Module: wine Branch: refs/heads/master Commit: 7d665672539be9dba5c91765bd82cf39d8e0caac URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7d665672539be9dba5c91765...
Author: Mike McCormack mike@codeweavers.com Date: Mon Jan 16 20:41:34 2006 +0100
programs: Use WIN32_LEAN_AND_MEAN in some more places.
---
programs/control/control.c | 4 +++- programs/eject/eject.c | 2 ++ programs/expand/expand.c | 2 ++ programs/hh/main.c | 2 ++ programs/msiexec/msiexec.c | 2 ++ programs/progman/dialog.c | 2 ++ programs/progman/group.c | 2 ++ programs/progman/grpfile.c | 2 ++ programs/progman/program.c | 2 ++ programs/progman/string.c | 2 ++ programs/wcmd/builtins.c | 2 ++ programs/wcmd/directory.c | 2 ++ programs/winecfg/appdefaults.c | 1 + programs/winecfg/libraries.c | 1 + programs/winecfg/properties.c | 2 ++ programs/winepath/winepath.c | 2 ++ 16 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/programs/control/control.c b/programs/control/control.c index 15a7bc4..49f514d 100644 --- a/programs/control/control.c +++ b/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 h 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) diff --git a/programs/eject/eject.c b/programs/eject/eject.c index 761fdfb..bf3d514 100644 --- a/programs/eject/eject.c +++ b/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> diff --git a/programs/expand/expand.c b/programs/expand/expand.c index 6437246..a2f5e88 100644 --- a/programs/expand/expand.c +++ b/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> diff --git a/programs/hh/main.c b/programs/hh/main.c index 494c6ce..51a5b8b 100644 --- a/programs/hh/main.c +++ b/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); diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index cff4dda..7ec8831 100644 --- a/programs/msiexec/msiexec.c +++ b/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> diff --git a/programs/progman/dialog.c b/programs/progman/dialog.c index 0aea722..fbfdc23 100644 --- a/programs/progman/dialog.c +++ b/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" diff --git a/programs/progman/group.c b/programs/progman/group.c index 211776d..2f8c5fc 100644 --- a/programs/progman/group.c +++ b/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" diff --git a/programs/progman/grpfile.c b/programs/progman/grpfile.c index 024d402..8174308 100644 --- a/programs/progman/grpfile.c +++ b/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" diff --git a/programs/progman/program.c b/programs/progman/program.c index 9ad4727..783d415 100644 --- a/programs/progman/program.c +++ b/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" diff --git a/programs/progman/string.c b/programs/progman/string.c index ea0a8dc..9760388 100644 --- a/programs/progman/string.c +++ b/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"
diff --git a/programs/wcmd/builtins.c b/programs/wcmd/builtins.c index a47bc0a..addb3c7 100644 --- a/programs/wcmd/builtins.c +++ b/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); diff --git a/programs/wcmd/directory.c b/programs/wcmd/directory.c index 8046500..4820f47 100644 --- a/programs/wcmd/directory.c +++ b/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); diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index 235f0d8..681d21c 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -21,6 +21,7 @@ * */
+#define WIN32_LEAN_AND_MEAN #define NONAMELESSUNION #include <windows.h> #include <commdlg.h> diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c index c044433..4ae431d 100644 --- a/programs/winecfg/libraries.c +++ b/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> diff --git a/programs/winecfg/properties.c b/programs/winecfg/properties.c index 7f63a6f..482448c 100644 --- a/programs/winecfg/properties.c +++ b/programs/winecfg/properties.c @@ -20,6 +20,8 @@ * */
+#define WIN32_LEAN_AND_MEAN + #include <windows.h>
#include "properties.h" diff --git a/programs/winepath/winepath.c b/programs/winepath/winepath.c index f5886c2..a16831f 100644 --- a/programs/winepath/winepath.c +++ b/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>
-
Alexandre Julliard