mirror of
https://github.com/reactos/reactos.git
synced 2025-01-04 21:38:43 +00:00
minor fixes
svn path=/trunk/; revision=19715
This commit is contained in:
parent
ce6ccd9bb5
commit
7c2d655e6c
3 changed files with 181 additions and 154 deletions
|
@ -1077,16 +1077,18 @@ SecurityPageProc(IN HWND hwndDlg,
|
||||||
IN LPARAM lParam)
|
IN LPARAM lParam)
|
||||||
{
|
{
|
||||||
PSECURITY_PAGE sp;
|
PSECURITY_PAGE sp;
|
||||||
|
INT_PTR Ret = FALSE;
|
||||||
|
|
||||||
|
sp = (PSECURITY_PAGE)GetWindowLongPtr(hwndDlg,
|
||||||
|
DWL_USER);
|
||||||
|
if (sp != NULL || uMsg == WM_INITDIALOG)
|
||||||
|
{
|
||||||
switch (uMsg)
|
switch (uMsg)
|
||||||
{
|
{
|
||||||
case WM_NOTIFY:
|
case WM_NOTIFY:
|
||||||
{
|
{
|
||||||
NMHDR *pnmh = (NMHDR*)lParam;
|
NMHDR *pnmh = (NMHDR*)lParam;
|
||||||
sp = (PSECURITY_PAGE)GetWindowLongPtr(hwndDlg,
|
|
||||||
DWL_USER);
|
|
||||||
if (sp != NULL)
|
|
||||||
{
|
|
||||||
if (pnmh->hwndFrom == sp->hWndPrincipalsList)
|
if (pnmh->hwndFrom == sp->hWndPrincipalsList)
|
||||||
{
|
{
|
||||||
switch (pnmh->code)
|
switch (pnmh->code)
|
||||||
|
@ -1123,7 +1125,6 @@ SecurityPageProc(IN HWND hwndDlg,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1135,9 +1136,6 @@ SecurityPageProc(IN HWND hwndDlg,
|
||||||
{
|
{
|
||||||
HRESULT hRet;
|
HRESULT hRet;
|
||||||
|
|
||||||
sp = (PSECURITY_PAGE)GetWindowLongPtr(hwndDlg,
|
|
||||||
DWL_USER);
|
|
||||||
|
|
||||||
hRet = InitializeObjectPicker(sp->ServerName,
|
hRet = InitializeObjectPicker(sp->ServerName,
|
||||||
&sp->ObjectInfo,
|
&sp->ObjectInfo,
|
||||||
&sp->pDsObjectPicker);
|
&sp->pDsObjectPicker);
|
||||||
|
@ -1164,15 +1162,24 @@ SecurityPageProc(IN HWND hwndDlg,
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
case IDC_REMOVE_PRINCIPAL:
|
||||||
|
{
|
||||||
|
PPRINCIPAL_LISTITEM SelectedPrincipal;
|
||||||
|
|
||||||
|
SelectedPrincipal = (PPRINCIPAL_LISTITEM)ListViewGetSelectedItemData(sp->hWndPrincipalsList);
|
||||||
|
if (SelectedPrincipal != NULL)
|
||||||
|
{
|
||||||
|
/* FIXME */
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
case WM_SIZE:
|
case WM_SIZE:
|
||||||
{
|
{
|
||||||
sp = (PSECURITY_PAGE)GetWindowLongPtr(hwndDlg,
|
|
||||||
DWL_USER);
|
|
||||||
|
|
||||||
ResizeControls(sp,
|
ResizeControls(sp,
|
||||||
(INT)LOWORD(lParam),
|
(INT)LOWORD(lParam),
|
||||||
(INT)HIWORD(lParam));
|
(INT)HIWORD(lParam));
|
||||||
|
@ -1209,6 +1216,10 @@ SecurityPageProc(IN HWND hwndDlg,
|
||||||
DWL_USER,
|
DWL_USER,
|
||||||
(DWORD_PTR)sp);
|
(DWORD_PTR)sp);
|
||||||
|
|
||||||
|
ListView_SetExtendedListViewStyleEx(sp->hWndPrincipalsList,
|
||||||
|
LVS_EX_FULLROWSELECT,
|
||||||
|
LVS_EX_FULLROWSELECT);
|
||||||
|
|
||||||
sp->hiPrincipals = ImageList_LoadBitmap(hDllInstance,
|
sp->hiPrincipals = ImageList_LoadBitmap(hDllInstance,
|
||||||
MAKEINTRESOURCE(IDB_USRGRPIMAGES),
|
MAKEINTRESOURCE(IDB_USRGRPIMAGES),
|
||||||
16,
|
16,
|
||||||
|
@ -1220,9 +1231,6 @@ SecurityPageProc(IN HWND hwndDlg,
|
||||||
/* setup the listview control */
|
/* setup the listview control */
|
||||||
if (sp->hiPrincipals != NULL)
|
if (sp->hiPrincipals != NULL)
|
||||||
{
|
{
|
||||||
ListView_SetExtendedListViewStyleEx(sp->hWndPrincipalsList,
|
|
||||||
LVS_EX_FULLROWSELECT,
|
|
||||||
LVS_EX_FULLROWSELECT);
|
|
||||||
ListView_SetImageList(sp->hWndPrincipalsList,
|
ListView_SetImageList(sp->hWndPrincipalsList,
|
||||||
sp->hiPrincipals,
|
sp->hiPrincipals,
|
||||||
LVSIL_SMALL);
|
LVSIL_SMALL);
|
||||||
|
@ -1283,10 +1291,13 @@ SecurityPageProc(IN HWND hwndDlg,
|
||||||
|
|
||||||
UpdateControlStates(sp);
|
UpdateControlStates(sp);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Ret = TRUE;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return 0;
|
}
|
||||||
|
return Ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1498,6 +1498,8 @@ CheckListWndProc(IN HWND hwnd,
|
||||||
{
|
{
|
||||||
hdc = (wParam != 0 ? (HDC)wParam : BeginPaint(hwnd, &ps));
|
hdc = (wParam != 0 ? (HDC)wParam : BeginPaint(hwnd, &ps));
|
||||||
|
|
||||||
|
if (hdc != NULL)
|
||||||
|
{
|
||||||
PaintControl(infoPtr,
|
PaintControl(infoPtr,
|
||||||
hdc,
|
hdc,
|
||||||
&rcUpdate);
|
&rcUpdate);
|
||||||
|
@ -1508,6 +1510,7 @@ CheckListWndProc(IN HWND hwnd,
|
||||||
&ps);
|
&ps);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -338,6 +338,19 @@ InvokeObjectPickerDialog(IN IDsObjectPicker *pDsObjectPicker,
|
||||||
}
|
}
|
||||||
|
|
||||||
GlobalUnlock(stm.hGlobal);
|
GlobalUnlock(stm.hGlobal);
|
||||||
|
|
||||||
|
if (SUCCEEDED(hRet))
|
||||||
|
{
|
||||||
|
/* return S_OK instead of possible other success codes if
|
||||||
|
everything went well */
|
||||||
|
hRet = S_OK;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
/* unable to translate the selection pointer handle, indicate
|
||||||
|
failure */
|
||||||
|
hRet = E_FAIL;
|
||||||
}
|
}
|
||||||
|
|
||||||
ReleaseStgMedium(&stm);
|
ReleaseStgMedium(&stm);
|
||||||
|
|
Loading…
Reference in a new issue