From 55b816a7c4b945cfbe2b44c1a923c074e6930e3c Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Mon, 22 Jun 2009 01:10:58 +0000
Subject: [PATCH]  - Fix a bug that caused translations of NdisParameterInteger
 values into unicode strings to produce bad results  - Fix a bug that caused
 NdisParameterMultiString values to be written to the registry incorrectly

svn path=/trunk/; revision=41522
---
 reactos/drivers/network/ndis/ndis/config.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/reactos/drivers/network/ndis/ndis/config.c b/reactos/drivers/network/ndis/ndis/config.c
index 297aac6cf3c..02eabd35a5b 100644
--- a/reactos/drivers/network/ndis/ndis/config.c
+++ b/reactos/drivers/network/ndis/ndis/config.c
@@ -63,7 +63,7 @@ NdisWriteConfiguration(
  *    I don't know why tho so i free everything before return.  comments welcome.
  */
 {
-    ULONG ParameterType = ParameterValue->ParameterType;
+    ULONG ParameterType;
     ULONG DataSize;
     PVOID Data;
     WCHAR Buff[25];
@@ -71,7 +71,7 @@ NdisWriteConfiguration(
     NDIS_DbgPrint(MAX_TRACE, ("Called.\n"));
 
     /* reset parameter type to standard reg types */
-    switch(ParameterType)
+    switch(ParameterValue->ParameterType)
     {
         case NdisParameterHexInteger:
         case NdisParameterInteger:
@@ -85,7 +85,7 @@ NdisWriteConfiguration(
                  ParameterType = REG_SZ;
                  if (!NT_SUCCESS(RtlIntegerToUnicodeString(
                       ParameterValue->ParameterData.IntegerData,
-                      (ParameterType == NdisParameterInteger) ? 10 : 16, &Str)))
+                      (ParameterValue->ParameterType == NdisParameterInteger) ? 10 : 16, &Str)))
                  {
                       *Status = NDIS_STATUS_FAILURE;
                       return;
@@ -96,7 +96,7 @@ NdisWriteConfiguration(
              break;
         case NdisParameterString:
         case NdisParameterMultiString:
-            ParameterType = REG_SZ;
+            ParameterType = (ParameterValue->ParameterType == NdisParameterString) ? REG_SZ : REG_MULTI_SZ;
             Data = ParameterValue->ParameterData.StringData.Buffer;
             DataSize = ParameterValue->ParameterData.StringData.Length;
             break;