[DHCPCSVC] Change AdapterName parameter to UNICODE

DhcpAcquireParameters and DhcpReleaseParameters use a UNICODE AdapterName parameter.

Author: EricKohl

base/services/dhcpcsvc/dhcp/adapter.c

@@ -511,15 +511,17 @@ PDHCP_ADAPTER AdapterFindIndex( unsigned int indx ) {
     return NULL;
 }
 
-PDHCP_ADAPTER AdapterFindName( const CHAR *name ) {
+PDHCP_ADAPTER AdapterFindName( const WCHAR *name ) {
     PDHCP_ADAPTER Adapter;
     PLIST_ENTRY ListEntry;
+    WCHAR UnicodeName[45];
 
     for( ListEntry = AdapterList.Flink;
          ListEntry != &AdapterList;
          ListEntry = ListEntry->Flink ) {
         Adapter = CONTAINING_RECORD( ListEntry, DHCP_ADAPTER, ListEntry );
-        if( !stricmp((const CHAR*)Adapter->IfMib.bDescr, name ) ) return Adapter;
+        mbstowcs(UnicodeName, (const CHAR *)Adapter->IfMib.bDescr, strlen((const CHAR *)Adapter->IfMib.bDescr) + 1);
+        if( !wcsicmp(UnicodeName, name ) ) return Adapter;
     }
 
     return NULL;

base/services/dhcpcsvc/dhcpcsvc.c

@@ -79,19 +79,19 @@ DhcpCApiCleanup(VOID)
 DWORD
 APIENTRY
 DhcpAcquireParameters(
-    _In_ PSTR AdapterName)
+    _In_ PWSTR AdapterName)
 {
     COMM_DHCP_REQ Req;
     COMM_DHCP_REPLY Reply;
     DWORD BytesRead;
     BOOL Result;
 
-    DPRINT1("DhcpAcquireParameters(%s)\n", AdapterName);
+    DPRINT1("DhcpAcquireParameters(%S)\n", AdapterName);
 
     ASSERT(PipeHandle != INVALID_HANDLE_VALUE);
 
     Req.Type = DhcpReqAcquireParams;
-    strcpy(Req.Body.AcquireParams.AdapterName, AdapterName);
+    wcscpy(Req.Body.AcquireParams.AdapterName, AdapterName);
 
     Result = TransactNamedPipe(PipeHandle,
                                &Req, sizeof(Req),
@@ -110,19 +110,19 @@ DhcpAcquireParameters(
 DWORD
 APIENTRY
 DhcpReleaseParameters(
-    _In_ PSTR AdapterName)
+    _In_ PWSTR AdapterName)
 {
     COMM_DHCP_REQ Req;
     COMM_DHCP_REPLY Reply;
     DWORD BytesRead;
     BOOL Result;
 
-    DPRINT1("DhcpReleaseParameters(%s)\n", AdapterName);
+    DPRINT1("DhcpReleaseParameters(%S)\n", AdapterName);
 
     ASSERT(PipeHandle != INVALID_HANDLE_VALUE);
 
     Req.Type = DhcpReqReleaseParams;
-    strcpy(Req.Body.AcquireParams.AdapterName, AdapterName);
+    wcscpy(Req.Body.AcquireParams.AdapterName, AdapterName);
 
     Result = TransactNamedPipe(PipeHandle,
                                &Req, sizeof(Req),

base/services/dhcpcsvc/dhcpcsvc.spec

@@ -5,7 +5,7 @@
 # PURPOSE:     dhcpcsvc exports
 # COPYRIGHT:   Copyright 2006 Ge van Geldorp <[email protected]>
 #
-@ stdcall DhcpAcquireParameters(str)
+@ stdcall DhcpAcquireParameters(wstr)
 @ stub DhcpAcquireParametersByBroadcast
 @ stdcall DhcpCApiCleanup()
 @ stdcall DhcpCApiInitialize(ptr)
@@ -27,7 +27,7 @@
 @ stub DhcpRegisterParamChange
 @ stdcall DhcpReleaseIpAddressLease(long)
 @ stub DhcpReleaseIpAddressLeaseEx
-@ stdcall DhcpReleaseParameters(str)
+@ stdcall DhcpReleaseParameters(wstr)
 @ stub DhcpRemoveDNSRegistrations
 @ stdcall DhcpRenewIpAddressLease(long)
 @ stub DhcpRenewIpAddressLeaseEx

base/services/dhcpcsvc/include/rosdhcp.h

@@ -90,7 +90,7 @@ void AdapterStop(VOID);
 extern PDHCP_ADAPTER AdapterGetFirst(VOID);
 extern PDHCP_ADAPTER AdapterGetNext(PDHCP_ADAPTER);
 extern PDHCP_ADAPTER AdapterFindIndex( unsigned int AdapterIndex );
-extern PDHCP_ADAPTER AdapterFindName(const CHAR *name);
+extern PDHCP_ADAPTER AdapterFindName(const WCHAR *name);
 extern PDHCP_ADAPTER AdapterFindInfo( struct interface_info *info );
 extern PDHCP_ADAPTER AdapterFindByHardwareAddress( u_int8_t haddr[16], u_int8_t hlen );
 extern HANDLE PipeInit(HANDLE hStopEvent);

base/services/dhcpcsvc/include/rosdhcp_pipe.h

@@ -18,7 +18,7 @@ typedef struct _COMM_DHCP_REQ {
     {
         struct
         {
-            CHAR AdapterName[64];
+            WCHAR AdapterName[45];
         } AcquireParams;
         struct {
             BOOL Inserted;

sdk/include/psdk/dhcpcapi.h

@@ -8,12 +8,12 @@ extern "C" {
 DWORD
 APIENTRY
 DhcpAcquireParameters(
-    _In_ PSTR AdapterName);
+    _In_ PWSTR AdapterName);
 
 DWORD
 APIENTRY
 DhcpReleaseParameters(
-    _In_ PSTR AdapterName);
+    _In_ PWSTR AdapterName);
 
 DWORD APIENTRY DhcpLeaseIpAddress( DWORD AdapterIndex );
 DWORD APIENTRY DhcpQueryHWInfo( DWORD AdapterIndex,