Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Go further with BSD license #3

Merged
merged 4 commits into from
Dec 22, 2022
Merged

Go further with BSD license #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ab1a30a
Update "BSD 3-Clause License" to say "3-Clause BSD License"
hartwork Dec 21, 2022
8f7b051
Apply 3-clause BSD license where visible to the user
hartwork Dec 21, 2022
8be1a71
main.cpp: Stop using wsprintf in DisclaimerDialogProc for its target …
hartwork Dec 22, 2022
7468b85
Document change of license to 3-clause BSD license
hartwork Dec 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/windows-msvc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# / __| __|_ _/ __/ __|
# | (_ | _| | |\__ \__ \
# \___|___|___|___/___/
# BSD 3-Clause License
# 3-Clause BSD License
#
# Copyright (c) 2022-2022 Sebastian Pipping <sebastian@pipping.org>
#
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# / __| __|_ _/ __/ __|
# | (_ | _| | |\__ \__ \
# \___|___|___|___/___/
# BSD 3-Clause License
# 3-Clause BSD License
#
# Copyright (c) 2022-2022 Sebastian Pipping <sebastian@pipping.org>
#
Expand Down
2 changes: 1 addition & 1 deletion CPU_MHZ.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// / __| __|_ _/ __/ __|
// | (_ | _| | |\__ \__ \
// \___|___|___|___/___/
// BSD 3-Clause License
// 3-Clause BSD License
//
// Copyright (c) 1998-2022 Ryan Geiss (@geissomatik)
//
Expand Down
2 changes: 1 addition & 1 deletion CPU_TYPE.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// / __| __|_ _/ __/ __|
// | (_ | _| | |\__ \__ \
// \___|___|___|___/___/
// BSD 3-Clause License
// 3-Clause BSD License
//
// Copyright (c) 1998-2022 Ryan Geiss (@geissomatik)
//
Expand Down
2 changes: 1 addition & 1 deletion CYRIX.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// / __| __|_ _/ __/ __|
// | (_ | _| | |\__ \__ \
// \___|___|___|___/___/
// BSD 3-Clause License
// 3-Clause BSD License
//
// Copyright (c) 1998-2022 Ryan Geiss (@geissomatik)
//
Expand Down
2 changes: 1 addition & 1 deletion DEFINES.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// / __| __|_ _/ __/ __|
// | (_ | _| | |\__ \__ \
// \___|___|___|___/___/
// BSD 3-Clause License
// 3-Clause BSD License
//
// Copyright (c) 1998-2022 Ryan Geiss (@geissomatik)
//
Expand Down
2 changes: 1 addition & 1 deletion Effects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// / __| __|_ _/ __/ __|
// | (_ | _| | |\__ \__ \
// \___|___|___|___/___/
// BSD 3-Clause License
// 3-Clause BSD License
//
// Copyright (c) 1998-2022 Ryan Geiss (@geissomatik)
//
Expand Down
2 changes: 1 addition & 1 deletion GETDXVER.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// / __| __|_ _/ __/ __|
// | (_ | _| | |\__ \__ \
// \___|___|___|___/___/
// BSD 3-Clause License
// 3-Clause BSD License
//
// Copyright (c) 1998-2022 Ryan Geiss (@geissomatik)
//
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
BSD 3-Clause License
3-Clause BSD License

Copyright (c) 1998-2022 Ryan Geiss (@geissomatik)

Expand Down
2 changes: 1 addition & 1 deletion Proc_map.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// / __| __|_ _/ __/ __|
// | (_ | _| | |\__ \__ \
// \___|___|___|___/___/
// BSD 3-Clause License
// 3-Clause BSD License
//
// Copyright (c) 1998-2022 Ryan Geiss (@geissomatik)
//
Expand Down
2 changes: 1 addition & 1 deletion Resource.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ CAPTION "About Geiss"
FONT 8, "MS Sans Serif", 0, 0, 0x0
BEGIN
DEFPUSHBUTTON "OK",IDOK,81,120,50,14
LTEXT "'Geiss' is copyright (c) 1998-2009 Ryan M. Geiss.\nAll rights reserved.",
LTEXT "'Geiss' is copyright (c) 1998-2022 Ryan M. Geiss.\nIt is licensed under the 3-Clause BSD License.",
IDC_STATIC,11,10,196,20
LTEXT "'Geiss' requires Windows 95/98/2000/XP/Vista and Microsoft DirectX 3.0 or later. A sound card is highly recommended.",
IDC_STATIC,11,33,185,25
Expand Down
2 changes: 1 addition & 1 deletion SOUND.CPP
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// / __| __|_ _/ __/ __|
// | (_ | _| | |\__ \__ \
// \___|___|___|___/___/
// BSD 3-Clause License
// 3-Clause BSD License
//
// Copyright (c) 1998-2022 Ryan Geiss (@geissomatik)
//
Expand Down
2 changes: 1 addition & 1 deletion SOUND.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// / __| __|_ _/ __/ __|
// | (_ | _| | |\__ \__ \
// \___|___|___|___/___/
// BSD 3-Clause License
// 3-Clause BSD License
//
// Copyright (c) 1998-2022 Ryan Geiss (@geissomatik)
//
Expand Down
2 changes: 1 addition & 1 deletion Sysstuff.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// / __| __|_ _/ __/ __|
// | (_ | _| | |\__ \__ \
// \___|___|___|___/___/
// BSD 3-Clause License
// 3-Clause BSD License
//
// Copyright (c) 1998-2022 Ryan Geiss (@geissomatik)
//
Expand Down
2 changes: 1 addition & 1 deletion VIS.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// / __| __|_ _/ __/ __|
// | (_ | _| | |\__ \__ \
// \___|___|___|___/___/
// BSD 3-Clause License
// 3-Clause BSD License
//
// Copyright (c) 1998-2022 Ryan Geiss (@geissomatik)
//
Expand Down
45 changes: 30 additions & 15 deletions bin_plugin/geiss_about.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
GEISS is copyright (c) 1998-2009 by Ryan M. Geiss, as
well as all images generated with it. All rights are reserved.
GEISS is copyright (c) 1998-2022 by Ryan M. Geiss.
It is licensed under the 3-Clause BSD License.


WHAT IS GEISS?
Expand Down Expand Up @@ -280,21 +280,36 @@ instructions and up-to-date troubleshooting tips for both
the plugin and screensaver.



TERMS OF USE / COPYRIGHT INFORMATION / PUBLIC DISPLAY
-----------------------------------------------------
Geiss is 100 percent free for personal use. No registration is required.
Any commercial use of this program, however, requires the consent of the
author. For large ventures this might involve a licensing fee. Images
and video sequences generated with this program remain the copyright
of Ryan M. Geiss and can not be reproduced or displayed in public
without permission.


LICENSE AGREEMENT
-----------------
You may personally use and copy Geiss freely. However, you may NOT charge
money for distributing Geiss. Don't try to sell this program - it's free.
3-Clause BSD License

Copyright (c) 1998-2022 Ryan Geiss (@geissomatik)

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

3. Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


DISCLAIMER
Expand Down
6 changes: 6 additions & 0 deletions bin_plugin/geiss_whatsnew.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@

What's New in Geiss vX.XX (XX/XX/XXXX)
----------
1. License changed to be Software Libre and Open Source under
the 3-Clause BSD License.


What's New in Geiss v4.29 (6/20/2009)
----------
1. Default video mode selection now matches whatever your primary monitor is set to.
Expand Down
45 changes: 30 additions & 15 deletions bin_saver/geiss_about.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
GEISS is copyright (c) 1998-2009 by Ryan M. Geiss, as
well as all images generated with it. All rights are reserved.
GEISS is copyright (c) 1998-2022 by Ryan M. Geiss.
It is licensed under the 3-Clause BSD License.


WHAT IS GEISS?
Expand Down Expand Up @@ -283,21 +283,36 @@ instructions and up-to-date troubleshooting tips for both
the plugin and screensaver.



TERMS OF USE / COPYRIGHT INFORMATION / PUBLIC DISPLAY
-----------------------------------------------------
Geiss is 100 percent free for personal use. No registration is required.
Any commercial use of this program, however, requires the consent of the
author. For large ventures this might involve a licensing fee. Images
and video sequences generated with this program remain the copyright
of Ryan M. Geiss and can not be reproduced or displayed in public
without permission.


LICENSE AGREEMENT
-----------------
You may personally use and copy Geiss freely. However, you may NOT charge
money for distributing Geiss. Don't try to sell this program - it's free.
3-Clause BSD License

Copyright (c) 1998-2022 Ryan Geiss (@geissomatik)

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

3. Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


DISCLAIMER
Expand Down
6 changes: 6 additions & 0 deletions bin_saver/geiss_whatsnew.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@

What's New in Geiss vX.XX (XX/XX/XXXX)
----------
1. License changed to be Software Libre and Open Source under
the 3-Clause BSD License.


What's New in Geiss v4.29 (6/20/2009)
----------
1. Default video mode selection now matches whatever your primary monitor is set to.
Expand Down
2 changes: 1 addition & 1 deletion helper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// / __| __|_ _/ __/ __|
// | (_ | _| | |\__ \__ \
// \___|___|___|___/___/
// BSD 3-Clause License
// 3-Clause BSD License
//
// Copyright (c) 1998-2022 Ryan Geiss (@geissomatik)
//
Expand Down
2 changes: 1 addition & 1 deletion helper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// / __| __|_ _/ __/ __|
// | (_ | _| | |\__ \__ \
// \___|___|___|___/___/
// BSD 3-Clause License
// 3-Clause BSD License
//
// Copyright (c) 1998-2022 Ryan Geiss (@geissomatik)
//
Expand Down
2 changes: 1 addition & 1 deletion installer_PLUGIN.nsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
; / __| __|_ _/ __/ __|
; | (_ | _| | |\__ \__ \
; \___|___|___|___/___/
; BSD 3-Clause License
; 3-Clause BSD License
;
; Copyright (c) 1998-2022 Ryan Geiss (@geissomatik)
;
Expand Down
55 changes: 35 additions & 20 deletions main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// / __| __|_ _/ __/ __|
// | (_ | _| | |\__ \__ \
// \___|___|___|___/___/
// BSD 3-Clause License
// 3-Clause BSD License
//
// Copyright (c) 1998-2022 Ryan Geiss (@geissomatik)
//
Expand Down Expand Up @@ -3142,9 +3142,9 @@ BOOL CALLBACK DisclaimerDialogProc(HWND hwnd,UINT msg,WPARAM wParam,LPARAM lPara

SendMessage( GetDlgItem( hwnd, IDC_DISC ), EM_SETLIMITTEXT, 16000, 0 );

wsprintf(buf,
"Geiss is entirely copyright (c) 1998,99 by Ryan M. Geiss.\r\n"
"All rights are reserved.\r\n"
strcpy(buf,
"Geiss is entirely copyright (c) 1998-2022 by Ryan M. Geiss.\r\n"
"It is licensed under the 3-Clause BSD License.\r\n"
"\r\n"
"SYSTEM REQUIREMENTS\r\n"
"-------------------\r\n"
Expand All @@ -3153,25 +3153,40 @@ BOOL CALLBACK DisclaimerDialogProc(HWND hwnd,UINT msg,WPARAM wParam,LPARAM lPara
"3. Pentium-200 or faster processor.\r\n"
"\r\n"
);
wsprintf((char *)(buf+strlen(buf)),
"TERMS OF USE / COPYRIGHT INFORMATION / PUBLIC DISPLAY"
"---------------------------------\r\n"
"Geiss is 100 percent free for personal use. No registration is required.\r\n"
"Any commercial use of this program, however, requires the consent of the\r\n"
"author. For large ventures this will involve a licensing fee. Be wary\r\n"
"that every image or video sequence generated with this program is the sole\r\n"
"copyright of Ryan M. Geiss and can not be reproduced or displayed in public\r\n"
"without permission.\r\n"
"\r\n"
);
wsprintf((char *)(buf+strlen(buf)),
strcat(buf,
"LICENSE AGREEMENT\r\n"
"-----------------\r\n"
"You may personally use and copy Geiss freely. However, you may NOT charge\r\n"
"money for distributing Geiss. Don't try to sell this program - it's free.\r\n"
"3-Clause BSD License\r\n"
"\r\n"
"Copyright (c) 1998-2022 Ryan Geiss (@geissomatik)\r\n"
"\r\n"
"Redistribution and use in source and binary forms, with or without\r\n"
"modification, are permitted provided that the following conditions are met:\r\n"
"\r\n"
"1. Redistributions of source code must retain the above copyright notice, this\r\n"
" list of conditions and the following disclaimer.\r\n"
"\r\n"
"2. Redistributions in binary form must reproduce the above copyright notice,\r\n"
" this list of conditions and the following disclaimer in the documentation\r\n"
" and/or other materials provided with the distribution.\r\n"
"\r\n"
"3. Neither the name of the copyright holder nor the names of its\r\n"
" contributors may be used to endorse or promote products derived from\r\n"
" this software without specific prior written permission.\r\n"
"\r\n"
"THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"\r\n"
"AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\r\n"
"IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\r\n"
"DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE\r\n"
"FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\r\n"
"DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR\r\n"
"SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\r\n"
"CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,\r\n"
"OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\r\n"
"OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\r\n"
"\r\n"
);
wsprintf((char *)(buf+strlen(buf)),
strcat(buf,
"DISCLAIMER\r\n"
"----------\r\n"
"The author is not responsible for any damages or loss of data that\r\n"
Expand All @@ -3182,7 +3197,7 @@ BOOL CALLBACK DisclaimerDialogProc(HWND hwnd,UINT msg,WPARAM wParam,LPARAM lPara
"\r\n"
);
#if SAVER
wsprintf((char *)(buf+strlen(buf)),
strcat(buf,
"USE PASSWORD FEATURE AT OWN RISK\r\n"
"--------------------------------\r\n"
"Passwords are supported since version 4.0, but might not be\r\n"
Expand Down
2 changes: 1 addition & 1 deletion outsound.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// / __| __|_ _/ __/ __|
// | (_ | _| | |\__ \__ \
// \___|___|___|___/___/
// BSD 3-Clause License
// 3-Clause BSD License
//
// Copyright (c) 1998-2022 Ryan Geiss (@geissomatik)
//
Expand Down
Loading