No commit message

common/AcceleratorHook.cpp

@@ -27,9 +27,10 @@ DWORD CALLBACK AcceleratorHook::Handler( int code,   DWORD wParam,    LONG lPara
 	if (msg && code == HC_ACTION){
 		bool q = msg->message == WM_QUIT;
 
+		AcceleratorHandler* handler = NULL;
 		EnterCriticalSection(&instance->m_CriticalSection);
 		for(Handlers::iterator it=instance->m_Handlers.begin(); it!=instance->m_Handlers.end(); ++it){
-			AcceleratorHandler* handler = *it;
+			handler = *it;
 			if (handler->execute(msg)){
 				msg->message = WM_NULL;
 				break;

common/System.cpp

@@ -146,7 +146,7 @@ HRESULT STDMETHODCALLTYPE System::decodeFrom(
 		*result = SysAllocStringLen(NULL, len);
 		res = MultiByteToWideChar(codepage, 0, buf, newlen, *result, len);
 
-		delete[] buf;
+		delete buf;
 	}
 	return S_OK;
 }
@@ -163,7 +163,7 @@ HRESULT STDMETHODCALLTYPE System::encodeTo( int codepage, BSTR *value, BSTR *res
 		*result = SysAllocStringLen(NULL, len);
 		res = MultiByteToWideChar(0, 0, buf, newlen, *result, len);
 
-		delete[] buf;
+		delete buf;
 	}
 	return S_OK;
 }

common/System.h

@@ -61,7 +61,7 @@ class CallBack :public CComDispatch<ICallBack>
 			mov v_ebp, ebp
 		}
 
-		CallBack* cb = *GetCallBack(NUM);
+		CallBack* cb = *CallBack::GetCallBack(NUM);
 		return cb->Call(v_ebp); // provide actual parameters
 #else
 #pragma message(": warning: Library::call not available")

editor/view/EditorView.cpp

@@ -165,7 +165,7 @@ HRESULT STDMETHODCALLTYPE CEditorView::get_selection( BSTR *value){
 	sci(SCI_GETSELTEXT, len, (LPARAM)buf);
 
 	*value = adjustFromCodePage(buf, -1);  
-	delete[] buf;
+	delete buf;
 
 	return S_OK;
 }
@@ -174,7 +174,7 @@ HRESULT STDMETHODCALLTYPE CEditorView::put_selection(BSTR *value){
 	char* buf = adjustToCodePage(*value);
 
 	sci(SCI_REPLACESEL, 0, (LPARAM)buf);
-	delete[] buf;
+	delete buf;
 
 	return S_OK;
 }
@@ -195,10 +195,9 @@ HRESULT STDMETHODCALLTYPE CEditorView::get_files(IDispatch **result){
 	// prepare for getting filenames
 	long nbFiles;
 	get_files(&nbFiles);
-	TCHAR** filesArray = new TCHAR*[nbFiles];
-
+	TCHAR** filesArray = (TCHAR**)malloc(sizeof(TCHAR*)*nbFiles);
 	for(int i=0; i<nbFiles; i++){
-		filesArray[i] = new TCHAR[MAX_PATH];
+		filesArray[i] = (TCHAR*)malloc(sizeof(TCHAR)*MAX_PATH);
 	}
 
 	// get filenames
@@ -214,10 +213,9 @@ HRESULT STDMETHODCALLTYPE CEditorView::get_files(IDispatch **result){
 	// fill and free allocated Resources
 	for(int i=0; i<nbFiles; i++){
 		MyActiveSite::getInstance()->pushValueInToArr(arr, filesArray[i]);
-		delete[] filesArray[i];
+		delete filesArray[i];
 	}
-
-	delete[] filesArray;
+	delete filesArray;
 
 	*result = arr;
 	return S_OK;

editor/view/ViewLine.cpp

@@ -116,7 +116,7 @@ HRESULT STDMETHODCALLTYPE ViewLine::get_text( BSTR *result){
 
 	*result = m_View->adjustFromCodePage(buf, -1);
 
-	delete[] buf;
+	delete buf;
 
 	return S_OK;
 }