Sync to Wine-0_9_5:
Mike McCormack <mike(a)codeweavers.com>
- 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.
Modified: trunk/reactos/subsys/system/msiexec/msiexec.c
_____
Modified: trunk/reactos/subsys/system/msiexec/msiexec.c
--- trunk/reactos/subsys/system/msiexec/msiexec.c 2006-01-06
20:42:46 UTC (rev 20627)
+++ trunk/reactos/subsys/system/msiexec/msiexec.c 2006-01-06
20:44:09 UTC (rev 20628)
@@ -452,7 +452,6 @@
DWORD RepairMode = 0;
DWORD AdvertiseMode = 0;
- LPWSTR Transforms = NULL;
struct string_list *transform_list = NULL;
LANGID Language = 0;
@@ -658,10 +657,6 @@
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 @@
MsiSetInternalUI(InstallUILevel, NULL);
Properties = build_properties( property_list );
- Transforms = build_transforms( transform_list );
if(FunctionInstallAdmin && FunctionPatch)
FunctionInstall = FALSE;
@@ -880,6 +874,7 @@
}
else if(FunctionAdvertise)
{
+ LPWSTR Transforms = build_transforms( property_list );
ReturnCode = MsiAdvertiseProductW(PackageName, (LPWSTR)
AdvertiseMode, Transforms, Language);
}
else if(FunctionPatch)
Show replies by date