makefiles: Define __WINESRC__ when building programs.

programs/Makeprog.rules.in

@@ -10,7 +10,7 @@
 #
 
 DLLFLAGS    = @DLLFLAGS@
-DEFS        = -DWINE_STRICT_PROTOTYPES -DWINE_NO_UNICODE_MACROS $(EXTRADEFS)
+DEFS        = -D__WINESRC__ $(EXTRADEFS)
 ALL_LIBS    = $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(EXTRALIBS) -lwine $(LIBPORT) $(LDFLAGS) $(LIBS)
 INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(dlldir) $(DESTDIR)$(fakedlldir) $(DESTDIR)$(mandir)/man$(prog_manext)
 

programs/clock/main.c

@@ -27,6 +27,7 @@
 
 #include "windows.h"
 #include "commdlg.h"
+#include "shellapi.h"
 
 #include "main.h"
 #include "winclock.h"

programs/cmd/wcmdmain.c

@@ -26,7 +26,9 @@
  */
 
 #include "config.h"
+#include <time.h>
 #include "wcmd.h"
+#include "shellapi.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(cmd);

programs/explorer/appbar.c

@@ -27,10 +27,10 @@
  * TODO: multiple monitor support
  */
 
+#include "windows.h"
+#include "shellapi.h"
 #include "wine/unicode.h"
-
-#include <windows.h>
-#include <wine/debug.h>
+#include "wine/debug.h"
 #include "explorer_private.h"
 
 #include "wine/list.h"

programs/explorer/desktop.c

@@ -26,6 +26,7 @@
 #define OEMRESOURCE
 
 #include <windows.h>
+#include <rpc.h>
 #include <wine/debug.h>
 #include "explorer_private.h"
 

programs/explorer/explorer.c

@@ -30,6 +30,7 @@
 
 #include <initguid.h>
 #include <windows.h>
+#include <shellapi.h>
 #include <shobjidl.h>
 #include <shlobj.h>
 #include <shlwapi.h>

programs/explorer/systray.c

@@ -24,6 +24,7 @@
 #define _WIN32_IE 0x500
 #include <windows.h>
 #include <commctrl.h>
+#include <shellapi.h>
 
 #include <wine/debug.h>
 #include <wine/list.h>

programs/iexplore/main.c

@@ -20,6 +20,7 @@
 
 #include <windows.h>
 #include <advpub.h>
+#include <ole2.h>
 #include <rpcproxy.h>
 
 #include "wine/unicode.h"

programs/msiexec/msiexec.c

@@ -23,6 +23,7 @@
 
 #include <windows.h>
 #include <msi.h>
+#include <winsvc.h>
 #include <objbase.h>
 #include <stdio.h>
 

programs/msiexec/service.c

@@ -20,8 +20,9 @@
 
 #define WIN32_LEAN_AND_MEAN
 
-#include <windows.h>
 #include <stdio.h>
+#include <windows.h>
+#include <winsvc.h>
 
 #include "wine/debug.h"
 

programs/notepad/dialog.c

@@ -25,6 +25,7 @@
 #include <assert.h>
 #include <stdio.h>
 #include <windows.h>
+#include <shellapi.h>
 #include <commdlg.h>
 #include <shlwapi.h>
 #include <winternl.h>

programs/notepad/main.c

@@ -22,9 +22,11 @@
  *
  */
 
-#include <windows.h>
-#include <shlwapi.h>
 #include <stdio.h>
+#include <windows.h>
+#include <commdlg.h>
+#include <shellapi.h>
+#include <shlwapi.h>
 
 #include "main.h"
 #include "dialog.h"

programs/oleview/oleview.c

@@ -19,6 +19,8 @@
  */
 
 #include "main.h"
+#include "commdlg.h"
+#include "shellapi.h"
 #include "wine/unicode.h"
 
 GLOBALS globals;

programs/oleview/typelib.c

@@ -19,6 +19,7 @@
  */
 
 #include "main.h"
+#include "commdlg.h"
 
 #include "wine/debug.h"
 #include "wine/unicode.h"

programs/plugplay/main.c

@@ -19,6 +19,7 @@
 #define WIN32_LEAN_AND_MEAN
 
 #include <windows.h>
+#include "winsvc.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(plugplay);

programs/presentationfontcache/main.c

@@ -19,6 +19,7 @@
 #define WIN32_LEAN_AND_MEAN
 
 #include <windows.h>
+#include "winsvc.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(fontcache);

programs/progman/main.c

@@ -25,6 +25,7 @@
 #define OEMRESOURCE
 
 #include "windows.h"
+#include "shellapi.h"
 #include "progman.h"
 
 GLOBALS Globals;

programs/sc/sc.c

@@ -25,6 +25,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <windows.h>
+#include <winsvc.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(sc);
 

programs/services/utils.c

@@ -22,6 +22,7 @@
 
 #include <stdarg.h>
 #include <windows.h>
+#include <winsvc.h>
 
 #include "wine/unicode.h"
 #include "wine/debug.h"

programs/spoolsv/main.c

@@ -19,6 +19,7 @@
 #define WIN32_LEAN_AND_MEAN
 
 #include <windows.h>
+#include <winsvc.h>
 
 #include "wine/debug.h"
 

programs/start/start.c

@@ -20,11 +20,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <windows.h>
-#include <winuser.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <windows.h>
 #include <shlobj.h>
+#include <shellapi.h>
 
 #include <wine/unicode.h>
 #include <wine/debug.h>

programs/taskkill/taskkill.c

@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <stdlib.h>
 #include <windows.h>
 #include <psapi.h>
 #include <wine/unicode.h>

programs/termsv/main.c

@@ -19,6 +19,7 @@
 #define WIN32_LEAN_AND_MEAN
 
 #include <windows.h>
+#include <winsvc.h>
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(termsv);

programs/winebrowser/main.c

@@ -45,6 +45,7 @@
 
 #include <windows.h>
 #include <shlwapi.h>
+#include <urlmon.h>
 #include <ddeml.h>
 #include <stdio.h>
 #include <stdlib.h>

programs/winecfg/theme.c

@@ -41,6 +41,8 @@
 #define COBJMACROS
 
 #include <windows.h>
+#include <commdlg.h>
+#include <shellapi.h>
 #include <uxtheme.h>
 #include <tmschema.h>
 #include <shlobj.h>

programs/wineconsole/curses.c

@@ -55,6 +55,8 @@
 
 #include "wine/library.h"
 #include "wine/debug.h"
+#undef ERR
+#define ERR (-1)
 
 WINE_DEFAULT_DEBUG_CHANNEL(curses);
 

programs/winedbg/dbg.y

@@ -27,9 +27,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
 
 #include "debugger.h"
 #include "wine/exception.h"

programs/winedbg/debug.l

@@ -27,10 +27,7 @@
 #include <string.h>
 #include <stdarg.h>
 
-#ifndef HAVE_UNISTD_H
 #define YY_NO_UNISTD_H
-#endif
-
 #include "debugger.h"
 #include "dbg.tab.h"
 

programs/winetest/send.c

@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <winsock.h>
+#include <winsock2.h>
 #include <wininet.h>
 #include <stdio.h>
 #include <errno.h>

programs/winhlp32/macro.lex.l

@@ -27,10 +27,7 @@
 #include <assert.h>
 #include <stdarg.h>
 
-#ifndef HAVE_UNISTD_H
 #define YY_NO_UNISTD_H
-#endif
-
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"

programs/winver/winver.c

@@ -20,6 +20,7 @@
 
 #include "config.h"
 #include "windows.h"
+#include "shellapi.h"
 
 int PASCAL WinMain (HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 {

programs/wordpad/print.c

@@ -21,6 +21,7 @@
 #include <windows.h>
 #include <richedit.h>
 #include <commctrl.h>
+#include <commdlg.h>
 
 #include "wordpad.h"
 

programs/wscript/main.c

@@ -24,6 +24,7 @@
 #include <winbase.h>
 #include <winreg.h>
 #include <ole2.h>
+#include <shellapi.h>
 #include <activscp.h>
 #include <initguid.h>
 

programs/xcopy/xcopy.c

@@ -41,6 +41,7 @@
 
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <windows.h>
 #include <wine/debug.h>
 #include <wine/unicode.h>