unitfork: getfs was deprecated in fpc 2.6.2, use getfilehandle

[lcore.git] / dnswin.pas

diff --git a/dnswin.pas b/dnswin.pas
old mode 100755 (executable)
new mode 100644 (file)
index 573c888..5e85f70
--- a/dnswin.pas
+++ b/dnswin.pas
@@ -2,15 +2,15 @@ unit dnswin;
 \r
 interface\r
 \r
 \r
 interface\r
 \r

-uses binipstuff,classes,lcore;\r
+uses binipstuff,classes,lcore,pgtypes;\r

 \r
 {$include lcoreconfig.inc}\r
 \r
 //on failure a null string or zeroed out binip will be retuned and error will be\r
 //set to a windows error code (error will be left untouched under non error\r
 //conditions).\r
 \r
 {$include lcoreconfig.inc}\r
 \r
 //on failure a null string or zeroed out binip will be retuned and error will be\r
 //set to a windows error code (error will be left untouched under non error\r
 //conditions).\r

-function winforwardlookuplist(name : string;familyhint:integer;var error : integer) : tbiniplist;\r
-function winreverselookup(ip:tbinip;var error:integer):string;\r
+function winforwardlookuplist(name : thostname;familyhint:integer;var error : integer) : tbiniplist;\r
+function winreverselookup(ip:tbinip;var error:integer):thostname;\r

 \r
 \r
 type\r
 \r
 \r
 type\r


@@ -21,17 +21,16 @@ type
   tdnswinasync=class(tthread)\r
   private\r
     freverse : boolean;\r
   tdnswinasync=class(tthread)\r
   private\r
     freverse : boolean;\r

-    error : integer;\r

     freewhendone : boolean;\r
     hadevent : boolean;\r
   protected\r
     procedure execute; override;\r
   public\r
     onrequestdone:tsocketevent;\r
     freewhendone : boolean;\r
     hadevent : boolean;\r
   protected\r
     procedure execute; override;\r
   public\r
     onrequestdone:tsocketevent;\r

-    name : string;\r
+    name : thostname;\r

     iplist : tbiniplist;\r
 \r
     iplist : tbiniplist;\r
 \r

-    procedure forwardlookup(name:string);\r
+    procedure forwardlookup(name:thostname);\r

     procedure reverselookup(ip:tbinip);\r
     destructor destroy; override;\r
     procedure release;\r
     procedure reverselookup(ip:tbinip);\r
     destructor destroy; override;\r
     procedure release;\r


@@ -40,9 +39,12 @@ type
 \r
   end;\r
 \r
 \r
   end;\r
 \r

+procedure init;\r
+\r

 implementation\r
 uses\r
 implementation\r
 uses\r

-  lsocket,pgtypes,sysutils,winsock,windows,messages;\r
+  // zipplet: moved pgtypes to interface because it's needed for the string definitions\r
+  lsocket,sysutils,winsock,windows,messages;\r

 \r
 type\r
   //taddrinfo = record; //forward declaration\r
 \r
 type\r
   //taddrinfo = record; //forward declaration\r


@@ -53,14 +55,14 @@ type
     ai_socktype : longint;\r
     ai_protocol : longint;\r
     ai_addrlen : taddrint;\r
     ai_socktype : longint;\r
     ai_protocol : longint;\r
     ai_addrlen : taddrint;\r

-    ai_canonname : pchar;\r
+    ai_canonname : pansichar;\r

     ai_addr : pinetsockaddrv;\r
     ai_next : paddrinfo;\r
   end;\r
   ppaddrinfo = ^paddrinfo;\r
     ai_addr : pinetsockaddrv;\r
     ai_next : paddrinfo;\r
   end;\r
   ppaddrinfo = ^paddrinfo;\r

-  tgetaddrinfo = function(nodename : pchar; servname : pchar; hints : paddrinfo;res : ppaddrinfo) : longint; stdcall;\r
+  tgetaddrinfo = function(nodename : pansichar; servname : pansichar; hints : paddrinfo;res : ppaddrinfo) : longint; stdcall;\r

   tfreeaddrinfo = procedure(ai : paddrinfo); stdcall;\r
   tfreeaddrinfo = procedure(ai : paddrinfo); stdcall;\r

-  tgetnameinfo = function(sa:Pinetsockaddrv;salen : longint; host:pchar;hostlen : longint;serv:pchar;servlen:longint;flags:longint) : longint;stdcall;\r
+  tgetnameinfo = function(sa:Pinetsockaddrv;salen : longint; host:pansichar;hostlen : longint;serv:pansichar;servlen:longint;flags:longint) : longint;stdcall;\r

 var\r
   getaddrinfo : tgetaddrinfo;\r
   freeaddrinfo : tfreeaddrinfo;\r
 var\r
   getaddrinfo : tgetaddrinfo;\r
   freeaddrinfo : tfreeaddrinfo;\r


@@ -81,12 +83,13 @@ type
   plongint = ^longint;\r
   pplongint = ^plongint;\r
 \r
   plongint = ^longint;\r
   pplongint = ^plongint;\r
 \r

-function v4onlygetaddrinfo(nodename : pchar; servname : pchar; hints : paddrinfo;res : ppaddrinfo) : longint; stdcall;\r
+function v4onlygetaddrinfo(nodename : pansichar; servname : pansichar; hints : paddrinfo;res : ppaddrinfo) : longint; stdcall;\r

 var\r
   output,prev,first : paddrinfo;\r
   hostent : phostent;\r
   addrlist:^pointer;\r
 begin\r
 var\r
   output,prev,first : paddrinfo;\r
   hostent : phostent;\r
   addrlist:^pointer;\r
 begin\r

+  output := nil;\r

   if hints.ai_family <> af_inet6 then begin\r
     result := 0;\r
 \r
   if hints.ai_family <> af_inet6 then begin\r
     result := 0;\r
 \r


@@ -107,15 +110,15 @@ begin
 \r
       getmem(output,sizeof(taddrinfo));\r
       if assigned(prev) then prev.ai_next := output;\r
 \r
       getmem(output,sizeof(taddrinfo));\r
       if assigned(prev) then prev.ai_next := output;\r

-      getmem(output.ai_addr,sizeof(tinetsockaddr));\r
+      getmem(output.ai_addr,sizeof(tlinetsockaddr4));\r

       if servname <> nil then output.ai_addr.InAddr.port := htons(strtoint(servname)) else output.ai_addr.InAddr.port := 0;\r
       output.ai_addr.InAddr.addr := longint(addrlist^^);\r
       if servname <> nil then output.ai_addr.InAddr.port := htons(strtoint(servname)) else output.ai_addr.InAddr.port := 0;\r
       output.ai_addr.InAddr.addr := longint(addrlist^^);\r

-      inc(integer(addrlist),4);\r
+      inc(taddrint(addrlist),4);\r

       output.ai_flags := 0;\r
       output.ai_family := af_inet;\r
       output.ai_socktype := 0;\r
       output.ai_protocol := 0;\r
       output.ai_flags := 0;\r
       output.ai_family := af_inet;\r
       output.ai_socktype := 0;\r
       output.ai_protocol := 0;\r

-      output.ai_addrlen := sizeof(tinetsockaddr);\r
+      output.ai_addrlen := sizeof(tlinetsockaddr4);\r

       output.ai_canonname := nil;\r
       output.ai_next := nil;\r
       prev := output;\r
       output.ai_canonname := nil;\r
       output.ai_next := nil;\r
       prev := output;\r


@@ -132,7 +135,7 @@ begin
   if a<b then result := a else result := b;\r
 end;\r
 \r
   if a<b then result := a else result := b;\r
 end;\r
 \r

-function v4onlygetnameinfo(sa:Pinetsockaddrv;salen : longint; host:pchar;hostlen : longint;serv:pchar;servlen:longint;flags:longint) : longint;stdcall;\r
+function v4onlygetnameinfo(sa:Pinetsockaddrv;salen : longint; host:pansichar;hostlen : longint;serv:pansichar;servlen:longint;flags:longint) : longint;stdcall;\r

 var\r
   hostent : phostent;\r
   bytestocopy : integer;\r
 var\r
   hostent : phostent;\r
   bytestocopy : integer;\r


@@ -158,13 +161,13 @@ procedure populateprocvars;
 var\r
   libraryhandle : hmodule;\r
   i : integer;\r
 var\r
   libraryhandle : hmodule;\r
   i : integer;\r

-  dllname : string;\r
+  dllname : ansistring;\r

 \r
 begin\r
   if assigned(getaddrinfo) then exit; //procvars already populated\r
   for i := 0 to 1 do begin\r
     if i=0 then dllname := 'Ws2_32.dll' else dllname := 'Wship6.dll';\r
 \r
 begin\r
   if assigned(getaddrinfo) then exit; //procvars already populated\r
   for i := 0 to 1 do begin\r
     if i=0 then dllname := 'Ws2_32.dll' else dllname := 'Wship6.dll';\r

-    libraryhandle := LoadLibrary(pchar(dllname));\r
+    libraryhandle := LoadLibraryA(pansichar(dllname));\r

     getaddrinfo := getprocaddress(libraryhandle,'getaddrinfo');\r
     freeaddrinfo := getprocaddress(libraryhandle,'freeaddrinfo');\r
     getnameinfo := getprocaddress(libraryhandle,'getnameinfo');\r
     getaddrinfo := getprocaddress(libraryhandle,'getaddrinfo');\r
     freeaddrinfo := getprocaddress(libraryhandle,'freeaddrinfo');\r
     getnameinfo := getprocaddress(libraryhandle,'getnameinfo');\r


@@ -181,7 +184,7 @@ begin
 end;\r
 \r
 \r
 end;\r
 \r
 \r

-function winforwardlookuplist(name : string;familyhint:integer;var error : integer) : tbiniplist;\r
+function winforwardlookuplist(name : thostname;familyhint:integer;var error : integer) : tbiniplist;\r

 var\r
   hints: taddrinfo;\r
   res0,res : paddrinfo;\r
 var\r
   hints: taddrinfo;\r
   res0,res : paddrinfo;\r


@@ -198,7 +201,7 @@ begin
   hints.ai_canonname := nil;\r
   hints.ai_addr := nil;\r
   hints.ai_next := nil;\r
   hints.ai_canonname := nil;\r
   hints.ai_addr := nil;\r
   hints.ai_next := nil;\r

-  getaddrinforesult := getaddrinfo(pchar(name),'1',@hints,@res);\r
+  getaddrinforesult := getaddrinfo(pansichar(name),'1',@hints,@res);\r

   res0 := res;\r
   result := biniplist_new;\r
   if getaddrinforesult = 0 then begin\r
   res0 := res;\r
   result := biniplist_new;\r
   if getaddrinforesult = 0 then begin\r


@@ -227,16 +230,16 @@ begin
   end;\r
 end;\r
 \r
   end;\r
 end;\r
 \r

-function winreverselookup(ip:tbinip;var error : integer):string;\r
+function winreverselookup(ip:tbinip;var error : integer):thostname;\r

 var\r
   sa : tinetsockaddrv;\r
   getnameinforesult : integer;\r
 begin\r
 \r
 var\r
   sa : tinetsockaddrv;\r
   getnameinforesult : integer;\r
 begin\r
 \r

-  makeinaddrv(sa,ip);
+  makeinaddrv(ip,'1',sa);\r

   populateprocvars;\r
   setlength(result,1025);\r
   populateprocvars;\r
   setlength(result,1025);\r

-  getnameinforesult := getnameinfo(@sa,sizeof(tinetsockaddrv),pchar(result),length(result),nil,0,0);\r
+  getnameinforesult := getnameinfo(@sa,sizeof(tinetsockaddrv),pansichar(result),length(result),nil,0,0);\r

   if getnameinforesult <> 0 then begin\r
     error := getnameinforesult;\r
     result := '';\r
   if getnameinforesult <> 0 then begin\r
     error := getnameinforesult;\r
     result := '';\r


@@ -263,6 +266,7 @@ begin
     if assigned (dwas.onrequestdone) then dwas.onrequestdone(dwas,awparam);\r
     dwas.hadevent := true;\r
     if dwas.freewhendone then dwas.free;\r
     if assigned (dwas.onrequestdone) then dwas.onrequestdone(dwas,awparam);\r
     dwas.hadevent := true;\r
     if dwas.freewhendone then dwas.free;\r

+    result := 0; {added returning 0 when handling --beware}\r

   end else begin\r
     //not passing unknown messages on to defwindowproc will cause window\r
     //creation to fail! --plugwash\r
   end else begin\r
     //not passing unknown messages on to defwindowproc will cause window\r
     //creation to fail! --plugwash\r


@@ -270,7 +274,7 @@ begin
   end;\r
 end;\r
 \r
   end;\r
 end;\r
 \r

-procedure tdnswinasync.forwardlookup(name:string);\r
+procedure tdnswinasync.forwardlookup(name:thostname);\r

 begin\r
   self.name := name;\r
   freverse := false;\r
 begin\r
   self.name := name;\r
   freverse := false;\r


@@ -328,6 +332,7 @@ var
                                  hbrBackground : 0;\r
                                  lpszMenuName  : nil;\r
                                  lpszClassName : 'dnswinClass');\r
                                  hbrBackground : 0;\r
                                  lpszMenuName  : nil;\r
                                  lpszClassName : 'dnswinClass');\r

+procedure init;\r

 begin\r
 \r
     if Windows.RegisterClass(MyWindowClass) = 0 then halt;\r
 begin\r
 \r
     if Windows.RegisterClass(MyWindowClass) = 0 then halt;\r


@@ -344,4 +349,7 @@ begin
                                nil);      { CreateParam   }\r
   //writeln('dnswin hwnd is ',hwnddnswin);\r
   //writeln('last error is ',GetLastError);\r
                                nil);      { CreateParam   }\r
   //writeln('dnswin hwnd is ',hwnddnswin);\r
   //writeln('last error is ',GetLastError);\r

+end;\r
+\r
+\r

 end.\r
 end.\r