[ros-diffs] [gedmurphy] 25309: - Add a bit of a hack to paint over the NULL text values in the caption bar. At least they look pretty now until a better fix is found - load resource strings onto heap to avoid overfows from translations

Author: gedmurphy
Date: Fri Jan  5 20:51:05 2007
New Revision: 25309

URL: http://svn.reactos.org/svn/reactos?rev=25309&view=rev
Log:
- Add a bit of a hack to paint over the NULL text values in the caption bar. At least they
look pretty now until a better fix is found
- load resource strings onto heap to avoid overfows from translations

Added:
    trunk/reactos/dll/cpl/desk/misc.c
Modified:
    trunk/reactos/dll/cpl/desk/Fr.rc
    trunk/reactos/dll/cpl/desk/It.rc
    trunk/reactos/dll/cpl/desk/Ja.rc
    trunk/reactos/dll/cpl/desk/Ru.rc
    trunk/reactos/dll/cpl/desk/Uk.rc
    trunk/reactos/dll/cpl/desk/cz.rc
    trunk/reactos/dll/cpl/desk/de.rc
    trunk/reactos/dll/cpl/desk/desk.h
    trunk/reactos/dll/cpl/desk/desk.rc
    trunk/reactos/dll/cpl/desk/en.rc
    trunk/reactos/dll/cpl/desk/es.rc
    trunk/reactos/dll/cpl/desk/gr.rc
    trunk/reactos/dll/cpl/desk/hu.rc
    trunk/reactos/dll/cpl/desk/nl.rc
    trunk/reactos/dll/cpl/desk/pl.rc
    trunk/reactos/dll/cpl/desk/preview.c
    trunk/reactos/dll/cpl/desk/resource.h
    trunk/reactos/dll/cpl/desk/sv.rc

Modified: trunk/reactos/dll/cpl/desk/Fr.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/Fr.rc?rev=253…
==============================================================================
--- trunk/reactos/dll/cpl/desk/Fr.rc (original)
+++ trunk/reactos/dll/cpl/desk/Fr.rc Fri Jan  5 20:51:05 2007
@@ -131,4 +131,7 @@
     IDS_MESSBOX  "Message Box"
     IDS_MESSTEXT "Message Text"
     IDS_BUTTEXT  "OK"
+    IDS_NORMAL   "Normal"
+    IDS_DISABLED "Disabled"
+    IDS_SELECTED "Selected"
 END

Modified: trunk/reactos/dll/cpl/desk/It.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/It.rc?rev=253…
==============================================================================
--- trunk/reactos/dll/cpl/desk/It.rc (original)
+++ trunk/reactos/dll/cpl/desk/It.rc Fri Jan  5 20:51:05 2007
@@ -125,4 +125,7 @@
     IDS_MESSBOX  "Message Box"
     IDS_MESSTEXT "Message Text"
     IDS_BUTTEXT  "OK"
+    IDS_NORMAL   "Normal"
+    IDS_DISABLED "Disabled"
+    IDS_SELECTED "Selected"
 END

Modified: trunk/reactos/dll/cpl/desk/Ja.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/Ja.rc?rev=253…
==============================================================================
--- trunk/reactos/dll/cpl/desk/Ja.rc (original)
+++ trunk/reactos/dll/cpl/desk/Ja.rc Fri Jan  5 20:51:05 2007
@@ -129,4 +129,7 @@
     IDS_MESSBOX  "Message Box"
     IDS_MESSTEXT "Message Text"
     IDS_BUTTEXT  "OK"
+    IDS_NORMAL   "Normal"
+    IDS_DISABLED "Disabled"
+    IDS_SELECTED "Selected"
 END

Modified: trunk/reactos/dll/cpl/desk/Ru.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/Ru.rc?rev=253…
==============================================================================
--- trunk/reactos/dll/cpl/desk/Ru.rc (original)
+++ trunk/reactos/dll/cpl/desk/Ru.rc Fri Jan  5 20:51:05 2007
@@ -151,4 +151,7 @@
     IDS_MESSBOX  "Message Box"
     IDS_MESSTEXT "Message Text"
     IDS_BUTTEXT  "OK"
+    IDS_NORMAL   "Normal"
+    IDS_DISABLED "Disabled"
+    IDS_SELECTED "Selected"
 END

Modified: trunk/reactos/dll/cpl/desk/Uk.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/Uk.rc?rev=253…
==============================================================================
--- trunk/reactos/dll/cpl/desk/Uk.rc (original)
+++ trunk/reactos/dll/cpl/desk/Uk.rc Fri Jan  5 20:51:05 2007
@@ -133,4 +133,7 @@
     IDS_MESSBOX  "Message Box"
     IDS_MESSTEXT "Message Text"
     IDS_BUTTEXT  "OK"
+    IDS_NORMAL   "Normal"
+    IDS_DISABLED "Disabled"
+    IDS_SELECTED "Selected"
 END

Modified: trunk/reactos/dll/cpl/desk/cz.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/cz.rc?rev=253…
==============================================================================
--- trunk/reactos/dll/cpl/desk/cz.rc (original)
+++ trunk/reactos/dll/cpl/desk/cz.rc Fri Jan  5 20:51:05 2007
@@ -123,4 +123,7 @@
     IDS_MESSBOX  "Message Box"
     IDS_MESSTEXT "Message Text"
     IDS_BUTTEXT  "OK"
+    IDS_NORMAL   "Normal"
+    IDS_DISABLED "Disabled"
+    IDS_SELECTED "Selected"
 END

Modified: trunk/reactos/dll/cpl/desk/de.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/de.rc?rev=253…
==============================================================================
--- trunk/reactos/dll/cpl/desk/de.rc (original)
+++ trunk/reactos/dll/cpl/desk/de.rc Fri Jan  5 20:51:05 2007
@@ -127,4 +127,7 @@
     IDS_MESSBOX  "Message Box"
     IDS_MESSTEXT "Message Text"
     IDS_BUTTEXT  "OK"
+    IDS_NORMAL   "Normal"
+    IDS_DISABLED "Disabled"
+    IDS_SELECTED "Selected"
 END

Modified: trunk/reactos/dll/cpl/desk/desk.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.h?rev=25…
==============================================================================
--- trunk/reactos/dll/cpl/desk/desk.h (original)
+++ trunk/reactos/dll/cpl/desk/desk.h Fri Jan  5 20:51:05 2007
@@ -33,6 +33,10 @@
 PDIBITMAP DibLoadImage(LPTSTR lpFilename);
 VOID DibFreeImage(PDIBITMAP lpBitmap);
 
+INT AllocAndLoadString(LPTSTR *lpTarget,
+                       HINSTANCE hInst,
+                       UINT uID);
+
 DWORD DbgPrint(PCH Format,...);
 
 #endif /* __CPL_DESK_H__ */

Modified: trunk/reactos/dll/cpl/desk/desk.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.rc?rev=2…
==============================================================================
--- trunk/reactos/dll/cpl/desk/desk.rc (original)
+++ trunk/reactos/dll/cpl/desk/desk.rc Fri Jan  5 20:51:05 2007
@@ -8,7 +8,7 @@
 #define REACTOS_STR_INTERNAL_NAME       "desk\0"
 #define REACTOS_STR_ORIGINAL_FILENAME   "desk.cpl\0"
 
-#include <reactos/version.rc>
+//#include <reactos/version.rc>
 
 IDC_DESK_ICON ICON "resources/applet.ico"
 IDC_DESK_ICON2 ICON "resources/applet.ico"

Modified: trunk/reactos/dll/cpl/desk/en.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/en.rc?rev=253…
==============================================================================
--- trunk/reactos/dll/cpl/desk/en.rc (original)
+++ trunk/reactos/dll/cpl/desk/en.rc Fri Jan  5 20:51:05 2007
@@ -125,4 +125,7 @@
     IDS_MESSBOX  "Message Box"
     IDS_MESSTEXT "Message Text"
     IDS_BUTTEXT  "OK"
+    IDS_NORMAL   "Normal"
+    IDS_DISABLED "Disabled"
+    IDS_SELECTED "Selected"
 END

Modified: trunk/reactos/dll/cpl/desk/es.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/es.rc?rev=253…
==============================================================================
--- trunk/reactos/dll/cpl/desk/es.rc (original)
+++ trunk/reactos/dll/cpl/desk/es.rc Fri Jan  5 20:51:05 2007
@@ -130,4 +130,7 @@
     IDS_MESSBOX  "Message Box"
     IDS_MESSTEXT "Message Text"
     IDS_BUTTEXT  "OK"
+    IDS_NORMAL   "Normal"
+    IDS_DISABLED "Disabled"
+    IDS_SELECTED "Selected"
 END

Modified: trunk/reactos/dll/cpl/desk/gr.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/gr.rc?rev=253…
==============================================================================
--- trunk/reactos/dll/cpl/desk/gr.rc (original)
+++ trunk/reactos/dll/cpl/desk/gr.rc Fri Jan  5 20:51:05 2007
@@ -129,4 +129,7 @@
     IDS_MESSBOX  "Message Box"
     IDS_MESSTEXT "Message Text"
     IDS_BUTTEXT  "OK"
+    IDS_NORMAL   "Normal"
+    IDS_DISABLED "Disabled"
+    IDS_SELECTED "Selected"
 END

Modified: trunk/reactos/dll/cpl/desk/hu.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/hu.rc?rev=253…
==============================================================================
--- trunk/reactos/dll/cpl/desk/hu.rc (original)
+++ trunk/reactos/dll/cpl/desk/hu.rc Fri Jan  5 20:51:05 2007
@@ -117,4 +117,7 @@
     IDS_MESSBOX  "Message Box"
     IDS_MESSTEXT "Message Text"
     IDS_BUTTEXT  "OK"
+    IDS_NORMAL   "Normal"
+    IDS_DISABLED "Disabled"
+    IDS_SELECTED "Selected"
 END

Added: trunk/reactos/dll/cpl/desk/misc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/misc.c?rev=25…
==============================================================================
--- trunk/reactos/dll/cpl/desk/misc.c (added)
+++ trunk/reactos/dll/cpl/desk/misc.c Fri Jan  5 20:51:05 2007
@@ -1,0 +1,63 @@
+#include "desk.h"
+
+static INT
+LengthOfStrResource(IN HINSTANCE hInst,
+                    IN UINT uID)
+{
+    HRSRC hrSrc;
+    HGLOBAL hRes;
+    LPWSTR lpName, lpStr;
+
+    if (hInst == NULL)
+    {
+        return -1;
+    }
+
+    /* There are always blocks of 16 strings */
+    lpName = (LPWSTR)MAKEINTRESOURCE((uID >> 4) + 1);
+
+    /* Find the string table block */
+    if ((hrSrc = FindResourceW(hInst, lpName, (LPWSTR)RT_STRING)) &&
+        (hRes = LoadResource(hInst, hrSrc)) &&
+        (lpStr = LockResource(hRes)))
+    {
+        UINT x;
+
+        /* Find the string we're looking for */
+        uID &= 0xF; /* position in the block, same as % 16 */
+        for (x = 0; x < uID; x++)
+        {
+            lpStr += (*lpStr) + 1;
+        }
+
+        /* Found the string */
+        return (int)(*lpStr);
+    }
+    return -1;
+}
+
+INT
+AllocAndLoadString(OUT LPTSTR *lpTarget,
+                   IN HINSTANCE hInst,
+                   IN UINT uID)
+{
+    INT ln;
+
+    ln = LengthOfStrResource(hInst,
+                             uID);
+    if (ln++ > 0)
+    {
+        (*lpTarget) = (LPTSTR)LocalAlloc(LMEM_FIXED,
+                                         ln * sizeof(TCHAR));
+        if ((*lpTarget) != NULL)
+        {
+            INT Ret;
+            if (!(Ret = LoadString(hInst, uID, *lpTarget, ln)))
+            {
+                LocalFree((HLOCAL)(*lpTarget));
+            }
+            return Ret;
+        }
+    }
+    return 0;
+}

Modified: trunk/reactos/dll/cpl/desk/nl.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/nl.rc?rev=253…
==============================================================================
--- trunk/reactos/dll/cpl/desk/nl.rc (original)
+++ trunk/reactos/dll/cpl/desk/nl.rc Fri Jan  5 20:51:05 2007
@@ -123,4 +123,7 @@
     IDS_MESSBOX  "Message Box"
     IDS_MESSTEXT "Message Text"
     IDS_BUTTEXT  "OK"
+    IDS_NORMAL   "Normal"
+    IDS_DISABLED "Disabled"
+    IDS_SELECTED "Selected"
 END

Modified: trunk/reactos/dll/cpl/desk/pl.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/pl.rc?rev=253…
==============================================================================
--- trunk/reactos/dll/cpl/desk/pl.rc (original)
+++ trunk/reactos/dll/cpl/desk/pl.rc Fri Jan  5 20:51:05 2007
@@ -124,4 +124,7 @@
     IDS_MESSBOX  "Message Box"
     IDS_MESSTEXT "Message Text"
     IDS_BUTTEXT  "OK"
+    IDS_NORMAL   "Normal"
+    IDS_DISABLED "Disabled"
+    IDS_SELECTED "Selected"
 END

Modified: trunk/reactos/dll/cpl/desk/preview.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/preview.c?rev…
==============================================================================
--- trunk/reactos/dll/cpl/desk/preview.c (original)
+++ trunk/reactos/dll/cpl/desk/preview.c Fri Jan  5 20:51:05 2007
@@ -39,11 +39,37 @@
 
     RECT rcDialogButton;
 
+    LPTSTR lpInAct;
+    LPTSTR lpAct;
+    LPTSTR lpWinTxt;
+    LPTSTR lpMessBox;
+    LPTSTR lpMessText;
+    LPTSTR lpButText;
+    LPTSTR lpMenNorm;
+    LPTSTR lpMenDis;
+    LPTSTR lpMenSel;
+
     LOGFONT CaptionFont;
     LOGFONT DialogFont;
     LOGFONT MenuFont;
 
 } PREVIEW_DATA, *PPREVIEW_DATA;
+
+
+/* HACK: fill the caption bar squares due to NULL text */
+static VOID
+FillSquare(HDC hdc, PRECT rect)
+{
+    INT x, y, i;
+
+    x = rect->left + 2;
+    y = rect->top + 2;
+
+    for (i = 3; i < 12; i++)
+    {
+        BitBlt(hdc, x, y + i, 10, 1, hdc, x, y, SRCCOPY);
+    }
+}
 
 
 static VOID
@@ -176,13 +202,6 @@
     HDC hdc;
     PAINTSTRUCT ps;
     RECT rc;
-    static NONCLIENTMETRICS NonClientMetrics;
-    static TCHAR szInAct[32];
-    static TCHAR szAct[32];
-    static TCHAR szWinTxt[32];
-    static TCHAR szMessBox[32];
-    static TCHAR szMessText[32];
-    static TCHAR szButText[4];
 
     pPreviewData = (PPREVIEW_DATA)GetWindowLongPtr(hwnd, GWLP_USERDATA);
 
@@ -190,6 +209,8 @@
     {
         case WM_CREATE:
         {
+            NONCLIENTMETRICS NonClientMetrics;
+
             pPreviewData = (PPREVIEW_DATA)HeapAlloc(GetProcessHeap(),
                                                     HEAP_ZERO_MEMORY,
                                                     sizeof(PREVIEW_DATA));
@@ -214,12 +235,15 @@
             pPreviewData->MenuFont = NonClientMetrics.lfMenuFont;
             pPreviewData->DialogFont = NonClientMetrics.lfMessageFont;
 
-            LoadString(hApplet, IDS_INACTWIN, szInAct, sizeof(szInAct));
-            LoadString(hApplet, IDS_ACTWIN, szAct, sizeof(szAct));
-            LoadString(hApplet, IDS_WINTEXT, szWinTxt, sizeof(szWinTxt));
-            LoadString(hApplet, IDS_MESSBOX, szMessBox, sizeof(szMessBox));
-            LoadString(hApplet, IDS_MESSTEXT, szMessText, sizeof(szMessText));
-            LoadString(hApplet, IDS_BUTTEXT, szButText, sizeof(szButText));
+            AllocAndLoadString(&pPreviewData->lpInAct, hApplet, IDS_INACTWIN);
+            AllocAndLoadString(&pPreviewData->lpAct, hApplet, IDS_ACTWIN);
+            AllocAndLoadString(&pPreviewData->lpWinTxt, hApplet, IDS_WINTEXT);
+            AllocAndLoadString(&pPreviewData->lpMessBox, hApplet, IDS_MESSBOX);
+            AllocAndLoadString(&pPreviewData->lpMessText, hApplet, IDS_MESSTEXT);
+            AllocAndLoadString(&pPreviewData->lpButText, hApplet, IDS_BUTTEXT);
+            AllocAndLoadString(&pPreviewData->lpMenNorm, hApplet, IDS_NORMAL);
+            AllocAndLoadString(&pPreviewData->lpMenDis, hApplet, IDS_DISABLED);
+            AllocAndLoadString(&pPreviewData->lpMenSel, hApplet, IDS_SELECTED);
 
             break;
         }
@@ -241,25 +265,26 @@
             DrawEdge(hdc, &pPreviewData->rcInactiveFrame, EDGE_RAISED, BF_RECT |
BF_MIDDLE);
             DrawCaption(hwnd, hdc, &pPreviewData->rcInactiveCaption, DC_GRADIENT |
DC_TEXT);
             DrawCaptionButtons(hdc, &pPreviewData->rcInactiveCaption, TRUE);
-            CopyMemory(&tmpRc, &pPreviewData->rcInactiveCaption,
sizeof(RECT));
+            FillSquare(hdc, &pPreviewData->rcInactiveCaption);
+            CopyRect(&tmpRc, &pPreviewData->rcInactiveCaption);
             tmpRc.left += 4;
             tmpRc.top += 2;
             SelectObject(hdc, CreateFontIndirect(&pPreviewData->CaptionFont));
             SetTextColor(hdc, RGB(212,208,200));
-            DrawText(hdc, szInAct, lstrlen(szInAct), &tmpRc, DT_LEFT);
-            DeleteObject(SelectObject(hdc, GetStockObject(SYSTEM_FONT)));
-
+            DrawText(hdc, pPreviewData->lpInAct, lstrlen(pPreviewData->lpInAct),
&tmpRc, DT_LEFT);
+            DeleteObject(SelectObject(hdc, GetStockObject(SYSTEM_FONT)));
 
             /* Active Window */
             DrawEdge(hdc, &pPreviewData->rcActiveFrame, EDGE_RAISED, BF_RECT |
BF_MIDDLE);
             DrawCaption(hwnd, hdc, &pPreviewData->rcActiveCaption, DC_ACTIVE |
DC_GRADIENT | DC_TEXT);
             DrawCaptionButtons(hdc, &pPreviewData->rcActiveCaption, TRUE);
-            CopyMemory(&tmpRc, &pPreviewData->rcActiveCaption, sizeof(RECT));
+            FillSquare(hdc, &pPreviewData->rcActiveCaption);
+            CopyRect(&tmpRc, &pPreviewData->rcActiveCaption);
             tmpRc.left += 4;
             tmpRc.top += 2;
             SetTextColor(hdc, RGB(255,255,255)); // FIXME: don't hardcode colors
             SelectObject(hdc, CreateFontIndirect(&pPreviewData->CaptionFont));
-            DrawText(hdc, szAct, lstrlen(szAct), &tmpRc, DT_LEFT);
+            DrawText(hdc, pPreviewData->lpAct, lstrlen(pPreviewData->lpAct),
&tmpRc, DT_LEFT);
             DeleteObject(SelectObject(hdc, GetStockObject(SYSTEM_FONT)));
 
             /* FIXME: Draw the menu bar */
@@ -268,47 +293,46 @@
             FillRect(hdc, &rc, pPreviewData->hbrWindow);
 
             /* Draw the client text */
-            CopyMemory(&tmpRc, &pPreviewData->rcActiveClient, sizeof(RECT));
+            CopyRect(&tmpRc, &pPreviewData->rcActiveClient);
             tmpRc.left += 4;
             tmpRc.top += 2;
             SetTextColor(hdc, RGB(0,0,0));
             SelectObject(hdc, CreateFontIndirect(&pPreviewData->DialogFont));
-            DrawText(hdc, szWinTxt, lstrlen(szWinTxt), &tmpRc, DT_LEFT);
+            DrawText(hdc, pPreviewData->lpWinTxt, lstrlen(pPreviewData->lpWinTxt),
&tmpRc, DT_LEFT);
             DeleteObject(SelectObject(hdc, GetStockObject(SYSTEM_FONT)));
 
             /* Draw the scroll bar */
             DrawScrollbar(hdc, &pPreviewData->rcActiveScroll);
-
 
             /* Dialog Window */
             DrawEdge(hdc, &pPreviewData->rcDialogFrame, EDGE_RAISED, BF_RECT |
BF_MIDDLE);
             DrawCaption(hwnd, hdc, &pPreviewData->rcDialogCaption, DC_ACTIVE |
DC_GRADIENT | DC_TEXT);
             DrawCaptionButtons(hdc, &pPreviewData->rcDialogCaption, FALSE);
-            CopyMemory(&tmpRc, &pPreviewData->rcDialogCaption, sizeof(RECT));
+            FillSquare(hdc, &pPreviewData->rcDialogCaption);
+            CopyRect(&tmpRc, &pPreviewData->rcDialogCaption);
             tmpRc.left += 4;
             tmpRc.top += 2;
             SetTextColor(hdc, RGB(255,255,255));
             SelectObject(hdc, CreateFontIndirect(&pPreviewData->CaptionFont));
-            DrawText(hdc, szMessBox, lstrlen(szMessBox), &tmpRc, DT_LEFT);
+            DrawText(hdc, pPreviewData->lpMessBox,
lstrlen(pPreviewData->lpMessBox), &tmpRc, DT_LEFT);
             DeleteObject(SelectObject(hdc, GetStockObject(SYSTEM_FONT)));
 
             /* draw the dialog text */
-            CopyMemory(&tmpRc, &pPreviewData->rcDialogClient, sizeof(RECT));
+            CopyRect(&tmpRc, &pPreviewData->rcDialogClient);
             tmpRc.left += 4;
             tmpRc.top += 2;
             SetTextColor(hdc, RGB(0,0,0));
             SelectObject(hdc, CreateFontIndirect(&pPreviewData->DialogFont));
-            DrawText(hdc, szMessText, lstrlen(szMessText), &tmpRc, DT_LEFT);
+            DrawText(hdc, pPreviewData->lpMessText,
lstrlen(pPreviewData->lpMessText), &tmpRc, DT_LEFT);
             DeleteObject(SelectObject(hdc, GetStockObject(SYSTEM_FONT)));
 
             /* Draw Button */
             DrawFrameControl(hdc, &pPreviewData->rcDialogButton, DFC_BUTTON,
DFCS_BUTTONPUSH);
-            CopyMemory(&tmpRc, &pPreviewData->rcDialogButton, sizeof(RECT));
+            CopyRect(&tmpRc, &pPreviewData->rcDialogButton);
             tmpRc.top += 6;
             SelectObject(hdc, CreateFontIndirect(&pPreviewData->DialogFont));
-            DrawText(hdc, szButText, lstrlen(szButText), &tmpRc, DT_CENTER);
-            DeleteObject(SelectObject(hdc, GetStockObject(SYSTEM_FONT)));
-
+            DrawText(hdc, pPreviewData->lpButText,
lstrlen(pPreviewData->lpButText), &tmpRc, DT_CENTER);
+            DeleteObject(SelectObject(hdc, GetStockObject(SYSTEM_FONT)));
 
             EndPaint(hwnd, &ps);
             break;
@@ -317,6 +341,16 @@
         case WM_DESTROY:
             DeleteObject(pPreviewData->hbrDesktop);
             DeleteObject(pPreviewData->hbrWindow);
+
+            LocalFree((HLOCAL)pPreviewData->lpInAct);
+            LocalFree((HLOCAL)pPreviewData->lpAct);
+            LocalFree((HLOCAL)pPreviewData->lpWinTxt);
+            LocalFree((HLOCAL)pPreviewData->lpMessBox);
+            LocalFree((HLOCAL)pPreviewData->lpMessText);
+            LocalFree((HLOCAL)pPreviewData->lpButText);
+            LocalFree((HLOCAL)pPreviewData->lpMenNorm);
+            LocalFree((HLOCAL)pPreviewData->lpMenDis);
+            LocalFree((HLOCAL)pPreviewData->lpMenSel);
 
             HeapFree(GetProcessHeap(), 0, pPreviewData);
             break;

Modified: trunk/reactos/dll/cpl/desk/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/resource.h?re…
==============================================================================
--- trunk/reactos/dll/cpl/desk/resource.h (original)
+++ trunk/reactos/dll/cpl/desk/resource.h Fri Jan  5 20:51:05 2007
@@ -88,6 +88,9 @@
 #define IDS_MESSBOX     1513
 #define IDS_MESSTEXT    1514
 #define IDS_BUTTEXT     1515
+#define IDS_NORMAL      1516
+#define IDS_DISABLED    1517
+#define IDS_SELECTED    1518
 
 
 #endif /* __CPL_DESK_RESOURCE_H__ */

Modified: trunk/reactos/dll/cpl/desk/sv.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/sv.rc?rev=253…
==============================================================================
--- trunk/reactos/dll/cpl/desk/sv.rc (original)
+++ trunk/reactos/dll/cpl/desk/sv.rc Fri Jan  5 20:51:05 2007
@@ -126,4 +126,7 @@
     IDS_MESSBOX  "Message Box"
     IDS_MESSTEXT "Message Text"
     IDS_BUTTEXT  "OK"
+    IDS_NORMAL   "Normal"
+    IDS_DISABLED "Disabled"
+    IDS_SELECTED "Selected"
 END