wine-devel December 2014

wine-devel@winehq.org

51 participants
126 discussions

Re: kernel32: Implement Get{Time,Date}FormatEx
by Nikolay Sivov 04 Jan '15

04 Jan '15

On 30.12.2014 2:06, Sean Burke wrote: > Provides an implementation of time and date format functions added in > Vista sufficient to allow some basic applications requiring them to run. > Includes necessary tests and header defs. > > > Sean Burke > > > Hi, Sean. As you can see tests are failing on win2000 and winxp because these calls are not available on these platforms. You should use GetProcAddress() to fix that. > +@ stdcall GetDateFormatEx(ptr long ptr wstr ptr long ptr) First argument should be 'wstr' as well. > +@ stdcall GetTimeFormatEx(ptr long ptr wstr ptr long) Same. > +INT WINAPI GetDateFormatEx(LPCWSTR lpLocaleName, DWORD dwFlags, > + const SYSTEMTIME* lpDate, LPCWSTR lpFormat, > + LPWSTR lpDateStr, INT cchDate, LPCWSTR lpCalendar) Please use cleaner argument names, like 'localename', 'flags', 'date', 'format', etc. So lowercase, no prefix. > + lcid = LocaleNameToLCID(lpLocaleName, 0); > + > + return NLS_GetDateTimeFormatW(lcid, dwFlags | DATE_DATEVARSONLY, lpDate, > + lpFormat, lpDateStr, cchDate); No real need for temporary 'lcid' variable.

2 2

Re: secur32: Add support for ECDHE algorithms using gnutls
by Jacek Caban 04 Jan '15

04 Jan '15

Hi Sean, On 12/30/14 00:08, Sean Burke wrote: > diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c > index 638b3c5..810c598 100644 > --- a/dlls/secur32/schannel_gnutls.c > +++ b/dlls/secur32/schannel_gnutls.c > @@ -328,6 +328,8 @@ static ALG_ID schannel_get_kx_algid(gnutls_kx_algorithm_t kx) > switch (kx) > { > case GNUTLS_KX_RSA: return CALG_RSA_KEYX; > + case GNUTLS_KX_ECDHE_ECDSA: Shouldn't this case use CALG_ECDSA? > + case GNUTLS_KX_ECDHE_RSA: return CALG_ECDH; > case GNUTLS_KX_DHE_DSS: > case GNUTLS_KX_DHE_RSA: return CALG_DH_EPHEM; > default: Cheers, Jacek

2 1

Re: [PATCH] winealsa: support up to 6 channels
by Chris Robinson 02 Jan '15

02 Jan '15

On 12/31/2014 01:34 PM, Mark Harmstone wrote: > Needed for surround sound. ALSA uses a different channel mapping for 5.1 than Windows. Windows wants: front-left, front-right, front-center, lfe, back-left*, back-right* while ALSA wants: front-left, front-right, back-left*, back-right*, front-center, lfe So you can't just pass the samples through without swapping them. * This is complicated by the fact that some 5.1 setups use the side channels instead of the back channels, and with the side channels the mappings are the same for both: front-left, front-right, front-center, lfe, side-left, side-right Technically 5.1 is supposed to use the side channels according to Dolby, but until recently Windows has used back and many speakers are color-coded to match the surround speakers to the back speaker jacks. The newer enumerant DSSPEAKER_5POINT1_SURROUND indicates it's using side channels, while the older DSSPEAKER_5POINT1 (aka DSSPEAKER_5POINT1_BACK) indicates the back channels.

2 1

Re: po: Update Portuguese translation
by Bruno Jesus 31 Dec '14

31 Dec '14

On Wed, Mar 5, 2014 at 9:48 PM, Bruno Jesus <00cpxxx(a)gmail.com> wrote: > Sorry, the subtitle is wrong. Please prefer the update version.

1 1

Unicode Support in wine-devel
by 中川祥 31 Dec '14

31 Dec '14

This mailing list does not support any chinise and japanese character, so we cannot help feeling discriminated.

2 1

FOSDEM 2015
by Stefan Dösinger 31 Dec '14

31 Dec '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, I've been asked by the gallium nine devs and a developer of one of the proprietary drivers if any one of us will be at FOSDEM in a month. Since we won't have a full-blown Wine room I'm wondering if the Wine Party Fund has enough resources to send myself (and/or Henri and Matteo if they're interested) to FOSDEM. My main agenda is to sit in the Xorg room for smalltalk. If there's interest on part of the Xorg developers I can give an updated performance talk like the last two years. If anyone is planning a Wine table I can help out with it, or talk to other upstream projects if anyone else here has any errands to take care of. Cheers, Stefan -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJUoQCDAAoJEN0/YqbEcdMwiT0QAIGfxFvIiTwt3QeRaMiIc/07 AMnQ7/xCIj63hYUzAcR8Z0wzfGG1JH/nQmhu+tkNhCU4XMj8nZt0nD6YC/GGOytU 6mOFpbF902sbW4mtT18w0ZTIsZhU9rl6sufsPQiNnNRZGP61bo432NwYYlO29EKh n/rUO8WESxSzQjN73bF14J1r5d0GGB8q9cakkqi5zfQhOgBJHT3wijfumR/6wJI/ Xkccdzn4on0yaDLmnWQgpwu+kwDaZ5a48J48BlwFXi6zGoUmY/wIJPcdB9mwXm42 +k6lBmPyv5iPCbiMje6lvZajKdayKSc4MNyuURwrl3nBdtuXIFpQwrtJsjjILm3B CwL660h8yTbuFaGJQTY7fKyy8YxDGDnKKscrWzTyyFGe75I6eo4w1iMIsAy9dF9Q VP9J4+j2NYMozzxxB8nhrjvN7Cf67hKtvhJepeGDG6/JIMLR+ryksFhvMRNlDpjq 5gJOdWBqJJO/ODdzlhaUuqKfTyDGciwO6mljzyuWcnOA4eEd6fMVLkOpkvBvzQCc fGiV7nMjUi0aSkoctjgh7UNHFfqSbAnNfVum5h+iEYP/wdch2HBiZX5jbbjn3XzX ktkzcGN+Av+yfkB1AfNAWcSyaEGthzeEONtxduvoEgKH640tU2PhLOWLoyKNNaS2 xkRhiL5U4QV0cF7pFhSm =//r+ -----END PGP SIGNATURE-----

4 4

Re: [PATCH] msvcr120: Fixed a race condition in Concurrency::critical_section.
by Piotr Caban 31 Dec '14

31 Dec '14

On 12/31/14 00:45, Yifu Wang wrote: > @@ -380,11 +393,18 @@ void __thiscall critical_section_lock(critical_section *this) > memset(&q, 0, sizeof(q)); > last = InterlockedExchangePointer(&this->tail, &q); > if(last) { > + /* If last == &this->unk_active, the current thread might be racing setting > + * unk_active.next with another thread calling cs_set_head(). If the current > + * thread sets unk_active.next first, the data structure would be left in an > + * inconsistent state and causes hang. Spin waiting until unk_active.next > + * becomes NULL solves the race condition. > + */ > + if(last == &this->unk_active) > + spin_wait_for_next_null(&this->unk_active); > last->next = &q; > NtWaitForKeyedEvent(keyed_event, &q, 0, NULL); > } > > - this->unk_active.next = NULL; > if(InterlockedCompareExchangePointer(&this->tail, &this->unk_active, &q) != &q) > spin_wait_for_next_cs(&q); > cs_set_head(this, &q); There's still a race with your patch. There's no guarantee that this->unk_active.next != NULL before cs_set_head(this, &q) is called. Changing the place where cs_set_head is called should fix the issue in cleaner way: diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index 328b5b5..e2ebef3 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -384,10 +397,11 @@ void __thiscall critical_section_lock(critical_section *this) NtWaitForKeyedEvent(keyed_event, &q, 0, NULL); } - this->unk_active.next = NULL; - if(InterlockedCompareExchangePointer(&this->tail, &this->unk_active, &q) != &q) - spin_wait_for_next_cs(&q); cs_set_head(this, &q); + if(InterlockedCompareExchangePointer(&this->tail, &this->unk_active, &q) != &q) { + spin_wait_for_next_cs(&q); + this->unk_active.next = q.next; + } } /* ?try_lock@critical_section@Concurrency@@QAE_NXZ */ There's also similar race in critical_section_try_lock and critical_section_try_lock_for function. Could you please also fix it there? Thank you, Piotr

1 0

Re: wininet: Handle CERT_TRUST_IS_NOT_SIGNATURE_VALID in netconn_verify_cert()
by 中川祥 31 Dec '14

31 Dec '14

Yes.it will fix, but the function is not implemented yet,too. On 2014年12月31日(水) PM2:47 Bruno Jesus <00cpxxx(a)gmail.com> wrote: > The application hits a CERT_TRUST_IS_NOT_SIGNATURE_VALID, and only > passes the flag SECURITY_FLAG_IGNORE_UNKNOWN_CA. Currently wine is not > able to ignore this error and aborts. > > This is an extension to the work added by commit > http://source.winehq.org/git/wine.git/commitdiff/ > e2a9511b30e5b68eb328c08ffecf56dcc91bce0b > > Fixes https://bugs.winehq.org/show_bug.cgi?id=36785 > >

1 0

Re: 答复: zh_CN Translation Submittion
by Jactry Zeng 30 Dec '14

30 Dec '14

Hi Jeff, Thanks for your work! Most of them look good to me. I would like to discuss these cases with you guys :) : 1. #: crypt32.rc:30 msgid "Authority Key Identifier" -msgstr "" +msgstr "权限键值辨识" #: crypt32.rc:31 msgid "Key Attributes" -msgstr "" +msgstr "键值属性" #: crypt32.rc:32 msgid "Key Usage Restriction" -msgstr "" +msgstr "键值使用限制" #: crypt32.rc:36 msgid "Key Usage" -msgstr "" +msgstr "键值使用" #: crypt32.rc:38 msgid "Subject Key Identifier" -msgstr "" +msgstr "对象键值辨识" #: crypt32.rc:41 msgid "Enhanced Key Usage" -msgstr "" +msgstr "高级键值使用" I'm not sure is 'key' here same as 'key'(秘钥) in 'Public Key', or 'key value'(键) in Registry. 2. #: crypt32.rc:52 msgid "Challenge Password" -msgstr "" +msgstr "Challenge Password" Don't modify it if you didn't translate it. 3. #: crypt32.rc:54 msgid "S/MIME Capabilities" -msgstr "" +msgstr "S/MIME 能力" Maybe '功能' is better than '能力' ? 4. #: crypt32.rc:57 cryptdlg.rc:35 msgid "User Notice" -msgstr "" +msgstr "用户告示" I'll prefer '用户通知' here. ;) 5. #: crypt32.rc:72 msgid "Organization" -msgstr "" +msgstr "阻止" Typo. 6. #: crypt32.rc:74 msgid "Common Name" -msgstr "" +msgstr "统称" Do you think '常用名' will be more proper? 7. #: crypt32.rc:91 msgid "Enrollment CSP" -msgstr "" +msgstr "招入 CSP" I prefer '注册' which you did in line 381. 8. #: crypt32.rc:93 msgid "Delta CRL Indicator" -msgstr "" +msgstr "增量 CRL 指示器" '指示器' or '指示符', which will be better? I'm not sure, but you can find some documents with 'CRL 指示符' with Google. 9. #: crypt32.rc:104 msgid "CMC Response" -msgstr "" +msgstr "CMC 回应" I'll prefer 'CMC 响应'. 10. #: crypt32.rc:193 msgid "Unknown Key Usage" -msgstr "" +msgstr "未知密钥使用" What about '未知密钥用法'? 11. #: cryptui.rc:192 msgid "Issuer &Statement" -msgstr "" +msgstr "颁发者陈述 (&S)" One more unnecessary space after '述'? 12. #: cryptui.rc:408 msgid "&DER-encoded X.509 (*.cer)" -msgstr "" +msgstr "&DER 编码的 X.509 (*.cer) (&D)" #: cryptui.rc:410 msgid "Ba&se64-encoded X.509 (*.cer):" -msgstr "" +msgstr "Ba&se64 编码的 X.509 (*.cer): (&S)" #: cryptui.rc:412 msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (*.p7b)" -msgstr "" +msgstr "加密消息语法标准/PKCS #7 消息 (*.p7b) (&C)" #: cryptui.rc:414 msgid "&Include all certificates in the certification path if possible" -msgstr "" +msgstr "如果可能，将所有证书包含在证书目录 (&I)" #: cryptui.rc:416 msgid "&Personal Information Exchange/PKCS #12 (*.pfx)" -msgstr "" +msgstr "个人信息交换/PKCS #12 (*.pfx) (&P)" Should we use brackets in SBC case here? It'll be "+msgstr "个人信息交换/PKCS #12（*.pfx） (&P)" . 13. #: cryptui.rc:61 msgid "%1 (%2!d! bits)" -msgstr "" +msgstr "%1 (%2!d! 位)" Ditto. 14. #: cryptui.rc:67 msgid "Please enter an OID in the form 1.2.3.4" -msgstr "" +msgstr "请在表单 1.2.3.4 输入对象 ID (OID)" #: cryptui.rc:68 msgid "The OID you entered already exists." -msgstr "" +msgstr "你输入的对象 ID (OID) 已经存在" Ditto. 15. #: cryptui.rc:77 msgid "X.509 Certificate (*.cer; *.crt)" -msgstr "" +msgstr "X.509 证书 (*.cer; *.crt)" #: cryptui.rc:78 msgid "Personal Information Exchange (*.pfx; *.p12)" -msgstr "" +msgstr "个人信息交换 (*.pfx; *.p12)" #: cryptui.rc:79 cryptui.rc:158 msgid "Certificate Revocation List (*.crl)" -msgstr "" +msgstr "证书吊销列表 (*.crl)" #: cryptui.rc:80 cryptui.rc:159 msgid "Certificate Trust List (*.stl)" -msgstr "" +msgstr "证书信任列表 (*.stl)" #: cryptui.rc:82 msgid "CMS/PKCS #7 Messages (*.spc; *.p7b)" -msgstr "" +msgstr "CMS/PKCS #7 消息 (*.spc; *.p7b)" Ditto. 16. #: cryptui.rc:114 msgid "" @@ -2678,6 +2693,8 @@ "trusted.\n" "Are you sure you want to remove this certificate?" msgstr "" +"用此证书颁发机构颁发的证书将不会被继续信任。\n" +"你确定要移除此证书吗？" #: cryptui.rc:115 msgid "" @@ -2685,6 +2702,8 @@ "trusted.\n" "Are you sure you want to remove these certificates?" msgstr "" +"用这些证书颁发机构颁发的证书将不会被继续信任。\n" +"你确定要移除这些证书吗？" #: cryptui.rc:116 msgid "" @@ -2692,6 +2711,8 @@ "certification authorities it issued, will no longer be trusted.\n" "Are you sure you want to remove this trusted root certificate?" msgstr "" +"用此根证书颁发机构颁发的或任何受颁发的证书颁发机构的证书将不会被继续信任。\n" +"你确定要移除这个受信任的根证书吗？" #: cryptui.rc:117 msgid "" @@ -2699,6 +2720,8 @@ "certification authorities they issued, will no longer be trusted.\n" "Are you sure you want to remove these trusted root certificates?" msgstr "" +"用这些根证书颁发机构颁发的或任何受颁发的证书颁发机构的证书将不会被继续信任。\n" +"你确定要移除这些受信任的根证书吗？" Is '用' a typo of '由' here? 17. #: cryptui.rc:156 msgid "DER-Encoded Binary X.509 (*.cer)" -msgstr "" +msgstr "DER 编码的二进制 X.509 (*.cer)" #: cryptui.rc:157 msgid "Base64-Encoded X.509 (*.cer)" -msgstr "" +msgstr "Ba&se64 编码的 X.509 (*.cer)" #: cryptui.rc:160 msgid "CMS/PKCS #7 Messages (*.p7b)" -msgstr "" +msgstr "CMS/PKCS #7 消息 (*.p7b)" #: cryptui.rc:161 msgid "Personal Information Exchange (*.pfx)" -msgstr "" +msgstr "个人信息交换 (*.pfx)" Same as 12. 18. #: gdi32.rc:42 msgid "Hangul(Johab)" -msgstr "" +msgstr "韩文（裘哈）" Is '裘哈' typo of '朝鲜语'? 19. #: inetcpl.rc:32 msgid "Configure Wine Internet Browser and related settings" -msgstr "" +msgstr "配置 Wine Internet Explorer 以及相关设置" Here is 'Wine Internet Browser', I think 'Wine Internet 浏览器' will be better. What about you? 20. #: inetcpl.rc:35 msgid "Very Low" -msgstr "" +msgstr "非常低" What about '极低' ? When 'Medium' is '中等' and 'Increased' is '较高'. 21. #: winecfg.rc:227 msgid "" @@ -12790,8 +12734,7 @@ msgstr "" "你确定要删除 C 盘吗？\n" "\n" -"大部分 Windows 程序都假定 C 盘存在，在没有它时会死得很难看。如果要继续，请记" -"得重新建立一个！" +"大部分 Windows 程序都假定 C 盘存在，在没有它时会死得很难看。如果要继续，请记得重新建立一个！" Translation here is facetious but I don't think it's appropriate. :-p Can we translate '死得很难看' to "严重出错" ? Finally, you should resend the patch to wine-patches, not provide a link of the patch. The wiki page provided by Nikolay may help. Thanks again! 2014-12-16 8:24 GMT+08:00 Jeff Bai <jeffbaichina(a)gmail.com>: > > ---------- Forwarded message ---------- > From: Jeff Bai <jeffbaichina(a)gmail.com> > Date: Mon, Dec 15, 2014 at 5:02 PM > Subject: Re: 答复: zh_CN Translation Submittion > To: Nikolay Sivov <bunglehead(a)gmail.com> > > Okay, got the part fixed. Sorry about that. More translation will be > coming and I will be editing them with a text editor instead. > > https://pastebin.anthonos.org/view/30fbda6b > > Regards, > Jeff Bai > > On Mon, Dec 15, 2014 at 2:42 PM, Nikolay Sivov <bunglehead(a)gmail.com> > wrote: >> >> On 16.12.2014 0:01, Jeff Bai wrote: >> >>> The problem is I'm not sure how to fix them. >>> >> >> How to fix what? Just open a file in a text editor and make changes there. >> >> ------------------------------------------------------------------------ >>> 发件人: Nikolay Sivov <mailto:bunglehead@gmail.com> >>> 发送时间: ‎2014/‎12/‎15 13:08 >>> 收件人: Jeff Bai <mailto:jeffbaichina@gmail.com> >>> 抄送: wine-devel(a)winehq.org <mailto:wine-devel@winehq.org> >>> >>> 主题: Re: zh_CN Translation Submittion >>> >>> >>> On 15.12.2014 17:39, Jeff Bai wrote: >>> > Umm... I think POEdit is the one who made these changes... Not sure >>> if it's my settings or what. >>> >>> Yes, it's mostly likely it. But you don't have to use it, your favorite >>> text editor will work just fine. >>> >>> > >>> > >>> >> 在 2014年12月15日，上午12:01，Nikolay Sivov <bunglehead(a)gmail.com> >>> 写道： >>> >> >>> >>> On 15.12.2014 7:53, Jeff Bai wrote: >>> >>> Hello, fellow developers. >>> >>> >>> >>> I've got several hundred strings translated to zh_CN, and according >>> to >>> >>> you guys' wiki I am supposed to submit a patch of what I've changed. >>> >>> >>> >>> So here it is (too long, used PasteBin) >>> >>> >>> >>> https://pastebin.anthonos.org/view/bb82ca07 >>> >>> >>> >>> Also, I am not sure if I would be fast enough to get them all done >>> by >>> >>> 1.7.34 (nearly two weeks apart?), so is it Okay for me to submit >>> them >>> >>> bit by bit, like this time, several hundred? There's still about 950 >>> >>> left as I can see on POEdit - and I think I can push this to 100% >>> after >>> >>> my high school final four days later. >>> >>> >>> >>> Thanks everyone, Wine is AWESOME. >>> >>> >>> >>> Regards, >>> >>> >>> >>> Jeff Bai (白铭骢) >>> >> >>> >> Hi, Jeff. >>> >> >>> >> I think it's okay to submit full diff at once. But please avoid >>> changing original messages like you do here (or maybe not you directly >>> but poedit): >>> >> >>> >>> #: oleview.rc:121 >>> >>> -msgid "" >>> >>> -"Toggle the display of component categories that are not meant to >>> be visible" >>> >>> +msgid "Toggle the display of component categories that are not >>> meant to be visible" >>> >>> msgstr "切换隐藏组件类显示" >>> >> >>> >> So keep msgid part as it is and touch only msgstr part, this will >>> also help reducing resulting diff. >>> >> >>> >> And once you fixed that you should send a patch to >>> wine-patches(a)winehq.org as it says here >>> http://wiki.winehq.org/SubmittingPatches. >>> >>> >> > > > -- Regards, Jactry Zeng

2 1

Re: kernel32: Implement Get{Time,Date}FormatEx
by Marvin 30 Dec '14

30 Dec '14

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=10947 Your paranoid android. === w2000pro (32 bit locale) === The test timed out === wxppro (32 bit locale) === The test timed out

1 0

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-devel December 2014