Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 20:03:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
svn path=/trunk/; revision=38643
This commit is contained in:
Daniel Reimer 2009-01-08 14:08:17 +00:00
parent 2fa1f6d4c8
commit b1bf34ac4d
4 changed files with 724 additions and 737 deletions
Download patch file Download diff file Expand all files Collapse all files

4
reactos/base/applications/cmdutils/xcopy/xcopy.c
View file

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

2
reactos/base/applications/winhlp32/lex.yy.c
View file

@ -1670,7 +1670,7 @@ static LRESULT CALLBACK MACRO_TestDialogProc(HWND hDlg, UINT msg, WPARAM wParam,
void macro_test(void) void macro_test(void)
{ {
WNDPROC lpfnDlg = MakeProcInstance(MACRO_TestDialogProc, Globals.hInstance); 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); FreeProcInstance(lpfnDlg);
macro = szTestMacro; macro = szTestMacro;
} }

1450
reactos/base/applications/winhlp32/winhelp.c
View file

File diff suppressed because it is too large Load diff

1
reactos/base/applications/winhlp32/winhelp.h
View file

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