Merge pull request #1 from ixe013/feature/no-icon

Syncing the Subversion version, one last time
ixe013 · Dec 23, 2020 · 073d87e · 073d87e
2 parents f87ea43 + e5622fe
commit 073d87e
Show file tree

Hide file tree

Showing 34 changed files with 943 additions and 72 deletions.
diff --git a/Debug.reg b/Debug.reg
@@ -1,3 +1,27 @@
+;Copyright (c) 2019, Solutions Paralint inc.
+;All rights reserved.
+;
+;Redistribution and use in source and binary forms, with or without
+;modification, are permitted provided that the following conditions are met:
+;    * Redistributions of source code must retain the above copyright
+;      notice, this list of conditions and the following disclaimer.
+;    * 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.
+;    * Neither the name of the <organization> 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 <COPYRIGHT HOLDER> 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.
 REGEDIT4
 
 ;****************************************************************************

diff --git a/cnotifu/cnotifu.vcxproj b/cnotifu/cnotifu.vcxproj
@@ -1,5 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!--
+Copyright (c) 2019, Solutions Paralint inc.                                     
+All rights reserved.                                                            
+                                                                                
+Redistribution and use in source and binary forms, with or without              
+modification, are permitted provided that the following conditions are met:     
+    * Redistributions of source code must retain the above copyright            
+      notice, this list of conditions and the following disclaimer.             
+    * 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.      
+    * Neither the name of the <organization> 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 <COPYRIGHT HOLDER> 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.                    
+  -->
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -21,10 +47,12 @@
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -97,6 +125,7 @@
     <ClCompile Include="..\notifu\QueryContinueOneInstance.cpp" />
     <ClCompile Include="..\notifu\RegistryFix.cpp" />
     <ClCompile Include="..\notifu\Serialize.cpp" />
+    <ClCompile Include="..\notifu\License.cpp" />
     <ClCompile Include="..\notifu\Settings.c">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
       </PrecompiledHeader>
@@ -128,6 +157,7 @@
     <ClInclude Include="..\notifu\resource.h" />
     <ClInclude Include="..\notifu\returnvalue.h" />
     <ClInclude Include="..\notifu\Serialize.h" />
+    <ClInclude Include="..\notifu\License.h" />
     <ClInclude Include="..\notifu\settings.h" />
     <ClInclude Include="..\notifu\stdafx.h" />
     <ClInclude Include="..\notifu\Trace.h" />
@@ -140,4 +170,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/makezip.cmd b/makezip.cmd
@@ -1,3 +1,29 @@
+@REM Copyright (c) 2019, Solutions Paralint inc.
+@REM All rights reserved.
+@REM
+@REM Redistribution and use in source and binary forms, with or without
+@REM modification, are permitted provided that the following conditions are met:
+@REM     * Redistributions of source code must retain the above copyright
+@REM       notice, this list of conditions and the following disclaimer.
+@REM     * Redistributions in binary form must reproduce the above copyright
+@REM       notice, this list of conditions and the following disclaimer in the
+@REM       documentation and/or other materials provided with the distribution.
+@REM     * Neither the name of the <organization> nor the
+@REM       names of its contributors may be used to endorse or promote products
+@REM       derived from this software without specific prior written permission.
+@REM
+@REM THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+@REM ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+@REM WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+@REM DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+@REM DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+@REM (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+@REM LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+@REM ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+@REM (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+@REM SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
 @echo off                            
 
 setlocal
@@ -13,11 +39,11 @@ svn list -R | zip %PROJECT_NAME%-src.zip -@
 
 echo.
 echo Preparing for build
-md %PROJECT_NAME%_build
+if not exist %PROJECT_NAME%_build mkdir %PROJECT_NAME%_build
 
 pushd %PROJECT_NAME%_build
 
-unzip -q ..\%PROJECT_NAME%-src.zip
+unzip -qo ..\%PROJECT_NAME%-src.zip
 
 echo.
 findstr /s /n DebugBreak *.c *.cpp *.h 

diff --git a/notifu/CommandLine.cpp b/notifu/CommandLine.cpp
@@ -1,5 +1,29 @@
-// CommandLine.cpp: implementation of the CCommandLine class.
+// Copyright (c) 2019, Solutions Paralint inc.                                     
+// All rights reserved.                                                            
+//                                                                                 
+// Redistribution and use in source and binary forms, with or without              
+// modification, are permitted provided that the following conditions are met:     
+//     * Redistributions of source code must retain the above copyright            
+//       notice, this list of conditions and the following disclaimer.             
+//     * 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.      
+//     * Neither the name of the <organization> 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 <COPYRIGHT HOLDER> 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.                    
 //
+// CommandLine.cpp: implementation of the CCommandLine class.
 //////////////////////////////////////////////////////////////////////
 
 #include "stdafx.h"
@@ -28,6 +52,7 @@ CCommandLine::CCommandLine()
 , ForceXP(L"xp", L"Force WindowsXP ballon tips behavior")
 , Queue(L"c", L"Constant (persistent) instance, will not be dismissed by new instances")
 , KillAll(L"k", L"Removes every instance of Notifu, even the ones who are waiting to be displayed")
+, License(L"l", L"Diplay the license (BSD-3-Clause)")
 , IconFileName(L"i", L"Specify an icon to use ('parent' uses the icon of the parent process)")
 {
 }
@@ -38,6 +63,7 @@ void CCommandLine::Setup()
 	Type.AddValue(L"info", L"The message is an informational message");
 	Type.AddValue(L"warn", L"The message is an warning message");
 	Type.AddValue(L"error", L"The message is an error message");
+	Type.AddValue(L"none", L"Do not display an icon next to the message");
 
 	Delay.SetDefaultValue(0);
 	Type.SetDefaultValue(L"info");
@@ -55,6 +81,7 @@ void CCommandLine::Setup()
 	AddFlag(ForceXP);
 	AddFlag(Queue);
 	AddFlag(KillAll);
+	AddFlag(License);
 }
 
 HRESULT CCommandLine::CopyCommandLineToParams(NOTIFU_PARAM& params)
@@ -68,7 +95,10 @@ HRESULT CCommandLine::CopyCommandLineToParams(NOTIFU_PARAM& params)
 		params.mType = NIIF_WARNING;
 	else if(Type.Value() == L"error")
 		params.mType = NIIF_ERROR;
-	else
+	else if(Type.Value() == L"none")
+        //should have been the default from the stard, but I don't want to introduce a breaking change now
+		params.mType = 0; 
+    else
 		params.mType = NIIF_INFO;
 
 	if(NoSound)

diff --git a/notifu/CommandLine.h b/notifu/CommandLine.h
@@ -1,3 +1,28 @@
+// Copyright (c) 2019, Solutions Paralint inc.                                     
+// All rights reserved.                                                            
+//                                                                                 
+// Redistribution and use in source and binary forms, with or without              
+// modification, are permitted provided that the following conditions are met:     
+//     * Redistributions of source code must retain the above copyright            
+//       notice, this list of conditions and the following disclaimer.             
+//     * 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.      
+//     * Neither the name of the <organization> 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 <COPYRIGHT HOLDER> 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.                    
+//
 // CommandLine.h: interface for the CCommandLine class.
 //
 //////////////////////////////////////////////////////////////////////
@@ -26,6 +51,7 @@ class CCommandLine
 	FlagArg ForceXP;
 	FlagArg Queue;
 	FlagArg KillAll;
+	FlagArg License;
 	ValueArg<tstring> IconFileName;
 
 public:

diff --git a/notifu/CommandLineParser.cpp b/notifu/CommandLineParser.cpp
@@ -1,3 +1,27 @@
+// Copyright (c) 2019, Solutions Paralint inc.                                     
+// All rights reserved.                                                            
+//                                                                                 
+// Redistribution and use in source and binary forms, with or without              
+// modification, are permitted provided that the following conditions are met:     
+//     * Redistributions of source code must retain the above copyright            
+//       notice, this list of conditions and the following disclaimer.             
+//     * 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.      
+//     * Neither the name of the <organization> 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 <COPYRIGHT HOLDER> 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.                    
 #include "stdafx.h"
 #include "CommandLineParser.h"
 

diff --git a/notifu/Icon.cpp b/notifu/Icon.cpp
@@ -1,3 +1,28 @@
+// Copyright (c) 2019, Solutions Paralint inc.                                     
+// All rights reserved.                                                            
+//                                                                                 
+// Redistribution and use in source and binary forms, with or without              
+// modification, are permitted provided that the following conditions are met:     
+//     * Redistributions of source code must retain the above copyright            
+//       notice, this list of conditions and the following disclaimer.             
+//     * 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.      
+//     * Neither the name of the <organization> 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 <COPYRIGHT HOLDER> 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.                    
+//                                                                                 
 // Icon.cpp: implementation of the Icon class.
 //
 //////////////////////////////////////////////////////////////////////