From ab513983d63af56c85186421e17a4205735a3d25 Mon Sep 17 00:00:00 2001
From: Alexander Zhirov <a.zhirov@agrohold.ru>
Date: Fri, 15 Jul 2022 18:53:03 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B8=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B8=20=D0=BF=D0=BE=D0=B4=D0=BA=D0=BB=D1=8E=D1=87?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db.c                 |   7 ++---
 freerdp.db           | Bin 81920 -> 81920 bytes
 gui.c                |  14 ++++-----
 main.c => xfreerdp.c |   0
 xrdp.c               |  71 +++++++++++++++++++++++++++++++++++++++++++
 xrdp.h               |  13 ++++++++
 6 files changed, 94 insertions(+), 11 deletions(-)
 rename main.c => xfreerdp.c (100%)
 create mode 100644 xrdp.c
 create mode 100644 xrdp.h

diff --git a/db.c b/db.c
index d9e429e..5cacce3 100644
--- a/db.c
+++ b/db.c
@@ -368,18 +368,17 @@ bool dbSetUserNameCurrent(char *current)
         sqlite3_bind_int(res, 3, VALUE_USERNAME);
     }
 
-
     if (sqlite3_step(res) == SQLITE_BUSY)
     {
-        fprintf(stderr, "[ЗАНЯТО] %s - \"%s\"\n", text ? "установлено" : "очищено", getParameter(VALUE_USERNAME)->key);
+        fprintf(stderr, "[ЗАНЯТО] %s - \"%s\"\n", text ? "установлено" : "очищено", text ? getValue(VALUE_USERNAME)->current : "");
     }
     if (sqlite3_step(res) == SQLITE_ERROR)
     {
-        fprintf(stderr, "[ОШИБКА] %s - \"%s\"\n", text ? "установлено" : "очищено", getParameter(VALUE_USERNAME)->key);
+        fprintf(stderr, "[ОШИБКА] %s - \"%s\"\n", text ? "установлено" : "очищено", text ? getValue(VALUE_USERNAME)->current : "");
     }
     if (sqlite3_step(res) == SQLITE_DONE)
     {
-        fprintf(stdout, "[УСПЕШНО] %s - \"%s\"\n", text ? "установлено" : "очищено", getParameter(VALUE_USERNAME)->key);
+        fprintf(stdout, "[УСПЕШНО] %s - \"%s\"\n", text ? "установлено" : "очищено", text ? getValue(VALUE_USERNAME)->current : "");
     }
 
     sqlite3_finalize(res);
diff --git a/freerdp.db b/freerdp.db
index 2e536902f0fc7f054838d9726a20e14e77337ad4..620b020b2378504d09fa1257475215936834f235 100644
GIT binary patch
delta 66
zcmV-I0KNZ!fCYen1&|v7z>yq70l=|fp<fFR!vG8pp#lz}57e^^V7Ct#0000HFDVIO
YXL4_7Z){{-VG{ub001cnv)gYa(6+x69RL6T

delta 50
zcmV-20L}k^fCYen1&|v7yOA720lTqap<fFC000aQp#lz}55uzzV7CthBmo5glX7k%
Iv*~Xa(2npB5&!@I

diff --git a/gui.c b/gui.c
index 49ed722..fc44f50 100644
--- a/gui.c
+++ b/gui.c
@@ -17,6 +17,7 @@
 #include "address.h"
 
 #include "db.h"
+#include "xrdp.h"
 
 static int guiExit(Ihandle *self)
 {
@@ -40,19 +41,18 @@ static int guiConnect(Ihandle *self)
     {
         printf("%s\n", args.argv[i]);
     }
-    printf("\n");
-    freeArguments(&args);
 
-    if (!dbAddServer(result, IupGetAttribute(IupGetDialogChild(self, "SERVER"), "VALUE")))
-    {
-        IupSetAttribute(IupGetDialogChild(self, "SERVER"), "APPENDITEM", IupGetAttribute(IupGetDialogChild(self, "SERVER"), "VALUE"));
-    }
 //    if (free_rdp_connect(args.argc, args.argv) != XF_EXIT_DNS_NAME_NOT_FOUND)
 //    {
-//        dbSetValueCurrent(VALUE_SERVER, IupGetAttribute(IupGetDialogChild(self, "SERVER"), "LINEVALUE"));
+        if (!dbAddServer(result, IupGetAttribute(IupGetDialogChild(self, "SERVER"), "VALUE")))
+        {
+            IupSetAttribute(IupGetDialogChild(self, "SERVER"), "APPENDITEM", IupGetAttribute(IupGetDialogChild(self, "SERVER"), "VALUE"));
+        }
         dbSetUserNameCurrent(IupGetAttribute(IupGetDialogChild(self, "USER"), "LINEVALUE"));
 //    }
 
+    freeArguments(&args);
+
     return IUP_DEFAULT;
 }
 
diff --git a/main.c b/xfreerdp.c
similarity index 100%
rename from main.c
rename to xfreerdp.c
diff --git a/xrdp.c b/xrdp.c
new file mode 100644
index 0000000..5448459
--- /dev/null
+++ b/xrdp.c
@@ -0,0 +1,71 @@
+//#ifdef HAVE_CONFIG_H
+//#include "config.h"
+//#endif
+//
+//#include <winpr/crt.h>
+//#include <winpr/synch.h>
+//#include <winpr/thread.h>
+//
+//#include <freerdp/freerdp.h>
+//#include <freerdp/client/cmdline.h>
+//
+//#include "../xf_client.h"
+//#include "../xfreerdp.h"
+//
+//#include <stdlib.h>
+//#include <stdio.h>
+//#include <string.h>
+//#include <iup.h>
+//
+//#include "xrdp.h"
+//
+//int free_rdp_connect(int argc, char **argv)
+//{
+//    int rc = 1;
+//    int status;
+//    HANDLE thread;
+//    xfContext *xfc;
+//    DWORD dwExitCode;
+//    rdpContext *context;
+//    rdpSettings *settings;
+//    RDP_CLIENT_ENTRY_POINTS clientEntryPoints;
+//
+//    ZeroMemory(&clientEntryPoints, sizeof(RDP_CLIENT_ENTRY_POINTS));
+//    clientEntryPoints.Size = sizeof(RDP_CLIENT_ENTRY_POINTS);
+//    clientEntryPoints.Version = RDP_CLIENT_INTERFACE_VERSION;
+//
+//    RdpClientEntry(&clientEntryPoints);
+//
+//    context = freerdp_client_context_new(&clientEntryPoints);
+//    if (!context)
+//        return 1;
+//
+//    settings = context->settings;
+//    xfc = (xfContext*) context;
+//
+//    status = freerdp_client_settings_parse_command_line(context->settings, argc, argv, FALSE);
+//    if (status)
+//    {
+//        rc = freerdp_client_settings_command_line_status_print(settings, status, argc, argv);
+//
+//        if (settings->ListMonitors)
+//            xf_list_monitors(xfc);
+//
+//        goto out;
+//    }
+//
+//    if (freerdp_client_start(context) != 0)
+//        goto out;
+//
+//    thread = freerdp_client_get_thread(context);
+//
+//    WaitForSingleObject(thread, INFINITE);
+//    GetExitCodeThread(thread, &dwExitCode);
+//    rc = xf_exit_code_from_disconnect_reason(dwExitCode);
+//
+//    freerdp_client_stop(context);
+//
+//    out: freerdp_client_context_free(context);
+//
+//    return rc;
+//}
diff --git a/xrdp.h b/xrdp.h
new file mode 100644
index 0000000..4fac1a1
--- /dev/null
+++ b/xrdp.h
@@ -0,0 +1,13 @@
+/*
+ * xrdp.h
+ *
+ *  Created on: 15 июл. 2022 г.
+ *      Author: alexander
+ */
+
+#ifndef XRDP_H_
+#define XRDP_H_
+
+int free_rdp_connect(int argc, char **argv);
+
+#endif /* XRDP_H_ */