Index: base/applications/sndvol32/dialog.c
===================================================================
--- base/applications/sndvol32/dialog.c	(revision 74244)
+++ base/applications/sndvol32/dialog.c	(working copy)
@@ -113,9 +113,9 @@
         ClassName = (LPWSTR)Offset;
 
         /* adjust offset */
-        Offset += wcslen(ClassName) + 1;
+        Offset += wcslen(ClassName);
 
-        /* get offset */
+        /* get window name */
         WindowName = (LPWSTR)(Offset + 1);
     }
 
@@ -174,19 +174,13 @@
 
     //ShowWindow(hwnd, SW_SHOWNORMAL);
 
+    Offset++;
+
     if (WindowName != NULL)
     {
-        /* position offset to start of name */
-        Offset++;
-
         /* move offset past name */
-        Offset += wcslen((LPWSTR)Offset) + 1;
+        Offset += wcslen((LPWSTR)WindowName) + 1;
     }
-    else
-    {
-        /* no name so just adjust offset */
-        Offset++;
-    }
 
     /* check if there is additional data */
     if (*Offset == 0)