diff --git a/dll/cpl/sysdm/licence.c b/dll/cpl/sysdm/licence.c index d8461bf4422..6894fd6598d 100644 --- a/dll/cpl/sysdm/licence.c +++ b/dll/cpl/sysdm/licence.c @@ -20,7 +20,7 @@ OnInitDialog(HWND hDlg, PLIC_CONTEXT pLicInfo) { HRSRC hResInfo; HGLOBAL hResMem; - WCHAR *LicenseText; + PCSTR LicenseText; pLicInfo->hIcon = LoadImage(hApplet, MAKEINTRESOURCE(IDI_CPLSYSTEM), @@ -45,10 +45,10 @@ OnInitDialog(HWND hDlg, PLIC_CONTEXT pLicInfo) return FALSE; } - /* Insert the license into the edit control (unicode!) */ - SetDlgItemText(hDlg, - IDC_LICENCEEDIT, - LicenseText); + /* Insert the license into the edit control */ + SetDlgItemTextA(hDlg, + IDC_LICENCEEDIT, + LicenseText); PostMessage(GetDlgItem(hDlg, IDC_LICENCEEDIT), EM_SETSEL, diff --git a/dll/cpl/sysdm/resources/.gitattributes b/dll/cpl/sysdm/resources/.gitattributes new file mode 100644 index 00000000000..4d51a75d04d --- /dev/null +++ b/dll/cpl/sysdm/resources/.gitattributes @@ -0,0 +1,2 @@ +# This text file is included in the binary output +gpl.txt text eol=crlf diff --git a/dll/cpl/sysdm/resources/gpl.txt b/dll/cpl/sysdm/resources/gpl.txt index 9f46aed4df5..d511905c164 100644 Binary files a/dll/cpl/sysdm/resources/gpl.txt and b/dll/cpl/sysdm/resources/gpl.txt differ