From 9eda943d76a8009f3dfe41f654871d04399308c2 Mon Sep 17 00:00:00 2001
From: Johannes Anderwald <johannes.anderwald@reactos.org>
Date: Tue, 23 May 2006 19:27:27 +0000
Subject: [PATCH] prevent ncpa from crashing when no component is selected.
 patch & bug report by ThePhysicist (bug 1519)

svn path=/trunk/; revision=21990
---
 reactos/dll/cpl/ncpa/ncpa.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/reactos/dll/cpl/ncpa/ncpa.c b/reactos/dll/cpl/ncpa/ncpa.c
index b94504a930f..fc520ca3798 100644
--- a/reactos/dll/cpl/ncpa/ncpa.c
+++ b/reactos/dll/cpl/ncpa/ncpa.c
@@ -263,11 +263,11 @@ NICPropertyPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 			SetDlgItemText(hwndDlg,IDC_NETCARDNAME,tpszDisplayName);
 			EnableWindow(GetDlgItem(hwndDlg,IDC_CONFIGURE),FALSE);
 
-
 			SetWindowLongPtr(hwndDlg,GWL_USERDATA,(DWORD_PTR)lParam);
 			//SetDlgItemTextA(hwndDlg,IDC_NETCARDNAME,Info[pPage->lParam].Description);
 			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;
 	case WM_COMMAND:
@@ -302,14 +302,16 @@ NICPropertyPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 			// drop though
 		case IDC_PROPERTIES:
 			{
-				TCHAR *tpszSubKey;
+				TCHAR *tpszSubKey = NULL;
 				TCHAR tpszNDIKey[MAX_PATH];
 				TCHAR tpszClsIDText[MAX_PATH];
 				TCHAR *tpszTCPIPClsID = _T("{A907657F-6FDF-11D0-8EFB-00C04FD912B2}");
 				HKEY hNDIKey;
 				DWORD dwType,dwSize;
 				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)
 					break;
 				_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_REMOVE),FALSE);
 
-			SendDlgItemMessage(hwndDlg,IDC_NETCARDLIST,LB_SETCURSEL,0,0);
-		
 			EnumAdapters(hwndDlg);
+			SendDlgItemMessage(hwndDlg,IDC_NETCARDLIST,LB_SETCURSEL,0,0);
 		}
 		break;