Hermès Bélusca-Maï =?UTF-8?Q?to=20?=: shell32: Automatically expand CPL applet path string.
Alexandre Julliard
julliard at winehq.org
Wed Apr 16 12:11:38 CDT 2014
Module: wine
Branch: master
Commit: a08160680be1a3164e882fcc41504f115ba62f12
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a08160680be1a3164e882fcc41504f115ba62f12
Author: Hermès Bélusca-Maïto <hermes.belusca at sfr.fr>
Date: Wed Apr 9 15:27:31 2014 +0200
shell32: Automatically expand CPL applet path string.
---
dlls/shell32/control.c | 24 +++++++++++++++++-------
1 file changed, 17 insertions(+), 7 deletions(-)
diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c
index fe392e3..b393154 100644
--- a/dlls/shell32/control.c
+++ b/dlls/shell32/control.c
@@ -62,6 +62,7 @@ void Control_UnloadApplet(CPlApplet* applet)
CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel)
{
CPlApplet* applet;
+ DWORD len;
unsigned i;
CPLINFO info;
NEWCPLINFOW newinfo;
@@ -69,21 +70,30 @@ CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel)
if (!(applet = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*applet))))
return applet;
- if (!(applet->cmd = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(cmd)+1) * sizeof(WCHAR)))) {
- WARN("Cannot allocate memory for applet path\n");
+ len = ExpandEnvironmentStringsW(cmd, NULL, 0);
+ if (len > 0)
+ {
+ if (!(applet->cmd = HeapAlloc(GetProcessHeap(), 0, (len+1) * sizeof(WCHAR))))
+ {
+ WARN("Cannot allocate memory for applet path\n");
+ goto theError;
+ }
+ ExpandEnvironmentStringsW(cmd, applet->cmd, len+1);
+ }
+ else
+ {
+ WARN("Cannot expand applet path\n");
goto theError;
}
- lstrcpyW(applet->cmd, cmd);
-
applet->hWnd = hWnd;
- if (!(applet->hModule = LoadLibraryW(cmd))) {
- WARN("Cannot load control panel applet %s\n", debugstr_w(cmd));
+ if (!(applet->hModule = LoadLibraryW(applet->cmd))) {
+ WARN("Cannot load control panel applet %s\n", debugstr_w(applet->cmd));
goto theError;
}
if (!(applet->proc = (APPLET_PROC)GetProcAddress(applet->hModule, "CPlApplet"))) {
- WARN("Not a valid control panel applet %s\n", debugstr_w(cmd));
+ WARN("Not a valid control panel applet %s\n", debugstr_w(applet->cmd));
goto theError;
}
if (!applet->proc(hWnd, CPL_INIT, 0L, 0L)) {
More information about the wine-cvs
mailing list