February 2006 - Wine-Commits

Paul Vriens : winecfg: Update Dutch resources.
by Alexandre Julliard Feb. 6, 2006

Feb. 6, 2006

Module: wine Branch: refs/heads/master Commit: afcf31cb510d158483047321660911503b034f8a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=afcf31cb510d15848304732… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Mon Feb 6 11:26:12 2006 +0100 winecfg: Update Dutch resources. --- programs/winecfg/Nl.rc | 55 +++++++++++++++++++++++++++++++----------------- 1 files changed, 36 insertions(+), 19 deletions(-) diff --git a/programs/winecfg/Nl.rc b/programs/winecfg/Nl.rc index a38413b..564e175 100644 --- a/programs/winecfg/Nl.rc +++ b/programs/winecfg/Nl.rc @@ -3,7 +3,7 @@ * Dutch Language Support * * Copyright 2004 Rein Klazes - * Copyright 2005 Paul Vriens + * Copyright 2005-2006 Paul Vriens * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -61,27 +61,32 @@ IDD_GRAPHCFG DIALOG DISCARDABLE 0, 0, 2 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Windowsinstellingen ",IDC_STATIC,8,25,244,120 + GROUPBOX " Venster-instellingen ",IDC_STATIC,8,25,244,180 - CONTROL "Een DirectX programma kan de muis in een window vasthouden.",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,35,230,8 + CONTROL "Een DirectX programma kan de muis in een venster vasthouden.",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,35,230,8 CONTROL "Schakel \"double buffering\" in.",IDC_DOUBLE_BUFFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,45,230,8 + LTEXT "Wanneer de vensters door de window manager worden beheerd hebben deze de standaard kaders, er wordt rekening gehouden met de virtuele desktop en ze staan in de lijst met vensters.\n\nAls de vensters niet worden beheerd, worden ze losgekoppeld van de window manager. Dit betekent dat vensters niet perfect met u desktop integreren. De 'emulatie' is echter exacter en kan ervoor zorgen dat programma's beter werken.", + IDC_STATIC,15,58,228,80 + CONTROL "Laat de window manger de vensters beheren",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,132,230,8 + /* FIXME: the wording of this explanation could be a lot better */ - LTEXT "U kunt kiezen voor een virtuele windows desktop waarop alle windows geplaatst worden, of U kunt er voor kiezen dat de windows op uw standaard desktop geplaatst worden.", - IDC_STATIC,15,73,228,28 - LTEXT "Desktop afmetingen:",IDC_DESKTOP_SIZE,15,115,44,8,WS_DISABLED - LTEXT "X",IDC_DESKTOP_BY,108,115,8,8,WS_DISABLED + LTEXT "U kunt kiezen voor een virtuele windows desktop waarop alle vensters geplaatst worden, of u kunt er voor kiezen dat de vensters op uw standaard desktop geplaatst worden.", + IDC_STATIC,15,146,228,28 + LTEXT "Desktop afmetingen:",IDC_DESKTOP_SIZE,15,188,44,8,WS_DISABLED + LTEXT "X",IDC_DESKTOP_BY,108,188,8,8,WS_DISABLED CONTROL "Emuleer een virtuele desktop",IDC_ENABLE_DESKTOP,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,15,100,230,10 + BS_AUTOCHECKBOX | WS_TABSTOP,15,173,230,10 - EDITTEXT IDC_DESKTOP_WIDTH,64,115,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED - EDITTEXT IDC_DESKTOP_HEIGHT,117,115,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED - GROUPBOX " Direct3D ",IDC_STATIC,8,140,244,120 + EDITTEXT IDC_DESKTOP_WIDTH,64,188,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + EDITTEXT IDC_DESKTOP_HEIGHT,117,188,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + + GROUPBOX " Direct3D ",IDC_STATIC,8,210,244,50 - LTEXT "Vertex Shader ondersteuning: ",IDC_STATIC,15,150,100,30 - COMBOBOX IDC_D3D_VSHADER_MODE,120,148,130,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Vertex Shader ondersteuning: ",IDC_STATIC,15,220,100,30 + COMBOBOX IDC_D3D_VSHADER_MODE,120,218,130,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Pixel Shader toestaan (indien ondersteund door de hardware)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,165,230,10 + CONTROL "Pixel Shader toestaan (indien ondersteund door de hardware)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,237,230,10 END IDD_DLLCFG DIALOG DISCARDABLE 0, 0, 260, 250 @@ -94,7 +99,7 @@ BEGIN LTEXT "Nieuwe override voor dll:",IDC_STATIC,16,58,100,8 COMBOBOX IDC_DLLCOMBO,16,68,140,14,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP | CBS_SORT | CBS_LOWERCASE PUSHBUTTON "&Toevoegen",IDC_DLLS_ADDDLL, 164,68,82,13,BS_DEFPUSHBUTTON - LTEXT "Existing overrides:",IDC_STATIC,16,86,100,8 + LTEXT "Bestaande overrides:",IDC_STATIC,16,86,100,8 LISTBOX IDC_DLLS_LIST,16,96,140,140,WS_BORDER | WS_TABSTOP | WS_VSCROLL PUSHBUTTON "&Bewerken",IDC_DLLS_EDITDLL,164,96,82,14 PUSHBUTTON "&Verwijderen",IDC_DLLS_REMOVEDLL,164,114,82,14 @@ -133,9 +138,9 @@ BEGIN LTEXT "&Soort:",IDC_STATIC_TYPE,15,138,21,10 COMBOBOX IDC_COMBO_TYPE,41,135,77,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - + LTEXT "Naam en serienummer",IDC_LABELSERIAL_STATIC,15,155,131,10 - + PUSHBUTTON "Toon &Uitgebreid",IDC_BUTTON_SHOW_HIDE_ADVANCED,183,136,65,13 CONTROL "Automatisch detecteren van apparaat:",IDC_RADIO_AUTODETECT,"Button", BS_AUTORADIOBUTTON,15,166,150,10 @@ -143,12 +148,12 @@ BEGIN PUSHBUTTON "B&laderen...",IDC_BUTTON_BROWSE_DEVICE,208,176,40,13 CONTROL "&Handmatig instellen:",IDC_RADIO_ASSIGN,"Button", BS_AUTORADIOBUTTON,15,195,150,10 - + LTEXT "&Naam:",IDC_STATIC_LABEL,33,208,60,12 EDITTEXT IDC_EDIT_LABEL,94,205,78,13,ES_AUTOHSCROLL | WS_TABSTOP LTEXT "S&erie nummer:",IDC_STATIC_SERIAL,33,225,60,12 EDITTEXT IDC_EDIT_SERIAL,94,221,78,13,ES_AUTOHSCROLL | WS_TABSTOP - + CONTROL "Toon \".\" files",IDC_SHOW_DOT_FILES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,260,230,8 END @@ -196,4 +201,16 @@ BEGIN IDS_WINECFG_TITLE "Wine configuratie" IDS_THEMEFILE "Thema-bestanden" IDS_THEMEFILE_SELECT "Thema-bestanden kiezen" + IDS_AUDIO_MISSING "Op dit moment is er geen audio stuurbestand gespecificeerd in de registry.\n\nEen aanbevolen stuurbestand is voor u geselecteerd.\nU kunt dit stuurbestand gebruiken of (indien beschikbaar) een ander selecteren.\n\nKlik op 'Toepassen' om deze selectie te activeren." +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DLL_WARNING "Veranderen van de laadvolgorde van deze bibliotheek wordt niet aanbevolen\n. Weet u zeker dat u dit wilt doen?" + IDS_DLL_WARNING_CAPTION "Waarschuwing: systeembibliotheek" + IDS_DLL_NATIVE "Native (Windows)" + IDS_DLL_BUILTIN "Builtin (Wine)" + IDS_DLL_NATIVE_BUILTIN "Native dan builtin" + IDS_DLL_BUILTIN_NATIVE "Builtin dan native" + IDS_DLL_DISABLED "Uitgeschakeld" END

1 0

appdb/. account.php
by WineHQ Feb. 5, 2006

Feb. 5, 2006

ChangeSet ID: 22737 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/02/05 14:46:10 Modified files: . : account.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Don't urlencode the users email address when displaying it back to the user, otherwise we'll see stuff like blah%40yourdomain.com Patch: http://cvs.winehq.org/patch.py?id=22737 Old revision New revision Changes Path 1.14 1.15 +1 -1 appdb/account.php Index: appdb/account.php diff -u -p appdb/account.php:1.14 appdb/account.php:1.15 --- appdb/account.php:1.14 5 Feb 2006 20:46:10 -0000 +++ appdb/account.php 5 Feb 2006 20:46:10 -0000 @@ -159,7 +159,7 @@ function cmd_send_passwd() } else { - addmsg("Sorry, that user (". urlencode($_POST['ext_email']) .") does not exist. " + addmsg("Sorry, that user (".$_POST['ext_email'].") does not exist. " .$note, "red"); }

1 0

appdb/. account.php
by WineHQ Feb. 5, 2006

Feb. 5, 2006

ChangeSet ID: 22736 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/02/05 14:44:32 Modified files: . : account.php Log message: Rafal Maj <rafal(a)raf256.com> Clarify that appdb and bugzilla have separate accounts when a user is requesting their password from the appdb. Patch: http://cvs.winehq.org/patch.py?id=22736 Old revision New revision Changes Path 1.13 1.14 +6 -2 appdb/account.php Index: appdb/account.php diff -u -p appdb/account.php:1.13 appdb/account.php:1.14 --- appdb/account.php:1.13 5 Feb 2006 20:44:32 -0000 +++ appdb/account.php 5 Feb 2006 20:44:32 -0000 @@ -126,6 +126,9 @@ function cmd_do_new() function cmd_send_passwd() { + $note = '(Note: accounts for appdb.winehq.org and bugs.winehq.org ' + .'are separated, so You might need to create second account for appdb.)'; + $userid = user_exists($_POST['ext_email']); $passwd = generate_passwd(); $user = new User($userid); @@ -156,7 +159,8 @@ function cmd_send_passwd() } else { - addmsg("Sorry, that user (". urlencode($_POST['ext_email']) .") does not exist.", "red"); + addmsg("Sorry, that user (". urlencode($_POST['ext_email']) .") does not exist. " + .$note, "red"); } redirect(apidb_fullurl("account.php?cmd=login")); @@ -177,7 +181,7 @@ function cmd_do_login() redirect(apidb_fullurl("index.php")); } else { - retry("login","Login failed"); + retry("login","Login failed ".$note); $_SESSION['current'] = ""; } }

1 0

Gerald Pfeifer : ntdll: Use struct mtget.mt_blksiz on systems featuring this.
by Alexandre Julliard Feb. 5, 2006

Feb. 5, 2006

Module: wine Branch: refs/heads/master Commit: 36bdc64e3921c922ab7f9559f4c817b145d54957 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=36bdc64e3921c922ab7f955… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Feb 5 13:51:03 2006 +0100 ntdll: Use struct mtget.mt_blksiz on systems featuring this. Work around using struct mtget.mt_gstat on systems lacking this. --- configure | 228 +++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 6 + dlls/ntdll/tape.c | 12 +++ include/config.h.in | 6 + 4 files changed, 252 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 2d3080b..fb51ce2 100755 --- a/configure +++ b/configure @@ -18074,6 +18074,234 @@ _ACEOF fi +echo "$as_me:$LINENO: checking for struct mtget.mt_blksiz" >&5 +echo $ECHO_N "checking for struct mtget.mt_blksiz... $ECHO_C" >&6 +if test "${ac_cv_member_struct_mtget_mt_blksiz+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef HAVE_SYS_MTIO_H +#include <sys/mtio.h> +#endif + +int +main () +{ +static struct mtget ac_aggr; +if (ac_aggr.mt_blksiz) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_member_struct_mtget_mt_blksiz=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef HAVE_SYS_MTIO_H +#include <sys/mtio.h> +#endif + +int +main () +{ +static struct mtget ac_aggr; +if (sizeof ac_aggr.mt_blksiz) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_member_struct_mtget_mt_blksiz=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_member_struct_mtget_mt_blksiz=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_member_struct_mtget_mt_blksiz" >&5 +echo "${ECHO_T}$ac_cv_member_struct_mtget_mt_blksiz" >&6 +if test $ac_cv_member_struct_mtget_mt_blksiz = yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_MTGET_MT_BLKSIZ 1 +_ACEOF + + +fi +echo "$as_me:$LINENO: checking for struct mtget.mt_gstat" >&5 +echo $ECHO_N "checking for struct mtget.mt_gstat... $ECHO_C" >&6 +if test "${ac_cv_member_struct_mtget_mt_gstat+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef HAVE_SYS_MTIO_H +#include <sys/mtio.h> +#endif + +int +main () +{ +static struct mtget ac_aggr; +if (ac_aggr.mt_gstat) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_member_struct_mtget_mt_gstat=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef HAVE_SYS_MTIO_H +#include <sys/mtio.h> +#endif + +int +main () +{ +static struct mtget ac_aggr; +if (sizeof ac_aggr.mt_gstat) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_member_struct_mtget_mt_gstat=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_member_struct_mtget_mt_gstat=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_member_struct_mtget_mt_gstat" >&5 +echo "${ECHO_T}$ac_cv_member_struct_mtget_mt_gstat" >&6 +if test $ac_cv_member_struct_mtget_mt_gstat = yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_MTGET_MT_GSTAT 1 +_ACEOF + + +fi + + echo "$as_me:$LINENO: checking for struct option.name" >&5 echo $ECHO_N "checking for struct option.name... $ECHO_C" >&6 if test "${ac_cv_member_struct_option_name+set}" = set; then diff --git a/configure.ac b/configure.ac index f3e961e..17caf2f 100644 --- a/configure.ac +++ b/configure.ac @@ -1427,6 +1427,12 @@ AC_CHECK_MEMBERS([scsireq_t.cmd, sg_io_h dnl Check for siginfo_t members AC_CHECK_MEMBERS([siginfo_t.si_fd],,,[#include <signal.h>]) +dnl Check for struct mtget members +AC_CHECK_MEMBERS([struct mtget.mt_blksiz, struct mtget.mt_gstat],,, +[#ifdef HAVE_SYS_MTIO_H +#include <sys/mtio.h> +#endif]) + dnl Check for struct option AC_CHECK_MEMBERS([struct option.name],,, [#ifdef HAVE_GETOPT_H diff --git a/dlls/ntdll/tape.c b/dlls/ntdll/tape.c index 41d4131..9a25ea8 100644 --- a/dlls/ntdll/tape.c +++ b/dlls/ntdll/tape.c @@ -177,7 +177,11 @@ static NTSTATUS TAPE_GetDriveParams( int data->Compression = FALSE; data->DataPadding = FALSE; data->ReportSetmarks = FALSE; +#ifdef HAVE_STRUCT_MTGET_MT_BLKSIZ + data->DefaultBlockSize = get.mt_blksiz; +#else data->DefaultBlockSize = get.mt_dsreg & MT_ST_BLKSIZE_MASK; +#endif data->MaximumBlockSize = data->DefaultBlockSize; data->MinimumBlockSize = data->DefaultBlockSize; data->MaximumPartitionCount = 1; @@ -208,9 +212,17 @@ static NTSTATUS TAPE_GetMediaParams( int data->Capacity.u.LowPart = 1024 * 1024 * 1024; data->Remaining.u.LowPart = 1024 * 1024 * 1024; +#ifdef HAVE_STRUCT_MTGET_MT_BLKSIZ + data->BlockSize = get.mt_blksiz; +#else data->BlockSize = get.mt_dsreg & MT_ST_BLKSIZE_MASK; +#endif data->PartitionCount = 1; +#ifdef HAVE_STRUCT_MTGET_GSTAT data->WriteProtected = GMT_WR_PROT(get.mt_gstat); +#else + data->WriteProtected = 0; +#endif return status; #else diff --git a/include/config.h.in b/include/config.h.in index 3a423cf..62942f7 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -614,6 +614,12 @@ /* Define to 1 if `msg_accrights' is member of `struct msghdr'. */ #undef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS +/* Define to 1 if `mt_blksiz' is member of `struct mtget'. */ +#undef HAVE_STRUCT_MTGET_MT_BLKSIZ + +/* Define to 1 if `mt_gstat' is member of `struct mtget'. */ +#undef HAVE_STRUCT_MTGET_MT_GSTAT + /* Define to 1 if `name' is member of `struct option'. */ #undef HAVE_STRUCT_OPTION_NAME

1 0

Robert Millan : Enable for GNU/kFreeBSD the same kernel-specific interface/parameter
by Alexandre Julliard Feb. 5, 2006

Feb. 5, 2006

Module: wine Branch: refs/heads/master Commit: 8800352477f93de6bf1a8571a564fddb1e6dc5bb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8800352477f93de6bf1a857… Author: Robert Millan <rmh(a)aybabtu.com> Date: Sun Feb 5 13:06:50 2006 +0100 Enable for GNU/kFreeBSD the same kernel-specific interface/parameter that is used with FreeBSD. --- configure | 2 +- configure.ac | 2 +- dlls/kernel/heap.c | 4 ++-- dlls/ntdll/directory.c | 4 ++-- dlls/ntdll/file.c | 2 +- dlls/ntdll/signal_i386.c | 8 ++++---- dlls/winsock/socket.c | 2 +- libs/wine/ldt.c | 4 ++-- libs/wine/mmap.c | 4 ++-- server/context_i386.c | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/configure b/configure index f4887d9..2d3080b 100755 --- a/configure +++ b/configure @@ -13019,7 +13019,7 @@ case $host_os in esac case $host_os in - linux*) + linux* | k*bsd*-gnu) case $host_cpu in *i[3456789]86*) WINE_BINARIES="wine-glibc wine-kthread wine-pthread wine-preloader" ;; diff --git a/configure.ac b/configure.ac index 310b2e3..f3e961e 100644 --- a/configure.ac +++ b/configure.ac @@ -1091,7 +1091,7 @@ case $host_os in esac case $host_os in - linux*) + linux* | k*bsd*-gnu) case $host_cpu in *i[[3456789]]86*) AC_SUBST(WINE_BINARIES,"wine-glibc wine-kthread wine-pthread wine-preloader") ;; *) AC_SUBST(WINE_BINARIES,"wine-glibc wine-kthread wine-pthread") ;; diff --git a/dlls/kernel/heap.c b/dlls/kernel/heap.c index 19d4b5b..3df7bbc 100644 --- a/dlls/kernel/heap.c +++ b/dlls/kernel/heap.c @@ -1138,7 +1138,7 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMO #ifdef linux FILE *f; #endif -#if defined(__FreeBSD__) || defined(__NetBSD__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) int *tmp; int size_sys; int mib[2] = { CTL_HW }; @@ -1209,7 +1209,7 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMO / (TotalPhysical / 100); } } -#elif defined(__FreeBSD__) || defined(__NetBSD__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) mib[1] = HW_PHYSMEM; sysctl(mib, 2, NULL, &size_sys, NULL, 0); tmp = malloc(size_sys * sizeof(int)); diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index b07174d..6b18d5f 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -288,7 +288,7 @@ static char *parse_mount_entries( FILE * } #endif -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) #include <fstab.h> static char *parse_mount_entries( FILE *f, dev_t dev, ino_t ino ) { @@ -391,7 +391,7 @@ static char *get_default_drive_device( c } RtlLeaveCriticalSection( &dir_section ); -#elif defined( __FreeBSD__ ) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__ ) char *device = NULL; int fd, res = -1; struct stat st; diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index b817283..2293800 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1594,7 +1594,7 @@ NTSTATUS FILE_GetDeviceInfo( int fd, FIL info->DeviceType = FILE_DEVICE_DISK_FILE_SYSTEM; break; } -#elif defined(__FreeBSD__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) struct statfs stfs; /* The proper way to do this in FreeBSD seems to be with the diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index d82c7bb..be5164d 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -204,7 +204,7 @@ typedef struct trapframe SIGCONTEXT; #endif /* bsdi */ -#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) +#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) typedef struct sigcontext SIGCONTEXT; @@ -328,7 +328,7 @@ typedef ucontext_t SIGCONTEXT; #endif /* __APPLE__ */ -#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) ||\ +#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) ||\ defined(__OpenBSD__) || defined(__EMX__) || defined(__CYGWIN__) #define EAX_sig(context) ((context)->sc_eax) @@ -358,7 +358,7 @@ typedef ucontext_t SIGCONTEXT; #define FAULT_ADDRESS ((void *)HANDLER_CONTEXT->cr2) #endif -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) #define EFL_sig(context) ((context)->sc_efl) /* FreeBSD, see i386/i386/traps.c::trap_pfault va->err kludge */ #define FAULT_ADDRESS ((void *)HANDLER_CONTEXT->sc_err) @@ -1366,7 +1366,7 @@ static int set_handler( int sig, int hav sigaddset( &sig_act.sa_mask, SIGUSR1 ); sigaddset( &sig_act.sa_mask, SIGUSR2 ); -#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) +#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) sig_act.sa_flags = SA_RESTART; #elif defined (__svr4__) || defined(_SCO_DS) || defined(__APPLE__) sig_act.sa_flags = SA_SIGINFO | SA_RESTART; diff --git a/dlls/winsock/socket.c b/dlls/winsock/socket.c index 6df1c4d..ea730b8 100644 --- a/dlls/winsock/socket.c +++ b/dlls/winsock/socket.c @@ -144,7 +144,7 @@ #endif -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) # define sipx_network sipx_addr.x_net # define sipx_node sipx_addr.x_host.c_host #endif /* __FreeBSD__ */ diff --git a/libs/wine/ldt.c b/libs/wine/ldt.c index ab277e1..6038c6f 100644 --- a/libs/wine/ldt.c +++ b/libs/wine/ldt.c @@ -109,7 +109,7 @@ static inline int set_thread_area( struc #endif #endif -#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) +#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) #include <machine/segments.h> extern int i386_get_ldt(int, union descriptor *, int); @@ -203,7 +203,7 @@ static int internal_set_entry( unsigned if ((ret = modify_ldt(0x11, &ldt_info, sizeof(ldt_info))) < 0) perror( "modify_ldt" ); } -#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) +#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) { LDT_ENTRY entry_copy = *entry; /* The kernel will only let us set LDTs with user priority level */ diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index 2e16073..3d25f26 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -199,7 +199,7 @@ void *wine_anon_mmap( void *start, size_ if (!(flags & MAP_FIXED)) { -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) /* Even FreeBSD 5.3 does not properly support NULL here. */ if( start == NULL ) start = (void *)0x110000; #endif @@ -283,7 +283,7 @@ void mmap_init(void) { struct reserved_area *area; struct list *ptr; -#if defined(__i386__) && !defined(__FreeBSD__) /* commented out until FreeBSD gets fixed */ +#if defined(__i386__) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) /* commented out until FreeBSD gets fixed */ char stack; char * const stack_ptr = &stack; char *user_space_limit = (char *)0x80000000; diff --git a/server/context_i386.c b/server/context_i386.c index 7f1bb44..52b33aa 100644 --- a/server/context_i386.c +++ b/server/context_i386.c @@ -340,7 +340,7 @@ static void set_thread_context_ptrace( s file_set_error(); } -#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__NetBSD__) #include <machine/reg.h> /* retrieve a thread context */

1 0

Kevin Koltzau : riched20: Separate stream state from editor state.
by Alexandre Julliard Feb. 5, 2006

Feb. 5, 2006

Module: wine Branch: refs/heads/master Commit: 58b308db6abc779e513d3cb0dc4eb27940cb8297 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=58b308db6abc779e513d3cb… Author: Kevin Koltzau <kevin(a)plop.org> Date: Sun Feb 5 13:05:45 2006 +0100 riched20: Separate stream state from editor state. Somewhat improves thread safety. --- dlls/riched20/editstr.h | 1 dlls/riched20/writer.c | 239 +++++++++++++++++++++++------------------------ 2 files changed, 118 insertions(+), 122 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=58b308db6abc779e513…

1 0

Kevin Koltzau : riched20: Add method to stream data based on a range.
by Alexandre Julliard Feb. 5, 2006

Feb. 5, 2006

Module: wine Branch: refs/heads/master Commit: 4d74e1dbfb912e9b93986c5ebdd368b097052ef4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4d74e1dbfb912e9b93986c5… Author: Kevin Koltzau <kevin(a)plop.org> Date: Sun Feb 5 13:05:06 2006 +0100 riched20: Add method to stream data based on a range. --- dlls/riched20/editor.h | 1 + dlls/riched20/writer.c | 26 ++++++++++++++++---------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index bd34166..ec8bd5b 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -241,4 +241,5 @@ extern HANDLE me_heap; extern void DoWrap(ME_TextEditor *editor); /* writer.c */ +LRESULT ME_StreamOutRange(ME_TextEditor *editor, DWORD dwFormat, int nStart, int nTo, EDITSTREAM *stream); LRESULT ME_StreamOut(ME_TextEditor *editor, DWORD dwFormat, EDITSTREAM *stream); diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 5e2cee5..125332d 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -810,18 +810,10 @@ ME_StreamOutText(ME_TextEditor *editor, LRESULT -ME_StreamOut(ME_TextEditor *editor, DWORD dwFormat, EDITSTREAM *stream) +ME_StreamOutRange(ME_TextEditor *editor, DWORD dwFormat, int nStart, int nTo, EDITSTREAM *stream) { - int nStart, nTo; - ME_StreamOutInit(editor, stream); - if (dwFormat & SFF_SELECTION) - ME_GetSelection(editor, &nStart, &nTo); - else { - nStart = 0; - nTo = -1; - } if (nTo == -1) { nTo = ME_GetTextLength(editor); @@ -830,7 +822,7 @@ ME_StreamOut(ME_TextEditor *editor, DWOR nTo++; } TRACE("from %d to %d\n", nStart, nTo); - + if (dwFormat & SF_RTF) ME_StreamOutRTF(editor, nStart, nTo - nStart, dwFormat); else if (dwFormat & SF_TEXT || dwFormat & SF_TEXTIZED) @@ -839,3 +831,17 @@ ME_StreamOut(ME_TextEditor *editor, DWOR ME_StreamOutFlush(editor); return ME_StreamOutFree(editor); } + +LRESULT +ME_StreamOut(ME_TextEditor *editor, DWORD dwFormat, EDITSTREAM *stream) +{ + int nStart, nTo; + + if (dwFormat & SFF_SELECTION) + ME_GetSelection(editor, &nStart, &nTo); + else { + nStart = 0; + nTo = -1; + } + return ME_StreamOutRange(editor, dwFormat, nStart, nTo, stream); +}

1 0

Kevin Koltzau : riched20: Don't use EM_STREAMOUT for copy/cut.
by Alexandre Julliard Feb. 5, 2006

Feb. 5, 2006

Module: wine Branch: refs/heads/master Commit: 374106d1367062acff2c41a77193ba50ff6b6de6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=374106d1367062acff2c41a… Author: Kevin Koltzau <kevin(a)plop.org> Date: Sun Feb 5 13:05:00 2006 +0100 riched20: Don't use EM_STREAMOUT for copy/cut. --- dlls/riched20/editor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index b9ce162..3274a41 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1668,7 +1668,7 @@ LRESULT WINAPI RichEditANSIWndProc(HWND gds.nLength = 0; es.dwCookie = (DWORD)&gds; es.pfnCallback = ME_AppendToHGLOBAL; - SendMessageW(hWnd, EM_STREAMOUT, SFF_SELECTION|SF_RTF, (LPARAM)&es); + ME_StreamOutRange(editor, SF_RTF, from, to, &es); GlobalReAlloc(gds.hData, gds.nLength+1, 0); SetClipboardData(CF_UNICODETEXT, hData);

1 0

Alexandre Julliard : server: Remove no longer used create_flags from get_startup_info request.
by Alexandre Julliard Feb. 5, 2006

Feb. 5, 2006

Module: wine Branch: refs/heads/master Commit: 2a36dd239cda38d3b059d17fe4ece437da1d7286 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2a36dd239cda38d3b059d17… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Feb 5 12:33:24 2006 +0100 server: Remove no longer used create_flags from get_startup_info request. --- dlls/kernel/process.c | 2 -- include/wine/server_protocol.h | 3 +-- server/process.c | 2 -- server/protocol.def | 1 - server/trace.c | 1 - 5 files changed, 1 insertions(+), 8 deletions(-) diff --git a/dlls/kernel/process.c b/dlls/kernel/process.c index 491ee6c..cba0bc1 100644 --- a/dlls/kernel/process.c +++ b/dlls/kernel/process.c @@ -65,7 +65,6 @@ static DWORD shutdown_flags = 0; static DWORD shutdown_priority = 0x280; static DWORD process_dword; -int main_create_flags = 0; HMODULE kernel32_handle = 0; const WCHAR *DIR_Windows = NULL; @@ -752,7 +751,6 @@ static BOOL init_user_process_params( RT if ((ret = !wine_server_call( req ))) { info_size = wine_server_reply_size( reply ); - main_create_flags = reply->create_flags; main_exe_file = reply->exe_file; hstdin = reply->hstdin; hstdout = reply->hstdout; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 1be70ae..513d7df 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -247,7 +247,6 @@ struct get_startup_info_request struct get_startup_info_reply { struct reply_header __header; - unsigned int create_flags; obj_handle_t exe_file; obj_handle_t hstdin; obj_handle_t hstdout; @@ -4345,6 +4344,6 @@ union generic_reply struct query_symlink_reply query_symlink_reply; }; -#define SERVER_PROTOCOL_VERSION 222 +#define SERVER_PROTOCOL_VERSION 223 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/process.c b/server/process.c index cdc0461..7771c59 100644 --- a/server/process.c +++ b/server/process.c @@ -946,8 +946,6 @@ DECL_HANDLER(get_startup_info) if (!info) return; - reply->create_flags = info->create_flags; - if (info->exe_file && !(reply->exe_file = alloc_handle( process, info->exe_file, GENERIC_READ, 0 ))) return; diff --git a/server/protocol.def b/server/protocol.def index 6df0784..87fe90d 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -243,7 +243,6 @@ struct security_descriptor /* Retrieve the new process startup info */ @REQ(get_startup_info) @REPLY - unsigned int create_flags; /* creation flags */ obj_handle_t exe_file; /* file handle for main exe */ obj_handle_t hstdin; /* handle for stdin */ obj_handle_t hstdout; /* handle for stdout */ diff --git a/server/trace.c b/server/trace.c index 7467b9e..8977813 100644 --- a/server/trace.c +++ b/server/trace.c @@ -624,7 +624,6 @@ static void dump_get_startup_info_reques static void dump_get_startup_info_reply( const struct get_startup_info_reply *req ) { - fprintf( stderr, " create_flags=%08x,", req->create_flags ); fprintf( stderr, " exe_file=%p,", req->exe_file ); fprintf( stderr, " hstdin=%p,", req->hstdin ); fprintf( stderr, " hstdout=%p,", req->hstdout );

1 0

Alexandre Julliard : kernel: Use a magic ConsoleHandle value instead of create flag to pass
by Alexandre Julliard Feb. 5, 2006

Feb. 5, 2006

Module: wine Branch: refs/heads/master Commit: 626669e1e3838b6ac40d22b0d61a73d5d953199e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=626669e1e3838b6ac40d22b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Feb 5 12:24:43 2006 +0100 kernel: Use a magic ConsoleHandle value instead of create flag to pass the CREATE_NEW_CONSOLE flag to the child. --- dlls/kernel/kernel_main.c | 16 ++++++---------- dlls/kernel/process.c | 1 + 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/kernel/kernel_main.c b/dlls/kernel/kernel_main.c index f5bf27c..a78439e 100644 --- a/dlls/kernel/kernel_main.c +++ b/dlls/kernel/kernel_main.c @@ -50,8 +50,6 @@ extern int __wine_set_signal_handler(unsigned, int (*)(unsigned)); -extern int main_create_flags; - static CRITICAL_SECTION ldt_section; static CRITICAL_SECTION_DEBUG critsect_debug = { @@ -142,19 +140,17 @@ static BOOL process_attach(void) /* finish the process initialisation for console bits, if needed */ __wine_set_signal_handler(SIGINT, CONSOLE_HandleCtrlC); - if (main_create_flags & CREATE_NEW_CONSOLE) + if (NtCurrentTeb()->Peb->ProcessParameters->ConsoleHandle == (HANDLE)1) /* FIXME */ { HMODULE mod = GetModuleHandleA(0); if (RtlImageNtHeader(mod)->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_CUI) AllocConsole(); } - else if (!(main_create_flags & DETACHED_PROCESS)) - { - /* 1/ shall inherit console + handles - * 2/ shall create std handles, if handles are not inherited - * TBD when not using wineserver handles for console handles - */ - } + /* else TODO for DETACHED_PROCESS: + * 1/ inherit console + handles + * 2/ create std handles, if handles are not inherited + * TBD when not using wineserver handles for console handles + */ /* Create 16-bit task */ LoadLibrary16( "krnl386.exe" ); diff --git a/dlls/kernel/process.c b/dlls/kernel/process.c index 1aa29a4..491ee6c 100644 --- a/dlls/kernel/process.c +++ b/dlls/kernel/process.c @@ -1426,6 +1426,7 @@ static RTL_USER_PROCESS_PARAMETERS *crea } if (flags & CREATE_NEW_PROCESS_GROUP) params->ConsoleFlags = 1; + if (flags & CREATE_NEW_CONSOLE) params->ConsoleHandle = (HANDLE)1; /* FIXME: cf. kernel_main.c */ params->hStdInput = startup->hStdInput; params->hStdOutput = startup->hStdOutput;

1 0