- wine-devel - winehq.org

[tools 1/2] testbot/web: Simplify the JobDetails page's GenerateDataView().
by Francois Gouget 03 May '22

03 May '22

Undefined values don't need any special formatting so let the default implementation deal with them. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/JobDetails.pl | 35 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 748153f28..b0ef2a733 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -91,11 +91,11 @@ sub GenerateDataView($$$) my $PropertyName = $Col->{Descriptor}->GetName(); if ($PropertyName eq "VM") { - print "<a href='#k", $StepTask->GetKey(), "'>"; - print $self->escapeHTML($StepTask->VM->Name); - print "</a>"; + print "<a href='#k", $StepTask->GetKey(), "'>", + $self->escapeHTML($StepTask->VM->Name), "</a>"; + return; } - elsif ($PropertyName eq "FileName") + if ($PropertyName eq "FileName") { my $FileName = $StepTask->GetFullFileName(); if ($FileName and -r $FileName) @@ -105,12 +105,9 @@ sub GenerateDataView($$$) print "<a href='", $self->escapeHTML($URI), "'>", $self->escapeHTML($StepTask->FileName), "</a>"; } - else - { - $self->SUPER::GenerateDataView($Row, $Col); - } + return; } - elsif ($PropertyName eq "CmdLineArg") + if ($PropertyName eq "CmdLineArg") { my $Args = $self->escapeHTML($StepTask->CmdLineArg); if ($Args eq "" or $StepTask->VM->Type eq "wine") @@ -127,23 +124,15 @@ sub GenerateDataView($$$) } } print $Args; + return; } - elsif ($PropertyName eq "Ended") - { - if (defined $StepTask->Ended) - { - my $Duration = $StepTask->Ended - $StepTask->Started; - GenerateTipDateTime($StepTask->Ended, DurationToString($Duration)); - } - else - { - print " "; - } - } - else + if ($PropertyName eq "Ended" and defined $StepTask->Ended) { - $self->SUPER::GenerateDataView($Row, $Col); + my $Duration = $StepTask->Ended - $StepTask->Started; + GenerateTipDateTime($StepTask->Ended, DurationToString($Duration)); + return; } + $self->SUPER::GenerateDataView($Row, $Col); } -- 2.30.2

1 1

[tools] testbot/web: Show canceled jobs in dark blue.
by Francois Gouget 03 May '22

03 May '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/WineTestBot.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index a8756dfce..7b6389477 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -387,7 +387,7 @@ pre .badbuild { color: red; } .testfail { color: red; } .boterror { color: #e55600; } -.canceled { color: black; } +.canceled { color: darkblue; } .userrequest { color: #e55600; } .userapproved { color: green; } -- 2.30.2

1 0

[tools] testbot/cgi: Improve the CollectionBlock::GetDetailsLink() documentation.
by Francois Gouget 03 May '22

03 May '22

Specifically, better document the escaping situation. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index b2ebb2eec..594ed5649 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -200,6 +200,10 @@ sub GetSortedItems($$) Returns the URL of the details page for the current row's object. +If the URL contains parameters those must already be encoded (see uri_escape()) +but the returned URL as a whole may still need to be escaped for use in HTML +documents (notably for the ampersands, see escapeHTML()). + See GenerateDataView() for details about the Row parameter. =back -- 2.30.2

1 0

[PATCH v2 0/10] MR28: winex11: PE conversion preparation
by Jacek Caban (＠jacek) 03 May '22

03 May '22

-- v2: winex11: Directly use ntdll in more places. win32u: Allow NULL client_menu_name in NtUserRegisterClassExWOW. winex11: Reimplement EVENT_DropFromOffiX using get_dos_file_name. winex11: Use import_text_uri_list code in EVENT_DropURLs. winex11: Use ntdll for Unicode conversion. winex11: Directly use wine_nt_to_unix_file_name to get Unix path name. winex11: Use ntdll_umbstowcs and ntdll_wcstoumbs for Unicode conversion. https://gitlab.winehq.org/wine/wine/-/merge_requests/28

2 11

[PATCH 0/10] MR28: winex11: PE conversion preparation
by Jacek Caban (＠jacek) 03 May '22

03 May '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/28

3 11

[PATCH 5/5] wineoss: Build with msvcrt.
by Huw Davies 03 May '22

03 May '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/Makefile.in | 2 -- dlls/wineoss.drv/mmdevdrv.c | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/wineoss.drv/Makefile.in b/dlls/wineoss.drv/Makefile.in index 13fb18b6004..d41aa0113c8 100644 --- a/dlls/wineoss.drv/Makefile.in +++ b/dlls/wineoss.drv/Makefile.in @@ -6,8 +6,6 @@ DELAYIMPORTS = winmm EXTRALIBS = $(OSS4_LIBS) $(PTHREAD_LIBS) EXTRAINCL = $(OSS4_CFLAGS) -EXTRADLLFLAGS = -mcygwin - C_SRCS = \ midi.c \ midipatch.c \ diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 9e3380ca8d9..c282ff14f01 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -39,7 +39,6 @@ #include "wine/debug.h" #include "wine/list.h" -#include "wine/unicode.h" #include "wine/unixlib.h" #include "unixlib.h" @@ -391,7 +390,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **gu } for(i = 0; i < params.num; i++){ - unsigned int name_size = (strlenW(params.endpoints[i].name) + 1) * sizeof(WCHAR); + unsigned int name_size = (wcslen(params.endpoints[i].name) + 1) * sizeof(WCHAR); unsigned int dev_size = strlen(params.endpoints[i].device) + 1; OSSDevice *oss_dev; -- 2.25.1

2 1

[PATCH 4/5] wineoss: Move AUXDM_GETVOLUME and AUXDM_SETVOLUME to the unixlib.
by Huw Davies 03 May '22

03 May '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmaux.c | 135 --------------------------------------- dlls/wineoss.drv/oss.c | 121 +++++++++++++++++++++++++++++++++++ 2 files changed, 121 insertions(+), 135 deletions(-) diff --git a/dlls/wineoss.drv/mmaux.c b/dlls/wineoss.drv/mmaux.c index a3a12a96bea..ae52293f944 100644 --- a/dlls/wineoss.drv/mmaux.c +++ b/dlls/wineoss.drv/mmaux.c @@ -18,16 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> -#include <stdlib.h> -#include <string.h> -#include <sys/types.h> -#include <unistd.h> -#include <fcntl.h> -#include <sys/ioctl.h> -#include <sys/soundcard.h> #include "windef.h" #include "winbase.h" @@ -42,125 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mmaux); -#define MIXER_DEV "/dev/mixer" - -/*-----------------------------------------------------------------------*/ - -/************************************************************************** - * AUX_GetVolume [internal] - */ -static DWORD AUX_GetVolume(WORD wDevID, LPDWORD lpdwVol) -{ - int mixer, volume, left, right, cmd; - - TRACE("(%04X, %p);\n", wDevID, lpdwVol); - if (lpdwVol == NULL) return MMSYSERR_NOTENABLED; - if ((mixer = open(MIXER_DEV, O_RDWR)) < 0) { - WARN("mixer device not available !\n"); - return MMSYSERR_NOTENABLED; - } - switch(wDevID) { - case 0: - TRACE("SOUND_MIXER_READ_PCM !\n"); - cmd = SOUND_MIXER_READ_PCM; - break; - case 1: - TRACE("SOUND_MIXER_READ_SYNTH !\n"); - cmd = SOUND_MIXER_READ_SYNTH; - break; - case 2: - TRACE("SOUND_MIXER_READ_CD !\n"); - cmd = SOUND_MIXER_READ_CD; - break; - case 3: - TRACE("SOUND_MIXER_READ_LINE !\n"); - cmd = SOUND_MIXER_READ_LINE; - break; - case 4: - TRACE("SOUND_MIXER_READ_MIC !\n"); - cmd = SOUND_MIXER_READ_MIC; - break; - case 5: - TRACE("SOUND_MIXER_READ_VOLUME !\n"); - cmd = SOUND_MIXER_READ_VOLUME; - break; - default: - WARN("invalid device id=%04X !\n", wDevID); - close(mixer); - return MMSYSERR_NOTENABLED; - } - if (ioctl(mixer, cmd, &volume) == -1) { - WARN("unable to read mixer !\n"); - close(mixer); - return MMSYSERR_NOTENABLED; - } - close(mixer); - left = LOBYTE(LOWORD(volume)); - right = HIBYTE(LOWORD(volume)); - TRACE("left=%d right=%d !\n", left, right); - *lpdwVol = MAKELONG((left * 0xFFFFL) / 100, (right * 0xFFFFL) / 100); - return MMSYSERR_NOERROR; -} - -/************************************************************************** - * AUX_SetVolume [internal] - */ -static DWORD AUX_SetVolume(WORD wDevID, DWORD dwParam) -{ - int mixer; - int volume, left, right; - int cmd; - - TRACE("(%04X, %08X);\n", wDevID, dwParam); - - left = (LOWORD(dwParam) * 100) >> 16; - right = (HIWORD(dwParam) * 100) >> 16; - volume = (right << 8) | left; - - if ((mixer = open(MIXER_DEV, O_RDWR)) < 0) { - WARN("mixer device not available !\n"); - return MMSYSERR_NOTENABLED; - } - - switch(wDevID) { - case 0: - TRACE("SOUND_MIXER_WRITE_PCM !\n"); - cmd = SOUND_MIXER_WRITE_PCM; - break; - case 1: - TRACE("SOUND_MIXER_WRITE_SYNTH !\n"); - cmd = SOUND_MIXER_WRITE_SYNTH; - break; - case 2: - TRACE("SOUND_MIXER_WRITE_CD !\n"); - cmd = SOUND_MIXER_WRITE_CD; - break; - case 3: - TRACE("SOUND_MIXER_WRITE_LINE !\n"); - cmd = SOUND_MIXER_WRITE_LINE; - break; - case 4: - TRACE("SOUND_MIXER_WRITE_MIC !\n"); - cmd = SOUND_MIXER_WRITE_MIC; - break; - case 5: - TRACE("SOUND_MIXER_WRITE_VOLUME !\n"); - cmd = SOUND_MIXER_WRITE_VOLUME; - break; - default: - WARN("invalid device id=%04X !\n", wDevID); - close(mixer); - return MMSYSERR_NOTENABLED; - } - if (ioctl(mixer, cmd, &volume) == -1) { - WARN("unable to set mixer !\n"); - close(mixer); - return MMSYSERR_NOTENABLED; - } - close(mixer); - return MMSYSERR_NOERROR; -} - /************************************************************************** * auxMessage (WINEOSS.2) */ @@ -173,13 +45,6 @@ DWORD WINAPI OSS_auxMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); - switch (wMsg) { - case AUXDM_GETVOLUME: - return AUX_GetVolume(wDevID, (LPDWORD)dwParam1); - case AUXDM_SETVOLUME: - return AUX_SetVolume(wDevID, dwParam1); - } - params.dev_id = wDevID; params.msg = wMsg; params.user = dwUser; diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index e387a2a4a71..6490081e069 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1444,6 +1444,121 @@ static UINT aux_get_devcaps(WORD dev_id, AUXCAPSW *caps, UINT size) return MMSYSERR_NOERROR; } +static UINT aux_get_volume(WORD dev_id, UINT *vol) +{ + int mixer, volume, left, right, cmd; + + TRACE("(%04X, %p);\n", dev_id, vol); + if (vol == NULL) return MMSYSERR_NOTENABLED; + if ((mixer = open(MIXER_DEV, O_RDWR)) < 0) + { + WARN("mixer device not available !\n"); + return MMSYSERR_NOTENABLED; + } + switch(dev_id) + { + case 0: + TRACE("SOUND_MIXER_READ_PCM !\n"); + cmd = SOUND_MIXER_READ_PCM; + break; + case 1: + TRACE("SOUND_MIXER_READ_SYNTH !\n"); + cmd = SOUND_MIXER_READ_SYNTH; + break; + case 2: + TRACE("SOUND_MIXER_READ_CD !\n"); + cmd = SOUND_MIXER_READ_CD; + break; + case 3: + TRACE("SOUND_MIXER_READ_LINE !\n"); + cmd = SOUND_MIXER_READ_LINE; + break; + case 4: + TRACE("SOUND_MIXER_READ_MIC !\n"); + cmd = SOUND_MIXER_READ_MIC; + break; + case 5: + TRACE("SOUND_MIXER_READ_VOLUME !\n"); + cmd = SOUND_MIXER_READ_VOLUME; + break; + default: + WARN("invalid device id=%04X !\n", dev_id); + close(mixer); + return MMSYSERR_NOTENABLED; + } + if (ioctl(mixer, cmd, &volume) == -1) + { + WARN("unable to read mixer !\n"); + close(mixer); + return MMSYSERR_NOTENABLED; + } + close(mixer); + left = LOBYTE(LOWORD(volume)); + right = HIBYTE(LOWORD(volume)); + TRACE("left=%d right=%d !\n", left, right); + *vol = MAKELONG((left * 0xFFFFL) / 100, (right * 0xFFFFL) / 100); + return MMSYSERR_NOERROR; +} + +static UINT aux_set_volume(WORD dev_id, UINT vol) +{ + int mixer; + int volume, left, right; + int cmd; + + TRACE("(%04X, %08X);\n", dev_id, vol); + + left = (LOWORD(vol) * 100) >> 16; + right = (HIWORD(vol) * 100) >> 16; + volume = (right << 8) | left; + + if ((mixer = open(MIXER_DEV, O_RDWR)) < 0) + { + WARN("mixer device not available !\n"); + return MMSYSERR_NOTENABLED; + } + + switch(dev_id) + { + case 0: + TRACE("SOUND_MIXER_WRITE_PCM !\n"); + cmd = SOUND_MIXER_WRITE_PCM; + break; + case 1: + TRACE("SOUND_MIXER_WRITE_SYNTH !\n"); + cmd = SOUND_MIXER_WRITE_SYNTH; + break; + case 2: + TRACE("SOUND_MIXER_WRITE_CD !\n"); + cmd = SOUND_MIXER_WRITE_CD; + break; + case 3: + TRACE("SOUND_MIXER_WRITE_LINE !\n"); + cmd = SOUND_MIXER_WRITE_LINE; + break; + case 4: + TRACE("SOUND_MIXER_WRITE_MIC !\n"); + cmd = SOUND_MIXER_WRITE_MIC; + break; + case 5: + TRACE("SOUND_MIXER_WRITE_VOLUME !\n"); + cmd = SOUND_MIXER_WRITE_VOLUME; + break; + default: + WARN("invalid device id=%04X !\n", dev_id); + close(mixer); + return MMSYSERR_NOTENABLED; + } + if (ioctl(mixer, cmd, &volume) == -1) + { + WARN("unable to set mixer !\n"); + close(mixer); + return MMSYSERR_NOTENABLED; + } + close(mixer); + return MMSYSERR_NOERROR; +} + static NTSTATUS aux_message(void *args) { struct aux_message_params *params = args; @@ -1468,6 +1583,12 @@ static NTSTATUS aux_message(void *args) TRACE("return %d;\n", num_aux); *params->err = num_aux; break; + case AUXDM_GETVOLUME: + *params->err = aux_get_volume(params->dev_id, (UINT *)params->param_1); + break; + case AUXDM_SETVOLUME: + *params->err = aux_set_volume(params->dev_id, params->param_1); + break; default: WARN("unknown message !\n"); *params->err = MMSYSERR_NOTSUPPORTED; -- 2.25.1

2 1

[PATCH 3/5] wineoss: Move AUXDM_GETDEVCAPS to the unixlib.
by Huw Davies 03 May '22

03 May '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmaux.c | 42 +--------------------------------------- dlls/wineoss.drv/oss.c | 35 +++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 41 deletions(-) diff --git a/dlls/wineoss.drv/mmaux.c b/dlls/wineoss.drv/mmaux.c index 9fb1eeb7cd7..a3a12a96bea 100644 --- a/dlls/wineoss.drv/mmaux.c +++ b/dlls/wineoss.drv/mmaux.c @@ -33,9 +33,9 @@ #include "winbase.h" #include "mmddk.h" #include "audioclient.h" +#include "winternl.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "wine/unixlib.h" #include "unixlib.h" @@ -46,44 +46,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mmaux); /*-----------------------------------------------------------------------*/ -DWORD WINAPI OSS_auxMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, - DWORD_PTR dwParam1, DWORD_PTR dwParam2); - -/************************************************************************** - * AUX_GetDevCaps [internal] - */ -static DWORD AUX_GetDevCaps(WORD wDevID, LPAUXCAPSW lpCaps, DWORD dwSize) -{ - int mixer, volume; - static const WCHAR ini[] = {'O','S','S',' ','A','u','x',' ','#','0',0}; - unsigned int num_aux = OSS_auxMessage(0, AUXDM_GETNUMDEVS, 0, 0, 0); - - TRACE("(%04X, %p, %u);\n", wDevID, lpCaps, dwSize); - if (lpCaps == NULL) return MMSYSERR_NOTENABLED; - if (wDevID >= num_aux) return MMSYSERR_BADDEVICEID; - if ((mixer = open(MIXER_DEV, O_RDWR)) < 0) { - WARN("mixer device not available !\n"); - return MMSYSERR_NOTENABLED; - } - if (ioctl(mixer, SOUND_MIXER_READ_LINE, &volume) == -1) { - close(mixer); - WARN("unable to read mixer !\n"); - return MMSYSERR_NOTENABLED; - } - close(mixer); - lpCaps->wMid = 0xAA; - lpCaps->wPid = 0x55 + wDevID; - lpCaps->vDriverVersion = 0x0100; - strcpyW(lpCaps->szPname, ini); - lpCaps->szPname[9] = '0' + wDevID; /* 6 at max */ - lpCaps->wTechnology = wDevID == 2 ? AUXCAPS_CDAUDIO : AUXCAPS_AUXIN; - lpCaps->wReserved1 = 0; - lpCaps->dwSupport = AUXCAPS_VOLUME | AUXCAPS_LRVOLUME; - - return MMSYSERR_NOERROR; -} - - /************************************************************************** * AUX_GetVolume [internal] */ @@ -212,8 +174,6 @@ DWORD WINAPI OSS_auxMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, wDevID, wMsg, dwUser, dwParam1, dwParam2); switch (wMsg) { - case AUXDM_GETDEVCAPS: - return AUX_GetDevCaps(wDevID, (LPAUXCAPSW)dwParam1, dwParam2); case AUXDM_GETVOLUME: return AUX_GetVolume(wDevID, (LPDWORD)dwParam1); case AUXDM_SETVOLUME: diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index d469bbebb4e..e387a2a4a71 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1412,6 +1412,38 @@ static UINT aux_exit(void) return 0; } +static UINT aux_get_devcaps(WORD dev_id, AUXCAPSW *caps, UINT size) +{ + int mixer, volume; + static const WCHAR ini[] = {'O','S','S',' ','A','u','x',' ','#','0',0}; + + TRACE("(%04X, %p, %u);\n", dev_id, caps, size); + if (caps == NULL) return MMSYSERR_NOTENABLED; + if (dev_id >= num_aux) return MMSYSERR_BADDEVICEID; + if ((mixer = open(MIXER_DEV, O_RDWR)) < 0) + { + WARN("mixer device not available !\n"); + return MMSYSERR_NOTENABLED; + } + if (ioctl(mixer, SOUND_MIXER_READ_LINE, &volume) == -1) + { + close(mixer); + WARN("unable to read mixer !\n"); + return MMSYSERR_NOTENABLED; + } + close(mixer); + caps->wMid = 0xAA; + caps->wPid = 0x55 + dev_id; + caps->vDriverVersion = 0x0100; + memcpy(caps->szPname, ini, sizeof(ini)); + caps->szPname[9] = '0' + dev_id; /* 6 at max */ + caps->wTechnology = (dev_id == 2) ? AUXCAPS_CDAUDIO : AUXCAPS_AUXIN; + caps->wReserved1 = 0; + caps->dwSupport = AUXCAPS_VOLUME | AUXCAPS_LRVOLUME; + + return MMSYSERR_NOERROR; +} + static NTSTATUS aux_message(void *args) { struct aux_message_params *params = args; @@ -1429,6 +1461,9 @@ static NTSTATUS aux_message(void *args) /* FIXME: Pretend this is supported */ *params->err = 0; break; + case AUXDM_GETDEVCAPS: + *params->err = aux_get_devcaps(params->dev_id, (AUXCAPSW *)params->param_1, params->param_2); + break; case AUXDM_GETNUMDEVS: TRACE("return %d;\n", num_aux); *params->err = num_aux; -- 2.25.1

2 1

[PATCH 2/5] wineoss: Move AUXDM_GETNUMDEVS to the unixlib.
by Huw Davies 03 May '22

03 May '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmaux.c | 59 ++++++++++++----------------------- dlls/wineoss.drv/oss.c | 63 ++++++++++++++++++++++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 11 +++++++ 3 files changed, 93 insertions(+), 40 deletions(-) diff --git a/dlls/wineoss.drv/mmaux.c b/dlls/wineoss.drv/mmaux.c index 02ef912bd34..9fb1eeb7cd7 100644 --- a/dlls/wineoss.drv/mmaux.c +++ b/dlls/wineoss.drv/mmaux.c @@ -32,40 +32,20 @@ #include "windef.h" #include "winbase.h" #include "mmddk.h" -#include "wine/unicode.h" +#include "audioclient.h" + #include "wine/debug.h" +#include "wine/unicode.h" +#include "wine/unixlib.h" + +#include "unixlib.h" WINE_DEFAULT_DEBUG_CHANNEL(mmaux); #define MIXER_DEV "/dev/mixer" -static int NumDev = 6; - -/*-----------------------------------------------------------------------*/ - -static LRESULT OSS_AuxInit(void) -{ - int mixer; - TRACE("()\n"); - - if ((mixer = open(MIXER_DEV, O_RDWR)) < 0) { - WARN("mixer device not available !\n"); - NumDev = 0; - } else { - close(mixer); - NumDev = 6; - } - return 0; -} - /*-----------------------------------------------------------------------*/ -static LRESULT OSS_AuxExit(void) -{ - TRACE("()\n"); - return 0; -} - DWORD WINAPI OSS_auxMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2); @@ -225,29 +205,28 @@ static DWORD AUX_SetVolume(WORD wDevID, DWORD dwParam) DWORD WINAPI OSS_auxMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { + struct aux_message_params params; + UINT err; + TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); switch (wMsg) { - case DRVM_INIT: - return OSS_AuxInit(); - case DRVM_EXIT: - return OSS_AuxExit(); - case DRVM_ENABLE: - case DRVM_DISABLE: - /* FIXME: Pretend this is supported */ - return 0; case AUXDM_GETDEVCAPS: return AUX_GetDevCaps(wDevID, (LPAUXCAPSW)dwParam1, dwParam2); - case AUXDM_GETNUMDEVS: - TRACE("return %d;\n", NumDev); - return NumDev; case AUXDM_GETVOLUME: return AUX_GetVolume(wDevID, (LPDWORD)dwParam1); case AUXDM_SETVOLUME: return AUX_SetVolume(wDevID, dwParam1); - default: - WARN("unknown message !\n"); } - return MMSYSERR_NOTSUPPORTED; + + params.dev_id = wDevID; + params.msg = wMsg; + params.user = dwUser; + params.param_1 = dwParam1; + params.param_2 = dwParam2; + params.err = &err; + OSS_CALL(aux_message, &params); + + return err; } diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index a5aea9ee724..d469bbebb4e 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -38,6 +38,7 @@ #include "winternl.h" #include "initguid.h" #include "audioclient.h" +#include "mmddk.h" #include "wine/debug.h" #include "wine/unixlib.h" @@ -1380,6 +1381,67 @@ static NTSTATUS is_started(void *args) return oss_unlock_result(stream, &params->result, stream->playing ? S_OK : S_FALSE); } +/* Aux driver */ + +static unsigned int num_aux; + +#define MIXER_DEV "/dev/mixer" + +static UINT aux_init(void) +{ + int mixer; + + TRACE("()\n"); + + if ((mixer = open(MIXER_DEV, O_RDWR)) < 0) + { + WARN("mixer device not available !\n"); + num_aux = 0; + } + else + { + close(mixer); + num_aux = 6; + } + return 0; +} + +static UINT aux_exit(void) +{ + TRACE("()\n"); + return 0; +} + +static NTSTATUS aux_message(void *args) +{ + struct aux_message_params *params = args; + + switch (params->msg) + { + case DRVM_INIT: + *params->err = aux_init(); + break; + case DRVM_EXIT: + *params->err = aux_exit(); + break; + case DRVM_ENABLE: + case DRVM_DISABLE: + /* FIXME: Pretend this is supported */ + *params->err = 0; + break; + case AUXDM_GETNUMDEVS: + TRACE("return %d;\n", num_aux); + *params->err = num_aux; + break; + default: + WARN("unknown message !\n"); + *params->err = MMSYSERR_NOTSUPPORTED; + break; + } + + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { test_connect, @@ -1409,4 +1471,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = midi_out_message, midi_in_message, midi_notify_wait, + aux_message, }; diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 6a7dc9288d9..25e9a7007b3 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -250,6 +250,16 @@ struct midi_notify_wait_params struct notify_context *notify; }; +struct aux_message_params +{ + UINT dev_id; + UINT msg; + UINT_PTR user; + UINT_PTR param_1; + UINT_PTR param_2; + UINT *err; +}; + enum oss_funcs { oss_test_connect, @@ -279,6 +289,7 @@ enum oss_funcs oss_midi_out_message, oss_midi_in_message, oss_midi_notify_wait, + oss_aux_message, }; NTSTATUS midi_release(void *args) DECLSPEC_HIDDEN; -- 2.25.1

2 1

[PATCH 1/5] wineoss: Use AUXDM_GETNUMDEVS to retrieve the number of devices.
by Huw Davies 03 May '22

03 May '22

This is temporary and allows the global variable to move to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmaux.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wineoss.drv/mmaux.c b/dlls/wineoss.drv/mmaux.c index 7d0b8ed53cc..02ef912bd34 100644 --- a/dlls/wineoss.drv/mmaux.c +++ b/dlls/wineoss.drv/mmaux.c @@ -66,6 +66,9 @@ static LRESULT OSS_AuxExit(void) return 0; } +DWORD WINAPI OSS_auxMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, + DWORD_PTR dwParam1, DWORD_PTR dwParam2); + /************************************************************************** * AUX_GetDevCaps [internal] */ @@ -73,10 +76,11 @@ static DWORD AUX_GetDevCaps(WORD wDevID, LPAUXCAPSW lpCaps, DWORD dwSize) { int mixer, volume; static const WCHAR ini[] = {'O','S','S',' ','A','u','x',' ','#','0',0}; + unsigned int num_aux = OSS_auxMessage(0, AUXDM_GETNUMDEVS, 0, 0, 0); TRACE("(%04X, %p, %u);\n", wDevID, lpCaps, dwSize); if (lpCaps == NULL) return MMSYSERR_NOTENABLED; - if (wDevID >= NumDev) return MMSYSERR_BADDEVICEID; + if (wDevID >= num_aux) return MMSYSERR_BADDEVICEID; if ((mixer = open(MIXER_DEV, O_RDWR)) < 0) { WARN("mixer device not available !\n"); return MMSYSERR_NOTENABLED; -- 2.25.1

2 1

[PATCH 0/9] MR26: dinput/tests: Test fixes and more WGI force feedback tests.
by Rémi Bernon (＠rbernon) 03 May '22

03 May '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/26

5 12

[PATCH] xmllite/reader: Implement CreateXmlReaderInputWithEncodingCodePage().
by Nikolay Sivov 03 May '22

03 May '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52953 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/xmllite/reader.c | 36 ++++++++++++++++++++++++++---------- dlls/xmllite/tests/reader.c | 6 ++++++ dlls/xmllite/xmllite.spec | 2 +- include/xmllite.idl | 2 ++ 4 files changed, 35 insertions(+), 11 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 8d893b51f04..03bb6c409b7 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -3663,19 +3663,12 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) return hr; } -HRESULT WINAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream, - IMalloc *imalloc, - LPCWSTR encoding, - BOOL hint, - LPCWSTR base_uri, - IXmlReaderInput **ppInput) +static HRESULT create_reader_input(IUnknown *stream, IMalloc *imalloc, xml_encoding encoding, + BOOL hint, const WCHAR *base_uri, IXmlReaderInput **ppInput) { xmlreaderinput *readerinput; HRESULT hr; - TRACE("%p %p %s %d %s %p\n", stream, imalloc, wine_dbgstr_w(encoding), - hint, wine_dbgstr_w(base_uri), ppInput); - if (!stream || !ppInput) return E_INVALIDARG; if (!(readerinput = m_alloc(imalloc, sizeof(*readerinput)))) @@ -3686,7 +3679,7 @@ HRESULT WINAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream, readerinput->ref = 1; readerinput->imalloc = imalloc; if (imalloc) IMalloc_AddRef(imalloc); - readerinput->encoding = parse_encoding_name(encoding, -1); + readerinput->encoding = encoding; readerinput->hint = hint; readerinput->baseuri = readerinput_strdupW(readerinput, base_uri); @@ -3706,3 +3699,26 @@ HRESULT WINAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream, return S_OK; } + +/*********************************************************************** + * CreateXmlReaderInputWithEncodingName (xmllite.@) + */ +HRESULT WINAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream, IMalloc *imalloc, + const WCHAR *encoding, BOOL hint, const WCHAR *base_uri, IXmlReaderInput **input) +{ + TRACE("%p, %p, %s, %d, %s, %p.\n", stream, imalloc, wine_dbgstr_w(encoding), + hint, wine_dbgstr_w(base_uri), input); + + return create_reader_input(stream, imalloc, parse_encoding_name(encoding, -1), hint, base_uri, input); +} + +/*********************************************************************** + * CreateXmlReaderInputWithEncodingCodePage (xmllite.@) + */ +HRESULT WINAPI CreateXmlReaderInputWithEncodingCodePage(IUnknown *stream, IMalloc *imalloc, + UINT codepage, BOOL hint, const WCHAR *base_uri, IXmlReaderInput **input) +{ + TRACE("%p, %p, %u, %d, %s, %p.\n", stream, imalloc, codepage, hint, wine_dbgstr_w(base_uri), input); + + return create_reader_input(stream, imalloc, get_encoding_from_codepage(codepage), hint, base_uri, input); +} diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index c4af39173a6..c1778a9764e 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -766,6 +766,12 @@ static void test_readerinput(void) IXmlReader_Release(reader); IUnknown_Release(reader_input); + + /* Using codepage */ + hr = CreateXmlReaderInputWithEncodingCodePage(input, NULL, 1200, FALSE, NULL, &reader_input); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + IUnknown_Release(reader_input); + IUnknown_Release(input); } diff --git a/dlls/xmllite/xmllite.spec b/dlls/xmllite/xmllite.spec index 574ed9865c3..3097e8d4e88 100644 --- a/dlls/xmllite/xmllite.spec +++ b/dlls/xmllite/xmllite.spec @@ -1,5 +1,5 @@ @ stdcall CreateXmlReader(ptr ptr ptr) -@ stub CreateXmlReaderInputWithEncodingCodePage +@ stdcall CreateXmlReaderInputWithEncodingCodePage(ptr ptr long long wstr ptr) @ stdcall CreateXmlReaderInputWithEncodingName(ptr ptr wstr long wstr ptr) @ stdcall CreateXmlWriter(ptr ptr ptr) @ stdcall CreateXmlWriterOutputWithEncodingCodePage(ptr ptr long ptr) diff --git a/include/xmllite.idl b/include/xmllite.idl index 0fd68f7b781..b2de76e5630 100644 --- a/include/xmllite.idl +++ b/include/xmllite.idl @@ -228,6 +228,8 @@ typedef enum XmlError cpp_quote("STDAPI CreateXmlReader(REFIID riid, void **ppvObject, IMalloc *pMalloc);") cpp_quote("typedef IUnknown IXmlReaderInput;") +cpp_quote("STDAPI CreateXmlReaderInputWithEncodingCodePage(IUnknown *stream, IMalloc *pMalloc,") +cpp_quote(" UINT encoding_codepage, BOOL hint, const WCHAR *base_uri, IXmlReaderInput **pInput);") cpp_quote("STDAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream, IMalloc *pMalloc,") cpp_quote(" LPCWSTR encoding, BOOL hint,") cpp_quote(" LPCWSTR base_uri, IXmlReaderInput **ppInput);") -- 2.35.1

1 0

[PATCH 0/5] MR25: mf/tests: Add dmo / transform tests for the audio resampler and color converters.
by Rémi Bernon (＠rbernon) 03 May '22

03 May '22

I believe this doesn't conflict with https://gitlab.winehq.org/wine/wine/-/merge_requests/22 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 -- https://gitlab.winehq.org/wine/wine/-/merge_requests/25

3 9

[PATCH 0/1] MR27: dlls/dbghelp: properly fail on PDB files generated by MSVC compiler version 14.31
by eric pouech (＠epo) 03 May '22

03 May '22

Some internal bits of PDB files are different, so report & abort loading of such PDB file until it's properly understood & supported (instead of crashing) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/27

2 1

[PATCH 0/1] MR23: shell32: Sanitize Program Manager icon and group names
by Alex Henrie (＠alexhenrie) 03 May '22

03 May '22

All of the new tests that are marked todo_wine fail because Wine's PathCombineW does not handle ".", "...", "....", or "foobar." correctly. They will pass once PathCombineW is fixed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52506 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/23

4 3

[PATCH 0/1] MR24: msado15: Implement _Recordset get_EditMode
by Alistair Leslie-Hughes (＠alesliehughes) 03 May '22

03 May '22

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/24

2 1

[PATCH v3 0/1] MR20: include/msvcrt: redefine tolower & toupper with wint_t parameters
by eric pouech (＠epo) 03 May '22

03 May '22

it conflicts in C++ compilation with MINGW builtin definitions Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> -- v3: include/msvcrt: redefine towlower* & towupper* with wint_t types https://gitlab.winehq.org/wine/wine/-/merge_requests/20

2 1

[PATCH v2 0/2] MR20: include/msvcrt: redefine tolower & toupper with wint_t parameters
by eric pouech (＠epo) 03 May '22

03 May '22

it conflicts in C++ compilation with MINGW builtin definitions Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> -- v2: include/msvcrt: redefine towlower* & towupper* with wint_t types https://gitlab.winehq.org/wine/wine/-/merge_requests/20

2 2

Default GitLab merge request target
by Alex Henrie 03 May '22

03 May '22

Would it be possible to make merge requests from forked Wine projects target the upstream Wine project by default, as described at [1]? I just accidentally created a merge request to merge my own topic branch into my own master branch, because for some reason that's the default when you click the "Create merge request" button in the "You pushed to <topic branch> just now" banner. -Alex [1] https://docs.gitlab.com/14.10/ee/user/project/merge_requests/creating_merge…

2 2

[PATCH 1/2] dinput/tests: Do not test that reports are identical when polling.
by Zebediah Figura 03 May '22

03 May '22

This is dependent on timing, and currently fails occasionally both on Windows and Wine. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- For examples of failures: http://test.winehq.org/data/4ec67b7a6447dfc4af8c03c141c600b41b90ef53/win81_… http://test.winehq.org/data/64b96eec7d0aea470f897a3ed0ac9e1b3a680cc5/linux_… dlls/dinput/tests/hid.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/tests/hid.c b/dlls/dinput/tests/hid.c index 4e107625064..1162f154f8e 100644 --- a/dlls/dinput/tests/hid.c +++ b/dlls/dinput/tests/hid.c @@ -2312,14 +2312,13 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle ok( ret, "GetOverlappedResult failed, last error %lu\n", GetLastError() ); ok( value == (report_id ? 3 : 4), "GetOverlappedResult returned length %lu, expected %u\n", value, (report_id ? 3 : 4) ); - /* first report should be ready and the same */ + /* first report should be ready */ ret = GetOverlappedResult( async_file, &overlapped, &value, FALSE ); ok( ret, "GetOverlappedResult failed, last error %lu\n", GetLastError() ); ok( value == (report_id ? 3 : 4), "GetOverlappedResult returned length %lu, expected %u\n", value, (report_id ? 3 : 4) ); ok( memcmp( report, buffer + caps.InputReportByteLength, caps.InputReportByteLength ), "expected different report\n" ); - ok( !memcmp( report, buffer, caps.InputReportByteLength ), "expected identical reports\n" ); value = 10; SetLastError( 0xdeadbeef ); @@ -2343,12 +2342,11 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle ok( ret, "GetOverlappedResult failed, last error %lu\n", GetLastError() ); ok( value == (report_id ? 3 : 4), "GetOverlappedResult returned length %lu, expected %u\n", value, (report_id ? 3 : 4) ); - /* first report should be ready and the same */ + /* first report should be ready */ ret = GetOverlappedResult( async_file, &overlapped, &value, FALSE ); ok( ret, "GetOverlappedResult failed, last error %lu\n", GetLastError() ); ok( value == (report_id ? 3 : 4), "GetOverlappedResult returned length %lu, expected %u\n", value, (report_id ? 3 : 4) ); - ok( !memcmp( report, buffer, caps.InputReportByteLength ), "expected identical reports\n" ); send_hid_input( file, expect_small, sizeof(expect_small) ); -- 2.35.1

4 6

[PATCH vkd3d 1/8] vkd3d-shader/hlsl: Detect missing loads on rhs when splitting copies of non-numeric types.
by Giovanni Mascellani 02 May '22

02 May '22

From: Francisco Casas <fcasas(a)codeweavers.com> Otherwise we can get failed assertions: assert(node->type == HLSL_IR_LOAD); because broadcasts to these types are not implemented yet. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_codegen.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index e945b94d..f7396a96 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -637,6 +637,12 @@ static bool split_array_copies(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, element_type = type->e.array.type; element_size = hlsl_type_get_array_element_reg_size(element_type); + if (rhs->type != HLSL_IR_LOAD) + { + hlsl_fixme(ctx, &instr->loc, "Array store rhs is not HLSL_IR_LOAD. Broadcast may be missing."); + return false; + } + for (i = 0; i < type->e.array.elements_count; ++i) { if (!split_copy(ctx, store, hlsl_ir_load(rhs), i * element_size, element_type)) @@ -667,6 +673,12 @@ static bool split_struct_copies(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr if (type->type != HLSL_CLASS_STRUCT) return false; + if (rhs->type != HLSL_IR_LOAD) + { + hlsl_fixme(ctx, &instr->loc, "Struct store rhs is not HLSL_IR_LOAD. Broadcast may be missing."); + return false; + } + LIST_FOR_EACH_ENTRY(field, type->e.elements, struct hlsl_struct_field, entry) { if (!split_copy(ctx, store, hlsl_ir_load(rhs), field->reg_offset, field->type)) -- 2.36.0

5 32

[PATCH v2 1/7] quartz/tests: Add tests for MPEG audio decoder sink allocator.
by Anton Baskanov 02 May '22

02 May '22

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/quartz/tests/mpegaudio.c | 52 +++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/dlls/quartz/tests/mpegaudio.c b/dlls/quartz/tests/mpegaudio.c index ae098dba355..1983828beb0 100644 --- a/dlls/quartz/tests/mpegaudio.c +++ b/dlls/quartz/tests/mpegaudio.c @@ -880,6 +880,56 @@ static void testfilter_init(struct testfilter *filter) strmbase_source_init(&filter->source, &filter->filter, L"source", &testsource_ops); } +static void test_sink_allocator(IMemInputPin *input) +{ + IMemAllocator *req_allocator, *ret_allocator; + ALLOCATOR_PROPERTIES props, ret_props; + HRESULT hr; + + hr = IMemInputPin_GetAllocatorRequirements(input, &props); + ok(hr == E_NOTIMPL, "Got hr %#lx.\n", hr); + + hr = IMemInputPin_GetAllocator(input, &ret_allocator); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + + if (hr == S_OK) + { + hr = IMemAllocator_GetProperties(ret_allocator, &props); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(!props.cBuffers, "Got %ld buffers.\n", props.cBuffers); + ok(!props.cbBuffer, "Got size %ld.\n", props.cbBuffer); + ok(!props.cbAlign, "Got alignment %ld.\n", props.cbAlign); + ok(!props.cbPrefix, "Got prefix %ld.\n", props.cbPrefix); + + hr = IMemInputPin_NotifyAllocator(input, ret_allocator, TRUE); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + IMemAllocator_Release(ret_allocator); + } + + hr = IMemInputPin_NotifyAllocator(input, NULL, TRUE); + ok(hr == E_POINTER, "Got hr %#lx.\n", hr); + + CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, + &IID_IMemAllocator, (void **)&req_allocator); + + props.cBuffers = 1; + props.cbBuffer = 256; + props.cbAlign = 1; + props.cbPrefix = 0; + hr = IMemAllocator_SetProperties(req_allocator, &props, &ret_props); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IMemInputPin_NotifyAllocator(input, req_allocator, TRUE); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IMemInputPin_GetAllocator(input, &ret_allocator); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(ret_allocator == req_allocator, "Allocators didn't match.\n"); + + IMemAllocator_Release(req_allocator); + IMemAllocator_Release(ret_allocator); +} + static void test_connect_pin(void) { IBaseFilter *filter = create_mpeg_audio_codec(); @@ -995,6 +1045,8 @@ static void test_connect_pin(void) hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#lx.\n", hr); + test_sink_allocator(meminput); + IMemInputPin_Release(meminput); IPin_Release(sink); IPin_Release(source); -- 2.34.1

2 14

Re: [PATCH v6 4/5] winusb: Add WinUsb_Free stub.
by Mohamad Al-Jaf 02 May '22

02 May '22

On Mon, May 2, 2022 at 11:22 AM Yonnel BALEZ <yonnel.balez(a)gmx.fr> wrote: > Bonjour, > je vous remercie de votre envoie, mais je ne suis pas suffisamment compétent > Cordialement > Yonnel BALEZ Bonjour, De rien, je suis content que cela vous semble utile. Attendez-vous que ce patch soit ajouté? Veuillez répondre à tous afin que la liste de diffusion de wine-devel en soit informée. Please reply in English if possible. I used Google Translate here so the translation might not be accurate. -- Kind regards, Mohamad

1 0

[PATCH 0/1] MR20: include/msvcrt: redefine tolower & toupper with wint_t parameters
by eric pouech (＠epo) 02 May '22

02 May '22

it conflicts in C++ compilation with MINGW builtin definitions Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/20

3 3

[PATCH] kernel32/tests: Fix the HAVE_SYS_INOTIFY_H checks.
by Francois Gouget 02 May '22

02 May '22

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/winebus.sys/bus_udev.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 6b4bf09a773..39573162afa 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1773,7 +1773,7 @@ NTSTATUS udev_bus_init(void *args) goto error; } -#if HAVE_SYS_INOTIFY_H +#ifdef HAVE_SYS_INOTIFY_H if (options.disable_udevd) monitor_fd = create_inotify(); if (monitor_fd < 0) options.disable_udevd = FALSE; #else @@ -1798,7 +1798,7 @@ NTSTATUS udev_bus_init(void *args) poll_count = 2; if (!options.disable_udevd) build_initial_deviceset_udevd(); -#if HAVE_SYS_INOTIFY_H +#ifdef HAVE_SYS_INOTIFY_H else build_initial_deviceset_direct(); #endif @@ -1841,7 +1841,7 @@ NTSTATUS udev_bus_wait(void *args) if (pfd[0].revents) { if (udev_monitor) process_monitor_event(udev_monitor); -#if HAVE_SYS_INOTIFY_H +#ifdef HAVE_SYS_INOTIFY_H else process_inotify_event(pfd[0].fd); #endif } -- 2.30.2

1 0

[PATCH] kernel32/tests: Fix a cpoy/paste error in an ok() message.
by Francois Gouget 02 May '22

02 May '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/kernel32/tests/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 0f945f9c4fe..0bb3c57e782 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2192,7 +2192,7 @@ static void test_MoveFileW(void) ret = MoveFileW(source, dest); ok(!ret && GetLastError() == ERROR_ALREADY_EXISTS, - "CopyFileW: unexpected error %ld\n", GetLastError()); + "MoveFileW: unexpected error %ld\n", GetLastError()); ret = DeleteFileW(source); ok(ret, "DeleteFileW: error %ld\n", GetLastError()); -- 2.30.2

1 0

[tools 1/2] testbot/cgi: Add an HasRW property to form pages.
by Francois Gouget 02 May '22

02 May '22

Derived pages can use it to determine whether the form has any editable field. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index e286880fd..224bf3687 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -90,6 +90,7 @@ sub _initialize($$$$) $self->{HasRequired} = !1; $self->{ActionPerformed} = !1; $self->{Method} = "post"; + $self->{HasRW} = !1; } =pod @@ -437,6 +438,7 @@ sub GenerateField($$$$) my $Value = $self->GetFormValue($PropertyDescriptor); if ($Display eq "rw") { + $self->{HasRW} = 1; print "<div class='ItemValue'>"; $self->GenerateValueInput($PropertyDescriptor, $Value, $Format); print "</div>"; -- 2.30.2

1 1

[tools] testbot/web: Standardise escaping of the job details page URLs.
by Francois Gouget 02 May '22

02 May '22

There is no need to call uri_escape() on integers. Also don't call escapeHTML() on simple URLs that contain no ampersand. But do call it any time they may contain one such as the return value of GetMoreInfoLink(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/JobDetails.pl | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index c04266330..748153f28 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -91,7 +91,7 @@ sub GenerateDataView($$$) my $PropertyName = $Col->{Descriptor}->GetName(); if ($PropertyName eq "VM") { - print "<a href='#k", $self->escapeHTML($Row->{Item}->GetKey()), "'>"; + print "<a href='#k", $StepTask->GetKey(), "'>"; print $self->escapeHTML($StepTask->VM->Name); print "</a>"; } @@ -101,11 +101,9 @@ sub GenerateDataView($$$) if ($FileName and -r $FileName) { my $JobId = $self->{EnclosingPage}->GetJob()->Id; - my $URI = "/GetFile.pl?JobKey=" . uri_escape($JobId) . - "&StepKey=" . uri_escape($StepTask->StepNo); - print "<a href='" . $self->escapeHTML($URI) . "'>"; - print $self->escapeHTML($StepTask->FileName); - print "</a>"; + my $URI = "/GetFile.pl?JobKey=$JobId&StepKey=". $StepTask->StepNo; + print "<a href='", $self->escapeHTML($URI), "'>", + $self->escapeHTML($StepTask->FileName), "</a>"; } else { @@ -371,7 +369,7 @@ sub GetMoreInfoLink($$$$;$) { my ($self, $LinkKey, $Label, $Set, $Value) = @_; - my $Url = $ENV{"SCRIPT_NAME"} ."?Key=". uri_escape($self->{JobId}); + my $Url = $ENV{"SCRIPT_NAME"} ."?Key=$self->{JobId}"; my $Action = "Show". ($Set eq "Full" and $Label !~ /old/ ? " full" : ""); foreach my $Key (sort keys %{$self->{More}}) @@ -423,11 +421,11 @@ sub GenerateMoreInfoLink($$$$;$$) my $Html = "<a href='". $self->escapeHTML($Url) ."'$Title>$Action $Label</a>"; if (defined $Value) { - $Url = "/GetTaskFile.pl?Job=". uri_escape($self->{JobId}) - ."&Step=". uri_escape($StepTask->StepNo) - ."&Task=". uri_escape($StepTask->TaskNo) + $Url = "/GetTaskFile.pl?Job=$self->{JobId}" + ."&Step=". $StepTask->StepNo + ."&Task=". $StepTask->TaskNo ."&File=". uri_escape($Value); - $Html = "<a href='$Url'>↓</a> $Html"; + $Html = "<a href='". $self->escapeHTML($Url) ."'>↓</a> $Html"; } if ($Action eq "Hide") { @@ -585,11 +583,11 @@ EOF { if ($MoreInfo->{Screenshot}) { - my $URI = "/Screenshot.pl?JobKey=" . uri_escape($self->{JobId}) . - "&StepKey=" . uri_escape($StepTask->StepNo) . - "&TaskKey=" . uri_escape($StepTask->TaskNo); - print "<div class='Screenshot'><img src='" . - $self->escapeHTML($URI) . "' alt='Screenshot' /></div>\n"; + my $URI = "/Screenshot.pl?JobKey=$self->{JobId}" + ."&StepKey=". $StepTask->StepNo + ."&TaskKey=". $StepTask->TaskNo; + print "<div class='Screenshot'><img src='", $self->escapeHTML($URI), + "' alt='Screenshot'/></div>\n"; } $self->GenerateMoreInfoLink($Key, "final screenshot", "Screenshot"); } @@ -665,7 +663,7 @@ EOF if (defined $LogInfo->{BadLog}) { my ($_Action, $Url) = $self->GetMoreInfoLink($Key, GetLogLabel($LogName), "Full", $LogName); - print "<pre class='log-note'>The error summary is not available (<a href='$Url'>see full log instead</a>): $LogInfo->{BadLog}</pre>\n"; + print "<pre class='log-note'>The error summary is not available (<a href='", $self->escapeHTML($Url), "'>see full log instead</a>): $LogInfo->{BadLog}</pre>\n"; } elsif ($LogInfo->{NoRef} and !defined $LogInfo->{BadRef}) { -- 2.30.2

1 0

[tools] testbot/SetWinLocale: Copy the locales again after a revert.
by Francois Gouget 02 May '22

02 May '22

Most of the time the system and default user account locales are not impacted when the current account's --locale and --country locales are reverted after a reboot. But for some locales they are reverted too so that SetWinLocale needs to set them again. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This fixes creating the snapshots for the en-AE, mx-MX and pt-PT locales. --- testbot/bin/SetWinLocale | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index e41af2088..0752df5ba 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -946,7 +946,7 @@ if ($OptReboot) if ($Reverted) { Warning("$Expected got reverted to $Reverted. Setting them again but this will not stick across reboots\n"); - SetWinLocales(undef, undef, $OptLocale, $CountryId, undef, undef, undef, undef); + SetWinLocales($OptSysCopy, $OptDefCopy, $OptLocale, $CountryId, undef, undef, undef, undef); last; } sleep(2); -- 2.30.2

1 0

[PATCH 0/1] MR21: include/guiddef.h: use Mingw64's __uuidof when present
by eric pouech (＠epo) 02 May '22

02 May '22

otherwise Wine's and Mingw64's __uuidof() enter in conflict (C++) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/21

2 1

[PATCH] wined3d: Do not use vkCmdClearColorImage() to clear compressed images.
by Zebediah Figura 02 May '22

02 May '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52922 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/texture.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 5fd38b49132..49650f2839e 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -5257,9 +5257,10 @@ static void wined3d_texture_vk_download_data(struct wined3d_context *context, } } -static void wined3d_texture_vk_clear(struct wined3d_texture_vk *texture_vk, +static bool wined3d_texture_vk_clear(struct wined3d_texture_vk *texture_vk, unsigned int sub_resource_idx, struct wined3d_context *context) { + struct wined3d_texture_sub_resource *sub_resource = &texture_vk->t.sub_resources[sub_resource_idx]; struct wined3d_context_vk *context_vk = wined3d_context_vk(context); const struct wined3d_format *format = texture_vk->t.resource.format; const struct wined3d_vk_info *vk_info = context_vk->vk_info; @@ -5270,12 +5271,24 @@ static void wined3d_texture_vk_clear(struct wined3d_texture_vk *texture_vk, VkImageAspectFlags aspect_mask; VkImage vk_image; + if (texture_vk->t.resource.format_flags & WINED3DFMT_FLAG_COMPRESSED) + { + struct wined3d_bo_address addr; + + if (!wined3d_texture_prepare_location(&texture_vk->t, sub_resource_idx, context, WINED3D_LOCATION_SYSMEM)) + return false; + wined3d_texture_get_bo_address(&texture_vk->t, sub_resource_idx, &addr, WINED3D_LOCATION_SYSMEM); + memset(addr.addr, 0, sub_resource->size); + wined3d_texture_validate_location(&texture_vk->t, sub_resource_idx, WINED3D_LOCATION_SYSMEM); + return true; + } + vk_image = texture_vk->image.vk_image; if (!(vk_command_buffer = wined3d_context_vk_get_command_buffer(context_vk))) { ERR("Failed to get command buffer.\n"); - return; + return false; } aspect_mask = vk_aspect_mask_from_format(format); @@ -5305,6 +5318,9 @@ static void wined3d_texture_vk_clear(struct wined3d_texture_vk *texture_vk, VK_ACCESS_TRANSFER_WRITE_BIT, vk_access_mask_from_bind_flags(texture_vk->t.resource.bind_flags), VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, texture_vk->layout, vk_image, &vk_range); wined3d_context_vk_reference_texture(context_vk, texture_vk); + + wined3d_texture_validate_location(&texture_vk->t, sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB); + return true; } static BOOL wined3d_texture_vk_load_texture(struct wined3d_texture_vk *texture_vk, @@ -5319,8 +5335,11 @@ static BOOL wined3d_texture_vk_load_texture(struct wined3d_texture_vk *texture_v if (sub_resource->locations & WINED3D_LOCATION_CLEARED) { - wined3d_texture_vk_clear(texture_vk, sub_resource_idx, context); - return TRUE; + if (!wined3d_texture_vk_clear(texture_vk, sub_resource_idx, context)) + return FALSE; + + if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB) + return TRUE; } if (!(sub_resource->locations & wined3d_texture_sysmem_locations)) -- 2.35.1

2 1

[PATCH v2 0/2] MR17: programs/cmd: test that read is successful before using its result
by eric pouech (＠epo) 02 May '22

02 May '22

There are cases where the read can fail (not attached to a console, input stream mapped to /dev/null...) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> -- v2: programs/cmd: skip too long paths https://gitlab.winehq.org/wine/wine/-/merge_requests/17

2 2

[PATCH v3 1/3] d2d1: Add stubs for ID2D1EffectContext.
by Ziqing Hui 02 May '22

02 May '22

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v3: * Move CreateEffect() implementation to effect_context in this patch. * Add effect_context to d2d_effect in this patch. * Remove the factory reference in struct d2d_effect. Use effect_context->device_context->factory instead. * Use d2d_device_context in d2d_effect_context. dlls/d2d1/d2d1_private.h | 31 ++++- dlls/d2d1/device.c | 18 +-- dlls/d2d1/effect.c | 290 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 320 insertions(+), 19 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index aa8e8569455..cb9ee6d5b80 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -34,6 +34,7 @@ #include "initguid.h" #endif #include "dwrite_2.h" +#include "d2d1effectauthor.h" enum d2d_brush_type { @@ -567,6 +568,17 @@ struct d2d_device void d2d_device_init(struct d2d_device *device, ID2D1Factory1 *factory, IDXGIDevice *dxgi_device) DECLSPEC_HIDDEN; +struct d2d_effect_context +{ + ID2D1EffectContext ID2D1EffectContext_iface; + LONG refcount; + + struct d2d_device_context *device_context; +}; + +void d2d_effect_context_init(struct d2d_effect_context *effect_context, + struct d2d_device_context *device_context) DECLSPEC_HIDDEN; + struct d2d_effect_info { const CLSID *clsid; @@ -583,13 +595,14 @@ struct d2d_effect const struct d2d_effect_info *info; - ID2D1Factory *factory; + struct d2d_effect_context *effect_context; ID2D1Image **inputs; size_t inputs_size; size_t input_count; }; -HRESULT d2d_effect_init(struct d2d_effect *effect, ID2D1Factory *factory, const CLSID *effect_id) DECLSPEC_HIDDEN; +HRESULT d2d_effect_init(struct d2d_effect *effect, + struct d2d_effect_context *effect_context, const CLSID *effect_id) DECLSPEC_HIDDEN; static inline BOOL d2d_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) { @@ -694,6 +707,13 @@ static inline const char *debug_d2d_point_2f(const D2D1_POINT_2F *point) return wine_dbg_sprintf("{%.8e, %.8e}", point->x, point->y); } +static inline const char *debug_d2d_point_2l(const D2D1_POINT_2L *point) +{ + if (!point) + return "(null)"; + return wine_dbg_sprintf("{%ld, %ld}", point->x, point->y); +} + static inline const char *debug_d2d_rect_f(const D2D1_RECT_F *rect) { if (!rect) @@ -701,6 +721,13 @@ static inline const char *debug_d2d_rect_f(const D2D1_RECT_F *rect) return wine_dbg_sprintf("(%.8e, %.8e)-(%.8e, %.8e)", rect->left, rect->top, rect->right, rect->bottom); } +static inline const char *debug_d2d_rect_l(const D2D1_RECT_L *rect) +{ + if (!rect) + return "(null)"; + return wine_dbg_sprintf("(%ld, %ld)-(%ld, %ld)", rect->left, rect->top, rect->right, rect->bottom); +} + static inline const char *debug_d2d_rounded_rect(const D2D1_ROUNDED_RECT *rounded_rect) { if (!rounded_rect) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 13c99458cfa..80badcddaac 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1890,25 +1890,19 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateEffect(ID2D1DeviceCont REFCLSID effect_id, ID2D1Effect **effect) { struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); - struct d2d_effect *object; + struct d2d_effect_context *effect_context; HRESULT hr; FIXME("iface %p, effect_id %s, effect %p stub!\n", iface, debugstr_guid(effect_id), effect); - if (!(object = heap_alloc_zero(sizeof(*object)))) + if (!(effect_context = heap_alloc_zero(sizeof(*effect_context)))) return E_OUTOFMEMORY; + d2d_effect_context_init(effect_context, context); - if (FAILED(hr = d2d_effect_init(object, context->factory, effect_id))) - { - WARN("Failed to initialise effect, hr %#lx.\n", hr); - heap_free(object); - return hr; - } + hr = ID2D1EffectContext_CreateEffect(&effect_context->ID2D1EffectContext_iface, effect_id, effect); - TRACE("Created effect %p.\n", object); - *effect = &object->ID2D1Effect_iface; - - return S_OK; + ID2D1EffectContext_Release(&effect_context->ID2D1EffectContext_iface); + return hr; } static HRESULT STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_CreateGradientStopCollection( diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 350ac3c7bbf..65183b4f0f1 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -17,7 +17,6 @@ */ #include "d2d1_private.h" -#include "d2d1effectauthor.h" WINE_DEFAULT_DEBUG_CHANNEL(d2d); @@ -31,6 +30,286 @@ static const struct d2d_effect_info builtin_effects[] = {&CLSID_D2D1Grayscale, 1, 1, 1}, }; +static inline struct d2d_effect_context *impl_from_ID2D1EffectContext(ID2D1EffectContext *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_effect_context, ID2D1EffectContext_iface); +} + +static void d2d_effect_context_cleanup(struct d2d_effect_context *effect_context) +{ + ID2D1DeviceContext_Release(&effect_context->device_context->ID2D1DeviceContext_iface); +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_QueryInterface(ID2D1EffectContext *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_ID2D1EffectContext) + || IsEqualGUID(iid, &IID_IUnknown)) + { + ID2D1EffectContext_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d2d_effect_context_AddRef(ID2D1EffectContext *iface) +{ + struct d2d_effect_context *effect_context = impl_from_ID2D1EffectContext(iface); + ULONG refcount = InterlockedIncrement(&effect_context->refcount); + + TRACE("%p increasing refcount to %lu.\n", iface, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d2d_effect_context_Release(ID2D1EffectContext *iface) +{ + struct d2d_effect_context *effect_context = impl_from_ID2D1EffectContext(iface); + ULONG refcount = InterlockedDecrement(&effect_context->refcount); + + TRACE("%p decreasing refcount to %lu.\n", iface, refcount); + + if (!refcount) + { + d2d_effect_context_cleanup(effect_context); + heap_free(effect_context); + } + + return refcount; +} + +static void STDMETHODCALLTYPE d2d_effect_context_GetDpi(ID2D1EffectContext *iface, float *dpi_x, float *dpi_y) +{ + FIXME("iface %p, dpi_x %p, dpi_y %p stub!\n", iface, dpi_x, dpi_y); +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateEffect(ID2D1EffectContext *iface, + REFCLSID clsid, ID2D1Effect **effect) +{ + struct d2d_effect_context *effect_context = impl_from_ID2D1EffectContext(iface); + struct d2d_effect *object; + HRESULT hr; + + TRACE("iface %p, clsid %s, effect %p.\n", iface, debugstr_guid(clsid), effect); + + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = d2d_effect_init(object, effect_context, clsid))) + { + WARN("Failed to initialise effect, hr %#lx.\n", hr); + heap_free(object); + return hr; + } + + TRACE("Created effect %p.\n", object); + *effect = &object->ID2D1Effect_iface; + + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_GetMaximumSupportedFeatureLevel(ID2D1EffectContext *iface, + const D3D_FEATURE_LEVEL *levels, UINT32 level_count, D3D_FEATURE_LEVEL *max_level) +{ + FIXME("iface %p, levels %p, level_count %u, max_level %p stub!\n", iface, levels, level_count, max_level); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateTransformNodeFromEffect(ID2D1EffectContext *iface, + ID2D1Effect *effect, ID2D1TransformNode **node) +{ + FIXME("iface %p, effect %p, node %p stub!\n", iface, effect, node); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateBlendTransform(ID2D1EffectContext *iface, + UINT32 num_inputs, const D2D1_BLEND_DESCRIPTION *description, ID2D1BlendTransform **transform) +{ + FIXME("iface %p, num_inputs %u, description %p, transform %p stub!\n", iface, num_inputs, description, transform); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateBorderTransform(ID2D1EffectContext *iface, + D2D1_EXTEND_MODE mode_x, D2D1_EXTEND_MODE mode_y, ID2D1BorderTransform **transform) +{ + FIXME("iface %p, mode_x %#x, mode_y %#x, transform %p stub!\n", iface, mode_x, mode_y, transform); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateOffsetTransform(ID2D1EffectContext *iface, + D2D1_POINT_2L offset, ID2D1OffsetTransform **transform) +{ + FIXME("iface %p, offset %s, transform %p stub!\n", iface, debug_d2d_point_2l(&offset), transform); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateBoundsAdjustmentTransform(ID2D1EffectContext *iface, + const D2D1_RECT_L *output_rect, ID2D1BoundsAdjustmentTransform **transform) +{ + FIXME("iface %p, output_rect %s, transform %p stub!\n", iface, debug_d2d_rect_l(output_rect), transform); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadPixelShader(ID2D1EffectContext *iface, + REFGUID shader_id, const BYTE *buffer, UINT32 buffer_size) +{ + FIXME("iface %p, shader_id %s, buffer %p, buffer_size %u stub!\n", + iface, debugstr_guid(shader_id), buffer, buffer_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadVertexShader(ID2D1EffectContext *iface, + REFGUID shader_id, const BYTE *buffer, UINT32 buffer_size) +{ + FIXME("iface %p, shader_id %s, buffer %p, buffer_size %u stub!\n", + iface, debugstr_guid(shader_id), buffer, buffer_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadComputeShader(ID2D1EffectContext *iface, + REFGUID shader_id, const BYTE *buffer, UINT32 buffer_size) +{ + FIXME("iface %p, shader_id %s, buffer %p, buffer_size %u stub!\n", + iface, debugstr_guid(shader_id), buffer, buffer_size); + + return E_NOTIMPL; +} + +static BOOL STDMETHODCALLTYPE d2d_effect_context_IsShaderLoaded(ID2D1EffectContext *iface, REFGUID shader_id) +{ + FIXME("iface %p, shader_id %s stub!\n", iface, debugstr_guid(shader_id)); + + return FALSE; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateResourceTexture(ID2D1EffectContext *iface, + const GUID *id, const D2D1_RESOURCE_TEXTURE_PROPERTIES *texture_properties, + const BYTE *data, const UINT32 *strides, UINT32 data_size, ID2D1ResourceTexture **texture) +{ + FIXME("iface %p, id %s, texture_properties %p, data %p, strides %s, data_size %u, texture %p stub!\n", + iface, debugstr_guid(id), texture_properties, data, + strides ? wine_dbg_sprintf("%u", *strides) : "(null)", data_size, texture); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_FindResourceTexture(ID2D1EffectContext *iface, + const GUID *id, ID2D1ResourceTexture **texture) +{ + FIXME("iface %p, id %s, texture %p stub!\n", iface, debugstr_guid(id), texture); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateVertexBuffer(ID2D1EffectContext *iface, + const D2D1_VERTEX_BUFFER_PROPERTIES *buffer_properties, const GUID *id, + const D2D1_CUSTOM_VERTEX_BUFFER_PROPERTIES *custom_buffer_properties, ID2D1VertexBuffer **buffer) +{ + FIXME("iface %p, buffer_properties %p, id %s, custom_buffer_properties %p, buffer %p stub!\n", + iface, buffer_properties, debugstr_guid(id), custom_buffer_properties, buffer); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_FindVertexBuffer(ID2D1EffectContext *iface, + const GUID *id, ID2D1VertexBuffer **buffer) +{ + FIXME("iface %p, id %s, buffer %p stub!\n", iface, debugstr_guid(id), buffer); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateColorContext(ID2D1EffectContext *iface, + D2D1_COLOR_SPACE space, const BYTE *profile, UINT32 profile_size, ID2D1ColorContext **color_context) +{ + FIXME("iface %p, space %#x, profile %p, profile_size %u, color_context %p stub!\n", + iface, space, profile, profile_size, color_context); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateColorContextFromFilename(ID2D1EffectContext *iface, + const WCHAR *filename, ID2D1ColorContext **color_context) +{ + FIXME("iface %p, filename %s, color_context %p stub!\n", iface, debugstr_w(filename), color_context); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateColorContextFromWicColorContext(ID2D1EffectContext *iface, + IWICColorContext *wic_color_context, ID2D1ColorContext **color_context) +{ + FIXME("iface %p, wic_color_context %p, color_context %p stub!\n", iface, wic_color_context, color_context); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CheckFeatureSupport(ID2D1EffectContext *iface, + D2D1_FEATURE feature, void *data, UINT32 data_size) +{ + FIXME("iface %p, feature %#x, data %p, data_size %u stub!\n", iface, feature, data, data_size); + + return E_NOTIMPL; +} + +static BOOL STDMETHODCALLTYPE d2d_effect_context_IsBufferPrecisionSupported(ID2D1EffectContext *iface, + D2D1_BUFFER_PRECISION precision) +{ + FIXME("iface %p, precision %#x stub!\n", iface, precision); + + return FALSE; +} + +static const ID2D1EffectContextVtbl d2d_effect_context_vtbl = +{ + d2d_effect_context_QueryInterface, + d2d_effect_context_AddRef, + d2d_effect_context_Release, + d2d_effect_context_GetDpi, + d2d_effect_context_CreateEffect, + d2d_effect_context_GetMaximumSupportedFeatureLevel, + d2d_effect_context_CreateTransformNodeFromEffect, + d2d_effect_context_CreateBlendTransform, + d2d_effect_context_CreateBorderTransform, + d2d_effect_context_CreateOffsetTransform, + d2d_effect_context_CreateBoundsAdjustmentTransform, + d2d_effect_context_LoadPixelShader, + d2d_effect_context_LoadVertexShader, + d2d_effect_context_LoadComputeShader, + d2d_effect_context_IsShaderLoaded, + d2d_effect_context_CreateResourceTexture, + d2d_effect_context_FindResourceTexture, + d2d_effect_context_CreateVertexBuffer, + d2d_effect_context_FindVertexBuffer, + d2d_effect_context_CreateColorContext, + d2d_effect_context_CreateColorContextFromFilename, + d2d_effect_context_CreateColorContextFromWicColorContext, + d2d_effect_context_CheckFeatureSupport, + d2d_effect_context_IsBufferPrecisionSupported, +}; + +void d2d_effect_context_init(struct d2d_effect_context *effect_context, struct d2d_device_context *device_context) +{ + effect_context->ID2D1EffectContext_iface.lpVtbl = &d2d_effect_context_vtbl; + effect_context->refcount = 1; + effect_context->device_context = device_context; + ID2D1DeviceContext_AddRef(&device_context->ID2D1DeviceContext_iface); +} + static inline struct d2d_effect *impl_from_ID2D1Effect(ID2D1Effect *iface) { return CONTAINING_RECORD(iface, struct d2d_effect, ID2D1Effect_iface); @@ -46,7 +325,7 @@ static void d2d_effect_cleanup(struct d2d_effect *effect) ID2D1Image_Release(effect->inputs[i]); } heap_free(effect->inputs); - ID2D1Factory_Release(effect->factory); + ID2D1EffectContext_Release(&effect->effect_context->ID2D1EffectContext_iface); } static HRESULT STDMETHODCALLTYPE d2d_effect_QueryInterface(ID2D1Effect *iface, REFIID iid, void **out) @@ -362,7 +641,7 @@ static void STDMETHODCALLTYPE d2d_effect_image_GetFactory(ID2D1Image *iface, ID2 TRACE("iface %p, factory %p.\n", iface, factory); - ID2D1Factory_AddRef(*factory = effect->factory); + ID2D1Factory_AddRef(*factory = effect->effect_context->device_context->factory); } static const ID2D1ImageVtbl d2d_effect_image_vtbl = @@ -373,7 +652,7 @@ static const ID2D1ImageVtbl d2d_effect_image_vtbl = d2d_effect_image_GetFactory, }; -HRESULT d2d_effect_init(struct d2d_effect *effect, ID2D1Factory *factory, const CLSID *effect_id) +HRESULT d2d_effect_init(struct d2d_effect *effect, struct d2d_effect_context *effect_context, const CLSID *effect_id) { unsigned int i; @@ -387,7 +666,8 @@ HRESULT d2d_effect_init(struct d2d_effect *effect, ID2D1Factory *factory, const { effect->info = &builtin_effects[i]; d2d_effect_SetInputCount(&effect->ID2D1Effect_iface, effect->info->default_input_count); - ID2D1Factory_AddRef(effect->factory = factory); + effect->effect_context = effect_context; + ID2D1EffectContext_AddRef(&effect_context->ID2D1EffectContext_iface); return S_OK; } } -- 2.25.1

2 5

MR19v3 - Fix msvcrt include for C++ support - closed
by eric pouech (＠epo) 02 May '22

02 May '22

This merge request was closed by eric pouech. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/19

1 0

[PATCH vkd3d 1/4] vkd3d: Introduce an internal refcount to d3d12_fence to replace the thread waiting mechanism.
by Conor McCarthy 02 May '22

02 May '22

Simplifies the preservation of fence objects until worker threads are done with them, and will be needed when threaded queue submission is added. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/command.c | 72 ++++++++++++-------------------------- libs/vkd3d/vkd3d_private.h | 4 +-- 2 files changed, 24 insertions(+), 52 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 09171fe4..7a373b34 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -20,6 +20,8 @@ #include "vkd3d_private.h" +static void d3d12_fence_incref(struct d3d12_fence *fence); +static void d3d12_fence_decref(struct d3d12_fence *fence); static HRESULT d3d12_fence_signal(struct d3d12_fence *fence, uint64_t value, VkFence vk_fence); HRESULT vkd3d_queue_create(struct d3d12_device *device, @@ -295,7 +297,7 @@ static HRESULT vkd3d_enqueue_gpu_fence(struct vkd3d_fence_worker *worker, waiting_fence->queue_sequence_number = queue_sequence_number; ++worker->enqueued_fence_count; - InterlockedIncrement(&fence->pending_worker_operation_count); + d3d12_fence_incref(fence); vkd3d_cond_signal(&worker->cond); vkd3d_mutex_unlock(&worker->mutex); @@ -303,37 +305,6 @@ static HRESULT vkd3d_enqueue_gpu_fence(struct vkd3d_fence_worker *worker, return S_OK; } -static void vkd3d_fence_worker_remove_fence(struct vkd3d_fence_worker *worker, struct d3d12_fence *fence) -{ - LONG count; - int rc; - - if (!(count = InterlockedAdd(&fence->pending_worker_operation_count, 0))) - return; - - WARN("Waiting for %u pending fence operations (fence %p).\n", count, fence); - - if ((rc = vkd3d_mutex_lock(&worker->mutex))) - { - ERR("Failed to lock mutex, error %d.\n", rc); - return; - } - - while ((count = InterlockedAdd(&fence->pending_worker_operation_count, 0))) - { - TRACE("Still waiting for %u pending fence operations (fence %p).\n", count, fence); - - worker->pending_fence_destruction = true; - vkd3d_cond_signal(&worker->cond); - - vkd3d_cond_wait(&worker->fence_destruction_cond, &worker->mutex); - } - - TRACE("Removed fence %p.\n", fence); - - vkd3d_mutex_unlock(&worker->mutex); -} - static void vkd3d_fence_worker_move_enqueued_fences_locked(struct vkd3d_fence_worker *worker) { unsigned int i; @@ -432,7 +403,7 @@ static void vkd3d_wait_for_gpu_timeline_semaphores(struct vkd3d_fence_worker *wo if (FAILED(hr = d3d12_fence_signal(current->fence, counter_value, VK_NULL_HANDLE))) ERR("Failed to signal D3D12 fence, hr %#x.\n", hr); - InterlockedDecrement(&current->fence->pending_worker_operation_count); + d3d12_fence_decref(current->fence); continue; } @@ -480,7 +451,7 @@ static void vkd3d_wait_for_gpu_fences(struct vkd3d_fence_worker *worker) if (FAILED(hr = d3d12_fence_signal(current->fence, current->value, vk_fence))) ERR("Failed to signal D3D12 fence, hr %#x.\n", hr); - InterlockedDecrement(&current->fence->pending_worker_operation_count); + d3d12_fence_decref(current->fence); vkd3d_queue_update_sequence_number(current->queue, current->queue_sequence_number, device); continue; @@ -518,12 +489,6 @@ static void *vkd3d_fence_worker_main(void *arg) break; } - if (worker->pending_fence_destruction) - { - vkd3d_cond_broadcast(&worker->fence_destruction_cond); - worker->pending_fence_destruction = false; - } - if (worker->enqueued_fence_count) { vkd3d_fence_worker_move_enqueued_fences_locked(worker); @@ -560,7 +525,6 @@ HRESULT vkd3d_fence_worker_start(struct vkd3d_fence_worker *worker, TRACE("worker %p.\n", worker); worker->should_exit = false; - worker->pending_fence_destruction = false; worker->device = device; worker->enqueued_fence_count = 0; @@ -1026,22 +990,35 @@ static ULONG STDMETHODCALLTYPE d3d12_fence_AddRef(ID3D12Fence *iface) return refcount; } +static void d3d12_fence_incref(struct d3d12_fence *fence) +{ + InterlockedIncrement(&fence->internal_refcount); +} + static ULONG STDMETHODCALLTYPE d3d12_fence_Release(ID3D12Fence *iface) { struct d3d12_fence *fence = impl_from_ID3D12Fence(iface); ULONG refcount = InterlockedDecrement(&fence->refcount); - int rc; TRACE("%p decreasing refcount to %u.\n", fence, refcount); if (!refcount) + d3d12_fence_decref(fence); + + return refcount; +} + +static void d3d12_fence_decref(struct d3d12_fence *fence) +{ + ULONG internal_refcount = InterlockedDecrement(&fence->internal_refcount); + int rc; + + if (!internal_refcount) { struct d3d12_device *device = fence->device; vkd3d_private_store_destroy(&fence->private_store); - vkd3d_fence_worker_remove_fence(&device->fence_worker, fence); - d3d12_fence_destroy_vk_objects(fence); vkd3d_free(fence->events); @@ -1052,8 +1029,6 @@ static ULONG STDMETHODCALLTYPE d3d12_fence_Release(ID3D12Fence *iface) d3d12_device_release(device); } - - return refcount; } static HRESULT STDMETHODCALLTYPE d3d12_fence_GetPrivateData(ID3D12Fence *iface, @@ -1380,6 +1355,7 @@ static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device * int rc; fence->ID3D12Fence_iface.lpVtbl = &d3d12_fence_vtbl; + fence->internal_refcount = 1; fence->refcount = 1; fence->value = initial_value; @@ -1419,8 +1395,6 @@ static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device * memset(fence->old_vk_fences, 0, sizeof(fence->old_vk_fences)); - fence->pending_worker_operation_count = 0; - if (FAILED(hr = vkd3d_private_store_init(&fence->private_store))) { vkd3d_mutex_destroy(&fence->mutex); @@ -6496,7 +6470,7 @@ static HRESULT vkd3d_enqueue_timeline_semaphore(struct vkd3d_fence_worker *worke waiting_fence->queue = queue; ++worker->enqueued_fence_count; - InterlockedIncrement(&fence->pending_worker_operation_count); + d3d12_fence_incref(fence); vkd3d_cond_signal(&worker->cond); vkd3d_mutex_unlock(&worker->mutex); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 56060b6d..a0163c8d 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -346,7 +346,6 @@ struct vkd3d_fence_worker struct vkd3d_cond cond; struct vkd3d_cond fence_destruction_cond; bool should_exit; - bool pending_fence_destruction; LONG enqueued_fence_count; struct vkd3d_enqueued_fence @@ -532,6 +531,7 @@ struct vkd3d_pending_fence_wait struct d3d12_fence { ID3D12Fence ID3D12Fence_iface; + LONG internal_refcount; LONG refcount; uint64_t value; @@ -555,8 +555,6 @@ struct d3d12_fence struct list semaphores; unsigned int semaphore_count; - LONG pending_worker_operation_count; - VkFence old_vk_fences[VKD3D_MAX_VK_SYNC_OBJECTS]; struct d3d12_device *device; -- 2.35.1

3 7

[PATCH 0/13] MR18: win32u: more menu conversion
by Jacek Caban (＠jacek) 02 May '22

02 May '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/18

3 14

[PATCH 1/7] quartz/tests: Add tests for MPEG audio decoder sink allocator.
by Anton Baskanov 02 May '22

02 May '22

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/quartz/tests/mpegaudio.c | 52 +++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/dlls/quartz/tests/mpegaudio.c b/dlls/quartz/tests/mpegaudio.c index ae098dba355..1983828beb0 100644 --- a/dlls/quartz/tests/mpegaudio.c +++ b/dlls/quartz/tests/mpegaudio.c @@ -880,6 +880,56 @@ static void testfilter_init(struct testfilter *filter) strmbase_source_init(&filter->source, &filter->filter, L"source", &testsource_ops); } +static void test_sink_allocator(IMemInputPin *input) +{ + IMemAllocator *req_allocator, *ret_allocator; + ALLOCATOR_PROPERTIES props, ret_props; + HRESULT hr; + + hr = IMemInputPin_GetAllocatorRequirements(input, &props); + ok(hr == E_NOTIMPL, "Got hr %#lx.\n", hr); + + hr = IMemInputPin_GetAllocator(input, &ret_allocator); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + + if (hr == S_OK) + { + hr = IMemAllocator_GetProperties(ret_allocator, &props); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(!props.cBuffers, "Got %ld buffers.\n", props.cBuffers); + ok(!props.cbBuffer, "Got size %ld.\n", props.cbBuffer); + ok(!props.cbAlign, "Got alignment %ld.\n", props.cbAlign); + ok(!props.cbPrefix, "Got prefix %ld.\n", props.cbPrefix); + + hr = IMemInputPin_NotifyAllocator(input, ret_allocator, TRUE); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + IMemAllocator_Release(ret_allocator); + } + + hr = IMemInputPin_NotifyAllocator(input, NULL, TRUE); + ok(hr == E_POINTER, "Got hr %#lx.\n", hr); + + CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, + &IID_IMemAllocator, (void **)&req_allocator); + + props.cBuffers = 1; + props.cbBuffer = 256; + props.cbAlign = 1; + props.cbPrefix = 0; + hr = IMemAllocator_SetProperties(req_allocator, &props, &ret_props); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IMemInputPin_NotifyAllocator(input, req_allocator, TRUE); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IMemInputPin_GetAllocator(input, &ret_allocator); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(ret_allocator == req_allocator, "Allocators didn't match.\n"); + + IMemAllocator_Release(req_allocator); + IMemAllocator_Release(ret_allocator); +} + static void test_connect_pin(void) { IBaseFilter *filter = create_mpeg_audio_codec(); @@ -995,6 +1045,8 @@ static void test_connect_pin(void) hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#lx.\n", hr); + test_sink_allocator(meminput); + IMemInputPin_Release(meminput); IPin_Release(sink); IPin_Release(source); -- 2.34.1

2 11

[PATCH] mshtml: Added IHTMLCSSStyleDeclaration::backgroundSize property implementation.
by Hans Leidekker 02 May '22

02 May '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 13 +++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 16 ++++++++++++++++ 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 11a66369c39..44ac21c5f97 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -181,6 +181,11 @@ static const style_tbl_entry_t style_tbl[] = { DISPID_A_BACKGROUNDREPEAT, 0, background_repeat_values }, + { + L"background-size", + DISPID_IHTMLCSSSTYLEDECLARATION_BACKGROUNDSIZE, + DISPID_A_IE9_BACKGROUNDSIZE, + }, { L"border", DISPID_IHTMLCSSSTYLEDECLARATION_BORDER, @@ -7628,15 +7633,15 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_get_backgroundOrigin(IHTMLCSSStyle static HRESULT WINAPI HTMLCSSStyleDeclaration_put_backgroundSize(IHTMLCSSStyleDeclaration *iface, BSTR v) { CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + return set_style_property(This, STYLEID_BACKGROUND_SIZE, v); } static HRESULT WINAPI HTMLCSSStyleDeclaration_get_backgroundSize(IHTMLCSSStyleDeclaration *iface, BSTR *p) { CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_style_property(This, STYLEID_BACKGROUND_SIZE, p); } static HRESULT WINAPI HTMLCSSStyleDeclaration_put_boxShadow(IHTMLCSSStyleDeclaration *iface, BSTR v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 25f87c802b2..e14c1274360 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -55,6 +55,7 @@ typedef enum { STYLEID_BACKGROUND_POSITION_X, STYLEID_BACKGROUND_POSITION_Y, STYLEID_BACKGROUND_REPEAT, + STYLEID_BACKGROUND_SIZE, STYLEID_BORDER, STYLEID_BORDER_BOTTOM, STYLEID_BORDER_BOTTOM_COLOR, diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index bc9afda7617..4b72d144354 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -793,6 +793,22 @@ static void test_css_style_declaration(IHTMLCSSStyleDeclaration *css_style) ok(!lstrcmpW(str, L"border-box"), "backgroundClip = %s\n", wine_dbgstr_w(str)); SysFreeString(str); + str = (BSTR)0xdeadbeef; + hres = IHTMLCSSStyleDeclaration_get_backgroundSize(css_style, &str); + ok(hres == S_OK, "get_backgroundSize failed: %08lx\n", hres); + ok(str == NULL, "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = SysAllocString(L"100% 100%"); + hres = IHTMLCSSStyleDeclaration_put_backgroundSize(css_style, str); + ok(hres == S_OK, "put_backgroundSize failed: %08lx\n", hres); + SysFreeString(str); + + hres = IHTMLCSSStyleDeclaration_get_backgroundSize(css_style, &str); + ok(hres == S_OK, "get_backgroundSize failed: %08lx\n", hres); + ok(!lstrcmpW(str, L"100% 100%"), "backgroundSize = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + hres = IHTMLCSSStyleDeclaration_get_opacity(css_style, &v); ok(hres == S_OK, "get_opacity failed: %08lx\n", hres); test_var_bstr(&v, NULL); -- 2.30.2

2 1

[PATCH 0/2] MR17: programs/cmd: test that read is successful before using its result
by eric pouech (＠epo) 02 May '22

02 May '22

There are cases where the read can fail (not attached to a console, input stream mapped to /dev/null...) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/17

3 3

[PATCH 1/3] dwrite/opentype: Correct flags field size for layout lookup structure.
by Nikolay Sivov 02 May '22

02 May '22

Higher 16 bits are used for mark filtering set index. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/opentype.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 7df0d207bc6..7df153e681d 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -3619,10 +3619,10 @@ struct lookup { unsigned short index; unsigned short type; - unsigned short flags; unsigned short subtable_count; unsigned int mask; + unsigned int flags; unsigned int offset; unsigned int auto_zwnj : 1; unsigned int auto_zwj : 1; @@ -4542,9 +4542,9 @@ static int __cdecl lookups_sorting_compare(const void *a, const void *b) static BOOL opentype_layout_init_lookup(const struct ot_gsubgpos_table *table, unsigned short lookup_index, const struct shaping_feature *feature, struct lookup *lookup) { - unsigned short subtable_count, lookup_type, flags, mark_filtering_set; + unsigned short subtable_count, lookup_type, mark_filtering_set; const struct ot_lookup_table *lookup_table; - unsigned int offset; + unsigned int offset, flags; if (!(offset = table_read_be_word(&table->table, table->lookup_list + FIELD_OFFSET(struct ot_lookup_list, lookup[lookup_index])))) -- 2.35.1

1 2

[PATCH v2 1/2] iphlpapi: Correctly include tcpestats.h.
by Mohamad Al-Jaf 02 May '22

02 May '22

This is needed to add prototypes with TCP_ESTATS_TYPE argument types. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- This is how it is in the Windows SDK file. --- dlls/iphlpapi/iphlpapi_main.c | 1 - include/iphlpapi.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 0bd7cdc06c8..e002e12e2fd 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -32,7 +32,6 @@ #include "fltdefs.h" #include "ifdef.h" #include "netioapi.h" -#include "tcpestats.h" #include "ip2string.h" #include "netiodef.h" #include "icmpapi.h" diff --git a/include/iphlpapi.h b/include/iphlpapi.h index da5819c8423..4e156913426 100644 --- a/include/iphlpapi.h +++ b/include/iphlpapi.h @@ -25,6 +25,7 @@ extern "C" { #include <iprtrmib.h> #include <ipexport.h> #include <iptypes.h> +#include <tcpestats.h> #define NET_STRING_IPV4_ADDRESS 0x00000001 #define NET_STRING_IPV4_SERVICE 0x00000002 -- 2.36.0

3 6

[PATCH] netapi32: Remove obsolete -D_SVRAPI_ from Makefile.in
by Drew Ronneberg 01 May '22

01 May '22

_SVRAPI_ is no longer used in the Wine source code. Signed-off-by: Drew Ronneberg <drew_ronneberg(a)yahoo.com> --- dlls/netapi32/Makefile.in | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/netapi32/Makefile.in b/dlls/netapi32/Makefile.in index 1f97d9797b9..cb0ea5168b5 100644 --- a/dlls/netapi32/Makefile.in +++ b/dlls/netapi32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -D_SVRAPI_ MODULE = netapi32.dll UNIXLIB = netapi32.so IMPORTLIB = netapi32 -- 2.25.1

1 6

[PATCH 0/4] MR9: ntdll: Implement __fastfail().
by Jinoh Kang (＠iamahuman) 30 Apr '22

30 Apr '22

__fastfail() is used by the Visual C++ runtime and Windows system libraries to signal that the in-process state is corrupted and unrecoverable. If __fastfail() is invoked, the NT kernel raises a second-chance non-continuable exception STATUS_STACK_BUFFER_OVERRUN. This quickly terminates the process, bypassing all in-process exception handlers (since they all rely on the potentially corrupted process state). -- https://gitlab.winehq.org/wine/wine/-/merge_requests/9

3 5

[PATCH v3 0/9] MR6: Avoid performance degradation due to vDSO unmapping (BZ#52313)
by Jinoh Kang (＠iamahuman) 30 Apr '22

30 Apr '22

Commit f558741fabc116534fa598aa890ffed683a7153b removes vDSO if it conflicts with reserved ranges: > Remove the AT_SYSINFO and AT_SYSINFO_EHDR values if the sysinfo page > is in one of our reserved ranges. However, missing vDSO leads to performance issues on some syscalls (e.g. clock_gettime, gettimeofday) and may even lead to crash when run with some ancient C libraries that does not supply a custom signal restorer. vDSO pages can clash with reserved ranges especially in a 32-bit address space with address space layout randomization (ASLR) turned on. Recent versions of the Linux kernel introduced support for mremap()-ping vDSO pages, partly in an effort to support checkpoint restore in userspace (CRIU). Special programs that require specific memory layout constraints (such as Wine preloader) can take advantage of this support to modify the address space to meet its requirements. The following test script has been used to test each changes (use with `git rebase --exec=...`): ```sh set -e make -C ../wine64-build -j5 make -C ../wine32-build -j5 cd ../wine64-build export WINEPRELOADREMAPSTACK export WINEPRELOADREMAPVDSO for WINEPRELOADREMAPSTACK in skip never always force auto on-demand '' do for WINEPRELOADREMAPVDSO in skip never always force auto on-demand '' do ./loader/wine64 wineboot ./loader/wine wineboot done done ``` -- v3: loader: Switch stack if the old stack address is in reserved range. loader: Relocate sigpage on conflict with reserved ranges in ARM. loader: Relocate vDSO on conflict with reserved ranges. loader: Fix return type of get_auxiliary(). loader: Don't clobber existing memory mappings when reserving addresses. loader: Explicitly munmap() the preloader's ELF EHDR. loader: Generalise is_addr_reserved to find overlapping address ranges. loader: Refactor number parsing to own function. loader: Refactor argv/envp/auxv management. https://gitlab.winehq.org/wine/wine/-/merge_requests/6

2 9

[PATCH] msadpm: Stop decoding instead of crashing for invalid adpcm
by Moore, Brandon A. 30 Apr '22

30 Apr '22

2 1

[PATCH] msadpm: Stop decoding instead of crashing for invalid adpcm data.
by Moore, Brandon A. 30 Apr '22

30 Apr '22

Apply the same patch from 72528be84fdc for adpcm data sent to mono destinations in addition to stereo destinations. Signed-off-by: Brandon Moore <moore.3071(a)osu.edu> --- dlls/msadp32.acm/msadp32.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/msadp32.acm/msadp32.c b/dlls/msadp32.acm/msadp32.c index 2dc11b9239a..a68b13d58f6 100644 --- a/dlls/msadp32.acm/msadp32.c +++ b/dlls/msadp32.acm/msadp32.c @@ -319,7 +319,14 @@ static void cvtMMms16K(const ACMDRVSTREAMINSTANCE *adsi, { const unsigned char* in_src = src; - assert(*src <= 6); + /* Catch a problem from Lord of the Rings War of the Ring where it + * passes invalid data. */ + if (*src > 6 || *(src + 1) > 6) + { + *ndst -= nblock * nsamp_blk * adsi->pwfxDst->nBlockAlign; + WARN("Invalid ADPCM data, stopping conversion\n"); + break; + } coeff = MSADPCM_CoeffSet[*src++]; idelta = R16(src); src += 2; -- 2.35.1

1 0

[PATCH v7 0/3] Partial IShellItemImageFactory implementation (#52673)
by Jinoh Kang 29 Apr '22

29 Apr '22

Jinoh Kang (3): shell32/tests: Add tests for IShellItemImageFactory. shell32: Add stub for IShellItemImageFactory. shell32: Partially implement IShellItemImageFactory (icon only, no thumbnail). dlls/shell32/Makefile.in | 2 +- dlls/shell32/shellitem.c | 241 +++++++++++++++++++++++++++++++++ dlls/shell32/tests/shlfolder.c | 50 +++++++ 3 files changed, 292 insertions(+), 1 deletion(-) -- 2.34.1

3 10

[PATCH 6/6] wineoss: Move DRVM_INIT and DRVM_EXIT to the unixlib.
by Huw Davies 29 Apr '22

29 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 63 -------------------------------------- dlls/wineoss.drv/oss.c | 1 - dlls/wineoss.drv/ossmidi.c | 41 +++++++++++++++++++------ dlls/wineoss.drv/unixlib.h | 7 ----- 4 files changed, 31 insertions(+), 81 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 84a4fac4b74..dda5dabf522 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -34,19 +34,7 @@ * timers (like select on fd) */ -#include "config.h" - -#include <stdlib.h> -#include <string.h> #include <stdarg.h> -#include <stdio.h> -#include <sys/types.h> -#include <unistd.h> -#include <fcntl.h> -#include <errno.h> -#include <sys/ioctl.h> -#include <poll.h> -#include <sys/soundcard.h> #include "windef.h" #include "winbase.h" @@ -67,44 +55,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi); * Low level MIDI implementation * *======================================================================*/ -static int MIDI_loadcount; -/************************************************************************** - * OSS_MidiInit [internal] - * - * Initializes the MIDI devices information variables - */ -static LRESULT OSS_MidiInit(void) -{ - struct midi_init_params params; - UINT err; - - TRACE("(%i)\n", MIDI_loadcount); - if (MIDI_loadcount++) - return 1; - - TRACE("Initializing the MIDI variables.\n"); - - params.err = &err; - OSS_CALL(midi_init, &params); - - return err; -} - -/************************************************************************** - * OSS_MidiExit [internal] - * - * Release the MIDI devices information variables - */ -static LRESULT OSS_MidiExit(void) -{ - TRACE("(%i)\n", MIDI_loadcount); - - if (--MIDI_loadcount) - return 1; - - return 0; -} - static void notify_client(struct notify_context *notify) { TRACE("dev_id = %d msg = %d param1 = %04lX param2 = %04lX\n", @@ -130,12 +80,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) { - case DRVM_INIT: - return OSS_MidiInit(); - case DRVM_EXIT: - return OSS_MidiExit(); - } params.dev_id = wDevID; params.msg = wMsg; @@ -167,13 +111,6 @@ DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); - switch (wMsg) { - case DRVM_INIT: - return OSS_MidiInit(); - case DRVM_EXIT: - return OSS_MidiExit(); - } - params.dev_id = wDevID; params.msg = wMsg; params.user = dwUser; diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index b0a411ecd9b..a5aea9ee724 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1405,7 +1405,6 @@ unixlib_entry_t __wine_unix_call_funcs[] = set_volumes, set_event_handle, is_started, - midi_init, midi_release, midi_out_message, midi_in_message, diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c index 072a9815c35..6677609a5a6 100644 --- a/dlls/wineoss.drv/ossmidi.c +++ b/dlls/wineoss.drv/ossmidi.c @@ -83,6 +83,7 @@ static pthread_mutex_t in_buffer_mutex = PTHREAD_MUTEX_INITIALIZER; 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]; +static int load_count; static unsigned int num_midi_in_started; static int rec_cancel_pipe[2]; @@ -301,22 +302,23 @@ static int seq_close(int fd) return 0; } -NTSTATUS midi_init(void *args) +static UINT midi_init(void) { - 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; + TRACE("(%i)\n", load_count); + + if (load_count++) + return 1; + /* try to open device */ fd = seq_open(); if (fd == -1) - { - *params->err = -1; - return STATUS_SUCCESS; - } + return -1; /* find how many Synth devices are there in the system */ status = ioctl(fd, SNDCTL_SEQ_NRSYNTHS, &synth_devs); @@ -324,8 +326,7 @@ NTSTATUS midi_init(void *args) { ERR("ioctl for nr synth failed.\n"); seq_close(fd); - *params->err = -1; - return STATUS_SUCCESS; + return -1; } if (synth_devs > MAX_MIDIOUTDRV) @@ -506,9 +507,17 @@ wrapup: /* close file and exit */ seq_close(fd); - *params->err = 0; + return 0; +} - return STATUS_SUCCESS; +static UINT midi_exit(void) +{ + TRACE("(%i)\n", load_count); + + if (--load_count) + return 1; + + return 0; } NTSTATUS midi_release(void *args) @@ -1634,6 +1643,12 @@ NTSTATUS midi_out_message(void *args) switch (params->msg) { + case DRVM_INIT: + *params->err = midi_init(); + break; + case DRVM_EXIT: + *params->err = midi_exit(); + break; case DRVM_ENABLE: case DRVM_DISABLE: /* FIXME: Pretend this is supported */ @@ -1688,6 +1703,12 @@ NTSTATUS midi_in_message(void *args) switch (params->msg) { + case DRVM_INIT: + *params->err = midi_init(); + break; + case DRVM_EXIT: + *params->err = midi_exit(); + break; case DRVM_ENABLE: case DRVM_DISABLE: /* FIXME: Pretend this is supported */ diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index d3dda7c76f2..6a7dc9288d9 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -209,11 +209,6 @@ struct is_started_params HRESULT result; }; -struct midi_init_params -{ - UINT *err; -}; - struct notify_context { BOOL send_notify; @@ -280,14 +275,12 @@ enum oss_funcs oss_set_volumes, oss_set_event_handle, oss_is_started, - oss_midi_init, oss_midi_release, oss_midi_out_message, oss_midi_in_message, oss_midi_notify_wait, }; -NTSTATUS midi_init(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_release(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_out_message(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_in_message(void *args) DECLSPEC_HIDDEN; -- 2.25.1

2 1

[PATCH 5/6] wineoss: Move MIDM_OPEN and MIDM_CLOSE to the unixlib.
by Huw Davies 29 Apr '22

29 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/Makefile.in | 2 +- dlls/wineoss.drv/midi.c | 243 ----------------------------------- dlls/wineoss.drv/oss.c | 3 - dlls/wineoss.drv/ossmidi.c | 193 +++++++++++++++++++++++++--- dlls/wineoss.drv/unixlib.h | 35 ----- 5 files changed, 175 insertions(+), 301 deletions(-) diff --git a/dlls/wineoss.drv/Makefile.in b/dlls/wineoss.drv/Makefile.in index 04b438da71e..13fb18b6004 100644 --- a/dlls/wineoss.drv/Makefile.in +++ b/dlls/wineoss.drv/Makefile.in @@ -3,7 +3,7 @@ MODULE = wineoss.drv UNIXLIB = wineoss.so IMPORTS = uuid ole32 user32 advapi32 DELAYIMPORTS = winmm -EXTRALIBS = $(OSS4_LIBS) +EXTRALIBS = $(OSS4_LIBS) $(PTHREAD_LIBS) EXTRAINCL = $(OSS4_CFLAGS) EXTRADLLFLAGS = -mcygwin diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index c83dd55fd6b..84a4fac4b74 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -63,23 +63,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi); -static WINE_MIDIIN *MidiInDev; - -/* this is the total number of MIDI out devices found */ -static int MIDM_NumDevs = 0; - -static int numStartedMidiIn = 0; - -static int rec_cancel_pipe[2]; -static HANDLE hThread; - /*======================================================================* * Low level MIDI implementation * *======================================================================*/ -static int midiOpenSeq(void); -static int midiCloseSeq(int); - static int MIDI_loadcount; /************************************************************************** * OSS_MidiInit [internal] @@ -100,11 +87,6 @@ static LRESULT OSS_MidiInit(void) params.err = &err; OSS_CALL(midi_init, &params); - if (!err) - { - MidiInDev = params.srcs; - MIDM_NumDevs = params.num_srcs; - } return err; } @@ -120,9 +102,6 @@ static LRESULT OSS_MidiExit(void) if (--MIDI_loadcount) return 1; - MidiInDev = NULL; - MIDM_NumDevs = 0; - return 0; } @@ -135,224 +114,6 @@ static void notify_client(struct notify_context *notify) notify->instance, notify->param_1, notify->param_2); } -/************************************************************************** - * MIDI_NotifyClient [internal] - */ -static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, - DWORD_PTR dwParam1, DWORD_PTR dwParam2) -{ - DWORD_PTR dwCallBack; - UINT uFlags; - HANDLE hDev; - DWORD_PTR dwInstance; - - TRACE("wDevID = %04X wMsg = %d dwParm1 = %04lX dwParam2 = %04lX\n", - wDevID, wMsg, dwParam1, dwParam2); - - switch (wMsg) { - case MIM_OPEN: - case MIM_CLOSE: - case MIM_DATA: - case MIM_LONGDATA: - case MIM_ERROR: - case MIM_LONGERROR: - case MIM_MOREDATA: - if (wDevID > MIDM_NumDevs) return; - - dwCallBack = MidiInDev[wDevID].midiDesc.dwCallback; - uFlags = MidiInDev[wDevID].wFlags; - hDev = MidiInDev[wDevID].midiDesc.hMidi; - dwInstance = MidiInDev[wDevID].midiDesc.dwInstance; - break; - default: - ERR("Unsupported MSW-MIDI message %u\n", wMsg); - return; - } - - DriverCallback(dwCallBack, uFlags, hDev, wMsg, dwInstance, dwParam1, dwParam2); -} - -/************************************************************************** - * midiOpenSeq [internal] - */ -static int midiOpenSeq(void) -{ - struct midi_seq_open_params params; - - params.close = 0; - params.fd = -1; - OSS_CALL(midi_seq_open, &params); - - return params.fd; -} - -/************************************************************************** - * midiCloseSeq [internal] - */ -static int midiCloseSeq(int fd) -{ - struct midi_seq_open_params params; - - params.close = 1; - params.fd = fd; - OSS_CALL(midi_seq_open, &params); - - return 0; -} - -static void handle_midi_data(unsigned char *buffer, unsigned int len) -{ - struct midi_handle_data_params params; - - params.buffer = buffer; - params.len = len; - OSS_CALL(midi_handle_data, &params); -} - -static DWORD WINAPI midRecThread(void *arg) -{ - int fd = (int)(INT_PTR)arg; - unsigned char buffer[256]; - int len; - struct pollfd pollfd[2]; - - pollfd[0].fd = rec_cancel_pipe[0]; - pollfd[0].events = POLLIN; - pollfd[1].fd = fd; - pollfd[1].events = POLLIN; - - while (1) - { - /* Check if an event is present */ - if (poll(pollfd, ARRAY_SIZE(pollfd), -1) <= 0) - continue; - - if (pollfd[0].revents & POLLIN) /* cancelled */ - break; - - len = read(fd, buffer, sizeof(buffer)); - - if (len > 0 && len % 4 == 0) - handle_midi_data(buffer, len); - } - return 0; -} - -/************************************************************************** - * midOpen [internal] - */ -static DWORD midOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) -{ - int fd; - - TRACE("(%04X, %p, %08X);\n", wDevID, lpDesc, dwFlags); - - if (lpDesc == NULL) { - WARN("Invalid Parameter !\n"); - return MMSYSERR_INVALPARAM; - } - - /* FIXME : - * how to check that content of lpDesc is correct ? - */ - if (wDevID >= MIDM_NumDevs) { - WARN("wDevID too large (%u) !\n", wDevID); - return MMSYSERR_BADDEVICEID; - } - if (MidiInDev[wDevID].state == -1) { - WARN("device disabled\n"); - return MIDIERR_NODEVICE; - } - if (MidiInDev[wDevID].midiDesc.hMidi != 0) { - WARN("device already open !\n"); - return MMSYSERR_ALLOCATED; - } - if ((dwFlags & MIDI_IO_STATUS) != 0) { - WARN("No support for MIDI_IO_STATUS in dwFlags yet, ignoring it\n"); - dwFlags &= ~MIDI_IO_STATUS; - } - if ((dwFlags & ~CALLBACK_TYPEMASK) != 0) { - FIXME("Bad dwFlags\n"); - return MMSYSERR_INVALFLAG; - } - - fd = midiOpenSeq(); - if (fd < 0) { - return MMSYSERR_ERROR; - } - - if (numStartedMidiIn++ == 0) { - pipe(rec_cancel_pipe); - hThread = CreateThread(NULL, 0, midRecThread, (void *)(INT_PTR)fd, 0, NULL); - if (!hThread) { - close(rec_cancel_pipe[0]); - close(rec_cancel_pipe[1]); - numStartedMidiIn = 0; - WARN("Couldn't create thread for midi-in\n"); - midiCloseSeq(fd); - return MMSYSERR_ERROR; - } - SetThreadPriority(hThread, THREAD_PRIORITY_TIME_CRITICAL); - TRACE("Created thread for midi-in\n"); - } - - MidiInDev[wDevID].wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); - - MidiInDev[wDevID].lpQueueHdr = NULL; - MidiInDev[wDevID].midiDesc = *lpDesc; - MidiInDev[wDevID].state = 0; - MidiInDev[wDevID].incLen = 0; - MidiInDev[wDevID].startTime = 0; - MidiInDev[wDevID].fd = fd; - - MIDI_NotifyClient(wDevID, MIM_OPEN, 0L, 0L); - return MMSYSERR_NOERROR; -} - -/************************************************************************** - * midClose [internal] - */ -static DWORD midClose(WORD wDevID) -{ - int ret = MMSYSERR_NOERROR; - - TRACE("(%04X);\n", wDevID); - - if (wDevID >= MIDM_NumDevs) { - WARN("wDevID too big (%u) !\n", wDevID); - return MMSYSERR_BADDEVICEID; - } - if (MidiInDev[wDevID].midiDesc.hMidi == 0) { - WARN("device not opened !\n"); - return MMSYSERR_ERROR; - } - if (MidiInDev[wDevID].lpQueueHdr != 0) { - return MIDIERR_STILLPLAYING; - } - - if (MidiInDev[wDevID].fd == -1) { - WARN("ooops !\n"); - return MMSYSERR_ERROR; - } - if (--numStartedMidiIn == 0) { - TRACE("Stopping thread for midi-in\n"); - write(rec_cancel_pipe[1], "x", 1); - if (WaitForSingleObject(hThread, 5000) != WAIT_OBJECT_0) { - WARN("Thread end not signaled, force termination\n"); - TerminateThread(hThread, 0); - } - close(rec_cancel_pipe[0]); - close(rec_cancel_pipe[1]); - TRACE("Stopped thread for midi-in\n"); - } - midiCloseSeq(MidiInDev[wDevID].fd); - MidiInDev[wDevID].fd = -1; - - MIDI_NotifyClient(wDevID, MIM_CLOSE, 0L, 0L); - MidiInDev[wDevID].midiDesc.hMidi = 0; - return ret; -} - /*======================================================================* * MIDI entry points * *======================================================================*/ @@ -374,10 +135,6 @@ DWORD WINAPI OSS_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return OSS_MidiInit(); case DRVM_EXIT: return OSS_MidiExit(); - case MIDM_OPEN: - return midOpen(wDevID, (LPMIDIOPENDESC)dwParam1, dwParam2); - case MIDM_CLOSE: - return midClose(wDevID); } params.dev_id = wDevID; diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index c5b422a60c9..b0a411ecd9b 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1410,7 +1410,4 @@ unixlib_entry_t __wine_unix_call_funcs[] = midi_out_message, midi_in_message, midi_notify_wait, - - midi_seq_open, - midi_handle_data, }; diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c index 9c8ca8a8f39..072a9815c35 100644 --- a/dlls/wineoss.drv/ossmidi.c +++ b/dlls/wineoss.drv/ossmidi.c @@ -33,6 +33,7 @@ #include <stdint.h> #include <time.h> #include <unistd.h> +#include <poll.h> #include <errno.h> #include <sys/types.h> #include <sys/stat.h> @@ -45,6 +46,7 @@ #define WIN32_NO_STATUS #include "winternl.h" #include "audioclient.h" +#include "mmddk.h" #include "wine/debug.h" #include "wine/unixlib.h" @@ -62,12 +64,30 @@ struct midi_dest int fd; }; +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; + int fd; +}; + static pthread_mutex_t in_buffer_mutex = PTHREAD_MUTEX_INITIALIZER; 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]; +static unsigned int num_midi_in_started; +static int rec_cancel_pipe[2]; +static pthread_t rec_thread_id; + static pthread_mutex_t notify_mutex = PTHREAD_MUTEX_INITIALIZER; static pthread_cond_t notify_read_cond = PTHREAD_COND_INITIALIZER; static pthread_cond_t notify_write_cond = PTHREAD_COND_INITIALIZER; @@ -281,18 +301,6 @@ static int seq_close(int fd) return 0; } -NTSTATUS midi_seq_open(void *args) -{ - struct midi_seq_open_params *params = args; - - if (!params->close) - params->fd = seq_open(); - else - seq_close(params->fd); - - return STATUS_SUCCESS; -} - NTSTATUS midi_init(void *args) { struct midi_init_params *params = args; @@ -499,8 +507,6 @@ wrapup: seq_close(fd); *params->err = 0; - params->num_srcs = num_srcs; - params->srcs = srcs; return STATUS_SUCCESS; } @@ -1313,11 +1319,8 @@ static void handle_regular_data(struct midi_src *src, unsigned char value, UINT } } -NTSTATUS midi_handle_data(void *args) +static void handle_midi_data(unsigned char *buffer, unsigned int len) { - struct midi_handle_data_params *params = args; - unsigned char *buffer = params->buffer; - unsigned int len = params->len; unsigned int time = get_time_msec(), i; struct midi_src *src; unsigned char value; @@ -1339,7 +1342,153 @@ NTSTATUS midi_handle_data(void *args) else handle_regular_data(src, value, time - src->startTime); } - return STATUS_SUCCESS; +} + +static void *rec_thread_proc(void *arg) +{ + int fd = PtrToLong(arg); + unsigned char buffer[256]; + int len; + struct pollfd pollfd[2]; + + pollfd[0].fd = rec_cancel_pipe[0]; + pollfd[0].events = POLLIN; + pollfd[1].fd = fd; + pollfd[1].events = POLLIN; + + while (1) + { + /* Check if an event is present */ + if (poll(pollfd, ARRAY_SIZE(pollfd), -1) <= 0) + continue; + + if (pollfd[0].revents & POLLIN) /* cancelled */ + break; + + len = read(fd, buffer, sizeof(buffer)); + + if (len > 0 && len % 4 == 0) + handle_midi_data(buffer, len); + } + return NULL; +} + +static UINT midi_in_open(WORD dev_id, MIDIOPENDESC *desc, UINT flags, struct notify_context *notify) +{ + struct midi_src *src; + int fd; + + TRACE("(%04X, %p, %08X);\n", dev_id, desc, flags); + + if (desc == NULL) + { + WARN("Invalid Parameter !\n"); + return MMSYSERR_INVALPARAM; + } + + /* FIXME : + * how to check that content of lpDesc is correct ? + */ + if (dev_id >= num_srcs) + { + WARN("wDevID too large (%u) !\n", dev_id); + return MMSYSERR_BADDEVICEID; + } + src = srcs + dev_id; + if (src->state == -1) + { + WARN("device disabled\n"); + return MIDIERR_NODEVICE; + } + if (src->midiDesc.hMidi != 0) + { + WARN("device already open !\n"); + return MMSYSERR_ALLOCATED; + } + if ((flags & MIDI_IO_STATUS) != 0) + { + WARN("No support for MIDI_IO_STATUS in dwFlags yet, ignoring it\n"); + flags &= ~MIDI_IO_STATUS; + } + if ((flags & ~CALLBACK_TYPEMASK) != 0) + { + FIXME("Bad flags\n"); + return MMSYSERR_INVALFLAG; + } + + fd = seq_open(); + if (fd < 0) + return MMSYSERR_ERROR; + + if (num_midi_in_started++ == 0) + { + pipe(rec_cancel_pipe); + if (pthread_create(&rec_thread_id, NULL, rec_thread_proc, LongToPtr(fd))) + { + close(rec_cancel_pipe[0]); + close(rec_cancel_pipe[1]); + num_midi_in_started = 0; + WARN("Couldn't create thread for midi-in\n"); + seq_close(fd); + return MMSYSERR_ERROR; + } + TRACE("Created thread for midi-in\n"); + } + + src->wFlags = HIWORD(flags & CALLBACK_TYPEMASK); + + src->lpQueueHdr = NULL; + src->midiDesc = *desc; + src->state = 0; + src->incLen = 0; + src->startTime = 0; + src->fd = fd; + + set_in_notify(notify, src, dev_id, MIM_OPEN, 0, 0); + return MMSYSERR_NOERROR; +} + +static UINT midi_in_close(WORD dev_id, struct notify_context *notify) +{ + struct midi_src *src; + + TRACE("(%04X);\n", dev_id); + + if (dev_id >= num_srcs) + { + WARN("dev_id too big (%u) !\n", dev_id); + return MMSYSERR_BADDEVICEID; + } + src = srcs + dev_id; + if (src->midiDesc.hMidi == 0) + { + WARN("device not opened !\n"); + return MMSYSERR_ERROR; + } + if (src->lpQueueHdr != 0) + return MIDIERR_STILLPLAYING; + + if (src->fd == -1) + { + WARN("ooops !\n"); + return MMSYSERR_ERROR; + } + if (--num_midi_in_started == 0) + { + TRACE("Stopping thread for midi-in\n"); + write(rec_cancel_pipe[1], "x", 1); + pthread_join(rec_thread_id, NULL); + close(rec_cancel_pipe[0]); + close(rec_cancel_pipe[1]); + TRACE("Stopped thread for midi-in\n"); + } + seq_close(src->fd); + src->fd = -1; + + set_in_notify(notify, src, dev_id, MIM_CLOSE, 0, 0); + src->midiDesc.hMidi = 0; + + return MMSYSERR_NOERROR; } static UINT midi_in_add_buffer(WORD dev_id, MIDIHDR *hdr, UINT hdr_size) @@ -1544,6 +1693,12 @@ NTSTATUS midi_in_message(void *args) /* FIXME: Pretend this is supported */ *params->err = MMSYSERR_NOERROR; break; + case MIDM_OPEN: + *params->err = midi_in_open(params->dev_id, (MIDIOPENDESC *)params->param_1, params->param_2, params->notify); + break; + case MIDM_CLOSE: + *params->err = midi_in_close(params->dev_id, params->notify); + break; case MIDM_ADDBUFFER: *params->err = midi_in_add_buffer(params->dev_id, (MIDIHDR *)params->param_1, params->param_2); break; diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 90d0c47421c..d3dda7c76f2 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -209,27 +209,9 @@ 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; - int fd; -} WINE_MIDIIN; - struct midi_init_params { UINT *err; - unsigned int num_srcs; - struct midi_src *srcs; }; struct notify_context @@ -273,18 +255,6 @@ struct midi_notify_wait_params struct notify_context *notify; }; -struct midi_seq_open_params -{ - int close; - int fd; -}; - -struct midi_handle_data_params -{ - unsigned char *buffer; - unsigned int len; -}; - enum oss_funcs { oss_test_connect, @@ -315,9 +285,6 @@ enum oss_funcs oss_midi_out_message, oss_midi_in_message, oss_midi_notify_wait, - - oss_midi_seq_open, /* temporary */ - oss_midi_handle_data, }; NTSTATUS midi_init(void *args) DECLSPEC_HIDDEN; @@ -325,8 +292,6 @@ NTSTATUS midi_release(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_out_message(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_in_message(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_notify_wait(void *args) DECLSPEC_HIDDEN; -NTSTATUS midi_seq_open(void *args) DECLSPEC_HIDDEN; -NTSTATUS midi_handle_data(void *args) DECLSPEC_HIDDEN; extern unixlib_handle_t oss_handle; -- 2.25.1

2 1

[PATCH 4/6] wineoss: Use a pipe to signal the end of the record thread.
by Huw Davies 29 Apr '22

29 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 42 ++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 0afd9985c03..c83dd55fd6b 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -70,7 +70,7 @@ static int MIDM_NumDevs = 0; static int numStartedMidiIn = 0; -static int end_thread; +static int rec_cancel_pipe[2]; static HANDLE hThread; /*======================================================================* @@ -214,30 +214,26 @@ static DWORD WINAPI midRecThread(void *arg) int fd = (int)(INT_PTR)arg; unsigned char buffer[256]; int len; - struct pollfd pfd; + struct pollfd pollfd[2]; - TRACE("Thread startup\n"); - - pfd.fd = fd; - pfd.events = POLLIN; - - while(!end_thread) { - TRACE("Thread loop\n"); + pollfd[0].fd = rec_cancel_pipe[0]; + pollfd[0].events = POLLIN; + pollfd[1].fd = fd; + pollfd[1].events = POLLIN; + while (1) + { /* Check if an event is present */ - if (poll(&pfd, 1, 250) <= 0) + if (poll(pollfd, ARRAY_SIZE(pollfd), -1) <= 0) continue; - - len = read(fd, buffer, sizeof(buffer)); - TRACE("Received %d bytes\n", len); - if (len < 0) continue; - if ((len % 4) != 0) { - WARN("Bad length %d, errno %d (%s)\n", len, errno, strerror(errno)); - continue; - } + if (pollfd[0].revents & POLLIN) /* cancelled */ + break; + + len = read(fd, buffer, sizeof(buffer)); - handle_midi_data(buffer, len); + if (len > 0 && len % 4 == 0) + handle_midi_data(buffer, len); } return 0; } @@ -286,9 +282,11 @@ static DWORD midOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) } if (numStartedMidiIn++ == 0) { - end_thread = 0; + pipe(rec_cancel_pipe); hThread = CreateThread(NULL, 0, midRecThread, (void *)(INT_PTR)fd, 0, NULL); if (!hThread) { + close(rec_cancel_pipe[0]); + close(rec_cancel_pipe[1]); numStartedMidiIn = 0; WARN("Couldn't create thread for midi-in\n"); midiCloseSeq(fd); @@ -338,11 +336,13 @@ static DWORD midClose(WORD wDevID) } if (--numStartedMidiIn == 0) { TRACE("Stopping thread for midi-in\n"); - end_thread = 1; + write(rec_cancel_pipe[1], "x", 1); if (WaitForSingleObject(hThread, 5000) != WAIT_OBJECT_0) { WARN("Thread end not signaled, force termination\n"); TerminateThread(hThread, 0); } + close(rec_cancel_pipe[0]); + close(rec_cancel_pipe[1]); TRACE("Stopped thread for midi-in\n"); } midiCloseSeq(MidiInDev[wDevID].fd); -- 2.25.1

2 1

[PATCH 3/6] wineoss: Introduce a helper to retrieve the time.
by Huw Davies 29 Apr '22

29 Apr '22

The motivation is that this will need to be called from a non-Win32 thread and so shouldn't use the Win32 API. An added benefit is that it will eliminate the 16ms jitter associated with GetTickCount(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/ossmidi.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c index 1695f1d2f7b..9c8ca8a8f39 100644 --- a/dlls/wineoss.drv/ossmidi.c +++ b/dlls/wineoss.drv/ossmidi.c @@ -30,6 +30,8 @@ #include <stdarg.h> #include <string.h> #include <stdio.h> +#include <stdint.h> +#include <time.h> #include <unistd.h> #include <errno.h> #include <sys/types.h> @@ -155,6 +157,18 @@ static void in_buffer_unlock(void) pthread_mutex_unlock(&in_buffer_mutex); } +static uint64_t get_time_msec(void) +{ + struct timespec now = {0, 0}; + +#ifdef CLOCK_MONOTONIC_RAW + if (!clock_gettime(CLOCK_MONOTONIC_RAW, &now)) + return (uint64_t)now.tv_sec * 1000 + now.tv_nsec / 1000000; +#endif + clock_gettime(CLOCK_MONOTONIC, &now); + return (uint64_t)now.tv_sec * 1000 + now.tv_nsec / 1000000; +} + /* * notify buffer: The notification ring buffer is implemented so that * there is always at least one unused sentinel before the current @@ -1304,7 +1318,7 @@ NTSTATUS midi_handle_data(void *args) struct midi_handle_data_params *params = args; unsigned char *buffer = params->buffer; unsigned int len = params->len; - unsigned int time = NtGetTickCount(), i; + unsigned int time = get_time_msec(), i; struct midi_src *src; unsigned char value; WORD dev_id; @@ -1415,7 +1429,7 @@ static UINT midi_in_start(WORD dev_id) if (src->state == -1) return MIDIERR_NODEVICE; src->state = 1; - src->startTime = NtGetTickCount(); + src->startTime = get_time_msec(); return MMSYSERR_NOERROR; } @@ -1435,7 +1449,7 @@ static UINT midi_in_stop(WORD dev_id) static UINT midi_in_reset(WORD dev_id, struct notify_context *notify) { - UINT cur_time = NtGetTickCount(); + UINT cur_time = get_time_msec(); UINT err = MMSYSERR_NOERROR; struct midi_src *src; MIDIHDR *hdr; -- 2.25.1

2 1

[PATCH 2/6] wineoss: Move the midi in data handlers to the unixlib.
by Huw Davies 29 Apr '22

29 Apr '22

The syscall itself is temporary. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 129 +------------------------ dlls/wineoss.drv/oss.c | 2 +- dlls/wineoss.drv/ossmidi.c | 189 +++++++++++++++++++++++++++++++++++-- dlls/wineoss.drv/unixlib.h | 10 +- 4 files changed, 196 insertions(+), 134 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index b3f980ab3da..0afd9985c03 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -126,16 +126,6 @@ static LRESULT OSS_MidiExit(void) return 0; } -static void in_buffer_lock(void) -{ - OSS_CALL(midi_in_lock, ULongToPtr(1)); -} - -static void in_buffer_unlock(void) -{ - OSS_CALL(midi_in_lock, ULongToPtr(0)); -} - static void notify_client(struct notify_context *notify) { TRACE("dev_id = %d msg = %d param1 = %04lX param2 = %04lX\n", @@ -210,123 +200,13 @@ static int midiCloseSeq(int fd) return 0; } -static void handle_sysex_data(struct midi_src *src, unsigned char value, UINT time) -{ - MIDIHDR *hdr; - BOOL done = FALSE; - - src->state |= 2; - src->incLen = 0; - - in_buffer_lock(); - - hdr = src->lpQueueHdr; - if (hdr) - { - BYTE *data = (BYTE *)hdr->lpData; - - data[hdr->dwBytesRecorded++] = value; - if (hdr->dwBytesRecorded == hdr->dwBufferLength) - done = TRUE; - } - - if (value == 0xf7) /* end */ - { - src->state &= ~2; - done = TRUE; - } - - if (done && hdr) - { - src->lpQueueHdr = hdr->lpNext; - hdr->dwFlags &= ~MHDR_INQUEUE; - hdr->dwFlags |= MHDR_DONE; - MIDI_NotifyClient(src - MidiInDev, MIM_LONGDATA, (UINT_PTR)hdr, time); - } - - in_buffer_unlock(); -} - -static void handle_regular_data(struct midi_src *src, unsigned char value, UINT time) -{ - UINT to_send = 0; - -#define IS_CMD(_x) (((_x) & 0x80) == 0x80) -#define IS_SYS_CMD(_x) (((_x) & 0xF0) == 0xF0) - - if (!IS_CMD(value) && src->incLen == 0) /* try to reuse old cmd */ - { - if (IS_CMD(src->incPrev) && !IS_SYS_CMD(src->incPrev)) - { - src->incoming[0] = src->incPrev; - src->incLen = 1; - } - else - { - /* FIXME: should generate MIM_ERROR notification */ - return; - } - } - src->incoming[(int)src->incLen++] = value; - if (src->incLen == 1 && !IS_SYS_CMD(src->incoming[0])) - /* store new cmd, just in case */ - src->incPrev = src->incoming[0]; - -#undef IS_CMD -#undef IS_SYS_CMD - - switch (src->incoming[0] & 0xF0) - { - case MIDI_NOTEOFF: - case MIDI_NOTEON: - case MIDI_KEY_PRESSURE: - case MIDI_CTL_CHANGE: - case MIDI_PITCH_BEND: - if (src->incLen == 3) - to_send = (src->incoming[2] << 16) | (src->incoming[1] << 8) | - src->incoming[0]; - break; - case MIDI_PGM_CHANGE: - case MIDI_CHN_PRESSURE: - if (src->incLen == 2) - to_send = (src->incoming[1] << 8) | src->incoming[0]; - break; - case MIDI_SYSTEM_PREFIX: - if (src->incLen == 1) - to_send = src->incoming[0]; - break; - } - - if (to_send) - { - src->incLen = 0; - MIDI_NotifyClient(src - MidiInDev, MIM_DATA, to_send, time); - } -} - static void handle_midi_data(unsigned char *buffer, unsigned int len) { - unsigned int time = GetTickCount(), i; - struct midi_src *src; - unsigned char value; - WORD dev_id; + struct midi_handle_data_params params; - for (i = 0; i < len; i += (buffer[i] & 0x80) ? 8 : 4) - { - if (buffer[i] != SEQ_MIDIPUTC) continue; - - dev_id = buffer[i + 2]; - value = buffer[i + 1]; - - if (dev_id >= MIDM_NumDevs) continue; - src = MidiInDev + dev_id; - if (src->state <= 0) continue; - - if (value == 0xf0 || src->state & 2) /* system exclusive */ - handle_sysex_data(src, value, time - src->startTime); - else - handle_regular_data(src, value, time - src->startTime); - } + params.buffer = buffer; + params.len = len; + OSS_CALL(midi_handle_data, &params); } static DWORD WINAPI midRecThread(void *arg) @@ -565,6 +445,7 @@ static DWORD WINAPI notify_thread(void *p) { OSS_CALL(midi_notify_wait, &params); if (quit) break; + if (notify.send_notify) notify_client(&notify); } return 0; } diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 8fda9270a4e..c5b422a60c9 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1412,5 +1412,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = midi_notify_wait, midi_seq_open, - midi_in_lock, + midi_handle_data, }; diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c index 0790eaaec1a..1695f1d2f7b 100644 --- a/dlls/wineoss.drv/ossmidi.c +++ b/dlls/wineoss.drv/ossmidi.c @@ -68,7 +68,11 @@ static struct midi_src srcs[MAX_MIDIINDRV]; static pthread_mutex_t notify_mutex = PTHREAD_MUTEX_INITIALIZER; static pthread_cond_t notify_read_cond = PTHREAD_COND_INITIALIZER; +static pthread_cond_t notify_write_cond = PTHREAD_COND_INITIALIZER; static BOOL notify_quit; +#define NOTIFY_BUFFER_SIZE 64 + 1 /* + 1 for the sentinel */ +static struct notify_context notify_buffer[NOTIFY_BUFFER_SIZE]; +static struct notify_context *notify_read = notify_buffer, *notify_write = notify_buffer; typedef struct sVoice { @@ -151,19 +155,59 @@ static void in_buffer_unlock(void) pthread_mutex_unlock(&in_buffer_mutex); } -NTSTATUS midi_in_lock(void *args) +/* + * notify buffer: The notification ring buffer is implemented so that + * there is always at least one unused sentinel before the current + * read position in order to allow detection of the full vs empty + * state. + */ +static struct notify_context *notify_buffer_next(struct notify_context *notify) { - if (args) in_buffer_lock(); - else in_buffer_unlock(); + if (++notify >= notify_buffer + ARRAY_SIZE(notify_buffer)) + notify = notify_buffer; - return STATUS_SUCCESS; + return notify; +} + +static BOOL notify_buffer_empty(void) +{ + return notify_read == notify_write; +} + +static BOOL notify_buffer_full(void) +{ + return notify_buffer_next(notify_write) == notify_read; +} + +static BOOL notify_buffer_add(struct notify_context *notify) +{ + if (notify_buffer_full()) return FALSE; + + *notify_write = *notify; + notify_write = notify_buffer_next(notify_write); + return TRUE; +} + +static BOOL notify_buffer_remove(struct notify_context *notify) +{ + if (notify_buffer_empty()) return FALSE; + + *notify = *notify_read; + notify_read = notify_buffer_next(notify_read); + return TRUE; } static void notify_post(struct notify_context *notify) { pthread_mutex_lock(&notify_mutex); - if (notify) FIXME("Not yet handled\n"); + if (notify) + { + while (notify_buffer_full()) + pthread_cond_wait(&notify_write_cond, &notify_mutex); + + notify_buffer_add(notify); + } else notify_quit = TRUE; pthread_cond_signal(&notify_read_cond); @@ -1157,6 +1201,133 @@ static UINT midi_out_reset(WORD dev_id) return MMSYSERR_NOERROR; } +static void handle_sysex_data(struct midi_src *src, unsigned char value, UINT time) +{ + struct notify_context notify; + MIDIHDR *hdr; + BOOL done = FALSE; + + src->state |= 2; + src->incLen = 0; + + in_buffer_lock(); + + hdr = src->lpQueueHdr; + if (hdr) + { + BYTE *data = (BYTE *)hdr->lpData; + + data[hdr->dwBytesRecorded++] = value; + if (hdr->dwBytesRecorded == hdr->dwBufferLength) + done = TRUE; + } + + if (value == 0xf7) /* end */ + { + src->state &= ~2; + done = TRUE; + } + + if (done && hdr) + { + src->lpQueueHdr = hdr->lpNext; + hdr->dwFlags &= ~MHDR_INQUEUE; + hdr->dwFlags |= MHDR_DONE; + set_in_notify(&notify, src, src - srcs, MIM_LONGDATA, (UINT_PTR)hdr, time); + notify_post(&notify); + } + + in_buffer_unlock(); +} + +static void handle_regular_data(struct midi_src *src, unsigned char value, UINT time) +{ + struct notify_context notify; + UINT to_send = 0; + +#define IS_CMD(_x) (((_x) & 0x80) == 0x80) +#define IS_SYS_CMD(_x) (((_x) & 0xF0) == 0xF0) + + if (!IS_CMD(value) && src->incLen == 0) /* try to reuse old cmd */ + { + if (IS_CMD(src->incPrev) && !IS_SYS_CMD(src->incPrev)) + { + src->incoming[0] = src->incPrev; + src->incLen = 1; + } + else + { + /* FIXME: should generate MIM_ERROR notification */ + return; + } + } + src->incoming[(int)src->incLen++] = value; + if (src->incLen == 1 && !IS_SYS_CMD(src->incoming[0])) + /* store new cmd, just in case */ + src->incPrev = src->incoming[0]; + +#undef IS_CMD +#undef IS_SYS_CMD + + switch (src->incoming[0] & 0xF0) + { + case MIDI_NOTEOFF: + case MIDI_NOTEON: + case MIDI_KEY_PRESSURE: + case MIDI_CTL_CHANGE: + case MIDI_PITCH_BEND: + if (src->incLen == 3) + to_send = (src->incoming[2] << 16) | (src->incoming[1] << 8) | + src->incoming[0]; + break; + case MIDI_PGM_CHANGE: + case MIDI_CHN_PRESSURE: + if (src->incLen == 2) + to_send = (src->incoming[1] << 8) | src->incoming[0]; + break; + case MIDI_SYSTEM_PREFIX: + if (src->incLen == 1) + to_send = src->incoming[0]; + break; + } + + if (to_send) + { + src->incLen = 0; + set_in_notify(&notify, src, src - srcs, MIM_DATA, to_send, time); + notify_post(&notify); + } +} + +NTSTATUS midi_handle_data(void *args) +{ + struct midi_handle_data_params *params = args; + unsigned char *buffer = params->buffer; + unsigned int len = params->len; + unsigned int time = NtGetTickCount(), i; + struct midi_src *src; + unsigned char value; + WORD dev_id; + + for (i = 0; i < len; i += (buffer[i] & 0x80) ? 8 : 4) + { + if (buffer[i] != SEQ_MIDIPUTC) continue; + + dev_id = buffer[i + 2]; + value = buffer[i + 1]; + + if (dev_id >= num_srcs) continue; + src = srcs + dev_id; + if (src->state <= 0) continue; + + if (value == 0xf0 || src->state & 2) /* system exclusive */ + handle_sysex_data(src, value, time - src->startTime); + else + handle_regular_data(src, value, time - src->startTime); + } + return STATUS_SUCCESS; +} + static UINT midi_in_add_buffer(WORD dev_id, MIDIHDR *hdr, UINT hdr_size) { struct midi_src *src; @@ -1397,11 +1568,15 @@ NTSTATUS midi_notify_wait(void *args) pthread_mutex_lock(&notify_mutex); - while (!notify_quit) + while (!notify_quit && notify_buffer_empty()) pthread_cond_wait(&notify_read_cond, &notify_mutex); *params->quit = notify_quit; - + if (!notify_quit) + { + notify_buffer_remove(params->notify); + pthread_cond_signal(&notify_write_cond); + } pthread_mutex_unlock(&notify_mutex); return STATUS_SUCCESS; diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index ddeba49556c..90d0c47421c 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -279,6 +279,12 @@ struct midi_seq_open_params int fd; }; +struct midi_handle_data_params +{ + unsigned char *buffer; + unsigned int len; +}; + enum oss_funcs { oss_test_connect, @@ -311,7 +317,7 @@ enum oss_funcs oss_midi_notify_wait, oss_midi_seq_open, /* temporary */ - oss_midi_in_lock, + oss_midi_handle_data, }; NTSTATUS midi_init(void *args) DECLSPEC_HIDDEN; @@ -320,7 +326,7 @@ NTSTATUS midi_out_message(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_in_message(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_notify_wait(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_seq_open(void *args) DECLSPEC_HIDDEN; -NTSTATUS midi_in_lock(void *args) DECLSPEC_HIDDEN; +NTSTATUS midi_handle_data(void *args) DECLSPEC_HIDDEN; extern unixlib_handle_t oss_handle; -- 2.25.1

2 1

[PATCH 1/6] wineoss: Introduce a notification thread.
by Huw Davies 29 Apr '22

29 Apr '22

Currently the thread just blocks until told to quit by midi_release. Eventually this thread will dispatch the MIM_DATA and MIM_LONGDATA notifications. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 21 ++++++++++++++++++++ dlls/wineoss.drv/oss.c | 2 ++ dlls/wineoss.drv/ossmidi.c | 39 ++++++++++++++++++++++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 10 ++++++++++ 4 files changed, 72 insertions(+) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index e36a737624a..b3f980ab3da 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -552,6 +552,23 @@ DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return err; } +static DWORD WINAPI notify_thread(void *p) +{ + struct midi_notify_wait_params params; + struct notify_context notify; + BOOL quit; + + params.notify = &notify; + params.quit = &quit; + + while (1) + { + OSS_CALL(midi_notify_wait, &params); + if (quit) break; + } + return 0; +} + /************************************************************************** * DriverProc (WINEOSS.1) */ @@ -563,7 +580,11 @@ LRESULT CALLBACK OSS_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, switch(wMsg) { case DRV_LOAD: + CloseHandle(CreateThread(NULL, 0, notify_thread, NULL, 0, NULL)); + return 1; case DRV_FREE: + OSS_CALL(midi_release, NULL); + return 1; case DRV_OPEN: case DRV_CLOSE: case DRV_ENABLE: diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index a9081f2cac9..8fda9270a4e 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1406,8 +1406,10 @@ unixlib_entry_t __wine_unix_call_funcs[] = set_event_handle, is_started, midi_init, + midi_release, midi_out_message, midi_in_message, + midi_notify_wait, midi_seq_open, midi_in_lock, diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c index 86d766eceaf..0790eaaec1a 100644 --- a/dlls/wineoss.drv/ossmidi.c +++ b/dlls/wineoss.drv/ossmidi.c @@ -66,6 +66,10 @@ 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]; +static pthread_mutex_t notify_mutex = PTHREAD_MUTEX_INITIALIZER; +static pthread_cond_t notify_read_cond = PTHREAD_COND_INITIALIZER; +static BOOL notify_quit; + typedef struct sVoice { int note; /* 0 means not used */ @@ -155,6 +159,17 @@ NTSTATUS midi_in_lock(void *args) return STATUS_SUCCESS; } +static void notify_post(struct notify_context *notify) +{ + pthread_mutex_lock(&notify_mutex); + + if (notify) FIXME("Not yet handled\n"); + else notify_quit = TRUE; + pthread_cond_signal(&notify_read_cond); + + pthread_mutex_unlock(&notify_mutex); +} + static void set_in_notify(struct notify_context *notify, struct midi_src *src, WORD dev_id, WORD msg, UINT_PTR param_1, UINT_PTR param_2) { @@ -432,6 +447,14 @@ wrapup: return STATUS_SUCCESS; } +NTSTATUS midi_release(void *args) +{ + /* stop the notify_wait thread */ + notify_post(NULL); + + return STATUS_SUCCESS; +} + /* FIXME: this is a bad idea, it's even not static... */ SEQ_DEFINEBUF(1024); @@ -1367,3 +1390,19 @@ NTSTATUS midi_in_message(void *args) return STATUS_SUCCESS; } + +NTSTATUS midi_notify_wait(void *args) +{ + struct midi_notify_wait_params *params = args; + + pthread_mutex_lock(&notify_mutex); + + while (!notify_quit) + pthread_cond_wait(&notify_read_cond, &notify_mutex); + + *params->quit = notify_quit; + + pthread_mutex_unlock(&notify_mutex); + + return STATUS_SUCCESS; +} diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 867e1ff656e..ddeba49556c 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -267,6 +267,12 @@ struct midi_in_message_params struct notify_context *notify; }; +struct midi_notify_wait_params +{ + BOOL *quit; + struct notify_context *notify; +}; + struct midi_seq_open_params { int close; @@ -299,16 +305,20 @@ enum oss_funcs oss_set_event_handle, oss_is_started, oss_midi_init, + oss_midi_release, oss_midi_out_message, oss_midi_in_message, + oss_midi_notify_wait, oss_midi_seq_open, /* temporary */ oss_midi_in_lock, }; NTSTATUS midi_init(void *args) DECLSPEC_HIDDEN; +NTSTATUS midi_release(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_out_message(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_in_message(void *args) DECLSPEC_HIDDEN; +NTSTATUS midi_notify_wait(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_seq_open(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_in_lock(void *args) DECLSPEC_HIDDEN; -- 2.25.1

2 1

[PATCH 1/2] uiautomationcore: Implement UiaProviderFromIAccessible.
by Connor McAdams 29 Apr '22

29 Apr '22

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/Makefile.in | 3 +- dlls/uiautomationcore/uia_main.c | 1 + dlls/uiautomationcore/uia_provider.c | 226 ++++++++++++++++++++ dlls/uiautomationcore/uiautomationcore.spec | 2 +- include/uiautomationcoreapi.h | 4 + 5 files changed, 234 insertions(+), 2 deletions(-) create mode 100644 dlls/uiautomationcore/uia_provider.c diff --git a/dlls/uiautomationcore/Makefile.in b/dlls/uiautomationcore/Makefile.in index f0973fdec4c..bda3614f051 100644 --- a/dlls/uiautomationcore/Makefile.in +++ b/dlls/uiautomationcore/Makefile.in @@ -5,4 +5,5 @@ IMPORTS = uuid ole32 oleaut32 user32 EXTRADLLFLAGS = -Wb,--prefer-native C_SRCS = \ - uia_main.c + uia_main.c \ + uia_provider.c diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index a303e71cf76..9f257684333 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -20,6 +20,7 @@ #include "initguid.h" #include "uiautomation.h" +#include "ocidl.h" #include "wine/debug.h" #include "wine/heap.h" diff --git a/dlls/uiautomationcore/uia_provider.c b/dlls/uiautomationcore/uia_provider.c new file mode 100644 index 00000000000..790593dbcab --- /dev/null +++ b/dlls/uiautomationcore/uia_provider.c @@ -0,0 +1,226 @@ +/* + * Copyright 2022 Connor McAdams for CodeWeavers + * + * 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 + */ + +#define COBJMACROS + +#include "uiautomation.h" +#include "ocidl.h" + +#include "wine/debug.h" +#include "wine/heap.h" + +WINE_DEFAULT_DEBUG_CHANNEL(uiautomation); + +static void variant_init_i4(VARIANT *v, int val) +{ + V_VT(v) = VT_I4; + V_I4(v) = val; +} + +/* + * UiaProviderFromIAccessible IRawElementProviderSimple interface. + */ +struct msaa_provider { + IRawElementProviderSimple IRawElementProviderSimple_iface; + LONG refcount; + + IAccessible *acc; + VARIANT cid; + HWND hwnd; +}; + +static inline struct msaa_provider *impl_from_msaa_provider(IRawElementProviderSimple *iface) +{ + return CONTAINING_RECORD(iface, struct msaa_provider, IRawElementProviderSimple_iface); +} + +HRESULT WINAPI msaa_provider_QueryInterface(IRawElementProviderSimple *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + if (IsEqualIID(riid, &IID_IRawElementProviderSimple) || IsEqualIID(riid, &IID_IUnknown)) + *ppv = iface; + else + return E_NOINTERFACE; + + IRawElementProviderSimple_AddRef(iface); + return S_OK; +} + +ULONG WINAPI msaa_provider_AddRef(IRawElementProviderSimple *iface) +{ + struct msaa_provider *msaa_prov = impl_from_msaa_provider(iface); + ULONG refcount = InterlockedIncrement(&msaa_prov->refcount); + + TRACE("%p, refcount %ld\n", iface, refcount); + + return refcount; +} + +ULONG WINAPI msaa_provider_Release(IRawElementProviderSimple *iface) +{ + struct msaa_provider *msaa_prov = impl_from_msaa_provider(iface); + ULONG refcount = InterlockedDecrement(&msaa_prov->refcount); + + TRACE("%p, refcount %ld\n", iface, refcount); + + if (!refcount) + { + IAccessible_Release(msaa_prov->acc); + heap_free(msaa_prov); + } + + return refcount; +} + +HRESULT WINAPI msaa_provider_get_ProviderOptions(IRawElementProviderSimple *iface, + enum ProviderOptions *ret_val) +{ + TRACE("%p, %p\n", iface, ret_val); + *ret_val = ProviderOptions_ServerSideProvider | ProviderOptions_UseComThreading; + return S_OK; +} + +HRESULT WINAPI msaa_provider_GetPatternProvider(IRawElementProviderSimple *iface, + PATTERNID pattern_id, IUnknown **ret_val) +{ + FIXME("%p, %d, %p: stub!\n", iface, pattern_id, ret_val); + *ret_val = NULL; + return E_NOTIMPL; +} + +HRESULT WINAPI msaa_provider_GetPropertyValue(IRawElementProviderSimple *iface, + PROPERTYID prop_id, VARIANT *ret_val) +{ + TRACE("%p, %d, %p\n", iface, prop_id, ret_val); + + VariantInit(ret_val); + switch (prop_id) + { + case UIA_ProviderDescriptionPropertyId: + V_VT(ret_val) = VT_BSTR; + V_BSTR(ret_val) = SysAllocString(L"Wine: MSAA Proxy"); + break; + + default: + FIXME("Unimplemented propertyId %d\n", prop_id); + break; + } + + return S_OK; +} + +HRESULT WINAPI msaa_provider_get_HostRawElementProvider(IRawElementProviderSimple *iface, + IRawElementProviderSimple **ret_val) +{ + FIXME("%p, %p: stub!\n", iface, ret_val); + *ret_val = NULL; + return E_NOTIMPL; +} + +static const IRawElementProviderSimpleVtbl msaa_provider_vtbl = { + msaa_provider_QueryInterface, + msaa_provider_AddRef, + msaa_provider_Release, + msaa_provider_get_ProviderOptions, + msaa_provider_GetPatternProvider, + msaa_provider_GetPropertyValue, + msaa_provider_get_HostRawElementProvider, +}; + +/*********************************************************************** + * UiaProviderFromIAccessible (uiautomationcore.@) + */ +HRESULT WINAPI UiaProviderFromIAccessible(IAccessible *acc, long child_id, DWORD flags, + IRawElementProviderSimple **elprov) +{ + struct msaa_provider *msaa_prov; + IServiceProvider *serv_prov; + HWND hwnd = NULL; + IOleWindow *win; + HRESULT hr; + + TRACE("(%p, %ld, %#lx, %p)\n", acc, child_id, flags, elprov); + + if (elprov) + *elprov = NULL; + + if (!elprov) + return E_POINTER; + if (!acc) + return E_INVALIDARG; + + if (flags != UIA_PFIA_DEFAULT) + { + FIXME("unsupported flags %#lx\n", flags); + return E_NOTIMPL; + } + + hr = IAccessible_QueryInterface(acc, &IID_IServiceProvider, (void **)&serv_prov); + if (SUCCEEDED(hr)) + { + IUnknown *unk; + + hr = IServiceProvider_QueryService(serv_prov, &IIS_IsOleaccProxy, &IID_IUnknown, (void **)&unk); + if (SUCCEEDED(hr)) + { + WARN("Cannot wrap an oleacc proxy IAccessible!\n"); + IUnknown_Release(unk); + IServiceProvider_Release(serv_prov); + return E_INVALIDARG; + } + + IServiceProvider_Release(serv_prov); + } + + hr = IAccessible_QueryInterface(acc, &IID_IOleWindow, (void **)&win); + if (SUCCEEDED(hr)) + { + hr = IOleWindow_GetWindow(win, &hwnd); + if (FAILED(hr)) + hwnd = NULL; + IOleWindow_Release(win); + } + + if (!IsWindow(hwnd)) + { + VARIANT v, cid; + + VariantInit(&v); + variant_init_i4(&cid, CHILDID_SELF); + hr = IAccessible_accNavigate(acc, 10, cid, &v); + if (SUCCEEDED(hr) && V_VT(&v) == VT_I4) + hwnd = ULongToHandle(V_I4(&v)); + + if (!IsWindow(hwnd)) + return E_FAIL; + } + + msaa_prov = heap_alloc(sizeof(*msaa_prov)); + if (!msaa_prov) + return E_OUTOFMEMORY; + + msaa_prov->IRawElementProviderSimple_iface.lpVtbl = &msaa_provider_vtbl; + msaa_prov->refcount = 1; + msaa_prov->hwnd = hwnd; + variant_init_i4(&msaa_prov->cid, child_id); + msaa_prov->acc = acc; + IAccessible_AddRef(acc); + *elprov = &msaa_prov->IRawElementProviderSimple_iface; + + return S_OK; +} diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec index 82071bd2317..70d78d52085 100644 --- a/dlls/uiautomationcore/uiautomationcore.spec +++ b/dlls/uiautomationcore/uiautomationcore.spec @@ -83,7 +83,7 @@ @ stub UiaNodeRelease @ stub UiaPatternRelease #@ stub UiaProviderForNonClient -#@ stub UiaProviderFromIAccessible +@ stdcall UiaProviderFromIAccessible(ptr long long ptr) @ stub UiaRaiseAsyncContentLoadedEvent @ stdcall UiaRaiseAutomationEvent(ptr long) @ stdcall UiaRaiseAutomationPropertyChangedEvent(ptr long int128 int128) diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h index 563d5c602bd..22b3888dc6e 100644 --- a/include/uiautomationcoreapi.h +++ b/include/uiautomationcoreapi.h @@ -34,6 +34,9 @@ extern "C" { #define UiaAppendRuntimeId 3 #define UiaRootObjectId -25 +#define UIA_PFIA_DEFAULT 0x00 +#define UIA_PFIA_UNWRAP_BRIDGE 0x01 + DECLARE_HANDLE(HUIANODE); DECLARE_HANDLE(HUIAPATTERNOBJECT); DECLARE_HANDLE(HUIATEXTRANGE); @@ -71,6 +74,7 @@ void WINAPI UiaRegisterProviderCallback(UiaProviderCallback *pCallback); LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wParam, LPARAM lParam, IRawElementProviderSimple *elprov); BOOL WINAPI UiaTextRangeRelease(HUIATEXTRANGE hobj); HRESULT WINAPI UiaHostProviderFromHwnd(HWND hwnd, IRawElementProviderSimple **elprov); +HRESULT WINAPI UiaProviderFromIAccessible(IAccessible *acc, long child_id, DWORD flags, IRawElementProviderSimple **elprov); #ifdef __cplusplus } -- 2.25.1

1 1

[PATCH v3 1/2] programs/sc: Add tests.
by Torge Matthies 29 Apr '22

29 Apr '22

Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> --- configure.ac | 1 + programs/sc/tests/Makefile.in | 5 + programs/sc/tests/sc.c | 402 ++++++++++++++++++++++++++++++++++ 3 files changed, 408 insertions(+) create mode 100644 programs/sc/tests/Makefile.in create mode 100644 programs/sc/tests/sc.c diff --git a/configure.ac b/configure.ac index 74c80fd7fa8c..98f56fc849fa 100644 --- a/configure.ac +++ b/configure.ac @@ -3322,6 +3322,7 @@ WINE_CONFIG_MAKEFILE(programs/rpcss) WINE_CONFIG_MAKEFILE(programs/rundll.exe16,enable_win16) WINE_CONFIG_MAKEFILE(programs/rundll32) WINE_CONFIG_MAKEFILE(programs/sc) +WINE_CONFIG_MAKEFILE(programs/sc/tests) WINE_CONFIG_MAKEFILE(programs/schtasks) WINE_CONFIG_MAKEFILE(programs/schtasks/tests) WINE_CONFIG_MAKEFILE(programs/sdbinst) diff --git a/programs/sc/tests/Makefile.in b/programs/sc/tests/Makefile.in new file mode 100644 index 000000000000..24a875fb9051 --- /dev/null +++ b/programs/sc/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = sc.exe +IMPORTS = advapi32 + +C_SRCS = \ + sc.c diff --git a/programs/sc/tests/sc.c b/programs/sc/tests/sc.c new file mode 100644 index 000000000000..66493ed578c7 --- /dev/null +++ b/programs/sc/tests/sc.c @@ -0,0 +1,402 @@ +/* + * Copyright 2022 Torge Matthies for CodeWeavers + * + * 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 + */ + +#include <windows.h> +#include <winsvc.h> +#include <stdio.h> +#include "wine/test.h" + +#define lok ok_(__FILE__,line) + +#define TEST_SERVICE_NAME "wine_test_svc" +#define TEST_SERVICE_NAME2 "wine_test_svc_2" +#define TEST_SERVICE_BINARY "c:\\windows\\system32\\cmd.exe" +#define TEST_SERVICE_BINARY_START_BOOT "\\SystemRoot\\system32\\cmd.exe" +#define TEST_SERVICE_BINARY_START_SYSTEM "\\??\\" TEST_SERVICE_BINARY + +#define SC_EXIT_SUCCESS ERROR_SUCCESS +#define SC_EXIT_INVALID_PARAMETER ERROR_INVALID_PARAMETER +#define SC_EXIT_CIRCULAR_DEPENDENCY ERROR_CIRCULAR_DEPENDENCY +#define SC_EXIT_SERVICE_DOES_NOT_EXIST ERROR_SERVICE_DOES_NOT_EXIST +#define SC_EXIT_SERVICE_EXISTS ERROR_SERVICE_EXISTS +#define SC_EXIT_INVALID_COMMAND_LINE ERROR_INVALID_COMMAND_LINE + +static HANDLE nul_file; +static SC_HANDLE scmgr; + +/* Copied and modified from the reg.exe tests */ +#define run_sc_exe(c,r) run_sc_exe_(__FILE__,__LINE__,c,r) +static BOOL run_sc_exe_(const char *file, unsigned line, const char *cmd, DWORD *rc) +{ + STARTUPINFOA si = {sizeof(STARTUPINFOA)}; + PROCESS_INFORMATION pi; + BOOL bret; + DWORD ret; + char cmdline[256]; + + si.dwFlags = STARTF_USESTDHANDLES; + si.hStdInput = nul_file; + si.hStdOutput = nul_file; + si.hStdError = nul_file; + + strcpy(cmdline, cmd); + if (!CreateProcessA(NULL, cmdline, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi)) + return FALSE; + + ret = WaitForSingleObject(pi.hProcess, 10000); + if (ret == WAIT_TIMEOUT) + TerminateProcess(pi.hProcess, 1); + + bret = GetExitCodeProcess(pi.hProcess, rc); + lok(bret, "GetExitCodeProcess failed: %ld\n", GetLastError()); + + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + return bret; +} + +#define BROKEN_CREATE 0x000000001UL +#define BROKEN_BINPATH 0x000000002UL +#define BROKEN_TYPE 0x000000004UL +#define BROKEN_START 0x000000008UL +#define BROKEN_ERROR 0x000000010UL +#define BROKEN_DEPEND 0x000000020UL +#define BROKEN_DISPLAY_NAME 0x000000040UL +#define BROKEN_DELAYED_AUTO_START 0x000000080UL +#define BROKEN_ALL ~0UL + +#define SERVICE_DELAYED_AUTO_START (SERVICE_AUTO_START | 0x80000000) + +#define check_service_definition(n,bi,t,s,e,de,di,br) check_service_definition_(__FILE__,__LINE__,n,bi,t,s,e,de,di,br) +static void check_service_definition_(const char *file, unsigned line, char const *name, + const char *binpath, DWORD type, DWORD start, DWORD error, + const char *depend, const char *display_name, DWORD broken) +{ + SERVICE_DELAYED_AUTO_START_INFO delayed_auto_info = {0}; + union { + char buffer[8192]; + QUERY_SERVICE_CONFIGA config; + } cfg; + BOOL delayed_auto; + SC_HANDLE svc; + DWORD needed; + BOOL ret; + + delayed_auto = !!(start & 0x80000000); + start &= ~0x80000000; + + if (!scmgr) + return; + + svc = OpenServiceA(scmgr, name, GENERIC_READ); + todo_wine_if(broken & BROKEN_CREATE) + lok(!!svc, "OpenServiceA failed: %ld\n", GetLastError()); + if (!svc) + return; + + ret = QueryServiceConfigA(svc, &cfg.config, sizeof(cfg.buffer), &needed); + lok(!!ret, "QueryServiceConfigA failed: %ld\n", GetLastError()); + if (!ret) + goto done; + + ret = QueryServiceConfig2A(svc, SERVICE_CONFIG_DELAYED_AUTO_START_INFO, (LPBYTE)&delayed_auto_info, + sizeof(delayed_auto_info), &needed); + todo_wine lok(!!ret, "QueryServiceConfig2A(SERVICE_CONFIG_DELAYED_AUTO_START_INFO) failed: %ld\n", + GetLastError()); + +#define check_str(a, b, msg) lok((a) && (b) && (a) != (b) && !strcmp((a), (b)), msg ": %s != %s\n", \ + debugstr_a((a)), debugstr_a((b))) +#define check_dw(a, b, msg) lok((a) == (b), msg ": 0x%lx != 0x%lx\n", a, b) + + todo_wine_if(broken & BROKEN_BINPATH) + check_str(cfg.config.lpBinaryPathName, binpath, "Wrong binary path"); + todo_wine_if(broken & BROKEN_TYPE) + check_dw(cfg.config.dwServiceType, type, "Wrong service type"); + todo_wine_if(broken & BROKEN_START) + check_dw(cfg.config.dwStartType, start, "Wrong start type"); + todo_wine_if(broken & BROKEN_ERROR) + check_dw(cfg.config.dwErrorControl, error, "Wrong error control"); + todo_wine_if(broken & BROKEN_DEPEND) + check_str(cfg.config.lpDependencies, depend, "Wrong dependencies"); + todo_wine_if(broken & BROKEN_DISPLAY_NAME) + check_str(cfg.config.lpDisplayName, display_name, "Wrong display name"); + todo_wine_if(broken & BROKEN_DELAYED_AUTO_START) + check_dw((DWORD)delayed_auto_info.fDelayedAutostart, (DWORD)delayed_auto, "Wrong delayed autostart value"); + +#undef check_dw +#undef check_str + +done: + CloseServiceHandle(svc); +} + +#define delete_service(n,e,b) delete_service_(__FILE__,__LINE__,n,e,b) +static void delete_service_(const char *file, unsigned line, const char *name, DWORD expected_status, BOOL broken) +{ + char command[256]; + BOOL bret; + DWORD r; + + strcpy(command, "sc delete "); + strcat(command, name); + bret = run_sc_exe_(file, line, command, &r); + lok(bret, "run_sc_exe failed\n"); + if (expected_status != SC_EXIT_SUCCESS && !strcmp(winetest_platform, "wine")) + expected_status = 1; + todo_wine_if(broken) lok(r == expected_status, "got exit code %ld, expected %ld\n", r, expected_status); +} + +static void test_create_service(BOOL elevated) +{ + static struct { + const char *param; + DWORD expected_start_type; + DWORD expected_service_type; + const char * expected_binary_path; + } start_types[] = { + { "boot type= kernel", SERVICE_BOOT_START, SERVICE_KERNEL_DRIVER, TEST_SERVICE_BINARY_START_BOOT }, + { "system type= kernel", SERVICE_SYSTEM_START, SERVICE_KERNEL_DRIVER, TEST_SERVICE_BINARY_START_SYSTEM }, + { "auto", SERVICE_AUTO_START, SERVICE_WIN32_OWN_PROCESS, TEST_SERVICE_BINARY }, + { "demand", SERVICE_DEMAND_START, SERVICE_WIN32_OWN_PROCESS, TEST_SERVICE_BINARY }, + { "disabled", SERVICE_DISABLED, SERVICE_WIN32_OWN_PROCESS, TEST_SERVICE_BINARY }, + { "delayed-auto", SERVICE_DELAYED_AUTO_START, SERVICE_WIN32_OWN_PROCESS, TEST_SERVICE_BINARY } + }; + static struct { + const char *param; + DWORD expected_error_control; + } error_severities[] = { + { "normal", SERVICE_ERROR_NORMAL }, + { "severe", SERVICE_ERROR_SEVERE }, + { "critical", SERVICE_ERROR_CRITICAL }, + { "ignore", SERVICE_ERROR_IGNORE } + }; + unsigned int i; + DWORD r; + + if (!elevated) + { + win_skip("\"sc create\" tests need elevated permissions\n"); + return; + } + +#define check_exit_code(x) ok(r == (x), "got exit code %ld, expected %d\n", r, (x)) +#define check_test_service(t,s,e,de,di,br) \ + check_service_definition(TEST_SERVICE_NAME, TEST_SERVICE_BINARY, t, s, e, de, di ? di : TEST_SERVICE_NAME, br) +#define delete_test_service(x, y) \ + delete_service(TEST_SERVICE_NAME, (x) ? SC_EXIT_SUCCESS : SC_EXIT_SERVICE_DOES_NOT_EXIST, (y)) +#define check_test_service2(t,s,e,de,di,br) \ + check_service_definition(TEST_SERVICE_NAME2, TEST_SERVICE_BINARY, t, s, e, de, di ? di : TEST_SERVICE_NAME2, br) +#define delete_test_service2(x, y) \ + delete_service(TEST_SERVICE_NAME2, (x) ? SC_EXIT_SUCCESS : SC_EXIT_SERVICE_DOES_NOT_EXIST, (y)) + + /* too few parameters */ + + run_sc_exe("sc create", &r); + todo_wine check_exit_code(SC_EXIT_INVALID_COMMAND_LINE); + delete_test_service(FALSE, FALSE); + + run_sc_exe("sc create " TEST_SERVICE_NAME, &r); + todo_wine check_exit_code(SC_EXIT_INVALID_COMMAND_LINE); + delete_test_service(FALSE, FALSE); + + /* binpath= */ + + run_sc_exe("sc create " TEST_SERVICE_NAME " binpath= \"" TEST_SERVICE_BINARY "\"", &r); + todo_wine check_exit_code(SC_EXIT_SUCCESS); + check_test_service(SERVICE_WIN32_OWN_PROCESS, SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL, "", NULL, + BROKEN_CREATE); + + /* existing service */ + + run_sc_exe("sc create " TEST_SERVICE_NAME " binpath= \"" TEST_SERVICE_BINARY "\" start= auto", &r); + todo_wine check_exit_code(SC_EXIT_SERVICE_EXISTS); + check_test_service(SERVICE_WIN32_OWN_PROCESS, SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL, "", NULL, + BROKEN_CREATE); + delete_test_service(TRUE, TRUE); + + /* type= */ + + run_sc_exe("sc create " TEST_SERVICE_NAME " binpath= \"" TEST_SERVICE_BINARY "\" type= invalid", &r); + todo_wine check_exit_code(SC_EXIT_INVALID_COMMAND_LINE); + delete_test_service(FALSE, FALSE); + + run_sc_exe("sc create " TEST_SERVICE_NAME " binpath= \"" TEST_SERVICE_BINARY "\" type= own", &r); + todo_wine check_exit_code(SC_EXIT_SUCCESS); + check_test_service(SERVICE_WIN32_OWN_PROCESS, SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL, "", NULL, + BROKEN_CREATE); + delete_test_service(TRUE, TRUE); + + run_sc_exe("sc create " TEST_SERVICE_NAME " binpath= \"" TEST_SERVICE_BINARY "\" type= interact", &r); + todo_wine check_exit_code(SC_EXIT_INVALID_PARAMETER); + delete_test_service(FALSE, FALSE); + + run_sc_exe("sc create " TEST_SERVICE_NAME " binpath= \"" TEST_SERVICE_BINARY "\" type= interact type= own", &r); + todo_wine check_exit_code(SC_EXIT_SUCCESS); + check_test_service(SERVICE_WIN32_OWN_PROCESS | SERVICE_INTERACTIVE_PROCESS, SERVICE_DEMAND_START, + SERVICE_ERROR_NORMAL, "", NULL, BROKEN_CREATE); + delete_test_service(TRUE, TRUE); + + /* start= */ + + run_sc_exe("sc create " TEST_SERVICE_NAME " binpath= \"" TEST_SERVICE_BINARY "\" start= invalid", &r); + todo_wine check_exit_code(SC_EXIT_INVALID_COMMAND_LINE); + delete_test_service(FALSE, FALSE); + + for (i = 0; i < ARRAY_SIZE(start_types); i++) + { + char cmdline[256]; + + strcpy(cmdline, "sc create " TEST_SERVICE_NAME " binpath= \"" TEST_SERVICE_BINARY "\" start= "); + strcat(cmdline, start_types[i].param); + run_sc_exe(cmdline, &r); + todo_wine check_exit_code(SC_EXIT_SUCCESS); + check_service_definition(TEST_SERVICE_NAME, start_types[i].expected_binary_path, + start_types[i].expected_service_type, start_types[i].expected_start_type, + SERVICE_ERROR_NORMAL, "", TEST_SERVICE_NAME, BROKEN_CREATE); + delete_test_service(TRUE, TRUE); + } + + /* error= */ + + for (i = 0; i < ARRAY_SIZE(error_severities); i++) + { + char cmdline[256]; + + strcpy(cmdline, "sc create " TEST_SERVICE_NAME " binpath= \"" TEST_SERVICE_BINARY "\" error= "); + strcat(cmdline, error_severities[i].param); + run_sc_exe(cmdline, &r); + todo_wine check_exit_code(SC_EXIT_SUCCESS); + check_test_service(SERVICE_WIN32_OWN_PROCESS, SERVICE_DEMAND_START, + error_severities[i].expected_error_control, "", NULL, BROKEN_CREATE); + delete_test_service(TRUE, TRUE); + } + + /* tag= */ + + run_sc_exe("sc create " TEST_SERVICE_NAME " binpath= \"" TEST_SERVICE_BINARY "\" tag= yes", &r); + todo_wine check_exit_code(SC_EXIT_INVALID_PARAMETER); + delete_test_service(FALSE, FALSE); + + run_sc_exe("sc create " TEST_SERVICE_NAME " binpath= \"" TEST_SERVICE_BINARY "\" tag= no", &r); + todo_wine check_exit_code(SC_EXIT_SUCCESS); + check_test_service(SERVICE_WIN32_OWN_PROCESS, SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL, "", NULL, + BROKEN_CREATE); + delete_test_service(TRUE, TRUE); + + /* depend= */ + + run_sc_exe("sc create " TEST_SERVICE_NAME " binpath= \"" TEST_SERVICE_BINARY "\" depend= " TEST_SERVICE_NAME, &r); + todo_wine check_exit_code(SC_EXIT_CIRCULAR_DEPENDENCY); + delete_test_service(FALSE, FALSE); + + run_sc_exe("sc create " TEST_SERVICE_NAME2 " binpath= \"" TEST_SERVICE_BINARY "\" depend= " TEST_SERVICE_NAME, &r); + todo_wine check_exit_code(SC_EXIT_SUCCESS); + check_test_service2(SERVICE_WIN32_OWN_PROCESS, SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL, + TEST_SERVICE_NAME, NULL, BROKEN_CREATE); + delete_test_service2(TRUE, TRUE); + + run_sc_exe("sc create " TEST_SERVICE_NAME " binpath= " TEST_SERVICE_BINARY, &r); + todo_wine check_exit_code(SC_EXIT_SUCCESS); + run_sc_exe("sc create " TEST_SERVICE_NAME2 " binpath= \"" TEST_SERVICE_BINARY "\" depend= " TEST_SERVICE_NAME, &r); + todo_wine check_exit_code(SC_EXIT_SUCCESS); + check_test_service2(SERVICE_WIN32_OWN_PROCESS, SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL, + TEST_SERVICE_NAME, NULL, BROKEN_CREATE); + delete_test_service2(TRUE, TRUE); + delete_test_service(TRUE, TRUE); + + /* displayname= */ + + run_sc_exe("sc create " TEST_SERVICE_NAME " binpath= " TEST_SERVICE_BINARY + " displayname= \"Wine Test Service\"", &r); + todo_wine check_exit_code(SC_EXIT_SUCCESS); + check_test_service(SERVICE_WIN32_OWN_PROCESS, SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL, "", + "Wine Test Service", BROKEN_CREATE); + delete_test_service(TRUE, TRUE); + + /* without spaces */ + + run_sc_exe("sc create " TEST_SERVICE_NAME2 " binpath=\"" TEST_SERVICE_BINARY "\" type=own start=auto" + " error=normal tag=no depend=" TEST_SERVICE_NAME " displayname=\"Wine Test Service\"", &r); + ok(r == SC_EXIT_SUCCESS || broken(r == SC_EXIT_INVALID_COMMAND_LINE), "got exit code %ld, expected %d\n", + r, SC_EXIT_SUCCESS); + if (r == SC_EXIT_SUCCESS) + { + check_test_service2(SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, SERVICE_ERROR_NORMAL, + TEST_SERVICE_NAME, "Wine Test Service", BROKEN_DEPEND); + delete_test_service2(TRUE, FALSE); + } + else + { + delete_test_service2(FALSE, FALSE); + } + + /* case-insensitive */ + + run_sc_exe("SC CREATE " TEST_SERVICE_NAME2 " BINPATH= \"" TEST_SERVICE_BINARY "\" TYPE= OWN START= AUTO" + " ERROR= NORMAL TAG= NO DEPEND= " TEST_SERVICE_NAME " DISPLAYNAME= \"Wine Test Service\"", &r); + todo_wine check_exit_code(SC_EXIT_SUCCESS); + check_test_service2(SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, SERVICE_ERROR_NORMAL, + TEST_SERVICE_NAME, "Wine Test Service", BROKEN_CREATE); + delete_test_service2(TRUE, TRUE); + +#undef delete_test_service2 +#undef check_test_service2 +#undef delete_test_service +#undef check_test_service +#undef check_exit_code +} + +/* taken from winetest, only whitespace changes */ +static int running_elevated(void) +{ + HANDLE token; + TOKEN_ELEVATION elevation_info; + DWORD size; + + /* Get the process token */ + if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token)) + return -1; + + /* Get the elevation info from the token */ + if (!GetTokenInformation(token, TokenElevation, &elevation_info, sizeof(TOKEN_ELEVATION), &size)) + { + CloseHandle(token); + return -1; + } + CloseHandle(token); + + return elevation_info.TokenIsElevated; +} + + +START_TEST(sc) +{ + SECURITY_ATTRIBUTES secattr = {sizeof(SECURITY_ATTRIBUTES), NULL, TRUE}; + BOOL elevated = running_elevated(); + + nul_file = CreateFileA("NUL", GENERIC_READ | GENERIC_WRITE, 0, &secattr, OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, NULL); + + scmgr = OpenSCManagerA(NULL, NULL, GENERIC_READ); + ok(!!scmgr, "OpenSCManagerA failed: %ld\n", GetLastError()); + + test_create_service(elevated); + + CloseServiceHandle(scmgr); + CloseHandle(nul_file); +} -- 2.36.0

1 1

[PATCH] shlwapi: Remove obsolete -D_SHLWAPI_ from Makefile.in
by Drew Ronneberg 29 Apr '22

29 Apr '22

1 0

[PATCH] shdocvw: Remove obsolete -D_SHDOCVW_ from Makefile.in
by Drew Ronneberg 29 Apr '22

29 Apr '22

1 0

[PATCH] setupapi: Remove obsolete -D_SETUPAPI_ from Makefile.in
by Drew Ronneberg 29 Apr '22

29 Apr '22

1 0

[PATCH 0/1] MR15: programs/winedbg: correctly read register values
by eric pouech (＠epo) 29 Apr '22

29 Apr '22

(was incorrectly reading all registers as having the size of debugger's DWORD_PTR) this is mainly needed: - for a 64-bit debugger attached to a 32-bit debuggee - when register is of different size than machine word (regressions introduced in wine-7.0-rc1) Fixed by accessing registers through dbg_lvalue structure (which contains correct size information) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/15

2 1

[PATCH v2 1/8] d2d1: Add stubs for ID2D1EffectContext.
by Ziqing Hui 29 Apr '22

29 Apr '22

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d2d1/d2d1_private.h | 23 ++++ dlls/d2d1/effect.c | 256 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 278 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index aa8e8569455..98092d80951 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -34,6 +34,7 @@ #include "initguid.h" #endif #include "dwrite_2.h" +#include "d2d1effectauthor.h" enum d2d_brush_type { @@ -567,6 +568,14 @@ struct d2d_device void d2d_device_init(struct d2d_device *device, ID2D1Factory1 *factory, IDXGIDevice *dxgi_device) DECLSPEC_HIDDEN; +struct d2d_effect_context +{ + ID2D1EffectContext ID2D1EffectContext_iface; + LONG refcount; +}; + +void d2d_effect_context_init(struct d2d_effect_context *effect_context) DECLSPEC_HIDDEN; + struct d2d_effect_info { const CLSID *clsid; @@ -694,6 +703,13 @@ static inline const char *debug_d2d_point_2f(const D2D1_POINT_2F *point) return wine_dbg_sprintf("{%.8e, %.8e}", point->x, point->y); } +static inline const char *debug_d2d_point_2l(const D2D1_POINT_2L *point) +{ + if (!point) + return "(null)"; + return wine_dbg_sprintf("{%ld, %ld}", point->x, point->y); +} + static inline const char *debug_d2d_rect_f(const D2D1_RECT_F *rect) { if (!rect) @@ -701,6 +717,13 @@ static inline const char *debug_d2d_rect_f(const D2D1_RECT_F *rect) return wine_dbg_sprintf("(%.8e, %.8e)-(%.8e, %.8e)", rect->left, rect->top, rect->right, rect->bottom); } +static inline const char *debug_d2d_rect_l(const D2D1_RECT_L *rect) +{ + if (!rect) + return "(null)"; + return wine_dbg_sprintf("(%ld, %ld)-(%ld, %ld)", rect->left, rect->top, rect->right, rect->bottom); +} + static inline const char *debug_d2d_rounded_rect(const D2D1_ROUNDED_RECT *rounded_rect) { if (!rounded_rect) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 350ac3c7bbf..5709afed7a5 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -17,7 +17,6 @@ */ #include "d2d1_private.h" -#include "d2d1effectauthor.h" WINE_DEFAULT_DEBUG_CHANNEL(d2d); @@ -31,6 +30,261 @@ static const struct d2d_effect_info builtin_effects[] = {&CLSID_D2D1Grayscale, 1, 1, 1}, }; +static inline struct d2d_effect_context *impl_from_ID2D1EffectContext(ID2D1EffectContext *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_effect_context, ID2D1EffectContext_iface); +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_QueryInterface(ID2D1EffectContext *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_ID2D1EffectContext) + || IsEqualGUID(iid, &IID_IUnknown)) + { + ID2D1EffectContext_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d2d_effect_context_AddRef(ID2D1EffectContext *iface) +{ + struct d2d_effect_context *effect_context = impl_from_ID2D1EffectContext(iface); + ULONG refcount = InterlockedIncrement(&effect_context->refcount); + + TRACE("%p increasing refcount to %lu.\n", iface, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d2d_effect_context_Release(ID2D1EffectContext *iface) +{ + struct d2d_effect_context *effect_context = impl_from_ID2D1EffectContext(iface); + ULONG refcount = InterlockedDecrement(&effect_context->refcount); + + TRACE("%p decreasing refcount to %lu.\n", iface, refcount); + + if (!refcount) + { + heap_free(effect_context); + } + + return refcount; +} + +static void STDMETHODCALLTYPE d2d_effect_context_GetDpi(ID2D1EffectContext *iface, float *dpi_x, float *dpi_y) +{ + FIXME("iface %p, dpi_x %p, dpi_y %p stub!\n", iface, dpi_x, dpi_y); +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateEffect(ID2D1EffectContext *iface, + REFCLSID clsid, ID2D1Effect **effect) +{ + FIXME("iface %p, clsid %s, effect %p stub!\n", iface, debugstr_guid(clsid), effect); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_GetMaximumSupportedFeatureLevel(ID2D1EffectContext *iface, + const D3D_FEATURE_LEVEL *levels, UINT32 level_count, D3D_FEATURE_LEVEL *max_level) +{ + FIXME("iface %p, levels %p, level_count %u, max_level %p stub!\n", iface, levels, level_count, max_level); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateTransformNodeFromEffect(ID2D1EffectContext *iface, + ID2D1Effect *effect, ID2D1TransformNode **node) +{ + FIXME("iface %p, effect %p, node %p stub!\n", iface, effect, node); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateBlendTransform(ID2D1EffectContext *iface, + UINT32 num_inputs, const D2D1_BLEND_DESCRIPTION *description, ID2D1BlendTransform **transform) +{ + FIXME("iface %p, num_inputs %u, description %p, transform %p stub!\n", iface, num_inputs, description, transform); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateBorderTransform(ID2D1EffectContext *iface, + D2D1_EXTEND_MODE mode_x, D2D1_EXTEND_MODE mode_y, ID2D1BorderTransform **transform) +{ + FIXME("iface %p, mode_x %#x, mode_y %#x, transform %p stub!\n", iface, mode_x, mode_y, transform); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateOffsetTransform(ID2D1EffectContext *iface, + D2D1_POINT_2L offset, ID2D1OffsetTransform **transform) +{ + FIXME("iface %p, offset %s, transform %p stub!\n", iface, debug_d2d_point_2l(&offset), transform); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateBoundsAdjustmentTransform(ID2D1EffectContext *iface, + const D2D1_RECT_L *output_rect, ID2D1BoundsAdjustmentTransform **transform) +{ + FIXME("iface %p, output_rect %s, transform %p stub!\n", iface, debug_d2d_rect_l(output_rect), transform); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadPixelShader(ID2D1EffectContext *iface, + REFGUID shader_id, const BYTE *buffer, UINT32 buffer_size) +{ + FIXME("iface %p, shader_id %s, buffer %p, buffer_size %u stub!\n", + iface, debugstr_guid(shader_id), buffer, buffer_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadVertexShader(ID2D1EffectContext *iface, + REFGUID shader_id, const BYTE *buffer, UINT32 buffer_size) +{ + FIXME("iface %p, shader_id %s, buffer %p, buffer_size %u stub!\n", + iface, debugstr_guid(shader_id), buffer, buffer_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadComputeShader(ID2D1EffectContext *iface, + REFGUID shader_id, const BYTE *buffer, UINT32 buffer_size) +{ + FIXME("iface %p, shader_id %s, buffer %p, buffer_size %u stub!\n", + iface, debugstr_guid(shader_id), buffer, buffer_size); + + return E_NOTIMPL; +} + +static BOOL STDMETHODCALLTYPE d2d_effect_context_IsShaderLoaded(ID2D1EffectContext *iface, REFGUID shader_id) +{ + FIXME("iface %p, shader_id %s stub!\n", iface, debugstr_guid(shader_id)); + + return FALSE; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateResourceTexture(ID2D1EffectContext *iface, + const GUID *id, const D2D1_RESOURCE_TEXTURE_PROPERTIES *texture_properties, + const BYTE *data, const UINT32 *strides, UINT32 data_size, ID2D1ResourceTexture **texture) +{ + FIXME("iface %p, id %s, texture_properties %p, data %p, strides %s, data_size %u, texture %p stub!\n", + iface, debugstr_guid(id), texture_properties, data, + strides ? wine_dbg_sprintf("%u", *strides) : "(null)", data_size, texture); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_FindResourceTexture(ID2D1EffectContext *iface, + const GUID *id, ID2D1ResourceTexture **texture) +{ + FIXME("iface %p, id %s, texture %p stub!\n", iface, debugstr_guid(id), texture); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateVertexBuffer(ID2D1EffectContext *iface, + const D2D1_VERTEX_BUFFER_PROPERTIES *buffer_properties, const GUID *id, + const D2D1_CUSTOM_VERTEX_BUFFER_PROPERTIES *custom_buffer_properties, ID2D1VertexBuffer **buffer) +{ + FIXME("iface %p, buffer_properties %p, id %s, custom_buffer_properties %p, buffer %p stub!\n", + iface, buffer_properties, debugstr_guid(id), custom_buffer_properties, buffer); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_FindVertexBuffer(ID2D1EffectContext *iface, + const GUID *id, ID2D1VertexBuffer **buffer) +{ + FIXME("iface %p, id %s, buffer %p stub!\n", iface, debugstr_guid(id), buffer); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateColorContext(ID2D1EffectContext *iface, + D2D1_COLOR_SPACE space, const BYTE *profile, UINT32 profile_size, ID2D1ColorContext **color_context) +{ + FIXME("iface %p, space %#x, profile %p, profile_size %u, color_context %p stub!\n", + iface, space, profile, profile_size, color_context); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateColorContextFromFilename(ID2D1EffectContext *iface, + const WCHAR *filename, ID2D1ColorContext **color_context) +{ + FIXME("iface %p, filename %s, color_context %p stub!\n", iface, debugstr_w(filename), color_context); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateColorContextFromWicColorContext(ID2D1EffectContext *iface, + IWICColorContext *wic_color_context, ID2D1ColorContext **color_context) +{ + FIXME("iface %p, wic_color_context %p, color_context %p stub!\n", iface, wic_color_context, color_context); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CheckFeatureSupport(ID2D1EffectContext *iface, + D2D1_FEATURE feature, void *data, UINT32 data_size) +{ + FIXME("iface %p, feature %#x, data %p, data_size %u stub!\n", iface, feature, data, data_size); + + return E_NOTIMPL; +} + +static BOOL STDMETHODCALLTYPE d2d_effect_context_IsBufferPrecisionSupported(ID2D1EffectContext *iface, + D2D1_BUFFER_PRECISION precision) +{ + FIXME("iface %p, precision %#x stub!\n", iface, precision); + + return FALSE; +} + +static const ID2D1EffectContextVtbl d2d_effect_context_vtbl = +{ + d2d_effect_context_QueryInterface, + d2d_effect_context_AddRef, + d2d_effect_context_Release, + d2d_effect_context_GetDpi, + d2d_effect_context_CreateEffect, + d2d_effect_context_GetMaximumSupportedFeatureLevel, + d2d_effect_context_CreateTransformNodeFromEffect, + d2d_effect_context_CreateBlendTransform, + d2d_effect_context_CreateBorderTransform, + d2d_effect_context_CreateOffsetTransform, + d2d_effect_context_CreateBoundsAdjustmentTransform, + d2d_effect_context_LoadPixelShader, + d2d_effect_context_LoadVertexShader, + d2d_effect_context_LoadComputeShader, + d2d_effect_context_IsShaderLoaded, + d2d_effect_context_CreateResourceTexture, + d2d_effect_context_FindResourceTexture, + d2d_effect_context_CreateVertexBuffer, + d2d_effect_context_FindVertexBuffer, + d2d_effect_context_CreateColorContext, + d2d_effect_context_CreateColorContextFromFilename, + d2d_effect_context_CreateColorContextFromWicColorContext, + d2d_effect_context_CheckFeatureSupport, + d2d_effect_context_IsBufferPrecisionSupported, +}; + +void d2d_effect_context_init(struct d2d_effect_context *effect_context) +{ + effect_context->ID2D1EffectContext_iface.lpVtbl = &d2d_effect_context_vtbl; + effect_context->refcount = 1; +} + static inline struct d2d_effect *impl_from_ID2D1Effect(ID2D1Effect *iface) { return CONTAINING_RECORD(iface, struct d2d_effect, ID2D1Effect_iface); -- 2.25.1

2 14

[PATCH v2 0/1] MR14: dlls/dbghelp: introduce symt_find_symbol_at()
by eric pouech (＠epo) 29 Apr '22

29 Apr '22

To be used in place of symt_find_nearest(). symt_find_symbol_at() ensures that the address passed is within the boundaries of the returned symbol (while find_nearest() doesn't). This fixes erroneous backtraces in debugger like: ``` $ ./wine winedbg notepad WineDbg starting on pid 0104 RtlDefaultNpAcl () at Z:\home\eric\work\wine\dlls\ntdll\sec.c:1731 0x00000170054805 ntdll+0x54805 [Z:\home\eric\work\wine\dlls\ntdll\sec.c:1731]: ret 1731 } Wine-dbg>bt Backtrace: =>0 0x00000170054805 RtlDefaultNpAcl+0x2d5(pAcl=<internal error>) [Z:\home\eric\work\wine\dlls\ntdll\sec.c:1731] in ntdll (0x000001700701a4) 1 0x0000017002d6c4 __wine_pop_frame(pAcl=<internal error>) [Z:\home\eric\work\wine\include\wine\exception.h:273] in ntdll (0x000001700701a4) 2 0x0000017002d6c4 process_breakpoint+0x84() [Z:\home\eric\work\wine\dlls\ntdll\loader.c:3912] in ntdll (0x000001700701a4) 3 0x000001700354c9 LdrInitializeThunk+0x509(context=<register R13 not accessible in this frame>, unknown2=<internal error>, unknown3=<internal error>, unknown4=<internal error>) [Z:\home\eric\work\wine\dlls\ntdll\loader.c:4200] in ntdll (0x000001700701a4) ``` where RtlDefaultNpAcl() has nothing to do here (it's the symbol below RIP and we don't have a symbol with debug information for that address). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> -- v2: dlls/dbghelp: introduce symt_find_symbol_at() https://gitlab.winehq.org/wine/wine/-/merge_requests/14

2 1

[PATCH 0/1] MR14: dlls/dbghelp: introduce symt_find_symbol_at()
by eric pouech (＠epo) 29 Apr '22

29 Apr '22

To be used in place of symt_find_nearest(). symt_find_symbol_at() ensures that the address passed is whithin the boundaries of the returned symbol (while find_nearest() doesn't). This fixes erroneous backtraces in debugger like: $ ./wine winedbg notepad WineDbg starting on pid 0104 RtlDefaultNpAcl () at Z:\home\eric\work\wine\dlls\ntdll\sec.c:1731 0x00000170054805 ntdll+0x54805 [Z:\home\eric\work\wine\dlls\ntdll\sec.c:1731]: ret 1731 } Wine-dbg>bt Backtrace: =>0 0x00000170054805 RtlDefaultNpAcl+0x2d5(pAcl=<internal error>) [Z:\home\eric\work\wine\dlls\ntdll\sec.c:1731] in ntdll (0x000001700701a4) 1 0x0000017002d6c4 __wine_pop_frame(pAcl=<internal error>) [Z:\home\eric\work\wine\include\wine\exception.h:273] in ntdll (0x000001700701a4) 2 0x0000017002d6c4 process_breakpoint+0x84() [Z:\home\eric\work\wine\dlls\ntdll\loader.c:3912] in ntdll (0x000001700701a4) 3 0x000001700354c9 LdrInitializeThunk+0x509(context=<register R13 not accessible in this frame>, unknown2=<internal error>, unknown3=<internal error>, unknown4=<internal error>) [Z:\home\eric\work\wine\dlls\ntdll\loader.c:4200] in ntdll (0x000001700701a4) where RtlDefaultNpAcl() has nothing to do here (it's the symbol below RIP and we don't have a symbol with debug information for that address). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/14

3 2

[PATCH 0/1] MR13: kernelbase: Add support for progress callback in CopyFileEx.
by Alistair Leslie-Hughes (＠alesliehughes) 29 Apr '22

29 Apr '22

Based on patch by Michael Müller. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/13

2 1

[PATCH v2 1/5] ntdll: Prevent double free (Coverity)
by Fabian Maurer 29 Apr '22

29 Apr '22

fd will be closed at the end of the function anyways Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/ntdll/unix/file.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index cc8bf0c6e82..a6d76a49b27 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4215,7 +4215,6 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, int res = recv( fd, tmpbuf, size, MSG_PEEK ); info->MessagesAvailable = (res > 0); info->NextMessageSize = (res >= 0) ? res : MAILSLOT_NO_MESSAGE; - if (needs_close) close( fd ); } free( tmpbuf ); } -- 2.36.0

2 8

[PATCH v2 1/2] wrc: Support function macros where varargs are the only argument.
by Brendan Shanks 29 Apr '22

29 Apr '22

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- v2: wrc needed support added for parsing function macros where '...' is the only argument. Negative 'args' was being used to represent a macro using varargs, but this obviously fails when there are no named arguments. Like with other variable argument macros, expansion still doesn't work. tools/wrc/ppl.l | 4 ++-- tools/wrc/ppy.y | 11 ++++++----- tools/wrc/wpp.c | 5 +++-- tools/wrc/wpp_private.h | 3 ++- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/tools/wrc/ppl.l b/tools/wrc/ppl.l index 35c3fd6fb44..4748d735fa2 100644 --- a/tools/wrc/ppl.l +++ b/tools/wrc/ppl.l @@ -1071,9 +1071,9 @@ static void expand_macro(macexpstackentry_t *mep) assert(ppp->type == def_macro); assert(ppp->expanding == 0); - if((ppp->nargs >= 0 && nargs != ppp->nargs) || (ppp->nargs < 0 && nargs < -ppp->nargs)) + if((!ppp->variadic && nargs != ppp->nargs) || (ppp->variadic && nargs < ppp->nargs)) { - ppy_error("Too %s macro arguments (%d)", nargs < abs(ppp->nargs) ? "few" : "many", nargs); + ppy_error("Too %s macro arguments (%d)", nargs < ppp->nargs ? "few" : "many", nargs); return; } diff --git a/tools/wrc/ppy.y b/tools/wrc/ppy.y index ac4423d724f..ce3c409e735 100644 --- a/tools/wrc/ppy.y +++ b/tools/wrc/ppy.y @@ -112,6 +112,7 @@ static char *merge_text(char *s1, char *s2); */ static char **macro_args; /* Macro parameters array while parsing */ static int nmacro_args; +static int macro_variadic; /* Macro arguments end with (or consist entirely of) '...' */ %} @@ -267,7 +268,7 @@ preprocessor | tUNDEF tIDENT tNL { pp_del_define($2); free($2); } | tDEFINE opt_text tNL { pp_add_define($1, $2); free($1); free($2); } | tMACRO res_arg allmargs tMACROEND opt_mtexts tNL { - pp_add_macro($1, macro_args, nmacro_args, $5); + pp_add_macro($1, macro_args, nmacro_args, macro_variadic, $5); } | tLINE tSINT tDQSTRING tNL { if($3) fprintf(ppy_out, "# %d %s\n", $2 , $3); free($3); } | tGCCLINE tSINT tDQSTRING tNL { if($3) fprintf(ppy_out, "# %d %s\n", $2 , $3); free($3); } @@ -305,16 +306,16 @@ text : tLITERAL { $$ = $1; } | text tSQSTRING { $$ = merge_text($1, $2); } ; -res_arg : /* Empty */ { macro_args = NULL; nmacro_args = 0; } +res_arg : /* Empty */ { macro_args = NULL; nmacro_args = 0; macro_variadic = 0; } ; -allmargs: /* Empty */ { $$ = 0; macro_args = NULL; nmacro_args = 0; } +allmargs: /* Empty */ { $$ = 0; macro_args = NULL; nmacro_args = 0; macro_variadic = 0; } | emargs { $$ = nmacro_args; } ; emargs : margs { $$ = $1; } - | margs ',' tELLIPSIS { nmacro_args *= -1; } - | tELLIPSIS { macro_args = NULL; nmacro_args = 0; } + | margs ',' tELLIPSIS { macro_variadic = 1; } + | tELLIPSIS { macro_args = NULL; nmacro_args = 0; macro_variadic = 1; } ; margs : margs ',' tIDENT { $$ = add_new_marg($3); } diff --git a/tools/wrc/wpp.c b/tools/wrc/wpp.c index d8d5052870a..57baf44862b 100644 --- a/tools/wrc/wpp.c +++ b/tools/wrc/wpp.c @@ -239,7 +239,7 @@ pp_entry_t *pp_add_define(const char *def, const char *text) return ppp; } -pp_entry_t *pp_add_macro(char *id, char *args[], int nargs, mtext_t *exp) +pp_entry_t *pp_add_macro(char *id, char *args[], int nargs, int variadic, mtext_t *exp) { int idx; pp_entry_t *ppp; @@ -258,13 +258,14 @@ pp_entry_t *pp_add_macro(char *id, char *args[], int nargs, mtext_t *exp) ppp->type = def_macro; ppp->margs = args; ppp->nargs = nargs; + ppp->variadic = variadic; ppp->subst.mtext= exp; ppp->filename = xstrdup(pp_status.input ? pp_status.input : "<internal or cmdline>"); ppp->linenumber = pp_status.input ? pp_status.line_number : 0; list_add_head( &pp_defines[idx], &ppp->entry ); if(pp_status.debug) { - fprintf(stderr, "Added macro (%s, %d) <%s(%d)> to <", pp_status.input, pp_status.line_number, ppp->ident, nargs); + fprintf(stderr, "Added macro (%s, %d) <%s(%d%s)> to <", pp_status.input, pp_status.line_number, ppp->ident, nargs, variadic ? ",va" : ""); for(; exp; exp = exp->next) { switch(exp->type) diff --git a/tools/wrc/wpp_private.h b/tools/wrc/wpp_private.h index 435dbcc005a..9d92fa02fbb 100644 --- a/tools/wrc/wpp_private.h +++ b/tools/wrc/wpp_private.h @@ -80,6 +80,7 @@ typedef struct pp_entry { char *ident; /* The key */ char **margs; /* Macro arguments array or NULL if none */ int nargs; + int variadic; union { mtext_t *mtext; /* The substitution sequence or NULL if none */ char *text; @@ -156,7 +157,7 @@ typedef struct cval { pp_entry_t *pplookup(const char *ident); pp_entry_t *pp_add_define(const char *def, const char *text); -pp_entry_t *pp_add_macro(char *ident, char *args[], int nargs, mtext_t *exp); +pp_entry_t *pp_add_macro(char *ident, char *args[], int nargs, int variadic, mtext_t *exp); void pp_del_define(const char *name); void *pp_open_include(const char *name, int type, const char *parent_name, char **newpath); void pp_push_if(pp_if_state_t s); -- 2.35.1

1 1

[PATCH v3 1/5] ws2_32/tests: Test polling for AFD_POLL_READ while there is a pending WSARecv() call.
by Zebediah Figura 29 Apr '22

29 Apr '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ws2_32/tests/afd.c | 49 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index e385715f102..9d1600a7f6a 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -154,11 +154,14 @@ static void test_poll(void) struct afd_poll_params *out_params = (struct afd_poll_params *)out_buffer; int large_buffer_size = 1024 * 1024; SOCKET client, server, listener; + OVERLAPPED overlapped = {0}; struct sockaddr_in addr; + DWORD size, flags = 0; char *large_buffer; IO_STATUS_BLOCK io; LARGE_INTEGER now; ULONG params_size; + WSABUF wsabuf; HANDLE event; int ret, len; @@ -166,6 +169,7 @@ static void test_poll(void) memset(in_buffer, 0, sizeof(in_buffer)); memset(out_buffer, 0, sizeof(out_buffer)); event = CreateEventW(NULL, TRUE, FALSE, NULL); + overlapped.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); listener = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); ret = bind(listener, (const struct sockaddr *)&bind_addr, sizeof(bind_addr)); @@ -329,6 +333,50 @@ static void test_poll(void) check_poll(client, event, AFD_POLL_WRITE | AFD_POLL_CONNECT | AFD_POLL_READ); check_poll(server, event, AFD_POLL_CONNECT); + /* Test sending data while there is a pending WSARecv(). */ + + in_params->timeout = -1000 * 10000; + in_params->count = 1; + in_params->sockets[0].socket = server; + in_params->sockets[0].flags = AFD_POLL_READ; + + ret = NtDeviceIoControlFile((HANDLE)server, event, NULL, NULL, &io, + IOCTL_AFD_POLL, in_params, params_size, out_params, params_size); + ok(ret == STATUS_PENDING, "got %#x\n", ret); + + wsabuf.buf = large_buffer; + wsabuf.len = 1; + ret = WSARecv(server, &wsabuf, 1, NULL, &flags, &overlapped, NULL); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError()); + + ret = send(client, "a", 1, 0); + ok(ret == 1, "got %d\n", ret); + + ret = WaitForSingleObject(overlapped.hEvent, 200); + ok(!ret, "got %d\n", ret); + ret = GetOverlappedResult((HANDLE)server, &overlapped, &size, FALSE); + ok(ret, "got error %lu\n", GetLastError()); + ok(size == 1, "got size %lu\n", size); + + ret = WaitForSingleObject(event, 0); + todo_wine ok(ret == WAIT_TIMEOUT, "got %#x\n", ret); + + ret = send(client, "a", 1, 0); + ok(ret == 1, "got %d\n", ret); + + ret = WaitForSingleObject(event, 200); + ok(!ret, "got %#x\n", ret); + ok(!io.Status, "got %#lx\n", io.Status); + ok(io.Information == offsetof(struct afd_poll_params, sockets[1]), "got %#Ix\n", io.Information); + ok(out_params->count == 1, "got count %u\n", out_params->count); + ok(out_params->sockets[0].socket == server, "got socket %#Ix\n", out_params->sockets[0].socket); + ok(out_params->sockets[0].flags == AFD_POLL_READ, "got flags %#x\n", out_params->sockets[0].flags); + ok(!out_params->sockets[0].status, "got status %#x\n", out_params->sockets[0].status); + + ret = recv(server, large_buffer, 1, 0); + ok(ret == 1, "got %d\n", ret); + /* Test sending out-of-band data. */ ret = send(client, "a", 1, MSG_OOB); @@ -745,6 +793,7 @@ static void test_poll(void) closesocket(client); closesocket(server); + CloseHandle(overlapped.hEvent); CloseHandle(event); free(large_buffer); } -- 2.34.1

2 5

[PATCH 1/4] kernel32/tests: Add tests for CancelSynchronousIo.
by Daniel Lehman 29 Apr '22

29 Apr '22

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/kernel32/tests/pipe.c | 93 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 7fa3c313d47..50dda0bcc80 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -37,6 +37,7 @@ static HANDLE alarm_event; static BOOL (WINAPI *pDuplicateTokenEx)(HANDLE,DWORD,LPSECURITY_ATTRIBUTES, SECURITY_IMPERSONATION_LEVEL,TOKEN_TYPE,PHANDLE); static BOOL (WINAPI *pCancelIoEx)(HANDLE handle, LPOVERLAPPED lpOverlapped); +static BOOL (WINAPI *pCancelSynchronousIo)(HANDLE handle); static BOOL (WINAPI *pGetNamedPipeClientProcessId)(HANDLE,ULONG*); static BOOL (WINAPI *pGetNamedPipeServerProcessId)(HANDLE,ULONG*); static BOOL (WINAPI *pGetNamedPipeClientSessionId)(HANDLE,ULONG*); @@ -4202,6 +4203,96 @@ static void test_exit_process_async(void) CloseHandle(server); } +static DWORD CALLBACK synchronousIoThreadMain(void *arg) +{ + HANDLE pipe; + BOOL ret; + + pipe = arg; + SetLastError(0xdeadbeef); + ret = ConnectNamedPipe(pipe, NULL); + ok(!ret, "expected failure\n"); + todo_wine + ok(GetLastError() == ERROR_OPERATION_ABORTED, "got error %lu\n", GetLastError()); + return 0; +} + +static DWORD CALLBACK synchronousIoThreadMain2(void *arg) +{ + OVERLAPPED ov; + HANDLE pipe; + BOOL ret; + + pipe = arg; + memset(&ov, 0, sizeof(ov)); + ov.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + SetLastError(0xdeadbeef); + ret = ConnectNamedPipe(pipe, &ov); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_IO_PENDING, "got error %lu\n", GetLastError()); + ret = WaitForSingleObject(ov.hEvent, 1000); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", ret); + CloseHandle(ov.hEvent); + return 0; +} + +static void test_CancelSynchronousIo(void) +{ + BOOL res; + HANDLE file; + HANDLE pipe; + HANDLE thread; + + /* bogus values */ + SetLastError(0xdeadbeef); + res = pCancelSynchronousIo((HANDLE)0xdeadbeef); + ok(!res, "CancelSynchronousIo succeeded unexpectedly\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_HANDLE, + "In CancelSynchronousIo failure, expected ERROR_INVALID_HANDLE, got %ld\n", GetLastError()); + + SetLastError(0xdeadbeef); + res = pCancelSynchronousIo(GetCurrentThread()); + ok(!res, "CancelSynchronousIo succeeded unexpectedly\n"); + todo_wine + ok(GetLastError() == ERROR_NOT_FOUND, + "In CancelSynchronousIo failure, expected ERROR_NOT_FOUND, got %ld\n", GetLastError()); + + /* synchronous i/o */ + pipe = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_DUPLEX, + PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, + 1, 1024, 1024, NMPWAIT_USE_DEFAULT_WAIT, NULL); + ok(pipe != INVALID_HANDLE_VALUE, "CreateNamedPipe failed with %lu\n", GetLastError()); + thread = CreateThread(NULL, 0, synchronousIoThreadMain, pipe, 0, NULL); + /* wait for thread to start listening */ + Sleep(100); + res = pCancelSynchronousIo(thread); + todo_wine + ok(res, "CancelSynchronousIo failed with error %ld\n", GetLastError()); + CloseHandle(pipe); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + + /* asynchronous i/o */ + pipe = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, + PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, + 1, 1024, 1024, NMPWAIT_USE_DEFAULT_WAIT, NULL); + ok(pipe != INVALID_HANDLE_VALUE, "CreateNamedPipe failed with %lu\n", GetLastError()); + thread = CreateThread(NULL, 0, synchronousIoThreadMain2, pipe, 0, NULL); + Sleep(100); + res = pCancelSynchronousIo(thread); + ok(!res, "CancelSynchronousIo succeeded unexpectedly\n"); + todo_wine + ok(GetLastError() == ERROR_NOT_FOUND, + "In CancelSynchronousIo failure, expected ERROR_NOT_FOUND, got %ld\n", GetLastError()); + file = CreateFileA(PIPENAME, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed (%ld)\n", GetLastError()); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + CloseHandle(file); + CloseHandle(pipe); +} + START_TEST(pipe) { char **argv; @@ -4212,6 +4303,7 @@ START_TEST(pipe) pDuplicateTokenEx = (void *) GetProcAddress(hmod, "DuplicateTokenEx"); hmod = GetModuleHandleA("kernel32.dll"); pCancelIoEx = (void *) GetProcAddress(hmod, "CancelIoEx"); + pCancelSynchronousIo = (void *) GetProcAddress(hmod, "CancelSynchronousIo"); pGetNamedPipeClientProcessId = (void *) GetProcAddress(hmod, "GetNamedPipeClientProcessId"); pGetNamedPipeServerProcessId = (void *) GetProcAddress(hmod, "GetNamedPipeServerProcessId"); pGetNamedPipeClientSessionId = (void *) GetProcAddress(hmod, "GetNamedPipeClientSessionId"); @@ -4282,4 +4374,5 @@ START_TEST(pipe) test_nowait(PIPE_TYPE_MESSAGE); test_GetOverlappedResultEx(); test_exit_process_async(); + test_CancelSynchronousIo(); } -- 2.25.1

2 6

[PATCH 0/7] MR12: crypt32: Fix short output string length handling in str.c plus a bit of refactoring
by Paul Gofman (＠gofman) 28 Apr '22

28 Apr '22

This is a resend of 233262-233269. Hans reviewed the previous version (https://www.winehq.org/pipermail/wine-devel/2022-April/214386.html) and I sent this one as the follow up with the only change fixing the compiler warning as test. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/12

2 7

[PATCH v5 1/2] include: Add winusb.h file.
by Mohamad Al-Jaf 28 Apr '22

28 Apr '22

Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v5: - Remove ddk/winusbio.h dependent entries --- include/Makefile.in | 1 + include/winusb.h | 59 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 include/winusb.h diff --git a/include/Makefile.in b/include/Makefile.in index 047e7ff9146..6654e877464 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -836,6 +836,7 @@ SOURCES = \ wintabx.h \ winternl.h \ wintrust.h \ + winusb.h \ winuser.h \ winuser.rh \ winver.h \ diff --git a/include/winusb.h b/include/winusb.h new file mode 100644 index 00000000000..e3c2cd366e6 --- /dev/null +++ b/include/winusb.h @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2022 Mohamad Al-Jaf + * + * 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 + */ + +#ifndef _WINUSB_H_ +#define _WINUSB_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +typedef PVOID WINUSB_INTERFACE_HANDLE, *PWINUSB_INTERFACE_HANDLE; + +typedef struct _WINUSB_SETUP_PACKET { + UCHAR RequestType; + UCHAR Request; + USHORT Value; + USHORT Index; + USHORT Length; +} WINUSB_SETUP_PACKET, *PWINUSB_SETUP_PACKET; + +BOOL WINAPI WinUsb_AbortPipe(WINUSB_INTERFACE_HANDLE,UCHAR); +BOOL WINAPI WinUsb_ControlTransfer(WINUSB_INTERFACE_HANDLE,WINUSB_SETUP_PACKET,PUCHAR,ULONG,PULONG,LPOVERLAPPED); +BOOL WINAPI WinUsb_FlushPipe(WINUSB_INTERFACE_HANDLE,UCHAR); +BOOL WINAPI WinUsb_Free(WINUSB_INTERFACE_HANDLE); +BOOL WINAPI WinUsb_GetAssociatedInterface(WINUSB_INTERFACE_HANDLE,UCHAR,PWINUSB_INTERFACE_HANDLE); +BOOL WINAPI WinUsb_GetCurrentAlternateSetting(WINUSB_INTERFACE_HANDLE,PUCHAR); +BOOL WINAPI WinUsb_GetDescriptor(WINUSB_INTERFACE_HANDLE,UCHAR,UCHAR,USHORT,PUCHAR,ULONG,PULONG); +BOOL WINAPI WinUsb_GetOverlappedResult(WINUSB_INTERFACE_HANDLE,LPOVERLAPPED,LPDWORD,BOOL); +BOOL WINAPI WinUsb_GetPipePolicy(WINUSB_INTERFACE_HANDLE,UCHAR,ULONG,PULONG,PVOID); +BOOL WINAPI WinUsb_GetPowerPolicy(WINUSB_INTERFACE_HANDLE,ULONG,PULONG,PVOID); +BOOL WINAPI WinUsb_Initialize(HANDLE,PWINUSB_INTERFACE_HANDLE); +BOOL WINAPI WinUsb_QueryDeviceInformation(WINUSB_INTERFACE_HANDLE,ULONG,PULONG,PVOID); +BOOL WINAPI WinUsb_ReadPipe(WINUSB_INTERFACE_HANDLE,UCHAR,PUCHAR,ULONG,PULONG,LPOVERLAPPED); +BOOL WINAPI WinUsb_ResetPipe(WINUSB_INTERFACE_HANDLE,UCHAR); +BOOL WINAPI WinUsb_SetCurrentAlternateSetting(WINUSB_INTERFACE_HANDLE,UCHAR); +BOOL WINAPI WinUsb_SetPipePolicy(WINUSB_INTERFACE_HANDLE,UCHAR,ULONG,ULONG,PVOID); +BOOL WINAPI WinUsb_SetPowerPolicy(WINUSB_INTERFACE_HANDLE,ULONG,ULONG,PVOID); +BOOL WINAPI WinUsb_WritePipe(WINUSB_INTERFACE_HANDLE,UCHAR,PUCHAR,ULONG,PULONG,LPOVERLAPPED); + +#ifdef __cplusplus +} +#endif + +#endif /* _WINUSB_H_ */ -- 2.35.2

3 4

[PATCH v2 1/3] winegstreamer: Ignore unset H264 format profile and level.
by Rémi Bernon 28 Apr '22

28 Apr '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winegstreamer/wg_format.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winegstreamer/wg_format.c b/dlls/winegstreamer/wg_format.c index 84163f1e5d7..b22581e7824 100644 --- a/dlls/winegstreamer/wg_format.c +++ b/dlls/winegstreamer/wg_format.c @@ -455,6 +455,8 @@ static GstCaps *wg_format_to_caps_h264(const struct wg_format *format) case eAVEncH264VProfile_444: profile = "high-4:4:4"; break; default: GST_FIXME("H264 profile attribute %u not implemented.", format->u.h264.profile); + /* fallthrough */ + case eAVEncH264VProfile_unknown: profile = NULL; break; } @@ -481,6 +483,8 @@ static GstCaps *wg_format_to_caps_h264(const struct wg_format *format) case eAVEncH264VLevel5_2: level = "5.2"; break; default: GST_FIXME("H264 level attribute %u not implemented.", format->u.h264.level); + /* fallthrough */ + case 0: level = NULL; break; } -- 2.35.1

2 5

[PATCH v2 1/3] winegstreamer: Reject incompatible input media types in MPEG audio decoder.
by Anton Baskanov 28 Apr '22

28 Apr '22

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- v2: * Removed cbSize check. * Simplified layer condition. --- dlls/quartz/tests/mpegaudio.c | 10 +++--- dlls/winegstreamer/quartz_transform.c | 52 +++++++++++++++++++++++++-- 2 files changed, 55 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/tests/mpegaudio.c b/dlls/quartz/tests/mpegaudio.c index cbf8ef393d2..84297884a6d 100644 --- a/dlls/quartz/tests/mpegaudio.c +++ b/dlls/quartz/tests/mpegaudio.c @@ -759,25 +759,25 @@ static void test_media_types(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IPin_QueryAccept(pin, &mp3_mt0); - todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); hr = IPin_QueryAccept(pin, &mp3_mt1); - todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); mt = mp2_mt; mt.majortype = GUID_NULL; hr = IPin_QueryAccept(pin, &mt); - todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); mt = mp2_mt; mt.subtype = MEDIASUBTYPE_PCM; hr = IPin_QueryAccept(pin, &mt); - todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); mt = mp2_mt; mt.formattype = GUID_NULL; hr = IPin_QueryAccept(pin, &mt); - todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); IPin_Release(pin); diff --git a/dlls/winegstreamer/quartz_transform.c b/dlls/winegstreamer/quartz_transform.c index 9665c56d848..4472e524dae 100644 --- a/dlls/winegstreamer/quartz_transform.c +++ b/dlls/winegstreamer/quartz_transform.c @@ -28,6 +28,13 @@ struct transform struct strmbase_sink sink; struct strmbase_source source; + + const struct transform_ops *ops; +}; + +struct transform_ops +{ + HRESULT (*sink_query_accept)(struct transform *filter, const AM_MEDIA_TYPE *mt); }; static inline struct transform *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -62,6 +69,13 @@ static const struct strmbase_filter_ops filter_ops = .filter_destroy = transform_destroy, }; +static HRESULT transform_sink_query_accept(struct strmbase_pin *pin, const AM_MEDIA_TYPE *mt) +{ + struct transform *filter = impl_from_strmbase_filter(pin->filter); + + return filter->ops->sink_query_accept(filter, mt); +} + static HRESULT transform_sink_query_interface(struct strmbase_pin *pin, REFIID iid, void **out) { struct transform *filter = impl_from_strmbase_filter(pin->filter); @@ -77,6 +91,7 @@ static HRESULT transform_sink_query_interface(struct strmbase_pin *pin, REFIID i static const struct strmbase_sink_ops sink_ops = { + .base.pin_query_accept = transform_sink_query_accept, .base.pin_query_interface = transform_sink_query_interface, }; @@ -86,7 +101,7 @@ static const struct strmbase_source_ops source_ops = .pfnDecideAllocator = BaseOutputPinImpl_DecideAllocator, }; -static HRESULT transform_create(IUnknown *outer, const CLSID *clsid, struct transform **out) +static HRESULT transform_create(IUnknown *outer, const CLSID *clsid, const struct transform_ops *ops, struct transform **out) { struct transform *object; @@ -98,16 +113,49 @@ static HRESULT transform_create(IUnknown *outer, const CLSID *clsid, struct tran strmbase_sink_init(&object->sink, &object->filter, L"In", &sink_ops, NULL); strmbase_source_init(&object->source, &object->filter, L"Out", &source_ops); + object->ops = ops; + *out = object; return S_OK; } +static HRESULT mpeg_audio_codec_sink_query_accept(struct transform *filter, const AM_MEDIA_TYPE *mt) +{ + const MPEG1WAVEFORMAT *format; + + if (!IsEqualGUID(&mt->majortype, &MEDIATYPE_Audio)) + return S_FALSE; + + if (!IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_MPEG1Packet) + && !IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_MPEG1Payload) + && !IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_MPEG1AudioPayload) + && !IsEqualGUID(&mt->subtype, &GUID_NULL)) + return S_FALSE; + + if (!IsEqualGUID(&mt->formattype, &FORMAT_WaveFormatEx) + || mt->cbFormat < sizeof(MPEG1WAVEFORMAT)) + return S_FALSE; + + format = (const MPEG1WAVEFORMAT *)mt->pbFormat; + + if (format->wfx.wFormatTag != WAVE_FORMAT_MPEG + || format->fwHeadLayer == ACM_MPEG_LAYER3) + return S_FALSE; + + return S_OK; +} + +static const struct transform_ops mpeg_audio_codec_transform_ops = +{ + mpeg_audio_codec_sink_query_accept, +}; + HRESULT mpeg_audio_codec_create(IUnknown *outer, IUnknown **out) { struct transform *object; HRESULT hr; - hr = transform_create(outer, &CLSID_CMpegAudioCodec, &object); + hr = transform_create(outer, &CLSID_CMpegAudioCodec, &mpeg_audio_codec_transform_ops, &object); if (FAILED(hr)) return hr; -- 2.34.1

2 5

[PATCH v2 0/10] MR6: Avoid performance degradation due to vDSO unmapping (BZ#52313)
by Jinoh Kang (＠iamahuman) 28 Apr '22

28 Apr '22

Commit f558741fabc116534fa598aa890ffed683a7153b removes vDSO if it conflicts with reserved ranges: > Remove the AT_SYSINFO and AT_SYSINFO_EHDR values if the sysinfo page > is in one of our reserved ranges. However, missing vDSO leads to performance issues on some syscalls (e.g. clock_gettime, gettimeofday) and may even lead to crash when run with some ancient C libraries that does not supply a custom signal restorer. vDSO pages can clash with reserved ranges especially in a 32-bit address space with address space layout randomization (ASLR) turned on. Recent versions of the Linux kernel introduced support for mremap()-ping vDSO pages, partly in an effort to support checkpoint restore in userspace (CRIU). Special programs that require specific memory layout constraints (such as Wine preloader) can take advantage of this support to modify the address space to meet its requirements. The following test script has been used to test each changes (use with `git rebase --exec=...`): ```sh set -e make -C ../wine64-build -j5 make -C ../wine32-build -j5 cd ../wine64-build export WINEPRELOADREMAPSTACK export WINEPRELOADREMAPVDSO for WINEPRELOADREMAPSTACK in skip never always force auto on-demand '' do for WINEPRELOADREMAPVDSO in skip never always force auto on-demand '' do ./loader/wine64 wineboot ./loader/wine wineboot done done ``` -- v2: loader: Enable all remap logic by default. loader: Switch stack if the old stack address is in reserved range. loader: Relocate sigpage on conflict with reserved ranges in ARM. loader: Relocate vDSO on conflict with reserved ranges. loader: Fix return type of get_auxiliary(). loader: Don't clobber existing memory mappings when reserving addresses. loader: Explicitly munmap() the preloader's ELF EHDR. loader: Generalise is_addr_reserved to find overlapping address ranges. loader: Refactor number parsing to own function. loader: Refactor argv/envp/auxv management. https://gitlab.winehq.org/wine/wine/-/merge_requests/6

2 11

[PATCH] uiautomationcore: Make hwnd_host_provider_vtbl static const.
by Connor McAdams 28 Apr '22

28 Apr '22

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/uia_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index c250d82a1e6..a303e71cf76 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -247,7 +247,7 @@ HRESULT WINAPI hwnd_host_provider_get_HostRawElementProvider(IRawElementProvider return S_OK; } -IRawElementProviderSimpleVtbl hwnd_host_provider_vtbl = { +static const IRawElementProviderSimpleVtbl hwnd_host_provider_vtbl = { hwnd_host_provider_QueryInterface, hwnd_host_provider_AddRef, hwnd_host_provider_Release, -- 2.25.1

1 0

[PATCH] include: Add WINE_ALLOC_SIZE attribute to heap_calloc().
by Brendan Shanks 28 Apr '22

28 Apr '22

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- This is a C99 variadic macro, but I tested with GCC 4.5 and it seemed supported in all modes (including the default). include/wine/heap.h | 2 +- include/winnt.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/wine/heap.h b/include/wine/heap.h index 97d3a5662be..fb687c92393 100644 --- a/include/wine/heap.h +++ b/include/wine/heap.h @@ -46,7 +46,7 @@ static inline void heap_free(void *mem) HeapFree(GetProcessHeap(), 0, mem); } -static inline void *heap_calloc(SIZE_T count, SIZE_T size) +static inline void * __WINE_ALLOC_SIZE(1,2) heap_calloc(SIZE_T count, SIZE_T size) { SIZE_T len = count * size; diff --git a/include/winnt.h b/include/winnt.h index e853ddbc7ae..79df4259f59 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -199,9 +199,9 @@ extern "C" { #endif #if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3))) -#define __WINE_ALLOC_SIZE(x) __attribute__((__alloc_size__(x))) +#define __WINE_ALLOC_SIZE(...) __attribute__((__alloc_size__(__VA_ARGS__))) #else -#define __WINE_ALLOC_SIZE(x) +#define __WINE_ALLOC_SIZE(...) #endif /* Anonymous union/struct handling */ -- 2.35.1

2 1

[PATCH vkd3d 1/4] vkd3d: Introduce an internal refcount to d3d12_fence to replace the thread waiting mechanism.
by Conor McCarthy 28 Apr '22

28 Apr '22

This simplifies the preservation of fence objects until worker threads are done with them, and will be needed when threaded queue submission is added. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/command.c | 72 ++++++++++++-------------------------- libs/vkd3d/vkd3d_private.h | 4 +-- 2 files changed, 24 insertions(+), 52 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 09171fe4..7a373b34 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -20,6 +20,8 @@ #include "vkd3d_private.h" +static void d3d12_fence_incref(struct d3d12_fence *fence); +static void d3d12_fence_decref(struct d3d12_fence *fence); static HRESULT d3d12_fence_signal(struct d3d12_fence *fence, uint64_t value, VkFence vk_fence); HRESULT vkd3d_queue_create(struct d3d12_device *device, @@ -295,7 +297,7 @@ static HRESULT vkd3d_enqueue_gpu_fence(struct vkd3d_fence_worker *worker, waiting_fence->queue_sequence_number = queue_sequence_number; ++worker->enqueued_fence_count; - InterlockedIncrement(&fence->pending_worker_operation_count); + d3d12_fence_incref(fence); vkd3d_cond_signal(&worker->cond); vkd3d_mutex_unlock(&worker->mutex); @@ -303,37 +305,6 @@ static HRESULT vkd3d_enqueue_gpu_fence(struct vkd3d_fence_worker *worker, return S_OK; } -static void vkd3d_fence_worker_remove_fence(struct vkd3d_fence_worker *worker, struct d3d12_fence *fence) -{ - LONG count; - int rc; - - if (!(count = InterlockedAdd(&fence->pending_worker_operation_count, 0))) - return; - - WARN("Waiting for %u pending fence operations (fence %p).\n", count, fence); - - if ((rc = vkd3d_mutex_lock(&worker->mutex))) - { - ERR("Failed to lock mutex, error %d.\n", rc); - return; - } - - while ((count = InterlockedAdd(&fence->pending_worker_operation_count, 0))) - { - TRACE("Still waiting for %u pending fence operations (fence %p).\n", count, fence); - - worker->pending_fence_destruction = true; - vkd3d_cond_signal(&worker->cond); - - vkd3d_cond_wait(&worker->fence_destruction_cond, &worker->mutex); - } - - TRACE("Removed fence %p.\n", fence); - - vkd3d_mutex_unlock(&worker->mutex); -} - static void vkd3d_fence_worker_move_enqueued_fences_locked(struct vkd3d_fence_worker *worker) { unsigned int i; @@ -432,7 +403,7 @@ static void vkd3d_wait_for_gpu_timeline_semaphores(struct vkd3d_fence_worker *wo if (FAILED(hr = d3d12_fence_signal(current->fence, counter_value, VK_NULL_HANDLE))) ERR("Failed to signal D3D12 fence, hr %#x.\n", hr); - InterlockedDecrement(&current->fence->pending_worker_operation_count); + d3d12_fence_decref(current->fence); continue; } @@ -480,7 +451,7 @@ static void vkd3d_wait_for_gpu_fences(struct vkd3d_fence_worker *worker) if (FAILED(hr = d3d12_fence_signal(current->fence, current->value, vk_fence))) ERR("Failed to signal D3D12 fence, hr %#x.\n", hr); - InterlockedDecrement(&current->fence->pending_worker_operation_count); + d3d12_fence_decref(current->fence); vkd3d_queue_update_sequence_number(current->queue, current->queue_sequence_number, device); continue; @@ -518,12 +489,6 @@ static void *vkd3d_fence_worker_main(void *arg) break; } - if (worker->pending_fence_destruction) - { - vkd3d_cond_broadcast(&worker->fence_destruction_cond); - worker->pending_fence_destruction = false; - } - if (worker->enqueued_fence_count) { vkd3d_fence_worker_move_enqueued_fences_locked(worker); @@ -560,7 +525,6 @@ HRESULT vkd3d_fence_worker_start(struct vkd3d_fence_worker *worker, TRACE("worker %p.\n", worker); worker->should_exit = false; - worker->pending_fence_destruction = false; worker->device = device; worker->enqueued_fence_count = 0; @@ -1026,22 +990,35 @@ static ULONG STDMETHODCALLTYPE d3d12_fence_AddRef(ID3D12Fence *iface) return refcount; } +static void d3d12_fence_incref(struct d3d12_fence *fence) +{ + InterlockedIncrement(&fence->internal_refcount); +} + static ULONG STDMETHODCALLTYPE d3d12_fence_Release(ID3D12Fence *iface) { struct d3d12_fence *fence = impl_from_ID3D12Fence(iface); ULONG refcount = InterlockedDecrement(&fence->refcount); - int rc; TRACE("%p decreasing refcount to %u.\n", fence, refcount); if (!refcount) + d3d12_fence_decref(fence); + + return refcount; +} + +static void d3d12_fence_decref(struct d3d12_fence *fence) +{ + ULONG internal_refcount = InterlockedDecrement(&fence->internal_refcount); + int rc; + + if (!internal_refcount) { struct d3d12_device *device = fence->device; vkd3d_private_store_destroy(&fence->private_store); - vkd3d_fence_worker_remove_fence(&device->fence_worker, fence); - d3d12_fence_destroy_vk_objects(fence); vkd3d_free(fence->events); @@ -1052,8 +1029,6 @@ static ULONG STDMETHODCALLTYPE d3d12_fence_Release(ID3D12Fence *iface) d3d12_device_release(device); } - - return refcount; } static HRESULT STDMETHODCALLTYPE d3d12_fence_GetPrivateData(ID3D12Fence *iface, @@ -1380,6 +1355,7 @@ static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device * int rc; fence->ID3D12Fence_iface.lpVtbl = &d3d12_fence_vtbl; + fence->internal_refcount = 1; fence->refcount = 1; fence->value = initial_value; @@ -1419,8 +1395,6 @@ static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device * memset(fence->old_vk_fences, 0, sizeof(fence->old_vk_fences)); - fence->pending_worker_operation_count = 0; - if (FAILED(hr = vkd3d_private_store_init(&fence->private_store))) { vkd3d_mutex_destroy(&fence->mutex); @@ -6496,7 +6470,7 @@ static HRESULT vkd3d_enqueue_timeline_semaphore(struct vkd3d_fence_worker *worke waiting_fence->queue = queue; ++worker->enqueued_fence_count; - InterlockedIncrement(&fence->pending_worker_operation_count); + d3d12_fence_incref(fence); vkd3d_cond_signal(&worker->cond); vkd3d_mutex_unlock(&worker->mutex); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 56060b6d..a0163c8d 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -346,7 +346,6 @@ struct vkd3d_fence_worker struct vkd3d_cond cond; struct vkd3d_cond fence_destruction_cond; bool should_exit; - bool pending_fence_destruction; LONG enqueued_fence_count; struct vkd3d_enqueued_fence @@ -532,6 +531,7 @@ struct vkd3d_pending_fence_wait struct d3d12_fence { ID3D12Fence ID3D12Fence_iface; + LONG internal_refcount; LONG refcount; uint64_t value; @@ -555,8 +555,6 @@ struct d3d12_fence struct list semaphores; unsigned int semaphore_count; - LONG pending_worker_operation_count; - VkFence old_vk_fences[VKD3D_MAX_VK_SYNC_OBJECTS]; struct d3d12_device *device; -- 2.35.1

4 7

[PATCH 1/3] wined3d: Refuse blits between height-scaled formats in the CPU blitter.
by Zebediah Figura 28 Apr '22

28 Apr '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/surface.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3216439f32b..5feeba3be2d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -853,6 +853,14 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int goto release; } + if ((src_fmt_flags | dst_fmt_flags) & WINED3DFMT_FLAG_HEIGHT_SCALE) + { + FIXME("Unsupported blit between height-scaled formats (src %s, dst %s).\n", + debug_d3dformat(src_format->id), debug_d3dformat(dst_format->id)); + hr = E_NOTIMPL; + goto release; + } + if (filter != WINED3D_TEXF_NONE && filter != WINED3D_TEXF_POINT && (src_width != dst_width || src_height != dst_height)) { -- 2.35.1

2 5

[PATCH v2 1/2] programs/sc: Add tests.
by Torge Matthies 28 Apr '22

28 Apr '22

Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> --- configure.ac | 1 + programs/sc/tests/Makefile.in | 5 + programs/sc/tests/sc.c | 363 ++++++++++++++++++++++++++++++++++ 3 files changed, 369 insertions(+) create mode 100644 programs/sc/tests/Makefile.in create mode 100644 programs/sc/tests/sc.c diff --git a/configure.ac b/configure.ac index 74c80fd7fa8c..98f56fc849fa 100644 --- a/configure.ac +++ b/configure.ac @@ -3322,6 +3322,7 @@ WINE_CONFIG_MAKEFILE(programs/rpcss) WINE_CONFIG_MAKEFILE(programs/rundll.exe16,enable_win16) WINE_CONFIG_MAKEFILE(programs/rundll32) WINE_CONFIG_MAKEFILE(programs/sc) +WINE_CONFIG_MAKEFILE(programs/sc/tests) WINE_CONFIG_MAKEFILE(programs/schtasks) WINE_CONFIG_MAKEFILE(programs/schtasks/tests) WINE_CONFIG_MAKEFILE(programs/sdbinst) diff --git a/programs/sc/tests/Makefile.in b/programs/sc/tests/Makefile.in new file mode 100644 index 000000000000..24a875fb9051 --- /dev/null +++ b/programs/sc/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = sc.exe +IMPORTS = advapi32 + +C_SRCS = \ + sc.c diff --git a/programs/sc/tests/sc.c b/programs/sc/tests/sc.c new file mode 100644 index 000000000000..7d41ac14cb27 --- /dev/null +++ b/programs/sc/tests/sc.c @@ -0,0 +1,363 @@ +/* + * Copyright 2022 Torge Matthies for CodeWeavers + * + * 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 + */ + +#include <windows.h> +#include <winsvc.h> +#include <stdio.h> +#include "wine/test.h" + +#define lok ok_(__FILE__,line) + +#define TEST_SERVICE_NAME "wine_test_svc" +#define TEST_SERVICE_NAME2 "wine_test_svc_2" +#define TEST_SERVICE_BINARY "c:\\windows\\system32\\cmd.exe" +#define TEST_SERVICE_BINARY_START_BOOT "\\SystemRoot\\system32\\cmd.exe" +#define TEST_SERVICE_BINARY_START_SYSTEM "\\??\\" TEST_SERVICE_BINARY + +#define SC_EXIT_SUCCESS ERROR_SUCCESS +#define SC_EXIT_INVALID_PARAMETER ERROR_INVALID_PARAMETER +#define SC_EXIT_CIRCULAR_DEPENDENCY ERROR_CIRCULAR_DEPENDENCY +#define SC_EXIT_SERVICE_DOES_NOT_EXIST ERROR_SERVICE_DOES_NOT_EXIST +#define SC_EXIT_SERVICE_EXISTS ERROR_SERVICE_EXISTS +#define SC_EXIT_INVALID_COMMAND_LINE ERROR_INVALID_COMMAND_LINE + +static HANDLE nul_file; +static SC_HANDLE scmgr; + +/* Copied and modified from the reg.exe tests */ +#define run_sc_exe(c,r) run_sc_exe_(__FILE__,__LINE__,c,r) +static BOOL run_sc_exe_(const char *file, unsigned line, const char *cmd, DWORD *rc) +{ + STARTUPINFOA si = {sizeof(STARTUPINFOA)}; + PROCESS_INFORMATION pi; + BOOL bret; + DWORD ret; + char cmdline[256]; + + si.dwFlags = STARTF_USESTDHANDLES; + si.hStdInput = nul_file; + si.hStdOutput = nul_file; + si.hStdError = nul_file; + + strcpy(cmdline, cmd); + if (!CreateProcessA(NULL, cmdline, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi)) + return FALSE; + + ret = WaitForSingleObject(pi.hProcess, 10000); + if (ret == WAIT_TIMEOUT) + TerminateProcess(pi.hProcess, 1); + + bret = GetExitCodeProcess(pi.hProcess, rc); + lok(bret, "GetExitCodeProcess failed: %ld\n", GetLastError()); + + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + return bret; +} + +#define BROKEN_CREATE 0x000000001UL +#define BROKEN_BINPATH 0x000000002UL +#define BROKEN_TYPE 0x000000004UL +#define BROKEN_START 0x000000008UL +#define BROKEN_ERROR 0x000000010UL +#define BROKEN_DEPEND 0x000000020UL +#define BROKEN_DISPLAY_NAME 0x000000040UL +#define BROKEN_DELAYED_AUTO_START 0x000000080UL +#define BROKEN_ALL ~0UL + +#define SERVICE_DELAYED_AUTO_START (SERVICE_AUTO_START | 0x80000000) + +#define check_service_definition(n,bi,t,s,e,de,di,br) check_service_definition_(__FILE__,__LINE__,n,bi,t,s,e,de,di,br) +static void check_service_definition_(const char *file, unsigned line, char const *name, + const char *binpath, DWORD type, DWORD start, DWORD error, + const char *depend, const char *display_name, DWORD broken) +{ + SERVICE_DELAYED_AUTO_START_INFO delayed_auto_info = {0}; + union { + char buffer[8192]; + QUERY_SERVICE_CONFIGA config; + } cfg; + BOOL delayed_auto; + SC_HANDLE svc; + DWORD needed; + BOOL ret; + + delayed_auto = !!(start & 0x80000000); + start &= ~0x80000000; + + if (!scmgr) + return; + + svc = OpenServiceA(scmgr, name, GENERIC_READ); + todo_wine_if(broken & BROKEN_CREATE) + lok(!!svc, "OpenServiceA failed: %ld\n", GetLastError()); + if (!svc) + return; + + ret = QueryServiceConfigA(svc, &cfg.config, sizeof(cfg.buffer), &needed); + lok(!!ret, "QueryServiceConfigA failed: %ld\n", GetLastError()); + if (!ret) + goto done; + + ret = QueryServiceConfig2A(svc, SERVICE_CONFIG_DELAYED_AUTO_START_INFO, (LPBYTE)&delayed_auto_info, + sizeof(delayed_auto_info), &needed); + todo_wine lok(!!ret, "QueryServiceConfig2A(SERVICE_CONFIG_DELAYED_AUTO_START_INFO) failed: %ld\n", + GetLastError()); + +#define check_str(a, b, msg) lok((a) && (b) && (a) != (b) && !strcmp((a), (b)), msg ": %s != %s\n", \ + debugstr_a((a)), debugstr_a((b))) +#define check_dw(a, b, msg) lok((a) == (b), msg ": 0x%lx != 0x%lx\n", a, b) + + todo_wine_if(broken & BROKEN_BINPATH) + check_str(cfg.config.lpBinaryPathName, binpath, "Wrong binary path"); + todo_wine_if(broken & BROKEN_TYPE) + check_dw(cfg.config.dwServiceType, type, "Wrong service type"); + todo_wine_if(broken & BROKEN_START) + check_dw(cfg.config.dwStartType, start, "Wrong start type"); + todo_wine_if(broken & BROKEN_ERROR) + check_dw(cfg.config.dwErrorControl, error, "Wrong error control"); + todo_wine_if(broken & BROKEN_DEPEND) + check_str(cfg.config.lpDependencies, depend, "Wrong dependencies"); + todo_wine_if(broken & BROKEN_DISPLAY_NAME) + check_str(cfg.config.lpDisplayName, display_name, "Wrong display name"); + todo_wine_if(broken & BROKEN_DELAYED_AUTO_START) + check_dw((DWORD)delayed_auto_info.fDelayedAutostart, (DWORD)delayed_auto, "Wrong delayed autostart value"); + +#undef check_dw +#undef check_str + +done: + CloseServiceHandle(svc); +} + +#define delete_service(n,e,b) delete_service_(__FILE__,__LINE__,n,e,b) +static void delete_service_(const char *file, unsigned line, const char *name, DWORD expected_status, BOOL broken) +{ + char command[256]; + BOOL bret; + DWORD r; + + strcpy(command, "sc delete "); + strcat(command, name); + bret = run_sc_exe_(file, line, command, &r); + lok(bret, "run_sc_exe failed\n"); + if (expected_status != SC_EXIT_SUCCESS && !strcmp(winetest_platform, "wine")) + expected_status = 1; + todo_wine_if(broken) lok(r == expected_status, "got exit code %ld, expected %ld\n", r, expected_status); +} + +static void test_create_service(void) +{ + static struct { + const char *param; + DWORD expected_start_type; + DWORD expected_service_type; + const char * expected_binary_path; + } start_types[] = { + { "boot type= kernel", SERVICE_BOOT_START, SERVICE_KERNEL_DRIVER, TEST_SERVICE_BINARY_START_BOOT }, + { "system type= kernel", SERVICE_SYSTEM_START, SERVICE_KERNEL_DRIVER, TEST_SERVICE_BINARY_START_SYSTEM }, + { "auto", SERVICE_AUTO_START, SERVICE_WIN32_OWN_PROCESS, TEST_SERVICE_BINARY }, + { "demand", SERVICE_DEMAND_START, SERVICE_WIN32_OWN_PROCESS, TEST_SERVICE_BINARY }, + { "disabled", SERVICE_DISABLED, SERVICE_WIN32_OWN_PROCESS, TEST_SERVICE_BINARY }, + { "delayed-auto", SERVICE_DELAYED_AUTO_START, SERVICE_WIN32_OWN_PROCESS, TEST_SERVICE_BINARY } + }; + static struct { + const char *param; + DWORD expected_error_control; + } error_severities[] = { + { "normal", SERVICE_ERROR_NORMAL }, + { "severe", SERVICE_ERROR_SEVERE }, + { "critical", SERVICE_ERROR_CRITICAL }, + { "ignore", SERVICE_ERROR_IGNORE } + }; + unsigned int i; + DWORD r; + +#define check_exit_code(x) ok(r == (x), "got exit code %ld, expected %d\n", r, (x)) +#define check_test_service(t,s,e,de,di,br) \ + check_service_definition(TEST_SERVICE_NAME, TEST_SERVICE_BINARY, t, s, e, de, di ? di : TEST_SERVICE_NAME, br) +#define delete_test_service(x, y) \ + delete_service(TEST_SERVICE_NAME, (x) ? SC_EXIT_SUCCESS : SC_EXIT_SERVICE_DOES_NOT_EXIST, (y)) +#define check_test_service2(t,s,e,de,di,br) \ + check_service_definition(TEST_SERVICE_NAME2, TEST_SERVICE_BINARY, t, s, e, de, di ? di : TEST_SERVICE_NAME2, br) +#define delete_test_service2(x, y) \ + delete_service(TEST_SERVICE_NAME2, (x) ? SC_EXIT_SUCCESS : SC_EXIT_SERVICE_DOES_NOT_EXIST, (y)) + + /* too few parameters */ + + run_sc_exe("sc create", &r); + todo_wine check_exit_code(SC_EXIT_INVALID_COMMAND_LINE); + delete_test_service(FALSE, FALSE); + + run_sc_exe("sc create " TEST_SERVICE_NAME, &r); + todo_wine check_exit_code(SC_EXIT_INVALID_COMMAND_LINE); + delete_test_service(FALSE, FALSE); + + /* binpath= */ + + run_sc_exe("sc create " TEST_SERVICE_NAME " binpath= \"" TEST_SERVICE_BINARY "\"", &r); + todo_wine check_exit_code(SC_EXIT_SUCCESS); + check_test_service(SERVICE_WIN32_OWN_PROCESS, SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL, "", NULL, + BROKEN_CREATE); + + /* existing service */ + + run_sc_exe("sc create " TEST_SERVICE_NAME " binpath= \"" TEST_SERVICE_BINARY "\" start= auto", &r); + todo_wine check_exit_code(SC_EXIT_SERVICE_EXISTS); + check_test_service(SERVICE_WIN32_OWN_PROCESS, SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL, "", NULL, + BROKEN_CREATE); + delete_test_service(TRUE, TRUE); + + /* type= */ + + run_sc_exe("sc create " TEST_SERVICE_NAME " binpath= \"" TEST_SERVICE_BINARY "\" type= invalid", &r); + todo_wine check_exit_code(SC_EXIT_INVALID_COMMAND_LINE); + delete_test_service(FALSE, FALSE); + + run_sc_exe("sc create " TEST_SERVICE_NAME " binpath= \"" TEST_SERVICE_BINARY "\" type= own", &r); + todo_wine check_exit_code(SC_EXIT_SUCCESS); + check_test_service(SERVICE_WIN32_OWN_PROCESS, SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL, "", NULL, + BROKEN_CREATE); + delete_test_service(TRUE, TRUE); + + run_sc_exe("sc create " TEST_SERVICE_NAME " binpath= \"" TEST_SERVICE_BINARY "\" type= interact", &r); + todo_wine check_exit_code(SC_EXIT_INVALID_PARAMETER); + delete_test_service(FALSE, FALSE); + + run_sc_exe("sc create " TEST_SERVICE_NAME " binpath= \"" TEST_SERVICE_BINARY "\" type= interact type= own", &r); + todo_wine check_exit_code(SC_EXIT_SUCCESS); + check_test_service(SERVICE_WIN32_OWN_PROCESS | SERVICE_INTERACTIVE_PROCESS, SERVICE_DEMAND_START, + SERVICE_ERROR_NORMAL, "", NULL, BROKEN_CREATE); + delete_test_service(TRUE, TRUE); + + /* start= */ + + run_sc_exe("sc create " TEST_SERVICE_NAME " binpath= \"" TEST_SERVICE_BINARY "\" start= invalid", &r); + todo_wine check_exit_code(SC_EXIT_INVALID_COMMAND_LINE); + delete_test_service(FALSE, FALSE); + + for (i = 0; i < ARRAY_SIZE(start_types); i++) + { + char cmdline[256]; + + strcpy(cmdline, "sc create " TEST_SERVICE_NAME " binpath= \"" TEST_SERVICE_BINARY "\" start= "); + strcat(cmdline, start_types[i].param); + run_sc_exe(cmdline, &r); + todo_wine check_exit_code(SC_EXIT_SUCCESS); + check_service_definition(TEST_SERVICE_NAME, start_types[i].expected_binary_path, + start_types[i].expected_service_type, start_types[i].expected_start_type, + SERVICE_ERROR_NORMAL, "", TEST_SERVICE_NAME, BROKEN_CREATE); + delete_test_service(TRUE, TRUE); + } + + /* error= */ + + for (i = 0; i < ARRAY_SIZE(error_severities); i++) + { + char cmdline[256]; + + strcpy(cmdline, "sc create " TEST_SERVICE_NAME " binpath= \"" TEST_SERVICE_BINARY "\" error= "); + strcat(cmdline, error_severities[i].param); + run_sc_exe(cmdline, &r); + todo_wine check_exit_code(SC_EXIT_SUCCESS); + check_test_service(SERVICE_WIN32_OWN_PROCESS, SERVICE_DEMAND_START, + error_severities[i].expected_error_control, "", NULL, BROKEN_CREATE); + delete_test_service(TRUE, TRUE); + } + + /* tag= */ + + run_sc_exe("sc create " TEST_SERVICE_NAME " binpath= \"" TEST_SERVICE_BINARY "\" tag= yes", &r); + todo_wine check_exit_code(SC_EXIT_INVALID_PARAMETER); + delete_test_service(FALSE, FALSE); + + run_sc_exe("sc create " TEST_SERVICE_NAME " binpath= \"" TEST_SERVICE_BINARY "\" tag= no", &r); + todo_wine check_exit_code(SC_EXIT_SUCCESS); + check_test_service(SERVICE_WIN32_OWN_PROCESS, SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL, "", NULL, + BROKEN_CREATE); + delete_test_service(TRUE, TRUE); + + /* depend= */ + + run_sc_exe("sc create " TEST_SERVICE_NAME " binpath= \"" TEST_SERVICE_BINARY "\" depend= " TEST_SERVICE_NAME, &r); + todo_wine check_exit_code(SC_EXIT_CIRCULAR_DEPENDENCY); + delete_test_service(FALSE, FALSE); + + run_sc_exe("sc create " TEST_SERVICE_NAME2 " binpath= \"" TEST_SERVICE_BINARY "\" depend= " TEST_SERVICE_NAME, &r); + todo_wine check_exit_code(SC_EXIT_SUCCESS); + check_test_service2(SERVICE_WIN32_OWN_PROCESS, SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL, + TEST_SERVICE_NAME, NULL, BROKEN_CREATE); + delete_test_service2(TRUE, TRUE); + + run_sc_exe("sc create " TEST_SERVICE_NAME " binpath= " TEST_SERVICE_BINARY, &r); + todo_wine check_exit_code(SC_EXIT_SUCCESS); + run_sc_exe("sc create " TEST_SERVICE_NAME2 " binpath= \"" TEST_SERVICE_BINARY "\" depend= " TEST_SERVICE_NAME, &r); + todo_wine check_exit_code(SC_EXIT_SUCCESS); + check_test_service2(SERVICE_WIN32_OWN_PROCESS, SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL, + TEST_SERVICE_NAME, NULL, BROKEN_CREATE); + delete_test_service2(TRUE, TRUE); + delete_test_service(TRUE, TRUE); + + /* displayname= */ + + run_sc_exe("sc create " TEST_SERVICE_NAME " binpath= " TEST_SERVICE_BINARY + " displayname= \"Wine Test Service\"", &r); + todo_wine check_exit_code(SC_EXIT_SUCCESS); + check_test_service(SERVICE_WIN32_OWN_PROCESS, SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL, "", + "Wine Test Service", BROKEN_CREATE); + delete_test_service(TRUE, TRUE); + + /* without spaces */ + + run_sc_exe("sc create " TEST_SERVICE_NAME2 " binpath=\"" TEST_SERVICE_BINARY "\" type=own start=auto" + " error=normal tag=no depend=" TEST_SERVICE_NAME " displayname=\"Wine Test Service\"", &r); + check_exit_code(SC_EXIT_SUCCESS); + check_test_service2(SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, SERVICE_ERROR_NORMAL, + TEST_SERVICE_NAME, "Wine Test Service", BROKEN_DEPEND); + delete_test_service2(TRUE, FALSE); + + /* case-insensitive */ + + run_sc_exe("SC CREATE " TEST_SERVICE_NAME2 " BINPATH= \"" TEST_SERVICE_BINARY "\" TYPE= OWN START= AUTO" + " ERROR= NORMAL TAG= NO DEPEND= " TEST_SERVICE_NAME " DISPLAYNAME= \"Wine Test Service\"", &r); + todo_wine check_exit_code(SC_EXIT_SUCCESS); + check_test_service2(SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, SERVICE_ERROR_NORMAL, + TEST_SERVICE_NAME, "Wine Test Service", BROKEN_CREATE); + delete_test_service2(TRUE, TRUE); + +#undef delete_test_service2 +#undef check_test_service2 +#undef delete_test_service +#undef check_test_service +#undef check_exit_code +} + +START_TEST(sc) +{ + SECURITY_ATTRIBUTES secattr = {sizeof(SECURITY_ATTRIBUTES), NULL, TRUE}; + nul_file = CreateFileA("NUL", GENERIC_READ | GENERIC_WRITE, 0, &secattr, OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, NULL); + + scmgr = OpenSCManagerA(NULL, NULL, GENERIC_READ); + ok(!!scmgr, "OpenSCManagerA failed: %ld\n", GetLastError()); + + test_create_service(); + + CloseServiceHandle(scmgr); + CloseHandle(nul_file); +} -- 2.36.0

2 3

[PATCH v2 6/6] wineoss: Combine midReceiveChar() into handle_midi_data().
by Andrew Eikum 28 Apr '22

28 Apr '22

From: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 39 ++++++++++++++------------------------- 1 file changed, 14 insertions(+), 25 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 564a2431472..e36a737624a 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -304,39 +304,28 @@ static void handle_regular_data(struct midi_src *src, unsigned char value, UINT } } -/************************************************************************** - * midReceiveChar [internal] - */ -static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime) -{ - TRACE("Adding %02xh to %d[%d]\n", value, wDevID, MidiInDev[wDevID].incLen); - - if (wDevID >= MIDM_NumDevs) { - WARN("bad devID\n"); - return; - } - if (MidiInDev[wDevID].state <= 0) { - TRACE("disabled or input not started, thrown away\n"); - return; - } - - dwTime -= MidiInDev[wDevID].startTime; - - if (value == 0xf0 || MidiInDev[wDevID].state & 2) /* system exclusive */ - handle_sysex_data(MidiInDev + wDevID, value, dwTime); - else - handle_regular_data(MidiInDev + wDevID, value, dwTime); -} - static void handle_midi_data(unsigned char *buffer, unsigned int len) { unsigned int time = GetTickCount(), i; + struct midi_src *src; + unsigned char value; + WORD dev_id; for (i = 0; i < len; i += (buffer[i] & 0x80) ? 8 : 4) { if (buffer[i] != SEQ_MIDIPUTC) continue; - midReceiveChar(buffer[i + 2], buffer[i + 1], time); + dev_id = buffer[i + 2]; + value = buffer[i + 1]; + + if (dev_id >= MIDM_NumDevs) continue; + src = MidiInDev + dev_id; + if (src->state <= 0) continue; + + if (value == 0xf0 || src->state & 2) /* system exclusive */ + handle_sysex_data(src, value, time - src->startTime); + else + handle_regular_data(src, value, time - src->startTime); } } -- 2.36.0

1 0

[PATCH v2 5/6] wineoss: Make the MIM_LONGDATA time relative to the start time.
by Andrew Eikum 28 Apr '22

28 Apr '22

From: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 77bd37d3f2a..564a2431472 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -300,7 +300,6 @@ static void handle_regular_data(struct midi_src *src, unsigned char value, UINT if (to_send) { src->incLen = 0; - time -= src->startTime; MIDI_NotifyClient(src - MidiInDev, MIM_DATA, to_send, time); } } @@ -321,6 +320,8 @@ static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime) return; } + dwTime -= MidiInDev[wDevID].startTime; + if (value == 0xf0 || MidiInDev[wDevID].state & 2) /* system exclusive */ handle_sysex_data(MidiInDev + wDevID, value, dwTime); else -- 2.36.0

1 0

[PATCH v2 4/6] wineoss: Move the regular data handling to a separate helper.
by Andrew Eikum 28 Apr '22

28 Apr '22

From: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 122 ++++++++++++++++++++-------------------- 1 file changed, 60 insertions(+), 62 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 2c1e8b3a4d7..77bd37d3f2a 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -247,86 +247,84 @@ static void handle_sysex_data(struct midi_src *src, unsigned char value, UINT ti in_buffer_unlock(); } -/************************************************************************** - * midReceiveChar [internal] - */ -static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime) +static void handle_regular_data(struct midi_src *src, unsigned char value, UINT time) { - DWORD toSend = 0; + UINT to_send = 0; - TRACE("Adding %02xh to %d[%d]\n", value, wDevID, MidiInDev[wDevID].incLen); +#define IS_CMD(_x) (((_x) & 0x80) == 0x80) +#define IS_SYS_CMD(_x) (((_x) & 0xF0) == 0xF0) - if (wDevID >= MIDM_NumDevs) { - WARN("bad devID\n"); - return; - } - if (MidiInDev[wDevID].state <= 0) { - TRACE("disabled or input not started, thrown away\n"); - return; - } - - if (value == 0xf0 || MidiInDev[wDevID].state & 2) /* system exclusive */ + if (!IS_CMD(value) && src->incLen == 0) /* try to reuse old cmd */ { - handle_sysex_data(MidiInDev + wDevID, value, dwTime); - return; - } - -#define IS_CMD(_x) (((_x) & 0x80) == 0x80) -#define IS_SYS_CMD(_x) (((_x) & 0xF0) == 0xF0) - - if (!IS_CMD(value) && MidiInDev[wDevID].incLen == 0) { /* try to reuse old cmd */ - if (IS_CMD(MidiInDev[wDevID].incPrev) && !IS_SYS_CMD(MidiInDev[wDevID].incPrev)) { - MidiInDev[wDevID].incoming[0] = MidiInDev[wDevID].incPrev; - MidiInDev[wDevID].incLen = 1; - TRACE("Reusing old command %02xh\n", MidiInDev[wDevID].incPrev); - } else { - FIXME("error for midi-in, should generate MIM_ERROR notification:" - " prev=%02Xh, incLen=%02Xh\n", - MidiInDev[wDevID].incPrev, MidiInDev[wDevID].incLen); - return; - } - } - MidiInDev[wDevID].incoming[(int)(MidiInDev[wDevID].incLen++)] = value; - if (MidiInDev[wDevID].incLen == 1 && !IS_SYS_CMD(MidiInDev[wDevID].incoming[0])) { - /* store new cmd, just in case */ - MidiInDev[wDevID].incPrev = MidiInDev[wDevID].incoming[0]; + if (IS_CMD(src->incPrev) && !IS_SYS_CMD(src->incPrev)) + { + src->incoming[0] = src->incPrev; + src->incLen = 1; + } + else + { + /* FIXME: should generate MIM_ERROR notification */ + return; + } } + src->incoming[(int)src->incLen++] = value; + if (src->incLen == 1 && !IS_SYS_CMD(src->incoming[0])) + /* store new cmd, just in case */ + src->incPrev = src->incoming[0]; #undef IS_CMD #undef IS_SYS_CMD - switch (MidiInDev[wDevID].incoming[0] & 0xF0) { + switch (src->incoming[0] & 0xF0) + { case MIDI_NOTEOFF: case MIDI_NOTEON: case MIDI_KEY_PRESSURE: case MIDI_CTL_CHANGE: case MIDI_PITCH_BEND: - if (MidiInDev[wDevID].incLen == 3) { - toSend = (MidiInDev[wDevID].incoming[2] << 16) | - (MidiInDev[wDevID].incoming[1] << 8) | - (MidiInDev[wDevID].incoming[0] << 0); - } - break; + if (src->incLen == 3) + to_send = (src->incoming[2] << 16) | (src->incoming[1] << 8) | + src->incoming[0]; + break; case MIDI_PGM_CHANGE: case MIDI_CHN_PRESSURE: - if (MidiInDev[wDevID].incLen == 2) { - toSend = (MidiInDev[wDevID].incoming[1] << 8) | - (MidiInDev[wDevID].incoming[0] << 0); - } - break; + if (src->incLen == 2) + to_send = (src->incoming[1] << 8) | src->incoming[0]; + break; case MIDI_SYSTEM_PREFIX: - if (MidiInDev[wDevID].incLen == 1) - toSend = (MidiInDev[wDevID].incoming[0] << 0); - break; - default: - WARN("This shouldn't happen (%02X)\n", MidiInDev[wDevID].incoming[0]); - } - if (toSend != 0) { - TRACE("Sending event %08x\n", toSend); - MidiInDev[wDevID].incLen = 0; - dwTime -= MidiInDev[wDevID].startTime; - MIDI_NotifyClient(wDevID, MIM_DATA, toSend, dwTime); + if (src->incLen == 1) + to_send = src->incoming[0]; + break; } + + if (to_send) + { + src->incLen = 0; + time -= src->startTime; + MIDI_NotifyClient(src - MidiInDev, MIM_DATA, to_send, time); + } +} + +/************************************************************************** + * midReceiveChar [internal] + */ +static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime) +{ + TRACE("Adding %02xh to %d[%d]\n", value, wDevID, MidiInDev[wDevID].incLen); + + if (wDevID >= MIDM_NumDevs) { + WARN("bad devID\n"); + return; + } + if (MidiInDev[wDevID].state <= 0) { + TRACE("disabled or input not started, thrown away\n"); + return; + } + + if (value == 0xf0 || MidiInDev[wDevID].state & 2) /* system exclusive */ + handle_sysex_data(MidiInDev + wDevID, value, dwTime); + else + handle_regular_data(MidiInDev + wDevID, value, dwTime); } static void handle_midi_data(unsigned char *buffer, unsigned int len) -- 2.36.0

1 0

[PATCH v2 3/6] wineoss: Move the sysex handling to a separate helper.
by Andrew Eikum 28 Apr '22

28 Apr '22

From: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 67 ++++++++++++++++++++++++----------------- 1 file changed, 40 insertions(+), 27 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 462fd3625f0..2c1e8b3a4d7 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -210,6 +210,43 @@ static int midiCloseSeq(int fd) return 0; } +static void handle_sysex_data(struct midi_src *src, unsigned char value, UINT time) +{ + MIDIHDR *hdr; + BOOL done = FALSE; + + src->state |= 2; + src->incLen = 0; + + in_buffer_lock(); + + hdr = src->lpQueueHdr; + if (hdr) + { + BYTE *data = (BYTE *)hdr->lpData; + + data[hdr->dwBytesRecorded++] = value; + if (hdr->dwBytesRecorded == hdr->dwBufferLength) + done = TRUE; + } + + if (value == 0xf7) /* end */ + { + src->state &= ~2; + done = TRUE; + } + + if (done && hdr) + { + src->lpQueueHdr = hdr->lpNext; + hdr->dwFlags &= ~MHDR_INQUEUE; + hdr->dwFlags |= MHDR_DONE; + MIDI_NotifyClient(src - MidiInDev, MIM_LONGDATA, (UINT_PTR)hdr, time); + } + + in_buffer_unlock(); +} + /************************************************************************** * midReceiveChar [internal] */ @@ -228,33 +265,9 @@ static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime) return; } - if (value == 0xf0 || MidiInDev[wDevID].state & 2) { /* system exclusive */ - LPMIDIHDR lpMidiHdr; - BOOL sbfb = FALSE; - - MidiInDev[wDevID].state |= 2; - MidiInDev[wDevID].incLen = 0; - in_buffer_lock(); - if ((lpMidiHdr = MidiInDev[wDevID].lpQueueHdr) != NULL) { - LPBYTE lpData = (LPBYTE) lpMidiHdr->lpData; - - lpData[lpMidiHdr->dwBytesRecorded++] = value; - if (lpMidiHdr->dwBytesRecorded == lpMidiHdr->dwBufferLength) { - sbfb = TRUE; - } - } - if (value == 0xF7) { /* then end */ - MidiInDev[wDevID].state &= ~2; - sbfb = TRUE; - } - if (sbfb && lpMidiHdr != NULL) { - lpMidiHdr = MidiInDev[wDevID].lpQueueHdr; - MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext; - lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; - lpMidiHdr->dwFlags |= MHDR_DONE; - MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime); - } - in_buffer_unlock(); + if (value == 0xf0 || MidiInDev[wDevID].state & 2) /* system exclusive */ + { + handle_sysex_data(MidiInDev + wDevID, value, dwTime); return; } -- 2.36.0

1 0

[PATCH v2 2/6] wineoss: Add the leading 0xf0 to the sysex data.
by Andrew Eikum 28 Apr '22

28 Apr '22

From: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 1a5b348da9f..462fd3625f0 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -228,10 +228,12 @@ static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime) return; } - if (MidiInDev[wDevID].state & 2) { /* system exclusive */ + if (value == 0xf0 || MidiInDev[wDevID].state & 2) { /* system exclusive */ LPMIDIHDR lpMidiHdr; BOOL sbfb = FALSE; + MidiInDev[wDevID].state |= 2; + MidiInDev[wDevID].incLen = 0; in_buffer_lock(); if ((lpMidiHdr = MidiInDev[wDevID].lpQueueHdr) != NULL) { LPBYTE lpData = (LPBYTE) lpMidiHdr->lpData; @@ -300,14 +302,8 @@ static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime) } break; case MIDI_SYSTEM_PREFIX: - if (MidiInDev[wDevID].incoming[0] == 0xF0) { - MidiInDev[wDevID].state |= 2; - MidiInDev[wDevID].incLen = 0; - } else { - if (MidiInDev[wDevID].incLen == 1) { - toSend = (MidiInDev[wDevID].incoming[0] << 0); - } - } + if (MidiInDev[wDevID].incLen == 1) + toSend = (MidiInDev[wDevID].incoming[0] << 0); break; default: WARN("This shouldn't happen (%02X)\n", MidiInDev[wDevID].incoming[0]); -- 2.36.0

1 0

[PATCH v2 1/6] wineoss: Simplify the midi in dispatcher.
by Andrew Eikum 28 Apr '22

28 Apr '22

From: Huw Davies <huw(a)codeweavers.com> The continue statement looks a bit awkward at the moment, but a future patch will introduce more code into the for loop. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- v2: Clean up some wonky indentation in 1/6. dlls/wineoss.drv/midi.c | 42 ++++++++++++++--------------------------- 1 file changed, 14 insertions(+), 28 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index fe73d97f5ab..1a5b348da9f 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -320,12 +320,23 @@ static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime) } } +static void handle_midi_data(unsigned char *buffer, unsigned int len) +{ + unsigned int time = GetTickCount(), i; + + for (i = 0; i < len; i += (buffer[i] & 0x80) ? 8 : 4) + { + if (buffer[i] != SEQ_MIDIPUTC) continue; + + midReceiveChar(buffer[i + 2], buffer[i + 1], time); + } +} + static DWORD WINAPI midRecThread(void *arg) { int fd = (int)(INT_PTR)arg; unsigned char buffer[256]; - int len, idx; - DWORD dwTime; + int len; struct pollfd pfd; TRACE("Thread startup\n"); @@ -349,32 +360,7 @@ static DWORD WINAPI midRecThread(void *arg) continue; } - dwTime = GetTickCount(); - - for (idx = 0; idx < len; ) { - if (buffer[idx] & 0x80) { - TRACE( - "Reading<8> %02x %02x %02x %02x %02x %02x %02x %02x\n", - buffer[idx + 0], buffer[idx + 1], - buffer[idx + 2], buffer[idx + 3], - buffer[idx + 4], buffer[idx + 5], - buffer[idx + 6], buffer[idx + 7]); - idx += 8; - } else { - switch (buffer[idx + 0]) { - case SEQ_WAIT: - case SEQ_ECHO: - break; - case SEQ_MIDIPUTC: - midReceiveChar(buffer[idx + 2], buffer[idx + 1], dwTime); - break; - default: - TRACE("Unsupported event %d\n", buffer[idx + 0]); - break; - } - idx += 4; - } - } + handle_midi_data(buffer, len); } return 0; } -- 2.36.0

1 0

[PATCH resend 0/3] Add ownerdata listview multiselect tests.
by Angelo Haller 28 Apr '22

28 Apr '22

From: Angelo Haller <angelo(a)szanni.org> This is a resend of the follow up on the listview LVN_ODSTATECHANGED fixes I sent in a while ago. These are the missing tests that were requested for the fixes that I will resubmit once this gets merged. The first two patches are fairly straight forward: refactoring and adding basic tests. The third one adds a new message test sequence. I have tried to use one of the existing PARENT_SEQ_INDEX sequences, it just turns out that that particular sequence gets spammed with many unrelated messages. Many messages that are being sent out of order and/or that concern other listview aspects: LVN_GETDISPINFOA NM_CUSTOMDRAW WM_CHANGEUISTATE Hence I introduced a new PARENT_ODSTATECHANGED_SEQ_INDEX to enable better testing of ownerdata listviews. Warning: I have had access to the Windows Research Kernel (WRK) 1.2 ~10 years ago. These changes are regarding comctrl32 & tests which are NOT part of the WRK. As outlined in https://wiki.winehq.org/Developer_FAQ this should therefore satisfy the requirement of ONLY submitting patches to components I have NOT had access to. Angelo Haller (3): comctl32/tests: Add hold_key and release_key functions. comctl32/tests: Add multi select tests for ownerdata listviews. comctl32/tests: Add change sequence for ownerdata listviews. dlls/comctl32/tests/listview.c | 114 ++++++++++++++++++++++++++++++--- 1 file changed, 105 insertions(+), 9 deletions(-) Signed-off-by: Angelo Haller <angelo(a)szanni.org> -- 2.36.0

1 3

[PATCH v2 0/8] MR11: winex11: PE conversion preparation
by Jacek Caban (＠jacek) 28 Apr '22

28 Apr '22

Prepare xdnd.c to be in PE file and use ntdll interface for Unicode conversion. -- v2: winex11: Directly use ntdll for utf8 conversion. winex11: Move Unicode conversion out of string_from_unicode_text. winex11: Move Unicode conversion out of unicode_text_from_string. winex11: Use inline intersect_rect helper instead of IntersectRect. winex11: Move XdndLeave event handler to event.c. winex11: Move XdndDrop event handler to event.c. winex11: Move XdndPosition event handler to event.c. winex11: Move XdndEnter event handler to event.c. https://gitlab.winehq.org/wine/wine/-/merge_requests/11

3 10

[PATCH 0/8] MR11: winex11: PE conversion preparation
by Jacek Caban (＠jacek) 28 Apr '22

28 Apr '22

Prepare xdnd.c to be in PE file and use ntdll interface for Unicode conversion. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/11

3 9

[PATCH v2 1/2] include: Use nested namespaces in windows.storage.streams.idl.
by Rémi Bernon 28 Apr '22

28 Apr '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Supersedes: 233842 include/windows.storage.streams.idl | 56 +++++++++-------------------- 1 file changed, 16 insertions(+), 40 deletions(-) diff --git a/include/windows.storage.streams.idl b/include/windows.storage.streams.idl index 59b15761af0..ba58e74687d 100644 --- a/include/windows.storage.streams.idl +++ b/include/windows.storage.streams.idl @@ -24,47 +24,23 @@ import "inspectable.idl"; import "eventtoken.idl"; import "windows.foundation.idl"; -namespace Windows -{ - namespace Foundation - { - interface IClosable; - } -} +namespace Windows.Storage.Streams { + interface IContentTypeProvider; + interface IInputStream; + interface IOutputStream; + interface IRandomAccessStream; + interface IRandomAccessStreamWithContentType; -namespace Windows -{ - namespace Storage + [ + uuid(cc254827-4b3d-438f-9232-10c76bc7e038), + ] + interface IRandomAccessStreamWithContentType : IInspectable + requires + Windows.Storage.Streams.IRandomAccessStream, + Windows.Foundation.IClosable, + Windows.Storage.Streams.IInputStream, + Windows.Storage.Streams.IOutputStream, + Windows.Storage.Streams.IContentTypeProvider { - namespace Streams - { - interface IContentTypeProvider; - interface IInputStream; - interface IOutputStream; - interface IRandomAccessStream; - interface IRandomAccessStreamWithContentType; - } - } -} - -namespace Windows -{ - namespace Storage - { - namespace Streams - { - [ - uuid(cc254827-4b3d-438f-9232-10c76bc7e038), - ] - interface IRandomAccessStreamWithContentType : IInspectable - requires - Windows.Storage.Streams.IRandomAccessStream, - Windows.Foundation.IClosable, - Windows.Storage.Streams.IInputStream, - Windows.Storage.Streams.IOutputStream, - Windows.Storage.Streams.IContentTypeProvider - { - } - } } } -- 2.35.1

1 1

[PATCH v3] wintypes: Implement IApiInformationStatics stubs.
by Zhiyi Zhang 28 Apr '22

28 Apr '22

Required for Iragon: Prologue. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v3: Supersede 233207. Add tests. configure.ac | 1 + dlls/wintypes/main.c | 207 ++++++++++++++ dlls/wintypes/tests/Makefile.in | 5 + dlls/wintypes/tests/wintypes.c | 459 ++++++++++++++++++++++++++++++++ 4 files changed, 672 insertions(+) create mode 100644 dlls/wintypes/tests/Makefile.in create mode 100644 dlls/wintypes/tests/wintypes.c diff --git a/configure.ac b/configure.ac index 74c80fd7fa8..f0b39d172ba 100644 --- a/configure.ac +++ b/configure.ac @@ -3142,6 +3142,7 @@ WINE_CONFIG_MAKEFILE(dlls/wintab32/tests) WINE_CONFIG_MAKEFILE(dlls/wintrust) WINE_CONFIG_MAKEFILE(dlls/wintrust/tests) WINE_CONFIG_MAKEFILE(dlls/wintypes) +WINE_CONFIG_MAKEFILE(dlls/wintypes/tests) WINE_CONFIG_MAKEFILE(dlls/winusb) WINE_CONFIG_MAKEFILE(dlls/wlanapi) WINE_CONFIG_MAKEFILE(dlls/wlanapi/tests) diff --git a/dlls/wintypes/main.c b/dlls/wintypes/main.c index e5fea2f7d30..1ca8d94cd67 100644 --- a/dlls/wintypes/main.c +++ b/dlls/wintypes/main.c @@ -28,6 +28,9 @@ #include "activation.h" +#define WIDL_using_Windows_Foundation_Metadata +#include "windows.foundation.metadata.h" + WINE_DEFAULT_DEBUG_CHANNEL(wintypes); static const char *debugstr_hstring(HSTRING hstr) @@ -43,6 +46,7 @@ static const char *debugstr_hstring(HSTRING hstr) struct wintypes { IActivationFactory IActivationFactory_iface; + IApiInformationStatics IApiInformationStatics_iface; LONG ref; }; @@ -51,9 +55,16 @@ static inline struct wintypes *impl_from_IActivationFactory(IActivationFactory * return CONTAINING_RECORD(iface, struct wintypes, IActivationFactory_iface); } +static inline struct wintypes *impl_from_IApiInformationStatics(IApiInformationStatics *iface) +{ + return CONTAINING_RECORD(iface, struct wintypes, IApiInformationStatics_iface); +} + static HRESULT STDMETHODCALLTYPE wintypes_QueryInterface(IActivationFactory *iface, REFIID iid, void **out) { + struct wintypes *impl = impl_from_IActivationFactory(iface); + TRACE("iface %p, iid %s, out %p stub!\n", iface, debugstr_guid(iid), out); if (IsEqualGUID(iid, &IID_IUnknown) @@ -66,6 +77,13 @@ static HRESULT STDMETHODCALLTYPE wintypes_QueryInterface(IActivationFactory *ifa return S_OK; } + if (IsEqualGUID(iid, &IID_IApiInformationStatics)) + { + IUnknown_AddRef(iface); + *out = &impl->IApiInformationStatics_iface; + return S_OK; + } + FIXME("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); *out = NULL; return E_NOINTERFACE; @@ -128,9 +146,198 @@ static const struct IActivationFactoryVtbl activation_factory_vtbl = wintypes_ActivateInstance, }; +static HRESULT STDMETHODCALLTYPE api_information_statics_QueryInterface( + IApiInformationStatics *iface, REFIID iid, void **out) +{ + struct wintypes *impl = impl_from_IApiInformationStatics(iface); + return wintypes_QueryInterface(&impl->IActivationFactory_iface, iid, out); +} + +static ULONG STDMETHODCALLTYPE api_information_statics_AddRef( + IApiInformationStatics *iface) +{ + struct wintypes *impl = impl_from_IApiInformationStatics(iface); + return wintypes_AddRef(&impl->IActivationFactory_iface); +} + +static ULONG STDMETHODCALLTYPE api_information_statics_Release( + IApiInformationStatics *iface) +{ + struct wintypes *impl = impl_from_IApiInformationStatics(iface); + return wintypes_Release(&impl->IActivationFactory_iface); +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_GetIids( + IApiInformationStatics *iface, ULONG *iid_count, IID **iids) +{ + FIXME("iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_GetRuntimeClassName( + IApiInformationStatics *iface, HSTRING *class_name) +{ + FIXME("iface %p, class_name %p stub!\n", iface, class_name); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_GetTrustLevel( + IApiInformationStatics *iface, TrustLevel *trust_level) +{ + FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_IsTypePresent( + IApiInformationStatics *iface, HSTRING type_name, BOOLEAN *value) +{ + FIXME("iface %p, type_name %s, value %p stub!\n", iface, debugstr_hstring(type_name), value); + + if (!type_name) + return E_INVALIDARG; + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_IsMethodPresent( + IApiInformationStatics *iface, HSTRING type_name, HSTRING method_name, BOOLEAN *value) +{ + FIXME("iface %p, type_name %s, method_name %s, value %p stub!\n", iface, + debugstr_hstring(type_name), debugstr_hstring(method_name), value); + + if (!type_name) + return E_INVALIDARG; + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_IsMethodPresentWithArity( + IApiInformationStatics *iface, HSTRING type_name, HSTRING method_name, + UINT32 input_parameter_count, BOOLEAN *value) +{ + FIXME("iface %p, type_name %s, method_name %s, input_parameter_count %u, value %p stub!\n", + iface, debugstr_hstring(type_name), debugstr_hstring(method_name), + input_parameter_count, value); + + if (!type_name) + return E_INVALIDARG; + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_IsEventPresent( + IApiInformationStatics *iface, HSTRING type_name, HSTRING event_name, BOOLEAN *value) +{ + FIXME("iface %p, type_name %s, event_name %s, value %p stub!\n", iface, + debugstr_hstring(type_name), debugstr_hstring(event_name), value); + + if (!type_name) + return E_INVALIDARG; + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_IsPropertyPresent( + IApiInformationStatics *iface, HSTRING type_name, HSTRING property_name, BOOLEAN *value) +{ + FIXME("iface %p, type_name %s, property_name %s, value %p stub!\n", iface, + debugstr_hstring(type_name), debugstr_hstring(property_name), value); + + if (!type_name) + return E_INVALIDARG; + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_IsReadOnlyPropertyPresent( + IApiInformationStatics *iface, HSTRING type_name, HSTRING property_name, + BOOLEAN *value) +{ + FIXME("iface %p, type_name %s, property_name %s, value %p stub!\n", iface, + debugstr_hstring(type_name), debugstr_hstring(property_name), value); + + if (!type_name) + return E_INVALIDARG; + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_IsWriteablePropertyPresent( + IApiInformationStatics *iface, HSTRING type_name, HSTRING property_name, BOOLEAN *value) +{ + FIXME("iface %p, type_name %s, property_name %s, value %p stub!\n", iface, + debugstr_hstring(type_name), debugstr_hstring(property_name), value); + + if (!type_name) + return E_INVALIDARG; + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_IsEnumNamedValuePresent( + IApiInformationStatics *iface, HSTRING enum_type_name, HSTRING value_name, BOOLEAN *value) +{ + FIXME("iface %p, enum_type_name %s, value_name %s, value %p stub!\n", iface, + debugstr_hstring(enum_type_name), debugstr_hstring(value_name), value); + + if (!enum_type_name) + return E_INVALIDARG; + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_IsApiContractPresentByMajor( + IApiInformationStatics *iface, HSTRING contract_name, UINT16 major_version, BOOLEAN *value) +{ + FIXME("iface %p, contract_name %s, major_version %u, value %p stub!\n", iface, + debugstr_hstring(contract_name), major_version, value); + + if (!contract_name) + return E_INVALIDARG; + + *value = FALSE; + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_IsApiContractPresentByMajorAndMinor( + IApiInformationStatics *iface, HSTRING contract_name, UINT16 major_version, + UINT16 minor_version, BOOLEAN *value) +{ + FIXME("iface %p, contract_name %s, major_version %u, minor_version %u, value %p stub!\n", iface, + debugstr_hstring(contract_name), major_version, minor_version, value); + + if (!contract_name) + return E_INVALIDARG; + + return E_NOTIMPL; +} + +static const struct IApiInformationStaticsVtbl api_information_statics_vtbl = +{ + api_information_statics_QueryInterface, + api_information_statics_AddRef, + api_information_statics_Release, + /* IInspectable methods */ + api_information_statics_GetIids, + api_information_statics_GetRuntimeClassName, + api_information_statics_GetTrustLevel, + /* IApiInformationStatics methods */ + api_information_statics_IsTypePresent, + api_information_statics_IsMethodPresent, + api_information_statics_IsMethodPresentWithArity, + api_information_statics_IsEventPresent, + api_information_statics_IsPropertyPresent, + api_information_statics_IsReadOnlyPropertyPresent, + api_information_statics_IsWriteablePropertyPresent, + api_information_statics_IsEnumNamedValuePresent, + api_information_statics_IsApiContractPresentByMajor, + api_information_statics_IsApiContractPresentByMajorAndMinor +}; + static struct wintypes wintypes = { {&activation_factory_vtbl}, + {&api_information_statics_vtbl}, 1 }; diff --git a/dlls/wintypes/tests/Makefile.in b/dlls/wintypes/tests/Makefile.in new file mode 100644 index 00000000000..4769b591776 --- /dev/null +++ b/dlls/wintypes/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = wintypes.dll +IMPORTS = uuid + +C_SRCS = \ + wintypes.c diff --git a/dlls/wintypes/tests/wintypes.c b/dlls/wintypes/tests/wintypes.c new file mode 100644 index 00000000000..6b21c126c33 --- /dev/null +++ b/dlls/wintypes/tests/wintypes.c @@ -0,0 +1,459 @@ +/* + * Copyright 2022 Zhiyi Zhang for CodeWeavers + * + * 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 + */ +#define COBJMACROS +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "winstring.h" + +#include "initguid.h" +#include "roapi.h" + +#define WIDL_using_Windows_Foundation_Metadata +#include "windows.foundation.metadata.h" + +#include "wine/test.h" + +static HRESULT (WINAPI *pRoActivateInstance)(HSTRING, IInspectable **); +static HRESULT (WINAPI *pRoGetActivationFactory)(HSTRING, REFIID, void **); +static HRESULT (WINAPI *pRoInitialize)(RO_INIT_TYPE); +static void (WINAPI *pRoUninitialize)(void); +static HRESULT (WINAPI *pWindowsCreateString)(LPCWSTR, UINT32, HSTRING *); +static HRESULT (WINAPI *pWindowsDeleteString)(HSTRING); +static WCHAR * (WINAPI *pWindowsGetStringRawBuffer)(HSTRING, UINT32 *); + +static void test_IApiInformationStatics(void) +{ + static const WCHAR *class_name = L"Windows.Foundation.Metadata.ApiInformation"; + IAgileObject *agile_object = NULL, *tmp_agile_object = NULL; + IInspectable *inspectable = NULL, *tmp_inspectable = NULL; + IApiInformationStatics *statics = NULL; + IActivationFactory *factory = NULL; + HSTRING str, str2; + BOOLEAN ret; + HRESULT hr; + + hr = pRoInitialize(RO_INIT_MULTITHREADED); + ok(hr == S_OK, "RoInitialize failed, hr %#lx.\n", hr); + + hr = pWindowsCreateString(class_name, wcslen(class_name), &str); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr); + + hr = pRoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); + ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG), "RoGetActivationFactory failed, hr %#lx.\n", hr); + pWindowsDeleteString(str); + if (hr == REGDB_E_CLASSNOTREG) + { + win_skip("%s runtimeclass not registered, skipping tests.\n", wine_dbgstr_w(class_name)); + pRoUninitialize(); + return; + } + + hr = IActivationFactory_QueryInterface(factory, &IID_IInspectable, (void **)&inspectable); + ok(hr == S_OK, "QueryInterface IID_IInspectable failed, hr %#lx.\n", hr); + + hr = IActivationFactory_QueryInterface(factory, &IID_IAgileObject, (void **)&agile_object); + ok(hr == S_OK, "QueryInterface IID_IAgileObject failed, hr %#lx.\n", hr); + + hr = IActivationFactory_QueryInterface(factory, &IID_IApiInformationStatics, (void **)&statics); + ok(hr == S_OK, "QueryInterface IID_IApiInformationStatics failed, hr %#lx.\n", hr); + + hr = IApiInformationStatics_QueryInterface(statics, &IID_IInspectable, (void **)&tmp_inspectable); + ok(hr == S_OK, "QueryInterface IID_IInspectable failed, hr %#lx.\n", hr); + ok(tmp_inspectable == inspectable, "QueryInterface IID_IInspectable returned %p, expected %p.\n", + tmp_inspectable, inspectable); + IInspectable_Release(tmp_inspectable); + + hr = IApiInformationStatics_QueryInterface(statics, &IID_IAgileObject, (void **)&tmp_agile_object); + ok(hr == S_OK, "QueryInterface IID_IAgileObject failed, hr %#lx.\n", hr); + ok(tmp_agile_object == agile_object, "QueryInterface IID_IAgileObject returned %p, expected %p.\n", + tmp_agile_object, agile_object); + IAgileObject_Release(tmp_agile_object); + + /* IsTypePresent() */ + hr = pWindowsCreateString(L"Windows.Foundation.FoundationContract", + wcslen(L"Windows.Foundation.FoundationContract"), &str); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr); + + hr = IApiInformationStatics_IsTypePresent(statics, NULL, &ret); + ok(hr == E_INVALIDARG, "IsTypePresent failed, hr %#lx.\n", hr); + +#if 0 /* Crash on Windows */ + hr = IApiInformationStatics_IsTypePresent(statics, str, NULL); + ok(hr == E_INVALIDARG, "IsTypePresent failed, hr %#lx.\n", hr); +#endif + + ret = FALSE; + hr = IApiInformationStatics_IsTypePresent(statics, str, &ret); + todo_wine + ok(hr == S_OK, "IsTypePresent failed, hr %#lx.\n", hr); + todo_wine + ok(ret == TRUE, "IsTypePresent returned FALSE.\n"); + + pWindowsDeleteString(str); + + /* IsMethodPresent() */ + hr = pWindowsCreateString(L"Windows.Foundation.Metadata.IApiInformationStatics", + wcslen(L"Windows.Foundation.Metadata.IApiInformationStatics"), &str); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr); + hr = pWindowsCreateString(L"IsTypePresent", wcslen(L"IsTypePresent"), &str2); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr); + + hr = IApiInformationStatics_IsMethodPresent(statics, NULL, str2, &ret); + ok(hr == E_INVALIDARG, "IsMethodPresent failed, hr %#lx.\n", hr); + + ret = TRUE; + hr = IApiInformationStatics_IsMethodPresent(statics, str, NULL, &ret); + todo_wine + ok(hr == S_OK, "IsMethodPresent failed, hr %#lx.\n", hr); + todo_wine + ok(ret == FALSE, "IsMethodPresent returned TRUE.\n"); + +#if 0 /* Crash on Windows */ + hr = IApiInformationStatics_IsMethodPresent(statics, str, str2, NULL); + ok(hr == E_INVALIDARG, "IsMethodPresent failed, hr %#lx.\n", hr); +#endif + + ret = FALSE; + hr = IApiInformationStatics_IsMethodPresent(statics, str, str2, &ret); + todo_wine + ok(hr == S_OK, "IsMethodPresent failed, hr %#lx.\n", hr); + todo_wine + ok(ret == TRUE, "IsMethodPresent returned FALSE.\n"); + + /* IsMethodPresentWithArity() */ + hr = IApiInformationStatics_IsMethodPresentWithArity(statics, NULL, str2, 1, &ret); + ok(hr == E_INVALIDARG, "IsMethodPresentWithArity failed, hr %#lx.\n", hr); + + ret = TRUE; + hr = IApiInformationStatics_IsMethodPresentWithArity(statics, str, NULL, 1, &ret); + todo_wine + ok(hr == S_OK, "IsMethodPresentWithArity failed, hr %#lx.\n", hr); + todo_wine + ok(ret == FALSE, "IsMethodPresentWithArity returned FALSE.\n"); + + ret = TRUE; + hr = IApiInformationStatics_IsMethodPresentWithArity(statics, str, str2, 0, &ret); + todo_wine + ok(hr == S_OK, "IsMethodPresentWithArity failed, hr %#lx.\n", hr); + todo_wine + ok(ret == FALSE, "IsMethodPresentWithArity returned FALSE.\n"); + + ret = TRUE; + hr = IApiInformationStatics_IsMethodPresentWithArity(statics, str, str2, 2, &ret); + todo_wine + ok(hr == S_OK, "IsMethodPresentWithArity failed, hr %#lx.\n", hr); + todo_wine + ok(ret == FALSE, "IsMethodPresentWithArity returned FALSE.\n"); + +#if 0 /* Crash on Windows */ + hr = IApiInformationStatics_IsMethodPresentWithArity(statics, str, str2, 1, NULL); + ok(hr == E_INVALIDARG, "IsMethodPresentWithArity failed, hr %#lx.\n", hr); +#endif + + ret = FALSE; + hr = IApiInformationStatics_IsMethodPresentWithArity(statics, str, str2, 1, &ret); + todo_wine + ok(hr == S_OK, "IsMethodPresentWithArity failed, hr %#lx.\n", hr); + todo_wine + ok(ret == TRUE, "IsMethodPresentWithArity returned FALSE.\n"); + + pWindowsDeleteString(str2); + pWindowsDeleteString(str); + + /* IsEventPresent() */ + hr = pWindowsCreateString(L"Windows.Devices.Enumeration.IDeviceWatcher", + wcslen(L"Windows.Devices.Enumeration.IDeviceWatcher"), &str); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr); + hr = pWindowsCreateString(L"Added", wcslen(L"Added"), &str2); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr); + + hr = IApiInformationStatics_IsEventPresent(statics, NULL, str2, &ret); + ok(hr == E_INVALIDARG, "IsEventPresent failed, hr %#lx.\n", hr); + + ret = TRUE; + hr = IApiInformationStatics_IsEventPresent(statics, str, NULL, &ret); + todo_wine + ok(hr == S_OK, "IsEventPresent failed, hr %#lx.\n", hr); + todo_wine + ok(ret == FALSE, "IsEventPresent returned FALSE.\n"); + +#if 0 /* Crash on Windows */ + hr = IApiInformationStatics_IsEventPresent(statics, str, str2, NULL); + ok(hr == E_INVALIDARG, "IsEventPresent failed, hr %#lx.\n", hr); +#endif + + ret = FALSE; + hr = IApiInformationStatics_IsEventPresent(statics, str, str2, &ret); + todo_wine + ok(hr == S_OK, "IsEventPresent failed, hr %#lx.\n", hr); + todo_wine + ok(ret == TRUE, "IsEventPresent returned FALSE.\n"); + + pWindowsDeleteString(str2); + pWindowsDeleteString(str); + + /* IsPropertyPresent() */ + hr = pWindowsCreateString(L"Windows.Devices.Enumeration.IDeviceWatcher", + wcslen(L"Windows.Devices.Enumeration.IDeviceWatcher"), &str); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr); + hr = pWindowsCreateString(L"Status", wcslen(L"Status"), &str2); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr); + + hr = IApiInformationStatics_IsPropertyPresent(statics, NULL, str2, &ret); + ok(hr == E_INVALIDARG, "IsPropertyPresent failed, hr %#lx.\n", hr); + + ret = TRUE; + hr = IApiInformationStatics_IsPropertyPresent(statics, str, NULL, &ret); + todo_wine + ok(hr == S_OK, "IsPropertyPresent failed, hr %#lx.\n", hr); + todo_wine + ok(ret == FALSE, "IsPropertyPresent returned TRUE.\n"); + +#if 0 /* Crash on Windows */ + hr = IApiInformationStatics_IsPropertyPresent(statics, str, str2, NULL); + ok(hr == E_INVALIDARG, "IsPropertyPresent failed, hr %#lx.\n", hr); +#endif + + ret = FALSE; + hr = IApiInformationStatics_IsPropertyPresent(statics, str, str2, &ret); + todo_wine + ok(hr == S_OK, "IsPropertyPresent failed, hr %#lx.\n", hr); + todo_wine + ok(ret == TRUE, "IsPropertyPresent returned FALSE.\n"); + + pWindowsDeleteString(str2); + pWindowsDeleteString(str); + + /* IsReadOnlyPropertyPresent() */ + hr = pWindowsCreateString(L"Windows.Devices.Enumeration.IDeviceWatcher", + wcslen(L"Windows.Devices.Enumeration.IDeviceWatcher"), &str); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr); + hr = pWindowsCreateString(L"Id", wcslen(L"Id"), &str2); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr); + + hr = IApiInformationStatics_IsReadOnlyPropertyPresent(statics, NULL, str2, &ret); + ok(hr == E_INVALIDARG, "IsReadOnlyPropertyPresent failed, hr %#lx.\n", hr); + + ret = TRUE; + hr = IApiInformationStatics_IsReadOnlyPropertyPresent(statics, str, NULL, &ret); + todo_wine + ok(hr == S_OK, "IsReadOnlyPropertyPresent failed, hr %#lx.\n", hr); + todo_wine + ok(ret == FALSE, "IsReadOnlyPropertyPresent returned TRUE.\n"); + +#if 0 /* Crash on Windows */ + hr = IApiInformationStatics_IsReadOnlyPropertyPresent(statics, str, str2, NULL); + ok(hr == E_INVALIDARG, "IsReadOnlyPropertyPresent failed, hr %#lx.\n", hr); +#endif + + ret = TRUE; + hr = IApiInformationStatics_IsReadOnlyPropertyPresent(statics, str, str2, &ret); + todo_wine + ok(hr == S_OK, "IsReadOnlyPropertyPresent failed, hr %#lx.\n", hr); + todo_wine + ok(ret == FALSE, "IsReadOnlyPropertyPresent returned TRUE.\n"); + + pWindowsDeleteString(str2); + pWindowsDeleteString(str); + + /* IsWriteablePropertyPresent() */ + hr = pWindowsCreateString(L"Windows.Gaming.Input.ForceFeedback.IForceFeedbackEffect", + wcslen(L"Windows.Gaming.Input.ForceFeedback.IForceFeedbackEffect"), &str); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr); + hr = pWindowsCreateString(L"Gain", wcslen(L"Gain"), &str2); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr); + + hr = IApiInformationStatics_IsWriteablePropertyPresent(statics, NULL, str2, &ret); + ok(hr == E_INVALIDARG, "IsWriteablePropertyPresent failed, hr %#lx.\n", hr); + + ret = TRUE; + hr = IApiInformationStatics_IsWriteablePropertyPresent(statics, str, NULL, &ret); + todo_wine + ok(hr == S_OK, "IsWriteablePropertyPresent failed, hr %#lx.\n", hr); + todo_wine + ok(ret == FALSE, "IsWriteablePropertyPresent returned TRUE.\n"); + +#if 0 /* Crash on Windows */ + hr = IApiInformationStatics_IsWriteablePropertyPresent(statics, str, str2, NULL); + ok(hr == E_INVALIDARG, "IsWriteablePropertyPresent failed, hr %#lx.\n", hr); +#endif + + ret = FALSE; + hr = IApiInformationStatics_IsWriteablePropertyPresent(statics, str, str2, &ret); + todo_wine + ok(hr == S_OK, "IsWriteablePropertyPresent failed, hr %#lx.\n", hr); + todo_wine + ok(ret == TRUE || broken(ret == FALSE) /* Win10 1507 */, + "IsWriteablePropertyPresent returned FALSE.\n"); + + pWindowsDeleteString(str2); + pWindowsDeleteString(str); + + /* IsEnumNamedValuePresent */ + hr = pWindowsCreateString(L"Windows.Foundation.Metadata.GCPressureAmount", + wcslen(L"Windows.Foundation.Metadata.GCPressureAmount"), &str); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr); + hr = pWindowsCreateString(L"Low", wcslen(L"Low"), &str2); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr); + + hr = IApiInformationStatics_IsEnumNamedValuePresent(statics, NULL, str2, &ret); + ok(hr == E_INVALIDARG, "IsEnumNamedValuePresent failed, hr %#lx.\n", hr); + + ret = TRUE; + hr = IApiInformationStatics_IsEnumNamedValuePresent(statics, str, NULL, &ret); + todo_wine + ok(hr == S_OK, "IsEnumNamedValuePresent failed, hr %#lx.\n", hr); + todo_wine + ok(ret == FALSE, "IsEnumNamedValuePresent returned TRUE.\n"); + +#if 0 /* Crash on Windows */ + hr = IApiInformationStatics_IsEnumNamedValuePresent(statics, str, str2, NULL); + ok(hr == E_INVALIDARG, "IsEnumNamedValuePresent failed, hr %#lx.\n", hr); +#endif + + ret = FALSE; + hr = IApiInformationStatics_IsEnumNamedValuePresent(statics, str, str2, &ret); + todo_wine + ok(hr == S_OK, "IsEnumNamedValuePresent failed, hr %#lx.\n", hr); + todo_wine + ok(ret == TRUE, "IsEnumNamedValuePresent returned FALSE.\n"); + + ret = TRUE; + hr = IApiInformationStatics_IsEnumNamedValuePresent(statics, str, str, &ret); + todo_wine + ok(hr == S_OK, "IsEnumNamedValuePresent failed, hr %#lx.\n", hr); + todo_wine + ok(ret == FALSE, "IsEnumNamedValuePresent returned TRUE.\n"); + + pWindowsDeleteString(str2); + pWindowsDeleteString(str); + + /* IsApiContractPresentByMajor */ + hr = pWindowsCreateString(L"Windows.Foundation.FoundationContract", + wcslen(L"Windows.Foundation.FoundationContract"), &str); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr); + + hr = IApiInformationStatics_IsApiContractPresentByMajor(statics, NULL, 1, &ret); + ok(hr == E_INVALIDARG, "IsApiContractPresentByMajor failed, hr %#lx.\n", hr); + +#if 0 /* Crash on Windows */ + hr = IApiInformationStatics_IsApiContractPresentByMajor(statics, str, 1, NULL); + ok(hr == E_INVALIDARG, "IsApiContractPresentByMajor failed, hr %#lx.\n", hr); +#endif + + ret = FALSE; + hr = IApiInformationStatics_IsApiContractPresentByMajor(statics, str, 1, &ret); + ok(hr == S_OK, "IsApiContractPresentByMajor failed, hr %#lx.\n", hr); + todo_wine + ok(ret == TRUE, "IsApiContractPresentByMajor returned FALSE.\n"); + + ret = FALSE; + hr = IApiInformationStatics_IsApiContractPresentByMajor(statics, str, 0, &ret); + ok(hr == S_OK, "IsApiContractPresentByMajor failed, hr %#lx.\n", hr); + todo_wine + ok(ret == TRUE, "IsApiContractPresentByMajor returned FALSE.\n"); + + ret = TRUE; + hr = IApiInformationStatics_IsApiContractPresentByMajor(statics, str, 999, &ret); + ok(hr == S_OK, "IsApiContractPresentByMajor failed, hr %#lx.\n", hr); + ok(ret == FALSE, "IsApiContractPresentByMajor returned TRUE.\n"); + + pWindowsDeleteString(str); + + /* IsApiContractPresentByMajorAndMinor */ + hr = pWindowsCreateString(L"Windows.Foundation.FoundationContract", + wcslen(L"Windows.Foundation.FoundationContract"), &str); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr); + + hr = IApiInformationStatics_IsApiContractPresentByMajorAndMinor(statics, NULL, 1, 0, &ret); + ok(hr == E_INVALIDARG, "IsApiContractPresentByMajorAndMinor failed, hr %#lx.\n", hr); + +#if 0 /* Crash on Windows */ + hr = IApiInformationStatics_IsApiContractPresentByMajorAndMinor(statics, str, 1, 0, NULL); + ok(hr == E_INVALIDARG, "IsApiContractPresentByMajorAndMinor failed, hr %#lx.\n", hr); +#endif + + ret = FALSE; + hr = IApiInformationStatics_IsApiContractPresentByMajorAndMinor(statics, str, 1, 0, &ret); + todo_wine + ok(hr == S_OK, "IsApiContractPresentByMajorAndMinor failed, hr %#lx.\n", hr); + todo_wine + ok(ret == TRUE, "IsApiContractPresentByMajorAndMinor returned FALSE.\n"); + + ret = FALSE; + hr = IApiInformationStatics_IsApiContractPresentByMajorAndMinor(statics, str, 0, 999, &ret); + todo_wine + ok(hr == S_OK, "IsApiContractPresentByMajorAndMinor failed, hr %#lx.\n", hr); + todo_wine + ok(ret == TRUE, "IsApiContractPresentByMajorAndMinor returned FALSE.\n"); + + ret = FALSE; + hr = IApiInformationStatics_IsApiContractPresentByMajorAndMinor(statics, str, 1, 999, &ret); + todo_wine + ok(hr == S_OK, "IsApiContractPresentByMajorAndMinor failed, hr %#lx.\n", hr); + todo_wine + ok(ret == TRUE || broken(ret == FALSE) /* Win10 1507 */, + "IsApiContractPresentByMajorAndMinor returned FALSE.\n"); + + ret = TRUE; + hr = IApiInformationStatics_IsApiContractPresentByMajorAndMinor(statics, str, 999, 999, &ret); + todo_wine + ok(hr == S_OK, "IsApiContractPresentByMajorAndMinor failed, hr %#lx.\n", hr); + todo_wine + ok(ret == FALSE, "IsApiContractPresentByMajorAndMinor returned TRUE.\n"); + + pWindowsDeleteString(str); + + IApiInformationStatics_Release(statics); + IAgileObject_Release(agile_object); + IInspectable_Release(inspectable); + IActivationFactory_Release(factory); + pRoUninitialize(); +} + +START_TEST(wintypes) +{ + HMODULE combase; + + if (!(combase = LoadLibraryW(L"combase.dll"))) + { + win_skip("Failed to load combase.dll, skipping tests.\n"); + return; + } + +#define LOAD_FUNCPTR(x) \ + if (!(p##x = (void *)GetProcAddress(combase, #x))) \ + { \ + win_skip("Failed to find %s in combase.dll, skipping tests.\n", #x); \ + return; \ + } + + LOAD_FUNCPTR(RoActivateInstance) + LOAD_FUNCPTR(RoGetActivationFactory) + LOAD_FUNCPTR(RoInitialize) + LOAD_FUNCPTR(RoUninitialize) + LOAD_FUNCPTR(WindowsCreateString) + LOAD_FUNCPTR(WindowsDeleteString) + LOAD_FUNCPTR(WindowsGetStringRawBuffer) +#undef LOAD_FUNCPTR + + test_IApiInformationStatics(); +} -- 2.32.0

2 1

[PATCH v2 7/7] wbemprox: Add FreeVirtualMemory property to Win32_Operatingsystem.
by Hans Leidekker 28 Apr '22

28 Apr '22

From: Louis Lenders <xerox.xerox2000x(a)gmail.com> Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=52887 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 12 ++++++++++++ dlls/wbemprox/tests/query.c | 1 + 2 files changed, 13 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 98a32313461..d27130b00c9 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -239,6 +239,7 @@ static const struct column col_operatingsystem[] = { L"CSName", CIM_STRING|COL_FLAG_DYNAMIC }, { L"CurrentTimeZone", CIM_SINT16 }, { L"FreePhysicalMemory", CIM_UINT64 }, + { L"FreeVirtualMemory", CIM_UINT64 }, { L"InstallDate", CIM_DATETIME }, { L"LastBootUpTime", CIM_DATETIME|COL_FLAG_DYNAMIC }, { L"LocalDateTime", CIM_DATETIME|COL_FLAG_DYNAMIC }, @@ -676,6 +677,7 @@ struct record_operatingsystem const WCHAR *csname; INT16 currenttimezone; UINT64 freephysicalmemory; + UINT64 freevirtualmemory; const WCHAR *installdate; const WCHAR *lastbootuptime; const WCHAR *localdatetime; @@ -1572,6 +1574,15 @@ static UINT64 get_available_physical_memory(void) return status.ullAvailPhys; } +static UINT64 get_available_virtual_memory(void) +{ + MEMORYSTATUSEX status; + + status.dwLength = sizeof(status); + if (!GlobalMemoryStatusEx( &status )) return 1024 * 1024 * 1024; + return status.ullAvailVirtual; +} + static WCHAR *get_computername(void) { WCHAR *ret; @@ -3683,6 +3694,7 @@ static enum fill_status fill_operatingsystem( struct table *table, const struct rec->csname = get_computername(); rec->currenttimezone = get_currenttimezone(); rec->freephysicalmemory = get_available_physical_memory() / 1024; + rec->freevirtualmemory = get_available_virtual_memory() / 1024; rec->installdate = L"20140101000000.000000+000"; rec->lastbootuptime = get_lastbootuptime(); rec->localdatetime = get_localdatetime(); diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index f8508cd1405..f6faaea0d99 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1404,6 +1404,7 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) VariantClear( &val ); check_property( obj, L"FreePhysicalMemory", VT_BSTR, CIM_UINT64 ); + check_property( obj, L"FreeVirtualMemory", VT_BSTR, CIM_UINT64 ); check_property( obj, L"Name", VT_BSTR, CIM_STRING ); type = 0xdeadbeef; -- 2.30.2

1 0

[PATCH v2 6/7] wbemprox: Add SystemType property to Win32_Computersystem.
by Hans Leidekker 28 Apr '22

28 Apr '22

From: Louis Lenders <xerox.xerox2000x(a)gmail.com> v2: Use a helper that maps directly from processor architecture. Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=52887 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 11 +++++++++++ dlls/wbemprox/tests/query.c | 1 + 2 files changed, 12 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 27e1084b21e..98a32313461 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -105,6 +105,7 @@ static const struct column col_compsys[] = { L"Name", CIM_STRING|COL_FLAG_DYNAMIC }, { L"NumberOfLogicalProcessors", CIM_UINT32 }, { L"NumberOfProcessors", CIM_UINT32 }, + { L"SystemType", CIM_STRING }, { L"TotalPhysicalMemory", CIM_UINT64 }, { L"UserName", CIM_STRING|COL_FLAG_DYNAMIC }, }; @@ -541,6 +542,7 @@ struct record_computersystem const WCHAR *name; UINT32 num_logical_processors; UINT32 num_processors; + const WCHAR *systemtype; UINT64 total_physical_memory; const WCHAR *username; }; @@ -1580,6 +1582,14 @@ static WCHAR *get_computername(void) return ret; } +static const WCHAR *get_systemtype(void) +{ + SYSTEM_INFO info; + GetNativeSystemInfo( &info ); + if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) return L"x64 based PC"; + return L"x86 based PC"; +} + static WCHAR *get_username(void) { WCHAR *ret; @@ -1614,6 +1624,7 @@ static enum fill_status fill_compsys( struct table *table, const struct expr *co rec->model = L"Wine"; rec->name = get_computername(); rec->num_logical_processors = get_logical_processor_count( NULL, &rec->num_processors ); + rec->systemtype = get_systemtype(); rec->total_physical_memory = get_total_physical_memory(); rec->username = get_username(); if (!match_row( table, row, cond, &status )) free_row_values( table, row ); diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 54d80b9e196..f8508cd1405 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -752,6 +752,7 @@ static void test_Win32_ComputerSystem( IWbemServices *services ) } check_property( obj, L"NumberOfProcessors", VT_I4, CIM_UINT32 ); + check_property( obj, L"SystemType", VT_BSTR, CIM_STRING ); type = 0xdeadbeef; VariantInit( &value ); -- 2.30.2

1 0

[PATCH v2 5/7] wbemprox: Add WindowsDirectory property to Win32_Operatingsystem.
by Hans Leidekker 28 Apr '22

28 Apr '22

From: Louis Lenders <xerox.xerox2000x(a)gmail.com> v2: Use GetWindowsDirectoryW() and mark the property as dynamic. Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=52887 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 22 ++++++++++++++++------ dlls/wbemprox/tests/query.c | 1 + 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 8c5a158fea3..27e1084b21e 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -263,6 +263,7 @@ static const struct column col_operatingsystem[] = { L"TotalVirtualMemorySize", CIM_UINT64 }, { L"TotalVisibleMemorySize", CIM_UINT64 }, { L"Version", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"WindowsDirectory", CIM_STRING|COL_FLAG_DYNAMIC }, }; static const struct column col_pagefileusage[] = { @@ -698,6 +699,7 @@ struct record_operatingsystem UINT64 totalvirtualmemorysize; UINT64 totalvisiblememorysize; const WCHAR *version; + const WCHAR *windowsdirectory; }; struct record_pagefileusage { @@ -3446,6 +3448,15 @@ static enum fill_status fill_processor( struct table *table, const struct expr * return status; } +static INT16 get_currenttimezone(void) +{ + TIME_ZONE_INFORMATION info; + DWORD status = GetTimeZoneInformation( &info ); + if (status == TIME_ZONE_ID_INVALID) return 0; + if (status == TIME_ZONE_ID_DAYLIGHT) return -(info.Bias + info.DaylightBias); + return -(info.Bias + info.StandardBias); +} + static WCHAR *get_lastbootuptime(void) { SYSTEM_TIMEOFDAY_INFORMATION ti; @@ -3631,13 +3642,11 @@ static WCHAR *get_registereduser(void) return get_reg_str( HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion", L"RegisteredOwner" ); } -static INT16 get_currenttimezone(void) +static WCHAR *get_windowsdirectory(void) { - TIME_ZONE_INFORMATION info; - DWORD status = GetTimeZoneInformation( &info ); - if (status == TIME_ZONE_ID_INVALID) return 0; - if (status == TIME_ZONE_ID_DAYLIGHT) return -(info.Bias + info.DaylightBias); - return -(info.Bias + info.StandardBias); + WCHAR dir[MAX_PATH]; + if (!GetWindowsDirectoryW( dir, ARRAY_SIZE(dir) )) return NULL; + return wcsdup( dir ); } static enum fill_status fill_operatingsystem( struct table *table, const struct expr *cond ) @@ -3688,6 +3697,7 @@ static enum fill_status fill_operatingsystem( struct table *table, const struct rec->totalvirtualmemorysize = get_total_physical_memory() / 1024; rec->totalvisiblememorysize = rec->totalvirtualmemorysize; rec->version = get_osversion( &ver ); + rec->windowsdirectory = get_windowsdirectory(); if (!match_row( table, row, cond, &status )) free_row_values( table, row ); else row++; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 37c149fab26..54d80b9e196 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1441,6 +1441,7 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) check_property( obj, L"TotalVirtualMemorySize", VT_BSTR, CIM_UINT64 ); check_property( obj, L"Status", VT_BSTR, CIM_STRING ); check_property( obj, L"SystemDrive", VT_BSTR, CIM_STRING ); + check_property( obj, L"WindowsDirectory", VT_BSTR, CIM_STRING ); IWbemClassObject_Release( obj ); IEnumWbemClassObject_Release( result ); -- 2.30.2

1 0

[PATCH v2 4/7] wbemprox: Add BootDevice property to Win32_Operatingsystem.
by Hans Leidekker 28 Apr '22

28 Apr '22

From: Louis Lenders <xerox.xerox2000x(a)gmail.com> Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=52887 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 3 +++ dlls/wbemprox/tests/query.c | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index ba3e728c8c5..8c5a158fea3 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -228,6 +228,7 @@ static const struct column col_networkadapterconfig[] = }; static const struct column col_operatingsystem[] = { + { L"BootDevice", CIM_STRING }, { L"BuildNumber", CIM_STRING|COL_FLAG_DYNAMIC }, { L"BuildType", CIM_STRING }, { L"Caption", CIM_STRING|COL_FLAG_DYNAMIC }, @@ -662,6 +663,7 @@ struct record_networkadapterconfig }; struct record_operatingsystem { + const WCHAR *bootdevice; const WCHAR *buildnumber; const WCHAR *buildtype; const WCHAR *caption; @@ -3651,6 +3653,7 @@ static enum fill_status fill_operatingsystem( struct table *table, const struct RtlGetVersion( &ver ); rec = (struct record_operatingsystem *)table->data; + rec->bootdevice = L"\\Device\\HarddiskVolume1"; rec->buildnumber = get_osbuildnumber( &ver ); rec->buildtype = L"Wine build"; rec->caption = get_oscaption( &ver ); diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index b31506a12d6..37c149fab26 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1388,6 +1388,7 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) hr = IWbemClassObject_EndEnumeration( obj ); ok( hr == S_OK, "got %#lx\n", hr ); + check_property( obj, L"BootDevice", VT_BSTR, CIM_STRING ); check_property( obj, L"BuildNumber", VT_BSTR, CIM_STRING ); check_property( obj, L"BuildType", VT_BSTR, CIM_STRING ); check_property( obj, L"Caption", VT_BSTR, CIM_STRING ); -- 2.30.2

1 0

[PATCH v2 3/7] wbemprox: Add Organization property to Win32_Operatingsystem.
by Hans Leidekker 28 Apr '22

28 Apr '22

From: Louis Lenders <xerox.xerox2000x(a)gmail.com> v2: Use the helper. Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=52887 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 52 ++++++++++++++++++++++--------------- dlls/wbemprox/tests/query.c | 1 + 2 files changed, 32 insertions(+), 21 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 5c53aae8d3b..ba3e728c8c5 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -244,6 +244,7 @@ static const struct column col_operatingsystem[] = { L"Manufacturer", CIM_STRING }, { L"Name", CIM_STRING|COL_FLAG_DYNAMIC }, { L"OperatingSystemSKU", CIM_UINT32 }, + { L"Organization", CIM_STRING|COL_FLAG_DYNAMIC }, { L"OSArchitecture", CIM_STRING }, { L"OSLanguage", CIM_UINT32 }, { L"OSProductSuite", CIM_UINT32 }, @@ -677,6 +678,7 @@ struct record_operatingsystem const WCHAR *manufacturer; const WCHAR *name; UINT32 operatingsystemsku; + const WCHAR *organization; const WCHAR *osarchitecture; UINT32 oslanguage; UINT32 osproductsuite; @@ -3515,6 +3517,34 @@ static WCHAR *get_locale(void) if (ret) GetLocaleInfoW( LOCALE_SYSTEM_DEFAULT, LOCALE_ILANGUAGE, ret, 5 ); return ret; } + +static WCHAR *get_reg_str( HKEY root, const WCHAR *path, const WCHAR *value ) +{ + HKEY hkey = 0; + DWORD size, type; + WCHAR *ret = NULL; + + if (!RegOpenKeyExW( root, path, 0, KEY_READ, &hkey ) && + !RegQueryValueExW( hkey, value, NULL, &type, NULL, &size ) && type == REG_SZ && + (ret = malloc( size + sizeof(WCHAR) ))) + { + size += sizeof(WCHAR); + if (RegQueryValueExW( hkey, value, NULL, NULL, (BYTE *)ret, &size )) + { + free( ret ); + ret = NULL; + } + } + if (hkey) RegCloseKey( hkey ); + return ret; +} + +static WCHAR *get_organization(void) +{ + return get_reg_str( HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion", + L"RegisteredOrganization" ); +} + static WCHAR *get_osbuildnumber( OSVERSIONINFOEXW *ver ) { WCHAR *ret = malloc( 11 * sizeof(WCHAR) ); @@ -3574,27 +3604,6 @@ static WCHAR *get_osname( const WCHAR *caption ) return ret; } -static WCHAR *get_reg_str( HKEY root, const WCHAR *path, const WCHAR *value ) -{ - HKEY hkey = 0; - DWORD size, type; - WCHAR *ret = NULL; - - if (!RegOpenKeyExW( root, path, 0, KEY_READ, &hkey ) && - !RegQueryValueExW( hkey, value, NULL, &type, NULL, &size ) && type == REG_SZ && - (ret = malloc( size + sizeof(WCHAR) ))) - { - size += sizeof(WCHAR); - if (RegQueryValueExW( hkey, value, NULL, NULL, (BYTE *)ret, &size )) - { - free( ret ); - ret = NULL; - } - } - if (hkey) RegCloseKey( hkey ); - return ret; -} - static WCHAR *get_osserialnumber(void) { WCHAR *ret = get_reg_str( HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion", L"ProductId" ); @@ -3658,6 +3667,7 @@ static enum fill_status fill_operatingsystem( struct table *table, const struct rec->manufacturer = L"The Wine Project"; rec->name = get_osname( rec->caption ); rec->operatingsystemsku = get_operatingsystemsku(); + rec->organization = get_organization(); rec->osarchitecture = get_osarchitecture(); rec->oslanguage = GetSystemDefaultLangID(); rec->osproductsuite = 2461140; /* Windows XP Professional */ diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 7cca770ffc7..b31506a12d6 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1428,6 +1428,7 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) check_property( obj, L"CSName", VT_BSTR, CIM_STRING ); check_property( obj, L"CurrentTimeZone", VT_I2, CIM_SINT16 ); check_property( obj, L"Manufacturer", VT_BSTR, CIM_STRING ); + check_property( obj, L"Organization", VT_BSTR, CIM_STRING ); check_property( obj, L"OSType", VT_I4, CIM_UINT16 ); check_property( obj, L"ProductType", VT_I4, CIM_UINT32 ); check_property( obj, L"RegisteredUser", VT_BSTR, CIM_STRING ); -- 2.30.2

1 0

[PATCH v2 2/7] wbemprox: Add RegisterdUser property to Win32_Operatingsystem.
by Hans Leidekker 28 Apr '22

28 Apr '22

From: Louis Lenders <xerox.xerox2000x(a)gmail.com> v2: Use a shared helper to get the registry value. Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=52887 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 27 ++++++++++++++++++++++----- dlls/wbemprox/tests/query.c | 1 + 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 93b26c23dd3..5c53aae8d3b 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -250,6 +250,7 @@ static const struct column col_operatingsystem[] = { L"OSType", CIM_UINT16 }, { L"Primary", CIM_BOOLEAN }, { L"ProductType", CIM_UINT32 }, + { L"RegisteredUser", CIM_STRING|COL_FLAG_DYNAMIC }, { L"SerialNumber", CIM_STRING|COL_FLAG_DYNAMIC }, { L"ServicePackMajorVersion", CIM_UINT16 }, { L"ServicePackMinorVersion", CIM_UINT16 }, @@ -682,6 +683,7 @@ struct record_operatingsystem UINT16 ostype; int primary; UINT32 producttype; + const WCHAR *registereduser; const WCHAR *serialnumber; UINT16 servicepackmajor; UINT16 servicepackminor; @@ -3571,27 +3573,35 @@ static WCHAR *get_osname( const WCHAR *caption ) memcpy( ret + len, partitionW, sizeof(partitionW) ); return ret; } -static WCHAR *get_osserialnumber(void) + +static WCHAR *get_reg_str( HKEY root, const WCHAR *path, const WCHAR *value ) { HKEY hkey = 0; DWORD size, type; WCHAR *ret = NULL; - if (!RegOpenKeyExW( HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion", 0, KEY_READ, &hkey ) && - !RegQueryValueExW( hkey, L"ProductId", NULL, &type, NULL, &size ) && type == REG_SZ && + if (!RegOpenKeyExW( root, path, 0, KEY_READ, &hkey ) && + !RegQueryValueExW( hkey, value, NULL, &type, NULL, &size ) && type == REG_SZ && (ret = malloc( size + sizeof(WCHAR) ))) { size += sizeof(WCHAR); - if (RegQueryValueExW( hkey, L"ProductId", NULL, NULL, (BYTE *)ret, &size )) + if (RegQueryValueExW( hkey, value, NULL, NULL, (BYTE *)ret, &size )) { free( ret ); ret = NULL; } } if (hkey) RegCloseKey( hkey ); - if (!ret) return wcsdup( L"12345-OEM-1234567-12345" ); return ret; } + +static WCHAR *get_osserialnumber(void) +{ + WCHAR *ret = get_reg_str( HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion", L"ProductId" ); + if (!ret) ret = wcsdup( L"12345-OEM-1234567-12345" ); + return ret; +} + static WCHAR *get_osversion( OSVERSIONINFOEXW *ver ) { WCHAR *ret = malloc( 33 * sizeof(WCHAR) ); @@ -3604,6 +3614,12 @@ static DWORD get_operatingsystemsku(void) GetProductInfo( 6, 0, 0, 0, &ret ); return ret; } + +static WCHAR *get_registereduser(void) +{ + return get_reg_str( HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion", L"RegisteredOwner" ); +} + static INT16 get_currenttimezone(void) { TIME_ZONE_INFORMATION info; @@ -3648,6 +3664,7 @@ static enum fill_status fill_operatingsystem( struct table *table, const struct rec->ostype = 18; /* WINNT */ rec->primary = -1; rec->producttype = 1; + rec->registereduser = get_registereduser(); rec->serialnumber = get_osserialnumber(); rec->servicepackmajor = ver.wServicePackMajor; rec->servicepackminor = ver.wServicePackMinor; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 865d1b6136a..7cca770ffc7 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1430,6 +1430,7 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) check_property( obj, L"Manufacturer", VT_BSTR, CIM_STRING ); check_property( obj, L"OSType", VT_I4, CIM_UINT16 ); check_property( obj, L"ProductType", VT_I4, CIM_UINT32 ); + check_property( obj, L"RegisteredUser", VT_BSTR, CIM_STRING ); check_property( obj, L"ServicePackMajorVersion", VT_I4, CIM_UINT16 ); check_property( obj, L"ServicePackMinorVersion", VT_I4, CIM_UINT16 ); check_property( obj, L"SuiteMask", VT_I4, CIM_UINT32 ); -- 2.30.2

1 0

[PATCH v2 1/7] wbemprox: Add BuildType property to Win32_OperatingSystem.
by Hans Leidekker 28 Apr '22

28 Apr '22

From: Louis Lenders <xerox.xerox2000x(a)gmail.com> Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=52887 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 3 +++ dlls/wbemprox/tests/query.c | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 69d74d756f8..93b26c23dd3 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -229,6 +229,7 @@ static const struct column col_networkadapterconfig[] = static const struct column col_operatingsystem[] = { { L"BuildNumber", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"BuildType", CIM_STRING }, { L"Caption", CIM_STRING|COL_FLAG_DYNAMIC }, { L"CodeSet", CIM_STRING|COL_FLAG_DYNAMIC }, { L"CountryCode", CIM_STRING|COL_FLAG_DYNAMIC }, @@ -660,6 +661,7 @@ struct record_networkadapterconfig struct record_operatingsystem { const WCHAR *buildnumber; + const WCHAR *buildtype; const WCHAR *caption; const WCHAR *codeset; const WCHAR *countrycode; @@ -3625,6 +3627,7 @@ static enum fill_status fill_operatingsystem( struct table *table, const struct rec = (struct record_operatingsystem *)table->data; rec->buildnumber = get_osbuildnumber( &ver ); + rec->buildtype = L"Wine build"; rec->caption = get_oscaption( &ver ); rec->codeset = get_codeset(); rec->countrycode = get_countrycode(); diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index e0fe78b7fd1..865d1b6136a 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1389,6 +1389,7 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) ok( hr == S_OK, "got %#lx\n", hr ); check_property( obj, L"BuildNumber", VT_BSTR, CIM_STRING ); + check_property( obj, L"BuildType", VT_BSTR, CIM_STRING ); check_property( obj, L"Caption", VT_BSTR, CIM_STRING ); type = 0xdeadbeef; -- 2.30.2

1 0

[PATCH 1/5] kernel32/tests: Add some HEAP_NO_SERIALIZE flag / LFH locking tests.
by Rémi Bernon 28 Apr '22

28 Apr '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/tests/heap.c | 202 ++++++++++++++++++++++++++++++++++++- 1 file changed, 201 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index fded1c69f1e..28cbee6ea83 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -88,18 +88,76 @@ struct heap }; +struct heap_thread_params +{ + HANDLE ready_event; + HANDLE start_event; + BOOL done; + + HANDLE heap; + DWORD flags; + BOOL lock; +}; + +DWORD WINAPI heap_thread_proc( void *arg ) +{ + struct heap_thread_params *params = arg; + void *ptr; + DWORD res; + BOOL ret; + + SetEvent( params->ready_event ); + + while (!(res = WaitForSingleObject( params->start_event, INFINITE )) && !params->done) + { + if (params->lock) + { + ret = HeapLock( params->heap ); + ok( ret, "HeapLock failed, error %lu\n", GetLastError() ); + } + + ptr = HeapAlloc( params->heap, params->flags, 0 ); + ok( !!ptr, "HeapAlloc failed, error %lu\n", GetLastError() ); + ret = HeapFree( params->heap, params->flags, ptr ); + ok( ret, "HeapFree failed, error %lu\n", GetLastError() ); + + if (params->lock) + { + ret = HeapUnlock( params->heap ); + ok( ret, "HeapUnlock failed, error %lu\n", GetLastError() ); + } + + SetEvent( params->ready_event ); + } + ok( !res, "WaitForSingleObject returned %#lx, error %lu\n", res, GetLastError() ); + + return 0; +} + + static void test_HeapCreate(void) { static const BYTE buffer[512] = {0}; SIZE_T alloc_size = 0x8000 * sizeof(void *), size, i; + struct heap_thread_params thread_params = {0}; PROCESS_HEAP_ENTRY entry, entries[256]; - HANDLE heap, heap1, heaps[8]; + HANDLE heap, heap1, heaps[8], thread; BYTE *ptr, *ptr1, *ptrs[128]; DWORD heap_count, count; ULONG compat_info; UINT_PTR align; + DWORD res; BOOL ret; + thread_params.ready_event = CreateEventW( NULL, FALSE, FALSE, NULL ); + ok( !!thread_params.ready_event, "CreateEventW failed, error %lu\n", GetLastError() ); + thread_params.start_event = CreateEventW( NULL, FALSE, FALSE, NULL ); + ok( !!thread_params.start_event, "CreateEventW failed, error %lu\n", GetLastError() ); + thread = CreateThread( NULL, 0, heap_thread_proc, &thread_params, 0, NULL ); + ok( !!thread, "CreateThread failed, error %lu\n", GetLastError() ); + res = WaitForSingleObject( thread_params.ready_event, INFINITE ); + ok( !res, "WaitForSingleObject returned %#lx, error %lu\n", res, GetLastError() ); + heap_count = GetProcessHeaps( 0, NULL ); ok( heap_count <= 6, "GetProcessHeaps returned %lu\n", heap_count ); @@ -879,6 +937,148 @@ static void test_HeapCreate(void) ret = HeapDestroy( heap ); ok( ret, "HeapDestroy failed, error %lu\n", GetLastError() ); + + + /* check HEAP_NO_SERIALIZE HeapCreate flag effect */ + + heap = HeapCreate( HEAP_NO_SERIALIZE, 0, 0 ); + ok( !!heap, "HeapCreate failed, error %lu\n", GetLastError() ); + ok( !((ULONG_PTR)heap & 0xffff), "wrong heap alignment\n" ); + + ret = HeapLock( heap ); + ok( ret, "HeapLock failed, error %lu\n", GetLastError() ); + thread_params.heap = heap; + thread_params.lock = TRUE; + thread_params.flags = 0; + SetEvent( thread_params.start_event ); + res = WaitForSingleObject( thread_params.ready_event, 100 ); + todo_wine + ok( !res, "WaitForSingleObject returned %#lx, error %lu\n", res, GetLastError() ); + ret = HeapUnlock( heap ); + ok( ret, "HeapUnlock failed, error %lu\n", GetLastError() ); + if (res) WaitForSingleObject( thread_params.ready_event, 100 ); + + ret = HeapLock( heap ); + ok( ret, "HeapLock failed, error %lu\n", GetLastError() ); + thread_params.heap = heap; + thread_params.lock = FALSE; + thread_params.flags = 0; + SetEvent( thread_params.start_event ); + res = WaitForSingleObject( thread_params.ready_event, 100 ); + ok( !res, "WaitForSingleObject returned %#lx, error %lu\n", res, GetLastError() ); + ret = HeapUnlock( heap ); + ok( ret, "HeapUnlock failed, error %lu\n", GetLastError() ); + + ret = HeapDestroy( heap ); + ok( ret, "HeapDestroy failed, error %lu\n", GetLastError() ); + + + /* check HEAP_NO_SERIALIZE HeapAlloc / HeapFree flag effect */ + + heap = HeapCreate( 0, 0, 0 ); + ok( !!heap, "HeapCreate failed, error %lu\n", GetLastError() ); + ok( !((ULONG_PTR)heap & 0xffff), "wrong heap alignment\n" ); + + ret = HeapLock( heap ); + ok( ret, "HeapLock failed, error %lu\n", GetLastError() ); + thread_params.heap = heap; + thread_params.lock = TRUE; + thread_params.flags = 0; + SetEvent( thread_params.start_event ); + res = WaitForSingleObject( thread_params.ready_event, 100 ); + ok( res == WAIT_TIMEOUT, "WaitForSingleObject returned %#lx, error %lu\n", res, GetLastError() ); + ret = HeapUnlock( heap ); + ok( ret, "HeapUnlock failed, error %lu\n", GetLastError() ); + res = WaitForSingleObject( thread_params.ready_event, 100 ); + ok( !res, "WaitForSingleObject returned %#lx, error %lu\n", res, GetLastError() ); + + ret = HeapLock( heap ); + ok( ret, "HeapLock failed, error %lu\n", GetLastError() ); + thread_params.heap = heap; + thread_params.lock = FALSE; + thread_params.flags = 0; + SetEvent( thread_params.start_event ); + res = WaitForSingleObject( thread_params.ready_event, 100 ); + ok( res == WAIT_TIMEOUT, "WaitForSingleObject returned %#lx, error %lu\n", res, GetLastError() ); + ret = HeapUnlock( heap ); + ok( ret, "HeapUnlock failed, error %lu\n", GetLastError() ); + res = WaitForSingleObject( thread_params.ready_event, 100 ); + ok( !res, "WaitForSingleObject returned %#lx, error %lu\n", res, GetLastError() ); + + ret = HeapLock( heap ); + ok( ret, "HeapLock failed, error %lu\n", GetLastError() ); + thread_params.heap = heap; + thread_params.lock = FALSE; + thread_params.flags = HEAP_NO_SERIALIZE; + SetEvent( thread_params.start_event ); + res = WaitForSingleObject( thread_params.ready_event, 100 ); + ok( !res, "WaitForSingleObject returned %#lx, error %lu\n", res, GetLastError() ); + ret = HeapUnlock( heap ); + ok( ret, "HeapUnlock failed, error %lu\n", GetLastError() ); + + ret = HeapDestroy( heap ); + ok( ret, "HeapDestroy failed, error %lu\n", GetLastError() ); + + + /* check LFH heap locking */ + + heap = HeapCreate( 0, 0, 0 ); + ok( !!heap, "HeapCreate failed, error %lu\n", GetLastError() ); + ok( !((ULONG_PTR)heap & 0xffff), "wrong heap alignment\n" ); + + ret = pHeapQueryInformation( heap, HeapCompatibilityInformation, &compat_info, sizeof(compat_info), &size ); + ok( ret, "HeapQueryInformation failed, error %lu\n", GetLastError() ); + ok( compat_info == 0, "got HeapCompatibilityInformation %lu\n", compat_info ); + + for (i = 0; i < 0x12; i++) ptrs[i] = pHeapAlloc( heap, 0, 0 ); + for (i = 0; i < 0x12; i++) HeapFree( heap, 0, ptrs[i] ); + + ret = pHeapQueryInformation( heap, HeapCompatibilityInformation, &compat_info, sizeof(compat_info), &size ); + ok( ret, "HeapQueryInformation failed, error %lu\n", GetLastError() ); + todo_wine + ok( compat_info == 2, "got HeapCompatibilityInformation %lu\n", compat_info ); + + /* locking is serialized */ + + ret = HeapLock( heap ); + ok( ret, "HeapLock failed, error %lu\n", GetLastError() ); + thread_params.heap = heap; + thread_params.lock = TRUE; + thread_params.flags = 0; + SetEvent( thread_params.start_event ); + res = WaitForSingleObject( thread_params.ready_event, 100 ); + ok( res == WAIT_TIMEOUT, "WaitForSingleObject returned %#lx, error %lu\n", res, GetLastError() ); + ret = HeapUnlock( heap ); + ok( ret, "HeapUnlock failed, error %lu\n", GetLastError() ); + res = WaitForSingleObject( thread_params.ready_event, 100 ); + ok( !res, "WaitForSingleObject returned %#lx, error %lu\n", res, GetLastError() ); + + /* but allocation is not */ + + ret = HeapLock( heap ); + ok( ret, "HeapLock failed, error %lu\n", GetLastError() ); + thread_params.heap = heap; + thread_params.lock = FALSE; + thread_params.flags = 0; + SetEvent( thread_params.start_event ); + res = WaitForSingleObject( thread_params.ready_event, 100 ); + todo_wine + ok( !res, "WaitForSingleObject returned %#lx, error %lu\n", res, GetLastError() ); + ret = HeapUnlock( heap ); + ok( ret, "HeapUnlock failed, error %lu\n", GetLastError() ); + if (res) res = WaitForSingleObject( thread_params.ready_event, 100 ); + + ret = HeapDestroy( heap ); + ok( ret, "HeapDestroy failed, error %lu\n", GetLastError() ); + + + thread_params.done = TRUE; + SetEvent( thread_params.start_event ); + res = WaitForSingleObject( thread, INFINITE ); + ok( !res, "WaitForSingleObject returned %#lx, error %lu\n", res, GetLastError() ); + CloseHandle( thread_params.start_event ); + CloseHandle( thread_params.ready_event ); + CloseHandle( thread ); } -- 2.35.1

1 4

[PATCH 0/16] MR10: use OEM code page for output
by eric pouech (＠epo) 28 Apr '22

28 Apr '22

review and fix the logic when writing text oriented output in programs/* - some where using GetConsoleCP() or GetConsoleOutputCP() if WriteConsoleW fails; this is wrong as if WriteConsole failed, then it could mean that program isn't attached to a console (or here running under shell-no-window)... Luckily, in these cases, the returned value by GetConsole*CP() is 0, and CP_ACP is also 0... but it's likely not what was expected at first glance - testing under windows shows that it's rather GetOEMCP() which is used in those cases - simplified some code and checked for allocation failure where missing Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> -- This merge request has too many patches to be relayed via email. Please visit the URL below to see the contents of the merge request. https://gitlab.winehq.org/wine/wine/-/merge_requests/10

1 0

[PATCH 3/3] opengl32/tests: Test wglCopyContext().
by Zhiyi Zhang 28 Apr '22

28 Apr '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/opengl32/tests/opengl.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 8b0e70ccf9c..f5ce9e6f983 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -1820,6 +1820,26 @@ static void test_wglChoosePixelFormatARB(HDC hdc) } } +static void test_copy_context(HDC hdc) +{ + HGLRC ctx, ctx2; + BOOL ret; + + ctx = wglCreateContext(hdc); + ok(!!ctx, "Failed to create GL context, last error %#lx.\n", GetLastError()); + ctx2 = wglCreateContext(hdc); + ok(!!ctx2, "Failed to create GL context, last error %#lx.\n", GetLastError()); + + ret = wglCopyContext(ctx, ctx2, GL_ALL_ATTRIB_BITS); + todo_wine + ok(ret, "Failed to copy GL context, last error %#lx.\n", GetLastError()); + + ret = wglDeleteContext(ctx2); + ok(ret, "Failed to delete GL context, last error %#lx.\n", GetLastError()); + ret = wglDeleteContext(ctx); + ok(ret, "Failed to delete GL context, last error %#lx.\n", GetLastError()); +} + START_TEST(opengl) { HWND hwnd; @@ -1905,6 +1925,7 @@ START_TEST(opengl) test_getprocaddress(hdc); test_deletecontext(hwnd, hdc); test_makecurrent(hdc); + test_copy_context(hdc); /* The lack of wglGetExtensionsStringARB in general means broken software rendering or the lack of decent OpenGL support, skip tests in such cases */ if (!pwglGetExtensionsStringARB) -- 2.32.0

1 0

[PATCH 2/3] winex11.drv: Lock display when expecting error events.
by Zhiyi Zhang 28 Apr '22

28 Apr '22

If the display is not locked, another thread could take the error event and handle it with the default error handlers and thus not handled by the current thread with the specified error handlers. Fix Cladun X2 crash at start. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/bitblt.c | 4 ++-- dlls/winex11.drv/clipboard.c | 2 +- dlls/winex11.drv/graphics.c | 2 +- dlls/winex11.drv/opengl.c | 6 +++--- dlls/winex11.drv/wintab.c | 6 +++--- dlls/winex11.drv/x11drv.h | 2 +- dlls/winex11.drv/x11drv_main.c | 4 +++- dlls/winex11.drv/xrandr.c | 4 ++-- dlls/winex11.drv/xvidmode.c | 12 ++++++------ 9 files changed, 22 insertions(+), 20 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 550c5f06f37..1461e1430c5 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1369,7 +1369,7 @@ DWORD CDECL X11DRV_GetImage( PHYSDEV dev, BITMAPINFO *info, image = XGetImage( gdi_display, physdev->drawable, physdev->dc_rect.left + x, physdev->dc_rect.top + y, width, height, AllPlanes, ZPixmap ); - if (X11DRV_check_error()) + if (X11DRV_check_error( gdi_display )) { /* use a temporary pixmap to avoid the BadMatch error */ Pixmap pixmap = XCreatePixmap( gdi_display, root_window, width, height, vis.depth ); @@ -1807,7 +1807,7 @@ static XImage *create_shm_image( const XVisualInfo *vis, int width, int height, X11DRV_expect_error( gdi_display, xshm_error_handler, NULL ); ok = (XShmAttach( gdi_display, shminfo ) != 0); XSync( gdi_display, False ); - if (!X11DRV_check_error() && ok) + if (!X11DRV_check_error( gdi_display ) && ok) { image->data = shminfo->shmaddr; shmctl( shminfo->shmid, IPC_RMID, 0 ); diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 6baa87c5ce1..6d6ee485385 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -397,7 +397,7 @@ static void register_x11_formats( const Atom *atoms, UINT size ) X11DRV_expect_error( display, is_atom_error, NULL ); if (!XGetAtomNames( display, new_atoms, count, names )) count = 0; - if (X11DRV_check_error()) + if (X11DRV_check_error( display )) { WARN( "got some bad atoms, ignoring\n" ); count = 0; diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index 7ab358c43c1..39e420231e9 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -1471,7 +1471,7 @@ BOOL CDECL X11DRV_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT physDev->dc_rect.left + rect.left, physDev->dc_rect.top + rect.top, rect.right - rect.left, rect.bottom - rect.top, AllPlanes, ZPixmap ); - if(X11DRV_check_error()) image = NULL; + if(X11DRV_check_error( gdi_display )) image = NULL; if (!image) return FALSE; if (X11DRV_SetupGCForBrush( physDev )) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index fd6eea05fa6..2718575922b 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1230,7 +1230,7 @@ static BOOL set_swap_interval(GLXDrawable drawable, int interval) X11DRV_expect_error(gdi_display, GLXErrorHandler, NULL); pglXSwapIntervalEXT(gdi_display, drawable, interval); XSync(gdi_display, False); - ret = !X11DRV_check_error(); + ret = !X11DRV_check_error(gdi_display); break; case GLX_SWAP_CONTROL_MESA: @@ -1706,7 +1706,7 @@ static BOOL WINAPI glxdrv_wglCopyContext(struct wgl_context *src, struct wgl_con X11DRV_expect_error( gdi_display, GLXErrorHandler, NULL ); pglXCopyContext( gdi_display, src->ctx, dst->ctx, mask ); XSync( gdi_display, False ); - if (X11DRV_check_error()) + if (X11DRV_check_error( gdi_display )) { static unsigned int once; @@ -2085,7 +2085,7 @@ static struct wgl_context *X11DRV_wglCreateContextAttribsARB( HDC hdc, struct wg X11DRV_expect_error(gdi_display, GLXErrorHandler, NULL); ret->ctx = create_glxcontext(gdi_display, ret, hShareContext ? hShareContext->ctx : NULL); XSync(gdi_display, False); - if ((err = X11DRV_check_error()) || !ret->ctx) + if ((err = X11DRV_check_error(gdi_display)) || !ret->ctx) { /* In the future we should convert the GLX error to a win32 one here if needed */ WARN("Context creation failed (error %#x).\n", err); diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 331601c3325..269a1daaa4d 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -589,7 +589,7 @@ BOOL CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) X11DRV_expect_error(data->display, Tablet_ErrorHandler, NULL); opendevice = pXOpenDevice(data->display,target->id); - if (!X11DRV_check_error() && opendevice) + if (!X11DRV_check_error(data->display) && opendevice) { unsigned char map[32]; int i; @@ -597,7 +597,7 @@ BOOL CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) X11DRV_expect_error(data->display,Tablet_ErrorHandler,NULL); cursor.BUTTONS = pXGetDeviceButtonMapping(data->display, opendevice, map, 32); - if (X11DRV_check_error() || cursor.BUTTONS <= 0) + if (X11DRV_check_error(data->display) || cursor.BUTTONS <= 0) { TRACE("No buttons, Non Tablet Device\n"); pXCloseDevice(data->display, opendevice); @@ -1086,7 +1086,7 @@ int CDECL X11DRV_AttachEventQueueToTablet(HWND hOwner) } } XSync(data->display, False); - X11DRV_check_error(); + X11DRV_check_error(data->display); if (NULL != devices) pXFreeDeviceList(devices); return 0; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index f6d28122fc3..bde92d2eb89 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -700,7 +700,7 @@ extern HWND *build_hwnd_list(void) DECLSPEC_HIDDEN; typedef int (*x11drv_error_callback)( Display *display, XErrorEvent *event, void *arg ); extern void X11DRV_expect_error( Display *display, x11drv_error_callback callback, void *arg ) DECLSPEC_HIDDEN; -extern int X11DRV_check_error(void) DECLSPEC_HIDDEN; +extern int X11DRV_check_error( Display *display ) DECLSPEC_HIDDEN; extern void X11DRV_X_to_window_rect( struct x11drv_win_data *data, RECT *rect, int x, int y, int cx, int cy ) DECLSPEC_HIDDEN; extern POINT virtual_screen_to_root( INT x, INT y ) DECLSPEC_HIDDEN; extern POINT root_to_virtual_screen( INT x, INT y ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 6042f2522b5..296f1c4d036 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -246,6 +246,7 @@ static inline BOOL ignore_error( Display *display, XErrorEvent *event ) void X11DRV_expect_error( Display *display, x11drv_error_callback callback, void *arg ) { pthread_mutex_lock( &error_mutex ); + XLockDisplay( display ); err_callback = callback; err_callback_display = display; err_callback_arg = arg; @@ -260,10 +261,11 @@ void X11DRV_expect_error( Display *display, x11drv_error_callback callback, void * Check if an expected X11 error occurred; return non-zero if yes. * The caller is responsible for calling XSync first if necessary. */ -int X11DRV_check_error(void) +int X11DRV_check_error( Display *display ) { int res = err_callback_result; err_callback = NULL; + XUnlockDisplay( display ); pthread_mutex_unlock( &error_mutex ); return res; } diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index b0619c0abcd..81ecbc4b9a8 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -707,7 +707,7 @@ static BOOL get_gpu_properties_from_vulkan( struct gdi_gpu *gpu, const XRRProvid vr = pvkGetRandROutputDisplayEXT( vk_physical_devices[device_idx], gdi_display, provider_info->outputs[output_idx], &vk_display ); XSync( gdi_display, FALSE ); - if (X11DRV_check_error() || vr != VK_SUCCESS || vk_display == VK_NULL_HANDLE) + if (X11DRV_check_error( gdi_display ) || vr != VK_SUCCESS || vk_display == VK_NULL_HANDLE) continue; memset( &id, 0, sizeof(id) ); @@ -1652,7 +1652,7 @@ void X11DRV_XRandR_Init(void) if (!pXRRQueryExtension( gdi_display, &event_base, &error_base )) return; X11DRV_expect_error( gdi_display, XRandRErrorHandler, NULL ); ok = pXRRQueryVersion( gdi_display, &major, &minor ); - if (X11DRV_check_error() || !ok) return; + if (X11DRV_check_error( gdi_display ) || !ok) return; TRACE("Found XRandR %d.%d.\n", major, minor); diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index 126e2bf2a69..8adbb3ffb5d 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -125,7 +125,7 @@ static BOOL xf86vm_get_modes(ULONG_PTR id, DWORD flags, DEVMODEW **new_modes, UI X11DRV_expect_error(gdi_display, XVidModeErrorHandler, NULL); ret = pXF86VidModeGetAllModeLines(gdi_display, DefaultScreen(gdi_display), &xf86vm_mode_count, &xf86vm_modes); - if (X11DRV_check_error() || !ret || !xf86vm_mode_count) + if (X11DRV_check_error(gdi_display) || !ret || !xf86vm_mode_count) return FALSE; /* Put a XF86VidModeModeInfo ** at the start to store the XF86VidMode modes pointer */ @@ -195,7 +195,7 @@ static BOOL xf86vm_get_current_mode(ULONG_PTR id, DEVMODEW *mode) X11DRV_expect_error(gdi_display, XVidModeErrorHandler, NULL); ret = pXF86VidModeGetModeLine(gdi_display, DefaultScreen(gdi_display), &dotclock, &xf86vm_mode); - if (X11DRV_check_error() || !ret) + if (X11DRV_check_error(gdi_display) || !ret) return FALSE; mode->dmBitsPerPel = screen_bpp; @@ -235,7 +235,7 @@ static LONG xf86vm_set_current_mode(ULONG_PTR id, DEVMODEW *mode) memcpy(&xf86vm_mode, (BYTE *)mode + sizeof(*mode), sizeof(xf86vm_mode)); X11DRV_expect_error(gdi_display, XVidModeErrorHandler, NULL); ret = pXF86VidModeSwitchToMode(gdi_display, DefaultScreen(gdi_display), xf86vm_mode); - if (X11DRV_check_error() || !ret) + if (X11DRV_check_error(gdi_display) || !ret) return DISP_CHANGE_FAILED; #if 0 /* it is said that SetViewPort causes problems with some X servers */ pXF86VidModeSetViewPort(gdi_display, DefaultScreen(gdi_display), 0, 0); @@ -287,7 +287,7 @@ void X11DRV_XF86VM_Init(void) X11DRV_expect_error(gdi_display, XVidModeErrorHandler, NULL); ok = pXF86VidModeQueryVersion(gdi_display, &xf86vm_major, &xf86vm_minor); - if (X11DRV_check_error() || !ok) return; + if (X11DRV_check_error(gdi_display) || !ok) return; #ifdef X_XF86VidModeSetGammaRamp if (xf86vm_major > 2 || (xf86vm_major == 2 && xf86vm_minor >= 1)) @@ -295,7 +295,7 @@ void X11DRV_XF86VM_Init(void) X11DRV_expect_error(gdi_display, XVidModeErrorHandler, NULL); pXF86VidModeGetGammaRampSize(gdi_display, DefaultScreen(gdi_display), &xf86vm_gammaramp_size); - if (X11DRV_check_error()) xf86vm_gammaramp_size = 0; + if (X11DRV_check_error(gdi_display)) xf86vm_gammaramp_size = 0; TRACE("Gamma ramp size %d.\n", xf86vm_gammaramp_size); if (xf86vm_gammaramp_size >= GAMMA_RAMP_SIZE) xf86vm_use_gammaramp = TRUE; @@ -495,7 +495,7 @@ static BOOL xf86vm_set_gamma_ramp(struct x11drv_gamma_ramp *ramp) ret = pXF86VidModeSetGammaRamp(gdi_display, DefaultScreen(gdi_display), xf86vm_gammaramp_size, red, green, blue); if (ret) XSync( gdi_display, FALSE ); - if (X11DRV_check_error()) ret = FALSE; + if (X11DRV_check_error(gdi_display)) ret = FALSE; if (red != ramp->red) free(red); -- 2.32.0

1 0

[PATCH 1/3] winex11.drv: Handle X errors from glXCopyContext().
by Zhiyi Zhang 28 Apr '22

28 Apr '22

glxCopyContext() may throw X errors and cause the current process to exit. For example, Mesa doesn't support glxCopyContext() for direct rendering contexts and ends up using the code path for indirect rendering contexts. When Xorg receives such requests, it rejects them because they're for direct rendering contexts and reports an X error. We also can't use indirect rendering context because it needs to be explicitly enabled in xorg.conf and has poor performance. So handle this error before graphics drivers implement the support. Fix Cladun X2 crash at start. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- See also https://github.com/mesa3d/mesa/blob/main/src/glx/glxcmds.c#L658 glXCopyContext() and https://github.com/freedesktop/xorg-xserver/blob/master/glx/glxcmds.c#L843 __glXDisp_CopyContext(). dlls/winex11.drv/opengl.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 92555841f71..fd6eea05fa6 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1703,9 +1703,21 @@ static BOOL WINAPI glxdrv_wglCopyContext(struct wgl_context *src, struct wgl_con { TRACE("%p -> %p mask %#x\n", src, dst, mask); - pglXCopyContext(gdi_display, src->ctx, dst->ctx, mask); + X11DRV_expect_error( gdi_display, GLXErrorHandler, NULL ); + pglXCopyContext( gdi_display, src->ctx, dst->ctx, mask ); + XSync( gdi_display, False ); + if (X11DRV_check_error()) + { + static unsigned int once; + + if (!once++) + { + ERR("glXCopyContext failed. glXCopyContext() for direct rendering contexts not " + "implemented in the host graphics driver?\n"); + } + return FALSE; + } - /* As opposed to wglCopyContext, glXCopyContext doesn't return anything, so hopefully we passed */ return TRUE; } -- 2.32.0

1 0

[PATCH 6/6] wineoss: Combine midReceiveChar() into handle_midi_data().
by Huw Davies 28 Apr '22

28 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 39 ++++++++++++++------------------------- 1 file changed, 14 insertions(+), 25 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index df22d427475..3786211c71e 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -304,39 +304,28 @@ static void handle_regular_data(struct midi_src *src, unsigned char value, UINT } } -/************************************************************************** - * midReceiveChar [internal] - */ -static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime) -{ - TRACE("Adding %02xh to %d[%d]\n", value, wDevID, MidiInDev[wDevID].incLen); - - if (wDevID >= MIDM_NumDevs) { - WARN("bad devID\n"); - return; - } - if (MidiInDev[wDevID].state <= 0) { - TRACE("disabled or input not started, thrown away\n"); - return; - } - - dwTime -= MidiInDev[wDevID].startTime; - - if (value == 0xf0 || MidiInDev[wDevID].state & 2) /* system exclusive */ - handle_sysex_data(MidiInDev + wDevID, value, dwTime); - else - handle_regular_data(MidiInDev + wDevID, value, dwTime); -} - static void handle_midi_data(unsigned char *buffer, unsigned int len) { unsigned int time = GetTickCount(), i; + struct midi_src *src; + unsigned char value; + WORD dev_id; for (i = 0; i < len; i += (buffer[i] & 0x80) ? 8 : 4) { if (buffer[i] != SEQ_MIDIPUTC) continue; - midReceiveChar(buffer[i + 2], buffer[i + 1], time); + dev_id = buffer[i + 2]; + value = buffer[i + 1]; + + if (dev_id >= MIDM_NumDevs) continue; + src = MidiInDev + dev_id; + if (src->state <= 0) continue; + + if (value == 0xf0 || src->state & 2) /* system exclusive */ + handle_sysex_data(src, value, time - src->startTime); + else + handle_regular_data(src, value, time - src->startTime); } } -- 2.25.1

1 0

[PATCH 5/6] wineoss: Make the MIM_LONGDATA time relative to the start time.
by Huw Davies 28 Apr '22

28 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index d474076011d..df22d427475 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -300,7 +300,6 @@ static void handle_regular_data(struct midi_src *src, unsigned char value, UINT if (to_send) { src->incLen = 0; - time -= src->startTime; MIDI_NotifyClient(src - MidiInDev, MIM_DATA, to_send, time); } } @@ -321,6 +320,8 @@ static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime) return; } + dwTime -= MidiInDev[wDevID].startTime; + if (value == 0xf0 || MidiInDev[wDevID].state & 2) /* system exclusive */ handle_sysex_data(MidiInDev + wDevID, value, dwTime); else -- 2.25.1

1 0

[PATCH 4/6] wineoss: Move the regular data handling to a separate helper.
by Huw Davies 28 Apr '22

28 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 120 ++++++++++++++++++++-------------------- 1 file changed, 59 insertions(+), 61 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index b4c42896a8c..d474076011d 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -247,86 +247,84 @@ static void handle_sysex_data(struct midi_src *src, unsigned char value, UINT ti in_buffer_unlock(); } -/************************************************************************** - * midReceiveChar [internal] - */ -static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime) +static void handle_regular_data(struct midi_src *src, unsigned char value, UINT time) { - DWORD toSend = 0; - - TRACE("Adding %02xh to %d[%d]\n", value, wDevID, MidiInDev[wDevID].incLen); + UINT to_send = 0; - if (wDevID >= MIDM_NumDevs) { - WARN("bad devID\n"); - return; - } - if (MidiInDev[wDevID].state <= 0) { - TRACE("disabled or input not started, thrown away\n"); - return; - } +#define IS_CMD(_x) (((_x) & 0x80) == 0x80) +#define IS_SYS_CMD(_x) (((_x) & 0xF0) == 0xF0) - if (value == 0xf0 || MidiInDev[wDevID].state & 2) /* system exclusive */ + if (!IS_CMD(value) && src->incLen == 0) /* try to reuse old cmd */ { - handle_sysex_data(MidiInDev + wDevID, value, dwTime); - return; - } - -#define IS_CMD(_x) (((_x) & 0x80) == 0x80) -#define IS_SYS_CMD(_x) (((_x) & 0xF0) == 0xF0) - - if (!IS_CMD(value) && MidiInDev[wDevID].incLen == 0) { /* try to reuse old cmd */ - if (IS_CMD(MidiInDev[wDevID].incPrev) && !IS_SYS_CMD(MidiInDev[wDevID].incPrev)) { - MidiInDev[wDevID].incoming[0] = MidiInDev[wDevID].incPrev; - MidiInDev[wDevID].incLen = 1; - TRACE("Reusing old command %02xh\n", MidiInDev[wDevID].incPrev); - } else { - FIXME("error for midi-in, should generate MIM_ERROR notification:" - " prev=%02Xh, incLen=%02Xh\n", - MidiInDev[wDevID].incPrev, MidiInDev[wDevID].incLen); - return; - } - } - MidiInDev[wDevID].incoming[(int)(MidiInDev[wDevID].incLen++)] = value; - if (MidiInDev[wDevID].incLen == 1 && !IS_SYS_CMD(MidiInDev[wDevID].incoming[0])) { - /* store new cmd, just in case */ - MidiInDev[wDevID].incPrev = MidiInDev[wDevID].incoming[0]; + if (IS_CMD(src->incPrev) && !IS_SYS_CMD(src->incPrev)) + { + src->incoming[0] = src->incPrev; + src->incLen = 1; + } + else + { + /* FIXME: should generate MIM_ERROR notification */ + return; + } } + src->incoming[(int)src->incLen++] = value; + if (src->incLen == 1 && !IS_SYS_CMD(src->incoming[0])) + /* store new cmd, just in case */ + src->incPrev = src->incoming[0]; #undef IS_CMD #undef IS_SYS_CMD - switch (MidiInDev[wDevID].incoming[0] & 0xF0) { + switch (src->incoming[0] & 0xF0) + { case MIDI_NOTEOFF: case MIDI_NOTEON: case MIDI_KEY_PRESSURE: case MIDI_CTL_CHANGE: case MIDI_PITCH_BEND: - if (MidiInDev[wDevID].incLen == 3) { - toSend = (MidiInDev[wDevID].incoming[2] << 16) | - (MidiInDev[wDevID].incoming[1] << 8) | - (MidiInDev[wDevID].incoming[0] << 0); - } - break; + if (src->incLen == 3) + to_send = (src->incoming[2] << 16) | (src->incoming[1] << 8) | + src->incoming[0]; + break; case MIDI_PGM_CHANGE: case MIDI_CHN_PRESSURE: - if (MidiInDev[wDevID].incLen == 2) { - toSend = (MidiInDev[wDevID].incoming[1] << 8) | - (MidiInDev[wDevID].incoming[0] << 0); - } - break; + if (src->incLen == 2) + to_send = (src->incoming[1] << 8) | src->incoming[0]; + break; case MIDI_SYSTEM_PREFIX: - if (MidiInDev[wDevID].incLen == 1) - toSend = (MidiInDev[wDevID].incoming[0] << 0); - break; - default: - WARN("This shouldn't happen (%02X)\n", MidiInDev[wDevID].incoming[0]); + if (src->incLen == 1) + to_send = src->incoming[0]; + break; + } + + if (to_send) + { + src->incLen = 0; + time -= src->startTime; + MIDI_NotifyClient(src - MidiInDev, MIM_DATA, to_send, time); + } +} + +/************************************************************************** + * midReceiveChar [internal] + */ +static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime) +{ + TRACE("Adding %02xh to %d[%d]\n", value, wDevID, MidiInDev[wDevID].incLen); + + if (wDevID >= MIDM_NumDevs) { + WARN("bad devID\n"); + return; } - if (toSend != 0) { - TRACE("Sending event %08x\n", toSend); - MidiInDev[wDevID].incLen = 0; - dwTime -= MidiInDev[wDevID].startTime; - MIDI_NotifyClient(wDevID, MIM_DATA, toSend, dwTime); + if (MidiInDev[wDevID].state <= 0) { + TRACE("disabled or input not started, thrown away\n"); + return; } + + if (value == 0xf0 || MidiInDev[wDevID].state & 2) /* system exclusive */ + handle_sysex_data(MidiInDev + wDevID, value, dwTime); + else + handle_regular_data(MidiInDev + wDevID, value, dwTime); } static void handle_midi_data(unsigned char *buffer, unsigned int len) -- 2.25.1

1 0

[PATCH 3/6] wineoss: Move the sysex handling to a separate helper.
by Huw Davies 28 Apr '22

28 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 67 ++++++++++++++++++++++++----------------- 1 file changed, 40 insertions(+), 27 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index d8cf3346a9c..b4c42896a8c 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -210,6 +210,43 @@ static int midiCloseSeq(int fd) return 0; } +static void handle_sysex_data(struct midi_src *src, unsigned char value, UINT time) +{ + MIDIHDR *hdr; + BOOL done = FALSE; + + src->state |= 2; + src->incLen = 0; + + in_buffer_lock(); + + hdr = src->lpQueueHdr; + if (hdr) + { + BYTE *data = (BYTE *)hdr->lpData; + + data[hdr->dwBytesRecorded++] = value; + if (hdr->dwBytesRecorded == hdr->dwBufferLength) + done = TRUE; + } + + if (value == 0xf7) /* end */ + { + src->state &= ~2; + done = TRUE; + } + + if (done && hdr) + { + src->lpQueueHdr = hdr->lpNext; + hdr->dwFlags &= ~MHDR_INQUEUE; + hdr->dwFlags |= MHDR_DONE; + MIDI_NotifyClient(src - MidiInDev, MIM_LONGDATA, (UINT_PTR)hdr, time); + } + + in_buffer_unlock(); +} + /************************************************************************** * midReceiveChar [internal] */ @@ -228,33 +265,9 @@ static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime) return; } - if (value == 0xf0 || MidiInDev[wDevID].state & 2) { /* system exclusive */ - LPMIDIHDR lpMidiHdr; - BOOL sbfb = FALSE; - - MidiInDev[wDevID].state |= 2; - MidiInDev[wDevID].incLen = 0; - in_buffer_lock(); - if ((lpMidiHdr = MidiInDev[wDevID].lpQueueHdr) != NULL) { - LPBYTE lpData = (LPBYTE) lpMidiHdr->lpData; - - lpData[lpMidiHdr->dwBytesRecorded++] = value; - if (lpMidiHdr->dwBytesRecorded == lpMidiHdr->dwBufferLength) { - sbfb = TRUE; - } - } - if (value == 0xF7) { /* then end */ - MidiInDev[wDevID].state &= ~2; - sbfb = TRUE; - } - if (sbfb && lpMidiHdr != NULL) { - lpMidiHdr = MidiInDev[wDevID].lpQueueHdr; - MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext; - lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; - lpMidiHdr->dwFlags |= MHDR_DONE; - MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime); - } - in_buffer_unlock(); + if (value == 0xf0 || MidiInDev[wDevID].state & 2) /* system exclusive */ + { + handle_sysex_data(MidiInDev + wDevID, value, dwTime); return; } -- 2.25.1

1 0

[PATCH 2/6] wineoss: Add the leading 0xf0 to the sysex data.
by Huw Davies 28 Apr '22

28 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 4da7a606248..d8cf3346a9c 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -228,10 +228,12 @@ static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime) return; } - if (MidiInDev[wDevID].state & 2) { /* system exclusive */ + if (value == 0xf0 || MidiInDev[wDevID].state & 2) { /* system exclusive */ LPMIDIHDR lpMidiHdr; BOOL sbfb = FALSE; + MidiInDev[wDevID].state |= 2; + MidiInDev[wDevID].incLen = 0; in_buffer_lock(); if ((lpMidiHdr = MidiInDev[wDevID].lpQueueHdr) != NULL) { LPBYTE lpData = (LPBYTE) lpMidiHdr->lpData; @@ -300,14 +302,8 @@ static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime) } break; case MIDI_SYSTEM_PREFIX: - if (MidiInDev[wDevID].incoming[0] == 0xF0) { - MidiInDev[wDevID].state |= 2; - MidiInDev[wDevID].incLen = 0; - } else { - if (MidiInDev[wDevID].incLen == 1) { - toSend = (MidiInDev[wDevID].incoming[0] << 0); - } - } + if (MidiInDev[wDevID].incLen == 1) + toSend = (MidiInDev[wDevID].incoming[0] << 0); break; default: WARN("This shouldn't happen (%02X)\n", MidiInDev[wDevID].incoming[0]); -- 2.25.1

1 0

[PATCH 1/6] wineoss: Simplify the midi in dispatcher.
by Huw Davies 28 Apr '22

28 Apr '22

The continue statement looks a bit awkward at the moment, but a future patch will introduce more code into the for loop. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 42 ++++++++++++++--------------------------- 1 file changed, 14 insertions(+), 28 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index fe73d97f5ab..4da7a606248 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -320,12 +320,23 @@ static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime) } } +static void handle_midi_data(unsigned char *buffer, unsigned int len) +{ + unsigned int time = GetTickCount(), i; + + for (i = 0; i < len; i += (buffer[i] & 0x80) ? 8 : 4) + { + if (buffer[i] != SEQ_MIDIPUTC) continue; + + midReceiveChar(buffer[i + 2], buffer[i + 1], time); + } +} + static DWORD WINAPI midRecThread(void *arg) { int fd = (int)(INT_PTR)arg; unsigned char buffer[256]; - int len, idx; - DWORD dwTime; + int len; struct pollfd pfd; TRACE("Thread startup\n"); @@ -349,32 +360,7 @@ static DWORD WINAPI midRecThread(void *arg) continue; } - dwTime = GetTickCount(); - - for (idx = 0; idx < len; ) { - if (buffer[idx] & 0x80) { - TRACE( - "Reading<8> %02x %02x %02x %02x %02x %02x %02x %02x\n", - buffer[idx + 0], buffer[idx + 1], - buffer[idx + 2], buffer[idx + 3], - buffer[idx + 4], buffer[idx + 5], - buffer[idx + 6], buffer[idx + 7]); - idx += 8; - } else { - switch (buffer[idx + 0]) { - case SEQ_WAIT: - case SEQ_ECHO: - break; - case SEQ_MIDIPUTC: - midReceiveChar(buffer[idx + 2], buffer[idx + 1], dwTime); - break; - default: - TRACE("Unsupported event %d\n", buffer[idx + 0]); - break; - } - idx += 4; - } - } + handle_midi_data(buffer, len); } return 0; } -- 2.25.1

1 0

[PATCH 0/1] MR2: kernelbase: Add support for progress callback in CopyFileEx.
by Alistair Leslie-Hughes (＠alesliehughes) 28 Apr '22

28 Apr '22

Based on patch by Michael Müller. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/2

3 3

[PATCH] include: Add IParentAndItem definition.
by Nikolay Sivov 28 Apr '22

28 Apr '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/actxprxy/usrmarshal.c | 20 ++++++++++++++++++++ dlls/shell32/tests/shlfolder.c | 1 - include/shobjidl.idl | 25 +++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 1 deletion(-) diff --git a/dlls/actxprxy/usrmarshal.c b/dlls/actxprxy/usrmarshal.c index 33db1327a8d..e4eada6848f 100644 --- a/dlls/actxprxy/usrmarshal.c +++ b/dlls/actxprxy/usrmarshal.c @@ -227,3 +227,23 @@ HRESULT __RPC_STUB IFolderView2_GetGroupBy_Proxy( TRACE("(%p)->(%p %p)\n", This, pkey, ascending); return IFolderView2_RemoteGetGroupBy_Proxy(This, pkey, ascending); } + +HRESULT __RPC_STUB IParentAndItem_GetParentAndItem_Stub( + IParentAndItem *This, + PIDLIST_ABSOLUTE *parent, + IShellFolder **folder, + PITEMID_CHILD *child) +{ + TRACE("(%p)->(%p %p %p)\n", This, parent, folder, child); + return IParentAndItem_GetParentAndItem(This, parent, folder, child); +} + +HRESULT __RPC_STUB IParentAndItem_GetParentAndItem_Proxy( + IParentAndItem *This, + PIDLIST_ABSOLUTE *parent, + IShellFolder **folder, + PITEMID_CHILD *child) +{ + TRACE("(%p)->(%p %p %p)\n", This, parent, folder, child); + return IParentAndItem_RemoteGetParentAndItem_Proxy(This, parent, folder, child); +} diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index b690e979ab5..da606a9e707 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -40,7 +40,6 @@ #include "wine/test.h" #include <initguid.h> -DEFINE_GUID(IID_IParentAndItem, 0xB3A4B685, 0xB685, 0x4805, 0x99,0xD9, 0x5D,0xEA,0xD2,0x87,0x32,0x36); DEFINE_GUID(CLSID_ShellDocObjView, 0xe7e4bc40, 0xe76a, 0x11ce, 0xa9,0xbb, 0x00,0xaa,0x00,0x4a,0xe8,0x37); static HRESULT (WINAPI *pSHCreateItemFromIDList)(PCIDLIST_ABSOLUTE pidl, REFIID riid, void **ppv); diff --git a/include/shobjidl.idl b/include/shobjidl.idl index a23f3cfdd36..8113d9a7ff6 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -501,6 +501,31 @@ interface IShellItemImageFactory : IUnknown [out] HBITMAP *phbm); } +[ + object, + uuid(b3a4b685-b685-4805-99d9-5dead2873236), + pointer_default(unique) +] +interface IParentAndItem : IUnknown +{ + HRESULT SetParentAndItem( + [in, unique] PCIDLIST_ABSOLUTE parent, + [in, unique] IShellFolder *folder, + [in] PCUITEMID_CHILD child); + + [local] + HRESULT GetParentAndItem( + [out] PIDLIST_ABSOLUTE *parent, + [out] IShellFolder **folder, + [out] PITEMID_CHILD *child); + + [call_as(GetParentAndItem)] + HRESULT RemoteGetParentAndItem( + [out] PIDLIST_ABSOLUTE *parent, + [out] IShellFolder **folder, + [out] PITEMID_CHILD *child); +} + typedef [v1_enum] enum tagNWMF { NWMF_UNLOADING = 0x00000001, NWMF_USERINITED = 0x00000002, -- 2.35.1

2 1

[PATCH 1/9] d2d1: Add stubs for ID2D1EffectContext.
by Ziqing Hui 28 Apr '22

28 Apr '22

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d2d1/d2d1_private.h | 23 ++++ dlls/d2d1/effect.c | 256 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 278 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index aa8e8569455..98092d80951 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -34,6 +34,7 @@ #include "initguid.h" #endif #include "dwrite_2.h" +#include "d2d1effectauthor.h" enum d2d_brush_type { @@ -567,6 +568,14 @@ struct d2d_device void d2d_device_init(struct d2d_device *device, ID2D1Factory1 *factory, IDXGIDevice *dxgi_device) DECLSPEC_HIDDEN; +struct d2d_effect_context +{ + ID2D1EffectContext ID2D1EffectContext_iface; + LONG refcount; +}; + +void d2d_effect_context_init(struct d2d_effect_context *effect_context) DECLSPEC_HIDDEN; + struct d2d_effect_info { const CLSID *clsid; @@ -694,6 +703,13 @@ static inline const char *debug_d2d_point_2f(const D2D1_POINT_2F *point) return wine_dbg_sprintf("{%.8e, %.8e}", point->x, point->y); } +static inline const char *debug_d2d_point_2l(const D2D1_POINT_2L *point) +{ + if (!point) + return "(null)"; + return wine_dbg_sprintf("{%ld, %ld}", point->x, point->y); +} + static inline const char *debug_d2d_rect_f(const D2D1_RECT_F *rect) { if (!rect) @@ -701,6 +717,13 @@ static inline const char *debug_d2d_rect_f(const D2D1_RECT_F *rect) return wine_dbg_sprintf("(%.8e, %.8e)-(%.8e, %.8e)", rect->left, rect->top, rect->right, rect->bottom); } +static inline const char *debug_d2d_rect_l(const D2D1_RECT_L *rect) +{ + if (!rect) + return "(null)"; + return wine_dbg_sprintf("(%ld, %ld)-(%ld, %ld)", rect->left, rect->top, rect->right, rect->bottom); +} + static inline const char *debug_d2d_rounded_rect(const D2D1_ROUNDED_RECT *rounded_rect) { if (!rounded_rect) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 350ac3c7bbf..5709afed7a5 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -17,7 +17,6 @@ */ #include "d2d1_private.h" -#include "d2d1effectauthor.h" WINE_DEFAULT_DEBUG_CHANNEL(d2d); @@ -31,6 +30,261 @@ static const struct d2d_effect_info builtin_effects[] = {&CLSID_D2D1Grayscale, 1, 1, 1}, }; +static inline struct d2d_effect_context *impl_from_ID2D1EffectContext(ID2D1EffectContext *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_effect_context, ID2D1EffectContext_iface); +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_QueryInterface(ID2D1EffectContext *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_ID2D1EffectContext) + || IsEqualGUID(iid, &IID_IUnknown)) + { + ID2D1EffectContext_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d2d_effect_context_AddRef(ID2D1EffectContext *iface) +{ + struct d2d_effect_context *effect_context = impl_from_ID2D1EffectContext(iface); + ULONG refcount = InterlockedIncrement(&effect_context->refcount); + + TRACE("%p increasing refcount to %lu.\n", iface, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d2d_effect_context_Release(ID2D1EffectContext *iface) +{ + struct d2d_effect_context *effect_context = impl_from_ID2D1EffectContext(iface); + ULONG refcount = InterlockedDecrement(&effect_context->refcount); + + TRACE("%p decreasing refcount to %lu.\n", iface, refcount); + + if (!refcount) + { + heap_free(effect_context); + } + + return refcount; +} + +static void STDMETHODCALLTYPE d2d_effect_context_GetDpi(ID2D1EffectContext *iface, float *dpi_x, float *dpi_y) +{ + FIXME("iface %p, dpi_x %p, dpi_y %p stub!\n", iface, dpi_x, dpi_y); +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateEffect(ID2D1EffectContext *iface, + REFCLSID clsid, ID2D1Effect **effect) +{ + FIXME("iface %p, clsid %s, effect %p stub!\n", iface, debugstr_guid(clsid), effect); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_GetMaximumSupportedFeatureLevel(ID2D1EffectContext *iface, + const D3D_FEATURE_LEVEL *levels, UINT32 level_count, D3D_FEATURE_LEVEL *max_level) +{ + FIXME("iface %p, levels %p, level_count %u, max_level %p stub!\n", iface, levels, level_count, max_level); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateTransformNodeFromEffect(ID2D1EffectContext *iface, + ID2D1Effect *effect, ID2D1TransformNode **node) +{ + FIXME("iface %p, effect %p, node %p stub!\n", iface, effect, node); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateBlendTransform(ID2D1EffectContext *iface, + UINT32 num_inputs, const D2D1_BLEND_DESCRIPTION *description, ID2D1BlendTransform **transform) +{ + FIXME("iface %p, num_inputs %u, description %p, transform %p stub!\n", iface, num_inputs, description, transform); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateBorderTransform(ID2D1EffectContext *iface, + D2D1_EXTEND_MODE mode_x, D2D1_EXTEND_MODE mode_y, ID2D1BorderTransform **transform) +{ + FIXME("iface %p, mode_x %#x, mode_y %#x, transform %p stub!\n", iface, mode_x, mode_y, transform); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateOffsetTransform(ID2D1EffectContext *iface, + D2D1_POINT_2L offset, ID2D1OffsetTransform **transform) +{ + FIXME("iface %p, offset %s, transform %p stub!\n", iface, debug_d2d_point_2l(&offset), transform); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateBoundsAdjustmentTransform(ID2D1EffectContext *iface, + const D2D1_RECT_L *output_rect, ID2D1BoundsAdjustmentTransform **transform) +{ + FIXME("iface %p, output_rect %s, transform %p stub!\n", iface, debug_d2d_rect_l(output_rect), transform); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadPixelShader(ID2D1EffectContext *iface, + REFGUID shader_id, const BYTE *buffer, UINT32 buffer_size) +{ + FIXME("iface %p, shader_id %s, buffer %p, buffer_size %u stub!\n", + iface, debugstr_guid(shader_id), buffer, buffer_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadVertexShader(ID2D1EffectContext *iface, + REFGUID shader_id, const BYTE *buffer, UINT32 buffer_size) +{ + FIXME("iface %p, shader_id %s, buffer %p, buffer_size %u stub!\n", + iface, debugstr_guid(shader_id), buffer, buffer_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadComputeShader(ID2D1EffectContext *iface, + REFGUID shader_id, const BYTE *buffer, UINT32 buffer_size) +{ + FIXME("iface %p, shader_id %s, buffer %p, buffer_size %u stub!\n", + iface, debugstr_guid(shader_id), buffer, buffer_size); + + return E_NOTIMPL; +} + +static BOOL STDMETHODCALLTYPE d2d_effect_context_IsShaderLoaded(ID2D1EffectContext *iface, REFGUID shader_id) +{ + FIXME("iface %p, shader_id %s stub!\n", iface, debugstr_guid(shader_id)); + + return FALSE; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateResourceTexture(ID2D1EffectContext *iface, + const GUID *id, const D2D1_RESOURCE_TEXTURE_PROPERTIES *texture_properties, + const BYTE *data, const UINT32 *strides, UINT32 data_size, ID2D1ResourceTexture **texture) +{ + FIXME("iface %p, id %s, texture_properties %p, data %p, strides %s, data_size %u, texture %p stub!\n", + iface, debugstr_guid(id), texture_properties, data, + strides ? wine_dbg_sprintf("%u", *strides) : "(null)", data_size, texture); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_FindResourceTexture(ID2D1EffectContext *iface, + const GUID *id, ID2D1ResourceTexture **texture) +{ + FIXME("iface %p, id %s, texture %p stub!\n", iface, debugstr_guid(id), texture); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateVertexBuffer(ID2D1EffectContext *iface, + const D2D1_VERTEX_BUFFER_PROPERTIES *buffer_properties, const GUID *id, + const D2D1_CUSTOM_VERTEX_BUFFER_PROPERTIES *custom_buffer_properties, ID2D1VertexBuffer **buffer) +{ + FIXME("iface %p, buffer_properties %p, id %s, custom_buffer_properties %p, buffer %p stub!\n", + iface, buffer_properties, debugstr_guid(id), custom_buffer_properties, buffer); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_FindVertexBuffer(ID2D1EffectContext *iface, + const GUID *id, ID2D1VertexBuffer **buffer) +{ + FIXME("iface %p, id %s, buffer %p stub!\n", iface, debugstr_guid(id), buffer); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateColorContext(ID2D1EffectContext *iface, + D2D1_COLOR_SPACE space, const BYTE *profile, UINT32 profile_size, ID2D1ColorContext **color_context) +{ + FIXME("iface %p, space %#x, profile %p, profile_size %u, color_context %p stub!\n", + iface, space, profile, profile_size, color_context); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateColorContextFromFilename(ID2D1EffectContext *iface, + const WCHAR *filename, ID2D1ColorContext **color_context) +{ + FIXME("iface %p, filename %s, color_context %p stub!\n", iface, debugstr_w(filename), color_context); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateColorContextFromWicColorContext(ID2D1EffectContext *iface, + IWICColorContext *wic_color_context, ID2D1ColorContext **color_context) +{ + FIXME("iface %p, wic_color_context %p, color_context %p stub!\n", iface, wic_color_context, color_context); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_context_CheckFeatureSupport(ID2D1EffectContext *iface, + D2D1_FEATURE feature, void *data, UINT32 data_size) +{ + FIXME("iface %p, feature %#x, data %p, data_size %u stub!\n", iface, feature, data, data_size); + + return E_NOTIMPL; +} + +static BOOL STDMETHODCALLTYPE d2d_effect_context_IsBufferPrecisionSupported(ID2D1EffectContext *iface, + D2D1_BUFFER_PRECISION precision) +{ + FIXME("iface %p, precision %#x stub!\n", iface, precision); + + return FALSE; +} + +static const ID2D1EffectContextVtbl d2d_effect_context_vtbl = +{ + d2d_effect_context_QueryInterface, + d2d_effect_context_AddRef, + d2d_effect_context_Release, + d2d_effect_context_GetDpi, + d2d_effect_context_CreateEffect, + d2d_effect_context_GetMaximumSupportedFeatureLevel, + d2d_effect_context_CreateTransformNodeFromEffect, + d2d_effect_context_CreateBlendTransform, + d2d_effect_context_CreateBorderTransform, + d2d_effect_context_CreateOffsetTransform, + d2d_effect_context_CreateBoundsAdjustmentTransform, + d2d_effect_context_LoadPixelShader, + d2d_effect_context_LoadVertexShader, + d2d_effect_context_LoadComputeShader, + d2d_effect_context_IsShaderLoaded, + d2d_effect_context_CreateResourceTexture, + d2d_effect_context_FindResourceTexture, + d2d_effect_context_CreateVertexBuffer, + d2d_effect_context_FindVertexBuffer, + d2d_effect_context_CreateColorContext, + d2d_effect_context_CreateColorContextFromFilename, + d2d_effect_context_CreateColorContextFromWicColorContext, + d2d_effect_context_CheckFeatureSupport, + d2d_effect_context_IsBufferPrecisionSupported, +}; + +void d2d_effect_context_init(struct d2d_effect_context *effect_context) +{ + effect_context->ID2D1EffectContext_iface.lpVtbl = &d2d_effect_context_vtbl; + effect_context->refcount = 1; +} + static inline struct d2d_effect *impl_from_ID2D1Effect(ID2D1Effect *iface) { return CONTAINING_RECORD(iface, struct d2d_effect, ID2D1Effect_iface); -- 2.25.1

2 13

[PATCH 1/2] shell32: Only call HCR_GetFolderAttributes with simple pidls
by Fabian Maurer 28 Apr '22

28 Apr '22

The function returns false with not-simple pidls anyways. This fixes an "ERR" message when opening a control panel applet from explorer Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/shell32/shlfolder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index 10aafc160c0..8e3b561cfd1 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -412,7 +412,7 @@ HRESULT SHELL32_GetItemAttributes (IShellFolder2 *psf, LPCITEMIDLIST pidl, LPDWO if (_ILIsDrive (pidl)) { *pdwAttributes &= SFGAO_HASSUBFOLDER|SFGAO_FILESYSTEM|SFGAO_FOLDER|SFGAO_FILESYSANCESTOR| SFGAO_DROPTARGET|SFGAO_HASPROPSHEET|SFGAO_CANLINK; - } else if (has_guid && HCR_GetFolderAttributes(pidl, &dwAttributes)) { + } else if (has_guid && _ILIsPidlSimple(pidl) && HCR_GetFolderAttributes(pidl, &dwAttributes)) { *pdwAttributes = dwAttributes; } else if (_ILGetDataPointer (pidl)) { DWORD file_attr = _ILGetFileAttributes (pidl, NULL, 0); -- 2.34.1

2 5

[PATCH v2 1/5] server: Return void from sock_reselect().
by Zebediah Figura 27 Apr '22

27 Apr '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- server/sock.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server/sock.c b/server/sock.c index b403541fcbf..a9d8d2ca2bd 100644 --- a/server/sock.c +++ b/server/sock.c @@ -567,7 +567,7 @@ void sock_init(void) } } -static int sock_reselect( struct sock *sock ) +static void sock_reselect( struct sock *sock ) { int ev = sock_get_poll_events( sock->fd ); @@ -575,7 +575,6 @@ static int sock_reselect( struct sock *sock ) fprintf(stderr,"sock_reselect(%p): new mask %x\n", sock, ev); set_fd_events( sock->fd, ev ); - return ev; } static unsigned int afd_poll_flag_to_win32( unsigned int flags ) -- 2.34.1

2 8

[PATCH 0/2] MR7: ntdll: Properly track refcount with forwarded exports.
by Jinoh Kang (＠iamahuman) 27 Apr '22

27 Apr '22

This fixes https://bugs.winehq.org/show_bug.cgi?id=52094. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/7

3 4

[PATCH v3 0/5] MR5: windows.media.speech: Backport tweaks from windows.gaming.input async.
by Rémi Bernon (＠rbernon) 27 Apr '22

27 Apr '22

Some being more cosmetic than others. -- v3: windows.media.speech: Assume that async_run_work cannot be NULL in IAsyncInfo_Close. windows.media.speech: Simplify error handling in async_operation_create. windows.media.speech: Initialize HRESULT variables consistently. windows.media.speech: Return E_ILLEGAL_METHOD_CALL from get_ErrorCode. windows.media.speech: Return operation error from IAsyncOperation_GetResults. https://gitlab.winehq.org/wine/wine/-/merge_requests/5

2 5

[PATCH v2 0/1] MR8: wineboot: Don't use ai_canonname for ComputerName if it is "localhost".
by Jinoh Kang (＠iamahuman) 27 Apr '22

27 Apr '22

-- v2: wineboot: Don't use ai_canonname for ComputerName if it is "localhost". https://gitlab.winehq.org/wine/wine/-/merge_requests/8

2 1

[PATCH v2 1/2] ntdll/tests: Test NtMapViewOfSection with a DLL and zero_bits.
by Brendan Shanks 27 Apr '22

27 Apr '22

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- The zero_bits mask test always passes on 32-bit (the pointer is either truncated, or version.dll is itself 32-bit). dlls/ntdll/tests/virtual.c | 41 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 30a97ba9d94..cd374cf2ea4 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -37,6 +37,8 @@ static ULONG64 (WINAPI *pRtlGetEnabledExtendedFeatures)(ULONG64); static NTSTATUS (WINAPI *pRtlFreeUserStack)(void *); static void * (WINAPI *pRtlFindExportedRoutineByName)(HMODULE,const char*); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); +static BOOL (WINAPI *pWow64DisableWow64FsRedirection)(PVOID*); +static BOOL (WINAPI *pWow64RevertWow64FsRedirection)(PVOID); static NTSTATUS (WINAPI *pNtAllocateVirtualMemoryEx)(HANDLE, PVOID *, SIZE_T *, ULONG, ULONG, MEM_EXTENDED_PARAMETER *, ULONG); static const BOOL is_win64 = sizeof(void*) != sizeof(int); @@ -904,6 +906,43 @@ static void test_NtMapViewOfSection(void) CloseHandle(file); DeleteFileA(testfile); + /* test zero_bits > 31 with a 64-bit DLL if possible */ + if (is_wow64) + pWow64DisableWow64FsRedirection(&ptr2); + + file = CreateFileA("c:\\windows\\system32\\version.dll", GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "Failed to open version.dll\n"); + + if (is_wow64) + pWow64RevertWow64FsRedirection(ptr2); + + mapping = CreateFileMappingA(file, NULL, PAGE_READONLY|SEC_IMAGE, 0, 0, NULL); + ok(mapping != 0, "CreateFileMapping failed\n"); + + ptr = NULL; + size = 0; + offset.QuadPart = 0; + zero_bits = 0x7fffffff; + status = NtMapViewOfSection(mapping, process, &ptr, zero_bits, 0, &offset, &size, 1, 0, PAGE_READONLY); + + if (!is_win64 && !is_wow64) + { + ok(status == STATUS_INVALID_PARAMETER_4, "NtMapViewOfSection returned %08lx\n", status); + } + else + { + ok(status == STATUS_SUCCESS || status == STATUS_IMAGE_NOT_AT_BASE, "NtMapViewOfSection returned %08lx\n", status); + ok(!((ULONG_PTR)ptr & 0xffff), "returned memory %p is not aligned to 64k\n", ptr); + todo_wine + ok(((UINT_PTR)ptr & ~get_zero_bits_mask(zero_bits)) == 0, "NtMapViewOfSection returned address %p\n", ptr); + + status = NtUnmapViewOfSection(process, ptr); + ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection returned %08lx\n", status); + } + + NtClose(mapping); + CloseHandle(file); + TerminateProcess(process, 0); CloseHandle(process); } @@ -1152,6 +1191,8 @@ START_TEST(virtual) mod = GetModuleHandleA("kernel32.dll"); pIsWow64Process = (void *)GetProcAddress(mod, "IsWow64Process"); + pWow64DisableWow64FsRedirection = (void *)GetProcAddress(mod, "Wow64DisableWow64FsRedirection"); + pWow64RevertWow64FsRedirection = (void *)GetProcAddress(mod, "Wow64RevertWow64FsRedirection"); pGetEnabledXStateFeatures = (void *)GetProcAddress(mod, "GetEnabledXStateFeatures"); mod = GetModuleHandleA("ntdll.dll"); pRtlCreateUserStack = (void *)GetProcAddress(mod, "RtlCreateUserStack"); -- 2.35.1

2 2

[PATCH v2 0/5] MR5: windows.media.speech: Backport tweaks from windows.gaming.input async.
by Rémi Bernon (＠rbernon) 27 Apr '22

27 Apr '22

Some being more cosmetic than others. -- v2: windows.media.speech: Assume that async_run_work cannot be NULL in IAsyncInfo_Close. windows.media.speech: Simplify error handling in async_operation_create. windows.media.speech: Initialize HRESULT variables consistently. windows.media.speech: Return E_ILLEGAL_METHOD_CALL from get_ErrorCode. https://gitlab.winehq.org/wine/wine/-/merge_requests/5

3 8

[PATCH v2 3/3] msvcp140_atomic_wait: Add __std_atomic_wait_direct implementation.
by Piotr Caban 27 Apr '22

27 Apr '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52821 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp140_atomic_wait/main.c | 7 ++ .../msvcp140_atomic_wait.spec | 2 +- .../tests/msvcp140_atomic_wait.c | 76 +++++++++++++++++++ 3 files changed, 84 insertions(+), 1 deletion(-)

1 0

[PATCH v2 2/3] msvcp140_atomic_wait: Add __std_atomic_notify_all_direct implementation.
by Piotr Caban 27 Apr '22

27 Apr '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp140_atomic_wait/main.c | 6 ++++++ dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-)

1 0

[PATCH v2 1/3] msvcp140_atomic_wait: Add __std_atomic_notify_one_direct implementation.
by Piotr Caban 27 Apr '22

27 Apr '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - skip tests on Windows 7 dlls/msvcp140_atomic_wait/Makefile.in | 2 +- dlls/msvcp140_atomic_wait/main.c | 6 ++++++ dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-)

1 0

[PATCH] winegstreamer: Check whether transforms are supported at creation time.
by Rémi Bernon 27 Apr '22

27 Apr '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52908 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52914 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winegstreamer/h264_decoder.c | 10 ++++++++++ dlls/winegstreamer/wg_transform.c | 13 +++++++++---- dlls/winegstreamer/wma_decoder.c | 10 ++++++++++ 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c index 8bfa15529db..778729f576c 100644 --- a/dlls/winegstreamer/h264_decoder.c +++ b/dlls/winegstreamer/h264_decoder.c @@ -585,10 +585,20 @@ static const IMFTransformVtbl transform_vtbl = HRESULT h264_decoder_create(REFIID riid, void **ret) { + struct wg_format output_format = {.major_type = WG_MAJOR_TYPE_UNKNOWN}; + struct wg_format input_format = {.major_type = WG_MAJOR_TYPE_H264}; + struct wg_transform *transform; struct h264_decoder *decoder; TRACE("riid %s, ret %p.\n", debugstr_guid(riid), ret); + if (!(transform = wg_transform_create(&input_format, &output_format))) + { + FIXME("GStreamer doesn't support H264 decoding, please install appropriate plugins\n"); + return E_FAIL; + } + wg_transform_destroy(transform); + if (!(decoder = calloc(1, sizeof(*decoder)))) return E_OUTOFMEMORY; diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index 49c7bfaa927..0b975a8210e 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -169,7 +169,6 @@ NTSTATUS wg_transform_create(void *args) NTSTATUS status = STATUS_UNSUCCESSFUL; GstPadTemplate *template = NULL; struct wg_transform *transform; - const gchar *media_type; GstEvent *event; if (!init_gstreamer()) @@ -210,9 +209,13 @@ NTSTATUS wg_transform_create(void *args) * based on the actual output caps now. Matching decoders with the * raw output media type should be enough. */ - media_type = gst_structure_get_name(gst_caps_get_structure(sink_caps, 0)); - if (!(raw_caps = gst_caps_new_empty_simple(media_type))) + if (!(raw_caps = gst_caps_new_any())) goto out; + if (gst_caps_get_size(sink_caps)) + { + const gchar *media_type = gst_structure_get_name(gst_caps_get_structure(sink_caps, 0)); + gst_caps_append_structure(raw_caps, gst_structure_new_empty(media_type)); + } switch (input_format.major_type) { @@ -268,9 +271,11 @@ NTSTATUS wg_transform_create(void *args) case WG_MAJOR_TYPE_H264: case WG_MAJOR_TYPE_WMA: - case WG_MAJOR_TYPE_UNKNOWN: GST_FIXME("Format %u not implemented!", output_format.major_type); goto out; + + case WG_MAJOR_TYPE_UNKNOWN: + break; } if (!(transform->their_sink = gst_element_get_static_pad(first, "sink"))) diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c index 57b0f204f9e..9d1ad20fba7 100644 --- a/dlls/winegstreamer/wma_decoder.c +++ b/dlls/winegstreamer/wma_decoder.c @@ -853,10 +853,20 @@ static const IPropertyBagVtbl property_bag_vtbl = HRESULT wma_decoder_create(IUnknown *outer, IUnknown **out) { + struct wg_format output_format = {.major_type = WG_MAJOR_TYPE_UNKNOWN}; + struct wg_format input_format = {.major_type = WG_MAJOR_TYPE_WMA}; + struct wg_transform *transform; struct wma_decoder *decoder; TRACE("outer %p, out %p.\n", outer, out); + if (!(transform = wg_transform_create(&input_format, &output_format))) + { + FIXME("GStreamer doesn't support WMA decoding, please install appropriate plugins\n"); + return E_FAIL; + } + wg_transform_destroy(transform); + if (!(decoder = calloc(1, sizeof(*decoder)))) return E_OUTOFMEMORY; -- 2.35.1

2 1

[PATCH 1/5] quartz/tests: Add tests for MPEG audio decoder IEnumMediaTypes.
by Anton Baskanov 27 Apr '22

27 Apr '22

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/quartz/tests/mpegaudio.c | 76 +++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/dlls/quartz/tests/mpegaudio.c b/dlls/quartz/tests/mpegaudio.c index 44e1a9ad2e6..5f851cb5973 100644 --- a/dlls/quartz/tests/mpegaudio.c +++ b/dlls/quartz/tests/mpegaudio.c @@ -526,6 +526,81 @@ static void test_pin_info(void) ok(!ref, "Got outstanding refcount %ld.\n", ref); } +static void test_enum_media_types(void) +{ + IBaseFilter *filter = create_mpeg_audio_codec(); + IEnumMediaTypes *enum1, *enum2; + AM_MEDIA_TYPE *mts[1]; + ULONG ref, count; + HRESULT hr; + IPin *pin; + + IBaseFilter_FindPin(filter, L"In", &pin); + + hr = IPin_EnumMediaTypes(pin, &enum1); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, &count); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + ok(!count, "Got count %lu.\n", count); + + hr = IEnumMediaTypes_Reset(enum1); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + + hr = IEnumMediaTypes_Clone(enum1, &enum2); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IEnumMediaTypes_Skip(enum1, 1); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + + hr = IEnumMediaTypes_Next(enum2, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + + IEnumMediaTypes_Release(enum1); + IEnumMediaTypes_Release(enum2); + IPin_Release(pin); + + IBaseFilter_FindPin(filter, L"Out", &pin); + + hr = IPin_EnumMediaTypes(pin, &enum1); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, &count); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + ok(!count, "Got count %lu.\n", count); + + hr = IEnumMediaTypes_Reset(enum1); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + + hr = IEnumMediaTypes_Clone(enum1, &enum2); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IEnumMediaTypes_Skip(enum1, 1); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + + hr = IEnumMediaTypes_Next(enum2, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + + IEnumMediaTypes_Release(enum1); + IEnumMediaTypes_Release(enum2); + IPin_Release(pin); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %ld.\n", ref); +} + START_TEST(mpegaudio) { CoInitialize(NULL); @@ -536,6 +611,7 @@ START_TEST(mpegaudio) test_enum_pins(); test_find_pin(); test_pin_info(); + test_enum_media_types(); CoUninitialize(); } -- 2.34.1

2 8

[PATCH v2 1/5] wined3d: Raise MAX_ATTRIBS to 32.
by Matteo Bruni 27 Apr '22

27 Apr '22

Which is the SM5 limit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43845 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- It also should fix a crash some ways into the game in Hellblade: Senua's Sacrifice. As it turns out, GL implementations in practice support only 16 attributes, while Vulkan requires at least 32. In the case of both ABZU and Hellblade: Senua's Sacrifice at least though, the problematic shaders don't actually make use of vertex attributes with index > 15, they just include a SV_InstanceID system value for attribute 16 in the shader input signature but don't declare it in the shader code at all. This patch is enough to make ABZU work on GL (I haven't retested Hellblade but I expect the same there). FWIW, both games are built around Unreal Engine 4. v2: Just raise MAX_ATTRIBS and fixup (hopefully) all the fallout. --- dlls/wined3d/context_gl.c | 13 +++++++++++-- dlls/wined3d/wined3d_private.h | 31 ++++++++++++++++--------------- 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 45c1062b3ec..2e953fc9c78 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -4818,7 +4818,8 @@ static void draw_primitive_immediate_mode(struct wined3d_context_gl *context_gl, unsigned int element_idx; stride_idx = get_stride_idx(idx_data, idx_size, base_vertex_idx, start_idx, vertex_idx); - for (element_idx = MAX_ATTRIBS - 1; use_map; use_map &= ~(1u << element_idx), --element_idx) + for (element_idx = gl_info->limits.vertex_attribs - 1; use_map; + use_map &= ~(1u << element_idx), --element_idx) { if (!(use_map & 1u << element_idx)) continue; @@ -5657,7 +5658,15 @@ static void wined3d_context_gl_load_numbered_arrays(struct wined3d_context_gl *c context->instance_count = 0; current_bo = gl_info->supported[ARB_VERTEX_BUFFER_OBJECT] ? ~0u : 0; - for (i = 0; i < MAX_ATTRIBS; ++i) + if (stream_info->use_map & ~wined3d_mask_from_size(gl_info->limits.vertex_attribs)) + { + static unsigned int once; + + if (!once++) + FIXME("More than the supported %u vertex attributes are in use.\n", gl_info->limits.vertex_attribs); + } + + for (i = 0; i < gl_info->limits.vertex_attribs; ++i) { const struct wined3d_stream_info_element *element = &stream_info->elements[i]; const void *offset = get_vertex_attrib_pointer(element, state); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 35925b04cd1..3210c628de3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -737,8 +737,7 @@ enum wined3d_shader_conditional_op /* Shader backends */ -/* TODO: Make this dynamic, based on shader limits ? */ -#define MAX_ATTRIBS 16 +#define MAX_ATTRIBS 32 #define MAX_REG_ADDR 1 #define MAX_REG_TEXCRD 8 #define MAX_REG_INPUT 32 @@ -1453,6 +1452,9 @@ enum fog_src_type struct vs_compile_args { + DWORD swizzle_map; /* MAX_ATTRIBS, 32 */ + unsigned int next_shader_input_count; + DWORD interpolation_mode[WINED3D_PACKED_INTERPOLATION_SIZE]; BYTE fog_src; BYTE clip_enabled : 1; BYTE point_size : 1; @@ -1460,9 +1462,6 @@ struct vs_compile_args BYTE flatshading : 1; BYTE next_shader_type : 3; BYTE padding : 1; - WORD swizzle_map; /* MAX_ATTRIBS, 16 */ - unsigned int next_shader_input_count; - DWORD interpolation_mode[WINED3D_PACKED_INTERPOLATION_SIZE]; }; struct ds_compile_args @@ -1699,8 +1698,8 @@ struct wined3d_stream_info struct wined3d_stream_info_element elements[MAX_ATTRIBS]; DWORD position_transformed : 1; DWORD all_vbo : 1; - WORD swizzle_map; /* MAX_ATTRIBS, 16 */ - WORD use_map; /* MAX_ATTRIBS, 16 */ + DWORD swizzle_map; /* MAX_ATTRIBS, 32 */ + DWORD use_map; /* MAX_ATTRIBS, 32 */ }; void wined3d_stream_info_from_declaration(struct wined3d_stream_info *stream_info, @@ -2149,28 +2148,28 @@ struct wined3d_context } current_rt; /* Stores some information about the context state for optimization */ + DWORD last_swizzle_map; /* MAX_ATTRIBS, 32 */ + DWORD shader_update_mask : 6; /* WINED3D_SHADER_TYPE_COUNT, 6 */ DWORD update_shader_resource_bindings : 1; DWORD update_compute_shader_resource_bindings : 1; DWORD update_unordered_access_view_bindings : 1; DWORD update_compute_unordered_access_view_bindings : 1; - DWORD last_swizzle_map : 16; /* MAX_ATTRIBS, 16 */ DWORD last_was_rhw : 1; /* True iff last draw_primitive was in xyzrhw mode. */ DWORD last_was_pshader : 1; DWORD last_was_vshader : 1; DWORD last_was_diffuse : 1; DWORD last_was_specular : 1; DWORD last_was_normal : 1; - DWORD last_was_ffp_blit : 1; DWORD last_was_blit : 1; DWORD last_was_ckey : 1; DWORD last_was_dual_source_blend : 1; DWORD texShaderBumpMap : 8; /* WINED3D_MAX_TEXTURES, 8 */ - DWORD lastWasPow2Texture : 8; /* WINED3D_MAX_TEXTURES, 8 */ - DWORD fixed_function_usage_map : 8; /* WINED3D_MAX_TEXTURES, 8 */ DWORD lowest_disabled_stage : 4; /* Max WINED3D_MAX_TEXTURES, 8 */ + DWORD lastWasPow2Texture : 8; /* WINED3D_MAX_TEXTURES, 8 */ + DWORD fixed_function_usage_map : 8; /* WINED3D_MAX_TEXTURES, 8 */ DWORD use_immediate_mode_draw : 1; DWORD uses_uavs : 1; DWORD uses_fbo_attached_resources : 1; @@ -2181,9 +2180,10 @@ struct wined3d_context DWORD current : 1; DWORD destroyed : 1; DWORD destroy_delayed : 1; - DWORD clip_distance_mask : 8; /* WINED3D_MAX_CLIP_DISTANCES, 8 */ DWORD namedArraysLoaded : 1; - DWORD padding : 13; + DWORD padding : 5; + + DWORD clip_distance_mask : 8; /* WINED3D_MAX_CLIP_DISTANCES, 8 */ DWORD constant_update_mask; DWORD numbered_array_mask; @@ -3653,8 +3653,9 @@ struct wined3d_ffp_vs_settings DWORD texcoords : 8; /* WINED3D_MAX_TEXTURES */ DWORD ortho_fog : 1; DWORD flatshading : 1; - DWORD swizzle_map : 16; /* MAX_ATTRIBS, 16 */ - DWORD padding : 2; + DWORD padding : 18; + + DWORD swizzle_map; /* MAX_ATTRIBS, 32 */ DWORD texgen[WINED3D_MAX_TEXTURES]; }; -- 2.34.1

2 9

[PATCH 1/3] include: Add defines for ID2D1Transform.
by Ziqing Hui 27 Apr '22

27 Apr '22

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- include/d2d1effectauthor.idl | 162 +++++++++++++++++++++++++++++++++++ 1 file changed, 162 insertions(+) diff --git a/include/d2d1effectauthor.idl b/include/d2d1effectauthor.idl index cec7de8c311..6838492c498 100644 --- a/include/d2d1effectauthor.idl +++ b/include/d2d1effectauthor.idl @@ -258,3 +258,165 @@ interface ID2D1TransformGraph : IUnknown [in] UINT32 index ); } + +[ + object, + uuid(ef1a287d-342a-4f76-8fdb-da0d6ea9f92b), + local, +] +interface ID2D1Transform : ID2D1TransformNode +{ + HRESULT MapOutputRectToInputRects( + [in] const D2D1_RECT_L *output_rect, + [out] D2D1_RECT_L *input_rects, + [in] UINT32 input_rects_count + ); + HRESULT MapInputRectsToOutputRect( + [in] const D2D1_RECT_L *input_rects, + [in] const D2D1_RECT_L *input_opaque_rects, + [in] UINT32 input_rect_count, + [out] D2D1_RECT_L *output_rect, + [out] D2D1_RECT_L *output_opaque_rect + ); + HRESULT MapInvalidRect( + [in] UINT32 index, + [in] D2D1_RECT_L input_rect, + [out] D2D1_RECT_L *output_rect + ); +} + +[ + object, + uuid(36bfdcb6-9739-435d-a30d-a653beff6a6f), + local, +] +interface ID2D1DrawTransform : ID2D1Transform +{ + HRESULT SetDrawInfo( + [in] ID2D1DrawInfo *info + ); +} + +[ + object, + uuid(0d85573c-01e3-4f7d-bfd9-0d60608bf3c3), + local, +] +interface ID2D1ComputeTransform : ID2D1Transform +{ + HRESULT SetComputeInfo( + [in] ID2D1ComputeInfo *info + ); + HRESULT CalculateThreadgroups( + [in] const D2D1_RECT_L *output_rect, + [out] UINT32 *dimension_x, + [out] UINT32 *dimension_y, + [out] UINT32 *dimension_z + ); +} + +[ + object, + uuid(0359dc30-95e6-4568-9055-27720d130e93), + local, +] +interface ID2D1AnalysisTransform : IUnknown +{ + HRESULT ProcessAnalysisResults( + [in] const BYTE *data, + [in] UINT32 size + ); +} + +[ + object, + uuid(db1800dd-0c34-4cf9-be90-31cc0a5653e1), + local, +] +interface ID2D1SourceTransform : ID2D1Transform +{ + HRESULT SetRenderInfo( + [in] ID2D1RenderInfo *info + ); + HRESULT Draw( + [in] ID2D1Bitmap1 *target, + [in] const D2D1_RECT_L *draw_rect, + [in] D2D1_POINT_2U target_origin + ); +} + +[ + object, + uuid(1a799d8a-69f7-4e4c-9fed-437ccc6684cc), + local, +] +interface ID2D1ConcreteTransform : ID2D1TransformNode +{ + HRESULT SetOutputBuffer( + [in] D2D1_BUFFER_PRECISION precision, + [in] D2D1_CHANNEL_DEPTH depth + ); + void SetCached( + [in] BOOL is_cached + ); +} + +[ + object, + uuid(63ac0b32-ba44-450f-8806-7f4ca1ff2f1b), + local, +] +interface ID2D1BlendTransform : ID2D1ConcreteTransform +{ + void SetDescription( + [in] const D2D1_BLEND_DESCRIPTION *description + ); + void GetDescription( + [out] D2D1_BLEND_DESCRIPTION *description + ); +} + +[ + object, + uuid(4998735c-3a19-473c-9781-656847e3a347), + local, +] +interface ID2D1BorderTransform : ID2D1ConcreteTransform +{ + void SetExtendModeX( + [in] D2D1_EXTEND_MODE mode + ); + void SetExtendModeY( + [in] D2D1_EXTEND_MODE mode + ); + D2D1_EXTEND_MODE GetExtendModeX(); + D2D1_EXTEND_MODE GetExtendModeY(); +} + +[ + object, + uuid(3fe6adea-7643-4f53-bd14-a0ce63f24042), + local, +] +interface ID2D1OffsetTransform : ID2D1TransformNode +{ + void SetOffset( + [in] D2D1_POINT_2L offset + ); + D2D1_POINT_2L GetOffset(); +} + +[ + object, + uuid(90f732e2-5092-4606-a819-8651970baccd), + local, +] +interface ID2D1BoundsAdjustmentTransform : ID2D1TransformNode +{ + void SetOutputBounds( + [in] const D2D1_RECT_L *bounds + ); + void GetOutputBounds( + [out] D2D1_RECT_L *bounds + ); +} -- 2.25.1

2 5

[PATCH vkd3d] configure: Allow specifying the Vulkan library path with VULKAN_LIBS.
by Zebediah Figura 27 Apr '22

27 Apr '22

Do not define it for the vkd3d build, but restore support for overriding it as a configure argument. This partially reverts 99a3adcc19f2a64fad630948851616f52c00d553. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52915 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- configure.ac | 1 + m4/check-vulkan.m4 | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index b386104a..7796ae8d 100644 --- a/configure.ac +++ b/configure.ac @@ -113,6 +113,7 @@ case $host_os in esac AC_ARG_VAR([SONAME_LIBVULKAN], [shared object name for the Vulkan library]) +AC_ARG_VAR([VULKAN_LIBS], [linker flags for the Vulkan library]) AS_IF([test "x$SONAME_LIBVULKAN" = "x"], [VKD3D_CHECK_VULKAN], [AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN],["$SONAME_LIBVULKAN"],[Define to the shared object name of the Vulkan library.])]) diff --git a/m4/check-vulkan.m4 b/m4/check-vulkan.m4 index b2c3f8a1..f651a077 100644 --- a/m4/check-vulkan.m4 +++ b/m4/check-vulkan.m4 @@ -6,7 +6,8 @@ VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr],, [VKD3D_CHECK_SONAME([MoltenVK], [vkGetInstanceProcAddr], [AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN], ["$ac_cv_lib_soname_MoltenVK"])], - [AC_MSG_ERROR([libvulkan and libMoltenVK not found.])]) - ]) - ]) + [AC_MSG_ERROR([libvulkan and libMoltenVK not found.])], + [$VULKAN_LIBS])], + [$VULKAN_LIBS])], + [$VULKAN_LIBS]) ]) -- 2.34.1

3 2

[PATCH vkd3d v5 1/7] vkd3d-shader/hlsl: Do not allow NaNs in SM1.
by Giovanni Mascellani 27 Apr '22

27 Apr '22

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_constant_ops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 2e16577f..d8787c21 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -278,10 +278,10 @@ static bool fold_div(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, "Floating point division by zero."); } dst->value[k].f = src1->value[k].f / src2->value[k].f; - if (ctx->profile->major_version < 4 && isinf(dst->value[k].f)) + if (ctx->profile->major_version < 4 && !isfinite(dst->value[k].f)) { hlsl_error(ctx, &dst->node.loc, VKD3D_SHADER_ERROR_HLSL_DIVISION_BY_ZERO, - "Infinities are not allowed by the shader model."); + "Infinities and NaNs are not allowed by the shader model."); } break; -- 2.36.0

3 8

[PATCH 3/3] msvcp140_atomic_wait: Add __std_atomic_wait_direct implementation.
by Piotr Caban 27 Apr '22

27 Apr '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52821 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp140_atomic_wait/main.c | 7 ++ .../msvcp140_atomic_wait.spec | 2 +- .../tests/msvcp140_atomic_wait.c | 70 +++++++++++++++++++ 3 files changed, 78 insertions(+), 1 deletion(-)

2 1

[PATCH 2/3] msvcp140_atomic_wait: Add __std_atomic_notify_all_direct implementation.
by Piotr Caban 27 Apr '22

27 Apr '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp140_atomic_wait/main.c | 6 ++++++ dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-)

1 0

[PATCH 1/3] msvcp140_atomic_wait: Add __std_atomic_notify_one_direct implementation.
by Piotr Caban 27 Apr '22

27 Apr '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp140_atomic_wait/Makefile.in | 2 +- dlls/msvcp140_atomic_wait/main.c | 6 ++++++ dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-)

1 0

[PATCH 0/1] MR8: wineboot: Don't use ai_canonname for ComputerName if it is "localhost".
by Jinoh Kang (＠iamahuman) 27 Apr '22

27 Apr '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/8

2 1

[PATCH 0/10] MR6: Avoid performance degradation due to vDSO unmapping (BZ#52313)
by Jinoh Kang (＠iamahuman) 27 Apr '22

27 Apr '22

Commit f558741fabc116534fa598aa890ffed683a7153b removes vDSO if it conflicts with reserved ranges: > Remove the AT_SYSINFO and AT_SYSINFO_EHDR values if the sysinfo page > is in one of our reserved ranges. However, missing vDSO leads to performance issues on some syscalls (e.g. clock_gettime, gettimeofday) and may even lead to crash when run with some ancient C libraries that does not supply a custom signal restorer. vDSO pages can clash with reserved ranges especially in a 32-bit address space with address space layout randomization (ASLR) turned on. Recent versions of the Linux kernel introduced support for mremap()-ping vDSO pages, partly in an effort to support checkpoint restore in userspace (CRIU). Special programs that require specific memory layout constraints (such as Wine preloader) can take advantage of this support to modify the address space to meet its requirements. The following test script has been used to test each changes (use with `git rebase --exec=...`): ```sh set -e make -C ../wine64-build -j5 make -C ../wine32-build -j5 cd ../wine64-build export WINEPRELOADREMAPSTACK export WINEPRELOADREMAPVDSO for WINEPRELOADREMAPSTACK in skip never always force auto on-demand '' do for WINEPRELOADREMAPVDSO in skip never always force auto on-demand '' do ./loader/wine64 wineboot ./loader/wine wineboot done done ``` -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6

2 10

[PATCH v2] ieframe: Initialize new history log entry.
by Dmitry Timoshkov 27 Apr '22

27 Apr '22

In addition to 41cfc86d8dd65c71a7c81b826d02ac0a99050d6a. This fixes another crash when browsing help file that I have here. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ieframe/dochost.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 7717f786d52..e73659f1736 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -469,6 +469,8 @@ static void update_travellog(DocHost *This) if(This->travellog.loading_pos == -1) { This->travellog.position++; + This->travellog.log[This->travellog.position].stream = NULL; + This->travellog.log[This->travellog.position].url = NULL; }else { This->travellog.position = This->travellog.loading_pos; This->travellog.loading_pos = -1; -- 2.35.3

2 1

[PATCH] po: Mark an incomplete Dutch translation as fuzzy.
by Francois Gouget 27 Apr '22

27 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- It does not translate the usage exemples section and the trailing empty line is a hint that this is likely accidental. --- po/nl.po | 1 + 1 file changed, 1 insertion(+)

2 1

[PATCH 1/2] msvcp140/tests: Add a broken last error result in test_Copy_file().
by Paul Gofman 27 Apr '22

27 Apr '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52857 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/msvcp140/tests/msvcp140.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 1df2f058424..640e44e5b7c 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -1614,12 +1614,14 @@ static void test_Copy_file(void) SetLastError(0xdeadbeef); ret = p_Copy_file(L"wine_test_dir/f1", L"wine_test_dir/f3"); ok(ret == ERROR_SUCCESS, "Got unexpected ret %lu.\n", ret); - ok(GetLastError() == ret, "Got unexpected err %lu.\n", GetLastError()); + ok(GetLastError() == ret || broken(GetLastError() == ERROR_INVALID_PARAMETER) /* some win8 machines */, + "Got unexpected err %lu.\n", GetLastError()); SetLastError(0xdeadbeef); ret = p_Copy_file(L"wine_test_dir/f1", L"wine_test_dir/f3"); ok(ret == ERROR_SUCCESS, "Got unexpected ret %lu.\n", ret); - ok(GetLastError() == ret, "Got unexpected err %lu.\n", GetLastError()); + ok(GetLastError() == ret || broken(GetLastError() == ERROR_INVALID_PARAMETER) /* some win8 machines */, + "Got unexpected err %lu.\n", GetLastError()); SetLastError(0xdeadbeef); ret = p_Copy_file(L"wine_test_dir/missing", L"wine_test_dir/f3"); -- 2.35.1

2 2

[PATCH 4/4] wineoss: Move MIDM_STOP to the unixlib.
by Huw Davies 27 Apr '22

27 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 16 ---------------- dlls/wineoss.drv/ossmidi.c | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 9df97530865..fe73d97f5ab 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -490,20 +490,6 @@ static DWORD midClose(WORD wDevID) return ret; } -/************************************************************************** - * midStop [internal] - */ -static DWORD midStop(WORD wDevID) -{ - TRACE("(%04X);\n", wDevID); - - if (wDevID >= MIDM_NumDevs) return MMSYSERR_BADDEVICEID; - if (MidiInDev[wDevID].state == -1) return MIDIERR_NODEVICE; - - MidiInDev[wDevID].state = 0; - return MMSYSERR_NOERROR; -} - /*======================================================================* * MIDI entry points * *======================================================================*/ @@ -529,8 +515,6 @@ DWORD WINAPI OSS_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return midOpen(wDevID, (LPMIDIOPENDESC)dwParam1, dwParam2); case MIDM_CLOSE: return midClose(wDevID); - case MIDM_STOP: - return midStop(wDevID); } params.dev_id = wDevID; diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c index 091eccd6d53..86d766eceaf 100644 --- a/dlls/wineoss.drv/ossmidi.c +++ b/dlls/wineoss.drv/ossmidi.c @@ -1225,6 +1225,20 @@ static UINT midi_in_start(WORD dev_id) return MMSYSERR_NOERROR; } +static UINT midi_in_stop(WORD dev_id) +{ + struct midi_src *src; + + TRACE("(%04X);\n", dev_id); + + if (dev_id >= num_srcs) return MMSYSERR_BADDEVICEID; + src = srcs + dev_id; + if (src->state == -1) return MIDIERR_NODEVICE; + + src->state = 0; + return MMSYSERR_NOERROR; +} + static UINT midi_in_reset(WORD dev_id, struct notify_context *notify) { UINT cur_time = NtGetTickCount(); @@ -1340,6 +1354,9 @@ NTSTATUS midi_in_message(void *args) case MIDM_START: *params->err = midi_in_start(params->dev_id); break; + case MIDM_STOP: + *params->err = midi_in_stop(params->dev_id); + break; case MIDM_RESET: *params->err = midi_in_reset(params->dev_id, params->notify); break; -- 2.25.1

2 1

[PATCH 3/4] wineoss: Move MIDM_START to the unixlib.
by Huw Davies 27 Apr '22

27 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 17 ----------------- dlls/wineoss.drv/ossmidi.c | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 8d4c9bab68c..9df97530865 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -490,21 +490,6 @@ static DWORD midClose(WORD wDevID) return ret; } -/************************************************************************** - * midStart [internal] - */ -static DWORD midStart(WORD wDevID) -{ - TRACE("(%04X);\n", wDevID); - - if (wDevID >= MIDM_NumDevs) return MMSYSERR_BADDEVICEID; - if (MidiInDev[wDevID].state == -1) return MIDIERR_NODEVICE; - - MidiInDev[wDevID].state = 1; - MidiInDev[wDevID].startTime = GetTickCount(); - return MMSYSERR_NOERROR; -} - /************************************************************************** * midStop [internal] */ @@ -544,8 +529,6 @@ DWORD WINAPI OSS_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return midOpen(wDevID, (LPMIDIOPENDESC)dwParam1, dwParam2); case MIDM_CLOSE: return midClose(wDevID); - case MIDM_START: - return midStart(wDevID); case MIDM_STOP: return midStop(wDevID); } diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c index d63ba936239..091eccd6d53 100644 --- a/dlls/wineoss.drv/ossmidi.c +++ b/dlls/wineoss.drv/ossmidi.c @@ -1210,6 +1210,21 @@ static UINT midi_in_get_devcaps(WORD dev_id, MIDIINCAPSW *caps, UINT size) return MMSYSERR_NOERROR; } +static UINT midi_in_start(WORD dev_id) +{ + struct midi_src *src; + + TRACE("(%04X);\n", dev_id); + + if (dev_id >= num_srcs) return MMSYSERR_BADDEVICEID; + src = srcs + dev_id; + if (src->state == -1) return MIDIERR_NODEVICE; + + src->state = 1; + src->startTime = NtGetTickCount(); + return MMSYSERR_NOERROR; +} + static UINT midi_in_reset(WORD dev_id, struct notify_context *notify) { UINT cur_time = NtGetTickCount(); @@ -1322,6 +1337,9 @@ NTSTATUS midi_in_message(void *args) case MIDM_GETNUMDEVS: *params->err = num_srcs; break; + case MIDM_START: + *params->err = midi_in_start(params->dev_id); + break; case MIDM_RESET: *params->err = midi_in_reset(params->dev_id, params->notify); break; -- 2.25.1

2 1

[PATCH 2/4] wineoss: Move MIDM_RESET to the unixlib.
by Huw Davies 27 Apr '22

27 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 35 ++++++--------------------- dlls/wineoss.drv/ossmidi.c | 49 ++++++++++++++++++++++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 1 + 3 files changed, 57 insertions(+), 28 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 44491a98cfa..8d4c9bab68c 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -490,31 +490,6 @@ static DWORD midClose(WORD wDevID) return ret; } -/************************************************************************** - * midReset [internal] - */ -static DWORD midReset(WORD wDevID) -{ - DWORD dwTime = GetTickCount(); - - TRACE("(%04X);\n", wDevID); - - if (wDevID >= MIDM_NumDevs) return MMSYSERR_BADDEVICEID; - if (MidiInDev[wDevID].state == -1) return MIDIERR_NODEVICE; - - in_buffer_lock(); - while (MidiInDev[wDevID].lpQueueHdr) { - LPMIDIHDR lpMidiHdr = MidiInDev[wDevID].lpQueueHdr; - MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext; - lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; - lpMidiHdr->dwFlags |= MHDR_DONE; - MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime - MidiInDev[wDevID].startTime); - } - in_buffer_unlock(); - - return MMSYSERR_NOERROR; -} - /************************************************************************** * midStart [internal] */ @@ -555,6 +530,7 @@ DWORD WINAPI OSS_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { struct midi_in_message_params params; + struct notify_context notify; UINT err; TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n", @@ -568,8 +544,6 @@ DWORD WINAPI OSS_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return midOpen(wDevID, (LPMIDIOPENDESC)dwParam1, dwParam2); case MIDM_CLOSE: return midClose(wDevID); - case MIDM_RESET: - return midReset(wDevID); case MIDM_START: return midStart(wDevID); case MIDM_STOP: @@ -582,8 +556,13 @@ DWORD WINAPI OSS_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, params.param_1 = dwParam1; params.param_2 = dwParam2; params.err = &err; + params.notify = &notify; - OSS_CALL(midi_in_message, &params); + do + { + OSS_CALL(midi_in_message, &params); + if ((!err || err == ERROR_RETRY) && notify.send_notify) notify_client(&notify); + } while (err == ERROR_RETRY); return err; } diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c index 8fca6e32c41..d63ba936239 100644 --- a/dlls/wineoss.drv/ossmidi.c +++ b/dlls/wineoss.drv/ossmidi.c @@ -155,6 +155,20 @@ NTSTATUS midi_in_lock(void *args) return STATUS_SUCCESS; } +static void set_in_notify(struct notify_context *notify, struct midi_src *src, WORD dev_id, WORD msg, + UINT_PTR param_1, UINT_PTR param_2) +{ + notify->send_notify = TRUE; + notify->dev_id = dev_id; + notify->msg = msg; + notify->param_1 = param_1; + notify->param_2 = param_2; + notify->callback = src->midiDesc.dwCallback; + notify->flags = src->wFlags; + notify->device = src->midiDesc.hMidi; + notify->instance = src->midiDesc.dwInstance; +} + static int seq_open(void) { static int midi_warn = 1; @@ -1196,6 +1210,36 @@ static UINT midi_in_get_devcaps(WORD dev_id, MIDIINCAPSW *caps, UINT size) return MMSYSERR_NOERROR; } +static UINT midi_in_reset(WORD dev_id, struct notify_context *notify) +{ + UINT cur_time = NtGetTickCount(); + UINT err = MMSYSERR_NOERROR; + struct midi_src *src; + MIDIHDR *hdr; + + TRACE("(%04X);\n", dev_id); + + if (dev_id >= num_srcs) return MMSYSERR_BADDEVICEID; + src = srcs + dev_id; + if (src->state == -1) return MIDIERR_NODEVICE; + + in_buffer_lock(); + + if (src->lpQueueHdr) + { + hdr = src->lpQueueHdr; + src->lpQueueHdr = hdr->lpNext; + hdr->dwFlags &= ~MHDR_INQUEUE; + hdr->dwFlags |= MHDR_DONE; + set_in_notify(notify, src, dev_id, MIM_LONGDATA, (UINT_PTR)hdr, cur_time - src->startTime); + if (src->lpQueueHdr) err = ERROR_RETRY; /* ask the client to call again */ + } + + in_buffer_unlock(); + + return err; +} + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -1254,6 +1298,8 @@ NTSTATUS midi_in_message(void *args) { struct midi_in_message_params *params = args; + params->notify->send_notify = FALSE; + switch (params->msg) { case DRVM_ENABLE: @@ -1276,6 +1322,9 @@ NTSTATUS midi_in_message(void *args) case MIDM_GETNUMDEVS: *params->err = num_srcs; break; + case MIDM_RESET: + *params->err = midi_in_reset(params->dev_id, params->notify); + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 544a462dcc4..867e1ff656e 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -264,6 +264,7 @@ struct midi_in_message_params UINT_PTR param_1; UINT_PTR param_2; UINT *err; + struct notify_context *notify; }; struct midi_seq_open_params -- 2.25.1

2 1

[PATCH 1/4] wineoss: Pass the time relative to the start time to the callback.
by Huw Davies 27 Apr '22

27 Apr '22

This is equivalent to commits 01ad503004cf8ea6b0bd8f544ee131fc86abc580 and bce11840bd5f56c70e1290d302556c97ba3b1389 in the coreaudio and alsa drivers. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index e796c9a7085..44491a98cfa 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -508,7 +508,7 @@ static DWORD midReset(WORD wDevID) MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext; lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; lpMidiHdr->dwFlags |= MHDR_DONE; - MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime); + MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime - MidiInDev[wDevID].startTime); } in_buffer_unlock(); -- 2.25.1

2 1

[PATCH v2] gdi32/tests: Trace the invalid height in test_max_height().
by Francois Gouget 27 Apr '22

27 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- v2: Fixed the compilation warning. --- dlls/gdi32/tests/font.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 9c616e6a30b..76d787c1440 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -6523,6 +6523,7 @@ static void test_max_height(void) /* test an invalid value */ for (i = 0; i < ARRAY_SIZE(invalid_height); i++) { + winetest_push_context("height=%ld", invalid_height[i]); lf.lfHeight = invalid_height[i]; hfont = CreateFontIndirectA(&lf); hfont_old = SelectObject(hdc, hfont); @@ -6534,6 +6535,7 @@ static void test_max_height(void) ok(tm.tmAveCharWidth == tm1.tmAveCharWidth, "expected 1 ppem value (%ld), got %ld\n", tm1.tmAveCharWidth, tm.tmAveCharWidth); DeleteObject(SelectObject(hdc, hfont_old)); + winetest_pop_context(); } ReleaseDC(NULL, hdc); -- 2.30.2

3 2

[PATCH] po: Fix trailing full stop inconsistencies in the Turkish translation.
by Francois Gouget 27 Apr '22

27 Apr '22

The translation's trailing full stop use should match the English version. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- I did not notice anything to indicate that Turkish should behave differently in this regard. --- po/tr.po | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)

1 0

[PATCH] po: Fix trailing full stop inconsistencies in the Czech translation.
by Francois Gouget 27 Apr '22

27 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- po/cs.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[PATCH] po: Fix a trailing full stop inconsistency in the Asturian translation.
by Francois Gouget 27 Apr '22

27 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- po/ast.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH] po: Fix the indentation of a usage message in the Brazilian translation.
by Francois Gouget 27 Apr '22

27 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- po/pt_BR.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH v2 1/5] mf/tests: Simplify handling of broken Win7 results.
by Rémi Bernon 27 Apr '22

27 Apr '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: No changes. dlls/mf/tests/mf.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 31a84e47bc1..b2dd807dd33 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6631,6 +6631,7 @@ static void test_h264_decoder(void) IMFMediaType *media_type; IMFTransform *transform; DWORD status, length; + BOOL is_win7 = FALSE; ULONG i, ret, flags; HANDLE output_file; IMFSample *sample; @@ -6741,10 +6742,9 @@ static void test_h264_decoder(void) winetest_push_context("out %lu", i); ok(hr == S_OK, "GetOutputAvailableType returned %#lx\n", hr); check_media_type(media_type, default_outputs[i], -1); - if (FAILED(hr = IMFMediaType_GetItem(media_type, &MF_MT_VIDEO_ROTATION, NULL))) - check_media_type(media_type, default_outputs_win7[i], -1); - else - check_media_type(media_type, default_outputs_extra[i], -1); + hr = IMFMediaType_GetItem(media_type, &MF_MT_VIDEO_ROTATION, NULL); + is_win7 = broken(FAILED(hr)); + check_media_type(media_type, is_win7 ? default_outputs_win7[i] : default_outputs_extra[i], -1); ret = IMFMediaType_Release(media_type); ok(ret == 0, "Release returned %lu\n", ret); winetest_pop_context(); @@ -6772,11 +6772,9 @@ static void test_h264_decoder(void) init_media_type(media_type, output_type_desc, i + 1); } hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); - if (broken(hr == MF_E_INVALIDMEDIATYPE)) - { - init_media_type(media_type, output_type_desc_win7, ARRAY_SIZE(output_type_desc_win7) - 1); - hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); - } + ok(hr == (is_win7 ? MF_E_INVALIDMEDIATYPE : S_OK), "SetOutputType returned %#lx.\n", hr); + init_media_type(media_type, is_win7 ? output_type_desc_win7 : output_type_desc, -1); + hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); ok(hr == S_OK, "SetOutputType returned %#lx.\n", hr); ret = IMFMediaType_Release(media_type); ok(ret == 1, "Release returned %lu\n", ret); -- 2.35.1

2 9

[PATCH] po: Fix a typo in the Asturian translation.
by Francois Gouget 27 Apr '22

27 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- All the other instances of 'invalid' translate to 'nun ye válidu' (or válida). So there does not seem to be any reason to add an 's' to 'válidu'. Thus I think the 's' is just an extra character that should not be there. --- po/ast.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH] kernel32/tests: Fix the spelling of a comment.
by Francois Gouget 27 Apr '22

27 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/kernel32/tests/heap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index e3c75fbfe0a..88781aa376c 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -338,7 +338,7 @@ static void test_HeapCreate(void) ok( !!heap, "HeapCreate failed, error %lu\n", GetLastError() ); ok( !((ULONG_PTR)heap & 0xffff), "wrong heap alignment\n" ); - /* theshold between failure and success varies, and w7pro64 has a much larger overhead. */ + /* threshold between failure and success varies, and w7pro64 has a much larger overhead. */ ptr = HeapAlloc( heap, 0, alloc_size - (0x400 + 0x100 * sizeof(void *)) ); ok( !!ptr, "HeapAlloc failed, error %lu\n", GetLastError() ); -- 2.30.2

1 0

[PATCH] user32/tests: Trace monitor information with 'monitor info'.
by Francois Gouget 27 Apr '22

27 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Just running user32:monitor does not provide useful information about how many monitors are present, their resolution, etc. I can manually check this information by starting a VM, connecting to it with virt-viewer and using the GUI. But multi-monitor setups are a bit finicky so I'm never really sure if they really get the same configuration when they run tests. This issue is exacerbated by the fact that Libvirt's screenshotting functionality is particularly buggy for Windows guests and seems to only capture the primary monitor. So I'm hoping to use this patch to get more accurate monitor + resolution information (at least until client-side screenshotting). I can also keep it locally if it is deemed not suitable for Wine. --- dlls/user32/tests/monitor.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 02bc6651dd3..94cb7e60382 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2530,9 +2530,38 @@ static void test_display_dc(void) } } +BOOL CALLBACK MonitorEnumProc(HMONITOR hMonitor, HDC hdcMonitor, + LPRECT lprcMonitor, LPARAM dwData) +{ + MONITORINFOEXW info; + static int index; + + info.cbSize = sizeof(info); + if (GetMonitorInfoW(hMonitor, (MONITORINFO*)&info)) + { + printf("Monitor %d %7s [%02lx] %s %s\n", index, + (info.dwFlags & MONITORINFOF_PRIMARY) ? "primary" : "", + info.dwFlags, wine_dbgstr_rect(&info.rcMonitor), + wine_dbgstr_w(info.szDevice)); + } + index++; + return TRUE; +} + START_TEST(monitor) { + char** myARGV; + int myARGC = winetest_get_mainargs(&myARGV); + init_function_pointers(); + + if (myARGC >= 3 && strcmp(myARGV[2], "info") == 0) + { + printf("Monitor information:\n"); + EnumDisplayMonitors(NULL, NULL, MonitorEnumProc, 0); + return; + } + test_enumdisplaydevices(); test_ChangeDisplaySettingsEx(); test_DisplayConfigSetDeviceInfo(); -- 2.30.2

1 0

[PATCH] oleaut32/tests: The EUR abbreviation is not recognized as a currency.
by Francois Gouget 27 Apr '22

27 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/oleaut32/tests/vartest.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 4fc0e4e0221..cdbb836b041 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -2151,6 +2151,12 @@ static void test_VarParseNumFromStrFr(void) EXPECT2(1,2); EXPECTRGB(2,FAILDIG); + /* The three-letter Euro abbreviation is not allowed */ + WCONVERT(L"12EUR", NUMPRS_CURRENCY); + EXPECT(2,NUMPRS_CURRENCY,0,2,0,0); + EXPECT2(1,2); + EXPECTRGB(2,FAILDIG); + /* With flag and decimal flag, consumes decimal point and following digits */ WCONVERT(L"12,1\x20ac", NUMPRS_CURRENCY|NUMPRS_DECIMAL|NUMPRS_USE_ALL); EXPECT(3,NUMPRS_CURRENCY|NUMPRS_DECIMAL|NUMPRS_USE_ALL,NUMPRS_CURRENCY|NUMPRS_DECIMAL,5,0,-1); -- 2.30.2

1 0

[PATCH] oleau32/tests: Show that spaces are not allowed before exponents.
by Francois Gouget 27 Apr '22

27 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/oleaut32/tests/vartest.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 9456b56eb26..4fc0e4e0221 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1837,6 +1837,11 @@ static void test_VarParseNumFromStrEn(void) EXPECT(1,NUMPRS_EXPONENT,NUMPRS_EXPONENT,3,0,1); EXPECT2(1,FAILDIG); + /* Spaces are not allowed before the exponent */ + CONVERT("1 e1", NUMPRS_EXPONENT|NUMPRS_TRAILING_WHITE); + EXPECT(1,NUMPRS_EXPONENT|NUMPRS_TRAILING_WHITE,NUMPRS_TRAILING_WHITE,2,0,0); + EXPECT2(1,FAILDIG); + /* With flag, incompatible with NUMPRS_HEX_OCT */ CONVERT("&o1e1", NUMPRS_HEX_OCT|NUMPRS_EXPONENT); EXPECT(1,NUMPRS_HEX_OCT|NUMPRS_EXPONENT,NUMPRS_HEX_OCT,3,3,0); @@ -2013,6 +2018,11 @@ static void test_VarParseNumFromStrFr(void) EXPECTFAIL; } + /* No space of any type is allowed before the exponent... */ + wsprintfW(wstr, L"1%ce1", spaces[i]); + WCONVERT(wstr, NUMPRS_EXPONENT|NUMPRS_TRAILING_WHITE|NUMPRS_USE_ALL); + EXPECTFAIL; + winetest_pop_context(); } -- 2.30.2

1 0

[PATCH] comctl32/tests: Use winetest_push_context() in test_combo_dropdown_size().
by Francois Gouget 27 Apr '22

27 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/comctl32/tests/combo.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/tests/combo.c b/dlls/comctl32/tests/combo.c index 0dd05befa06..3eceeb55bd5 100644 --- a/dlls/comctl32/tests/combo.c +++ b/dlls/comctl32/tests/combo.c @@ -1272,6 +1272,7 @@ static void test_combo_dropdown_size(DWORD style) RECT rect_list_client; int min_visible_expected; + winetest_push_context("Test %d", test); hCombo = CreateWindowA(WC_COMBOBOXA, "Combo", CBS_DROPDOWN | WS_VISIBLE | WS_CHILD | style, 5, 5, 100, info_test->height_combo, hMainWnd, (HMENU)COMBO_ID, NULL, 0); @@ -1297,8 +1298,8 @@ static void test_combo_dropdown_size(DWORD style) ret = SendMessageA(hCombo, CB_SETMINVISIBLE, min_visible_expected, 0); ok(ret, "Failed to set visible limit.\n"); min_visible_actual = SendMessageA(hCombo, CB_GETMINVISIBLE, 0, 0); - ok(min_visible_expected == min_visible_actual, "test %d: unexpected number of items %d.\n", - test, min_visible_actual); + ok(min_visible_expected == min_visible_actual, "unexpected number of items %d.\n", + min_visible_actual); } ret = SendMessageA(hCombo, CB_SHOWDROPDOWN, TRUE,0); @@ -1333,18 +1334,19 @@ static void test_combo_dropdown_size(DWORD style) if (expected_height_list < 0) expected_height_list = 0; - ok(expected_height_list == height_list, "Test %d, expected list height to be %d, got %d\n", - test, expected_height_list, height_list); + ok(expected_height_list == height_list, "expected list height to be %d, got %d\n", + expected_height_list, height_list); } else { expected_height_list = min(info_test->num_items, min_visible_expected) * height_item; - ok(expected_height_list == height_list, "Test %d, expected list height to be %d, got %d\n", - test, expected_height_list, height_list); + ok(expected_height_list == height_list, "expected list height to be %d, got %d\n", + expected_height_list, height_list); } DestroyWindow(hCombo); + winetest_pop_context(); } } -- 2.30.2

1 0

[PATCH] kernel32/tests: Remove a couple of unnecessary NULL casts.
by Francois Gouget 27 Apr '22

27 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/kernel32/tests/heap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 88781aa376c..fded1c69f1e 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -1915,7 +1915,7 @@ static void test_block_layout( HANDLE heap, DWORD global_flags, DWORD heap_flags tmp_flags = 0xdeadbeef; ret = pRtlGetUserInfoHeap( heap, 0, ptr0, (void **)&tmp_ptr, &tmp_flags ); ok( ret, "RtlGetUserInfoHeap failed, error %lu\n", GetLastError() ); - ok( tmp_ptr == (void *)NULL, "got ptr %p\n", tmp_ptr ); + ok( tmp_ptr == NULL, "got ptr %p\n", tmp_ptr ); todo_wine ok( tmp_flags == 0xc00, "got flags %#lx\n", tmp_flags ); @@ -1923,7 +1923,7 @@ static void test_block_layout( HANDLE heap, DWORD global_flags, DWORD heap_flags tmp_flags = 0xdeadbeef; ret = pRtlGetUserInfoHeap( heap, 0, ptr1, (void **)&tmp_ptr, &tmp_flags ); ok( ret, "RtlGetUserInfoHeap failed, error %lu\n", GetLastError() ); - ok( tmp_ptr == (void *)NULL, "got ptr %p\n", tmp_ptr ); + ok( tmp_ptr == NULL, "got ptr %p\n", tmp_ptr ); todo_wine ok( tmp_flags == 0x200, "got flags %#lx\n", tmp_flags ); -- 2.30.2

1 0

[PATCH 1/6] win32u: Use NtUserSetClipboardData to import clipboard data.
by Jacek Caban 27 Apr '22

27 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/clipboard.c | 192 ++++++++++++++++++----------------- 1 file changed, 100 insertions(+), 92 deletions(-)

2 1

[PATCH v2 6/6] winex11: Use format_entry to store cached XDND formats data.
by Huw Davies 27 Apr '22

27 Apr '22

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winex11.drv/xdnd.c | 107 ++++++++++++---------------------------- 1 file changed, 32 insertions(+), 75 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index b892a70949a..34cb2a47081 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -45,14 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(xdnd); -typedef struct tagXDNDDATA -{ - int cf_win; - HANDLE contents; - struct list entry; -} XDNDDATA, *LPXDNDDATA; - -static struct list xdndData = LIST_INIT(xdndData); +static struct format_entry *xdnd_formats, *xdnd_formats_end; static POINT XDNDxy = { 0, 0 }; static IDataObject XDNDDataObject; static BOOL XDNDAccepted = FALSE; @@ -62,7 +55,6 @@ static HWND XDNDLastTargetWnd; /* might be an ancestor of XDNDLastTargetWnd */ static HWND XDNDLastDropTargetWnd; -static void X11DRV_XDND_InsertXDNDData( UINT format, HANDLE contents ); static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, Atom *types, unsigned long count); static BOOL X11DRV_XDND_HasHDROP(void); @@ -529,7 +521,7 @@ void X11DRV_XDND_LeaveEvent( HWND hWnd, XClientMessageEvent *event ) static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, Atom *types, unsigned long count) { - struct format_entry *formats, *formats_end, *iter; + struct format_entry *formats; size_t size; TRACE("count(%ld)\n", count); @@ -537,41 +529,14 @@ static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, X11DRV_XDND_FreeDragDropOp(); /* Clear previously cached data */ formats = import_xdnd_selection( display, xwin, x11drv_atom(XdndSelection), types, count, &size ); - if (formats) - { - formats_end = (struct format_entry *)((char *)formats + size); - for (iter = formats; iter < formats_end; iter = next_format( iter )) - { - HANDLE handle; - if ((handle = GlobalAlloc( GMEM_FIXED, iter->size ))) - { - void *ptr = GlobalLock( handle ); - memcpy( ptr, iter->data, iter->size ); - GlobalUnlock( handle ); - X11DRV_XDND_InsertXDNDData( iter->format, handle ); - } - } - } -} - + if (!formats) return; -/************************************************************************** - * X11DRV_XDND_InsertXDNDData - * - * Cache available XDND property - */ -static void X11DRV_XDND_InsertXDNDData( UINT format, HANDLE contents ) -{ - LPXDNDDATA current = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(XDNDDATA)); - - if (current) + if ((xdnd_formats = HeapAlloc( GetProcessHeap(), 0, size ))) { - EnterCriticalSection(&xdnd_cs); - current->cf_win = format; - current->contents = contents; - list_add_tail(&xdndData, &current->entry); - LeaveCriticalSection(&xdnd_cs); + memcpy( xdnd_formats, formats, size ); + xdnd_formats_end = (struct format_entry *)((char *)xdnd_formats + size); } + free( formats ); } @@ -580,15 +545,15 @@ static void X11DRV_XDND_InsertXDNDData( UINT format, HANDLE contents ) */ static BOOL X11DRV_XDND_HasHDROP(void) { - LPXDNDDATA current = NULL; + struct format_entry *iter; BOOL found = FALSE; EnterCriticalSection(&xdnd_cs); /* Find CF_HDROP type if any */ - LIST_FOR_EACH_ENTRY(current, &xdndData, XDNDDATA, entry) + for (iter = xdnd_formats; iter < xdnd_formats_end; iter = next_format( iter )) { - if (current->cf_win == CF_HDROP) + if (iter->format == CF_HDROP) { found = TRUE; break; @@ -605,15 +570,15 @@ static BOOL X11DRV_XDND_HasHDROP(void) */ static HRESULT X11DRV_XDND_SendDropFiles(HWND hwnd) { + struct format_entry *iter; HRESULT hr; - LPXDNDDATA current = NULL; BOOL found = FALSE; EnterCriticalSection(&xdnd_cs); - LIST_FOR_EACH_ENTRY(current, &xdndData, XDNDDATA, entry) + for (iter = xdnd_formats; iter < xdnd_formats_end; iter = next_format( iter )) { - if (current->cf_win == CF_HDROP) + if (iter->format == CF_HDROP) { found = TRUE; break; @@ -621,13 +586,12 @@ static HRESULT X11DRV_XDND_SendDropFiles(HWND hwnd) } if (found) { - HGLOBAL dropHandle = GlobalAlloc(GMEM_FIXED, GlobalSize(current->contents)); + HGLOBAL dropHandle = GlobalAlloc(GMEM_FIXED, iter->size); if (dropHandle) { RECT rect; DROPFILES *lpDrop = GlobalLock(dropHandle); - memcpy(lpDrop, GlobalLock(current->contents), GlobalSize(current->contents)); - GlobalUnlock(current->contents); + memcpy(lpDrop, iter->data, iter->size); lpDrop->pt.x = XDNDxy.x; lpDrop->pt.y = XDNDxy.y; lpDrop->fNC = !(ScreenToClient(hwnd, &lpDrop->pt) && @@ -662,20 +626,12 @@ static HRESULT X11DRV_XDND_SendDropFiles(HWND hwnd) */ static void X11DRV_XDND_FreeDragDropOp(void) { - LPXDNDDATA next; - LPXDNDDATA current; - TRACE("\n"); EnterCriticalSection(&xdnd_cs); - /** Free data cache */ - LIST_FOR_EACH_ENTRY_SAFE(current, next, &xdndData, XDNDDATA, entry) - { - list_remove(&current->entry); - GlobalFree(current->contents); - HeapFree(GetProcessHeap(), 0, current); - } + HeapFree( GetProcessHeap(), 0, xdnd_formats ); + xdnd_formats = xdnd_formats_end = NULL; XDNDxy.x = XDNDxy.y = 0; XDNDLastTargetWnd = NULL; @@ -772,18 +728,18 @@ static HRESULT WINAPI XDNDDATAOBJECT_GetData(IDataObject *dataObject, hr = IDataObject_QueryGetData(dataObject, formatEtc); if (SUCCEEDED(hr)) { - XDNDDATA *current; - LIST_FOR_EACH_ENTRY(current, &xdndData, XDNDDATA, entry) + struct format_entry *iter; + + for (iter = xdnd_formats; iter < xdnd_formats_end; iter = next_format( iter )) { - if (current->cf_win == formatEtc->cfFormat) + if (iter->format == formatEtc->cfFormat) { pMedium->tymed = TYMED_HGLOBAL; - pMedium->u.hGlobal = GlobalAlloc(GMEM_FIXED | GMEM_ZEROINIT, GlobalSize(current->contents)); + pMedium->u.hGlobal = GlobalAlloc(GMEM_FIXED | GMEM_ZEROINIT, iter->size); if (pMedium->u.hGlobal == NULL) return E_OUTOFMEMORY; - memcpy(GlobalLock(pMedium->u.hGlobal), GlobalLock(current->contents), GlobalSize(current->contents)); + memcpy(GlobalLock(pMedium->u.hGlobal), iter->data, iter->size); GlobalUnlock(pMedium->u.hGlobal); - GlobalUnlock(current->contents); pMedium->pUnkForRelease = 0; return S_OK; } @@ -803,8 +759,8 @@ static HRESULT WINAPI XDNDDATAOBJECT_GetDataHere(IDataObject *dataObject, static HRESULT WINAPI XDNDDATAOBJECT_QueryGetData(IDataObject *dataObject, FORMATETC *formatEtc) { + struct format_entry *iter; char formatDesc[1024]; - XDNDDATA *current; TRACE("(%p, %p={.tymed=0x%x, .dwAspect=%d, .cfFormat=%d}\n", dataObject, formatEtc, formatEtc->tymed, formatEtc->dwAspect, formatEtc->cfFormat); @@ -819,9 +775,9 @@ static HRESULT WINAPI XDNDDATAOBJECT_QueryGetData(IDataObject *dataObject, * and we have no way to implement them on XDnD anyway, so ignore them too. */ - LIST_FOR_EACH_ENTRY(current, &xdndData, XDNDDATA, entry) + for (iter = xdnd_formats; iter < xdnd_formats_end; iter = next_format( iter )) { - if (current->cf_win == formatEtc->cfFormat) + if (iter->format == formatEtc->cfFormat) { TRACE("application found %s\n", formatDesc); return S_OK; @@ -853,7 +809,8 @@ static HRESULT WINAPI XDNDDATAOBJECT_EnumFormatEtc(IDataObject *dataObject, DWORD dwDirection, IEnumFORMATETC **ppEnumFormatEtc) { - DWORD count; + struct format_entry *iter; + DWORD count = 0; FORMATETC *formats; TRACE("(%p, %u, %p)\n", dataObject, dwDirection, ppEnumFormatEtc); @@ -864,16 +821,16 @@ static HRESULT WINAPI XDNDDATAOBJECT_EnumFormatEtc(IDataObject *dataObject, return E_NOTIMPL; } - count = list_count(&xdndData); + for (iter = xdnd_formats; iter < xdnd_formats_end; iter = next_format( iter )) count++; + formats = HeapAlloc(GetProcessHeap(), 0, count * sizeof(FORMATETC)); if (formats) { - XDNDDATA *current; DWORD i = 0; HRESULT hr; - LIST_FOR_EACH_ENTRY(current, &xdndData, XDNDDATA, entry) + for (iter = xdnd_formats; iter < xdnd_formats_end; iter = next_format( iter )) { - formats[i].cfFormat = current->cf_win; + formats[i].cfFormat = iter->format; formats[i].ptd = NULL; formats[i].dwAspect = DVASPECT_CONTENT; formats[i].lindex = -1; -- 2.25.1

1 0

[PATCH v2 5/6] winex11: Move CF_HDROP filtering to import_xdnd_selection.
by Huw Davies 27 Apr '22

27 Apr '22

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winex11.drv/clipboard.c | 11 +++++++++++ dlls/winex11.drv/xdnd.c | 26 -------------------------- 2 files changed, 11 insertions(+), 26 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 92284d436dd..6baa87c5ce1 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1108,14 +1108,25 @@ struct format_entry *import_xdnd_selection( Display *display, Window win, Atom s void *data; struct clipboard_format *format; struct format_entry *ret = NULL, *entry; + BOOL have_hdrop = FALSE; register_x11_formats( targets, count ); *ret_size = 0; + for (i = 0; i < count; i++) + { + if (!(format = find_x11_format( targets[i] ))) continue; + if (format->id != CF_HDROP) continue; + have_hdrop = TRUE; + break; + } + for (i = 0; i < count; i++) { if (!(format = find_x11_format( targets[i] ))) continue; if (!format->id) continue; + if (have_hdrop && format->id != CF_HDROP && format->id < CF_MAX) continue; + if (!(data = import_selection( display, win, selection, format, &size ))) continue; entry_size = (FIELD_OFFSET( struct format_entry, data[size] ) + 7) & ~7; diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index aa46467f6f7..b892a70949a 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -530,8 +530,6 @@ static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, Atom *types, unsigned long count) { struct format_entry *formats, *formats_end, *iter; - XDNDDATA *current, *next; - BOOL haveHDROP = FALSE; size_t size; TRACE("count(%ld)\n", count); @@ -554,30 +552,6 @@ static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, } } } - - /* On Windows when there is a CF_HDROP, there are no other CF_ formats. - * foobar2000 relies on this (spaces -> %20's without it). - */ - LIST_FOR_EACH_ENTRY(current, &xdndData, XDNDDATA, entry) - { - if (current->cf_win == CF_HDROP) - { - haveHDROP = TRUE; - break; - } - } - if (haveHDROP) - { - LIST_FOR_EACH_ENTRY_SAFE(current, next, &xdndData, XDNDDATA, entry) - { - if (current->cf_win != CF_HDROP && current->cf_win < CF_MAX) - { - list_remove(&current->entry); - GlobalFree(current->contents); - HeapFree(GetProcessHeap(), 0, current); - } - } - } } -- 2.25.1

1 0

[PATCH v2 4/6] winex11: Return selection data as a single buffer from import_xdnd_selection.
by Huw Davies 27 Apr '22

27 Apr '22

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winex11.drv/clipboard.c | 29 +++++++++++++++++------------ dlls/winex11.drv/x11drv.h | 14 +++++++++++--- dlls/winex11.drv/xdnd.c | 26 ++++++++++++++++++++++++-- 3 files changed, 52 insertions(+), 17 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index ec69778fc3c..92284d436dd 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1096,21 +1096,21 @@ static void *import_selection( Display *display, Window win, Atom selection, /************************************************************************** - * X11DRV_CLIPBOARD_ImportSelection + * import_xdnd_selection * * Import the X selection into the clipboard format registered for the given X target. */ -void X11DRV_CLIPBOARD_ImportSelection( Display *display, Window win, Atom selection, - Atom *targets, UINT count, - void (*callback)( UINT, HANDLE )) +struct format_entry *import_xdnd_selection( Display *display, Window win, Atom selection, + Atom *targets, UINT count, size_t *ret_size ) { + size_t size, buf_size = 0, entry_size; UINT i; - HANDLE handle; void *data; - size_t size; struct clipboard_format *format; + struct format_entry *ret = NULL, *entry; register_x11_formats( targets, count ); + *ret_size = 0; for (i = 0; i < count; i++) { @@ -1118,16 +1118,21 @@ void X11DRV_CLIPBOARD_ImportSelection( Display *display, Window win, Atom select if (!format->id) continue; if (!(data = import_selection( display, win, selection, format, &size ))) continue; - if ((handle = GlobalAlloc( GMEM_FIXED, size ))) + entry_size = (FIELD_OFFSET( struct format_entry, data[size] ) + 7) & ~7; + if (buf_size < size + entry_size) { - void *ptr; - ptr = GlobalLock( handle ); - memcpy( ptr, data, size ); - GlobalUnlock( handle ); - callback( format->id, handle ); + if (!(ret = realloc( ret, *ret_size + entry_size + 1024 ))) continue; + buf_size = *ret_size + entry_size + 1024; /* extra space for following entries */ } + entry = (struct format_entry *)((char *)ret + *ret_size); + entry->format = format->id; + entry->size = size; + if (size) memcpy( entry->data, data, size ); + *ret_size += entry_size; free( data ); } + + return ret; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index a8d2f78aa6b..f6d28122fc3 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -297,9 +297,17 @@ extern void X11DRV_XDND_EnterEvent( HWND hWnd, XClientMessageEvent *event ) DECL extern void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) DECLSPEC_HIDDEN; extern void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) DECLSPEC_HIDDEN; extern void X11DRV_XDND_LeaveEvent( HWND hWnd, XClientMessageEvent *event ) DECLSPEC_HIDDEN; -extern void X11DRV_CLIPBOARD_ImportSelection( Display *display, Window win, Atom selection, - Atom *targets, UINT count, - void (*callback)( UINT, HANDLE )) DECLSPEC_HIDDEN; + +struct format_entry +{ + UINT format; + UINT size; + char data[1]; +}; + +extern struct format_entry *import_xdnd_selection( Display *display, Window win, Atom selection, + Atom *targets, UINT count, + size_t *size ) DECLSPEC_HIDDEN; /************************************************************************** * X11 GDI driver diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index b9bba1ff872..aa46467f6f7 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -79,6 +79,12 @@ static CRITICAL_SECTION_DEBUG critsect_debug = static CRITICAL_SECTION xdnd_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; +static struct format_entry *next_format( struct format_entry *entry ) +{ + return (struct format_entry *)&entry->data[(entry->size + 7) & ~7]; +} + + /* Based on functions in dlls/ole32/ole2.c */ static HANDLE get_droptarget_local_handle(HWND hwnd) { @@ -523,15 +529,31 @@ void X11DRV_XDND_LeaveEvent( HWND hWnd, XClientMessageEvent *event ) static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, Atom *types, unsigned long count) { + struct format_entry *formats, *formats_end, *iter; XDNDDATA *current, *next; BOOL haveHDROP = FALSE; + size_t size; TRACE("count(%ld)\n", count); X11DRV_XDND_FreeDragDropOp(); /* Clear previously cached data */ - X11DRV_CLIPBOARD_ImportSelection( display, xwin, x11drv_atom(XdndSelection), - types, count, X11DRV_XDND_InsertXDNDData ); + formats = import_xdnd_selection( display, xwin, x11drv_atom(XdndSelection), types, count, &size ); + if (formats) + { + formats_end = (struct format_entry *)((char *)formats + size); + for (iter = formats; iter < formats_end; iter = next_format( iter )) + { + HANDLE handle; + if ((handle = GlobalAlloc( GMEM_FIXED, iter->size ))) + { + void *ptr = GlobalLock( handle ); + memcpy( ptr, iter->data, iter->size ); + GlobalUnlock( handle ); + X11DRV_XDND_InsertXDNDData( iter->format, handle ); + } + } + } /* On Windows when there is a CF_HDROP, there are no other CF_ formats. * foobar2000 relies on this (spaces -> %20's without it). -- 2.25.1

1 0

[PATCH v2 3/6] winex11: Directly use ntdll in clipboard.c.
by Huw Davies 27 Apr '22

27 Apr '22

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winex11.drv/clipboard.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index b36b9a002a3..ec69778fc3c 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -191,7 +191,7 @@ static Window selection_window; static Window import_window; static Atom current_selection; static UINT rendered_formats; -static ULONG64 last_clipboard_update; +static ULONG last_clipboard_update; static struct clipboard_format **current_x11_formats; static unsigned int nb_current_x11_formats; static BOOL use_xfixes; @@ -281,6 +281,14 @@ static struct clipboard_format *find_x11_format( Atom atom ) } +static ATOM register_clipboard_format( const WCHAR *name ) +{ + ATOM atom; + if (NtAddAtom( name, lstrlenW( name ) * sizeof(WCHAR), &atom )) return 0; + return atom; +} + + /************************************************************************** * register_builtin_formats */ @@ -294,7 +302,7 @@ static void register_builtin_formats(void) for (i = 0; i < ARRAY_SIZE(builtin_formats); i++) { if (builtin_formats[i].name) - formats[i].id = RegisterClipboardFormatW( builtin_formats[i].name ); + formats[i].id = register_clipboard_format( builtin_formats[i].name ); else formats[i].id = builtin_formats[i].id; @@ -398,7 +406,7 @@ static void register_x11_formats( const Atom *atoms, UINT size ) for (i = pos = 0; i < count; i++) { if (MultiByteToWideChar( CP_UNIXCP, 0, names[i], -1, buffer, 256 ) && - (ids[pos] = RegisterClipboardFormatW( buffer ))) + (ids[pos] = register_clipboard_format( buffer ))) new_atoms[pos++] = new_atoms[i]; XFree( names[i] ); } @@ -1915,7 +1923,7 @@ static BOOL request_selection_contents( Display *display, BOOL changed ) last_type = type; last_data = data; last_size = size; - last_clipboard_update = GetTickCount64(); + last_clipboard_update = NtGetTickCount(); NtUserCloseClipboard(); if (!use_xfixes) NtUserSetTimer( clipboard_hwnd, 1, SELECTION_UPDATE_DELAY, NULL, TIMERV_DEFAULT_COALESCING ); @@ -1933,7 +1941,7 @@ BOOL update_clipboard( HWND hwnd ) if (use_xfixes) return TRUE; if (hwnd != clipboard_hwnd) return TRUE; if (!is_clipboard_owner) return TRUE; - if (GetTickCount64() - last_clipboard_update <= SELECTION_UPDATE_DELAY) return TRUE; + if (NtGetTickCount() - last_clipboard_update <= SELECTION_UPDATE_DELAY) return TRUE; return request_selection_contents( thread_display(), FALSE ); } @@ -2131,7 +2139,7 @@ void X11DRV_UpdateClipboard(void) if (use_xfixes) return; if (GetCurrentThreadId() == clipboard_thread_id) return; - now = GetTickCount(); + now = NtGetTickCount(); if ((int)(now - last_update) <= SELECTION_UPDATE_DELAY) return; if (SendMessageTimeoutW( GetClipboardOwner(), WM_X11DRV_UPDATE_CLIPBOARD, 0, 0, SMTO_ABORTIFHUNG, 5000, &ret ) && ret) -- 2.25.1

1 0

[PATCH v2 2/6] winex11: Directly use win32u in import_image_bmp.
by Huw Davies 27 Apr '22

27 Apr '22

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winex11.drv/clipboard.c | 45 ++++++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 7640308fadd..b36b9a002a3 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -511,7 +511,7 @@ static void *create_dib_from_bitmap( HBITMAP hBmp, size_t *size ) int nLinesCopied; char *ret; - if (!GetObjectW( hBmp, sizeof(bmp), &bmp )) return 0; + if (!NtGdiExtGetObjectW( hBmp, sizeof(bmp), &bmp )) return 0; /* * A packed DIB contains a BITMAPINFO structure followed immediately by @@ -551,15 +551,10 @@ static void *create_dib_from_bitmap( HBITMAP hBmp, size_t *size ) /* Retrieve the DIB bits from the bitmap and fill in the * DIB color table if present */ - hdc = GetDC( 0 ); - nLinesCopied = GetDIBits(hdc, /* Handle to device context */ - hBmp, /* Handle to bitmap */ - 0, /* First scan line to set in dest bitmap */ - bmp.bmHeight, /* Number of scan lines to copy */ - ret + OffsetBits, /* [out] Address of array for bitmap bits */ - (LPBITMAPINFO) pbmiHeader, /* [out] Address of BITMAPINFO structure */ - 0); /* RGB or palette index */ - ReleaseDC( 0, hdc ); + hdc = NtUserGetDCEx( 0, 0, DCX_CACHE | DCX_WINDOW ); + nLinesCopied = NtGdiGetDIBitsInternal( hdc, hBmp, 0, bmp.bmHeight, ret + OffsetBits, + (LPBITMAPINFO) pbmiHeader, 0, 0, 0 ); + NtUserReleaseDC( 0, hdc ); /* Cleanup if GetDIBits failed */ if (nLinesCopied != bmp.bmHeight) @@ -845,16 +840,36 @@ static void *import_image_bmp( Atom type, const void *data, size_t size, size_t bfh->bfType == 0x4d42 /* "BM" */) { const BITMAPINFO *bmi = (const BITMAPINFO *)(bfh + 1); + int width, height; HBITMAP hbmp; - HDC hdc = GetDC(0); + HDC hdc; - if ((hbmp = CreateDIBitmap( hdc, &bmi->bmiHeader, CBM_INIT, - (const BYTE *)data + bfh->bfOffBits, bmi, DIB_RGB_COLORS ))) + if (bmi->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) + { + const BITMAPCOREHEADER *core = (const BITMAPCOREHEADER *)bmi; + width = core->bcWidth; + height = core->bcHeight; + } + else if (bmi->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER)) + { + const BITMAPINFOHEADER *header = &bmi->bmiHeader; + if (header->biCompression == BI_JPEG || header->biCompression == BI_PNG) return 0; + width = header->biWidth; + height = header->biHeight; + } + else return NULL; + if (!width || !height) return NULL; + + hdc = NtUserGetDCEx( 0, 0, DCX_CACHE | DCX_WINDOW ); + + if ((hbmp = NtGdiCreateDIBitmapInternal( hdc, width, height, CBM_INIT, + (const BYTE *)data + bfh->bfOffBits, bmi, + DIB_RGB_COLORS, 0, 0, 0, 0 ))) { ret = create_dib_from_bitmap( hbmp, ret_size ); - DeleteObject(hbmp); + NtGdiDeleteObjectApp( hbmp ); } - ReleaseDC(0, hdc); + NtUserReleaseDC(0, hdc); } return ret; } -- 2.25.1

1 0

[PATCH v2 1/6] winex11: Use NtUserSetClipboardData to import clipboard data.
by Huw Davies 27 Apr '22

27 Apr '22

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winex11.drv/clipboard.c | 192 ++++++++++++++++++----------------- 1 file changed, 100 insertions(+), 92 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index a0ccc3ebc96..7640308fadd 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -98,7 +98,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(clipboard); #define SELECTION_UPDATE_DELAY 2000 /* delay between checks of the X11 selection */ typedef BOOL (*EXPORTFUNC)( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ); -typedef HANDLE (*IMPORTFUNC)( Atom type, const void *data, size_t size ); +typedef void *(*IMPORTFUNC)( Atom type, const void *data, size_t size, size_t *ret_size ); struct clipboard_format { @@ -109,17 +109,16 @@ struct clipboard_format EXPORTFUNC export; }; -static HANDLE import_data( Atom type, const void *data, size_t size ); -static HANDLE import_enhmetafile( Atom type, const void *data, size_t size ); -static HANDLE import_pixmap( Atom type, const void *data, size_t size ); -static HANDLE import_image_bmp( Atom type, const void *data, size_t size ); -static HANDLE import_string( Atom type, const void *data, size_t size ); -static HANDLE import_utf8_string( Atom type, const void *data, size_t size ); -static HANDLE import_compound_text( Atom type, const void *data, size_t size ); -static HANDLE import_text( Atom type, const void *data, size_t size ); -static HANDLE import_text_html( Atom type, const void *data, size_t size ); -static HANDLE import_text_uri_list( Atom type, const void *data, size_t size ); -static HANDLE import_targets( Atom type, const void *data, size_t size ); +static void *import_data( Atom type, const void *data, size_t size, size_t *ret_size ); +static void *import_pixmap( Atom type, const void *data, size_t size, size_t *ret_size ); +static void *import_image_bmp( Atom type, const void *data, size_t size, size_t *ret_size ); +static void *import_string( Atom type, const void *data, size_t size, size_t *ret_size ); +static void *import_utf8_string( Atom type, const void *data, size_t size, size_t *ret_size ); +static void *import_compound_text( Atom type, const void *data, size_t size, size_t *ret_size ); +static void *import_text( Atom type, const void *data, size_t size, size_t *ret_size ); +static void *import_text_html( Atom type, const void *data, size_t size, size_t *ret_size ); +static void *import_text_uri_list( Atom type, const void *data, size_t size, size_t *ret_size ); +static void *import_targets( Atom type, const void *data, size_t size, size_t *ret_size ); static BOOL export_data( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ); static BOOL export_string( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ); @@ -135,7 +134,7 @@ static BOOL export_multiple( Display *display, Window win, Atom prop, Atom targe static BOOL export_timestamp( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ); static BOOL read_property( Display *display, Window w, Atom prop, - Atom *type, unsigned char **data, unsigned long *datasize ); + Atom *type, unsigned char **data, size_t *datasize ); /* Clipboard formats */ @@ -166,7 +165,7 @@ static const struct { 0, CF_PENDATA, XATOM_WCF_PENDATA, import_data, export_data }, { 0, CF_RIFF, XATOM_WCF_RIFF, import_data, export_data }, { 0, CF_WAVE, XATOM_WCF_WAVE, import_data, export_data }, - { 0, CF_ENHMETAFILE, XATOM_WCF_ENHMETAFILE, import_enhmetafile, export_data }, + { 0, CF_ENHMETAFILE, XATOM_WCF_ENHMETAFILE, import_data, export_data }, { 0, CF_HDROP, XATOM_text_uri_list, import_text_uri_list, export_hdrop }, { 0, CF_DIB, XATOM_image_bmp, import_image_bmp, export_image_bmp }, { RichTextFormatW, 0, XATOM_text_rtf, import_data, export_data }, @@ -442,13 +441,12 @@ static void selection_sleep(void) NtDelayExecution( FALSE, &timeout ); } - /************************************************************************** * convert_selection */ static BOOL convert_selection( Display *display, Window win, Atom selection, struct clipboard_format *format, Atom *type, - unsigned char **data, unsigned long *size ) + unsigned char **data, size_t *size ) { int i; XEvent event; @@ -504,15 +502,14 @@ static int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) * * Allocates a packed DIB and copies the bitmap data into it. */ -static HGLOBAL create_dib_from_bitmap(HBITMAP hBmp) +static void *create_dib_from_bitmap( HBITMAP hBmp, size_t *size ) { BITMAP bmp; HDC hdc; - HGLOBAL hPackedDIB; - LPBYTE pPackedDIB; LPBITMAPINFOHEADER pbmiHeader; - unsigned int cDataSize, cPackedSize, OffsetBits; + unsigned int cDataSize, OffsetBits; int nLinesCopied; + char *ret; if (!GetObjectW( hBmp, sizeof(bmp), &bmp )) return 0; @@ -523,24 +520,22 @@ static HGLOBAL create_dib_from_bitmap(HBITMAP hBmp) /* Calculate the size of the packed DIB */ cDataSize = abs( bmp.bmHeight ) * (((bmp.bmWidth * bmp.bmBitsPixel + 31) / 8) & ~3); - cPackedSize = sizeof(BITMAPINFOHEADER) + *size = sizeof(BITMAPINFOHEADER) + ( (bmp.bmBitsPixel <= 8) ? (sizeof(RGBQUAD) * (1 << bmp.bmBitsPixel)) : 0 ) + cDataSize; /* Get the offset to the bits */ - OffsetBits = cPackedSize - cDataSize; + OffsetBits = *size - cDataSize; /* Allocate the packed DIB */ - TRACE("\tAllocating packed DIB of size %d\n", cPackedSize); - hPackedDIB = GlobalAlloc( GMEM_FIXED, cPackedSize ); - if ( !hPackedDIB ) + TRACE( "\tAllocating packed DIB\n" ); + if (!(ret = malloc( *size ))) { - WARN("Could not allocate packed DIB!\n"); + WARN( "Could not allocate packed DIB!\n" ); return 0; } /* A packed DIB starts with a BITMAPINFOHEADER */ - pPackedDIB = GlobalLock(hPackedDIB); - pbmiHeader = (LPBITMAPINFOHEADER)pPackedDIB; + pbmiHeader = (LPBITMAPINFOHEADER)ret; /* Init the BITMAPINFOHEADER */ pbmiHeader->biSize = sizeof(BITMAPINFOHEADER); @@ -561,20 +556,19 @@ static HGLOBAL create_dib_from_bitmap(HBITMAP hBmp) hBmp, /* Handle to bitmap */ 0, /* First scan line to set in dest bitmap */ bmp.bmHeight, /* Number of scan lines to copy */ - pPackedDIB + OffsetBits, /* [out] Address of array for bitmap bits */ + ret + OffsetBits, /* [out] Address of array for bitmap bits */ (LPBITMAPINFO) pbmiHeader, /* [out] Address of BITMAPINFO structure */ 0); /* RGB or palette index */ - GlobalUnlock(hPackedDIB); ReleaseDC( 0, hdc ); /* Cleanup if GetDIBits failed */ if (nLinesCopied != bmp.bmHeight) { TRACE("\tGetDIBits returned %d. Actual lines=%d\n", nLinesCopied, bmp.bmHeight); - GlobalFree(hPackedDIB); - hPackedDIB = 0; + free( ret ); + ret = NULL; } - return hPackedDIB; + return ret; } @@ -690,14 +684,14 @@ static WCHAR* uri_to_dos(char *encodedURI) * * Convert a string in the specified encoding to CF_UNICODETEXT format. */ -static HANDLE unicode_text_from_string( UINT codepage, const void *data, size_t size ) +static WCHAR *unicode_text_from_string( UINT codepage, const void *data, size_t size, size_t *ret_size ) { DWORD i, j, count; WCHAR *strW; count = MultiByteToWideChar( codepage, 0, data, size, NULL, 0); - if (!(strW = GlobalAlloc( GMEM_FIXED, (count * 2 + 1) * sizeof(WCHAR) ))) return 0; + if (!(strW = malloc( (count * 2 + 1) * sizeof(WCHAR) ))) return 0; MultiByteToWideChar( codepage, 0, data, size, strW + count, count ); for (i = j = 0; i < count; i++) @@ -706,7 +700,7 @@ static HANDLE unicode_text_from_string( UINT codepage, const void *data, size_t strW[j++] = strW[i + count]; } strW[j++] = 0; - GlobalReAlloc( strW, j * sizeof(WCHAR), GMEM_FIXED ); /* release unused space */ + *ret_size = j * sizeof(WCHAR); TRACE( "returning %s\n", debugstr_wn( strW, j - 1 )); return strW; } @@ -717,9 +711,9 @@ static HANDLE unicode_text_from_string( UINT codepage, const void *data, size_t * * Import XA_STRING, converting the string to CF_UNICODETEXT. */ -static HANDLE import_string( Atom type, const void *data, size_t size ) +static void *import_string( Atom type, const void *data, size_t size, size_t *ret_size ) { - return unicode_text_from_string( 28591, data, size ); + return unicode_text_from_string( 28591, data, size, ret_size ); } @@ -728,9 +722,9 @@ static HANDLE import_string( Atom type, const void *data, size_t size ) * * Import XA_UTF8_STRING, converting the string to CF_UNICODETEXT. */ -static HANDLE import_utf8_string( Atom type, const void *data, size_t size ) +static void *import_utf8_string( Atom type, const void *data, size_t size, size_t *ret_size ) { - return unicode_text_from_string( CP_UTF8, data, size ); + return unicode_text_from_string( CP_UTF8, data, size, ret_size ); } @@ -739,12 +733,12 @@ static HANDLE import_utf8_string( Atom type, const void *data, size_t size ) * * Import COMPOUND_TEXT to CF_UNICODETEXT. */ -static HANDLE import_compound_text( Atom type, const void *data, size_t size ) +static void *import_compound_text( Atom type, const void *data, size_t size, size_t *ret_size ) { char** srcstr; int count; - HANDLE ret; XTextProperty txtprop; + void *ret; txtprop.value = (BYTE *)data; txtprop.nitems = size; @@ -753,7 +747,7 @@ static HANDLE import_compound_text( Atom type, const void *data, size_t size ) if (XmbTextPropertyToTextList( thread_display(), &txtprop, &srcstr, &count ) != Success) return 0; if (!count) return 0; - ret = unicode_text_from_string( CP_UNIXCP, srcstr[0], strlen(srcstr[0]) + 1 ); + ret = unicode_text_from_string( CP_UNIXCP, srcstr[0], strlen(srcstr[0]) + 1, ret_size ); XFreeStringList(srcstr); return ret; } @@ -764,11 +758,11 @@ static HANDLE import_compound_text( Atom type, const void *data, size_t size ) * * Import XA_TEXT, converting the string to CF_UNICODETEXT. */ -static HANDLE import_text( Atom type, const void *data, size_t size ) +static void *import_text( Atom type, const void *data, size_t size, size_t *ret_size ) { - if (type == XA_STRING) return import_string( type, data, size ); - if (type == x11drv_atom(UTF8_STRING)) return import_utf8_string( type, data, size ); - if (type == x11drv_atom(COMPOUND_TEXT)) return import_compound_text( type, data, size ); + if (type == XA_STRING) return import_string( type, data, size, ret_size ); + if (type == x11drv_atom(UTF8_STRING)) return import_utf8_string( type, data, size, ret_size ); + if (type == x11drv_atom(COMPOUND_TEXT)) return import_compound_text( type, data, size, ret_size ); FIXME( "unsupported TEXT type %s\n", debugstr_xatom( type )); return 0; } @@ -779,7 +773,7 @@ static HANDLE import_text( Atom type, const void *data, size_t size ) * * Import XA_PIXMAP, converting the image to CF_DIB. */ -static HANDLE import_pixmap( Atom type, const void *data, size_t size ) +static void *import_pixmap( Atom type, const void *data, size_t size, size_t *ret_size ) { const Pixmap *pPixmap = (const Pixmap *)data; BYTE *ptr = NULL; @@ -824,11 +818,12 @@ static HANDLE import_pixmap( Atom type, const void *data, size_t size ) { DWORD info_size = bitmap_info_size( info, DIB_RGB_COLORS ); - ptr = GlobalAlloc( GMEM_FIXED, info_size + info->bmiHeader.biSizeImage ); + ptr = malloc( info_size + info->bmiHeader.biSizeImage ); if (ptr) { memcpy( ptr, info, info_size ); memcpy( ptr + info_size, bits.ptr, info->bmiHeader.biSizeImage ); + *ret_size = info_size + info->bmiHeader.biSizeImage; } if (bits.free) bits.free( &bits ); } @@ -841,10 +836,10 @@ static HANDLE import_pixmap( Atom type, const void *data, size_t size ) * * Import image/bmp, converting the image to CF_DIB. */ -static HANDLE import_image_bmp( Atom type, const void *data, size_t size ) +static void *import_image_bmp( Atom type, const void *data, size_t size, size_t *ret_size ) { - HANDLE hClipData = 0; const BITMAPFILEHEADER *bfh = data; + void *ret = NULL; if (size >= sizeof(BITMAPFILEHEADER)+sizeof(BITMAPCOREHEADER) && bfh->bfType == 0x4d42 /* "BM" */) @@ -856,28 +851,19 @@ static HANDLE import_image_bmp( Atom type, const void *data, size_t size ) if ((hbmp = CreateDIBitmap( hdc, &bmi->bmiHeader, CBM_INIT, (const BYTE *)data + bfh->bfOffBits, bmi, DIB_RGB_COLORS ))) { - hClipData = create_dib_from_bitmap( hbmp ); + ret = create_dib_from_bitmap( hbmp, ret_size ); DeleteObject(hbmp); } ReleaseDC(0, hdc); } - return hClipData; -} - - -/************************************************************************** - * import_enhmetafile - */ -static HANDLE import_enhmetafile( Atom type, const void *data, size_t size ) -{ - return SetEnhMetaFileBits( size, data ); + return ret; } /************************************************************************** * import_text_html */ -static HANDLE import_text_html( Atom type, const void *data, size_t size ) +static void *import_text_html( Atom type, const void *data, size_t size, size_t *ret_size ) { static const char header[] = "Version:0.9\n" @@ -905,12 +891,13 @@ static HANDLE import_text_html( Atom type, const void *data, size_t size ) len = strlen( header ) + 12; /* 3 * 4 extra chars for %010lu */ total = len + size + sizeof(trailer); - if ((ret = GlobalAlloc( GMEM_FIXED, total ))) + if ((ret = malloc( total ))) { char *p = ret; p += sprintf( p, header, total - 1, len, len + size + 1 /* include the final \n in the data */ ); memcpy( p, data, size ); strcpy( p + size, trailer ); + *ret_size = total; TRACE( "returning %s\n", debugstr_a( ret )); } free( text ); @@ -923,7 +910,7 @@ static HANDLE import_text_html( Atom type, const void *data, size_t size ) * * Import text/uri-list. */ -static HANDLE import_text_uri_list( Atom type, const void *data, size_t size ) +static void *import_text_uri_list( Atom type, const void *data, size_t size, size_t *ret_size ) { const char *uriList = data; char *uri; @@ -980,7 +967,8 @@ static HANDLE import_text_uri_list( Atom type, const void *data, size_t size ) } if (out && end >= size) { - if ((dropFiles = GlobalAlloc( GMEM_FIXED, sizeof(DROPFILES) + (total + 1) * sizeof(WCHAR) ))) + *ret_size = sizeof(DROPFILES) + (total + 1) * sizeof(WCHAR); + if ((dropFiles = malloc( *ret_size ))) { dropFiles->pFiles = sizeof(DROPFILES); dropFiles->pt.x = 0; @@ -1001,7 +989,7 @@ static HANDLE import_text_uri_list( Atom type, const void *data, size_t size ) * * Import TARGETS and mark the corresponding clipboard formats as available. */ -static HANDLE import_targets( Atom type, const void *data, size_t size ) +static void *import_targets( Atom type, const void *data, size_t size, size_t *ret_size ) { UINT i, pos, count = size / sizeof(Atom); const Atom *properties = data; @@ -1022,9 +1010,12 @@ static HANDLE import_targets( Atom type, const void *data, size_t size ) if (i == count) continue; if (format->import && format->id) { + struct set_clipboard_params params = { .data = NULL }; + TRACE( "property %s -> format %s\n", debugstr_xatom( properties[i] ), debugstr_format( format->id )); - SetClipboardData( format->id, 0 ); + + NtUserSetClipboardData( format->id, 0, &params ); formats[pos++] = format; } else TRACE( "property %s (ignoring)\n", debugstr_xatom( properties[i] )); @@ -1033,7 +1024,8 @@ static HANDLE import_targets( Atom type, const void *data, size_t size ) free( current_x11_formats ); current_x11_formats = formats; nb_current_x11_formats = pos; - return (HANDLE)1; + *ret_size = 0; + return (void *)1; } @@ -1042,11 +1034,14 @@ static HANDLE import_targets( Atom type, const void *data, size_t size ) * * Generic import clipboard data routine. */ -static HANDLE import_data( Atom type, const void *data, size_t size ) +static void *import_data( Atom type, const void *data, size_t size, size_t *ret_size ) { - void *ret = GlobalAlloc( GMEM_FIXED, size ); - - if (ret) memcpy( ret, data, size ); + void *ret = malloc( size ); + if (ret) + { + memcpy( ret, data, size ); + *ret_size = size; + } return ret; } @@ -1056,11 +1051,11 @@ static HANDLE import_data( Atom type, const void *data, size_t size ) * * Import the specified format from the selection and return a global handle to the data. */ -static HANDLE import_selection( Display *display, Window win, Atom selection, - struct clipboard_format *format ) +static void *import_selection( Display *display, Window win, Atom selection, + struct clipboard_format *format, size_t *ret_size ) { unsigned char *data; - unsigned long size; + size_t size; Atom type; HANDLE ret; @@ -1071,7 +1066,7 @@ static HANDLE import_selection( Display *display, Window win, Atom selection, TRACE( "failed to convert selection\n" ); return 0; } - ret = format->import( type, data, size ); + ret = format->import( type, data, size, ret_size ); free( data ); return ret; } @@ -1088,6 +1083,8 @@ void X11DRV_CLIPBOARD_ImportSelection( Display *display, Window win, Atom select { UINT i; HANDLE handle; + void *data; + size_t size; struct clipboard_format *format; register_x11_formats( targets, count ); @@ -1096,8 +1093,17 @@ void X11DRV_CLIPBOARD_ImportSelection( Display *display, Window win, Atom select { if (!(format = find_x11_format( targets[i] ))) continue; if (!format->id) continue; - if (!(handle = import_selection( display, win, selection, format ))) continue; - callback( format->id, handle ); + if (!(data = import_selection( display, win, selection, format, &size ))) continue; + + if ((handle = GlobalAlloc( GMEM_FIXED, size ))) + { + void *ptr; + ptr = GlobalLock( handle ); + memcpy( ptr, data, size ); + GlobalUnlock( handle ); + callback( format->id, handle ); + } + free( data ); } } @@ -1105,23 +1111,25 @@ void X11DRV_CLIPBOARD_ImportSelection( Display *display, Window win, Atom select /************************************************************************** * render_format */ -static HANDLE render_format( UINT id ) +static BOOL render_format( UINT id ) { Display *display = thread_display(); unsigned int i; - HANDLE handle = 0; if (!current_selection) return 0; for (i = 0; i < nb_current_x11_formats; i++) { + struct set_clipboard_params params; if (current_x11_formats[i]->id != id) continue; - if (!(handle = import_selection( display, import_window, - current_selection, current_x11_formats[i] ))) continue; - SetClipboardData( id, handle ); - break; + if (!(params.data = import_selection( display, import_window, current_selection, + current_x11_formats[i], &params.size ))) continue; + params.seqno = 0; + NtUserSetClipboardData( id, 0, &params ); + if (params.size) free( params.data ); + return TRUE; } - return handle; + return FALSE; } @@ -1615,7 +1623,7 @@ static BOOL export_timestamp( Display *display, Window win, Atom prop, Atom targ * Gets type, data and size. */ static BOOL X11DRV_CLIPBOARD_GetProperty(Display *display, Window w, Atom prop, - Atom *atype, unsigned char** data, unsigned long* datasize) + Atom *atype, unsigned char **data, size_t *datasize) { int aformat; unsigned long pos = 0, nitems, remain, count; @@ -1652,7 +1660,7 @@ static BOOL X11DRV_CLIPBOARD_GetProperty(Display *display, Window w, Atom prop, pos += count / sizeof(int); } - TRACE( "got property %s type %s format %u len %lu from window %lx\n", + TRACE( "got property %s type %s format %u len %zu from window %lx\n", debugstr_xatom( prop ), debugstr_xatom( *atype ), aformat, *datasize, w ); /* Delete the property on the window now that we are done @@ -1674,7 +1682,7 @@ struct clipboard_data_packet { * Reads the contents of the X selection property. */ static BOOL read_property( Display *display, Window w, Atom prop, - Atom *type, unsigned char **data, unsigned long *datasize ) + Atom *type, unsigned char **data, size_t *datasize ) { XEvent xe; @@ -1704,7 +1712,7 @@ static BOOL read_property( Display *display, Window w, Atom prop, { int i; unsigned char *prop_data; - unsigned long prop_size; + size_t prop_size; /* Wait until PropertyNotify is received */ for (i = 0; i < SELECTION_RETRIES; i++) @@ -1830,7 +1838,7 @@ static BOOL request_selection_contents( Display *display, BOOL changed ) struct clipboard_format *format = NULL; Window owner = 0; unsigned char *data = NULL; - unsigned long size = 0; + size_t import_size, size = 0; Atom type = 0; static Atom last_selection; @@ -1883,7 +1891,7 @@ static BOOL request_selection_contents( Display *display, BOOL changed ) is_clipboard_owner = TRUE; rendered_formats = 0; - if (format) format->import( type, data, size ); + if (format) format->import( type, data, size, &import_size ); free( last_data ); last_selection = current_selection; -- 2.25.1

1 0

[PATCH 1/2] programs/wineconsole: use wmain as entry point
by Eric Pouech 27 Apr '22

27 Apr '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/wineconsole/Makefile.in | 3 - programs/wineconsole/wineconsole.c | 95 ++++++++++++++++++++++++++++++++++-- 2 files changed, 91 insertions(+), 7 deletions(-) diff --git a/programs/wineconsole/Makefile.in b/programs/wineconsole/Makefile.in index b859ef8a27a..08ad51d2b6a 100644 --- a/programs/wineconsole/Makefile.in +++ b/programs/wineconsole/Makefile.in @@ -1,6 +1,5 @@ MODULE = wineconsole.exe -IMPORTS = advapi32 -DELAYIMPORTS = comctl32 user32 gdi32 +DELAYIMPORTS = user32 EXTRADLLFLAGS = -mwindows -municode diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 1924bf791e6..c703127c238 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -32,14 +32,101 @@ WINE_DEFAULT_DEBUG_CHANNEL(console); -int WINAPI wWinMain( HINSTANCE inst, HINSTANCE prev, WCHAR *cmdline, INT show ) +static const unsigned int EC_INTERNAL = 255; /* value of exit_code for internal errors */ + +/*********************************************************************** + * build_command_line + * + * Build the command line of a process from the argv array. + * (copied from dlls/ntdll/unix/env.c) + * + * We must quote and escape characters so that the argv array can be rebuilt + * from the command line: + * - spaces and tabs must be quoted + * 'a b' -> '"a b"' + * - quotes must be escaped + * '"' -> '\"' + * - if '\'s are followed by a '"', they must be doubled and followed by '\"', + * resulting in an odd number of '\' followed by a '"' + * '\"' -> '\\\"' + * '\\"' -> '\\\\\"' + * - '\'s are followed by the closing '"' must be doubled, + * resulting in an even number of '\' followed by a '"' + * ' \' -> '" \\"' + * ' \\' -> '" \\\\"' + * - '\'s that are not followed by a '"' can be left as is + * 'a\b' == 'a\b' + * 'a\\b' == 'a\\b' + */ +static WCHAR *build_command_line( WCHAR **wargv ) +{ + int len; + WCHAR **arg, *ret; + LPWSTR p; + + len = 1; + for (arg = wargv; *arg; arg++) len += 3 + 2 * wcslen( *arg ); + if (!(ret = malloc( len * sizeof(WCHAR) ))) return NULL; + + p = ret; + for (arg = wargv; *arg; arg++) + { + BOOL has_space, has_quote; + int i, bcount; + WCHAR *a; + + /* check for quotes and spaces in this argument (first arg is always quoted) */ + has_space = (arg == wargv) || !**arg || wcschr( *arg, ' ' ) || wcschr( *arg, '\t' ); + has_quote = wcschr( *arg, '"' ) != NULL; + + /* now transfer it to the command line */ + if (has_space) *p++ = '"'; + if (has_quote || has_space) + { + bcount = 0; + for (a = *arg; *a; a++) + { + if (*a == '\\') bcount++; + else + { + if (*a == '"') /* double all the '\\' preceding this '"', plus one */ + for (i = 0; i <= bcount; i++) *p++ = '\\'; + bcount = 0; + } + *p++ = *a; + } + } + else + { + wcscpy( p, *arg ); + p += wcslen( p ); + } + if (has_space) + { + /* Double all the '\' preceding the closing quote */ + for (i = 0; i < bcount; i++) *p++ = '\\'; + *p++ = '"'; + } + *p++ = ' '; + } + if (p > ret) p--; /* remove last space */ + *p = 0; + if (p - ret >= 32767) + { + ERR( "command line too long (%Iu)\n", p - ret ); + exit( EC_INTERNAL ); + } + return ret; +} + +int wmain( int argc, WCHAR *argv[] ) { STARTUPINFOW startup = { sizeof(startup) }; PROCESS_INFORMATION info; - WCHAR *cmd = cmdline; + WCHAR *cmd; DWORD exit_code; - static WCHAR default_cmd[] = L"cmd"; + cmd = argc > 1 ? build_command_line( &argv[1] ) : wcsdup( L"cmd.exe" ); FreeConsole(); /* make sure we're not connected to inherited console */ if (!AllocConsole()) @@ -48,8 +135,6 @@ int WINAPI wWinMain( HINSTANCE inst, HINSTANCE prev, WCHAR *cmdline, INT show ) return 1; } - if (!*cmd) cmd = default_cmd; - startup.dwFlags = STARTF_USESTDHANDLES; startup.hStdInput = CreateFileW( L"CONIN$", GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0 );

1 1

crypt32: Remove obsolete -D_CRYPT32_ from Makefile.in
by Drew Ronneberg 27 Apr '22

27 Apr '22

1 0

[PATCH v2 1/3] dinput/tests: Enforce HID report descriptor buffer size.
by Rémi Bernon 27 Apr '22

27 Apr '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Remove unnecessary length checks in PATCH 3 instead of borking them. dlls/dinput/tests/driver_bus.c | 2 +- dlls/dinput/tests/driver_hid.h | 4 +++- dlls/dinput/tests/force_feedback.c | 11 +++++++---- dlls/dinput/tests/hid.c | 4 ++++ dlls/dinput/tests/hotplug.c | 1 + dlls/dinput/tests/joystick8.c | 21 ++++++++++++++++----- 6 files changed, 32 insertions(+), 11 deletions(-) diff --git a/dlls/dinput/tests/driver_bus.c b/dlls/dinput/tests/driver_bus.c index 45a984b6c36..9ece4414a1a 100644 --- a/dlls/dinput/tests/driver_bus.c +++ b/dlls/dinput/tests/driver_bus.c @@ -458,7 +458,7 @@ struct phys_device BOOL use_report_id; DWORD report_descriptor_len; - char report_descriptor_buf[1024]; + char report_descriptor_buf[MAX_HID_DESCRIPTOR_LEN]; HIDP_CAPS caps; HID_DEVICE_ATTRIBUTES attributes; diff --git a/dlls/dinput/tests/driver_hid.h b/dlls/dinput/tests/driver_hid.h index 1010499fc41..4711d391bfe 100644 --- a/dlls/dinput/tests/driver_hid.h +++ b/dlls/dinput/tests/driver_hid.h @@ -62,13 +62,15 @@ struct hid_expect }; /* create/remove device */ +#define MAX_HID_DESCRIPTOR_LEN 2048 + struct hid_device_desc { BOOL is_polled; BOOL use_report_id; DWORD report_descriptor_len; - char report_descriptor_buf[1024]; + char report_descriptor_buf[MAX_HID_DESCRIPTOR_LEN]; HIDP_CAPS caps; HID_DEVICE_ATTRIBUTES attributes; diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index d9dad38446c..f6525657450 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -1672,7 +1672,8 @@ static void test_condition_effect( IDirectInputDevice8W *device, HANDLE file, DW static BOOL test_force_feedback_joystick( DWORD version ) { #include "psh_hid_macros.h" - const unsigned char report_descriptor[] = { + const unsigned char report_descriptor[] = + { USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), USAGE(1, HID_USAGE_GENERIC_JOYSTICK), COLLECTION(1, Application), @@ -2005,7 +2006,7 @@ static BOOL test_force_feedback_joystick( DWORD version ) END_COLLECTION, END_COLLECTION, }; -#undef REPORT_ID_OR_USAGE_PAGE + C_ASSERT(sizeof(report_descriptor) < MAX_HID_DESCRIPTOR_LEN); #include "pop_hid_macros.h" struct hid_device_desc desc = @@ -3460,6 +3461,7 @@ static void test_device_managed_effect(void) END_COLLECTION, END_COLLECTION, }; + C_ASSERT(sizeof(report_descriptor) < MAX_HID_DESCRIPTOR_LEN); #include "pop_hid_macros.h" struct hid_device_desc desc = @@ -4576,7 +4578,8 @@ struct bool_async_handler default_bool_async_handler = {{&bool_async_handler_vtb static void test_windows_gaming_input(void) { #include "psh_hid_macros.h" - const unsigned char report_desc[] = { + const unsigned char report_desc[] = + { USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), USAGE(1, HID_USAGE_GENERIC_JOYSTICK), COLLECTION(1, Application), @@ -4997,7 +5000,7 @@ static void test_windows_gaming_input(void) END_COLLECTION, END_COLLECTION, }; -#undef REPORT_ID_OR_USAGE_PAGE + C_ASSERT(sizeof(report_desc) < MAX_HID_DESCRIPTOR_LEN); #include "pop_hid_macros.h" struct hid_device_desc desc = diff --git a/dlls/dinput/tests/hid.c b/dlls/dinput/tests/hid.c index 4e107625064..66019e766ad 100644 --- a/dlls/dinput/tests/hid.c +++ b/dlls/dinput/tests/hid.c @@ -2855,6 +2855,7 @@ static void test_hid_driver( DWORD report_id, DWORD polled ) END_COLLECTION, }; #undef REPORT_ID_OR_USAGE_PAGE + C_ASSERT(sizeof(report_desc) < MAX_HID_DESCRIPTOR_LEN); #include "pop_hid_macros.h" const HIDP_CAPS caps = @@ -3063,6 +3064,7 @@ static void test_hidp_kdr(void) END_COLLECTION, END_COLLECTION, }; + C_ASSERT(sizeof(report_desc) < MAX_HID_DESCRIPTOR_LEN); #include "pop_hid_macros.h" struct hid_device_desc desc = @@ -3572,6 +3574,7 @@ DWORD WINAPI dinput_test_device_thread( void *stop_event ) END_COLLECTION, END_COLLECTION, }; + C_ASSERT(sizeof(gamepad_desc) < MAX_HID_DESCRIPTOR_LEN); #include "pop_hid_macros.h" static const HID_DEVICE_ATTRIBUTES attributes = { @@ -3616,6 +3619,7 @@ static void test_bus_driver(void) INPUT(1, Data|Var|Abs), END_COLLECTION, }; + C_ASSERT(sizeof(report_desc) < MAX_HID_DESCRIPTOR_LEN); #include "pop_hid_macros.h" static const HID_DEVICE_ATTRIBUTES attributes = diff --git a/dlls/dinput/tests/hotplug.c b/dlls/dinput/tests/hotplug.c index 2d000317c9f..fca04c36ef5 100644 --- a/dlls/dinput/tests/hotplug.c +++ b/dlls/dinput/tests/hotplug.c @@ -133,6 +133,7 @@ static BOOL test_input_lost( DWORD version ) END_COLLECTION, END_COLLECTION, }; + C_ASSERT(sizeof(report_desc) < MAX_HID_DESCRIPTOR_LEN); #include "pop_hid_macros.h" struct hid_device_desc desc = diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 32d03a603c3..eeb8b90d0c8 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -396,7 +396,7 @@ static void test_simple_joystick( DWORD version ) END_COLLECTION, END_COLLECTION, }; -#undef REPORT_ID_OR_USAGE_PAGE + C_ASSERT(sizeof(report_desc) < MAX_HID_DESCRIPTOR_LEN); #include "pop_hid_macros.h" struct hid_device_desc desc = @@ -2110,6 +2110,7 @@ static BOOL test_device_types( DWORD version ) END_COLLECTION, END_COLLECTION, }; + C_ASSERT(sizeof(unknown_desc) < MAX_HID_DESCRIPTOR_LEN); static const unsigned char limited_desc[] = { USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), @@ -2140,6 +2141,7 @@ static BOOL test_device_types( DWORD version ) END_COLLECTION, END_COLLECTION, }; + C_ASSERT(sizeof(limited_desc) < MAX_HID_DESCRIPTOR_LEN); static const unsigned char gamepad_desc[] = { USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), @@ -2170,6 +2172,7 @@ static BOOL test_device_types( DWORD version ) END_COLLECTION, END_COLLECTION, }; + C_ASSERT(sizeof(gamepad_desc) < MAX_HID_DESCRIPTOR_LEN); static const unsigned char joystick_desc[] = { USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), @@ -2210,6 +2213,7 @@ static BOOL test_device_types( DWORD version ) END_COLLECTION, END_COLLECTION, }; + C_ASSERT(sizeof(joystick_desc) < MAX_HID_DESCRIPTOR_LEN); static const unsigned char wheel_steering_only_desc[] = { USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), @@ -2248,6 +2252,7 @@ static BOOL test_device_types( DWORD version ) END_COLLECTION, END_COLLECTION, }; + C_ASSERT(sizeof(wheel_steering_only_desc) < MAX_HID_DESCRIPTOR_LEN); static const unsigned char wheel_dualpedals_desc[] = { USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), @@ -2289,6 +2294,7 @@ static BOOL test_device_types( DWORD version ) END_COLLECTION, END_COLLECTION, }; + C_ASSERT(sizeof(wheel_dualpedals_desc) < MAX_HID_DESCRIPTOR_LEN); static const unsigned char wheel_threepedals_desc[] = { USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), @@ -2331,6 +2337,7 @@ static BOOL test_device_types( DWORD version ) END_COLLECTION, END_COLLECTION, }; + C_ASSERT(sizeof(wheel_threepedals_desc) < MAX_HID_DESCRIPTOR_LEN); #include "pop_hid_macros.h" static struct device_desc device_desc[] = @@ -2690,7 +2697,7 @@ static void test_many_axes_joystick(void) END_COLLECTION, END_COLLECTION, }; -#undef REPORT_ID_OR_USAGE_PAGE + C_ASSERT(sizeof(report_desc) < MAX_HID_DESCRIPTOR_LEN); #include "pop_hid_macros.h" struct hid_device_desc desc = @@ -3221,7 +3228,7 @@ static void test_driving_wheel_axes(void) END_COLLECTION, END_COLLECTION, }; -#undef REPORT_ID_OR_USAGE_PAGE + C_ASSERT(sizeof(report_desc) < MAX_HID_DESCRIPTOR_LEN); #include "pop_hid_macros.h" struct hid_device_desc desc = @@ -3415,7 +3422,8 @@ done: static BOOL test_winmm_joystick(void) { #include "psh_hid_macros.h" - const unsigned char report_desc[] = { + const unsigned char report_desc[] = + { USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), USAGE(1, HID_USAGE_GENERIC_JOYSTICK), COLLECTION(1, Application), @@ -3461,6 +3469,7 @@ static BOOL test_winmm_joystick(void) END_COLLECTION, END_COLLECTION, }; + C_ASSERT(sizeof(report_desc) < MAX_HID_DESCRIPTOR_LEN); #include "pop_hid_macros.h" struct hid_device_desc desc = @@ -3864,7 +3873,8 @@ static struct controller_handler controller_added = {{&controller_handler_vtbl}} static void test_windows_gaming_input(void) { #include "psh_hid_macros.h" - const unsigned char report_desc[] = { + const unsigned char report_desc[] = + { USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), USAGE(1, HID_USAGE_GENERIC_GAMEPAD), COLLECTION(1, Application), @@ -3906,6 +3916,7 @@ static void test_windows_gaming_input(void) END_COLLECTION, END_COLLECTION, }; + C_ASSERT(sizeof(report_desc) < MAX_HID_DESCRIPTOR_LEN); #include "pop_hid_macros.h" struct hid_device_desc desc = -- 2.35.1

2 6

[v3 PATCH] mfplay: Prevent usage of uninitialized pointer in error case (Coverity)
by Nikolay Sivov 27 Apr '22

27 Apr '22

From: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v3: make sure pointers are zeroed for every stream. dlls/mfplay/player.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 7d9a4da8649..c500717b8d0 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1378,7 +1378,6 @@ static HRESULT media_item_create_sink_node(IUnknown *sink, IMFTopologyNode **nod static HRESULT media_item_create_topology(struct media_player *player, struct media_item *item, IMFTopology **out) { - IMFTopologyNode *src_node, *sink_node; BOOL selected, video_added = FALSE; IMFStreamDescriptor *sd; IMFTopology *topology; @@ -1421,6 +1420,8 @@ static HRESULT media_item_create_topology(struct media_player *player, struct me if (sink) { + IMFTopologyNode *src_node = NULL, *sink_node = NULL; + hr = media_item_create_source_node(item, sd, &src_node); if (SUCCEEDED(hr)) hr = media_item_create_sink_node(sink, &sink_node); -- 2.35.1

1 0

[PATCH] comctl32: Remove obsolete -D_COMCTL32_ from Makefile.in
by Drew Ronneberg 27 Apr '22

27 Apr '22

1 0

[PATCH 1/2] dwrite/opentype: Use stdint type for color font structures.
by Nikolay Sivov 27 Apr '22

27 Apr '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/opentype.c | 110 +++++++++++++++++++++++------------------ 1 file changed, 61 insertions(+), 49 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 195607aa67f..9aeef88c92c 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -243,25 +243,25 @@ struct tt_hhea struct sbix_header { - WORD version; - WORD flags; - DWORD num_strikes; - DWORD strike_offset[1]; + uint16_t version; + uint16_t flags; + uint32_t num_strikes; + uint32_t strike_offset[1]; }; struct sbix_strike { - WORD ppem; - WORD ppi; - DWORD glyphdata_offsets[1]; + uint16_t ppem; + uint16_t ppi; + uint32_t glyphdata_offsets[1]; }; struct sbix_glyph_data { - WORD originOffsetX; - WORD originOffsetY; - DWORD graphic_type; - BYTE data[1]; + int16_t originOffsetX; + int16_t originOffsetY; + uint32_t graphic_type; + uint8_t data[1]; }; struct maxp @@ -272,29 +272,41 @@ struct maxp struct cblc_header { - WORD major_version; - WORD minor_version; - DWORD num_sizes; + uint16_t major_version; + uint16_t minor_version; + uint32_t num_sizes; }; -typedef struct { - BYTE res[12]; -} sbitLineMetrics; +struct sbit_line_metrics +{ + int8_t ascender; + int8_t descender; + uint8_t widthMax; + int8_t caretSlopeNumerator; + int8_t caretSlopeDenominator; + int8_t caretOffset; + int8_t minOriginSB; + int8_t minAdvanceSB; + int8_t maxBeforeBL; + int8_t minAfterBL; + int8_t pad1; + int8_t pad2; +}; struct cblc_bitmapsize_table { - DWORD indexSubTableArrayOffset; - DWORD indexTablesSize; - DWORD numberofIndexSubTables; - DWORD colorRef; - sbitLineMetrics hori; - sbitLineMetrics vert; - WORD startGlyphIndex; - WORD endGlyphIndex; - BYTE ppemX; - BYTE ppemY; - BYTE bit_depth; - BYTE flags; + uint32_t indexSubTableArrayOffset; + uint32_t indexTablesSize; + uint32_t numberofIndexSubTables; + uint32_t colorRef; + struct sbit_line_metrics hori; + struct sbit_line_metrics vert; + uint16_t startGlyphIndex; + uint16_t endGlyphIndex; + uint8_t ppemX; + uint8_t ppemY; + uint8_t bit_depth; + int8_t flags; }; struct gasp_range @@ -1204,43 +1216,43 @@ static const UINT16 dwriteid_to_opentypeid[DWRITE_INFORMATIONAL_STRING_WEIGHT_ST /* CPAL table */ struct cpal_header_0 { - USHORT version; - USHORT num_palette_entries; - USHORT num_palettes; - USHORT num_color_records; - ULONG offset_first_color_record; - USHORT color_record_indices[1]; + uint16_t version; + uint16_t num_palette_entries; + uint16_t num_palettes; + uint16_t num_color_records; + uint32_t offset_first_color_record; + uint16_t color_record_indices[1]; }; struct cpal_color_record { - BYTE blue; - BYTE green; - BYTE red; - BYTE alpha; + uint8_t blue; + uint8_t green; + uint8_t red; + uint8_t alpha; }; /* COLR table */ struct colr_header { - USHORT version; - USHORT num_baseglyph_records; - ULONG offset_baseglyph_records; - ULONG offset_layer_records; - USHORT num_layer_records; + uint16_t version; + uint16_t num_baseglyph_records; + uint32_t offset_baseglyph_records; + uint32_t offset_layer_records; + uint16_t num_layer_records; }; struct colr_baseglyph_record { - USHORT glyph; - USHORT first_layer_index; - USHORT num_layers; + uint16_t glyph; + uint16_t first_layer_index; + uint16_t num_layers; }; struct colr_layer_record { - USHORT glyph; - USHORT palette_index; + uint16_t glyph; + uint16_t palette_index; }; struct meta_data_map -- 2.35.1

1 1

[PATCH] nls: Hardcode minus sign for all locales.
by Nikolay Sivov 27 Apr '22

27 Apr '22

CLDR data for RTL locales includes LRM marker for minus sign text, in addition to that some locales are using different dash character. Windows seems to consistently use same character for all locales. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52866 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- nls/locale.nls | Bin 730526 -> 730506 bytes tools/make_unicode | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/nls/locale.nls b/nls/locale.nls index 329224c92fcb6083b9001a2de24b206a81bba163..af2f061944a8a78578c1248acb48ac8b2fb4dc69 100644 GIT binary patch delta 207424 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%0D&n>UkW#7WH57OH;Ucti$=qHBy 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 delta 208024 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 J&S%Rf{y*7n{x<*s diff --git a/tools/make_unicode b/tools/make_unicode index 29dea8cd52e..40b64ddca71 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -4716,7 +4716,7 @@ sub build_locale_data() $sthousand =~ s/\x{202f}/\x{00a0}/; my $smonthousandsep = loc_query( $loc, "/ldml/numbers/symbols[\@numberSystem='latn']/currencyGroup" ) || $sthousand; my $spositivesign = ""; - my $snegativesign = loc_query( $loc, "/ldml/numbers/symbols[\@numberSystem='latn']/minusSign" ); + my $snegativesign = "-"; my $spercent = loc_query( $loc, "/ldml/numbers/symbols[\@numberSystem='latn']/percentSign" ); my $snan = loc_query( $loc, "/ldml/numbers/symbols[\@numberSystem='latn']/nan" ); my $sposinfinity = loc_query( $loc, "/ldml/numbers/symbols[\@numberSystem='latn']/infinity" ); -- 2.35.1

1 0

[PATCH 6/6] winex11: Use format_entry to store cached XDND formats data.
by Jacek Caban 27 Apr '22

27 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/xdnd.c | 107 ++++++++++++---------------------------- 1 file changed, 32 insertions(+), 75 deletions(-)

1 0

[PATCH 5/6] winex11: Move CF_HDROP filtering to import_xdnd_selection.
by Jacek Caban 27 Apr '22

27 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/clipboard.c | 11 +++++++++++ dlls/winex11.drv/xdnd.c | 26 -------------------------- 2 files changed, 11 insertions(+), 26 deletions(-)

1 0

[PATCH 4/6] winex11: Return selection data as a single buffer from import_xdnd_selection.
by Jacek Caban 27 Apr '22

27 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- The plan for xdnd.c is to remain in PE part of the driver. This patch prepares selection data to be conveniently passed across syscall boundary. dlls/winex11.drv/clipboard.c | 29 +++++++++++++++++------------ dlls/winex11.drv/x11drv.h | 14 +++++++++++--- dlls/winex11.drv/xdnd.c | 26 ++++++++++++++++++++++++-- 3 files changed, 52 insertions(+), 17 deletions(-)

1 0

[PATCH 3/6] winex11: Directly use ntdll in clipboard.c.
by Jacek Caban 27 Apr '22

27 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/clipboard.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-)

1 0

[PATCH 2/6] winex11: Directly use win32u in import_image_bmp.
by Jacek Caban 27 Apr '22

27 Apr '22

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

1 0

[PATCH 0/5] MR5: windows.media.speech: Backport tweaks from windows.gaming.input async.
by Rémi Bernon (＠rbernon) 27 Apr '22

27 Apr '22

Some being more cosmetic than others. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/5

3 9

[PATCH v4] chakra: Add stub dll.
by Mohamad Al-Jaf 27 Apr '22

27 Apr '22

Needed by Minecraft. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52741 Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v4: - Rebase. - Add DllGetClassObject stub. Reasons to include this in Wine: 1) It fixes the wine-bug and allows Minecraft to run, an extremely popular game. 2) No functions are called, just the stub is enough. 3) The function implementations and prototypes are both publicly available under an MIT license. 4) Microsoft Edge initially used chakra but has since switched to the Chromium engine. Because of this, it's highly unlikely that this dll will require implementing. 5) This dll is present on most Windows installations including Windows 10 and 11. 6) This will become a legacy dll in a few years needed at least by (at that time) older Minecraft versions. Wine has a reputation for having superior backwards compatibility than Windows. This is inline with that. --- configure.ac | 1 + dlls/chakra/Makefile.in | 9 +++ dlls/chakra/chakra.spec | 160 ++++++++++++++++++++++++++++++++++++++++ dlls/chakra/main.c | 34 +++++++++ dlls/chakra/version.rc | 26 +++++++ 5 files changed, 230 insertions(+) create mode 100644 dlls/chakra/Makefile.in create mode 100644 dlls/chakra/chakra.spec create mode 100644 dlls/chakra/main.c create mode 100644 dlls/chakra/version.rc diff --git a/configure.ac b/configure.ac index 74c80fd7fa8..06b0a8dbbf7 100644 --- a/configure.ac +++ b/configure.ac @@ -2372,6 +2372,7 @@ WINE_CONFIG_MAKEFILE(dlls/capi2032) WINE_CONFIG_MAKEFILE(dlls/cards) WINE_CONFIG_MAKEFILE(dlls/cdosys) WINE_CONFIG_MAKEFILE(dlls/cfgmgr32) +WINE_CONFIG_MAKEFILE(dlls/chakra) WINE_CONFIG_MAKEFILE(dlls/clusapi) WINE_CONFIG_MAKEFILE(dlls/cng.sys) WINE_CONFIG_MAKEFILE(dlls/combase) diff --git a/dlls/chakra/Makefile.in b/dlls/chakra/Makefile.in new file mode 100644 index 00000000000..dff2303a7bc --- /dev/null +++ b/dlls/chakra/Makefile.in @@ -0,0 +1,9 @@ +MODULE = chakra.dll + +EXTRADLLFLAGS = -Wb,--prefer-native + +C_SRCS = \ + main.c + +RC_SRCS = \ + version.rc diff --git a/dlls/chakra/chakra.spec b/dlls/chakra/chakra.spec new file mode 100644 index 00000000000..8064d38ac17 --- /dev/null +++ b/dlls/chakra/chakra.spec @@ -0,0 +1,160 @@ +@ stub JsProjectWinRTNamespace +@ stub JsSetProjectionEnqueueCallback +@ stub CreateChakraEngine +@ stub DumpDiagInfo +@ stub JsDiscardBackgroundParse +@ stub JsInitializeJITServer +@ stub JsQueueBackgroundParse +@ stub MemProtectHeapAddRootSection +@ stub MemProtectHeapCollect +@ stub MemProtectHeapCreate +@ stub MemProtectHeapDestroy +@ stub MemProtectHeapDisableCollection +@ stub MemProtectHeapIsValidObject +@ stub MemProtectHeapMemSize +@ stub MemProtectHeapNotifyCurrentThreadDetach +@ stub MemProtectHeapProtectCurrentThread +@ stub MemProtectHeapRemoveRootSection +@ stub MemProtectHeapReportHeapSize +@ stub MemProtectHeapRootAlloc +@ stub MemProtectHeapRootAllocLeaf +@ stub MemProtectHeapRootRealloc +@ stub MemProtectHeapRootReallocLeaf +@ stub MemProtectHeapSynchronizeWithCollector +@ stub MemProtectHeapUnprotectCurrentThread +@ stub MemProtectHeapUnrootAndZero +@ stub RecyclerNativeHeapAddExternalMemoryUsage +@ stub RecyclerNativeHeapAllocLeaf +@ stub RecyclerNativeHeapAllocLeafFinalized +@ stub RecyclerNativeHeapAllocTraced +@ stub RecyclerNativeHeapAllocTracedFinalized +@ stub RecyclerNativeHeapCollectGarbageInThread +@ stub RecyclerNativeHeapCreateWeakReference +@ stub RecyclerNativeHeapGetRealAddressFromInterior +@ stub RecyclerNativeHeapGetStrongReference +@ stub RecyclerNativeHeapHasWeakReferenceCleanupOccurred +@ stub RecyclerNativeHeapRootAddRef +@ stub RecyclerNativeHeapRootRelease +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() +@ stub JsAddRef +@ stub JsBoolToBoolean +@ stub JsBooleanToBool +@ stub JsCallFunction +@ stub JsCollectGarbage +@ stub JsConstructObject +@ stub JsConvertValueToBoolean +@ stub JsConvertValueToNumber +@ stub JsConvertValueToObject +@ stub JsConvertValueToString +@ stub JsCreateArray +@ stub JsCreateArrayBuffer +@ stub JsCreateContext +@ stub JsCreateDataView +@ stub JsCreateError +@ stub JsCreateExternalArrayBuffer +@ stub JsCreateExternalObject +@ stub JsCreateFunction +@ stub JsCreateNamedFunction +@ stub JsCreateObject +@ stub JsCreateRangeError +@ stub JsCreateReferenceError +@ stub JsCreateRuntime +@ stub JsCreateSymbol +@ stub JsCreateSyntaxError +@ stub JsCreateThreadService +@ stub JsCreateTypeError +@ stub JsCreateTypedArray +@ stub JsCreateURIError +@ stub JsDefineProperty +@ stub JsDeleteIndexedProperty +@ stub JsDeleteProperty +@ stub JsDisableRuntimeExecution +@ stub JsDisposeRuntime +@ stub JsDoubleToNumber +@ stub JsEnableRuntimeExecution +@ stub JsEnumerateHeap +@ stub JsEquals +@ stub JsGetAndClearException +@ stub JsGetArrayBufferStorage +@ stub JsGetContextData +@ stub JsGetContextOfObject +@ stub JsGetCurrentContext +@ stub JsGetDataViewStorage +@ stub JsGetExtensionAllowed +@ stub JsGetExternalData +@ stub JsGetFalseValue +@ stub JsGetGlobalObject +@ stub JsGetIndexedPropertiesExternalData +@ stub JsGetIndexedProperty +@ stub JsGetNullValue +@ stub JsGetOwnPropertyDescriptor +@ stub JsGetOwnPropertyNames +@ stub JsGetOwnPropertySymbols +@ stub JsGetProperty +@ stub JsGetPropertyIdFromName +@ stub JsGetPropertyIdFromSymbol +@ stub JsGetPropertyIdType +@ stub JsGetPropertyNameFromId +@ stub JsGetPrototype +@ stub JsGetRuntime +@ stub JsGetRuntimeMemoryLimit +@ stub JsGetRuntimeMemoryUsage +@ stub JsGetStringLength +@ stub JsGetSymbolFromPropertyId +@ stub JsGetTrueValue +@ stub JsGetTypedArrayInfo +@ stub JsGetTypedArrayStorage +@ stub JsGetUndefinedValue +@ stub JsGetValueType +@ stub JsHasException +@ stub JsHasExternalData +@ stub JsHasIndexedPropertiesExternalData +@ stub JsHasIndexedProperty +@ stub JsHasProperty +@ stub JsIdle +@ stub JsInspectableToObject +@ stub JsInstanceOf +@ stub JsIntToNumber +@ stub JsIsEnumeratingHeap +@ stub JsIsRuntimeExecutionDisabled +@ stub JsNumberToDouble +@ stub JsNumberToInt +@ stub JsObjectToInspectable +@ stub JsParseScript +@ stub JsParseScriptWithAttributes +@ stub JsParseSerializedScript +@ stub JsParseSerializedScriptWithCallback +@ stub JsPointerToString +@ stub JsPreventExtension +@ stub JsRelease +@ stub JsRunScript +@ stub JsRunSerializedScript +@ stub JsRunSerializedScriptWithCallback +@ stub JsSerializeScript +@ stub JsSetContextData +@ stub JsSetCurrentContext +@ stub JsSetException +@ stub JsSetExternalData +@ stub JsSetIndexedPropertiesToExternalData +@ stub JsSetIndexedProperty +@ stub JsSetObjectBeforeCollectCallback +@ stub JsSetPromiseContinuationCallback +@ stub JsSetProperty +@ stub JsSetPrototype +@ stub JsSetRuntimeBeforeCollectCallback +@ stub JsSetRuntimeMemoryAllocationCallback +@ stub JsSetRuntimeMemoryLimit +@ stub JsStartDebugging +@ stub JsStartProfiling +@ stub JsStopProfiling +@ stub JsStrictEquals +@ stub JsStringToPointer +@ stub JsValueToVariant +@ stub JsVarAddRef +@ stub JsVarRelease +@ stub JsVarToExtension +@ stub JsVarToScriptDirect +@ stub JsVariantToValue diff --git a/dlls/chakra/main.c b/dlls/chakra/main.c new file mode 100644 index 00000000000..9f9d5519fd2 --- /dev/null +++ b/dlls/chakra/main.c @@ -0,0 +1,34 @@ +/* + * Chakra JavaScript Engine + * + * Copyright (C) 2022 Mohamad Al-Jaf + * + * 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 + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(chakra); + +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, void **out) +{ + FIXME("(%s, %s, %p) - stub\n", debugstr_guid(clsid), debugstr_guid(riid), out); + return CLASS_E_CLASSNOTAVAILABLE; +} diff --git a/dlls/chakra/version.rc b/dlls/chakra/version.rc new file mode 100644 index 00000000000..a73bf2bc5ad --- /dev/null +++ b/dlls/chakra/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2022 Mohamad Al-Jaf + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine chakra" +#define WINE_FILENAME_STR "chakra.dll" +#define WINE_FILEVERSION 11,0,22000,348 +#define WINE_FILEVERSION_STR "11.0.22000.348" +#define WINE_PRODUCTVERSION 11,00,22000,348 +#define WINE_PRODUCTVERSION_STR "11.00.22000.348" + +#include "wine/wine_common_ver.rc" -- 2.36.0

1 0

[PATCH 1/5] d3dx9/tests: Test D3DXAssembleShader() with both terminated and not terminated include data.
by Matteo Bruni 27 Apr '22

27 Apr '22

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx9_36/tests/asm.c | 171 ++++++++++++++++++++++---------------- 1 file changed, 98 insertions(+), 73 deletions(-) diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c index bfc84b2f9c2..3faebb4d69f 100644 --- a/dlls/d3dx9_36/tests/asm.c +++ b/dlls/d3dx9_36/tests/asm.c @@ -81,31 +81,46 @@ static void delete_directory(const char *name) RemoveDirectoryA(path); } +struct test_include +{ + ID3DXInclude ID3DXInclude_iface; + BOOL terminated_data; +}; + +static inline struct test_include *impl_from_ID3DXInclude(ID3DXInclude *iface) +{ + return CONTAINING_RECORD(iface, struct test_include, ID3DXInclude_iface); +} + static HRESULT WINAPI testD3DXInclude_open(ID3DXInclude *iface, D3DXINCLUDE_TYPE include_type, const char *filename, const void *parent_data, const void **data, UINT *bytes) { - char *buffer; static const char shader[] = "#include \"incl.vsh\"\n" "mov REGISTER, v0\n"; static const char include[] = "#define REGISTER r0\nvs.1.1\n"; static const char include2[] = "#include \"incl3.vsh\"\n"; static const char include3[] = "vs.1.1\n"; + struct test_include *test_include = impl_from_ID3DXInclude(iface); + unsigned int size; + char *buffer; trace("filename %s.\n", filename); trace("parent_data %p: %s.\n", parent_data, parent_data ? (char *)parent_data : "(null)"); if (!strcmp(filename, "shader.vsh")) { - buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(shader)); - memcpy(buffer, shader, sizeof(shader)); - *bytes = sizeof(shader); + size = test_include->terminated_data ? sizeof(shader) : sizeof(shader) - 1; + buffer = HeapAlloc(GetProcessHeap(), 0, size); + memcpy(buffer, shader, size); + *bytes = size; } else if (!strcmp(filename, "incl.vsh")) { - buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(include)); - memcpy(buffer, include, sizeof(include)); - *bytes = sizeof(include); + size = test_include->terminated_data ? sizeof(include) : sizeof(include) - 1; + buffer = HeapAlloc(GetProcessHeap(), 0, size); + memcpy(buffer, include, size); + *bytes = size; /* This is included from the first D3DXAssembleShader with non-null ID3DXInclude test * (parent_data == NULL) and from shader.vsh / shader[] (with matching parent_data). * Allow both cases. */ @@ -113,24 +128,27 @@ static HRESULT WINAPI testD3DXInclude_open(ID3DXInclude *iface, D3DXINCLUDE_TYPE } else if (!strcmp(filename, "incl2.vsh")) { - buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(include2)); - memcpy(buffer, include2, sizeof(include2)); - *bytes = sizeof(include2); + size = test_include->terminated_data ? sizeof(include2) : sizeof(include2) - 1; + buffer = HeapAlloc(GetProcessHeap(), 0, size); + memcpy(buffer, include2, size); + *bytes = size; } else if (!strcmp(filename, "incl3.vsh")) { - buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(include3)); - memcpy(buffer, include3, sizeof(include3)); - *bytes = sizeof(include3); + size = test_include->terminated_data ? sizeof(include3) : sizeof(include3) - 1; + buffer = HeapAlloc(GetProcessHeap(), 0, size); + memcpy(buffer, include3, size); + *bytes = size; /* Also check for the correct parent_data content */ - ok(parent_data != NULL && !strncmp(include2, parent_data, strlen(include2)), "wrong parent_data value\n"); + ok(parent_data != NULL && !strncmp(include2, parent_data, strlen(include2)), "wrong parent_data value.\n"); } else if (!strcmp(filename, "include/incl3.vsh")) { - buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(include)); - memcpy(buffer, include, sizeof(include)); - *bytes = sizeof(include); - ok(!parent_data, "wrong parent_data value\n"); + size = test_include->terminated_data ? sizeof(include) : sizeof(include) - 1; + buffer = HeapAlloc(GetProcessHeap(), 0, size); + memcpy(buffer, include, size); + *bytes = size; + ok(!parent_data, "wrong parent_data value.\n"); } else { @@ -147,15 +165,12 @@ static HRESULT WINAPI testD3DXInclude_close(ID3DXInclude *iface, const void *dat return S_OK; } -static const struct ID3DXIncludeVtbl D3DXInclude_Vtbl = { +static const struct ID3DXIncludeVtbl test_include_vtbl = +{ testD3DXInclude_open, testD3DXInclude_close }; -struct D3DXIncludeImpl { - ID3DXInclude ID3DXInclude_iface; -}; - static void assembleshader_test(void) { static const char test1[] = @@ -180,8 +195,6 @@ static void assembleshader_test(void) "vs.1.1\n"; static const char testincl4_wrong[] = "#error \"wrong include\"\n"; - HRESULT hr; - ID3DXBuffer *shader, *messages; static const D3DXMACRO defines[] = { { "DEF1", "10 + 15" @@ -193,8 +206,11 @@ static void assembleshader_test(void) NULL, NULL } }; - struct D3DXIncludeImpl include; char shader_vsh_path[MAX_PATH], shader3_vsh_path[MAX_PATH]; + ID3DXBuffer *shader, *messages; + struct test_include include; + unsigned int i; + HRESULT hr; /* pDefines test */ shader = NULL; @@ -229,56 +245,65 @@ static void assembleshader_test(void) } /* pInclude test */ - shader = NULL; - messages = NULL; - include.ID3DXInclude_iface.lpVtbl = &D3DXInclude_Vtbl; - hr = D3DXAssembleShader(testshader, strlen(testshader), NULL, &include.ID3DXInclude_iface, - D3DXSHADER_SKIPVALIDATION, &shader, &messages); - ok(hr == D3D_OK, "pInclude test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); - if(messages) { - trace("D3DXAssembleShader messages:\n%s", (char *)ID3DXBuffer_GetBufferPointer(messages)); - ID3DXBuffer_Release(messages); - } - if(shader) ID3DXBuffer_Release(shader); + for (i = 0; i < 2; ++i) + { + shader = NULL; + messages = NULL; + include.ID3DXInclude_iface.lpVtbl = &test_include_vtbl; + include.terminated_data = !!i; + hr = D3DXAssembleShader(testshader, strlen(testshader), NULL, &include.ID3DXInclude_iface, + D3DXSHADER_SKIPVALIDATION, &shader, &messages); + ok(hr == D3D_OK, "pInclude test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); + if (messages) + { + trace("D3DXAssembleShader messages:\n%s", (char *)ID3DXBuffer_GetBufferPointer(messages)); + ID3DXBuffer_Release(messages); + } + if (shader) + ID3DXBuffer_Release(shader); - /* "unexpected #include file from memory" test */ - shader = NULL; - messages = NULL; - hr = D3DXAssembleShader(testshader, strlen(testshader), - NULL, NULL, D3DXSHADER_SKIPVALIDATION, - &shader, &messages); - ok(hr == D3DXERR_INVALIDDATA, "D3DXAssembleShader test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); - if(messages) { - trace("D3DXAssembleShader messages:\n%s", (char *)ID3DXBuffer_GetBufferPointer(messages)); - ID3DXBuffer_Release(messages); - } - if(shader) ID3DXBuffer_Release(shader); + /* "unexpected #include file from memory" test */ + shader = NULL; + messages = NULL; + hr = D3DXAssembleShader(testshader, strlen(testshader), NULL, NULL, D3DXSHADER_SKIPVALIDATION, + &shader, &messages); + ok(hr == D3DXERR_INVALIDDATA, "D3DXAssembleShader test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); + if (messages) + { + trace("D3DXAssembleShader messages:\n%s", (char *)ID3DXBuffer_GetBufferPointer(messages)); + ID3DXBuffer_Release(messages); + } + if (shader) + ID3DXBuffer_Release(shader); - /* recursive #include test */ - shader = NULL; - messages = NULL; - hr = D3DXAssembleShader(testshader2, strlen(testshader2), NULL, &include.ID3DXInclude_iface, - D3DXSHADER_SKIPVALIDATION, &shader, &messages); - todo_wine ok(hr == D3D_OK, "D3DXAssembleShader test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); - if(messages) { - trace("recursive D3DXAssembleShader messages:\n%s", (char *)ID3DXBuffer_GetBufferPointer(messages)); - ID3DXBuffer_Release(messages); - } - if(shader) ID3DXBuffer_Release(shader); + /* recursive #include test */ + shader = NULL; + messages = NULL; + hr = D3DXAssembleShader(testshader2, strlen(testshader2), NULL, &include.ID3DXInclude_iface, + D3DXSHADER_SKIPVALIDATION, &shader, &messages); + todo_wine ok(hr == D3D_OK, "D3DXAssembleShader test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); + if (messages) + { + trace("recursive D3DXAssembleShader messages:\n%s", (char *)ID3DXBuffer_GetBufferPointer(messages)); + ID3DXBuffer_Release(messages); + } + if (shader) + ID3DXBuffer_Release(shader); - /* #include with a path. */ - shader = NULL; - messages = NULL; - hr = D3DXAssembleShader(testshader3, strlen(testshader3), NULL, &include.ID3DXInclude_iface, - D3DXSHADER_SKIPVALIDATION, &shader, &messages); - ok(hr == D3D_OK, "D3DXAssembleShader test failed with error 0x%x - %d\n", hr, hr & 0x0000ffff); - if (messages) - { - trace("Path search D3DXAssembleShader messages:\n%s", (char *)ID3DXBuffer_GetBufferPointer(messages)); - ID3DXBuffer_Release(messages); + /* #include with a path. */ + shader = NULL; + messages = NULL; + hr = D3DXAssembleShader(testshader3, strlen(testshader3), NULL, &include.ID3DXInclude_iface, + D3DXSHADER_SKIPVALIDATION, &shader, &messages); + ok(hr == D3D_OK, "D3DXAssembleShader test failed with error 0x%x - %d\n", hr, hr & 0x0000ffff); + if (messages) + { + trace("Path search D3DXAssembleShader messages:\n%s", (char *)ID3DXBuffer_GetBufferPointer(messages)); + ID3DXBuffer_Release(messages); + } + if (shader) + ID3DXBuffer_Release(shader); } - if (shader) - ID3DXBuffer_Release(shader); if (create_file("shader.vsh", testshader, sizeof(testshader) - 1, shader_vsh_path)) { @@ -443,7 +468,7 @@ static void d3dxpreprocess_test(void) HRESULT hr; ID3DXBuffer *shader, *messages; char shader_vsh_path[MAX_PATH], shader3_vsh_path[MAX_PATH]; - static struct D3DXIncludeImpl include = {{&D3DXInclude_Vtbl}}; + static struct test_include include = {{&test_include_vtbl}, TRUE}; if (create_file("shader.vsh", testshader, sizeof(testshader) - 1, shader_vsh_path)) { -- 2.34.1

3 7

[PATCH] loader/wine.inf: Update time zone data.
by Giovanni Mascellani 27 Apr '22

27 Apr '22

New time zone data were generated from CLDR release 41 and tzdata release 2022a. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- loader/wine.inf.in | 60 ++++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 46b2caf3647..220dee1b08d 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -4766,7 +4766,7 @@ HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time,"MUI_Display",,"@tzre HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time,"MUI_Dlt",,"@tzres.dll,-46161" HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time,"MUI_Std",,"@tzres.dll,-46160" HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time,"Std",,"West Bank Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2000",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,03,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,03,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2001",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,03,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,03,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2002",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,03,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,03,00,00,00,00,00,00,00,00,00 @@ -4789,35 +4789,37 @@ HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2018",1, HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2019",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2020",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2021",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2022",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2023",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2024",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2025",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2026",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2027",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2028",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2029",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2030",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2031",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2032",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2033",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2034",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2035",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2036",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2037",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2038",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2039",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2040",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2041",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2042",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2043",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2044",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2045",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2046",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2047",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2048",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2022",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2023",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2024",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2025",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2026",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2027",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2028",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2029",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2030",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2031",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2032",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2033",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2034",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2035",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2036",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2037",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2038",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2039",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2040",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2041",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2042",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2043",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2044",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2045",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2046",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2047",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2048",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2049",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2050",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" -HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"LastEntry",0x10001,"2048" +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"LastEntry",0x10001,"2050" HKLM,%CurrentVersionNT%\Time Zones\West Pacific Standard Time,"Display",,"(UTC+10:00) Guam, Port Moresby" HKLM,%CurrentVersionNT%\Time Zones\West Pacific Standard Time,"Dlt",,"West Pacific Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\West Pacific Standard Time,"MUI_Display",,"@tzres.dll,-10226" -- 2.36.0

1 0

[PATCH] wined3d: Trace the SRGB flag in wined3d_texture_gl_prepare_texture().
by Zebediah Figura 27 Apr '22

27 Apr '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/texture.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 213a04fb496..ce283b05022 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2096,7 +2096,8 @@ void wined3d_texture_gl_prepare_texture(struct wined3d_texture_gl *texture_gl, const struct wined3d_format_gl *format_gl; GLenum internal; - TRACE("texture_gl %p, context_gl %p, format %s.\n", texture_gl, context_gl, debug_d3dformat(format->id)); + TRACE("texture_gl %p, context_gl %p, srgb %d, format %s.\n", + texture_gl, context_gl, srgb, debug_d3dformat(format->id)); if (!d3d_info->shader_color_key && !(texture_gl->t.async.flags & WINED3D_TEXTURE_ASYNC_COLOR_KEY) -- 2.35.1

2 1

[PATCH 1/3] d3d8/tests: Add more tests for D3DLOCK_NO_DIRTY_UPDATE.
by Zebediah Figura 27 Apr '22

27 Apr '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3d8/tests/visual.c | 87 +++++++++++++++++++++++++++++++++++----- 1 file changed, 76 insertions(+), 11 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 41fc0cbf16a..87b3c120b4f 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -5639,7 +5639,7 @@ static void add_dirty_rect_test(void) ok(color_match(color, 0x0000ff00, 1), "Expected color 0x0000ff00, got 0x%08x.\n", color); - /* Locks with NO_DIRTY_UPDATE are ignored. */ + /* UpdateTexture() ignores locks made with D3DLOCK_NO_DIRTY_UPDATE. */ fill_surface(surface_src_green, 0x00000080, D3DLOCK_NO_DIRTY_UPDATE); hr = IDirect3DDevice8_UpdateTexture(device, (IDirect3DBaseTexture8 *)tex_src_green, (IDirect3DBaseTexture8 *)tex_dst2); @@ -5651,6 +5651,15 @@ static void add_dirty_rect_test(void) hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + /* Manually copying the surface works, though. */ + hr = IDirect3DDevice8_CopyRects(device, surface_src_green, NULL, 0, surface_dst2, NULL); + ok(hr == D3D_OK, "Failed to copy rects, hr %#x.\n", hr); + add_dirty_rect_test_draw(device); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x00000080, 1), "Got unexpected colour 0x%08x.\n", color); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Failed to present, hr %#x.\n", hr); + /* Readonly maps write to D3DPOOL_SYSTEMMEM, but don't record a dirty rectangle. */ fill_surface(surface_src_green, 0x000000ff, D3DLOCK_READONLY); hr = IDirect3DDevice8_UpdateTexture(device, (IDirect3DBaseTexture8 *)tex_src_green, @@ -5658,8 +5667,7 @@ static void add_dirty_rect_test(void) ok(SUCCEEDED(hr), "Failed to update texture, hr %#x.\n", hr); add_dirty_rect_test_draw(device); color = getPixelColor(device, 320, 240); - ok(color_match(color, 0x0000ff00, 1), - "Expected color 0x0000ff00, got 0x%08x.\n", color); + ok(color_match(color, 0x00000080, 1), "Got unexpected colour 0x%08x.\n", color); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); @@ -5724,7 +5732,7 @@ static void add_dirty_rect_test(void) hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); - /* UpdateSurface ignores the missing dirty marker. */ + /* CopyRects() ignores the missing dirty marker. */ hr = IDirect3DDevice8_UpdateTexture(device, (IDirect3DBaseTexture8 *)tex_src_red, (IDirect3DBaseTexture8 *)tex_dst2); hr = IDirect3DDevice8_CopyRects(device, surface_src_green, NULL, 0, surface_dst2, NULL); @@ -5775,17 +5783,28 @@ static void add_dirty_rect_test(void) ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); /* AddDirtyRect uploads the new contents. - * Side note, not tested in the test: Partial surface updates work, and two separate - * dirty rectangles are tracked individually. Tested on Nvidia Kepler, other drivers - * untested. */ - hr = IDirect3DTexture8_AddDirtyRect(tex_managed, NULL); - ok(SUCCEEDED(hr), "Failed to add dirty rect, hr %#x.\n", hr); + * Partial surface updates work, and two separate dirty rectangles are + * tracked individually. Tested on Nvidia Kepler, other drivers untested. */ + hr = IDirect3DTexture8_AddDirtyRect(tex_managed, &part_rect); + ok(hr == S_OK, "Failed to add dirty rect, hr %#x.\n", hr); add_dirty_rect_test_draw(device); color = getPixelColor(device, 320, 240); - ok(color_match(color, 0x0000ff00, 1), - "Expected color 0x0000ff00, got 0x%08x.\n", color); + ok(color_match(color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 1, 1); + todo_wine ok(color_match(color, 0x00ff0000, 1), "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + hr = IDirect3DTexture8_AddDirtyRect(tex_managed, NULL); + ok(hr == S_OK, "Failed to add dirty rect, hr %#x.\n", hr); + add_dirty_rect_test_draw(device); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 1, 1); + ok(color_match(color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", color); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_MAXMIPLEVEL, 1); ok(SUCCEEDED(hr), "Failed to set texture stage state, hr %#x.\n", hr); add_dirty_rect_test_draw(device); @@ -5812,6 +5831,18 @@ static void add_dirty_rect_test(void) hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + /* Test blitting from a managed texture. */ + fill_surface(surface_managed0, 0x0000ff00, D3DLOCK_NO_DIRTY_UPDATE); + hr = IDirect3DDevice8_CopyRects(device, surface_managed0, NULL, 0, surface_dst2, NULL); + ok(hr == D3D_OK, "Failed to update surface, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTexture(device, 0, (IDirect3DBaseTexture8 *)tex_dst2); + ok(hr == D3D_OK, "Failed to set texture, hr %#x.\n", hr); + add_dirty_rect_test_draw(device); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x0000ff00, 1), "Got unexpected colour 0x%08x.\n", color); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Failed to present, hr %#x.\n", hr); + /* Tests with dynamic textures */ fill_surface(surface_dynamic, 0x0000ffff, 0); hr = IDirect3DDevice8_SetTexture(device, 0, (IDirect3DBaseTexture8 *)tex_dynamic); @@ -5869,6 +5900,40 @@ static void add_dirty_rect_test(void) IDirect3DTexture8_Release(tex_dst2); IDirect3DTexture8_Release(tex_managed); IDirect3DTexture8_Release(tex_dynamic); + + /* As above, test CopyRect() after locking the source with + * D3DLOCK_NO_DIRTY_UPDATE, but this time do it immediately after creating + * the destination texture. This is a regression test for a previously + * broken code path. */ + + hr = IDirect3DDevice8_CreateTexture(device, 256, 256, 1, 0, D3DFMT_X8R8G8B8, + D3DPOOL_DEFAULT, &tex_dst2); + ok(hr == D3D_OK, "Failed to create texture, hr %#x.\n", hr); + hr = IDirect3DDevice8_CreateTexture(device, 256, 256, 1, 0, D3DFMT_X8R8G8B8, + D3DPOOL_SYSTEMMEM, &tex_src_green); + ok(hr == D3D_OK, "Failed to create texture, hr %#x.\n", hr); + + hr = IDirect3DTexture8_GetSurfaceLevel(tex_dst2, 0, &surface_dst2); + ok(hr == D3D_OK, "Failed to get surface level, hr %#x.\n", hr); + hr = IDirect3DTexture8_GetSurfaceLevel(tex_src_green, 0, &surface_src_green); + ok(hr == D3D_OK, "Failed to get surface level, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetTexture(device, 0, (IDirect3DBaseTexture8 *)tex_dst2); + ok(hr == D3D_OK, "Failed to set texture, hr %#x.\n", hr); + fill_surface(surface_src_green, 0x00ff0000, D3DLOCK_NO_DIRTY_UPDATE); + hr = IDirect3DDevice8_CopyRects(device, surface_src_green, NULL, 0, surface_dst2, NULL); + ok(hr == D3D_OK, "Failed to copy rects, hr %#x.\n", hr); + add_dirty_rect_test_draw(device); + color = getPixelColor(device, 320, 240); + todo_wine ok(color_match(color, 0x00ff0000, 1), "Got unexpected colour 0x%08x.\n", color); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Failed to present, hr %#x.\n", hr); + + IDirect3DSurface8_Release(surface_dst2); + IDirect3DSurface8_Release(surface_src_green); + IDirect3DTexture8_Release(tex_dst2); + IDirect3DTexture8_Release(tex_src_green); + refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); done: -- 2.35.1

3 6

Wineconf 2022 - with X.org - October 4-6
by Jeremy White 27 Apr '22

27 Apr '22

Hello all! After a 2 year hiatus the Wine Developers Conference, AKA WineConf, is being held in conjunction with the X.Org Developers Conference (XDC) in Minneapolis, MN from October 4th until Oct 6th, with a Wine focus on the 5th and 6th. This year, the two events are being held together allowing attendees to freely attend any programming they desire. The event is free to attend and open to the general public. We will concentrate the Wine related events on the 5th and 6th, so if your available travel time is limited, you can come just for those two days. Programming for the conference will consist of multiple tracks taking place in several rooms. There will be one main track for Wine and one or two overflow rooms for discussion. As always there will be plenty of time where there will be no programming to allow participants to engage in spontaneous conversation. This is being called the 'hallway track'. We are now requesting proposals for talks, workshops and demos for this year. When you propose your talk, if you have a preference toward a time slot and day please express that. This year the conference is longer, so there should be plenty of slots for all the relevant and interested presenters. Topics should obviously be of interest to the other attendees, i.e., the broader Wine community, but note that that doesn't imply the talk has to be about Wine itself. Additionally while proposals for pre-recorded or virtual presentations can be submitted, as of writing, we have a strong preference for in-person talks. Presentations should fall into one of the the following formats: Talk (full slot) Technical presentation in the main WineConf track, with around 35 minutes of presentation plus 10 minutes of Q&A. This can be anything: a talk about work-in-progress, a proposal for change, analysis of trends, etc. Talk (half slot) Technical presentation in the main WineConf track, with around 15 minutes of presentation and 5 minutes of Q&A. This can be anything: a talk about work-in-progress, a proposal for change, analysis of trends, etc. Demo (10 minutes) We will try to schedule them early and have a demo place throughout the conference. Lightning Talk (5 minutes) Scheduled throughout the conference in the main WineConf track. Any hallway track discussions summaries have priority. Workshop Discussion Topic Discussion topic for a smaller group. Ideally two people submit a proposal, one to lead the discussion and make sure it stays on track, second person to keep notes. Please mention relevant talk submissions for the main track that should kick of the discussion. These talks will be scheduled early in the conference program. Summary of the discussion will be presented at the end of the conference in a lightning talk. Presenters will be selected from those who submit before the deadline: July 4, 2022. There is usually time left for late talk proposals, but do not count on it. Please do submit your proposal in a timely fashion. You can submit Workshop, Demo and Lightning Talk proposals any time, even during the conference. To make a proposal please visit the website here: https://indico.freedesktop.org/event/2/abstracts/ The Wine project is able to sponsor travel, if required, with the goal to allow anyone with interest in attending this conference to do so. Any program proposal will be considered for a grant, please include your request in your submission. Grants are approved independently of program acceptance. We are really looking forward to seeing you all this year! Cheers, Jeremy, on behalf of the XDC + WineConf 2022 committee

2 1

[PATCH 1/3] dinput/tests: Enforce HID report descriptor buffer size.
by Rémi Bernon 27 Apr '22

27 Apr '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/tests/driver_bus.c | 2 +- dlls/dinput/tests/driver_hid.h | 4 +++- dlls/dinput/tests/force_feedback.c | 11 +++++++---- dlls/dinput/tests/hid.c | 4 ++++ dlls/dinput/tests/hotplug.c | 1 + dlls/dinput/tests/joystick8.c | 21 ++++++++++++++++----- 6 files changed, 32 insertions(+), 11 deletions(-) diff --git a/dlls/dinput/tests/driver_bus.c b/dlls/dinput/tests/driver_bus.c index 45a984b6c36..9ece4414a1a 100644 --- a/dlls/dinput/tests/driver_bus.c +++ b/dlls/dinput/tests/driver_bus.c @@ -458,7 +458,7 @@ struct phys_device BOOL use_report_id; DWORD report_descriptor_len; - char report_descriptor_buf[1024]; + char report_descriptor_buf[MAX_HID_DESCRIPTOR_LEN]; HIDP_CAPS caps; HID_DEVICE_ATTRIBUTES attributes; diff --git a/dlls/dinput/tests/driver_hid.h b/dlls/dinput/tests/driver_hid.h index 1010499fc41..4711d391bfe 100644 --- a/dlls/dinput/tests/driver_hid.h +++ b/dlls/dinput/tests/driver_hid.h @@ -62,13 +62,15 @@ struct hid_expect }; /* create/remove device */ +#define MAX_HID_DESCRIPTOR_LEN 2048 + struct hid_device_desc { BOOL is_polled; BOOL use_report_id; DWORD report_descriptor_len; - char report_descriptor_buf[1024]; + char report_descriptor_buf[MAX_HID_DESCRIPTOR_LEN]; HIDP_CAPS caps; HID_DEVICE_ATTRIBUTES attributes; diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index d9dad38446c..f6525657450 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -1672,7 +1672,8 @@ static void test_condition_effect( IDirectInputDevice8W *device, HANDLE file, DW static BOOL test_force_feedback_joystick( DWORD version ) { #include "psh_hid_macros.h" - const unsigned char report_descriptor[] = { + const unsigned char report_descriptor[] = + { USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), USAGE(1, HID_USAGE_GENERIC_JOYSTICK), COLLECTION(1, Application), @@ -2005,7 +2006,7 @@ static BOOL test_force_feedback_joystick( DWORD version ) END_COLLECTION, END_COLLECTION, }; -#undef REPORT_ID_OR_USAGE_PAGE + C_ASSERT(sizeof(report_descriptor) < MAX_HID_DESCRIPTOR_LEN); #include "pop_hid_macros.h" struct hid_device_desc desc = @@ -3460,6 +3461,7 @@ static void test_device_managed_effect(void) END_COLLECTION, END_COLLECTION, }; + C_ASSERT(sizeof(report_descriptor) < MAX_HID_DESCRIPTOR_LEN); #include "pop_hid_macros.h" struct hid_device_desc desc = @@ -4576,7 +4578,8 @@ struct bool_async_handler default_bool_async_handler = {{&bool_async_handler_vtb static void test_windows_gaming_input(void) { #include "psh_hid_macros.h" - const unsigned char report_desc[] = { + const unsigned char report_desc[] = + { USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), USAGE(1, HID_USAGE_GENERIC_JOYSTICK), COLLECTION(1, Application), @@ -4997,7 +5000,7 @@ static void test_windows_gaming_input(void) END_COLLECTION, END_COLLECTION, }; -#undef REPORT_ID_OR_USAGE_PAGE + C_ASSERT(sizeof(report_desc) < MAX_HID_DESCRIPTOR_LEN); #include "pop_hid_macros.h" struct hid_device_desc desc = diff --git a/dlls/dinput/tests/hid.c b/dlls/dinput/tests/hid.c index 4e107625064..66019e766ad 100644 --- a/dlls/dinput/tests/hid.c +++ b/dlls/dinput/tests/hid.c @@ -2855,6 +2855,7 @@ static void test_hid_driver( DWORD report_id, DWORD polled ) END_COLLECTION, }; #undef REPORT_ID_OR_USAGE_PAGE + C_ASSERT(sizeof(report_desc) < MAX_HID_DESCRIPTOR_LEN); #include "pop_hid_macros.h" const HIDP_CAPS caps = @@ -3063,6 +3064,7 @@ static void test_hidp_kdr(void) END_COLLECTION, END_COLLECTION, }; + C_ASSERT(sizeof(report_desc) < MAX_HID_DESCRIPTOR_LEN); #include "pop_hid_macros.h" struct hid_device_desc desc = @@ -3572,6 +3574,7 @@ DWORD WINAPI dinput_test_device_thread( void *stop_event ) END_COLLECTION, END_COLLECTION, }; + C_ASSERT(sizeof(gamepad_desc) < MAX_HID_DESCRIPTOR_LEN); #include "pop_hid_macros.h" static const HID_DEVICE_ATTRIBUTES attributes = { @@ -3616,6 +3619,7 @@ static void test_bus_driver(void) INPUT(1, Data|Var|Abs), END_COLLECTION, }; + C_ASSERT(sizeof(report_desc) < MAX_HID_DESCRIPTOR_LEN); #include "pop_hid_macros.h" static const HID_DEVICE_ATTRIBUTES attributes = diff --git a/dlls/dinput/tests/hotplug.c b/dlls/dinput/tests/hotplug.c index 2d000317c9f..fca04c36ef5 100644 --- a/dlls/dinput/tests/hotplug.c +++ b/dlls/dinput/tests/hotplug.c @@ -133,6 +133,7 @@ static BOOL test_input_lost( DWORD version ) END_COLLECTION, END_COLLECTION, }; + C_ASSERT(sizeof(report_desc) < MAX_HID_DESCRIPTOR_LEN); #include "pop_hid_macros.h" struct hid_device_desc desc = diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 32d03a603c3..eeb8b90d0c8 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -396,7 +396,7 @@ static void test_simple_joystick( DWORD version ) END_COLLECTION, END_COLLECTION, }; -#undef REPORT_ID_OR_USAGE_PAGE + C_ASSERT(sizeof(report_desc) < MAX_HID_DESCRIPTOR_LEN); #include "pop_hid_macros.h" struct hid_device_desc desc = @@ -2110,6 +2110,7 @@ static BOOL test_device_types( DWORD version ) END_COLLECTION, END_COLLECTION, }; + C_ASSERT(sizeof(unknown_desc) < MAX_HID_DESCRIPTOR_LEN); static const unsigned char limited_desc[] = { USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), @@ -2140,6 +2141,7 @@ static BOOL test_device_types( DWORD version ) END_COLLECTION, END_COLLECTION, }; + C_ASSERT(sizeof(limited_desc) < MAX_HID_DESCRIPTOR_LEN); static const unsigned char gamepad_desc[] = { USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), @@ -2170,6 +2172,7 @@ static BOOL test_device_types( DWORD version ) END_COLLECTION, END_COLLECTION, }; + C_ASSERT(sizeof(gamepad_desc) < MAX_HID_DESCRIPTOR_LEN); static const unsigned char joystick_desc[] = { USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), @@ -2210,6 +2213,7 @@ static BOOL test_device_types( DWORD version ) END_COLLECTION, END_COLLECTION, }; + C_ASSERT(sizeof(joystick_desc) < MAX_HID_DESCRIPTOR_LEN); static const unsigned char wheel_steering_only_desc[] = { USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), @@ -2248,6 +2252,7 @@ static BOOL test_device_types( DWORD version ) END_COLLECTION, END_COLLECTION, }; + C_ASSERT(sizeof(wheel_steering_only_desc) < MAX_HID_DESCRIPTOR_LEN); static const unsigned char wheel_dualpedals_desc[] = { USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), @@ -2289,6 +2294,7 @@ static BOOL test_device_types( DWORD version ) END_COLLECTION, END_COLLECTION, }; + C_ASSERT(sizeof(wheel_dualpedals_desc) < MAX_HID_DESCRIPTOR_LEN); static const unsigned char wheel_threepedals_desc[] = { USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), @@ -2331,6 +2337,7 @@ static BOOL test_device_types( DWORD version ) END_COLLECTION, END_COLLECTION, }; + C_ASSERT(sizeof(wheel_threepedals_desc) < MAX_HID_DESCRIPTOR_LEN); #include "pop_hid_macros.h" static struct device_desc device_desc[] = @@ -2690,7 +2697,7 @@ static void test_many_axes_joystick(void) END_COLLECTION, END_COLLECTION, }; -#undef REPORT_ID_OR_USAGE_PAGE + C_ASSERT(sizeof(report_desc) < MAX_HID_DESCRIPTOR_LEN); #include "pop_hid_macros.h" struct hid_device_desc desc = @@ -3221,7 +3228,7 @@ static void test_driving_wheel_axes(void) END_COLLECTION, END_COLLECTION, }; -#undef REPORT_ID_OR_USAGE_PAGE + C_ASSERT(sizeof(report_desc) < MAX_HID_DESCRIPTOR_LEN); #include "pop_hid_macros.h" struct hid_device_desc desc = @@ -3415,7 +3422,8 @@ done: static BOOL test_winmm_joystick(void) { #include "psh_hid_macros.h" - const unsigned char report_desc[] = { + const unsigned char report_desc[] = + { USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), USAGE(1, HID_USAGE_GENERIC_JOYSTICK), COLLECTION(1, Application), @@ -3461,6 +3469,7 @@ static BOOL test_winmm_joystick(void) END_COLLECTION, END_COLLECTION, }; + C_ASSERT(sizeof(report_desc) < MAX_HID_DESCRIPTOR_LEN); #include "pop_hid_macros.h" struct hid_device_desc desc = @@ -3864,7 +3873,8 @@ static struct controller_handler controller_added = {{&controller_handler_vtbl}} static void test_windows_gaming_input(void) { #include "psh_hid_macros.h" - const unsigned char report_desc[] = { + const unsigned char report_desc[] = + { USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), USAGE(1, HID_USAGE_GENERIC_GAMEPAD), COLLECTION(1, Application), @@ -3906,6 +3916,7 @@ static void test_windows_gaming_input(void) END_COLLECTION, END_COLLECTION, }; + C_ASSERT(sizeof(report_desc) < MAX_HID_DESCRIPTOR_LEN); #include "pop_hid_macros.h" struct hid_device_desc desc = -- 2.35.1

1 3

[PATCH vkd3d v4 1/7] vkd3d-shader/hlsl: Do not allow NaNs in SM1.
by Giovanni Mascellani 27 Apr '22

27 Apr '22

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_constant_ops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 2e16577f..d8787c21 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -278,10 +278,10 @@ static bool fold_div(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, "Floating point division by zero."); } dst->value[k].f = src1->value[k].f / src2->value[k].f; - if (ctx->profile->major_version < 4 && isinf(dst->value[k].f)) + if (ctx->profile->major_version < 4 && !isfinite(dst->value[k].f)) { hlsl_error(ctx, &dst->node.loc, VKD3D_SHADER_ERROR_HLSL_DIVISION_BY_ZERO, - "Infinities are not allowed by the shader model."); + "Infinities and NaNs are not allowed by the shader model."); } break; -- 2.35.2

3 20

[PATCH] gdi32/tests: Trace the invalid height in test_max_height().
by Francois Gouget 27 Apr '22

27 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/gdi32/tests/font.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 9c616e6a30b..86ab3f3632f 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -6523,6 +6523,7 @@ static void test_max_height(void) /* test an invalid value */ for (i = 0; i < ARRAY_SIZE(invalid_height); i++) { + winetest_push_context("height=%d", invalid_height[i]); lf.lfHeight = invalid_height[i]; hfont = CreateFontIndirectA(&lf); hfont_old = SelectObject(hdc, hfont); @@ -6534,6 +6535,7 @@ static void test_max_height(void) ok(tm.tmAveCharWidth == tm1.tmAveCharWidth, "expected 1 ppem value (%ld), got %ld\n", tm1.tmAveCharWidth, tm.tmAveCharWidth); DeleteObject(SelectObject(hdc, hfont_old)); + winetest_pop_context(); } ReleaseDC(NULL, hdc); -- 2.30.2

3 2

[PATCH 1/5] server: Return void from sock_reselect().
by Zebediah Figura 27 Apr '22

27 Apr '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- server/sock.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server/sock.c b/server/sock.c index 0b65a6eb198..5009f6a4f74 100644 --- a/server/sock.c +++ b/server/sock.c @@ -567,7 +567,7 @@ void sock_init(void) } } -static int sock_reselect( struct sock *sock ) +static void sock_reselect( struct sock *sock ) { int ev = sock_get_poll_events( sock->fd ); @@ -575,7 +575,6 @@ static int sock_reselect( struct sock *sock ) fprintf(stderr,"sock_reselect(%p): new mask %x\n", sock, ev); set_fd_events( sock->fd, ev ); - return ev; } static unsigned int afd_poll_flag_to_win32( unsigned int flags ) -- 2.34.1

2 6

[PATCH 1/5] include: Add Windows.Foundation.Numerics.Vector3 struct declaration.
by Rémi Bernon 27 Apr '22

27 Apr '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- include/Makefile.in | 1 + include/windows.foundation.numerics.idl | 39 +++++++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 include/windows.foundation.numerics.idl diff --git a/include/Makefile.in b/include/Makefile.in index b0a1d0e4880..24ed4acca84 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -787,6 +787,7 @@ SOURCES = \ windows.foundation.collections.idl \ windows.foundation.idl \ windows.foundation.metadata.idl \ + windows.foundation.numerics.idl \ windows.gaming.input.custom.idl \ windows.gaming.input.forcefeedback.idl \ windows.gaming.input.idl \ diff --git a/include/windows.foundation.numerics.idl b/include/windows.foundation.numerics.idl new file mode 100644 index 00000000000..eca99ca29bc --- /dev/null +++ b/include/windows.foundation.numerics.idl @@ -0,0 +1,39 @@ +/* + * Copyright 2022 Rémi Bernon for CodeWeavers + * + * 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 + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; + +namespace Windows.Foundation.Numerics { + typedef struct Vector3 Vector3; + + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + struct Vector3 + { + FLOAT X; + FLOAT Y; + FLOAT Z; + }; +} -- 2.35.1

1 4

[PATCH] windowscodecs: BitmapScaler_CopyPixels: Do not demand a larger buffer than necessary.
by Joachim Priesner 27 Apr '22

27 Apr '22

Only `bytesperrow` bytes are written to each row of the output rect. Therefore the last row need not be padded to `cbStride` bytes. Signed-off-by: Joachim Priesner <joachim.priesner(a)web.de> --- This fixes a crash when using Delphi 11's TWICImage.CreateScaledCopy, which doesn't perform any error checking (and works fine on Windows). --- dlls/windowscodecs/scaler.c | 2 +- dlls/windowscodecs/tests/bitmap.c | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/windowscodecs/scaler.c b/dlls/windowscodecs/scaler.c index f8f81c0a990..c31aac79861 100644 --- a/dlls/windowscodecs/scaler.c +++ b/dlls/windowscodecs/scaler.c @@ -251,7 +251,7 @@ static HRESULT WINAPI BitmapScaler_CopyPixels(IWICBitmapScaler *iface, goto end; } - if ((cbStride * dest_rect.Height) > cbBufferSize) + if (cbStride * (dest_rect.Height - 1) + bytesperrow > cbBufferSize) { hr = E_INVALIDARG; goto end; diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index 0d0d27e2707..fcfe366321d 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -1151,7 +1151,7 @@ static void test_bitmap_scaler(void) double res_x, res_y; IWICBitmap *bitmap; UINT width, height; - BYTE buf[16]; + BYTE buf[93]; // capable of holding a 7*4px, 24bpp image with stride 24 -> buffer size = 3*24+21 HRESULT hr; hr = IWICImagingFactory_CreateBitmap(factory, 4, 2, &GUID_WICPixelFormat24bppBGR, WICBitmapCacheOnLoad, &bitmap); @@ -1243,7 +1243,7 @@ static void test_bitmap_scaler(void) WICBitmapInterpolationModeNearestNeighbor); ok(hr == E_INVALIDARG, "Failed to initialize bitmap scaler, hr %#lx.\n", hr); - hr = IWICBitmapScaler_Initialize(scaler, (IWICBitmapSource *)bitmap, 8, 4, + hr = IWICBitmapScaler_Initialize(scaler, (IWICBitmapSource *)bitmap, 7, 4, WICBitmapInterpolationModeNearestNeighbor); ok(hr == S_OK, "Failed to initialize bitmap scaler, hr %#lx.\n", hr); @@ -1251,20 +1251,20 @@ static void test_bitmap_scaler(void) WICBitmapInterpolationModeNearestNeighbor); ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); - hr = IWICBitmapScaler_Initialize(scaler, (IWICBitmapSource *)bitmap, 8, 0, + hr = IWICBitmapScaler_Initialize(scaler, (IWICBitmapSource *)bitmap, 7, 0, WICBitmapInterpolationModeNearestNeighbor); ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = IWICBitmapScaler_Initialize(scaler, NULL, 8, 4, WICBitmapInterpolationModeNearestNeighbor); ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); - hr = IWICBitmapScaler_Initialize(scaler, (IWICBitmapSource *)bitmap, 8, 4, + hr = IWICBitmapScaler_Initialize(scaler, (IWICBitmapSource *)bitmap, 7, 4, WICBitmapInterpolationModeNearestNeighbor); ok(hr == WINCODEC_ERR_WRONGSTATE, "Unexpected hr %#lx.\n", hr); hr = IWICBitmapScaler_GetSize(scaler, &width, &height); ok(hr == S_OK, "Failed to get scaler size, hr %#lx.\n", hr); - ok(width == 8, "Unexpected width %u.\n", width); + ok(width == 7, "Unexpected width %u.\n", width); ok(height == 4, "Unexpected height %u.\n", height); hr = IWICBitmapScaler_GetSize(scaler, NULL, &height); @@ -1307,6 +1307,9 @@ static void test_bitmap_scaler(void) ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "Unexpected hr %#lx.\n", hr); IWICPalette_Release(palette); + hr = IWICBitmapScaler_CopyPixels(scaler, NULL, /*cbStride=*/24, sizeof(buf), buf); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + IWICBitmapScaler_Release(scaler); IWICBitmap_Release(bitmap); -- 2.36.0

2 1

[PATCH 1/2] ntdll/tests: Test NtMapViewOfSection with a DLL and zero_bits.
by Brendan Shanks 27 Apr '22

27 Apr '22

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- The zero_bits mask test always passes on 32-bit (the pointer is either truncated, or version.dll is itself 32-bit). dlls/ntdll/tests/virtual.c | 41 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 30a97ba9d94..cd374cf2ea4 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -37,6 +37,8 @@ static ULONG64 (WINAPI *pRtlGetEnabledExtendedFeatures)(ULONG64); static NTSTATUS (WINAPI *pRtlFreeUserStack)(void *); static void * (WINAPI *pRtlFindExportedRoutineByName)(HMODULE,const char*); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); +static BOOL (WINAPI *pWow64DisableWow64FsRedirection)(PVOID*); +static BOOL (WINAPI *pWow64RevertWow64FsRedirection)(PVOID); static NTSTATUS (WINAPI *pNtAllocateVirtualMemoryEx)(HANDLE, PVOID *, SIZE_T *, ULONG, ULONG, MEM_EXTENDED_PARAMETER *, ULONG); static const BOOL is_win64 = sizeof(void*) != sizeof(int); @@ -904,6 +906,43 @@ static void test_NtMapViewOfSection(void) CloseHandle(file); DeleteFileA(testfile); + /* test zero_bits > 31 with a 64-bit DLL if possible */ + if (is_wow64) + pWow64DisableWow64FsRedirection(&ptr2); + + file = CreateFileA("c:\\windows\\system32\\version.dll", GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "Failed to open version.dll\n"); + + if (is_wow64) + pWow64RevertWow64FsRedirection(ptr2); + + mapping = CreateFileMappingA(file, NULL, PAGE_READONLY|SEC_IMAGE, 0, 0, NULL); + ok(mapping != 0, "CreateFileMapping failed\n"); + + ptr = NULL; + size = 0; + offset.QuadPart = 0; + zero_bits = 0x7fffffff; + status = NtMapViewOfSection(mapping, process, &ptr, zero_bits, 0, &offset, &size, 1, 0, PAGE_READONLY); + + if (!is_win64 && !is_wow64) + { + ok(status == STATUS_INVALID_PARAMETER_4, "NtMapViewOfSection returned %08lx\n", status); + } + else + { + ok(status == STATUS_SUCCESS || status == STATUS_IMAGE_NOT_AT_BASE, "NtMapViewOfSection returned %08lx\n", status); + ok(!((ULONG_PTR)ptr & 0xffff), "returned memory %p is not aligned to 64k\n", ptr); + todo_wine + ok(((UINT_PTR)ptr & ~get_zero_bits_mask(zero_bits)) == 0, "NtMapViewOfSection returned address %p\n", ptr); + + status = NtUnmapViewOfSection(process, ptr); + ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection returned %08lx\n", status); + } + + NtClose(mapping); + CloseHandle(file); + TerminateProcess(process, 0); CloseHandle(process); } @@ -1152,6 +1191,8 @@ START_TEST(virtual) mod = GetModuleHandleA("kernel32.dll"); pIsWow64Process = (void *)GetProcAddress(mod, "IsWow64Process"); + pWow64DisableWow64FsRedirection = (void *)GetProcAddress(mod, "Wow64DisableWow64FsRedirection"); + pWow64RevertWow64FsRedirection = (void *)GetProcAddress(mod, "Wow64RevertWow64FsRedirection"); pGetEnabledXStateFeatures = (void *)GetProcAddress(mod, "GetEnabledXStateFeatures"); mod = GetModuleHandleA("ntdll.dll"); pRtlCreateUserStack = (void *)GetProcAddress(mod, "RtlCreateUserStack"); -- 2.35.1

2 3

[PATCH v2 0/3] MR1: server: Implement thread input keystate locking.
by Rémi Bernon (＠rbernon) 26 Apr '22

26 Apr '22

Based on a patch from Sebastian Lackner <sebastian(a)fds-team.de>, the series has been in Proton for a while. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=26269 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=27238 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31899 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35907 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45385 -- v2: server: Create message queue and thread input in get_key_state. server: Lock thread input keystate whenever it is modified. server: Create message queue and thread input in set_key_state. https://gitlab.winehq.org/wine/wine/-/merge_requests/1

4 7

[PATCH v2 0/1] MR3: msvcrt: Faster memcmp().
by Jan Sikorski (＠jsikorski) 26 Apr '22

26 Apr '22

Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- v3: Piotr's reviewed variant. I don't know how well compilers will handle unaligned access on archs that don't natively support it. One thing to perhaps look out for it to not have the compiler resort to faulting with software fixup.. -- v2: msvcrt: Faster memcmp(). https://gitlab.winehq.org/wine/wine/-/merge_requests/3

3 2

[PATCH] ieframe: Make sure that history initial state is fully initialized.
by Dmitry Timoshkov 26 Apr '22

26 Apr '22

In addition to 41cfc86d8dd65c71a7c81b826d02ac0a99050d6a. This fixes another crash when browsing help file that I have here. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ieframe/dochost.c | 4 ++-- dlls/ieframe/ieframe.h | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 7717f786d52..4e1e1d82fa1 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -436,7 +436,7 @@ static void update_travellog(DocHost *This) } if(!This->travellog.log) { - This->travellog.log = heap_alloc(4 * sizeof(*This->travellog.log)); + This->travellog.log = heap_alloc_zero(4 * sizeof(*This->travellog.log)); if(!This->travellog.log) return; @@ -444,7 +444,7 @@ static void update_travellog(DocHost *This) }else if(This->travellog.size < This->travellog.position+1) { travellog_entry_t *new_travellog; - new_travellog = heap_realloc(This->travellog.log, This->travellog.size*2*sizeof(*This->travellog.log)); + new_travellog = heap_realloc_zero(This->travellog.log, This->travellog.size*2*sizeof(*This->travellog.log)); if(!new_travellog) return; diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 633906a70ca..1bae1f6781d 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -340,6 +340,11 @@ static inline void unlock_module(void) { InterlockedDecrement(&module_ref); } +static inline void * __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, SIZE_T len) +{ + return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len); +} + static inline LPWSTR heap_strdupW(LPCWSTR str) { LPWSTR ret = NULL; -- 2.35.3

2 4

[tools 1/2] testbot: Provide (quick) read access to Itemref columns.
by Francois Gouget 26 Apr '22

26 Apr '22

Specifically this provides read-only access to the Itemref column(s). For instance if a task refers to a VM using a VMName field, then one can now write $Task->VMName instead of $Task->VM->Name. Incidentally read accesses are also much faster, except for the first Itemref / Detailref access which has to go through the slow path to initialize the relevant hashtable. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- The speedup is about 40% for regular columns. In the Task + VM example this replaces two slow accesses with a single faster access, resulting in a ~70% speedup or even more if it avoids loading the VM object from the database. --- testbot/lib/ObjectModel/Item.pm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index c086aec40..d47238182 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -230,10 +230,29 @@ sub AUTOLOAD # strip fully-qualified portion my $PropertyName = substr($ObjectModel::Item::AUTOLOAD, rindex($ObjectModel::Item::AUTOLOAD, ':') + 1); + + if (!@_) + { + # Provide quick read access to all the columns and cached object refs + if (defined $self->{ColValues}{$PropertyName}) + { + return $self->{ColValues}{$PropertyName}; + } + elsif (defined $self->{Itemrefs}{$PropertyName}) + { + return $self->{Itemrefs}{$PropertyName}; + } + elsif (defined $self->{Details}{$PropertyName}) + { + return $self->{Details}{$PropertyName}; + } + } if ($PropertyName eq "DESTROY") { return; } + + # Populate the Itemrefs and Details hashtable if necessary foreach my $PropertyDescriptor (@{$self->{PropertyDescriptors}}) { if ($PropertyName eq $PropertyDescriptor->GetName()) -- 2.30.2

1 1

[tools] testbot/web: Only show the patches day and time to limit line wrapping.
by Francois Gouget 26 Apr '22

26 Apr '22

This adds ValueFormatter::GenerateDayTimeTipDate(). As usual the full date is shown as a tooltip. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/ValueFormatter.pm | 55 ++++++++++++++++++- testbot/web/PatchesList.pl | 3 +- testbot/web/WineTestBot.css | 1 + testbot/web/js/datetime.js | 13 +++++ 4 files changed, 70 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/ValueFormatter.pm b/testbot/lib/ObjectModel/CGI/ValueFormatter.pm index d987cee55..41d1e14aa 100644 --- a/testbot/lib/ObjectModel/CGI/ValueFormatter.pm +++ b/testbot/lib/ObjectModel/CGI/ValueFormatter.pm @@ -23,7 +23,7 @@ package ObjectModel::CGI::ValueFormatter; use Exporter 'import'; our @EXPORT = qw(GetDateTimeJSFile GenerateDateTime GenerateTipDateTime - GenerateTimeTipDate GenerateValueHTML); + GenerateDayTimeTipDate GenerateTimeTipDate GenerateValueHTML); use POSIX qw(strftime); @@ -151,6 +151,51 @@ sub GenerateTipDateTime($$;$$) =pod =over 12 +=item C<GenerateDayTimeTipDate()> + +Show the timestamp's day and time with the date as a tooltip. + +The timestamp is shown in the user's timezone if JavaScript is available and +in the server's timezone otherwise. + +The default for TagAttrs is 'a' and it should always be a tag that shows the +content of the title attribute as a tooltip. + +See GenerateDateTime() for more details. + +=back +=cut + +sub GenerateDayTimeTipDate($;$$) +{ + my ($Sec1970, $Class, $TagAttrs) = @_; + + if (defined $Sec1970) + { + my $Tag; + if ($TagAttrs) + { + $Tag = $TagAttrs; + $Tag =~ s/ .*$//; + } + else + { + $TagAttrs = $Tag = "a"; + } + $Class = "$Class " if ($Class); + print "<$TagAttrs class='${Class}daytimetipdate' timestamp='$Sec1970' ", + strftime("title='%Y-%m-%d'>%d %H:%M:%S", localtime($Sec1970)), + "</$Tag>"; + } + else + { + print " "; + } +} + +=pod +=over 12 + =item C<GenerateTimeTipDate()> Show the timestamp's time with the date as a tooltip. @@ -221,6 +266,9 @@ for timestamp properties. =item "timetipdate" Same as above but put the date part in a tooltip. +=item "daytimetipdate" +Show the day and time and put the full date as a tooltip. + =back =back @@ -250,6 +298,11 @@ sub GenerateValueHTML($$$;$) GenerateTimeTipDate($Value); return; } + if ($Format eq "daytimetipdate") + { + GenerateDayTimeTipDate($Value); + return; + } } elsif ($PropertyDescriptor->GetClass() eq "Itemref" and defined $Value) { diff --git a/testbot/web/PatchesList.pl b/testbot/web/PatchesList.pl index 30cfc7547..fc074ada1 100644 --- a/testbot/web/PatchesList.pl +++ b/testbot/web/PatchesList.pl @@ -40,7 +40,8 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return $PropertyName =~ /^(?:Received|Disposition|FromName|Subject)$/ ? "ro" : + return $PropertyName eq "Received" ? ("ro", "daytimetipdate") : + $PropertyName =~ /^(?:Disposition|FromName|Subject)$/ ? "ro" : ""; } diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index 350ab64a4..a8756dfce 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -410,6 +410,7 @@ pre a.title { color:inherit; text-decoration: none; } a.tipdatetime { color:inherit; text-decoration: none; } a.timetipdate { color:inherit; text-decoration: none; } +a.daytimetipdate { color:inherit; text-decoration: none; } th.Record { text-align: center; } td.Record { text-align: center; } diff --git a/testbot/web/js/datetime.js b/testbot/web/js/datetime.js index 23b7b2718..d21bf5c6e 100644 --- a/testbot/web/js/datetime.js +++ b/testbot/web/js/datetime.js @@ -40,6 +40,16 @@ function ShowDateTime(dom, attr) } } +function ShowDayTimeTipDate(dom) +{ + const sec1970 = dom.getAttribute("timestamp"); + const dt = new Date(sec1970 * 1000); + dom.setAttribute('title', dt.getFullYear() +'-'+ Pad2(dt.getMonth() + 1) + +'-'+ Pad2(dt.getDate())); + dom.innerHTML = Pad2(dt.getDate()) +' '+ Pad2(dt.getHours()) +':'+ + Pad2(dt.getMinutes()) +':'+ Pad2(dt.getSeconds()); +} + function ShowTimeTipDate(dom) { const sec1970 = dom.getAttribute("timestamp"); @@ -58,6 +68,9 @@ function init() document.querySelectorAll(".tipdatetime").forEach(dom => { ShowDateTime(dom, 'title'); }); + document.querySelectorAll(".daytimetipdate").forEach(dom => { + ShowDayTimeTipDate(dom); + }); document.querySelectorAll(".timetipdate").forEach(dom => { ShowTimeTipDate(dom); }); -- 2.30.2

1 0

[tools] testbot/web: Tweak the Activity page VMs iteration.
by Francois Gouget 26 Apr '22

26 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Activity.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index ffdf0fef6..adf5a4525 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -158,7 +158,7 @@ sub GenerateBody($) print "<td class='Record'> </td>"; } - foreach my $Col (0..@SortedVMs-1) + foreach my $Col (0..$#SortedVMs) { my $VM = $SortedVMs[$Col]; my $VMStatus = $Group->{statusvms}->{$VM->Name}; -- 2.30.2

1 0

[tools] testbot: Tweak the error groups iteration.
by Francois Gouget 26 Apr '22

26 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineSendLog.pl | 2 +- testbot/lib/WineTestBot/LogUtils.pm | 2 +- testbot/web/JobDetails.pl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 954edaebd..37949e45f 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -350,7 +350,7 @@ EOF next if (!$Group->{NewCount}); push @Messages, ($GroupName ? "\n$GroupName:\n" : "\n"); - foreach my $ErrIndex (0..@{$Group->{Errors}} - 1) + foreach my $ErrIndex (0..$#{$Group->{Errors}}) { if ($Group->{IsNew}->[$ErrIndex]) { diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 0b2edf735..17cfc3525 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1052,7 +1052,7 @@ sub _WriteLogErrorsToFh($$) { my $Group = $LogInfo->{ErrGroups}->{$GroupName}; print $Fh "g $Group->{LineNo} $GroupName\n"; - foreach my $Index (0..@{$Group->{Errors}} - 1) + foreach my $Index (0..$#{$Group->{Errors}}) { my $IsNew = $Group->{IsNew}->[$Index] ? "n" : "o"; print $Fh "$IsNew $Group->{LineNos}->[$Index] $Group->{Errors}->[$Index]\n"; diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 33a952553..c04266330 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -513,7 +513,7 @@ sub GenerateFullLog($$$$) next if ($Group->{LineNo}); print "<div class='LogDllName'>$GroupName</div>\n"; - for my $ErrIndex (0..@{$Group->{Errors}} - 1) + for my $ErrIndex (0..$#{$Group->{Errors}}) { if ($IsEmpty) { -- 2.30.2

1 0

[tools] testbot/web: Show the job start / end dates as tooltips on the job details page.
by Francois Gouget 26 Apr '22

26 Apr '22

This also delegates the timestamp formatting to ValueFormatter. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This also fixes the Time column tooltip because, just like for the main index page, they relied on the old ShowDateTime() JavaScript function. --- testbot/web/JobDetails.pl | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 591a47ee9..33a952553 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -26,7 +26,8 @@ use ObjectModel::CGI::CollectionBlock; our @ISA = qw(ObjectModel::CGI::CollectionBlock); use URI::Escape; -use POSIX qw(strftime); + +use ObjectModel::CGI::ValueFormatter; use WineTestBot::Utils; use WineTestBot::Missions; @@ -50,6 +51,7 @@ sub DisplayProperty($$) my $PropertyName = $PropertyDescriptor->GetName(); return $PropertyName =~ /^(?:Id|PreviousNo|Type|FileType|Missions)$/ ? "" : + $PropertyName eq "Started" ? ("ro", "timetipdate") : $self->SUPER::DisplayProperty($PropertyDescriptor); } @@ -67,9 +69,13 @@ sub GenerateHeaderView($$$) { print "Arguments / <span class='MissionHeader'>Missions</span>"; } + elsif ($PropertyName eq "Started") + { + print "<a class='title' title='Start Date'>Start</a>"; + } elsif ($PropertyName eq "Ended") { - print "<a class='title' title='Execution ended'>Time</a>"; + print "<a class='title' title='End Time'>Time</a>"; } else { @@ -129,13 +135,7 @@ sub GenerateDataView($$$) if (defined $StepTask->Ended) { my $Duration = $StepTask->Ended - $StepTask->Started; - my $TagId = "E". $StepTask->Id; - print "<a id='$TagId' class='title' title='", - strftime("%Y-%m-%d %H:%M:%S", localtime($StepTask->Ended)), - "'>", DurationToString($Duration), "</a>\n"; - print "<script type='text/javascript'></script>"; + GenerateTipDateTime($StepTask->Ended, DurationToString($Duration)); } else { -- 2.30.2

1 0

[PATCH v3] ntdll: Use 32-bit time_t when calling __NR_futex syscall.
by Piotr Caban 26 Apr '22

26 Apr '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ntdll/unix/sync.c | 11 +++++++++++ 1 file changed, 11 insertions(+)

2 1

[PATCH 09/11] winex11: Directly use ntdll in uri_to_dos.
by Jacek Caban 26 Apr '22

26 Apr '22

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

2 1

[PATCH v2 12/12] win32u: Use user mode callback for registering builtin classes.
by Huw Davies 26 Apr '22

26 Apr '22

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/user32/class.c | 15 ++------------- dlls/user32/controls.h | 1 - dlls/user32/user_main.c | 2 +- dlls/user32/user_private.h | 1 + dlls/win32u/class.c | 16 ++++++++++++++++ dlls/win32u/ntuser_private.h | 2 +- dlls/win32u/window.c | 2 +- dlls/win32u/winstation.c | 2 +- include/ntuser.h | 1 + 9 files changed, 24 insertions(+), 18 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index aaa8f75bebe..620477f1b14 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -40,8 +40,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(class); #define MAX_ATOM_LEN 255 /* from dlls/kernel32/atom.c */ -static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; - static inline const char *debugstr_us( const UNICODE_STRING *us ) { if (!us) return "<null>"; @@ -307,9 +305,9 @@ static void load_uxtheme(void) } /*********************************************************************** - * register_builtins + * User32RegisterBuiltinClasses */ -static BOOL WINAPI register_builtins( INIT_ONCE *once, void *param, void **context ) +BOOL WINAPI User32RegisterBuiltinClasses( const struct win_hook_params *params, ULONG size ) { register_builtin( &BUTTON_builtin_class ); register_builtin( &COMBO_builtin_class ); @@ -330,15 +328,6 @@ static BOOL WINAPI register_builtins( INIT_ONCE *once, void *param, void **conte } -/*********************************************************************** - * register_builtin_classes - */ -void register_builtin_classes(void) -{ - InitOnceExecuteOnce( &init_once, register_builtins, NULL, NULL ); -} - - /*********************************************************************** * register_desktop_class */ diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index a410bf27460..5dcdd9bb935 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -104,7 +104,6 @@ extern LRESULT StaticWndProc_common(HWND,UINT,WPARAM,LPARAM,BOOL) DECLSPEC_HIDDE struct tagCLASS; /* opaque structure */ struct tagWND; extern ATOM get_int_atom_value( UNICODE_STRING *name ) DECLSPEC_HIDDEN; -extern void register_builtin_classes(void) DECLSPEC_HIDDEN; extern void register_desktop_class(void) DECLSPEC_HIDDEN; /* defwnd proc */ diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 1258181c88a..1400597eb5d 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -172,7 +172,6 @@ static const struct user_callbacks user_funcs = post_dde_message, process_rawinput_message, rawinput_device_get_usages, - register_builtin_classes, SCROLL_SetStandardScrollPainted, unpack_dde_message, register_imm, @@ -207,6 +206,7 @@ static const void *kernel_callback_table[NtUserCallCount] = User32CallWindowsHook, User32FreeCachedClipboardData, User32LoadDriver, + User32RegisterBuiltinClasses, User32RenderSsynthesizedFormat, }; diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index f28fc66bbf2..aa3e1565bfa 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -124,6 +124,7 @@ BOOL WINAPI User32CallSendAsyncCallback( const struct send_async_params *params, BOOL WINAPI User32CallWinEventHook( const struct win_event_hook_params *params, ULONG size ); BOOL WINAPI User32CallWindowProc( struct win_proc_params *params, ULONG size ); BOOL WINAPI User32CallWindowsHook( const struct win_hook_params *params, ULONG size ); +BOOL WINAPI User32RegisterBuiltinClasses( const struct win_hook_params *params, ULONG size ); /* message spy definitions */ diff --git a/dlls/win32u/class.c b/dlls/win32u/class.c index ba60794ccd7..c52fcad6025 100644 --- a/dlls/win32u/class.c +++ b/dlls/win32u/class.c @@ -972,3 +972,19 @@ WORD get_class_word( HWND hwnd, INT offset ) release_class_ptr( class ); return retvalue; } + +static void register_builtins(void) +{ + void *ret_ptr; + ULONG ret_len; + KeUserModeCallback( NtUserRegisterBuiltinClasses, NULL, 0, &ret_ptr, &ret_len ); +} + +/*********************************************************************** + * register_builtin_classes + */ +void register_builtin_classes(void) +{ + static pthread_once_t init_once = PTHREAD_ONCE_INIT; + pthread_once( &init_once, register_builtins ); +} diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 632cb16d23a..fe9d7e18bc9 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -46,7 +46,6 @@ struct user_callbacks DWORD type ); BOOL (CDECL *process_rawinput_message)( MSG *msg, UINT hw_id, const struct hardware_msg_data *msg_data ); BOOL (CDECL *rawinput_device_get_usages)(HANDLE handle, USHORT *usage_page, USHORT *usage); - void (CDECL *register_builtin_classes)(void); void (WINAPI *set_standard_scroll_painted)( HWND hwnd, INT bar, BOOL visible ); BOOL (CDECL *unpack_dde_message)( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam, void **buffer, size_t size ); @@ -303,6 +302,7 @@ WNDPROC get_winproc( WNDPROC proc, BOOL ansi ) DECLSPEC_HIDDEN; void get_winproc_params( struct win_proc_params *params ) DECLSPEC_HIDDEN; struct dce *get_class_dce( struct tagCLASS *class ) DECLSPEC_HIDDEN; struct dce *set_class_dce( struct tagCLASS *class, struct dce *dce ) DECLSPEC_HIDDEN; +extern void register_builtin_classes(void) DECLSPEC_HIDDEN; /* cursoricon.c */ HICON alloc_cursoricon_handle( BOOL is_icon ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index e206881e596..edafc522d14 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -4732,7 +4732,7 @@ static WND *create_window_handle( HWND parent, HWND owner, UNICODE_STRING *name, else assert( full_parent == thread_info->top_window ); if (full_parent && !user_driver->pCreateDesktopWindow( thread_info->top_window )) ERR( "failed to create desktop window\n" ); - if (user_callbacks) user_callbacks->register_builtin_classes(); + register_builtin_classes(); } else /* HWND_MESSAGE parent */ { diff --git a/dlls/win32u/winstation.c b/dlls/win32u/winstation.c index 4cd223750c2..0f6fb66a2b2 100644 --- a/dlls/win32u/winstation.c +++ b/dlls/win32u/winstation.c @@ -499,7 +499,7 @@ HWND get_desktop_window(void) if (!thread_info->top_window || !user_driver->pCreateDesktopWindow( thread_info->top_window )) ERR_(win)( "failed to create desktop window\n" ); - if (user_callbacks) user_callbacks->register_builtin_classes(); + register_builtin_classes(); return thread_info->top_window; } diff --git a/include/ntuser.h b/include/ntuser.h index cad90b91882..58486fcfcb0 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -34,6 +34,7 @@ enum NtUserCallWindowsHook, NtUserFreeCachedClipboardData, NtUserLoadDriver, + NtUserRegisterBuiltinClasses, NtUserRenderSynthesizedFormat, /* win16 hooks */ NtUserCallFreeIcon, -- 2.25.1

1 0

[PATCH v2 11/12] winex11: Directly use win32u and ntdll in a few more places.
by Huw Davies 26 Apr '22

26 Apr '22

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winex11.drv/clipboard.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index eb357ed4643..a0ccc3ebc96 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -203,7 +203,7 @@ static const char *debugstr_format( UINT id ) { WCHAR buffer[256]; - if (GetClipboardFormatNameW( id, buffer, 256 )) + if (NtUserGetClipboardFormatName( id, buffer, ARRAYSIZE(buffer) )) return wine_dbg_sprintf( "%04x %s", id, debugstr_w(buffer) ); switch (id) @@ -349,7 +349,8 @@ static void register_win32_formats( const UINT *ids, UINT size ) for (count = 0; count < 256 && size; ids++, size--) { if (find_win32_format( *ids )) continue; /* it already exists */ - if (!GetClipboardFormatNameW( *ids, buffer, 256 )) continue; /* not a named format */ + if (!NtUserGetClipboardFormatName( *ids, buffer, ARRAYSIZE(buffer) )) + continue; /* not a named format */ if (!(len = WideCharToMultiByte( CP_UNIXCP, 0, buffer, -1, NULL, 0, NULL, NULL ))) continue; if (!(names[count] = malloc( len ))) continue; WideCharToMultiByte( CP_UNIXCP, 0, buffer, -1, names[count], len, NULL, NULL ); @@ -434,6 +435,14 @@ static void put_property( Display *display, Window win, Atom prop, Atom type, in } +static void selection_sleep(void) +{ + LARGE_INTEGER timeout; + timeout.QuadPart = (ULONGLONG)SELECTION_WAIT * -10000; + NtDelayExecution( FALSE, &timeout ); +} + + /************************************************************************** * convert_selection */ @@ -455,7 +464,7 @@ static BOOL convert_selection( Display *display, Window win, Atom selection, Bool res = XCheckTypedWindowEvent( display, win, SelectionNotify, &event ); if (res && event.xselection.selection == selection && event.xselection.target == format->atom) return read_property( display, win, event.xselection.property, type, data, size ); - Sleep( SELECTION_WAIT ); + selection_sleep(); } ERR( "Timed out waiting for SelectionNotify event\n" ); return FALSE; @@ -1414,7 +1423,7 @@ static UINT *get_clipboard_formats( UINT *size ) for (;;) { if (!(ids = malloc( *size * sizeof(*ids) ))) return NULL; - if (GetUpdatedClipboardFormats( ids, *size, size )) break; + if (NtUserGetUpdatedClipboardFormats( ids, *size, size )) break; free( ids ); if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) return NULL; } @@ -1706,7 +1715,7 @@ static BOOL read_property( Display *display, Window w, Atom prop, if (res && xe.xproperty.atom == prop && xe.xproperty.state == PropertyNewValue) break; - Sleep(SELECTION_WAIT); + selection_sleep(); } if (i >= SELECTION_RETRIES || @@ -1863,14 +1872,14 @@ static BOOL request_selection_contents( Display *display, BOOL changed ) last_size != size || memcmp( last_data, data, size )); - if (!changed || !OpenClipboard( clipboard_hwnd )) + if (!changed || !NtUserOpenClipboard( clipboard_hwnd, 0 )) { free( data ); return FALSE; } TRACE( "selection changed, importing\n" ); - EmptyClipboard(); + NtUserEmptyClipboard(); is_clipboard_owner = TRUE; rendered_formats = 0; @@ -1884,9 +1893,9 @@ static BOOL request_selection_contents( Display *display, BOOL changed ) last_data = data; last_size = size; last_clipboard_update = GetTickCount64(); - CloseClipboard(); + NtUserCloseClipboard(); if (!use_xfixes) - SetTimer( clipboard_hwnd, 1, SELECTION_UPDATE_DELAY, NULL ); + NtUserSetTimer( clipboard_hwnd, 1, SELECTION_UPDATE_DELAY, NULL, TIMERV_DEFAULT_COALESCING ); return TRUE; } -- 2.25.1

1 0

[PATCH v2 10/12] winex11: Directly use ntdll in uri_to_dos.
by Huw Davies 26 Apr '22

26 Apr '22

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winex11.drv/clipboard.c | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index ec0392f3ec8..eb357ed4643 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -569,6 +569,29 @@ static HGLOBAL create_dib_from_bitmap(HBITMAP hBmp) } +/* based on wine_get_dos_file_name */ +static WCHAR *get_dos_file_name( const char *path ) +{ + ULONG len = strlen( path ) + 9; /* \??\unix prefix */ + WCHAR *ret; + + if (!(ret = malloc( len * sizeof(WCHAR) ))) return NULL; + if (wine_unix_to_nt_file_name( path, ret, &len )) + { + free( ret ); + return NULL; + } + + if (ret[5] == ':') + { + /* get rid of the \??\ prefix */ + memmove( ret, ret + 4, (len - 4) * sizeof(WCHAR) ); + } + else ret[1] = '\\'; + return ret; +} + + /*********************************************************************** * uri_to_dos * @@ -616,7 +639,7 @@ static WCHAR* uri_to_dos(char *encodedURI) if (uri[7] == '/') { /* file:///path/to/file (nautilus, thunar) */ - ret = wine_get_dos_file_name(&uri[7]); + ret = get_dos_file_name( &uri[7] ); } else if (uri[7]) { @@ -629,14 +652,14 @@ static WCHAR* uri_to_dos(char *encodedURI) if (strcmp(&uri[7], "localhost") == 0) { *path = '/'; - ret = wine_get_dos_file_name(path); + ret = get_dos_file_name( path ); } else if (gethostname(hostname, sizeof(hostname)) == 0) { if (strcmp(hostname, &uri[7]) == 0) { *path = '/'; - ret = wine_get_dos_file_name(path); + ret = get_dos_file_name( path ); } } } @@ -645,7 +668,7 @@ static WCHAR* uri_to_dos(char *encodedURI) else if (uri[6]) { /* file:/path/to/file (konqueror) */ - ret = wine_get_dos_file_name(&uri[5]); + ret = get_dos_file_name( &uri[5] ); } } free( uri ); @@ -938,7 +961,7 @@ static HANDLE import_text_uri_list( Atom type, const void *data, size_t size ) memcpy(&out[total], path, pathSize * sizeof(WCHAR)); total += pathSize; done: - HeapFree( GetProcessHeap(), 0, path ); + free( path ); if (out == NULL) break; } -- 2.25.1

1 0

[PATCH v2 09/12] winex11: Use data-only NtUserGetClipboardData to export clipboard data.
by Huw Davies 26 Apr '22

26 Apr '22

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winex11.drv/clipboard.c | 167 ++++++++++++++++------------------- 1 file changed, 75 insertions(+), 92 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 02456ef3870..ec0392f3ec8 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -97,7 +97,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(clipboard); #define SELECTION_UPDATE_DELAY 2000 /* delay between checks of the X11 selection */ -typedef BOOL (*EXPORTFUNC)( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); +typedef BOOL (*EXPORTFUNC)( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ); typedef HANDLE (*IMPORTFUNC)( Atom type, const void *data, size_t size ); struct clipboard_format @@ -121,19 +121,18 @@ static HANDLE import_text_html( Atom type, const void *data, size_t size ); static HANDLE import_text_uri_list( Atom type, const void *data, size_t size ); static HANDLE import_targets( Atom type, const void *data, size_t size ); -static BOOL export_data( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); -static BOOL export_string( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); -static BOOL export_utf8_string( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); -static BOOL export_text( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); -static BOOL export_compound_text( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); -static BOOL export_pixmap( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); -static BOOL export_image_bmp( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); -static BOOL export_enhmetafile( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); -static BOOL export_text_html( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); -static BOOL export_hdrop( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); -static BOOL export_targets( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); -static BOOL export_multiple( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); -static BOOL export_timestamp( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); +static BOOL export_data( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ); +static BOOL export_string( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ); +static BOOL export_utf8_string( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ); +static BOOL export_text( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ); +static BOOL export_compound_text( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ); +static BOOL export_pixmap( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ); +static BOOL export_image_bmp( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ); +static BOOL export_text_html( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ); +static BOOL export_hdrop( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ); +static BOOL export_targets( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ); +static BOOL export_multiple( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ); +static BOOL export_timestamp( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ); static BOOL read_property( Display *display, Window w, Atom prop, Atom *type, unsigned char **data, unsigned long *datasize ); @@ -167,7 +166,7 @@ static const struct { 0, CF_PENDATA, XATOM_WCF_PENDATA, import_data, export_data }, { 0, CF_RIFF, XATOM_WCF_RIFF, import_data, export_data }, { 0, CF_WAVE, XATOM_WCF_WAVE, import_data, export_data }, - { 0, CF_ENHMETAFILE, XATOM_WCF_ENHMETAFILE, import_enhmetafile, export_enhmetafile }, + { 0, CF_ENHMETAFILE, XATOM_WCF_ENHMETAFILE, import_enhmetafile, export_data }, { 0, CF_HDROP, XATOM_text_uri_list, import_text_uri_list, export_hdrop }, { 0, CF_DIB, XATOM_image_bmp, import_image_bmp, export_image_bmp }, { RichTextFormatW, 0, XATOM_text_rtf, import_data, export_data }, @@ -1099,13 +1098,9 @@ static HANDLE render_format( UINT id ) * * Generic export clipboard data routine. */ -static BOOL export_data( Display *display, Window win, Atom prop, Atom target, HANDLE handle ) +static BOOL export_data( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ) { - void *ptr = GlobalLock( handle ); - - if (!ptr) return FALSE; - put_property( display, win, prop, target, 8, ptr, GlobalSize( handle )); - GlobalUnlock( handle ); + put_property( display, win, prop, target, 8, data, size ); return TRUE; } @@ -1115,18 +1110,19 @@ static BOOL export_data( Display *display, Window win, Atom prop, Atom target, H * * Convert CF_UNICODETEXT data to a string in the specified codepage. */ -static char *string_from_unicode_text( UINT codepage, HANDLE handle, UINT *size ) +static char *string_from_unicode_text( UINT codepage, const WCHAR *string, size_t string_size, size_t *size ) { UINT i, j; char *str; - WCHAR *strW = GlobalLock( handle ); - UINT lenW = GlobalSize( handle ) / sizeof(WCHAR); - DWORD len = WideCharToMultiByte( codepage, 0, strW, lenW, NULL, 0, NULL, NULL ); + UINT lenW = string_size / sizeof(WCHAR); + DWORD len; + + if (!string_size) return NULL; + len = WideCharToMultiByte( codepage, 0, string, lenW, NULL, 0, NULL, NULL ); if ((str = malloc( len ))) { - WideCharToMultiByte( codepage, 0, strW, lenW, str, len, NULL, NULL); - GlobalUnlock( handle ); + WideCharToMultiByte( codepage, 0, string, lenW, str, len, NULL, NULL); /* remove carriage returns */ for (i = j = 0; i < len; i++) @@ -1138,7 +1134,6 @@ static char *string_from_unicode_text( UINT codepage, HANDLE handle, UINT *size *size = j; TRACE( "returning %s\n", debugstr_an( str, j )); } - GlobalUnlock( handle ); return str; } @@ -1148,15 +1143,13 @@ static char *string_from_unicode_text( UINT codepage, HANDLE handle, UINT *size * * Export CF_UNICODETEXT converting the string to XA_STRING. */ -static BOOL export_string( Display *display, Window win, Atom prop, Atom target, HANDLE handle ) +static BOOL export_string( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ) { - UINT size; - char *text = string_from_unicode_text( 28591, handle, &size ); + char *text = string_from_unicode_text( 28591, data, size, &size ); if (!text) return FALSE; put_property( display, win, prop, target, 8, text, size ); free( text ); - GlobalUnlock( handle ); return TRUE; } @@ -1166,15 +1159,14 @@ static BOOL export_string( Display *display, Window win, Atom prop, Atom target, * * Export CF_UNICODE converting the string to UTF8. */ -static BOOL export_utf8_string( Display *display, Window win, Atom prop, Atom target, HANDLE handle ) +static BOOL export_utf8_string( Display *display, Window win, Atom prop, Atom target, + void *data, size_t size ) { - UINT size; - char *text = string_from_unicode_text( CP_UTF8, handle, &size ); + char *text = string_from_unicode_text( CP_UTF8, data, size, &size ); if (!text) return FALSE; put_property( display, win, prop, target, 8, text, size ); free( text ); - GlobalUnlock( handle ); return TRUE; } @@ -1184,9 +1176,9 @@ static BOOL export_utf8_string( Display *display, Window win, Atom prop, Atom ta * * Export CF_UNICODE to the polymorphic TEXT type, using UTF8. */ -static BOOL export_text( Display *display, Window win, Atom prop, Atom target, HANDLE handle ) +static BOOL export_text( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ) { - return export_utf8_string( display, win, prop, x11drv_atom(UTF8_STRING), handle ); + return export_utf8_string( display, win, prop, x11drv_atom(UTF8_STRING), data, size ); } @@ -1195,12 +1187,12 @@ static BOOL export_text( Display *display, Window win, Atom prop, Atom target, H * * Export CF_UNICODE to COMPOUND_TEXT */ -static BOOL export_compound_text( Display *display, Window win, Atom prop, Atom target, HANDLE handle ) +static BOOL export_compound_text( Display *display, Window win, Atom prop, Atom target, + void *data, size_t size ) { XTextProperty textprop; XICCEncodingStyle style; - UINT size; - char *text = string_from_unicode_text( CP_UNIXCP, handle, &size ); + char *text = string_from_unicode_text( CP_UNIXCP, data, size, &size ); if (!text) return FALSE; if (target == x11drv_atom(COMPOUND_TEXT)) @@ -1225,18 +1217,16 @@ static BOOL export_compound_text( Display *display, Window win, Atom prop, Atom * * Export CF_DIB to XA_PIXMAP. */ -static BOOL export_pixmap( Display *display, Window win, Atom prop, Atom target, HANDLE handle ) +static BOOL export_pixmap( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ) { Pixmap pixmap; - BITMAPINFO *pbmi; + BITMAPINFO *pbmi = data; struct gdi_image_bits bits; - pbmi = GlobalLock( handle ); bits.ptr = (LPBYTE)pbmi + bitmap_info_size( pbmi, DIB_RGB_COLORS ); bits.free = NULL; bits.is_copy = FALSE; pixmap = create_pixmap_from_image( 0, &default_visual, pbmi, &bits, DIB_RGB_COLORS ); - GlobalUnlock( handle ); put_property( display, win, prop, target, 32, &pixmap, 1 ); /* FIXME: free the pixmap when the property is deleted */ @@ -1249,13 +1239,13 @@ static BOOL export_pixmap( Display *display, Window win, Atom prop, Atom target, * * Export CF_DIB to image/bmp. */ -static BOOL export_image_bmp( Display *display, Window win, Atom prop, Atom target, HANDLE handle ) +static BOOL export_image_bmp( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ) { - LPBYTE dibdata = GlobalLock( handle ); + LPBYTE dibdata = data; UINT bmpsize; BITMAPFILEHEADER *bfh; - bmpsize = sizeof(BITMAPFILEHEADER) + GlobalSize( handle ); + bmpsize = sizeof(BITMAPFILEHEADER) + size; bfh = malloc( bmpsize ); if (bfh) { @@ -1269,33 +1259,12 @@ static BOOL export_image_bmp( Display *display, Window win, Atom prop, Atom targ /* rest of bitmap is the same as the packed dib */ memcpy(bfh+1, dibdata, bmpsize-sizeof(BITMAPFILEHEADER)); } - GlobalUnlock( handle ); put_property( display, win, prop, target, 8, bfh, bmpsize ); free( bfh ); return TRUE; } -/************************************************************************** - * export_enhmetafile - * - * Export EnhMetaFile. - */ -static BOOL export_enhmetafile( Display *display, Window win, Atom prop, Atom target, HANDLE handle ) -{ - unsigned int size; - void *ptr; - - if (!(size = GetEnhMetaFileBits( handle, 0, NULL ))) return FALSE; - if (!(ptr = malloc( size ))) return FALSE; - - GetEnhMetaFileBits( handle, size, ptr ); - put_property( display, win, prop, target, 8, ptr, size ); - free( ptr ); - return TRUE; -} - - /************************************************************************** * export_text_html * @@ -1303,14 +1272,12 @@ static BOOL export_enhmetafile( Display *display, Window win, Atom prop, Atom ta * * FIXME: We should attempt to add an <a base> tag and convert windows paths. */ -static BOOL export_text_html( Display *display, Window win, Atom prop, Atom target, HANDLE handle ) +static BOOL export_text_html( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ) { - const char *p, *data; + const char *p; UINT start = 0, end = 0; BOOL ret = TRUE; - if (!(data = GlobalLock( handle ))) return FALSE; - p = data; while (*p && *p != '<') { @@ -1319,12 +1286,11 @@ static BOOL export_text_html( Display *display, Window win, Atom prop, Atom targ if (!(p = strpbrk( p, "\r\n" ))) break; while (*p == '\r' || *p == '\n') p++; } - if (start && start < end && end <= GlobalSize( handle )) - put_property( display, win, prop, target, 8, data + start, end - start ); + if (start && start < end && end <= size) + put_property( display, win, prop, target, 8, (char *)data + start, end - start ); else ret = FALSE; - GlobalUnlock( handle ); return ret; } @@ -1334,14 +1300,13 @@ static BOOL export_text_html( Display *display, Window win, Atom prop, Atom targ * * Export CF_HDROP format to text/uri-list. */ -static BOOL export_hdrop( Display *display, Window win, Atom prop, Atom target, HANDLE handle ) +static BOOL export_hdrop( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ) { char *textUriList = NULL; UINT textUriListSize = 32; UINT next = 0; const WCHAR *ptr; WCHAR *unicode_data = NULL; - void *data = GlobalLock( handle ); DROPFILES *drop_files = data; if (!drop_files->fWide) @@ -1406,7 +1371,6 @@ static BOOL export_hdrop( Display *display, Window win, Atom prop, Atom target, return TRUE; failed: - GlobalUnlock( handle ); free( unicode_data ); free( textUriList ); return FALSE; @@ -1454,7 +1418,7 @@ static BOOL is_format_available( UINT format, const UINT *ids, unsigned int coun * * Service a TARGETS selection request event */ -static BOOL export_targets( Display *display, Window win, Atom prop, Atom target, HANDLE handle ) +static BOOL export_targets( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ) { struct clipboard_format *format; UINT pos, count, *formats; @@ -1493,9 +1457,10 @@ static BOOL export_targets( Display *display, Window win, Atom prop, Atom target */ static BOOL export_selection( Display *display, Window win, Atom prop, Atom target ) { + struct get_clipboard_params params = { .data_only = TRUE }; struct clipboard_format *format; - HANDLE handle = 0; BOOL open = FALSE, ret = FALSE; + size_t buffer_size = 0; LIST_FOR_EACH_ENTRY( format, &format_list, struct clipboard_format, entry ) { @@ -1504,26 +1469,44 @@ static BOOL export_selection( Display *display, Window win, Atom prop, Atom targ if (!format->id) { TRACE( "win %lx prop %s target %s\n", win, debugstr_xatom( prop ), debugstr_xatom( target )); - ret = format->export( display, win, prop, target, 0 ); + ret = format->export( display, win, prop, target, NULL, 0 ); break; } - if (!open && !(open = OpenClipboard( clipboard_hwnd ))) + if (!open && !(open = NtUserOpenClipboard( clipboard_hwnd, 0 ))) { ERR( "failed to open clipboard for %s\n", debugstr_xatom( target )); return FALSE; } - if ((handle = GetClipboardData( format->id ))) + + if (!buffer_size) { - TRACE( "win %lx prop %s target %s exporting %s %p\n", - win, debugstr_xatom( prop ), debugstr_xatom( target ), - debugstr_format( format->id ), handle ); + buffer_size = 1024; + if (!(params.data = malloc( buffer_size ))) break; + } - ret = format->export( display, win, prop, target, handle ); - break; + for (;;) + { + params.size = buffer_size; + if (NtUserGetClipboardData( format->id, &params )) + { + TRACE( "win %lx prop %s target %s exporting %s\n", + win, debugstr_xatom( prop ), debugstr_xatom( target ), + debugstr_format( format->id ) ); + + ret = format->export( display, win, prop, target, params.data, params.size ); + goto done; + } + if (!params.data_size) break; + free( params.data ); + if (!(params.data = malloc( params.data_size ))) goto done; + buffer_size = params.data_size; + params.data_size = 0; } /* keep looking for another Win32 format mapping to the same target */ } - if (open) CloseClipboard(); +done: + free( params.data ); + if (open) NtUserCloseClipboard(); return ret; } @@ -1541,7 +1524,7 @@ static BOOL export_selection( Display *display, Window win, Atom prop, Atom targ * 2. If we fail to convert the target named by an atom in the MULTIPLE property, * we replace the atom in the property by None. */ -static BOOL export_multiple( Display *display, Window win, Atom prop, Atom target, HANDLE handle ) +static BOOL export_multiple( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ) { Atom atype; int aformat; @@ -1587,7 +1570,7 @@ static BOOL export_multiple( Display *display, Window win, Atom prop, Atom targe * * Export the timestamp that was used to acquire the selection */ -static BOOL export_timestamp( Display *display, Window win, Atom prop, Atom target, HANDLE handle ) +static BOOL export_timestamp( Display *display, Window win, Atom prop, Atom target, void *data, size_t size ) { Time time = CurrentTime; /* FIXME */ put_property( display, win, prop, XA_INTEGER, 32, &time, 1 ); -- 2.25.1

1 0

[PATCH v2 08/12] winex11: Don't use DragQueryFileW in export_hdrop.
by Huw Davies 26 Apr '22

26 Apr '22

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winex11.drv/clipboard.c | 41 +++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index d677aad034b..02456ef3870 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1336,30 +1336,39 @@ static BOOL export_text_html( Display *display, Window win, Atom prop, Atom targ */ static BOOL export_hdrop( Display *display, Window win, Atom prop, Atom target, HANDLE handle ) { - UINT i; - UINT numFiles; - char *textUriList; + char *textUriList = NULL; UINT textUriListSize = 32; UINT next = 0; + const WCHAR *ptr; + WCHAR *unicode_data = NULL; + void *data = GlobalLock( handle ); + DROPFILES *drop_files = data; - textUriList = malloc( textUriListSize ); - if (!textUriList) return FALSE; - numFiles = DragQueryFileW( handle, 0xFFFFFFFF, NULL, 0 ); - for (i = 0; i < numFiles; i++) + if (!drop_files->fWide) + { + char *p, *files = (char *)data + drop_files->pFiles; + p = files; + while (*p) p += strlen( p ) + 1; + p++; + + if (!(unicode_data = malloc( (p - files) * sizeof(WCHAR) ))) goto failed; + MultiByteToWideChar( CP_ACP, 0, files, p - files, unicode_data, p - files ); + ptr = unicode_data; + } + else ptr = (const WCHAR *)((char *)data + drop_files->pFiles); + + if (!(textUriList = malloc( textUriListSize ))) goto failed; + + while (*ptr) { - UINT dosFilenameSize; - WCHAR *dosFilename = NULL; char *unixFilename = NULL; UINT uriSize; UINT u; - dosFilenameSize = 1 + DragQueryFileW( handle, i, NULL, 0 ); - dosFilename = malloc( dosFilenameSize * sizeof(WCHAR) ); - if (dosFilename == NULL) goto failed; - DragQueryFileW( handle, i, dosFilename, dosFilenameSize ); - unixFilename = wine_get_unix_file_name(dosFilename); - free( dosFilename ); + unixFilename = wine_get_unix_file_name( ptr ); if (unixFilename == NULL) goto failed; + ptr += lstrlenW( ptr ) + 1; + uriSize = 8 + /* file:/// */ 3 * (lstrlenA(unixFilename) - 1) + /* "%xy" per char except first '/' */ 2; /* \r\n */ @@ -1397,6 +1406,8 @@ static BOOL export_hdrop( Display *display, Window win, Atom prop, Atom target, return TRUE; failed: + GlobalUnlock( handle ); + free( unicode_data ); free( textUriList ); return FALSE; } -- 2.25.1

1 0

[PATCH v2 07/12] win32u: Introduce data-only mode in NtUserGetClipboardData.
by Huw Davies 26 Apr '22

26 Apr '22

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/win32u/clipboard.c | 19 +++++++++++++++---- include/ntuser.h | 1 + 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/win32u/clipboard.c b/dlls/win32u/clipboard.c index 63306702b1c..67bdd0ba391 100644 --- a/dlls/win32u/clipboard.c +++ b/dlls/win32u/clipboard.c @@ -631,7 +631,7 @@ done: */ HANDLE WINAPI NtUserGetClipboardData( UINT format, struct get_clipboard_params *params ) { - struct cached_format *cache; + struct cached_format *cache = NULL; NTSTATUS status; UINT from, data_seqno; size_t size; @@ -642,7 +642,7 @@ HANDLE WINAPI NtUserGetClipboardData( UINT format, struct get_clipboard_params * { pthread_mutex_lock( &clipboard_mutex ); - cache = get_cached_format( format ); + if (!params->data_only) cache = get_cached_format( format ); SERVER_START_REQ( get_clipboard_data ) { @@ -662,6 +662,8 @@ HANDLE WINAPI NtUserGetClipboardData( UINT format, struct get_clipboard_params * } SERVER_END_REQ; + params->size = size; + if (!status && size) { if (cache) @@ -679,8 +681,18 @@ HANDLE WINAPI NtUserGetClipboardData( UINT format, struct get_clipboard_params * list_add_tail( &formats_to_free, &cache->entry ); } + if (params->data_only) + { + pthread_mutex_unlock( &clipboard_mutex ); + return params->data; + } + /* allocate new cache entry */ - if (!(cache = malloc( sizeof(*cache) ))) return 0; + if (!(cache = malloc( sizeof(*cache) ))) + { + pthread_mutex_unlock( &clipboard_mutex ); + return 0; + } cache->format = format; cache->seqno = data_seqno; @@ -690,7 +702,6 @@ HANDLE WINAPI NtUserGetClipboardData( UINT format, struct get_clipboard_params * pthread_mutex_unlock( &clipboard_mutex ); TRACE( "%s needs unmarshaling\n", debugstr_format( format ) ); params->data_size = ~0; - params->size = size; return 0; } pthread_mutex_unlock( &clipboard_mutex ); diff --git a/include/ntuser.h b/include/ntuser.h index f49c9bc7723..cad90b91882 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -257,6 +257,7 @@ struct get_clipboard_params size_t size; size_t data_size; UINT seqno; + BOOL data_only; }; /* NtUserSetClipboardData params, not compatible with Windows */ -- 2.25.1

1 0

[PATCH v2 06/12] user32: Merge caret.c into input.c.
by Huw Davies 26 Apr '22

26 Apr '22

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/user32/Makefile.in | 1 - dlls/user32/caret.c | 58 ----------------------------------------- dlls/user32/input.c | 27 +++++++++++++++++++ 3 files changed, 27 insertions(+), 59 deletions(-) delete mode 100644 dlls/user32/caret.c diff --git a/dlls/user32/Makefile.in b/dlls/user32/Makefile.in index dd83ecec5cf..92d5c1ec1d9 100644 --- a/dlls/user32/Makefile.in +++ b/dlls/user32/Makefile.in @@ -7,7 +7,6 @@ DELAYIMPORTS = hid setupapi imm32 C_SRCS = \ button.c \ - caret.c \ class.c \ clipboard.c \ combo.c \ diff --git a/dlls/user32/caret.c b/dlls/user32/caret.c deleted file mode 100644 index 9e0ff5ca48c..00000000000 --- a/dlls/user32/caret.c +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Caret functions - * - * Copyright 1993 David Metcalfe - * Copyright 1996 Frans van Dorsselaer - * Copyright 2001 Eric Pouech - * Copyright 2002 Alexandre Julliard - * - * 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 - */ - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "ntuser.h" -#include "user_private.h" -#include "wine/server.h" -#include "wine/debug.h" - -/***************************************************************** - * DestroyCaret (USER32.@) - */ -BOOL WINAPI DestroyCaret(void) -{ - return NtUserDestroyCaret(); -} - - -/***************************************************************** - * SetCaretPos (USER32.@) - */ -BOOL WINAPI SetCaretPos( INT x, INT y ) -{ - return NtUserSetCaretPos( x, y ); -} - - -/***************************************************************** - * SetCaretBlinkTime (USER32.@) - */ -BOOL WINAPI SetCaretBlinkTime( unsigned int time ) -{ - return NtUserSetCaretBlinkTime( time ); -} diff --git a/dlls/user32/input.c b/dlls/user32/input.c index dcb46df22b5..06756b5551e 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -162,6 +162,33 @@ HWND WINAPI GetCapture(void) } +/***************************************************************** + * DestroyCaret (USER32.@) + */ +BOOL WINAPI DestroyCaret(void) +{ + return NtUserDestroyCaret(); +} + + +/***************************************************************** + * SetCaretPos (USER32.@) + */ +BOOL WINAPI SetCaretPos( int x, int y ) +{ + return NtUserSetCaretPos( x, y ); +} + + +/***************************************************************** + * SetCaretBlinkTime (USER32.@) + */ +BOOL WINAPI SetCaretBlinkTime( unsigned int time ) +{ + return NtUserSetCaretBlinkTime( time ); +} + + /*********************************************************************** * GetInputState (USER32.@) */ -- 2.25.1

1 0

2025

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