programs: Use WIN32_LEAN_AND_MEAN in some more places.

programs/control/control.c

@@ -17,6 +17,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#define WIN32_LEAN_AND_MEAN
+
 #include <stdio.h>
 #include <string.h>
 #include <windows.h>
@@ -27,7 +29,7 @@ extern void WINAPI Control_RunDLL(HWND hWnd, HINSTANCE hInst, LPCSTR cmd, DWORD
 static void launch(const char *what)
 {
   Control_RunDLL(GetDesktopWindow(), 0, what, SW_SHOW);
-  exit(0);
+  ExitProcess(0);
 }
 
 int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpszCmdLine, INT nCmdShow)

programs/eject/eject.c

@@ -18,6 +18,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#define WIN32_LEAN_AND_MEAN
+
 #include "config.h"
 
 #include <windows.h>

programs/expand/expand.c

@@ -17,6 +17,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#define WIN32_LEAN_AND_MEAN
+
 #include <stdio.h>
 #include <string.h>
 #include <windows.h>

programs/hh/main.c

@@ -16,6 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#define WIN32_LEAN_AND_MEAN
+
 #include <windows.h>
 
 typedef int WINAPI DOWINMAIN(HMODULE hMod, LPSTR cmdline);

programs/msiexec/msiexec.c

@@ -19,6 +19,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#define WIN32_LEAN_AND_MEAN
+
 #include <windows.h>
 #include <msi.h>
 #include <objbase.h>

programs/progman/dialog.c

@@ -20,6 +20,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#define WIN32_LEAN_AND_MEAN
+
 #include "windows.h"
 #include "commdlg.h"
 #include "progman.h"

programs/progman/group.c

@@ -18,6 +18,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#define WIN32_LEAN_AND_MEAN
+
 #include <stdio.h>
 #include <string.h>
 #include "windows.h"

programs/progman/grpfile.c

@@ -19,6 +19,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#define WIN32_LEAN_AND_MEAN
+
 #include "windows.h"
 #include "wine/winuser16.h"
 #include "progman.h"

programs/progman/program.c

@@ -18,6 +18,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#define WIN32_LEAN_AND_MEAN
+
 #include <string.h>
 #include "windows.h"
 #include "windowsx.h"

programs/progman/string.c

@@ -19,6 +19,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#define WIN32_LEAN_AND_MEAN
+
 #include "windows.h"
 #include "progman.h"
 

programs/wcmd/builtins.c

@@ -32,6 +32,8 @@
  * - Messages etc need international support
  */
 
+#define WIN32_LEAN_AND_MEAN
+
 #include "wcmd.h"
 
 void WCMD_execute (char *orig_command, char *parameter, char *substitution);

programs/wcmd/directory.c

@@ -27,6 +27,8 @@
 
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+#define WIN32_LEAN_AND_MEAN
+
 #include "wcmd.h"
 
 int WCMD_dir_sort (const void *a, const void *b);

programs/winecfg/appdefaults.c

@@ -21,6 +21,7 @@
  *
  */
 
+#define WIN32_LEAN_AND_MEAN
 #define NONAMELESSUNION
 #include <windows.h>
 #include <commdlg.h>

programs/winecfg/libraries.c

@@ -21,6 +21,7 @@
  */
 
 #define NONAMELESSUNION
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <commdlg.h>
 #include <wine/debug.h>

programs/winecfg/properties.c

@@ -20,6 +20,8 @@
  *
  */
 
+#define WIN32_LEAN_AND_MEAN
+
 #include <windows.h>
 
 #include "properties.h"

programs/winepath/winepath.c

@@ -20,6 +20,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#define WIN32_LEAN_AND_MEAN
+
 #include "config.h"
 
 #include <windows.h>