[HNETCFG] Sync with Wine 3.0. CORE-14225

[reactos.git] / win32ss / drivers / videoprt / child.c

diff --git a/win32ss/drivers/videoprt/child.c b/win32ss/drivers/videoprt/child.c
index 4bdc34d..bfca706 100644 (file)
--- a/win32ss/drivers/videoprt/child.c
+++ b/win32ss/drivers/videoprt/child.c
@@ -20,6 +20,10 @@
  */
 
 #include "videoprt.h"
+#include <stdio.h>
+
+#define NDEBUG
+#include <debug.h>
 
 /* PRIVATE FUNCTIONS **********************************************************/
 
@@ -30,30 +34,24 @@ IntVideoPortGetMonitorId(
     IN OUT PWCHAR Buffer)
 {
     USHORT Manufacturer, Model;
-    UNICODE_STRING UnicodeModelStr;
 
     /* This must be valid to call this function */
     ASSERT(ChildExtension->EdidValid);
 
     /* 3 letters 5-bit ANSI manufacturer code (big endian) */
-    Manufacturer = *(PUSHORT)(&ChildExtension->ChildDescriptor[8]);
-
     /* Letters encoded as A=1 to Z=26 */
-    Buffer[0] = (WCHAR)((Manufacturer & 0x7C00) + 'A' - 1);
-    Buffer[1] = (WCHAR)((Manufacturer & 0x03E0) + 'A' - 1);
-    Buffer[2] = (WCHAR)((Manufacturer & 0x001F) + 'A' - 1);
+    Manufacturer = *(PUSHORT)(&ChildExtension->ChildDescriptor[8]);
 
     /* Model number (16-bit little endian) */
     Model = *(PUSHORT)(&ChildExtension->ChildDescriptor[10]);
 
-    /* Use Rtl helper for conversion */
-    UnicodeModelStr.Buffer = &Buffer[3];
-    UnicodeModelStr.Length = 0;
-    UnicodeModelStr.MaximumLength = 4 * sizeof(WCHAR);
-    RtlIntegerToUnicodeString(Model, 16, &UnicodeModelStr);
-
-    /* Terminate it */
-    Buffer[7] = UNICODE_NULL;
+    /* Convert the Monitor ID to a readable form */
+    swprintf(Buffer,
+             L"%C%C%C%04hx",
+             (WCHAR)((Manufacturer >> 10 & 0x001F) + 'A' - 1),
+             (WCHAR)((Manufacturer >> 5 & 0x001F) + 'A' - 1),
+             (WCHAR)((Manufacturer & 0x001F) + 'A' - 1),
+             Model);
 
     /* And we're done */
     return TRUE;
@@ -67,7 +65,6 @@ IntVideoPortChildQueryId(
 {
     PWCHAR Buffer = NULL, StaticBuffer;
     UNICODE_STRING UnicodeStr;
-    ULONG Length;
     
     switch (IrpSp->Parameters.QueryId.IdType)
     {
@@ -78,7 +75,6 @@ IntVideoPortChildQueryId(
                     if (ChildExtension->EdidValid)
                     {
                         StaticBuffer = L"DISPLAY\\";
-                        Length = 8 * sizeof(WCHAR);
                         Buffer = ExAllocatePool(PagedPool, (wcslen(StaticBuffer) + 8) * sizeof(WCHAR));
                         if (!Buffer) return STATUS_NO_MEMORY;
 
@@ -92,7 +88,6 @@ IntVideoPortChildQueryId(
                     else
                     {
                         StaticBuffer = L"DISPLAY\\Default_Monitor";
-                        Length = wcslen(StaticBuffer) * sizeof(WCHAR);
                         Buffer = ExAllocatePool(PagedPool, (wcslen(StaticBuffer) + 1) * sizeof(WCHAR));
                         if (!Buffer) return STATUS_NO_MEMORY;
 
@@ -121,7 +116,6 @@ IntVideoPortChildQueryId(
                     if (ChildExtension->EdidValid)
                     {
                         StaticBuffer = L"MONITOR\\";
-                        Length = 8 * sizeof(WCHAR);
                         Buffer = ExAllocatePool(PagedPool, (wcslen(StaticBuffer) + 9) * sizeof(WCHAR));
                         if (!Buffer) return STATUS_NO_MEMORY;
 
@@ -138,7 +132,6 @@ IntVideoPortChildQueryId(
                     else
                     {
                         StaticBuffer = L"MONITOR\\Default_Monitor";
-                        Length = wcslen(StaticBuffer) * sizeof(WCHAR);
                         Buffer = ExAllocatePool(PagedPool, (wcslen(StaticBuffer) + 2) * sizeof(WCHAR));
                         if (!Buffer) return STATUS_NO_MEMORY;
 
@@ -393,4 +386,4 @@ IntVideoPortDispatchPdoPnp(
     IoCompleteRequest(Irp, IO_NO_INCREMENT);
 
     return Status;
-}
\ No newline at end of file
+}