wine-commits December 2021

wine-commits@winehq.org

2 participants
569 discussions

Eric Pouech : winedump: Support dumping quad word values in enumerations.
by Alexandre Julliard 17 Dec '21

17 Dec '21

Module: wine Branch: master Commit: a9c177464f1a3cc2a065072e780b4a23e08ff43f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9c177464f1a3cc2a065072e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 15 13:32:05 2021 +0100 winedump: Support dumping quad word values in enumerations. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/msc.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index f0856b2a6a2..3c632ec19e9 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -504,6 +504,7 @@ static void do_field(const unsigned char* start, const unsigned char* end) const char* cstr; const struct p_string* pstr; int leaf_len, value; + struct full_value full_value; while (ptr < end) { @@ -518,18 +519,18 @@ static void do_field(const unsigned char* start, const unsigned char* end) switch (fieldtype->generic.id) { case LF_ENUMERATE_V1: - leaf_len = numeric_leaf(&value, &fieldtype->enumerate_v1.value); + leaf_len = full_numeric_leaf(&full_value, &fieldtype->enumerate_v1.value); pstr = PSTRING(&fieldtype->enumerate_v1.value, leaf_len); - printf("\t\tEnumerate V1: '%s' value:%d\n", - p_string(pstr), value); + printf("\t\tEnumerate V1: '%s' value:%s\n", + p_string(pstr), full_value_string(&full_value)); ptr += 2 + 2 + leaf_len + 1 + pstr->namelen; break; case LF_ENUMERATE_V3: - leaf_len = numeric_leaf(&value, &fieldtype->enumerate_v3.value); + leaf_len = full_numeric_leaf(&full_value, &fieldtype->enumerate_v3.value); cstr = (const char*)&fieldtype->enumerate_v3.value + leaf_len; - printf("\t\tEnumerate V3: '%s' value:%d\n", - cstr, value); + printf("\t\tEnumerate V3: '%s' value:%s\n", + cstr, full_value_string(&full_value)); ptr += 2 + 2 + leaf_len + strlen(cstr) + 1; break;

1 0

Jacek Caban : ntdll: Don't use inline assembly in do_cpuid.
by Alexandre Julliard 17 Dec '21

17 Dec '21

Module: wine Branch: master Commit: d0413d833f430a487589283c53f797da2b4f48a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0413d833f430a487589283c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 17 15:57:32 2021 +0100 ntdll: Don't use inline assembly in do_cpuid. Avoids problems on old GCC. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51862 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index c2f1ee11eca..9f49b9e6f58 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -249,10 +249,36 @@ BOOL xstate_compaction_enabled = FALSE; #define INEI 0x49656e69 /* "ineI" */ #define NTEL 0x6c65746e /* "ntel" */ -static inline void do_cpuid(unsigned int ax, unsigned int cx, unsigned int *p) -{ - __asm__ ("cpuid" : "=a"(p[0]), "=b" (p[1]), "=c"(p[2]), "=d"(p[3]) : "a"(ax), "c"(cx)); -} +extern void do_cpuid( unsigned int ax, unsigned int cx, unsigned int *p ) DECLSPEC_HIDDEN; +#ifdef __i386__ +__ASM_GLOBAL_FUNC( do_cpuid, + "pushl %esi\n\t" + "pushl %ebx\n\t" + "movl 12(%esp),%eax\n\t" + "movl 16(%esp),%ecx\n\t" + "movl 20(%esp),%esi\n\t" + "cpuid\n\t" + "movl %eax,(%esi)\n\t" + "movl %ebx,4(%esi)\n\t" + "movl %ecx,8(%esi)\n\t" + "movl %edx,12(%esi)\n\t" + "popl %ebx\n\t" + "popl %esi\n\t" + "ret" ) +#else +__ASM_GLOBAL_FUNC( do_cpuid, + "pushq %rbx\n\t" + "movl %edi,%eax\n\t" + "movl %esi,%ecx\n\t" + "movq %rdx,%r8\n\t" + "cpuid\n\t" + "movl %eax,(%r8)\n\t" + "movl %ebx,4(%r8)\n\t" + "movl %ecx,8(%r8)\n\t" + "movl %edx,12(%r8)\n\t" + "popq %rbx\n\t" + "ret" ) +#endif #ifdef __i386__ extern int have_cpuid(void) DECLSPEC_HIDDEN;

1 0

Eric Pouech : ntdll: Use proper names for magic constants.
by Alexandre Julliard 17 Dec '21

17 Dec '21

Module: wine Branch: master Commit: 594036d620ca46c9e1ad78136a6703da5ed21112 URL: https://source.winehq.org/git/wine.git/?a=commit;h=594036d620ca46c9e1ad7813… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Dec 17 15:57:23 2021 +0100 ntdll: Use proper names for magic constants. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 23aa340359e..99c8e37053c 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -444,7 +444,7 @@ static NTSTATUS spawn_process( const RTL_USER_PROCESS_PARAMETERS *params, int so if (!(pid = fork())) /* grandchild */ { if (params->ConsoleFlags || - params->ConsoleHandle == (HANDLE)1 /* KERNEL32_CONSOLE_ALLOC */ || + params->ConsoleHandle == CONSOLE_HANDLE_ALLOC || (params->hStdInput == INVALID_HANDLE_VALUE && params->hStdOutput == INVALID_HANDLE_VALUE)) { setsid();

1 0

Rémi Bernon : winepulse.drv: Write data to pulse in pulse_release_render_buffer.
by Alexandre Julliard 17 Dec '21

17 Dec '21

Module: wine Branch: master Commit: 033cd6013ea9852244b8d58360554c964a7bb540 URL: https://source.winehq.org/git/wine.git/?a=commit;h=033cd6013ea9852244b8d583… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Dec 16 18:20:26 2021 +0100 winepulse.drv: Write data to pulse in pulse_release_render_buffer. Instead of waiting for the timer loop, which sometimes causes pulse buffer underflows. This greatly reduces the amount of underflows in Prince of Persia: The Forgotten Sands, as well as in Forza Horizon 4 introduction and menu audio, which are suffering from audio clicks since PE xaudio conversion. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52225 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/pulse.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index fb8133e9e45..bd886e0d879 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -1675,6 +1675,9 @@ static NTSTATUS pulse_release_render_buffer(void *args) stream->clock_written += written_bytes; stream->locked = 0; + /* push as much data as we can to pulseaudio too */ + pulse_write(stream); + TRACE("Released %u, held %lu\n", params->written_frames, stream->held_bytes / pa_frame_size(&stream->ss)); pulse_unlock();

1 0

Rémi Bernon : winepulse.drv: Keep buffer size separate from allocated size.
by Alexandre Julliard 17 Dec '21

17 Dec '21

Module: wine Branch: master Commit: 262c52110ccc50cdca001eebc8c2f5481b902506 URL: https://source.winehq.org/git/wine.git/?a=commit;h=262c52110ccc50cdca001eeb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Dec 16 18:20:25 2021 +0100 winepulse.drv: Keep buffer size separate from allocated size. So that it rounds to integral audio frame count. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52225 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/pulse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index c329e8c423c..fb8133e9e45 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -876,7 +876,7 @@ static NTSTATUS pulse_create_stream(void *args) stream->alloc_size = stream->real_bufsize_bytes = stream->bufsize_frames * 2 * pa_frame_size(&stream->ss); if (NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, - 0, &stream->real_bufsize_bytes, MEM_COMMIT, PAGE_READWRITE)) + 0, &stream->alloc_size, MEM_COMMIT, PAGE_READWRITE)) hr = E_OUTOFMEMORY; } else { UINT32 i, capture_packets;

1 0

Rémi Bernon : winepulse.drv: Stop writing the same data again on underflow.
by Alexandre Julliard 17 Dec '21

17 Dec '21

Module: wine Branch: master Commit: 6995b77a6d0111bba045ed1dafa348cc465bc5c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6995b77a6d0111bba045ed1d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Dec 16 18:20:24 2021 +0100 winepulse.drv: Stop writing the same data again on underflow. Data in [lcl_offs_bytes;lcl_offs_bytes+held_bytes] is the data we've received from the client and that we consider being used by pulse, regardless of how we write it to it. A subset of this is [pa_offs_bytes;pa_offs_bytes+pa_held_bytes], which is the data we have received from the client but not yet written to pulse. If pulsed has underflown it means that it has used all the data we've written already, and resetting pa_offs_bytes and pa_held_bytes like here will only make us write the same data again (in addition to silence) to mend the underflow, ending up with potentially duplicate audio frames being played. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52225 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/pulse.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index bce70ac358c..c329e8c423c 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -260,9 +260,6 @@ static void pulse_underflow_callback(pa_stream *s, void *userdata) struct pulse_stream *stream = userdata; WARN("%p: Underflow\n", userdata); stream->just_underran = TRUE; - /* re-sync */ - stream->pa_offs_bytes = stream->lcl_offs_bytes; - stream->pa_held_bytes = stream->held_bytes; } static void pulse_started_callback(pa_stream *s, void *userdata)

1 0

Alexandre Julliard : d3d11/tests: Mark a couple of failing tests as todo.
by Alexandre Julliard 17 Dec '21

17 Dec '21

Module: wine Branch: master Commit: 91fb87b2898b2e05c90057541e6a2f422152b652 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91fb87b2898b2e05c9005754… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 17 15:18:42 2021 +0100 d3d11/tests: Mark a couple of failing tests as todo. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 53087684acf..154221e405c 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -6249,7 +6249,7 @@ static void test_so_statistics_query(void) get_query_data(context, query, &data, sizeof(data)); ok(!data.NumPrimitivesWritten, "Got unexpected NumPrimitivesWritten: %u.\n", (unsigned int)data.NumPrimitivesWritten); - todo_wine_if(query_desc.Query == D3D11_QUERY_SO_STATISTICS || query_desc.Query == D3D11_QUERY_SO_STATISTICS_STREAM0) + todo_wine ok(!data.PrimitivesStorageNeeded, "Got unexpected PrimitivesStorageNeeded: %u.\n", (unsigned int)data.PrimitivesStorageNeeded); @@ -6259,7 +6259,7 @@ static void test_so_statistics_query(void) get_query_data(context, query, &data, sizeof(data)); ok(!data.NumPrimitivesWritten, "Got unexpected NumPrimitivesWritten: %u.\n", (unsigned int)data.NumPrimitivesWritten); - todo_wine_if(query_desc.Query == D3D11_QUERY_SO_STATISTICS || query_desc.Query == D3D11_QUERY_SO_STATISTICS_STREAM0) + todo_wine ok(!data.PrimitivesStorageNeeded, "Got unexpected PrimitivesStorageNeeded: %u.\n", (unsigned int)data.PrimitivesStorageNeeded);

1 0

Alexandre Julliard : wininet/tests: Mark a failing test as todo.
by Alexandre Julliard 17 Dec '21

17 Dec '21

Module: wine Branch: master Commit: 13966ac99737acd1e05d3affb0ee5f0dd6c06216 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13966ac99737acd1e05d3aff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 17 15:10:48 2021 +0100 wininet/tests: Mark a failing test as todo. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 3b8f16a9fb2..cf3f62f868a 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -6612,6 +6612,7 @@ static void test_security_flags(void) ok(!res && GetLastError() == ERROR_IO_PENDING, "HttpSendRequest failed: %u\n", GetLastError()); WaitForSingleObject(complete_event, INFINITE); + todo_wine ok(req_error == ERROR_INTERNET_SEC_CERT_ERRORS, "req_error = %d\n", req_error); @@ -6675,7 +6676,7 @@ static void test_security_flags(void) CLEAR_NOTIFIED(INTERNET_STATUS_DETECTING_PROXY); if(req_error != ERROR_INTERNET_SEC_CERT_ERRORS) { - win_skip("Unexpected cert errors %u, skipping security flags tests\n", req_error); + skip("Unexpected cert errors %u, skipping security flags tests\n", req_error); close_async_handle(ses, 3); return;

1 0

Alexandre Julliard : crypt32/tests: Mark a failing test as todo.
by Alexandre Julliard 17 Dec '21

17 Dec '21

Module: wine Branch: master Commit: b714ed411a24c0ae189033e75d4fe21c19ab30ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=b714ed411a24c0ae189033e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 17 15:05:09 2021 +0100 crypt32/tests: Mark a failing test as todo. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/chain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 68817b98dda..5f7f6a5b777 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -4261,7 +4261,7 @@ static ChainCheck chainCheck[] = { { { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_NOT_TIME_NESTED, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_NOT_TIME_VALID, 0 }, - 1, googleSimpleStatus }, TODO_INFO, &oct2016 }, + 1, googleSimpleStatus }, TODO_INFO | TODO_ERROR, &oct2016 }, /* The stanford chain may or may not have its root trusted, so ignore the error */ { { ARRAY_SIZE(stanfordChain), stanfordChain },

1 0

Zebediah Figura : user32: Free the created icon handle when using LR_COPYFROMRESOURCE.
by Alexandre Julliard 16 Dec '21

16 Dec '21

Module: wine Branch: master Commit: 97bf2e7e1edcee9600badf4b708bfe2463d2c28a URL: https://source.winehq.org/git/wine.git/?a=commit;h=97bf2e7e1edcee9600badf4b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 16 11:58:38 2021 -0600 user32: Free the created icon handle when using LR_COPYFROMRESOURCE. Spotted by John Sullivan. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52207 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 582b2612688..d163d1a7360 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -3103,6 +3103,7 @@ HANDLE WINAPI CopyImage( HANDLE hnd, UINT type, INT desiredx, struct cursoricon_frame *frame; struct cursoricon_object *icon; int depth = (flags & LR_MONOCHROME) ? 1 : get_display_bpp(); + HICON resource_icon = NULL; ICONINFO info; HICON res; @@ -3110,10 +3111,14 @@ HANDLE WINAPI CopyImage( HANDLE hnd, UINT type, INT desiredx, if (icon->rsrc && (flags & LR_COPYFROMRESOURCE)) { - hnd = CURSORICON_Load( icon->module, icon->resname, desiredx, desiredy, depth, - !icon->is_icon, flags ); + resource_icon = CURSORICON_Load( icon->module, icon->resname, desiredx, + desiredy, depth, !icon->is_icon, flags ); release_user_handle_ptr( icon ); - if (!(icon = get_icon_ptr( hnd ))) return 0; + if (!(icon = get_icon_ptr( resource_icon ))) + { + if (resource_icon) DestroyIcon( resource_icon ); + return 0; + } } frame = get_icon_frame( icon, 0 ); @@ -3146,6 +3151,7 @@ HANDLE WINAPI CopyImage( HANDLE hnd, UINT type, INT desiredx, { release_icon_frame( icon, frame ); release_user_handle_ptr( icon ); + if (resource_icon) DestroyIcon( resource_icon ); return 0; } stretch_bitmap( info.hbmColor, frame->color, desiredx, desiredy, @@ -3156,6 +3162,7 @@ HANDLE WINAPI CopyImage( HANDLE hnd, UINT type, INT desiredx, DeleteObject( info.hbmColor ); release_icon_frame( icon, frame ); release_user_handle_ptr( icon ); + if (resource_icon) DestroyIcon( resource_icon ); return 0; } stretch_bitmap( info.hbmMask, frame->mask, desiredx, desiredy, @@ -3168,6 +3175,7 @@ HANDLE WINAPI CopyImage( HANDLE hnd, UINT type, INT desiredx, if (!(info.hbmMask = CreateBitmap( desiredx, desiredy * 2, 1, 1, NULL ))) { release_user_handle_ptr( icon ); + if (resource_icon) DestroyIcon( resource_icon ); return 0; } stretch_bitmap( info.hbmMask, frame->mask, desiredx, desiredy * 2, @@ -3184,6 +3192,7 @@ HANDLE WINAPI CopyImage( HANDLE hnd, UINT type, INT desiredx, release_user_handle_ptr( icon ); if (res && (flags & LR_COPYDELETEORG)) DestroyIcon( hnd ); + if (resource_icon) DestroyIcon( resource_icon ); return res; } }

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
57
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2021