May 2021 - Wine-Devel - list.winehq.org

[PATCH] README: document Libera Chat migration
by Austin English May 29, 2021

May 29, 2021

Signed-off-by: Austin English <austinenglish(a)gmail.com> --- README | 2 +- documentation/README.de | 2 +- documentation/README.es | 2 +- documentation/README.fi | 2 +- documentation/README.fr | 2 +- documentation/README.hu | 2 +- documentation/README.it | 2 +- documentation/README.ja | 2 +- documentation/README.ko | 2 +- documentation/README.nl | 2 +- documentation/README.no | 2 +- documentation/README.pt | 2 +- documentation/README.pt_br | 2 +- documentation/README.ru | 2 +- documentation/README.sv | 2 +- documentation/README.tr | 2 +- documentation/README.uk | 2 +- documentation/README.zh_cn | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/README b/README index 7d834db0a8fb..afcbbd482203 100644 --- a/README +++ b/README @@ -159,7 +159,7 @@ Bugs: Report bugs to Wine Bugzilla at https://bugs.winehq.org Please search the bugzilla database to check whether your problem is already known or fixed before posting a bug report. -IRC: Online help is available at channel #WineHQ on irc.freenode.net. +IRC: Online help is available at channel #WineHQ on irc.libera.chat. Git: The current Wine development tree is available through Git. Go to https://www.winehq.org/git for more information. diff --git a/documentation/README.de b/documentation/README.de index be8c033dba53..539745ec80a7 100644 --- a/documentation/README.de +++ b/documentation/README.de @@ -170,7 +170,7 @@ Fehler: Melden Sie Fehler bitte an Wine-Bugzilla unter https://bugs.winehq.org bereits bekannt ist oder sogar behoben wurde, bevor Sie eine Fehlermeldung verfassen. -IRC: Online-Hilfe ist im IRC-Kanal #WineHQ unter irc.freenode.net verfügbar. +IRC: Online-Hilfe ist im IRC-Kanal #WineHQ unter irc.libera.chat verfügbar. Git: Der aktuelle Wine-Entwicklungsstand ist über Git verfügbar. Besuchen Sie https://www.winehq.org/git für weitere Informationen. diff --git a/documentation/README.es b/documentation/README.es index 19b43dd02ecd..b200075a4a8b 100644 --- a/documentation/README.es +++ b/documentation/README.es @@ -160,7 +160,7 @@ Bugs: Reporte fallos en el Bugzilla de Wine, https://bugs.winehq.org datos de bugzilla para comprobar si su problema es un fallo conocido o existe una solución. -IRC: Se puede obtener ayuda online en el canal #WineHQ de irc.freenode.net. +IRC: Se puede obtener ayuda online en el canal #WineHQ de irc.libera.chat. Git: El árbol actual de desarrollo de Wine está disponible a través de Git. Vaya a https://www.winehq.org/git para más información. diff --git a/documentation/README.fi b/documentation/README.fi index 13af44b1e9b2..e459bbc779a0 100644 --- a/documentation/README.fi +++ b/documentation/README.fi @@ -155,7 +155,7 @@ Virheet: Katso kuitenkin ensin Bugzilla-tietokannasta, onko samasta asiasta ilmoitettu jo aiemmin. -IRC: Online-apua voi saada kanavalta #WineHQ palvelimella irc.freenode.net. +IRC: Online-apua voi saada kanavalta #WineHQ palvelimella irc.libera.chat. Git: Winen tämänhetkinen kehitysversio on jaossa Git-järjestelmän kautta. Sivulla https://www.winehq.org/git kerrotaan tästä lisää. diff --git a/documentation/README.fr b/documentation/README.fr index 2105502cf55b..d7f474036f41 100644 --- a/documentation/README.fr +++ b/documentation/README.fr @@ -176,7 +176,7 @@ Bogues : que le problème n'est pas déjà connu, ou corrigé. IRC : L'aide en ligne est disponible via le canal #WineHQ sur - irc.freenode.net. + irc.libera.chat. Git : L'arbre de développement actuel de Wine est disponible via Git. Voyez https://www.winehq.org/git pour plus d'informations. diff --git a/documentation/README.hu b/documentation/README.hu index e28c534c51e7..186057cbc9a5 100644 --- a/documentation/README.hu +++ b/documentation/README.hu @@ -190,7 +190,7 @@ Hibák: Wine hibabejelentés a Bugzilla-n keresztül itt: https://bugs.winehq.or már megtalálható-e az adatbázisban. Küldhet hibabejelentéseket a comp.emulators.ms-windows.wine címre is. -IRC: Azonnali segítség elérhetõ a #WineHQ csatornán a irc.freenode.net-en. +IRC: Azonnali segítség elérhetõ a #WineHQ csatornán a irc.libera.chat-en. Git: A jelenlegi Wine fejlesztõi fa elérhetõ Git-en keresztül. Látogasson el ide a további információhoz: https://www.winehq.org/git diff --git a/documentation/README.it b/documentation/README.it index 68f0df1f75f3..0af472bcb7ff 100644 --- a/documentation/README.it +++ b/documentation/README.it @@ -159,7 +159,7 @@ Bugs: Segnalare i bug su Wine Bugzilla all'indirizzo https://bugs.winehq.org il problema non sia già conosciuto o risolto prima di creare un rapporto su di esso. -IRC: Aiuto online disponibile nel canale #WineHQ su irc.freenode.net. +IRC: Aiuto online disponibile nel canale #WineHQ su irc.libera.chat. Git: L'albero attuale di sviluppo di Wine è disponibile attraverso Git. Vedere https://www.winehq.org/git per maggiori informazioni. diff --git a/documentation/README.ja b/documentation/README.ja index 72e1ce2fe465..d23548a575a7 100644 --- a/documentation/README.ja +++ b/documentation/README.ja @@ -163,7 +163,7 @@ Wiki: Wine Wikiはhttps://wiki.winehq.orgにありますバグ報告を投稿する前に問題が既知や修正済みかどうかを調べるために bugzillaデータベースを検索してください。 -IRC: irc.freenode.net上のチャンネル#WineHQでオンラインヘルプを利用できます。 +IRC: irc.libera.chat上のチャンネル#WineHQでオンラインヘルプを利用できます。 Git: 現在のWine開発ツリーはGitを通して入手できます。詳細についてはhttps://www.winehq.org/gitに行ってください。 diff --git a/documentation/README.ko b/documentation/README.ko index 17fcfee318a5..f3d1870f08fd 100644 --- a/documentation/README.ko +++ b/documentation/README.ko @@ -157,7 +157,7 @@ Bugs: https://bugs.winehq.org 의 Wine Bugzilla에 버그를 보고하십시 버그 보고서를 제출하기 전에 같은 문제가 이미 제출된 적이 있는지 Bugzilla 데이터베이스를 검색해 보시기 바랍니다. -IRC: irc.freenode.net 의 #WineHQ 채널에서 도움을 받을 수 있습니다. +IRC: irc.libera.chat 의 #WineHQ 채널에서 도움을 받을 수 있습니다. GIT: Wine 개발 트리는 현재 GIT로 관리되고 있습니다. 더 자세한 정보는 https://www.winehq.org/git 를 참조하기 바랍니다. diff --git a/documentation/README.nl b/documentation/README.nl index 2b54c33b5dc4..d2132e1f1e55 100644 --- a/documentation/README.nl +++ b/documentation/README.nl @@ -167,7 +167,7 @@ Fouten: Op https://bugs.winehq.org kunnen fouten gemeld worden aan de Wine Bugzilla. Doorzoek eerst de database van bugzilla om te kijken of de fout al bekend of gerepareerd is voordat de fout gemeld wordt. -IRC: Online hulp is beschikbaar in kanaal #WineHQ op irc.freenode.net +IRC: Online hulp is beschikbaar in kanaal #WineHQ op irc.libera.chat Git: De huidige ontwikkeling van Wine is beschikbaar op Git. Bezoek https://www.winehq.org/git voor meer informatie. diff --git a/documentation/README.no b/documentation/README.no index a25b47f7fceb..ac4db2444b46 100644 --- a/documentation/README.no +++ b/documentation/README.no @@ -151,7 +151,7 @@ Feil: Rapporter feil til Wines Bugzilla på https://bugs.winehq.org før du sender en feilrapport. IRC: Nødhjelp er tilgjengelig på kanalen #WineHQ på - irc.freenode.net. + irc.libera.chat. Git: Wines oppdaterte utvikler-versjon er tilgjengelig gjennom GIT. Gå til https://www.winehq.org/git for mer informasjon. diff --git a/documentation/README.pt b/documentation/README.pt index 256eb2310c07..76d3ac57acb8 100644 --- a/documentation/README.pt +++ b/documentation/README.pt @@ -194,7 +194,7 @@ FAQ: A Wine FAQ está localizada em https://www.winehq.org/FAQ Usenet: Tu podes discutor tópicos relacionados de Wine e obter ajuda em comp.emulators.ms-windows.wine. -IRC: Ajuda online está disponivel em #WineHQ on irc.freenode.net. +IRC: Ajuda online está disponivel em #WineHQ on irc.libera.chat. Git: O currente desenvolvimento do Wine está disponivel por Git. diff --git a/documentation/README.pt_br b/documentation/README.pt_br index a8025b55ac08..c908f71b34cb 100644 --- a/documentation/README.pt_br +++ b/documentation/README.pt_br @@ -160,7 +160,7 @@ Bugs: Relate erros ao Bugzilla do Wine em https://bugs.winehq.org se seu problema já foi encontrado ou resolvido antes de enviar um relatório do erro. -IRC: A ajuda online está disponível em #WineHQ em irc.freenode.net. +IRC: A ajuda online está disponível em #WineHQ em irc.libera.chat. Git: A árvore de desenvolvimento atual do Wine está disponível por Git. Visite https://www.winehq.org/git para mais informação. diff --git a/documentation/README.ru b/documentation/README.ru index 78ee9a50959b..408322c1d8d4 100644 --- a/documentation/README.ru +++ b/documentation/README.ru @@ -148,7 +148,7 @@ Wiki: Wine Wiki расположен на https://wiki.winehq.org Прежде чем отправлять сообщение об ошибке проверьте, может эта ошибка уже известна или исправлена в последней версии Wine. -IRC: Онлайн помощь доступна на канале #WineHQ на irc.freenode.net. +IRC: Онлайн помощь доступна на канале #WineHQ на irc.libera.chat. Git: Текущие разработки Wine доступны через Git. Смотрите https://www.winehq.org/site/git для дополнительной информации. diff --git a/documentation/README.sv b/documentation/README.sv index be017d40d7f9..83906b6890ab 100644 --- a/documentation/README.sv +++ b/documentation/README.sv @@ -153,7 +153,7 @@ Fel: Rapportera fel till Wines Bugzilla på https://bugs.winehq.org rapporterat innan du sänder en felrapport. IRC: Hjälp finns tillgänglig online på kanalen #WineHQ på - irc.freenode.net. + irc.libera.chat. Git: Wines nuvarande utvecklingsversion finns tillgänglig genom Git. Gå till https://www.winehq.org/git för mer information. diff --git a/documentation/README.tr b/documentation/README.tr index ae1451712692..65c45533f891 100644 --- a/documentation/README.tr +++ b/documentation/README.tr @@ -153,7 +153,7 @@ Hatalar: hatanın önceden girilip girilmediğini öğrenmek için Bugzilla'da arama yapınız. -IRC: irc.freenode.net sunucusundan #WineHQ kanalı ile çevrimiçi yardım +IRC: irc.libera.chat sunucusundan #WineHQ kanalı ile çevrimiçi yardım alabilirsiniz. Git: Geçerli Wine geliştirme ağacına Git üzerinden erişim sağlanabilir. diff --git a/documentation/README.uk b/documentation/README.uk index 8fea73571af4..613186cfcc51 100644 --- a/documentation/README.uk +++ b/documentation/README.uk @@ -156,7 +156,7 @@ Wiki: Wine Wiki розташована на https://wiki.winehq.org Перш ніж відправляти повідомлення про помилку перевірте в базі, чи ця помилка вже виявлена. -IRC: Онлайн допомога доступна на каналі #WineHQ на irc.freenode.net. +IRC: Онлайн допомога доступна на каналі #WineHQ на irc.libera.chat. Git: Поточне дерево розробки Wine доступне через Git. Дивіться https://www.winehq.org/git за детальною інформацією. diff --git a/documentation/README.zh_cn b/documentation/README.zh_cn index 934079fdef40..a79ddc7756a1 100644 --- a/documentation/README.zh_cn +++ b/documentation/README.zh_cn @@ -144,7 +144,7 @@ Bugs: 请向位于 https://bugs.winehq.org 的 Wine Bugzilla 提交 bug。请在提交漏洞报告前先在 bugzilla 数据库中进行搜索，检查先前是否已有类似的已知问题以避免重复，并跟踪这些问题的修复情况。 -IRC: 您可以在 irc.freenode.net 的 #WineHQ 频道获取到在线帮助。 +IRC: 您可以在 irc.libera.chat 的 #WineHQ 频道获取到在线帮助。 Git: 当前 Wine 的开发树可经由 Git 获取。请前往 https://www.winehq.org/git 以了解更多信息。 -- 2.30.2

1 0

[PATCH 6/6] winepulse: Use syscall interface to call unix lib.
by Jacek Caban May 28, 2021

May 28, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winepulse.drv/Makefile.in | 2 +- dlls/winepulse.drv/mmdevdrv.c | 56 ++++++------ dlls/winepulse.drv/pulse.c | 150 ++++++++++++++++++++++----------- dlls/winepulse.drv/unixlib.h | 46 +++++----- 4 files changed, 156 insertions(+), 98 deletions(-)

1 0

[PATCH 5/6] winepulse: Wrap unix call parameters in structs.
by Jacek Caban May 28, 2021

May 28, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This is a preparation for the next patch. I also experimented with using widl to generate such code. It worked fine, but it's not clear if it's worth it. dlls/winepulse.drv/mmdevdrv.c | 163 +++++++++++++---- dlls/winepulse.drv/pulse.c | 335 +++++++++++++++++++--------------- dlls/winepulse.drv/unixlib.h | 202 +++++++++++++++++--- 3 files changed, 493 insertions(+), 207 deletions(-)

1 0

[PATCH 4/6] makedep: Make unix libs depend on ntdll.so.
by Jacek Caban May 28, 2021

May 28, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/makedep.c | 3 +++ 1 file changed, 3 insertions(+)

1 0

[PATCH 3/6] ntdll: Introduce wine_unix_call.
by Jacek Caban May 28, 2021

May 28, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/unix/loader.c | 9 +++++++++ include/winternl.h | 3 +++ 3 files changed, 13 insertions(+)

1 0

[PATCH 2/6] winegcc: Link unix libs directly to native libraries.
by Jacek Caban May 28, 2021

May 28, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This patch uses --subsystem,native option (in addition to -munix) to opt-in to that. My thinking is to make that for -munix at when all relevant code is ready. tools/winegcc/utils.c | 14 +++++++------- tools/winegcc/utils.h | 2 +- tools/winegcc/winegcc.c | 19 ++++++++++++++++--- 3 files changed, 24 insertions(+), 11 deletions(-)

1 0

[PATCH 1/6] winegcc: Use -soname for unix libs.
by Jacek Caban May 28, 2021

May 28, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This allows linking to them using ELF linking and providing Unix library as full file name. It's not needed on Mach-O targets. tools/winegcc/winegcc.c | 1 + 1 file changed, 1 insertion(+)

1 0

[PATCH] rtworkq/tests: Document the CoGetApartmentType() situation.
by Francois Gouget May 28, 2021

May 28, 2021

It is reported as missing on Vista but is available on Windows 7 while rtworkq itself is only available on Windows 8+. So there is no need to load CoGetApartmentType() dynamically. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Given that loading CoGetApartmentType() dynamically seems undesirable I propose to just document the situation instead. See: https://test.winehq.org/data/tests/rtworkq:rtworkq.html https://www.winehq.org/pipermail/wine-devel/2021-April/185461.html --- dlls/rtworkq/tests/rtworkq.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/rtworkq/tests/rtworkq.c b/dlls/rtworkq/tests/rtworkq.c index 627e024d761..f6c2fc594e8 100644 --- a/dlls/rtworkq/tests/rtworkq.c +++ b/dlls/rtworkq/tests/rtworkq.c @@ -31,7 +31,11 @@ static void test_platform_init(void) APTTYPE apttype; HRESULT hr; - /* Startup initializes MTA. */ + /* Startup initializes MTA. + * Note that CoGetApartmentType() is available on Windows 7+ while + * rtworkq is only available on Windows 8+. So it is not necessary to + * load CoGetApartmentType() dynamically. + */ hr = CoGetApartmentType(&apttype, &qualifier); ok(hr == CO_E_NOTINITIALIZED, "Unexpected hr %#x.\n", hr); -- 2.20.1

1 0

[PATCH] ntdll/tests: Fix the XState AllFeatureSize check on old CPUs.
by Francois Gouget May 28, 2021

May 28, 2021

On old CPUs lacking XSAVEC, Windows 8+ does not set AllFeatureSize and AllFeatures. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=51188 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- As per the comment and commit message, my understanding is that this is tied to the XSAVEC support in the CPU. I removed broken() to match the xstate.AllFeatures check. But I'm also fine with having either or both with broken(): I don't know what we want / can do in Wine for this. This should fix the Windows 8.1 failures on cw-gtx560 and cw-rx460: https://test.winehq.org/data/patterns.html#ntdll:virtual --- dlls/ntdll/tests/virtual.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index e657a424fcd..5f155b1a147 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -952,12 +952,14 @@ static void test_user_shared_data(void) ok(xstate.OptimizedSave, "Got zero OptimizedSave with compaction enabled.\n"); ok(!xstate.AlignedFeatures, "Got unexpected AlignedFeatures %s.\n", wine_dbgstr_longlong(xstate.AlignedFeatures)); - ok(xstate.AllFeatureSize >= 512 + sizeof(XSTATE), "Got unexpected AllFeatureSize %u.\n", - xstate.AllFeatureSize); + ok(xstate.AllFeatureSize >= 512 + sizeof(XSTATE) + || !xstate.AllFeatureSize /* win8 on CPUs without XSAVEC */, + "Got unexpected AllFeatureSize %u.\n", xstate.AllFeatureSize); for (i = 0; i < ARRAY_SIZE(feature_sizes); ++i) { - ok(xstate.AllFeatures[i] == feature_sizes[i] || !xstate.AllFeatures[i], + ok(xstate.AllFeatures[i] == feature_sizes[i] + || !xstate.AllFeatures[i] /* win8+ on CPUs without XSAVEC */, "Got unexpected AllFeatures[%u] %u, expected %u.\n", i, xstate.AllFeatures[i], feature_sizes[i]); ok(xstate.Features[i].Size == feature_sizes[i], "Got unexpected Features[%u].Size %u, expected %u.\n", i, -- 2.20.1

1 0

[PATCH] ntdll: Update the STATUS_NO_SUCH_DEVICE error mapping.
by Francois Gouget May 28, 2021

May 28, 2021

Windows 10 >= 1909 returns ERROR_NO_SUCH_DEVICE. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This should clear out: https://test.winehq.org/data/patterns.html#ntdll:error --- dlls/ntdll/make_errors | 2 +- dlls/ntdll/tests/error.c | 2 +- include/winerror.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/make_errors b/dlls/ntdll/make_errors index 5b7885e0427..a994808c2ef 100755 --- a/dlls/ntdll/make_errors +++ b/dlls/ntdll/make_errors @@ -246,7 +246,7 @@ my %error_map = qw( STATUS_INVALID_CID ERROR_INVALID_PARAMETER STATUS_TIMER_NOT_CANCELED ERROR_TIMER_NOT_CANCELED STATUS_INVALID_PARAMETER ERROR_INVALID_PARAMETER - STATUS_NO_SUCH_DEVICE ERROR_FILE_NOT_FOUND + STATUS_NO_SUCH_DEVICE ERROR_NO_SUCH_DEVICE STATUS_NO_SUCH_FILE ERROR_FILE_NOT_FOUND STATUS_INVALID_DEVICE_REQUEST ERROR_INVALID_FUNCTION STATUS_END_OF_FILE ERROR_HANDLE_EOF diff --git a/dlls/ntdll/tests/error.c b/dlls/ntdll/tests/error.c index c812aa779cc..8f099e6903a 100644 --- a/dlls/ntdll/tests/error.c +++ b/dlls/ntdll/tests/error.c @@ -247,7 +247,7 @@ static void run_error_tests(void) cmp(STATUS_RESOURCE_TYPE_NOT_FOUND, ERROR_RESOURCE_TYPE_NOT_FOUND); cmp(STATUS_RESOURCE_NAME_NOT_FOUND, ERROR_RESOURCE_NAME_NOT_FOUND); cmp(STATUS_RESOURCE_LANG_NOT_FOUND, ERROR_RESOURCE_LANG_NOT_FOUND); - cmp(STATUS_NO_SUCH_DEVICE, ERROR_FILE_NOT_FOUND); + cmp3(STATUS_NO_SUCH_DEVICE, ERROR_NO_SUCH_DEVICE, ERROR_FILE_NOT_FOUND); cmp(STATUS_NO_SUCH_FILE, ERROR_FILE_NOT_FOUND); cmp(STATUS_INVALID_DEVICE_REQUEST, ERROR_INVALID_FUNCTION); cmp2(STATUS_VOLUME_NOT_UPGRADED, ERROR_INVALID_FUNCTION); diff --git a/include/winerror.h b/include/winerror.h index 86f7aace68e..8765e177029 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -410,6 +410,7 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define ERROR_THREAD_MODE_NOT_BACKGROUND 401 #define ERROR_PROCESS_MODE_ALREADY_BACKGROUND 402 #define ERROR_PROCESS_MODE_NOT_BACKGROUND 403 +#define ERROR_NO_SUCH_DEVICE 433 #define ERROR_PNP_QUERY_REMOVE_DEVICE_TIMEOUT 480 #define ERROR_PNP_QUERY_REMOVE_RELATED_DEVICE_TIMEOUT 481 #define ERROR_PNP_QUERY_REMOVE_UNRELATED_DEVICE_TIMEOUT 482 -- 2.20.1

2 2

[PATCH] user32/tests: Fix a typo in a comment.
by Francois Gouget May 28, 2021

May 28, 2021

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/user32/tests/sysparams.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 8fab62c951e..89a524407bf 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -1500,7 +1500,7 @@ static void test_SPI_SETNONCLIENTMETRICS( void ) /* 44 */ /* SPI_GETNONCLIENTMETRICS returns some "cooked" values. For instance if the caption font height is higher than the CaptionHeight field, the latter is adjusted accordingly. To be able to restore these setting - accurately be restore the raw values. */ + accurately we restore the raw values. */ Ncmorig.iCaptionWidth = metricfromreg( SPI_METRIC_REGKEY, SPI_CAPTIONWIDTH_VALNAME, real_dpi); Ncmorig.iCaptionHeight = metricfromreg( SPI_METRIC_REGKEY, SPI_CAPTIONHEIGHT_VALNAME, dpi); Ncmorig.iSmCaptionHeight = metricfromreg( SPI_METRIC_REGKEY, SPI_SMCAPTIONHEIGHT_VALNAME, dpi); -- 2.20.1

2 1

[PATCH] user32/tests: Trace GetLastError() when OpenClipboard() fails in edit.
by Francois Gouget May 28, 2021

May 28, 2021

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/user32/tests/edit.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 34bb1e5a76e..6edec12e03b 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -2187,7 +2187,7 @@ static void test_espassword(void) ok(strcmp(buffer, password) == 0, "expected %s, got %s\n", password, buffer); r = OpenClipboard(hwEdit); - ok(r == TRUE, "expected %d, got %d\n", TRUE, r); + ok(r == TRUE, "expected %d, got %d le=%u\n", TRUE, r, GetLastError()); r = EmptyClipboard(); ok(r == TRUE, "expected %d, got %d\n", TRUE, r); r = CloseClipboard(); @@ -3190,7 +3190,7 @@ static void test_paste(void) GlobalUnlock(hmem); r = OpenClipboard(hEdit); - ok(r == TRUE, "expected %d, got %d\n", TRUE, r); + ok(r == TRUE, "expected %d, got %d le=%u\n", TRUE, r, GetLastError()); r = EmptyClipboard(); ok(r == TRUE, "expected %d, got %d\n", TRUE, r); hmem_ret = SetClipboardData(CF_TEXT, hmem); @@ -3213,7 +3213,7 @@ static void test_paste(void) GlobalUnlock(hmem); r = OpenClipboard(hEdit); - ok(r == TRUE, "expected %d, got %d\n", TRUE, r); + ok(r == TRUE, "expected %d, got %d le=%u\n", TRUE, r, GetLastError()); r = EmptyClipboard(); ok(r == TRUE, "expected %d, got %d\n", TRUE, r); hmem_ret = SetClipboardData(CF_TEXT, hmem); -- 2.20.1

2 1

[PATCH v5 1/5] server: Add hardware_msg_data size for variable size messages.
by Rémi Bernon May 28, 2021

May 28, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50506 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v5: Add padding field to align hardware_msg_data on 8 bytes. dlls/user32/rawinput.c | 2 +- server/protocol.def | 2 ++ server/queue.c | 15 ++++++++++----- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index e4e7bad508f..115513ea144 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -624,7 +624,7 @@ UINT WINAPI DECLSPEC_HOTPATCH GetRawInputBuffer(RAWINPUT *data, UINT *data_size, data->header.dwSize - sizeof(RAWINPUTHEADER)); data->header.dwSize += overhead; data = NEXTRAWINPUTBLOCK(data); - msg_data++; + msg_data = (struct hardware_msg_data *)((char *)msg_data + msg_data->size); } if (count == 0 && next_size == 0) *data_size = 0; diff --git a/server/protocol.def b/server/protocol.def index 4239be834d1..0c98ac31328 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -308,6 +308,8 @@ union rawinput struct hardware_msg_data { lparam_t info; /* extra info */ + data_size_t size; /* size of hardware message data */ + int __pad; unsigned int hw_id; /* unique id */ unsigned int flags; /* hook flags */ struct hw_msg_source source; /* message source */ diff --git a/server/queue.c b/server/queue.c index 5d65e030112..07d4c7e0885 100644 --- a/server/queue.c +++ b/server/queue.c @@ -367,6 +367,7 @@ static struct message *alloc_hardware_message( lparam_t info, struct hw_msg_sour memset( msg_data, 0, sizeof(*msg_data) ); msg_data->info = info; + msg_data->size = msg->data_size; msg_data->source = source; return msg; } @@ -1794,6 +1795,7 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons msg_data = &raw_msg.data; msg_data->info = input->mouse.info; + msg_data->size = sizeof(*msg_data); msg_data->flags = flags; msg_data->rawinput.type = RIM_TYPEMOUSE; msg_data->rawinput.mouse.x = x - desktop->cursor.x; @@ -1929,6 +1931,7 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c msg_data = &raw_msg.data; msg_data->info = input->kbd.info; + msg_data->size = sizeof(*msg_data); msg_data->flags = input->kbd.flags; msg_data->rawinput.type = RIM_TYPEKEYBOARD; msg_data->rawinput.kbd.message = message_code; @@ -1996,6 +1999,7 @@ static void queue_custom_hardware_message( struct desktop *desktop, user_handle_ msg_data = &raw_msg.data; msg_data->info = 0; + msg_data->size = sizeof(*msg_data); msg_data->flags = 0; msg_data->rawinput = input->hw.rawinput; @@ -3295,16 +3299,17 @@ DECL_HANDLER(get_rawinput_buffer) { struct message *msg = LIST_ENTRY( ptr, struct message, entry ); struct hardware_msg_data *data = msg->data; + data_size_t extra_size = data->size - sizeof(*data); ptr = list_next( &input->msg_list, ptr ); if (msg->msg != WM_INPUT) continue; - next_size = req->rawinput_size; + next_size = req->rawinput_size + extra_size; if (size + next_size > req->buffer_size) break; - if (cur + sizeof(*data) > buf + get_reply_max_size()) break; - if (cur + sizeof(*data) > buf + buf_size) + if (cur + data->size > buf + get_reply_max_size()) break; + if (cur + data->size > buf + buf_size) { - buf_size += buf_size / 2; + buf_size += buf_size / 2 + extra_size; if (!(tmp = realloc( buf, buf_size ))) { set_error( STATUS_NO_MEMORY ); @@ -3314,7 +3319,7 @@ DECL_HANDLER(get_rawinput_buffer) buf = tmp; } - memcpy(cur, data, sizeof(*data)); + memcpy( cur, data, data->size ); list_remove( &msg->entry ); free_message( msg ); -- 2.31.0

2 6

[website 1/2] Update Dutch IRC website
by Floris Renaud May 28, 2021

May 28, 2021

Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- templates/nl/irc.template | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/templates/nl/irc.template b/templates/nl/irc.template index 6852edc2..b272da53 100644 --- a/templates/nl/irc.template +++ b/templates/nl/irc.template @@ -15,6 +15,10 @@ kanalen over Wine. Gebruik uw favorite IRC programma met de volgende instellinge <td><b>Poort:</b></td> <td>6697</td> </tr> + <tr> + <td><b>TLS:</b></td> + <td>ingeschakeld</td> + </tr> </table> </blockquote> @@ -51,9 +55,9 @@ kunnen de chat bezoeken met:</p> </ul> <p>Om de gespekken zo nuttig mogelijk te houden, doorzoek eerst de -<a href="https://wiki.winehq.org/FAQ">Wine FAQ</a>, +<a href="https://wiki.winehq.org/FAQ_nl">Wine FAQ</a>, <a href="//appdb.winehq.org">AppDB</a> en de -<a href="//www.winehq.org/download">download pagina's</a> voordat +<a href="https://wiki.winehq.org/Download_nl">download pagina's</a> voordat u een vraag stelt.</p> <h2>IRC Regels en Straffen</h2> @@ -90,14 +94,13 @@ gezet en waarom de sanctie moet worden opgeheven.</p> </tr> <tr> <td>Gebruik pastebin als u meer dan 1 of 2 regels tekst plakt</td> - <td><a href="http://winehq.pastebin.com">winehq.pastebin.com</a> en - <a href="http://pastebin.ca">pastebin.ca</a> kunnen worden gebruikt.</td> + <td></td> <td>0</td> <td>5</td> </tr> <tr> <td>Gebruik het goede kanaal</td> - <td>Als u niet zeker weet welk kanaal vraag het in <b>#winehq</b>.</td> + <td>Bij twijfel, vraag het in <b>#winehq</b>.</td> <td>2</td> <td>3</td> </tr> -- 2.32.0.rc0

1 1

[PATCH v4 1/5] server: Add hardware_msg_data size for variable size messages.
by Rémi Bernon May 28, 2021

May 28, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50506 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v4: Pretty much rewritten the series around this new hardware_msg_data size, and reordered patches. HID WM_INPUT messages are translated earlier, without any report, and the reports are sent last. dlls/user32/rawinput.c | 2 +- server/protocol.def | 1 + server/queue.c | 15 ++++++++++----- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index e4e7bad508f..115513ea144 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -624,7 +624,7 @@ UINT WINAPI DECLSPEC_HOTPATCH GetRawInputBuffer(RAWINPUT *data, UINT *data_size, data->header.dwSize - sizeof(RAWINPUTHEADER)); data->header.dwSize += overhead; data = NEXTRAWINPUTBLOCK(data); - msg_data++; + msg_data = (struct hardware_msg_data *)((char *)msg_data + msg_data->size); } if (count == 0 && next_size == 0) *data_size = 0; diff --git a/server/protocol.def b/server/protocol.def index 4239be834d1..6a185b822e7 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -308,6 +308,7 @@ union rawinput struct hardware_msg_data { lparam_t info; /* extra info */ + data_size_t size; /* size of hardware message data */ unsigned int hw_id; /* unique id */ unsigned int flags; /* hook flags */ struct hw_msg_source source; /* message source */ diff --git a/server/queue.c b/server/queue.c index 5d65e030112..07d4c7e0885 100644 --- a/server/queue.c +++ b/server/queue.c @@ -367,6 +367,7 @@ static struct message *alloc_hardware_message( lparam_t info, struct hw_msg_sour memset( msg_data, 0, sizeof(*msg_data) ); msg_data->info = info; + msg_data->size = msg->data_size; msg_data->source = source; return msg; } @@ -1794,6 +1795,7 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons msg_data = &raw_msg.data; msg_data->info = input->mouse.info; + msg_data->size = sizeof(*msg_data); msg_data->flags = flags; msg_data->rawinput.type = RIM_TYPEMOUSE; msg_data->rawinput.mouse.x = x - desktop->cursor.x; @@ -1929,6 +1931,7 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c msg_data = &raw_msg.data; msg_data->info = input->kbd.info; + msg_data->size = sizeof(*msg_data); msg_data->flags = input->kbd.flags; msg_data->rawinput.type = RIM_TYPEKEYBOARD; msg_data->rawinput.kbd.message = message_code; @@ -1996,6 +1999,7 @@ static void queue_custom_hardware_message( struct desktop *desktop, user_handle_ msg_data = &raw_msg.data; msg_data->info = 0; + msg_data->size = sizeof(*msg_data); msg_data->flags = 0; msg_data->rawinput = input->hw.rawinput; @@ -3295,16 +3299,17 @@ DECL_HANDLER(get_rawinput_buffer) { struct message *msg = LIST_ENTRY( ptr, struct message, entry ); struct hardware_msg_data *data = msg->data; + data_size_t extra_size = data->size - sizeof(*data); ptr = list_next( &input->msg_list, ptr ); if (msg->msg != WM_INPUT) continue; - next_size = req->rawinput_size; + next_size = req->rawinput_size + extra_size; if (size + next_size > req->buffer_size) break; - if (cur + sizeof(*data) > buf + get_reply_max_size()) break; - if (cur + sizeof(*data) > buf + buf_size) + if (cur + data->size > buf + get_reply_max_size()) break; + if (cur + data->size > buf + buf_size) { - buf_size += buf_size / 2; + buf_size += buf_size / 2 + extra_size; if (!(tmp = realloc( buf, buf_size ))) { set_error( STATUS_NO_MEMORY ); @@ -3314,7 +3319,7 @@ DECL_HANDLER(get_rawinput_buffer) buf = tmp; } - memcpy(cur, data, sizeof(*data)); + memcpy( cur, data, data->size ); list_remove( &msg->entry ); free_message( msg ); -- 2.31.0

2 9

[PATCH] mfplay: Enable source type enumeration.
by Nikolay Sivov May 28, 2021

May 28, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- This helps winegstreamer source case that outputs raw formats, allowing iterating through them, once loader responds to this flag correctly. Player still works on Windows after this change. dlls/mfplay/player.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 540a182a5ba..f6cb81de436 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1137,6 +1137,8 @@ static HRESULT media_item_create_topology(struct media_player *player, struct me IMFStreamDescriptor_Release(sd); } + IMFTopology_SetUINT32(topology, &MF_TOPOLOGY_ENUMERATE_SOURCE_TYPES, TRUE); + *out = topology; return S_OK; -- 2.30.2

1 0

[PATCH] mf/session: Do not drop pending commands when clearing current presentation.
by Nikolay Sivov May 28, 2021

May 28, 2021

Calling Start() short after SetTopology() has a good chance of getting lost, because clearing logic will drop all pending commands. This is easy to reproduce with IMFPMediaPlayer, which works reliably on Windows. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/session.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 925a8c93d20..41caf02d059 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -855,12 +855,22 @@ static void session_shutdown_current_topology(struct media_session *session) } } +static void session_clear_command_list(struct media_session *session) +{ + struct session_op *op, *op2; + + LIST_FOR_EACH_ENTRY_SAFE(op, op2, &session->commands, struct session_op, entry) + { + list_remove(&op->entry); + IUnknown_Release(&op->IUnknown_iface); + } +} + static void session_clear_presentation(struct media_session *session) { struct media_source *source, *source2; struct media_sink *sink, *sink2; struct topo_node *node, *node2; - struct session_op *op, *op2; session_shutdown_current_topology(session); @@ -895,12 +905,6 @@ static void session_clear_presentation(struct media_session *session) IMFMediaEventGenerator_Release(sink->event_generator); heap_free(sink); } - - LIST_FOR_EACH_ENTRY_SAFE(op, op2, &session->commands, struct session_op, entry) - { - list_remove(&op->entry); - IUnknown_Release(&op->IUnknown_iface); - } } static struct topo_node *session_get_node_by_id(const struct media_session *session, TOPOID id) @@ -1730,6 +1734,7 @@ static ULONG WINAPI mfsession_Release(IMFMediaSession *iface) { session_clear_topologies(session); session_clear_presentation(session); + session_clear_command_list(session); if (session->presentation.current_topology) IMFTopology_Release(session->presentation.current_topology); if (session->event_queue) @@ -1847,7 +1852,6 @@ static HRESULT WINAPI mfsession_Start(IMFMediaSession *iface, const GUID *format hr = session_submit_command(session, op); IUnknown_Release(&op->IUnknown_iface); - return hr; } @@ -1896,6 +1900,7 @@ static HRESULT WINAPI mfsession_Shutdown(IMFMediaSession *iface) IMFPresentationClock_Release(session->clock); session->clock = NULL; session_clear_presentation(session); + session_clear_command_list(session); } LeaveCriticalSection(&session->cs); -- 2.30.2

1 0

[PATCH] mfplat: Add some attributes for tracing.
by Nikolay Sivov May 28, 2021

May 28, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 1fc65f54ea2..b205dd2538e 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -44,6 +44,8 @@ #include "mfmediaengine.h" #include "propvarutil.h" #include "strsafe.h" +#undef INITGUID +#include "evr.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); @@ -1518,7 +1520,6 @@ const char *debugstr_attr(const GUID *guid) X(EVRConfig_AllowBatching), X(MF_TOPOLOGY_DYNAMIC_CHANGE_NOT_ALLOWED), X(MF_MT_VIDEO_PROFILE), - X(MF_MT_MPEG2_PROFILE), X(MF_MT_DV_AAUX_CTRL_PACK_1), X(MF_MT_ALPHA_MODE), X(MF_MT_MPEG2_TIMECODE), @@ -1564,6 +1565,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_PD_MIME_TYPE), X(MF_MT_H264_SUPPORTED_SLICE_MODES), X(MF_PD_LAST_MODIFIED_TIME), + X(VIDEO_ZOOM_RECT), X(MF_PD_PLAYBACK_ELEMENT_ID), X(MF_MEDIA_ENGINE_BROWSER_COMPATIBILITY_MODE_IE9), X(MF_MT_ALL_SAMPLES_INDEPENDENT), @@ -1614,6 +1616,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_ACTIVATE_CUSTOM_VIDEO_MIXER_CLSID), X(MF_MT_MIN_MASTERING_LUMINANCE), X(MF_ACTIVATE_CUSTOM_VIDEO_MIXER_ACTIVATE), + X(MF_SA_REQUIRED_SAMPLE_COUNT), X(MF_ACTIVATE_CUSTOM_VIDEO_MIXER_FLAGS), X(MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_CLSID), X(MF_EVENT_STREAM_METADATA_SYSTEMID), @@ -1638,7 +1641,6 @@ const char *debugstr_attr(const GUID *guid) X(MFSampleExtension_3DVideo_SampleFormat), X(MF_MT_H264_RESOLUTION_SCALING), X(MF_MT_VIDEO_LEVEL), - X(MF_MT_MPEG2_LEVEL), X(MF_SAMPLEGRABBERSINK_SAMPLE_TIME_OFFSET), X(MF_MT_SAMPLE_SIZE), X(MF_MT_AAC_PAYLOAD_TYPE), -- 2.30.2

1 0

[PATCH] evr/mixer: Test format only when setting output type.
by Nikolay Sivov May 28, 2021

May 28, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/mixer.c | 10 ++++++++-- dlls/evr/tests/evr.c | 42 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 49 insertions(+), 3 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 554fb0725e8..c18bf0450bf 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -810,17 +810,23 @@ static HRESULT WINAPI video_mixer_transform_SetInputType(IMFTransform *iface, DW static HRESULT WINAPI video_mixer_transform_SetOutputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) { - const unsigned int equality_flags = MF_MEDIATYPE_EQUAL_MAJOR_TYPES | - MF_MEDIATYPE_EQUAL_FORMAT_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_DATA; + const unsigned int equality_flags = MF_MEDIATYPE_EQUAL_MAJOR_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_TYPES; struct video_mixer *mixer = impl_from_IMFTransform(iface); HRESULT hr = MF_E_INVALIDMEDIATYPE; unsigned int i, compare_flags; + BOOL is_compressed = TRUE; TRACE("%p, %u, %p, %#x.\n", iface, id, type, flags); if (id) return MF_E_INVALIDSTREAMNUMBER; + if (!type) + return E_INVALIDARG; + + if (FAILED(IMFMediaType_IsCompressedFormat(type, &is_compressed)) || is_compressed) + return MF_E_INVALIDMEDIATYPE; + EnterCriticalSection(&mixer->cs); for (i = 0; i < mixer->output.rt_formats_count; ++i) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index dd38a75ca2b..91fff21ebed 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -942,11 +942,11 @@ static void test_default_mixer_type_negotiation(void) IDirect3DDeviceManager9 *manager; DXVA2_VideoProcessorCaps caps; IMFVideoProcessor *processor; + GUID subtype, guid, *guids; IDirect3DDevice9 *device; IMFMediaType *video_type; IMFTransform *transform; DWORD index, count; - GUID guid, *guids; IUnknown *unk; HWND window; HRESULT hr; @@ -1070,6 +1070,46 @@ static void test_default_mixer_type_negotiation(void) IMFMediaType_Release(media_type); IMFMediaType_Release(media_type2); + /* Minimal valid attribute set for output type. */ + hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = MFCreateMediaType(&media_type2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaType_GetGUID(media_type, &MF_MT_SUBTYPE, &subtype); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(media_type2, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(media_type2, &MF_MT_SUBTYPE, &subtype); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_SetOutputType(transform, 1, NULL, MFT_SET_TYPE_TEST_ONLY); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_SetOutputType(transform, 0, NULL, MFT_SET_TYPE_TEST_ONLY); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_SetOutputType(transform, 0, media_type2, MFT_SET_TYPE_TEST_ONLY); + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaType_SetUINT32(media_type2, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_SetOutputType(transform, 0, media_type2, MFT_SET_TYPE_TEST_ONLY); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* Candidate type have frame size set, mismatching size is accepted. */ + hr = IMFMediaType_SetUINT64(media_type2, &MF_MT_FRAME_SIZE, (UINT64)64 << 32 | 64); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_SetOutputType(transform, 0, media_type2, MFT_SET_TYPE_TEST_ONLY); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IMFMediaType_Release(media_type2); + IMFMediaType_Release(media_type); + hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoProcessor, (void **)&processor); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -- 2.30.2

1 0

[PATCH v4 1/3] msxml3: Implement ::get_attributes() for "xml" processing instruction node.
by Dmitry Timoshkov May 28, 2021

May 28, 2021

v4: Create special XML_ELEMENT_NODE for PI node attributes to avoid hitting a libxml2 limitation and manual properties management. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msxml3/nodemap.c | 4 +- dlls/msxml3/pi.c | 114 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 114 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c index 5ea083c4495..856f407654a 100644 --- a/dlls/msxml3/nodemap.c +++ b/dlls/msxml3/nodemap.c @@ -141,7 +141,7 @@ static ULONG WINAPI xmlnodemap_Release( if ( ref == 0 ) { xmlnode_release( This->node ); - xmldoc_release( This->node->doc ); + if (This->node->doc) xmldoc_release( This->node->doc ); if (This->enumvariant) IEnumVARIANT_Release(This->enumvariant); heap_free( This ); } @@ -452,7 +452,7 @@ IXMLDOMNamedNodeMap *create_nodemap(xmlNodePtr node, const struct nodemap_funcs init_dispex(&This->dispex, (IUnknown*)&This->IXMLDOMNamedNodeMap_iface, &xmlnodemap_dispex); xmlnode_add_ref(node); - xmldoc_add_ref(node->doc); + if (node->doc) xmldoc_add_ref(node->doc); return &This->IXMLDOMNamedNodeMap_iface; } diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index cea95708087..6bacff12027 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -34,6 +34,7 @@ #include "ole2.h" #include "msxml6.h" +#include "xmlparser.h" #include "msxml_private.h" #include "wine/debug.h" @@ -45,6 +46,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); typedef struct _dom_pi { xmlnode node; + xmlNodePtr attributes; IXMLDOMProcessingInstruction IXMLDOMProcessingInstruction_iface; LONG ref; } dom_pi; @@ -114,6 +116,7 @@ static ULONG WINAPI dom_pi_Release( TRACE("(%p)->(%d)\n", This, ref); if ( ref == 0 ) { + xmlFreeNode(This->attributes); destroy_xmlnode(&This->node); heap_free( This ); } @@ -287,6 +290,107 @@ static HRESULT WINAPI dom_pi_get_nextSibling( return node_get_next_sibling(&This->node, domNode); } +static HRESULT xml_get_value(xmlChar **p, xmlChar **value) +{ + xmlChar *v; + int len; + + while (isspace(**p)) *p += 1; + if (**p != '=') return XML_E_MISSINGEQUALS; + *p += 1; + + while (isspace(**p)) *p += 1; + if (**p != '"') return XML_E_MISSINGQUOTE; + *p += 1; + + v = *p; + while (**p && **p != '"') *p += 1; + if (!**p) return XML_E_EXPECTINGCLOSEQUOTE; + len = *p - v; + if (!len) return XML_E_MISSINGNAME; + *p += 1; + + *value = heap_alloc(len + 1); + if (!*value) return E_OUTOFMEMORY; + memcpy(*value, v, len); + *(*value + len) = 0; + + return S_OK; +} + +static HRESULT parse_xml_decl(dom_pi *This) +{ + xmlChar *version, *encoding, *standalone, *p; + xmlAttrPtr attr; + HRESULT hr = S_OK; + + if (!This->node.node->content || This->attributes->properties) + return S_OK; + + version = encoding = standalone = NULL; + + p = This->node.node->content; + + while (*p) + { + while (isspace(*p)) p++; + if (!*p) break; + + if (!strncmp((const char *)p, "version", 7)) + { + p += 7; + if ((hr = xml_get_value(&p, &version)) != S_OK) goto fail; + } + else if (!strncmp((const char *)p, "encoding", 8)) + { + p += 8; + if ((hr = xml_get_value(&p, &encoding)) != S_OK) goto fail; + } + else if (!strncmp((const char *)p, "standalone", 10)) + { + p += 10; + if ((hr = xml_get_value(&p, &standalone)) != S_OK) goto fail; + } + else + { + FIXME("unexpected XML attribute %s\n", debugstr_a((const char *)p)); + hr = XML_E_UNEXPECTED_ATTRIBUTE; + goto fail; + } + } + + if (version) + { + attr = xmlSetNsProp(This->attributes, NULL, (const xmlChar *)"version", version); + if (!attr) + hr = E_OUTOFMEMORY; + } + if (encoding) + { + attr = xmlSetNsProp(This->attributes, NULL, (const xmlChar *)"encoding", encoding); + if (!attr) + hr = E_OUTOFMEMORY; + } + if (standalone) + { + attr = xmlSetNsProp(This->attributes, NULL, (const xmlChar *)"standalone", standalone); + if (!attr) + hr = E_OUTOFMEMORY; + } + +fail: + if (hr != S_OK) + { + xmlFreePropList(This->attributes->properties); + This->attributes->properties = NULL; + } + + heap_free(version); + heap_free(encoding); + heap_free(standalone); + return hr; +} + static HRESULT WINAPI dom_pi_get_attributes( IXMLDOMProcessingInstruction *iface, IXMLDOMNamedNodeMap** map) @@ -307,8 +411,10 @@ static HRESULT WINAPI dom_pi_get_attributes( if (!strcmpW(name, xmlW)) { - FIXME("created dummy map for <?xml ?>\n"); - *map = create_nodemap(This->node.node, &dom_pi_attr_map); + hr = parse_xml_decl(This); + if (hr != S_OK) return S_FALSE; + + *map = create_nodemap(This->attributes, &dom_pi_attr_map); SysFreeString(name); return S_OK; } @@ -761,6 +867,10 @@ IUnknown* create_pi( xmlNodePtr pi ) This->IXMLDOMProcessingInstruction_iface.lpVtbl = &dom_pi_vtbl; This->ref = 1; + /* xmlSetProp/xmlSetNsProp accept only nodes of type XML_ELEMENT_NODE, + * so we have to create special node for attributes. + */ + This->attributes = xmlNewNode(NULL, (const xmlChar *)"attributes"); init_xmlnode(&This->node, pi, (IXMLDOMNode*)&This->IXMLDOMProcessingInstruction_iface, &dompi_dispex); -- 2.31.1

2 6

[PATCH v2 1/4] winegstreamer: Advertise support for fast forward and slow motion.
by Giovanni Mascellani May 28, 2021

May 28, 2021

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/winegstreamer/media_source.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 90efc9aaed2..3b7233ac2b5 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -933,7 +933,7 @@ static HRESULT WINAPI media_source_rate_support_GetSlowestRate(IMFRateSupport *i { TRACE("%p, %d, %d, %p.\n", iface, direction, thin, rate); - *rate = direction == MFRATE_FORWARD ? 1.0f : -1.0f; + *rate = 0.0f; return S_OK; } @@ -942,14 +942,14 @@ static HRESULT WINAPI media_source_rate_support_GetFastestRate(IMFRateSupport *i { TRACE("%p, %d, %d, %p.\n", iface, direction, thin, rate); - *rate = direction == MFRATE_FORWARD ? 1.0f : -1.0f; + *rate = direction == MFRATE_FORWARD ? 1e6f : -1e6f; return S_OK; } static HRESULT WINAPI media_source_rate_support_IsRateSupported(IMFRateSupport *iface, BOOL thin, float rate, float *nearest_support_rate) { - const float supported_rate = rate >= 0.0f ? 1.0f : -1.0f; + const float supported_rate = max(min(rate, 1e6f), -1e6f); TRACE("%p, %d, %f, %p.\n", iface, thin, rate, nearest_support_rate); -- 2.32.0.rc0

3 14

[PATCH 1/6] dinput: Make device creation error handling consistent.
by Rémi Bernon May 28, 2021

May 28, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/joystick_linux.c | 21 +++++++-------------- dlls/dinput/joystick_linuxinput.c | 15 ++++++++------- dlls/dinput/joystick_osx.c | 21 +++++++-------------- dlls/dinput/keyboard.c | 15 +++++++++------ dlls/dinput/mouse.c | 16 +++++++++------- 5 files changed, 40 insertions(+), 48 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index a33b16454b0..14074bb176c 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -451,8 +451,7 @@ static HRESULT joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS return S_FALSE; } -static HRESULT alloc_device(REFGUID rguid, IDirectInputImpl *dinput, - JoystickImpl **pdev, unsigned short index) +static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, JoystickImpl **out, unsigned short index ) { DWORD i; JoystickImpl* newDevice; @@ -461,14 +460,10 @@ static HRESULT alloc_device(REFGUID rguid, IDirectInputImpl *dinput, int idx = 0; DIDEVICEINSTANCEW ddi; - TRACE("%s %p %p %hu\n", debugstr_guid(rguid), dinput, pdev, index); + TRACE( "%s %p %p %hu\n", debugstr_guid( rguid ), dinput, out, index ); newDevice = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(JoystickImpl)); - if (newDevice == 0) { - WARN("out of memory\n"); - *pdev = 0; - return DIERR_OUTOFMEMORY; - } + if (!newDevice) return DIERR_OUTOFMEMORY; newDevice->joydev = &joystick_devices[index]; newDevice->joyfd = -1; @@ -564,8 +559,7 @@ static HRESULT alloc_device(REFGUID rguid, IDirectInputImpl *dinput, _dump_DIDEVCAPS(&newDevice->generic.devcaps); } - *pdev = newDevice; - + *out = newDevice; return DI_OK; FAILED: @@ -576,8 +570,6 @@ FAILED1: release_DataFormat(&newDevice->generic.base.data_format); HeapFree(GetProcessHeap(),0,newDevice->generic.axis_map); HeapFree(GetProcessHeap(),0,newDevice); - *pdev = 0; - return hr; } @@ -641,8 +633,9 @@ static HRESULT joydev_create_device(IDirectInputImpl *dinput, REFGUID rguid, REF return DIERR_NOINTERFACE; } - hr = alloc_device(rguid, dinput, &This, index); - if (!This) return hr; + if (FAILED(hr = alloc_device( rguid, dinput, &This, index ))) return hr; + + TRACE( "Created a Joystick device (%p)\n", This ); if (unicode) *pdev = &This->generic.base.IDirectInputDevice8W_iface; diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 2e2c8a87261..95b2df81ece 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -444,7 +444,7 @@ static HRESULT joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS return S_FALSE; } -static JoystickImpl *alloc_device(REFGUID rguid, IDirectInputImpl *dinput, unsigned short index) +static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, JoystickImpl **out, unsigned short index ) { JoystickImpl* newDevice; LPDIDATAFORMAT df = NULL; @@ -453,7 +453,7 @@ static JoystickImpl *alloc_device(REFGUID rguid, IDirectInputImpl *dinput, unsig DIDEVICEINSTANCEW ddi; newDevice = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(JoystickImpl)); - if (!newDevice) return NULL; + if (!newDevice) return DIERR_OUTOFMEMORY; newDevice->generic.base.IDirectInputDevice8A_iface.lpVtbl = &JoystickAvt; newDevice->generic.base.IDirectInputDevice8W_iface.lpVtbl = &JoystickWvt; @@ -584,14 +584,15 @@ static JoystickImpl *alloc_device(REFGUID rguid, IDirectInputImpl *dinput, unsig IDirectInput_AddRef(&newDevice->generic.base.dinput->IDirectInput7A_iface); - return newDevice; + *out = newDevice; + return DI_OK; failed: if (df) HeapFree(GetProcessHeap(), 0, df->rgodf); HeapFree(GetProcessHeap(), 0, df); HeapFree(GetProcessHeap(), 0, newDevice->generic.axis_map); HeapFree(GetProcessHeap(), 0, newDevice); - return NULL; + return DIERR_OUTOFMEMORY; } /****************************************************************************** @@ -630,6 +631,7 @@ static HRESULT joydev_create_device(IDirectInputImpl *dinput, REFGUID rguid, REF have_joydevs && index < have_joydevs) { JoystickImpl *This; + HRESULT hr; if (riid == NULL) ;/* nothing */ @@ -653,10 +655,9 @@ static HRESULT joydev_create_device(IDirectInputImpl *dinput, REFGUID rguid, REF return DIERR_NOINTERFACE; } - This = alloc_device(rguid, dinput, index); - TRACE("Created a Joystick device (%p)\n", This); + if (FAILED(hr = alloc_device( rguid, dinput, &This, index ))) return hr; - if (!This) return DIERR_OUTOFMEMORY; + TRACE( "Created a Joystick device (%p)\n", This ); if (unicode) *pdev = &This->generic.base.IDirectInputDevice8W_iface; diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index e2212557180..65d0a4a36eb 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -1105,8 +1105,7 @@ static BOOL osx_axis_has_ff(FFCAPABILITIES *ffcaps, UInt8 axis) return FALSE; } -static HRESULT alloc_device(REFGUID rguid, IDirectInputImpl *dinput, - JoystickImpl **pdev, unsigned short index) +static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, JoystickImpl **out, unsigned short index ) { DWORD i; IOHIDDeviceRef device; @@ -1119,14 +1118,10 @@ static HRESULT alloc_device(REFGUID rguid, IDirectInputImpl *dinput, int slider_count = 0; FFCAPABILITIES ffcaps; - TRACE("%s %p %p %hu\n", debugstr_guid(rguid), dinput, pdev, index); + TRACE( "%s %p %p %hu\n", debugstr_guid( rguid ), dinput, out, index ); newDevice = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(JoystickImpl)); - if (newDevice == 0) { - WARN("out of memory\n"); - *pdev = 0; - return DIERR_OUTOFMEMORY; - } + if (!newDevice) return DIERR_OUTOFMEMORY; newDevice->id = index; @@ -1287,8 +1282,7 @@ static HRESULT alloc_device(REFGUID rguid, IDirectInputImpl *dinput, _dump_DIDEVCAPS(&newDevice->generic.devcaps); } - *pdev = newDevice; - + *out = newDevice; return DI_OK; FAILED: @@ -1300,8 +1294,6 @@ FAILED: release_DataFormat(&newDevice->generic.base.data_format); HeapFree(GetProcessHeap(),0,newDevice->generic.name); HeapFree(GetProcessHeap(),0,newDevice); - *pdev = 0; - return hr; } @@ -1380,8 +1372,9 @@ static HRESULT joydev_create_device(IDirectInputImpl *dinput, REFGUID rguid, REF return DIERR_NOINTERFACE; } - hr = alloc_device(rguid, dinput, &This, index); - if (!This) return hr; + if (FAILED(hr = alloc_device( rguid, dinput, &This, index ))) return hr; + + TRACE( "Created a Joystick device (%p)\n", This ); if (unicode) *pdev = &This->generic.base.IDirectInputDevice8W_iface; diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 9d4ceda3edc..e9fa9eb8cbc 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -240,13 +240,15 @@ static HRESULT keyboarddev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVI return S_FALSE; } -static SysKeyboardImpl *alloc_device(REFGUID rguid, IDirectInputImpl *dinput) +static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, SysKeyboardImpl **out ) { SysKeyboardImpl* newDevice; LPDIDATAFORMAT df = NULL; int i, idx = 0; newDevice = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(SysKeyboardImpl)); + if (!newDevice) return DIERR_OUTOFMEMORY; + newDevice->base.IDirectInputDevice8A_iface.lpVtbl = &SysKeyboardAvt; newDevice->base.IDirectInputDevice8W_iface.lpVtbl = &SysKeyboardWvt; newDevice->base.ref = 1; @@ -278,13 +280,14 @@ static SysKeyboardImpl *alloc_device(REFGUID rguid, IDirectInputImpl *dinput) newDevice->base.data_format.wine_df = df; IDirectInput_AddRef(&newDevice->base.dinput->IDirectInput7A_iface); - return newDevice; + *out = newDevice; + return DI_OK; failed: if (df) HeapFree(GetProcessHeap(), 0, df->rgodf); HeapFree(GetProcessHeap(), 0, df); HeapFree(GetProcessHeap(), 0, newDevice); - return NULL; + return DIERR_OUTOFMEMORY; } @@ -296,6 +299,7 @@ static HRESULT keyboarddev_create_device(IDirectInputImpl *dinput, REFGUID rguid if (IsEqualGUID(&GUID_SysKeyboard, rguid)) /* Wine Keyboard */ { SysKeyboardImpl *This; + HRESULT hr; if (riid == NULL) ;/* nothing */ @@ -319,10 +323,9 @@ static HRESULT keyboarddev_create_device(IDirectInputImpl *dinput, REFGUID rguid return DIERR_NOINTERFACE; } - This = alloc_device(rguid, dinput); - TRACE("Created a Keyboard device (%p)\n", This); + if (FAILED(hr = alloc_device( rguid, dinput, &This ))) return hr; - if (!This) return DIERR_OUTOFMEMORY; + TRACE( "Created a Keyboard device (%p)\n", This ); if (unicode) *pdev = &This->base.IDirectInputDevice8W_iface; diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index e5bd697a0ea..e789d260e5a 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -184,7 +184,7 @@ static HRESULT mousedev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEI return S_FALSE; } -static SysMouseImpl *alloc_device(REFGUID rguid, IDirectInputImpl *dinput) +static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, SysMouseImpl **out ) { SysMouseImpl* newDevice; LPDIDATAFORMAT df = NULL; @@ -193,7 +193,8 @@ static SysMouseImpl *alloc_device(REFGUID rguid, IDirectInputImpl *dinput) HKEY hkey, appkey; newDevice = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(SysMouseImpl)); - if (!newDevice) return NULL; + if (!newDevice) return DIERR_OUTOFMEMORY; + newDevice->base.IDirectInputDevice8A_iface.lpVtbl = &SysMouseAvt; newDevice->base.IDirectInputDevice8W_iface.lpVtbl = &SysMouseWvt; newDevice->base.ref = 1; @@ -237,13 +238,14 @@ static SysMouseImpl *alloc_device(REFGUID rguid, IDirectInputImpl *dinput) newDevice->base.raw_device.usUsage = 2; /* HID generic mouse */ } - return newDevice; + *out = newDevice; + return DI_OK; failed: if (df) HeapFree(GetProcessHeap(), 0, df->rgodf); HeapFree(GetProcessHeap(), 0, df); HeapFree(GetProcessHeap(), 0, newDevice); - return NULL; + return DIERR_OUTOFMEMORY; } static HRESULT mousedev_create_device(IDirectInputImpl *dinput, REFGUID rguid, REFIID riid, LPVOID *pdev, int unicode) @@ -254,6 +256,7 @@ static HRESULT mousedev_create_device(IDirectInputImpl *dinput, REFGUID rguid, R if (IsEqualGUID(&GUID_SysMouse, rguid)) /* Wine Mouse */ { SysMouseImpl *This; + HRESULT hr; if (riid == NULL) ;/* nothing */ @@ -277,10 +280,9 @@ static HRESULT mousedev_create_device(IDirectInputImpl *dinput, REFGUID rguid, R return DIERR_NOINTERFACE; } - This = alloc_device(rguid, dinput); - TRACE("Created a Mouse device (%p)\n", This); + if (FAILED(hr = alloc_device( rguid, dinput, &This ))) return hr; - if (!This) return DIERR_OUTOFMEMORY; + TRACE( "Created a Mouse device (%p)\n", This ); if (unicode) *pdev = &This->base.IDirectInputDevice8W_iface; -- 2.31.0

1 5

[website] German translation for release 6.9
by Julian Rüger May 28, 2021

May 28, 2021

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for OSPP summer
by Julian Rüger May 28, 2021

May 28, 2021

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 6.8
by Julian Rüger May 28, 2021

May 28, 2021

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0