Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 14:25:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

prevent ncpa from crashing when no component is selected. patch & bug report by ThePhysicist (bug 1519)

Browse source 
svn path=/trunk/; revision=21990
This commit is contained in:
Johannes Anderwald 2006-05-23 19:27:27 +00:00
parent da398bc3c0
commit 9eda943d76
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
reactos/dll/cpl/ncpa/ncpa.c
View file

@ -263,11 +263,11 @@ NICPropertyPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
SetDlgItemText(hwndDlg,IDC_NETCARDNAME,tpszDisplayName); SetDlgItemText(hwndDlg,IDC_NETCARDNAME,tpszDisplayName);
EnableWindow(GetDlgItem(hwndDlg,IDC_CONFIGURE),FALSE); EnableWindow(GetDlgItem(hwndDlg,IDC_CONFIGURE),FALSE);
SetWindowLongPtr(hwndDlg,GWL_USERDATA,(DWORD_PTR)lParam); SetWindowLongPtr(hwndDlg,GWL_USERDATA,(DWORD_PTR)lParam);
//SetDlgItemTextA(hwndDlg,IDC_NETCARDNAME,Info[pPage->lParam].Description); //SetDlgItemTextA(hwndDlg,IDC_NETCARDNAME,Info[pPage->lParam].Description);
EnumRegKeys(NICPropertyProtocolCallback,hwndDlg,HKEY_LOCAL_MACHINE,_T("System\\CurrentControlSet\\Control\\Network\\{4D36E975-E325-11CE-BFC1-08002BE10318}")); EnumRegKeys(NICPropertyProtocolCallback,hwndDlg,HKEY_LOCAL_MACHINE,_T("System\\CurrentControlSet\\Control\\Network\\{4D36E975-E325-11CE-BFC1-08002BE10318}"));
SendDlgItemMessage(hwndDlg, IDC_COMPONENTSLIST, LB_SETCURSEL, 0, 0);
} }
break; break;
case WM_COMMAND: case WM_COMMAND:
@ -302,14 +302,16 @@ NICPropertyPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
// drop though // drop though
case IDC_PROPERTIES: case IDC_PROPERTIES:
{ {
TCHAR *tpszSubKey; TCHAR *tpszSubKey = NULL;
TCHAR tpszNDIKey[MAX_PATH]; TCHAR tpszNDIKey[MAX_PATH];
TCHAR tpszClsIDText[MAX_PATH]; TCHAR tpszClsIDText[MAX_PATH];
TCHAR *tpszTCPIPClsID = _T("{A907657F-6FDF-11D0-8EFB-00C04FD912B2}"); TCHAR *tpszTCPIPClsID = _T("{A907657F-6FDF-11D0-8EFB-00C04FD912B2}");
HKEY hNDIKey; HKEY hNDIKey;
DWORD dwType,dwSize; DWORD dwType,dwSize;
HWND hListBox = GetDlgItem(hwndDlg,IDC_COMPONENTSLIST); HWND hListBox = GetDlgItem(hwndDlg,IDC_COMPONENTSLIST);
tpszSubKey = (TCHAR*)SendMessage(hListBox,LB_GETITEMDATA,SendMessage(hListBox,LB_GETCURSEL,0,0),0); int iListBoxIndex = SendMessage(hListBox,LB_GETCURSEL,0,0);
if(iListBoxIndex != LB_ERR)
tpszSubKey = (TCHAR*)SendMessage(hListBox,LB_GETITEMDATA,iListBoxIndex,0);
if(!tpszSubKey) if(!tpszSubKey)
break; break;
_stprintf(tpszNDIKey,_T("%s\\Ndi"),tpszSubKey); _stprintf(tpszNDIKey,_T("%s\\Ndi"),tpszSubKey);
@ -598,9 +600,8 @@ NetworkPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
EnableWindow(GetDlgItem(hwndDlg,IDC_ADD),FALSE); EnableWindow(GetDlgItem(hwndDlg,IDC_ADD),FALSE);
EnableWindow(GetDlgItem(hwndDlg,IDC_REMOVE),FALSE); EnableWindow(GetDlgItem(hwndDlg,IDC_REMOVE),FALSE);
SendDlgItemMessage(hwndDlg,IDC_NETCARDLIST,LB_SETCURSEL,0,0);
EnumAdapters(hwndDlg); EnumAdapters(hwndDlg);
SendDlgItemMessage(hwndDlg,IDC_NETCARDLIST,LB_SETCURSEL,0,0);
} }
break; break;