winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
September 2020
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
1 participants
703 discussions
Start a n
N
ew thread
Zebediah Figura : ws2_32: Translate WSA_FLAG_OVERLAPPED to NT overlapped flags.
by Alexandre Julliard
25 Sep '20
25 Sep '20
Module: wine Branch: master Commit: 8fb897a5718767bb86c734c8ea90245aeb7bee47 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=8fb897a5718767bb86c734c8…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 24 22:21:00 2020 -0500 ws2_32: Translate WSA_FLAG_OVERLAPPED to NT overlapped flags. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 5 +++-- server/sock.c | 12 ++++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 1136ec87b9..f43c57bf9a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -7716,7 +7716,8 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, RtlInitUnicodeString(&string, afdW); InitializeObjectAttributes(&attr, &string, (flags & WSA_FLAG_NO_HANDLE_INHERIT) ? 0 : OBJ_INHERIT, NULL, NULL); - if ((status = NtOpenFile(&handle, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &attr, &io, 0, 0))) + if ((status = NtOpenFile(&handle, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &attr, + &io, 0, (flags & WSA_FLAG_OVERLAPPED) ? 0 : FILE_SYNCHRONOUS_IO_NONALERT))) { WARN("Failed to create socket, status %#x.\n", status); WSASetLastError(NtStatusToWSAError(status)); @@ -7726,7 +7727,7 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, create_params.family = unixaf; create_params.type = unixtype; create_params.protocol = protocol; - create_params.flags = flags & ~WSA_FLAG_NO_HANDLE_INHERIT; + create_params.flags = flags & ~(WSA_FLAG_NO_HANDLE_INHERIT | WSA_FLAG_OVERLAPPED); if ((status = NtDeviceIoControlFile(handle, NULL, NULL, NULL, &io, IOCTL_AFD_CREATE, &create_params, sizeof(create_params), NULL, 0))) { diff --git a/server/sock.c b/server/sock.c index 3f19c77964..43a17d46ee 100644 --- a/server/sock.c +++ b/server/sock.c @@ -315,7 +315,7 @@ static inline int sock_error( struct fd *fd ) static int sock_dispatch_asyncs( struct sock *sock, int event, int error ) { - if ( sock->flags & WSA_FLAG_OVERLAPPED ) + if (is_fd_overlapped( sock->fd )) { if (event & (POLLIN|POLLPRI) && async_waiting( &sock->read_q )) { @@ -680,6 +680,7 @@ static struct sock *create_socket(void) static int init_socket( struct sock *sock, int family, int type, int protocol, unsigned int flags ) { + unsigned int options = 0; int sockfd; sockfd = socket( family, type, protocol ); @@ -696,10 +697,13 @@ static int init_socket( struct sock *sock, int family, int type, int protocol, u sock->type = type; sock->family = family; - if (sock->fd) release_object( sock->fd ); + if (sock->fd) + { + options = get_fd_options( sock->fd ); + release_object( sock->fd ); + } - if (!(sock->fd = create_anonymous_fd( &sock_fd_ops, sockfd, &sock->obj, - (flags & WSA_FLAG_OVERLAPPED) ? 0 : FILE_SYNCHRONOUS_IO_NONALERT ))) + if (!(sock->fd = create_anonymous_fd( &sock_fd_ops, sockfd, &sock->obj, options ))) { return -1; }
1
0
0
0
Nikolay Sivov : comctl32/tests: Use wide strings literals.
by Alexandre Julliard
25 Sep '20
25 Sep '20
Module: wine Branch: master Commit: 4c86e860e60de954059ddbb09931c52ca1d198f0 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=4c86e860e60de954059ddbb0…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 25 10:36:17 2020 +0300 comctl32/tests: Use wide strings literals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/button.c | 16 +++++----------- dlls/comctl32/tests/combo.c | 6 +++--- dlls/comctl32/tests/dpa.c | 6 ++---- dlls/comctl32/tests/listview.c | 17 +++++------------ dlls/comctl32/tests/misc.c | 13 +++++-------- dlls/comctl32/tests/mru.c | 22 ++++++++++------------ dlls/comctl32/tests/pager.c | 20 ++++++-------------- dlls/comctl32/tests/propsheet.c | 3 +-- dlls/comctl32/tests/syslink.c | 10 +++------- dlls/comctl32/tests/taskdialog.c | 14 +++++--------- dlls/comctl32/tests/toolbar.c | 30 ++++++++++++------------------ dlls/comctl32/tests/tooltips.c | 3 +-- dlls/comctl32/tests/treeview.c | 11 ++++++----- 13 files changed, 64 insertions(+), 107 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=4c86e860e60de954059d…
1
0
0
0
Nikolay Sivov : comctl32/datetime: Do not call default procedure for WM_NCCREATE.
by Alexandre Julliard
25 Sep '20
25 Sep '20
Module: wine Branch: master Commit: 9a5c9be164beddf21d7ff4ca18128085d1050c4f URL:
https://source.winehq.org/git/wine.git/?a=commit;h=9a5c9be164beddf21d7ff4ca…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 25 10:36:16 2020 +0300 comctl32/datetime: Do not call default procedure for WM_NCCREATE. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/datetime.c | 2 +- dlls/comctl32/tests/datetime.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index ace00c7550..8c403dde13 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -1277,7 +1277,7 @@ DATETIME_NCCreate (HWND hwnd, const CREATESTRUCTW *lpcs) dwExStyle |= WS_EX_CLIENTEDGE; SetWindowLongW(hwnd, GWL_EXSTYLE, dwExStyle); - return DefWindowProcW(hwnd, WM_NCCREATE, 0, (LPARAM)lpcs); + return 1; } diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index 111f0bee89..47d7a8fbe5 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -765,6 +765,7 @@ static void test_wm_set_get_text(void) { static const CHAR a_str[] = "a"; CHAR buff[16], time[16], caltype[3]; + WCHAR buffW[16]; HWND hWnd; LRESULT ret; @@ -802,6 +803,16 @@ static void test_wm_set_get_text(void) } DestroyWindow(hWnd); + + /* Window text is not preserved. */ + hWnd = CreateWindowExA(0, DATETIMEPICK_CLASSA, "testname", 0, 0, 50, 300, 120, + NULL, NULL, NULL, NULL); + + buffW[0] = 1; + InternalGetWindowText(hWnd, buffW, ARRAY_SIZE(buffW)); + ok(!buffW[0], "Unexpected window text %s.\n", wine_dbgstr_w(buffW)); + + DestroyWindow(hWnd); } static void test_dts_shownone(void)
1
0
0
0
Zebediah Figura : winegstreamer: Avoid leaking a newly allocated buffer on failure in request_buffer_src().
by Alexandre Julliard
25 Sep '20
25 Sep '20
Module: wine Branch: master Commit: 025b3de29c63e5a05f66bd5354d7e90c2ccad417 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=025b3de29c63e5a05f66bd53…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 24 22:22:55 2020 -0500 winegstreamer: Avoid leaking a newly allocated buffer on failure in request_buffer_src(). According to the GStreamer documentation, the contents of "buffer" should be considered undefined on failure, which means that the caller has no way of freeing a newly allocated buffer. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 9a9fe01936..acb15dc923 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -878,13 +878,14 @@ static GstFlowReturn got_data_sink(GstPad *pad, GstObject *parent, GstBuffer *bu return GST_FLOW_OK; } -static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64 ofs, guint len, GstBuffer **buf) +static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64 ofs, guint len, GstBuffer **buffer) { struct gstdemux *This = gst_pad_get_element_private(pad); + GstBuffer *new_buffer = NULL; HRESULT hr; GstMapInfo info; - TRACE("pad %p, offset %s, length %u, buffer %p.\n", pad, wine_dbgstr_longlong(ofs), len, *buf); + TRACE("pad %p, offset %s, length %u, buffer %p.\n", pad, wine_dbgstr_longlong(ofs), len, *buffer); if (ofs == GST_BUFFER_OFFSET_NONE) ofs = This->nextpullofs; @@ -896,13 +897,16 @@ static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64 len = This->filesize - ofs; This->nextpullofs = ofs + len; - if (!*buf) - *buf = gst_buffer_new_and_alloc(len); - gst_buffer_map(*buf, &info, GST_MAP_WRITE); + if (!*buffer) + *buffer = new_buffer = gst_buffer_new_and_alloc(len); + gst_buffer_map(*buffer, &info, GST_MAP_WRITE); hr = IAsyncReader_SyncRead(This->reader, ofs, len, info.data); - gst_buffer_unmap(*buf, &info); - if (FAILED(hr)) { - ERR("Returned %08x\n", hr); + gst_buffer_unmap(*buffer, &info); + if (FAILED(hr)) + { + ERR("Failed to read data, hr %#x.\n", hr); + if (new_buffer) + gst_buffer_unref(new_buffer); return GST_FLOW_ERROR; }
1
0
0
0
Zebediah Figura : winegstreamer: Don't set the buffer offset in request_buffer_src().
by Alexandre Julliard
25 Sep '20
25 Sep '20
Module: wine Branch: master Commit: 622f2ce9915f1089f8e4550d6dbcfb6fb25289a6 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=622f2ce9915f1089f8e4550d…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 24 22:22:54 2020 -0500 winegstreamer: Don't set the buffer offset in request_buffer_src(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 724ac8fd25..9a9fe01936 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -906,7 +906,6 @@ static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64 return GST_FLOW_ERROR; } - GST_BUFFER_OFFSET(*buf) = ofs; return GST_FLOW_OK; }
1
0
0
0
Isabella Bosia : vkd3d-compiler: Add d3d-asm target type.
by Alexandre Julliard
25 Sep '20
25 Sep '20
Module: vkd3d Branch: master Commit: b0153f8054716c26fab5da373536fcd85dcd4469 URL:
https://source.winehq.org/git/vkd3d.git/?a=commit;h=b0153f8054716c26fab5da3…
Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Fri Sep 25 02:26:40 2020 +0100 vkd3d-compiler: Add d3d-asm target type. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 5f4f9db..fdf3faf 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -72,6 +72,9 @@ target_type_info[] = {VKD3D_SHADER_TARGET_SPIRV_TEXT, "spirv-text", "A SPIR-V shader in text form.\n", false}, + {VKD3D_SHADER_TARGET_D3D_ASM, + "d3d-asm", "A shader in Direct3D assembly form.\n", + false}, }; static bool read_shader(struct vkd3d_shader_code *shader, FILE *f)
1
0
0
0
Isabella Bosia : vkd3d-shader: Implement target type d3d asm.
by Alexandre Julliard
25 Sep '20
25 Sep '20
Module: vkd3d Branch: master Commit: f494abde8999acb849879eeeaede458a19a933d8 URL:
https://source.winehq.org/git/vkd3d.git/?a=commit;h=f494abde8999acb849879ee…
Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Fri Sep 25 02:26:38 2020 +0100 vkd3d-shader: Implement target type d3d asm. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 1 + libs/vkd3d-shader/vkd3d_shader_main.c | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 3efd355..0eead7c 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -466,6 +466,7 @@ enum vkd3d_shader_target_type */ VKD3D_SHADER_TARGET_SPIRV_BINARY, VKD3D_SHADER_TARGET_SPIRV_TEXT, + VKD3D_SHADER_TARGET_D3D_ASM, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_TARGET_TYPE), }; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index ea1a700..0839cae 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -338,6 +338,13 @@ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, vkd3d_shader_dump_shader(parser.shader_version.type, &compile_info->source); + if (compile_info->target_type == VKD3D_SHADER_TARGET_D3D_ASM) + { + ret = vkd3d_dxbc_binary_to_text(parser.data, out); + vkd3d_shader_parser_destroy(&parser); + goto done; + } + if (!(spirv_compiler = vkd3d_dxbc_compiler_create(&parser.shader_version, &parser.shader_desc, compile_info, &scan_descriptor_info, &message_context))) { @@ -1074,6 +1081,7 @@ const enum vkd3d_shader_target_type *vkd3d_shader_get_supported_target_types( #ifdef HAVE_SPIRV_TOOLS VKD3D_SHADER_TARGET_SPIRV_TEXT, #endif + VKD3D_SHADER_TARGET_D3D_ASM, }; TRACE("source_type %#x, count %p.\n", source_type, count);
1
0
0
0
Isabella Bosia : vkd3d-shader: Add vkd3d_dxbc_binary_to_text() helper function.
by Alexandre Julliard
25 Sep '20
25 Sep '20
Module: vkd3d Branch: master Commit: a0d469b20e319cdffcc57adf64f4c00da9d5f2b0 URL:
https://source.winehq.org/git/vkd3d.git/?a=commit;h=a0d469b20e319cdffcc57ad…
Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Fri Sep 25 02:26:36 2020 +0100 vkd3d-shader: Add vkd3d_dxbc_binary_to_text() helper function. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 37 ++++++++++++++++++++++++++------ libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index d7495ee..2d758b6 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1557,17 +1557,18 @@ static void shader_dump_instruction(struct vkd3d_string_buffer *buffer, shader_addline(buffer, "\n"); } -void vkd3d_shader_trace(void *data) +enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, struct vkd3d_shader_code *out) { struct vkd3d_shader_version shader_version; - struct vkd3d_string_buffer buffer; - const char *p, *q; const DWORD *ptr; + struct vkd3d_string_buffer buffer; + enum vkd3d_result result = VKD3D_OK; + void *code; if (!vkd3d_string_buffer_init(&buffer)) { ERR("Failed to initialize string buffer.\n"); - return; + return VKD3D_ERROR; } shader_sm4_read_header(data, &ptr, &shader_version); @@ -1583,13 +1584,37 @@ void vkd3d_shader_trace(void *data) { WARN("Skipping unrecognized instruction.\n"); shader_addline(&buffer, "<unrecognized instruction>\n"); + result = VKD3D_ERROR; continue; } shader_dump_instruction(&buffer, &ins, &shader_version); } - for (p = buffer.buffer; *p; p = q) + code = vkd3d_malloc(buffer.content_size); + if (code) + { + memcpy(code, buffer.buffer, buffer.content_size); + out->size = buffer.content_size; + out->code = code; + } + else + result = VKD3D_ERROR_OUT_OF_MEMORY; + + vkd3d_string_buffer_cleanup(&buffer); + + return result; +} + +void vkd3d_shader_trace(void *data) +{ + const char *p, *q; + struct vkd3d_shader_code code; + + if (vkd3d_dxbc_binary_to_text(data, &code) != VKD3D_OK) + return; + + for (p = code.code; *p; p = q) { if (!(q = strstr(p, "\n"))) q = p + strlen(p); @@ -1598,5 +1623,5 @@ void vkd3d_shader_trace(void *data) TRACE(" %.*s", (int)(q - p), p); } - vkd3d_string_buffer_cleanup(&buffer); + vkd3d_shader_free_shader_code(&code); } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 00b2441..ec0014e 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -830,6 +830,7 @@ struct vkd3d_string_buffer unsigned int content_size; }; +enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, struct vkd3d_shader_code *out) DECLSPEC_HIDDEN; void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer) DECLSPEC_HIDDEN; bool vkd3d_string_buffer_init(struct vkd3d_string_buffer *buffer) DECLSPEC_HIDDEN; int vkd3d_string_buffer_vprintf(struct vkd3d_string_buffer *buffer, const char *format, va_list args) DECLSPEC_HIDDEN;
1
0
0
0
Isabella Bosia : vkd3d-shader: Change use of strstr to strchr.
by Alexandre Julliard
25 Sep '20
25 Sep '20
Module: vkd3d Branch: master Commit: 0808058edefff961344e24419032ff242abe7d34 URL:
https://source.winehq.org/git/vkd3d.git/?a=commit;h=0808058edefff961344e244…
Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Fri Sep 25 02:26:34 2020 +0100 vkd3d-shader: Change use of strstr to strchr. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 16d895f..ea1a700 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -110,7 +110,7 @@ static void vkd3d_string_buffer_trace_(const struct vkd3d_string_buffer *buffer, for (p = buffer->buffer; *p; p = q) { - if (!(q = strstr(p, "\n"))) + if (!(q = strchr(p, '\n'))) q = p + strlen(p); else ++q;
1
0
0
0
Jacek Caban : conhost: Terminate pseudo console on input error.
by Alexandre Julliard
24 Sep '20
24 Sep '20
Module: wine Branch: master Commit: 5f24f3012469f7056aa9b22765af1c0f11e1f6a2 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=5f24f3012469f7056aa9b227…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 24 17:27:12 2020 +0200 conhost: Terminate pseudo console on input error. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 61346a3817..fadba2728d 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2658,7 +2658,7 @@ static NTSTATUS process_console_ioctls( struct console *console ) static int main_loop( struct console *console, HANDLE signal ) { HANDLE signal_event = NULL; - HANDLE wait_handles[2]; + HANDLE wait_handles[3]; unsigned int wait_cnt = 0; unsigned short signal_id; IO_STATUS_BLOCK signal_io; @@ -2677,6 +2677,7 @@ static int main_loop( struct console *console, HANDLE signal ) wait_handles[wait_cnt++] = console->server; if (signal) wait_handles[wait_cnt++] = signal_event; + if (console->input_thread) wait_handles[wait_cnt++] = console->input_thread; for (;;) {
1
0
0
0
← Newer
1
...
12
13
14
15
16
17
18
...
71
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
Results per page:
10
25
50
100
200