February 2013 - Wine-commits

Alexandre Julliard : imm32: Retrieve the graphics driver module from gdi32.
by Alexandre Julliard 11 Feb '13

11 Feb '13

Module: wine Branch: master Commit: a3b85a5a2ed615292f919638b52016aeff764ee4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3b85a5a2ed615292f919638b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 11 11:39:23 2013 +0100 imm32: Retrieve the graphics driver module from gdi32. --- dlls/imm32/imm.c | 39 +++++++-------------------------------- 1 files changed, 7 insertions(+), 32 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 1ade13a..fbb683f 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -32,6 +32,7 @@ #include "ddk/imm.h" #include "winnls.h" #include "winreg.h" +#include "wine/gdi_driver.h" #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(imm); @@ -247,37 +248,6 @@ static void IMM_FreeThreadData(void) } } -static HMODULE LoadDefaultWineIME(void) -{ - char buffer[MAX_PATH], libname[32], *name, *next; - HMODULE module = 0; - HKEY hkey; - - TRACE("Attempting to fall back to wine default IME\n"); - - strcpy( buffer, "x11" ); /* default value */ - /* @@ Wine registry key: HKCU\Software\Wine\Drivers */ - if (!RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\Drivers", &hkey )) - { - DWORD type, count = sizeof(buffer); - RegQueryValueExA( hkey, "Ime", 0, &type, (LPBYTE) buffer, &count ); - RegCloseKey( hkey ); - } - - name = buffer; - while (name) - { - next = strchr( name, ',' ); - if (next) *next++ = 0; - - snprintf( libname, sizeof(libname), "wine%s.drv", name ); - if ((module = LoadLibraryA( libname )) != 0) break; - name = next; - } - - return module; -} - /* ImmHkl loading and freeing */ #define LOAD_FUNCPTR(f) if((ptr->p##f = (LPVOID)GetProcAddress(ptr->hIME, #f)) == NULL){WARN("Can't find function %s in ime\n", #f);} static ImmHkl *IMM_GetImmHkl(HKL hkl) @@ -299,7 +269,12 @@ static ImmHkl *IMM_GetImmHkl(HKL hkl) ptr->hkl = hkl; if (ImmGetIMEFileNameW(hkl, filename, MAX_PATH)) ptr->hIME = LoadLibraryW(filename); if (!ptr->hIME) - ptr->hIME = LoadDefaultWineIME(); + { + HDC hdc = GetDC( 0 ); + GetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, + (LPCWSTR)__wine_get_driver_module( hdc ), &ptr->hIME ); + ReleaseDC( 0, hdc ); + } if (ptr->hIME) { LOAD_FUNCPTR(ImeInquire);

1 0

Daniel Jelinski : user32: Fix CopyImage implementation when changing cursor to icon.
by Alexandre Julliard 11 Feb '13

11 Feb '13

Module: wine Branch: master Commit: 59e0d7af68138ab295921447569ae42d3b71faec URL: http://source.winehq.org/git/wine.git/?a=commit;h=59e0d7af68138ab2959214475… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Fri Feb 8 20:19:47 2013 +0100 user32: Fix CopyImage implementation when changing cursor to icon. --- dlls/user32/cursoricon.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 25059e0..5b21101 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -2873,7 +2873,7 @@ HANDLE WINAPI CopyImage( HANDLE hnd, UINT type, INT desiredx, if (icon->rsrc && (flags & LR_COPYFROMRESOURCE)) res = CURSORICON_Load( icon->module, icon->resname, desiredx, desiredy, depth, - type == IMAGE_CURSOR, flags ); + !icon->is_icon, flags ); else res = CopyIcon( hnd ); /* FIXME: change size if necessary */ release_icon_ptr( hnd, icon );

1 0

Juan Lang : iphlpapi: Fix HRESULT/win32 error code confusion.
by Alexandre Julliard 11 Feb '13

11 Feb '13

Module: wine Branch: master Commit: 0ca4ad0d2fe616a9a54a30bbee88c787afc5ee1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ca4ad0d2fe616a9a54a30bbe… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Feb 8 12:33:28 2013 -0800 iphlpapi: Fix HRESULT/win32 error code confusion. --- dlls/iphlpapi/ipstats.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 966d24e..1f52fcc 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -693,7 +693,7 @@ DWORD WINAPI GetIcmpStatisticsEx(PMIB_ICMP_EX stats, DWORD family) } ret = GetIcmpStatistics(&ipv4stats); - if (SUCCEEDED(ret)) + if (!ret) { stats->icmpInStats.dwMsgs = ipv4stats.stats.icmpInStats.dwMsgs; stats->icmpInStats.dwErrors = ipv4stats.stats.icmpInStats.dwErrors;

1 0

Stefan Dösinger : wined3d: Use the ARBfp ffp pipeline only if ARBfp is supported.
by Alexandre Julliard 11 Feb '13

11 Feb '13

Module: wine Branch: master Commit: 425eab4cf91bb26aa983a2c1b59e63e4386c60a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=425eab4cf91bb26aa983a2c1b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Feb 8 23:19:46 2013 +0100 wined3d: Use the ARBfp ffp pipeline only if ARBfp is supported. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7734cba..f42299e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2252,7 +2252,7 @@ static const struct fragment_pipeline *select_fragment_implementation(const stru { if (shader_backend_ops == &glsl_shader_backend) return &glsl_fragment_pipe; - if (shader_backend_ops == &arb_program_shader_backend) + if (shader_backend_ops == &arb_program_shader_backend && gl_info->supported[ARB_FRAGMENT_PROGRAM]) return &arbfp_fragment_pipeline; if (gl_info->supported[ATI_FRAGMENT_SHADER]) return &atifs_fragment_pipeline;

1 0

Stefan Dösinger : wined3d: Reserve one vs constant on r200.
by Alexandre Julliard 11 Feb '13

11 Feb '13

Module: wine Branch: master Commit: 3221e7fdd0133ce2096278acf2ce47836e99cac4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3221e7fdd0133ce2096278acf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Feb 8 23:19:47 2013 +0100 wined3d: Reserve one vs constant on r200. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/directx.c | 26 ++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 28 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 2fd5108..e8da805 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -821,6 +821,7 @@ static DWORD shader_generate_arb_declarations(const struct wined3d_shader *shade max_constantsF -= reserved_vs_const(shader_data, reg_maps, gl_info); max_constantsF -= count_bits(reg_maps->integer_constants); + max_constantsF -= gl_info->reserved_arb_constants; for (i = 0; i < shader->limits.constant_float; ++i) { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f42299e..acdcc57 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -751,6 +751,14 @@ static BOOL match_fglrx(const struct wined3d_gl_info *gl_info, const char *gl_re return gl_vendor == GL_VENDOR_FGLRX; } +static BOOL match_r200(const struct wined3d_gl_info *gl_info, const char *gl_renderer, + enum wined3d_gl_vendor gl_vendor, enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) +{ + if (card_vendor != HW_VENDOR_AMD) return FALSE; + if (device == CARD_AMD_RADEON_8500) return TRUE; + return FALSE; +} + static void quirk_apple_glsl_constants(struct wined3d_gl_info *gl_info) { /* MacOS needs uniforms for relative addressing offsets. This can accumulate to quite a few uniforms. @@ -861,6 +869,19 @@ static void quirk_limited_tex_filtering(struct wined3d_gl_info *gl_info) gl_info->quirks |= WINED3D_QUIRK_LIMITED_TEX_FILTERING; } +static void quirk_r200_constants(struct wined3d_gl_info *gl_info) +{ + /* The Mesa r200 driver (and there is no other driver for this GPU Wine would run on) + * loads some fog parameters (start, end, exponent, but not the color) into the + * program. + * + * Apparently the fog hardware is only able to handle linear fog with a range of 0.0;1.0, + * and it is the responsibility of the vertex pipeline to handle non-linear fog and + * linear fog with start and end other than 0.0 and 1.0. */ + TRACE("Reserving 1 ARB constant for compiler private use.\n"); + gl_info->reserved_arb_constants = max(gl_info->reserved_arb_constants, 1); +} + struct driver_quirk { BOOL (*match)(const struct wined3d_gl_info *gl_info, const char *gl_renderer, @@ -941,6 +962,11 @@ static const struct driver_quirk quirk_table[] = quirk_limited_tex_filtering, "Texture filtering, blending and VTF support is limited" }, + { + match_r200, + quirk_r200_constants, + "r200 vertex shader constants" + }, }; /* Certain applications (Steam) complain if we report an outdated driver version. In general, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0ce0c65..45f6b29 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1532,7 +1532,7 @@ struct wined3d_gl_info { DWORD glsl_version; struct wined3d_gl_limits limits; - DWORD reserved_glsl_constants; + DWORD reserved_glsl_constants, reserved_arb_constants; DWORD quirks; BOOL supported[WINED3D_GL_EXT_COUNT]; GLint wrap_lookup[WINED3D_TADDRESS_MIRROR_ONCE - WINED3D_TADDRESS_WRAP + 1];

1 0

Andrew Talbot : jscript: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 11 Feb '13

11 Feb '13

Module: wine Branch: master Commit: 6b5a18f61923dd9f867f2747bac5f0eb394da5dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b5a18f61923dd9f867f2747b… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Feb 9 22:32:02 2013 +0000 jscript: Avoid signed-unsigned integer comparisons. --- dlls/jscript/date.c | 2 +- dlls/jscript/error.c | 2 +- dlls/jscript/function.c | 7 ++++--- dlls/jscript/regexp.c | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index f192824..d9243b1 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -2236,7 +2236,7 @@ static inline HRESULT date_parse(jsstr_t *input_str, double *ret) { } else { /* Month or garbage */ - int j; + unsigned int j; for(size=i; parse[size]>='A' && parse[size]<='Z'; size++); size -= i; diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index f7b0443..9f5cfe6 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -342,7 +342,7 @@ HRESULT init_error_constr(script_ctx_t *ctx, jsdisp_t *object_prototype) SyntaxErrorConstr_value, TypeErrorConstr_value, URIErrorConstr_value}; jsdisp_t *err; - INT i; + unsigned int i; jsstr_t *str; HRESULT hres; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index b058460..056f04a 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -755,7 +755,8 @@ static HRESULT construct_function(script_ctx_t *ctx, unsigned argc, jsval_t *arg bytecode_t *code; jsdisp_t *function; jsstr_t **params = NULL; - int i=0, j=0; + unsigned int i = 0; + int j = 0; HRESULT hres = S_OK; static const WCHAR function_anonymousW[] = {'f','u','n','c','t','i','o','n',' ','a','n','o','n','y','m','o','u','s','('}; @@ -809,8 +810,8 @@ static HRESULT construct_function(script_ctx_t *ctx, unsigned argc, jsval_t *arg } } - while(--i >= 0) - jsstr_release(params[i]); + while(i) + jsstr_release(params[--i]); heap_free(params); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index c1311d1..263bee9 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3596,7 +3596,7 @@ static HRESULT create_match_array(script_ctx_t *ctx, jsstr_t *input, const match { jsdisp_t *array; jsstr_t *str; - int i; + DWORD i; HRESULT hres = S_OK; static const WCHAR indexW[] = {'i','n','d','e','x',0};

1 0

Jactry Zeng : Updated Simplified Chinese translation
by Jeremy Newman 11 Feb '13

11 Feb '13

Module: website Branch: master Commit: fc651178d86439ff169b5cd91034b2edff73043a URL: http://source.winehq.org/git/website.git/?a=commit;h=fc651178d86439ff169b5c… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Sat Feb 9 16:53:37 2013 +0800 Updated Simplified Chinese translation --- templates/zh-cn/about.template | 2 +- templates/zh-cn/cvs.template | 21 ++++++ templates/zh-cn/download/debian.template | 22 +++++++ templates/zh-cn/download/ubuntu.template | 2 +- templates/zh-cn/interview.template | 8 +++ templates/zh-cn/irc.template | 98 ++++++++++++++++++++++++++++++ 6 files changed, 151 insertions(+), 2 deletions(-) diff --git a/templates/zh-cn/about.template b/templates/zh-cn/about.template index c2659d5..e2c56be 100644 --- a/templates/zh-cn/about.template +++ b/templates/zh-cn/about.template @@ -6,7 +6,7 @@ Wine （“Wine Is Not an Emulator” 的首字母缩写）是一个能够在多种 POSIX-compliant 操作系统（诸如 Linux，Mac OSX 及 BSD 等）上运行 Windows 应用的兼容层。 Wine 不是像虚拟机或者模拟器一样模仿内部的 Windows 逻辑，而是將 Windows API 调用翻译成为动态的 POSIX 调用，免除了性能和其他一些行为的内存占用，让你能够干净地集合 Windows 应用到你的桌面。 - 1993 年，Bob Amstadt 发起了 Wine 项目，旨在寻求一种在 Linux 上运行 Windows 3.1 + Wine 项目由 Bob Amstadt 于 1993 年发起，旨在寻求一种在 Linux 上运行 Windows 3.1 程序的办法。不久之后，Alexandre Julliard 开始接手领导 Wine 的开发，从此由他管理这个项目。多年以来，随着 Windows API 和应用为了适应新硬件及软件而不断演变，Wine 也一直不断发展来支持新的特性，移植到更多其他系统，并且更加稳定，提供着更好的用户体验。 diff --git a/templates/zh-cn/cvs.template b/templates/zh-cn/cvs.template new file mode 100644 index 0000000..ba10a25 --- /dev/null +++ b/templates/zh-cn/cvs.template @@ -0,0 +1,21 @@ + + + +<h1 class="title">The Wine CVS Tree</h1> + +注意：我们已经把开发从 CVS 切换到 <a href="http://git.or.cz">Git</a> 了。 + 不可以再通过 CVS 来获取 Wine 了。 + <a href="{$root}/site/git">Wine Git tree</a> 的使用说明可以从 + <a href="http://wiki.winehq.org">Wine Wiki</a> 上的 + <a href="http://wiki.winehq.org/GitWine">GitWine</a> 页面找到。 + +<hr /> + +<h1 id="sourcetree">通过 Web 方式浏览源码树</h1> + +The source code of the entire Wine tree is (<a href="http://lxr.linux.no/">LXR</a>-based) + cross-referenced and available for browsing, including a search engine. + This cross-references source is based on the snapshot-releases and is made available at: +<ul> + <li><a href="http://source.winehq.org/">source.winehq.org</a></li> +</ul> diff --git a/templates/zh-cn/download/debian.template b/templates/zh-cn/download/debian.template new file mode 100644 index 0000000..3ae57b0 --- /dev/null +++ b/templates/zh-cn/download/debian.template @@ -0,0 +1,22 @@ + + + +<h1 class="title"><a href="http://www.debian.org/" target="_new"><img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> +Wine for Debian Sid +<a href="http://www.debian.org/" target="_new"><img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a></h1> + +Debian-based 发行版使用为人所熟知的 APT 这一特定的工具来管理软件包。APT 能够自动解决软件安装包的依赖、更新包、检索 APT 仓库。Debian-based 发行版有他们自己包含 Wine 的软件源，然而，我们仍保持我们自己的源到最新 beta 版，以便可以从这里下载。 + +警告：这些是 beta 版安装包 +这意味着他们可能偶尔遭受 <a href="http://wiki.winehq.org/Regression">倒退（regressions）</a>，结果是一个更新可能破坏 Wine 的（原有）功能。如果最新的 Wine 稳定版（当前是 Wine {$config_stable_release}）能够为你工作，你或者不太想用这些 beta 版安装包。 + +这个网站有 i386 和 amd64 架构的安装包。 + +你得下载 .deb 文件并手动安装他们。更多细节请查看页面。 + + +主页： <a href="http://dev.carbon-project.org/debian/wine-unstable/" target="_blank">http://dev.carbon-project.org/debian/wine-unstable/</a> +打包者： <a href="mailto:curan(a)debian.org">Kai Wasserbäch</a> + + + diff --git a/templates/zh-cn/download/ubuntu.template b/templates/zh-cn/download/ubuntu.template index 4380a60..fd150d4 100644 --- a/templates/zh-cn/download/ubuntu.template +++ b/templates/zh-cn/download/ubuntu.template @@ -22,7 +22,7 @@ Ubuntu 的源默认包含了 Wine，当然，如果你想更新到最新版本 <h2>警告：Beta 版安装包</h2> -版本 1.5 的安装包是 beta 版的安装包。这意味着他们会偶尔被做<a href="http://wiki.winehq.org/Regression">回滚处理（regressions）</a>，这种处理发生在当更新导致 Wine 的（原有）功能被破坏的情况下。 +版本 1.5 的安装包是 beta 版的安装包。这意味着他们可能偶尔遭受<a href="http://wiki.winehq.org/Regression">倒退（regressions）</a>，结果是一个更新可能破坏 Wine 的（原有）功能。所以，如果稳定版的 Wine 1.4 已经能够为你工作，你或许不太想用 beta 版的安装包。 <h2>安装 Wine：</h2> diff --git a/templates/zh-cn/interview.template b/templates/zh-cn/interview.template new file mode 100644 index 0000000..5d1c425 --- /dev/null +++ b/templates/zh-cn/interview.template @@ -0,0 +1,8 @@ + + + +<h1 class="title">访谈</h1> + + + + diff --git a/templates/zh-cn/irc.template b/templates/zh-cn/irc.template new file mode 100644 index 0000000..a7a2aee --- /dev/null +++ b/templates/zh-cn/irc.template @@ -0,0 +1,98 @@ + + + +<h1 class="title">在线聊天社区</h1> + +<a href="http://www.freenode.net">Freenode.net</a> 上有各种 Wine 的频道。 +你可以使用像 +<a href="http://www.xchat.org/">X-Chat</a> 这样的 IRC 程序来进入聊天室，按照如下配置： + +<blockquote> + Server: irc.freenode.net + Port: 6667 +</blockquote> + +你可以根据你想讨论的话题来选择频道： + +<blockquote> + #winehq: 用户支持和运行 Wine 的帮助 + #crossover: 用户支持和运行 Crossover 的支持 + #winehackers: 开发和其他对 Wine 的贡献 + #winehq-social: 和其他社区成员闲聊灌水 +</blockquote> + +使用 Firefox 或者其他支持 IRC 地址的浏览器，可以通过点击加入聊天： +<ul> + <li><a href="irc://irc.freenode.net/winehq">#winehq</a></li> + <li><a href="irc://irc.freenode.net/crossover">#crossover</a></li> + <li><a href="irc://irc.freenode.net/winehackers">#winehackers</a></li> + <li><a href="irc://irc.freenode.net/winehq-social">#winehq-social</a></li> +</ul> + +为了使讨论更加专注和尽可能有效，在 IRC 提问之前可以先尝试搜索你的问题。 +<a href="http://wiki.winehq.org/FAQ">Wine FAQ</a>、 +<a href="http://appdb.winehq.org">AppDB</a>、 +<a href="http://www.winehq.org/site/download">下载页面</a> 都是值得首先检查的资源。 + +<h2>IRC 规定和惩罚</h2> + +除了不能带有攻击性和不顾他人地吵闹外，这里还有一些简单的规定希望每个人在 IRC 频道里都能遵守。 +大多数情况下，初次违法规定会被视为意外并予以警告。但当你用完了警告次数后，你将会被从频道中踢出。 + +如果你继续违反规定并用完“踢出”次数，你将会被禁止进入频道两个小时。 +在这之后如果还造成其他任何问题，将会被永久禁止，并且只能通过申诉来解除禁止。 +如果你想为禁令申辩，请到 #winehq-social （或者 +<a href="mailto:wine-devel(a)winehq.org">wine-devel 邮件列表</a>，当你被禁止进入 +#winehq-social 时），并且首先解释你为什么会被禁止和为什么你认为禁令应该解除。 + +<table border="0" cellpadding="5" cellspacing="1" bgcolor="#EFEFEF"> + <tr align="center" bgcolor="black"> + <th>规定</th> + <th>说明</th> + <th>警告</th> + <th>踢出</th> + </tr> + <tr bgcolor="#ffffff"> + <td>不要发送垃圾邮件。</td> + <td></td> + <td>1</td> + <td>2</td> + </tr> + <tr bgcolor="#ffffff"> + <td>当粘贴内容超过一或两行时者使用 pastebin。</td> + <td><a href="http://winehq.pastebin.com">winehq.pastebin.com</a> 和 + <a href="http://pastebin.ca">pastebin.ca</a> 都是可以使用的。</td> + <td>0</td> + <td>5</td> + </tr> + <tr bgcolor="#ffffff"> + <td>在合适的频道中讨论合适的话题。</td> + <td>如果不确定，可以在 #winehq 询问应该加入什么频道。</td> + <td>2</td> + <td>3</td> + </tr> + <tr bgcolor="#ffffff"> + <td>只有 Wine 和 Crossover 才会在他们对应的频道获得支持。</td> + <td>Sidenet、WineDoors、Cedega、IEs4Linux 等等是不会被支持的。</td> + <td>2</td> + <td>1</td> + </tr> + <tr bgcolor="#ffffff"> + <td>在 #winehq 提问前，确保你正在使用的是最新版本的 Wine。</td> + <td>如果不确定，在命令行中使用 <tt>wine --version</tt> 来确定你的版本。</td> + <td>3</td> + <td>1</td> + </tr> + <tr bgcolor="#ffffff"> + <td>请等候直到轮到你获取帮助。</td> + <td></td> + <td>3</td> + <td>1</td> + </tr> + <tr bgcolor="#ffffff"> + <td>不要讨论有关盗版软件的。</td> + <td></td> + <td>1</td> + <td>1</td> + </tr> +</table>

1 0

Huw Davies : riched20: Move the split point calculation to wrap.c.
by Alexandre Julliard 08 Feb '13

08 Feb '13

Module: wine Branch: master Commit: 9e8a9f4f657e30de42d422bda3b23810e56976bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e8a9f4f657e30de42d422bda… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 8 11:45:03 2013 +0000 riched20: Move the split point calculation to wrap.c. --- dlls/riched20/editor.h | 1 - dlls/riched20/run.c | 50 ------------------------------------------------ dlls/riched20/wrap.c | 47 ++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 46 insertions(+), 52 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 9722f36..4401498 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -140,7 +140,6 @@ ME_DisplayItem *ME_InsertRunAtCursor(ME_TextEditor *editor, ME_Cursor *cursor, ME_Style *style, const WCHAR *str, int len, int flags) DECLSPEC_HIDDEN; void ME_CheckCharOffsets(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_PropagateCharOffset(ME_DisplayItem *p, int shift) DECLSPEC_HIDDEN; -int ME_CharFromPoint(ME_Context *c, int cx, ME_Run *run) DECLSPEC_HIDDEN; /* this one accounts for 1/2 char tolerance */ int ME_CharFromPointCursor(ME_TextEditor *editor, int cx, ME_Run *run) DECLSPEC_HIDDEN; int ME_PointFromChar(ME_TextEditor *editor, ME_Run *pRun, int nOffset) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index aaa6300..6f9d5b5 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -404,56 +404,6 @@ void ME_UpdateRunFlags(ME_TextEditor *editor, ME_Run *run) } /****************************************************************************** - * ME_CharFromPoint - * - * Returns a character position inside the run given a run-relative - * pixel horizontal position. This version rounds left (ie. if the second - * character is at pixel position 8, then for cx=0..7 it returns 0). - */ -int ME_CharFromPoint(ME_Context *c, int cx, ME_Run *run) -{ - int fit = 0; - HGDIOBJ hOldFont; - SIZE sz; - if (!run->len || cx <= 0) - return 0; - - if (run->nFlags & MERF_TAB || - (run->nFlags & (MERF_ENDCELL|MERF_ENDPARA)) == MERF_ENDCELL) - { - if (cx < run->nWidth/2) - return 0; - return 1; - } - if (run->nFlags & MERF_GRAPHICS) - { - SIZE sz; - ME_GetOLEObjectSize(c, run, &sz); - if (cx < sz.cx) - return 0; - return 1; - } - hOldFont = ME_SelectStyleFont(c, run->style); - - if (c->editor->cPasswordMask) - { - ME_String *strMasked = ME_MakeStringR(c->editor->cPasswordMask, run->len); - GetTextExtentExPointW(c->hDC, strMasked->szData, run->len, - cx, &fit, NULL, &sz); - ME_DestroyString(strMasked); - } - else - { - GetTextExtentExPointW(c->hDC, get_text( run, 0 ), run->len, - cx, &fit, NULL, &sz); - } - - ME_UnselectStyleFont(c, run->style, hOldFont); - - return fit; -} - -/****************************************************************************** * ME_CharFromPointCursor * * Returns a character position inside the run given a run-relative diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 97598e7..0531c97 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -80,6 +80,51 @@ static ME_DisplayItem *split_run_extents(ME_WrapContext *wc, ME_DisplayItem *ite return cursor.pRun; } +/****************************************************************************** + * find_split_point + * + * Returns a character position to split inside the run given a run-relative + * pixel horizontal position. This version rounds left (ie. if the second + * character is at pixel position 8, then for cx=0..7 it returns 0). + */ +static int find_split_point( ME_Context *c, int cx, ME_Run *run ) +{ + int fit = 0; + HGDIOBJ hOldFont; + SIZE sz; + + if (!run->len || cx <= 0) return 0; + + if (run->nFlags & MERF_TAB || + (run->nFlags & (MERF_ENDCELL|MERF_ENDPARA)) == MERF_ENDCELL) + { + if (cx < run->nWidth / 2) return 0; + return 1; + } + if (run->nFlags & MERF_GRAPHICS) + { + SIZE sz; + ME_GetOLEObjectSize( c, run, &sz ); + if (cx < sz.cx) return 0; + return 1; + } + hOldFont = ME_SelectStyleFont( c, run->style ); + + if (c->editor->cPasswordMask) + { + ME_String *strMasked = ME_MakeStringR( c->editor->cPasswordMask, run->len ); + GetTextExtentExPointW( c->hDC, strMasked->szData, run->len, cx, &fit, NULL, &sz ); + ME_DestroyString( strMasked ); + } + else + { + GetTextExtentExPointW( c->hDC, get_text( run, 0 ), run->len, cx, &fit, NULL, &sz ); + } + + ME_UnselectStyleFont( c, run->style, hOldFont ); + + return fit; +} static ME_DisplayItem *ME_MakeRow(int height, int baseline, int width) { @@ -337,7 +382,7 @@ static ME_DisplayItem *ME_SplitByBacktracking(ME_WrapContext *wc, ME_DisplayItem int i, idesp, len; ME_Run *run = &p->member.run; - idesp = i = ME_CharFromPoint(wc->context, loc, run); + idesp = i = find_split_point( wc->context, loc, run ); len = run->len; assert(len>0); assert(i<len);

1 0

Henri Verbeet : wined3d: Add WINED3DFMT_INST to the format table.
by Alexandre Julliard 08 Feb '13

08 Feb '13

Module: wine Branch: master Commit: c37594d3a902dab5cd3186f6b9276e4ccbcb0e0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c37594d3a902dab5cd3186f6b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 8 13:21:14 2013 +0100 wined3d: Add WINED3DFMT_INST to the format table. We need the format to exist in apply_format_fixups() in particular. --- dlls/wined3d/utils.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 2b95dfd..4b29ec8 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -124,6 +124,7 @@ static const struct wined3d_format_channels formats[] = /* Vendor-specific formats */ {WINED3DFMT_ATI2N, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, {WINED3DFMT_NVDB, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + {WINED3DFMT_INST, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, {WINED3DFMT_INTZ, 0, 0, 0, 0, 0, 0, 0, 0, 4, 24, 8}, {WINED3DFMT_NVHU, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0}, {WINED3DFMT_NVHS, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0},

1 0

Aric Stewart : usp10: Free default_language items when freeing script cache .
by Alexandre Julliard 08 Feb '13

08 Feb '13

Module: wine Branch: master Commit: c8b5a16f0c2177746d6d4358f319f5e1e0f93234 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8b5a16f0c2177746d6d4358f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Feb 8 09:45:55 2013 -0600 usp10: Free default_language items when freeing script cache. --- dlls/usp10/usp10.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index a08b047..0b14e9e 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1060,6 +1060,9 @@ HRESULT WINAPI ScriptFreeCache(SCRIPT_CACHE *psc) heap_free(((ScriptCache *)*psc)->scripts[i].languages[j].features[k].lookups); heap_free(((ScriptCache *)*psc)->scripts[i].languages[j].features); } + for (j = 0; j < ((ScriptCache *)*psc)->scripts[i].default_language.feature_count; j++) + heap_free(((ScriptCache *)*psc)->scripts[i].default_language.features[j].lookups); + heap_free(((ScriptCache *)*psc)->scripts[i].default_language.features); heap_free(((ScriptCache *)*psc)->scripts[i].languages); } heap_free(((ScriptCache *)*psc)->scripts);

1 0