https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ca967db5ca65d289e3dc2…
commit ca967db5ca65d289e3dc2ed05e5e1b49673ed3e5
Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
AuthorDate: Mon Aug 26 22:19:06 2019 +0900
Commit: GitHub <noreply(a)github.com>
CommitDate: Mon Aug 26 22:19:06 2019 +0900
[MEDIA][FONTS] Add Verdana fonts (#1881)
- Add "Verdana", "Verdana Bold", "Verdana Bold Italic" and "Verdana Italic" fonts by duplicating "Bitstream Vera Sans" fonts and renaming them.
- Delete some "Verdana" font substitutes.
- Add LICENSE file.
I made these font files by using FontForge. Their family name is "Verdana". Their display names are "Verdana", "Verdana Bold", "Verdana Bold Italic" and "Verdana Italic". Their font filenames are verdana.ttf, verdanab.ttf, verdanaz.ttf and verdanai.ttf. The Underline Positions are hacked by adding an integer value for workaround of FontForge's bug. CORE-16264
---
media/fonts/CMakeLists.txt | 6 +-
media/fonts/doc/Verdana/COPYRIGHT.TXT | 124 ++++++++++++++++++++++++++++++++++
media/fonts/doc/Verdana/README.txt | 3 +
media/fonts/verdana.ttf | Bin 0 -> 38412 bytes
media/fonts/verdanab.ttf | Bin 0 -> 36204 bytes
media/fonts/verdanai.ttf | Bin 0 -> 34016 bytes
media/fonts/verdanaz.ttf | Bin 0 -> 37124 bytes
7 files changed, 132 insertions(+), 1 deletion(-)
diff --git a/media/fonts/CMakeLists.txt b/media/fonts/CMakeLists.txt
index 51a7d9e2282..e7a5aa6de0a 100644
--- a/media/fonts/CMakeLists.txt
+++ b/media/fonts/CMakeLists.txt
@@ -165,7 +165,11 @@ list(APPEND FONT_FILES
trebucbd.ttf
trebucbi.ttf
trebucit.ttf
- UniVGA16.ttf)
+ UniVGA16.ttf
+ verdanab.ttf
+ verdanaz.ttf
+ verdanai.ttf
+ verdana.ttf)
foreach(item ${FONT_FILES})
add_cd_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/${item}" DESTINATION reactos/Fonts FOR all)
diff --git a/media/fonts/doc/Verdana/COPYRIGHT.TXT b/media/fonts/doc/Verdana/COPYRIGHT.TXT
new file mode 100644
index 00000000000..e651be1c4fe
--- /dev/null
+++ b/media/fonts/doc/Verdana/COPYRIGHT.TXT
@@ -0,0 +1,124 @@
+Bitstream Vera Fonts Copyright
+
+The fonts have a generous copyright, allowing derivative works (as
+long as "Bitstream" or "Vera" are not in the names), and full
+redistribution (so long as they are not *sold* by themselves). They
+can be be bundled, redistributed and sold with any software.
+
+The fonts are distributed under the following copyright:
+
+Copyright
+=========
+
+Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream
+Vera is a trademark of Bitstream, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the fonts accompanying this license ("Fonts") and associated
+documentation files (the "Font Software"), to reproduce and distribute
+the Font Software, including without limitation the rights to use,
+copy, merge, publish, distribute, and/or sell copies of the Font
+Software, and to permit persons to whom the Font Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright and trademark notices and this permission notice
+shall be included in all copies of one or more of the Font Software
+typefaces.
+
+The Font Software may be modified, altered, or added to, and in
+particular the designs of glyphs or characters in the Fonts may be
+modified and additional glyphs or characters may be added to the
+Fonts, only if the fonts are renamed to names not containing either
+the words "Bitstream" or the word "Vera".
+
+This License becomes null and void to the extent applicable to Fonts
+or Font Software that has been modified and is distributed under the
+"Bitstream Vera" names.
+
+The Font Software may be sold as part of a larger software package but
+no copy of one or more of the Font Software typefaces may be sold by
+itself.
+
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
+BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL,
+OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT
+SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
+
+Except as contained in this notice, the names of Gnome, the Gnome
+Foundation, and Bitstream Inc., shall not be used in advertising or
+otherwise to promote the sale, use or other dealings in this Font
+Software without prior written authorization from the Gnome Foundation
+or Bitstream Inc., respectively. For further information, contact:
+fonts at gnome dot org.
+
+Copyright FAQ
+=============
+
+ 1. I don't understand the resale restriction... What gives?
+
+ Bitstream is giving away these fonts, but wishes to ensure its
+ competitors can't just drop the fonts as is into a font sale system
+ and sell them as is. It seems fair that if Bitstream can't make money
+ from the Bitstream Vera fonts, their competitors should not be able to
+ do so either. You can sell the fonts as part of any software package,
+ however.
+
+ 2. I want to package these fonts separately for distribution and
+ sale as part of a larger software package or system. Can I do so?
+
+ Yes. A RPM or Debian package is a "larger software package" to begin
+ with, and you aren't selling them independently by themselves.
+ See 1. above.
+
+ 3. Are derivative works allowed?
+ Yes!
+
+ 4. Can I change or add to the font(s)?
+ Yes, but you must change the name(s) of the font(s).
+
+ 5. Under what terms are derivative works allowed?
+
+ You must change the name(s) of the fonts. This is to ensure the
+ quality of the fonts, both to protect Bitstream and Gnome. We want to
+ ensure that if an application has opened a font specifically of these
+ names, it gets what it expects (though of course, using fontconfig,
+ substitutions could still could have occurred during font
+ opening). You must include the Bitstream copyright. Additional
+ copyrights can be added, as per copyright law. Happy Font Hacking!
+
+ 6. If I have improvements for Bitstream Vera, is it possible they might get
+ adopted in future versions?
+
+ Yes. The contract between the Gnome Foundation and Bitstream has
+ provisions for working with Bitstream to ensure quality additions to
+ the Bitstream Vera font family. Please contact us if you have such
+ additions. Note, that in general, we will want such additions for the
+ entire family, not just a single font, and that you'll have to keep
+ both Gnome and Jim Lyles, Vera's designer, happy! To make sense to add
+ glyphs to the font, they must be stylistically in keeping with Vera's
+ design. Vera cannot become a "ransom note" font. Jim Lyles will be
+ providing a document describing the design elements used in Vera, as a
+ guide and aid for people interested in contributing to Vera.
+
+ 7. I want to sell a software package that uses these fonts: Can I do so?
+
+ Sure. Bundle the fonts with your software and sell your software
+ with the fonts. That is the intent of the copyright.
+
+ 8. If applications have built the names "Bitstream Vera" into them,
+ can I override this somehow to use fonts of my choosing?
+
+ This depends on exact details of the software. Most open source
+ systems and software (e.g., Gnome, KDE, etc.) are now converting to
+ use fontconfig (see www.fontconfig.org) to handle font configuration,
+ selection and substitution; it has provisions for overriding font
+ names and subsituting alternatives. An example is provided by the
+ supplied local.conf file, which chooses the family Bitstream Vera for
+ "sans", "serif" and "monospace". Other software (e.g., the XFree86
+ core server) has other mechanisms for font substitution.
+
diff --git a/media/fonts/doc/Verdana/README.txt b/media/fonts/doc/Verdana/README.txt
new file mode 100644
index 00000000000..365bc5eb550
--- /dev/null
+++ b/media/fonts/doc/Verdana/README.txt
@@ -0,0 +1,3 @@
+ReactOS Verdana fonts are based on "Bitstream Vera Sans" fonts.
+
+See also COPYRIGHT.TXT.
diff --git a/media/fonts/verdana.ttf b/media/fonts/verdana.ttf
new file mode 100644
index 00000000000..1a55bafcf3c
Binary files /dev/null and b/media/fonts/verdana.ttf differ
diff --git a/media/fonts/verdanab.ttf b/media/fonts/verdanab.ttf
new file mode 100644
index 00000000000..7b56d8f2783
Binary files /dev/null and b/media/fonts/verdanab.ttf differ
diff --git a/media/fonts/verdanai.ttf b/media/fonts/verdanai.ttf
new file mode 100644
index 00000000000..2b7628696e8
Binary files /dev/null and b/media/fonts/verdanai.ttf differ
diff --git a/media/fonts/verdanaz.ttf b/media/fonts/verdanaz.ttf
new file mode 100644
index 00000000000..f1a96c4f128
Binary files /dev/null and b/media/fonts/verdanaz.ttf differ
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=121f0a5c50f4cf5bde88f…
commit 121f0a5c50f4cf5bde88f79e05c298159ba54877
Author: Eric Kohl <eric.kohl(a)reactos.org>
AuthorDate: Sun Aug 25 11:15:00 2019 +0200
Commit: Eric Kohl <eric.kohl(a)reactos.org>
CommitDate: Sun Aug 25 11:15:00 2019 +0200
[NETAPI32] Fix a typo in DsDeregisterDnsHostRecordsA
Thank you very much UserNT and Thomas for the hint!
---
dll/win32/netapi32/netlogon.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dll/win32/netapi32/netlogon.c b/dll/win32/netapi32/netlogon.c
index 73a0324f0fa..539d0c1f64d 100644
--- a/dll/win32/netapi32/netlogon.c
+++ b/dll/win32/netapi32/netlogon.c
@@ -341,7 +341,7 @@ DsDeregisterDnsHostRecordsA(
}
}
- pDnsHostNameW = NetpAllocWStrFromAnsiStr((PSTR)DnsDomainName);
+ pDnsHostNameW = NetpAllocWStrFromAnsiStr((PSTR)DnsHostName);
if (pDnsHostNameW == NULL)
{
status = ERROR_NOT_ENOUGH_MEMORY;