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

[PATH] user32: Fix store the surface rectangle in the server
by longchao＠uniontech.com 22 Jun '20

22 Jun '20

-------------- longchao(a)uniontech.com

2 1

[PATCH 1/2] include: Correct definition of PRTL_AVL_ALLOCATE_ROUTINE
by Alex Henrie 22 Jun '20

22 Jun '20

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- include/ddk/ntddk.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index b9f8295db8..497d42da39 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -165,7 +165,7 @@ typedef enum _RTL_GENERIC_COMPARE_RESULTS { typedef RTL_GENERIC_COMPARE_RESULTS (WINAPI *PRTL_AVL_COMPARE_ROUTINE)(struct _RTL_AVL_TABLE *, void *, void *); -typedef void (WINAPI *PRTL_AVL_ALLOCATE_ROUTINE)(struct _RTL_AVL_TABLE *, LONG); +typedef void * (WINAPI *PRTL_AVL_ALLOCATE_ROUTINE)(struct _RTL_AVL_TABLE *, LONG); typedef void (WINAPI *PRTL_AVL_FREE_ROUTINE )(struct _RTL_AVL_TABLE *, void *buffer); -- 2.27.0

1 1

[PATH] user32: Fix store the surface rectangle in the server
by 龙超 22 Jun '20

22 Jun '20

2 1

[PATCH 1/6] kernel32/tests: Add tests for profile struct functions.
by Zebediah Figura 22 Jun '20

22 Jun '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- I actually had a local version of 30ad67dc14 written several months ago. I figure it's at least worth sending the tests I wrote for that. dlls/kernel32/tests/profile.c | 72 +++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 1339b2b20ce..ce82a746e71 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -1092,6 +1092,77 @@ static void test_WritePrivateProfileString(void) DeleteFileA(path); } +static void test_profile_struct(void) +{ + static const char expect_data[] = "[s]\r\nkey=616261637573006F\r\n"; + char buffer[20]; + BOOL ret; + + SetLastError(0xdeadbeef); + ret = GetPrivateProfileStructA("s", "key", buffer, sizeof(buffer), "./winetest.ini"); + ok(!ret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_BAD_LENGTH, "got error %u\n", GetLastError()); + + ret = WritePrivateProfileStructA("s", "key", (void *)"abacus", sizeof("abacus"), "./winetest.ini"); + ok(ret, "got error %u\n", GetLastError()); + ok(check_file_data("./winetest.ini", expect_data), "file doesn't match\n"); + + SetLastError(0xdeadbeef); + ret = GetPrivateProfileStructA("s", "key", buffer, 6, "./winetest.ini"); + ok(!ret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_BAD_LENGTH, "got error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = GetPrivateProfileStructA("s", "key", buffer, 8, "./winetest.ini"); + ok(!ret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_BAD_LENGTH, "got error %u\n", GetLastError()); + + memset(buffer, 0xcc, sizeof(buffer)); + ret = GetPrivateProfileStructA("s", "key", buffer, 7, "./winetest.ini"); + ok(ret, "got error %u\n", GetLastError()); + ok(!strcmp(buffer, "abacus"), "data didn't match\n"); + + memset(buffer, 0xcc, sizeof(buffer)); + ret = GetPrivateProfileStringA("s", "key", "default", buffer, sizeof(buffer), "./winetest.ini"); + ok(ret == 16, "got size %u\n", ret); + ok(!strcmp(buffer, "616261637573006F"), "got %s\n", debugstr_a(buffer)); + + ret = WritePrivateProfileStringA("s", "key", "636163747573006F", "./winetest.ini"); + ok(ret, "got error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = GetPrivateProfileStructA("s", "key", buffer, 7, "./winetest.ini"); + ok(!ret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "got error %u\n", GetLastError()); + + ret = WritePrivateProfileStringA("s", "key", "6361637475730083", "./winetest.ini"); + ok(ret, "got error %u\n", GetLastError()); + + memset(buffer, 0xcc, sizeof(buffer)); + ret = GetPrivateProfileStructA("s", "key", buffer, 7, "./winetest.ini"); + ok(ret, "got error %u\n", GetLastError()); + ok(!strcmp(buffer, "cactus"), "data didn't match\n"); + + ret = WritePrivateProfileStringA("s", "key", "636163747573008Q", "./winetest.ini"); + ok(ret, "got error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = GetPrivateProfileStructA("s", "key", buffer, 7, "./winetest.ini"); + ok(!ret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "got error %u\n", GetLastError()); + + ret = WritePrivateProfileStringA("s", "key", "16361637475730083", "./winetest.ini"); + ok(ret, "got error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = GetPrivateProfileStructA("s", "key", buffer, 7, "./winetest.ini"); + ok(!ret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_BAD_LENGTH, "got error %u\n", GetLastError()); + + ret = DeleteFileA("./winetest.ini"); + ok(ret, "got error %u\n", GetLastError()); +} + START_TEST(profile) { test_profile_int(); @@ -1119,4 +1190,5 @@ START_TEST(profile) "[section2]\r", "CR only"); test_WritePrivateProfileString(); + test_profile_struct(); } -- 2.27.0

2 10

[PATCH] winevulkan: Update to VK spec version 1.2.145.
by Liam Middlebrook 21 Jun '20

21 Jun '20

Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Andy Ritger <aritger(a)nvidia.com> --- dlls/winevulkan/make_vulkan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index d027b9eaa7..a0bf6b0859 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) -VK_XML_VERSION = "1.2.142" +VK_XML_VERSION = "1.2.145" WINE_VK_VERSION = (1, 2) # Filenames to create. -- 2.26.2

1 0

winegstreamer: Avoid Fedora and openSUSE?
by Francois Gouget 21 Jun '20

21 Jun '20

So I ran into an issue 3 years ago where the 32-bit GStreamer plugins are unusable on Fedora and openSUSE despite these distributions shipping the needed 32-bit packages. So did anyone manage to get winegstreamer.dll to work for 32-bit Windows applications on Fedora and openSUSE or is it widely known that one should avoid them when using Wine? Note that of course I reported this issue to the distributions and this is where you'll find more details about this issue: * Fedora https://bugzilla.redhat.com/show_bug.cgi?id=1472160 -> Reported against Fedora 26, then 28, still present in Fedora 32 but fixing this bug seems to have been postponed indefinitely. * openSUSE https://bugzilla.opensuse.org/show_bug.cgi?id=1049452 -> Supposedly fixed on Tumbleweed 2 years ago but still present on openSUSE Leap 15.1 https://bugzilla.opensuse.org/show_bug.cgi?id=1172018 -> New bug for openSUSE Leap 15.1. -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ Demander si un ordinateur peut penser revient à demander si un sous-marin peut nager.

6 28

Installing Wine's build dependencies (wt-install-dev)
by Francois Gouget 21 Jun '20

21 Jun '20

So wt-install-dev now supports openSUSE Tumbleweed (in addition to Leap 15.1) and can also automate adding the contrib section on Debian (for the TrueType fonts) and also Ubuntu. I'm also not opposed to extending it to other distributions like Fedora and Arch. So I'd like to update the Wine wiki pages that describe how to build Wine to reference this tool [1] since I think it's really the easiest way to set things up the 32- and 64-bit build dependencies. But before I do that I wonder if the tool should be moved to another Git repository. Currently it's in my wt-daily repository but that may not be the most appropriate place. The three candidate are: * wt-daily That's where I initially put it since that was easiest and I use wt-install-dev to configure the machines for my daily WineTest runs. But wt-daily is not really a mainstream repository. * tools I also use wt-install-dev to configure the TestBot VMs that run the Wine tests. So since the TestBot source is stored in the tools repository it could make sense to add wt-install-dev there. * wine After all the goal is to help set up a system to compile Wine so that may be the most logical place for it. Then anyone wanting to compile Wine would immediately have access to this tool without having to go fetch some other repository. It could even be referenced in the README. Of course I'm also open to renaming wt-install-dev. Any thoughts? [1] https://wiki.winehq.org/Building_Wine#Cross-Compiling https://wiki.winehq.org/Building_Biarch_Wine_On_Ubuntu https://wiki.winehq.org/OpenSUSE#Build_Tools_and_Dependencies -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ Linux: It is now safe to turn on your computer.

1 0

[PATCH 2/2] winhttp: Pass length in WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER callback
by Alistair Leslie-Hughes 21 Jun '20

21 Jun '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/winhttp/request.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index b25ab9a45c..5d22aeadbf 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1591,7 +1591,8 @@ static DWORD open_connection( struct request *request ) TRACE("connecting to %s:%u\n", debugstr_w(addressW), port); - send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, addressW, 0 ); + len = lstrlenW( addressW ) + 1; + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, addressW, len ); if ((ret = netconn_create( host, &connect->sockaddr, request->connect_timeout, &netconn ))) { -- 2.27.0

1 0

[PATCH 1/2] winhttp: WinHttpWebSocketCompleteUpgrade use WINHTTP_CALLBACK_STATUS_HANDLE_CREATED callback
by Alistair Leslie-Hughes 21 Jun '20

21 Jun '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/winhttp/request.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 0511dd44ee..b25ab9a45c 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3113,7 +3113,11 @@ HINTERNET WINAPI WinHttpWebSocketCompleteUpgrade( HINTERNET hrequest, DWORD_PTR release_object( &socket->hdr ); release_object( &request->hdr ); TRACE("returning %p\n", hsocket); - if (hsocket) SetLastError( ERROR_SUCCESS ); + if (hsocket) + { + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED, hsocket, sizeof(hsocket) ); + SetLastError( ERROR_SUCCESS ); + } return hsocket; } -- 2.27.0

1 0

[RFC PATCH 5/5] quartz/tests: Add MPEG video parser tests for MPEG splitter. (resend)
by Akihiro Sagawa 21 Jun '20

21 Jun '20

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/quartz/tests/mpegsplit.c | 596 ++++++++++++++++++++++++++++------ dlls/quartz/tests/rsrc.rc | 4 + dlls/quartz/tests/video.mpg | Bin 0 -> 617 bytes 3 files changed, 500 insertions(+), 100 deletions(-) create mode 100644 dlls/quartz/tests/video.mpg

1 0