- Wine-devel - list.winehq.org

[PATCH 1/9] winex11: Use NtUserBuildHwndList for has_owned_popup implementation.
by Jacek Caban 19 Apr '22

19 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/window.c | 45 ++++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 17 deletions(-)

2 1

[PATCH 3/9] winex11: Use NtUserGetVirtualScreenRect for is_window_rect_full_screen implementation.
by Jacek Caban 19 Apr '22

19 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/window.c | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-)

2 2

[PATCH 3/3] wineoss: Move midi_init to the unixlib.
by Huw Davies 19 Apr '22

19 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/Makefile.in | 3 +- dlls/wineoss.drv/midi.c | 276 +++-------------------------- dlls/wineoss.drv/oss.c | 1 + dlls/wineoss.drv/ossmidi.c | 335 +++++++++++++++++++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 38 ++++ 5 files changed, 403 insertions(+), 250 deletions(-) create mode 100644 dlls/wineoss.drv/ossmidi.c diff --git a/dlls/wineoss.drv/Makefile.in b/dlls/wineoss.drv/Makefile.in index d48db94b929..04b438da71e 100644 --- a/dlls/wineoss.drv/Makefile.in +++ b/dlls/wineoss.drv/Makefile.in @@ -13,4 +13,5 @@ C_SRCS = \ midipatch.c \ mmaux.c \ mmdevdrv.c \ - oss.c + oss.c \ + ossmidi.c diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 1cf19b7be1a..626b3d43d83 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -1,15 +1,10 @@ -/* -*- tab-width: 8; c-basic-offset: 4 -*- */ - /* - * Sample MIDI Wine Driver for Open Sound System (basically Linux) + * MIDI driver for OSS (PE-side) * - * Copyright 1994 Martin Ayotte - * Copyright 1998 Luiz Otavio L. Zorzella (init procedures) - * Copyright 1998/1999 Eric POUECH : - * 98/7 changes for making this MIDI driver work on OSS - * current support is limited to MIDI ports of OSS systems - * 98/9 rewriting MCI code for MIDI - * 98/11 split in midi.c and mcimidi.c + * Copyright 1994 Martin Ayotte + * Copyright 1998 Luiz Otavio L. Zorzella (init procedures) + * Copyright 1998, 1999 Eric POUECH + * Copyright 2022 Huw Davies * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -57,35 +52,19 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "winnls.h" +#include "winternl.h" #include "mmddk.h" +#include "audioclient.h" + #include "wine/debug.h" +#include "wine/unixlib.h" + +#include "unixlib.h" WINE_DEFAULT_DEBUG_CHANNEL(midi); -typedef struct { - int state; /* -1 disabled, 0 is no recording started, 1 in recording, bit 2 set if in sys exclusive recording */ - MIDIOPENDESC midiDesc; - WORD wFlags; - LPMIDIHDR lpQueueHdr; - unsigned char incoming[3]; - unsigned char incPrev; - char incLen; - DWORD startTime; - MIDIINCAPSW caps; -} WINE_MIDIIN; - -typedef struct { - BOOL bEnabled; - MIDIOPENDESC midiDesc; - WORD wFlags; - LPMIDIHDR lpQueueHdr; - void* lpExtra; /* according to port type (MIDI, FM...), extra data when needed */ - MIDIOUTCAPSW caps; -} WINE_MIDIOUT; - -static WINE_MIDIIN MidiInDev [MAX_MIDIINDRV ]; -static WINE_MIDIOUT MidiOutDev[MAX_MIDIOUTDRV]; +static WINE_MIDIIN *MidiInDev; +static WINE_MIDIOUT *MidiOutDev; /* this is the total number of MIDI out devices found (synth and port) */ static int MODM_NumDevs = 0; @@ -119,37 +98,6 @@ static HANDLE hThread; static int midiOpenSeq(void); static int midiCloseSeq(void); -/************************************************************************** - * MIDI_unixToWindowsDeviceType [internal] - * - * return the Windows equivalent to a Unix Device Type - * - */ -static int MIDI_UnixToWindowsDeviceType(int type) -{ - /* MOD_MIDIPORT output port - * MOD_SYNTH generic internal synth - * MOD_SQSYNTH square wave internal synth - * MOD_FMSYNTH FM internal synth - * MOD_MAPPER MIDI mapper - * MOD_WAVETABLE hardware wavetable internal synth - * MOD_SWSYNTH software internal synth - */ - - /* FIXME Is this really the correct equivalence from UNIX to - Windows Sound type */ - - switch (type) { - case SYNTH_TYPE_FM: return MOD_FMSYNTH; - case SYNTH_TYPE_SAMPLE: return MOD_SYNTH; - case SYNTH_TYPE_MIDI: return MOD_MIDIPORT; - default: - ERR("Cannot determine the type of this midi device. " - "Assuming FM Synth\n"); - return MOD_FMSYNTH; - } -} - static int MIDI_loadcount; /************************************************************************** * OSS_MidiInit [internal] @@ -158,9 +106,8 @@ static int MIDI_loadcount; */ static LRESULT OSS_MidiInit(void) { - int i, status, numsynthdevs = 255, nummididevs = 255; - struct synth_info sinfo; - struct midi_info minfo; + struct midi_init_params params; + UINT err; TRACE("(%i)\n", MIDI_loadcount); if (MIDI_loadcount++) @@ -168,187 +115,18 @@ static LRESULT OSS_MidiInit(void) TRACE("Initializing the MIDI variables.\n"); - /* try to open device */ - if (midiOpenSeq() == -1) { - return -1; - } - - /* find how many Synth devices are there in the system */ - status = ioctl(midiSeqFD, SNDCTL_SEQ_NRSYNTHS, &numsynthdevs); - - if (status == -1) { - ERR("ioctl for nr synth failed.\n"); - midiCloseSeq(); - return -1; - } - - if (numsynthdevs > MAX_MIDIOUTDRV) { - ERR("MAX_MIDIOUTDRV (%d) was enough for the number of devices (%d). " - "Some FM devices will not be available.\n",MAX_MIDIOUTDRV,numsynthdevs); - numsynthdevs = MAX_MIDIOUTDRV; - } - - for (i = 0; i < numsynthdevs; i++) { - /* Manufac ID. We do not have access to this with soundcard.h - * Does not seem to be a problem, because in mmsystem.h only - * Microsoft's ID is listed. - */ - MidiOutDev[i].caps.wMid = 0x00FF; - MidiOutDev[i].caps.wPid = 0x0001; /* FIXME Product ID */ - /* Product Version. We simply say "1" */ - MidiOutDev[i].caps.vDriverVersion = 0x001; - /* The following are mandatory for MOD_MIDIPORT */ - MidiOutDev[i].caps.wChannelMask = 0xFFFF; - MidiOutDev[i].caps.wVoices = 0; - MidiOutDev[i].caps.wNotes = 0; - MidiOutDev[i].caps.dwSupport = 0; - - sinfo.device = i; - status = ioctl(midiSeqFD, SNDCTL_SYNTH_INFO, &sinfo); - if (status == -1) { - static const WCHAR fmt[] = {'W','i','n','e',' ','O','S','S',' ','M','i','d','i',' ','O','u','t',' ','#','%','d',' ','d','i','s','a','b','l','e','d',0}; - ERR("ioctl for synth info failed on %d, disabling it.\n", i); - - wsprintfW(MidiOutDev[i].caps.szPname, fmt, i); - - MidiOutDev[i].caps.wTechnology = MOD_MIDIPORT; - MidiOutDev[i].bEnabled = FALSE; - } else { - MultiByteToWideChar(CP_UNIXCP, 0, sinfo.name, -1, MidiOutDev[i].caps.szPname, - ARRAY_SIZE(MidiOutDev[i].caps.szPname)); - MidiOutDev[i].caps.wTechnology = MIDI_UnixToWindowsDeviceType(sinfo.synth_type); - - if (MOD_MIDIPORT != MidiOutDev[i].caps.wTechnology) { - /* FIXME Do we have this information? - * Assuming the soundcards can handle - * MIDICAPS_VOLUME and MIDICAPS_LRVOLUME but - * not MIDICAPS_CACHE. - */ - MidiOutDev[i].caps.dwSupport = MIDICAPS_VOLUME|MIDICAPS_LRVOLUME; - MidiOutDev[i].caps.wVoices = sinfo.nr_voices; - - /* FIXME Is it possible to know the maximum - * number of simultaneous notes of a soundcard ? - * I believe we don't have this information, but - * it's probably equal or more than wVoices - */ - MidiOutDev[i].caps.wNotes = sinfo.nr_voices; - } - MidiOutDev[i].bEnabled = TRUE; - - /* We also have the information sinfo.synth_subtype, not used here - */ - if (sinfo.capabilities & SYNTH_CAP_INPUT) { - FIXME("Synthesizer supports MIDI in. Not yet supported.\n"); - } - TRACE("SynthOut[%d]\tOSS info: synth type=%d/%d capa=%lx\n", - i, sinfo.synth_type, sinfo.synth_subtype, (long)sinfo.capabilities); - } - - TRACE("SynthOut[%d]\tname='%s' techn=%d voices=%d notes=%d chnMsk=%04x support=%d\n", - i, wine_dbgstr_w(MidiOutDev[i].caps.szPname), - MidiOutDev[i].caps.wTechnology, - MidiOutDev[i].caps.wVoices, MidiOutDev[i].caps.wNotes, - MidiOutDev[i].caps.wChannelMask, MidiOutDev[i].caps.dwSupport); - } - - /* find how many MIDI devices are there in the system */ - status = ioctl(midiSeqFD, SNDCTL_SEQ_NRMIDIS, &nummididevs); - if (status == -1) { - ERR("ioctl on nr midi failed.\n"); - nummididevs = 0; - goto wrapup; - } + params.err = &err; + OSS_CALL(midi_init, &params); - /* FIXME: the two restrictions below could be loosened in some cases */ - if (numsynthdevs + nummididevs > MAX_MIDIOUTDRV) { - ERR("MAX_MIDIOUTDRV was not enough for the number of devices. " - "Some MIDI devices will not be available.\n"); - nummididevs = MAX_MIDIOUTDRV - numsynthdevs; + if (!err) + { + MidiInDev = params.srcs; + MidiOutDev = params.dests; + MODM_NumDevs = params.num_dests; + MODM_NumFMSynthDevs = params.num_synths; + MIDM_NumDevs = params.num_srcs; } - - if (nummididevs > MAX_MIDIINDRV) { - ERR("MAX_MIDIINDRV (%d) was not enough for the number of devices (%d). " - "Some MIDI devices will not be available.\n",MAX_MIDIINDRV,nummididevs); - nummididevs = MAX_MIDIINDRV; - } - - for (i = 0; i < nummididevs; i++) { - minfo.device = i; - status = ioctl(midiSeqFD, SNDCTL_MIDI_INFO, &minfo); - if (status == -1) WARN("ioctl on midi info for device %d failed.\n", i); - - /* This whole part is somewhat obscure to me. I'll keep trying to dig - info about it. If you happen to know, please tell us. The very - descriptive minfo.dev_type was not used here. - */ - /* Manufacturer ID. We do not have access to this with soundcard.h - Does not seem to be a problem, because in mmsystem.h only - Microsoft's ID is listed */ - MidiOutDev[numsynthdevs + i].caps.wMid = 0x00FF; - MidiOutDev[numsynthdevs + i].caps.wPid = 0x0001; /* FIXME Product ID */ - /* Product Version. We simply say "1" */ - MidiOutDev[numsynthdevs + i].caps.vDriverVersion = 0x001; - if (status == -1) { - static const WCHAR fmt[] = {'W','i','n','e',' ','O','S','S',' ','M','i','d','i',' ','O','u','t',' ','#','%','d',' ','d','i','s','a','b','l','e','d',0}; - wsprintfW(MidiOutDev[numsynthdevs + i].caps.szPname, fmt, numsynthdevs + i); - MidiOutDev[numsynthdevs + i].bEnabled = FALSE; - } else { - MultiByteToWideChar(CP_UNIXCP, 0, minfo.name, -1, - MidiOutDev[numsynthdevs + i].caps.szPname, - ARRAY_SIZE(MidiOutDev[numsynthdevs + i].caps.szPname)); - MidiOutDev[numsynthdevs + i].bEnabled = TRUE; - } - MidiOutDev[numsynthdevs + i].caps.wTechnology = MOD_MIDIPORT; - MidiOutDev[numsynthdevs + i].caps.wVoices = 0; - MidiOutDev[numsynthdevs + i].caps.wNotes = 0; - MidiOutDev[numsynthdevs + i].caps.wChannelMask= 0xFFFF; - MidiOutDev[numsynthdevs + i].caps.dwSupport = 0; - - /* This whole part is somewhat obscure to me. I'll keep trying to dig - info about it. If you happen to know, please tell us. The very - descriptive minfo.dev_type was not used here. - */ - /* Manufac ID. We do not have access to this with soundcard.h - Does not seem to be a problem, because in mmsystem.h only - Microsoft's ID is listed */ - MidiInDev[i].caps.wMid = 0x00FF; - MidiInDev[i].caps.wPid = 0x0001; /* FIXME Product ID */ - /* Product Version. We simply say "1" */ - MidiInDev[i].caps.vDriverVersion = 0x001; - if (status == -1) { - static const WCHAR fmt[] = {'W','i','n','e',' ','O','S','S',' ','M','i','d','i',' ','I','n',' ','#','%','d',' ','d','i','s','a','b','l','e','d',0}; - wsprintfW(MidiInDev[i].caps.szPname, fmt, numsynthdevs + i); - MidiInDev[i].state = -1; - } else { - MultiByteToWideChar(CP_UNIXCP, 0, minfo.name, -1, MidiInDev[i].caps.szPname, - ARRAY_SIZE(MidiInDev[i].caps.szPname)); - MidiInDev[i].state = 0; - } - MidiInDev[i].caps.dwSupport = 0; /* mandatory with MIDIINCAPS */ - - TRACE("OSS info: midi[%d] dev-type=%d capa=%lx\n" - "\tMidiOut[%d] name='%s' techn=%d voices=%d notes=%d chnMsk=%04x support=%d\n" - "\tMidiIn [%d] name='%s' support=%d\n", - i, minfo.dev_type, (long)minfo.capabilities, - numsynthdevs + i, wine_dbgstr_w(MidiOutDev[numsynthdevs + i].caps.szPname), - MidiOutDev[numsynthdevs + i].caps.wTechnology, - MidiOutDev[numsynthdevs + i].caps.wVoices, MidiOutDev[numsynthdevs + i].caps.wNotes, - MidiOutDev[numsynthdevs + i].caps.wChannelMask, MidiOutDev[numsynthdevs + i].caps.dwSupport, - i, wine_dbgstr_w(MidiInDev[i].caps.szPname), MidiInDev[i].caps.dwSupport); - } - - wrapup: - /* windows does not seem to differentiate Synth from MIDI devices */ - MODM_NumFMSynthDevs = numsynthdevs; - MODM_NumDevs = numsynthdevs + nummididevs; - - MIDM_NumDevs = nummididevs; - - /* close file and exit */ - midiCloseSeq(); - - return 0; + return err; } /************************************************************************** @@ -363,8 +141,8 @@ static LRESULT OSS_MidiExit(void) if (--MIDI_loadcount) return 1; - ZeroMemory(MidiInDev, sizeof(MidiInDev)); - ZeroMemory(MidiOutDev, sizeof(MidiOutDev)); + MidiInDev = NULL; + MidiOutDev = NULL; MODM_NumDevs = 0; MODM_NumFMSynthDevs = 0; diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index b4e2cbda704..4f3c0bcb2cf 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1405,4 +1405,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = set_volumes, set_event_handle, is_started, + midi_init, }; diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c new file mode 100644 index 00000000000..75fbf6d7bee --- /dev/null +++ b/dlls/wineoss.drv/ossmidi.c @@ -0,0 +1,335 @@ +/* + * MIDI driver for OSS (unixlib) + * + * Copyright 1994 Martin Ayotte + * Copyright 1998 Luiz Otavio L. Zorzella (init procedures) + * Copyright 1998, 1999 Eric POUECH + * Copyright 2022 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if 0 +#pragma makedep unix +#endif + +#include "config.h" + +#include <stdarg.h> +#include <string.h> +#include <stdio.h> +#include <unistd.h> +#include <errno.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> +#include <sys/ioctl.h> +#include <sys/soundcard.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "winternl.h" +#include "audioclient.h" + +#include "wine/debug.h" +#include "wine/unixlib.h" + +#include "unixlib.h" + +static unsigned int num_dests, num_srcs, num_synths, seq_refs; +static struct midi_dest dests[MAX_MIDIOUTDRV]; +static struct midi_src srcs[MAX_MIDIINDRV]; + +WINE_DEFAULT_DEBUG_CHANNEL(midi); + +static int oss_to_win_device_type(int type) +{ + /* MOD_MIDIPORT output port + * MOD_SYNTH generic internal synth + * MOD_SQSYNTH square wave internal synth + * MOD_FMSYNTH FM internal synth + * MOD_MAPPER MIDI mapper + * MOD_WAVETABLE hardware wavetable internal synth + * MOD_SWSYNTH software internal synth + */ + + /* FIXME Is this really the correct equivalence from UNIX to + Windows Sound type */ + + switch (type) + { + case SYNTH_TYPE_FM: return MOD_FMSYNTH; + case SYNTH_TYPE_SAMPLE: return MOD_SYNTH; + case SYNTH_TYPE_MIDI: return MOD_MIDIPORT; + default: + ERR("Cannot determine the type of this midi device. " + "Assuming FM Synth\n"); + return MOD_FMSYNTH; + } +} + +static int seq_open(void) +{ + static int midi_warn = 1; + static int fd = -1; + + if (seq_refs <= 0) + { + const char* device = getenv("MIDIDEV"); + + if (!device) device = "/dev/sequencer"; + fd = open(device, O_RDWR, 0); + if (fd == -1) + { + if (midi_warn) + { + WARN("Can't open MIDI device '%s' ! (%s). If your program needs this (probably not): %s\n", + device, strerror(errno), + errno == ENOENT ? "create it ! (\"man MAKEDEV\" ?)" : + errno == ENODEV ? "load MIDI sequencer kernel driver !" : + errno == EACCES ? "grant access ! (\"man chmod\")" : ""); + } + midi_warn = 0; + return -1; + } + fcntl(fd, F_SETFD, 1); /* set close on exec flag */ + ioctl(fd, SNDCTL_SEQ_RESET); + } + seq_refs++; + return fd; +} + +static int seq_close(int fd) +{ + if (--seq_refs == 0) + close(fd); + + return 0; +} + +NTSTATUS midi_init(void *args) +{ + struct midi_init_params *params = args; + int i, status, synth_devs = 255, midi_devs = 255, fd, len; + struct synth_info sinfo; + struct midi_info minfo; + struct midi_dest *dest; + struct midi_src *src; + + /* try to open device */ + fd = seq_open(); + if (fd == -1) + { + *params->err = -1; + return STATUS_SUCCESS; + } + + /* find how many Synth devices are there in the system */ + status = ioctl(fd, SNDCTL_SEQ_NRSYNTHS, &synth_devs); + if (status == -1) + { + ERR("ioctl for nr synth failed.\n"); + seq_close(fd); + *params->err = -1; + return STATUS_SUCCESS; + } + + if (synth_devs > MAX_MIDIOUTDRV) + { + ERR("MAX_MIDIOUTDRV (%d) was enough for the number of devices (%d). " + "Some FM devices will not be available.\n", MAX_MIDIOUTDRV, synth_devs); + synth_devs = MAX_MIDIOUTDRV; + } + + for (i = 0, dest = dests; i < synth_devs; i++, dest++) + { + /* Manufac ID. We do not have access to this with soundcard.h + * Does not seem to be a problem, because in mmsystem.h only + * Microsoft's ID is listed. + */ + dest->caps.wMid = 0x00FF; + dest->caps.wPid = 0x0001; /* FIXME Product ID */ + /* Product Version. We simply say "1" */ + dest->caps.vDriverVersion = 0x001; + /* The following are mandatory for MOD_MIDIPORT */ + dest->caps.wChannelMask = 0xFFFF; + dest->caps.wVoices = 0; + dest->caps.wNotes = 0; + dest->caps.dwSupport = 0; + + sinfo.device = i; + status = ioctl(fd, SNDCTL_SYNTH_INFO, &sinfo); + if (status == -1) + { + char buf[255]; + + ERR("ioctl for synth info failed on %d, disabling it.\n", i); + + sprintf(buf, "Wine OSS Midi Out #%d disabled", i); + len = ntdll_umbstowcs(buf, strlen(buf) + 1, dest->caps.szPname, ARRAY_SIZE(dest->caps.szPname)); + dest->caps.szPname[len - 1] = '\0'; + dest->caps.wTechnology = MOD_MIDIPORT; + dest->bEnabled = FALSE; + } + else + { + len = ntdll_umbstowcs(sinfo.name, strlen(sinfo.name) + 1, dest->caps.szPname, ARRAY_SIZE(dest->caps.szPname)); + dest->caps.szPname[len - 1] = '\0'; + dest->caps.wTechnology = oss_to_win_device_type(sinfo.synth_type); + + if (dest->caps.wTechnology != MOD_MIDIPORT) + { + /* FIXME Do we have this information? + * Assuming the soundcards can handle + * MIDICAPS_VOLUME and MIDICAPS_LRVOLUME but + * not MIDICAPS_CACHE. + */ + dest->caps.dwSupport = MIDICAPS_VOLUME | MIDICAPS_LRVOLUME; + dest->caps.wVoices = sinfo.nr_voices; + + /* FIXME Is it possible to know the maximum + * number of simultaneous notes of a soundcard ? + * I believe we don't have this information, but + * it's probably equal or more than wVoices + */ + dest->caps.wNotes = sinfo.nr_voices; + } + dest->bEnabled = TRUE; + + /* We also have the information sinfo.synth_subtype, not used here + */ + if (sinfo.capabilities & SYNTH_CAP_INPUT) + FIXME("Synthesizer supports MIDI in. Not yet supported.\n"); + + TRACE("SynthOut[%d]\tOSS info: synth type=%d/%d capa=%lx\n", + i, sinfo.synth_type, sinfo.synth_subtype, (long)sinfo.capabilities); + } + + TRACE("SynthOut[%d]\tname='%s' techn=%d voices=%d notes=%d chnMsk=%04x support=%d\n", + i, wine_dbgstr_w(dest->caps.szPname), dest->caps.wTechnology, + dest->caps.wVoices, dest->caps.wNotes, dest->caps.wChannelMask, dest->caps.dwSupport); + } + + /* find how many MIDI devices are there in the system */ + status = ioctl(fd, SNDCTL_SEQ_NRMIDIS, &midi_devs); + if (status == -1) + { + ERR("ioctl on nr midi failed.\n"); + midi_devs = 0; + goto wrapup; + } + + /* FIXME: the two restrictions below could be loosened in some cases */ + if (synth_devs + midi_devs > MAX_MIDIOUTDRV) + { + ERR("MAX_MIDIOUTDRV was not enough for the number of devices. " + "Some MIDI devices will not be available.\n"); + midi_devs = MAX_MIDIOUTDRV - synth_devs; + } + + if (midi_devs > MAX_MIDIINDRV) + { + ERR("MAX_MIDIINDRV (%d) was not enough for the number of devices (%d). " + "Some MIDI devices will not be available.\n", MAX_MIDIINDRV, midi_devs); + midi_devs = MAX_MIDIINDRV; + } + + dest = dests + synth_devs; + src = srcs; + for (i = 0; i < midi_devs; i++, dest++, src++) + { + minfo.device = i; + status = ioctl(fd, SNDCTL_MIDI_INFO, &minfo); + if (status == -1) WARN("ioctl on midi info for device %d failed.\n", i); + + /* Manufacturer ID. We do not have access to this with soundcard.h + Does not seem to be a problem, because in mmsystem.h only Microsoft's ID is listed + */ + dest->caps.wMid = 0x00FF; + dest->caps.wPid = 0x0001; /* FIXME Product ID */ + /* Product Version. We simply say "1" */ + dest->caps.vDriverVersion = 0x001; + if (status == -1) + { + char buf[255]; + + sprintf(buf, "Wine OSS Midi Out #%d disabled", synth_devs + i); + len = ntdll_umbstowcs(buf, strlen(buf) + 1, dest->caps.szPname, ARRAY_SIZE(dest->caps.szPname)); + dest->caps.szPname[len - 1] = '\0'; + dest->bEnabled = FALSE; + } + else + { + len = ntdll_umbstowcs(minfo.name, strlen(minfo.name) + 1, dest->caps.szPname, ARRAY_SIZE(dest->caps.szPname)); + dest->caps.szPname[len - 1] = '\0'; + dest->bEnabled = TRUE; + } + dest->caps.wTechnology = MOD_MIDIPORT; + dest->caps.wVoices = 0; + dest->caps.wNotes = 0; + dest->caps.wChannelMask = 0xFFFF; + dest->caps.dwSupport = 0; + + /* Manufac ID. We do not have access to this with soundcard.h + Does not seem to be a problem, because in mmsystem.h only + Microsoft's ID is listed */ + src->caps.wMid = 0x00FF; + src->caps.wPid = 0x0001; /* FIXME Product ID */ + /* Product Version. We simply say "1" */ + src->caps.vDriverVersion = 0x001; + if (status == -1) + { + char buf[ARRAY_SIZE(dest->caps.szPname)]; + + sprintf(buf, "Wine OSS Midi In #%d disabled", synth_devs + i); + len = ntdll_umbstowcs(buf, strlen(buf) + 1, src->caps.szPname, ARRAY_SIZE(src->caps.szPname)); + src->caps.szPname[len - 1] = '\0'; + src->state = -1; + } + else + { + len = ntdll_umbstowcs(minfo.name, strlen(minfo.name) + 1, src->caps.szPname, ARRAY_SIZE(src->caps.szPname)); + src->caps.szPname[len - 1] = '\0'; + src->state = 0; + } + src->caps.dwSupport = 0; /* mandatory with MIDIINCAPS */ + + TRACE("OSS info: midi[%d] dev-type=%d capa=%lx\n" + "\tMidiOut[%d] name='%s' techn=%d voices=%d notes=%d chnMsk=%04x support=%d\n" + "\tMidiIn [%d] name='%s' support=%d\n", + i, minfo.dev_type, (long)minfo.capabilities, + synth_devs + i, wine_dbgstr_w(dest->caps.szPname), dest->caps.wTechnology, + dest->caps.wVoices, dest->caps.wNotes, dest->caps.wChannelMask, dest->caps.dwSupport, + i, wine_dbgstr_w(src->caps.szPname), src->caps.dwSupport); + } + +wrapup: + /* windows does not seem to differentiate Synth from MIDI devices */ + num_synths = synth_devs; + num_dests = synth_devs + midi_devs; + num_srcs = midi_devs; + + /* close file and exit */ + seq_close(fd); + + *params->err = 0; + params->num_srcs = num_srcs; + params->num_dests = num_dests; + params->num_synths = num_synths; + params->srcs = srcs; + params->dests = dests; + + return STATUS_SUCCESS; +} diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 1ed152fe794..2b30c5992c7 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -209,6 +209,41 @@ struct is_started_params HRESULT result; }; +#include <mmddk.h> /* temporary */ + +typedef struct midi_src +{ + int state; /* -1 disabled, 0 is no recording started, 1 in recording, bit 2 set if in sys exclusive recording */ + MIDIOPENDESC midiDesc; + WORD wFlags; + MIDIHDR *lpQueueHdr; + unsigned char incoming[3]; + unsigned char incPrev; + char incLen; + UINT startTime; + MIDIINCAPSW caps; +} WINE_MIDIIN; + +typedef struct midi_dest +{ + BOOL bEnabled; + MIDIOPENDESC midiDesc; + WORD wFlags; + MIDIHDR *lpQueueHdr; + void *lpExtra; /* according to port type (MIDI, FM...), extra data when needed */ + MIDIOUTCAPSW caps; +} WINE_MIDIOUT; + +struct midi_init_params +{ + UINT *err; + unsigned int num_dests; + unsigned int num_srcs; + unsigned int num_synths; + struct midi_dest *dests; + struct midi_src *srcs; +}; + enum oss_funcs { oss_test_connect, @@ -234,8 +269,11 @@ enum oss_funcs oss_set_volumes, oss_set_event_handle, oss_is_started, + oss_midi_init, }; +NTSTATUS midi_init(void *args) DECLSPEC_HIDDEN; + extern unixlib_handle_t oss_handle; #define OSS_CALL(func, params) __wine_unix_call(oss_handle, oss_ ## func, params) -- 2.25.1

2 1

[PATCH 2/3] wineoss: Remove preprocessor checks for SNDCTL_SEQ_NRMIDIS.
by Huw Davies 19 Apr '22

19 Apr '22

It's been in the linux kernel since at least 2005 and in OSS's tree since at least 2008 (In both cases it's in the first commit in the respective repos). Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 03c329680e5..1cf19b7be1a 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -63,8 +63,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi); -#ifdef SNDCTL_SEQ_NRMIDIS - typedef struct { int state; /* -1 disabled, 0 is no recording started, 1 in recording, bit 2 set if in sys exclusive recording */ MIDIOPENDESC midiDesc; @@ -1616,8 +1614,6 @@ static DWORD modReset(WORD wDevID) return MMSYSERR_NOERROR; } -#endif /* SNDCTL_SEQ_NRMIDIS */ - /*======================================================================* * MIDI entry points * *======================================================================*/ @@ -1631,7 +1627,6 @@ DWORD WINAPI OSS_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); switch (wMsg) { -#ifdef SNDCTL_SEQ_NRMIDIS case DRVM_INIT: return OSS_MidiInit(); case DRVM_EXIT: @@ -1660,11 +1655,6 @@ DWORD WINAPI OSS_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return midStart(wDevID); case MIDM_STOP: return midStop(wDevID); -#else - case DRVM_INIT: - case MIDM_GETNUMDEVS: - return 0; -#endif default: TRACE("Unsupported message\n"); } @@ -1681,7 +1671,6 @@ DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, wDevID, wMsg, dwUser, dwParam1, dwParam2); switch (wMsg) { -#ifdef SNDCTL_SEQ_NRMIDIS case DRVM_INIT: return OSS_MidiInit(); case DRVM_EXIT: @@ -1712,11 +1701,6 @@ DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return 0; case MODM_RESET: return modReset(wDevID); -#else - case DRVM_INIT: - case MODM_GETNUMDEVS: - return 0; -#endif default: TRACE("Unsupported message\n"); } -- 2.25.1

2 1

[PATCH 1/3] wineoss: Remove some unused members.
by Huw Davies 19 Apr '22

19 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 439bc9e442c..03c329680e5 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -67,11 +67,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi); typedef struct { int state; /* -1 disabled, 0 is no recording started, 1 in recording, bit 2 set if in sys exclusive recording */ - DWORD bufsize; MIDIOPENDESC midiDesc; WORD wFlags; LPMIDIHDR lpQueueHdr; - DWORD dwTotalPlayed; unsigned char incoming[3]; unsigned char incPrev; char incLen; @@ -81,11 +79,9 @@ typedef struct { typedef struct { BOOL bEnabled; - DWORD bufsize; MIDIOPENDESC midiDesc; WORD wFlags; LPMIDIHDR lpQueueHdr; - DWORD dwTotalPlayed; void* lpExtra; /* according to port type (MIDI, FM...), extra data when needed */ MIDIOUTCAPSW caps; } WINE_MIDIOUT; @@ -749,8 +745,6 @@ static DWORD midOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) MidiInDev[wDevID].wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); MidiInDev[wDevID].lpQueueHdr = NULL; - MidiInDev[wDevID].dwTotalPlayed = 0; - MidiInDev[wDevID].bufsize = 0x3FFF; MidiInDev[wDevID].midiDesc = *lpDesc; MidiInDev[wDevID].state = 0; MidiInDev[wDevID].incLen = 0; @@ -796,7 +790,6 @@ static DWORD midClose(WORD wDevID) } midiCloseSeq(); - MidiInDev[wDevID].bufsize = 0; MIDI_NotifyClient(wDevID, MIM_CLOSE, 0L, 0L); MidiInDev[wDevID].midiDesc.hMidi = 0; return ret; @@ -1130,8 +1123,6 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) MidiOutDev[wDevID].wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); MidiOutDev[wDevID].lpQueueHdr = NULL; - MidiOutDev[wDevID].dwTotalPlayed = 0; - MidiOutDev[wDevID].bufsize = 0x3FFF; MidiOutDev[wDevID].midiDesc = *lpDesc; MIDI_NotifyClient(wDevID, MOM_OPEN, 0L, 0L); @@ -1175,7 +1166,6 @@ static DWORD modClose(WORD wDevID) HeapFree(GetProcessHeap(), 0, MidiOutDev[wDevID].lpExtra); MidiOutDev[wDevID].lpExtra = 0; - MidiOutDev[wDevID].bufsize = 0; MIDI_NotifyClient(wDevID, MOM_CLOSE, 0L, 0L); MidiOutDev[wDevID].midiDesc.hMidi = 0; return ret; -- 2.25.1

2 1

[PATCH v2] gdi32: Use NtUserGetSysColor() directly.
by Huw Davies 19 Apr '22

19 Apr '22

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/uniscribe/usp10.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/uniscribe/usp10.c b/dlls/gdi32/uniscribe/usp10.c index a5637dbf645..3e27fcc2a03 100644 --- a/dlls/gdi32/uniscribe/usp10.c +++ b/dlls/gdi32/uniscribe/usp10.c @@ -31,6 +31,7 @@ #include "windef.h" #include "winbase.h" #include "ntgdi.h" +#include "ntuser.h" #include "winuser.h" #include "winnls.h" #include "winreg.h" @@ -2107,19 +2108,6 @@ static inline BOOL does_glyph_start_cluster(const SCRIPT_VISATTR *pva, const WOR return FALSE; } -static DWORD get_sys_color(INT index) -{ - static DWORD (WINAPI *pGetSysColor)(INT index); - - if (!pGetSysColor) - { - HMODULE user = GetModuleHandleW( L"user32.dll" ); - if (user) pGetSysColor = (void *)GetProcAddress( user, "GetSysColor" ); - } - - return pGetSysColor(index); -} - static HRESULT SS_ItemOut( SCRIPT_STRING_ANALYSIS ssa, int iX, int iY, @@ -2159,11 +2147,11 @@ static HRESULT SS_ItemOut( SCRIPT_STRING_ANALYSIS ssa, BkMode = GetBkMode(analysis->hdc); SetBkMode( analysis->hdc, OPAQUE); BkColor = GetBkColor(analysis->hdc); - SetBkColor(analysis->hdc, get_sys_color(COLOR_HIGHLIGHT)); + SetBkColor(analysis->hdc, NtUserGetSysColor(COLOR_HIGHLIGHT)); if (!fDisabled) { TextColor = GetTextColor(analysis->hdc); - SetTextColor(analysis->hdc, get_sys_color(COLOR_HIGHLIGHTTEXT)); + SetTextColor(analysis->hdc, NtUserGetSysColor(COLOR_HIGHLIGHTTEXT)); } } if (analysis->glyphs[iItem].fallbackFont) -- 2.23.0

2 1

[PATCH] gdi32: Use GetSysColor() directly.
by Nikolay Sivov 19 Apr '22

19 Apr '22

Since 2353ef9bd5c gdi32 links to user32, no reason to keep this workaround in Uniscribe part. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Another alternative is to use NtUser variant. dlls/gdi32/uniscribe/usp10.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/uniscribe/usp10.c b/dlls/gdi32/uniscribe/usp10.c index a5637dbf645..ab7923f0690 100644 --- a/dlls/gdi32/uniscribe/usp10.c +++ b/dlls/gdi32/uniscribe/usp10.c @@ -2107,19 +2107,6 @@ static inline BOOL does_glyph_start_cluster(const SCRIPT_VISATTR *pva, const WOR return FALSE; } -static DWORD get_sys_color(INT index) -{ - static DWORD (WINAPI *pGetSysColor)(INT index); - - if (!pGetSysColor) - { - HMODULE user = GetModuleHandleW( L"user32.dll" ); - if (user) pGetSysColor = (void *)GetProcAddress( user, "GetSysColor" ); - } - - return pGetSysColor(index); -} - static HRESULT SS_ItemOut( SCRIPT_STRING_ANALYSIS ssa, int iX, int iY, @@ -2159,11 +2146,11 @@ static HRESULT SS_ItemOut( SCRIPT_STRING_ANALYSIS ssa, BkMode = GetBkMode(analysis->hdc); SetBkMode( analysis->hdc, OPAQUE); BkColor = GetBkColor(analysis->hdc); - SetBkColor(analysis->hdc, get_sys_color(COLOR_HIGHLIGHT)); + SetBkColor(analysis->hdc, GetSysColor(COLOR_HIGHLIGHT)); if (!fDisabled) { TextColor = GetTextColor(analysis->hdc); - SetTextColor(analysis->hdc, get_sys_color(COLOR_HIGHLIGHTTEXT)); + SetTextColor(analysis->hdc, GetSysColor(COLOR_HIGHLIGHTTEXT)); } } if (analysis->glyphs[iItem].fallbackFont) -- 2.35.1

2 2

[PATCH 1/2] webservices/tests: Add test for binary encoding nested structure handling.
by Connor McAdams 19 Apr '22

19 Apr '22

Add a test for a nested structure with an optional ending element. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/webservices/tests/reader.c | 89 ++++++++++++++++++++++++++++++++- 1 file changed, 87 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index eacde56928d..1a2cd1fe420 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -4874,6 +4874,8 @@ static const WS_XML_TEXT_NODE *read_text_node( WS_XML_READER *reader ) static void test_binary_encoding(void) { + WS_XML_STRING str_s = {1, (BYTE *)"s"}, str_s_a = {3, (BYTE *)"s_a"}, str_s_b = {3, (BYTE *)"s_b"}; + WS_XML_STRING str_a = {1, (BYTE *)"a"}, str_b = {1, (BYTE *)"b"}; static WS_XML_STRING localname = {1, (BYTE *)"t"}, ns = {0, NULL}; static const char test[] = {0x40,0x01,'t',0x01}; @@ -4949,6 +4951,9 @@ static void test_binary_encoding(void) {0x40,0x01,'t',0x05,0x02,'p','2',0x01,'t',0x98,0x04,'t','e','s','t',0x09,0x02,'p','2',0x02,'n','s',0x01}; static const char test200[] = {0x02,0x07,'c','o','m','m','e','n','t'}; + static const char test_endelem[] = + { 0x40, 0x01, 't', 0x40, 0x01, 'a', 0x83, 0x40, 0x01, 's', 0x40, 0x03, 's', '_', 'a', 0x82, 0x01, 0x01, + 0x40, 0x01, 'b', 0x83, 0x01 }; const WS_XML_NODE *node; const WS_XML_TEXT_NODE *text_node; const WS_XML_ELEMENT_NODE *elem; @@ -4969,8 +4974,8 @@ static void test_binary_encoding(void) WS_HEAP *heap; BOOL found; HRESULT hr; - WS_STRUCT_DESCRIPTION s; - WS_FIELD_DESCRIPTION f, *fields[1]; + WS_STRUCT_DESCRIPTION s, s2; + WS_FIELD_DESCRIPTION f, f1[3], f2[2], *fields[3], *fields2[2]; struct typetest { WS_BYTES data; @@ -4983,6 +4988,17 @@ static void test_binary_encoding(void) { UINT64 val; } *typetest3; + struct s + { + INT32 s_a; + INT32 s_b; + }; + struct test + { + INT32 a; + struct s *s; + INT32 b; + } *test_struct; hr = WsGetDictionary( WS_ENCODING_XML_BINARY_1, &dict, NULL ); ok( hr == S_OK, "got %#lx\n", hr ); @@ -5689,6 +5705,75 @@ static void test_binary_encoding(void) WS_READ_REQUIRED_POINTER, heap, &typetest3, sizeof(typetest3), NULL ); ok( hr == WS_E_NUMERIC_OVERFLOW, "got %#lx\n", hr ); + /* Test optional ending field on a nested struct. */ + hr = set_input_bin( reader, test_endelem, sizeof(test_endelem), NULL ); + ok( hr == S_OK, "got %#lx\n", hr ); + + memset( &f1[0], 0, sizeof(f1[0]) ); + f1[0].mapping = WS_ELEMENT_FIELD_MAPPING; + f1[0].localName = &str_a; + f1[0].ns = &ns; + f1[0].type = WS_INT32_TYPE; + fields[0] = &f1[0]; + + memset( &f1[1], 0, sizeof(f1[1]) ); + f1[1].mapping = WS_ELEMENT_FIELD_MAPPING; + f1[1].localName = &str_s; + f1[1].ns = &ns; + f1[1].type = WS_STRUCT_TYPE; + f1[1].typeDescription = &s2; + f1[1].options = WS_FIELD_POINTER; + f1[1].offset = FIELD_OFFSET(struct test, s); + fields[1] = &f1[1]; + + memset( &f1[2], 0, sizeof(f1[2]) ); + f1[2].mapping = WS_ELEMENT_FIELD_MAPPING; + f1[2].localName = &str_b; + f1[2].ns = &ns; + f1[2].type = WS_INT32_TYPE; + f1[2].offset = FIELD_OFFSET(struct test, b); + fields[2] = &f1[2]; + + memset( &f2[0], 0, sizeof(f2[0]) ); + f2[0].mapping = WS_ELEMENT_FIELD_MAPPING; + f2[0].localName = &str_s_a; + f2[0].ns = &ns; + f2[0].type = WS_INT32_TYPE; + fields2[0] = &f2[0]; + + memset( &f2[1], 0, sizeof(f2[1]) ); + f2[1].mapping = WS_ELEMENT_FIELD_MAPPING; + f2[1].localName = &str_s_b; + f2[1].ns = &ns; + f2[1].type = WS_INT32_TYPE; + f2[1].offset = FIELD_OFFSET(struct s, s_b); + f2[1].options = WS_FIELD_OPTIONAL; + fields2[1] = &f2[1]; + + memset( &s2, 0, sizeof(s2) ); + s2.size = sizeof(struct s); + s2.alignment = TYPE_ALIGNMENT(struct s); + s2.fields = fields2; + s2.fieldCount = 2; + + memset( &s, 0, sizeof(s) ); + s.size = sizeof(struct test); + s.alignment = TYPE_ALIGNMENT(struct test); + s.fields = fields; + s.fieldCount = 3; + + hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_READ_REQUIRED_POINTER, heap, &test_struct, sizeof(test_struct), NULL ); + todo_wine ok( hr == S_OK, "got %#lx\n", hr ); + if (SUCCEEDED(hr)) + { + ok( test_struct->a == 1, "got %d\n", test_struct->a ); + ok( !!test_struct->s, "s is not set\n" ); + ok( test_struct->s->s_a == 1, "got %d\n", test_struct->s->s_a ); + ok( test_struct->s->s_b == 0, "got %d\n", test_struct->s->s_b ); + ok( test_struct->b == 1, "got %d\n", test_struct->b ); + } + WsFreeHeap( heap ); WsFreeReader( reader ); } -- 2.25.1

2 3

[PATCH] msvcrt: Faster memcmp().
by Jan Sikorski 19 Apr '22

19 Apr '22

Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/msvcrt/string.c | 63 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 59 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 3b352ac0bf2..7a753fbcd21 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2675,10 +2675,7 @@ int CDECL I10_OUTPUT(MSVCRT__LDOUBLE ld80, int prec, int flag, struct _I10_OUTPU } #undef I10_OUTPUT_MAX_PREC -/********************************************************************* - * memcmp (MSVCRT.@) - */ -int __cdecl memcmp(const void *ptr1, const void *ptr2, size_t n) +static inline int memcmp_unaligned(const void *ptr1, const void *ptr2, size_t n) { const unsigned char *p1, *p2; @@ -2690,6 +2687,64 @@ int __cdecl memcmp(const void *ptr1, const void *ptr2, size_t n) return 0; } +static int memcmp_aligned(const void *p1, const void *p2, size_t size) +{ + const unsigned char *first = p1, *second = p2; + const size_t block_size = sizeof(size_t); + + size_t remainder = size & (block_size - 1); + size_t block_count = size / block_size; + + while (block_count-- > 0) + { + size_t value_1 = *(size_t *)first; + size_t value_2 = *(size_t *)second; + + if (value_1 != value_2) + return memcmp_unaligned(first, second, block_size); + + first += block_size; + second += block_size; + } + + return memcmp_unaligned(first, second, remainder); +} + +/********************************************************************* + * memcmp (MSVCRT.@) + */ +int __cdecl memcmp(const void *ptr1, const void *ptr2, size_t n) +{ + const size_t block_size = sizeof(size_t); + const unsigned char *p1 = ptr1, *p2 = ptr2; + size_t align; + int result; + + if (n < block_size) + return memcmp_unaligned(p1, p2, n); + + align = -(uintptr_t)p1 & (block_size - 1); + + if ((result = memcmp_unaligned(p1, p2, align))) + return result; + + p1 += align; + p2 += align; + n -= align; + +#if defined(__i386__) || defined(__x86_64__) + return memcmp_aligned(p1, p2, n); +#else + if (!((uintptr_t)p2 & (block_size - 1))) + { + result = memcmp_aligned(p1, p2, n); + return result; + } + + return memcmp_unaligned(p1, p2, n); +#endif +} + #if defined(__i386__) || defined(__x86_64__) #ifdef __i386__ -- 2.32.0

3 3

[PATCH vkd3d 01/11] tests: Skip probe directives if the last render failed.
by Giovanni Mascellani 19 Apr '22

19 Apr '22

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- tests/shader_runner.c | 13 +++++++++++-- tests/shader_runner.h | 4 +++- tests/shader_runner_d3d11.c | 8 +++++--- tests/shader_runner_d3d12.c | 10 +++++----- tests/shader_runner_d3d9.c | 8 +++++--- tests/shader_runner_vulkan.c | 8 +++++++- 6 files changed, 36 insertions(+), 15 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 54b667fc..2a661122 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -382,7 +382,7 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) if (!runner->vs_source) runner->vs_source = strdup(vs_source); - runner->ops->draw(runner, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST, 3); + runner->last_render_failed = !runner->ops->draw(runner, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST, 3); } else if (match_string(line, "draw", &line)) { @@ -401,7 +401,7 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) if (line == rest) fatal_error("Malformed vertex count '%s'.\n", line); - runner->ops->draw(runner, topology, vertex_count); + runner->last_render_failed = !runner->ops->draw(runner, topology, vertex_count); } else if (match_string(line, "probe all rgba", &line)) { @@ -410,6 +410,9 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) struct vec4 v; int ret; + if (runner->last_render_failed) + return; + ret = sscanf(line, "( %f , %f , %f , %f ) %u", &v.x, &v.y, &v.z, &v.w, &ulps); if (ret < 4) fatal_error("Malformed probe arguments '%s'.\n", line); @@ -425,6 +428,9 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) RECT rect; int ret; + if (runner->last_render_failed) + return; + ret = sscanf(line, "( %d , %d , %d , %d ) ( %f , %f , %f , %f ) %u", &left, &top, &right, &bottom, &v.x, &v.y, &v.z, &v.w, &ulps); if (ret < 8) @@ -445,6 +451,9 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) RECT rect; int ret; + if (runner->last_render_failed) + return; + ret = sscanf(line, "( %u , %u ) ( %f , %f , %f , %f ) %u", &x, &y, &v.x, &v.y, &v.z, &v.w, &ulps); if (ret < 6) fatal_error("Malformed probe arguments '%s'.\n", line); diff --git a/tests/shader_runner.h b/tests/shader_runner.h index 19218ab5..2af2259a 100644 --- a/tests/shader_runner.h +++ b/tests/shader_runner.h @@ -98,6 +98,8 @@ struct shader_runner char *ps_source; enum shader_model minimum_shader_model; + bool last_render_failed; + uint32_t *uniforms; size_t uniform_count, uniform_capacity; @@ -118,7 +120,7 @@ struct shader_runner_ops bool (*check_requirements)(struct shader_runner *runner); struct resource *(*create_resource)(struct shader_runner *runner, const struct resource_params *params); void (*destroy_resource)(struct shader_runner *runner, struct resource *resource); - void (*draw)(struct shader_runner *runner, D3D_PRIMITIVE_TOPOLOGY primitive_topology, unsigned int vertex_count); + bool (*draw)(struct shader_runner *runner, D3D_PRIMITIVE_TOPOLOGY primitive_topology, unsigned int vertex_count); void (*probe_vec4)(struct shader_runner *runner, const RECT *rect, const struct vec4 *v, unsigned int ulps); }; diff --git a/tests/shader_runner_d3d11.c b/tests/shader_runner_d3d11.c index 93904a64..9d1ed09b 100644 --- a/tests/shader_runner_d3d11.c +++ b/tests/shader_runner_d3d11.c @@ -423,7 +423,7 @@ static void d3d11_runner_destroy_resource(struct shader_runner *r, struct resour free(resource); } -static void d3d11_runner_draw(struct shader_runner *r, +static bool d3d11_runner_draw(struct shader_runner *r, D3D_PRIMITIVE_TOPOLOGY primitive_topology, unsigned int vertex_count) { struct d3d11_shader_runner *runner = d3d11_shader_runner(r); @@ -437,12 +437,12 @@ static void d3d11_runner_draw(struct shader_runner *r, HRESULT hr; if (!(vs_code = compile_shader(runner->r.vs_source, "vs", runner->r.minimum_shader_model))) - return; + return false; if (!(ps_code = compile_shader(runner->r.ps_source, "ps", runner->r.minimum_shader_model))) { ID3D10Blob_Release(vs_code); - return; + return false; } hr = ID3D11Device_CreateVertexShader(device, ID3D10Blob_GetBufferPointer(vs_code), @@ -536,6 +536,8 @@ static void d3d11_runner_draw(struct shader_runner *r, ID3D11VertexShader_Release(vs); if (cb) ID3D11Buffer_Release(cb); + + return true; } struct resource_readback diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index c3eb5686..b94f5ee6 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -132,7 +132,7 @@ static void d3d12_runner_destroy_resource(struct shader_runner *r, struct resour free(resource); } -static void d3d12_runner_draw(struct shader_runner *r, +static bool d3d12_runner_draw(struct shader_runner *r, D3D_PRIMITIVE_TOPOLOGY primitive_topology, unsigned int vertex_count) { struct d3d12_shader_runner *runner = d3d12_shader_runner(r); @@ -155,12 +155,12 @@ static void d3d12_runner_draw(struct shader_runner *r, size_t i; if (!(ps_code = compile_shader(runner->r.ps_source, "ps", runner->r.minimum_shader_model))) - return; + return false; if (!(vs_code = compile_shader(runner->r.vs_source, "vs", runner->r.minimum_shader_model))) { ID3D10Blob_Release(ps_code); - return; + return false; } root_signature_desc.NumParameters = 0; @@ -257,8 +257,6 @@ static void d3d12_runner_draw(struct shader_runner *r, ID3D10Blob_Release(vs_code); ID3D10Blob_Release(ps_code); free(input_element_descs); - if (!pso) - return; vkd3d_array_reserve((void **)&test_context->pso, &test_context->pso_capacity, test_context->pso_count + 1, sizeof(*test_context->pso)); test_context->pso[test_context->pso_count++] = pso; @@ -303,6 +301,8 @@ static void d3d12_runner_draw(struct shader_runner *r, exec_command_list(queue, command_list); wait_queue_idle(device, queue); reset_command_list(command_list, test_context->allocator); + + return true; } static void d3d12_runner_probe_vec4(struct shader_runner *r, diff --git a/tests/shader_runner_d3d9.c b/tests/shader_runner_d3d9.c index a4e8938a..f2875d42 100644 --- a/tests/shader_runner_d3d9.c +++ b/tests/shader_runner_d3d9.c @@ -308,7 +308,7 @@ static D3DDECLUSAGE vertex_decl_usage_from_name(const char *name) fatal_error("Cannot translate usage \"%s\" to a d3d9 usage.\n", name); } -static void d3d9_runner_draw(struct shader_runner *r, +static bool d3d9_runner_draw(struct shader_runner *r, D3D_PRIMITIVE_TOPOLOGY primitive_topology, unsigned int vertex_count) { static const D3DVERTEXELEMENT9 decl_element_end = D3DDECL_END(); @@ -323,12 +323,12 @@ static void d3d9_runner_draw(struct shader_runner *r, HRESULT hr; if (!(vs_code = compile_shader(runner->r.vs_source, "vs_2_0"))) - return; + return false; if (!(ps_code = compile_shader(runner->r.ps_source, "ps_2_0"))) { ID3D10Blob_Release(vs_code); - return; + return false; } if (runner->r.uniform_count) @@ -445,6 +445,8 @@ static void d3d9_runner_draw(struct shader_runner *r, IDirect3DVertexDeclaration9_Release(vertex_declaration); IDirect3DVertexShader9_Release(vs); IDirect3DPixelShader9_Release(ps); + + return true; } struct resource_readback diff --git a/tests/shader_runner_vulkan.c b/tests/shader_runner_vulkan.c index 9728f192..b008c8e7 100644 --- a/tests/shader_runner_vulkan.c +++ b/tests/shader_runner_vulkan.c @@ -754,7 +754,7 @@ static void bind_resources(struct vulkan_shader_runner *runner, VkPipelineBindPo /* The descriptor set will be freed by resetting the descriptor pool. */ } -static void vulkan_runner_draw(struct shader_runner *r, +static bool vulkan_runner_draw(struct shader_runner *r, D3D_PRIMITIVE_TOPOLOGY primitive_topology, unsigned int vertex_count) { struct vulkan_shader_runner *runner = vulkan_shader_runner(r); @@ -768,6 +768,7 @@ static void vulkan_runner_draw(struct shader_runner *r, VkDevice device = runner->device; VkClearRect clear_rect; VkPipeline pipeline; + bool ret = true; unsigned int i; /* Create this before compiling shaders, it will assign resource bindings. */ @@ -775,7 +776,10 @@ static void vulkan_runner_draw(struct shader_runner *r, pipeline_layout = create_pipeline_layout(runner, set_layout); if (!(pipeline = create_pipeline(runner, pipeline_layout, primitive_topology))) + { + ret = false; goto out; + } begin_command_buffer(runner); @@ -813,6 +817,8 @@ out: VK_CALL(vkDestroyPipelineLayout(device, pipeline_layout, NULL)); VK_CALL(vkDestroyDescriptorSetLayout(device, set_layout, NULL)); + + return ret; } static const struct vec4 *get_readback_vec4(const uint8_t *data, unsigned int row_pitch, unsigned int x, unsigned int y) -- 2.35.2

5 37