d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix handling of message table messages that got broken when I

Browse Source 
converted NdisWriteErrorLogEntry() to use the RtlXXX unicode/ansi
conversion routines.
This commit is contained in:
wpaul 2005-10-24 05:05:09 +00:00
parent e13083b2ae
commit 34370764e1
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/compat/ndis/subr_ndis.c
View File

@ -1051,13 +1051,12 @@ NdisWriteErrorLogEntry(ndis_handle adapter, ndis_error_code code,
int i, error;
char *str = NULL;
uint16_t flags;
char msgbuf[ERRMSGLEN];
device_t dev;
driver_object *drv;
struct ndis_softc *sc;
struct ifnet *ifp;
unicode_string us;
ansi_string as;
ansi_string as = { 0, 0, NULL };
block = (ndis_miniport_block *)adapter;
dev = block->nmb_physdeviceobj->do_devext;
@ -1069,11 +1068,12 @@ NdisWriteErrorLogEntry(ndis_handle adapter, ndis_error_code code,
code, &str, &i, &flags);
if (error == 0 && flags & MESSAGE_RESOURCE_UNICODE &&
ifp->if_flags & IFF_DEBUG) {
RtlInitUnicodeString(&us, (uint16_t *)msgbuf);
RtlInitUnicodeString(&us, (uint16_t *)str);
if (RtlUnicodeStringToAnsiString(&as, &us, TRUE))
return;
str = as.as_buf;
}
} else
str = NULL;
device_printf (dev, "NDIS ERROR: %x (%s)\n", code,
str == NULL ? "unknown error" : str);
@ -1087,7 +1087,7 @@ NdisWriteErrorLogEntry(ndis_handle adapter, ndis_error_code code,
va_end(ap);
}
if (str != NULL)
if (as.as_len)
RtlFreeAnsiString(&as);
return;