From 8cebd2859be7808d238ae67320aca7e2eef4c1a1 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 18 Nov 2014 13:40:59 +0000
Subject: RichEd20.dll replaced with Msftedit.dll

git-svn-id: http://svn.miranda-ng.org/main/trunk@11011 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/mTextControl/src/FormattedTextDraw.h    |  1 -
 plugins/mTextControl/src/ImageDataObjectHlp.cpp | 37 -------------------------
 plugins/mTextControl/src/main.cpp               |  2 --
 plugins/mTextControl/src/richeditutils.cpp      |  3 --
 4 files changed, 43 deletions(-)

(limited to 'plugins/mTextControl')

diff --git a/plugins/mTextControl/src/FormattedTextDraw.h b/plugins/mTextControl/src/FormattedTextDraw.h
index 06a939c160..3ea2e2faee 100644
--- a/plugins/mTextControl/src/FormattedTextDraw.h
+++ b/plugins/mTextControl/src/FormattedTextDraw.h
@@ -6,7 +6,6 @@
 #ifndef __FORMATTEDTEXTDRAW_H_
 #define __FORMATTEDTEXTDRAW_H_
 
-// be sure to link this project with riched20.lib
 #ifndef LY_PER_INCH
 #define LY_PER_INCH   1440
 #define HOST_BORDER 0
diff --git a/plugins/mTextControl/src/ImageDataObjectHlp.cpp b/plugins/mTextControl/src/ImageDataObjectHlp.cpp
index fd81142271..7e2747eb44 100644
--- a/plugins/mTextControl/src/ImageDataObjectHlp.cpp
+++ b/plugins/mTextControl/src/ImageDataObjectHlp.cpp
@@ -213,40 +213,3 @@ bool InsertBitmap(IRichEditOle* pRichEditOle, HENHMETAFILE hEmf)
 
 	return sc == S_OK;
 }
-/*
-int RichEditVersion(void) 
-{
-    // get size of version information
-    DWORD dummy;
-    DWORD size = ::GetFileVersionInfoSize(_T("riched20.dll"), &dummy);
-    if (!size) return -1;  // unexpected failure
-
-    // allocate a buffer for version information
-    BYTE* buffer = (BYTE*) new BYTE[size];
-
-    // get the version information
-    if (!::GetFileVersionInfo(_T("riched20.dll"), 0, size, buffer)) 
-	{
-        delete[] buffer;
-        return -1;  // unexpected faiure
-    }
-
-    // get the static version information
-    VS_FIXEDFILEINFO* vsInfo;
-    UINT vsInfoSize;
-    if (!::VerQueryValue(buffer, _T("\\"), (LPVOID*) &vsInfo, &vsInfoSize)) 
-	{
-        delete[] buffer;
-        return -1;  // unexpected failure
-    }
-
-    int FileVersionMinor = LOWORD(vsInfo->dwFileVersionMS);
-
-    // free the buffer
-    delete[] buffer;
-
-    return FileVersionMinor ? 3 : 2;
-}
-
-bool g_HiddenTextSupported =  RichEditVersion() == 3;
-*/
\ No newline at end of file
diff --git a/plugins/mTextControl/src/main.cpp b/plugins/mTextControl/src/main.cpp
index da32323cb0..b24611b317 100644
--- a/plugins/mTextControl/src/main.cpp
+++ b/plugins/mTextControl/src/main.cpp
@@ -57,8 +57,6 @@ extern "C" __declspec(dllexport) int Load(void)
 {
 	mir_getLP(&pluginInfoEx);
 
-	//6.0A SDK is missing RichEd20.lib for x64
-	//http://connect.microsoft.com/VisualStudio/feedback/details/551071/the-6-0a-sdk-is-missing-riched20-lib-for-x64
 	MyCreateTextServices = 0;
 	hMsfteditDll = LoadLibrary(_T("msftedit.dll"));
 	if (hMsfteditDll) {
diff --git a/plugins/mTextControl/src/richeditutils.cpp b/plugins/mTextControl/src/richeditutils.cpp
index f5a473695f..043ab81675 100644
--- a/plugins/mTextControl/src/richeditutils.cpp
+++ b/plugins/mTextControl/src/richeditutils.cpp
@@ -125,10 +125,7 @@ LRESULT CALLBACK RichEditProxyWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 void LoadRichEdit()
 {
 	OleInitialize(NULL);
-//	LoadLibrary("riched20.dll");
 	reOleCallback = new CREOleCallback;
-//	CoInitializeEx(NULL,COINIT_MULTITHREADED);
-
 
 	WNDCLASSEX wcl;
 	wcl.cbSize = sizeof(wcl);
-- 
cgit v1.2.3