From: Giannis Adamopoulos <gadamopoulos@reactos.org>
Date: Mon, 13 Feb 2017 22:09:14 +0000 (+0000)
Subject: [SHELL32] -Call CPlApplet export of control panel applets with the correct activation... 
X-Git-Tag: ReactOS-0.4.4-CLT2017~295
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=6f4d361e2f6fb4e859f992e04c7800dc14e4c700

[SHELL32] -Call CPlApplet export of control panel applets with the correct activation context.

svn path=/trunk/; revision=73794
---

diff --git a/reactos/dll/win32/shell32/wine/control.c b/reactos/dll/win32/shell32/wine/control.c
index 56ca8a48c06..f568b923dac 100644
--- a/reactos/dll/win32/shell32/wine/control.c
+++ b/reactos/dll/win32/shell32/wine/control.c
@@ -53,6 +53,11 @@ void Control_UnloadApplet(CPlApplet* applet)
 
 CPlApplet*	Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel)
 {
+#ifdef __REACTOS__
+    ACTCTXW ActCtx = {sizeof(ACTCTX), ACTCTX_FLAG_RESOURCE_NAME_VALID};
+    ULONG_PTR cookie;
+    BOOL bActivated;
+#endif
     CPlApplet*	applet;
     DWORD len;
     unsigned 	i;
@@ -80,6 +85,13 @@ CPlApplet*	Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel)
 
     applet->hWnd = hWnd;
 
+#ifdef __REACTOS__
+    ActCtx.lpSource = applet->cmd;
+    ActCtx.lpResourceName = (LPCWSTR)123;
+    applet->hActCtx = CreateActCtx(&ActCtx);
+    bActivated = (applet->hActCtx != INVALID_HANDLE_VALUE ? ActivateActCtx(applet->hActCtx, &cookie) : FALSE);
+#endif
+
     if (!(applet->hModule = LoadLibraryW(applet->cmd))) {
         WARN("Cannot load control panel applet %s\n", debugstr_w(applet->cmd));
 	goto theError;
@@ -171,6 +183,11 @@ CPlApplet*	Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel)
        }
     }
 
+#ifdef __REACTOS__
+    if (bActivated)
+        DeactivateActCtx(0, cookie);
+#endif
+
 #ifndef __REACTOS__
     list_add_head( &panel->applets, &applet->entry );
 #endif
@@ -805,6 +822,10 @@ static	void	Control_DoLaunch(CPanel* panel, HWND hWnd, LPCWSTR wszCmd)
     applet = Control_LoadApplet(hWnd, buffer, panel);
     if (applet)
     {
+#ifdef __REACTOS__
+    ULONG_PTR cookie;
+    BOOL bActivated;
+#endif
         /* we've been given a textual parameter (or none at all) */
         if (sp == -1) {
             while ((++sp) != applet->count) {
@@ -820,10 +841,20 @@ static	void	Control_DoLaunch(CPanel* panel, HWND hWnd, LPCWSTR wszCmd)
             sp = 0;
         }
 
+#ifdef __REACTOS__
+        bActivated = (applet->hActCtx != INVALID_HANDLE_VALUE ? ActivateActCtx(applet->hActCtx, &cookie) : FALSE);
+#endif
+
         if (!applet->proc(applet->hWnd, CPL_STARTWPARMSW, sp, (LPARAM)extraPmts))
             applet->proc(applet->hWnd, CPL_DBLCLK, sp, applet->info[sp].data);
 
         Control_UnloadApplet(applet);
+
+#ifdef __REACTOS__
+    if (bActivated)
+        DeactivateActCtx(0, cookie);
+#endif
+
     }
 
     HeapFree(GetProcessHeap(), 0, buffer);
diff --git a/reactos/dll/win32/shell32/wine/cpanel.h b/reactos/dll/win32/shell32/wine/cpanel.h
index 26fca4a6abf..67fb3faf894 100644
--- a/reactos/dll/win32/shell32/wine/cpanel.h
+++ b/reactos/dll/win32/shell32/wine/cpanel.h
@@ -41,6 +41,8 @@ struct applet_info
 typedef struct CPlApplet {
 #ifndef __REACTOS__
     struct list         entry;
+#else
+    HANDLE hActCtx;
 #endif
     HWND		hWnd;
     LPWSTR		cmd;        /* path to applet */