dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Jim Park's Unicode NSIS merging - Step 1 : switch to TCHARs where relevant.

Browse source 
Compiler output is identical before & after this step

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/branches/wizou@6036 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
wizou 2010-03-24 17:22:56 +00:00
parent 4e48722b63
commit 752d7d239a
209 changed files with 9698 additions and 7658 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Contrib/UIs/default.rc
View file

@ -8,7 +8,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
ICON IDI_ICON2,IDC_ULICON,0,0,22,20
LTEXT "",IDC_INTROTEXT,25,0,241,23
CONTROL "",IDC_EDIT1,"RichEdit20A",WS_BORDER | WS_VSCROLL |
CONTROL "",IDC_EDIT1,RICHEDIT_CLASS,WS_BORDER | WS_VSCROLL |
WS_TABSTOP | 0x804,0,24,266,105
END
@ -18,7 +18,7 @@ FONT 8, "MS Shell Dlg"
BEGIN
ICON IDI_ICON2,IDC_ULICON,0,0,22,20
LTEXT "",IDC_INTROTEXT,25,0,241,23
CONTROL "",IDC_EDIT1,"RichEdit20A",WS_BORDER | WS_VSCROLL |
CONTROL "",IDC_EDIT1,RICHEDIT_CLASS,WS_BORDER | WS_VSCROLL |
WS_TABSTOP | 0x804,0,24,266,85
CONTROL "",IDC_LICENSEAGREE,"Button",BS_AUTORADIOBUTTON |
WS_TABSTOP,0,110,266,9
@ -32,7 +32,7 @@ FONT 8, "MS Shell Dlg"
BEGIN
ICON IDI_ICON2,IDC_ULICON,0,0,22,20
LTEXT "",IDC_INTROTEXT,25,0,241,23
CONTROL "",IDC_EDIT1,"RichEdit20A",WS_BORDER | WS_VSCROLL |
CONTROL "",IDC_EDIT1,RICHEDIT_CLASS,WS_BORDER | WS_VSCROLL |
WS_TABSTOP | 0x804,0,24,266,95
CONTROL "",IDC_LICENSEAGREE,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,0,120,266,9

6
Contrib/UIs/modern.rc
View file

@ -7,7 +7,7 @@ STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_CAPTION
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
LTEXT "",1040,0,0,300,15,NOT WS_GROUP
CONTROL "",IDC_EDIT1,"RichEdit20A",WS_BORDER | WS_VSCROLL |
CONTROL "",IDC_EDIT1,RICHEDIT_CLASS,WS_BORDER | WS_VSCROLL |
WS_TABSTOP | 0x804,0,15,300,93
LTEXT "",IDC_INTROTEXT,0,113,300,26,NOT WS_GROUP
END
@ -98,7 +98,7 @@ STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_CAPTION
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
LTEXT "",1040,0,0,300,15,NOT WS_GROUP
CONTROL "",IDC_EDIT1,"RichEdit20A",WS_BORDER | WS_VSCROLL |
CONTROL "",IDC_EDIT1,RICHEDIT_CLASS,WS_BORDER | WS_VSCROLL |
WS_TABSTOP | 0x804,0,15,300,73
LTEXT "",IDC_INTROTEXT,0,93,300,26,NOT WS_GROUP
CONTROL "",IDC_LICENSEAGREE,"Button",BS_AUTORADIOBUTTON |
@ -112,7 +112,7 @@ STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_CAPTION
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
LTEXT "",1040,0,0,300,15,NOT WS_GROUP
CONTROL "",IDC_EDIT1,"RichEdit20A",WS_BORDER | WS_VSCROLL |
CONTROL "",IDC_EDIT1,RICHEDIT_CLASS,WS_BORDER | WS_VSCROLL |
WS_TABSTOP | 0x804,0,15,300,83
LTEXT "",IDC_INTROTEXT,0,103,300,26,NOT WS_GROUP
CONTROL "",IDC_LICENSEAGREE,"Button",BS_AUTOCHECKBOX |

1
Contrib/UIs/resource.h
View file

@ -1,4 +1,5 @@
#include <windows.h>
#include <richedit.h>
#ifndef IDC_STATIC
#define IDC_STATIC (-1)

6
Contrib/UIs/sdbarker_tiny.rc
View file

@ -8,7 +8,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
ICON 103,IDC_ULICON,0,0,20,20
LTEXT "",IDC_INTROTEXT,25,0,241,23,NOT WS_GROUP
CONTROL "",IDC_EDIT1,"RichEdit20A",WS_BORDER | WS_VSCROLL |
CONTROL "",IDC_EDIT1,RICHEDIT_CLASS,WS_BORDER | WS_VSCROLL |
WS_TABSTOP | 0x804,0,24,266,47
END
@ -91,7 +91,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
ICON 103,IDC_ULICON,0,0,20,20
LTEXT "",IDC_INTROTEXT,25,0,241,23,NOT WS_GROUP
CONTROL "",IDC_EDIT1,"RichEdit20A",WS_BORDER | WS_VSCROLL |
CONTROL "",IDC_EDIT1,RICHEDIT_CLASS,WS_BORDER | WS_VSCROLL |
WS_TABSTOP | 0x804,0,24,266,27
CONTROL "",IDC_LICENSEAGREE,"Button",BS_AUTORADIOBUTTON |
WS_TABSTOP,0,50,266,9
@ -105,7 +105,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
ICON 103,IDC_ULICON,0,0,20,20
LTEXT "",IDC_INTROTEXT,25,0,241,23,NOT WS_GROUP
CONTROL "",IDC_EDIT1,"RichEdit20A",WS_BORDER | WS_VSCROLL |
CONTROL "",IDC_EDIT1,RICHEDIT_CLASS,WS_BORDER | WS_VSCROLL |
WS_TABSTOP | 0x804,0,24,266,37
CONTROL "",IDC_LICENSEAGREE,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,0,60,266,9

22
Contrib/UIs/ui.c
View file

@ -1,14 +1,16 @@
// ui.cpp : Defines the entry point for the application.
//
// Unicode support by Jim Park -- 08/10/2007
#include <windows.h>
#include <commctrl.h>
#include "../ExDLL/nsis_tchar.h"
#include "resource.h"
HINSTANCE g_hInstance;
HWND m_curwnd;
char* windows[] = {
TCHAR* windows[] = {
MAKEINTRESOURCE(IDD_LICENSE),
MAKEINTRESOURCE(IDD_SELCOM),
MAKEINTRESOURCE(IDD_DIR),
@ -34,11 +36,11 @@ BOOL CALLBACK DialogProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam) {
static int i = -1;
switch (uMsg) {
case WM_INITDIALOG:
SetWindowText(hwndDlg, "NSIS User Interface - Testing");
SetWindowText(GetDlgItem(hwndDlg, IDC_VERSTR), "NSIS version");
SetWindowText(GetDlgItem(hwndDlg, IDC_BACK), "< Back");
SetWindowText(GetDlgItem(hwndDlg, IDOK), "Next >");
SetWindowText(GetDlgItem(hwndDlg, IDCANCEL), "Cancel");
SetWindowText(hwndDlg, _T("NSIS User Interface - Testing"));
SetWindowText(GetDlgItem(hwndDlg, IDC_VERSTR), _T("NSIS version"));
SetWindowText(GetDlgItem(hwndDlg, IDC_BACK), _T("< Back"));
SetWindowText(GetDlgItem(hwndDlg, IDOK), _T("Next >"));
SetWindowText(GetDlgItem(hwndDlg, IDCANCEL), _T("Cancel"));
ShowWindow(GetDlgItem(hwndDlg, IDC_BACK), SW_SHOW);
ShowWindow(GetDlgItem(hwndDlg, IDC_CHILDRECT), SW_SHOW);
SendMessage(hwndDlg, WM_COMMAND, MAKEWORD(IDOK, 0), 0);
@ -53,7 +55,7 @@ BOOL CALLBACK DialogProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam) {
i++;
break;
}
if (i >= (int)sizeof(windows)/sizeof(char*)) {
if (i >= (int)sizeof(windows)/sizeof(TCHAR*)) {
i--;
break;
}
@ -78,14 +80,14 @@ BOOL CALLBACK DialogProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam) {
return 0;
}
int APIENTRY WinMain(HINSTANCE hInstance,
int APIENTRY _tWinMain(HINSTANCE hInstance,
HINSTANCE hPrevInstance,
LPSTR lpCmdLine,
LPTSTR lpCmdLine,
int nCmdShow)
{
InitCommonControls();
LoadLibrary("RichEd32.dll");
LoadLibrary(_T("RichEd32.dll"));
g_hInstance = GetModuleHandle(0);