From d6315f14ab545412a02a9199acb5a61537ec921d Mon Sep 17 00:00:00 2001
From: Gerardo <gerardo@narvaling.com>
Date: Wed, 18 Jan 2023 00:24:22 +0100
Subject: [PATCH] Diferenciar nombre producto

---
 LicServer/AppClasSrv.h           |  1 +
 LicServer/LicServer.cpp          | 29 +++++++++++++++++++----------
 LicServer/LicServer.vcxproj      | 10 +++++-----
 LicServer/LicServer.vcxproj.user |  8 +++++++-
 4 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/LicServer/AppClasSrv.h b/LicServer/AppClasSrv.h
index 551efb0..3a7a7b2 100644
--- a/LicServer/AppClasSrv.h
+++ b/LicServer/AppClasSrv.h
@@ -10,6 +10,7 @@ public:
 	char key[32];
 	char user[32];
 	char path[256];
+	char nombreProducto[32];
 
 	virtual void log_ext( __time64_t tiemp, char *modulo, char *fmt );
 	void runApp();
diff --git a/LicServer/LicServer.cpp b/LicServer/LicServer.cpp
index 26a86e5..62f6e8e 100644
--- a/LicServer/LicServer.cpp
+++ b/LicServer/LicServer.cpp
@@ -32,11 +32,11 @@ int _tmain(int argc, TCHAR* argv[], TCHAR* envp[])
 	if (!AfxWinInit(::GetModuleHandle(NULL), NULL, ::GetCommandLine(), 0))
 	{
 		// TODO: change error code to suit your needs
-		_tprintf(_T("Fatal Error: MFC initialization failed\n"));
 		nRetCode = 1;
 	}
 	else
 	{
+		_tprintf(_T("Fatal Error: MFC initialization failed\n"));
 		if(argc==1)
 		{
 			ClienteLicencias lic;
@@ -60,26 +60,35 @@ int _tmain(int argc, TCHAR* argv[], TCHAR* envp[])
 			system("pause");
 
 		}
-		else if(argc>=2 && argc<=4 )
+		else if(argc>=2 && argc<=5 )
 		{
 			LicCliente cli;
 			int tipo =0;
+			char nombreProducto[32];
+			nombreProducto[0] = 0;
+			char* n_produc = NULL;
 			for (int i =1; i<argc; i++)
 			{
-				if(app.key[0]==0)
+				if(!app.key[0])
 				{
 					strcpy(app.key,argv[i]);
-					continue;;
+					continue;
 				}
-				if(app.path[0]==0)
+				if (!app.path[0])
 				{
-					strcpy(app.path,argv[i]);
-					continue;;
+					strcpy(app.path, argv[i]);
+					continue;
 				}
-				if(tipo==0)
+				if(!tipo)
 				{
 					tipo = atoi(argv[i]);
-					continue;;
+					continue;
+				}
+				if (!nombreProducto[0])
+				{
+					strcpy(nombreProducto, argv[i]);
+					n_produc = nombreProducto;
+					continue;
 				}
 			}
 			char *pp=NULL;
@@ -88,7 +97,7 @@ int _tmain(int argc, TCHAR* argv[], TCHAR* envp[])
 			if(tipo)
 			{
 				C_log::log("Main", "Generando licencia");
-				cli.creaLicPropietaria(app.key,tipo, pp);
+				cli.creaLicPropietaria(app.key,tipo, pp, n_produc);
 			}
 			else if(!cli.cargaLicencia(&app, pp))
 				C_log::log("Main", "Error al cargar licencia");
diff --git a/LicServer/LicServer.vcxproj b/LicServer/LicServer.vcxproj
index ab908f8..9dc76b6 100644
--- a/LicServer/LicServer.vcxproj
+++ b/LicServer/LicServer.vcxproj
@@ -22,32 +22,32 @@
     <ProjectGuid>{D22EED4D-CE8E-4310-9C3A-DC7DE0368623}</ProjectGuid>
     <RootNamespace>LicServer</RootNamespace>
     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
diff --git a/LicServer/LicServer.vcxproj.user b/LicServer/LicServer.vcxproj.user
index be25078..f884ea0 100644
--- a/LicServer/LicServer.vcxproj.user
+++ b/LicServer/LicServer.vcxproj.user
@@ -1,4 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LocalDebuggerCommandArguments>OliviaGMP_3_1 OliviaTasks.exe 2 OliviaTasks_3_1</LocalDebuggerCommandArguments>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+    <LocalDebuggerCommand>D:\desa\v2019\bin\$(IntDir)$(TargetFileName)</LocalDebuggerCommand>
+    <LocalDebuggerAttach>false</LocalDebuggerAttach>
+    <LocalDebuggerWorkingDirectory>D:\desa\v2019\bin\$(IntDir)</LocalDebuggerWorkingDirectory>
+  </PropertyGroup>
 </Project>
\ No newline at end of file