From d40cb2b0f076454eb15661fc6f1aa7f7e690f456 Mon Sep 17 00:00:00 2001
From: "Kirill Lipatov (Leency)" <lipatov.kiril@gmail.com>
Date: Fri, 20 Apr 2018 11:44:59 +0000
Subject: [PATCH] delete app_installer as outdated

git-svn-id: svn://kolibrios.org@7246 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/cmm/app_installer/build_en.bat       | 12 -----
 .../app_installer/generate_file_listing.bat   | 31 -------------
 programs/cmm/app_installer/installer.c        | 40 -----------------
 programs/cmm/easyshot/easyshot.c              |  4 +-
 programs/cmm/lib/dll.h                        | 45 +------------------
 programs/cmm/lib/gui.h                        |  3 --
 6 files changed, 2 insertions(+), 133 deletions(-)
 delete mode 100644 programs/cmm/app_installer/build_en.bat
 delete mode 100644 programs/cmm/app_installer/generate_file_listing.bat
 delete mode 100644 programs/cmm/app_installer/installer.c

diff --git a/programs/cmm/app_installer/build_en.bat b/programs/cmm/app_installer/build_en.bat
deleted file mode 100644
index f6885f694c..0000000000
--- a/programs/cmm/app_installer/build_en.bat
+++ /dev/null
@@ -1,12 +0,0 @@
-@del lang.h--
-@echo #define LANG_ENG 1 >lang.h--
-
-call generate_file_listing.bat
-
-@C-- installer.c
-@del installer.kex
-@rename installer.com installer.kex
-@kpack installer.kex
-@del lang.h--
-@del warning.txt
-@pause
\ No newline at end of file
diff --git a/programs/cmm/app_installer/generate_file_listing.bat b/programs/cmm/app_installer/generate_file_listing.bat
deleted file mode 100644
index 8f175d1e8a..0000000000
--- a/programs/cmm/app_installer/generate_file_listing.bat
+++ /dev/null
@@ -1,31 +0,0 @@
-@echo off
-set TXTFILE=file_listing.h
-set DIRPATH="KingsBounty/*"
-set DIRNAME=KingsBounty
-set INDEX=0
-
-::Create TXTFILE
-echo //FIle listing generated by BAT script > "%TXTFILE%"
-
-::List files in DIRPATH and call function to write
-::files into TXTFILE
-FOR %%i IN (%DIRPATH%) DO Call :Function_Write %%i
-
-echo %TXTFILE% created from files in directory %DIRPATH%
-GoTo :EOF 
-
-:Function_Write
-echo #define FILE_NAME_%INDEX% "%DIRNAME%/%1\0" >> "%TXTFILE%"
-echo dword file%INDEX% = FROM FILE_NAME_%INDEX%;  >> "%TXTFILE%"
-
-if %INDEX%==10 set INDEX=11
-if %INDEX%==9 set INDEX=10
-if %INDEX%==8 set INDEX=9
-if %INDEX%==7 set INDEX=8
-if %INDEX%==6 set INDEX=7
-if %INDEX%==5 set INDEX=6
-if %INDEX%==4 set INDEX=5
-if %INDEX%==3 set INDEX=4
-if %INDEX%==2 set INDEX=3
-if %INDEX%==1 set INDEX=2
-if %INDEX%==0 set INDEX=1
diff --git a/programs/cmm/app_installer/installer.c b/programs/cmm/app_installer/installer.c
deleted file mode 100644
index c1a1e5c1ba..0000000000
--- a/programs/cmm/app_installer/installer.c
+++ /dev/null
@@ -1,40 +0,0 @@
-#define MEMSIZE 731935 + 200200
-#include "..\lib\strings.h"
-#include "..\lib\file_system.h"
-
-char app_name[] = "KingsBounty";
-
-//file_listing.h must be generated using generate_file_listing.bat
-#include "file_listing.h"
-
-:dword makepath(dword basic_path, relative_path)
-{
-	char absolute_path[4096];
-	strcpy(#absolute_path, basic_path);
-	strcat(#absolute_path, relative_path);	
-	return #absolute_path;
-}
-
-void main()
-{
-if (dir_exists("/kolibrios")==false) 
-die("'/kolibrios/ folder is not mounted!
-Please run APP+ on desktop.
-You must use ISO distro.'E");
-
-CreateDir("/tmp0/1/DOS");
-CreateDir(sprintf(#param, "/tmp0/1/DOS/%s", #app_name));
-
-if (EAX!=0) {
-	die("'/tmp0/1/ is not mounted!\nPlease run TMPDISK to add it.'E");
-}
-
-CreateFile(sizeof(file0), #file0, makepath("/tmp0/1/DOS/", FILE_NAME_0));
-
-notify(sprintf(#param, "'%s\nInstalled to /tmp0/1/DOS/\nEnjoy the game!'tO", #app_name));
-RunProgram("/sys/@open", sprintf(#param, "/tmp0/1/DOS/%s/PLAY.sh", #app_name));
-
-ExitProcess();
-}
-
-stop:
\ No newline at end of file
diff --git a/programs/cmm/easyshot/easyshot.c b/programs/cmm/easyshot/easyshot.c
index c12a7a1909..91f36848c4 100644
--- a/programs/cmm/easyshot/easyshot.c
+++ b/programs/cmm/easyshot/easyshot.c
@@ -37,6 +37,7 @@
 /* === DATA === */	
 
 proc_info Form;
+proc_info Settings;
 
 dword screenshot;
 int screenshot_length;
@@ -59,7 +60,6 @@ edit_box edit_save = {250,25,100,0xffffff,0x94AECE,0xFFFfff,0xffffff,
 more_less_box delay = { 1, 0, 64, T_DELAY };
 checkbox minimize = { T_MINIMIZE, true };
 
-proc_info Settings;
 
 opendialog open_folder_dialog = 
 {
@@ -119,11 +119,9 @@ void main()
 		break;
      
 	case evReDraw:
-		system.color.get();
 		DefineAndDrawWindow(screen.width/4, screen.height-100/3, 270, 
 			skin_height + 27+PD+PD, 0x34, system.color.work, T_WTITLE,0);
 		GetProcessInfo(#Form, SelfInfo);
-		if (Form.status_window>2) break;
 		DrawMainContent();
 	}
 }
diff --git a/programs/cmm/lib/dll.h b/programs/cmm/lib/dll.h
index 0841baa881..4254a8c198 100644
--- a/programs/cmm/lib/dll.h
+++ b/programs/cmm/lib/dll.h
@@ -16,17 +16,11 @@
 
 char a_libdir[43]  = "/sys/lib/\0";
 
-dword GLOBAL_FUNC_LIB = 0;
-dword G_FUNC_LOAD = 0;
-dword G_FUNC_GET = 0;
-dword PATH_LIBRARY_LOADING = "/rd/1/lib/library.obj";
-
 :inline void error_init(dword text)
 {
-	dword TEXT_ERROR = malloc(1024);
+	dword TEXT_ERROR[1024];
 	sprintf(TEXT_ERROR, "%s `%s`' -E",_TEXT_ERROR_ADD,text);
 	notify(TEXT_ERROR);
-	free(TEXT_ERROR);
 }
 
 // stdcall with 1 parameter
@@ -254,42 +248,5 @@ asm {
 	return true;
 }
 
-:struct OBJECT
-{
-	void load(dword dllname);
-	dword get(dword fname);
-} library;
-
-:void OBJECT::load(dword dllname)
-{
-	dword tmp;
-	IF(!GLOBAL_FUNC_LIB)
-	{
-		$mov eax, 68
-		$mov ebx, 19
-		ECX=#PATH_LIBRARY_LOADING;
-		$int 0x40
-		tmp = EAX;
-		GLOBAL_FUNC_LIB = tmp;
-		tmp+=4;
-		G_FUNC_LOAD = DSDWORD[tmp];
-		tmp+=8;
-		G_FUNC_GET = DSDWORD[tmp];
-	}
-	G_FUNC_LOAD stdcall(dllname);
-}
-
-:dword OBJECT::get(dword fname)
-{
-	dword tmp=fname;
-	G_FUNC_GET stdcall(tmp);
-	return EAX;
-}
-
-/*
-#define INIT_(name) byte init_#name(){object.load(name);
-#define IMPORT(name) name = object.get(name);
-#define _INIT return 1;}
-*/
 
 #endif
\ No newline at end of file
diff --git a/programs/cmm/lib/gui.h b/programs/cmm/lib/gui.h
index 8a07cf75d5..4683f55c23 100644
--- a/programs/cmm/lib/gui.h
+++ b/programs/cmm/lib/gui.h
@@ -30,7 +30,6 @@
 
 :void DrawRectangle(dword x,y,w,h,color1)
 {
-	if (w<=0) || (h<=0) return;
 	DrawBar(x,y,w,1,color1);
 	DrawBar(x,y+h,w,1,color1);
 	DrawBar(x,y,1,h,color1);
@@ -39,7 +38,6 @@
 
 :void DrawWideRectangle(dword x,y,w,h,boder,color1)
 {
-	if (w<=0) || (h<=0) return;
 	DrawBar(x, y, w, boder, color1);
 	DrawBar(x, y+h-boder, w, boder, color1);
 	DrawBar(x, y+boder, boder, h-boder-boder, color1);
@@ -48,7 +46,6 @@
 
 :void DrawRectangle3D(dword x,y,w,h,color1,color2)
 {
-	if (w<=0) || (h<=0) return;
 	DrawBar(x,y,w+1,1,color1);
 	DrawBar(x,y+1,1,h-1,color1);
 	DrawBar(x+w,y+1,1,h,color2);