[ros-diffs] [dchapyshev] 33523: - Don't show applets on taskbar
dchapyshev at svn.reactos.org
dchapyshev at svn.reactos.org
Thu May 15 07:43:02 CEST 2008
Author: dchapyshev
Date: Thu May 15 00:43:01 2008
New Revision: 33523
URL: http://svn.reactos.org/svn/reactos?rev=33523&view=rev
Log:
- Don't show applets on taskbar
Modified:
trunk/reactos/dll/cpl/access/access.c
trunk/reactos/dll/cpl/appwiz/appwiz.c
trunk/reactos/dll/cpl/console/console.c
trunk/reactos/dll/cpl/desk/desk.c
trunk/reactos/dll/cpl/input/input.c
trunk/reactos/dll/cpl/intl/intl.c
trunk/reactos/dll/cpl/main/keyboard.c
trunk/reactos/dll/cpl/main/mouse.c
trunk/reactos/dll/cpl/mmsys/mmsys.c
trunk/reactos/dll/cpl/ncpa/ncpa.c
trunk/reactos/dll/cpl/powercfg/powercfg.c
trunk/reactos/dll/cpl/sysdm/sysdm.c
trunk/reactos/dll/cpl/telephon/telephon.c
trunk/reactos/dll/cpl/timedate/timedate.c
trunk/reactos/dll/cpl/usrmgr/usrmgr.c
Modified: trunk/reactos/dll/cpl/access/access.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/access.c?rev=33523&r1=33522&r2=33523&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/access/access.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/access/access.c [iso-8859-1] Thu May 15 00:43:01 2008
@@ -20,6 +20,7 @@
LONG CALLBACK SystemApplet(VOID);
HINSTANCE hApplet = 0;
+HWND hCPLWindow;
/* Applets */
APPLET Applets[NUM_APPLETS] =
@@ -193,7 +194,7 @@
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;
@@ -222,8 +223,6 @@
LPARAM lParam2)
{
INT i = (INT)lParam1;
-
- UNREFERENCED_PARAMETER(hwndCPl);
switch (uMsg)
{
@@ -244,6 +243,7 @@
break;
case CPL_DBLCLK:
+ hCPLWindow = hwndCPl;
Applets[i].AppletProc();
break;
}
Modified: trunk/reactos/dll/cpl/appwiz/appwiz.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.c?rev=33523&r1=33522&r2=33523&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/appwiz/appwiz.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/appwiz/appwiz.c [iso-8859-1] Thu May 15 00:43:01 2008
@@ -36,6 +36,7 @@
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 @@
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 @@
CPLINFO *CPlInfo;
DWORD i;
- UNREFERENCED_PARAMETER(hwndCPl);
-
i = (DWORD)lParam1;
switch (uMsg)
{
@@ -114,6 +113,7 @@
break;
case CPL_DBLCLK:
+ hCPLWindow = hwndCPl;
Applets[i].AppletProc();
break;
}
Modified: trunk/reactos/dll/cpl/console/console.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/console.c?rev=33523&r1=33522&r2=33523&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/console/console.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/console/console.c [iso-8859-1] Thu May 15 00:43:01 2008
@@ -229,7 +229,7 @@
psh.pszCaption = pConInfo->szProcessName;
}
- psh.hwndParent = NULL;
+ psh.hwndParent = hwnd;
psh.hInstance = hApplet;
psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDC_CPLICON));
psh.pszCaption = 0;
Modified: trunk/reactos/dll/cpl/desk/desk.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.c?rev=33523&r1=33522&r2=33523&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/desk.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/desk.c [iso-8859-1] Thu May 15 00:43:01 2008
@@ -22,6 +22,7 @@
UINT CALLBACK SettingsPageCallbackProc(HWND hwnd, UINT uMsg, LPPROPSHEETPAGE ppsp);
HINSTANCE hApplet = 0;
+HWND hCPLWindow;
/* Applets */
APPLET Applets[NUM_APPLETS] =
@@ -136,7 +137,7 @@
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 @@
break;
case CPL_DBLCLK:
+ hCPLWindow = hwndCPl;
Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2);
break;
}
Modified: trunk/reactos/dll/cpl/input/input.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.c?rev=33523&r1=33522&r2=33523&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/input/input.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/input/input.c [iso-8859-1] Thu May 15 00:43:01 2008
@@ -17,6 +17,7 @@
LONG CALLBACK SystemApplet(VOID);
HINSTANCE hApplet = 0;
HANDLE hProcessHeap;
+HWND hCPLWindow;
/* Applets */
APPLET Applets[NUM_APPLETS] =
@@ -51,7 +52,7 @@
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 @@
CPLINFO *CPlInfo;
DWORD i;
- UNREFERENCED_PARAMETER(hwndCPl);
-
i = (DWORD)lParam1;
switch (uMsg)
{
@@ -93,6 +92,7 @@
break;
case CPL_DBLCLK:
+ hCPLWindow = hwndCPl;
Applets[i].AppletProc();
break;
}
Modified: trunk/reactos/dll/cpl/intl/intl.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.c?rev=33523&r1=33522&r2=33523&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/intl/intl.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/intl/intl.c [iso-8859-1] Thu May 15 00:43:01 2008
@@ -40,6 +40,7 @@
HINSTANCE hApplet = 0;
+HWND hCPLWindow;
HINF hSetupInf = INVALID_HANDLE_VALUE;
DWORD IsUnattendedSetupEnabled = 0;
DWORD UnattendLCID = 0;
@@ -142,7 +143,7 @@
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 @@
case CPL_DBLCLK:
{
UINT uAppIndex = (UINT)lParam1;
+ hCPLWindow = hwndCpl;
Applets[uAppIndex].AppletProc(hwndCpl, uMsg, lParam1, lParam2);
break;
}
Modified: trunk/reactos/dll/cpl/main/keyboard.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/keyboard.c?rev=33523&r1=33522&r2=33523&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/main/keyboard.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/main/keyboard.c [iso-8859-1] Thu May 15 00:43:01 2008
@@ -312,7 +312,7 @@
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;
Modified: trunk/reactos/dll/cpl/main/mouse.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/mouse.c?rev=33523&r1=33522&r2=33523&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/main/mouse.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/main/mouse.c [iso-8859-1] Thu May 15 00:43:01 2008
@@ -1837,7 +1837,7 @@
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;
Modified: trunk/reactos/dll/cpl/mmsys/mmsys.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.c?rev=33523&r1=33522&r2=33523&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/mmsys/mmsys.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/mmsys/mmsys.c [iso-8859-1] Thu May 15 00:43:01 2008
@@ -103,7 +103,6 @@
UNREFERENCED_PARAMETER(lParam);
UNREFERENCED_PARAMETER(wParam);
UNREFERENCED_PARAMETER(uMsg);
- UNREFERENCED_PARAMETER(hwnd);
LoadString(hApplet,
IDS_CPLNAME,
@@ -112,7 +111,7 @@
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));
Modified: trunk/reactos/dll/cpl/ncpa/ncpa.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/ncpa.c?rev=33523&r1=33522&r2=33523&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/ncpa/ncpa.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/ncpa/ncpa.c [iso-8859-1] Thu May 15 00:43:01 2008
@@ -82,6 +82,7 @@
void DisplayTCPIPProperties(HWND hParent,IP_ADAPTER_INFO *pInfo);
HINSTANCE hApplet = 0;
+HWND hCPLWindow;
/* Applets */
static APPLET Applets[] =
@@ -1030,7 +1031,7 @@
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 @@
case CPL_DBLCLK:
{
+ hCPLWindow = hwndCPl;
Applets[(int)lParam1].AppletProc();
break;
}
Modified: trunk/reactos/dll/cpl/powercfg/powercfg.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powercfg.c?rev=33523&r1=33522&r2=33523&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/powercfg/powercfg.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/powercfg/powercfg.c [iso-8859-1] Thu May 15 00:43:01 2008
@@ -84,7 +84,6 @@
SYSTEM_POWER_CAPABILITIES spc;
LONG ret;
- UNREFERENCED_PARAMETER(hwnd);
UNREFERENCED_PARAMETER(uMsg);
UNREFERENCED_PARAMETER(wParam);
UNREFERENCED_PARAMETER(lParam);
@@ -95,7 +94,7 @@
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;
Modified: trunk/reactos/dll/cpl/sysdm/sysdm.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/sysdm.c?rev=33523&r1=33522&r2=33523&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/sysdm/sysdm.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/sysdm/sysdm.c [iso-8859-1] Thu May 15 00:43:01 2008
@@ -11,6 +11,7 @@
LONG CALLBACK SystemApplet(VOID);
HINSTANCE hApplet = 0;
+HWND hCPLWindow;
/* Applets */
APPLET Applets[NUM_APPLETS] =
@@ -112,7 +113,7 @@
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 @@
break;
case CPL_DBLCLK:
+ hCPLWindow = hwndCPl;
Applets[i].AppletProc();
break;
}
Modified: trunk/reactos/dll/cpl/telephon/telephon.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/telephon.c?rev=33523&r1=33522&r2=33523&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/telephon/telephon.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/telephon/telephon.c [iso-8859-1] Thu May 15 00:43:01 2008
@@ -32,6 +32,7 @@
LONG CALLBACK SystemApplet(VOID);
HINSTANCE hApplet = 0;
+HWND hCPLWindow;
/* Applets */
@@ -53,7 +54,7 @@
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 @@
CPLINFO *CPlInfo;
DWORD i;
- UNREFERENCED_PARAMETER(hwndCPl);
-
i = (DWORD)lParam1;
switch (uMsg)
{
@@ -95,6 +94,7 @@
break;
case CPL_DBLCLK:
+ hCPLWindow = hwndCPl;
Applets[i].AppletProc();
break;
}
Modified: trunk/reactos/dll/cpl/timedate/timedate.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/timedate.c?rev=33523&r1=33522&r2=33523&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/timedate/timedate.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/timedate/timedate.c [iso-8859-1] Thu May 15 00:43:01 2008
@@ -76,7 +76,6 @@
WCHAR Caption[256];
LONG Ret = 0;
- UNREFERENCED_PARAMETER(hwnd);
UNREFERENCED_PARAMETER(uMsg);
UNREFERENCED_PARAMETER(wParam);
UNREFERENCED_PARAMETER(lParam);
@@ -89,7 +88,7 @@
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;
Modified: trunk/reactos/dll/cpl/usrmgr/usrmgr.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/usrmgr.c?rev=33523&r1=33522&r2=33523&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/usrmgr/usrmgr.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/usrmgr/usrmgr.c [iso-8859-1] Thu May 15 00:43:01 2008
@@ -51,14 +51,13 @@
UNREFERENCED_PARAMETER(lParam);
UNREFERENCED_PARAMETER(wParam);
UNREFERENCED_PARAMETER(uMsg);
- UNREFERENCED_PARAMETER(hwnd);
LoadString(hApplet, IDS_CPLNAME, Caption, sizeof(Caption) / sizeof(TCHAR));
ZeroMemory(&psh, sizeof(PROPSHEETHEADER));
psh.dwSize = sizeof(PROPSHEETHEADER);
psh.dwFlags = PSH_PROPSHEETPAGE;
- psh.hwndParent = NULL;
+ psh.hwndParent = hwnd;
psh.hInstance = hApplet;
psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_USRMGR_ICON));
psh.pszCaption = Caption;
More information about the Ros-diffs
mailing list