Sync to Wine HEAD. Done with my first try of a autosync script for the normal apps.

svn path=/trunk/; revision=38643

reactos/base/applications/cmdutils/xcopy/xcopy.c

@@ -43,6 +43,7 @@
 #include <stdio.h>
 #include <windows.h>
 #include <wine/debug.h>
+#include <wine/unicode.h>
 #include "xcopy.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(xcopy);
@@ -999,9 +1000,8 @@ int XCOPY_wprintf(const WCHAR *format, ...) {
       return 0;
     }
 
-    /* Use wvsprintf to store output into unicode buffer */
     va_start(parms, format);
-    len = vswprintf(output_bufW, format, parms);
+    len = vsnprintfW(output_bufW, MAX_WRITECONSOLE_SIZE/sizeof(WCHAR), format, parms);
     va_end(parms);
 
     /* Try to write as unicode all the time we think its a console */

reactos/base/applications/winhlp32/lex.yy.c

@@ -1670,7 +1670,7 @@ static LRESULT CALLBACK MACRO_TestDialogProc(HWND hDlg, UINT msg, WPARAM wParam,
 void macro_test(void)
 {
     WNDPROC lpfnDlg = MakeProcInstance(MACRO_TestDialogProc, Globals.hInstance);
-    DialogBox(Globals.hInstance, STRING_DIALOG_TEST, Globals.active_win->hMainWnd, lpfnDlg);
+    DialogBox(Globals.hInstance, STRING_DIALOG_TEST, Globals.active_win->hMainWnd, (DLGPROC)lpfnDlg);
     FreeProcInstance(lpfnDlg);
     macro = szTestMacro;
 }

reactos/base/applications/winhlp32/winhelp.h

@@ -149,7 +149,6 @@ BOOL WINHELP_OpenHelpWindow(HLPFILE_PAGE* (*)(HLPFILE*, LONG, ULONG*),
 BOOL WINHELP_GetOpenFileName(LPSTR, int);
 BOOL WINHELP_CreateIndexWindow(BOOL);
 void WINHELP_DeleteBackSet(WINHELP_WINDOW*);
-INT  WINHELP_MessageBoxIDS_s(UINT, LPCSTR, UINT, WORD);
 HLPFILE* WINHELP_LookupHelpFile(LPCSTR lpszFile);
 HLPFILE_WINDOWINFO* WINHELP_GetWindowInfo(HLPFILE* hlpfile, LPCSTR name);
 void WINHELP_LayoutMainWindow(WINHELP_WINDOW* win);