[dquintana] 64866: [USER32] * Fix wrong array length passed to GetClassNameW. CID 716222 * Replace other instances of explicit array length to GetWindowTextW with _countof(x). Based on a patch by C...

Author: dquintana
Date: Tue Oct 21 13:32:00 2014
New Revision: 64866

URL: http://svn.reactos.org/svn/reactos?rev=64866&view=rev
Log:
[USER32]
* Fix wrong array length passed to GetClassNameW. CID 716222
* Replace other instances of explicit array length to GetWindowTextW with _countof(x).
Based on a patch by Christoph von Wittich.

Modified:
    branches/shell-experiments/win32ss/user/user32/controls/appswitch.c

Modified: branches/shell-experiments/win32ss/user/user32/controls/appswitch.c
URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/u...
==============================================================================
--- branches/shell-experiments/win32ss/user/user32/controls/appswitch.c	[iso-8859-1] (original)
+++ branches/shell-experiments/win32ss/user/user32/controls/appswitch.c	[iso-8859-1] Tue Oct 21 13:32:00 2014
@@ -83,7 +83,7 @@
       {
          HWND hwnd = windowList[selectedWindow];

-         GetWindowTextW(hwnd, windowText, 1023);
+         GetWindowTextW(hwnd, windowText, _countof(windowText));

TRACE("[ATbot] CompleteSwitch Switching to 0x%08x (%ls)\n", hwnd, windowText);

@@ -103,9 +103,9 @@
    if (!IsWindowVisible(window))
             return TRUE;

-   GetClassNameW(window,windowText,4095);
-   if ((wcscmp(L"Shell_TrayWnd",windowText)==0) ||
-       (wcscmp(L"Progman",windowText)==0) )
+   GetClassNameW(window, windowText, _countof(windowText));
+   if ((wcscmp(L"Shell_TrayWnd", windowText)==0) ||
+       (wcscmp(L"Progman", windowText)==0) )
             return TRUE;

// First try to get the big icon assigned to the window
@@ -194,7 +194,7 @@
    HPEN hPen;
    HFONT dcFont;
    COLORREF cr;
-   int nch = GetWindowTextW(windowList[selectedWindow], windowText, 1023);
+   int nch = GetWindowTextW(windowList[selectedWindow], windowText, _countof(windowText));

dialogDC = BeginPaint(hWnd, &paint);
    {
@@ -373,7 +373,7 @@
          }
          TRACE("DoAppSwitch VK_ESCAPE 1 Count %d windowCount %d\n",Count,windowCount);
          hwnd = windowList[Count];
-         GetWindowTextW(hwnd, Text, 1023);
+         GetWindowTextW(hwnd, Text, _countof(Text));
          TRACE("[ATbot] Switching to 0x%08x (%ls)\n", hwnd, Text);
          MakeWindowActive(hwnd);
          Esc = TRUE;
@@ -456,7 +456,7 @@
                       Count = windowCount - 1;
                 }
                 hwnd = windowList[Count];
-                GetWindowTextW(hwnd, Text, 1023);
+                GetWindowTextW(hwnd, Text, _countof(Text));
                 MakeWindowActive(hwnd);
              }
           }