[ros-diffs] [weiden] 19787: rename dhcpcapi.dll to dhcpcsvc.dll

rename dhcpcapi.dll to dhcpcsvc.dll
Modified: trunk/reactos/bootdata/packages/reactos.dff
Modified: trunk/reactos/lib/cpl/ncpa/ncpa.xml
Deleted: trunk/reactos/lib/dhcpcapi/
Added: trunk/reactos/lib/dhcpcsvc/
Deleted: trunk/reactos/lib/dhcpcsvc/dhcpcapi.c
Deleted: trunk/reactos/lib/dhcpcsvc/dhcpcapi.def
Deleted: trunk/reactos/lib/dhcpcsvc/dhcpcapi.rc
Deleted: trunk/reactos/lib/dhcpcsvc/dhcpcapi.xml
Added: trunk/reactos/lib/dhcpcsvc/dhcpcsvc.c
Added: trunk/reactos/lib/dhcpcsvc/dhcpcsvc.def
Added: trunk/reactos/lib/dhcpcsvc/dhcpcsvc.rc
Added: trunk/reactos/lib/dhcpcsvc/dhcpcsvc.xml
Modified: trunk/reactos/lib/directory.xml
  _____  

Modified: trunk/reactos/bootdata/packages/reactos.dff
--- trunk/reactos/bootdata/packages/reactos.dff	2005-11-30 22:11:00 UTC
(rev 19786)
+++ trunk/reactos/bootdata/packages/reactos.dff	2005-11-30 22:11:00 UTC
(rev 19787)
@@ -84,7 +84,7 @@

 lib\ddraw\ddraw.dll                     1
 lib\devenum\devenum.dll                 1
 lib\devmgr\devmgr.dll                   1
-lib\dhcpcapi\dhcpcapi.dll               1
+lib\dhcpcsvc\dhcpcsvc.dll               1
 lib\dinput\dinput.dll                   1
 lib\dinput8\dinput8.dll                 1
 lib\dnsapi\dnsapi.dll                   1
  _____  

Modified: trunk/reactos/lib/cpl/ncpa/ncpa.xml
--- trunk/reactos/lib/cpl/ncpa/ncpa.xml	2005-11-30 22:11:00 UTC (rev
19786)
+++ trunk/reactos/lib/cpl/ncpa/ncpa.xml	2005-11-30 22:11:00 UTC (rev
19787)
@@ -12,7 +12,7 @@

 	<library>comctl32</library>
 	<library>iphlpapi</library>
 	<library>ws2_32</library>
-	<library>dhcpcapi</library>
+	<library>dhcpcsvc</library>
 	<library>ntdll</library>
 	<file>ncpa.c</file>
 	<file>tcpip_properties.c</file>
  _____  

Copied: trunk/reactos/lib/dhcpcsvc (from rev 19785,
trunk/reactos/lib/dhcpcapi)
  _____  

Deleted: trunk/reactos/lib/dhcpcsvc/dhcpcapi.c
--- trunk/reactos/lib/dhcpcapi/dhcpcapi.c	2005-11-30 21:29:39 UTC
(rev 19785)
+++ trunk/reactos/lib/dhcpcsvc/dhcpcapi.c	2005-11-30 22:11:00 UTC
(rev 19787)
@@ -1,138 +0,0 @@

-/* $Id: dllmain.c 12852 2005-01-06 13:58:04Z mf $
- *
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS system libraries
- * FILE:            lib/dhcpcapi/dhcpcapi.c
- * PURPOSE:         Client API for DHCP
- * PROGRAMMER:      arty (ayerkes(a)speakeasy.net)
- * UPDATE HISTORY:
- *                  Created 12/04/2005
- */
-
-#include <roscfg.h>
-#include <winsock2.h>
-#include <dhcpcsdk.h>
-#include <dhcp/rosdhcp_public.h>
-
-#define DHCP_TIMEOUT 1000
-
-DWORD APIENTRY DhcpCApiInitialize(LPDWORD Version) {
-    *Version = 2;
-    return 0;
-}
-
-VOID APIENTRY DhcpCApiCleanup() {
-}
-
-DWORD APIENTRY DhcpQueryHWInfo( DWORD AdapterIndex,
-                                     PDWORD MediaType, 
-                                     PDWORD Mtu, 
-                                     PDWORD Speed ) {
-    COMM_DHCP_REQ Req;
-    COMM_DHCP_REPLY Reply;
-    DWORD BytesRead;
-    BOOL Result;
-
-    Req.Type = DhcpReqQueryHWInfo;
-    Req.AdapterIndex = AdapterIndex;
-
-    Result = CallNamedPipe
-        ( DHCP_PIPE_NAME, &Req, sizeof(Req), &Reply, sizeof(Reply),
-          &BytesRead, DHCP_TIMEOUT );
-
-    if( !Reply.Reply ) return 0;
-    else {
-        *MediaType = Reply.QueryHWInfo.MediaType;
-        *Mtu = Reply.QueryHWInfo.Mtu;
-        *Speed = Reply.QueryHWInfo.Speed;
-        return 1;
-    }
-}
-
-DWORD APIENTRY DhcpLeaseIpAddress( DWORD AdapterIndex ) {   
-    COMM_DHCP_REQ Req;
-    COMM_DHCP_REPLY Reply;
-    DWORD BytesRead;
-    BOOL Result;
-
-    Req.Type = DhcpReqLeaseIpAddress;
-    Req.AdapterIndex = AdapterIndex;
-
-    Result = CallNamedPipe
-        ( DHCP_PIPE_NAME, &Req, sizeof(Req), &Reply, sizeof(Reply),
-          &BytesRead, DHCP_TIMEOUT );
-
-    return Reply.Reply;
-}
-
-DWORD APIENTRY DhcpReleaseIpAddressLease( DWORD AdapterIndex ) {
-    COMM_DHCP_REQ Req;
-    COMM_DHCP_REPLY Reply;
-    DWORD BytesRead;
-    BOOL Result;
-
-    Req.Type = DhcpReqReleaseIpAddress;
-    Req.AdapterIndex = AdapterIndex;
-
-    Result = CallNamedPipe
-        ( DHCP_PIPE_NAME, &Req, sizeof(Req), &Reply, sizeof(Reply),
-          &BytesRead, DHCP_TIMEOUT );
-
-    return Reply.Reply;
-}
-
-DWORD APIENTRY DhcpRenewIpAddressLease( DWORD AdapterIndex ) {
-    COMM_DHCP_REQ Req;
-    COMM_DHCP_REPLY Reply;
-    DWORD BytesRead;
-    BOOL Result;
-
-    Req.Type = DhcpReqRenewIpAddress;
-    Req.AdapterIndex = AdapterIndex;
-
-    Result = CallNamedPipe
-        ( DHCP_PIPE_NAME, &Req, sizeof(Req), &Reply, sizeof(Reply),
-          &BytesRead, DHCP_TIMEOUT );
-
-    return Reply.Reply;
-}
-
-DWORD APIENTRY DhcpStaticRefreshParams( DWORD AdapterIndex, 
-                                             DWORD Address, 
-                                             DWORD Netmask ) {
-    COMM_DHCP_REQ Req;
-    COMM_DHCP_REPLY Reply;
-    DWORD BytesRead;
-    BOOL Result;
-
-    Req.Type = DhcpReqStaticRefreshParams;
-    Req.AdapterIndex = AdapterIndex;
-    Req.Body.StaticRefreshParams.IPAddress = Address;
-    Req.Body.StaticRefreshParams.Netmask = Netmask;
-
-    Result = CallNamedPipe
-        ( DHCP_PIPE_NAME, &Req, sizeof(Req), &Reply, sizeof(Reply),
-          &BytesRead, DHCP_TIMEOUT );
-
-    return Reply.Reply;
-}
-
-INT STDCALL
-DllMain(PVOID hinstDll,
-	ULONG dwReason,
-	PVOID reserved)
-{
-   switch (dwReason)
-     {
-     case DLL_PROCESS_ATTACH:
-	DisableThreadLibraryCalls(hinstDll);
-	break;
-
-     case DLL_PROCESS_DETACH:
-	break;
-     }
-
-   return TRUE;
-}
-
-/* EOF */
  _____  

Deleted: trunk/reactos/lib/dhcpcsvc/dhcpcapi.def
--- trunk/reactos/lib/dhcpcapi/dhcpcapi.def	2005-11-30 21:29:39 UTC
(rev 19785)
+++ trunk/reactos/lib/dhcpcsvc/dhcpcapi.def	2005-11-30 22:11:00 UTC
(rev 19787)
@@ -1,16 +0,0 @@

-; $Id: dhcpcapi.def 14337 2005-03-26 22:10:04Z $
-;
-; dhcpcapi.def
-;
-; ReactOS Operating System
-;
-LIBRARY dhcpcapi.dll
-EXPORTS
-DhcpCApiInitialize@4
-DhcpCApiCleanup@0
-DhcpQueryHWInfo@16
-DhcpLeaseIpAddress@4
-DhcpReleaseIpAddressLease@4
-DhcpRenewIpAddressLease@4
-DhcpStaticRefreshParams@12
-; EOF
  _____  

Deleted: trunk/reactos/lib/dhcpcsvc/dhcpcapi.rc
--- trunk/reactos/lib/dhcpcapi/dhcpcapi.rc	2005-11-30 21:29:39 UTC
(rev 19785)
+++ trunk/reactos/lib/dhcpcsvc/dhcpcapi.rc	2005-11-30 22:11:00 UTC
(rev 19787)
@@ -1,7 +0,0 @@

-#include <windows.h>
-
-#define REACTOS_VERSION_DLL
-#define REACTOS_STR_FILE_DESCRIPTION	"DHCP Client API\0"
-#define REACTOS_STR_INTERNAL_NAME	"dhcpcapi\0"
-#define REACTOS_STR_ORIGINAL_FILENAME	"dhcpcapi.dll\0"
-#include <reactos/version.rc>
  _____  

Deleted: trunk/reactos/lib/dhcpcsvc/dhcpcapi.xml
--- trunk/reactos/lib/dhcpcapi/dhcpcapi.xml	2005-11-30 21:29:39 UTC
(rev 19785)
+++ trunk/reactos/lib/dhcpcsvc/dhcpcapi.xml	2005-11-30 22:11:00 UTC
(rev 19787)
@@ -1,14 +0,0 @@

-<module name="dhcpcapi" type="win32dll"
installbase="system32"
installname="dhcpcapi.dll">
-	<importlibrary definition="dhcpcapi.def" />
-	<include base="dhcpcapi">include</include>
-	<define name="_DISABLE_TIDENTS" />
-	<define name="__USE_W32API" />
-	<define name="_WIN32_WINNT=0x0500" />
-	<library>ntdll</library>
-	<library>kernel32</library>
-	<library>msvcrt</library>
-	<library>ws2_32</library>
-	<library>iphlpapi</library>
-	<file>dhcpcapi.c</file>
-	<file>dhcpcapi.rc</file>
-</module>
  _____  

Copied: trunk/reactos/lib/dhcpcsvc/dhcpcsvc.c (from rev 19785,
trunk/reactos/lib/dhcpcapi/dhcpcapi.c)
  _____  

Copied: trunk/reactos/lib/dhcpcsvc/dhcpcsvc.def (from rev 19785,
trunk/reactos/lib/dhcpcapi/dhcpcapi.def)
--- trunk/reactos/lib/dhcpcapi/dhcpcapi.def	2005-11-30 21:29:39 UTC
(rev 19785)
+++ trunk/reactos/lib/dhcpcsvc/dhcpcsvc.def	2005-11-30 22:11:00 UTC
(rev 19787)
@@ -0,0 +1,16 @@

+; $Id: dhcpcapi.def 14337 2005-03-26 22:10:04Z $
+;
+; dhcpcsvc.def
+;
+; ReactOS Operating System
+;
+LIBRARY dhcpcsvc.dll
+EXPORTS
+DhcpCApiInitialize@4
+DhcpCApiCleanup@0
+DhcpQueryHWInfo@16
+DhcpLeaseIpAddress@4
+DhcpReleaseIpAddressLease@4
+DhcpRenewIpAddressLease@4
+DhcpStaticRefreshParams@12
+; EOF
  _____  

Copied: trunk/reactos/lib/dhcpcsvc/dhcpcsvc.rc (from rev 19785,
trunk/reactos/lib/dhcpcapi/dhcpcapi.rc)
--- trunk/reactos/lib/dhcpcapi/dhcpcapi.rc	2005-11-30 21:29:39 UTC
(rev 19785)
+++ trunk/reactos/lib/dhcpcsvc/dhcpcsvc.rc	2005-11-30 22:11:00 UTC
(rev 19787)
@@ -0,0 +1,7 @@

+#include <windows.h>
+
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"DHCP Client Service\0"
+#define REACTOS_STR_INTERNAL_NAME	"dhcpcsvc\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"dhcpcsvc.dll\0"
+#include <reactos/version.rc>
  _____  

Copied: trunk/reactos/lib/dhcpcsvc/dhcpcsvc.xml (from rev 19785,
trunk/reactos/lib/dhcpcapi/dhcpcapi.xml)
--- trunk/reactos/lib/dhcpcapi/dhcpcapi.xml	2005-11-30 21:29:39 UTC
(rev 19785)
+++ trunk/reactos/lib/dhcpcsvc/dhcpcsvc.xml	2005-11-30 22:11:00 UTC
(rev 19787)
@@ -0,0 +1,14 @@

+<module name="dhcpcsvc" type="win32dll"
installbase="system32"
installname="dhcpcsvc.dll">
+	<importlibrary definition="dhcpcsvc.def" />
+	<include base="dhcpcsvc">include</include>
+	<define name="_DISABLE_TIDENTS" />
+	<define name="__USE_W32API" />
+	<define name="_WIN32_WINNT=0x0500" />
+	<library>ntdll</library>
+	<library>kernel32</library>
+	<library>msvcrt</library>
+	<library>ws2_32</library>
+	<library>iphlpapi</library>
+	<file>dhcpcsvc.c</file>
+	<file>dhcpcsvc.rc</file>
+</module>
  _____  

Modified: trunk/reactos/lib/directory.xml
--- trunk/reactos/lib/directory.xml	2005-11-30 22:11:00 UTC (rev
19786)
+++ trunk/reactos/lib/directory.xml	2005-11-30 22:11:00 UTC (rev
19787)
@@ -62,8 +62,8 @@

 <directory name="devmgr">
 	<xi:include href="devmgr/devmgr.xml" />
 </directory>
-<directory name="dhcpcapi">
-	<xi:include href="dhcpcapi/dhcpcapi.xml" />
+<directory name="dhcpcsvc">
+	<xi:include href="dhcpcsvc/dhcpcsvc.xml" />
 </directory>
 <directory name="dinput">
 	<xi:include href="dinput/dinput.xml" />