reactos/reactos-deprecated-gitsvn-dont-use
1
0
Fork 0
mirror of https://github.com/reactos/reactos-deprecated-gitsvn-dont-use.git synced 2024-11-26 21:10:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[VGAFONTEDIT] Use the new header with SPDX license identifier and make the entire application GPL-2.0+

Browse Source 
The code of the single GPL-2.0 only file "misc.c" was originally derived from GPL-2.0 only devmgmt.
I have now replaced it with the same code from LGPL-2.1+ mmc, which makes my application a full GPL-2.0+ work. This is legit, because I know that Thomas Weidenmueller is the original author of the "misc.c" code.

git-svn-id: file:///srv/svn/reactos/trunk@75987 97493ccd-5924-5043-b1f5-66cb403b36ce
This commit is contained in:
cfinck 2017-09-29 13:58:14 +00:00
parent eed2c728d1
commit 11344d1deb
27 changed files with 86 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rosapps/applications/devutils/vgafontedit/aboutdlg.c
View File

@ -1,9 +1,8 @@
/*
* PROJECT: ReactOS VGA Font Editor
* LICENSE: GNU General Public License Version 2.0 or any later version
* FILE: devutils/vgafontedit/aboutdlg.c
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: About dialog
* COPYRIGHT: Copyright 2008 Colin Finck <mail@colinfinck.de>
* COPYRIGHT: Copyright 2008 Colin Finck (colin@reactos.org)
*/
#include "precomp.h"

5
rosapps/applications/devutils/vgafontedit/cpi.h
View File

@ -1,11 +1,10 @@
/*
* PROJECT: ReactOS VGA Font Editor
* LICENSE: GNU General Public License Version 2.0 or any later version
* FILE: devutils/vgafontedit/cpi.h
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: CPI (Code Page Information) MS-DOS-compatible Fonts
* We support only screen fonts, not printer fonts.
* No DR-DOS/Novell-DOS compressed font format support.
* COPYRIGHT: Copyright 2014 Hermes Belusca-Maito <hermes.belusca@sfr.fr>
* COPYRIGHT: Copyright 2014 Hermes Belusca-Maito (hermes.belusca@sfr.fr)
*/
#ifndef __CPI_H

5
rosapps/applications/devutils/vgafontedit/customwndclasses.h
View File

@ -1,9 +1,8 @@
/*
* PROJECT: ReactOS VGA Font Editor
* LICENSE: GNU General Public License Version 2.0 or any later version
* FILE: devutils/vgafontedit/customwndclasses.h
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: Header for custom defined window classes (needed by "precomp.h" and the resource files)
* COPYRIGHT: Copyright 2008 Colin Finck <mail@colinfinck.de>
* COPYRIGHT: Copyright 2008 Colin Finck (colin@reactos.org)
*/
#ifndef __CUSTOMWNDCLASSES_H

5
rosapps/applications/devutils/vgafontedit/editglyphdlg.c
View File

@ -1,9 +1,8 @@
/*
* PROJECT: ReactOS VGA Font Editor
* LICENSE: GNU General Public License Version 2.0 or any later version
* FILE: devutils/vgafontedit/editglyphdlg.c
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: Dialog for editing a glyph
* COPYRIGHT: Copyright 2008 Colin Finck <mail@colinfinck.de>
* COPYRIGHT: Copyright 2008 Colin Finck (colin@reactos.org)
*/
#include "precomp.h"

5
rosapps/applications/devutils/vgafontedit/fontboxeswnd.c
View File

@ -1,9 +1,8 @@
/*
* PROJECT: ReactOS VGA Font Editor
* LICENSE: GNU General Public License Version 2.0 or any later version
* FILE: devutils/vgafontedit/fontboxeswnd.c
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: Implements the window showing the character boxes for a font
* COPYRIGHT: Copyright 2008 Colin Finck <mail@colinfinck.de>
* COPYRIGHT: Copyright 2008 Colin Finck (colin@reactos.org)
*/
#include "precomp.h"

5
rosapps/applications/devutils/vgafontedit/fontwnd.c
View File

@ -1,9 +1,8 @@
/*
* PROJECT: ReactOS VGA Font Editor
* LICENSE: GNU General Public License Version 2.0 or any later version
* FILE: devutils/vgafontedit/fontwnd.c
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: Implements the MDI child window for a font
* COPYRIGHT: Copyright 2008 Colin Finck <mail@colinfinck.de>
* COPYRIGHT: Copyright 2008 Colin Finck (colin@reactos.org)
*/
#include "precomp.h"

5
rosapps/applications/devutils/vgafontedit/lang/bg-BG.rc
View File

@ -1,9 +1,8 @@
/*
* PROJECT: ReactOS VGA Font Editor
* LICENSE: GNU General Public License Version 2.0 or any later version
* FILE: devutils/vgafontedit/lang/en-US.rc
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: Bulgarian resource file
* COPYRIGHT: Copyright 2008 Colin Finck <mail@colinfinck.de>
* COPYRIGHT: Copyright 2008 Colin Finck (colin@reactos.org)
* TRANSLATOR: CCTAHEB
*/

5
rosapps/applications/devutils/vgafontedit/lang/de-DE.rc
View File

@ -1,9 +1,8 @@
/*
* PROJECT: ReactOS VGA Font Editor
* LICENSE: GNU General Public License Version 2.0 or any later version
* FILE: devutils/vgafontedit/lang/de-DE.rc
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: German resource file
* COPYRIGHT: Copyright 2008 Colin Finck <mail@colinfinck.de>
* COPYRIGHT: Copyright 2008 Colin Finck (colin@reactos.org)
* TRANSLATOR: Dark_Shadow@gmx.at
*/

5
rosapps/applications/devutils/vgafontedit/lang/en-US.rc
View File

@ -1,9 +1,8 @@
/*
* PROJECT: ReactOS VGA Font Editor
* LICENSE: GNU General Public License Version 2.0 or any later version
* FILE: devutils/vgafontedit/lang/en-US.rc
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: English resource file
* COPYRIGHT: Copyright 2008 Colin Finck <mail@colinfinck.de>
* COPYRIGHT: Copyright 2008 Colin Finck (colin@reactos.org)
* TRANSLATOR: Colin Finck
*/

9
rosapps/applications/devutils/vgafontedit/lang/es-ES.rc
View File

@ -1,10 +1,9 @@
/*
* PROJECT: ReactOS VGA Font Editor
* LICENSE: GNU General Public License Version 2.0 or any later version
* FILE: devutils/vgafontedit/lang/en-US.rc
* PURPOSE: English resource file
* COPYRIGHT: Copyright 2008 Colin Finck <mail@colinfinck.de>
* Traducido por: Javier Remacha 2008
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: Spanish resource file
* COPYRIGHT: Copyright 2008 Colin Finck (colin@reactos.org)
* TRANSLATOR: Javier Remacha
*/
LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL

7
rosapps/applications/devutils/vgafontedit/lang/fr-FR.rc
View File

@ -1,10 +1,9 @@
/*
* PROJECT: ReactOS VGA Font Editor
* LICENSE: GNU General Public License Version 2.0 or any later version
* FILE: devutils/vgafontedit/lang/fr-FR.rc
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: French resource file
* COPYRIGHT: Copyright 2008 Colin Finck <mail@colinfinck.de>
* TRANSLATOR: Pierre Schweitzer <heis_spiter@hotmail.com>
* COPYRIGHT: Copyright 2008 Colin Finck (colin@reactos.org)
* TRANSLATOR: Pierre Schweitzer (pierre@reactos.org)
*/
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL

9
rosapps/applications/devutils/vgafontedit/lang/it-IT.rc
View File

@ -1,10 +1,9 @@
/*
* PROJECT: ReactOS VGA Font Editor
* LICENSE: GNU General Public License Version 2.0 or any later version
* FILE: devutils/vgafontedit/lang/en-US.rc
* PURPOSE: English resource file
* COPYRIGHT: Copyright 2008 Colin Finck <mail@colinfinck.de>
* TRANSLATOR: Paolo Devoti
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: Dialog for editing a glyph
* COPYRIGHT: Copyright 2008 Colin Finck (colin@reactos.org)
* TRANSLATOR: Paolo Devoti
*/
LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL

9
rosapps/applications/devutils/vgafontedit/lang/no-NO.rc
View File

@ -1,10 +1,9 @@
/*
* PROJECT: ReactOS VGA Font Editor
* LICENSE: GNU General Public License Version 2.0 or any later version
* FILE: devutils/vgafontedit/lang/en-US.rc
* PURPOSE: English resource file
* COPYRIGHT: Copyright 2008 Colin Finck <mail@colinfinck.de>
* TRANSLATOR: Colin Finck
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: Norwegian resource file
* COPYRIGHT: Copyright 2008 Colin Finck (colin@reactos.org)
* TRANSLATOR: Lars Martin Hambro
*/
LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL

9
rosapps/applications/devutils/vgafontedit/lang/pl-PL.rc
View File

@ -1,10 +1,9 @@
/*
* PROJECT: Edytor czczionek VGA dla ReactOS
* LICENSE: GNU General Public License Version 2.0 or any later version
* FILE: devutils/vgafontedit/lang/pl-PL.rc
* PROJECT: ReactOS VGA Font Editor
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: Polish resource file
* COPYRIGHT: Copyright 2008 Colin Finck <mail@colinfinck.de>
* TRANSLATOR: Olaf Siejka (Feb, 2008)
* COPYRIGHT: Copyright 2008 Colin Finck (colin@reactos.org)
* TRANSLATOR: Olaf Siejka
*/
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT

5
rosapps/applications/devutils/vgafontedit/lang/ro-RO.rc
View File

@ -1,9 +1,8 @@
/*
* PROJECT: ReactOS VGA Font Editor
* LICENSE: GNU General Public License Version 2.0 or any later version
* FILE: devutils/vgafontedit/lang/ro-RO.rc
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: Romanian resource file
* COPYRIGHT: Copyright 2008 Colin Finck <mail@colinfinck.de>
* COPYRIGHT: Copyright 2008 Colin Finck (colin@reactos.org)
* TRANSLATOR: Ștefan Fulea (stefan dot fulea at mail dot md)
*/

5
rosapps/applications/devutils/vgafontedit/lang/ru-RU.rc
View File

@ -1,9 +1,8 @@
/*
* PROJECT: ReactOS VGA Font Editor
* LICENSE: GNU General Public License Version 2.0 or any later version
* FILE: devutils/vgafontedit/lang/ru-RU.rc
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: Russian resource file
* COPYRIGHT: Copyright 2008 Colin Finck <mail@colinfinck.de>
* COPYRIGHT: Copyright 2008 Colin Finck (colin@reactos.org)
* TRANSLATOR: Dmitry Chapyshev
*/

7
rosapps/applications/devutils/vgafontedit/lang/uk-UA.rc
View File

@ -1,9 +1,8 @@
/*
* PROJECT: ReactOS VGA Font Editor
* LICENSE: GNU General Public License Version 2.0 or any later version
* FILE: devutils/vgafontedit/lang/uk-UA.rc
* PURPOSE: Ukraianian resource file
* COPYRIGHT: Copyright 2008 Colin Finck <mail@colinfinck.de>
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: Ukrainian resource file
* COPYRIGHT: Copyright 2008 Colin Finck (colin@reactos.org)
* TRANSLATOR: Artem Reznikov
*/

7
rosapps/applications/devutils/vgafontedit/lang/zh-CN.rc
View File

@ -1,10 +1,9 @@
/*
* PROJECT: ReactOS VGA Font Editor
* LICENSE: GNU General Public License Version 2.0 or any later version
* FILE: devutils/vgafontedit/lang/zh-CN.rc
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: Simplified Chinese resource file
* COPYRIGHT: Copyright 2008 Colin Finck <mail@colinfinck.de>
* TRANSLATOR: BinSys <binsys@163.com>
* COPYRIGHT: Copyright 2008 Colin Finck (colin@reactos.org)
* TRANSLATOR: BinSys (binsys@163.com)
*/
LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED

5
rosapps/applications/devutils/vgafontedit/main.c
View File

@ -1,9 +1,8 @@
/*
* PROJECT: ReactOS VGA Font Editor
* LICENSE: GNU General Public License Version 2.0 or any later version
* FILE: devutils/vgafontedit/main.c
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: Main entry point of the application
* COPYRIGHT: Copyright 2008 Colin Finck <mail@colinfinck.de>
* COPYRIGHT: Copyright 2008 Colin Finck (colin@reactos.org)
*/
#include "precomp.h"

5
rosapps/applications/devutils/vgafontedit/mainwnd.c
View File

@ -1,9 +1,8 @@
/*
* PROJECT: ReactOS VGA Font Editor
* LICENSE: GNU General Public License Version 2.0 or any later version
* FILE: devutils/vgafontedit/mainwnd.c
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: Implements the main window of the application
* COPYRIGHT: Copyright 2008 Colin Finck <mail@colinfinck.de>
* COPYRIGHT: Copyright 2008 Colin Finck (colin@reactos.org)
*/
#include "precomp.h"

50
rosapps/applications/devutils/vgafontedit/misc.c
View File

@ -1,10 +1,9 @@
/*
* PROJECT: ReactOS VGA Font Editor
* LICENSE: GNU General Public License Version 2.0 only
* FILE: devutils/vgafontedit/misc.c
* PURPOSE: Some miscellaneous resource functions (copied from "devmgmt") and modified
* COPYRIGHT: Copyright 2006 Ged Murphy <gedmurphy@gmail.com>
* Copyright 2008 Colin Finck <mail@colinfinck.de>
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: Some miscellaneous resource functions
* COPYRIGHT: Copyright 2006-2007 Thomas Weidenmueller (thomas@reactsoft.com)
* Copyright 2008 Colin Finck (colin@reactos.org)
*/
#include "precomp.h"
@ -14,55 +13,52 @@ LengthOfStrResource(IN UINT uID)
{
HRSRC hrSrc;
HGLOBAL hRes;
PWSTR lpName, lpStr;
LPWSTR lpName, lpStr;
/* There are always blocks of 16 strings */
lpName = (PWSTR) MAKEINTRESOURCEW((uID >> 4) + 1);
lpName = (LPWSTR)MAKEINTRESOURCEW((uID >> 4) + 1);
/* Find the string table block */
if ((hrSrc = FindResourceW(hInstance, lpName, (PWSTR)RT_STRING)) != 0 &&
(hRes = LoadResource(hInstance, hrSrc)) != 0 &&
(lpStr = (PWSTR)LockResource(hRes)) != 0)
if ((hrSrc = FindResourceW(hInstance, lpName, (LPWSTR)RT_STRING)) &&
(hRes = LoadResource(hInstance, hrSrc)) &&
(lpStr = LockResource(hRes)))
{
UINT x;
/* Find the string we're looking for */
uID &= 0xF; /* position in the block, same as % 16 */
for (x = 0; x < uID; x++)
{
lpStr += (*lpStr) + 1;
}
/* Found the string */
return (int)(*lpStr);
}
return -1;
}
INT
AllocAndLoadString(OUT PWSTR *lpTarget, IN UINT uID)
int
AllocAndLoadString(OUT LPWSTR *lpTarget,
IN UINT uID)
{
INT ln;
ln = LengthOfStrResource(uID);
if (ln++ > 0)
{
(*lpTarget) = (PWSTR) HeapAlloc( hProcessHeap, 0, ln * sizeof(WCHAR) );
if (*lpTarget)
(*lpTarget) = (LPWSTR)LocalAlloc(LMEM_FIXED,
ln * sizeof(WCHAR));
if ((*lpTarget) != NULL)
{
INT nRet;
nRet = LoadStringW(hInstance, uID, *lpTarget, ln);
if (!nRet)
HeapFree(hProcessHeap, 0, *lpTarget);
return nRet;
INT Ret;
if (!(Ret = LoadStringW(hInstance, uID, *lpTarget, ln)))
{
LocalFree((HLOCAL)(*lpTarget));
}
return Ret;
}
}
return 0;
}

5
rosapps/applications/devutils/vgafontedit/opensave.c
View File

@ -1,9 +1,8 @@
/*
* PROJECT: ReactOS VGA Font Editor
* LICENSE: GNU General Public License Version 2.0 or any later version
* FILE: devutils/vgafontedit/opensave.c
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: Functions for opening and saving files
* COPYRIGHT: Copyright 2008 Colin Finck <mail@colinfinck.de>
* COPYRIGHT: Copyright 2008 Colin Finck (colin@reactos.org)
*/
#include "precomp.h"

5
rosapps/applications/devutils/vgafontedit/precomp.h
View File

@ -1,9 +1,8 @@
/*
* PROJECT: ReactOS VGA Font Editor
* LICENSE: GNU General Public License Version 2.0 or any later version
* FILE: devutils/vgafontedit/precomp.h
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: Main header
* COPYRIGHT: Copyright 2008 Colin Finck <mail@colinfinck.de>
* COPYRIGHT: Copyright 2008 Colin Finck (colin@reactos.org)
*/
#ifndef __PRECOMP_H

5
rosapps/applications/devutils/vgafontedit/psf.h
View File

@ -1,9 +1,8 @@
/*
* PROJECT: ReactOS VGA Font Editor
* LICENSE: GNU General Public License Version 2.0 or any later version
* FILE: devutils/vgafontedit/psf.h
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: PSFv1 (PC Screen) Fonts - Version 1
* COPYRIGHT: Copyright 2008 Colin Finck <mail@colinfinck.de>
* COPYRIGHT: Copyright 2008 Colin Finck (colin@reactos.org)
*/
#ifndef __PSF_H

5
rosapps/applications/devutils/vgafontedit/raw.h
View File

@ -1,9 +1,8 @@
/*
* PROJECT: ReactOS VGA Font Editor
* LICENSE: GNU General Public License Version 2.0 or any later version
* FILE: devutils/vgafontedit/raw.h
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: Raw bitmap fonts
* COPYRIGHT: Copyright 2008 Colin Finck <mail@colinfinck.de>
* COPYRIGHT: Copyright 2008 Colin Finck (colin@reactos.org)
*/
#ifndef __RAW_H

5
rosapps/applications/devutils/vgafontedit/resource.h
View File

@ -1,9 +1,8 @@
/*
* PROJECT: ReactOS VGA Font Editor
* LICENSE: GNU General Public License Version 2.0 or any later version
* FILE: devutils/vgafontedit/resource.h
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: Header containing resource IDs
* COPYRIGHT: Copyright 2008 Colin Finck <mail@colinfinck.de>
* COPYRIGHT: Copyright 2008 Colin Finck (colin@reactos.org)
*/
#ifndef __RESOURCE_H

5
rosapps/applications/devutils/vgafontedit/vgafontedit.rc
View File

@ -1,9 +1,8 @@
/*
* PROJECT: ReactOS VGA Font Editor
* LICENSE: GNU General Public License Version 2.0 or any later version
* FILE: devutils/vgafontedit/vgafontedit.rc
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: Main resource file
* COPYRIGHT: Copyright 2008 Colin Finck <mail@colinfinck.de>
* COPYRIGHT: Copyright 2008 Colin Finck (colin@reactos.org)
*/
#include <windows.h>