December 2010 - Wine-Commits

Luca Bennati : cryptui: Update Italian translation.
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: 74fd0a4eed0cf859525ceca1cb564b2bada08610 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74fd0a4eed0cf859525ceca1c… Author: Luca Bennati <lucak3(a)gmail.com> Date: Mon Sep 20 22:47:53 2010 +0200 cryptui: Update Italian translation. (cherry picked from commit b1beec24d908ad640839f420e969ccd85cfe62a7) --- dlls/cryptui/cryptui_It.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/cryptui/cryptui_It.rc b/dlls/cryptui/cryptui_It.rc index 81e23c6..6ad7a8c 100644 --- a/dlls/cryptui/cryptui_It.rc +++ b/dlls/cryptui/cryptui_It.rc @@ -58,8 +58,8 @@ STRINGTABLE DISCARDABLE IDS_FIELD_VALID_TO "Valido fino a" IDS_FIELD_SUBJECT "Soggetto" IDS_FIELD_PUBLIC_KEY "Chiave pubblica" - IDS_FIELD_PUBLIC_KEY_FORMAT "%s (%d bits)" - IDS_PROP_HASH "SHA1 hash" + IDS_FIELD_PUBLIC_KEY_FORMAT "%s (%d bit)" + IDS_PROP_HASH "Hash SHA1" IDS_PROP_ENHKEY_USAGE "Uso delle chiavi avanzate (proprietà)" IDS_PROP_FRIENDLY_NAME "Nome amichevole" IDS_PROP_DESCRIPTION "Descrizione" @@ -69,7 +69,7 @@ STRINGTABLE DISCARDABLE IDS_SELECT_STORE_TITLE "Seleziona il deposito certificati" IDS_SELECT_STORE "Prego selezionare il deposito certificati." IDS_IMPORT_WIZARD "Guida all'Importazione di Certificati" - IDS_IMPORT_TYPE_MISMATCH "Il file contiene oggetti che non match con i criteri dati. Selezionare un altro file." + IDS_IMPORT_TYPE_MISMATCH "Il file contiene oggetti che non corrisponde con i criteri dati. Selezionare un altro file." IDS_IMPORT_FILE_TITLE "File da importare" IDS_IMPORT_FILE_SUBTITLE "Specificare il file che vuoi importare." IDS_IMPORT_STORE_TITLE "Deposito certificati"

1 0

Amine Khaldi : shlwapi: Fix translations.
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: a5edcdd763f021d9cf6482c34344a1c3c2f73af5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5edcdd763f021d9cf6482c34… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Sun Aug 29 16:16:16 2010 +0100 shlwapi: Fix translations. (cherry picked from commit 1848ae8d3ad34c4aeb2fa9f6aa794216e9e7e3fc) --- dlls/shlwapi/shlwapi_Da.rc | 8 ++++---- dlls/shlwapi/shlwapi_De.rc | 8 ++++---- dlls/shlwapi/shlwapi_En.rc | 8 ++++---- dlls/shlwapi/shlwapi_Eo.rc | 8 ++++---- dlls/shlwapi/shlwapi_Es.rc | 8 ++++---- dlls/shlwapi/shlwapi_Fi.rc | 8 ++++---- dlls/shlwapi/shlwapi_Fr.rc | 8 ++++---- dlls/shlwapi/shlwapi_Hu.rc | 8 ++++---- dlls/shlwapi/shlwapi_It.rc | 8 ++++---- dlls/shlwapi/shlwapi_Ja.rc | 8 ++++---- dlls/shlwapi/shlwapi_Ko.rc | 8 ++++---- dlls/shlwapi/shlwapi_Lt.rc | 8 ++++---- dlls/shlwapi/shlwapi_Nl.rc | 8 ++++---- dlls/shlwapi/shlwapi_No.rc | 8 ++++---- dlls/shlwapi/shlwapi_Pl.rc | 8 ++++---- dlls/shlwapi/shlwapi_Pt.rc | 8 ++++---- dlls/shlwapi/shlwapi_Ro.rc | 8 ++++---- dlls/shlwapi/shlwapi_Ru.rc | 8 ++++---- dlls/shlwapi/shlwapi_Si.rc | 8 ++++---- dlls/shlwapi/shlwapi_Sk.rc | 8 ++++---- dlls/shlwapi/shlwapi_Sv.rc | 8 ++++---- dlls/shlwapi/shlwapi_Tr.rc | 8 ++++---- dlls/shlwapi/shlwapi_Uk.rc | 8 ++++---- dlls/shlwapi/shlwapi_Zh.rc | 16 ++++++++-------- 24 files changed, 100 insertions(+), 100 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a5edcdd763f021d9cf648…

1 0

Luca Bennati : cryptui: Update Italian translation.
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: 8c3bd1590c75e11d5b8c83e23179e2c6bdf54b73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c3bd1590c75e11d5b8c83e23… Author: Luca Bennati <lucak3(a)gmail.com> Date: Thu Sep 9 15:27:51 2010 +0200 cryptui: Update Italian translation. (cherry picked from commit 5e87eacb1426f2510b150842de032f11d609eb30) --- dlls/cryptui/cryptui_It.rc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/cryptui/cryptui_It.rc b/dlls/cryptui/cryptui_It.rc index 5046ee4..81e23c6 100644 --- a/dlls/cryptui/cryptui_It.rc +++ b/dlls/cryptui/cryptui_It.rc @@ -97,10 +97,10 @@ STRINGTABLE DISCARDABLE IDS_IMPORT_CONTENT_PFX "Scambio Informazioni Personali" IDS_IMPORT_CONTENT_STORE "Deposito Certificati" IDS_IMPORT_SUCCEEDED "Importazione riuscita." - IDS_IMPORT_FAILED "Imposrtazione fallita." + IDS_IMPORT_FAILED "Importazione fallita." IDS_WIZARD_TITLE_FONT "Arial" IDS_PURPOSE_ALL "<Tutti>" - IDS_PURPOSE_ADVANCED "<Advanced Purposes>" + IDS_PURPOSE_ADVANCED "<Ragioni speciali>" IDS_SUBJECT_COLUMN "Emesso per" IDS_ISSUER_COLUMN "Emesso da" IDS_EXPIRATION_COLUMN "Data di scadenza" @@ -154,7 +154,7 @@ STRINGTABLE DISCARDABLE IDS_EXPORT_FILE_SUBTITLE "Specifica il nome del file nel quale il contenuto sarà salvato." IDS_EXPORT_FILE_EXISTS "File specificato esistene. Vuoi sostituirlo?" IDS_EXPORT_FILTER_CERT "Binario DER-Encoded X.509 (*.cer)" - IDS_EXPORT_FILTER_BASE64_CERT "Base64-Encoded X.509 (*.cer)" + IDS_EXPORT_FILTER_BASE64_CERT "X.509 Base64-Encoded (*.cer)" IDS_EXPORT_FILTER_CRL "Lista di Revoca di Certificati (*.crl)" IDS_EXPORT_FILTER_CTL "Lista di Fiducia di Certificati (*.stl)" IDS_EXPORT_FILTER_CMS "Messaggi CMS/PKCS #7 (*.p7b)" @@ -422,9 +422,9 @@ CAPTION "Guida all'Esportazione del Certificato" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Seleziona il formato che vuoi usare:", -1, 21,1,195,10 - AUTORADIOBUTTON "&DER-encoded X.509 (.cer)", + AUTORADIOBUTTON "X.509 &DER-encoded (.cer)", IDC_EXPORT_FORMAT_DER, 31,18,240,12, BS_AUTORADIOBUTTON|WS_TABSTOP - AUTORADIOBUTTON "Ba&se64-encoded X.509 (.cer):", + AUTORADIOBUTTON "X.509 Ba&se64-encoded (.cer):", IDC_EXPORT_FORMAT_BASE64, 31,30,240,12, BS_AUTORADIOBUTTON AUTORADIOBUTTON "Messaggio &Crittografico con Sintassi Standard/Messaggio PKCS #7 (.p7b)", IDC_EXPORT_FORMAT_CMS, 31,42,240,12, BS_AUTORADIOBUTTON

1 0

Anders Jonsson : winmm: Fix typo in English, Slovak resources.
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: 961e3d95de1cf67bf5c5c68a6f4143277656638d URL: http://source.winehq.org/git/wine.git/?a=commit;h=961e3d95de1cf67bf5c5c68a6… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Tue Aug 3 08:25:48 2010 +0200 winmm: Fix typo in English, Slovak resources. (cherry picked from commit 2ebe732453a6477dd8e5fcc209b297c7e2cf5b67) --- dlls/winmm/winmm_En.rc | 2 +- dlls/winmm/winmm_Sk.rc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/winmm_En.rc b/dlls/winmm/winmm_En.rc index 1a945d8..f7e80ea 100644 --- a/dlls/winmm/winmm_En.rc +++ b/dlls/winmm/winmm_En.rc @@ -119,7 +119,7 @@ MCIERR_FILE_READ, "Cannot read the specified file. Make sure the file is still MCIERR_FILE_WRITE, "Cannot write to the specified file. Make sure you have enough disk space or are still connected to the network." MCIERR_SEQ_DIV_INCOMPATIBLE, "The time formats of the ""song pointer"" and SMPTE are mutually exclusive. You can't use them together." MCIERR_SEQ_NOMIDIPRESENT, "The system has no installed MIDI devices. Use the Drivers option from the Control Panel to install a MIDI driver." -MCIERR_SEQ_PORT_INUSE, "The specified MIDI port is already in use. Wait until it is free; the try again." +MCIERR_SEQ_PORT_INUSE, "The specified MIDI port is already in use. Wait until it is free; then try again." MCIERR_SEQ_PORT_MAPNODEVICE, "The current MIDI Mapper setup refers to a MIDI device that is not installed on the system. Use the MIDI Mapper option from the Control Panel to edit the setup." MCIERR_SEQ_PORT_MISCERROR, "An error occurred with the specified port." MCIERR_SEQ_PORT_NONEXISTENT, "The specified MIDI device is not installed on the system. Use the Drivers option from the Control Panel to install a MIDI device." diff --git a/dlls/winmm/winmm_Sk.rc b/dlls/winmm/winmm_Sk.rc index d9345ec..0a1ded0 100644 --- a/dlls/winmm/winmm_Sk.rc +++ b/dlls/winmm/winmm_Sk.rc @@ -119,7 +119,7 @@ MCIERR_FILE_READ, "Cannot read the specified file. Make sure the file is still MCIERR_FILE_WRITE, "Cannot write to the specified file. Make sure you have enough disk space or are still connected to the network." MCIERR_SEQ_DIV_INCOMPATIBLE, "The time formats of the ""song pointer"" and SMPTE are mutually exclusive. You can't use them together." MCIERR_SEQ_NOMIDIPRESENT, "The system has no installed MIDI devices. Use the Drivers option from the Control Panel to install a MIDI driver." -MCIERR_SEQ_PORT_INUSE, "The specified MIDI port is already in use. Wait until it is free; the try again." +MCIERR_SEQ_PORT_INUSE, "The specified MIDI port is already in use. Wait until it is free; then try again." MCIERR_SEQ_PORT_MAPNODEVICE, "The current MIDI Mapper setup refers to a MIDI device that is not installed on the system. Use the MIDI Mapper option from the Control Panel to edit the setup." MCIERR_SEQ_PORT_MISCERROR, "An error occurred with the specified port." MCIERR_SEQ_PORT_NONEXISTENT, "The specified MIDI device is not installed on the system. Use the Drivers option from the Control Panel to install a MIDI device."

1 0

Hwang YunSong : winmm: Update Korean resource.
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: 4ae9246b76129eac067f0e100ad4805105c1e5e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ae9246b76129eac067f0e100… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Aug 9 11:15:01 2010 +0900 winmm: Update Korean resource. (cherry picked from commit c625e95af15222a002fb69b8051b02e7e7196d71) --- dlls/winmm/winmm_Ko.rc | 194 ++++++++++++++++++++++++------------------------ 1 files changed, 98 insertions(+), 96 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4ae9246b76129eac067f0…

1 0

Hwang YunSong : shlwapi: Update Korean resource.
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: 5166967232d5a0590dd6cb2364d1393cc8277508 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5166967232d5a0590dd6cb236… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Wed Sep 1 17:40:05 2010 +0900 shlwapi: Update Korean resource. (cherry picked from commit 4069da56249dc546861d8a7a20dfbeafa4188d58) --- dlls/shlwapi/shlwapi_Ko.rc | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/shlwapi/shlwapi_Ko.rc b/dlls/shlwapi/shlwapi_Ko.rc index 1e618e3..3269a0c 100644 --- a/dlls/shlwapi/shlwapi_Ko.rc +++ b/dlls/shlwapi/shlwapi_Ko.rc @@ -20,27 +20,29 @@ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "��!" +CAPTION "에러!" FONT 9, "MS Shell Dlg" { LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 - CHECKBOX "�� ޼�� ٽô� �� ÿ�(&I)", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Ȯ��(&O)", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "��(&C)", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "��(&Y)", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "�ƴϿ�(&N)", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + CHECKBOX "이 메세지를 다시는 보여주지 마십시시오(&I)", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "확인(&O)", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "취소(&C)", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "예(&Y)", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "아니오(&N)", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } STRINGTABLE DISCARDABLE { - IDS_BYTES_FORMAT "%ld ��Ʈ" - IDS_TIME_INTERVAL_HOURS "��" - IDS_TIME_INTERVAL_MINUTES " ��" - IDS_TIME_INTERVAL_SECONDS " ��" + IDS_BYTES_FORMAT "%ld 바이트" + IDS_TIME_INTERVAL_HOURS "시" + IDS_TIME_INTERVAL_MINUTES " 분" + IDS_TIME_INTERVAL_SECONDS " 초" }

1 0

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

Dec. 2, 2010

Module: wine Branch: stable Commit: 491704bab2435c7f3ac6ef6948a7d5720a264b38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=491704bab2435c7f3ac6ef694… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 25 08:18:03 2010 -0800 wineconsole: Add a manpage. (cherry picked from commit c43c31fe47078360beda03550344cdf2320ee312) --- .gitignore | 1 + programs/wineconsole/Makefile.in | 12 ++++++++++++ programs/wineconsole/wineconsole.man.in | 15 +++++++++++++++ 3 files changed, 28 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index a37de8a..81f0e48 100644 --- a/.gitignore +++ b/.gitignore @@ -256,6 +256,7 @@ programs/services/svcctl.h programs/services/svcctl_s.c programs/wineboot/wineboot.man programs/winecfg/winecfg.man +programs/wineconsole/wineconsole.man programs/winedbg/dbg.tab.c programs/winedbg/dbg.tab.h programs/winedbg/debug.yy.c diff --git a/programs/wineconsole/Makefile.in b/programs/wineconsole/Makefile.in index 88ecadd..c462e19 100644 --- a/programs/wineconsole/Makefile.in +++ b/programs/wineconsole/Makefile.in @@ -39,4 +39,16 @@ RC_SRCS = \ wineconsole_Uk.rc \ wineconsole_Zh.rc +MANPAGES = wineconsole.man + @MAKE_PROG_RULES@ + +all: $(MANPAGES) + +install-man-pages:: $(MANPAGES) $(DESTDIR)$(mandir)/man$(prog_manext) + $(INSTALL_DATA) wineconsole.man $(DESTDIR)$(mandir)/man$(prog_manext)/wineconsole.$(prog_manext) + +(a)WOW64_DISABLE@ install install-lib:: install-man-pages + +uninstall:: + $(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/wineconsole.$(prog_manext) diff --git a/programs/wineconsole/wineconsole.man.in b/programs/wineconsole/wineconsole.man.in new file mode 100644 index 0000000..8ae52fa --- /dev/null +++ b/programs/wineconsole/wineconsole.man.in @@ -0,0 +1,15 @@ +.TH WINECONSOLE 1 "November 2010" "@PACKAGE_STRING@" "Wine Programs" +.SH NAME +wineconsole \- The Wine console +.SH SYNOPSIS +.BR "wineconsole "\fI[option]\fR " command +.SH DESCRIPTION +.B wineconsole +is the Wine console manager, used to run console commands and applications. It allows running the +console either in the current terminal (\fIcurses\fR) or in a newly made window (\fIuser\fR). +.SH "OPTIONS" +.IP \-\-backend=\fR{\fIuser\fR|\fIcurses\fR} +If \fIuser\fR is chosen, a new window will be created for the console. The \fIcurses\fR option will make +wineconsole try to setup the current terminal as a Wine console. +.SH "SEE ALSO" +.BR wine(1)

1 0

Austin English : winegcc: Symlink winegcc manpage to winecpp.
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: 7f61c5827acb850ae998bdee75ab2edccdb7a619 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f61c5827acb850ae998bdee7… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 25 11:00:47 2010 -0800 winegcc: Symlink winegcc manpage to winecpp. (cherry picked from commit 50e2f2f10c1c7bc15455fb1315db1d96238f5650) --- tools/winegcc/Makefile.in | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/winegcc/Makefile.in b/tools/winegcc/Makefile.in index 986d17b..8b9250e 100644 --- a/tools/winegcc/Makefile.in +++ b/tools/winegcc/Makefile.in @@ -45,7 +45,9 @@ install install-dev:: $(PROGRAMS) $(MANPAGES) $(INSTALLDIRS) cd $(DESTDIR)$(bindir) && $(RM) winecpp$(EXEEXT) && $(LN_S) winegcc$(EXEEXT) winecpp$(EXEEXT) $(INSTALL_DATA) winegcc.man $(DESTDIR)$(mandir)/man$(prog_manext)/winegcc.$(prog_manext) cd $(DESTDIR)$(mandir)/man$(prog_manext) && $(RM) wineg++.$(prog_manext) && $(LN_S) winegcc.$(prog_manext) wineg++.$(prog_manext) + cd $(DESTDIR)$(mandir)/man$(prog_manext) && $(RM) winecpp.$(prog_manext) && $(LN_S) winegcc.$(prog_manext) winecpp.$(prog_manext) uninstall:: $(RM) $(DESTDIR)$(bindir)/winegcc$(EXEEXT) $(DESTDIR)$(bindir)/wineg++$(EXEEXT) $(DESTDIR)$(bindir)/winecpp$(EXEEXT) \ - $(DESTDIR)$(mandir)/man$(prog_manext)/winegcc.$(prog_manext) $(DESTDIR)$(mandir)/man$(prog_manext)/wineg++.$(prog_manext) + $(DESTDIR)$(mandir)/man$(prog_manext)/winegcc.$(prog_manext) $(DESTDIR)$(mandir)/man$(prog_manext)/wineg++.$(prog_manext) \ + $(DESTDIR)$(mandir)/man$(prog_manext)/winecpp.$(prog_manext)

1 0

Francois Gouget : configure: Load wine lower in memory on FreeBSD to leave more space for mmap() and malloc().
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: 365000ce5c158c758c4ff8cbcd3060f20fa1733b URL: http://source.winehq.org/git/wine.git/?a=commit;h=365000ce5c158c758c4ff8cbc… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 26 16:18:32 2010 +0100 configure: Load wine lower in memory on FreeBSD to leave more space for mmap() and malloc(). If not provided an explicit address, FreeBSD won't mmap any memory below the executable. In particularly this means any memory below that is unavailable to dlopen() and malloc(). This fixes the bug where large WineLib binaries, in particular winetest, failed to load because there was not enough space left for them and the native libraries they linked to. The drawback is that we can no longer load very large Windows executables (between about 1.5 and 2 GB). (cherry picked from commit 5f694ddf4c211c1c167a15541c2654175ce42a62) --- configure | 6 +++++- configure.ac | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/configure b/configure index db44d4d..0ac4902 100755 --- a/configure +++ b/configure @@ -6922,7 +6922,11 @@ eval ac_res=\$$as_ac_var { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } if test `eval 'as_val=${'$as_ac_var'};$as_echo "$as_val"'` = yes; then : - LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x7bf00400" + case $host_os in + freebsd*) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x60000400" ;; + *) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x7bf00400" ;; + esac + fi ;; esac diff --git a/configure.ac b/configure.ac index 8181c4d..3372e87 100644 --- a/configure.ac +++ b/configure.ac @@ -792,7 +792,11 @@ case $host_os in case $host_cpu in *i[[3456789]]86* | x86_64) WINE_TRY_CFLAGS([-Wl,--section-start,.interp=0x7bf00400], - [LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x7bf00400"]) + [case $host_os in + freebsd*) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x60000400" ;; + *) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x7bf00400" ;; + esac + ]) ;; esac

1 0

Hans Leidekker : ntdll: Add a stub implementation of FSCTL_GET_RETRIEVAL_POINTERS.
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: f668954529f076ca55f3f01e6665de54880a285f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f668954529f076ca55f3f01e6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Sat Nov 20 15:48:02 2010 +0100 ntdll: Add a stub implementation of FSCTL_GET_RETRIEVAL_POINTERS. (cherry picked from commit 63c19ab495ae31b83ad5d86a8fe9e54a09735c29) --- dlls/ntdll/file.c | 22 ++++++++++++++++++++++ include/winioctl.h | 9 +++++++++ 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 0a6ee55..b09383f 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1495,6 +1495,28 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc status = STATUS_SUCCESS; break; + case FSCTL_GET_RETRIEVAL_POINTERS: + { + RETRIEVAL_POINTERS_BUFFER *buffer = (RETRIEVAL_POINTERS_BUFFER *)out_buffer; + + FIXME("stub: FSCTL_GET_RETRIEVAL_POINTERS\n"); + + if (out_size >= sizeof(RETRIEVAL_POINTERS_BUFFER)) + { + buffer->ExtentCount = 1; + buffer->StartingVcn.QuadPart = 1; + buffer->Extents[0].NextVcn.QuadPart = 0; + buffer->Extents[0].Lcn.QuadPart = 0; + io->Information = sizeof(RETRIEVAL_POINTERS_BUFFER); + status = STATUS_SUCCESS; + } + else + { + io->Information = 0; + status = STATUS_BUFFER_TOO_SMALL; + } + break; + } case FSCTL_PIPE_LISTEN: case FSCTL_PIPE_WAIT: default: diff --git a/include/winioctl.h b/include/winioctl.h index 8765cdf..d1c3376 100644 --- a/include/winioctl.h +++ b/include/winioctl.h @@ -376,6 +376,15 @@ typedef struct _VOLUME_DISK_EXTENTS { DISK_EXTENT Extents[1]; } VOLUME_DISK_EXTENTS; +typedef struct RETRIEVAL_POINTERS_BUFFER { + DWORD ExtentCount; + LARGE_INTEGER StartingVcn; + struct { + LARGE_INTEGER NextVcn; + LARGE_INTEGER Lcn; + } Extents[1]; +} RETRIEVAL_POINTERS_BUFFER, *PRETRIEVAL_POINTERS_BUFFER; + /* End: _WIN32_WINNT >= 0x0400 */ /*

1 0