From 52892d7e6db5b6dd59f6f4f59b3e61e66cd81f82 Mon Sep 17 00:00:00 2001 From: kichik Date: Tue, 3 Sep 2002 11:25:47 +0000 Subject: [PATCH] Now always loads RichEdit2 if present git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@884 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/UIs/UI Holder/resource.h | 1 + Contrib/UIs/UI Holder/resource.rc | 4 +++- Contrib/UIs/default.exe | Bin 5632 -> 5632 bytes Contrib/UIs/modern.exe | Bin 6144 -> 6144 bytes Contrib/UIs/modern2.exe | Bin 6144 -> 6144 bytes Source/exehead/Ui.c | 14 ++++++++++++-- Source/exehead/resource.h | 1 + Source/exehead/resource.rc | 4 +++- 8 files changed, 20 insertions(+), 4 deletions(-) diff --git a/Contrib/UIs/UI Holder/resource.h b/Contrib/UIs/UI Holder/resource.h index e7b9d87a..4341d4da 100644 --- a/Contrib/UIs/UI Holder/resource.h +++ b/Contrib/UIs/UI Holder/resource.h @@ -28,6 +28,7 @@ #define IDC_CHECK1 1008 #define IDC_MJF 1008 #define IDC_VERSION 1009 +#define IDC_EDIT2 1010 #define IDC_DIRCAPTION 1011 #define IDC_STATUSTEXT 1014 #define IDC_LICTEXT 1015 diff --git a/Contrib/UIs/UI Holder/resource.rc b/Contrib/UIs/UI Holder/resource.rc index a4523b9a..ca322365 100644 --- a/Contrib/UIs/UI Holder/resource.rc +++ b/Contrib/UIs/UI Holder/resource.rc @@ -59,7 +59,9 @@ BEGIN ICON IDI_ICON2,IDC_ULICON,0,0,20,20 LTEXT "",IDC_INTROTEXT,25,0,241,23 CONTROL "",IDC_EDIT1,"RICHEDIT",ES_MULTILINE | ES_READONLY | - WS_BORDER | WS_VSCROLL,0,24,266,105 + WS_BORDER | WS_VSCROLL | NOT WS_VISIBLE,0,24,266,105 + CONTROL "",IDC_EDIT2,"RichEdit20A",ES_MULTILINE | ES_READONLY | + WS_BORDER | WS_VSCROLL | NOT WS_VISIBLE,0,24,266,105 END IDD_DIR DIALOG DISCARDABLE 0, 0, 266, 130 diff --git a/Contrib/UIs/default.exe b/Contrib/UIs/default.exe index 5fb8dae82af80fb77b4815a4a5df0d27c15bf374..5dd5f413091dd8d2c992e41722c56eaafe1d00a2 100755 GIT binary patch delta 532 zcmYjMO-LI-7=1H|F^z>ZTEv4=0)hlQ#2!RUEwM?AB0@|o?WuIx9g>B0mu@B`o{UI) z&N_&Ak(?CmK`@6s`Ujy$^;8f%^;!z0w_Z9iDapX_=KXy0W~!6b$=WOO-I+_oKgYlQ zxC|e<|96a@yVsBW$i0zx7y0WpCGOHa_d=p?qW*|kT`ja`obZTq#1o4SmQYN*=5J6^pP*n(-A&D;aE2 zF*SqD1FxxwJ{jGN(Ht|i6`4}?500w(_B?&xqZM;tb(>;D| z0XXdOXVO5{2@i>C&@T$lXT?=;ip0gA;CRIAugBZT5d?^i-<~XVs3;%>O`bSjA`1Dn JM(Ejj-#@`mnjQcE delta 520 zcmZqBY0#Nq!+2q$t#hTs#RF*`shUZVKzhEtH<%8} zOwIu5VL$@`t_%!5j4TY>vQsBMZe&VepIpe~J$WOeIwSYwn~dd*37Z3%)-z5t;Ml~% z%EW4XAnuUBW5`N^rp#SChU?x`id`6;D2sUC@WDLJW* z3=D@DCmV3e)Qd0$r{<;j0#zlZgM{ON{F3m@yp;U%kkpD2phy-|a7KPPM2LYQ8X+H$ zU(CS3#T1-el$x3slJA_8nVMI^zz_qn45B67wY=$JC;KsnP3`w5Doq-`} lqN4ER27V4k=E;Eq`jdC?TQdes{=%=a*+XCl>*NMT0{|OyiMRj& diff --git a/Contrib/UIs/modern.exe b/Contrib/UIs/modern.exe index 045227a29b151083cf4b892a88bb82d38f5827b2..973d30ebe5d37346b5cee79e15116339681ef65b 100644 GIT binary patch delta 210 zcmZoLXfW82!pKy>F}aY*d-6uc`HTgd1DSU7)SqBL00$=q1_?$4Kf;-T!2pTh;ljX> zgT(*h%D^Cl#20X9VCX?;XP5)zUqRwKupDpzaaq7(I*dTIle_s{7#${G;8)RP;aC8c qWnkcE&|yqv_{1EiyFgP+WY<|oCm>mFk=^l0f delta 172 zcmZoLXfW82!pP*nF}aY*d-6uc`HT*m1DSU7)X!i*00Ack1_?$4U&EP!!2pRL;ljX> zgTz1L%D^Cl#DCz%z|e!x&XD8Iz;FeL@4#}v0mNkni|H@|)lTl_cVP^ee1TtOvx>kS J_Q?&51^_N%7w-T7 diff --git a/Contrib/UIs/modern2.exe b/Contrib/UIs/modern2.exe index dabd7614dd03ddc9b2a7939a46152f22d67f710f..940baa521a94e5f9327b416e94286be57faea2df 100644 GIT binary patch delta 210 zcmZoLXfW82!pKy>F}aY*d-6uc`HTgd1DSU7)SqBL00$=q1_?$4Kf;-T!2pTh;ljX> zgT(*h%D^Cl#20X9VCX?;XP5)zUqRwKupDpzaaq7(I*dTIle_s{7#${G;8)RP;aC8c qWnkcE&|yqv_{1EiyFgP+WY<|oCm>mFk=^l0f delta 172 zcmZoLXfW82!pP*nF}aY*d-6uc`HT*m1DSU7)X!i*00Ack1_?$4U&EP!!2pRL;ljX> zgTz1L%D^Cl#DCz%z|e!x&XD8Iz;FeL@4#}v0mNkni|H@|)lTl_cVP^ee1TtOvx>kS J_Q?&51^_N%7w-T7 diff --git a/Source/exehead/Ui.c b/Source/exehead/Ui.c index c14c9086..e7506345 100644 --- a/Source/exehead/Ui.c +++ b/Source/exehead/Ui.c @@ -645,12 +645,22 @@ DWORD CALLBACK StreamLicense(DWORD dwCookie, LPBYTE pbBuff, LONG cb, LONG *pcb) static BOOL CALLBACK LicenseProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { static HWND hwLicense; - static HINSTANCE hRichEditDLL; + static HINSTANCE hRichEditDLL, hRichEdit2DLL; + static int new_richedit; + if (!hRichEdit2DLL) hRichEdit2DLL=LoadLibrary("RichEd20.dll"); if (!hRichEditDLL) hRichEditDLL=LoadLibrary("RichEd32.dll"); + if (!hRichEdit2DLL) { + // fake richedit2 + WNDCLASS phony_richedit2 = {0,}; + phony_richedit2.lpszClassName = "RichEdit20A"; + RegisterClass(&phony_richedit2); + } + else new_richedit=10; // edit2 is 1010 while edit1 is 1000 if (uMsg == WM_INITDIALOG) { EDITSTREAM es={(DWORD)STR(LANG_LICENSE_DATA),0,StreamLicense}; - hwLicense=GetDlgItem(hwndDlg,IDC_EDIT1); + hwLicense=GetDlgItem(hwndDlg,IDC_EDIT1+new_richedit); + ShowWindow(hwLicense, SW_SHOW); SendMessage(hwLicense,EM_AUTOURLDETECT,TRUE,0); SendMessage(hwLicense,EM_SETBKGNDCOLOR,0,g_inst_header->license_bg>=0?g_inst_header->license_bg:GetSysColor(COLOR_BTNFACE)); SendMessage(hwLicense,EM_SETEVENTMASK,0,ENM_LINK); diff --git a/Source/exehead/resource.h b/Source/exehead/resource.h index e7b9d87a..4341d4da 100644 --- a/Source/exehead/resource.h +++ b/Source/exehead/resource.h @@ -28,6 +28,7 @@ #define IDC_CHECK1 1008 #define IDC_MJF 1008 #define IDC_VERSION 1009 +#define IDC_EDIT2 1010 #define IDC_DIRCAPTION 1011 #define IDC_STATUSTEXT 1014 #define IDC_LICTEXT 1015 diff --git a/Source/exehead/resource.rc b/Source/exehead/resource.rc index 4e1098d2..b49e7e29 100644 --- a/Source/exehead/resource.rc +++ b/Source/exehead/resource.rc @@ -38,7 +38,9 @@ BEGIN ICON IDI_ICON2,IDC_ULICON,0,0,20,20 LTEXT "",IDC_INTROTEXT,25,0,241,23 CONTROL "",IDC_EDIT1,"RICHEDIT",ES_MULTILINE | ES_READONLY | - WS_BORDER | WS_VSCROLL,0,24,266,105 + WS_BORDER | WS_VSCROLL | NOT WS_VISIBLE,0,24,266,105 + CONTROL "",IDC_EDIT2,"RichEdit20A",ES_MULTILINE | ES_READONLY | + WS_BORDER | WS_VSCROLL | NOT WS_VISIBLE,0,24,266,105 END #endif