RichEd20.dll replaced with Msftedit.dll

git-svn-id: http://svn.miranda-ng.org/main/trunk@11011 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

28 files changed, 45 insertions, 96 deletions

diff --git a/plugins/BasicHistory/res/BasicHistory.rc b/plugins/BasicHistory/res/BasicHistory.rc
index 7c7c93b00c..67d9dab156 100644
--- a/plugins/BasicHistory/res/BasicHistory.rc
+++ b/plugins/BasicHistory/res/BasicHistory.rc
@@ -37,7 +37,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN

     CONTROL        "",IDC_LIST,WC_LISTVIEW, WS_TABSTOP | WS_BORDER | LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_SHOWSELALWAYS | LVS_SINGLESEL | LVS_SHAREIMAGELISTS ,102,27,387,73

     CONTROL         "",IDC_SPLITTER,WC_STATIC,SS_ENHMETAFILE,102,100,413,2

-    CONTROL         "", IDC_EDIT, RICHEDIT_CLASS,  WS_VSCROLL | WS_TABSTOP | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | ES_DISABLENOSCROLL, 102,102,387,252, WS_EX_STATICEDGE

+    CONTROL         "", IDC_EDIT, "RichEdit50W",  WS_VSCROLL | WS_TABSTOP | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | ES_DISABLENOSCROLL, 102,102,387,252, WS_EX_STATICEDGE

     CONTROL         "", IDC_SHOWHIDE,"MButtonClass", WS_TABSTOP,7,7,16,14

     EDITTEXT        IDC_FIND_TEXT,25,8,380,12,ES_AUTOHSCROLL

     CONTROL         "", IDC_TOOLBAR,TOOLBARCLASSNAME, WS_TABSTOP | TBSTYLE_FLAT | TBSTYLE_TOOLTIPS | CCS_NOPARENTALIGN | CCS_NODIVIDER  | CCS_NORESIZE,413,7,76,20

diff --git a/plugins/CrashDumper/res/crshdmp.rc b/plugins/CrashDumper/res/crshdmp.rc
index 3447fd5ff4..12adc55e38 100644
--- a/plugins/CrashDumper/res/crshdmp.rc
+++ b/plugins/CrashDumper/res/crshdmp.rc
@@ -59,7 +59,7 @@ BEGIN
     PUSHBUTTON      "Close",IDCANCEL,302,215,66,14

     PUSHBUTTON      "Copy To Clipboard",IDC_CLIPVER,142,215,95,14

     PUSHBUTTON      "To File",IDC_FILEVER,6,215,66,14

-    CONTROL         "",IDC_VIEWVERSIONINFO,RICHEDIT_CLASS,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,7,7,361,203,WS_EX_CLIENTEDGE

+    CONTROL         "",IDC_VIEWVERSIONINFO,"RichEdit50W",ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,7,7,361,203,WS_EX_CLIENTEDGE

 END

 

 IDD_OPTIONS DIALOGEX 0, 0, 209, 195

diff --git a/plugins/CrashDumper/src/crshdmp.cpp b/plugins/CrashDumper/src/crshdmp.cpp
index fab49d4554..b9f149c88c 100644
--- a/plugins/CrashDumper/src/crshdmp.cpp
+++ b/plugins/CrashDumper/src/crshdmp.cpp
@@ -333,7 +333,7 @@ static int PreShutdown(WPARAM, LPARAM)
 

 extern "C" int __declspec(dllexport) Load(void)

 {

-	if (LoadLibraryA("riched20.dll") == NULL)

+	if (LoadLibraryA("Msftedit.dll") == NULL)

 		return 1;

 

 	clsdates = db_get_b(NULL, PluginName, "ClassicDates", 1) != 0;

diff --git a/plugins/Folders/res/folders.rc b/plugins/Folders/res/folders.rc
index 366339e72f..415c6274d8 100644
--- a/plugins/Folders/res/folders.rc
+++ b/plugins/Folders/res/folders.rc
@@ -74,7 +74,7 @@ CAPTION "Custom folders variables help"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1

 BEGIN

     DEFPUSHBUTTON   "Close",IDCLOSE,392,216,50,14

-    CONTROL         "",IDC_HELP_RICHEDIT,"RichEdit20W",ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,7,7,435,203

+    CONTROL         "",IDC_HELP_RICHEDIT,"RichEdit50W",ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,7,7,435,203

 END

 

 

diff --git a/plugins/Msg_Export/res/resource.rc b/plugins/Msg_Export/res/resource.rc
index f540ccaba9..fddbf49949 100755
--- a/plugins/Msg_Export/res/resource.rc
+++ b/plugins/Msg_Export/res/resource.rc
@@ -96,7 +96,7 @@ STYLE DS_SETFONT | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_
 CAPTION "History file for %s (%s format %s)"

 FONT 8, "MS Sans Serif"

 BEGIN

-    CONTROL         "",IDC_RICHEDIT,"RichEdit20W",TCS_HOTTRACK | TCS_VERTICAL | TCS_BUTTONS | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,6,7,333,224

+    CONTROL         "",IDC_RICHEDIT,"RichEdit50W",TCS_HOTTRACK | TCS_VERTICAL | TCS_BUTTONS | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,6,7,333,224

     PUSHBUTTON      "&Find...",IDC_FV_FIND,46,238,50,14

     PUSHBUTTON      "&External",IDC_FV_EXTERNAL,142,238,50,14

     DEFPUSHBUTTON   "&Close",IDOK,246,238,50,14

diff --git a/plugins/NotesAndReminders/src/main.cpp b/plugins/NotesAndReminders/src/main.cpp
index 730cb0ca59..5ee0629b34 100644
--- a/plugins/NotesAndReminders/src/main.cpp
+++ b/plugins/NotesAndReminders/src/main.cpp
@@ -305,9 +305,9 @@ extern "C" __declspec(dllexport) int Load(void)
 	ctrls.dwICC = ICC_DATE_CLASSES;

 	InitCommonControlsEx(&ctrls);

 

-	hRichedDll = LoadLibrary(_T("RICHED20.DLL"));

+	hRichedDll = LoadLibrary(_T("Msftedit.dll"));

 	if (!hRichedDll) {

-		if (MessageBox(0, TranslateT("Miranda could not load the Notes & Reminders plugin, riched20.dll is missing. If you are using WINE, please make sure you have riched20.dll installed. Press 'Yes' to continue loading Miranda."), _T(SECTIONNAME), MB_YESNO | MB_ICONINFORMATION) != IDYES)

+		if (MessageBox(0, TranslateT("Miranda could not load the Notes & Reminders plugin, Msftedit.dll is missing. If you are using WINE, please make sure you have Msftedit.dll installed. Press 'Yes' to continue loading Miranda."), _T(SECTIONNAME), MB_YESNO | MB_ICONINFORMATION) != IDYES)

 			return 1;

 		return 0;

 	}

diff --git a/plugins/Scriver/res/resource.rc b/plugins/Scriver/res/resource.rc
index 6c1ff5c5a7..76c9d9c465 100644
--- a/plugins/Scriver/res/resource.rc
+++ b/plugins/Scriver/res/resource.rc
@@ -130,7 +130,7 @@ BEGIN
     EDITTEXT        IDC_INDENTSIZE,262,79,33,12,ES_RIGHT | ES_NUMBER | WS_DISABLED

     CONTROL         "Spin1",IDC_INDENTSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK | WS_DISABLED,290,79,10,12

     CONTROL         "Customize fonts and colors",IDC_FONTSCOLORS,"Hyperlink",0x0,8,91,200,8

-    CONTROL         "",IDC_LOG,"RichEdit20W",WS_VSCROLL | WS_TABSTOP | 0x844,8,105,288,68,WS_EX_STATICEDGE

+    CONTROL         "",IDC_LOG,"RichEdit50W",WS_VSCROLL | WS_TABSTOP | 0x844,8,105,288,68,WS_EX_STATICEDGE

     GROUPBOX        "Preload",IDC_STATIC,0,181,304,50

     CONTROL         "Unread events only",IDC_LOADUNREAD,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,192,138,10

     CONTROL         "Last",IDC_LOADCOUNT,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,204,138,10

@@ -172,7 +172,7 @@ BEGIN
     LTEXT           "An error has occurred. The protocol reported the following error:",IDC_STATIC,5,4,177,20

     EDITTEXT        IDC_ERRORTEXT,5,24,177,21,ES_MULTILINE | ES_READONLY

     LTEXT           "while sending the following message:",IDC_STATIC,6,48,175,8

-    CONTROL         "",IDC_MSGTEXT,"RichEdit20W",WS_CLIPSIBLINGS | WS_VSCROLL | WS_TABSTOP | 0x844,5,60,177,26,WS_EX_STATICEDGE

+    CONTROL         "",IDC_MSGTEXT,"RichEdit50W",WS_CLIPSIBLINGS | WS_VSCROLL | WS_TABSTOP | 0x844,5,60,177,26,WS_EX_STATICEDGE

     DEFPUSHBUTTON   "Try again",IDOK,22,91,63,14

     PUSHBUTTON      "Cancel",IDCANCEL,104,91,61,14

 END

@@ -191,8 +191,8 @@ STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 EXSTYLE WS_EX_ACCEPTFILES | WS_EX_STATICEDGE

 FONT 8, "MS Shell Dlg", 0, 0, 0x1

 BEGIN

-    CONTROL         "",IDC_INFOBAR_NAME,"RichEdit20W",WS_CLIPSIBLINGS | 0x800,0,0,129,20

-    CONTROL         "",IDC_INFOBAR_STATUS,"RichEdit20W",WS_CLIPSIBLINGS | 0x804,0,20,139,20

+    CONTROL         "",IDC_INFOBAR_NAME,"RichEdit50W",WS_CLIPSIBLINGS | 0x800,0,0,129,20

+    CONTROL         "",IDC_INFOBAR_STATUS,"RichEdit50W",WS_CLIPSIBLINGS | 0x804,0,20,139,20

     ICON            0,IDC_XSTATUSICON,130,0,10,10

     CONTROL         "",IDC_AVATAR,"Static",SS_OWNERDRAW,140,0,40,40

 END

@@ -202,8 +202,8 @@ STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 EXSTYLE WS_EX_ACCEPTFILES

 FONT 8, "MS Shell Dlg", 0, 0, 0x1

 BEGIN

-    CONTROL         "",IDC_LOG,"RichEdit20W",WS_CLIPSIBLINGS | WS_VSCROLL | WS_TABSTOP | 0x844,1,41,181,28,WS_EX_STATICEDGE

-    CONTROL         "",IDC_MESSAGE,"RichEdit20W",WS_VSCROLL | WS_TABSTOP | 0x1144,0,87,181,13,WS_EX_ACCEPTFILES | WS_EX_STATICEDGE

+    CONTROL         "",IDC_LOG,"RichEdit50W",WS_CLIPSIBLINGS | WS_VSCROLL | WS_TABSTOP | 0x844,1,41,181,28,WS_EX_STATICEDGE

+    CONTROL         "",IDC_MESSAGE,"RichEdit50W",WS_VSCROLL | WS_TABSTOP | 0x1144,0,87,181,13,WS_EX_ACCEPTFILES | WS_EX_STATICEDGE

     CONTROL         "&User menu",IDC_USERMENU,"MButtonClass",0x0,1,71,16,14,WS_EX_NOACTIVATE | 0x10000000L

     CONTROL         "User &details",IDC_DETAILS,"MButtonClass",0x0,17,71,16,14,WS_EX_NOACTIVATE | 0x10000000L

     CONTROL         "&Emoticons",IDC_SMILEYS,"MButtonClass",0x0,41,71,16,14,WS_EX_NOACTIVATE | 0x10000000L

@@ -232,7 +232,7 @@ IDD_CHANNEL DIALOGEX 0, 0, 252, 140
 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN

 FONT 8, "MS Shell Dlg", 0, 0, 0x1

 BEGIN

-    CONTROL         "",IDC_CHAT_MESSAGE,"RichEdit20W",WS_VSCROLL | WS_TABSTOP | 0x1144,0,128,127,12,WS_EX_STATICEDGE

+    CONTROL         "",IDC_CHAT_MESSAGE,"RichEdit50W",WS_VSCROLL | WS_TABSTOP | 0x1144,0,128,127,12,WS_EX_STATICEDGE

     CONTROL         "&Emoticons",IDC_CHAT_SMILEY,"MButtonClass",WS_DISABLED | WS_TABSTOP,8,108,15,13,WS_EX_NOACTIVATE | 0x10000000L

     CONTROL         "&Bold",IDC_CHAT_BOLD,"MButtonClass",WS_DISABLED | WS_TABSTOP,24,108,15,13,WS_EX_NOACTIVATE | 0x10000000L

     CONTROL         "&Italic",IDC_CHAT_ITALICS,"MButtonClass",WS_DISABLED | WS_TABSTOP,36,108,15,13,WS_EX_NOACTIVATE | 0x10000000L

@@ -245,7 +245,7 @@ BEGIN
     CONTROL         "&Room Settings",IDC_CHAT_CHANMGR,"MButtonClass",WS_DISABLED | WS_TABSTOP,204,108,15,13,WS_EX_NOACTIVATE | 0x10000000L

     CONTROL         "&Show/hide nick list",IDC_CHAT_SHOWNICKLIST,

                     "MButtonClass",WS_TABSTOP,236,108,15,13,WS_EX_NOACTIVATE | 0x10000000L

-    CONTROL         "",IDC_CHAT_LOG,"RichEdit20W",WS_VSCROLL | WS_TABSTOP | 0x844,8,23,164,73,WS_EX_STATICEDGE

+    CONTROL         "",IDC_CHAT_LOG,"RichEdit50W",WS_VSCROLL | WS_TABSTOP | 0x844,8,23,164,73,WS_EX_STATICEDGE

     CONTROL         "",IDC_CHAT_SPLITTERX,"Static",SS_ENHMETAFILE,172,23,10,73

     CONTROL         "",IDC_CHAT_SPLITTERY,"Static",SS_ENHMETAFILE,0,102,251,6

     LISTBOX         IDC_CHAT_LIST,182,23,69,73,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | NOT WS_BORDER | WS_VSCROLL | WS_TABSTOP,WS_EX_STATICEDGE

diff --git a/plugins/Scriver/src/msgs.cpp b/plugins/Scriver/src/msgs.cpp
index c2728ed879..3a78488668 100644
--- a/plugins/Scriver/src/msgs.cpp
+++ b/plugins/Scriver/src/msgs.cpp
@@ -502,7 +502,7 @@ int OnUnloadModule(void)
 

 	ReleaseIcons();

 	FreeMsgLogIcons();

-	FreeLibrary(GetModuleHandleA("riched20.dll"));

+	FreeLibrary(GetModuleHandleA("Msftedit.dll"));

 	OleUninitialize();

 	RichUtil_Unload();

 	FreeGlobals();

@@ -511,10 +511,10 @@ int OnUnloadModule(void)
 

 int OnLoadModule(void)

 {

-	if (LoadLibraryA("riched20.dll") == NULL) {

+	if (LoadLibraryA("Msftedit.dll") == NULL) {

 		if (IDYES != MessageBox(0,

 			TranslateT

-			("Miranda could not load the built-in message module, riched20.dll is missing. If you are using WINE, please make sure you have riched20.dll installed. Press 'Yes' to continue loading Miranda."),

+			("Miranda could not load the built-in message module, Msftedit.dll is missing. If you are using WINE, please make sure you have Msftedit.dll installed. Press 'Yes' to continue loading Miranda."),

 			TranslateT("Information"), MB_YESNO | MB_ICONINFORMATION))

 			return 1;

 		return 0;

diff --git a/plugins/TabSRMM/res/chat.rc b/plugins/TabSRMM/res/chat.rc
index 6f391b392b..6f91ca1700 100644
--- a/plugins/TabSRMM/res/chat.rc
+++ b/plugins/TabSRMM/res/chat.rc
@@ -30,8 +30,8 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN

     CONTROL         "",IDC_SPLITTERX,"Static",SS_ENHMETAFILE,172,23,10,73

     CONTROL         "",IDC_SPLITTERY,"Static",SS_ENHMETAFILE,0,132,251,6

-    CONTROL         "",IDC_CHAT_MESSAGE,"RichEdit20W",WS_VSCROLL | WS_TABSTOP | 0x1144,0,128,127,12,WS_EX_STATICEDGE

-    CONTROL         "",IDC_CHAT_LOG,"RichEdit20W",WS_VSCROLL | 0x844,8,23,164,72,WS_EX_STATICEDGE

+    CONTROL         "",IDC_CHAT_MESSAGE,"RichEdit50W",WS_VSCROLL | WS_TABSTOP | 0x1144,0,128,127,12,WS_EX_STATICEDGE

+    CONTROL         "",IDC_CHAT_LOG,"RichEdit50W",WS_VSCROLL | 0x844,8,23,164,72,WS_EX_STATICEDGE

     LISTBOX         IDC_LIST,182,23,69,73,LBS_MULTIPLESEL | LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | LBS_NODATA | NOT WS_BORDER | WS_VSCROLL | WS_TABSTOP,WS_EX_STATICEDGE

     CONTROL         "",IDC_PANELSPLITTER,"Static",SS_ENHMETAFILE,0,32,252,1,WS_EX_TRANSPARENT

 END

diff --git a/plugins/TabSRMM/res/msgwindow.rc b/plugins/TabSRMM/res/msgwindow.rc
index c7a2b02293..276a330b43 100644
--- a/plugins/TabSRMM/res/msgwindow.rc
+++ b/plugins/TabSRMM/res/msgwindow.rc
@@ -35,7 +35,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg", 0, 0, 0x1

 BEGIN

     CONTROL         "",IDC_SPLITTER,"Static",SS_ENHMETAFILE,0,46,187,1

-    CONTROL         "",IDC_MESSAGE,"RichEdit20W",ES_MULTILINE | 

+    CONTROL         "",IDC_MESSAGE,"RichEdit50W",ES_MULTILINE | 

                     ES_AUTOVSCROLL | ES_NOHIDESEL | ES_WANTRETURN | 

                     WS_VSCROLL | WS_TABSTOP,0,48,144,31,WS_EX_ACCEPTFILES | 

                     WS_EX_STATICEDGE

@@ -46,7 +46,7 @@ BEGIN
     CONTROL		   	"&Send",IDC_MSGSENDLATER,"MButtonClass",WS_TABSTOP,146,10,55,12,0x18000000L

     CONTROL         "",IDC_STATICTEXT,"Static",SS_OWNERDRAW | WS_GROUP,27,0,160,9

     CONTROL         "",IDC_STATICERRORICON,"Static",SS_OWNERDRAW,4,3,20,20

-    CONTROL         "",IDC_LOG,"RichEdit20W",ES_MULTILINE | ES_AUTOVSCROLL | ES_NOHIDESEL | ES_READONLY | WS_VSCROLL | WS_TABSTOP,0,0,188,30,WS_EX_STATICEDGE

+    CONTROL         "",IDC_LOG,"RichEdit50W",ES_MULTILINE | ES_AUTOVSCROLL | ES_NOHIDESEL | ES_READONLY | WS_VSCROLL | WS_TABSTOP,0,0,188,30,WS_EX_STATICEDGE

     CONTROL         "&Add",IDC_ADD,"MButtonClass",WS_TABSTOP,155,64,16,14,0x18000000L

     CONTROL         "&Remove",IDC_CANCELADD,"MButtonClass",WS_TABSTOP,171,64,16,14,0x18000000L

     CONTROL         "",IDC_LOGFROZENTEXT,"Static",SS_OWNERDRAW | WS_GROUP,10,3,188,18

diff --git a/plugins/TabSRMM/res/resource.rc b/plugins/TabSRMM/res/resource.rc
index b5354fda07..a8310a679b 100644
--- a/plugins/TabSRMM/res/resource.rc
+++ b/plugins/TabSRMM/res/resource.rc
@@ -463,7 +463,7 @@ BEGIN
     GROUPBOX        "Templates",IDC_STATIC,3,4,108,94

     LISTBOX         IDC_TEMPLATELIST,8,14,97,81,LBS_OWNERDRAWVARIABLE | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP

     GROUPBOX        "Preview",IDC_STATIC,117,4,249,94

-    CONTROL         "",IDC_PREVIEW,"RichEdit20W",WS_VSCROLL | WS_TABSTOP | 0x844,122,14,236,80

+    CONTROL         "",IDC_PREVIEW,"RichEdit50W",WS_VSCROLL | WS_TABSTOP | 0x844,122,14,236,80

     GROUPBOX        "Edit template",IDC_STATIC,3,99,363,129

     EDITTEXT        IDC_EDITTEMPLATE,11,109,344,14,ES_AUTOHSCROLL

     LTEXT           "Double click a template to edit it. Select a template from the list box and click ""Update Preview"" to show a preview message.",IDC_STATIC,11,126,342,26

@@ -622,7 +622,7 @@ BEGIN
     LTEXT           "",IDC_STATIC,0,0,298,76

     CONTROL         "Do not show this message again",IDC_DONTSHOWAGAIN,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,77,277,11

-    CONTROL         "",IDC_WARNTEXT,"RichEdit20W",WS_VSCROLL | 0x1944,36,23,250,51

+    CONTROL         "",IDC_WARNTEXT,"RichEdit50W",WS_VSCROLL | 0x1944,36,23,250,51

     ICON            "",IDC_WARNICON,6,8,24,24,SS_CENTERIMAGE

     LTEXT           "Static",IDC_CAPTION,36,5,252,16

     DEFPUSHBUTTON   "OK",IDOK,245,88,50,14

diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp
index 69e39b5029..663a4383a0 100644
--- a/plugins/TabSRMM/src/msgdialog.cpp
+++ b/plugins/TabSRMM/src/msgdialog.cpp
@@ -1420,7 +1420,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 			SendMessage(hwndContainer, DM_QUERYCLIENTAREA, 0, (LPARAM)&rc);

 

 			WNDCLASS wndClass = { 0 };

-			GetClassInfo(g_hInst, _T("RichEdit20W"), &wndClass);

+			GetClassInfo(g_hInst, _T("RICHEDIT50W"), &wndClass);

 			mir_subclassWindowFull(GetDlgItem(hwndDlg, IDC_LOG), MessageLogSubclassProc, wndClass.lpfnWndProc);

 

 			SetWindowPos(hwndDlg, 0, rc.left, rc.top, (rc.right - rc.left), (rc.bottom - rc.top), newData->iActivate ? 0 : SWP_NOZORDER | SWP_NOACTIVATE);

diff --git a/plugins/TabSRMM/src/msgs.cpp b/plugins/TabSRMM/src/msgs.cpp
index d354ce1922..bb6f28db47 100644
--- a/plugins/TabSRMM/src/msgs.cpp
+++ b/plugins/TabSRMM/src/msgs.cpp
@@ -337,7 +337,9 @@ int SplitmsgShutdown(void)
 	DestroyCursor(PluginConfig.hCurSplitNS);
 	DestroyCursor(PluginConfig.hCurHyperlinkHand);
 	DestroyCursor(PluginConfig.hCurSplitWE);
-	FreeLibrary(GetModuleHandleA("riched20"));
+
+	FreeLibrary(GetModuleHandleA("Msftedit.dll"));
+
 	if (g_hIconDLL) {
 		FreeLibrary(g_hIconDLL);
 		g_hIconDLL = NULL;
@@ -433,7 +435,7 @@ int LoadSendRecvMessageModule(void)
 	icex.dwICC = ICC_COOL_CLASSES | ICC_BAR_CLASSES | ICC_LISTVIEW_CLASSES;
 	InitCommonControlsEx(&icex);
 
-	Utils::loadSystemLibrary(L"\\riched20.dll");
+	Utils::loadSystemLibrary(L"\\Msftedit.dll");
 
 	OleInitialize(NULL);
 	mREOLECallback = new REOLECallback;
diff --git a/plugins/UserInfoEx/res/resource.rc b/plugins/UserInfoEx/res/resource.rc
index ab13d35ea1..a4a139ad5a 100644
--- a/plugins/UserInfoEx/res/resource.rc
+++ b/plugins/UserInfoEx/res/resource.rc
@@ -133,7 +133,7 @@ IDD_CONTACT_ABOUT DIALOGEX 0, 0, 300, 170
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

 FONT 8, "MS Shell Dlg", 400, 0, 0x1

 BEGIN

-    CONTROL         "",EDIT_ABOUT,"RichEdit20W",WS_VSCROLL | WS_TABSTOP | 0x1044,2,0,295,166,WS_EX_STATICEDGE

+    CONTROL         "",EDIT_ABOUT,"RichEdit50W",WS_VSCROLL | WS_TABSTOP | 0x1044,2,0,295,166,WS_EX_STATICEDGE

 END

 

 IDD_ADDPHONE DIALOGEX 0, 0, 242, 150

diff --git a/plugins/Weather/res/resource.rc b/plugins/Weather/res/resource.rc
index b8d8cd89b1..93a05e4515 100644
--- a/plugins/Weather/res/resource.rc
+++ b/plugins/Weather/res/resource.rc
@@ -30,7 +30,7 @@ EXSTYLE WS_EX_WINDOWEDGE | WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 0, 0, 0x1

 BEGIN

     CONTROL         "",IDC_HEADERBAR,"MHeaderbarCtrl",0x0,0,0,245,25

-    CONTROL         "",IDC_MTEXT,"RichEdit20W",NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | 0x804,0,25,244,180,WS_EX_STATICEDGE

+    CONTROL         "",IDC_MTEXT,"RichEdit50W",NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | 0x804,0,25,244,180,WS_EX_STATICEDGE

     CONTROL         "List1",IDC_DATALIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_TABSTOP,0,25,244,180,WS_EX_STATICEDGE

     PUSHBUTTON      "Update",IDC_MUPDATE,10,213,48,13

     PUSHBUTTON      "Brief Info",IDC_MTOGGLE,79,213,48,13

diff --git a/plugins/WebView/res/webview.rc b/plugins/WebView/res/webview.rc
index 578fc07c9c..e0e3e37390 100644
--- a/plugins/WebView/res/webview.rc
+++ b/plugins/WebView/res/webview.rc
@@ -131,20 +131,10 @@ CONTROL         "",IDC_FIND_BUTTON,"MButtonClass",WS_TABSTOP,45,1,16,14
 CONTROL         "",IDC_OPTIONS_BUTTON,"MButtonClass",WS_TABSTOP,65,1,16,14

 CONTROL         "",IDC_ALERT_BUTTON ,"MButtonClass",WS_TABSTOP,85,1,16,14

 CONTROL         "",IDC_STOP ,"MButtonClass",WS_TABSTOP,105,1,16,14

-//LTEXT  "",IDC_HIDDEN_URL,1,17,381,1,SS_NOPREFIX | NOT WS_VISIBLE

 CONTROL         "",IDC_OPEN_URL ,"MButtonClass",WS_TABSTOP,1,19,212,8

-#ifdef UNI

-CONTROL         "",IDC_DATA,"RichEdit20W", ES_LEFT | ES_MULTILINE | ES_WANTRETURN | WS_CHILD | WS_VISIBLE | WS_VSCROLL, 1, 28, 209, 110

-//CONTROL         "",IDC_DATA,"RichEdit20W", ES_LEFT | ES_MULTILINE | ES_WANTRETURN | WS_CHILD | WS_VISIBLE | WS_VSCROLL | ES_OEMCONVERT, 100, 128, 120, 11

-#endif

-#ifndef UNI

-CONTROL         "",IDC_DATA,"RichEdit20A", ES_LEFT | ES_MULTILINE | ES_WANTRETURN | WS_CHILD | WS_VISIBLE | WS_VSCROLL, 1, 28, 209, 110

-#endif

+CONTROL         "",IDC_DATA,"RichEdit50W", ES_LEFT | ES_MULTILINE | ES_WANTRETURN | WS_CHILD | WS_VISIBLE | WS_VSCROLL, 1, 28, 209, 110

 CONTROL         "", IDC_STATUSBAR, "msctls_statusbar32", SBARS_SIZEGRIP | WS_CHILD | WS_VISIBLE, 128, 4, 60, 12

 

-

-

-

 END

 

 

diff --git a/plugins/WebView/src/main.cpp b/plugins/WebView/src/main.cpp
index 0778402772..56426a95e4 100644
--- a/plugins/WebView/src/main.cpp
+++ b/plugins/WebView/src/main.cpp
@@ -157,7 +157,7 @@ extern "C" int __declspec(dllexport) Load()
 	HookEvent(ME_CLIST_DOUBLECLICKED, Doubleclick);

    

 	hMenu = LoadMenu(hInst, MAKEINTRESOURCE(IDR_CONTEXT));

-	hRichEd = LoadLibrary(_T("Riched20.dll"));

+	hRichEd = LoadLibrary(_T("Msftedit.dll"));

 

 	/*TIMERS*/

 	if ((db_get_dw(NULL, MODULENAME, REFRESH_KEY, TIME) != 0)) {  

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);

diff --git a/protocols/AimOscar/res/aim.rc b/protocols/AimOscar/res/aim.rc
index 125fba9787..7668313f80 100644
--- a/protocols/AimOscar/res/aim.rc
+++ b/protocols/AimOscar/res/aim.rc
@@ -93,7 +93,7 @@ EXSTYLE WS_EX_CONTROLPARENT | WS_EX_APPWINDOW
 FONT 8, "MS Shell Dlg", 0, 0, 0x0

 BEGIN

     PUSHBUTTON      "Save Profile",IDC_SETPROFILE,157,4,60,30,WS_DISABLED

-    CONTROL         "",IDC_PROFILE,"RichEdit20W",ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_NOHIDESEL | ES_WANTRETURN | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,4,36,213,112

+    CONTROL         "",IDC_PROFILE,"RichEdit50W",ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_NOHIDESEL | ES_WANTRETURN | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,4,36,213,112

     CONTROL         "",IDC_BOLD,"Button",BS_OWNERDRAW,4,4,16,14,WS_EX_RIGHT

     CONTROL         "",IDC_ITALIC,"Button",BS_OWNERDRAW,20,4,16,14,WS_EX_RIGHT

     CONTROL         "",IDC_UNDERLINE,"Button",BS_OWNERDRAW,36,4,16,14,WS_EX_RIGHT

diff --git a/protocols/JabberG/res/jabber.rc b/protocols/JabberG/res/jabber.rc
index 442cd0d29e..6afc1ce9f9 100644
--- a/protocols/JabberG/res/jabber.rc
+++ b/protocols/JabberG/res/jabber.rc
@@ -696,7 +696,7 @@ EXSTYLE WS_EX_CONTROLPARENT
 CAPTION "XML Console"

 FONT 8, "MS Shell Dlg", 0, 0, 0x1

 BEGIN

-    CONTROL         "",IDC_CONSOLE,"RichEdit20A",ES_MULTILINE | ES_READONLY | WS_BORDER | WS_VSCROLL | WS_TABSTOP,5,5,343,137

+    CONTROL         "",IDC_CONSOLE,"RichEdit50W",ES_MULTILINE | ES_READONLY | WS_BORDER | WS_VSCROLL | WS_TABSTOP,5,5,343,137

     CONTROL         "Custom1",IDC_BTN_MSG,"MButtonClass",WS_TABSTOP,5,147,16,14

     CONTROL         "Custom1",IDC_BTN_PRESENCE,"MButtonClass",WS_TABSTOP,21,147,16,14

     CONTROL         "Custom1",IDC_BTN_IQ,"MButtonClass",WS_TABSTOP,37,147,16,14

diff --git a/protocols/JabberG/src/jabber_console.cpp b/protocols/JabberG/src/jabber_console.cpp
index 84be1ee556..cfacaf7996 100644
--- a/protocols/JabberG/src/jabber_console.cpp
+++ b/protocols/JabberG/src/jabber_console.cpp
@@ -619,7 +619,7 @@ void __cdecl CJabberProto::ConsoleThread(void*)
 

 void CJabberProto::ConsoleInit()

 {

-	LoadLibraryA("riched20.dll");

+	LoadLibraryA("Msftedit.dll");

 	m_hThreadConsole = ForkThreadEx(&CJabberProto::ConsoleThread, 0, &m_dwConsoleThreadId);

 }

 

diff --git a/src/core/stdchat/res/chat.rc b/src/core/stdchat/res/chat.rc
index 469fe8dc7e..1465655e61 100644
--- a/src/core/stdchat/res/chat.rc
+++ b/src/core/stdchat/res/chat.rc
@@ -33,7 +33,7 @@ STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX |
 	WS_THICKFRAME

 FONT 8, "MS Shell Dlg", 0, 0, 0x1

 BEGIN

-    CONTROL         "",IDC_MESSAGE,RICHEDIT_CLASS,ES_MULTILINE | 

+    CONTROL         "",IDC_MESSAGE,"RichEdit50W",ES_MULTILINE | 

 					ES_AUTOVSCROLL | ES_NOHIDESEL | ES_WANTRETURN | 

 					ES_NUMBER | WS_VSCROLL | WS_TABSTOP,0,128,127,12,

 					WS_EX_STATICEDGE

@@ -48,7 +48,7 @@ BEGIN
     CONTROL         "&Filter",IDC_FILTER,"MButtonClass",WS_TABSTOP,220,108,15,13,0x18000000L

     CONTROL         "&Room settings",IDC_CHANMGR,"MButtonClass",WS_DISABLED | WS_TABSTOP,204,108,15,13,0x18000000L

     CONTROL         "&Show/Hide nick list",IDC_SHOWNICKLIST,"MButtonClass",WS_TABSTOP,236,108,15,13,0x18000000L

-    CONTROL         "",IDC_LOG,RICHEDIT_CLASS,ES_MULTILINE | ES_AUTOVSCROLL | 

+    CONTROL         "",IDC_LOG,"RichEdit50W",ES_MULTILINE | ES_AUTOVSCROLL | 

                     ES_READONLY | ES_NUMBER | WS_VSCROLL | WS_TABSTOP,8,23,

                     164,73,WS_EX_STATICEDGE

     CONTROL         "",IDC_SPLITTERX,"Static",SS_ENHMETAFILE,172,23,10,73

diff --git a/src/core/stdmsg/res/resource.rc b/src/core/stdmsg/res/resource.rc
index 13d84479cf..c8de828cc9 100644
--- a/src/core/stdmsg/res/resource.rc
+++ b/src/core/stdmsg/res/resource.rc
@@ -74,7 +74,7 @@ BEGIN
     LTEXT           "An error has occurred. The protocol reported the following error:",IDC_STATIC,5,4,177,20

     EDITTEXT        IDC_ERRORTEXT,5,24,177,21,ES_MULTILINE | ES_READONLY

     LTEXT           "while sending the following message:",IDC_STATIC,6,48,175,8

-    CONTROL         "",IDC_MSGTEXT,RICHEDIT_CLASS,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CLIPSIBLINGS | WS_VSCROLL | WS_TABSTOP,5,60,177,26,WS_EX_STATICEDGE

+    CONTROL         "",IDC_MSGTEXT,"RichEdit50W",ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CLIPSIBLINGS | WS_VSCROLL | WS_TABSTOP,5,60,177,26,WS_EX_STATICEDGE

     DEFPUSHBUTTON   "Try again",IDOK,22,91,63,14

     PUSHBUTTON      "Cancel",IDCANCEL,104,91,61,14

 END

@@ -91,10 +91,10 @@ BEGIN
     CONTROL         "&User menu",IDC_USERMENU,"MButtonClass",WS_TABSTOP,128,2,16,14,WS_EX_NOACTIVATE | 0x10000000L

     CONTROL         "&Details",IDC_DETAILS,"MButtonClass",WS_TABSTOP,146,2,16,14,WS_EX_NOACTIVATE | 0x10000000L

     CONTROL         "&History",IDC_HISTORY,"MButtonClass",WS_TABSTOP,164,2,16,14,WS_EX_NOACTIVATE | 0x10000000L

-    CONTROL         "",IDC_MESSAGE,RICHEDIT_CLASS,ES_MULTILINE | ES_AUTOVSCROLL | ES_NOHIDESEL | ES_WANTRETURN | WS_VSCROLL | WS_TABSTOP,1,49,141,13,WS_EX_ACCEPTFILES | WS_EX_STATICEDGE

+    CONTROL         "",IDC_MESSAGE,"RichEdit50W",ES_MULTILINE | ES_AUTOVSCROLL | ES_NOHIDESEL | ES_WANTRETURN | WS_VSCROLL | WS_TABSTOP,1,49,141,13,WS_EX_ACCEPTFILES | WS_EX_STATICEDGE

     DEFPUSHBUTTON   "&Send",IDOK,143,48,39,15

     PUSHBUTTON      "Close",IDCANCEL,129,0,54,15,NOT WS_VISIBLE

-    CONTROL         "",IDC_LOG,RICHEDIT_CLASS,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_TABSTOP,1,18,183,26,WS_EX_STATICEDGE

+    CONTROL         "",IDC_LOG,"RichEdit50W",ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_TABSTOP,1,18,183,26,WS_EX_STATICEDGE

     CONTROL         "",IDC_SPLITTER,"Static",SS_ENHMETAFILE,0,45,183,2

     CONTROL         "",IDC_AVATAR,"Button",BS_OWNERDRAW | NOT WS_VISIBLE,1,50,1,13

 END

diff --git a/src/core/stdmsg/src/msgs.cpp b/src/core/stdmsg/src/msgs.cpp
index ac00e00bac..3b9a1e2184 100644
--- a/src/core/stdmsg/src/msgs.cpp
+++ b/src/core/stdmsg/src/msgs.cpp
@@ -378,11 +378,11 @@ static INT_PTR GetWindowData(WPARAM wParam, LPARAM lParam)
 	return 0;

 }

 

-static TCHAR tszError[] = LPGENT("Miranda could not load the built-in message module, riched20.dll is missing. Press 'Yes' to continue loading Miranda.");

+static TCHAR tszError[] = LPGENT("Miranda could not load the built-in message module, Msftedit.dll is missing. Press 'Yes' to continue loading Miranda.");

 

 int LoadSendRecvMessageModule(void)

 {

-	if (LoadLibraryA("riched20.dll") == NULL) {

+	if (LoadLibraryA("Msftedit.dll") == NULL) {

 		if (IDYES != MessageBox(0, TranslateTS(tszError), TranslateT("Information"), MB_YESNO | MB_ICONINFORMATION))

 			return 1;

 		return 0;

@@ -444,7 +444,7 @@ int SplitmsgShutdown(void)
 	DestroyHookableEvent(hHookWinWrite);

 

 	FreeMsgLogIcons();

-	FreeLibrary(GetModuleHandleA("riched20"));

+	FreeLibrary(GetModuleHandleA("Msftedit"));

 	OleUninitialize();

 	RichUtil_Unload();

 	msgQueue_destroy();

diff --git a/src/resource.rc b/src/resource.rc
index 4b20f3b4d0..32aeba4aeb 100644
--- a/src/resource.rc
+++ b/src/resource.rc
@@ -730,7 +730,7 @@ BEGIN
     EDITTEXT        IDC_TXT_MULTILINE,6,6,230,12,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | NOT WS_VISIBLE | WS_VSCROLL

     EDITTEXT        IDC_TXT_PASSWORD,6,6,230,12,ES_PASSWORD | ES_AUTOHSCROLL | NOT WS_VISIBLE

     COMBOBOX        IDC_TXT_COMBO,6,6,230,92,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP

-    CONTROL         "",IDC_TXT_RICHEDIT,"RichEdit20W",NOT WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_TABSTOP | 0x1004,6,6,230,12

+    CONTROL         "",IDC_TXT_RICHEDIT,"RichEdit50W",NOT WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_TABSTOP | 0x1004,6,6,230,12

     DEFPUSHBUTTON   "OK",IDOK,131,23,50,14

     PUSHBUTTON      "Cancel",IDCANCEL,186,23,50,14

 END