April 2020 - Wine-devel - list.winehq.org

[PATCH 4/4] math.h: Use builtin nan and inf on clang MSVC target.
by Jacek Caban 26 Apr '20

26 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/math.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 2/4] wincon.h: Don't use calling convention wrappers on MSVC.
by Jacek Caban 26 Apr '20

26 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/console.c | 2 +- dlls/kernelbase/console.c | 2 +- include/wincon.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

1 0

[PATCH 1/4] wine/exception.h: Don't override __attribute__ keyword on clang MSVC target.
by Jacek Caban 26 Apr '20

26 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/wine/exception.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

wineserver crash during WineTest
by Francois Gouget 26 Apr '20

26 Apr '20

So I did not have time to look into this yet but last wednesday wineserver started crashing during WineTest. So it's likely a patch in f65cfbfe9b20..f52b33c63064. https://test.winehq.org/data/ Apparently the crash happens around the time that the ntdll tests are running but of course all is fine when manually running 'cd dlls/ntdll/tests && make -j1 test'... but it does happen if I run ./wine winetest.exe -c -t foo -m foo ntdll. https://testbot.winehq.org/JobDetails.pl?Key=70494&f101=task.log#k102 Is this a known issue? -- Francois Gouget <fgouget(a)codeweavers.com>

2 1

[PATCH try 2] wshom.ocx: Use wide character string literals
by Dmitry Kislyuk 26 Apr '20

26 Apr '20

1 0

[PATCH] wshom.ocx: Use wide character string literals
by Dmitry Kislyuk 26 Apr '20

26 Apr '20

1 0

[PATCH 00/17] Initial implementation of a USB kernel driver
by Zebediah Figura 26 Apr '20

26 Apr '20

This is enough to allow CASIO FA-124 to function, tested here with an fx-9750GII graphing calculator. The software must be installed in a 32-bit Windows XP prefix to work around bug 45455, and also requires native mfc42, but works nicely afterwards. Linux does not make USB devices writable by default, so users will need to set udev rules, or perform some other configuration, for devices which they wish to use through Wine. The code supports hotplugging in theory, but I ran into a problem where udev rules race with libusb discovery, such that libusb will pick up a device before udev has granted us write permissions. I'm not sure how to resolve this; possibly it's something that can be fixed on the host side. Zebediah Figura (17): wineusb.sys: New stub driver. wineusb.sys: Implement AddDevice(). wineusb.sys: Implement basic IRP_MJ_PNP requests for the bus FDO. wineusb.sys: Start an event handler thread. wineusb.sys: Create USB devices. wineusb.sys: Implement IRP_MN_QUERY_DEVICE_RELATIONS. wineusb.sys: Implement device and instance IDs. wineusb.sys: Implement hardware IDs. wineusb.sys: Return compatible IDs. wineusb.inf: Add new INF file. wineboot: Install wineusb as a root-enumerated PnP service. wineusb.sys: Implement URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE. wineusb.sys: Stub URB_FUNCTION_SELECT_CONFIGURATION. wineusb.sys: Implement URB_FUNCTION_VENDOR_INTERFACE. wineusb.sys: Implement URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER. wineusb.sys: Implement URB_FUNCTION_ABORT_PIPE. wineusb.sys: Implement URB_FUNCTION_SYNC_RESET_PIPE_AND_CLEAR_STALL. configure.ac | 13 + dlls/wineusb.sys/Makefile.in | 8 + dlls/wineusb.sys/wineusb.c | 759 ++++++++++++++++++++++++++++++ dlls/wineusb.sys/wineusb.sys.spec | 1 + include/ddk/usbioctl.h | 2 + loader/Makefile.in | 3 +- loader/wine.inf.in | 3 + loader/wineusb.inf.in | 22 + programs/wineboot/wineboot.c | 1 + 9 files changed, 811 insertions(+), 1 deletion(-) create mode 100644 dlls/wineusb.sys/Makefile.in create mode 100644 dlls/wineusb.sys/wineusb.c create mode 100644 dlls/wineusb.sys/wineusb.sys.spec create mode 100644 loader/wineusb.inf.in -- 2.26.0

3 14

[website] zh-cn: Update forums page.
by Jactry Zeng 26 Apr '20

26 Apr '20

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- templates/zh-cn/forums.template | 81 +++++++++++++++------------------ 1 file changed, 37 insertions(+), 44 deletions(-) diff --git a/templates/zh-cn/forums.template b/templates/zh-cn/forums.template index a33228fa..7304801e 100644 --- a/templates/zh-cn/forums.template +++ b/templates/zh-cn/forums.template @@ -1,18 +1,17 @@  - <h1 class="title">主要的邮件列表/论坛</h1> - Wine 有很多邮件列表和论坛，这里列举了对用户最有用的一些： +Wine 有很多邮件列表和论坛，这里列举了对用户最有用的一些： <ul> - <li><a href="//forums.winehq.org"> WineHQ 论坛</a></li> + <li><a href="//forum.winehq.org">WineHQ 论坛</a></li> - <li> Ubuntu 用户也许还想去 <a href="http://ubuntuforums.org/forumdisplay.php?f=313">Ubuntu 论坛 Wine 板块</a> + <li>Ubuntu 用户也许还想去 <a href="http://ubuntuforums.org/forumdisplay.php?f=313">Ubuntu 论坛 Wine 板块</a> <li>或许您还想去 <a href="http://www.linuxforums.org/forum/wine/">Linux Forums 的 Wine 板块</a> - <li>如果你想被告知最新的发布，请订阅 <a href="//www.winehq.org/mailman/listinfo/wine-announce"> Wine-Announce 邮件列表 </a></li> + <li>如果你想被告知最新的发布，请订阅 <a href="//www.winehq.org/mailman/listinfo/wine-announce">Wine-Announce 邮件列表 </a></li> </ul> 请不要新建英文的 Wine 论坛了（除非是一个流行发行版主要论坛上的 Wine 板块）。 @@ -22,90 +21,84 @@ <h2>所有 WineHQ 邮件列表</h2> WineHQ 分别有用于提交 patches、追踪 Git 提交、讨论 Wine 的邮件列表。他们拥有可定制的用户订阅配置，可以<a href="//www.winehq.org/mailman/listinfo">通过 -WWW</a>，或者发送一封标题为“subscribe”的邮件到 指定列表名称-request(a)winehq.org 来订阅。 -如果想取消订阅，则使用“unsubscribe 密码”作为标题，密码是你在你订阅时获得的。 +WWW</a>，或者发送一封标题为 <code>"subscribe"</code> 的邮件到 <code><指定列表名称>-request(a)winehq.org</code> 来订阅。 +如果想取消订阅，则使用 <code>"unsubscribe <密码>"</code> 作为标题，密码是你在你订阅时获得的。或者直接使用 <a href="//www.winehq.org/mailman/listinfo">Mailman web 界面</a>。 +<div class="alert alert-warning"> + <h3 class="nomargin-top"> Web 界面需要密码登录</h3> + + 因为邮件列表不断得受到爬虫干扰，访问 Mailman 的 web 界面开启了密码保护。 + + + 用户名： <code>mailman</code> + 密码： <code>getalist</code> + + 密码会时不时更新，请从这里获取最新的密码。 +</div> + 注意： 你必须订阅后才能发送邮件到列表，否则你的邮件将被邮件列表软件判定为垃圾邮件。 <ul class="roomy"> <li> + <a href="mailto:wine-announce(a)winehq.org">wine-announce(a)winehq.org</a> [<a href="//www.winehq.org/mailman/listinfo/wine-announce">（取消）订阅</a>] [<a href="//www.winehq.org/pipermail/wine-announce/">存档 1</a>] - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.announce">存档 2</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.announce">via newsreader</a>] - <a href="mailto:wine-announce(a)winehq.org">wine-announce(a)winehq.org</a> + [<a href="http://news.gmane.org/gmane.comp.emulators.wine.announce">存档 2</a>] 一个低流量（2封/月）的只读列表，用于宣布发布和其他主要的 Wine 或者 WineHQ 消息。 </li> <li> - [<a href="//www.winehq.org/pipermail/wine-users/">存档 1</a>] - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.user">存档 2</a>] - 一个中等流量（50封/天）的开放性列表，用于终端用户讨论。 - </li> - - <li> + <a href="mailto:wine-zh(a)freelists.org">wine-zh(a)freelists.org</a> [<a href="http://www.freelists.org/list/wine-zh">（取消）订阅</a>] - [<a href="http://www.freelists.org/archive/wine-zh/">存档</a>] - <a href="mailto:wine-zh(a)freelists.org">wine-zh(a)freelists.org</a> + [<a href="http://www.freelists.org/archive/wine-zh/">Archive</a>] 一个低流量（10封/天）的开放性列表，用于中文终端用户讨论。 </li> <li> + <a href="mailto:wine-devel(a)winehq.org">wine-devel(a)winehq.org</a> [<a href="//www.winehq.org/mailman/listinfo/wine-devel">（取消）订阅</a>] [<a href="//www.winehq.org/pipermail/wine-devel/">存档 1</a>] - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.devel">存档 2</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.devel">via newsreader</a>] - <a href="mailto:wine-devel(a)winehq.org">wine-devel(a)winehq.org</a> + [<a href="http://news.gmane.org/gmane.comp.emulators.wine.devel">存档 2</a>] 一个中等流量（50封/天）的开放性列表，用于讨论 Wine 开发、WineHQ、patches 或者其他 Wine 开发者感兴趣的事情。 </li> <li> - [<a href="//www.winehq.org/mailman/listinfo/wine-patches">（取消）订阅</a>] - [<a href="//www.winehq.org/pipermail/wine-patches/">存档 1</a>] - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">存档 2</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.patches">via newsreader</a>] - <a href="mailto:wine-patches(a)winehq.org">wine-patches(a)winehq.org</a> - 一个中等流量（45封/天）的开放性列表，只用于提交 patches。 + <a href="mailto:wine-patches(a)winehq.org">wine-patches(a)winehq.org</a> + [<a href="//www.winehq.org/mailman/listinfo/wine-patches">（取消）订阅</a>] + [<a href="//www.winehq.org/pipermail/wine-patches/">存档 1</a>] + [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">存档 2</a>] + 一个已经废弃的用于提交补丁的列表。请使用 <a href="mailto:wine-devel(a)winehq.org">wine-devel(a)winehq.org</a> 代替。 </li> <li> + <a href="mailto:wine-cvs(a)winehq.org">wine-cvs(a)winehq.org</a> [<a href="//www.winehq.org/mailman/listinfo/wine-cvs">（取消）订阅</a>] [<a href="//www.winehq.org/pipermail/wine-cvs/">存档 1</a>] - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">存档 2</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.cvs">via newsreader</a>] - <a href="mailto:wine-cvs(a)winehq.org">wine-cvs(a)winehq.org</a> + [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">存档 2</a>] 一个中等流量（25封/天）的只读列表，用于追踪 Git tree 上的 commits。 </li> <li> + <a href="mailto:wine-releases(a)winehq.org">wine-releases(a)winehq.org</a> [<a href="//www.winehq.org/mailman/listinfo/wine-releases">（取消）订阅</a>] - [<a href="//www.winehq.org/pipermail/wine-releases/">存档 1</a>] - <a href="mailto:wine-releases(a)winehq.org">wine-releases(a)winehq.org</a> + [<a href="//www.winehq.org/pipermail/wine-releases/">存档 1</a>] 一个低流量（2封/月）的只读列表，用于接收每个 Wine official release 的大体积 diff 文件。 </li> <li> - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.license">存档 1</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.license">via newsreader</a>] - - 已经关闭的列表，用于讨论与 Wine 有关的法律议题，包括许可证议题。（关闭于 2004-12-16） - </li> - - <li> + <a href="mailto:wine-bugs(a)winehq.org">wine-bugs(a)winehq.org</a> [<a href="//www.winehq.org/mailman/listinfo/wine-bugs">（取消）订阅</a>] [<a href="//www.winehq.org/pipermail/wine-bugs/">存档 1</a>] - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.bugs">存档 2</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.bugs">via newsreader</a>] - <a href="mailto:wine-bugs(a)winehq.org">wine-bugs(a)winehq.org</a> + [<a href="http://news.gmane.org/gmane.comp.emulators.wine.bugs">存档 2</a>] 一个大流量（100封/天）的只读列表，用于监听 <a href="//bugs.winehq.org/">Bug Tracking Database</a> 的活动。 </li> <li> + <a href="mailto:wine-tests-results(a)winehq.org">wine-tests-results(a)winehq.org</a> [<a href="//www.winehq.org/mailman/listinfo/wine-tests-results">（取消）订阅</a>] - [<a href="//www.winehq.org/pipermail/wine-tests-results/">存档</a>] - <a href="mailto:wine-tests-results(a)winehq.org">wine-tests-results(a)winehq.org</a> + [<a href="//www.winehq.org/pipermail/wine-tests-results/">存档</a>] 一个中等流量（10封/天）的开放性列表，用于提交测试结果。 </li> -- 2.26.2

1 0

[PATCH] wine.inf: Install WMI DLLs in the wbem subdirectory in WoW64 too.
by Zebediah Figura 26 Apr '20

26 Apr '20

Hauppauge WinTV 8.5 expects to find wmic.exe here. Without this patch it incorrectly reports that a device is connected. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- loader/wine.inf.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 39ad8e8455..0a43cc779c 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2603,6 +2603,10 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,gecko\plugin,npmshtml.dll 11,Speech\Common,sapi.dll 11,wbem,mofcomp.exe +11,wbem,wbemdisp.dll +11,wbem,wbemprox.dll +11,wbem,wmic.exe +11,wbem,wmiutils.dll 11,WindowsPowerShell\v1.0,powershell.exe 10,syswow64,stdole2.tlb 11,,iexplore.exe -- 2.26.2

1 0

[PATCH 1/3] cmd: Use _wsplitpath() from msvcrt.
by Zebediah Figura 25 Apr '20

25 Apr '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- programs/cmd/batch.c | 54 +--------------------------------------- programs/cmd/builtins.c | 10 ++++---- programs/cmd/directory.c | 6 ++--- programs/cmd/wcmd.h | 1 - 4 files changed, 9 insertions(+), 62 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 371f75af54..06437ecf1b 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -301,58 +301,6 @@ WCHAR *WCMD_fgets(WCHAR *buf, DWORD noChars, HANDLE h) return buf; } -/* WCMD_splitpath - copied from winefile as no obvious way to use it otherwise */ -void WCMD_splitpath(const WCHAR* path, WCHAR* drv, WCHAR* dir, WCHAR* name, WCHAR* ext) -{ - const WCHAR* end; /* end of processed string */ - const WCHAR* p; /* search pointer */ - const WCHAR* s; /* copy pointer */ - - /* extract drive name */ - if (path[0] && path[1]==':') { - if (drv) { - *drv++ = *path++; - *drv++ = *path++; - *drv = '\0'; - } - } else if (drv) - *drv = '\0'; - - end = path + lstrlenW(path); - - /* search for begin of file extension */ - for(p=end; p>path && *--p!='\\' && *p!='/'; ) - if (*p == '.') { - end = p; - break; - } - - if (ext) - for(s=end; (*ext=*s++); ) - ext++; - - /* search for end of directory name */ - for(p=end; p>path; ) - if (*--p=='\\' || *p=='/') { - p++; - break; - } - - if (name) { - for(s=p; s<end; ) - *name++ = *s++; - - *name = '\0'; - } - - if (dir) { - for(s=path; s<p; ) - *dir++ = *s++; - - *dir = '\0'; - } -} - /**************************************************************************** * WCMD_HandleTildaModifiers * @@ -627,7 +575,7 @@ void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute) BOOL addSpace = (finaloutput[0] != 0x00); /* Split into components */ - WCMD_splitpath(fullfilename, drive, dir, fname, ext); + _wsplitpath(fullfilename, drive, dir, fname, ext); /* 5. Handle 'd' : Drive Letter */ if (wmemchr(firstModifier, 'd', modifierLen) != NULL) { diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 43c4d9efef..1870e5688d 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1217,7 +1217,7 @@ static BOOL WCMD_delete_confirm_wildcard(const WCHAR *filename, BOOL *pPrompted) /* Convert path into actual directory spec */ GetFullPathNameW(filename, ARRAY_SIZE(fpath), fpath, NULL); - WCMD_splitpath(fpath, drive, dir, fname, ext); + _wsplitpath(fpath, drive, dir, fname, ext); /* Only prompt for * and *.*, not *a, a*, *.a* etc */ if ((lstrcmpW(fname, starW) == 0) && @@ -1352,7 +1352,7 @@ static BOOL WCMD_delete_one (const WCHAR *thisArg) { /* Convert path into actual directory spec */ GetFullPathNameW(argCopy, ARRAY_SIZE(thisDir), thisDir, NULL); - WCMD_splitpath(thisDir, drive, dir, fname, ext); + _wsplitpath(thisDir, drive, dir, fname, ext); lstrcpyW(thisDir, drive); lstrcatW(thisDir, dir); @@ -2986,7 +2986,7 @@ void WCMD_move (void) wine_dbgstr_w(param1), wine_dbgstr_w(output)); /* Split into components */ - WCMD_splitpath(input, drive, dir, fname, ext); + _wsplitpath(input, drive, dir, fname, ext); hff = FindFirstFileW(input, &fd); if (hff == INVALID_HANDLE_VALUE) @@ -3207,7 +3207,7 @@ void WCMD_rename (void) dotDst = wcschr(param2, '.'); /* Split into components */ - WCMD_splitpath(input, drive, dir, fname, ext); + _wsplitpath(input, drive, dir, fname, ext); hff = FindFirstFileW(input, &fd); if (hff == INVALID_HANDLE_VALUE) @@ -3492,7 +3492,7 @@ void WCMD_setshow_default (const WCHAR *args) { /* Convert path into actual directory spec */ GetFullPathNameW(string, ARRAY_SIZE(fpath), fpath, NULL); - WCMD_splitpath(fpath, drive, dir, fname, ext); + _wsplitpath(fpath, drive, dir, fname, ext); /* Rebuild path */ wsprintfW(string, fmt, drive, dir, fd.cFileName); diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 41e1f4e929..2d35f8eb1d 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -166,8 +166,8 @@ static int __cdecl WCMD_dir_sort (const void *a, const void *b) WCHAR extB[MAX_PATH]; /* Split into components */ - WCMD_splitpath(filea->cFileName, drive, dir, fname, extA); - WCMD_splitpath(fileb->cFileName, drive, dir, fname, extB); + _wsplitpath(filea->cFileName, drive, dir, fname, extA); + _wsplitpath(fileb->cFileName, drive, dir, fname, extB); result = lstrcmpiW(extA, extB); } @@ -819,7 +819,7 @@ void WCMD_directory (WCHAR *args) thisEntry->next = NULL; /* Split into components */ - WCMD_splitpath(path, drive, dir, fname, ext); + _wsplitpath(path, drive, dir, fname, ext); WINE_TRACE("Path Parts: drive: '%s' dir: '%s' name: '%s' ext:'%s'\n", wine_dbgstr_w(drive), wine_dbgstr_w(dir), wine_dbgstr_w(fname), wine_dbgstr_w(ext)); diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 112fc1a1ea..247f3dfdf3 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -117,7 +117,6 @@ WCHAR *WCMD_skip_leading_spaces (WCHAR *string); BOOL WCMD_keyword_ws_found(const WCHAR *keyword, int len, const WCHAR *ptr); void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute); -void WCMD_splitpath(const WCHAR* path, WCHAR* drv, WCHAR* dir, WCHAR* name, WCHAR* ext); WCHAR *WCMD_strip_quotes(WCHAR *cmd); WCHAR *WCMD_LoadMessage(UINT id); void WCMD_strsubstW(WCHAR *start, const WCHAR* next, const WCHAR* insert, int len); -- 2.26.2

2 4