wine-commits December 2010

wine-commits@winehq.org

2 participants
1099 discussions

Hwang YunSong : shlwapi: Update Korean resource.
by Alexandre Julliard 02 Dec '10

02 Dec '10

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

Amine Khaldi : shlwapi: Fix translations.
by Alexandre Julliard 02 Dec '10

02 Dec '10

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

Anders Jonsson : winmm: Add Swedish translation.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: stable Commit: 712df95dac1924ea8266c55ed1464dc1c83a0110 URL: http://source.winehq.org/git/wine.git/?a=commit;h=712df95dac1924ea8266c55ed… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Thu Aug 26 23:07:19 2010 +0200 winmm: Add Swedish translation. (cherry picked from commit 8ecf937c10cd6de49a6df046fdad9e48f56103e4) --- dlls/winmm/Makefile.in | 1 + dlls/winmm/winmm_Sv.rc | 133 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 134 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=712df95dac1924ea8266c…

1 0

Amine Khaldi : mpr: Fix translations.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: stable Commit: 54dc9a63e3cf96786ab9c8c8390630c33260c6b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54dc9a63e3cf96786ab9c8c83… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Thu Aug 26 18:14:19 2010 +0100 mpr: Fix translations. (cherry picked from commit 59296b7f0c4006edd2c41b181ea6ec03250402ce) --- dlls/mpr/mpr_Cs.rc | 4 ++-- dlls/mpr/mpr_Da.rc | 4 ++-- dlls/mpr/mpr_De.rc | 4 ++-- dlls/mpr/mpr_En.rc | 4 ++-- dlls/mpr/mpr_Eo.rc | 4 ++-- dlls/mpr/mpr_Es.rc | 4 ++-- dlls/mpr/mpr_Fr.rc | 4 ++-- dlls/mpr/mpr_Hu.rc | 4 ++-- dlls/mpr/mpr_It.rc | 4 ++-- dlls/mpr/mpr_Ja.rc | 4 ++-- dlls/mpr/mpr_Ko.rc | 4 ++-- dlls/mpr/mpr_Lt.rc | 4 ++-- dlls/mpr/mpr_Nl.rc | 4 ++-- dlls/mpr/mpr_No.rc | 4 ++-- dlls/mpr/mpr_Pl.rc | 4 ++-- dlls/mpr/mpr_Pt.rc | 4 ++-- dlls/mpr/mpr_Ro.rc | 4 ++-- dlls/mpr/mpr_Ru.rc | 4 ++-- dlls/mpr/mpr_Si.rc | 4 ++-- dlls/mpr/mpr_Sv.rc | 4 ++-- dlls/mpr/mpr_Tr.rc | 4 ++-- dlls/mpr/mpr_Uk.rc | 4 ++-- dlls/mpr/mpr_Zh.rc | 8 ++++---- 23 files changed, 48 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=54dc9a63e3cf96786ab9c…

1 0

Hwang YunSong : winmm: Update Korean resource.
by Alexandre Julliard 02 Dec '10

02 Dec '10

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

Anders Jonsson : winmm: Fix typo in English, Slovak resources.
by Alexandre Julliard 02 Dec '10

02 Dec '10

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

Anders Jonsson : cryptui: Fix typos in English resources.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: stable Commit: 05c277e3e15dd265827b2ff722fffcbfde4713ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=05c277e3e15dd265827b2ff72… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Tue Aug 3 08:24:12 2010 +0200 cryptui: Fix typos in English resources. (cherry picked from commit e8994599dcebb948d5c219bf7dda13546e70a0dc) --- dlls/cryptui/cryptui_En.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index 527ffa5..11ffa03 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -118,10 +118,10 @@ STRINGTABLE DISCARDABLE IDS_WARN_REMOVE_PLURAL_DEFAULT "Are you sure you want to remove these certificates?" IDS_CERT_MGR "Certificates" IDS_FRIENDLY_NAME_NONE "<None>" - IDS_PURPOSE_SERVER_AUTH "Ensures the identify of a remote computer" + IDS_PURPOSE_SERVER_AUTH "Ensures the identity of a remote computer" IDS_PURPOSE_CLIENT_AUTH "Proves your identity to a remote computer" IDS_PURPOSE_CODE_SIGNING "Ensures software came from software publisher\nProtects software from alteration after publication" - IDS_PURPOSE_EMAIL_PROTECTION "Protects e-mail messges" + IDS_PURPOSE_EMAIL_PROTECTION "Protects e-mail messages" IDS_PURPOSE_IPSEC "Allows secure communication over the Internet" IDS_PURPOSE_TIMESTAMP_SIGNING "Allows data to be signed with the current time" IDS_PURPOSE_CTL_USAGE_SIGNING "Allows you to digitally sign a certificate trust list"

1 0

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

02 Dec '10

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

André Hentschel : widl: Fix for typelib generation when unaligned access to memory is not allowed.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: stable Commit: 9a0f3b8e4fe8bd001a49ff91f6b1f6290344b8c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a0f3b8e4fe8bd001a49ff91f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Nov 13 21:42:34 2010 +0100 widl: Fix for typelib generation when unaligned access to memory is not allowed. (cherry picked from commit d4dc2a3a4f08c2c725ddf4203ecf6618b4e3fa19) --- tools/widl/write_msft.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 1ac34d0..95d7374 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1208,7 +1208,7 @@ static void write_value(msft_typelib_t* typelib, int *out, int vt, const void *v int len = strlen(s), seg_len = (len + 6 + 3) & ~0x3; int offset = ctl2_alloc_segment(typelib, MSFT_SEG_CUSTDATA, seg_len, 0); *((unsigned short *)&typelib->typelib_segment_data[MSFT_SEG_CUSTDATA][offset]) = vt; - *((unsigned int *)&typelib->typelib_segment_data[MSFT_SEG_CUSTDATA][offset+2]) = len; + memcpy(&typelib->typelib_segment_data[MSFT_SEG_CUSTDATA][offset+2], &len, sizeof(len)); memcpy(&typelib->typelib_segment_data[MSFT_SEG_CUSTDATA][offset+6], value, len); len += 6; while(len < seg_len) {

1 0

Hans Leidekker : ntdll: Add a stub implementation of FSCTL_GET_RETRIEVAL_POINTERS.
by Alexandre Julliard 02 Dec '10

02 Dec '10

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2010