December 2010 - Wine-Commits

Alexandre Julliard : shell32: Store the raw AUTHORS file in resources instead of trying to convert to a C array .
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: 000a238bb3f68f76de73ed7832c63a3568f06d76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=000a238bb3f68f76de73ed783… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 11 12:24:46 2010 +0100 shell32: Store the raw AUTHORS file in resources instead of trying to convert to a C array. (cherry picked from commit 40977bf1d2f0f11a24fd9330dffac264fced2306) --- .gitignore | 1 + Makefile.in | 2 ++ configure | 3 +++ configure.ac | 1 + dlls/shell32/.gitignore | 1 - dlls/shell32/Makefile.in | 10 ---------- dlls/shell32/shell32_main.c | 39 +++++++++++++++++++++++++++++---------- dlls/shell32/shres.rc | 3 +++ tools/make_makefiles | 1 + 9 files changed, 40 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 7e67d59..6749547 100644 --- a/.gitignore +++ b/.gitignore @@ -129,6 +129,7 @@ dlls/rpcrt4/tests/server.h dlls/rpcrt4/tests/server_c.c dlls/rpcrt4/tests/server_s.c dlls/shdocvw/shdocvw_v1.tlb +dlls/shell32/AUTHORS dlls/stdole2.tlb/std_ole_v2.tlb dlls/stdole32.tlb/std_ole_v1.tlb dlls/sti/sti_wia.h diff --git a/Makefile.in b/Makefile.in index 67507a1..2d7b85c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -78,6 +78,8 @@ tools/wmc tools/wrc: tools tools tools/wmc tools/wrc: libs/wine tools/widl tools/wmc tools/wrc: libs/wpp +dlls/shell32/Makefile dlls/shell32/__depend__: dlls/shell32/AUTHORS + $(MAKEDEP): include/config.h tools/Makefile @cd $(TOOLSDIR)/tools && $(MAKE) makedep$(TOOLSEXT) diff --git a/configure b/configure index b92e6a0..db44d4d 100755 --- a/configure +++ b/configure @@ -14241,6 +14241,8 @@ wine_fn_config_symlink () distclean:: \$(RM) $ac_link" } +ac_config_links="$ac_config_links dlls/shell32/AUTHORS:AUTHORS" +wine_fn_config_symlink dlls/shell32/AUTHORS ac_config_links="$ac_config_links dlls/wineps.drv/generic.ppd:dlls/wineps.drv/generic.ppd" test "$srcdir" = "." || wine_fn_config_symlink dlls/wineps.drv/generic.ppd if test "x$enable_fonts" != xno; then @@ -15583,6 +15585,7 @@ do case $ac_config_target in "include/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;; "include/stamp-h") CONFIG_COMMANDS="$CONFIG_COMMANDS include/stamp-h" ;; + "dlls/shell32/AUTHORS") CONFIG_LINKS="$CONFIG_LINKS dlls/shell32/AUTHORS:AUTHORS" ;; "dlls/wineps.drv/generic.ppd") CONFIG_LINKS="$CONFIG_LINKS dlls/wineps.drv/generic.ppd:dlls/wineps.drv/generic.ppd" ;; "fonts/marlett.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/marlett.ttf:fonts/marlett.ttf" ;; "fonts/symbol.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/symbol.ttf:fonts/symbol.ttf" ;; diff --git a/configure.ac b/configure.ac index 85c6017..8181c4d 100644 --- a/configure.ac +++ b/configure.ac @@ -2203,6 +2203,7 @@ AH_BOTTOM([#endif /* WINE_CROSSTEST */]) AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h]) +WINE_CONFIG_SYMLINK(dlls/shell32/AUTHORS,AUTHORS) WINE_CONFIG_SYMLINK(dlls/wineps.drv/generic.ppd) WINE_CONFIG_SYMLINK(fonts/marlett.ttf,,enable_fonts) WINE_CONFIG_SYMLINK(fonts/symbol.ttf,,enable_fonts) diff --git a/dlls/shell32/.gitignore b/dlls/shell32/.gitignore deleted file mode 100644 index a6683e2..0000000 --- a/dlls/shell32/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/authors.c diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index 63d5b30..66f27f7 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -108,14 +108,4 @@ SVG_SRCS = \ shortcut.svg \ trash_file.svg -EXTRA_OBJS = authors.o - @MAKE_DLL_RULES@ - -authors.c: $(TOPSRCDIR)/AUTHORS - (LC_ALL=C; export LC_ALL; echo 'const char * const SHELL_Authors[] = {' && \ - sed -e '1,2d' -e 's/$.*$/ \"\1\",/' $(TOPSRCDIR)/AUTHORS && \ - echo ' 0 };') >$@ || ($(RM) $@ && false) - -clean:: - $(RM) authors.c diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 2824268..501c477 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -50,8 +50,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); -extern const char * const SHELL_Authors[]; - /************************************************************************* * CommandLineToArgvW [SHELL32.@] * @@ -920,6 +918,34 @@ HRESULT WINAPI SHLoadInProc (REFCLSID rclsid) return DISP_E_MEMBERNOTFOUND; } +static void add_authors( HWND list ) +{ + static const WCHAR eol[] = {'\r','\n',0}; + static const WCHAR authors[] = {'A','U','T','H','O','R','S',0}; + WCHAR *strW, *start, *end; + HRSRC rsrc = FindResourceW( shell32_hInstance, authors, (LPCWSTR)RT_RCDATA ); + char *strA = LockResource( LoadResource( shell32_hInstance, rsrc )); + DWORD sizeW, sizeA = SizeofResource( shell32_hInstance, rsrc ); + + if (!strA) return; + sizeW = MultiByteToWideChar( CP_UTF8, 0, strA, sizeA, NULL, 0 ) + 1; + if (!(strW = HeapAlloc( GetProcessHeap(), 0, sizeW * sizeof(WCHAR) ))) return; + MultiByteToWideChar( CP_UTF8, 0, strA, sizeA, strW, sizeW ); + strW[sizeW - 1] = 0; + + start = strpbrkW( strW, eol ); /* skip the header line */ + while (start) + { + while (*start && strchrW( eol, *start )) start++; + if (!*start) break; + end = strpbrkW( start, eol ); + if (end) *end++ = 0; + SendMessageW( list, LB_ADDSTRING, -1, (LPARAM)start ); + start = end; + } + HeapFree( GetProcessHeap(), 0, strW ); +} + /************************************************************************* * AboutDlgProc (internal) */ @@ -940,7 +966,6 @@ static INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam, if (info) { - const char* const *pstr = SHELL_Authors; SendDlgItemMessageW(hWnd, stc1, STM_SETICON,(WPARAM)info->hIcon, 0); GetWindowTextW( hWnd, template, sizeof(template)/sizeof(WCHAR) ); sprintfW( buffer, template, info->szApp ); @@ -956,13 +981,7 @@ static INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam, hWndCtl = GetDlgItem(hWnd, IDC_ABOUT_LISTBOX); SendMessageW( hWndCtl, WM_SETREDRAW, 0, 0 ); SendMessageW( hWndCtl, WM_SETFONT, (WPARAM)info->hFont, 0 ); - while (*pstr) - { - /* authors list is in utf-8 format */ - MultiByteToWideChar( CP_UTF8, 0, *pstr, -1, buffer, sizeof(buffer)/sizeof(WCHAR) ); - SendMessageW( hWndCtl, LB_ADDSTRING, -1, (LPARAM)buffer ); - pstr++; - } + add_authors( hWndCtl ); SendMessageW( hWndCtl, WM_SETREDRAW, 1, 0 ); } } diff --git a/dlls/shell32/shres.rc b/dlls/shell32/shres.rc index 11cc344..6ff4d98 100644 --- a/dlls/shell32/shres.rc +++ b/dlls/shell32/shres.rc @@ -125,3 +125,6 @@ IDR_AVI_FILENUKE AVI searching.avi /* @makedep: searching.avi */ IDR_AVI_FILEDELETE AVI searching.avi + +/* @makedep: AUTHORS */ +AUTHORS RCDATA AUTHORS diff --git a/tools/make_makefiles b/tools/make_makefiles index 83d7836..6806edc 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -90,6 +90,7 @@ my @ignores = ( "Makefile", "dlldata.c", "dlls/*/*.def", + "dlls/shell32/AUTHORS", "*/*/tests/*crosstest.exe", "*/*/tests/testlist.c", "include/config.h",

1 0

Austin English : regsvr32: Add a manpage.
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: 64dfb217a679c320e219f741559b99c1f16620ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=64dfb217a679c320e219f7415… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Nov 20 14:25:08 2010 +0100 regsvr32: Add a manpage. (cherry picked from commit f30fa2f4f14b25b4b72dc41f37b72ae5dc781806) --- .gitignore | 1 + programs/regsvr32/Makefile.in | 12 ++++++++++++ programs/regsvr32/regsvr32.man.in | 20 ++++++++++++++++++++ 3 files changed, 33 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 916346e..87e0669 100644 --- a/.gitignore +++ b/.gitignore @@ -247,6 +247,7 @@ loader/wine64 programs/Makeprog.rules programs/msiexec/msiexec.man programs/notepad/notepad.man +programs/regsvr32/regsvr32.man programs/rpcss/epm.h programs/rpcss/epm_s.c programs/rpcss/irot.h diff --git a/programs/regsvr32/Makefile.in b/programs/regsvr32/Makefile.in index 958fad4..80affb1 100644 --- a/programs/regsvr32/Makefile.in +++ b/programs/regsvr32/Makefile.in @@ -12,4 +12,16 @@ C_SRCS = \ RC_SRCS = regsvr32.rc +MANPAGES = regsvr32.man + @MAKE_PROG_RULES@ + +all: $(MANPAGES) + +install-man-pages:: $(MANPAGES) $(DESTDIR)$(mandir)/man$(prog_manext) + $(INSTALL_DATA) regsvr32.man $(DESTDIR)$(mandir)/man$(prog_manext)/regsvr32.$(prog_manext) + +(a)WOW64_DISABLE@ install install-lib:: install-man-pages + +uninstall:: + $(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/regsvr32.$(prog_manext) diff --git a/programs/regsvr32/regsvr32.man.in b/programs/regsvr32/regsvr32.man.in new file mode 100644 index 0000000..33c9f42 --- /dev/null +++ b/programs/regsvr32/regsvr32.man.in @@ -0,0 +1,20 @@ +.TH REGSVR32 1 "November 2010" "@PACKAGE_STRING@" "Wine Programs" +.SH NAME +regsvr32 \- Wine DLL Registration Server +.SH SYNOPSIS +.BR "regsvr32 [/u] [/s] [/n] [/i [:cmdline]] dllname" +.SH DESCRIPTION +.B regsvr32 +is the Wine dll registration server, designed to be compatible with its Microsoft Windows counterpart. +By default, it will register the given dll. +.SH COMMANDS +.IP "\fl/u dllname\fR" +Unregister the specified dll. +.IP "\fl/s\fR" +Run regsvr32 silently (will not show any GUI dialogs). +.IP "\fl/i\fR" +Call DllInstall passing it an optional [cmdline]. When used with /u calls DllUninstall. +.IP "\fl/n\fR" +Do not call DllRegisterServer; this option must be used with [/i]. +.SH "SEE ALSO" +.BR wine(1)

1 0

Austin English : winecfg: Add a manpage.
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: fbac1f30199124d78265ca50eae835c81414118b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbac1f30199124d78265ca50e… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Nov 24 06:43:10 2010 -0800 winecfg: Add a manpage. (cherry picked from commit 68daebb681c1df761a035666217945a23c3c5d23) --- .gitignore | 1 + programs/winecfg/Makefile.in | 12 ++++++++++++ programs/winecfg/winecfg.man.in | 13 +++++++++++++ 3 files changed, 26 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index aecb01a..3c5363c 100644 --- a/.gitignore +++ b/.gitignore @@ -254,6 +254,7 @@ programs/rpcss/irot.h programs/rpcss/irot_s.c programs/services/svcctl.h programs/services/svcctl_s.c +programs/winecfg/winecfg.man programs/winedbg/dbg.tab.c programs/winedbg/dbg.tab.h programs/winedbg/debug.yy.c diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in index 8cf878e..ca4b0be 100644 --- a/programs/winecfg/Makefile.in +++ b/programs/winecfg/Makefile.in @@ -47,8 +47,20 @@ RC_SRCS = \ Zh.rc \ winecfg.rc +MANPAGES = winecfg.man + SVG_SRCS = \ logo.svg \ winecfg.svg @MAKE_PROG_RULES@ + +all: $(MANPAGES) + +install-man-pages:: $(MANPAGES) $(DESTDIR)$(mandir)/man$(prog_manext) + $(INSTALL_DATA) winecfg.man $(DESTDIR)$(mandir)/man$(prog_manext)/winecfg.$(prog_manext) + +(a)WOW64_DISABLE@ install install-lib:: install-man-pages + +uninstall:: + $(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/winecfg.$(prog_manext) diff --git a/programs/winecfg/winecfg.man.in b/programs/winecfg/winecfg.man.in new file mode 100644 index 0000000..0c56238 --- /dev/null +++ b/programs/winecfg/winecfg.man.in @@ -0,0 +1,13 @@ +.TH WINECFG 1 "November 2010" "@PACKAGE_STRING@" "Wine Programs" +.SH NAME +winecfg \- Wine Configuration Editor +.SH SYNOPSIS +.BR "winecfg" +.SH DESCRIPTION +.B winecfg +is the Wine configuration editor. It allows you to change several settings, such as DLL load order +(native versus builtin), enable a virtual desktop, setup disk drives, and change the Wine audio driver, +among others. Many of these settings can be made on a per application basis, for example, preferring native +riched20.dll for wordpad.exe, but not for notepad.exe. +.SH "SEE ALSO" +.BR wine(1)

1 0

Austin English : winefile: Add a manpage.
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: 9a5cd19a4f4dc3df6962ba56cded1831cc67c783 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a5cd19a4f4dc3df6962ba56c… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Nov 24 06:27:30 2010 -0800 winefile: Add a manpage. (cherry picked from commit d2989f0d09254268b557ab18aee572032d450291) --- .gitignore | 1 + programs/winefile/Makefile.in | 12 ++++++++++++ programs/winefile/winefile.man.in | 19 +++++++++++++++++++ 3 files changed, 32 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 7700625..aecb01a 100644 --- a/.gitignore +++ b/.gitignore @@ -258,6 +258,7 @@ programs/winedbg/dbg.tab.c programs/winedbg/dbg.tab.h programs/winedbg/debug.yy.c programs/winedbg/winedbg.man +programs/winefile/winefile.man programs/winemine/winemine.man programs/winetest/*_test.exe programs/winetest/*_test.rc diff --git a/programs/winefile/Makefile.in b/programs/winefile/Makefile.in index 9c5abf8..0202b79 100644 --- a/programs/winefile/Makefile.in +++ b/programs/winefile/Makefile.in @@ -36,6 +36,18 @@ RC_SRCS = \ Zh.rc \ rsrc.rc +MANPAGES = winefile.man + SVG_SRCS = winefile.svg @MAKE_PROG_RULES@ + +all: $(MANPAGES) + +install-man-pages:: $(MANPAGES) $(DESTDIR)$(mandir)/man$(prog_manext) + $(INSTALL_DATA) winefile.man $(DESTDIR)$(mandir)/man$(prog_manext)/winefile.$(prog_manext) + +(a)WOW64_DISABLE@ install install-lib:: install-man-pages + +uninstall:: + $(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/winefile.$(prog_manext) diff --git a/programs/winefile/winefile.man.in b/programs/winefile/winefile.man.in new file mode 100644 index 0000000..761501d --- /dev/null +++ b/programs/winefile/winefile.man.in @@ -0,0 +1,19 @@ +.TH WINEFILE 1 "November 2010" "@PACKAGE_STRING@" "Wine Programs" +.SH NAME +winefile \- Wine File Manager +.SH SYNOPSIS +.BR "winefile \fl[Unix\ path]\fR" + +.BR "winefile \fl[Win32\ path]\fR" +.SH DESCRIPTION +.B winefile +is the Wine file manager, with a similar design to early Microsoft Windows explorer. +.SH USAGE +.B You can pass winefile either a Unix or Win32 path, for example: + +.B Using a Unix path: winefile /mnt/hda1 + +.B Using a Win32 path: winefile C:\(rs\(rswindows\(rs\(rs\ + +.SH "SEE ALSO" +.BR wine(1)

1 0

Austin English : notepad: Add a manpage.
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: 49547729839f683d6c8106a28aef28ba560673d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49547729839f683d6c8106a28… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Nov 20 11:22:58 2010 +0100 notepad: Add a manpage. (cherry picked from commit ac0f13100e95e3dea4edfb9b8257ddd9e8ec6d15) --- .gitignore | 1 + programs/notepad/Makefile.in | 12 ++++++++++++ programs/notepad/notepad.man.in | 11 +++++++++++ 3 files changed, 24 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 120b5f9..916346e 100644 --- a/.gitignore +++ b/.gitignore @@ -246,6 +246,7 @@ loader/wine.man loader/wine64 programs/Makeprog.rules programs/msiexec/msiexec.man +programs/notepad/notepad.man programs/rpcss/epm.h programs/rpcss/epm_s.c programs/rpcss/irot.h diff --git a/programs/notepad/Makefile.in b/programs/notepad/Makefile.in index 472c753..453e238 100644 --- a/programs/notepad/Makefile.in +++ b/programs/notepad/Makefile.in @@ -46,6 +46,18 @@ RC_SRCS = \ Zh.rc \ rsrc.rc +MANPAGES = notepad.man + SVG_SRCS = notepad.svg @MAKE_PROG_RULES@ + +all: $(MANPAGES) + +install-man-pages:: $(MANPAGES) $(DESTDIR)$(mandir)/man$(prog_manext) + $(INSTALL_DATA) notepad.man $(DESTDIR)$(mandir)/man$(prog_manext)/notepad.$(prog_manext) + +(a)WOW64_DISABLE@ install install-lib:: install-man-pages + +uninstall:: + $(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/notepad.$(prog_manext) diff --git a/programs/notepad/notepad.man.in b/programs/notepad/notepad.man.in new file mode 100644 index 0000000..98affc4 --- /dev/null +++ b/programs/notepad/notepad.man.in @@ -0,0 +1,11 @@ +.TH NOTEPAD 1 "November 2010" "@PACKAGE_STRING@" "Wine Programs" +.SH NAME +notepad \- Wine text editor +.SH SYNOPSIS +.BR "notepad "\fI[text file]\fR " +.SH DESCRIPTION +.B notepad +is the Wine text editor, designed to be compatible with its Microsoft Windows counterpart. +It supports ANSI, UTF-8 and UTF-16 files, and can read (but not write) files with Unix line endings. +.SH "SEE ALSO" +.BR wine(1)

1 0

Alexandre Julliard : winapi: Add support for more spec entry flags.
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: 1b76019f7b74b010f43fbfc63a72e65732cbadd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b76019f7b74b010f43fbfc63… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 15 12:59:34 2010 +0100 winapi: Add support for more spec entry flags. (cherry picked from commit 0e034b634af87698a82c6d3932887462e8976eb4) --- tools/winapi/winapi.pm | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winapi/winapi.pm b/tools/winapi/winapi.pm index dcd9268..df99b66 100644 --- a/tools/winapi/winapi.pm +++ b/tools/winapi/winapi.pm @@ -391,7 +391,7 @@ sub parse_spec_file($$) { } } } - } elsif(/^(\d+|@)\s+stub(?:\s+(-arch=(?:$ARCHES)(?:,(?:$ARCHES))*|-noname|-norelay|-i386|-ret16|-ret64|-private))*\s+(\S+)$/) { + } elsif(/^(\d+|@)\s+stub(?:\s+(-arch=(?:$ARCHES)(?:,(?:$ARCHES))*|-noname|-norelay|-ordinal|-i386|-ret16|-ret64|-private))*\s+(\S+)$/) { $ordinal = $1; my $flags = $2; @@ -440,7 +440,7 @@ sub parse_spec_file($$) { } else { # if($$function_external_module{$external_name} !~ /$module/) { $$function_external_module{$external_name} .= " & $module"; } - } elsif(/^(\d+|@)\s+extern(?:\s+(?:-arch=(?:$ARCHES)(?:,(?:$ARCHES))*|-norelay|-i386|-ret16|-ret64))*\s+(\S+)\s*(\S*)$/) { + } elsif(/^(\d+|@)\s+extern(?:\s+(?:-arch=(?:$ARCHES)(?:,(?:$ARCHES))*|-noname|-norelay|-ordinal|-i386|-ret16|-ret64))*\s+(\S+)\s*(\S*)$/) { $ordinal = $1; my $external_name = $2;

1 0

Austin English : wineboot: Add a manpage.
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: a1f9ab59dc65792665234bce325cdcedde04c013 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1f9ab59dc65792665234bce3… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 25 08:02:08 2010 -0800 wineboot: Add a manpage. (cherry picked from commit 8d821bd933db1f0760601a3bd54aba028a962882) --- .gitignore | 1 + programs/wineboot/Makefile.in | 12 ++++++++++++ programs/wineboot/wineboot.man.in | 31 +++++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 3c5363c..a37de8a 100644 --- a/.gitignore +++ b/.gitignore @@ -254,6 +254,7 @@ programs/rpcss/irot.h programs/rpcss/irot_s.c programs/services/svcctl.h programs/services/svcctl_s.c +programs/wineboot/wineboot.man programs/winecfg/winecfg.man programs/winedbg/dbg.tab.c programs/winedbg/dbg.tab.h diff --git a/programs/wineboot/Makefile.in b/programs/wineboot/Makefile.in index b0207c1..5a6aa64 100644 --- a/programs/wineboot/Makefile.in +++ b/programs/wineboot/Makefile.in @@ -35,4 +35,16 @@ RC_SRCS = \ wineboot_Uk.rc \ wineboot_Zh.rc +MANPAGES = wineboot.man + @MAKE_PROG_RULES@ + +all: $(MANPAGES) + +install-man-pages:: $(MANPAGES) $(DESTDIR)$(mandir)/man$(prog_manext) + $(INSTALL_DATA) wineboot.man $(DESTDIR)$(mandir)/man$(prog_manext)/wineboot.$(prog_manext) + +(a)WOW64_DISABLE@ install install-lib:: install-man-pages + +uninstall:: + $(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/wineboot.$(prog_manext) diff --git a/programs/wineboot/wineboot.man.in b/programs/wineboot/wineboot.man.in new file mode 100644 index 0000000..820ded3 --- /dev/null +++ b/programs/wineboot/wineboot.man.in @@ -0,0 +1,31 @@ +.TH WINEBOOT 1 "November 2010" "@PACKAGE_STRING@" "Wine Programs" +.SH NAME +wineboot \- perform Wine initialization, startup, and shutdown tasks +.SH SYNOPSIS +.BR "wineboot "\fI[OPTION]\fR " +.SH DESCRIPTION +.B wineboot +performs the initial creation and setup of a WINEPREFIX for wine(1). It can also perform a simulated +reboot or shutdown to any applications running within the WINEPREFIX. +.SH "SEE ALSO" +.BR wine(1) +.SH "OPTIONS" +.IP \-h,\ \-\-help +Display help message. +.IP \-e,\ \-\-end\-session +End the current session cleanly. +.IP \-f,\ \-\-force +Force exit for processes that don't exit cleanly +.IP \-i,\ \-\-init +Initialize the WINEPREFIX. +.IP \-k,\ \-\-kill +Kill running processes without any cleanup. +.IP \-r,\ \-\-restart +Restart only, don't do normal startup operations. +.IP \-s,\ \-\-shutdown +Shutdown only, don't reboot. +.IP \-u,\ \-\-update +Update the WINEPREFIX. + +.SH "SEE ALSO" +.BR wine(1)

1 0

Louis Lenders : kernel32: Fix GetTempFileName with invalid path.
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: d7c7c2f43d54c9475e0838e77c1af3b910f0320d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7c7c2f43d54c9475e0838e77… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Wed Oct 20 20:27:38 2010 +0200 kernel32: Fix GetTempFileName with invalid path. Found by Oskar Eisemuth. (cherry picked from commit 8819ae1e66fb0d4181594510431eee7c8d158af0) --- dlls/kernel32/path.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 0e69f91..6f97b3a 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -660,6 +660,7 @@ UINT WINAPI GetTempFileNameW( LPCWSTR path, LPCWSTR prefix, UINT unique, LPWSTR int i; LPWSTR p; + DWORD attr; if ( !path || !buffer ) { @@ -667,6 +668,15 @@ UINT WINAPI GetTempFileNameW( LPCWSTR path, LPCWSTR prefix, UINT unique, LPWSTR return 0; } + /* ensure that the provided directory exists */ + attr = GetFileAttributesW(path); + if (attr == INVALID_FILE_ATTRIBUTES || !(attr & FILE_ATTRIBUTE_DIRECTORY)) + { + TRACE("path not found %s\n", debugstr_w(path)); + SetLastError( ERROR_DIRECTORY ); + return 0; + } + strcpyW( buffer, path ); p = buffer + strlenW(buffer);

1 0

André Hentschel : krnl386: Mention DOSBox.
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: 72e5e058d5c6cfbd48039b45288070f7e4267931 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72e5e058d5c6cfbd48039b452… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 10 20:02:21 2010 +0100 krnl386: Mention DOSBox. (cherry picked from commit ac816c2a82e44dff205e850743973bf97059bebd) --- dlls/krnl386.exe16/dosexe.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/krnl386.exe16/dosexe.c b/dlls/krnl386.exe16/dosexe.c index c16d0df..876a015 100644 --- a/dlls/krnl386.exe16/dosexe.c +++ b/dlls/krnl386.exe16/dosexe.c @@ -643,7 +643,8 @@ static DWORD WINAPI MZ_DOSVM( LPVOID lpExtra ) if (GetLastError() == ERROR_NOT_SUPPORTED) MESSAGE( "wine: Cannot start DOS application %s\n" - " because vm86 mode is not supported on this platform.\n", + " because vm86 mode is not supported on this platform.\n" + " Try running the application with DOSBox.\n", debugstr_a(env) ); else FIXME( "vm86 mode failed error %u\n", GetLastError() );

1 0

Marcus Meissner : ntdll: Check and fix PE header protections.
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: ab3d4bc27b2ef39f432ff9d73b76820d3bc8c659 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab3d4bc27b2ef39f432ff9d73… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Nov 8 03:34:27 2010 +0100 ntdll: Check and fix PE header protections. (cherry picked from commit 2e7dc3578663f052b8ee1d39df4a2ad41ed02300) --- dlls/ntdll/virtual.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 1428be0..7e2fb8b 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1416,10 +1416,13 @@ NTSTATUS virtual_create_builtin_view( void *module ) if (status) return status; + /* The PE header is always read-only, no write, no execute. */ + view->prot[0] = VPROT_COMMITTED | VPROT_READ; + sec = (IMAGE_SECTION_HEADER *)((char *)&nt->OptionalHeader + nt->FileHeader.SizeOfOptionalHeader); for (i = 0; i < nt->FileHeader.NumberOfSections; i++) { - DWORD flags = VPROT_SYSTEM | VPROT_IMAGE | VPROT_COMMITTED; + BYTE flags = VPROT_COMMITTED; if (sec[i].Characteristics & IMAGE_SCN_MEM_EXECUTE) flags |= VPROT_EXEC; if (sec[i].Characteristics & IMAGE_SCN_MEM_READ) flags |= VPROT_READ;

1 0