- Don't show applets on taskbar

svn path=/trunk/; revision=33523

diff --git a/reactos/dll/cpl/access/access.c b/reactos/dll/cpl/access/access.c
index b185eb9..2033848 100644 (file)
--- a/reactos/dll/cpl/access/access.c
+++ b/reactos/dll/cpl/access/access.c
@@ -20,6 +20,7 @@
 
 LONG CALLBACK SystemApplet(VOID);
 HINSTANCE hApplet = 0;
+HWND hCPLWindow;
 
 /* Applets */
 APPLET Applets[NUM_APPLETS] =
@@ -193,7 +194,7 @@ SystemApplet(VOID)
     ZeroMemory(&psh, sizeof(PROPSHEETHEADER));
     psh.dwSize = sizeof(PROPSHEETHEADER);
     psh.dwFlags =  PSH_PROPSHEETPAGE;
-    psh.hwndParent = NULL;
+    psh.hwndParent = hCPLWindow;
     psh.hInstance = hApplet;
     psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_CPLACCESS));
     psh.pszCaption = Caption;
@@ -223,8 +224,6 @@ CPlApplet(HWND hwndCPl,
 {
     INT i = (INT)lParam1;
 
-    UNREFERENCED_PARAMETER(hwndCPl);
-
     switch (uMsg)
     {
         case CPL_INIT:
@@ -244,6 +243,7 @@ CPlApplet(HWND hwndCPl,
             break;
 
         case CPL_DBLCLK:
+            hCPLWindow = hwndCPl;
             Applets[i].AppletProc();
             break;
     }

diff --git a/reactos/dll/cpl/appwiz/appwiz.c b/reactos/dll/cpl/appwiz/appwiz.c
index 47c63d9..63cee16 100644 (file)
--- a/reactos/dll/cpl/appwiz/appwiz.c
+++ b/reactos/dll/cpl/appwiz/appwiz.c
@@ -36,6 +36,7 @@ LONG CALLBACK SystemApplet(VOID);
 INT_PTR CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
 INT_PTR CALLBACK ComputerPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
 HINSTANCE hApplet = 0;
+HWND hCPLWindow;
 
 /* Applets */
 
@@ -69,7 +70,7 @@ SystemApplet(VOID)
     ZeroMemory(&psh, sizeof(PROPSHEETHEADER));
     psh.dwSize = sizeof(PROPSHEETHEADER);
     psh.dwFlags =  PSH_PROPSHEETPAGE;
-    psh.hwndParent = NULL;
+    psh.hwndParent = hCPLWindow;
     psh.hInstance = hApplet;
     psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_CPLSYSTEM));
     psh.pszCaption = Caption;
@@ -94,8 +95,6 @@ CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2)
     CPLINFO *CPlInfo;
     DWORD i;
 
-    UNREFERENCED_PARAMETER(hwndCPl);
-
     i = (DWORD)lParam1;
     switch (uMsg)
     {
@@ -114,6 +113,7 @@ CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2)
             break;
 
         case CPL_DBLCLK:
+            hCPLWindow = hwndCPl;
             Applets[i].AppletProc();
             break;
     }

diff --git a/reactos/dll/cpl/console/console.c b/reactos/dll/cpl/console/console.c
index a170a02..a9bea93 100644 (file)
--- a/reactos/dll/cpl/console/console.c
+++ b/reactos/dll/cpl/console/console.c
@@ -229,7 +229,7 @@ InitApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam)
                psh.pszCaption = pConInfo->szProcessName;
        }
 
-       psh.hwndParent = NULL;
+       psh.hwndParent = hwnd;
        psh.hInstance = hApplet;
        psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDC_CPLICON));
        psh.pszCaption = 0;

diff --git a/reactos/dll/cpl/desk/desk.c b/reactos/dll/cpl/desk/desk.c
index 34f0abc..c6784f4 100644 (file)
--- a/reactos/dll/cpl/desk/desk.c
+++ b/reactos/dll/cpl/desk/desk.c
@@ -22,6 +22,7 @@ INT_PTR CALLBACK SettingsPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
 UINT CALLBACK SettingsPageCallbackProc(HWND hwnd, UINT uMsg, LPPROPSHEETPAGE ppsp);
 
 HINSTANCE hApplet = 0;
+HWND hCPLWindow;
 
 /* Applets */
 APPLET Applets[NUM_APPLETS] =
@@ -136,7 +137,7 @@ DisplayApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam)
     ZeroMemory(&psh, sizeof(PROPSHEETHEADER));
     psh.dwSize = sizeof(PROPSHEETHEADER);
     psh.dwFlags = PSH_USECALLBACK | PSH_PROPTITLE;
-    psh.hwndParent = NULL;
+    psh.hwndParent = hCPLWindow;
     psh.hInstance = hApplet;
     psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDC_DESK_ICON));
     psh.pszCaption = Caption;
@@ -198,6 +199,7 @@ CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2)
             break;
 
         case CPL_DBLCLK:
+            hCPLWindow = hwndCPl;
             Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2);
             break;
     }

diff --git a/reactos/dll/cpl/input/input.c b/reactos/dll/cpl/input/input.c
index f6e3aa9..558bff4 100644 (file)
--- a/reactos/dll/cpl/input/input.c
+++ b/reactos/dll/cpl/input/input.c
@@ -17,6 +17,7 @@
 LONG CALLBACK SystemApplet(VOID);
 HINSTANCE hApplet = 0;
 HANDLE hProcessHeap;
+HWND hCPLWindow;
 
 /* Applets */
 APPLET Applets[NUM_APPLETS] =
@@ -51,7 +52,7 @@ SystemApplet(VOID)
     ZeroMemory(&psh, sizeof(PROPSHEETHEADER));
     psh.dwSize = sizeof(PROPSHEETHEADER);
     psh.dwFlags =  PSH_PROPSHEETPAGE;
-    psh.hwndParent = NULL;
+    psh.hwndParent = hCPLWindow;
     psh.hInstance = hApplet;
     psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_CPLSYSTEM));
     psh.pszCaption = Caption;
@@ -73,8 +74,6 @@ CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2)
     CPLINFO *CPlInfo;
     DWORD i;
 
-    UNREFERENCED_PARAMETER(hwndCPl);
-
     i = (DWORD)lParam1;
     switch (uMsg)
     {
@@ -93,6 +92,7 @@ CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2)
             break;
 
         case CPL_DBLCLK:
+            hCPLWindow = hwndCPl;
             Applets[i].AppletProc();
             break;
     }

diff --git a/reactos/dll/cpl/intl/intl.c b/reactos/dll/cpl/intl/intl.c
index f122f5a..d2c6d84 100644 (file)
--- a/reactos/dll/cpl/intl/intl.c
+++ b/reactos/dll/cpl/intl/intl.c
@@ -40,6 +40,7 @@ Applet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam);
 
 
 HINSTANCE hApplet = 0;
+HWND hCPLWindow;
 HINF hSetupInf = INVALID_HANDLE_VALUE;
 DWORD IsUnattendedSetupEnabled = 0;
 DWORD UnattendLCID = 0;
@@ -142,7 +143,7 @@ Applet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam)
     ZeroMemory(&psh, sizeof(PROPSHEETHEADER));
     psh.dwSize = sizeof(PROPSHEETHEADER);
     psh.dwFlags =  PSH_PROPSHEETPAGE | PSH_PROPTITLE;
-    psh.hwndParent = NULL;
+    psh.hwndParent = hCPLWindow;
     psh.hInstance = hApplet;
     psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDC_CPLICON));
     psh.pszCaption = Caption;
@@ -188,6 +189,7 @@ CPlApplet(HWND hwndCpl,
         case CPL_DBLCLK:
         {
             UINT uAppIndex = (UINT)lParam1;
+            hCPLWindow = hwndCpl;
             Applets[uAppIndex].AppletProc(hwndCpl, uMsg, lParam1, lParam2);
             break;
         }

diff --git a/reactos/dll/cpl/main/keyboard.c b/reactos/dll/cpl/main/keyboard.c
index 5e724f6..52d1f09 100644 (file)
--- a/reactos/dll/cpl/main/keyboard.c
+++ b/reactos/dll/cpl/main/keyboard.c
@@ -312,7 +312,7 @@ KeyboardApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam)
     ZeroMemory(&psh, sizeof(PROPSHEETHEADER));
     psh.dwSize = sizeof(PROPSHEETHEADER);
     psh.dwFlags =  PSH_PROPTITLE;
-    psh.hwndParent = NULL;
+    psh.hwndParent = hwnd;
     psh.hInstance = hApplet;
     psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDC_CPLICON_2));
     psh.pszCaption = szCaption;

diff --git a/reactos/dll/cpl/main/mouse.c b/reactos/dll/cpl/main/mouse.c
index 504e609..424c7ce 100644 (file)
--- a/reactos/dll/cpl/main/mouse.c
+++ b/reactos/dll/cpl/main/mouse.c
@@ -1837,7 +1837,7 @@ MouseApplet(HWND hwnd, UINT uMsg, LPARAM lParam1, LPARAM lParam2)
     ZeroMemory(&psh, sizeof(PROPSHEETHEADER));
     psh.dwSize = sizeof(PROPSHEETHEADER);
     psh.dwFlags = PSH_PROPTITLE;
-    psh.hwndParent = NULL;
+    psh.hwndParent = hwnd;
     psh.hInstance = hApplet;
     psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDC_CPLICON_1));
     psh.pszCaption = Caption;

diff --git a/reactos/dll/cpl/mmsys/mmsys.c b/reactos/dll/cpl/mmsys/mmsys.c
index 6ce0a98..bd6a226 100644 (file)
--- a/reactos/dll/cpl/mmsys/mmsys.c
+++ b/reactos/dll/cpl/mmsys/mmsys.c
@@ -103,7 +103,6 @@ MmSysApplet(HWND hwnd,
     UNREFERENCED_PARAMETER(lParam);
     UNREFERENCED_PARAMETER(wParam);
     UNREFERENCED_PARAMETER(uMsg);
-    UNREFERENCED_PARAMETER(hwnd);
 
     LoadString(hApplet,
                IDS_CPLNAME,
@@ -112,7 +111,7 @@ MmSysApplet(HWND hwnd,
 
     psh.dwSize = sizeof(PROPSHEETHEADER);
     psh.dwFlags =  PSH_PROPSHEETPAGE | PSH_PROPTITLE;
-    psh.hwndParent = NULL;
+    psh.hwndParent = hwnd;
     psh.hInstance = hApplet;
     psh.hIcon = LoadIcon(hApplet,
                          MAKEINTRESOURCE(IDI_CPLICON));

diff --git a/reactos/dll/cpl/ncpa/ncpa.c b/reactos/dll/cpl/ncpa/ncpa.c
index 3570c77..cdafefa 100644 (file)
--- a/reactos/dll/cpl/ncpa/ncpa.c
+++ b/reactos/dll/cpl/ncpa/ncpa.c
@@ -82,6 +82,7 @@ static INT_PTR CALLBACK NetworkPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam,
 void DisplayTCPIPProperties(HWND hParent,IP_ADAPTER_INFO *pInfo);
 
 HINSTANCE hApplet = 0;
+HWND hCPLWindow;
 
 /* Applets */
 static APPLET Applets[] =
@@ -1030,7 +1031,7 @@ DisplayApplet(VOID)
 
        psh.dwSize = sizeof(PROPSHEETHEADER);
        psh.dwFlags =  PSH_PROPSHEETPAGE;
-       psh.hwndParent = NULL;
+       psh.hwndParent = hCPLWindow;
        psh.hInstance = hApplet;
        psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_CPLSYSTEM));
        psh.pszCaption = Caption;
@@ -1077,6 +1078,7 @@ CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2)
 
        case CPL_DBLCLK:
                {
+            hCPLWindow = hwndCPl;
                        Applets[(int)lParam1].AppletProc();
                        break;
                }

diff --git a/reactos/dll/cpl/powercfg/powercfg.c b/reactos/dll/cpl/powercfg/powercfg.c
index 9a6c9af..af764b2 100644 (file)
--- a/reactos/dll/cpl/powercfg/powercfg.c
+++ b/reactos/dll/cpl/powercfg/powercfg.c
@@ -84,7 +84,6 @@ Applet1(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam)
   SYSTEM_POWER_CAPABILITIES spc;
   LONG ret;
 
-  UNREFERENCED_PARAMETER(hwnd);
   UNREFERENCED_PARAMETER(uMsg);
   UNREFERENCED_PARAMETER(wParam);
   UNREFERENCED_PARAMETER(lParam);
@@ -95,7 +94,7 @@ Applet1(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam)
   ZeroMemory(&psh, sizeof(PROPSHEETHEADER));
   psh.dwSize = sizeof(PROPSHEETHEADER);
   psh.dwFlags = PSH_PROPTITLE;
-  psh.hwndParent = NULL;
+  psh.hwndParent = hwnd;
   psh.hInstance = hApplet;
   psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDC_CPLICON_1));
   psh.pszCaption = Caption;

diff --git a/reactos/dll/cpl/sysdm/sysdm.c b/reactos/dll/cpl/sysdm/sysdm.c
index e3e9f3c..ddc6d55 100644 (file)
--- a/reactos/dll/cpl/sysdm/sysdm.c
+++ b/reactos/dll/cpl/sysdm/sysdm.c
@@ -11,6 +11,7 @@
 
 LONG CALLBACK SystemApplet(VOID);
 HINSTANCE hApplet = 0;
+HWND hCPLWindow;
 
 /* Applets */
 APPLET Applets[NUM_APPLETS] =
@@ -112,7 +113,7 @@ SystemApplet(VOID)
     ZeroMemory(&psh, sizeof(PROPSHEETHEADER));
     psh.dwSize = sizeof(PROPSHEETHEADER);
     psh.dwFlags =  PSH_PROPTITLE;
-    psh.hwndParent = NULL;
+    psh.hwndParent = hCPLWindow;
     psh.hInstance = hApplet;
     psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_CPLSYSTEM));
     psh.pszCaption = MAKEINTRESOURCE(IDS_CPLSYSTEMNAME);
@@ -176,6 +177,7 @@ CPlApplet(HWND hwndCPl,
             break;
 
         case CPL_DBLCLK:
+            hCPLWindow = hwndCPl;
             Applets[i].AppletProc();
             break;
     }

diff --git a/reactos/dll/cpl/telephon/telephon.c b/reactos/dll/cpl/telephon/telephon.c
index c1fcf0e..0b37340 100644 (file)
--- a/reactos/dll/cpl/telephon/telephon.c
+++ b/reactos/dll/cpl/telephon/telephon.c
@@ -32,6 +32,7 @@
 
 LONG CALLBACK SystemApplet(VOID);
 HINSTANCE hApplet = 0;
+HWND hCPLWindow;
 
 /* Applets */
 
@@ -53,7 +54,7 @@ SystemApplet(VOID)
     ZeroMemory(&psh, sizeof(PROPSHEETHEADER));
     psh.dwSize = sizeof(PROPSHEETHEADER);
     psh.dwFlags =  PSH_PROPSHEETPAGE;
-    psh.hwndParent = NULL;
+    psh.hwndParent = hCPLWindow;
     psh.hInstance = hApplet;
     psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_CPLSYSTEM));
     psh.pszCaption = Caption;
@@ -75,8 +76,6 @@ CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2)
     CPLINFO *CPlInfo;
     DWORD i;
 
-    UNREFERENCED_PARAMETER(hwndCPl);
-
     i = (DWORD)lParam1;
     switch (uMsg)
     {
@@ -95,6 +94,7 @@ CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2)
             break;
 
         case CPL_DBLCLK:
+            hCPLWindow = hwndCPl;
             Applets[i].AppletProc();
             break;
     }

diff --git a/reactos/dll/cpl/timedate/timedate.c b/reactos/dll/cpl/timedate/timedate.c
index b6263bd..246ca3b 100644 (file)
--- a/reactos/dll/cpl/timedate/timedate.c
+++ b/reactos/dll/cpl/timedate/timedate.c
@@ -76,7 +76,6 @@ Applet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam)
     WCHAR Caption[256];
     LONG Ret = 0;
 
-    UNREFERENCED_PARAMETER(hwnd);
     UNREFERENCED_PARAMETER(uMsg);
     UNREFERENCED_PARAMETER(wParam);
     UNREFERENCED_PARAMETER(lParam);
@@ -89,7 +88,7 @@ Applet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam)
         ZeroMemory(&psh, sizeof(PROPSHEETHEADERW));
         psh.dwSize = sizeof(PROPSHEETHEADERW);
         psh.dwFlags =  PSH_PROPSHEETPAGE | PSH_PROPTITLE;
-        psh.hwndParent = NULL;
+        psh.hwndParent = hwnd;
         psh.hInstance = hApplet;
         psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCEW(IDC_CPLICON));
         psh.pszCaption = Caption;

diff --git a/reactos/dll/cpl/usrmgr/usrmgr.c b/reactos/dll/cpl/usrmgr/usrmgr.c
index c622bea..1258ffe 100644 (file)
--- a/reactos/dll/cpl/usrmgr/usrmgr.c
+++ b/reactos/dll/cpl/usrmgr/usrmgr.c
@@ -51,14 +51,13 @@ UsrmgrApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam)
     UNREFERENCED_PARAMETER(lParam);\r
     UNREFERENCED_PARAMETER(wParam);\r
     UNREFERENCED_PARAMETER(uMsg);\r
-    UNREFERENCED_PARAMETER(hwnd);\r
 \r
     LoadString(hApplet, IDS_CPLNAME, Caption, sizeof(Caption) / sizeof(TCHAR));\r
 \r
     ZeroMemory(&psh, sizeof(PROPSHEETHEADER));\r
     psh.dwSize = sizeof(PROPSHEETHEADER);\r
     psh.dwFlags =  PSH_PROPSHEETPAGE;\r
-    psh.hwndParent = NULL;\r
+    psh.hwndParent = hwnd;\r
     psh.hInstance = hApplet;\r
     psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_USRMGR_ICON));\r
     psh.pszCaption = Caption;\r