February 2022 - Wine-Commits

Francois Gouget : testbot/LibvirtTool: Do not require '-off' to be at the end of the snapshot name.
by Alexandre Julliard Feb. 10, 2022

Feb. 10, 2022

Module: tools Branch: master Commit: cfaf2a62e692dc6241bf2532aaa102d6140b5157 URL: https://source.winehq.org/git/tools.git/?a=commit;h=cfaf2a62e692dc6241bf253… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 10 19:51:42 2022 +0100 testbot/LibvirtTool: Do not require '-off' to be at the end of the snapshot name. One could certainly reorder the elements of the snapshot name so '-off' is the last part but it's not always natural. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index ae21834..e3bc2a0 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -283,7 +283,7 @@ sub ShutDown() { my $Domain = $VM->GetDomain(); my $CurrentSnapshot = $Domain->GetSnapshotName(); - if (!defined $CurrentSnapshot or $CurrentSnapshot !~ /-off$/ or + if (!defined $CurrentSnapshot or $CurrentSnapshot !~ /-off\b/ or !$Domain->IsPoweredOn()) { return 1;

1 0

Francois Gouget : testbot/LibvirtTool: Simplify and fix logging in ShutDown().
by Alexandre Julliard Feb. 10, 2022

Feb. 10, 2022

Module: tools Branch: master Commit: b6218171b0daeae13ba72e349f55edc33c0de6a9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=b6218171b0daeae13ba72e3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 10 19:51:52 2022 +0100 testbot/LibvirtTool: Simplify and fix logging in ShutDown(). Don't log that the shutdown was successful if it failed or timed out. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index e3bc2a0..4b84f9b 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -289,10 +289,8 @@ sub ShutDown() return 1; } - Debug(Elapsed($Start), " Performing a clean shutdown of $VMKey $CurrentSnapshot\n"); - LogMsg "Performing a clean shutdown of $VMKey $CurrentSnapshot\n"; - - my $Success = 1; + Debug(Elapsed($Start), " Performing a clean shutdown of $VMKey/$CurrentSnapshot\n"); + LogMsg "Performing a clean shutdown of $VMKey/$CurrentSnapshot\n"; my $Cmd = $VM->Type =~ /^win(?:32|64)$/ ? ["shutdown.exe", "/p", "/d", "00:00"] : ["/sbin/shutdown", "--poweroff", "now"]; @@ -301,28 +299,24 @@ sub ShutDown() if (!$PTA->Run($Cmd, 0)) { Error "Could not run @$Cmd on $VMKey: ". $PTA->GetLastError() ."\n"; - $Success = 0; + return 0; } - else + + Debug(Elapsed($Start), " Waiting for the VM to shut down\n"); + my $Deadline = time() + $WaitForShutdown; + while (time() <= $Deadline) { - Debug(Elapsed($Start), " Waiting for the VM to power off\n"); - my $Deadline = time() + $WaitForShutdown; - while ($Domain->IsPoweredOn()) + if (!$Domain->IsPoweredOn()) { - if (time() >= $Deadline) - { - Error "Timed out waiting for $VMKey to perform a clean shutdown. Forcefully shutting down now...\n"; - $Success = 0; - last; - } - sleep(1); + Debug(Elapsed($Start), " Successfully shut down $VMKey\n"); + LogMsg "Successfully shut down $VMKey\n"; + return 1; } + sleep(1); } - $PTA->Disconnect(); + Error "Timed out waiting for $VMKey to perform a clean shutdown. Forcefully shutting down now...\n"; - Debug(Elapsed($Start), " Successfully shut down $VMKey\n"); - LogMsg "Successfully shut down $VMKey\n"; - return $Success; + return 0; } sub Monitor()

1 0

Stefan Dösinger : ddraw/tests: Account for random WARP behavior in test_texturemapblend.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: 3a833d9b0b73aef54499e89b0d0c2ead959e650e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a833d9b0b73aef54499e89b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Feb 9 14:23:17 2022 +0300 ddraw/tests: Account for random WARP behavior in test_texturemapblend. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 304671558af..458b3f48fdb 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -8390,6 +8390,20 @@ static void test_texturemapblend(void) emit_set_rs(&ptr, D3DRENDERSTATE_TEXTUREMAPBLEND, D3DTBLEND_MODULATE); emit_set_rs(&ptr, D3DRENDERSTATE_TEXTUREHANDLE, texture_handle); + /* SPECULARENABLE shouldn't matter in this test, but WARP begs to + * differ. In the event that color keying is randomly on (see comments + * in test_ck_default for reference), WARP will randomly discard + * fragments based on something, even though texture and diffuse color + * alpha components are non-zero. Setting SPECULARENABLE to FALSE + * prevents this in some cases - presumably WARP multiplies the + * specular color "alpha" channel into the final result and then + * alpha tests the result. Since the specular property normally does + * not have an alpha component the actual specular color we set in + * the vertex data above does not matter. Setting FOGENABLE = FALSE + * does not help either (specular alpha can contain a per-vertex fog + * factor. Doesn't seem to matter here). */ + emit_set_rs(&ptr, D3DRENDERSTATE_SPECULARENABLE, FALSE); + emit_tquad(&ptr, 0); emit_tquad(&ptr, 4); emit_end(&ptr); @@ -8407,6 +8421,7 @@ static void test_texturemapblend(void) hr = IDirect3DDevice_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + /* The above SPECULARENABLE = FALSE on WARP matters here.*/ color = get_surface_color(rt, 5, 5); ok(compare_color(color, 0x00000080, 2), "Got unexpected color 0x%08x.\n", color); color = get_surface_color(rt, 400, 5); @@ -8476,14 +8491,25 @@ static void test_texturemapblend(void) hr = IDirect3DDevice_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + /* Despite our best efforts at not making color keying randomly triggering, those + * four broken() results occur every now and then on WARP. Presumably the non- + * existent alpha channel sometimes samples 0.0 instead of the expected 1.0. */ color = get_surface_color(rt, 5, 5); - ok(compare_color(color, 0x000000ff, 2), "Got unexpected color 0x%08x.\n", color); + ok(compare_color(color, 0x000000ff, 2) + || broken(ddraw_is_warp(ddraw) && compare_color(color, 0x00000000, 2)), + "Got unexpected color 0x%08x.\n", color); color = get_surface_color(rt, 400, 5); - ok(compare_color(color, 0x000000ff, 2), "Got unexpected color 0x%08x.\n", color); + ok(compare_color(color, 0x000000ff, 2) + || broken(ddraw_is_warp(ddraw) && compare_color(color, 0x00000000, 2)), + "Got unexpected color 0x%08x.\n", color); color = get_surface_color(rt, 5, 245); - ok(compare_color(color, 0x00000080, 2), "Got unexpected color 0x%08x.\n", color); + ok(compare_color(color, 0x00000080, 2) + || broken(ddraw_is_warp(ddraw) && compare_color(color, 0x00000000, 2)), + "Got unexpected color 0x%08x.\n", color); color = get_surface_color(rt, 400, 245); - ok(compare_color(color, 0x00000080, 2), "Got unexpected color 0x%08x.\n", color); + ok(compare_color(color, 0x00000080, 2) + || broken(ddraw_is_warp(ddraw) && compare_color(color, 0x00000000, 2)), + "Got unexpected color 0x%08x.\n", color); IDirect3DTexture_Release(texture); ref = IDirectDrawSurface_Release(surface);

1 0

Zebediah Figura : wined3d: Use the chunk allocator for GL uniform buffers.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: 86f0ae8efb17ce688986971d24c3e25840a2beef URL: https://source.winehq.org/git/wine.git/?a=commit;h=86f0ae8efb17ce688986971d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 8 20:34:03 2022 -0600 wined3d: Use the chunk allocator for GL uniform buffers. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 0a904615a83..7b40b1de0fb 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -3120,6 +3120,7 @@ static bool use_buffer_chunk_suballocation(const struct wined3d_gl_info *gl_info case GL_ATOMIC_COUNTER_BUFFER: case GL_DRAW_INDIRECT_BUFFER: case GL_PIXEL_UNPACK_BUFFER: + case GL_UNIFORM_BUFFER: return true; case GL_TEXTURE_BUFFER:

1 0

Paul Gofman : ws2_32: Trace status on operation failure.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: 2a38dab2d28186921198b93f7626122d17b00c2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a38dab2d28186921198b93f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Feb 9 20:34:45 2022 +0300 ws2_32: Trace status on operation failure. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index fb2086b11e9..e5e29107853 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -747,7 +747,7 @@ SOCKET WINAPI accept( SOCKET s, struct sockaddr *addr, int *len ) } if (status) { - WARN( "failed; status %#lx\n", status ); + TRACE( "failed, status %#lx\n", status ); WSASetLastError( NtStatusToWSAError( status ) ); return INVALID_SOCKET; } @@ -814,6 +814,7 @@ static BOOL WINAPI WS2_AcceptEx( SOCKET listener, SOCKET acceptor, void *dest, D if (ret_len) *ret_len = overlapped->InternalHigh; WSASetLastError( NtStatusToWSAError(status) ); + TRACE( "status %#lx.\n", status ); return !status; } @@ -867,6 +868,7 @@ static BOOL WINAPI WS2_TransmitFile( SOCKET s, HANDLE file, DWORD file_len, DWOR status = piosb->u.Status; } SetLastError( NtStatusToWSAError( status ) ); + TRACE( "status %#lx.\n", status ); return !status; } @@ -955,6 +957,7 @@ static int WS2_recv_base( SOCKET s, WSABUF *buffers, DWORD buffer_count, DWORD * } if (!status && ret_size) *ret_size = piosb->Information; SetLastError( NtStatusToWSAError( status ) ); + TRACE( "status %#lx.\n", status ); return status ? -1 : 0; } @@ -1021,6 +1024,7 @@ static int WS2_sendto( SOCKET s, WSABUF *buffers, DWORD buffer_count, DWORD *ret } if (!status && ret_size) *ret_size = piosb->Information; SetLastError( NtStatusToWSAError( status ) ); + TRACE( "status %#lx.\n", status ); return status ? -1 : 0; } @@ -1149,7 +1153,8 @@ int WINAPI bind( SOCKET s, const struct sockaddr *addr, int len ) status = io.u.Status; } - if (!status) TRACE( "successfully bound to address %s\n", debugstr_sockaddr( ret_addr )); + if (status) TRACE( "failed, status %#lx.\n", status ); + else TRACE( "successfully bound to address %s\n", debugstr_sockaddr( ret_addr )); free( params ); free( ret_addr ); @@ -1218,6 +1223,7 @@ int WINAPI connect( SOCKET s, const struct sockaddr *addr, int len ) { /* NtStatusToWSAError() has no mapping for WSAEALREADY */ SetLastError( status == STATUS_ADDRESS_ALREADY_ASSOCIATED ? WSAEALREADY : NtStatusToWSAError( status ) ); + TRACE( "failed, status %#lx.\n", status ); return -1; } return 0; @@ -1273,6 +1279,7 @@ static BOOL WINAPI WS2_ConnectEx( SOCKET s, const struct sockaddr *name, int nam free( params ); if (ret_len) *ret_len = overlapped->InternalHigh; SetLastError( NtStatusToWSAError( status ) ); + TRACE( "status %#lx.\n", status ); return !status; } @@ -1303,6 +1310,7 @@ static BOOL WINAPI WS2_DisconnectEx( SOCKET s, OVERLAPPED *overlapped, DWORD fla IOCTL_AFD_WINE_SHUTDOWN, &how, sizeof(how), NULL, 0 ); if (!status && overlapped) status = STATUS_PENDING; SetLastError( NtStatusToWSAError( status ) ); + TRACE( "status %#lx.\n", status ); return !status; } @@ -1334,6 +1342,7 @@ int WINAPI getpeername( SOCKET s, struct sockaddr *addr, int *len ) if (!status) *len = io.Information; SetLastError( NtStatusToWSAError( status ) ); + TRACE( "status %#lx.\n", status ); return status ? -1 : 0; } @@ -1358,6 +1367,7 @@ int WINAPI getsockname( SOCKET s, struct sockaddr *addr, int *len ) if (!status) *len = io.Information; WSASetLastError( NtStatusToWSAError( status ) ); + TRACE( "status %#lx.\n", status ); return status ? -1 : 0; } @@ -1370,6 +1380,7 @@ static int server_getsockopt( SOCKET s, ULONG code, char *optval, int *optlen ) status = NtDeviceIoControlFile( (HANDLE)s, NULL, NULL, NULL, &io, code, NULL, 0, optval, *optlen ); if (!status) *optlen = io.Information; SetLastError( NtStatusToWSAError( status ) ); + TRACE( "status %#lx.\n", status ); return status ? -1 : 0; } @@ -1960,6 +1971,7 @@ static DWORD server_ioctl_sock( SOCKET s, DWORD code, LPVOID in_buff, DWORD in_s else if (status == STATUS_SUCCESS) *ret_size = piosb->Information; + TRACE( "status %#lx.\n", status ); return NtStatusToWSAError( status ); } @@ -2322,6 +2334,7 @@ int WINAPI listen( SOCKET s, int backlog ) status = NtDeviceIoControlFile( SOCKET2HANDLE(s), NULL, NULL, NULL, &io, IOCTL_AFD_LISTEN, &params, sizeof(params), NULL, 0 ); SetLastError( NtStatusToWSAError( status ) ); + TRACE( "status %#lx.\n", status ); return status ? -1 : 0; } @@ -2517,6 +2530,7 @@ int WINAPI select( int count, fd_set *read_ptr, fd_set *write_ptr, free( params ); SetLastError( NtStatusToWSAError( status ) ); + TRACE( "status %#lx.\n", status ); return status ? -1 : ret_count; } @@ -2661,6 +2675,7 @@ int WINAPI WSAPoll( WSAPOLLFD *fds, ULONG count, int timeout ) free( params ); SetLastError( NtStatusToWSAError( status ) ); + TRACE( "status %#lx.\n", status ); return status ? -1 : ret_count; } @@ -2744,6 +2759,7 @@ static int server_setsockopt( SOCKET s, ULONG code, const char *optval, int optl status = NtDeviceIoControlFile( (HANDLE)s, NULL, NULL, NULL, &io, code, (void *)optval, optlen, NULL, 0 ); SetLastError( NtStatusToWSAError( status ) ); + TRACE( "status %#lx.\n", status ); return status ? -1 : 0; } @@ -3055,6 +3071,7 @@ int WINAPI shutdown( SOCKET s, int how ) status = NtDeviceIoControlFile( (HANDLE)s, NULL, NULL, NULL, &io, IOCTL_AFD_WINE_SHUTDOWN, &how, sizeof(how), NULL, 0 ); SetLastError( NtStatusToWSAError( status ) ); + TRACE( "status %#lx.\n", status ); return status ? -1 : 0; } @@ -3112,6 +3129,7 @@ int WINAPI WSAEnumNetworkEvents( SOCKET s, WSAEVENT event, WSANETWORKEVENTS *ret } } SetLastError( NtStatusToWSAError( status ) ); + TRACE( "status %#lx.\n", status ); return status ? -1 : 0; } @@ -3156,6 +3174,7 @@ int WINAPI WSAEventSelect( SOCKET s, WSAEVENT event, LONG mask ) status = NtDeviceIoControlFile( (HANDLE)s, NULL, NULL, NULL, &io, IOCTL_AFD_EVENT_SELECT, &params, sizeof(params), NULL, 0 ); SetLastError( NtStatusToWSAError( status ) ); + TRACE( "status %#lx.\n", status ); return status ? -1 : 0; } @@ -3201,6 +3220,7 @@ BOOL WINAPI WSAGetOverlappedResult( SOCKET s, LPWSAOVERLAPPED lpOverlapped, *lpdwFlags = lpOverlapped->u.s.Offset; SetLastError( NtStatusToWSAError(status) ); + TRACE( "status %#lx.\n", status ); return NT_SUCCESS( status ); } @@ -3224,6 +3244,7 @@ int WINAPI WSAAsyncSelect( SOCKET s, HWND window, UINT message, LONG mask ) status = NtDeviceIoControlFile( (HANDLE)s, NULL, NULL, NULL, &io, IOCTL_AFD_WINE_MESSAGE_SELECT, &params, sizeof(params), NULL, 0 ); SetLastError( NtStatusToWSAError( status ) ); + TRACE( "status %#lx.\n", status ); return status ? -1 : 0; } @@ -3563,7 +3584,7 @@ SOCKET WINAPI WSAAccept( SOCKET s, struct sockaddr *addr, int *addrlen, ret = (*callback)( &caller_id, &caller_data, NULL, NULL, &callee_id, &callee_data, &group, context ); - + TRACE( "callback returned %d.\n", ret ); switch (ret) { case CF_ACCEPT: @@ -3579,6 +3600,7 @@ SOCKET WINAPI WSAAccept( SOCKET s, struct sockaddr *addr, int *addrlen, &server_handle, sizeof(server_handle), NULL, 0 ); closesocket( cs ); SetLastError( status ? RtlNtStatusToDosError( status ) : WSATRY_AGAIN ); + TRACE( "status %#lx.\n", status ); return -1; }

1 0

Piotr Caban : msvcp90: Remove STREAMSIZE_BITS definition.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: 1d5a45912e476a67d6db7f6cb0e9238db8ae4b98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d5a45912e476a67d6db7f6c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 9 18:09:12 2022 +0100 msvcp90: Remove STREAMSIZE_BITS definition. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/ios.c | 94 +++++++++++++++++++++++++------------------------- dlls/msvcp90/msvcp90.h | 4 --- 2 files changed, 47 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1d5a45912e476a67d6db…

1 0

Matteo Bruni : wined3d: Improve comment in wined3d_query_vk_issue().
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: 84dcf5279fc577856f82705aaaa62cdf92182049 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84dcf5279fc577856f82705a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Feb 9 16:50:00 2022 +0100 wined3d: Improve comment in wined3d_query_vk_issue(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/query.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 864a3b82f0a..6c1ed1d6b5a 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -1681,10 +1681,11 @@ static BOOL wined3d_query_vk_issue(struct wined3d_query *query, uint32_t flags) return false; } - /* A query needs to either begin and end inside a single render pass, - * or begin and end outside of a render pass. Occlusion queries, if issued - * outside of a render pass, are queued up and only begun when a render - * pass is started, to avoid interrupting it when the query ends. */ + /* A query needs to either begin and end inside a single render pass + * or begin and end outside of a render pass. Occlusion queries, if + * issued outside of a render pass, are queued up and only begun when + * a render pass is started, to avoid interrupting the render pass + * when the query ends. */ if (context_vk->vk_render_pass) { wined3d_query_vk_begin(query_vk, context_vk, vk_command_buffer);

1 0

Piotr Caban : msvcp: Remove typos in mangled names.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: 4aed1c2074fbd3084a8bf181c93404f5f7614c68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4aed1c2074fbd3084a8bf181… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 9 18:09:09 2022 +0100 msvcp: Remove typos in mangled names. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/ios.c | 10 +++++----- dlls/msvcp90/ios.c | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 9637cbd7c4a..d74856e454f 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -523,11 +523,11 @@ DEFINE_RTTI_DATA0(basic_streambuf_wchar, 0, DEFINE_RTTI_DATA0(basic_streambuf_short, 0, ".?AV?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@") DEFINE_RTTI_DATA1(basic_filebuf_char, 0, &basic_streambuf_char_rtti_base_descriptor, - ".?AV?$basic_filebuf(a)_WU?$char_traits(a)_W@std@@@std@@") + ".?AV?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@") DEFINE_RTTI_DATA1(basic_filebuf_wchar, 0, &basic_streambuf_wchar_rtti_base_descriptor, - ".?AV?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@") + ".?AV?$basic_filebuf(a)_WU?$char_traits(a)_W@std@@@std@@") DEFINE_RTTI_DATA1(basic_filebuf_short, 0, &basic_streambuf_short_rtti_base_descriptor, - ".?AV?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@") + ".?AV?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@") DEFINE_RTTI_DATA1(basic_stringbuf_char, 0, &basic_streambuf_char_rtti_base_descriptor, ".?AV?$basic_stringbuf(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@") DEFINE_RTTI_DATA1(basic_stringbuf_wchar, 0, &basic_streambuf_wchar_rtti_base_descriptor, @@ -9576,8 +9576,8 @@ basic_istream_wchar* __thiscall basic_istream_wchar_read_long(basic_istream_wcha IOS_LOCALE(basic_istream_wchar_get_basic_ios(this)->strbuf))); } -/* ??5?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QAEAAV01(a)AAJ@Z */ -/* ??5?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QEAAAEAV01(a)AEAJ@Z */ +/* ??5?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QAEAAV01(a)AAJ@Z */ +/* ??5?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QEAAAEAV01(a)AEAJ@Z */ DEFINE_THISCALL_WRAPPER(basic_istream_short_read_long, 8) basic_istream_wchar* __thiscall basic_istream_short_read_long(basic_istream_wchar *this, LONG *v) { diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index a4a8657e74f..aa4bdde09a7 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -612,11 +612,11 @@ DEFINE_RTTI_DATA0(basic_streambuf_wchar, 0, DEFINE_RTTI_DATA0(basic_streambuf_short, 0, ".?AV?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@") DEFINE_RTTI_DATA1(basic_filebuf_char, 0, &basic_streambuf_char_rtti_base_descriptor, - ".?AV?$basic_filebuf(a)_WU?$char_traits(a)_W@std@@@std@@") + ".?AV?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@") DEFINE_RTTI_DATA1(basic_filebuf_wchar, 0, &basic_streambuf_wchar_rtti_base_descriptor, - ".?AV?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@") + ".?AV?$basic_filebuf(a)_WU?$char_traits(a)_W@std@@@std@@") DEFINE_RTTI_DATA1(basic_filebuf_short, 0, &basic_streambuf_short_rtti_base_descriptor, - ".?AV?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@") + ".?AV?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@") DEFINE_RTTI_DATA1(basic_stringbuf_char, 0, &basic_streambuf_char_rtti_base_descriptor, ".?AV?$basic_stringbuf(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@") DEFINE_RTTI_DATA1(basic_stringbuf_wchar, 0, &basic_streambuf_wchar_rtti_base_descriptor, @@ -10653,8 +10653,8 @@ basic_istream_wchar* __thiscall basic_istream_wchar_read_long(basic_istream_wcha IOS_LOCALE(basic_istream_wchar_get_basic_ios(this)->strbuf))); } -/* ??5?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QAEAAV01(a)AAJ@Z */ -/* ??5?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QEAAAEAV01(a)AEAJ@Z */ +/* ??5?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QAEAAV01(a)AAJ@Z */ +/* ??5?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QEAAAEAV01(a)AEAJ@Z */ DEFINE_THISCALL_WRAPPER(basic_istream_short_read_long, 8) basic_istream_wchar* __thiscall basic_istream_short_read_long(basic_istream_wchar *this, LONG *v) {

1 0

Piotr Caban : msvcp60: Remove code specific to newer versions of the dll.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: 6b5a277f4f250b6210312b2af5557382ee6cca53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b5a277f4f250b6210312b2a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 9 18:09:05 2022 +0100 msvcp60: Remove code specific to newer versions of the dll. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/ios.c | 250 ----------------------------------------------------- 1 file changed, 250 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6b5a277f4f250b621031…

1 0

Zebediah Figura : wined3d: Use the chunk allocator for GL texture buffers.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: b2087112144ca945d1df9ab9d82ef8a9f6e6d00b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2087112144ca945d1df9ab9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 8 20:34:02 2022 -0600 wined3d: Use the chunk allocator for GL texture buffers. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 2d37e29a655..0a904615a83 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -3113,6 +3113,23 @@ void wined3d_context_gl_destroy_bo(struct wined3d_context_gl *context_gl, struct bo->id = 0; } +static bool use_buffer_chunk_suballocation(const struct wined3d_gl_info *gl_info, GLenum binding) +{ + switch (binding) + { + case GL_ATOMIC_COUNTER_BUFFER: + case GL_DRAW_INDIRECT_BUFFER: + case GL_PIXEL_UNPACK_BUFFER: + return true; + + case GL_TEXTURE_BUFFER: + return gl_info->supported[ARB_TEXTURE_BUFFER_RANGE]; + + default: + return false; + } +} + bool wined3d_context_gl_create_bo(struct wined3d_context_gl *context_gl, GLsizeiptr size, GLenum binding, GLenum usage, bool coherent, GLbitfield flags, struct wined3d_bo_gl *bo) { @@ -3127,19 +3144,15 @@ bool wined3d_context_gl_create_bo(struct wined3d_context_gl *context_gl, GLsizei if (gl_info->supported[ARB_BUFFER_STORAGE]) { - switch (binding) + if (use_buffer_chunk_suballocation(gl_info, binding)) { - case GL_ATOMIC_COUNTER_BUFFER: - case GL_DRAW_INDIRECT_BUFFER: - case GL_PIXEL_UNPACK_BUFFER: - if ((memory = wined3d_context_gl_allocate_memory(context_gl, memory_type_idx, size, &id))) - buffer_offset = memory->offset; - break; - - default: - WARN_(d3d_perf)("Not allocating chunk memory for binding type %#x.\n", binding); - id = wined3d_context_gl_allocate_vram_chunk_buffer(context_gl, memory_type_idx, size); - break; + if ((memory = wined3d_context_gl_allocate_memory(context_gl, memory_type_idx, size, &id))) + buffer_offset = memory->offset; + } + else + { + WARN_(d3d_perf)("Not allocating chunk memory for binding type %#x.\n", binding); + id = wined3d_context_gl_allocate_vram_chunk_buffer(context_gl, memory_type_idx, size); } if (!id)

1 0