February 2013 - Wine-Commits

Ludger Sprenker : windowscodecs: Add enum type WICTiffCompressionOption.
by Alexandre Julliard Feb. 6, 2013

Feb. 6, 2013

Module: wine Branch: master Commit: 5c1e82ce54f9c0dbce47a11d9b3dd066cc95ac91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c1e82ce54f9c0dbce47a11d9… Author: Ludger Sprenker <ludger(a)sprenker.net> Date: Mon Feb 4 20:39:23 2013 +0100 windowscodecs: Add enum type WICTiffCompressionOption. --- include/wincodec.idl | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/include/wincodec.idl b/include/wincodec.idl index 9a2d377..4e1d039 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -156,6 +156,18 @@ typedef enum WICPixelFormatNumericRepresentation { WICPIXELFORMATNUMERICREPRESENTATION_FORCE_DWORD = CODEC_FORCE_DWORD } WICPixelFormatNumericRepresentation; +typedef enum WICTiffCompressionOption { + WICTiffCompressionDontCare = 0x00000000, + WICTiffCompressionNone = 0x00000001, + WICTiffCompressionCCITT3 = 0x00000002, + WICTiffCompressionCCITT4 = 0x00000003, + WICTiffCompressionLZW = 0x00000004, + WICTiffCompressionRLE = 0x00000005, + WICTiffCompressionZIP = 0x00000006, + WICTiffCompressionLZWHDifferencing = 0x00000007, + WICTIFFCOMPRESSIONOPTION_FORCE_DWORD = CODEC_FORCE_DWORD +} WICTiffCompressionOption; + typedef GUID WICPixelFormatGUID; typedef REFGUID REFWICPixelFormatGUID;

1 0

Jactry Zeng : Simplified Chinese translation for release 1.5.23
by Jeremy Newman Feb. 5, 2013

Feb. 5, 2013

Module: website Branch: master Commit: eb6ed2010e13fec23f8a7e265ca1e69d2d03abc5 URL: http://source.winehq.org/git/website.git/?a=commit;h=eb6ed2010e13fec23f8a7e… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Wed Feb 6 03:58:21 2013 +0800 Simplified Chinese translation for release 1.5.23 --- news/zh-cn/2013020101.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/zh-cn/2013020101.xml b/news/zh-cn/2013020101.xml new file mode 100644 index 0000000..b8965e3 --- /dev/null +++ b/news/zh-cn/2013020101.xml @@ -0,0 +1,16 @@ +<news> +<date>二月 1, 2013</date> +<title>Wine 1.5.23 发布</title> +<body> + Wine 开发版 1.5.23 现在可以使用了。 + 本次<a href="{$root}/announce/1.5.23">更新</a>： +<ul> + <li>解除 HTTPS 支持对 OpenSSL 的依赖。</li> + <li>对 Mac 后端驱动事件处理的支持。</li> + <li>一个功能性的 Netstat 内置应用。</li> + <li>一些 C++ 运行时的数学函数。</li> + <li>各种 bug 修复。</li> +</ul> +源代码可以从<a href="http://prdownloads.sourceforge.net/wine/wine-1.5.23.tar.bz2">这里</a>获取。 +二进制包正在构建中，稍后将出现在各自相应的<a href="{$root}/download">下载位置</a>。 +</body></news>

1 0

Jactry Zeng : Simplified Chinese translation for release 1.5.22
by Jeremy Newman Feb. 5, 2013

Feb. 5, 2013

Module: website Branch: master Commit: 2cc67ff1bbdcd858e1fdff0e493d363693aea366 URL: http://source.winehq.org/git/website.git/?a=commit;h=2cc67ff1bbdcd858e1fdff… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Wed Feb 6 04:21:30 2013 +0800 Simplified Chinese translation for release 1.5.22 --- news/zh-cn/2013011801.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/zh-cn/2013011801.xml b/news/zh-cn/2013011801.xml new file mode 100644 index 0000000..d06d956 --- /dev/null +++ b/news/zh-cn/2013011801.xml @@ -0,0 +1,16 @@ +<news> +<date>一月 18, 2013</date> +<title>Wine 1.5.22 发布</title> +<body> + Wine 开发版 1.5.22 现在可以使用了。 + 本次<a href="{$root}/announce/1.5.22">更新</a>： +<ul> + <li>新的 Gecko 引擎。</li> + <li>开始 Mac 图像后端驱动的开发。</li> + <li>对 ARM64 平台的支持。</li> + <li>改进 Uniscribe 对 RTL（从右往左）文本的支持。</li> + <li>各种 bug 修复。</li> +</ul> +源代码可以从<a href="http://prdownloads.sourceforge.net/wine/wine-1.5.22.tar.bz2">这里</a>获取。 +二进制包正在构建中，稍后将出现在各自相应的<a href="{$root}/download">下载位置</a>。 +</body></news>

1 0

Aric Stewart : usp10: Update diacritical script handling for non OpenType Itemization.
by Alexandre Julliard Feb. 5, 2013

Feb. 5, 2013

Module: wine Branch: master Commit: ef4b7c5948e43d4ceeed98ba4ddbf6c222259d36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef4b7c5948e43d4ceeed98ba4… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Feb 5 08:57:44 2013 -0600 usp10: Update diacritical script handling for non OpenType Itemization. --- dlls/usp10/usp10.c | 32 ++++++++++++++++++++++++++++++-- 1 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index da0752d..41a7f32 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1329,8 +1329,36 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, forceLevels = TRUE; /* Diacritical marks merge with other scripts */ - if (scripts[i] == Script_Diacritical && i > 0) - scripts[i] = scripts[i-1]; + if (scripts[i] == Script_Diacritical) + { + if (i > 0) + { + if (pScriptTags) + scripts[i] = scripts[i-1]; + else + { + int j; + BOOL asian = FALSE; + WORD first_script = scripts[i-1]; + for (j = i-1; j >= 0 && scripts[j] == first_script && pwcInChars[j] != Numeric_space; j--) + { + WORD original = scripts[j]; + if (original == Script_Ideograph || original == Script_Kana || original == Script_Yi || original == Script_CJK_Han || original == Script_Bopomofo) + { + asian = TRUE; + break; + } + if (original != Script_MathAlpha && scriptInformation[scripts[j]].props.fComplex) + break; + scripts[j] = scripts[i]; + if (original == Script_Punctuation2) + break; + } + if (scriptInformation[scripts[j]].props.fComplex || asian) + scripts[i] = scripts[j]; + } + } + } } for (i = 0; i < cInChars; i++)

1 0

Aric Stewart : usp10: Split the core Itemize function out to be able to support differences between the normal and OpenType versions .
by Alexandre Julliard Feb. 5, 2013

Feb. 5, 2013

Module: wine Branch: master Commit: e70b9b1c1e0b239e9c3f76696650c7187b57570f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e70b9b1c1e0b239e9c3f76696… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Feb 5 08:57:38 2013 -0600 usp10: Split the core Itemize function out to be able to support differences between the normal and OpenType versions. --- dlls/usp10/usp10.c | 69 +++++++++++++++++++++++++++------------------------- 1 files changed, 36 insertions(+), 33 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index fb09808..da0752d 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1270,28 +1270,11 @@ static inline WORD base_indic(WORD script) }; } -/*********************************************************************** - * ScriptItemizeOpenType (USP10.@) - * - * Split a Unicode string into shapeable parts. - * - * PARAMS - * pwcInChars [I] String to split. - * cInChars [I] Number of characters in pwcInChars. - * cMaxItems [I] Maximum number of items to return. - * psControl [I] Pointer to a SCRIPT_CONTROL structure. - * psState [I] Pointer to a SCRIPT_STATE structure. - * pItems [O] Buffer to receive SCRIPT_ITEM structures. - * pScriptTags [O] Buffer to receive OPENTYPE_TAGs. - * pcItems [O] Number of script items returned. - * - * RETURNS - * Success: S_OK - * Failure: Non-zero HRESULT value. - */ -HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int cMaxItems, - const SCRIPT_CONTROL *psControl, const SCRIPT_STATE *psState, - SCRIPT_ITEM *pItems, OPENTYPE_TAG *pScriptTags, int *pcItems) + +static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, + int cMaxItems, const SCRIPT_CONTROL *psControl, + const SCRIPT_STATE *psState, SCRIPT_ITEM *pItems, + OPENTYPE_TAG *pScriptTags, int *pcItems) { #define Numeric_space 0x0020 @@ -1496,7 +1479,8 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int pItems[index].iCharPos = 0; pItems[index].a = scriptInformation[scripts[cnt]].a; - pScriptTags[index] = scriptInformation[scripts[cnt]].scriptTag; + if (pScriptTags) + pScriptTags[index] = scriptInformation[scripts[cnt]].scriptTag; if (strength && strength[cnt] == BIDI_STRONG) str = strength[cnt]; @@ -1590,7 +1574,8 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int memset(&pItems[index].a, 0, sizeof(SCRIPT_ANALYSIS)); pItems[index].a = scriptInformation[New_Script].a; - pScriptTags[index] = scriptInformation[New_Script].scriptTag; + if (pScriptTags) + pScriptTags[index] = scriptInformation[New_Script].scriptTag; if (levels) { if (levels[cnt] == 0) @@ -1633,6 +1618,32 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int } /*********************************************************************** + * ScriptItemizeOpenType (USP10.@) + * + * Split a Unicode string into shapeable parts. + * + * PARAMS + * pwcInChars [I] String to split. + * cInChars [I] Number of characters in pwcInChars. + * cMaxItems [I] Maximum number of items to return. + * psControl [I] Pointer to a SCRIPT_CONTROL structure. + * psState [I] Pointer to a SCRIPT_STATE structure. + * pItems [O] Buffer to receive SCRIPT_ITEM structures. + * pScriptTags [O] Buffer to receive OPENTYPE_TAGs. + * pcItems [O] Number of script items returned. + * + * RETURNS + * Success: S_OK + * Failure: Non-zero HRESULT value. + */ +HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int cMaxItems, + const SCRIPT_CONTROL *psControl, const SCRIPT_STATE *psState, + SCRIPT_ITEM *pItems, OPENTYPE_TAG *pScriptTags, int *pcItems) +{ + return _ItemizeInternal(pwcInChars, cInChars, cMaxItems, psControl, psState, pItems, pScriptTags, pcItems); +} + +/*********************************************************************** * ScriptItemize (USP10.@) * * Split a Unicode string into shapeable parts. @@ -1654,15 +1665,7 @@ HRESULT WINAPI ScriptItemize(const WCHAR *pwcInChars, int cInChars, int cMaxItem const SCRIPT_CONTROL *psControl, const SCRIPT_STATE *psState, SCRIPT_ITEM *pItems, int *pcItems) { - OPENTYPE_TAG *discarded_tags; - HRESULT res; - - discarded_tags = heap_alloc(cMaxItems * sizeof(OPENTYPE_TAG)); - if (!discarded_tags) - return E_OUTOFMEMORY; - res = ScriptItemizeOpenType(pwcInChars, cInChars, cMaxItems, psControl, psState, pItems, discarded_tags, pcItems); - heap_free(discarded_tags); - return res; + return _ItemizeInternal(pwcInChars, cInChars, cMaxItems, psControl, psState, pItems, NULL, pcItems); } static inline int getGivenTabWidth(ScriptCache *psc, SCRIPT_TABDEF *pTabdef, int charPos, int current_x)

1 0

Huw Davies : riched20: Move the text to the paragraph level.
by Alexandre Julliard Feb. 5, 2013

Feb. 5, 2013

Module: wine Branch: master Commit: 5168d66be7367473c1819c010bf7037e01a45f09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5168d66be7367473c1819c010… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 5 13:19:41 2013 +0000 riched20: Move the text to the paragraph level. --- dlls/riched20/caret.c | 2 +- dlls/riched20/editor.h | 12 +++++++----- dlls/riched20/editstr.h | 2 +- dlls/riched20/list.c | 4 +++- dlls/riched20/para.c | 23 +++++++++++++++-------- dlls/riched20/run.c | 14 +++++++------- dlls/riched20/string.c | 39 +++++++++++++++++++++------------------ dlls/riched20/undo.c | 6 +++--- 8 files changed, 58 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5168d66be7367473c1819…

1 0

Vijay Kiran Kamuju : msvcr90: Update the manifest version.
by Alexandre Julliard Feb. 5, 2013

Feb. 5, 2013

Module: wine Branch: master Commit: a044165b27ef1e7f721294b165439d779692890d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a044165b27ef1e7f721294b16… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Mon Feb 4 10:49:31 2013 +0000 msvcr90: Update the manifest version. --- dlls/msvcr90/msvcr90.manifest | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcr90/msvcr90.manifest b/dlls/msvcr90/msvcr90.manifest index 0effe99..588a0fd 100644 --- a/dlls/msvcr90/msvcr90.manifest +++ b/dlls/msvcr90/msvcr90.manifest @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> - <assemblyIdentity type="win32" name="Microsoft.VC90.CRT" version="9.0.30729.4148" processorArchitecture="" publicKeyToken="1fc8b3b9a1e18e3b"/> + <assemblyIdentity type="win32" name="Microsoft.VC90.CRT" version="9.0.30729.6161" processorArchitecture="" publicKeyToken="1fc8b3b9a1e18e3b"/> <file name="msvcr90.dll"/> <file name="msvcp90.dll"/> <file name="msvcm90.dll"/>

1 0

Ken Thomases : winemac: Ignore Cocoa' s window frame adjustments for off-screen windows.
by Alexandre Julliard Feb. 5, 2013

Feb. 5, 2013

Module: wine Branch: master Commit: 0757a6636013cf5ac3c46164ea7bf0d07769a94e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0757a6636013cf5ac3c46164e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Feb 4 08:46:00 2013 -0600 winemac: Ignore Cocoa's window frame adjustments for off-screen windows. --- dlls/winemac.drv/cocoa_window.m | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 38bc176..4d69674 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -265,10 +265,6 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [window setContentView:contentView]; - /* In case Cocoa adjusted the frame we tried to set, generate a frame-changed - event. The back end will ignore it if nothing actually changed. */ - [window windowDidResize:nil]; - return window; } @@ -424,9 +420,12 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [self setFrame:frame display:YES]; } - /* In case Cocoa adjusted the frame we tried to set, generate a frame-changed - event. The back end will ignore it if nothing actually changed. */ - [self windowDidResize:nil]; + if (on_screen) + { + /* In case Cocoa adjusted the frame we tried to set, generate a frame-changed + event. The back end will ignore it if nothing actually changed. */ + [self windowDidResize:nil]; + } return on_screen; }

1 0

Michael Stefaniuc : ddraw/tests: Use assignment instead of memcpy to copy structs.
by Alexandre Julliard Feb. 5, 2013

Feb. 5, 2013

Module: wine Branch: master Commit: 7d0ab835aeb0403f5f5dbc8cf923711eee7847e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d0ab835aeb0403f5f5dbc8cf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Feb 5 13:18:04 2013 +0100 ddraw/tests: Use assignment instead of memcpy to copy structs. --- dlls/ddraw/tests/dsurface.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index c8f90c9..4e08224 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -3872,13 +3872,13 @@ static void CreateSurfaceBadCapsSizeTest(void) ddsd_ok.dwWidth = 64; ddsd_ok.dwHeight = 64; ddsd_ok.ddsCaps.dwCaps = caps; - memcpy(&ddsd_bad1, &ddsd_ok, sizeof(ddsd_bad1)); + ddsd_bad1 = ddsd_ok; ddsd_bad1.dwSize--; - memcpy(&ddsd_bad2, &ddsd_ok, sizeof(ddsd_bad2)); + ddsd_bad2 = ddsd_ok; ddsd_bad2.dwSize++; - memcpy(&ddsd_bad3, &ddsd_ok, sizeof(ddsd_bad3)); + ddsd_bad3 = ddsd_ok; ddsd_bad3.dwSize = 0; - memcpy(&ddsd_bad4, &ddsd_ok, sizeof(ddsd_bad4)); + ddsd_bad4 = ddsd_ok; ddsd_bad4.dwSize = sizeof(DDSURFACEDESC2); memset(&ddsd2_ok, 0, sizeof(ddsd2_ok)); @@ -3887,13 +3887,13 @@ static void CreateSurfaceBadCapsSizeTest(void) ddsd2_ok.dwWidth = 64; ddsd2_ok.dwHeight = 64; ddsd2_ok.ddsCaps.dwCaps = caps; - memcpy(&ddsd2_bad1, &ddsd2_ok, sizeof(ddsd2_bad1)); + ddsd2_bad1 = ddsd2_ok; ddsd2_bad1.dwSize--; - memcpy(&ddsd2_bad2, &ddsd2_ok, sizeof(ddsd2_bad2)); + ddsd2_bad2 = ddsd2_ok; ddsd2_bad2.dwSize++; - memcpy(&ddsd2_bad3, &ddsd2_ok, sizeof(ddsd2_bad3)); + ddsd2_bad3 = ddsd2_ok; ddsd2_bad3.dwSize = 0; - memcpy(&ddsd2_bad4, &ddsd2_ok, sizeof(ddsd2_bad4)); + ddsd2_bad4 = ddsd2_ok; ddsd2_bad4.dwSize = sizeof(DDSURFACEDESC); hr = IDirectDraw_CreateSurface(lpDD, &ddsd_ok, &surf, NULL);

1 0

Aric Stewart : usp10: Fix typo with Script_Khmer_Numeric.
by Alexandre Julliard Feb. 5, 2013

Feb. 5, 2013

Module: wine Branch: master Commit: 8077975e70843f43b788c58412e58534b0d269a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8077975e70843f43b788c5841… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Feb 5 08:56:47 2013 -0600 usp10: Fix typo with Script_Khmer_Numeric. --- dlls/usp10/usp10.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index e2e72fc..fb09808 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -513,7 +513,7 @@ const scriptData scriptInformation[] = { {0x53, 0, 1, 1, 1, DEFAULT_CHARSET, 0, 0, 0, 0, 1, 0, 0, 0, 0}, MS_MAKE_TAG('k','h','m','r'), {'D','a','u','n','P','e','n','h'}}, - {{Script_Khmer, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {{Script_Khmer_Numeric, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {0x53, 1, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('k','h','m','r'), {'D','a','u','n','P','e','n','h'}},

1 0