o2on svn commit
o2on-****@lists*****
2008年 3月 16日 (日) 06:39:30 JST
Revision: 50
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=o2on&view=rev&rev=50
Author: laxmi
Date: 2008-03-16 06:39:30 +0900 (Sun, 16 Mar 2008)
Log Message:
-----------
FIX:UPnPダイアãƒã‚°ã§é …目未é¸æŠžæ™‚ã«ã‚‚ボタンãŒæŠ¼ã›ã‚‹
Modified Paths:
--------------
branches/PRE_0043/o2on/src.o2on/main.cpp
Modified: branches/PRE_0043/o2on/src.o2on/main.cpp
===================================================================
--- branches/PRE_0043/o2on/src.o2on/main.cpp 2008-03-15 21:32:17 UTC (rev 49)
+++ branches/PRE_0043/o2on/src.o2on/main.cpp 2008-03-15 21:39:30 UTC (rev 50)
@@ -2006,20 +2006,29 @@
case IDC_NICLIST:
if (HIWORD(wp) == LBN_SELCHANGE) {
HWND hwndList = GD(hwnd, IDC_NICLIST);
- IP_ADAPTER_INFO *p = (IP_ADAPTER_INFO*)ListBox_GetItemData(hwndList,
- ListBox_GetCurSel(hwndList));
- testparam.ip = inet_addr(p->IpAddressList.IpAddress.String);
- EnableWindow(GD(hwnd, IDC_SEARCHIGD), TRUE);
+ int index = ListBox_GetCurSel(hwndList);
+ if (index != LB_ERR) {
+ IP_ADAPTER_INFO *p = (IP_ADAPTER_INFO*)ListBox_GetItemData(hwndList, index);
+ testparam.ip = inet_addr(p->IpAddressList.IpAddress.String);
+ EnableWindow(GD(hwnd, IDC_SEARCHIGD), TRUE);
+ }
}
return TRUE;
case IDC_SERVICELIST:
- if (HIWORD(wp) == LBN_SELCHANGE)
- EnableWindow(GD(hwnd, IDOK), TRUE);
+ if (HIWORD(wp) == LBN_SELCHANGE) {
+ int index = ListBox_GetCurSel(GD(hwnd, IDC_SERVICELIST));
+ if (index != LB_ERR)
+ EnableWindow(GD(hwnd, IDOK), TRUE);
+ }
return TRUE;
case IDC_SEARCHIGD:
PostMessage(hwnd, UM_UPNP_START_TEST, 0, 0);
return TRUE;
case IDOK: {
+ //Ž–‘OðŒ
+ //1,ListBox_GetCurSel(GD(hwnd, IDC_NICLIST)) != LB_ERR
+ //2,ListBox_GetCurSel(GD(hwnd, IDC_SERVICELIST)) != LB_ERR
+
HWND hwndList = GD(hwnd, IDC_NICLIST);
IP_ADAPTER_INFO *p = (IP_ADAPTER_INFO*)ListBox_GetItemData(hwndList,
ListBox_GetCurSel(hwndList));