[KSPROXY]

[reactos.git] / reactos / dll / cpl / sysdm / licence.c

diff --git a/reactos/dll/cpl/sysdm/licence.c b/reactos/dll/cpl/sysdm/licence.c
index 29f767d..a1a799c 100644 (file)
--- a/reactos/dll/cpl/sysdm/licence.c
+++ b/reactos/dll/cpl/sysdm/licence.c
@@ -9,6 +9,55 @@
 
 #include "precomp.h"
 
+typedef struct _LIC_CONTEXT
+{
+    HICON hIcon;
+} LIC_CONTEXT, *PLIC_CONTEXT;
+
+
+static BOOL
+OnInitDialog(HWND hDlg, PLIC_CONTEXT pLicInfo)
+{
+    HRSRC hResInfo;
+    HGLOBAL hResMem;
+    WCHAR *LicenseText;
+
+    pLicInfo->hIcon = LoadImage(hApplet,
+                                MAKEINTRESOURCE(IDI_CPLSYSTEM),
+                                IMAGE_ICON,
+                                16,
+                                16,
+                                0);
+
+    SendMessage(hDlg,
+                WM_SETICON,
+                ICON_SMALL,
+                (LPARAM)pLicInfo->hIcon);
+
+    /* load license from resource */
+    if (!(hResInfo = FindResource(hApplet,
+                                  MAKEINTRESOURCE(RC_LICENSE),
+                                  MAKEINTRESOURCE(RTDATA))) ||
+        !(hResMem = LoadResource(hApplet, hResInfo)) ||
+        !(LicenseText = LockResource(hResMem)))
+    {
+        ShowLastWin32Error(hDlg);
+        return FALSE;
+    }
+
+    /* insert the license into the edit control (unicode!) */
+    SetDlgItemText(hDlg,
+                   IDC_LICENCEEDIT,
+                   LicenseText);
+
+    PostMessage(GetDlgItem(hDlg, IDC_LICENCEEDIT),
+                EM_SETSEL,
+                -1,
+                0);
+
+    return TRUE;
+}
+
 
 INT_PTR CALLBACK
 LicenceDlgProc(HWND hDlg,
@@ -16,55 +65,35 @@ LicenceDlgProc(HWND hDlg,
                WPARAM wParam,
                LPARAM lParam)
 {
-    HRSRC hResInfo;
-    HGLOBAL hResMem;
-    WCHAR *LicenseText;
-    static HICON hIcon;
+    PLIC_CONTEXT pLicInfo;
 
     UNREFERENCED_PARAMETER(lParam);
 
+    pLicInfo = (PLIC_CONTEXT)GetWindowLongPtr(hDlg, DWLP_USER);
+
     switch (uMsg)
     {
         case WM_INITDIALOG:
-            hIcon = LoadImage(hApplet,
-                              MAKEINTRESOURCE(IDI_CPLSYSTEM),
-                              IMAGE_ICON,
-                              16,
-                              16,
-                              0);
-
-            SendMessage(hDlg,
-                        WM_SETICON,
-                        ICON_SMALL,
-                        (LPARAM)hIcon);
-
-            /* load license from resource */
-            if(!(hResInfo = FindResource(hApplet,
-                                         MAKEINTRESOURCE(RC_LICENSE),
-                                         MAKEINTRESOURCE(RTDATA))) ||
-               !(hResMem = LoadResource(hApplet, hResInfo)) ||
-               !(LicenseText = LockResource(hResMem)))
+            pLicInfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LIC_CONTEXT));
+            if (pLicInfo == NULL)
             {
-                ShowLastWin32Error(hDlg);
-                break;
+                EndDialog(hDlg, 0);
+                return FALSE;
             }
+            SetWindowLongPtr(hDlg, DWLP_USER, (LONG_PTR)pLicInfo);
+            return OnInitDialog(hDlg, pLicInfo);
 
-            /* insert the license into the edit control (unicode!) */
-            SetDlgItemText(hDlg,
-                           IDC_LICENCEEDIT,
-                           LicenseText);
-
-            PostMessage(GetDlgItem(hDlg, IDC_LICENCEEDIT),
-                        EM_SETSEL,
-                        -1,
-                        0);
-
-            return TRUE;
+        case WM_DESTROY:
+            if (pLicInfo)
+            {
+                DestroyIcon(pLicInfo->hIcon);
+                HeapFree(GetProcessHeap(), 0, pLicInfo);
+            }
+            break;
 
         case WM_COMMAND:
             if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL))
             {
-                DestroyIcon(hIcon);
                 EndDialog(hDlg,
                           LOWORD(wParam));
                 return TRUE;