[cfinck] 75987: [VGAFONTEDIT] Use the new header with SPDX license identifier and make the entire application GPL-2.0+ The code of the single GPL-2.0 only file "misc.c" was originally derived from ... - Ros-diffs

29 Sep 2017

Author: cfinck
Date: Fri Sep 29 13:58:14 2017
New Revision: 75987

URL: http://svn.reactos.org/svn/reactos?rev=75987&view=rev
Log:
[VGAFONTEDIT] Use the new header with SPDX license identifier and make the entire
application GPL-2.0+

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.

Modified:
    trunk/rosapps/applications/devutils/vgafontedit/aboutdlg.c
    trunk/rosapps/applications/devutils/vgafontedit/cpi.h
    trunk/rosapps/applications/devutils/vgafontedit/customwndclasses.h
    trunk/rosapps/applications/devutils/vgafontedit/editglyphdlg.c
    trunk/rosapps/applications/devutils/vgafontedit/fontboxeswnd.c
    trunk/rosapps/applications/devutils/vgafontedit/fontwnd.c
    trunk/rosapps/applications/devutils/vgafontedit/lang/bg-BG.rc
    trunk/rosapps/applications/devutils/vgafontedit/lang/de-DE.rc
    trunk/rosapps/applications/devutils/vgafontedit/lang/en-US.rc
    trunk/rosapps/applications/devutils/vgafontedit/lang/es-ES.rc
    trunk/rosapps/applications/devutils/vgafontedit/lang/fr-FR.rc
    trunk/rosapps/applications/devutils/vgafontedit/lang/it-IT.rc
    trunk/rosapps/applications/devutils/vgafontedit/lang/no-NO.rc
    trunk/rosapps/applications/devutils/vgafontedit/lang/pl-PL.rc
    trunk/rosapps/applications/devutils/vgafontedit/lang/ro-RO.rc
    trunk/rosapps/applications/devutils/vgafontedit/lang/ru-RU.rc
    trunk/rosapps/applications/devutils/vgafontedit/lang/uk-UA.rc
    trunk/rosapps/applications/devutils/vgafontedit/lang/zh-CN.rc
    trunk/rosapps/applications/devutils/vgafontedit/main.c
    trunk/rosapps/applications/devutils/vgafontedit/mainwnd.c
    trunk/rosapps/applications/devutils/vgafontedit/misc.c
    trunk/rosapps/applications/devutils/vgafontedit/opensave.c
    trunk/rosapps/applications/devutils/vgafontedit/precomp.h
    trunk/rosapps/applications/devutils/vgafontedit/psf.h
    trunk/rosapps/applications/devutils/vgafontedit/raw.h
    trunk/rosapps/applications/devutils/vgafontedit/resource.h
    trunk/rosapps/applications/devutils/vgafontedit/vgafontedit.rc

Modified: trunk/rosapps/applications/devutils/vgafontedit/aboutdlg.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf…
==============================================================================

--- trunk/rosapps/applications/devutils/vgafontedit/aboutdlg.c	[iso-8859-1] (original)
+++ trunk/rosapps/applications/devutils/vgafontedit/aboutdlg.c	[iso-8859-1] Fri Sep 29
13:58:14 2017
@@ -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 &lt;mail(a)colinfinck.de&gt;
+ * COPYRIGHT:   Copyright 2008 Colin Finck (colin(a)reactos.org)
  */
 
 #include "precomp.h"

Modified: trunk/rosapps/applications/devutils/vgafontedit/cpi.h
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf…
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/cpi.h	[iso-8859-1] (original)
+++ trunk/rosapps/applications/devutils/vgafontedit/cpi.h	[iso-8859-1] Fri Sep 29 13:58:14
2017
@@ -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 &lt;hermes.belusca(a)sfr.fr&gt;
+ * COPYRIGHT:   Copyright 2014 Hermes Belusca-Maito (hermes.belusca(a)sfr.fr)
  */
 
 #ifndef __CPI_H

Modified: trunk/rosapps/applications/devutils/vgafontedit/customwndclasses.h
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf…
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/customwndclasses.h	[iso-8859-1]
(original)
+++ trunk/rosapps/applications/devutils/vgafontedit/customwndclasses.h	[iso-8859-1] Fri
Sep 29 13:58:14 2017
@@ -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 &lt;mail(a)colinfinck.de&gt;
+ * COPYRIGHT:   Copyright 2008 Colin Finck (colin(a)reactos.org)
  */
 
 #ifndef __CUSTOMWNDCLASSES_H

Modified: trunk/rosapps/applications/devutils/vgafontedit/editglyphdlg.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf…
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/editglyphdlg.c	[iso-8859-1]
(original)
+++ trunk/rosapps/applications/devutils/vgafontedit/editglyphdlg.c	[iso-8859-1] Fri Sep 29
13:58:14 2017
@@ -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 &lt;mail(a)colinfinck.de&gt;
+ * COPYRIGHT:   Copyright 2008 Colin Finck (colin(a)reactos.org)
  */
 
 #include "precomp.h"

Modified: trunk/rosapps/applications/devutils/vgafontedit/fontboxeswnd.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf…
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/fontboxeswnd.c	[iso-8859-1]
(original)
+++ trunk/rosapps/applications/devutils/vgafontedit/fontboxeswnd.c	[iso-8859-1] Fri Sep 29
13:58:14 2017
@@ -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 &lt;mail(a)colinfinck.de&gt;
+ * COPYRIGHT:   Copyright 2008 Colin Finck (colin(a)reactos.org)
  */
 
 #include "precomp.h"

Modified: trunk/rosapps/applications/devutils/vgafontedit/fontwnd.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf…
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/fontwnd.c	[iso-8859-1] (original)
+++ trunk/rosapps/applications/devutils/vgafontedit/fontwnd.c	[iso-8859-1] Fri Sep 29
13:58:14 2017
@@ -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 &lt;mail(a)colinfinck.de&gt;
+ * COPYRIGHT:   Copyright 2008 Colin Finck (colin(a)reactos.org)
  */
 
 #include "precomp.h"

Modified: trunk/rosapps/applications/devutils/vgafontedit/lang/bg-BG.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf…
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/lang/bg-BG.rc	[iso-8859-1] (original)
+++ trunk/rosapps/applications/devutils/vgafontedit/lang/bg-BG.rc	[iso-8859-1] Fri Sep 29
13:58:14 2017
@@ -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 &lt;mail(a)colinfinck.de&gt;
+ * COPYRIGHT:   Copyright 2008 Colin Finck (colin(a)reactos.org)
  * TRANSLATOR:  CCTAHEB
  */
 

Modified: trunk/rosapps/applications/devutils/vgafontedit/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf…
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/lang/de-DE.rc	[iso-8859-1] (original)
+++ trunk/rosapps/applications/devutils/vgafontedit/lang/de-DE.rc	[iso-8859-1] Fri Sep 29
13:58:14 2017
@@ -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 &lt;mail(a)colinfinck.de&gt;
+ * COPYRIGHT:   Copyright 2008 Colin Finck (colin(a)reactos.org)
  * TRANSLATOR:  Dark_Shadow(a)gmx.at
  */
 

Modified: trunk/rosapps/applications/devutils/vgafontedit/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf…
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/lang/en-US.rc	[iso-8859-1] (original)
+++ trunk/rosapps/applications/devutils/vgafontedit/lang/en-US.rc	[iso-8859-1] Fri Sep 29
13:58:14 2017
@@ -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 &lt;mail(a)colinfinck.de&gt;
+ * COPYRIGHT:   Copyright 2008 Colin Finck (colin(a)reactos.org)
  * TRANSLATOR:  Colin Finck
  */
 

Modified: trunk/rosapps/applications/devutils/vgafontedit/lang/es-ES.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf…
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/lang/es-ES.rc	[iso-8859-1] (original)
+++ trunk/rosapps/applications/devutils/vgafontedit/lang/es-ES.rc	[iso-8859-1] Fri Sep 29
13:58:14 2017
@@ -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 &lt;mail(a)colinfinck.de&gt;
- * 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(a)reactos.org)
+ * TRANSLATOR:  Javier Remacha
  */
 
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL

Modified: trunk/rosapps/applications/devutils/vgafontedit/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf…
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/lang/fr-FR.rc	[iso-8859-1] (original)
+++ trunk/rosapps/applications/devutils/vgafontedit/lang/fr-FR.rc	[iso-8859-1] Fri Sep 29
13:58:14 2017
@@ -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 &lt;mail(a)colinfinck.de&gt;
- * TRANSLATOR:  Pierre Schweitzer &lt;heis_spiter(a)hotmail.com&gt;
+ * COPYRIGHT:   Copyright 2008 Colin Finck (colin(a)reactos.org)
+ * TRANSLATOR:  Pierre Schweitzer (pierre(a)reactos.org)
  */
 
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL

Modified: trunk/rosapps/applications/devutils/vgafontedit/lang/it-IT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf…
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/lang/it-IT.rc	[iso-8859-1] (original)
+++ trunk/rosapps/applications/devutils/vgafontedit/lang/it-IT.rc	[iso-8859-1] Fri Sep 29
13:58:14 2017
@@ -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 &lt;mail(a)colinfinck.de&gt;
- * 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(a)reactos.org)
+ * TRANSLATOR:  Paolo Devoti
  */
 
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL

Modified: trunk/rosapps/applications/devutils/vgafontedit/lang/no-NO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf…
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/lang/no-NO.rc	[iso-8859-1] (original)
+++ trunk/rosapps/applications/devutils/vgafontedit/lang/no-NO.rc	[iso-8859-1] Fri Sep 29
13:58:14 2017
@@ -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 &lt;mail(a)colinfinck.de&gt;
- * TRANSLATOR:  Colin Finck
+ * LICENSE:     GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
+ * PURPOSE:     Norwegian resource file
+ * COPYRIGHT:   Copyright 2008 Colin Finck (colin(a)reactos.org)
+ * TRANSLATOR:  Lars Martin Hambro
  */
 
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL

Modified: trunk/rosapps/applications/devutils/vgafontedit/lang/pl-PL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf…
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/lang/pl-PL.rc	[iso-8859-1] (original)
+++ trunk/rosapps/applications/devutils/vgafontedit/lang/pl-PL.rc	[iso-8859-1] Fri Sep 29
13:58:14 2017
@@ -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 &lt;mail(a)colinfinck.de&gt;
- * TRANSLATOR:  Olaf Siejka (Feb, 2008)
+ * COPYRIGHT:   Copyright 2008 Colin Finck (colin(a)reactos.org)
+ * TRANSLATOR:  Olaf Siejka
  */
 
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT

Modified: trunk/rosapps/applications/devutils/vgafontedit/lang/ro-RO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf…
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/lang/ro-RO.rc	[iso-8859-1] (original)
+++ trunk/rosapps/applications/devutils/vgafontedit/lang/ro-RO.rc	[iso-8859-1] Fri Sep 29
13:58:14 2017
@@ -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 &lt;mail(a)colinfinck.de&gt;
+ * COPYRIGHT:   Copyright 2008 Colin Finck (colin(a)reactos.org)
  * TRANSLATOR:  Ètefan Fulea (stefan dot fulea at mail dot md)
  */
 

Modified: trunk/rosapps/applications/devutils/vgafontedit/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf…
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/lang/ru-RU.rc	[iso-8859-1] (original)
+++ trunk/rosapps/applications/devutils/vgafontedit/lang/ru-RU.rc	[iso-8859-1] Fri Sep 29
13:58:14 2017
@@ -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 &lt;mail(a)colinfinck.de&gt;
+ * COPYRIGHT:   Copyright 2008 Colin Finck (colin(a)reactos.org)
  * TRANSLATOR:  Dmitry Chapyshev
  */
 

Modified: trunk/rosapps/applications/devutils/vgafontedit/lang/uk-UA.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf…
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/lang/uk-UA.rc	[iso-8859-1] (original)
+++ trunk/rosapps/applications/devutils/vgafontedit/lang/uk-UA.rc	[iso-8859-1] Fri Sep 29
13:58:14 2017
@@ -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 &lt;mail(a)colinfinck.de&gt;
+ * LICENSE:     GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
+ * PURPOSE:     Ukrainian resource file
+ * COPYRIGHT:   Copyright 2008 Colin Finck (colin(a)reactos.org)
  * TRANSLATOR:  Artem Reznikov
  */
 

Modified: trunk/rosapps/applications/devutils/vgafontedit/lang/zh-CN.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf…
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/lang/zh-CN.rc	[iso-8859-1] (original)
+++ trunk/rosapps/applications/devutils/vgafontedit/lang/zh-CN.rc	[iso-8859-1] Fri Sep 29
13:58:14 2017
@@ -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 &lt;mail(a)colinfinck.de&gt;
- * TRANSLATOR:  BinSys &lt;binsys(a)163.com&gt;
+ * COPYRIGHT:   Copyright 2008 Colin Finck (colin(a)reactos.org)
+ * TRANSLATOR:  BinSys (binsys(a)163.com)
  */
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED

Modified: trunk/rosapps/applications/devutils/vgafontedit/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf…
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/main.c	[iso-8859-1] (original)
+++ trunk/rosapps/applications/devutils/vgafontedit/main.c	[iso-8859-1] Fri Sep 29
13:58:14 2017
@@ -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 &lt;mail(a)colinfinck.de&gt;
+ * COPYRIGHT:   Copyright 2008 Colin Finck (colin(a)reactos.org)
  */
 
 #include "precomp.h"

Modified: trunk/rosapps/applications/devutils/vgafontedit/mainwnd.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf…
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/mainwnd.c	[iso-8859-1] (original)
+++ trunk/rosapps/applications/devutils/vgafontedit/mainwnd.c	[iso-8859-1] Fri Sep 29
13:58:14 2017
@@ -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 &lt;mail(a)colinfinck.de&gt;
+ * COPYRIGHT:   Copyright 2008 Colin Finck (colin(a)reactos.org)
  */
 
 #include "precomp.h"

Modified: trunk/rosapps/applications/devutils/vgafontedit/misc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf…
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/misc.c	[iso-8859-1] (original)
+++ trunk/rosapps/applications/devutils/vgafontedit/misc.c	[iso-8859-1] Fri Sep 29
13:58:14 2017
@@ -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 &lt;gedmurphy(a)gmail.com&gt;
- *              Copyright 2008 Colin Finck &lt;mail(a)colinfinck.de&gt;
+ * LICENSE:     GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
+ * PURPOSE:     Some miscellaneous resource functions
+ * COPYRIGHT:   Copyright 2006-2007 Thomas Weidenmueller (thomas(a)reactsoft.com)
+ *              Copyright 2008 Colin Finck (colin(a)reactos.org)
  */
 
 #include "precomp.h"
@@ -14,55 +13,52 @@
 {
     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;
 }
 

Modified: trunk/rosapps/applications/devutils/vgafontedit/opensave.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf…
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/opensave.c	[iso-8859-1] (original)
+++ trunk/rosapps/applications/devutils/vgafontedit/opensave.c	[iso-8859-1] Fri Sep 29
13:58:14 2017
@@ -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 &lt;mail(a)colinfinck.de&gt;
+ * COPYRIGHT:   Copyright 2008 Colin Finck (colin(a)reactos.org)
  */
 
 #include "precomp.h"

Modified: trunk/rosapps/applications/devutils/vgafontedit/precomp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf…
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/precomp.h	[iso-8859-1] (original)
+++ trunk/rosapps/applications/devutils/vgafontedit/precomp.h	[iso-8859-1] Fri Sep 29
13:58:14 2017
@@ -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 &lt;mail(a)colinfinck.de&gt;
+ * COPYRIGHT:   Copyright 2008 Colin Finck (colin(a)reactos.org)
  */
 
 #ifndef __PRECOMP_H

Modified: trunk/rosapps/applications/devutils/vgafontedit/psf.h
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf…
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/psf.h	[iso-8859-1] (original)
+++ trunk/rosapps/applications/devutils/vgafontedit/psf.h	[iso-8859-1] Fri Sep 29 13:58:14
2017
@@ -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 &lt;mail(a)colinfinck.de&gt;
+ * COPYRIGHT:   Copyright 2008 Colin Finck (colin(a)reactos.org)
  */
 
 #ifndef __PSF_H

Modified: trunk/rosapps/applications/devutils/vgafontedit/raw.h
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf…
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/raw.h	[iso-8859-1] (original)
+++ trunk/rosapps/applications/devutils/vgafontedit/raw.h	[iso-8859-1] Fri Sep 29 13:58:14
2017
@@ -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 &lt;mail(a)colinfinck.de&gt;
+ * COPYRIGHT:   Copyright 2008 Colin Finck (colin(a)reactos.org)
  */
 
 #ifndef __RAW_H

Modified: trunk/rosapps/applications/devutils/vgafontedit/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf…
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/resource.h	[iso-8859-1] (original)
+++ trunk/rosapps/applications/devutils/vgafontedit/resource.h	[iso-8859-1] Fri Sep 29
13:58:14 2017
@@ -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 &lt;mail(a)colinfinck.de&gt;
+ * COPYRIGHT:   Copyright 2008 Colin Finck (colin(a)reactos.org)
  */
 
 #ifndef __RESOURCE_H

Modified: trunk/rosapps/applications/devutils/vgafontedit/vgafontedit.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf…
==============================================================================
--- trunk/rosapps/applications/devutils/vgafontedit/vgafontedit.rc	[iso-8859-1]
(original)
+++ trunk/rosapps/applications/devutils/vgafontedit/vgafontedit.rc	[iso-8859-1] Fri Sep 29
13:58:14 2017
@@ -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 &lt;mail(a)colinfinck.de&gt;
+ * COPYRIGHT:   Copyright 2008 Colin Finck (colin(a)reactos.org)
  */
 
 #include <windows.h>



    