[PATCH 1/7] dnsapi: Increase buffer size to fix format-overflow warning.
Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dnsapi/query.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index e601191c5de..f540662dfd2 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -71,7 +71,7 @@ static const char *dns_section_to_str( ns_sect section ) case ns_s_ar: return "Additional"; default: { - static char tmp[5]; + static char tmp[11]; FIXME( "unknown section: 0x%02x\n", section ); sprintf( tmp, "0x%02x", section ); return tmp; -- 2.24.0.rc2
Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winealsa.drv/mmdevdrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index c2fe59ea795..09f98dc7b85 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -631,7 +631,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids, static snd_config_t *make_handle_underrun_config(const char *name) { snd_config_t *lconf, *dev_node, *hu_node, *type_node; - char dev_node_name[64]; + char dev_node_name[260]; const char *type_str; int err; -- 2.24.0.rc2
Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> On Wed, Nov 13, 2019 at 02:51:19PM +0100, Rémi Bernon wrote:
Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winealsa.drv/mmdevdrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index c2fe59ea795..09f98dc7b85 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -631,7 +631,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids, static snd_config_t *make_handle_underrun_config(const char *name) { snd_config_t *lconf, *dev_node, *hu_node, *type_node; - char dev_node_name[64]; + char dev_node_name[260]; const char *type_str; int err;
-- 2.24.0.rc2
Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/oleaut32/oleaut.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 28f796794ae..9417969465e 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -829,7 +829,7 @@ static BOOL actctx_get_typelib_module(REFIID iid, WCHAR *module, DWORD len) static HRESULT reg_get_typelib_module(REFIID iid, WCHAR *module, DWORD len) { REGSAM opposite = (sizeof(void*) == 8) ? KEY_WOW64_32KEY : KEY_WOW64_64KEY; - char tlguid[200], typelibkey[300], interfacekey[300], ver[100], tlfn[260]; + char tlguid[200], typelibkey[316], interfacekey[300], ver[100], tlfn[260]; DWORD tlguidlen, verlen, type; LONG tlfnlen, err; BOOL is_wow64; -- 2.24.0.rc2
Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- programs/winevdm/winevdm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c index 4852e5fc728..64750db1355 100644 --- a/programs/winevdm/winevdm.c +++ b/programs/winevdm/winevdm.c @@ -305,7 +305,7 @@ static VOID pif_cmd( char *filename, char *cmdline) { HANDLE hFile; char progpath[MAX_PATH]; - char buf[128]; + char buf[308]; char progname[64]; char title[31]; char optparams[65]; -- 2.24.0.rc2
Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- tools/widl/typegen.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index f37c7b0d675..9b8aa1a3229 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -4286,7 +4286,7 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const { print_file(file, indent, "if (%s%s)\n", local_var_prefix, var->name); indent++; - print_file(file, indent, "__frame->_StubMsg.pfnFree(%s%s);\n", local_var_prefix, var->name); + print_file(file, indent, "__frame->_StubMsg.pfnFree((void*)%s%s);\n", local_var_prefix, var->name); } } else @@ -4361,7 +4361,7 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const print_phase_function(file, indent, array_type, local_var_prefix, phase, var, start_offset); print_file(file, indent, "if (%s%s)\n", local_var_prefix, var->name); indent++; - print_file(file, indent, "__frame->_StubMsg.pfnFree(%s%s);\n", local_var_prefix, var->name); + print_file(file, indent, "__frame->_StubMsg.pfnFree((void*)%s%s);\n", local_var_prefix, var->name); break; } } @@ -4463,7 +4463,7 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const { print_file(file, indent, "if (%s%s)\n", local_var_prefix, var->name); indent++; - print_file(file, indent, "__frame->_StubMsg.pfnFree(%s%s);\n", local_var_prefix, var->name); + print_file(file, indent, "__frame->_StubMsg.pfnFree((void*)%s%s);\n", local_var_prefix, var->name); indent--; } break; -- 2.24.0.rc2
On 11/13/19 7:51 AM, Rémi Bernon wrote:
Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- tools/widl/typegen.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
This is for bug 39692, right? For what it's worth, MIDL doesn't do this. Not that that necessarily means we shouldn't either; just making sure it's known.
diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index f37c7b0d675..9b8aa1a3229 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -4286,7 +4286,7 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const { print_file(file, indent, "if (%s%s)\n", local_var_prefix, var->name); indent++; - print_file(file, indent, "__frame->_StubMsg.pfnFree(%s%s);\n", local_var_prefix, var->name); + print_file(file, indent, "__frame->_StubMsg.pfnFree((void*)%s%s);\n", local_var_prefix, var->name); } } else @@ -4361,7 +4361,7 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const print_phase_function(file, indent, array_type, local_var_prefix, phase, var, start_offset); print_file(file, indent, "if (%s%s)\n", local_var_prefix, var->name); indent++; - print_file(file, indent, "__frame->_StubMsg.pfnFree(%s%s);\n", local_var_prefix, var->name); + print_file(file, indent, "__frame->_StubMsg.pfnFree((void*)%s%s);\n", local_var_prefix, var->name); break; } } @@ -4463,7 +4463,7 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const { print_file(file, indent, "if (%s%s)\n", local_var_prefix, var->name); indent++; - print_file(file, indent, "__frame->_StubMsg.pfnFree(%s%s);\n", local_var_prefix, var->name); + print_file(file, indent, "__frame->_StubMsg.pfnFree((void*)%s%s);\n", local_var_prefix, var->name); indent--; } break;
On 11/13/19 4:49 PM, Zebediah Figura wrote:
On 11/13/19 7:51 AM, Rémi Bernon wrote:
Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- tools/widl/typegen.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
This is for bug 39692, right?
For what it's worth, MIDL doesn't do this. Not that that necessarily means we shouldn't either; just making sure it's known.
I didn't know there was a bug for that, but yes. I was just going through the build warnings, trying to fix them. If we shouldn't diverge from MIDL then I guess we could otherwise compile the generated files with this warning disabled. It could cause some missing warnings in valid situations though. -- Rémi Bernon <rbernon(a)codeweavers.com>
The stream pointer was used as the DWORD id, which is only going to work on 32bit. It may very well be that winmm is only used in 32bit, but then we still build a 64bit version of it. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winmm/winmm.c | 58 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 53 insertions(+), 5 deletions(-) diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 0f0cd946d1d..9075a78f343 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -54,6 +54,7 @@ #include "winemm.h" #include "wine/debug.h" +#include "wine/rbtree.h" WINE_DEFAULT_DEBUG_CHANNEL(winmm); @@ -72,12 +73,16 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; CRITICAL_SECTION WINMM_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; +static struct wine_rb_tree wine_midi_streams; +static int wine_midi_stream_compare(const void *key, const struct wine_rb_entry *entry); + /************************************************************************** * WINMM_CreateIData [internal] */ static BOOL WINMM_CreateIData(HINSTANCE hInstDLL) { hWinMM32Instance = hInstDLL; + wine_rb_init(&wine_midi_streams, wine_midi_stream_compare); psLastEvent = CreateEventW(NULL, TRUE, FALSE, NULL); return psLastEvent != NULL; } @@ -924,6 +929,8 @@ typedef struct WINE_MIDIStream { WORD status; HANDLE hEvent; LPMIDIHDR lpMidiHdr; + DWORD dwStreamID; + struct wine_rb_entry entry; } WINE_MIDIStream; #define WINE_MSM_HEADER (WM_USER+0) @@ -935,12 +942,50 @@ typedef struct WINE_MIDIStream { #define MSM_STATUS_PAUSED WINE_MSM_PAUSE #define MSM_STATUS_PLAYING WINE_MSM_RESUME +static int wine_midi_stream_compare(const void *key, const struct wine_rb_entry *entry) +{ + WINE_MIDIStream *stream = WINE_RB_ENTRY_VALUE(entry, struct WINE_MIDIStream, entry); + return memcmp(key, &stream->dwStreamID, sizeof(stream->dwStreamID)); +} + +static WINE_MIDIStream *wine_midi_stream_allocate(void) +{ + DWORD stream_id = 1; + WINE_MIDIStream *stream = NULL; + + EnterCriticalSection(&WINMM_cs); + + while (stream_id < 0xFFFFFFFF && wine_rb_get(&wine_midi_streams, &stream_id)) + stream_id++; + + if (stream_id < 0xFFFFFFFF && + (stream = HeapAlloc(GetProcessHeap(), 0, sizeof(WINE_MIDIStream)))) + { + stream->dwStreamID = stream_id; + wine_rb_put(&wine_midi_streams, &stream_id, &stream->entry); + } + + LeaveCriticalSection(&WINMM_cs); + return stream; +} + +static void wine_midi_stream_free(WINE_MIDIStream *stream) +{ + EnterCriticalSection(&WINMM_cs); + + wine_rb_remove(&wine_midi_streams, &stream->entry); + HeapFree(GetProcessHeap(), 0, stream); + + LeaveCriticalSection(&WINMM_cs); +} + /************************************************************************** * MMSYSTEM_GetMidiStream [internal] */ static BOOL MMSYSTEM_GetMidiStream(HMIDISTRM hMidiStrm, WINE_MIDIStream** lpMidiStrm, WINE_MIDI** lplpwm) { WINE_MIDI* lpwm = (LPWINE_MIDI)MMDRV_Get(hMidiStrm, MMDRV_MIDIOUT, FALSE); + struct wine_rb_entry *entry; if (lplpwm) *lplpwm = lpwm; @@ -949,7 +994,10 @@ static BOOL MMSYSTEM_GetMidiStream(HMIDISTRM hMidiStrm, WINE_MIDIStream** lpMidi return FALSE; } - *lpMidiStrm = (WINE_MIDIStream*)lpwm->mod.rgIds.dwStreamID; + EnterCriticalSection(&WINMM_cs); + if ((entry = wine_rb_get(&wine_midi_streams, &lpwm->mod.rgIds.dwStreamID))) + *lpMidiStrm = WINE_RB_ENTRY_VALUE(entry, struct WINE_MIDIStream, entry); + LeaveCriticalSection(&WINMM_cs); return *lpMidiStrm != NULL; } @@ -1106,7 +1154,7 @@ static BOOL MMSYSTEM_MidiStream_MessageHandler(WINE_MIDIStream* lpMidiStrm, LPWI #endif if (((LPMIDIEVENT)lpData)->dwStreamID != 0 && ((LPMIDIEVENT)lpData)->dwStreamID != 0xFFFFFFFF && - ((LPMIDIEVENT)lpData)->dwStreamID != (DWORD)lpMidiStrm) { + ((LPMIDIEVENT)lpData)->dwStreamID != lpMidiStrm->dwStreamID) { FIXME("Dropping bad %s lpMidiHdr (streamID=%08x)\n", (lpMidiHdr->dwFlags & MHDR_ISSTRM) ? "stream" : "regular", ((LPMIDIEVENT)lpData)->dwStreamID); @@ -1301,7 +1349,7 @@ MMRESULT WINAPI midiStreamClose(HMIDISTRM hMidiStrm) if(!ret) { lpMidiStrm->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&lpMidiStrm->lock); - HeapFree(GetProcessHeap(), 0, lpMidiStrm); + wine_midi_stream_free(lpMidiStrm); } return midiOutClose((HMIDIOUT)hMidiStrm); @@ -1330,7 +1378,7 @@ MMRESULT WINAPI midiStreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, if (ret != MMSYSERR_NOERROR) return ret; - lpMidiStrm = HeapAlloc(GetProcessHeap(), 0, sizeof(WINE_MIDIStream)); + lpMidiStrm = wine_midi_stream_allocate(); if (!lpMidiStrm) return MMSYSERR_NOMEM; @@ -1341,7 +1389,7 @@ MMRESULT WINAPI midiStreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, lpMidiStrm->status = MSM_STATUS_PAUSED; lpMidiStrm->dwElapsedMS = 0; - mosm.dwStreamID = (DWORD)lpMidiStrm; + mosm.dwStreamID = lpMidiStrm->dwStreamID; /* FIXME: the correct value is not allocated yet for MAPPER */ mosm.wDeviceID = *lpuDeviceID; lpwm = MIDI_OutAlloc(&hMidiOut, &dwCallback, &dwInstance, &fdwOpen, 1, &mosm); -- 2.24.0.rc2
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=60018 Your paranoid android. === debian10 (build log) === 0164:err:winediag:MIDIMAP_drvOpen No software synthesizer midi port found, Midi sound output probably won't work. 0183:err:winediag:MIDIMAP_drvOpen No software synthesizer midi port found, Midi sound output probably won't work. 0163:err:winediag:MIDIMAP_drvOpen No software synthesizer midi port found, Midi sound output probably won't work. 0182:err:winediag:MIDIMAP_drvOpen No software synthesizer midi port found, Midi sound output probably won't work. === debian10 (build log) === 0162:err:winediag:MIDIMAP_drvOpen No software synthesizer midi port found, Midi sound output probably won't work. 0181:err:winediag:MIDIMAP_drvOpen No software synthesizer midi port found, Midi sound output probably won't work. 0163:err:winediag:MIDIMAP_drvOpen No software synthesizer midi port found, Midi sound output probably won't work. 0182:err:winediag:MIDIMAP_drvOpen No software synthesizer midi port found, Midi sound output probably won't work.
Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> On Wed, Nov 13, 2019 at 02:51:23PM +0100, Rémi Bernon wrote:
The stream pointer was used as the DWORD id, which is only going to work on 32bit. It may very well be that winmm is only used in 32bit, but then we still build a 64bit version of it.
Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winmm/winmm.c | 58 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 53 insertions(+), 5 deletions(-)
diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 0f0cd946d1d..9075a78f343 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -54,6 +54,7 @@ #include "winemm.h"
#include "wine/debug.h" +#include "wine/rbtree.h"
WINE_DEFAULT_DEBUG_CHANNEL(winmm);
@@ -72,12 +73,16 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; CRITICAL_SECTION WINMM_cs = { &critsect_debug, -1, 0, 0, 0, 0 };
+static struct wine_rb_tree wine_midi_streams; +static int wine_midi_stream_compare(const void *key, const struct wine_rb_entry *entry); + /************************************************************************** * WINMM_CreateIData [internal] */ static BOOL WINMM_CreateIData(HINSTANCE hInstDLL) { hWinMM32Instance = hInstDLL; + wine_rb_init(&wine_midi_streams, wine_midi_stream_compare); psLastEvent = CreateEventW(NULL, TRUE, FALSE, NULL); return psLastEvent != NULL; } @@ -924,6 +929,8 @@ typedef struct WINE_MIDIStream { WORD status; HANDLE hEvent; LPMIDIHDR lpMidiHdr; + DWORD dwStreamID; + struct wine_rb_entry entry; } WINE_MIDIStream;
#define WINE_MSM_HEADER (WM_USER+0) @@ -935,12 +942,50 @@ typedef struct WINE_MIDIStream { #define MSM_STATUS_PAUSED WINE_MSM_PAUSE #define MSM_STATUS_PLAYING WINE_MSM_RESUME
+static int wine_midi_stream_compare(const void *key, const struct wine_rb_entry *entry) +{ + WINE_MIDIStream *stream = WINE_RB_ENTRY_VALUE(entry, struct WINE_MIDIStream, entry); + return memcmp(key, &stream->dwStreamID, sizeof(stream->dwStreamID)); +} + +static WINE_MIDIStream *wine_midi_stream_allocate(void) +{ + DWORD stream_id = 1; + WINE_MIDIStream *stream = NULL; + + EnterCriticalSection(&WINMM_cs); + + while (stream_id < 0xFFFFFFFF && wine_rb_get(&wine_midi_streams, &stream_id)) + stream_id++; + + if (stream_id < 0xFFFFFFFF && + (stream = HeapAlloc(GetProcessHeap(), 0, sizeof(WINE_MIDIStream)))) + { + stream->dwStreamID = stream_id; + wine_rb_put(&wine_midi_streams, &stream_id, &stream->entry); + } + + LeaveCriticalSection(&WINMM_cs); + return stream; +} + +static void wine_midi_stream_free(WINE_MIDIStream *stream) +{ + EnterCriticalSection(&WINMM_cs); + + wine_rb_remove(&wine_midi_streams, &stream->entry); + HeapFree(GetProcessHeap(), 0, stream); + + LeaveCriticalSection(&WINMM_cs); +} + /************************************************************************** * MMSYSTEM_GetMidiStream [internal] */ static BOOL MMSYSTEM_GetMidiStream(HMIDISTRM hMidiStrm, WINE_MIDIStream** lpMidiStrm, WINE_MIDI** lplpwm) { WINE_MIDI* lpwm = (LPWINE_MIDI)MMDRV_Get(hMidiStrm, MMDRV_MIDIOUT, FALSE); + struct wine_rb_entry *entry;
if (lplpwm) *lplpwm = lpwm; @@ -949,7 +994,10 @@ static BOOL MMSYSTEM_GetMidiStream(HMIDISTRM hMidiStrm, WINE_MIDIStream** lpMidi return FALSE; }
- *lpMidiStrm = (WINE_MIDIStream*)lpwm->mod.rgIds.dwStreamID; + EnterCriticalSection(&WINMM_cs); + if ((entry = wine_rb_get(&wine_midi_streams, &lpwm->mod.rgIds.dwStreamID))) + *lpMidiStrm = WINE_RB_ENTRY_VALUE(entry, struct WINE_MIDIStream, entry); + LeaveCriticalSection(&WINMM_cs);
return *lpMidiStrm != NULL; } @@ -1106,7 +1154,7 @@ static BOOL MMSYSTEM_MidiStream_MessageHandler(WINE_MIDIStream* lpMidiStrm, LPWI #endif if (((LPMIDIEVENT)lpData)->dwStreamID != 0 && ((LPMIDIEVENT)lpData)->dwStreamID != 0xFFFFFFFF && - ((LPMIDIEVENT)lpData)->dwStreamID != (DWORD)lpMidiStrm) { + ((LPMIDIEVENT)lpData)->dwStreamID != lpMidiStrm->dwStreamID) { FIXME("Dropping bad %s lpMidiHdr (streamID=%08x)\n", (lpMidiHdr->dwFlags & MHDR_ISSTRM) ? "stream" : "regular", ((LPMIDIEVENT)lpData)->dwStreamID); @@ -1301,7 +1349,7 @@ MMRESULT WINAPI midiStreamClose(HMIDISTRM hMidiStrm) if(!ret) { lpMidiStrm->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&lpMidiStrm->lock); - HeapFree(GetProcessHeap(), 0, lpMidiStrm); + wine_midi_stream_free(lpMidiStrm); }
return midiOutClose((HMIDIOUT)hMidiStrm); @@ -1330,7 +1378,7 @@ MMRESULT WINAPI midiStreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, if (ret != MMSYSERR_NOERROR) return ret;
- lpMidiStrm = HeapAlloc(GetProcessHeap(), 0, sizeof(WINE_MIDIStream)); + lpMidiStrm = wine_midi_stream_allocate(); if (!lpMidiStrm) return MMSYSERR_NOMEM;
@@ -1341,7 +1389,7 @@ MMRESULT WINAPI midiStreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, lpMidiStrm->status = MSM_STATUS_PAUSED; lpMidiStrm->dwElapsedMS = 0;
- mosm.dwStreamID = (DWORD)lpMidiStrm; + mosm.dwStreamID = lpMidiStrm->dwStreamID; /* FIXME: the correct value is not allocated yet for MAPPER */ mosm.wDeviceID = *lpuDeviceID; lpwm = MIDI_OutAlloc(&hMidiOut, &dwCallback, &dwInstance, &fdwOpen, 1, &mosm); -- 2.24.0.rc2
This is going to be the value used anyway, as we didn't specify it. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/opencl/opencl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/opencl/opencl.c b/dlls/opencl/opencl.c index 2d145bf25c8..7e680ba057f 100644 --- a/dlls/opencl/opencl.c +++ b/dlls/opencl/opencl.c @@ -34,6 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(opencl); #define CL_USE_DEPRECATED_OPENCL_1_1_APIS #define CL_USE_DEPRECATED_OPENCL_1_2_APIS #define CL_USE_DEPRECATED_OPENCL_2_0_APIS +#define CL_TARGET_OPENCL_VERSION 220 #include <CL/cl.h> #elif defined(HAVE_OPENCL_OPENCL_H) #include <OpenCL/opencl.h> -- 2.24.0.rc2
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=60019 Your paranoid android. === debian10 (build log) === 0163:err:winediag:MIDIMAP_drvOpen No software synthesizer midi port found, Midi sound output probably won't work. 0182:err:winediag:MIDIMAP_drvOpen No software synthesizer midi port found, Midi sound output probably won't work. 0162:err:winediag:MIDIMAP_drvOpen No software synthesizer midi port found, Midi sound output probably won't work. 0181:err:winediag:MIDIMAP_drvOpen No software synthesizer midi port found, Midi sound output probably won't work. === debian10 (build log) === 0163:err:winediag:MIDIMAP_drvOpen No software synthesizer midi port found, Midi sound output probably won't work. 0182:err:winediag:MIDIMAP_drvOpen No software synthesizer midi port found, Midi sound output probably won't work. 0162:err:winediag:MIDIMAP_drvOpen No software synthesizer midi port found, Midi sound output probably won't work. 0181:err:winediag:MIDIMAP_drvOpen No software synthesizer midi port found, Midi sound output probably won't work.
The format-overflow warning patches are probably related to this bug https://bugs.winehq.org/show_bug.cgi?id=47126 There's still a whole lot of them in the tests sources, but I didn't feel the courage. -- Rémi Bernon <rbernon(a)codeweavers.com>
participants (4)
-
Andrew Eikum -
Marvin -
Rémi Bernon -
Zebediah Figura