December 2015 - Wine-Commits

Dmitry Timoshkov : winhttp/tests: Fix a typo.
by Alexandre Julliard Dec. 7, 2015

Dec. 7, 2015

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

Alexandre Julliard : user32: Fix WS_EX_DLGMODALFRAME handling in AdjustWindowRect and add more tests.
by Alexandre Julliard Dec. 7, 2015

Dec. 7, 2015

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

Boyuan Yang : readme: Add Simplified Chinese translation.
by Alexandre Julliard Dec. 7, 2015

Dec. 7, 2015

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 : po: Remove an unwanted shortcut key in the Arabic translation.
by Alexandre Julliard Dec. 7, 2015

Dec. 7, 2015

Module: wine Branch: master Commit: 20dfbe76e4f850dea68e0f12ed864f278b9814f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20dfbe76e4f850dea68e0f12e… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Dec 6 19:26:30 2015 +0100 po: Remove an unwanted shortcut key in the Arabic translation. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ar.po b/po/ar.po index b425574..bc08dc7 100644 --- a/po/ar.po +++ b/po/ar.po @@ -52,7 +52,7 @@ msgstr "&إزالة" #: appwiz.rc:75 msgid "Support Information" -msgstr "&معلومات الدّعم" +msgstr "معلومات الدّعم" #: appwiz.rc:78 avifil32.rc:54 comctl32.rc:55 comdlg32.rc:231 comdlg32.rc:261 #: comdlg32.rc:304 comdlg32.rc:358 comdlg32.rc:397 comdlg32.rc:451 credui.rc:52

1 0

Francois Gouget : po: Fix some trailing sp ace and exclamation mark issues in the Norwegian Bokmål translation.
by Alexandre Julliard Dec. 7, 2015

Dec. 7, 2015

Module: wine Branch: master Commit: 608767a86c826446918a8c8ca74f06503fa0060e URL: http://source.winehq.org/git/wine.git/?a=commit;h=608767a86c826446918a8c8ca… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Dec 6 19:06:22 2015 +0100 po: Fix some trailing space and exclamation mark issues in the Norwegian Bokmål translation. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 869e0d1..bf25bad 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -2035,7 +2035,7 @@ msgstr "Sertifikatregler" #: cryptdlg.rc:31 msgid "Policy Identifier: " -msgstr "ID for regel:" +msgstr "ID for regel: " #: cryptdlg.rc:32 msgid "Policy Qualifier Info" @@ -3451,7 +3451,7 @@ msgstr "Oppsett av Wine Internet Explorer og relaterte innstillinger" #: inetcpl.rc:33 msgid "Security settings for zone: " -msgstr "Sikkerhetsinnstillinger for sone:" +msgstr "Sikkerhetsinnstillinger for sone: " #: inetcpl.rc:34 msgid "Custom" @@ -13388,7 +13388,7 @@ msgstr "(Ingen)" #: winecfg.rc:86 msgid "Audio test failed!" -msgstr "Lydtesten feilet" +msgstr "Lydtesten feilet!" #: winecfg.rc:88 msgid "(System default)"

1 0

Francois Gouget : po: Fix ellipsis issues in the Norwegian Bokmål translation.
by Alexandre Julliard Dec. 7, 2015

Dec. 7, 2015

Module: wine Branch: master Commit: 4f2016e57feb93a6b90e035682aad1ea599b0834 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f2016e57feb93a6b90e03568… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Dec 6 19:09:17 2015 +0100 po: Fix ellipsis issues in the Norwegian Bokmål translation. The Microsoft Style Guidelines forbids inserting a space before the ellipsis in menu and button labels, unlike in regular sentences. Also Wine avoids the Unicode ellipsis character. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index bf25bad..cf75675 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -2199,7 +2199,7 @@ msgstr "&Filnavn:" #: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:309 msgid "B&rowse..." -msgstr "&Bla …" +msgstr "&Bla..." #: cryptui.rc:297 msgid "" @@ -3251,23 +3251,23 @@ msgstr "Vind&u" #: ieframe.rc:34 view.rc:33 winhlp32.rc:32 msgid "&Open..." -msgstr "&Åpne …" +msgstr "&Åpne..." #: ieframe.rc:36 notepad.rc:33 wordpad.rc:34 msgid "Save &as..." -msgstr "L&agre som …" +msgstr "L&agre som..." #: ieframe.rc:38 msgid "Print &format..." -msgstr "Utskri&ftformat …" +msgstr "Utskri&ftformat..." #: ieframe.rc:39 msgid "Pr&int..." -msgstr "Skr&iv ut …" +msgstr "Skr&iv ut..." #: ieframe.rc:40 wordpad.rc:37 msgid "Print previe&w" -msgstr "Forhånds&visning …" +msgstr "Forhånds&visning..." #: ieframe.rc:47 msgid "&Toolbars" @@ -3365,11 +3365,11 @@ msgstr "" #: inetcpl.rc:59 msgid "Delete &files..." -msgstr "Slett &filer …" +msgstr "Slett &filer..." #: inetcpl.rc:60 msgid "&Settings..." -msgstr "Inn&stillinger …" +msgstr "Inn&stillinger..." #: inetcpl.rc:68 msgid "Delete browsing history" @@ -3435,11 +3435,11 @@ msgstr "" #: inetcpl.rc:114 msgid "Certificates..." -msgstr "Sertifikater …" +msgstr "Sertifikater..." #: inetcpl.rc:115 msgid "Publishers..." -msgstr "Utgivere …" +msgstr "Utgivere..." #: inetcpl.rc:31 msgid "Internet Settings" @@ -6783,7 +6783,7 @@ msgstr "HTML-dokument" #: mshtml.rc:29 msgid "Downloading from %s..." -msgstr "Laster ned fra «%s» …" +msgstr "Laster ned fra «%s» ..." #: mshtml.rc:28 msgid "Done" @@ -10431,7 +10431,7 @@ msgstr "Klarte ikke finne PATH\n" #: cmd.rc:383 msgid "Press any key to continue... " -msgstr "Trykk en tast for å fortsette …" +msgstr "Trykk en tast for å fortsette ... " #: cmd.rc:384 msgid "Wine Command Prompt" @@ -11753,7 +11753,7 @@ msgstr "&Om Registerredigering" #: regedit.rc:91 msgid "Modify Binary Data..." -msgstr "Endre binærdata …" +msgstr "Endre binærdata..." #: regedit.rc:218 msgid "Export registry" @@ -13943,7 +13943,7 @@ msgstr "Klarte ikke lagre" #: winedbg.rc:44 msgid "Loading detailed information, please wait..." -msgstr "Laster detaljert informasjon. Vent litt …" +msgstr "Laster detaljert informasjon. Vent litt ..." #: winefile.rc:29 msgid "&Open\tEnter" @@ -13967,7 +13967,7 @@ msgstr "&Stasjon" #: winefile.rc:44 msgid "Connect &Network Drive..." -msgstr "Koble til &nettverkstasjon …" +msgstr "Koble til &nettverkstasjon..." #: winefile.rc:45 msgid "&Disconnect Network Drive" @@ -13999,7 +13999,7 @@ msgstr "Sorter etter &dato" #: winefile.rc:59 msgid "Filter by&..." -msgstr "Filtrer &etter …" +msgstr "Filtrer &etter..." #: winefile.rc:66 msgid "&Drive Bar"

1 0

Francois Gouget : po: French translation tweaks and fixes.
by Alexandre Julliard Dec. 7, 2015

Dec. 7, 2015

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

Austin English : fusion: Add a stub for CopyPDBs.
by Alexandre Julliard Dec. 7, 2015

Dec. 7, 2015

Module: wine Branch: master Commit: e3389112dfcadf88cce070452d1d114f64aebf8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3389112dfcadf88cce070452… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Dec 4 02:59:30 2015 -0500 fusion: Add a stub for CopyPDBs. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fusion/fusion.c | 9 +++++++++ dlls/fusion/fusion.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/fusion/fusion.c b/dlls/fusion/fusion.c index 6c0bc00..f9d57d1 100644 --- a/dlls/fusion/fusion.c +++ b/dlls/fusion/fusion.c @@ -52,6 +52,15 @@ HRESULT WINAPI ClearDownloadCache(void) } /****************************************************************** + * CopyPDBs (FUSION.@) + */ +HRESULT WINAPI CopyPDBs(void *unknown) +{ + FIXME("(%p) stub!\n", unknown); + return E_NOTIMPL; +} + +/****************************************************************** * CreateInstallReferenceEnum (FUSION.@) */ HRESULT WINAPI CreateInstallReferenceEnum(IInstallReferenceEnum **ppRefEnum, diff --git a/dlls/fusion/fusion.spec b/dlls/fusion/fusion.spec index 264aff7..f3a8950 100644 --- a/dlls/fusion/fusion.spec +++ b/dlls/fusion/fusion.spec @@ -1,4 +1,4 @@ -@ stub CopyPDBs +@ stdcall CopyPDBs(ptr) @ stdcall ClearDownloadCache() @ stdcall CreateApplicationContext(ptr ptr) @ stdcall CreateAssemblyCache(ptr long)

1 0

Francois Gouget : po: Remove some extraneo us ellipses in the Norwegian Bokmål translation.
by Alexandre Julliard Dec. 7, 2015

Dec. 7, 2015

Module: wine Branch: master Commit: 13cdcc414268ed51076f5e39a1b03a696a6bf802 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13cdcc414268ed51076f5e39a… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Dec 6 19:06:48 2015 +0100 po: Remove some extraneous ellipses in the Norwegian Bokmål translation. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index cf75675..bc862e8 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -3267,7 +3267,7 @@ msgstr "Skr&iv ut..." #: ieframe.rc:40 wordpad.rc:37 msgid "Print previe&w" -msgstr "Forhånds&visning..." +msgstr "Forhånds&visning" #: ieframe.rc:47 msgid "&Toolbars" @@ -11431,7 +11431,7 @@ msgstr "&Kopier...\tF8" #: progman.rc:38 msgid "&Properties\tAlt+Enter" -msgstr "&Egenskaper …\tAlt+Enter" +msgstr "&Egenskaper\tAlt+Enter" #: progman.rc:40 msgid "&Execute..." @@ -13955,7 +13955,7 @@ msgstr "Gi &nytt navn..." #: winefile.rc:34 msgid "Propert&ies\tAlt+Enter" -msgstr "&Egenskaper …\tAlt+Enter" +msgstr "&Egenskaper\tAlt+Enter" #: winefile.rc:38 msgid "Cr&eate Directory..."

1 0

Francois Gouget : po: Fuzzy some incorrect Arabic translations.
by Alexandre Julliard Dec. 7, 2015

Dec. 7, 2015

Module: wine Branch: master Commit: 2ff6e546b4a95307992a2e7f1a4404dfb87b63fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ff6e546b4a95307992a2e7f1… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Dec 6 19:15:47 2015 +0100 po: Fuzzy some incorrect Arabic translations. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 3 +++ 1 file changed, 3 insertions(+) diff --git a/po/ar.po b/po/ar.po index f88e1b9..b425574 100644 --- a/po/ar.po +++ b/po/ar.po @@ -2064,6 +2064,7 @@ msgid "General" msgstr "عام" #: cryptui.rc:191 +#, fuzzy msgid "&Install Certificate..." msgstr "معلومات" @@ -2084,6 +2085,7 @@ msgid "&Copy to File..." msgstr "ا&نسخ إلى ملف..." #: cryptui.rc:210 +#, fuzzy msgid "Certification Path" msgstr "معلومات" @@ -13330,6 +13332,7 @@ msgid "Nati&ve then Builtin" msgstr "الأصليّة ثمّ المضمّنة" #: winecfg.rc:220 +#, fuzzy msgid "Select Drive Letter" msgstr "اختر ال&كل\tCtrl+A"

1 0

Francois Gouget : po: Fix trailing colon issues in the Czech, Esperanto Japanese and Portuguese (Portugal) translations.
by Alexandre Julliard Dec. 7, 2015

Dec. 7, 2015

Module: wine Branch: master Commit: 5efd11a4de6694f06192a8de8e58212fb99fc35a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5efd11a4de6694f06192a8de8… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Dec 6 19:28:30 2015 +0100 po: Fix trailing colon issues in the Czech, Esperanto Japanese and Portuguese (Portugal) translations. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/cs.po | 2 +- po/eo.po | 2 +- po/ja.po | 2 +- po/pt_PT.po | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/po/cs.po b/po/cs.po index 81a1d50..8cbf3e3 100644 --- a/po/cs.po +++ b/po/cs.po @@ -13900,7 +13900,7 @@ msgstr "Poslední změna:" #: winefile.rc:171 msgid "Cop&yright:" -msgstr "Autorská práva" +msgstr "Autorská práva:" #: winefile.rc:173 msgid "Size:" diff --git a/po/eo.po b/po/eo.po index 562cb51..004cdad 100644 --- a/po/eo.po +++ b/po/eo.po @@ -13451,7 +13451,7 @@ msgstr "" #: winefile.rc:171 msgid "Cop&yright:" -msgstr "Kop&irajto::" +msgstr "Kop&irajto:" #: winefile.rc:173 msgid "Size:" diff --git a/po/ja.po b/po/ja.po index 4b584dd..c7aa4ee 100644 --- a/po/ja.po +++ b/po/ja.po @@ -13583,7 +13583,7 @@ msgstr "コマンド履歴" #: wineconsole.rc:69 msgid "&Buffer size:" -msgstr "バッファサイズ(&B)" +msgstr "バッファサイズ(&B):" #: wineconsole.rc:72 msgid "&Remove duplicates" diff --git a/po/pt_PT.po b/po/pt_PT.po index ff6b5eb..90a7ca8 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -2369,7 +2369,7 @@ msgstr "X.509 codificado em &DER (*.cer)" #: cryptui.rc:410 msgid "Ba&se64-encoded X.509 (*.cer):" -msgstr "X509 codificado em Base64 (*.cer)" +msgstr "X509 codificado em Base64 (*.cer):" #: cryptui.rc:412 msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (*.p7b)" @@ -2441,7 +2441,7 @@ msgstr "Todos os propósitos deste certificado não foram verificados." #: cryptui.rc:37 msgid "This certificate is intended for the following purposes:" -msgstr "Este certificado é intencionado com os seguintes propósitos::" +msgstr "Este certificado é intencionado com os seguintes propósitos:" #: cryptui.rc:38 msgid "Issued to: "

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard Dec. 7, 2015

Dec. 7, 2015

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 : winecfg: Tweak sizes and alignments so the 'Font' button does not clip in Portuguese (Portugal).
by Alexandre Julliard Dec. 7, 2015

Dec. 7, 2015

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

Dmitry Timoshkov : winhttp/tests: Fix spurious crashes under Windows.
by Alexandre Julliard Dec. 7, 2015

Dec. 7, 2015

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 Dec. 7, 2015

Dec. 7, 2015

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 Dec. 7, 2015

Dec. 7, 2015

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 Dec. 7, 2015

Dec. 7, 2015

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

Francois Gouget : po: Add a couple of missing ellipses to the Catalan translation.
by Alexandre Julliard Dec. 7, 2015

Dec. 7, 2015

Module: wine Branch: master Commit: 204fd38b096ad6a411f93c25d22ec6ed54d6fcc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=204fd38b096ad6a411f93c25d… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Dec 6 19:32:50 2015 +0100 po: Add a couple of missing ellipses to the Catalan translation. Any size issue should be fixed in the dialog using the translation. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ca.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/ca.po b/po/ca.po index 9319822..f43a5c4 100644 --- a/po/ca.po +++ b/po/ca.po @@ -3313,10 +3313,10 @@ msgctxt "home page" msgid "Home" msgstr "Inici" -# Including the ellipsis would make this string too long +# FIXME: The ellipsis makes this string too long (or not?) #: ieframe.rc:71 winhlp32.rc:69 msgid "Print..." -msgstr "Imprimeix" +msgstr "Imprimeix..." #: ieframe.rc:76 msgid "Address" @@ -9649,10 +9649,10 @@ msgstr "Ana&lògic" msgid "Digi&tal" msgstr "Digi&tal" -# Including the ellipsis would make this string too long +# FIXME: The ellipsis makes this string too long (or not?) #: clock.rc:35 notepad.rc:53 winecfg.rc:303 winefile.rc:63 wordpad.rc:84 msgid "&Font..." -msgstr "T&ipus de lletra" +msgstr "T&ipus de lletra..." #: clock.rc:37 msgid "&Without Titlebar"

1 0

Francois Gouget : po: Remove a superfluous trailing space in a Japanese translation.
by Alexandre Julliard Dec. 7, 2015

Dec. 7, 2015

Module: wine Branch: master Commit: 0f1c79e581ab52a315d4b6ef86448bdd0dc5b56c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f1c79e581ab52a315d4b6ef8… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Dec 6 19:28:24 2015 +0100 po: Remove a superfluous trailing space in a Japanese translation. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ja.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ja.po b/po/ja.po index d8b5cb0..4b584dd 100644 --- a/po/ja.po +++ b/po/ja.po @@ -11949,7 +11949,7 @@ msgstr "" " [/s] サイレントモード (一切のメッセージが表示されません)。\n" " [/i] DllInstallを呼び出し、追加の[cmdline]を渡します。\n" "\t[/u]と同時に使った場合、DllInstallはアンインストールモードで呼び出\n" -"\tされます。 \n" +"\tされます。\n" " [/n] DllRegisterServerを呼び出しません。[/i]と一緒に使用してください。\n" "\n"

1 0

Francois Gouget : po: Fix a printf-format specified in the Catalan translation.
by Alexandre Julliard Dec. 7, 2015

Dec. 7, 2015

Module: wine Branch: master Commit: 54f68565841b0cc90a812d1208cbac7bfbc30050 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54f68565841b0cc90a812d120… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Dec 6 19:28:13 2015 +0100 po: Fix a printf-format specified in the Catalan translation. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ca.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ca.po b/po/ca.po index 410cdd8..9319822 100644 --- a/po/ca.po +++ b/po/ca.po @@ -13016,7 +13016,7 @@ msgstr "" #: uninstaller.rc:31 msgid "uninstaller: The application with GUID '%1' was not found\n" -msgstr "desinstal·lador: No s'ha trobat l'aplicació amb la GUID '%s'\n" +msgstr "desinstal·lador: No s'ha trobat l'aplicació amb la GUID '%1'\n" #: uninstaller.rc:32 msgid ""

1 0

Alexandre Julliard : Wine release 1.8-rc3
by Alexandre Julliard Dec. 4, 2015

Dec. 4, 2015

Module: website Branch: master Commit: 69a8bb0b6c9de8be1b48b4a80bd06f0e2763d623 URL: http://source.winehq.org/git/website.git/?a=commit;h=69a8bb0b6c9de8be1b48b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 4 23:19:36 2015 +0900 Wine release 1.8-rc3 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2015120401.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/en/2015120401.xml b/news/en/2015120401.xml new file mode 100644 index 0000000..426f4a3 --- /dev/null +++ b/news/en/2015120401.xml @@ -0,0 +1,12 @@ +<news> +<date>December 4, 2015</date> +<title>Wine 1.8-rc3 Released</title> +<body> + The Wine development release 1.8-rc3 is now available. + <a href="{$root}/announce/1.8-rc3">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/1.8/wine-1.8-rc3.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.8-rc3 : Alexandre Julliard : Release 1.8-rc3
by Alexandre Julliard Dec. 4, 2015

Dec. 4, 2015

Module: wine Branch: refs/tags/wine-1.8-rc3 Tag: e91b5dc9bdc3fd4e72554cf8cf28636842a2c716 URL: http://source.winehq.org/git/wine.git/?a=tag;h=e91b5dc9bdc3fd4e72554cf8cf28… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 4 23:17:34 2015 +0900 Release 1.8-rc3

1 0

Alexandre Julliard : Release 1.8-rc3.
by Alexandre Julliard Dec. 4, 2015

Dec. 4, 2015

Module: wine Branch: master Commit: ffee96a80c0585fb5fcb041382540e2014d2f77b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffee96a80c0585fb5fcb04138… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 4 23:17:34 2015 +0900 Release 1.8-rc3. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 374 ++++++++++++++++++++++++++++---------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +-- 4 files changed, 177 insertions(+), 218 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ffee96a80c0585fb5fcb0…

1 0

Alexandre Julliard : gdi32: Fix StretchDIBits color mapping for monochrome bitmaps without a color table.
by Alexandre Julliard Dec. 4, 2015

Dec. 4, 2015

Module: wine Branch: master Commit: eddc4609eca7589c021e181b1701ec25b1ee0e8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=eddc4609eca7589c021e181b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 4 21:40:14 2015 +0900 gdi32: Fix StretchDIBits color mapping for monochrome bitmaps without a color table. This is the equivalent of df924f6a8ca6d4835c579141d16d866a574b380a for the StretchDIBits case. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dib.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 2817ede..cf1ebe4 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -567,22 +567,33 @@ INT nulldrv_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT he err = dev->funcs->pPutImage( dev, clip, dst_info, &src_bits, &src, &dst, rop ); if (err == ERROR_BAD_FORMAT) { + DWORD dst_colors = dst_info->bmiHeader.biClrUsed; + /* 1-bpp destination without a color table requires a fake 1-entry table - * that contains only the background color */ - if (dst_info->bmiHeader.biBitCount == 1 && !dst_info->bmiHeader.biClrUsed) + * that contains only the background color; except with a 1-bpp source, + * in which case it uses the source colors */ + if (dst_info->bmiHeader.biBitCount == 1 && !dst_colors) { - COLORREF color = GetBkColor( dev->hdc ); - dst_info->bmiColors[0].rgbRed = GetRValue( color ); - dst_info->bmiColors[0].rgbGreen = GetGValue( color ); - dst_info->bmiColors[0].rgbBlue = GetBValue( color ); - dst_info->bmiColors[0].rgbReserved = 0; - dst_info->bmiHeader.biClrUsed = 1; + if (src_info->bmiHeader.biBitCount > 1) + { + COLORREF color = GetBkColor( dev->hdc ); + dst_info->bmiColors[0].rgbRed = GetRValue( color ); + dst_info->bmiColors[0].rgbGreen = GetGValue( color ); + dst_info->bmiColors[0].rgbBlue = GetBValue( color ); + dst_info->bmiColors[0].rgbReserved = 0; + dst_info->bmiHeader.biClrUsed = 1; + } + else + { + memcpy( dst_info->bmiColors, src_info->bmiColors, 2 * sizeof(dst_info->bmiColors[0]) ); + dst_info->bmiHeader.biClrUsed = 2; + } } if (!(err = convert_bits( src_info, &src, dst_info, &src_bits ))) { /* get rid of the fake 1-bpp table */ - if (dst_info->bmiHeader.biClrUsed == 1) dst_info->bmiHeader.biClrUsed = 0; + dst_info->bmiHeader.biClrUsed = dst_colors; err = dev->funcs->pPutImage( dev, clip, dst_info, &src_bits, &src, &dst, rop ); } }

1 0

Henri Verbeet : ddraw: Do not mark surfaces as lost unconditionally when setting the cooperative level.
by Alexandre Julliard Dec. 4, 2015

Dec. 4, 2015

Module: wine Branch: master Commit: 821c2ed6a3478fadeafe7c64213b5f0af5f19d57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=821c2ed6a3478fadeafe7c642… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 4 11:30:15 2015 +0100 ddraw: Do not mark surfaces as lost unconditionally when setting the cooperative level. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 13 ++++++- dlls/ddraw/tests/ddraw1.c | 74 ++++++++++++++++++++++++++++++++++------ dlls/ddraw/tests/ddraw2.c | 74 ++++++++++++++++++++++++++++++++++------ dlls/ddraw/tests/ddraw4.c | 86 +++++++++++++++++++++++++++++++++++++++++------ dlls/ddraw/tests/ddraw7.c | 86 +++++++++++++++++++++++++++++++++++++++++------ 5 files changed, 292 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=821c2ed6a3478fadeafe7…

1 0

Henri Verbeet : ddraw: Mark surfaces as lost when the device window is deactivated.
by Alexandre Julliard Dec. 4, 2015

Dec. 4, 2015

Module: wine Branch: master Commit: 1ebb42ca534b58221b32cbf687de2ace00b4cbfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ebb42ca534b58221b32cbf68… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 4 11:30:14 2015 +0100 ddraw: Mark surfaces as lost when the device window is deactivated. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 23 ++++++++++++++++++++--- dlls/ddraw/ddraw_private.h | 3 +++ dlls/ddraw/surface.c | 23 ++++++----------------- dlls/ddraw/tests/ddraw1.c | 8 ++++---- dlls/ddraw/tests/ddraw2.c | 8 ++++---- dlls/ddraw/tests/ddraw4.c | 8 ++++---- dlls/ddraw/tests/ddraw7.c | 8 ++++---- dlls/wined3d/surface.c | 25 +------------------------ dlls/wined3d/wined3d.spec | 2 -- dlls/wined3d/wined3d_private.h | 1 - include/wine/wined3d.h | 3 --- 11 files changed, 46 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1ebb42ca534b58221b32c…

1 0

Alistair Leslie-Hughes : webservices: Add missing break.
by Alexandre Julliard Dec. 4, 2015

Dec. 4, 2015

Module: wine Branch: master Commit: 7aefdc2f18beeb27e15c60c34ee93b88e50c3a6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aefdc2f18beeb27e15c60c34… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Dec 4 20:55:22 2015 +1100 webservices: Add missing break. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 10f3aab..f701dce 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -321,6 +321,7 @@ void free_node( struct node *node ) { WS_XML_COMMENT_NODE *comment = (WS_XML_COMMENT_NODE *)node; heap_free( comment->value.bytes ); + break; } case WS_XML_NODE_TYPE_END_ELEMENT: case WS_XML_NODE_TYPE_EOF:

1 0

Dmitry Timoshkov : winhttp/tests: Add a test for data returned by IWinHttpRequest::get_ResponseText().
by Alexandre Julliard Dec. 4, 2015

Dec. 4, 2015

Module: wine Branch: master Commit: 34e88a4a7661e93f2420a82c493548ec7d6ea2de URL: http://source.winehq.org/git/wine.git/?a=commit;h=34e88a4a7661e93f2420a82c4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Dec 4 17:15:11 2015 +0800 winhttp/tests: Add a test for data returned by IWinHttpRequest::get_ResponseText(). 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, 2 insertions(+) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 1dbfe08..bc36fa2 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -3051,6 +3051,7 @@ static void test_credentials(void) static void test_IWinHttpRequest(void) { + static const WCHAR data_start[] = {'<','!','D','O','C','T','Y','P','E',' ','h','t','m','l',' ','P','U','B','L','I','C'}; static const WCHAR usernameW[] = {'u','s','e','r','n','a','m','e',0}; static const WCHAR passwordW[] = {'p','a','s','s','w','o','r','d',0}; static const WCHAR url1W[] = {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',0}; @@ -3358,6 +3359,7 @@ static void test_IWinHttpRequest(void) 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_get_Status( req, NULL );

1 0

Dmitry Timoshkov : winhttp/tests: For a secure connection check what WinHttpQueryDataAvailable() returns as well as first chunk of actual data.
by Alexandre Julliard Dec. 4, 2015

Dec. 4, 2015

Module: wine Branch: master Commit: 4b1eae9facbd028291cdc1ff77743e5732d2826a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b1eae9facbd028291cdc1ff7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Dec 4 17:14:38 2015 +0800 winhttp/tests: For a secure connection check what WinHttpQueryDataAvailable() returns as well as first chunk of actual data. 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 | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index d6b4649..1dbfe08 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -970,8 +970,9 @@ static void CALLBACK cert_error(HINTERNET handle, DWORD_PTR ctx, DWORD status, L static void test_secure_connection(void) { + static const char data_start[] = "<!DOCTYPE html PUBLIC"; HINTERNET ses, con, req; - DWORD size, status, policy, bitness, read_size, err; + DWORD size, status, policy, bitness, read_size, err, available_size; BOOL ret; CERT_CONTEXT *cert; WINHTTP_CERTIFICATE_INFO info; @@ -1050,6 +1051,11 @@ static void test_secure_connection(void) ret = WinHttpReceiveResponse(req, NULL); ok(ret, "failed to receive response %u\n", GetLastError()); + available_size = 0; + ret = WinHttpQueryDataAvailable(req, &available_size); + ok(ret, "failed to query available data %u\n", GetLastError()); + ok(available_size > 2014, "available_size = %u\n", available_size); + status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); @@ -1068,8 +1074,11 @@ static void test_secure_connection(void) ok(ret == TRUE, "WinHttpReadData failed: %u.\n", GetLastError()); if (!size) break; read_size += size; + + if (read_size <= 32) + ok(!memcmp(buffer, data_start, sizeof(data_start)-1), "not expected: %.32s\n", buffer); } - ok(read_size > 2014, "read_size = %u\n", read_size); + ok(read_size >= available_size, "read_size = %u, available_size = %u\n", read_size, available_size); cleanup: WinHttpCloseHandle(req);

1 0

Nikolay Sivov : browseui: Use defined context kind constant with CoGetMalloc().
by Alexandre Julliard Dec. 4, 2015

Dec. 4, 2015

Module: wine Branch: master Commit: 3e7da62ab85f2151906f1540510d38d4dbffdb84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e7da62ab85f2151906f15405… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 4 12:23:22 2015 +0300 browseui: Use defined context kind constant with CoGetMalloc(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/browseui/progressdlg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 70c78c9..24183bd 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -93,7 +93,7 @@ static void set_buffer(LPWSTR *buffer, LPCWSTR string) if (string == NULL) string = empty_string; - CoGetMalloc(1, &malloc); + CoGetMalloc(MEMCTX_TASK, &malloc); cb = (strlenW(string) + 1)*sizeof(WCHAR); if (*buffer == NULL || cb > IMalloc_GetSize(malloc, *buffer))

1 0

Nikolay Sivov : ole32/tests: Some tests for CoGetMalloc().
by Alexandre Julliard Dec. 4, 2015

Dec. 4, 2015

Module: wine Branch: master Commit: f797f63d24f7d4e2be74814b7fc799eefbdf0461 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f797f63d24f7d4e2be74814b7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 4 12:19:26 2015 +0300 ole32/tests: Some tests for CoGetMalloc(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/compobj.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index b03e861..10eb2fa 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -2619,6 +2619,51 @@ static void test_CoWaitForMultipleHandles(void) CoUninitialize(); } +static void test_CoGetMalloc(void) +{ + IMalloc *imalloc; + HRESULT hr; + +if (0) /* crashes on native */ + hr = CoGetMalloc(0, NULL); + + imalloc = (void*)0xdeadbeef; + hr = CoGetMalloc(0, &imalloc); +todo_wine { + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(imalloc == NULL, "got %p\n", imalloc); +} + imalloc = (void*)0xdeadbeef; + hr = CoGetMalloc(MEMCTX_SHARED, &imalloc); +todo_wine { + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(imalloc == NULL, "got %p\n", imalloc); +} + imalloc = (void*)0xdeadbeef; + hr = CoGetMalloc(MEMCTX_MACSYSTEM, &imalloc); +todo_wine { + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(imalloc == NULL, "got %p\n", imalloc); +} + imalloc = (void*)0xdeadbeef; + hr = CoGetMalloc(MEMCTX_UNKNOWN, &imalloc); +todo_wine { + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(imalloc == NULL, "got %p\n", imalloc); +} + imalloc = (void*)0xdeadbeef; + hr = CoGetMalloc(MEMCTX_SAME, &imalloc); +todo_wine { + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(imalloc == NULL, "got %p\n", imalloc); +} + imalloc = NULL; + hr = CoGetMalloc(MEMCTX_TASK, &imalloc); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(imalloc != NULL, "got %p\n", imalloc); + IMalloc_Release(imalloc); +} + static void init_funcs(void) { HMODULE hOle32 = GetModuleHandleA("ole32"); @@ -2681,4 +2726,5 @@ START_TEST(compobj) test_OleRegGetMiscStatus(); test_CoCreateGuid(); test_CoWaitForMultipleHandles(); + test_CoGetMalloc(); }

1 0

Austin English : wine.inf: Add HKCR\folder\shellex\ContextMenuHandlers and HKCR\*\shellex\ContextMenuHandlers keys.
by Alexandre Julliard Dec. 4, 2015

Dec. 4, 2015

Module: wine Branch: master Commit: c23b6f5a9f1fbe9bb6b2422a793c9b0f4d998240 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c23b6f5a9f1fbe9bb6b2422a7… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Dec 3 22:48:41 2015 -0500 wine.inf: Add HKCR\folder\shellex\ContextMenuHandlers and HKCR\*\shellex\ContextMenuHandlers keys. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index b0844c3..7c0ad09 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -175,6 +175,7 @@ HKCR,.msi,,2,"Msi.Package" HKCR,.msp,,2,"Msi.Patch" HKCR,.rtf,,2,"rtffile" HKCR,.wri,,2,"wrifile" +HKCR,*\shellex\ContextMenuHandlers,,16 HKCR,chm.file,,2,"Compiled HTML Help File" HKCR,chm.file\DefaultIcon,,2,"%10%\hh.exe,0" HKCR,chm.file\shell\open\command,,2,"%10%\hh.exe %1" @@ -188,6 +189,7 @@ HKCR,exefile\shell\open\command,,2,"""%1"" %*" HKCR,folder\shell\open\ddeexec,,2,"[ViewFolder("%l", %I, %S)]" HKCR,folder\shell\open\ddeexec,"NoActivateHandler",2,"" HKCR,folder\shell\open\ddeexec\application,,2,"Folders" +HKCR,folder\shellex\ContextMenuHandlers,,16 HKCR,hlpfile,,2,"Help File" HKCR,hlpfile\shell\open\command,,2,"%11%\winhlp32.exe %1" HKCR,htmlfile\shell\open\command,,2,"""%11%\winebrowser.exe"" -nohome"

1 0

Austin English : wine.inf: Add " HKLM\System\CurrentControlSet\Services\Eventlog\System" key.
by Alexandre Julliard Dec. 4, 2015

Dec. 4, 2015

Module: wine Branch: master Commit: 8ba649563c84015a967e36d38e969ba39803044e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ba649563c84015a967e36d38… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Dec 3 14:04:09 2015 -0600 wine.inf: Add "HKLM\System\CurrentControlSet\Services\Eventlog\System" key. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 58a8d1d..b0844c3 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3252,6 +3252,7 @@ HKLM,%CurrentVersionNT%\SvcHost,"netsvcs",0x00010008,"Schedule" [Services] HKLM,%CurrentVersion%\RunServices,"winemenubuilder",2,"%11%\winemenubuilder.exe -a -r" HKLM,"System\CurrentControlSet\Services\Eventlog\Application",,16 +HKLM,"System\CurrentControlSet\Services\Eventlog\System",,16 HKLM,"System\CurrentControlSet\Services\RpcSs",,16 HKLM,"System\CurrentControlSet\Services\Tcpip\Parameters",,16 HKLM,"System\CurrentControlSet\Services\VxD\MSTCP",,16

1 0

Sebastian Lackner : user32/tests: Add test to check ObjectNameInformation for desktop objects.
by Alexandre Julliard Dec. 4, 2015

Dec. 4, 2015

Module: wine Branch: master Commit: 8c4a785daf4b833561054e3556e094ab2ba6bf92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c4a785daf4b833561054e355… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Dec 4 01:18:51 2015 +0100 user32/tests: Add test to check ObjectNameInformation for desktop objects. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/winstation.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 30c56c3..db82026 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -23,6 +23,9 @@ #include "wingdi.h" #include "winuser.h" #include "winnls.h" +#include "winternl.h" + +static NTSTATUS (WINAPI *pNtQueryObject)(HANDLE, OBJECT_INFORMATION_CLASS, PVOID, ULONG, PULONG); #define DESKTOP_ALL_ACCESS 0x01ff @@ -388,12 +391,14 @@ static void test_enumdesktops(void) static void test_getuserobjectinformation(void) { - HDESK desk; - WCHAR bufferW[20]; - char buffer[20]; - WCHAR foobarTestW[] = {'f','o','o','b','a','r','T','e','s','t',0}; + WCHAR foobarTestW[] = {'\\','f','o','o','b','a','r','T','e','s','t',0}; WCHAR DesktopW[] = {'D','e','s','k','t','o','p',0}; + OBJECT_NAME_INFORMATION *name_info; + WCHAR bufferW[20]; + char buffer[64]; + NTSTATUS status; DWORD size; + HDESK desk; BOOL ret; desk = CreateDesktopA("foobarTest", NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL); @@ -440,9 +445,16 @@ static void test_getuserobjectinformation(void) ok(ret, "GetUserObjectInformationW returned %x\n", ret); ok(GetLastError() == 0xdeadbeef, "LastError is set to %08x\n", GetLastError()); - ok(lstrcmpW(bufferW, foobarTestW) == 0, "Buffer is not set to 'foobarTest'\n"); + ok(lstrcmpW(bufferW, foobarTestW + 1) == 0, "Buffer is not set to 'foobarTest'\n"); ok(size == 22, "size is set to %d\n", size); /* 22 bytes in 'foobarTest\0' in Unicode */ + /* ObjectNameInformation does not return the full desktop name */ + name_info = (OBJECT_NAME_INFORMATION *)buffer; + status = pNtQueryObject(desk, ObjectNameInformation, name_info, sizeof(buffer), NULL); + ok(!status, "expected STATUS_SUCCESS, got %08x\n", status); + todo_wine ok(lstrcmpW(name_info->Name.Buffer, foobarTestW) == 0, + "expected '\\foobarTest', got %s\n", wine_dbgstr_w(name_info->Name.Buffer)); + /** Tests for UOI_TYPE **/ /* Get size, test size and return value/error code */ @@ -935,6 +947,9 @@ static void test_foregroundwindow(void) START_TEST(winstation) { + HMODULE hntdll = GetModuleHandleA("ntdll.dll"); + pNtQueryObject = (void *)GetProcAddress(hntdll, "NtQueryObject"); + /* Check whether this platform supports WindowStation calls */ SetLastError( 0xdeadbeef );

1 0

Sebastian Lackner : user32: Make sure explorer.exe process is spawned for the correct desktop.
by Alexandre Julliard Dec. 4, 2015

Dec. 4, 2015

Module: wine Branch: master Commit: 19a3f6b5cb956bc4af1455bd624828478e2c0444 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19a3f6b5cb956bc4af1455bd6… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Dec 4 01:19:58 2015 +0100 user32: Make sure explorer.exe process is spawned for the correct desktop. If an invalid combination of winstation/desktop is active for the current process, the handle inheritance doesn't work, and no desktop is created. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 19 +++++++++++++++++++ dlls/user32/winstation.c | 2 +- include/wine/server_protocol.h | 5 +++-- server/protocol.def | 5 +++-- server/winstation.c | 15 ++++++++------- 5 files changed, 34 insertions(+), 12 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 360834e..1a3cd49 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -25,6 +25,7 @@ #include <stdarg.h> #include <stdlib.h> #include <string.h> + #include "windef.h" #include "winbase.h" #include "winver.h" @@ -2040,10 +2041,28 @@ HWND WINAPI GetDesktopWindow(void) WCHAR windir[MAX_PATH]; WCHAR app[MAX_PATH + sizeof(explorer)/sizeof(WCHAR)]; WCHAR cmdline[MAX_PATH + (sizeof(explorer) + sizeof(args))/sizeof(WCHAR)]; + WCHAR desktop[MAX_PATH]; void *redir; + SERVER_START_REQ( set_user_object_info ) + { + req->handle = wine_server_obj_handle( GetThreadDesktop(GetCurrentThreadId()) ); + req->flags = SET_USER_OBJECT_GET_FULL_NAME; + wine_server_set_reply( req, desktop, sizeof(desktop) - sizeof(WCHAR) ); + if (!wine_server_call( req )) + { + size_t size = wine_server_reply_size( reply ); + desktop[size / sizeof(WCHAR)] = 0; + TRACE( "starting explorer for desktop %s\n", debugstr_w(desktop) ); + } + else + desktop[0] = 0; + } + SERVER_END_REQ; + memset( &si, 0, sizeof(si) ); si.cb = sizeof(si); + si.lpDesktop = *desktop ? desktop : NULL; si.dwFlags = STARTF_USESTDHANDLES; si.hStdInput = 0; si.hStdOutput = 0; diff --git a/dlls/user32/winstation.c b/dlls/user32/winstation.c index d1353b4..ae1d6ad 100644 --- a/dlls/user32/winstation.c +++ b/dlls/user32/winstation.c @@ -632,7 +632,7 @@ BOOL WINAPI SetUserObjectInformationW( HANDLE handle, INT index, LPVOID info, DW SERVER_START_REQ( set_user_object_info ) { req->handle = wine_server_obj_handle( handle ); - req->flags = SET_USER_OBJECT_FLAGS; + req->flags = SET_USER_OBJECT_SET_FLAGS; req->obj_flags = obj_flags->dwFlags; ret = !wine_server_call_err( req ); } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 64f02a0..4e33260 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4009,7 +4009,8 @@ struct set_user_object_info_reply unsigned int old_obj_flags; /* VARARG(name,unicode_str); */ }; -#define SET_USER_OBJECT_FLAGS 1 +#define SET_USER_OBJECT_SET_FLAGS 1 +#define SET_USER_OBJECT_GET_FULL_NAME 2 @@ -6152,6 +6153,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 489 +#define SERVER_PROTOCOL_VERSION 490 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index aa37c66..04814c9 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2840,14 +2840,15 @@ enum coords_relative /* Get/set information about a user object (window station or desktop) */ @REQ(set_user_object_info) obj_handle_t handle; /* handle to the object */ - unsigned int flags; /* information to set */ + unsigned int flags; /* information to set/get */ unsigned int obj_flags; /* new object flags */ @REPLY int is_desktop; /* is object a desktop? */ unsigned int old_obj_flags; /* old object flags */ VARARG(name,unicode_str); /* object name */ @END -#define SET_USER_OBJECT_FLAGS 1 +#define SET_USER_OBJECT_SET_FLAGS 1 +#define SET_USER_OBJECT_GET_FULL_NAME 2 /* Register a hotkey */ diff --git a/server/winstation.c b/server/winstation.c index 08389bb..5016184 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -424,13 +424,13 @@ void close_thread_desktop( struct thread *thread ) } /* set the reply data from the object name */ -static void set_reply_data_obj_name( struct object *obj ) +static void set_reply_data_obj_name( struct object *obj, int full_name ) { data_size_t len; const WCHAR *ptr, *name = get_object_name( obj, &len ); /* if there is a backslash return the part of the name after it */ - if (name && (ptr = memchrW( name, '\\', len/sizeof(WCHAR) ))) + if (name && !full_name && (ptr = memchrW( name, '\\', len/sizeof(WCHAR) ))) { len -= (ptr + 1 - name) * sizeof(WCHAR); name = ptr + 1; @@ -657,14 +657,14 @@ DECL_HANDLER(set_user_object_info) struct desktop *desktop = (struct desktop *)obj; reply->is_desktop = 1; reply->old_obj_flags = desktop->flags; - if (req->flags & SET_USER_OBJECT_FLAGS) desktop->flags = req->obj_flags; + if (req->flags & SET_USER_OBJECT_SET_FLAGS) desktop->flags = req->obj_flags; } else if (obj->ops == &winstation_ops) { struct winstation *winstation = (struct winstation *)obj; reply->is_desktop = 0; reply->old_obj_flags = winstation->flags; - if (req->flags & SET_USER_OBJECT_FLAGS) winstation->flags = req->obj_flags; + if (req->flags & SET_USER_OBJECT_SET_FLAGS) winstation->flags = req->obj_flags; } else { @@ -672,7 +672,8 @@ DECL_HANDLER(set_user_object_info) release_object( obj ); return; } - if (get_reply_max_size()) set_reply_data_obj_name( obj ); + if (get_reply_max_size()) + set_reply_data_obj_name( obj, (req->flags & SET_USER_OBJECT_GET_FULL_NAME) != 0 ); release_object( obj ); } @@ -688,7 +689,7 @@ DECL_HANDLER(enum_winstation) unsigned int access = WINSTA_ENUMERATE; if (req->index > index++) continue; if (!check_object_access( &winsta->obj, &access )) continue; - set_reply_data_obj_name( &winsta->obj ); + set_reply_data_obj_name( &winsta->obj, 0 ); clear_error(); reply->next = index; return; @@ -714,7 +715,7 @@ DECL_HANDLER(enum_desktop) if (req->index > index++) continue; if (!desktop->obj.name) continue; if (!check_object_access( &desktop->obj, &access )) continue; - set_reply_data_obj_name( &desktop->obj ); + set_reply_data_obj_name( &desktop->obj, 0 ); release_object( winstation ); clear_error(); reply->next = index;

1 0

Piotr Caban : msiexec: Avoid broken pipe error caused by setting SERVICE_STOPPED state twice.
by Alexandre Julliard Dec. 4, 2015

Dec. 4, 2015

Module: wine Branch: master Commit: 0722a25dcd085a6f981bbc5651a169a4045baf38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0722a25dcd085a6f981bbc565… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 4 11:41:43 2015 +0100 msiexec: Avoid broken pipe error caused by setting SERVICE_STOPPED state twice. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/msiexec/service.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/programs/msiexec/service.c b/programs/msiexec/service.c index 59dfd0e..735cd5c 100644 --- a/programs/msiexec/service.c +++ b/programs/msiexec/service.c @@ -47,7 +47,9 @@ static BOOL UpdateSCMStatus(DWORD dwCurrentState, DWORD dwWin32ExitCode, status.dwServiceType = SERVICE_WIN32_OWN_PROCESS; status.dwCurrentState = dwCurrentState; - if (dwCurrentState == SERVICE_START_PENDING) + if (dwCurrentState == SERVICE_START_PENDING + || dwCurrentState == SERVICE_STOP_PENDING + || dwCurrentState == SERVICE_STOPPED) status.dwControlsAccepted = 0; else { @@ -81,8 +83,6 @@ static BOOL UpdateSCMStatus(DWORD dwCurrentState, DWORD dwWin32ExitCode, static void WINAPI ServiceCtrlHandler(DWORD code) { - DWORD state = SERVICE_RUNNING; - WINE_TRACE("%d\n", code); switch (code) @@ -91,14 +91,12 @@ static void WINAPI ServiceCtrlHandler(DWORD code) case SERVICE_CONTROL_STOP: UpdateSCMStatus(SERVICE_STOP_PENDING, NO_ERROR, 0); KillService(); - state = SERVICE_STOPPED; break; default: fprintf(stderr, "Unhandled service control code: %d\n", code); + UpdateSCMStatus(SERVICE_RUNNING, NO_ERROR, 0); break; } - - UpdateSCMStatus(state, NO_ERROR, 0); } static DWORD WINAPI ServiceExecutionThread(LPVOID param) @@ -150,10 +148,7 @@ static void WINAPI ServiceMain(DWORD argc, LPSTR *argv) } UpdateSCMStatus(SERVICE_RUNNING, NO_ERROR, 0); - - WaitForSingleObject(kill_event, INFINITE); - KillService(); - + WaitForSingleObject(thread, INFINITE); UpdateSCMStatus(SERVICE_STOPPED, NO_ERROR, 0); }

1 0

Alexandre Julliard : tools: Allow running installed builtin apps even when the 32-bit loader is missing.
by Alexandre Julliard Dec. 4, 2015

Dec. 4, 2015

Module: wine Branch: master Commit: 57f9c33c08782399d6729bc58b68d73812560638 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57f9c33c08782399d6729bc58… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 4 18:10:35 2015 +0900 tools: Allow running installed builtin apps even when the 32-bit loader is missing. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wineapploader.in | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/tools/wineapploader.in b/tools/wineapploader.in index 03ede5e..f48d552 100755 --- a/tools/wineapploader.in +++ b/tools/wineapploader.in @@ -25,9 +25,6 @@ appname=`basename "$0" .exe`.exe # first try explicit WINELOADER if [ -x "$WINELOADER" ]; then exec "$WINELOADER" "$appname" "$@"; fi -# then default bin directory -if [ -x "@bindir@/wine" ]; then exec "@bindir@/wine" "$appname" "$@"; fi - # now try the directory containing $0 appdir="" case "$0" in @@ -47,6 +44,21 @@ case "$0" in ;; esac if [ -x "$appdir/wine" ]; then exec "$appdir/wine" "$appname" "$@"; fi +if [ -x "$appdir/wine64" ]; then exec "$appdir/wine64" "$appname" "$@"; fi + +# now look in PATH +saved_ifs=$IFS +IFS=: +for d in $PATH +do + IFS=$saved_ifs + if [ -x "$d/wine" ]; then exec "$d/wine" "$appname" "$@"; fi + if [ -x "$d/wine64" ]; then exec "$d/wine64" "$appname" "$@"; fi +done + +# finally, the default bin directory +if [ -x "@bindir@/wine" ]; then exec "@bindir@/wine" "$appname" "$@"; fi +if [ -x "@bindir@/wine64" ]; then exec "@bindir@/wine64" "$appname" "$@"; fi -# finally look in PATH -exec wine "$appname" "$@" +echo "$0: the Wine loader is missing" +exit 1

1 0

Henri Verbeet : ddraw: Return DDERR_NOEXCLUSIVEMODE in ddraw_surface7_Flip () when not in exclusive mode.
by Alexandre Julliard Dec. 4, 2015

Dec. 4, 2015

Module: wine Branch: master Commit: 83f10e2251e7ab07e48b076aa8d0bb7dc68474a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83f10e2251e7ab07e48b076aa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 4 11:30:13 2015 +0100 ddraw: Return DDERR_NOEXCLUSIVEMODE in ddraw_surface7_Flip() when not in exclusive mode. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 45c7594..f8acb2d 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1239,6 +1239,13 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 wined3d_mutex_lock(); + if (!(dst_impl->ddraw->cooperative_level & DDSCL_EXCLUSIVE)) + { + WARN("Not in exclusive mode.\n"); + wined3d_mutex_unlock(); + return DDERR_NOEXCLUSIVEMODE; + } + tmp_rtv = ddraw_surface_get_rendertarget_view(dst_impl); tmp = dst_impl->wined3d_surface; texture = dst_impl->wined3d_texture;

1 0

Dmitry Timoshkov : winhttp/tests: Add a test for data returned by IWinHttpRequest::get_ResponseText() using an https connection.
by Alexandre Julliard Dec. 4, 2015

Dec. 4, 2015

Module: wine Branch: master Commit: 7dc055f89704c8d789c3719a25f332e4c4a2c1fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dc055f89704c8d789c3719a2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Dec 4 17:15:46 2015 +0800 winhttp/tests: Add a test for data returned by IWinHttpRequest::get_ResponseText() using an https connection. 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 | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index bc36fa2..2b460df 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -38,6 +38,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); static const WCHAR test_useragent[] = {'W','i','n','e',' ','R','e','g','r','e','s','s','i','o','n',' ','T','e','s','t',0}; static const WCHAR test_winehq[] = {'t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',0}; +static const WCHAR test_winehq_https[] = {'h','t','t','p','s',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',':','4','4','3',0}; static const WCHAR localhostW[] = {'l','o','c','a','l','h','o','s','t',0}; static BOOL proxy_active(void) @@ -3560,6 +3561,31 @@ static void test_IWinHttpRequest(void) SysFreeString( today ); VariantClear( &proxy_server ); VariantClear( &bypass_list ); + + hr = CoCreateInstance( &CLSID_WinHttpRequest, NULL, CLSCTX_INPROC_SERVER, &IID_IWinHttpRequest, (void **)&req ); + ok( hr == S_OK, "got %08x\n", hr ); + + url = SysAllocString( test_winehq_https ); + method = SysAllocString( method3W ); + V_VT( &async ) = VT_BOOL; + V_BOOL( &async ) = VARIANT_FALSE; + hr = IWinHttpRequest_Open( req, method, url, async ); + ok( hr == S_OK, "got %08x\n", hr ); + 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 ); + + IWinHttpRequest_Release( req ); + CoUninitialize(); }

1 0

Dmitry Timoshkov : winhttp/tests: Accept Windows7 return value for WinHttpQueryOption( WINHTTP_OPTION_CONNECTION_INFO).
by Alexandre Julliard Dec. 4, 2015

Dec. 4, 2015

Module: wine Branch: master Commit: 42d42daa2e9699869fe553643d8811192fcdb940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42d42daa2e9699869fe553643… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Dec 4 17:14:05 2015 +0800 winhttp/tests: Accept Windows7 return value for WinHttpQueryOption(WINHTTP_OPTION_CONNECTION_INFO). Windows7 doesn't include the size of info.cbSize field in the returned 'size' value. 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index bd6b47f..d6b4649 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2903,7 +2903,7 @@ static void test_connection_info( int port ) memset( &info, 0, sizeof(info) ); ret = WinHttpQueryOption( req, WINHTTP_OPTION_CONNECTION_INFO, &info, &size ); ok( ret, "failed to retrieve connection info %u\n", GetLastError() ); - ok( info.cbSize == sizeof(info), "wrong size %u\n", info.cbSize ); + ok( info.cbSize == sizeof(info) || info.cbSize == sizeof(info) - sizeof(info.cbSize) /* Win7 */, "wrong size %u\n", info.cbSize ); ret = WinHttpReceiveResponse( req, NULL ); ok( ret, "failed to receive response %u\n", GetLastError() ); @@ -2912,7 +2912,7 @@ static void test_connection_info( int port ) memset( &info, 0, sizeof(info) ); ret = WinHttpQueryOption( req, WINHTTP_OPTION_CONNECTION_INFO, &info, &size ); ok( ret, "failed to retrieve connection info %u\n", GetLastError() ); - ok( info.cbSize == sizeof(info), "wrong size %u\n", info.cbSize ); + ok( info.cbSize == sizeof(info) || info.cbSize == sizeof(info) - sizeof(info.cbSize) /* Win7 */, "wrong size %u\n", info.cbSize ); WinHttpCloseHandle( req ); WinHttpCloseHandle( con );

1 0

Sebastian Lackner : wineboot: Remove unused declaration for __wine_make_process_system.
by Alexandre Julliard Dec. 4, 2015

Dec. 4, 2015

Module: wine Branch: master Commit: d38b334babdb536da85b59b5f1fc5525a338b0e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d38b334babdb536da85b59b5f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Dec 4 01:28:04 2015 +0100 wineboot: Remove unused declaration for __wine_make_process_system. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineboot/wineboot.c | 1 - 1 file changed, 1 deletion(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 1477287..ee5b8d4 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -1152,7 +1152,6 @@ static const struct option long_options[] = int main( int argc, char *argv[] ) { - extern HANDLE CDECL __wine_make_process_system(void); static const WCHAR RunW[] = {'R','u','n',0}; static const WCHAR RunOnceW[] = {'R','u','n','O','n','c','e',0}; static const WCHAR RunServicesW[] = {'R','u','n','S','e','r','v','i','c','e','s',0};

1 0

Sebastian Lackner : server: Check winstation visibility in server to avoid race-conditions.
by Alexandre Julliard Dec. 4, 2015

Dec. 4, 2015

Module: wine Branch: master Commit: 6bfa3896fcbfca7a2ab51bcac463c0750d6e9272 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bfa3896fcbfca7a2ab51bcac… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Dec 4 01:17:50 2015 +0100 server: Check winstation visibility in server to avoid race-conditions. GetDesktopWindow incorrectly assumes, that the process window station is still the same one, which was used earlier when changing the desktop. By moving the visibility check to wineserver we can also avoid wineserver roundtrip for invisible desktops. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 72 +++++++++++++++++++++++++------------------------------ server/window.c | 8 +++++-- 2 files changed, 39 insertions(+), 41 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index b81c22d..360834e 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2033,45 +2033,39 @@ HWND WINAPI GetDesktopWindow(void) if (!thread_info->top_window) { - USEROBJECTFLAGS flags; - if (!GetUserObjectInformationW( GetProcessWindowStation(), UOI_FLAGS, &flags, - sizeof(flags), NULL ) || (flags.dwFlags & WSF_VISIBLE)) - { - static const WCHAR explorer[] = {'\\','e','x','p','l','o','r','e','r','.','e','x','e',0}; - static const WCHAR args[] = {' ','/','d','e','s','k','t','o','p',0}; - STARTUPINFOW si; - PROCESS_INFORMATION pi; - WCHAR windir[MAX_PATH]; - WCHAR app[MAX_PATH + sizeof(explorer)/sizeof(WCHAR)]; - WCHAR cmdline[MAX_PATH + (sizeof(explorer) + sizeof(args))/sizeof(WCHAR)]; - void *redir; - - memset( &si, 0, sizeof(si) ); - si.cb = sizeof(si); - si.dwFlags = STARTF_USESTDHANDLES; - si.hStdInput = 0; - si.hStdOutput = 0; - si.hStdError = GetStdHandle( STD_ERROR_HANDLE ); - - GetSystemDirectoryW( windir, MAX_PATH ); - strcpyW( app, windir ); - strcatW( app, explorer ); - strcpyW( cmdline, app ); - strcatW( cmdline, args ); - - Wow64DisableWow64FsRedirection( &redir ); - if (CreateProcessW( app, cmdline, NULL, NULL, FALSE, DETACHED_PROCESS, - NULL, windir, &si, &pi )) - { - TRACE( "started explorer pid %04x tid %04x\n", pi.dwProcessId, pi.dwThreadId ); - WaitForInputIdle( pi.hProcess, 10000 ); - CloseHandle( pi.hThread ); - CloseHandle( pi.hProcess ); - } - else WARN( "failed to start explorer, err %d\n", GetLastError() ); - Wow64RevertWow64FsRedirection( redir ); - } - else TRACE( "not starting explorer since winstation is not visible\n" ); + static const WCHAR explorer[] = {'\\','e','x','p','l','o','r','e','r','.','e','x','e',0}; + static const WCHAR args[] = {' ','/','d','e','s','k','t','o','p',0}; + STARTUPINFOW si; + PROCESS_INFORMATION pi; + WCHAR windir[MAX_PATH]; + WCHAR app[MAX_PATH + sizeof(explorer)/sizeof(WCHAR)]; + WCHAR cmdline[MAX_PATH + (sizeof(explorer) + sizeof(args))/sizeof(WCHAR)]; + void *redir; + + memset( &si, 0, sizeof(si) ); + si.cb = sizeof(si); + si.dwFlags = STARTF_USESTDHANDLES; + si.hStdInput = 0; + si.hStdOutput = 0; + si.hStdError = GetStdHandle( STD_ERROR_HANDLE ); + + GetSystemDirectoryW( windir, MAX_PATH ); + strcpyW( app, windir ); + strcatW( app, explorer ); + strcpyW( cmdline, app ); + strcatW( cmdline, args ); + + Wow64DisableWow64FsRedirection( &redir ); + if (CreateProcessW( app, cmdline, NULL, NULL, FALSE, DETACHED_PROCESS, + NULL, windir, &si, &pi )) + { + TRACE( "started explorer pid %04x tid %04x\n", pi.dwProcessId, pi.dwThreadId ); + WaitForInputIdle( pi.hProcess, 10000 ); + CloseHandle( pi.hThread ); + CloseHandle( pi.hProcess ); + } + else WARN( "failed to start explorer, err %d\n", GetLastError() ); + Wow64RevertWow64FsRedirection( redir ); SERVER_START_REQ( get_desktop_window ) { diff --git a/server/window.c b/server/window.c index d089149..5f32f1e 100644 --- a/server/window.c +++ b/server/window.c @@ -1953,10 +1953,14 @@ DECL_HANDLER(destroy_window) DECL_HANDLER(get_desktop_window) { struct desktop *desktop = get_thread_desktop( current, 0 ); + int force; if (!desktop) return; - if (!desktop->top_window && req->force) /* create it */ + /* if winstation is invisible, then avoid roundtrip */ + force = req->force || !(desktop->winstation->flags & WSF_VISIBLE); + + if (!desktop->top_window && force) /* create it */ { if ((desktop->top_window = create_window( NULL, NULL, DESKTOP_ATOM, 0 ))) { @@ -1965,7 +1969,7 @@ DECL_HANDLER(get_desktop_window) } } - if (!desktop->msg_window && req->force) /* create it */ + if (!desktop->msg_window && force) /* create it */ { static const WCHAR messageW[] = {'M','e','s','s','a','g','e'}; static const struct unicode_str name = { messageW, sizeof(messageW) };

1 0

Olivier F. R. Dierick : shlwapi/tests: Test SHFreeShared with NULL handle.
by Alexandre Julliard Dec. 3, 2015

Dec. 3, 2015

Module: wine Branch: master Commit: 71bbd8da87109161448c7c6d7f6fcfa721b6c746 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71bbd8da87109161448c7c6d7… Author: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Date: Wed Dec 2 00:44:20 2015 +0100 shlwapi/tests: Test SHFreeShared with NULL handle. Signed-off-by: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/ordinal.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 68526cd..bd3d46a 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -516,6 +516,11 @@ static void test_alloc_shared(int argc, char **argv) ret = pSHFreeShared(hmem2, procid); ok(ret, "SHFreeShared failed: %u\n", GetLastError()); } + + SetLastError(0xdeadbeef); + ret = pSHFreeShared(NULL, procid); + ok(ret, "SHFreeShared failed: %u\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef, "last error should not have changed, got %u\n", GetLastError()); } static void test_alloc_shared_remote(DWORD procid, HANDLE hmem)

1 0

Olivier F. R. Dierick : shlwapi: SHFreeShared returns TRUE when passed NULL handle.
by Alexandre Julliard Dec. 3, 2015

Dec. 3, 2015

Module: wine Branch: master Commit: de0d8719d2b32b01261a2b93cb92a2f52c8b24cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=de0d8719d2b32b01261a2b93c… Author: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Date: Wed Dec 2 00:39:12 2015 +0100 shlwapi: SHFreeShared returns TRUE when passed NULL handle. Signed-off-by: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/ordinal.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 3c8af5c..699fcc6 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -259,6 +259,9 @@ BOOL WINAPI SHFreeShared(HANDLE hShared, DWORD dwProcId) TRACE("(%p %d)\n", hShared, dwProcId); + if (!hShared) + return TRUE; + /* Get a copy of the handle for our process, closing the source handle */ hClose = SHMapHandle(hShared, dwProcId, GetCurrentProcessId(), FILE_MAP_ALL_ACCESS,DUPLICATE_CLOSE_SOURCE);

1 0

Jacek Caban : ieframe: Fixed tests on some VMs.
by Alexandre Julliard Dec. 3, 2015

Dec. 3, 2015

Module: wine Branch: master Commit: d5bbf847ade5667ba90cfd5881852c53cc0bbf69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5bbf847ade5667ba90cfd588… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 3 11:46:58 2015 +0100 ieframe: Fixed tests on some VMs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/tests/webbrowser.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 1cd8f75..3201499 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -2877,7 +2877,7 @@ static void test_download(DWORD flags) test_ready_state((flags & (DWL_FROM_PUT_HREF|DWL_FROM_GOBACK|DWL_FROM_GOFORWARD|DWL_REFRESH)) ? READYSTATE_COMPLETE : READYSTATE_LOADING); - if(flags & (DWL_EXPECT_BEFORE_NAVIGATE|(is_http ? DWL_FROM_PUT_HREF : 0)|DWL_FROM_GOFORWARD)) + if(flags & (DWL_EXPECT_BEFORE_NAVIGATE|(is_http ? DWL_FROM_PUT_HREF : 0)|DWL_FROM_GOFORWARD|DWL_REFRESH)) SET_EXPECT(Invoke_PROPERTYCHANGE); if(flags & DWL_EXPECT_BEFORE_NAVIGATE) { @@ -2946,7 +2946,7 @@ static void test_download(DWORD flags) if(flags & (DWL_EXPECT_BEFORE_NAVIGATE|(is_http ? DWL_FROM_PUT_HREF : 0))) todo_wine CHECK_CALLED(Invoke_PROPERTYCHANGE); - else if(flags & DWL_FROM_GOFORWARD) + else if(flags & (DWL_FROM_GOFORWARD|DWL_REFRESH)) CLEAR_CALLED(Invoke_PROPERTYCHANGE); /* called by IE11 */ if(flags & DWL_EXPECT_BEFORE_NAVIGATE) {

1 0

Michael Müller : winedbg: Print windows version in system info.
by Alexandre Julliard Dec. 3, 2015

Dec. 3, 2015

Module: wine Branch: master Commit: a78efe16f7b0ca9475d153d98f4c2053cde0ca62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a78efe16f7b0ca9475d153d98… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Dec 3 00:20:25 2015 +0100 winedbg: Print windows version in system info. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/tgt_active.c | 58 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 989e433..07edccc 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -678,6 +678,63 @@ static HANDLE create_temp_file(void) NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_DELETE_ON_CLOSE, 0 ); } +static const struct +{ + int type; + int platform; + int major; + int minor; + const char *str; +} +version_table[] = +{ + { 0, VER_PLATFORM_WIN32s, 2, 0, "2.0" }, + { 0, VER_PLATFORM_WIN32s, 3, 0, "3.0" }, + { 0, VER_PLATFORM_WIN32s, 3, 10, "3.1" }, + { 0, VER_PLATFORM_WIN32_WINDOWS, 4, 0, "95" }, + { 0, VER_PLATFORM_WIN32_WINDOWS, 4, 10, "98" }, + { 0, VER_PLATFORM_WIN32_WINDOWS, 4, 90, "ME" }, + { VER_NT_WORKSTATION, VER_PLATFORM_WIN32_NT, 3, 51, "NT 3.51" }, + { VER_NT_WORKSTATION, VER_PLATFORM_WIN32_NT, 4, 0, "NT 4.0" }, + { VER_NT_WORKSTATION, VER_PLATFORM_WIN32_NT, 5, 0, "2000" }, + { VER_NT_WORKSTATION, VER_PLATFORM_WIN32_NT, 5, 1, "XP" }, + { VER_NT_WORKSTATION, VER_PLATFORM_WIN32_NT, 5, 2, "XP" }, + { VER_NT_SERVER, VER_PLATFORM_WIN32_NT, 5, 2, "Server 2003" }, + { VER_NT_WORKSTATION, VER_PLATFORM_WIN32_NT, 6, 0, "Vista" }, + { VER_NT_SERVER, VER_PLATFORM_WIN32_NT, 6, 0, "Server 2008" }, + { VER_NT_WORKSTATION, VER_PLATFORM_WIN32_NT, 6, 1, "7" }, + { VER_NT_SERVER, VER_PLATFORM_WIN32_NT, 6, 1, "Server 2008 R2" }, + { VER_NT_WORKSTATION, VER_PLATFORM_WIN32_NT, 6, 2, "8" }, + { VER_NT_SERVER, VER_PLATFORM_WIN32_NT, 6, 2, "Server 2012" }, + { VER_NT_WORKSTATION, VER_PLATFORM_WIN32_NT, 6, 3, "8.1" }, + { VER_NT_SERVER, VER_PLATFORM_WIN32_NT, 6, 3, "Server 2012 R2" }, + { VER_NT_WORKSTATION, VER_PLATFORM_WIN32_NT, 10, 0, "10" }, +}; + +static const char *get_windows_version(void) +{ + OSVERSIONINFOEXW info = { sizeof(OSVERSIONINFOEXW) }; + static char str[64]; + int i; + + GetVersionExW( (OSVERSIONINFOW *)&info ); + + for (i = 0; i < sizeof(version_table) / sizeof(version_table[0]); i++) + { + if (version_table[i].type == info.wProductType && + version_table[i].platform == info.dwPlatformId && + version_table[i].major == info.dwMajorVersion && + version_table[i].minor == info.dwMinorVersion) + { + return version_table[i].str; + } + } + + snprintf( str, sizeof(str), "%d.%d (%d)", info.dwMajorVersion, + info.dwMinorVersion, info.wProductType ); + return str; +} + static void output_system_info(void) { #ifdef __i386__ @@ -705,6 +762,7 @@ static void output_system_info(void) dbg_printf( "System information:\n" ); if (wine_get_build_id) dbg_printf( " Wine build: %s\n", wine_get_build_id() ); dbg_printf( " Platform: %s%s\n", platform, is_wow64 ? " (WOW64)" : "" ); + dbg_printf( " Version: Windows %s\n", get_windows_version() ); if (wine_get_host_version) { const char *sysname, *release;

1 0

Sebastian Lackner : oleaut32/tests: Add test for calling method with coclass argument.
by Alexandre Julliard Dec. 3, 2015

Dec. 3, 2015

Module: wine Branch: master Commit: 3690fa04015174de9b015eaa5a5c584c29070eba URL: http://source.winehq.org/git/wine.git/?a=commit;h=3690fa04015174de9b015eaa5… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Dec 3 00:49:35 2015 +0100 oleaut32/tests: Add test for calling method with coclass argument. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/tmarshal.c | 29 ++++++++++++++++++++++++++--- dlls/oleaut32/tests/tmarshal.idl | 3 +++ dlls/oleaut32/tests/tmarshal_dispids.h | 1 + 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 4a990af..d2b8dc9 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -598,7 +598,7 @@ static HRESULT WINAPI Widget_CloneCoclass( ApplicationObject2 **ppVal) { trace("CloneCoclass()\n"); - return S_OK; + return Widget_QueryInterface(iface, &IID_IWidget, (void **)ppVal); } static HRESULT WINAPI Widget_Value( @@ -909,6 +909,14 @@ static HRESULT WINAPI Widget_VarArg_Ref_Run( return S_OK; } +static HRESULT WINAPI Widget_Coclass( + IWidget *iface, ApplicationObject2 *param) +{ + trace("Coclass(%p)\n", param); + ok(param == (ApplicationObject2 *)iface, "expected param == %p, got %p\n", iface, param); + return S_OK; +} + static const struct IWidgetVtbl Widget_VTable = { Widget_QueryInterface, @@ -948,7 +956,8 @@ static const struct IWidgetVtbl Widget_VTable = Widget_pos_restrict, Widget_neg_restrict, Widget_VarArg_Run, - Widget_VarArg_Ref_Run + Widget_VarArg_Ref_Run, + Widget_Coclass, }; static HRESULT WINAPI StaticWidget_QueryInterface(IStaticWidget *iface, REFIID riid, void **ppvObject) @@ -1494,8 +1503,22 @@ static void test_typelibmarshal(void) excepinfo.wCode, excepinfo.scode); ok(V_VT(&varresult) == VT_DISPATCH, "V_VT(&varresult) was %d instead of VT_DISPATCH\n", V_VT(&varresult)); - ok(!V_DISPATCH(&varresult), "V_DISPATCH(&varresult) should be NULL instead of %p\n", V_DISPATCH(&varresult)); + ok(V_DISPATCH(&varresult) != NULL, "expected V_DISPATCH(&varresult) != NULL\n"); + + /* call Coclass with VT_DISPATCH type */ + vararg[0] = varresult; + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.cArgs = 1; + dispparams.rgvarg = vararg; + VariantInit(&varresult); + hr = IDispatch_Invoke(pDispatch, DISPID_TM_COCLASS, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); + todo_wine ok_ole_success(hr, IDispatch_Invoke); + ok(excepinfo.wCode == 0x0 && excepinfo.scode == S_OK, + "EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n", + excepinfo.wCode, excepinfo.scode); VariantClear(&varresult); + VariantClear(&vararg[0]); /* call Value with a VT_VARIANT|VT_BYREF type */ V_VT(&vararg[0]) = VT_VARIANT|VT_BYREF; diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index 680f4b4..12c0bd5 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -185,6 +185,9 @@ library TestTypelib [id(DISPID_TM_VARARG_REF_RUN), vararg] HRESULT VarArg_Ref_Run([in] BSTR name, [in] SAFEARRAY(VARIANT) *params, [out, retval] VARIANT *result); + + [id(DISPID_TM_COCLASS)] + HRESULT Coclass([in] ApplicationObject2 *param); } [ diff --git a/dlls/oleaut32/tests/tmarshal_dispids.h b/dlls/oleaut32/tests/tmarshal_dispids.h index dfca216..26f4027 100644 --- a/dlls/oleaut32/tests/tmarshal_dispids.h +++ b/dlls/oleaut32/tests/tmarshal_dispids.h @@ -46,6 +46,7 @@ #define DISPID_TM_TESTSECONDIFACE 27 #define DISPID_TM_VARARG_RUN 28 #define DISPID_TM_VARARG_REF_RUN 29 +#define DISPID_TM_COCLASS 30 #define DISPID_NOA_BSTRRET 1 #define DISPID_NOA_ERROR 2

1 0

Qian Hong : ntdll/tests: Add SIMD exception test for floating point invalid operation fault.
by Alexandre Julliard Dec. 3, 2015

Dec. 3, 2015

Module: wine Branch: master Commit: 6a03e618df280dcfd8fce1223a871fbd89b227cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a03e618df280dcfd8fce1223… Author: Qian Hong <qhong(a)codeweavers.com> Date: Thu Dec 3 00:06:50 2015 +0800 ntdll/tests: Add SIMD exception test for floating point invalid operation fault. Signed-off-by: Qian Hong <qhong(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 57 +++++++++++++++++++++++++++++++------------- 1 file changed, 41 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 8477988..221d86a 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1015,22 +1015,25 @@ static DWORD simd_fault_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_R context->Eip += 3; /* skip addps */ return ExceptionContinueExecution; } - - /* stage 2 - divide by zero fault */ - if( rec->ExceptionCode == EXCEPTION_ILLEGAL_INSTRUCTION) - skip("system doesn't support SIMD exceptions\n"); - else { - ok( rec->ExceptionCode == STATUS_FLOAT_MULTIPLE_TRAPS, - "exception code: %#x, should be %#x\n", - rec->ExceptionCode, STATUS_FLOAT_MULTIPLE_TRAPS); - ok( rec->NumberParameters == 1 || broken(is_wow64 && rec->NumberParameters == 2), - "# of params: %i, should be 1\n", - rec->NumberParameters); - if( rec->NumberParameters == 1 ) - ok( rec->ExceptionInformation[0] == 0, "param #1: %lx, should be 0\n", rec->ExceptionInformation[0]); + else if ( *stage == 2 || *stage == 3 ) { + /* stage 2 - divide by zero fault */ + /* stage 3 - invalid operation fault */ + if( rec->ExceptionCode == EXCEPTION_ILLEGAL_INSTRUCTION) + skip("system doesn't support SIMD exceptions\n"); + else { + ok( rec->ExceptionCode == STATUS_FLOAT_MULTIPLE_TRAPS, + "exception code: %#x, should be %#x\n", + rec->ExceptionCode, STATUS_FLOAT_MULTIPLE_TRAPS); + ok( rec->NumberParameters == 1 || broken(is_wow64 && rec->NumberParameters == 2), + "# of params: %i, should be 1\n", + rec->NumberParameters); + if( rec->NumberParameters == 1 ) + ok( rec->ExceptionInformation[0] == 0, "param #1: %lx, should be 0\n", rec->ExceptionInformation[0]); + } + context->Eip += 3; /* skip divps */ } - - context->Eip += 3; /* skip divps */ + else + ok(FALSE, "unexpected stage %x\n", *stage); return ExceptionContinueExecution; } @@ -1054,6 +1057,21 @@ static const BYTE simd_exception_test[] = { 0xc3, /* ret */ }; +static const BYTE simd_exception_test2[] = { + 0x83, 0xec, 0x4, /* sub $0x4, %esp */ + 0x0f, 0xae, 0x1c, 0x24, /* stmxcsr (%esp) */ + 0x8b, 0x04, 0x24, /* mov (%esp),%eax * store mxcsr */ + 0x66, 0x81, 0x24, 0x24, 0x7f, 0xff, /* andw $0xff7f,(%esp) * enable invalid */ + 0x0f, 0xae, 0x14, 0x24, /* ldmxcsr (%esp) * operation exceptions */ + 0x0f, 0x57, 0xc9, /* xorps %xmm1,%xmm1 * clear dividend */ + 0x0f, 0x57, 0xc0, /* xorps %xmm0,%xmm0 * clear divisor */ + 0x0f, 0x5e, 0xc8, /* divps %xmm0,%xmm1 * generate fault */ + 0x89, 0x04, 0x24, /* mov %eax,(%esp) * restore to old mxcsr */ + 0x0f, 0xae, 0x14, 0x24, /* ldmxcsr (%esp) */ + 0x83, 0xc4, 0x04, /* add $0x4,%esp */ + 0xc3, /* ret */ +}; + static const BYTE sse_check[] = { 0x0f, 0x58, 0xc8, /* addps %xmm0,%xmm1 */ 0xc3, /* ret */ @@ -1077,7 +1095,14 @@ static void test_simd_exceptions(void) got_exception = 0; run_exception_test(simd_fault_handler, &stage, simd_exception_test, sizeof(simd_exception_test), 0); - ok( got_exception == 1, "got exception: %i, should be 1\n", got_exception); + ok(got_exception == 1, "got exception: %i, should be 1\n", got_exception); + + /* generate a SIMD exception, test FPE_FLTINV */ + stage = 3; + got_exception = 0; + run_exception_test(simd_fault_handler, &stage, simd_exception_test2, + sizeof(simd_exception_test2), 0); + ok(got_exception == 1, "got exception: %i, should be 1\n", got_exception); } struct fpu_exception_info

1 0

Qian Hong : ntdll: Silence useless fixme message when handling SIMD floating point invalid operation exception.
by Alexandre Julliard Dec. 3, 2015

Dec. 3, 2015

Module: wine Branch: master Commit: 10d080aa8dfeea22384df3440b8c05e1d8be61c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10d080aa8dfeea22384df3440… Author: Qian Hong <qhong(a)codeweavers.com> Date: Thu Dec 3 00:07:18 2015 +0800 ntdll: Silence useless fixme message when handling SIMD floating point invalid operation exception. Signed-off-by: Qian Hong <qhong(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 5582299..a3abbff 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2163,7 +2163,7 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) /* TODO: * Behaviour only tested for divide-by-zero exceptions * Check for other SIMD exceptions as well */ - if(siginfo->si_code != FPE_FLTDIV) + if(siginfo->si_code != FPE_FLTDIV && siginfo->si_code != FPE_FLTINV) FIXME("untested SIMD exception: %#x. Might not work correctly\n", siginfo->si_code);

1 0

Qian Hong : ntdll/tests: Restore old value in a more context independent way.
by Alexandre Julliard Dec. 3, 2015

Dec. 3, 2015

Module: wine Branch: master Commit: b4172c08dd2200afe53e165c821f29bffd92dd81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4172c08dd2200afe53e165c8… Author: Qian Hong <qhong(a)codeweavers.com> Date: Thu Dec 3 00:07:36 2015 +0800 ntdll/tests: Restore old value in a more context independent way. Signed-off-by: Qian Hong <qhong(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 221d86a..a368997 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1041,6 +1041,7 @@ static DWORD simd_fault_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_R static const BYTE simd_exception_test[] = { 0x83, 0xec, 0x4, /* sub $0x4, %esp */ 0x0f, 0xae, 0x1c, 0x24, /* stmxcsr (%esp) */ + 0x8b, 0x04, 0x24, /* mov (%esp),%eax * store mxcsr */ 0x66, 0x81, 0x24, 0x24, 0xff, 0xfd, /* andw $0xfdff,(%esp) * enable divide by */ 0x0f, 0xae, 0x14, 0x24, /* ldmxcsr (%esp) * zero exceptions */ 0x6a, 0x01, /* push $0x1 */ @@ -1051,7 +1052,7 @@ static const BYTE simd_exception_test[] = { 0x0f, 0x57, 0xc0, /* xorps %xmm0,%xmm0 * clear divisor */ 0x0f, 0x5e, 0xc8, /* divps %xmm0,%xmm1 * generate fault */ 0x83, 0xc4, 0x10, /* add $0x10,%esp */ - 0x66, 0x81, 0x0c, 0x24, 0x00, 0x02, /* orw $0x200,(%esp) * disable exceptions */ + 0x89, 0x04, 0x24, /* mov %eax,(%esp) * restore to old mxcsr */ 0x0f, 0xae, 0x14, 0x24, /* ldmxcsr (%esp) */ 0x83, 0xc4, 0x04, /* add $0x4,%esp */ 0xc3, /* ret */

1 0