wine-commits December 2015

wine-commits@winehq.org

2 participants
327 discussions

Boyuan Yang : readme: Add Simplified Chinese translation.
by Alexandre Julliard 07 Dec '15

07 Dec '15

Module: wine Branch: master Commit: d47591c350ce2c41b02e06c5490fb39e79610a31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d47591c350ce2c41b02e06c54… Author: Boyuan Yang <073plan(a)gmail.com> Date: Mon Dec 7 16:21:37 2015 +0800 readme: Add Simplified Chinese translation. Signed-off-by: Boyuan Yang <073plan(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- documentation/README.zh_cn | 159 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 159 insertions(+) diff --git a/documentation/README.zh_cn b/documentation/README.zh_cn new file mode 100644 index 0000000..d77ad40 --- /dev/null +++ b/documentation/README.zh_cn @@ -0,0 +1,159 @@ +1. 简介 + +Wine 是能够使 Microsoft Windows 程序（包括 DOS、Windows 3.x、Win32 +以及 Win64 可执行程序）在 Unix 上运行的应用程序。 +它包含一个用来加载并执行 Microsoft Windows 二进制程序的程序加载器， +以及一个使用 Unix 或 X11 的等价功能实现 Windows API 调用的函数库 +（名称为 Winelib）。这个库也可用来将 Windows 代码移植为原生 Unix +可执行程序。 + +Wine 是自由软件，在 GNU LGPL 协议下发布；请查看 LICENSE 文件以了解 +详情。 + + +2. 快速开始 + +当您从源代码编译时，我们建议您使用 Wine Installer 来构建、安装 Wine。 +从 Wine 源代码的顶层目录开始（即包含本文件的目录[译注：指顶层的 README +文件]），运行： + +./tools/wineinstall + +运行程序时，请使用“wine [程序名]”的语法。如需了解更多信息或解决遇到的 +问题，您可以继续阅读本文件的剩余部分，或阅读 Wine 的手册页。 +需特别指出的是，您可以在网站：http://www.winehq.org 上找到十分丰富 +的信息。 + + +3. 系统需求 + +要想成功编译并运行 Wine，您必须使用以下列出的操作系统之一： + + Linux 2.0.36 或更新版本 + FreeBSD 8.0 或更新版本 + Solaris x86 9 或更新版本 + NetBSD-current + Mac OS X 10.5 或更新版本 + +鉴于运行 Wine 需要内核级别的线程支持，仅以上提及的操作系统能被支持。 +其它拥有内核线程的操作系统可能在未来得到支持。 + +FreeBSD 信息： + Wine 通常不会在早于 FreeBSD 8.0 的系统上正常工作。 + 请查看 http://wiki.freebsd.org/Wine 以了解更多信息。 + +Solaris 信息： + 您大部分情况下可能需要使用 GNU 工具链（gcc、gas 等）来构建 Wine。 + 警告：安装 gas *不能* 确保它被 gcc 所使用。您可能需要在安装 gas + 之后重编译 gcc，或是将 cc、as 和 ld 符号链接至 GNU 版的对应工具。 + +NetBSD 信息： + 请确保您在内核中启用了 USER_LDT、SYSVSHM、SYSVSEM 和 SYSVMSG 选项。 + +Mac OS X 信息: + 在 x86 平台下，您需要 Xcode 2.4 或更新版本以正常进行编译。 + Mac 驱动需要 OS X 10.6 或更新版本。它在 10.5 下不会编译通过。 + + +支持的文件系统： + Wine 应当能在大多数文件系统上工作。有一些被报告的兼容性问题， + 主要与使用 Samba 访问文件有关。另外，NTFS 不能提供一些应用所 + 需要的某些文件系统的特定功能。综上所述，建议您使用原生的 Unix + 文件系统。 + +基本要求： + 您需要安装 X11 开发用头文件（在 Debian 中可能被称为 xlib6g-dev + ，在 Red Hat 中可能被称为 XFree86-devel [译注：在新版本的 Linux + 发行版中可能有其它名称，例如使用替代 Xlib 的 XCB library，此时 + Debian 的包名称应为 libxcb1-dev]）。 + + 当然您同样需要“make”工具（一般应当为 GNU make）。 + + 您也需要 flex 的 2.5.33 版或更新版本，以及 bison 工具。 + +可选的支持库： + 当可选的函数库无法在您的系统中找到时，configure 会显示对应的提示信息。 + 请查看 http://wiki.winehq.org/Recommended_Packages 以了解您应当安装的 + 软件包的信息。 + + 在 64 位平台上，如果以 32 位的方式编译 Wine（这是默认情况），您必须确保 + 对应函数库的 32 位版本已被安装；请查看 http://wiki.winehq.org/WineOn64bit + 以了解详情。如果您想安装一个真正的 64 位 Wine（或者一个混合 32 位 Wine 和 + 64 位 Wine 的版本），请参阅 http://wiki.winehq.org/Wine64 以了解具体内容。 + +4. 编译 + +如果您选择不使用 wineinstall 工具，请运行下列的命令以构建 Wine： + +./configure +make + +这样将会构建“wine”程序和大量的支持库/二进制文件。 +“wine”程序可以加载并运行 Windows 可执行文件。 +“libwine”（“Winelib”）函数库可被用来在 Unix 下编译并链接 Windows +程序的源码。 + +如需查看编译配置选项，请使用“./configure --help”。 + +5. 安装 + +一旦 Wine 已被正确构建，您可以进行“make install”；该操作将安装 wine +可执行文件、函数库、Wine 手册页以及其它需要使用的文件。 + +不要忘记事先卸载先前任何安装过的、会引起冲突的 Wine 软件集。 +请在安装前尝试“dpkg -r wine”、“rpm -e wine”或“make uninstall”。 + +一旦安装完成，您可以运行“winecfg”配置工具。请参考 http://www.winehq.org/ +网站中的支持页面以了解配置技巧。 + + +6. 运行程序 + +当您调用 Wine 时，您可以指定指向可执行文件的整个路径，或是仅指定文件名 +信息。 + +例如，如需运行 Notepad： + + wine notepad (使用注册表中指定的搜索路径来 + wine notepad.exe 定位文件) + + wine c:\\windows\\notepad.exe (使用 DOS 文件名语法) + + wine ~/.wine/drive_c/windows/notepad.exe (使用 Unix 文件名语法) + + wine notepad.exe readme.txt (带参数调用程序) + +Wine 不是十全十美的，所以某些程序可能会崩溃。如果这样的情况发生， +您将会得到一份崩溃日志。您应当在提交程序漏洞时附上这份日志。 + + +7. 获取更多信息 + +WWW: 有关 Wine 的很多信息可以在 WineHQ 网站：http://www.winehq.org/ + 上面找到。包括：各类 Wine 相关的向导、应用程序数据库（AppDB）、 + 漏洞跟踪系统等等。这个网站可能是您最佳的起始之处。 + +FAQ: Wine 常见问题位于 http://www.winehq.org/FAQ + +维基： Wine 维基位于 http://wiki.winehq.org + +邮件列表： + 存在数个服务于 Wine 用户和开发者的邮件列表； + 请查看 http://www.winehq.org/forums 以了解更多信息。 + +Bugs: 请向位于 http://bugs.winehq.org 的 Wine Bugzilla 提交 bug。 + 请在提交漏洞报告前先在 bugzilla 数据库中进行搜索，检查 + 先前是否已有类似的已知问题以避免重复，并跟踪这些问题的修复情况。 + +IRC: 您可以在 irc.freenode.net 的 #WineHQ 频道获取到在线帮助。 + +Git: 当前 Wine 的开发树可经由 Git 获取。 + 请前往 http://www.winehq.org/git 以了解更多信息。 + +如果您在代码中添加了某些内容，或是修复了某个 bug，请向 +wine-patches(a)winehq.org 这个邮件列表发送对应的补丁（建议使用 +git-format-patch 生成补丁），以便我们将其加入下一个版本中。 + +-- +Alexandre Julliard +julliard(a)winehq.org

1 0

Francois Gouget : winecfg: Tweak sizes and alignments so the 'Font' button does not clip in Portuguese (Portugal).
by Alexandre Julliard 07 Dec '15

07 Dec '15

Module: wine Branch: master Commit: 9d90c897ce67ce90a7ee6100eee69a75565b70f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d90c897ce67ce90a7ee6100e… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 7 12:26:58 2015 +0100 winecfg: Tweak sizes and alignments so the 'Font' button does not clip in Portuguese (Portugal). Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/winecfg.rc | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc index 221916b..d30d819 100644 --- a/programs/winecfg/winecfg.rc +++ b/programs/winecfg/winecfg.rc @@ -288,18 +288,18 @@ BEGIN LTEXT "&Theme:",IDC_STATIC,15,16,130,8 COMBOBOX IDC_THEME_THEMECOMBO,15,26,130,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Install theme...",IDC_THEME_INSTALL,152,26,93,14 - LTEXT "&Color:",IDC_THEME_COLORTEXT,15,48,112,8 - COMBOBOX IDC_THEME_COLORCOMBO,15,58,112,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "&Size:",IDC_THEME_SIZETEXT,135,48,110,8 - COMBOBOX IDC_THEME_SIZECOMBO,135,58,110,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "It&em:",IDC_STATIC,15,80,112,8 - COMBOBOX IDC_SYSPARAM_COMBO,15,90,112,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_SORT - LTEXT "C&olor:",IDC_SYSPARAM_COLOR_TEXT,133,80,25,8,WS_DISABLED - PUSHBUTTON "",IDC_SYSPARAM_COLOR,133,90,25,13,WS_DISABLED | BS_OWNERDRAW - LTEXT "Si&ze:",IDC_SYSPARAM_SIZE_TEXT,164,80,30,8,WS_DISABLED - EDITTEXT IDC_SYSPARAM_SIZE,164,90,33,13,ES_AUTOHSCROLL | WS_TABSTOP | WS_DISABLED + LTEXT "&Color:",IDC_THEME_COLORTEXT,15,48,105,8 + COMBOBOX IDC_THEME_COLORCOMBO,15,58,105,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "&Size:",IDC_THEME_SIZETEXT,126,48,120,8 + COMBOBOX IDC_THEME_SIZECOMBO,126,58,120,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "It&em:",IDC_STATIC,15,80,105,8 + COMBOBOX IDC_SYSPARAM_COMBO,15,90,105,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_SORT + LTEXT "C&olor:",IDC_SYSPARAM_COLOR_TEXT,126,80,25,8,WS_DISABLED + PUSHBUTTON "",IDC_SYSPARAM_COLOR,126,90,25,13,WS_DISABLED | BS_OWNERDRAW + LTEXT "Si&ze:",IDC_SYSPARAM_SIZE_TEXT,157,80,30,8,WS_DISABLED + EDITTEXT IDC_SYSPARAM_SIZE,157,90,30,13,ES_AUTOHSCROLL | WS_TABSTOP | WS_DISABLED CONTROL "",IDC_SYSPARAM_SIZE_UD,UPDOWN_CLASSA,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | WS_DISABLED, 185,90,15,13 - PUSHBUTTON "&Font...",IDC_SYSPARAM_FONT,200,90,45,13,WS_DISABLED + PUSHBUTTON "&Font...",IDC_SYSPARAM_FONT,190,90,55,13,WS_DISABLED GROUPBOX "Folders",IDC_STATIC,8,114,244,100 CONTROL "",IDC_LIST_SFPATHS,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,126,230,64

1 0

Alexandre Julliard : user32: Fix WS_EX_DLGMODALFRAME handling in AdjustWindowRect and add more tests.
by Alexandre Julliard 07 Dec '15

07 Dec '15

Module: wine Branch: master Commit: 5095ee32af3b997e98989c8c1e622d84a76db6c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5095ee32af3b997e98989c8c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 7 21:20:39 2015 +0900 user32: Fix WS_EX_DLGMODALFRAME handling in AdjustWindowRect and add more tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/tests/filedlg.c | 2 +- dlls/user32/nonclient.c | 2 +- dlls/user32/tests/win.c | 106 +++++++++++++++++++++++++++++++++++------- 3 files changed, 91 insertions(+), 19 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index 49a430c..0a4c509 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -781,7 +781,7 @@ static UINT_PTR WINAPI template_hook_arrange(HWND dlgChild, UINT msg, WPARAM wPa ok( wrcParent.right - wrcParent.left == expectx, "Wrong width of dialog %d, expected %d\n", wrcParent.right - wrcParent.left, expectx); - } else todo_wine { + } else { /* with the OFN_ENABLESIZING flag */ ok( wrcParent.bottom - wrcParent.top > expecty, "Wrong height of dialog %d, expected more than %d\n", diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 1267ab6..053353a 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -98,7 +98,7 @@ NC_AdjustRectOuter (LPRECT rect, DWORD style, BOOL menu, DWORD exStyle) if ((exStyle & WS_EX_DLGMODALFRAME) || (style & (WS_THICKFRAME|WS_DLGFRAME))) adjust = 2; /* outer */ } - if ((style & WS_THICKFRAME) && !(exStyle & WS_EX_DLGMODALFRAME)) + if (style & WS_THICKFRAME) adjust += ( GetSystemMetrics (SM_CXFRAME) - GetSystemMetrics (SM_CXDLGFRAME)); /* The resize border */ if ((style & (WS_BORDER|WS_DLGFRAME)) || diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 30b3da9..b202544 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -989,6 +989,52 @@ static void FixedAdjustWindowRectEx(RECT* rc, LONG style, BOOL menu, LONG exstyl rc->bottom += GetSystemMetrics(SM_CYHSCROLL); } +/* reimplement it to check that the Wine algorithm gives the correct result */ +static void wine_AdjustWindowRectEx( RECT *rect, LONG style, BOOL menu, LONG exStyle ) +{ + int adjust; + + if ((exStyle & (WS_EX_STATICEDGE|WS_EX_DLGMODALFRAME)) == + WS_EX_STATICEDGE) + { + adjust = 1; /* for the outer frame always present */ + } + else + { + adjust = 0; + if ((exStyle & WS_EX_DLGMODALFRAME) || + (style & (WS_THICKFRAME|WS_DLGFRAME))) adjust = 2; /* outer */ + } + if (style & WS_THICKFRAME) + adjust += GetSystemMetrics(SM_CXFRAME) - GetSystemMetrics(SM_CXDLGFRAME); /* The resize border */ + if ((style & (WS_BORDER|WS_DLGFRAME)) || + (exStyle & WS_EX_DLGMODALFRAME)) + adjust++; /* The other border */ + + InflateRect (rect, adjust, adjust); + + if ((style & WS_CAPTION) == WS_CAPTION) + { + if (exStyle & WS_EX_TOOLWINDOW) + rect->top -= GetSystemMetrics(SM_CYSMCAPTION); + else + rect->top -= GetSystemMetrics(SM_CYCAPTION); + } + if (menu) rect->top -= GetSystemMetrics(SM_CYMENU); + + if (exStyle & WS_EX_CLIENTEDGE) + InflateRect(rect, GetSystemMetrics(SM_CXEDGE), GetSystemMetrics(SM_CYEDGE)); + + if (style & WS_VSCROLL) + { + if((exStyle & WS_EX_LEFTSCROLLBAR) != 0) + rect->left -= GetSystemMetrics(SM_CXVSCROLL); + else + rect->right += GetSystemMetrics(SM_CXVSCROLL); + } + if (style & WS_HSCROLL) rect->bottom += GetSystemMetrics(SM_CYHSCROLL); +} + static void test_nonclient_area(HWND hwnd) { DWORD style, exstyle; @@ -1016,6 +1062,14 @@ static void test_nonclient_area(HWND hwnd) style, exstyle, menu, rc_window.left, rc_window.top, rc_window.right, rc_window.bottom, rc.left, rc.top, rc.right, rc.bottom); + CopyRect(&rc, &rc_client); + MapWindowPoints(hwnd, 0, (LPPOINT)&rc, 2); + wine_AdjustWindowRectEx(&rc, style, menu, exstyle); + ok(EqualRect(&rc, &rc_window), + "window rect does not match: style:exstyle=0x%08x:0x%08x, menu=%d, win=(%d,%d)-(%d,%d), calc=(%d,%d)-(%d,%d)\n", + style, exstyle, menu, rc_window.left, rc_window.top, rc_window.right, rc_window.bottom, + rc.left, rc.top, rc.right, rc.bottom); + CopyRect(&rc, &rc_window); DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc); @@ -4747,26 +4801,16 @@ static BOOL AWR_init(void) static void test_AWR_window_size(BOOL menu) { - LONG styles[] = { - WS_POPUP, - WS_MAXIMIZE, WS_BORDER, WS_DLGFRAME, - WS_SYSMENU, - WS_THICKFRAME, - WS_MINIMIZEBOX, WS_MAXIMIZEBOX, - WS_HSCROLL, WS_VSCROLL + static const DWORD styles[] = { + WS_POPUP, WS_MAXIMIZE, WS_BORDER, WS_DLGFRAME, WS_CAPTION, WS_SYSMENU, + WS_THICKFRAME, WS_MINIMIZEBOX, WS_MAXIMIZEBOX, WS_HSCROLL, WS_VSCROLL }; - LONG exStyles[] = { - WS_EX_CLIENTEDGE, - WS_EX_TOOLWINDOW, WS_EX_WINDOWEDGE, - WS_EX_APPWINDOW, -#if 0 - /* These styles have problems on (at least) WinXP (SP2) and Wine */ - WS_EX_DLGMODALFRAME, - WS_EX_STATICEDGE, -#endif + static const DWORD exStyles[] = { + WS_EX_CLIENTEDGE, WS_EX_TOOLWINDOW, WS_EX_WINDOWEDGE, WS_EX_APPWINDOW, + WS_EX_DLGMODALFRAME, WS_EX_DLGMODALFRAME | WS_EX_STATICEDGE }; - int i; + unsigned int i; /* A exhaustive check of all the styles takes too long * so just do a (hopefully representative) sample @@ -4778,6 +4822,33 @@ static void test_AWR_window_size(BOOL menu) test_AWRwindow(szAWRClass, WS_THICKFRAME, exStyles[i], menu); } } + +static void test_AWR_flags(void) +{ + static const DWORD styles[] = { WS_POPUP, WS_BORDER, WS_DLGFRAME, WS_THICKFRAME }; + static const DWORD exStyles[] = { WS_EX_CLIENTEDGE, WS_EX_TOOLWINDOW, WS_EX_WINDOWEDGE, + WS_EX_APPWINDOW, WS_EX_DLGMODALFRAME, WS_EX_STATICEDGE }; + + DWORD i, j, k, style, exstyle; + RECT rect, rect2; + + for (i = 0; i < (1 << COUNTOF(styles)); i++) + { + for (k = style = 0; k < COUNTOF(styles); k++) if (i & (1 << k)) style |= styles[k]; + + for (j = 0; j < (1 << COUNTOF(exStyles)); j++) + { + for (k = exstyle = 0; k < COUNTOF(exStyles); k++) if (j & (1 << k)) exstyle |= exStyles[k]; + SetRect( &rect, 100, 100, 200, 200 ); + rect2 = rect; + AdjustWindowRectEx( &rect, style, FALSE, exstyle ); + wine_AdjustWindowRectEx( &rect2, style, FALSE, exstyle ); + ok( EqualRect( &rect, &rect2 ), "rects do not match: win %d,%d-%d,%d wine %d,%d-%d,%d\n", + rect.left, rect.top, rect.right, rect.bottom, + rect2.left, rect2.top, rect2.right, rect2.bottom ); + } + } +} #undef COUNTOF #define SHOWSYSMETRIC(SM) trace(#SM "=%d\n", GetSystemMetrics(SM)) @@ -4803,6 +4874,7 @@ static void test_AdjustWindowRect(void) test_AWR_window_size(FALSE); test_AWR_window_size(TRUE); + test_AWR_flags(); DestroyMenu(hmenu); }

1 0

Dmitry Timoshkov : winhttp/tests: Fix a typo.
by Alexandre Julliard 07 Dec '15

07 Dec '15

Module: wine Branch: master Commit: c599a0f6b090a046e8c09dde39dc377b6737c264 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c599a0f6b090a046e8c09dde3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Dec 7 13:16:25 2015 +0800 winhttp/tests: Fix a typo. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index c41ff62..db789b3 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2408,7 +2408,7 @@ static void test_basic_authentication(int port) ret = WinHttpSetOption(req, WINHTTP_OPTION_USERNAME, userW, lstrlenW(userW)); ok(ret, "failed to set username %u\n", GetLastError()); - ret = WinHttpSetOption(req, WINHTTP_OPTION_PASSWORD, pass2W, lstrlenW(passW)); + ret = WinHttpSetOption(req, WINHTTP_OPTION_PASSWORD, passW, lstrlenW(passW)); ok(ret, "failed to set password %u\n", GetLastError()); ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC, userW, pass2W, NULL);

1 0

Dmitry Timoshkov : winhttp/tests: Fix spurious crashes under Windows.
by Alexandre Julliard 07 Dec '15

07 Dec '15

Module: wine Branch: master Commit: fb31a0f7e084d7db4c9e945ecfc38b603ea93a6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb31a0f7e084d7db4c9e945ec… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Dec 7 13:15:53 2015 +0800 winhttp/tests: Fix spurious crashes under Windows. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 2b460df..c41ff62 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -3574,15 +3574,15 @@ static void test_IWinHttpRequest(void) SysFreeString( method ); SysFreeString( url ); - V_VT( &data ) = VT_BSTR; - V_BSTR( &data ) = NULL; - hr = IWinHttpRequest_Send( req, data ); - ok( hr == S_OK, "got %08x\n", hr ); - - hr = IWinHttpRequest_get_ResponseText( req, &response ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !memcmp(response, data_start, sizeof(data_start)), "got %s\n", wine_dbgstr_wn(response, 32) ); - SysFreeString( response ); + hr = IWinHttpRequest_Send( req, empty ); + ok( hr == S_OK || broken(hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_INVALID_SERVER_RESPONSE )), "got %08x\n", hr ); + if (hr == S_OK) + { + hr = IWinHttpRequest_get_ResponseText( req, &response ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !memcmp(response, data_start, sizeof(data_start)), "got %s\n", wine_dbgstr_wn(response, 32) ); + SysFreeString( response ); + } IWinHttpRequest_Release( req );

1 0

Jactry Zeng : riched20/tests: Add return tests for EM_SETTEXTEX.
by Alexandre Julliard 07 Dec '15

07 Dec '15

Module: wine Branch: master Commit: d5c587b1c27c967ef744d81603604a506016238e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5c587b1c27c967ef744d8160… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Dec 4 15:30:35 2015 +0800 riched20/tests: Add return tests for EM_SETTEXTEX. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 20cc924..efa0b29 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -3676,8 +3676,9 @@ static void test_EM_SETTEXTEX(void) setText.codepage = CP_ACP; setText.flags = ST_SELECTION; - SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, - (LPARAM)"{\\rtf 1\\par 2\\par 3\\par 4\\par 5\\par 6\\par 7\\par 8\\par 9\\par}"); + result = SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, + (LPARAM)"{\\rtf 1\\par 2\\par 3\\par 4\\par 5\\par 6\\par 7\\par 8\\par 9\\par}"); + todo_wine ok(result == 18, "EM_SETTEXTEX returned %d, expected 18\n", result); si.cbSize = sizeof(si); si.fMask = SIF_ALL; GetScrollInfo(hwndRichEdit, SB_VERT, &si); @@ -3692,8 +3693,9 @@ static void test_EM_SETTEXTEX(void) hwndRichEdit = new_richedit(NULL); setText.codepage = CP_ACP; setText.flags = ST_SELECTION; - SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, - (LPARAM)"{\\rtf 1\\par 2\\par 3\\par 4\\par 5\\par 6\\par 7\\par 8\\par 9\\par}"); + result = SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, + (LPARAM)"{\\rtf 1\\par 2\\par 3\\par 4\\par 5\\par 6\\par 7\\par 8\\par 9\\par}"); + todo_wine ok(result == 18, "EM_SETTEXTEX returned %d, expected 18\n", result); si.cbSize = sizeof(si); si.fMask = SIF_ALL; GetScrollInfo(hwndRichEdit, SB_VERT, &si); @@ -3706,8 +3708,9 @@ static void test_EM_SETTEXTEX(void) * but this time it is because the selection is at the beginning. */ setText.codepage = CP_ACP; setText.flags = ST_DEFAULT; - SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, - (LPARAM)"{\\rtf 1\\par 2\\par 3\\par 4\\par 5\\par 6\\par 7\\par 8\\par 9\\par}"); + result = SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, + (LPARAM)"{\\rtf 1\\par 2\\par 3\\par 4\\par 5\\par 6\\par 7\\par 8\\par 9\\par}"); + ok(result == 1, "EM_SETTEXTEX returned %d, expected 1\n", result); si.cbSize = sizeof(si); si.fMask = SIF_ALL; GetScrollInfo(hwndRichEdit, SB_VERT, &si); @@ -3724,7 +3727,8 @@ static void test_EM_SETTEXTEX(void) getText.lpUsedDefChar = NULL; setText.flags = 0; - SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)TestItem1); + result = SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)TestItem1); + ok(result == 1, "EM_SETTEXTEX returned %d, expected 1\n", result); SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); ok(lstrcmpW(buf, TestItem1) == 0, "EM_GETTEXTEX results not what was set by EM_SETTEXTEX\n"); @@ -3739,7 +3743,8 @@ static void test_EM_SETTEXTEX(void) getText.lpDefaultChar = NULL; getText.lpUsedDefChar = NULL; setText.flags = 0; - SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)TestItem2); + result = SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)TestItem2); + ok(result == 1, "EM_SETTEXTEX returned %d, expected 1\n", result); SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); ok(lstrcmpW(buf, TestItem2) == 0, "EM_GETTEXTEX results not what was set by EM_SETTEXTEX\n"); @@ -3784,7 +3789,8 @@ static void test_EM_SETTEXTEX(void) getText.lpDefaultChar = NULL; getText.lpUsedDefChar = NULL; setText.flags = 0; - SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)TestItem3); + result = SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)TestItem3); + ok(result == 1, "EM_SETTEXTEX returned %d, expected 1\n", result); SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); ok(lstrcmpW(buf, TestItem3_after) == 0, "EM_SETTEXTEX did not convert properly\n"); @@ -3797,7 +3803,8 @@ static void test_EM_SETTEXTEX(void) getText.lpDefaultChar = NULL; getText.lpUsedDefChar = NULL; setText.flags = 0; - SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)TestItem3alt); + result = SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)TestItem3alt); + ok(result == 1, "EM_SETTEXTEX returned %d, expected 1\n", result); SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); ok(lstrcmpW(buf, TestItem3_after) == 0, "EM_SETTEXTEX did not convert properly\n"); @@ -3810,7 +3817,8 @@ static void test_EM_SETTEXTEX(void) getText.lpDefaultChar = NULL; getText.lpUsedDefChar = NULL; setText.flags = 0; - SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)TestItem4); + result = SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)TestItem4); + ok(result == 1, "EM_SETTEXTEX returned %d, expected 1\n", result); SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); ok(lstrcmpW(buf, TestItem4_after) == 0, "EM_SETTEXTEX did not convert properly\n"); @@ -3825,7 +3833,8 @@ static void test_EM_SETTEXTEX(void) /* put some text back: !ST_SELECTION && Unicode && !\rtf */ setText.flags = 0; - SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)TestItem1); + result = SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)TestItem1); + ok(result == 1, "EM_SETTEXTEX returned %d, expected 1\n", result); /* select some text */ cr.cpMax = 1; cr.cpMin = 3; @@ -3840,7 +3849,8 @@ static void test_EM_SETTEXTEX(void) /* put some text back: !ST_SELECTION && Unicode && !\rtf */ setText.flags = 0; - SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)TestItem1); + result = SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)TestItem1); + ok(result == 1, "EM_SETTEXTEX returned %d, expected 1\n", result); /* select some text */ cr.cpMax = 1; cr.cpMin = 3; @@ -3878,7 +3888,8 @@ static void test_EM_SETTEXTEX(void) getText.lpUsedDefChar = NULL; setText.flags = 0; - SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)buf); + result = SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)buf); + ok(result == 1, "EM_SETTEXTEX returned %d, expected 1\n", result); SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); ok(lstrcmpW(buf, TestItem1) == 0, "EM_GETTEXTEX results not what was set by EM_SETTEXTEX\n");

1 0

Jactry Zeng : riched20/tests: Test EM_SETTEXT and EM_REPLACESEL with multibyte character.
by Alexandre Julliard 07 Dec '15

07 Dec '15

Module: wine Branch: master Commit: f52ae0458536e47b8c975e6210fa4664f642ae45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f52ae0458536e47b8c975e621… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Dec 4 15:30:25 2015 +0800 riched20/tests: Test EM_SETTEXT and EM_REPLACESEL with multibyte character. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 63 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 46d93aa..20cc924 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -3997,6 +3997,41 @@ static void test_EM_SETTEXTEX(void) result = strcmp(bufACP, "TestUTF8WithBOM"); ok(result == 0, "EM_SETTEXTEX: Test UTF8 with BOM set wrong text: Result: %s\n", bufACP); + /* Test multibyte character */ + if (PRIMARYLANGID(GetUserDefaultLangID()) != LANG_JAPANESE) + skip("Skip multibyte character tests on non-Japanese platform\n"); + else + { + SendMessageA(hwndRichEdit, EM_SETSEL, 0, -1); + setText.flags = ST_SELECTION; + setText.codepage = CP_ACP; + result = SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)"abc\x8e\xf0"); + todo_wine ok(result == 5, "EM_SETTEXTEX incorrectly returned %d, expected 5\n", result); + result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)bufACP); + ok(result == 5, "WM_GETTEXT incorrectly returned %d, expected 5\n", result); + ok(!strcmp(bufACP, "abc\x8e\xf0"), + "EM_SETTEXTEX: Test multibyte character set wrong text: Result: %s\n", bufACP); + + setText.flags = ST_DEFAULT; + setText.codepage = CP_ACP; + result = SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)"abc\x8e\xf0"); + ok(result == 1, "EM_SETTEXTEX incorrectly returned %d, expected 1\n", result); + result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)bufACP); + ok(result == 5, "WM_GETTEXT incorrectly returned %d, expected 5\n", result); + ok(!strcmp(bufACP, "abc\x8e\xf0"), + "EM_SETTEXTEX: Test multibyte character set wrong text: Result: %s\n", bufACP); + + SendMessageA(hwndRichEdit, EM_SETSEL, 0, -1); + setText.flags = ST_SELECTION; + setText.codepage = CP_ACP; + result = SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)"{\\rtf abc\x8e\xf0}"); + todo_wine ok(result == 4, "EM_SETTEXTEX incorrectly returned %d, expected 4\n", result); + result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)bufACP); + ok(result == 5, "WM_GETTEXT incorrectly returned %d, expected 5\n", result); + todo_wine ok(!strcmp(bufACP, "abc\x8e\xf0"), + "EM_SETTEXTEX: Test multibyte character set wrong text: Result: %s\n", bufACP); + } + DestroyWindow(hwndRichEdit); } @@ -4835,6 +4870,34 @@ static void test_EM_REPLACESEL(int redraw) r = SendMessageA(hwndRichEdit, EM_GETLINECOUNT, 0, 0); ok(r == 7, "EM_GETLINECOUNT returned %d, expected 7\n", r); + /* Test with multibyte character */ + if (PRIMARYLANGID(GetUserDefaultLangID()) != LANG_JAPANESE) + skip("Skip multibyte character tests on non-Japanese platform\n"); + else + { + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, 0); + r = SendMessageA(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM)"abc\x8e\xf0"); + todo_wine ok(r == 5, "EM_REPLACESEL returned %d, expected 5\n", r); + r = SendMessageA(hwndRichEdit, EM_EXGETSEL, 0, (LPARAM)&cr); + ok(r == 0, "EM_EXGETSEL returned %d, expected 0\n", r); + ok(cr.cpMin == 4, "EM_EXGETSEL returned cpMin=%d, expected 4\n", cr.cpMin); + ok(cr.cpMax == 4, "EM_EXGETSEL returned cpMax=%d, expected 4\n", cr.cpMax); + r = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); + ok(!strcmp(buffer, "abc\x8e\xf0"), "WM_GETTEXT returned incorrect string\n"); + ok(r == 5, "WM_GETTEXT returned %d, expected 5\n", r); + + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, 0); + r = SendMessageA(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM)"{\\rtf abc\x8e\xf0}"); + todo_wine ok(r == 4, "EM_REPLACESEL returned %d, expected 4\n", r); + r = SendMessageA(hwndRichEdit, EM_EXGETSEL, 0, (LPARAM)&cr); + ok(r == 0, "EM_EXGETSEL returned %d, expected 0\n", r); + todo_wine ok(cr.cpMin == 4, "EM_EXGETSEL returned cpMin=%d, expected 4\n", cr.cpMin); + todo_wine ok(cr.cpMax == 4, "EM_EXGETSEL returned cpMax=%d, expected 4\n", cr.cpMax); + r = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); + todo_wine ok(!strcmp(buffer, "abc\x8e\xf0"), "WM_GETTEXT returned incorrect string\n"); + todo_wine ok(r == 5, "WM_GETTEXT returned %d, expected 5\n", r); + } + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, 0); r = SendMessageA(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM)rtfstream); todo_wine ok(r == 12, "EM_REPLACESEL returned %d, expected 12\n", r);

1 0

Alistair Leslie-Hughes : configure: Create d3dx10 import library.
by Alexandre Julliard 07 Dec '15

07 Dec '15

Module: wine Branch: master Commit: 3f38d2a1170e63c9d9d2cbbdbf79bc094a87fe1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f38d2a1170e63c9d9d2cbbdb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Dec 5 10:23:36 2015 +1100 configure: Create d3dx10 import library. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- dlls/d3dx10_43/Makefile.in | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 885a3c5..3787828 100755 --- a/configure +++ b/configure @@ -17451,7 +17451,7 @@ wine_fn_config_dll d3dx10_39 enable_d3dx10_39 wine_fn_config_dll d3dx10_40 enable_d3dx10_40 wine_fn_config_dll d3dx10_41 enable_d3dx10_41 wine_fn_config_dll d3dx10_42 enable_d3dx10_42 -wine_fn_config_dll d3dx10_43 enable_d3dx10_43 +wine_fn_config_dll d3dx10_43 enable_d3dx10_43 implib d3dx10 wine_fn_config_dll d3dx11_42 enable_d3dx11_42 wine_fn_config_dll d3dx11_43 enable_d3dx11_43 wine_fn_config_dll d3dx9_24 enable_d3dx9_24 diff --git a/configure.ac b/configure.ac index 2d2a168..86f12c5 100644 --- a/configure.ac +++ b/configure.ac @@ -2791,7 +2791,7 @@ WINE_CONFIG_DLL(d3dx10_39) WINE_CONFIG_DLL(d3dx10_40) WINE_CONFIG_DLL(d3dx10_41) WINE_CONFIG_DLL(d3dx10_42) -WINE_CONFIG_DLL(d3dx10_43) +WINE_CONFIG_DLL(d3dx10_43,,[implib],[d3dx10]) WINE_CONFIG_DLL(d3dx11_42) WINE_CONFIG_DLL(d3dx11_43) WINE_CONFIG_DLL(d3dx9_24) diff --git a/dlls/d3dx10_43/Makefile.in b/dlls/d3dx10_43/Makefile.in index 2585f48..cb48f0d 100644 --- a/dlls/d3dx10_43/Makefile.in +++ b/dlls/d3dx10_43/Makefile.in @@ -1,4 +1,5 @@ MODULE = d3dx10_43.dll +IMPORTLIB = d3dx10 C_SRCS = \ d3dx10_43_main.c

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 07 Dec '15

07 Dec '15

Module: wine Branch: master Commit: ffbab96cc6fc486c71a2473ceee76717d84dfc40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffbab96cc6fc486c71a2473ce… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Dec 7 00:44:55 2015 +0100 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/po/de.po b/po/de.po index 86d59d4..1f56835 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-11-24 19:33+0100\n" +"PO-Revision-Date: 2015-12-07 00:44+0100\n" "Last-Translator: Julian Rüger\n" "Language-Team: German\n" "Language: de\n" @@ -9863,7 +9863,7 @@ msgstr "" "\n" "Durch Eingabe von PATH wird die aktuelle PATH-Einstellung angezeigt (der\n" "Initialwert wird aus der Registrierung ausgelesen). Um diese Einstellung zu\n" -"ändern, kann dem PATH-Befehl der neue Wert als Argument übergegeben werden.\n" +"ändern, kann dem PATH-Befehl der neue Wert als Argument übergeben werden.\n" "\n" "Es ist möglich, den Suchpfad mit Hilfe der PATH-Umgebungsvariable zu\n" "modifizieren. Zum Beispiel:\n" @@ -10120,10 +10120,10 @@ msgid "" msgstr "" "SETLOCAL startet die Begrenzung der Gültigkeit von Änderungen.\n" "\n" -"Änderungen der Umgebung nach SETLOCAL sind lokal zur\n" -"Stapelverarbeitungsdatei und werden bis zum nächsten ENDLOCAL vorgehalten\n" -"(oder bis zum Ende der Datei falls dies zuerst kommt). Ab diesem Punkt wirt\n" -"die vorherige Umgebung wiederhergestellt.\n" +"Änderungen der Umgebung nach SETLOCAL sind nur innerhalb der\n" +"Stapelverarbeitungsdatei gültig und werden bis zum nächsten ENDLOCAL\n" +"(oder dem Ende der aktuellen Datei) vorgehalten. Ab diesem Punkt wird die\n" +"vorherige Umgebung wiederhergestellt.\n" #: cmd.rc:275 msgid "" @@ -12157,19 +12157,19 @@ msgstr "Prozess \"%1\" mit der PID %2!u! wurde zum Beenden gezwungen.\n" #: taskkill.rc:40 msgid "Error: Could not find process \"%1\".\n" -msgstr "Fehler: Konnte Prozess \"%1\" nicht finden.\n" +msgstr "Fehler: Prozess \"%1\" konnte nicht gefunden werden.\n" #: taskkill.rc:41 msgid "Error: Unable to enumerate the process list.\n" -msgstr "Fehler: Konnte die Prozessliste nicht enumerieren.\n" +msgstr "Fehler: Die Prozessliste konnte nicht enumeriert werden.\n" #: taskkill.rc:42 msgid "Error: Unable to terminate process \"%1\".\n" -msgstr "Fehler: Konnte Prozess \"%1\" nicht beenden.\n" +msgstr "Fehler: Prozess \"%1\" konnte nicht beendet werden.\n" #: taskkill.rc:43 msgid "Error: Process self-termination is not permitted.\n" -msgstr "Fehler: Eigenen Prozess beenden ist nicht gestattet.\n" +msgstr "Fehler: Selbstterminierung von Prozessen ist nicht gestattet.\n" #: taskmgr.rc:37 taskmgr.rc:108 msgid "&New Task (Run...)"

1 0

Francois Gouget : po: French translation tweaks and fixes.
by Alexandre Julliard 07 Dec '15

07 Dec '15

Module: wine Branch: master Commit: 89dd06da06f2a0366764ccd5392463e0a7c72053 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89dd06da06f2a0366764ccd53… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Dec 6 19:33:24 2015 +0100 po: French translation tweaks and fixes. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fr.po | 60 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/po/fr.po b/po/fr.po index c700ac8..12972e3 100644 --- a/po/fr.po +++ b/po/fr.po @@ -848,7 +848,7 @@ msgstr "Le fichier n'existe pas" #: comdlg32.rc:40 msgid "The selection contains a non-folder object" -msgstr "La sélection contient un objet non-dossier" +msgstr "La sélection contient un élément qui n'est pas un dossier" #: comdlg32.rc:45 msgid "Up One Level" @@ -1489,7 +1489,7 @@ msgstr "Contraintes de nom" #: crypt32.rc:97 msgid "Policy Mappings" -msgstr "Mappings de politiques" +msgstr "Correspondance de politiques" #: crypt32.rc:98 msgid "Policy Constraints" @@ -1505,7 +1505,7 @@ msgstr "Politiques applicatives" #: crypt32.rc:101 msgid "Application Policy Mappings" -msgstr "Mappings de politiques applicatives" +msgstr "Correspondances de politiques applicatives" #: crypt32.rc:102 msgid "Application Policy Constraints" @@ -6671,7 +6671,7 @@ msgstr "Cette connexion réseau n'existe pas.\n" #: winerror.mc:3746 msgid "Connection reset by peer.\n" -msgstr "Connexion cloturée par le pair.\n" +msgstr "Connexion fermée par le pair.\n" #: localspl.rc:31 localui.rc:31 winspool.rc:30 msgid "Local Port" @@ -9723,11 +9723,13 @@ msgid "" "called procedure are inherited by the caller.\n" msgstr "" "CALL <fichierbatch> sert à appeler un fichier batch depuis un autre fichier\n" -"batch. Quand le fichier batch sort, le contrôle revient au fichier qui l'a\n" -"appelé. La commande CALL doit être suivie des de la procédure appelée.\n" +"batch. Quand le fichier appelé sort, le contrôle revient au fichier " +"appelant.\n" +"La commande CALL peut fournir des paramètres à la procédure appelée.\n" "\n" -"Les changements de répertoire courant, de variables d'environnement etc.\n" -"effectués dans une procédure appelée sont transmis à l'appelant.\n" +"Les changements de répertoire courant, de variables d'environnement et " +"autres\n" +"effectués dans une procédure appelée sont répercutés dans l'appelant.\n" #: cmd.rc:44 msgid "" @@ -9797,7 +9799,7 @@ msgid "" "\n" "The % sign must be doubled when using FOR in a batch file.\n" msgstr "" -"L1 commande FOR sert à exécuter une commande pour chaque fichier d'une\n" +"La commande FOR sert à exécuter une commande pour chaque fichier d'une\n" "liste de fichiers.\n" "\n" "Usage : FOR %variable IN (liste) DO commande\n" @@ -9910,8 +9912,8 @@ msgid "" msgstr "" "PATH affiche ou change le chemin de recherche de cmd.\n" "\n" -"Entrer PATH seul affiche le réglage courant de PATH (dont la valeur\n" -"initiale provient de la base de registre). Pour changer le réglage, faites\n" +"Entrer PATH seul affiche la valeur courante de PATH (qui vient\n" +"initialement de la base de registre). Pour changer le réglage, faites\n" "suivre la commande PATH par la nouvelle valeur.\n" "\n" "Il est aussi possible de modifier le PATH en utilisant la variable\n" @@ -9974,9 +9976,9 @@ msgstr "" "lecteur courant) suivi d'un signe « plus grand que » (>).\n" "(c.-à-d. la commande PROMPT $p$g).\n" "\n" -"L'invite peut aussi être adaptée en modifiant la variable d'environnement\n" -"PROMPT ; ainsi la commande « SET PROMPT=texte » a le même effet que\n" -"« PROMPT texte ».\n" +"L'invite peut aussi être modifiée via la variable d'environnement PROMPT ;\n" +"ainsi la commande « SET PROMPT=texte » a le même effet que « PROMPT " +"texte ».\n" #: cmd.rc:173 msgid "" @@ -10104,8 +10106,8 @@ msgstr "" "/affinity masque Lancer le programme avec le masque d'affinité spécifié.\n" "/wait Attendre que le programme lancé se termine, puis renvoyer\n" " son code de sortie.\n" -"/unix Utiliser un chemin Unix et lancer le fichier comme windows\n" -" explorer.\n" +"/unix Interpréter fichier_programme ou fichier_document comme un\n" +" chemin Unix.\n" "/ProgIDOpen Ouvrir un document via le programme identifié par progID.\n" "/? Afficher cette aide et se terminer.\n" @@ -10207,11 +10209,9 @@ msgstr "" "Syntaxe : ASSOC [.ext[=[typeFichier]]]\n" "\n" "ASSOC sans paramètre affiche les associations d'extensions de fichiers en\n" -"cours.\n" -"Si utilisé uniquement avec une extension de fichier, affiche l'association\n" -"actuelle.\n" -"Si aucun type de fichiers n'est spécifié après le signe égal, supprime\n" -"l'association courante, si elle existe.\n" +"cours. Si utilisé uniquement avec une extension de fichier, affiche\n" +"l'association actuelle. Si aucun type de fichier n'est spécifié après le\n" +"signe égal, supprime l'association courante, si elle existe.\n" #: cmd.rc:300 msgid "" @@ -10226,15 +10226,15 @@ msgid "" "Specifying no open command after the equal sign removes the command string\n" "associated to the specified file type.\n" msgstr "" -"FTYPE affiche ou modifie les commandes d'ouvertures associées à des types\n" +"FTYPE affiche ou modifie les commandes d'ouverture associées à des types\n" "de fichiers.\n" "\n" "Syntaxe : FTYPE [typeFichier[=[commandeOuverture]]]\n" "\n" "Sans paramètre, affiche les types de fichiers pour lesquels des chaînes de\n" "commande d'ouverture sont actuellement définies.\n" -"Si seul un type de fichier est utilisé, affiche la chaîne de commande\n" -"d'ouverture associée, si elle existe.\n" +"Si seul un type de fichier est spécifié, affiche la chaîne de commande\n" +"d'ouverture associée si elle existe.\n" "Ne spécifier aucune commande après le signe égal supprime la commande\n" "d'ouverture associée au type de fichier spécifié.\n" @@ -10250,8 +10250,8 @@ msgid "" msgstr "" "CHOICE affiche un message et bloque jusqu'à ce que l'utilisateur appuie sur\n" "une des touches spécifiées dans une liste configurable.\n" -"CHOICE est principalement utilisé pour construire une sélection de menu\n" -"dans un fichier batch.\n" +"CHOICE est principalement utilisé pour construire un menu dans un fichier\n" +"batch.\n" #: cmd.rc:312 msgid "" @@ -10807,11 +10807,11 @@ msgstr "Octets" #: netstat.rc:39 msgid "Unicast packets" -msgstr "Paquets monodiffusion" +msgstr "Paquets unicast" #: netstat.rc:40 msgid "Non-unicast packets" -msgstr "Paquets non monodiffusion" +msgstr "Paquets non unicast" #: netstat.rc:41 msgid "Discards" @@ -12126,7 +12126,7 @@ msgid "" "regsvr32: Invalid or unrecognized switch [%1]\n" "\n" msgstr "" -"regsvr32: Option [%1] invalide ou non reconnue\n" +"regsvr32 : Option [%1] invalide ou non reconnue\n" "\n" #: regsvr32.rc:42 @@ -13492,7 +13492,7 @@ msgstr "(Valeur par défaut du système)" #: winecfg.rc:91 msgid "5.1 Surround" -msgstr "Ambiophonique 5.1" +msgstr "Multicanal 5.1" #: winecfg.rc:92 msgid "Quadraphonic"

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
33
Older →

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 2015