wine-devel March 2020

wine-devel@winehq.org

72 participants
969 discussions

[PATCH] dbghelp: Define NT_GNU_BUILD_ID regardless of whether __ELF__ is defined.
by Gerald Pfeifer 28 Mar '20

28 Mar '20

[ Jacek, this materialized as a consequence of your changes over the last 14 days, between Wine 5.4 and Wine 5.5. ] In dlls/dbghelp/module.c we have unconditional code like the following: if (note[2] == NT_GNU_BUILD_ID) { NT_GNU_BUILD_ID is #defined in image_private.h, which is #included by module.c, alas that definition is conditional on __ELF__ *not* being defined: #ifndef __ELF__ : #ifndef NT_GNU_BUILD_ID #define NT_GNU_BUILD_ID 3 #endif #endif This causes problems on some (newer) versions of FreeBSD, where apparently __ELF__ is defined while NT_GNU_BUILD_ID is not (at least not without including sys/elf_common.h which we do not). I do not have access to the version of FreeBSD 11.3 where that issue was reported. It did successfully pass on a different version of FreeBSD 11.3, though. Gerald Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/dbghelp/image_private.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/image_private.h b/dlls/dbghelp/image_private.h index 9be6d3ebdc..d3c154b713 100644 --- a/dlls/dbghelp/image_private.h +++ b/dlls/dbghelp/image_private.h @@ -52,10 +52,11 @@ #ifndef SHT_NULL #define SHT_NULL 0 #endif +#endif + #ifndef NT_GNU_BUILD_ID #define NT_GNU_BUILD_ID 3 #endif -#endif /* structure holding information while handling an ELF image * allows one by one section mapping for memory savings -- 2.25.0

2 1

Building wine 1.9.20
by Bronze Alibi 28 Mar '20

28 Mar '20

4 6

[PATCH 1/5] quartz/avidec: Use the strmbase_passthrough object directly.
by Zebediah Figura 28 Mar '20

28 Mar '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/avidec.c | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 97566679068..8d38b89e992 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -43,7 +43,7 @@ typedef struct AVIDecImpl struct strmbase_source source; IQualityControl source_IQualityControl_iface; - IUnknown *seeking; + struct strmbase_passthrough passthrough; struct strmbase_sink sink; @@ -300,7 +300,7 @@ static HRESULT avi_decompressor_source_query_interface(struct strmbase_pin *ifac if (IsEqualGUID(iid, &IID_IQualityControl)) *out = &filter->source_IQualityControl_iface; else if (IsEqualGUID(iid, &IID_IMediaSeeking)) - return IUnknown_QueryInterface(filter->seeking, iid, out); + *out = &filter->passthrough.IMediaSeeking_iface; else return E_NOINTERFACE; @@ -548,10 +548,10 @@ static void avi_decompressor_destroy(struct strmbase_filter *iface) strmbase_sink_cleanup(&filter->sink); strmbase_source_cleanup(&filter->source); + strmbase_passthrough_cleanup(&filter->passthrough); filter->stream_cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&filter->stream_cs); - IUnknown_Release(filter->seeking); strmbase_filter_cleanup(&filter->filter); free(filter); @@ -603,8 +603,6 @@ static const struct strmbase_filter_ops filter_ops = HRESULT avi_dec_create(IUnknown *outer, IUnknown **out) { AVIDecImpl *object; - ISeekingPassThru *passthrough; - HRESULT hr; if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; @@ -618,21 +616,9 @@ HRESULT avi_dec_create(IUnknown *outer, IUnknown **out) strmbase_source_init(&object->source, &object->filter, L"Out", &source_ops); object->source_IQualityControl_iface.lpVtbl = &source_qc_vtbl; - - if (FAILED(hr = CoCreateInstance(&CLSID_SeekingPassThru, - (IUnknown *)&object->source.pin.IPin_iface, CLSCTX_INPROC_SERVER, - &IID_IUnknown, (void **)&object->seeking))) - { - strmbase_sink_cleanup(&object->sink); - strmbase_source_cleanup(&object->source); - strmbase_filter_cleanup(&object->filter); - free(object); - return hr; - } - - IUnknown_QueryInterface(object->seeking, &IID_ISeekingPassThru, (void **)&passthrough); - ISeekingPassThru_Init(passthrough, FALSE, &object->sink.pin.IPin_iface); - ISeekingPassThru_Release(passthrough); + strmbase_passthrough_init(&object->passthrough, (IUnknown *)&object->source.pin.IPin_iface); + ISeekingPassThru_Init(&object->passthrough.ISeekingPassThru_iface, FALSE, + &object->sink.pin.IPin_iface); TRACE("Created AVI decompressor %p.\n", object); *out = &object->filter.IUnknown_inner; -- 2.25.1

1 4

[PATCH] user32/tests: Don't report cursor handle since it always changes.
by Mathew Hodson 28 Mar '20

28 Mar '20

Signed-off-by: Mathew Hodson <mathew.hodson(a)gmail.com> --- dlls/user32/tests/cursoricon.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index ff4ab5d..d2265be 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -2332,7 +2332,7 @@ static void test_SetCursor(void) ok( pGetCursorInfo( &info ), "GetCursorInfo failed\n" ); /* global cursor doesn't change since we don't have a window */ ok( info.hCursor == global_cursor || broken(info.hCursor != cursor), /* win9x */ - "wrong info cursor %p/%p\n", info.hCursor, global_cursor ); + "expected global cursor %p\n", global_cursor ); } thread = CreateThread( NULL, 0, set_cursor_thread, 0, 0, &id ); WaitForSingleObject( thread, 1000 ); @@ -2364,7 +2364,7 @@ static void test_SetCursor(void) info.cbSize = sizeof(info); ok( pGetCursorInfo( &info ), "GetCursorInfo failed\n" ); ok( info.hCursor == global_cursor || broken(info.hCursor != cursor), /* win9x */ - "wrong info cursor %p/%p\n", info.hCursor, global_cursor ); + "expected global cursor %p\n", global_cursor ); } SetCursor( old_cursor ); DestroyCursor( cursor ); @@ -2381,7 +2381,7 @@ static void test_SetCursor(void) info.cbSize = sizeof(info); ok( pGetCursorInfo( &info ), "GetCursorInfo failed\n" ); ok( info.hCursor == global_cursor || broken(info.hCursor != cursor), /* win9x */ - "wrong info cursor %p/%p\n", info.hCursor, global_cursor ); + "expected global cursor %p\n", global_cursor ); } } -- 2.7.4

2 1

Building wine 1.9.20
by Bronze Alibi 27 Mar '20

27 Mar '20

Hello everybody, This is my first time trying to figure out if something is a regression , so I need to build an older version of wine. The application involved was reported to work in the past on wine 1.9.20. As that was also an older version of the application it is not clear weather a change in wine or a change in the application broke support, so I want to run the current version on wine 1.9.20. Sadly that build fails. The part from where the red text start ed appearing is attached below. The system is a current installation of Archlinux. Can anyone help me out here with what needs to be adjusted here. This is my first time posting to this list, so if this is the wrong place or information is missing, please tell and I will adjust. (following <https://wiki.winehq.org/Regression_Testing#Preliminary_notes> I went back to the winehq-packaged wine 2.0.4 version to test on debian buster, but that seems not far back enough sadly.) Thanks! ... In file included from /usr/include/pcap/socket.h:68, from /usr/include/pcap/pcap.h:87, from wpcap.c:21: /usr/include/netdb.h:74: note: this is the location of the previous definition 74 | # define NO_ADDRESS NO_DATA /* No address, look for MX record. */ | In file included from ../../include/winsock2.h:47, from wpcap.c:22: ../../include/winsock.h:1009:18: error: conflicting types for ‘accept’ 1009 | SOCKET WINAPI WS(accept)(SOCKET,struct WS(sockaddr)*,int*); | ^~~~~~ ../../include/winsock.h:136:19: note: in definition of macro ‘WS’ 136 | # define WS(x) x | ^ In file included from /usr/include/pcap/socket.h:67, from /usr/include/pcap/pcap.h:87, from wpcap.c:21: /usr/include/sys/socket.h:232:12: note: previous declaration of ‘accept’ was here 232 | extern int accept (int __fd, __SOCKADDR_ARG __addr, | ^~~~~~ In file included from ../../include/winsock2.h:47, from wpcap.c:22: ../../include/winsock.h:1010:15: error: conflicting types for ‘bind’ 1010 | int WINAPI WS(bind)(SOCKET,const struct WS(sockaddr)*,int); | ^~~~ ../../include/winsock.h:136:19: note: in definition of macro ‘WS’ 136 | # define WS(x) x | ^ In file included from /usr/include/pcap/socket.h:67, from /usr/include/pcap/pcap.h:87, from wpcap.c:21: /usr/include/sys/socket.h:112:12: note: previous declaration of ‘bind’ was here 112 | extern int bind (int __fd, __CONST_SOCKADDR_ARG __addr, socklen_t __len) | ^~~~ In file included from ../../include/winsock2.h:47, from wpcap.c:22: ../../include/winsock.h:1012:15: error: conflicting types for ‘connect’ 1012 | int WINAPI WS(connect)(SOCKET,const struct WS(sockaddr)*,int); | ^~~~~~~ ../../include/winsock.h:136:19: note: in definition of macro ‘WS’ 136 | # define WS(x) x | ^ In file included from /usr/include/pcap/socket.h:67, from /usr/include/pcap/pcap.h:87, from wpcap.c:21: /usr/include/sys/socket.h:126:12: note: previous declaration of ‘connect’ was here 126 | extern int connect (int __fd, __CONST_SOCKADDR_ARG __addr, socklen_t __len); | ^~~~~~~ In file included from ../../include/winsock2.h:47, from wpcap.c:22: ../../include/winsock.h:1013:31: error: conflicting types for ‘gethostbyaddr’ 1013 | struct WS(hostent)* WINAPI WS(gethostbyaddr)(const char*,int,int); | ^~~~~~~~~~~~~ ../../include/winsock.h:136:19: note: in definition of macro ‘WS’ 136 | # define WS(x) x | ^ In file included from /usr/include/pcap/socket.h:68, from /usr/include/pcap/pcap.h:87, from wpcap.c:21: /usr/include/netdb.h:135:24: note: previous declaration of ‘gethostbyaddr’ was here 135 | extern struct hostent *gethostbyaddr (const void *__addr, __socklen_t __len, | ^~~~~~~~~~~~~ In file included from ../../include/winsock2.h:47, from wpcap.c:22: ../../include/winsock.h:1014:31: error: conflicting types for ‘gethostbyname’ 1014 | struct WS(hostent)* WINAPI WS(gethostbyname)(const char*); | ^~~~~~~~~~~~~ ../../include/winsock.h:136:19: note: in definition of macro ‘WS’ 136 | # define WS(x) x | ^ In file included from /usr/include/pcap/socket.h:68, from /usr/include/pcap/pcap.h:87, from wpcap.c:21: /usr/include/netdb.h:142:24: note: previous declaration of ‘gethostbyname’ was here 142 | extern struct hostent *gethostbyname (const char *__name); | ^~~~~~~~~~~~~ In file included from ../../include/winsock2.h:47, from wpcap.c:22: ../../include/winsock.h:1015:15: error: conflicting types for ‘getpeername’ 1015 | int WINAPI WS(getpeername)(SOCKET,struct WS(sockaddr)*,int*); | ^~~~~~~~~~~ ../../include/winsock.h:136:19: note: in definition of macro ‘WS’ 136 | # define WS(x) x | ^ In file included from /usr/include/pcap/socket.h:67, from /usr/include/pcap/pcap.h:87, from wpcap.c:21: /usr/include/sys/socket.h:130:12: note: previous declaration of ‘getpeername’ was here 130 | extern int getpeername (int __fd, __SOCKADDR_ARG __addr, | ^~~~~~~~~~~ In file included from ../../include/winsock2.h:47, from wpcap.c:22: ../../include/winsock.h:1016:32: error: conflicting types for ‘getprotobyname’ 1016 | struct WS(protoent)* WINAPI WS(getprotobyname)(const char*); | ^~~~~~~~~~~~~~ ../../include/winsock.h:136:19: note: in definition of macro ‘WS’ 136 | # define WS(x) x | ^ In file included from /usr/include/pcap/socket.h:68, from /usr/include/pcap/pcap.h:87, from wpcap.c:21: /usr/include/netdb.h:355:25: note: previous declaration of ‘getprotobyname’ was here 355 | extern struct protoent *getprotobyname (const char *__name); | ^~~~~~~~~~~~~~ In file included from ../../include/winsock2.h:47, from wpcap.c:22: ../../include/winsock.h:1017:32: error: conflicting types for ‘getprotobynumber’ 1017 | struct WS(protoent)* WINAPI WS(getprotobynumber)(int); | ^~~~~~~~~~~~~~~~ ../../include/winsock.h:136:19: note: in definition of macro ‘WS’ 136 | # define WS(x) x | ^ In file included from /usr/include/pcap/socket.h:68, from /usr/include/pcap/pcap.h:87, from wpcap.c:21: /usr/include/netdb.h:361:25: note: previous declaration of ‘getprotobynumber’ was here 361 | extern struct protoent *getprotobynumber (int __proto); | ^~~~~~~~~~~~~~~~ In file included from ../../include/winsock2.h:47, from wpcap.c:22: ../../include/winsock.h:1021:31: error: conflicting types for ‘getservbyname’ 1021 | struct WS(servent)* WINAPI WS(getservbyname)(const char*,const char*); | ^~~~~~~~~~~~~ ../../include/winsock.h:136:19: note: in definition of macro ‘WS’ 136 | # define WS(x) x | ^ In file included from /usr/include/pcap/socket.h:68, from /usr/include/pcap/pcap.h:87, from wpcap.c:21: /usr/include/netdb.h:288:24: note: previous declaration of ‘getservbyname’ was here 288 | extern struct servent *getservbyname (const char *__name, const char *__proto); | ^~~~~~~~~~~~~ In file included from ../../include/winsock2.h:47, from wpcap.c:22: ../../include/winsock.h:1022:31: error: conflicting types for ‘getservbyport’ 1022 | struct WS(servent)* WINAPI WS(getservbyport)(int,const char*); | ^~~~~~~~~~~~~ ../../include/winsock.h:136:19: note: in definition of macro ‘WS’ 136 | # define WS(x) x | ^ In file included from /usr/include/pcap/socket.h:68, from /usr/include/pcap/pcap.h:87, from wpcap.c:21: /usr/include/netdb.h:295:24: note: previous declaration of ‘getservbyport’ was here 295 | extern struct servent *getservbyport (int __port, const char *__proto); | ^~~~~~~~~~~~~ In file included from ../../include/winsock2.h:47, from wpcap.c:22: ../../include/winsock.h:1023:15: error: conflicting types for ‘getsockname’ 1023 | int WINAPI WS(getsockname)(SOCKET,struct WS(sockaddr)*,int*); | ^~~~~~~~~~~ ../../include/winsock.h:136:19: note: in definition of macro ‘WS’ 136 | # define WS(x) x | ^ In file included from /usr/include/pcap/socket.h:67, from /usr/include/pcap/pcap.h:87, from wpcap.c:21: /usr/include/sys/socket.h:116:12: note: previous declaration of ‘getsockname’ was here 116 | extern int getsockname (int __fd, __SOCKADDR_ARG __addr, | ^~~~~~~~~~~ In file included from ../../include/winsock2.h:47, from wpcap.c:22: ../../include/winsock.h:1024:15: error: conflicting types for ‘getsockopt’ 1024 | int WINAPI WS(getsockopt)(SOCKET,int,int,char*,int*); | ^~~~~~~~~~ ../../include/winsock.h:136:19: note: in definition of macro ‘WS’ 136 | # define WS(x) x | ^ In file included from /usr/include/pcap/socket.h:67, from /usr/include/pcap/pcap.h:87, from wpcap.c:21: /usr/include/sys/socket.h:208:12: note: previous declaration of ‘getsockopt’ was here 208 | extern int getsockopt (int __fd, int __level, int __optname, | ^~~~~~~~~~ In file included from ../../include/winsock2.h:47, from wpcap.c:22: ../../include/winsock.h:1025:17: error: conflicting types for ‘inet_addr’ 1025 | ULONG WINAPI WS(inet_addr)(const char*); | ^~~~~~~~~ ../../include/winsock.h:136:19: note: in definition of macro ‘WS’ 136 | # define WS(x) x | ^ In file included from /usr/include/pcap/socket.h:70, from /usr/include/pcap/pcap.h:87, from wpcap.c:21: /usr/include/arpa/inet.h:34:18: note: previous declaration of ‘inet_addr’ was here 34 | extern in_addr_t inet_addr (const char *__cp) __THROW; | ^~~~~~~~~ In file included from ../../include/winsock2.h:47, from wpcap.c:22: ../../include/winsock.h:1026:17: error: conflicting types for ‘inet_ntoa’ 1026 | char* WINAPI WS(inet_ntoa)(struct WS(in_addr)); | ^~~~~~~~~ ../../include/winsock.h:136:19: note: in definition of macro ‘WS’ 136 | # define WS(x) x | ^ In file included from /usr/include/pcap/socket.h:70, from /usr/include/pcap/pcap.h:87, from wpcap.c:21: /usr/include/arpa/inet.h:53:14: note: previous declaration of ‘inet_ntoa’ was here 53 | extern char *inet_ntoa (struct in_addr __in) __THROW; | ^~~~~~~~~ In file included from ../../include/winsock2.h:47, from wpcap.c:22: ../../include/winsock.h:1028:15: error: conflicting types for ‘listen’ 1028 | int WINAPI WS(listen)(SOCKET,int); | ^~~~~~ ../../include/winsock.h:136:19: note: in definition of macro ‘WS’ 136 | # define WS(x) x | ^ In file included from /usr/include/pcap/socket.h:67, from /usr/include/pcap/pcap.h:87, from wpcap.c:21: /usr/include/sys/socket.h:222:12: note: previous declaration of ‘listen’ was here 222 | extern int listen (int __fd, int __n) __THROW; | ^~~~~~ In file included from ../../include/winsock2.h:47, from wpcap.c:22: ../../include/winsock.h:1029:15: error: conflicting types for ‘recv’ 1029 | int WINAPI WS(recv)(SOCKET,char*,int,int); | ^~~~ ../../include/winsock.h:136:19: note: in definition of macro ‘WS’ 136 | # define WS(x) x | ^ In file included from /usr/include/pcap/socket.h:67, from /usr/include/pcap/pcap.h:87, from wpcap.c:21: /usr/include/sys/socket.h:145:16: note: previous declaration of ‘recv’ was here 145 | extern ssize_t recv (int __fd, void *__buf, size_t __n, int __flags); | ^~~~ In file included from ../../include/winsock2.h:47, from wpcap.c:22: ../../include/winsock.h:1030:15: error: conflicting types for ‘recvfrom’ 1030 | int WINAPI WS(recvfrom)(SOCKET,char*,int,int,struct WS(sockaddr)*,int*); | ^~~~~~~~ ../../include/winsock.h:136:19: note: in definition of macro ‘WS’ 136 | # define WS(x) x | ^ In file included from /usr/include/pcap/socket.h:67, from /usr/include/pcap/pcap.h:87, from wpcap.c:21: /usr/include/sys/socket.h:163:16: note: previous declaration of ‘recvfrom’ was here 163 | extern ssize_t recvfrom (int __fd, void *__restrict __buf, size_t __n, | ^~~~~~~~ In file included from ../../include/winsock2.h:47, from wpcap.c:22: ../../include/winsock.h:1031:15: error: conflicting types for ‘send’ 1031 | int WINAPI WS(send)(SOCKET,const char*,int,int); | ^~~~ ../../include/winsock.h:136:19: note: in definition of macro ‘WS’ 136 | # define WS(x) x | ^ In file included from /usr/include/pcap/socket.h:67, from /usr/include/pcap/pcap.h:87, from wpcap.c:21: /usr/include/sys/socket.h:138:16: note: previous declaration of ‘send’ was here 138 | extern ssize_t send (int __fd, const void *__buf, size_t __n, int __flags); | ^~~~ In file included from ../../include/winsock2.h:47, from wpcap.c:22: ../../include/winsock.h:1032:15: error: conflicting types for ‘sendto’ 1032 | int WINAPI WS(sendto)(SOCKET,const char*,int,int,const struct WS(sockaddr)*,int); | ^~~~~~ ../../include/winsock.h:136:19: note: in definition of macro ‘WS’ 136 | # define WS(x) x | ^ In file included from /usr/include/pcap/socket.h:67, from /usr/include/pcap/pcap.h:87, from wpcap.c:21: /usr/include/sys/socket.h:152:16: note: previous declaration of ‘sendto’ was here 152 | extern ssize_t sendto (int __fd, const void *__buf, size_t __n, | ^~~~~~ In file included from ../../include/winsock2.h:47, from wpcap.c:22: ../../include/winsock.h:1033:15: error: conflicting types for ‘setsockopt’ 1033 | int WINAPI WS(setsockopt)(SOCKET,int,int,const char*,int); | ^~~~~~~~~~ ../../include/winsock.h:136:19: note: in definition of macro ‘WS’ 136 | # define WS(x) x | ^ In file included from /usr/include/pcap/socket.h:67, from /usr/include/pcap/pcap.h:87, from wpcap.c:21: /usr/include/sys/socket.h:215:12: note: previous declaration of ‘setsockopt’ was here 215 | extern int setsockopt (int __fd, int __level, int __optname, | ^~~~~~~~~~ In file included from ../../include/winsock2.h:47, from wpcap.c:22: ../../include/winsock.h:1034:15: error: conflicting types for ‘shutdown’ 1034 | int WINAPI WS(shutdown)(SOCKET,int); | ^~~~~~~~ ../../include/winsock.h:136:19: note: in definition of macro ‘WS’ 136 | # define WS(x) x | ^ In file included from /usr/include/pcap/socket.h:67, from /usr/include/pcap/pcap.h:87, from wpcap.c:21: /usr/include/sys/socket.h:250:12: note: previous declaration of ‘shutdown’ was here 250 | extern int shutdown (int __fd, int __how) __THROW; | ^~~~~~~~ In file included from ../../include/winsock2.h:47, from wpcap.c:22: ../../include/winsock.h:1035:18: error: conflicting types for ‘socket’ 1035 | SOCKET WINAPI WS(socket)(int,int,int); | ^~~~~~ ../../include/winsock.h:136:19: note: in definition of macro ‘WS’ 136 | # define WS(x) x | ^ In file included from /usr/include/pcap/socket.h:67, from /usr/include/pcap/pcap.h:87, from wpcap.c:21: /usr/include/sys/socket.h:102:12: note: previous declaration of ‘socket’ was here 102 | extern int socket (int __domain, int __type, int __protocol) __THROW; | ^~~~~~ In file included from ../../include/winsock2.h:50, from wpcap.c:22: ../../include/ws2def.h:58:19: error: redefinition of ‘struct sockaddr_storage’ 58 | typedef struct WS(sockaddr_storage) { | ^~~~~~~~~~~~~~~~ ../../include/ws2def.h:27:18: note: in definition of macro ‘WS’ 27 | #define WS(x) x | ^ In file included from /usr/include/sys/socket.h:33, from /usr/include/pcap/socket.h:67, from /usr/include/pcap/pcap.h:87, from wpcap.c:21: /usr/include/bits/socket.h:191:8: note: originally defined here 191 | struct sockaddr_storage | ^~~~~~~~~~~~~~~~ wpcap.c: In function ‘wine_pcap_lookupdev’: wpcap.c:183:5: warning: ‘pcap_lookupdev’ is deprecated: use 'pcap_findalldevs' and use the first device [-Wdeprecated-declarations] 183 | return pcap_lookupdev(errbuf); | ^~~~~~ In file included from wpcap.c:21: /usr/include/pcap/pcap.h:328:16: note: declared here 328 | PCAP_API char *pcap_lookupdev(char *) | ^~~~~~~~~~~~~~ wpcap.c: At top level: wpcap.c:234: warning: "PCAP_OPENFLAG_PROMISCUOUS" redefined 234 | #define PCAP_OPENFLAG_PROMISCUOUS 1 | In file included from wpcap.c:21: /usr/include/pcap/pcap.h:714: note: this is the location of the previous definition 714 | #define PCAP_OPENFLAG_PROMISCUOUS 0x00000001 | make[1]: *** [Makefile:169: wpcap.o] Error 1 make[1]: Leaving directory '/home/a/wine-1.9.20/dlls/wpcap' make: *** [Makefile:18511: dlls/wpcap] Error 2 Compilation failed, aborting install.

1 0

Re: [PATCH v2] ntdll: Don't fail if LDR_MODULE.Flags is modified during load
by Myah Caron 27 Mar '20

27 Mar '20

I'm really sorry for the trouble, but I'm not sure how to proceed. My email server strips whitespace, which is what makes the patch invalid, and I'm unable to use pop/imap with mail.com, so I unfortunately cannot send a raw email through git send-email either. I've attached the patch directly, if that works? Again I'm sorry for the trouble. > Sent: Friday, March 27, 2020 at 2:14 PM > From: "Marvin" <testbot(a)winehq.org> > To: "Myah Caron" <qsniyg(a)mail.com> > Subject: Re: [PATCH v2] ntdll: Don't fail if LDR_MODULE.Flags is modified during load > > Thank you for your contribution to Wine! > > This is an automated notification to let you know that your patch has > been reviewed and its status set to "Apply failure". > > This means that git-apply refused to apply the patch. This could be > either because it got mangled in transit, it's not relative to the > latest git, or it conflicts with someone else's patch in the same > area. You need to resend an updated patch. > > If you do not understand the reason for this status, disagree with our > assessment, or are simply not sure how to proceed next, please ask for > clarification by replying to this email. >

2 1

[PATCH v3 1/4] d3dcompiler: Get rid of the init_*_dx9_writer() helpers.
by Zebediah Figura 27 Mar '20

27 Mar '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3dcompiler_43/bytecodewriter.c | 174 +++++++-------------------- 1 file changed, 44 insertions(+), 130 deletions(-) diff --git a/dlls/d3dcompiler_43/bytecodewriter.c b/dlls/d3dcompiler_43/bytecodewriter.c index 35bd6669ef9..b1c0bb60714 100644 --- a/dlls/d3dcompiler_43/bytecodewriter.c +++ b/dlls/d3dcompiler_43/bytecodewriter.c @@ -2285,130 +2285,29 @@ static const struct bytecode_backend ps_3_backend = { ps_3_handlers }; -static void init_vs10_dx9_writer(struct bc_writer *writer) { - TRACE("Creating DirectX9 vertex shader 1.0 writer\n"); - writer->funcs = &vs_1_x_backend; -} - -static void init_vs11_dx9_writer(struct bc_writer *writer) { - TRACE("Creating DirectX9 vertex shader 1.1 writer\n"); - writer->funcs = &vs_1_x_backend; -} - -static void init_vs20_dx9_writer(struct bc_writer *writer) { - TRACE("Creating DirectX9 vertex shader 2.0 writer\n"); - writer->funcs = &vs_2_0_backend; -} - -static void init_vs2x_dx9_writer(struct bc_writer *writer) { - TRACE("Creating DirectX9 vertex shader 2.x writer\n"); - writer->funcs = &vs_2_x_backend; -} - -static void init_vs30_dx9_writer(struct bc_writer *writer) { - TRACE("Creating DirectX9 vertex shader 3.0 writer\n"); - writer->funcs = &vs_3_backend; -} - -static void init_ps10_dx9_writer(struct bc_writer *writer) { - TRACE("Creating DirectX9 pixel shader 1.0 writer\n"); - writer->funcs = &ps_1_0123_backend; -} - -static void init_ps11_dx9_writer(struct bc_writer *writer) { - TRACE("Creating DirectX9 pixel shader 1.1 writer\n"); - writer->funcs = &ps_1_0123_backend; -} - -static void init_ps12_dx9_writer(struct bc_writer *writer) { - TRACE("Creating DirectX9 pixel shader 1.2 writer\n"); - writer->funcs = &ps_1_0123_backend; -} - -static void init_ps13_dx9_writer(struct bc_writer *writer) { - TRACE("Creating DirectX9 pixel shader 1.3 writer\n"); - writer->funcs = &ps_1_0123_backend; -} - -static void init_ps14_dx9_writer(struct bc_writer *writer) { - TRACE("Creating DirectX9 pixel shader 1.4 writer\n"); - writer->funcs = &ps_1_4_backend; -} - -static void init_ps20_dx9_writer(struct bc_writer *writer) { - TRACE("Creating DirectX9 pixel shader 2.0 writer\n"); - writer->funcs = &ps_2_0_backend; -} - -static void init_ps2x_dx9_writer(struct bc_writer *writer) { - TRACE("Creating DirectX9 pixel shader 2.x writer\n"); - writer->funcs = &ps_2_x_backend; -} - -static void init_ps30_dx9_writer(struct bc_writer *writer) { - TRACE("Creating DirectX9 pixel shader 3.0 writer\n"); - writer->funcs = &ps_3_backend; -} - -static struct bc_writer *create_writer(DWORD version) +static const struct { - struct bc_writer *ret = d3dcompiler_alloc(sizeof(*ret)); - - if(!ret) { - WARN("Failed to allocate a bytecode writer instance\n"); - return NULL; - } - - switch(version) { - case BWRITERVS_VERSION(1, 0): - init_vs10_dx9_writer(ret); - break; - case BWRITERVS_VERSION(1, 1): - init_vs11_dx9_writer(ret); - break; - case BWRITERVS_VERSION(2, 0): - init_vs20_dx9_writer(ret); - break; - case BWRITERVS_VERSION(2, 1): - init_vs2x_dx9_writer(ret); - break; - case BWRITERVS_VERSION(3, 0): - init_vs30_dx9_writer(ret); - break; - case BWRITERPS_VERSION(1, 0): - init_ps10_dx9_writer(ret); - break; - case BWRITERPS_VERSION(1, 1): - init_ps11_dx9_writer(ret); - break; - case BWRITERPS_VERSION(1, 2): - init_ps12_dx9_writer(ret); - break; - case BWRITERPS_VERSION(1, 3): - init_ps13_dx9_writer(ret); - break; - case BWRITERPS_VERSION(1, 4): - init_ps14_dx9_writer(ret); - break; - case BWRITERPS_VERSION(2, 0): - init_ps20_dx9_writer(ret); - break; - case BWRITERPS_VERSION(2, 1): - init_ps2x_dx9_writer(ret); - break; - case BWRITERPS_VERSION(3, 0): - init_ps30_dx9_writer(ret); - break; - default: - WARN("Unexpected shader version requested: %08x\n", version); - goto fail; - } - return ret; - -fail: - d3dcompiler_free(ret); - return NULL; + enum shader_type type; + unsigned char major, minor; + const struct bytecode_backend *backend; } +shader_backends[] = +{ + {ST_VERTEX, 1, 0, &vs_1_x_backend}, + {ST_VERTEX, 1, 1, &vs_1_x_backend}, + {ST_VERTEX, 2, 0, &vs_2_0_backend}, + {ST_VERTEX, 2, 1, &vs_2_x_backend}, + {ST_VERTEX, 3, 0, &vs_3_backend}, + + {ST_PIXEL, 1, 0, &ps_1_0123_backend}, + {ST_PIXEL, 1, 1, &ps_1_0123_backend}, + {ST_PIXEL, 1, 2, &ps_1_0123_backend}, + {ST_PIXEL, 1, 3, &ps_1_0123_backend}, + {ST_PIXEL, 1, 4, &ps_1_4_backend}, + {ST_PIXEL, 2, 0, &ps_2_0_backend}, + {ST_PIXEL, 2, 1, &ps_2_x_backend}, + {ST_PIXEL, 3, 0, &ps_3_backend}, +}; static HRESULT call_instr_handler(struct bc_writer *writer, const struct instruction *instr, @@ -2443,17 +2342,32 @@ HRESULT shader_write_bytecode(const struct bwriter_shader *shader, DWORD **resul ERR("NULL shader structure, aborting\n"); return E_FAIL; } - writer = create_writer(sm1_version(shader)); - writer->shader = shader; - *result = NULL; - if(!writer) { - WARN("Could not create a bytecode writer instance. Either unsupported version\n"); - WARN("or out of memory\n"); - hr = E_FAIL; - goto error; + if (!(writer = d3dcompiler_alloc(sizeof(*writer)))) + return E_OUTOFMEMORY; + + for (i = 0; i < ARRAY_SIZE(shader_backends); ++i) + { + if (shader->type == shader_backends[i].type + && shader->major_version == shader_backends[i].major + && shader->minor_version == shader_backends[i].minor) + { + writer->funcs = shader_backends[i].backend; + break; + } + } + + if (!writer->funcs) + { + FIXME("Unsupported shader type %#x, version %u.%u.\n", + shader->type, shader->major_version, shader->minor_version); + d3dcompiler_free(writer); + return E_NOTIMPL; } + writer->shader = shader; + *result = NULL; + buffer = allocate_buffer(); if(!buffer) { WARN("Failed to allocate a buffer for the shader bytecode\n"); -- 2.25.1

3 8

[PATCH] d3dxof: Use stricmp() instead of _strnicmp(..., -1).
by Paul Gofman 27 Mar '20

27 Mar '20

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/d3dxof/parsing.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 7d31627b9c..e29d17810d 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -971,7 +971,7 @@ static BOOL parse_template_members_list(parse_buffer * buf) cur_member->idx_template = 1; while (cur_member->idx_template < buf->pdxf->nb_xtemplates) { - if (!_strnicmp((char*)buf->value, buf->pdxf->xtemplates[cur_member->idx_template].name, -1)) + if (!stricmp((char*)buf->value, buf->pdxf->xtemplates[cur_member->idx_template].name)) break; cur_member->idx_template++; } @@ -1175,7 +1175,7 @@ static BOOL parse_object_members_list(parse_buffer * buf) /* To do template lookup */ for (j = 0; j < buf->pdxf->nb_xtemplates; j++) { - if (!_strnicmp(buf->pdxf->xtemplates[pt->members[i].idx_template].name, buf->pdxf->xtemplates[j].name, -1)) + if (!stricmp(buf->pdxf->xtemplates[pt->members[i].idx_template].name, buf->pdxf->xtemplates[j].name)) { buf->pxt[buf->level] = &buf->pdxf->xtemplates[j]; break; @@ -1391,7 +1391,7 @@ BOOL parse_object(parse_buffer * buf) /* To do template lookup */ for (i = 0; i < buf->pdxf->nb_xtemplates; i++) { - if (!_strnicmp((char*)buf->value, buf->pdxf->xtemplates[i].name, -1)) + if (!stricmp((char*)buf->value, buf->pdxf->xtemplates[i].name)) { buf->pxt[buf->level] = &buf->pdxf->xtemplates[i]; memcpy(&buf->pxo->type, &buf->pdxf->xtemplates[i].class_id, 16); -- 2.25.1

2 1

[PATCH] d3dx9: Use stricmp() instead of _strnicmp(..., -1).
by Paul Gofman 27 Mar '20

27 Mar '20

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/d3dx9_36/effect.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 345bee3c3a..710e999f27 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2202,7 +2202,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetParameterBySemantic(ID3DXEffect *iface, continue; } - if (!_strnicmp(temp_param->semantic, semantic, -1)) + if (!stricmp(temp_param->semantic, semantic)) { TRACE("Returning parameter %p\n", temp_param); return get_parameter_handle(temp_param); @@ -2225,7 +2225,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetParameterBySemantic(ID3DXEffect *iface, continue; } - if (!_strnicmp(temp_param->semantic, semantic, -1)) + if (!stricmp(temp_param->semantic, semantic)) { TRACE("Returning parameter %p\n", temp_param); return get_parameter_handle(temp_param); -- 2.25.1

2 1

[PATCH] d3dcompiler: Use stricmp() instead of _strnicmp(..., -1).
by Paul Gofman 27 Mar '20

27 Mar '20

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/d3dcompiler_43/reflection.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 820e5c239f..b29db47c71 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -1674,13 +1674,13 @@ static HRESULT d3dcompiler_parse_signature(struct d3dcompiler_shader_signature * if (d[i].Register == 0xffffffff) { - if (!_strnicmp(d[i].SemanticName, "sv_depth", -1)) + if (!stricmp(d[i].SemanticName, "sv_depth")) d[i].SystemValueType = D3D_NAME_DEPTH; - else if (!_strnicmp(d[i].SemanticName, "sv_coverage", -1)) + else if (!stricmp(d[i].SemanticName, "sv_coverage")) d[i].SystemValueType = D3D_NAME_COVERAGE; - else if (!_strnicmp(d[i].SemanticName, "sv_depthgreaterequal", -1)) + else if (!stricmp(d[i].SemanticName, "sv_depthgreaterequal")) d[i].SystemValueType = D3D_NAME_DEPTH_GREATER_EQUAL; - else if (!_strnicmp(d[i].SemanticName, "sv_depthlessequal", -1)) + else if (!stricmp(d[i].SemanticName, "sv_depthlessequal")) d[i].SystemValueType = D3D_NAME_DEPTH_LESS_EQUAL; } else -- 2.25.1

3 3

← Newer
1
...
12
13
14
15
16
17
18
...
97
Older →

Jump to page:

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-devel March 2020