ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shell32: Execute control panel applets in separate process.

Browse Source
This commit is contained in:
Owen Rudge 2009-07-20 17:03:58 -03:00 committed by Alexandre Julliard
parent bd926bde38
commit 1eca313f47
2 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
dlls/shell32/control.c
View File

@ -59,6 +59,7 @@ CPlApplet* Control_UnloadApplet(CPlApplet* applet)
if (applet->proc) applet->proc(applet->hWnd, CPL_EXIT, 0L, 0L); if (applet->proc) applet->proc(applet->hWnd, CPL_EXIT, 0L, 0L);
FreeLibrary(applet->hModule); FreeLibrary(applet->hModule);
next = applet->next; next = applet->next;
HeapFree(GetProcessHeap(), 0, applet->cmd);
HeapFree(GetProcessHeap(), 0, applet); HeapFree(GetProcessHeap(), 0, applet);
return next; return next;
} }
@ -95,6 +96,13 @@ CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel)
applet = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, applet, applet = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, applet,
sizeof(*applet) + (applet->count - 1) * sizeof(NEWCPLINFOW)); sizeof(*applet) + (applet->count - 1) * sizeof(NEWCPLINFOW));
if (!(applet->cmd = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(cmd)+1) * sizeof(WCHAR)))) {
WARN("Cannot allocate memory for applet path");
goto theError;
}
lstrcpyW(applet->cmd, cmd);
for (i = 0; i < applet->count; i++) { for (i = 0; i < applet->count; i++) {
ZeroMemory(&newinfo, sizeof(newinfo)); ZeroMemory(&newinfo, sizeof(newinfo));
newinfo.dwSize = sizeof(NEWCPLINFOA); newinfo.dwSize = sizeof(NEWCPLINFOA);
@ -426,6 +434,20 @@ static CPlItem* Control_GetCPlItem_From_ListView(CPanel *panel)
return NULL; return NULL;
} }
static void Control_StartApplet(HWND hWnd, CPlItem *item)
{
WCHAR verbOpen[] = {'c','p','l','o','p','e','n',0};
WCHAR format[] = {'@','%','d',0};
WCHAR param[MAX_PATH];
/* execute the applet if item is valid */
if (item)
{
wsprintfW(param, format, item->id);
ShellExecuteW(hWnd, verbOpen, item->applet->cmd, param, NULL, SW_SHOW);
}
}
static LRESULT WINAPI Control_WndProc(HWND hWnd, UINT wMsg, static LRESULT WINAPI Control_WndProc(HWND hWnd, UINT wMsg,
WPARAM lParam1, LPARAM lParam2) WPARAM lParam1, LPARAM lParam2)
{ {
@ -484,13 +506,7 @@ static LRESULT WINAPI Control_WndProc(HWND hWnd, UINT wMsg,
if ((LOWORD(lParam1) >= IDM_CPANEL_APPLET_BASE) && if ((LOWORD(lParam1) >= IDM_CPANEL_APPLET_BASE) &&
(LOWORD(lParam1) <= IDM_CPANEL_APPLET_BASE + panel->total_subprogs)) (LOWORD(lParam1) <= IDM_CPANEL_APPLET_BASE + panel->total_subprogs))
{ {
CPlItem *item = Control_GetCPlItem_From_MenuID(hWnd, LOWORD(lParam1)); Control_StartApplet(hWnd, Control_GetCPlItem_From_MenuID(hWnd, LOWORD(lParam1)));
/* execute the applet if item is valid */
if (item)
item->applet->proc(item->applet->hWnd, CPL_DBLCLK, item->id,
item->applet->info[item->id].lData);
return 0; return 0;
} }
@ -511,13 +527,7 @@ static LRESULT WINAPI Control_WndProc(HWND hWnd, UINT wMsg,
case NM_RETURN: case NM_RETURN:
case NM_DBLCLK: case NM_DBLCLK:
{ {
CPlItem *item = Control_GetCPlItem_From_ListView(panel); Control_StartApplet(hWnd, Control_GetCPlItem_From_ListView(panel));
/* execute the applet if item is valid */
if (item)
item->applet->proc(item->applet->hWnd, CPL_DBLCLK,
item->id, item->applet->info[item->id].lData);
return 0; return 0;
} }
case LVN_ITEMCHANGED: case LVN_ITEMCHANGED:

1
dlls/shell32/cpanel.h
View File

@ -26,6 +26,7 @@
typedef struct CPlApplet { typedef struct CPlApplet {
struct CPlApplet* next; /* linked list */ struct CPlApplet* next; /* linked list */
HWND hWnd; HWND hWnd;
LPWSTR cmd; /* path to applet */
unsigned count; /* number of subprograms */ unsigned count; /* number of subprograms */
HMODULE hModule; /* module of loaded applet */ HMODULE hModule; /* module of loaded applet */
APPLET_PROC proc; /* entry point address */ APPLET_PROC proc; /* entry point address */