Commit in reactos/subsys/system/explorer on MAIN
taskbar/desktopbar.cpp+7-31.32 -> 1.33
utility/utility.cpp+4-41.16 -> 1.17
       /utility.h+12-111.57 -> 1.58
+23-18
3 modified files
launch sound control panel applet

reactos/subsys/system/explorer/taskbar
desktopbar.cpp 1.32 -> 1.33
diff -u -r1.32 -r1.33
--- desktopbar.cpp	15 Mar 2004 20:45:40 -0000	1.32
+++ desktopbar.cpp	15 Mar 2004 20:59:06 -0000	1.33
@@ -241,7 +241,7 @@
 	  case WM_TIMER:
 		if (wparam == ID_TRAY_VOLUME) {
 			KillTimer(_hwnd, wparam);
-			WinExec("sndvol32.exe -t", SW_SHOWNORMAL);	// launch volume control in small mode
+			launch_file(_hwnd, TEXT("sndvol32.exe"), SW_SHOWNORMAL, TEXT("-t"));	// launch volume control in small mode
 		}
 		break;
 
@@ -323,7 +323,11 @@
 		break;}
 
 	  case ID_TRAY_VOLUME:
-		WinExec("sndvol32.exe", SW_SHOWNORMAL);
+		launch_file(_hwnd, TEXT("sndvol32.exe"), SW_SHOWNORMAL);	// launch volume control application
+		break;
+
+	  case ID_VOLUME_PROPERTIES:
+		RunDLL(_hwnd, TEXT("shell32"), "Control_RunDLL", TEXT("mmsys.cpl"), SW_SHOWNORMAL);
 		break;
 
 	  default:
@@ -394,7 +398,7 @@
 	switch(id) {
 	  case ID_TRAY_VOLUME:
 		KillTimer(_hwnd, ID_TRAY_VOLUME);	// finish one-click timer
-		WinExec("sndvol32.exe", SW_SHOWNORMAL);
+		launch_file(_hwnd, TEXT("sndvol32.exe"), SW_SHOWNORMAL);	// launch volume control application
 		break;
 	}
 }

reactos/subsys/system/explorer/utility
utility.cpp 1.16 -> 1.17
diff -u -r1.16 -r1.17
--- utility.cpp	2 Feb 2004 23:18:07 -0000	1.16
+++ utility.cpp	15 Mar 2004 20:59:06 -0000	1.17
@@ -176,11 +176,11 @@
 }
 
 
-BOOL launch_file(HWND hwnd, LPCTSTR cmd, UINT nCmdShow)
+BOOL launch_file(HWND hwnd, LPCTSTR cmd, UINT nCmdShow, LPCTSTR parameters)
 {
 	CONTEXT("launch_file()");
 
-	HINSTANCE hinst = ShellExecute(hwnd, NULL/*operation*/, cmd, NULL/*parameters*/, NULL/*dir*/, nCmdShow);
+	HINSTANCE hinst = ShellExecute(hwnd, NULL/*operation*/, cmd, parameters, NULL/*dir*/, nCmdShow);
 
 	if ((int)hinst <= 32) {
 		display_error(hwnd, GetLastError());
@@ -191,9 +191,9 @@
 }
 
 #ifdef UNICODE
-BOOL launch_fileA(HWND hwnd, LPSTR cmd, UINT nCmdShow)
+BOOL launch_fileA(HWND hwnd, LPSTR cmd, UINT nCmdShow, LPCSTR parameters)
 {
-	HINSTANCE hinst = ShellExecuteA(hwnd, NULL/*operation*/, cmd, NULL/*parameters*/, NULL/*dir*/, nCmdShow);
+	HINSTANCE hinst = ShellExecuteA(hwnd, NULL/*operation*/, cmd, parameters, NULL/*dir*/, nCmdShow);
 
 	if ((int)hinst <= 32) {
 		display_error(hwnd, GetLastError());

reactos/subsys/system/explorer/utility
utility.h 1.57 -> 1.58
diff -u -r1.57 -r1.58
--- utility.h	7 Feb 2004 15:00:28 -0000	1.57
+++ utility.h	15 Mar 2004 20:59:06 -0000	1.58
@@ -146,17 +146,6 @@
  // search for windows of a specific classname
 extern int find_window_class(LPCTSTR classname);
 
- // launch a program or document file
-extern BOOL launch_file(HWND hwnd, LPCTSTR cmd, UINT nCmdShow);
-#ifdef UNICODE
-extern BOOL launch_fileA(HWND hwnd, LPSTR cmd, UINT nCmdShow);
-#else
-#define	launch_fileA launch_file
-#endif
-
- // call an DLL export like rundll32
-BOOL RunDLL(HWND hwnd, LPCTSTR dllname, LPCSTR procname, LPCTSTR cmdline, UINT nCmdShow);
-
  // create a directory with all missing parent directories
 BOOL RecursiveCreateDirectory(LPCTSTR path_in);
 
@@ -197,6 +186,18 @@
 #endif	// _MSC_VER && !_NO_COMUTIL
 
 
+ // launch a program or document file
+extern BOOL launch_file(HWND hwnd, LPCTSTR cmd, UINT nCmdShow, LPCTSTR parameters=NULL);
+#ifdef UNICODE
+extern BOOL launch_fileA(HWND hwnd, LPSTR cmd, UINT nCmdShow, LPCSTR parameters=NULL);
+#else
+#define	launch_fileA launch_file
+#endif
+
+ // call an DLL export like rundll32
+BOOL RunDLL(HWND hwnd, LPCTSTR dllname, LPCSTR procname, LPCTSTR cmdline, UINT nCmdShow);
+
+
  /// initialization of windows common controls
 struct CommonControlInit
 {
CVSspam 0.2.8