Hi,
Sending the diff for adding description to the User element. This
description is what gets shown for the user in the computer management
console.
Diff with the source version 2.0.3309.0.
-----------------------------
diff E:\work\wix\sources-2.0.3309.0\src\ca\serverca\scaexec\scaexec.cpp
E:\work\wix\Jitusources\src\ca\serverca\scaexec\scaexec.cpp
1379a1380
LPWSTR pwzDescription = NULL;
1409a1411,1413
hr = WcaReadStringFromCaData(&pwz, &pwzDescription);
ExitOnFailure(hr, "failed to read description from custom action data");
1417c1421
< userInfo.usri1_comment = NULL;
---
userInfo.usri1_comment = pwzDescription;
diff E:\work\wix\sources-2.0.3309.0\src\ca\serverca\scasched\scauser.cpp
E:\work\wix\Jitusources\src\ca\serverca\scasched\scauser.cpp
33c33
< LPCWSTR vActionableQuery = L"SELECT
`User`,`Component_`,`Name`,`Domain`,`Password`,`Attributes` "
---
LPCWSTR vActionableQuery = L"SELECT
`User`,`Component_`,`Name`,`Domain`,`Password`,`Attributes`,`Description` "
35c35
< enum eActionableQuery { vaqUser = 1, vaqComponent, vaqName, vaqDomain,
vaqPassword, vaqAttributes };
---
enum eActionableQuery { vaqUser = 1, vaqComponent, vaqName, vaqDomain,
vaqPassword, vaqAttributes, vaqDescription };
339a340,344
hr = WcaGetRecordFormattedString(hRec, vaqDescription,
&pwzData);
ExitOnFailure(hr, "failed to get User.Description");
hr = StringCchCopyW(psu->wzDescription, countof(psu->wzDescription),
pwzData);
ExitOnFailure1(hr, "failed to copy user Description:
%S", pwzData);
455a461,463
hr = WcaWriteStringToCaData(psu->wzDescription,
&pwzActionData);
ExitOnFailure1(hr, "failed to add user description to custom action data
for user: %S", psu->wzKey);
diff E:\work\wix\sources-2.0.3309.0\src\ca\serverca\scasched\scauser.h
E:\work\wix\Jitusources\src\ca\serverca\scasched\scauser.h
42a43
WCHAR wzDescription[MAX_DARWIN_COLUMN + 1];
diff E:\work\wix\sources-2.0.3309.0\src\wix\Compiler.cs
E:\work\wix\Jitusources\src\wix\Compiler.cs
12546a12547
string description = null;
12587a12589,12591
case "Description":
description =
this.core.GetAttributeValue(sourceLineNumbers, attrib);
break;
12701a12706
row[6] = description;
diff E:\work\wix\sources-2.0.3309.0\src\wix\Data\tables.xml
E:\work\wix\Jitusources\src\wix\Data\tables.xml
1127a1128,1129
<columnDefinition name="Description" type="string" length="255"
nullable="yes" modularize="property"
category="formatted" description="User
description"/>
diff E:\work\wix\sources-2.0.3309.0\src\wix\Serialize\wix.cs
E:\work\wix\Jitusources\src\wix\Serialize\wix.cs
26941a26942,26945
private string descriptionField;
private bool descriptionFieldSet;
27121c27125,27138
<
---
public string Description
{
get
{
return this.descriptionField;
}
set
{
this.descriptionFieldSet = true;
this.descriptionField = value;
}
}
27238a27256,27259
if (this.descriptionFieldSet)
{
writer.WriteAttributeString("Description",
this.descriptionField);
}
diff E:\work\wix\sources-2.0.3309.0\src\wix\Xsd\wix.xsd
E:\work\wix\Jitusources\src\wix\Xsd\wix.xsd
6457a6458,6460
<xs:attribute name="Description" type="xs:string">
<xs:annotation><xs:documentation>Description of the
user.</xs:documentation></xs:annotation>
</xs:attribute>
--------------------------------
Please review it and then submit it.
Thanks,
Jitu
Previously had attached the zip file containing all changed files and that
bounced back. So this message is without the zip file
_________________________________________________________________
Tried the new MSN Messenger? ItÂ’s cool! Download now.
http://messenger.msn.com/Download/Default.aspx?mkt=en-in
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
WiX-devs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/wix-devs
