projects
/
reactos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[USRMGR]
[reactos.git]
/
reactos
/
dll
/
cpl
/
usrmgr
/
groupprops.c
diff --git
a/reactos/dll/cpl/usrmgr/groupprops.c
b/reactos/dll/cpl/usrmgr/groupprops.c
index
d34acd3
..
a455446
100644
(file)
--- a/
reactos/dll/cpl/usrmgr/groupprops.c
+++ b/
reactos/dll/cpl/usrmgr/groupprops.c
@@
-389,7
+389,7
@@
GetGeneralGroupData(HWND hwndDlg,
PGENERAL_GROUP_DATA pGroupData)
{
PLOCALGROUP_INFO_1 groupInfo = NULL;
PGENERAL_GROUP_DATA pGroupData)
{
PLOCALGROUP_INFO_1 groupInfo = NULL;
- PLOCALGROUP_MEMBERS_INFO_
1
membersInfo = NULL;
+ PLOCALGROUP_MEMBERS_INFO_
2
membersInfo = NULL;
DWORD dwRead;
DWORD dwTotal;
DWORD_PTR resumeHandle = 0;
DWORD dwRead;
DWORD dwTotal;
DWORD_PTR resumeHandle = 0;
@@
-435,7
+435,7
@@
GetGeneralGroupData(HWND hwndDlg,
NetApiBufferFree(groupInfo);
/* Set group members */
NetApiBufferFree(groupInfo);
/* Set group members */
- NetLocalGroupGetMembers(NULL, pGroupData->szGroupName,
1
, (LPBYTE*)&membersInfo,
+ NetLocalGroupGetMembers(NULL, pGroupData->szGroupName,
2
, (LPBYTE*)&membersInfo,
MAX_PREFERRED_LENGTH, &dwRead, &dwTotal,
&resumeHandle);
MAX_PREFERRED_LENGTH, &dwRead, &dwTotal,
&resumeHandle);
@@
-443,32
+443,45
@@
GetGeneralGroupData(HWND hwndDlg,
{
ZeroMemory(&lvi, sizeof(lvi));
lvi.mask = LVIF_TEXT | LVIF_STATE | LVIF_IMAGE;
{
ZeroMemory(&lvi, sizeof(lvi));
lvi.mask = LVIF_TEXT | LVIF_STATE | LVIF_IMAGE;
- lvi.pszText = membersInfo[i].lgrmi1_name;
lvi.state = 0;
lvi.state = 0;
- if (membersInfo[i].lgrmi
1
_sidusage == SidTypeGroup ||
- membersInfo[i].lgrmi
1
_sidusage == SidTypeWellKnownGroup)
+ if (membersInfo[i].lgrmi
2
_sidusage == SidTypeGroup ||
+ membersInfo[i].lgrmi
2
_sidusage == SidTypeWellKnownGroup)
{
lvi.iImage = 0;
}
{
lvi.iImage = 0;
}
- else if (membersInfo[i].lgrmi
1
_sidusage == SidTypeUser)
+ else if (membersInfo[i].lgrmi
2
_sidusage == SidTypeUser)
{
/* FIXME: handle locked user properly! */
lvi.iImage = 1;
}
{
/* FIXME: handle locked user properly! */
lvi.iImage = 1;
}
- if (membersInfo[i].lgrmi
1
_sidusage == SidTypeWellKnownGroup)
+ if (membersInfo[i].lgrmi
2
_sidusage == SidTypeWellKnownGroup)
{
TCHAR szSid[256];
{
TCHAR szSid[256];
- GetTextSid(membersInfo[i].lgrmi
1
_sid, szSid);
+ GetTextSid(membersInfo[i].lgrmi
2
_sid, szSid);
wsprintf(szGroupName,
TEXT("%s (%s)"),
wsprintf(szGroupName,
TEXT("%s (%s)"),
- membersInfo[i].lgrmi
1_
name,
+ membersInfo[i].lgrmi
2_domainand
name,
szSid);
lvi.pszText = szGroupName;
}
szSid);
lvi.pszText = szGroupName;
}
+ else
+ {
+ LPWSTR ptr;
+
+ ptr = wcschr(membersInfo[i].lgrmi2_domainandname, L'\\');
+ if (ptr != NULL)
+ {
+ lvi.pszText = ++ptr;
+ }
+ else
+ {
+ lvi.pszText = membersInfo[i].lgrmi2_domainandname;
+ }
+ }
(void)ListView_InsertItem(hwndLV, &lvi);
}
(void)ListView_InsertItem(hwndLV, &lvi);
}