A first stab at implementing the RunDll features.

dlls/shell32/Makefile.in

@@ -14,6 +14,7 @@ C_SRCS = \
 	changenotify.c \
 	classes.c \
 	clipboard.c \
+	control.c \
 	dataobject.c \
 	dialogs.c \
 	enumidlist.c \

dlls/shell32/iconcache.c

@@ -157,7 +157,7 @@ INT SIC_GetIconIndex (LPCSTR sSourceFile, INT dwSourceIndex )
 	return ret;
 }
 /****************************************************************************
- * SIC_LoadIcon				[internal]
+ * SIC_GetIcon				[internal]
  *
  * NOTES
  *  retrives the specified icon from the iconcache. if not found try's to load the icon

dlls/shell32/shell32.spec

@@ -14,7 +14,7 @@ import advapi32.dll
 import kernel32.dll
 import ntdll.dll
 
-debug_channels (exec pidl shell)
+debug_channels (exec pidl shell shlctrl)
 
 # Functions exported by the Win95 shell32.dll 
 # (these need to have these exact ordinals, for some 
@@ -172,10 +172,10 @@ debug_channels (exec pidl shell)
  164 stdcall Win32DeleteFile(str) Win32DeleteFile
  165 stdcall SHCreateDirectory(long long) SHCreateDirectory
  166 stub CallCPLEntry16
- 167 stub SHAddFromPropSheetExtArray
- 168 stub SHCreatePropSheetExtArray
- 169 stub SHDestroyPropSheetExtArray
- 170 stub SHReplaceFromPropSheetExtArray
+ 167 stdcall SHAddFromPropSheetExtArray(long long long) SHAddFromPropSheetExtArray
+ 168 stdcall SHCreatePropSheetExtArray(long str long) SHCreatePropSheetExtArray
+ 169 stdcall SHDestroyPropSheetExtArray(long) SHDestroyPropSheetExtArray
+ 170 stdcall SHReplaceFromPropSheetExtArray(long long long long) SHReplaceFromPropSheetExtArray
  171 stdcall PathCleanupSpec(ptr ptr) PathCleanupSpecAW
  172 stub SHCreateLinks
  173 stdcall SHValidateUNC(long long long)SHValidateUNC

dlls/shell32/shell32_main.c

@@ -77,20 +77,6 @@ LPWSTR* WINAPI CommandLineToArgvW(LPWSTR cmdline,LPDWORD numargs)
 }
 
 /*************************************************************************
- * Control_RunDLL			[SHELL32.12]
- *
- * Wild speculation in the following!
- *
- * http://premium.microsoft.com/msdn/library/techart/msdn193.htm
- */
-
-void WINAPI Control_RunDLL( HWND hwnd, LPCVOID code, LPCSTR cmd, DWORD arg4 )
-{
-    FIXME("(0x%08x, %p, %s, 0x%08lx): stub\n", hwnd, code,
-          debugstr_a(cmd), arg4);
-}
-
-/*************************************************************************
  * SHGetFileInfoA			[SHELL32.@]
  *
  */

dlls/shell32/shellord.c

@@ -881,22 +881,6 @@ BOOL WINAPI SHWaitForFileToOpen(
 	FIXME("%p 0x%08lx 0x%08lx stub\n", pidl, dwFlags, dwTimeout);
 	return 0;
 }
-/*************************************************************************
- * Control_FillCache_RunDLL			[SHELL32.8]
- *
- */
-HRESULT WINAPI Control_FillCache_RunDLL(HWND hWnd, HANDLE hModule, DWORD w, DWORD x)
-{	FIXME("0x%04x 0x%04x 0x%04lx 0x%04lx stub\n",hWnd, hModule,w,x);
-	return 0;
-}
-/*************************************************************************
- * RunDLL_CallEntry16				[SHELL32.122]
- * the name is propably wrong
- */
-HRESULT WINAPI RunDLL_CallEntry16(DWORD v, DWORD w, DWORD x, DWORD y, DWORD z)
-{	FIXME("0x%04lx 0x%04lx 0x%04lx 0x%04lx 0x%04lx stub\n",v,w,x,y,z);
-	return 0;
-}
 
 /************************************************************************
  *	shell32_654				[SHELL32.654]
@@ -983,3 +967,39 @@ DWORD WINAPI SHELL32_714(LPVOID x)
  	FIXME("(%s)stub\n", debugstr_w(x));
 	return 0;
 }
+
+/*************************************************************************
+ *      SHAddFromPropSheetExtArray	[SHELL32]
+ */
+DWORD WINAPI SHAddFromPropSheetExtArray(DWORD a, DWORD b, DWORD c)
+{
+ 	FIXME("(%08lx,%08lx,%08lx)stub\n", a, b, c);
+	return 0;
+}
+
+/*************************************************************************
+ *      SHCreatePropSheetExtArray	[SHELL32]
+ */
+DWORD WINAPI SHCreatePropSheetExtArray(DWORD a, LPCSTR b, DWORD c)
+{
+ 	FIXME("(%08lx,%s,%08lx)stub\n", a, debugstr_a(b), c);
+	return 0;
+}
+
+/*************************************************************************
+ *      SHReplaceFromPropSheetExtArray	[SHELL]
+ */
+DWORD WINAPI SHReplaceFromPropSheetExtArray(DWORD a, DWORD b, DWORD c, DWORD d)
+{
+ 	FIXME("(%08lx,%08lx,%08lx,%08lx)stub\n", a, b, c, d);
+	return 0;
+}
+
+/*************************************************************************
+ *      SHDestroyPropSheetExtArray	[SHELL32]
+ */
+DWORD WINAPI SHDestroyPropSheetExtArray(DWORD a)
+{
+ 	FIXME("(%08lx)stub\n", a);
+	return 0;
+}

include/Makefile.in

@@ -12,6 +12,7 @@ INSTALLED_INCLUDES = \
 	commctrl.h \
 	commdlg.h \
 	compobj.h \
+	cpl.h \
 	d3d.h \
 	d3dcaps.h \
 	d3dtypes.h \

include/cpl.h

+/* Control panel definitions */
+
+#ifndef _INC_CPL
+#define _INC_CPL
+
+#include "pshpack1.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define WM_CPL_LAUNCH   (WM_USER+1000)
+#define WM_CPL_LAUNCHED (WM_USER+1001)
+
+typedef LONG (APIENTRY *APPLET_PROC)(HWND hwndCpl, UINT msg, LPARAM lParam1, LPARAM lParam2);
+
+typedef struct tagCPLINFO {
+    int     idIcon;
+    int     idName;
+    int     idInfo;
+    LONG    lData;
+} CPLINFO, *LPCPLINFO;
+
+typedef struct tagNEWCPLINFOA
+{
+    DWORD   dwSize;
+    DWORD   dwFlags;
+    DWORD   dwHelpContext;
+    LONG    lData;
+    HICON   hIcon;
+    CHAR    szName[32];
+    CHAR    szInfo[64];
+    CHAR    szHelpFile[128];
+} NEWCPLINFOA, *LPNEWCPLINFOA;
+
+typedef struct tagNEWCPLINFOW
+{
+    DWORD   dwSize;
+    DWORD   dwFlags;
+    DWORD   dwHelpContext;
+    LONG    lData;
+    HICON   hIcon;
+    WCHAR   szName[32];
+    WCHAR   szInfo[64];
+    WCHAR   szHelpFile[128];
+} NEWCPLINFOW, *LPNEWCPLINFOW;
+
+DECL_WINELIB_TYPE_AW(NEWCPLINFO)
+DECL_WINELIB_TYPE_AW(LPNEWCPLINFO)
+
+#define CPL_DYNAMIC_RES 	0
+#define CPL_INIT        	1
+#define CPL_GETCOUNT    	2
+#define CPL_INQUIRE     	3
+#define CPL_SELECT      	4
+#define CPL_DBLCLK      	5
+#define CPL_STOP        	6
+#define CPL_EXIT        	7
+#define CPL_NEWINQUIRE		8
+#define CPL_STARTWPARMSA 	9
+#define CPL_STARTWPARMSW 	10
+#define CPL_STARTWPARMS WINELIB_NAME_AW(CPL_STARTWPARMS)
+#define CPL_SETUP		200
+
+#ifdef __cplusplus
+}
+#endif
+
+#include "poppack.h"
+
+#endif /* _INC_CPL */

include/winuser.h

@@ -3083,10 +3083,6 @@ typedef struct
 #define DI_COMPAT               4
 #define DI_DEFAULTSIZE          8
 
-  /* misc messages */
-#define WM_CPL_LAUNCH       (WM_USER + 1000)
-#define WM_CPL_LAUNCHED     (WM_USER + 1001)
-
 /* WM_NOTIFYFORMAT commands and return values */
 #define NFR_ANSI	    1
 #define NFR_UNICODE	    2