17.7.6 Some fix

tablacus · Jul 6, 2017 · cfa0125 · cfa0125
1 parent ee76ce3
commit cfa0125
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 17 deletions.
diff --git a/TE/Resource.h b/TE/Resource.h
@@ -11,4 +11,4 @@
 #define STRING2(str) #str
 #define VER_Y		17
 #define VER_M		7
-#define VER_D		3
+#define VER_D		6
diff --git a/TE/TE.cpp b/TE/TE.cpp
@@ -5317,22 +5317,24 @@ LRESULT CALLBACK TELVProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 				}
 			} else if (((LPNMHDR)lParam)->code == LVN_ENDLABELEDIT) {
 				NMLVDISPINFO *lpDispInfo = (NMLVDISPINFO *)lParam;
-				if (g_pOnFunc[TE_OnEndLabelEdit]) {
-					VARIANTARG *pv = GetNewVARIANT(2);
-					teSetObject(&pv[1], pSB);
-					teSetSZ(&pv[0], lpDispInfo->item.pszText);
-					VARIANT vResult;
-					VariantInit(&vResult);
-					Invoke4(g_pOnFunc[TE_OnEndLabelEdit], &vResult, 2, pv);
-					if (GetIntFromVariantClear(&vResult)) {
-						lpDispInfo->item.pszText[0] = NULL;
+				if (lpDispInfo->item.pszText) {
+					if (g_pOnFunc[TE_OnEndLabelEdit]) {
+						VARIANTARG *pv = GetNewVARIANT(2);
+						teSetObject(&pv[1], pSB);
+						teSetSZ(&pv[0], lpDispInfo->item.pszText);
+						VARIANT vResult;
+						VariantInit(&vResult);
+						Invoke4(g_pOnFunc[TE_OnEndLabelEdit], &vResult, 2, pv);
+						if (GetIntFromVariantClear(&vResult)) {
+							lpDispInfo->item.pszText[0] = NULL;
+						}
 					}
-				}
-				if (lpDispInfo->item.pszText[0] == '.' && !StrChr(&lpDispInfo->item.pszText[1], '.')) {
-					int i = lstrlen(lpDispInfo->item.pszText);
-					if (i > 1 && i < lpDispInfo->item.cchTextMax - 1) {
-						lpDispInfo->item.pszText[i++] = '.';
-						lpDispInfo->item.pszText[i] = NULL;
+					if (lpDispInfo->item.pszText[0] == '.' && !StrChr(&lpDispInfo->item.pszText[1], '.')) {
+						int i = lstrlen(lpDispInfo->item.pszText);
+						if (i > 1 && i < lpDispInfo->item.cchTextMax - 1) {
+							lpDispInfo->item.pszText[i++] = '.';
+							lpDispInfo->item.pszText[i] = NULL;
+						}
 					}
 				}
 #ifdef _FIXWIN10IPBUG1
@@ -16459,7 +16461,7 @@ void CteWebBrowser::Close()
 			SetRectEmpty(&rc);
 			pOleObject->DoVerb(OLEIVERB_HIDE, NULL, NULL, 0, m_hwndParent, &rc);
 			pOleObject->Close(OLECLOSE_NOSAVE);
-			pOleObject->Release();
+			teDelayRelease(&pOleObject);
 		}
 		teUnadviseAndRelease(m_pWebBrowser, DIID_DWebBrowserEvents2, &m_dwCookie);
 		PostMessage(get_HWND(), WM_CLOSE, 0, 0);