[Wine-patches] [school] LPT Katran is not working without etersafe (eterbug #7497)

[Alexander Morozov]

----------- следующая часть -----------
From 9076b23a95a19b4efd01158513d19e51e21f53a4 Mon Sep 17 00:00:00 2001
From: Alexander Morozov <amorozov на etersoft.ru>
Date: Thu, 4 Aug 2011 16:13:06 +0400
Subject: [school] LPT Katran is not working without etersafe (eterbug #7497).

---
 etersoft/reg.d/lpt_katran.reg |   11 -----------
 programs/winecfg/dongleui.c   |   15 ---------------
 2 files changed, 0 insertions(+), 26 deletions(-)
 delete mode 100644 etersoft/reg.d/lpt_katran.reg

diff --git a/etersoft/reg.d/lpt_katran.reg b/etersoft/reg.d/lpt_katran.reg
deleted file mode 100644
index 148cf55..0000000
--- a/etersoft/reg.d/lpt_katran.reg
+++ /dev/null
@@ -1,11 +0,0 @@
-# (c) Etersoft 2009
-# Katran lpt key support
-
-[HKEY_LOCAL_MACHINE\System\CurrentControlSet\Enum\Root\PKEY\0000]
-"ClassGUID"="{FF646F80-8DEF-11D2-9449-00105A075F6B}"
-"Service"="PKey"
-
-[HKEY_LOCAL_MACHINE\System\CurrentControlSet\Services\PKey]
-"ErrorControl"=dword:00000001
-"ImagePath"="system32\\DRIVERS\\PKey.sys"
-"Type"=dword:00000001
diff --git a/programs/winecfg/dongleui.c b/programs/winecfg/dongleui.c
index e7e7333..db9cc91 100644
--- a/programs/winecfg/dongleui.c
+++ b/programs/winecfg/dongleui.c
@@ -51,7 +51,6 @@ static WCHAR device[2][LOADSTRING_SIZE];
 
 static const char* dongles[] = {"Guardant",
                                 "HASP HL",
-                                "LPT Katran",
                                 "USB Katran",
                                 "Senselock",
                                 "Sentinel",
@@ -64,7 +63,6 @@ static const WCHAR grdusbW[] = {'G','r','d','U','s','b',0};
 static const WCHAR hardlockW[] = {'H','a','r','d','l','o','c','k',0};
 static const WCHAR akshaspW[] = {'a','k','s','h','a','s','p',0};
 static const WCHAR aksusbW[] = {'a','k','s','u','s','b',0};
-static const WCHAR pkeyW[] = {'P','K','e','y',0};
 static const WCHAR nkeyW[] = {'N','K','e','y',0};
 static const WCHAR upkeyW[] = {'U','P','K','e','y',0};
 static const WCHAR sense4v2W[] = {'s','e','n','s','e','4','v','2',0};
@@ -78,7 +76,6 @@ enum dongle_t
 {
     guardant,
     hasp,
-    katran_lpt,
     katran_usb,
     senselock,
     sentinel,
@@ -167,7 +164,6 @@ static int is_loaded(enum dongle_t dongle)
 {
     static const WCHAR nvkeyntW[] = {'\\','\\','.','\\','n','v','k','e','y','n','t',0};
     static const WCHAR fentedevW[] = {'\\','\\','.','\\','f','e','n','t','e','d','e','v',0};
-    static const WCHAR pkey0W[] = {'\\','\\','.','\\','p','k','e','y','0',0};
     static const WCHAR nkey0W[] = {'\\','\\','.','\\','n','k','e','y','0',0};
     static const WCHAR upkey0W[] = {'\\','\\','.','\\','u','p','k','e','y','0',0};
     static const WCHAR rnbodrv0W[] = {'\\','\\','.','\\','r','n','b','o','d','r','v','0',0};
@@ -189,10 +185,6 @@ static int is_loaded(enum dongle_t dongle)
         if (file_exists(fentedevW) && interface_exists(&hasp_intf))
             return 1;
         break;
-    case katran_lpt:
-        if (file_exists(pkey0W))
-            return 1;
-        break;
     case katran_usb:
         if (file_exists(nkey0W) && file_exists(upkey0W))
             return 1;
@@ -253,9 +245,6 @@ static void set_start(enum dongle_t dongle, int start)
         set_service_start(akshaspW, start ? SERVICE_DEMAND_START : SERVICE_DISABLED);
         set_service_start(aksusbW, start ? SERVICE_DEMAND_START : SERVICE_DISABLED);
         break;
-    case katran_lpt:
-        set_service_start(pkeyW, start ? SERVICE_DEMAND_START : SERVICE_DISABLED);
-        break;
     case katran_usb:
         set_service_start(nkeyW, start ? SERVICE_DEMAND_START : SERVICE_DISABLED);
         set_service_start(upkeyW, start ? SERVICE_DEMAND_START : SERVICE_DISABLED);
@@ -288,10 +277,6 @@ static int get_start(enum dongle_t dongle)
             get_service_start(aksusbW) == SERVICE_DEMAND_START)
             return 1;
         break;
-    case katran_lpt:
-        if (get_service_start(pkeyW) == SERVICE_DEMAND_START)
-            return 1;
-        break;
     case katran_usb:
         if (get_service_start(nkeyW) == SERVICE_DEMAND_START &&
             get_service_start(upkeyW) == SERVICE_DEMAND_START)
-- 
1.7.5.4