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
July 2022
----- 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
639 discussions
Start a n
N
ew thread
Connor McAdams : uiautomationcore: Add support for UIAutomationType_Element properties.
by Alexandre Julliard
21 Jul '22
21 Jul '22
Module: wine Branch: master Commit: 0cea011921304eaa48639fe2f591842289f75fde URL:
https://gitlab.winehq.org/wine/wine/-/commit/0cea011921304eaa48639fe2f59184…
Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Jun 20 13:25:12 2022 -0400 uiautomationcore: Add support for UIAutomationType_Element properties. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 10 +- dlls/uiautomationcore/uia_client.c | 189 ++++++++++++++++++++++++++++- dlls/uiautomationcore/uia_ids.c | 18 ++- 3 files changed, 203 insertions(+), 14 deletions(-)
1
0
0
0
Connor McAdams : uiautomationcore: Add support for UIAutomationType_Int properties.
by Alexandre Julliard
21 Jul '22
21 Jul '22
Module: wine Branch: master Commit: afb155145ac719cc0efb4b6de12675b473f06187 URL:
https://gitlab.winehq.org/wine/wine/-/commit/afb155145ac719cc0efb4b6de12675…
Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Sun Jun 19 13:08:16 2022 -0400 uiautomationcore: Add support for UIAutomationType_Int properties. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 18 ++++++----- dlls/uiautomationcore/uia_client.c | 42 ++++++++++++++++++++++++-- dlls/uiautomationcore/uia_ids.c | 48 ++++++++++++++++++++---------- 3 files changed, 82 insertions(+), 26 deletions(-)
1
0
0
0
Connor McAdams : uiautomationcore: Implement UiaGetPropertyValue.
by Alexandre Julliard
21 Jul '22
21 Jul '22
Module: wine Branch: master Commit: 61fa18aa04e31afeaa42ea768fa63161b427784c URL:
https://gitlab.winehq.org/wine/wine/-/commit/61fa18aa04e31afeaa42ea768fa631…
Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Jun 17 15:04:18 2022 -0400 uiautomationcore: Implement UiaGetPropertyValue. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/uia_classes.idl | 17 ++++ dlls/uiautomationcore/uia_client.c | 165 ++++++++++++++++++++++++++++++---- dlls/uiautomationcore/uia_ids.c | 45 ++++++++-- dlls/uiautomationcore/uia_main.c | 13 +-- dlls/uiautomationcore/uia_private.h | 24 +++++ dlls/uiautomationcore/uia_provider.c | 4 +- 6 files changed, 230 insertions(+), 38 deletions(-)
1
0
0
0
Connor McAdams : uiautomationcore/tests: Add basic UIA property tests for UiaGetPropertyValue.
by Alexandre Julliard
21 Jul '22
21 Jul '22
Module: wine Branch: master Commit: 7dc4a1793ea3139ee34448d1c1cec42c46a853d3 URL:
https://gitlab.winehq.org/wine/wine/-/commit/7dc4a1793ea3139ee34448d1c1cec4…
Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Jun 16 12:20:54 2022 -0400 uiautomationcore/tests: Add basic UIA property tests for UiaGetPropertyValue. Add tests for UIA properties that correspond directly with the GetPropertyValue method on IRawElementProviderSimple. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 572 ++++++++++++++++++++++++++++- 1 file changed, 566 insertions(+), 6 deletions(-)
1
0
0
0
Connor McAdams : include: Add CUIAutomationRegistrar definition.
by Alexandre Julliard
21 Jul '22
21 Jul '22
Module: wine Branch: master Commit: 93d6b5a4ff0097e9578584b2aaf6a850aef0e9ae URL:
https://gitlab.winehq.org/wine/wine/-/commit/93d6b5a4ff0097e9578584b2aaf6a8…
Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue Nov 9 18:34:46 2021 -0500 include: Add CUIAutomationRegistrar definition. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- include/uiautomationcore.idl | 153 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 153 insertions(+) diff --git a/include/uiautomationcore.idl b/include/uiautomationcore.idl index c4aa258b5af..5f39ac6d076 100644 --- a/include/uiautomationcore.idl +++ b/include/uiautomationcore.idl @@ -182,4 +182,157 @@ library UIA HRESULT GetSelection([out, retval] SAFEARRAY(VARIANT) *pvarSelectedChildren); [propget] HRESULT DefaultAction([out, retval] BSTR *pszDefaultAction); } + + enum UIAutomationType { + UIAutomationType_Int = 0x01, + UIAutomationType_Bool = 0x02, + UIAutomationType_String = 0x03, + UIAutomationType_Double = 0x04, + UIAutomationType_Point = 0x05, + UIAutomationType_Rect = 0x06, + UIAutomationType_Element = 0x07, + + UIAutomationType_Array = 0x00010000, + UIAutomationType_Out = 0x00020000, + + UIAutomationType_IntArray = ( UIAutomationType_Int | UIAutomationType_Array ), + UIAutomationType_BoolArray = ( UIAutomationType_Bool | UIAutomationType_Array ), + UIAutomationType_StringArray = ( UIAutomationType_String | UIAutomationType_Array ), + UIAutomationType_DoubleArray = ( UIAutomationType_Double | UIAutomationType_Array ), + UIAutomationType_PointArray = ( UIAutomationType_Point | UIAutomationType_Array ), + UIAutomationType_RectArray = ( UIAutomationType_Rect | UIAutomationType_Array ), + UIAutomationType_ElementArray = ( UIAutomationType_Element | UIAutomationType_Array ), + + UIAutomationType_OutInt = ( UIAutomationType_Int | UIAutomationType_Out ), + UIAutomationType_OutBool = ( UIAutomationType_Bool | UIAutomationType_Out ), + UIAutomationType_OutString = ( UIAutomationType_String | UIAutomationType_Out ), + UIAutomationType_OutDouble = ( UIAutomationType_Double | UIAutomationType_Out ), + UIAutomationType_OutPoint = ( UIAutomationType_Point | UIAutomationType_Out ), + UIAutomationType_OutRect = ( UIAutomationType_Rect | UIAutomationType_Out ), + UIAutomationType_OutElement = ( UIAutomationType_Element | UIAutomationType_Out ), + + UIAutomationType_OutIntArray = ( UIAutomationType_Int | UIAutomationType_Array | UIAutomationType_Out ), + UIAutomationType_OutBoolArray = ( UIAutomationType_Bool | UIAutomationType_Array | UIAutomationType_Out ), + UIAutomationType_OutStringArray = ( UIAutomationType_String | UIAutomationType_Array | UIAutomationType_Out ), + UIAutomationType_OutDoubleArray = ( UIAutomationType_Double | UIAutomationType_Array | UIAutomationType_Out ), + UIAutomationType_OutPointArray = ( UIAutomationType_Point | UIAutomationType_Array | UIAutomationType_Out ), + UIAutomationType_OutRectArray = ( UIAutomationType_Rect | UIAutomationType_Array | UIAutomationType_Out ), + UIAutomationType_OutElementArray = ( UIAutomationType_Element | UIAutomationType_Array | UIAutomationType_Out ), + }; + +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(UIAutomationType)") + + struct UIAutomationParameter { + enum UIAutomationType type; + void *pData; + }; + + struct UIAutomationPropertyInfo { + GUID guid; + LPCWSTR pProgrammaticName; + enum UIAutomationType type; + }; + + struct UIAutomationEventInfo { + GUID guid; + LPCWSTR pProgrammaticName; + }; + + struct UIAutomationMethodInfo { + LPCWSTR pProgrammaticName; + BOOL doSetFocus; + UINT cInParameters; + UINT cOutParameters; + [size_is(cInParameters + cOutParameters)]enum UIAutomationType *pParameterTypes; + [size_is(cInParameters + cOutParameters)]LPCWSTR *pParameterNames; + }; + + [ + object, + uuid(c03a7fe4-9431-409f-bed8-ae7c2299bc8d), + pointer_default(unique), + oleautomation + ] + interface IUIAutomationPatternInstance : IUnknown + { + [local] HRESULT GetProperty( + [in] UINT index, + [in] BOOL cached, + [in] enum UIAutomationType type, + [out] void *pPtr); + + [local] HRESULT CallMethod( + [in] UINT index, + [in] const struct UIAutomationParameter *pParams, + [in] UINT cParams); + } + + [ + object, + uuid(d97022f3-a947-465e-8b2a-ac4315fa54e8), + pointer_default(unique), + oleautomation + ] + interface IUIAutomationPatternHandler : IUnknown + { + HRESULT CreateClientWrapper( + [in] IUIAutomationPatternInstance *pPatternInstance, + [out] IUnknown **pClientWrapper); + + [local] HRESULT Dispatch( + [in] IUnknown *pTarget, + [in] UINT index, + [in] const struct UIAutomationParameter *pParams, + [in] UINT cParams); + } + + struct UIAutomationPatternInfo { + GUID guid; + LPCWSTR pProgrammaticName; + GUID providerInterfaceId; + GUID clientInterfaceId; + UINT cProperties; + [size_is(cProperties)]struct UIAutomationPropertyInfo *pProperties; + UINT cMethods; + [size_is(cMethods)]struct UIAutomationMethodInfo *pMethods; + UINT cEvents; + [size_is(cEvents)]struct UIAutomationEventInfo *pEvents; + IUIAutomationPatternHandler *pPatternHandler; + }; + + [ + object, + uuid(8609c4ec-4a1a-4d88-a357-5a66e060e1cf), + pointer_default(unique), + oleautomation + ] + interface IUIAutomationRegistrar : IUnknown + { + HRESULT RegisterProperty( + [in] const struct UIAutomationPropertyInfo *property, + [out] PROPERTYID *propertyId); + + HRESULT RegisterEvent( + [in] const struct UIAutomationEventInfo *event, + [out] EVENTID *eventId); + + HRESULT RegisterPattern( + [in] const struct UIAutomationPatternInfo *pattern, + [out] PATTERNID *pPatternId, + [out] PROPERTYID *pPatternAvailablePropertyId, + [in] UINT propertyIdCount, + [out, size_is(propertyIdCount)] PROPERTYID *pPropertyIds, + [in] UINT eventIdCount, + [out, size_is(eventIdCount)] EVENTID *pEventIds); + }; + + [ + uuid(6e29fabf-9977-42d1-8d0e-ca7e61ad87e6), + version(1.0), + threading(both) + ] + coclass CUIAutomationRegistrar + { + [default] interface IUIAutomationRegistrar; + } }
1
0
0
0
Zebediah Figura : server: Move sock->error setting completely out of sock_dispatch_events().
by Alexandre Julliard
21 Jul '22
21 Jul '22
Module: wine Branch: master Commit: 1d0e21db29b7d5b11cff8726ca3e2d0fe57c9ab6 URL:
https://gitlab.winehq.org/wine/wine/-/commit/1d0e21db29b7d5b11cff8726ca3e2d…
Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 11 23:48:09 2022 -0500 server: Move sock->error setting completely out of sock_dispatch_events(). --- server/sock.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/server/sock.c b/server/sock.c index a8c0b56c2bc..53553ab8ee7 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1084,7 +1084,7 @@ static int sock_dispatch_asyncs( struct sock *sock, int event, int error ) return event; } -static void post_socket_event( struct sock *sock, enum afd_poll_bit event_bit, int error ) +static void post_socket_event( struct sock *sock, enum afd_poll_bit event_bit ) { unsigned int event = (1 << event_bit); @@ -1092,11 +1092,10 @@ static void post_socket_event( struct sock *sock, enum afd_poll_bit event_bit, i { sock->pending_events |= event; sock->reported_events |= event; - sock->errors[event_bit] = error; } } -static void sock_dispatch_events( struct sock *sock, enum connection_state prevstate, int event, int error ) +static void sock_dispatch_events( struct sock *sock, enum connection_state prevstate, int event ) { switch (prevstate) { @@ -1105,29 +1104,29 @@ static void sock_dispatch_events( struct sock *sock, enum connection_state prevs case SOCK_CONNECTING: if (event & POLLOUT) - post_socket_event( sock, AFD_POLL_BIT_CONNECT, 0 ); + post_socket_event( sock, AFD_POLL_BIT_CONNECT ); if (event & (POLLERR | POLLHUP)) - post_socket_event( sock, AFD_POLL_BIT_CONNECT_ERR, error ); + post_socket_event( sock, AFD_POLL_BIT_CONNECT_ERR ); break; case SOCK_LISTENING: if (event & (POLLIN | POLLERR | POLLHUP)) - post_socket_event( sock, AFD_POLL_BIT_ACCEPT, error ); + post_socket_event( sock, AFD_POLL_BIT_ACCEPT ); break; case SOCK_CONNECTED: case SOCK_CONNECTIONLESS: if (event & POLLIN) - post_socket_event( sock, AFD_POLL_BIT_READ, 0 ); + post_socket_event( sock, AFD_POLL_BIT_READ ); if (event & POLLOUT) - post_socket_event( sock, AFD_POLL_BIT_WRITE, 0 ); + post_socket_event( sock, AFD_POLL_BIT_WRITE ); if (event & POLLPRI) - post_socket_event( sock, AFD_POLL_BIT_OOB, 0 ); + post_socket_event( sock, AFD_POLL_BIT_OOB ); if (event & (POLLERR | POLLHUP)) - post_socket_event( sock, AFD_POLL_BIT_HUP, error ); + post_socket_event( sock, AFD_POLL_BIT_HUP ); break; } @@ -1194,6 +1193,7 @@ static void sock_poll_event( struct fd *fd, int event ) { error = errno; event |= POLLERR; + sock->errors[AFD_POLL_BIT_HUP] = error; if ( debug_level ) fprintf( stderr, "recv error on socket %p: %d\n", sock, errno ); } @@ -1218,7 +1218,7 @@ static void sock_poll_event( struct fd *fd, int event ) } event = sock_dispatch_asyncs( sock, event, error ); - sock_dispatch_events( sock, prevstate, event, error ); + sock_dispatch_events( sock, prevstate, event ); complete_async_polls( sock, event, error ); sock_reselect( sock );
1
0
0
0
Zebediah Figura : server: Report the socket error in sock_poll_event() on POLLERR or POLLHUP.
by Alexandre Julliard
21 Jul '22
21 Jul '22
Module: wine Branch: master Commit: 41cdc6674cd5882adc151ec7f4199c6b11c9227f URL:
https://gitlab.winehq.org/wine/wine/-/commit/41cdc6674cd5882adc151ec7f4199c…
Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 11 23:38:34 2022 -0500 server: Report the socket error in sock_poll_event() on POLLERR or POLLHUP. Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=52815
--- dlls/ws2_32/tests/afd.c | 3 ++- server/sock.c | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index 9852d54ecb9..eb525c78c54 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -162,7 +162,8 @@ static void check_poll_(int line, SOCKET s, HANDLE event, int mask, int expect, ok_(__FILE__, line)(out_params.count == 1, "got count %u\n", out_params.count); ok_(__FILE__, line)(out_params.sockets[0].socket == s, "got socket %#Ix\n", out_params.sockets[0].socket); todo_wine_if (todo) ok_(__FILE__, line)(out_params.sockets[0].flags == expect, "got flags %#x\n", out_params.sockets[0].flags); - ok_(__FILE__, line)(!out_params.sockets[0].status, "got status %#x\n", out_params.sockets[0].status); + todo_wine_if (expect & AFD_POLL_RESET) + ok_(__FILE__, line)(!out_params.sockets[0].status, "got status %#x\n", out_params.sockets[0].status); } static void test_poll(void) diff --git a/server/sock.c b/server/sock.c index 373236cab56..a8c0b56c2bc 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1145,6 +1145,9 @@ static void sock_poll_event( struct fd *fd, int event ) if (debug_level) fprintf(stderr, "socket %p select event: %x\n", sock, event); + if (event & (POLLERR | POLLHUP)) + error = sock_error( sock ); + switch (sock->state) { case SOCK_UNCONNECTED: @@ -1153,7 +1156,6 @@ static void sock_poll_event( struct fd *fd, int event ) case SOCK_CONNECTING: if (event & (POLLERR|POLLHUP)) { - error = sock_error( sock ); sock->state = SOCK_UNCONNECTED; event &= ~POLLOUT; } @@ -1166,8 +1168,6 @@ static void sock_poll_event( struct fd *fd, int event ) break; case SOCK_LISTENING: - if (event & (POLLERR|POLLHUP)) - error = sock_error( sock ); break; case SOCK_CONNECTED:
1
0
0
0
Zebediah Figura : server: Record the error for connected and connectionless sockets sockets in sock_error().
by Alexandre Julliard
21 Jul '22
21 Jul '22
Module: wine Branch: master Commit: a2f2b773fb9a55bd73affe4c0ac9e3ff50f6ce03 URL:
https://gitlab.winehq.org/wine/wine/-/commit/a2f2b773fb9a55bd73affe4c0ac9e3…
Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 11 23:24:38 2022 -0500 server: Record the error for connected and connectionless sockets sockets in sock_error(). As long as we do it for connecting and listening sockets, do it here for the remaining socket types as well. --- server/sock.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/server/sock.c b/server/sock.c index 1224c3b4674..373236cab56 100644 --- a/server/sock.c +++ b/server/sock.c @@ -645,20 +645,35 @@ static inline int sock_error( struct sock *sock ) socklen_t len = sizeof(error); getsockopt( get_unix_fd(sock->fd), SOL_SOCKET, SO_ERROR, (void *)&error, &len); - if (sock->state == SOCK_CONNECTING) + + switch (sock->state) { + case SOCK_UNCONNECTED: + break; + + case SOCK_CONNECTING: if (error) sock->errors[AFD_POLL_BIT_CONNECT_ERR] = error; else error = sock->errors[AFD_POLL_BIT_CONNECT_ERR]; - } - else if (sock->state == SOCK_LISTENING) - { + break; + + case SOCK_LISTENING: if (error) sock->errors[AFD_POLL_BIT_ACCEPT] = error; else error = sock->errors[AFD_POLL_BIT_ACCEPT]; + break; + + case SOCK_CONNECTED: + case SOCK_CONNECTIONLESS: + if (error) + sock->errors[AFD_POLL_BIT_HUP] = error; + else + error = sock->errors[AFD_POLL_BIT_HUP]; + break; } + return error; }
1
0
0
0
Zebediah Figura : server: Clear sock->errors[AFD_POLL_BIT_CONNECT_ERR] in sock_poll_event().
by Alexandre Julliard
21 Jul '22
21 Jul '22
Module: wine Branch: master Commit: a1fd99cfbb478b2668aa684e5de00b6994a4daee URL:
https://gitlab.winehq.org/wine/wine/-/commit/a1fd99cfbb478b2668aa684e5de00b…
Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 11 23:08:04 2022 -0500 server: Clear sock->errors[AFD_POLL_BIT_CONNECT_ERR] in sock_poll_event(). Give sock_dispatch_events() a more consistent scope. --- server/sock.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/server/sock.c b/server/sock.c index b96f81a0ea8..1224c3b4674 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1090,10 +1090,7 @@ static void sock_dispatch_events( struct sock *sock, enum connection_state prevs case SOCK_CONNECTING: if (event & POLLOUT) - { post_socket_event( sock, AFD_POLL_BIT_CONNECT, 0 ); - sock->errors[AFD_POLL_BIT_CONNECT_ERR] = 0; - } if (event & (POLLERR | POLLHUP)) post_socket_event( sock, AFD_POLL_BIT_CONNECT_ERR, error ); break; @@ -1149,6 +1146,7 @@ static void sock_poll_event( struct fd *fd, int event ) { sock->state = SOCK_CONNECTED; sock->connect_time = current_time; + sock->errors[AFD_POLL_BIT_CONNECT_ERR] = 0; } break;
1
0
0
0
Jeff Smith : d3drm: Fix components of palette built when loading texture from file.
by Alexandre Julliard
21 Jul '22
21 Jul '22
Module: wine Branch: master Commit: 293c6d24e39a3c99455c15f243bafb3d87043088 URL:
https://gitlab.winehq.org/wine/wine/-/commit/293c6d24e39a3c99455c15f243bafb…
Author: Jeff Smith <whydoubt(a)gmail.com> Date: Tue Jul 19 08:51:11 2022 -0500 d3drm: Fix components of palette built when loading texture from file. Fix the palette-building code used by IDirect3DTexture::InitFromFile to use color components correctly. Also, fix and expand the tests to properly check the components of a built palette. --- dlls/d3drm/tests/d3drm.c | 5 +++-- dlls/d3drm/texture.c | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 87986547a4d..3153f7191f4 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -6287,8 +6287,8 @@ static void test_bitmap_data(unsigned int test_idx, const D3DRMIMAGE *img, for (i = 0; i < img->palette_size; ++i) { unsigned int idx = upside_down ? (h - 1) * w - i + (i % w) * 2 : i; - ok(img->palette[i].red == idx % MOD_B - && img->palette[i].green == idx % MOD_G && img->palette[i].blue == idx % MOD_R, + ok(img->palette[i].red == idx % MOD_R + && img->palette[i].green == idx % MOD_G && img->palette[i].blue == idx % MOD_B, "Test %u: Got unexpected palette entry (%u) color 0x%02x%02x%02x.\n", test_idx, i, img->palette[i].red, img->palette[i].green, img->palette[i].blue); ok(img->palette[i].flags == D3DRMPALETTE_READONLY, @@ -6367,6 +6367,7 @@ static void test_load_texture(void) {100, 100, FALSE}, {99, 100, FALSE}, {3, 39, FALSE}, + {16, 16, FALSE}, }; hr = Direct3DRMCreate(&d3drm1); diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index a60317b48bc..29e304d8598 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -103,9 +103,9 @@ static BOOL d3drm_image_palettise(D3DRMIMAGE *image, unsigned char *src_data, for (i = 0; i < colour_count; ++i) { entry = &palette[i]; - if (entry->red == src_ptr[x * 3 + 0] + if (entry->red == src_ptr[x * 3 + 2] && entry->green == src_ptr[x * 3 + 1] - && entry->blue == src_ptr[x * 3 + 2]) + && entry->blue == src_ptr[x * 3 + 0]) break; } @@ -119,9 +119,9 @@ static BOOL d3drm_image_palettise(D3DRMIMAGE *image, unsigned char *src_data, } entry = &palette[colour_count++]; - entry->red = src_ptr[x * 3 + 0]; + entry->red = src_ptr[x * 3 + 2]; entry->green = src_ptr[x * 3 + 1]; - entry->blue = src_ptr[x * 3 + 2]; + entry->blue = src_ptr[x * 3 + 0]; entry->flags = D3DRMPALETTE_READONLY; }
1
0
0
0
← Newer
1
...
18
19
20
21
22
23
24
...
64
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
Results per page:
10
25
50
100
200