wine-devel

wine-devel@winehq.org

6 participants
84465 discussions

[tools] testbot/web: Escape the GetTaskURL() ampersands.
by Francois Gouget 21 Apr '22

21 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- See also the corresponding user details patch. --- testbot/web/Activity.pl | 2 +- testbot/web/Stats.pl | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index 5a5a37505..a92435805 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -238,7 +238,7 @@ EOF $Label .= "/64" if ($Bitness); } } - my $URL = GetTaskURL($VMStatus->{job}->Id, $VMStatus->{step}->No, $VMStatus->{task}->No); + my $URL = $self->escapeHTML(GetTaskURL($VMStatus->{job}->Id, $VMStatus->{step}->No, $VMStatus->{task}->No)); my $Title = $self->escapeHTML($VMStatus->{job}->Remarks); $Label = "<a href='$URL' title='$Title'>$Label</a>"; } diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index 3c0fe9990..773fe3bb9 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -147,7 +147,7 @@ sub _GetStatHtml($$;$$) my ($JobId, $StepNo, $TaskNo) = ObjectModel::Collection::SplitKey(undef, $SrcObj->GetFullKey()); if (defined $TaskNo) { - return "<a href='". GetTaskURL($JobId, $StepNo, $TaskNo) ."'>$Value</a>"; + return "<a href='". $Stats->{Page}->escapeHTML(GetTaskURL($JobId, $StepNo, $TaskNo)) ."'>$Value</a>"; } return "<a href='/index.pl#job$JobId'>$Value</a>"; } @@ -174,6 +174,7 @@ sub _GenStatsLine($$$$;$) foreach my $Col (@$ColumnKeys) { my $Stats = $RowStats->{items}->{$Col}; + $Stats->{Page} = $RowStats->{Page}; my $Value = _GetStatHtml($Stats, $StatKey, $RowStats, $Flags); print "<td>$Value</td>\n"; } @@ -205,6 +206,7 @@ sub GenerateBody($) ### Show global statistics my $GlobalStats = $Stats->{global}; + $GlobalStats->{Page} = $self; print "<h2>General statistics</h2>\n"; print "<div class='CollectionBlock'><table>\n"; @@ -251,6 +253,7 @@ sub GenerateBody($) print "<tr><td class='StatSeparator'>Activity</td><td colspan='2'><hr></td></tr>\n"; my $VMsStats = $Stats->{vms}; + $VMsStats->{Page} = $self; _GenGlobalLine($VMsStats, "elapsed", "Activity history", "How far back the activity records go. This is used for the VM and VM host tables."); _GenGlobalLine($GlobalStats, "records.count", "Record count", "The number of activity records."); @@ -264,7 +267,8 @@ sub GenerateBody($) print "<thead><tr><th>Stat</th>\n"; my $HostsStats = $Stats->{hosts}; - my $SortedHosts = [ sort keys %{$Stats->{hosts}->{items}} ]; + $HostsStats->{Page} = $self; + my $SortedHosts = [ sort keys %{$HostsStats->{items}} ]; foreach my $Host (@$SortedHosts) { my $DisplayHost = $Host; -- 2.30.2

1 0

[tools] testbot/web: Tweak the main page's job details links.
by Francois Gouget 21 Apr '22

21 Apr '22

There is no need to call uri_escape() on integers. But GetDetailsLink() should go through escapeHTML() in case it contains ampersands. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- See also the corresponding user details patch. --- testbot/web/index.pl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 0b8a9cb78..1c506c9b1 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -26,7 +26,6 @@ use ObjectModel::CGI::CollectionBlock; our @ISA = qw(ObjectModel::CGI::CollectionBlock); use POSIX qw(strftime); -use URI::Escape; use WineTestBot::Branches; use WineTestBot::Users; @@ -89,9 +88,9 @@ sub GenerateDataView($$$) } elsif ($PropertyName eq "Status") { - my $EscapedKey = uri_escape($Row->{Item}->GetKey()); my $DetailsLink = $self->GetDetailsLink($Row); - print "<a id='job$EscapedKey' href='$DetailsLink'>"; + print "<a id='job", $Job->Id, "' href='", $self->escapeHTML($DetailsLink), + "'>"; my %HTMLChunks = ("queued" => "<span class='queued'>queued</span>", "running" => "<span class='running'>running</span>", -- 2.30.2

1 0

[tools] testbot/web: Escape URLs to the user details page.
by Francois Gouget 21 Apr '22

21 Apr '22

It may contain ampersands which should be escaped in HTML documents. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Web browsers don't actually care and HTML 5 reportedly allows not escaping them in URLs as long as they are not ambiguous (!~ /&[a-zA-Z]+;/) which ours shouldn't be (=~ /&[a-zA-Z]+=/). But the TestBot is still on HTML 4 which means strictly speaking it should escape these ampersands. --- testbot/web/admin/UsersList.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/admin/UsersList.pl b/testbot/web/admin/UsersList.pl index dcdb8111c..ec6d2822e 100644 --- a/testbot/web/admin/UsersList.pl +++ b/testbot/web/admin/UsersList.pl @@ -82,7 +82,7 @@ sub GenerateDataView($$$) { ($Class, $Label) = ('usernone', 'none'); } - my $DetailsLink = $self->GetDetailsLink($Row); + my $DetailsLink = $self->escapeHTML($self->GetDetailsLink($Row)); print "<a href='$DetailsLink'><span class='$Class'>$Label</span></a>"; } else -- 2.30.2

1 0

[tools] testbot: Shorten the "No patch found" disposition name.
by Francois Gouget 21 Apr '22

21 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Patches.pm | 2 +- testbot/tests/TestWTBS | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index d2ac52e4e..c0768bea7 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -550,7 +550,7 @@ sub NewPatch($$;$) my $SubjectInfo = $Patch->ParseSubject(); if (@PatchBodies == 0) { - $Patch->Disposition("No patch found"); + $Patch->Disposition("No patch"); } elsif (@PatchBodies > 1) { diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 8067a62e5..e5cd44832 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -1460,7 +1460,7 @@ sub CheckPatches() { ok(($Patch->Subject =~ /NoPatch/ or $Patch->Disposition eq "Reply to a patch series" or - $Patch->Disposition eq "No patch found"), + $Patch->Disposition eq "No patch"), "Found no file for patch ". $Patch->Id .": ". $Patch->Subject) or diag("Disposition=". $Patch->Disposition); } -- 2.30.2

1 0

[PATCH V3 1/5] dlls/kernel32/tests: move CreateProcess() handle inheritance test into a dedicated function
by Eric Pouech 21 Apr '22

21 Apr '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/kernel32/tests/process.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 8f18a0d37a7..e7b4f30b565 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1521,10 +1521,6 @@ static void test_Console(void) CONSOLE_SCREEN_BUFFER_INFO sbi, sbiC; DWORD modeIn, modeOut, modeInC, modeOutC; DWORD cpIn, cpOut, cpInC, cpOutC; - DWORD w; - HANDLE hChildIn, hChildInInh, hChildOut, hChildOutInh, hParentIn, hParentOut; - const char* msg = "This is a std-handle inheritance test."; - unsigned msg_len; BOOL run_tests = TRUE; char *result; @@ -1647,6 +1643,17 @@ static void test_Console(void) release_memory(); DeleteFileA(resfile); +} + +static void test_StdInheritance(void) +{ + char buffer[2 * MAX_PATH + 35]; + PROCESS_INFORMATION info; + STARTUPINFOA startup; + DWORD w; + HANDLE hChildIn, hChildInInh, hChildOut, hChildOutInh, hParentIn, hParentOut; + const char* msg = "This is a std-handle inheritance test."; + unsigned msg_len; ok(CreatePipe(&hParentIn, &hChildOut, NULL, 0), "Creating parent-input pipe\n"); ok(DuplicateHandle(GetCurrentProcess(), hChildOut, GetCurrentProcess(), @@ -5095,6 +5102,7 @@ START_TEST(process) test_SuspendFlag(); test_DebuggingFlag(); test_Console(); + test_StdInheritance(); test_ExitCode(); test_OpenProcess(); test_GetProcessVersion();

4 9

[PATCH 4/4] wineoss: Move MODM_PREPARE and MODM_UNPREPARE to the unixlib.
by Huw Davies 21 Apr '22

21 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 39 -------------------------------------- dlls/wineoss.drv/ossmidi.c | 36 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 39 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index aa672e211b9..9615c9892b9 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -663,41 +663,6 @@ static DWORD modGetDevCaps(WORD wDevID, LPMIDIOUTCAPSW lpCaps, DWORD dwSize) return MMSYSERR_NOERROR; } -/************************************************************************** - * modPrepare [internal] - */ -static DWORD modPrepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) -{ - TRACE("(%04X, %p, %d);\n", wDevID, lpMidiHdr, dwSize); - - if (dwSize < offsetof(MIDIHDR,dwOffset) || lpMidiHdr == 0 || lpMidiHdr->lpData == 0) - return MMSYSERR_INVALPARAM; - if (lpMidiHdr->dwFlags & MHDR_PREPARED) - return MMSYSERR_NOERROR; - - lpMidiHdr->lpNext = 0; - lpMidiHdr->dwFlags |= MHDR_PREPARED; - lpMidiHdr->dwFlags &= ~(MHDR_DONE|MHDR_INQUEUE); /* flags cleared since w2k */ - return MMSYSERR_NOERROR; -} - -/************************************************************************** - * modUnprepare [internal] - */ -static DWORD modUnprepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) -{ - TRACE("(%04X, %p, %d);\n", wDevID, lpMidiHdr, dwSize); - - if (dwSize < offsetof(MIDIHDR,dwOffset) || lpMidiHdr == 0 || lpMidiHdr->lpData == 0) - return MMSYSERR_INVALPARAM; - if (!(lpMidiHdr->dwFlags & MHDR_PREPARED)) - return MMSYSERR_NOERROR; - if (lpMidiHdr->dwFlags & MHDR_INQUEUE) - return MIDIERR_STILLPLAYING; - lpMidiHdr->dwFlags &= ~MHDR_PREPARED; - return MMSYSERR_NOERROR; -} - /************************************************************************** * modGetVolume [internal] */ @@ -803,10 +768,6 @@ DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return OSS_MidiInit(); case DRVM_EXIT: return OSS_MidiExit(); - case MODM_PREPARE: - return modPrepare(wDevID, (LPMIDIHDR)dwParam1, dwParam2); - case MODM_UNPREPARE: - return modUnprepare(wDevID, (LPMIDIHDR)dwParam1, dwParam2); case MODM_GETDEVCAPS: return modGetDevCaps(wDevID, (LPMIDIOUTCAPSW)dwParam1, dwParam2); case MODM_GETNUMDEVS: diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c index 7ab78bcbfdd..b97c5159e89 100644 --- a/dlls/wineoss.drv/ossmidi.c +++ b/dlls/wineoss.drv/ossmidi.c @@ -1014,6 +1014,36 @@ static UINT midi_out_long_data(WORD dev_id, MIDIHDR *hdr, UINT hdr_size, struct return MMSYSERR_NOERROR; } +static UINT midi_out_prepare(WORD dev_id, MIDIHDR *hdr, UINT hdr_size) +{ + TRACE("(%04X, %p, %d);\n", dev_id, hdr, hdr_size); + + if (hdr_size < offsetof(MIDIHDR, dwOffset) || !hdr || !hdr->lpData) + return MMSYSERR_INVALPARAM; + if (hdr->dwFlags & MHDR_PREPARED) + return MMSYSERR_NOERROR; + + hdr->lpNext = 0; + hdr->dwFlags |= MHDR_PREPARED; + hdr->dwFlags &= ~(MHDR_DONE | MHDR_INQUEUE); + return MMSYSERR_NOERROR; +} + +static UINT midi_out_unprepare(WORD dev_id, MIDIHDR *hdr, UINT hdr_size) +{ + TRACE("(%04X, %p, %d);\n", dev_id, hdr, hdr_size); + + if (hdr_size < offsetof(MIDIHDR, dwOffset) || !hdr || !hdr->lpData) + return MMSYSERR_INVALPARAM; + if (!(hdr->dwFlags & MHDR_PREPARED)) + return MMSYSERR_NOERROR; + if (hdr->dwFlags & MHDR_INQUEUE) + return MIDIERR_STILLPLAYING; + + hdr->dwFlags &= ~MHDR_PREPARED; + return MMSYSERR_NOERROR; +} + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -1039,6 +1069,12 @@ NTSTATUS midi_out_message(void *args) case MODM_LONGDATA: *params->err = midi_out_long_data(params->dev_id, (MIDIHDR *)params->param_1, params->param_2, params->notify); break; + case MODM_PREPARE: + *params->err = midi_out_prepare(params->dev_id, (MIDIHDR *)params->param_1, params->param_2); + break; + case MODM_UNPREPARE: + *params->err = midi_out_unprepare(params->dev_id, (MIDIHDR *)params->param_1, params->param_2); + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; -- 2.25.1

2 1

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

21 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 128 ------------------------------------- dlls/wineoss.drv/ossmidi.c | 83 ++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 128 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 1751af2349e..aa672e211b9 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -173,16 +173,6 @@ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, wDevID, wMsg, dwParam1, dwParam2); switch (wMsg) { - case MOM_DONE: - case MOM_POSITIONCB: - if (wDevID > MODM_NumDevs) return; - - dwCallBack = MidiOutDev[wDevID].midiDesc.dwCallback; - uFlags = MidiOutDev[wDevID].wFlags; - hDev = MidiOutDev[wDevID].midiDesc.hMidi; - dwInstance = MidiOutDev[wDevID].midiDesc.dwInstance; - break; - case MIM_OPEN: case MIM_CLOSE: case MIM_DATA: @@ -233,40 +223,6 @@ static int midiCloseSeq(int fd) return 0; } -/* FIXME: this is a bad idea, it's even not static... */ -SEQ_DEFINEBUF(1024); - -/* FIXME: this is not reentrant, not static - because of global variable - * _seqbuf and al. - */ -/************************************************************************** - * seqbuf_dump [internal] - * - * Used by SEQ_DUMPBUF to flush the buffer. - * - */ -void seqbuf_dump(void) -{ - int fd; - - /* The device is already open, but there's no way to pass the - fd to this function. Rather than rely on a global variable - we pretend to open the seq again. */ - fd = midiOpenSeq(); - if (_seqbufptr) { - if (write(fd, _seqbuf, _seqbufptr) == -1) { - WARN("Can't write data to sequencer %d, errno %d (%s)!\n", - fd, errno, strerror(errno)); - } - /* FIXME: - * in any case buffer is lost so that if many errors occur the buffer - * will not overrun - */ - _seqbufptr = 0; - } - midiCloseSeq(fd); -} - /************************************************************************** * midReceiveChar [internal] */ @@ -707,88 +663,6 @@ static DWORD modGetDevCaps(WORD wDevID, LPMIDIOUTCAPSW lpCaps, DWORD dwSize) return MMSYSERR_NOERROR; } -/************************************************************************** - * modLongData [internal] - */ -static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) -{ - int count; - LPBYTE lpData; - - TRACE("(%04X, %p, %08X);\n", wDevID, lpMidiHdr, dwSize); - - /* Note: MS doc does not say much about the dwBytesRecorded member of the MIDIHDR structure - * but it seems to be used only for midi input. - * Taking a look at the WAVEHDR structure (which is quite similar) confirms this assumption. - */ - - if (wDevID >= MODM_NumDevs) return MMSYSERR_BADDEVICEID; - if (!MidiOutDev[wDevID].bEnabled) return MIDIERR_NODEVICE; - - if (MidiOutDev[wDevID].fd == -1) { - WARN("can't play !\n"); - return MIDIERR_NODEVICE; - } - - lpData = (LPBYTE) lpMidiHdr->lpData; - - if (lpData == NULL) - return MIDIERR_UNPREPARED; - if (!(lpMidiHdr->dwFlags & MHDR_PREPARED)) - return MIDIERR_UNPREPARED; - if (lpMidiHdr->dwFlags & MHDR_INQUEUE) - return MIDIERR_STILLPLAYING; - lpMidiHdr->dwFlags &= ~MHDR_DONE; - lpMidiHdr->dwFlags |= MHDR_INQUEUE; - - /* FIXME: MS doc is not 100% clear. Will lpData only contain system exclusive - * data, or can it also contain raw MIDI data, to be split up and sent to - * modShortData() ? - * If the latter is true, then the following WARNing will fire up - */ - if (lpData[0] != 0xF0 || lpData[lpMidiHdr->dwBufferLength - 1] != 0xF7) { - WARN("The allegedly system exclusive buffer is not correct\n\tPlease report with MIDI file\n"); - } - - TRACE("dwBufferLength=%u !\n", lpMidiHdr->dwBufferLength); - TRACE(" %02X %02X %02X ... %02X %02X %02X\n", - lpData[0], lpData[1], lpData[2], lpData[lpMidiHdr->dwBufferLength-3], - lpData[lpMidiHdr->dwBufferLength-2], lpData[lpMidiHdr->dwBufferLength-1]); - - switch (MidiOutDev[wDevID].caps.wTechnology) { - case MOD_FMSYNTH: - /* FIXME: I don't think there is much to do here */ - break; - case MOD_MIDIPORT: - if (lpData[0] != 0xF0) { - /* Send end of System Exclusive */ - SEQ_MIDIOUT(wDevID - MODM_NumFMSynthDevs, 0xF0); - WARN("Adding missing 0xF0 marker at the beginning of " - "system exclusive byte stream\n"); - } - for (count = 0; count < lpMidiHdr->dwBufferLength; count++) { - SEQ_MIDIOUT(wDevID - MODM_NumFMSynthDevs, lpData[count]); - } - if (lpData[count - 1] != 0xF7) { - /* Send end of System Exclusive */ - SEQ_MIDIOUT(wDevID - MODM_NumFMSynthDevs, 0xF7); - WARN("Adding missing 0xF7 marker at the end of " - "system exclusive byte stream\n"); - } - SEQ_DUMPBUF(); - break; - default: - WARN("Technology not supported (yet) %d !\n", - MidiOutDev[wDevID].caps.wTechnology); - return MMSYSERR_NOTENABLED; - } - - lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; - lpMidiHdr->dwFlags |= MHDR_DONE; - MIDI_NotifyClient(wDevID, MOM_DONE, (DWORD_PTR)lpMidiHdr, 0L); - return MMSYSERR_NOERROR; -} - /************************************************************************** * modPrepare [internal] */ @@ -929,8 +803,6 @@ DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return OSS_MidiInit(); case DRVM_EXIT: return OSS_MidiExit(); - case MODM_LONGDATA: - return modLongData(wDevID, (LPMIDIHDR)dwParam1, dwParam2); case MODM_PREPARE: return modPrepare(wDevID, (LPMIDIHDR)dwParam1, dwParam2); case MODM_UNPREPARE: diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c index ee83da8bfcd..7ab78bcbfdd 100644 --- a/dlls/wineoss.drv/ossmidi.c +++ b/dlls/wineoss.drv/ossmidi.c @@ -934,6 +934,86 @@ static UINT midi_out_data(WORD dev_id, UINT data) return MMSYSERR_NOTENABLED; } +static UINT midi_out_long_data(WORD dev_id, MIDIHDR *hdr, UINT hdr_size, struct notify_context *notify) +{ + struct midi_dest *dest; + BYTE *data; + unsigned int count; + + TRACE("(%04X, %p, %08X);\n", dev_id, hdr, hdr_size); + + /* Note: MS doc does not say much about the dwBytesRecorded member of the MIDIHDR structure + * but it seems to be used only for midi input. + * Taking a look at the WAVEHDR structure (which is quite similar) confirms this assumption. + */ + + if (dev_id >= num_dests) return MMSYSERR_BADDEVICEID; + dest = dests + dev_id; + if (!dest->bEnabled) return MIDIERR_NODEVICE; + + if (dest->fd == -1) + { + WARN("can't play !\n"); + return MIDIERR_NODEVICE; + } + + data = (BYTE *)hdr->lpData; + + if (data == NULL) + return MIDIERR_UNPREPARED; + if (!(hdr->dwFlags & MHDR_PREPARED)) + return MIDIERR_UNPREPARED; + if (hdr->dwFlags & MHDR_INQUEUE) + return MIDIERR_STILLPLAYING; + hdr->dwFlags &= ~MHDR_DONE; + hdr->dwFlags |= MHDR_INQUEUE; + + /* FIXME: MS doc is not 100% clear. Will lpData only contain system exclusive + * data, or can it also contain raw MIDI data, to be split up and sent to + * modShortData() ? + * If the latter is true, then the following WARNing will fire up + */ + if (data[0] != 0xF0 || data[hdr->dwBufferLength - 1] != 0xF7) + WARN("The allegedly system exclusive buffer is not correct\n\tPlease report with MIDI file\n"); + + TRACE("dwBufferLength=%u !\n", hdr->dwBufferLength); + TRACE(" %02X %02X %02X ... %02X %02X %02X\n", + data[0], data[1], data[2], data[hdr->dwBufferLength - 3], + data[hdr->dwBufferLength - 2], data[hdr->dwBufferLength - 1]); + + switch (dest->caps.wTechnology) + { + case MOD_FMSYNTH: + /* FIXME: I don't think there is much to do here */ + break; + case MOD_MIDIPORT: + if (data[0] != 0xF0) + { + /* Send end of System Exclusive */ + SEQ_MIDIOUT(dev_id - num_synths, 0xF0); + WARN("Adding missing 0xF0 marker at the beginning of system exclusive byte stream\n"); + } + for (count = 0; count < hdr->dwBufferLength; count++) + SEQ_MIDIOUT(dev_id - num_synths, data[count]); + if (data[count - 1] != 0xF7) + { + /* Send end of System Exclusive */ + SEQ_MIDIOUT(dev_id - num_synths, 0xF7); + WARN("Adding missing 0xF7 marker at the end of system exclusive byte stream\n"); + } + SEQ_DUMPBUF(); + break; + default: + WARN("Technology not supported (yet) %d !\n", dest->caps.wTechnology); + return MMSYSERR_NOTENABLED; + } + + hdr->dwFlags &= ~MHDR_INQUEUE; + hdr->dwFlags |= MHDR_DONE; + set_out_notify(notify, dest, dev_id, MOM_DONE, (UINT_PTR)hdr, 0); + return MMSYSERR_NOERROR; +} + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -956,6 +1036,9 @@ NTSTATUS midi_out_message(void *args) case MODM_DATA: *params->err = midi_out_data(params->dev_id, params->param_1); break; + case MODM_LONGDATA: + *params->err = midi_out_long_data(params->dev_id, (MIDIHDR *)params->param_1, params->param_2, params->notify); + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; -- 2.25.1

2 1

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

21 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 338 +------------------------------------ dlls/wineoss.drv/oss.c | 1 - dlls/wineoss.drv/ossmidi.c | 301 ++++++++++++++++++++++++++++++++- dlls/wineoss.drv/unixlib.h | 9 - 4 files changed, 301 insertions(+), 348 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 70bc4b7b9bd..1751af2349e 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -692,46 +692,6 @@ static DWORD midStop(WORD wDevID) /*-----------------------------------------------------------------------*/ -typedef struct sVoice { - int note; /* 0 means not used */ - int channel; - unsigned cntMark : 30, - status : 2; -#define sVS_UNUSED 0 -#define sVS_PLAYING 1 -#define sVS_SUSTAINED 2 -} sVoice; - -typedef struct sChannel { - int program; - - int bender; - int benderRange; - /* controllers */ - int bank; /* CTL_BANK_SELECT */ - int volume; /* CTL_MAIN_VOLUME */ - int balance; /* CTL_BALANCE */ - int expression; /* CTL_EXPRESSION */ - int sustain; /* CTL_SUSTAIN */ - - unsigned char nrgPmtMSB; /* Non register Parameters */ - unsigned char nrgPmtLSB; - unsigned char regPmtMSB; /* Non register Parameters */ - unsigned char regPmtLSB; -} sChannel; - -typedef struct sFMextra { - unsigned counter; - int drumSetMask; - sChannel channel[16]; /* MIDI has only 16 channels */ - sVoice voice[1]; /* dyn allocated according to sound card */ - /* do not append fields below voice[1] since the size of this structure - * depends on the number of available voices on the FM synth... - */ -} sFMextra; - -#define IS_DRUM_CHANNEL(_xtra, _chn) ((_xtra)->drumSetMask & (1 << (_chn))) - /************************************************************************** * modGetDevCaps [internal] */ @@ -747,295 +707,6 @@ static DWORD modGetDevCaps(WORD wDevID, LPMIDIOUTCAPSW lpCaps, DWORD dwSize) return MMSYSERR_NOERROR; } -static UINT midi_out_fm_data(WORD dev_id, UINT data) -{ - struct midi_dest *dest = MidiOutDev + dev_id; - WORD evt = LOBYTE(LOWORD(data)); - WORD d1 = HIBYTE(LOWORD(data)); - WORD d2 = LOBYTE(HIWORD(data)); - sFMextra *extra = dest->lpExtra; - sVoice *voice = extra->voice; - sChannel *channel = extra->channel; - int chn = (evt & 0x0F), i, nv; - - /* FIXME: chorus depth controller is not used */ - - switch (evt & 0xF0) - { - case MIDI_NOTEOFF: - for (i = 0; i < dest->caps.wVoices; i++) - { - /* don't stop sustained notes */ - if (voice[i].status == sVS_PLAYING && voice[i].channel == chn && voice[i].note == d1) - { - voice[i].status = sVS_UNUSED; - SEQ_STOP_NOTE(dev_id, i, d1, d2); - } - } - break; - case MIDI_NOTEON: - if (d2 == 0) /* note off if velocity == 0 */ - { - for (i = 0; i < dest->caps.wVoices; i++) /* don't stop sustained notes */ - { - if (voice[i].status == sVS_PLAYING && voice[i].channel == chn && voice[i].note == d1) - { - voice[i].status = sVS_UNUSED; - SEQ_STOP_NOTE(dev_id, i, d1, 64); - } - } - break; - } - /* finding out in this order : - * - an empty voice - * - if replaying the same note on the same channel - * - the older voice (LRU) - */ - for (i = nv = 0; i < dest->caps.wVoices; i++) - { - if (voice[i].status == sVS_UNUSED || (voice[i].note == d1 && voice[i].channel == chn)) - { - nv = i; - break; - } - if (voice[i].cntMark < voice[0].cntMark) - nv = i; - } - TRACE("playing on voice=%d, pgm=%d, pan=0x%02X, vol=0x%02X, bender=0x%02X, note=0x%02X, vel=0x%02X\n", - nv, channel[chn].program, channel[chn].balance, channel[chn].volume, channel[chn].bender, d1, d2); - - SEQ_SET_PATCH(dev_id, nv, IS_DRUM_CHANNEL(extra, chn) ? - (128 + d1) : channel[chn].program); - SEQ_BENDER_RANGE(dev_id, nv, channel[chn].benderRange * 100); - SEQ_BENDER(dev_id, nv, channel[chn].bender); - SEQ_CONTROL(dev_id, nv, CTL_PAN, channel[chn].balance); - SEQ_CONTROL(dev_id, nv, CTL_EXPRESSION, channel[chn].expression); - SEQ_START_NOTE(dev_id, nv, d1, d2); - voice[nv].status = channel[chn].sustain ? sVS_SUSTAINED : sVS_PLAYING; - voice[nv].note = d1; - voice[nv].channel = chn; - voice[nv].cntMark = extra->counter++; - break; - case MIDI_KEY_PRESSURE: - for (i = 0; i < dest->caps.wVoices; i++) - if (voice[i].status != sVS_UNUSED && voice[i].channel == chn && voice[i].note == d1) - SEQ_KEY_PRESSURE(dev_id, i, d1, d2); - break; - case MIDI_CTL_CHANGE: - switch (d1) - { - case CTL_BANK_SELECT: channel[chn].bank = d2; break; - case CTL_MAIN_VOLUME: channel[chn].volume = d2; break; - case CTL_PAN: channel[chn].balance = d2; break; - case CTL_EXPRESSION: channel[chn].expression = d2; break; - case CTL_SUSTAIN: channel[chn].sustain = d2; - if (d2) - { - for (i = 0; i < dest->caps.wVoices; i++) - if (voice[i].status == sVS_PLAYING && voice[i].channel == chn) - voice[i].status = sVS_SUSTAINED; - } - else - { - for (i = 0; i < dest->caps.wVoices; i++) - { - if (voice[i].status == sVS_SUSTAINED && voice[i].channel == chn) - { - voice[i].status = sVS_UNUSED; - SEQ_STOP_NOTE(dev_id, i, voice[i].note, 64); - } - } - } - break; - case CTL_NONREG_PARM_NUM_LSB: channel[chn].nrgPmtLSB = d2; break; - case CTL_NONREG_PARM_NUM_MSB: channel[chn].nrgPmtMSB = d2; break; - case CTL_REGIST_PARM_NUM_LSB: channel[chn].regPmtLSB = d2; break; - case CTL_REGIST_PARM_NUM_MSB: channel[chn].regPmtMSB = d2; break; - case CTL_DATA_ENTRY: - switch ((channel[chn].regPmtMSB << 8) | channel[chn].regPmtLSB) - { - case 0x0000: - if (channel[chn].benderRange != d2) - { - channel[chn].benderRange = d2; - for (i = 0; i < dest->caps.wVoices; i++) - if (voice[i].channel == chn) - SEQ_BENDER_RANGE(dev_id, i, channel[chn].benderRange); - } - break; - - case 0x7F7F: - channel[chn].benderRange = 2; - for (i = 0; i < dest->caps.wVoices; i++) - if (voice[i].channel == chn) - SEQ_BENDER_RANGE(dev_id, i, channel[chn].benderRange); - break; - default: - TRACE("Data entry: regPmt=0x%02x%02x, nrgPmt=0x%02x%02x with %x\n", - channel[chn].regPmtMSB, channel[chn].regPmtLSB, - channel[chn].nrgPmtMSB, channel[chn].nrgPmtLSB, d2); - break; - } - break; - - case 0x78: /* all sounds off */ - /* FIXME: I don't know if I have to take care of the channel for this control? */ - for (i = 0; i < dest->caps.wVoices; i++) - { - if (voice[i].status != sVS_UNUSED && voice[i].channel == chn) - { - voice[i].status = sVS_UNUSED; - SEQ_STOP_NOTE(dev_id, i, voice[i].note, 64); - } - } - break; - case 0x7B: /* all notes off */ - /* FIXME: I don't know if I have to take care of the channel for this control? */ - for (i = 0; i < dest->caps.wVoices; i++) - { - if (voice[i].status == sVS_PLAYING && voice[i].channel == chn) - { - voice[i].status = sVS_UNUSED; - SEQ_STOP_NOTE(dev_id, i, voice[i].note, 64); - } - } - break; - default: - TRACE("Dropping MIDI control event 0x%02x(%02x) on channel %d\n", d1, d2, chn); - break; - } - break; - case MIDI_PGM_CHANGE: - channel[chn].program = d1; - break; - case MIDI_CHN_PRESSURE: - for (i = 0; i < dest->caps.wVoices; i++) - if (voice[i].status != sVS_UNUSED && voice[i].channel == chn) - SEQ_KEY_PRESSURE(dev_id, i, voice[i].note, d1); - - break; - case MIDI_PITCH_BEND: - channel[chn].bender = (d2 << 7) + d1; - for (i = 0; i < dest->caps.wVoices; i++) - if (voice[i].channel == chn) - SEQ_BENDER(dev_id, i, channel[chn].bender); - break; - case MIDI_SYSTEM_PREFIX: - switch (evt & 0x0F) - { - case 0x0F: /* Reset */ - OSS_CALL(midi_out_fm_reset, (void *)(UINT_PTR)dev_id); - break; - default: - WARN("Unsupported (yet) system event %02x\n", evt & 0x0F); - } - break; - default: - WARN("Internal error, shouldn't happen (event=%08x)\n", evt & 0xF0); - return MMSYSERR_NOTENABLED; - } - - SEQ_DUMPBUF(); - return MMSYSERR_NOERROR; -} - -static UINT midi_out_port_data(WORD dev_id, UINT data) -{ - WORD evt = LOBYTE(LOWORD(data)); - WORD d1 = HIBYTE(LOWORD(data)); - WORD d2 = LOBYTE(HIWORD(data)); - int dev = dev_id - MODM_NumFMSynthDevs; - - if (dev < 0) - { - WARN("Internal error on devID (%u) !\n", dev_id); - return MIDIERR_NODEVICE; - } - - switch (evt & 0xF0) - { - case MIDI_NOTEOFF: - case MIDI_NOTEON: - case MIDI_KEY_PRESSURE: - case MIDI_CTL_CHANGE: - case MIDI_PITCH_BEND: - SEQ_MIDIOUT(dev, evt); - SEQ_MIDIOUT(dev, d1); - SEQ_MIDIOUT(dev, d2); - break; - case MIDI_PGM_CHANGE: - case MIDI_CHN_PRESSURE: - SEQ_MIDIOUT(dev, evt); - SEQ_MIDIOUT(dev, d1); - break; - case MIDI_SYSTEM_PREFIX: - switch (evt & 0x0F) - { - case 0x00: /* System Exclusive, don't do it on MODM_DATA, should require MODM_LONGDATA */ - case 0x04: /* Undefined. */ - case 0x05: /* Undefined. */ - case 0x07: /* End of Exclusive. */ - case 0x09: /* Undefined. */ - case 0x0D: /* Undefined. */ - break; - case 0x06: /* Tune Request */ - case 0x08: /* Timing Clock. */ - case 0x0A: /* Start. */ - case 0x0B: /* Continue */ - case 0x0C: /* Stop */ - case 0x0E: /* Active Sensing. */ - SEQ_MIDIOUT(dev, evt); - break; - case 0x0F: /* Reset */ - SEQ_MIDIOUT(dev, MIDI_SYSTEM_PREFIX); - SEQ_MIDIOUT(dev, 0x7e); - SEQ_MIDIOUT(dev, 0x7f); - SEQ_MIDIOUT(dev, 0x09); - SEQ_MIDIOUT(dev, 0x01); - SEQ_MIDIOUT(dev, 0xf7); - break; - case 0x01: /* MTC Quarter frame */ - case 0x03: /* Song Select. */ - SEQ_MIDIOUT(dev, evt); - SEQ_MIDIOUT(dev, d1); - case 0x02: /* Song Position Pointer. */ - SEQ_MIDIOUT(dev, evt); - SEQ_MIDIOUT(dev, d1); - SEQ_MIDIOUT(dev, d2); - } - break; - } - - SEQ_DUMPBUF(); - return MMSYSERR_NOERROR; -} - -/************************************************************************** - * modData [internal] - */ -static DWORD modData(WORD wDevID, DWORD dwParam) -{ - TRACE("(%04X, %08X);\n", wDevID, dwParam); - - if (wDevID >= MODM_NumDevs) return MMSYSERR_BADDEVICEID; - if (!MidiOutDev[wDevID].bEnabled) return MIDIERR_NODEVICE; - - if (MidiOutDev[wDevID].fd == -1) { - WARN("can't play !\n"); - return MIDIERR_NODEVICE; - } - switch (MidiOutDev[wDevID].caps.wTechnology) { - case MOD_FMSYNTH: - return midi_out_fm_data(wDevID, dwParam); - case MOD_MIDIPORT: - return midi_out_port_data(wDevID, dwParam); - } - - WARN("Technology not supported (yet) %d !\n", - MidiOutDev[wDevID].caps.wTechnology); - return MMSYSERR_NOTENABLED; -} - /************************************************************************** * modLongData [internal] */ @@ -1164,6 +835,9 @@ static DWORD modGetVolume(WORD wDevID, DWORD* lpdwVolume) return (MidiOutDev[wDevID].caps.dwSupport & MIDICAPS_VOLUME) ? 0 : MMSYSERR_NOTSUPPORTED; } +DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, + DWORD_PTR dwParam1, DWORD_PTR dwParam2); + /************************************************************************** * modReset [internal] */ @@ -1182,9 +856,9 @@ static DWORD modReset(WORD wDevID) */ for (chn = 0; chn < 16; chn++) { /* turn off every note */ - modData(wDevID, 0x7800 | MIDI_CTL_CHANGE | chn); + OSS_modMessage(wDevID, MODM_DATA, 0, 0x7800 | MIDI_CTL_CHANGE | chn, 0); /* remove sustain on all channels */ - modData(wDevID, (CTL_SUSTAIN << 8) | MIDI_CTL_CHANGE | chn); + OSS_modMessage(wDevID, MODM_DATA, 0, (CTL_SUSTAIN << 8) | MIDI_CTL_CHANGE | chn, 0); } /* FIXME: the LongData buffers must also be returned to the app */ return MMSYSERR_NOERROR; @@ -1255,8 +929,6 @@ DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return OSS_MidiInit(); case DRVM_EXIT: return OSS_MidiExit(); - case MODM_DATA: - return modData(wDevID, dwParam1); case MODM_LONGDATA: return modLongData(wDevID, (LPMIDIHDR)dwParam1, dwParam2); case MODM_PREPARE: diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 1bd5ddb5762..db2f705a0c5 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1409,5 +1409,4 @@ unixlib_entry_t __wine_unix_call_funcs[] = midi_out_message, midi_seq_open, - midi_out_fm_reset, }; diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c index 613b070fde5..ee83da8bfcd 100644 --- a/dlls/wineoss.drv/ossmidi.c +++ b/dlls/wineoss.drv/ossmidi.c @@ -93,6 +93,8 @@ typedef struct sFMextra */ } sFMextra; +#define IS_DRUM_CHANNEL(_xtra, _chn) ((_xtra)->drumSetMask & (1 << (_chn))) + WINE_DEFAULT_DEBUG_CHANNEL(midi); static int oss_to_win_device_type(int type) @@ -458,9 +460,8 @@ static int midi_out_fm_load(WORD dev_id, int fd) return 0; } -NTSTATUS midi_out_fm_reset(void *args) +static void midi_out_fm_reset(WORD dev_id) { - WORD dev_id = (WORD)(UINT_PTR)args; struct midi_dest *dest = dests + dev_id; sFMextra *extra = dest->lpExtra; sVoice *voice = extra->voice; @@ -492,8 +493,6 @@ NTSTATUS midi_out_fm_reset(void *args) extra->counter = 0; extra->drumSetMask = 1 << 9; /* channel 10 is normally drums, sometimes 16 also */ SEQ_DUMPBUF(); - - return STATUS_SUCCESS; } static void set_out_notify(struct notify_context *notify, struct midi_dest *dest, WORD dev_id, WORD msg, @@ -572,7 +571,7 @@ static UINT midi_out_open(WORD dev_id, MIDIOPENDESC *midi_desc, UINT flags, stru free(extra); return MMSYSERR_ERROR; } - midi_out_fm_reset((void *)(UINT_PTR)dev_id); + midi_out_fm_reset(dev_id); break; } case MOD_MIDIPORT: @@ -645,6 +644,295 @@ static UINT midi_out_close(WORD dev_id, struct notify_context *notify) return MMSYSERR_NOERROR; } +static UINT midi_out_fm_data(WORD dev_id, UINT data) +{ + struct midi_dest *dest = dests + dev_id; + WORD evt = LOBYTE(LOWORD(data)); + WORD d1 = HIBYTE(LOWORD(data)); + WORD d2 = LOBYTE(HIWORD(data)); + sFMextra *extra = dest->lpExtra; + sVoice *voice = extra->voice; + sChannel *channel = extra->channel; + int chn = (evt & 0x0F), i, nv; + + /* FIXME: chorus depth controller is not used */ + + switch (evt & 0xF0) + { + case MIDI_NOTEOFF: + for (i = 0; i < dest->caps.wVoices; i++) + { + /* don't stop sustained notes */ + if (voice[i].status == sVS_PLAYING && voice[i].channel == chn && voice[i].note == d1) + { + voice[i].status = sVS_UNUSED; + SEQ_STOP_NOTE(dev_id, i, d1, d2); + } + } + break; + case MIDI_NOTEON: + if (d2 == 0) /* note off if velocity == 0 */ + { + for (i = 0; i < dest->caps.wVoices; i++) /* don't stop sustained notes */ + { + if (voice[i].status == sVS_PLAYING && voice[i].channel == chn && voice[i].note == d1) + { + voice[i].status = sVS_UNUSED; + SEQ_STOP_NOTE(dev_id, i, d1, 64); + } + } + break; + } + /* finding out in this order : + * - an empty voice + * - if replaying the same note on the same channel + * - the older voice (LRU) + */ + for (i = nv = 0; i < dest->caps.wVoices; i++) + { + if (voice[i].status == sVS_UNUSED || (voice[i].note == d1 && voice[i].channel == chn)) + { + nv = i; + break; + } + if (voice[i].cntMark < voice[0].cntMark) + nv = i; + } + TRACE("playing on voice=%d, pgm=%d, pan=0x%02X, vol=0x%02X, bender=0x%02X, note=0x%02X, vel=0x%02X\n", + nv, channel[chn].program, channel[chn].balance, channel[chn].volume, channel[chn].bender, d1, d2); + + SEQ_SET_PATCH(dev_id, nv, IS_DRUM_CHANNEL(extra, chn) ? + (128 + d1) : channel[chn].program); + SEQ_BENDER_RANGE(dev_id, nv, channel[chn].benderRange * 100); + SEQ_BENDER(dev_id, nv, channel[chn].bender); + SEQ_CONTROL(dev_id, nv, CTL_PAN, channel[chn].balance); + SEQ_CONTROL(dev_id, nv, CTL_EXPRESSION, channel[chn].expression); + SEQ_START_NOTE(dev_id, nv, d1, d2); + voice[nv].status = channel[chn].sustain ? sVS_SUSTAINED : sVS_PLAYING; + voice[nv].note = d1; + voice[nv].channel = chn; + voice[nv].cntMark = extra->counter++; + break; + case MIDI_KEY_PRESSURE: + for (i = 0; i < dest->caps.wVoices; i++) + if (voice[i].status != sVS_UNUSED && voice[i].channel == chn && voice[i].note == d1) + SEQ_KEY_PRESSURE(dev_id, i, d1, d2); + break; + case MIDI_CTL_CHANGE: + switch (d1) + { + case CTL_BANK_SELECT: channel[chn].bank = d2; break; + case CTL_MAIN_VOLUME: channel[chn].volume = d2; break; + case CTL_PAN: channel[chn].balance = d2; break; + case CTL_EXPRESSION: channel[chn].expression = d2; break; + case CTL_SUSTAIN: channel[chn].sustain = d2; + if (d2) + { + for (i = 0; i < dest->caps.wVoices; i++) + if (voice[i].status == sVS_PLAYING && voice[i].channel == chn) + voice[i].status = sVS_SUSTAINED; + } + else + { + for (i = 0; i < dest->caps.wVoices; i++) + { + if (voice[i].status == sVS_SUSTAINED && voice[i].channel == chn) + { + voice[i].status = sVS_UNUSED; + SEQ_STOP_NOTE(dev_id, i, voice[i].note, 64); + } + } + } + break; + case CTL_NONREG_PARM_NUM_LSB: channel[chn].nrgPmtLSB = d2; break; + case CTL_NONREG_PARM_NUM_MSB: channel[chn].nrgPmtMSB = d2; break; + case CTL_REGIST_PARM_NUM_LSB: channel[chn].regPmtLSB = d2; break; + case CTL_REGIST_PARM_NUM_MSB: channel[chn].regPmtMSB = d2; break; + case CTL_DATA_ENTRY: + switch ((channel[chn].regPmtMSB << 8) | channel[chn].regPmtLSB) + { + case 0x0000: + if (channel[chn].benderRange != d2) + { + channel[chn].benderRange = d2; + for (i = 0; i < dest->caps.wVoices; i++) + if (voice[i].channel == chn) + SEQ_BENDER_RANGE(dev_id, i, channel[chn].benderRange); + } + break; + + case 0x7F7F: + channel[chn].benderRange = 2; + for (i = 0; i < dest->caps.wVoices; i++) + if (voice[i].channel == chn) + SEQ_BENDER_RANGE(dev_id, i, channel[chn].benderRange); + break; + default: + TRACE("Data entry: regPmt=0x%02x%02x, nrgPmt=0x%02x%02x with %x\n", + channel[chn].regPmtMSB, channel[chn].regPmtLSB, + channel[chn].nrgPmtMSB, channel[chn].nrgPmtLSB, d2); + break; + } + break; + + case 0x78: /* all sounds off */ + /* FIXME: I don't know if I have to take care of the channel for this control? */ + for (i = 0; i < dest->caps.wVoices; i++) + { + if (voice[i].status != sVS_UNUSED && voice[i].channel == chn) + { + voice[i].status = sVS_UNUSED; + SEQ_STOP_NOTE(dev_id, i, voice[i].note, 64); + } + } + break; + case 0x7B: /* all notes off */ + /* FIXME: I don't know if I have to take care of the channel for this control? */ + for (i = 0; i < dest->caps.wVoices; i++) + { + if (voice[i].status == sVS_PLAYING && voice[i].channel == chn) + { + voice[i].status = sVS_UNUSED; + SEQ_STOP_NOTE(dev_id, i, voice[i].note, 64); + } + } + break; + default: + TRACE("Dropping MIDI control event 0x%02x(%02x) on channel %d\n", d1, d2, chn); + break; + } + break; + case MIDI_PGM_CHANGE: + channel[chn].program = d1; + break; + case MIDI_CHN_PRESSURE: + for (i = 0; i < dest->caps.wVoices; i++) + if (voice[i].status != sVS_UNUSED && voice[i].channel == chn) + SEQ_KEY_PRESSURE(dev_id, i, voice[i].note, d1); + + break; + case MIDI_PITCH_BEND: + channel[chn].bender = (d2 << 7) + d1; + for (i = 0; i < dest->caps.wVoices; i++) + if (voice[i].channel == chn) + SEQ_BENDER(dev_id, i, channel[chn].bender); + break; + case MIDI_SYSTEM_PREFIX: + switch (evt & 0x0F) + { + case 0x0F: /* Reset */ + midi_out_fm_reset(dev_id); + break; + default: + WARN("Unsupported (yet) system event %02x\n", evt & 0x0F); + } + break; + default: + WARN("Internal error, shouldn't happen (event=%08x)\n", evt & 0xF0); + return MMSYSERR_NOTENABLED; + } + + SEQ_DUMPBUF(); + return MMSYSERR_NOERROR; +} + +static UINT midi_out_port_data(WORD dev_id, UINT data) +{ + WORD evt = LOBYTE(LOWORD(data)); + WORD d1 = HIBYTE(LOWORD(data)); + WORD d2 = LOBYTE(HIWORD(data)); + int dev = dev_id - num_synths; + + if (dev < 0) + { + WARN("Internal error on devID (%u) !\n", dev_id); + return MIDIERR_NODEVICE; + } + + switch (evt & 0xF0) + { + case MIDI_NOTEOFF: + case MIDI_NOTEON: + case MIDI_KEY_PRESSURE: + case MIDI_CTL_CHANGE: + case MIDI_PITCH_BEND: + SEQ_MIDIOUT(dev, evt); + SEQ_MIDIOUT(dev, d1); + SEQ_MIDIOUT(dev, d2); + break; + case MIDI_PGM_CHANGE: + case MIDI_CHN_PRESSURE: + SEQ_MIDIOUT(dev, evt); + SEQ_MIDIOUT(dev, d1); + break; + case MIDI_SYSTEM_PREFIX: + switch (evt & 0x0F) + { + case 0x00: /* System Exclusive, don't do it on MODM_DATA, should require MODM_LONGDATA */ + case 0x04: /* Undefined. */ + case 0x05: /* Undefined. */ + case 0x07: /* End of Exclusive. */ + case 0x09: /* Undefined. */ + case 0x0D: /* Undefined. */ + break; + case 0x06: /* Tune Request */ + case 0x08: /* Timing Clock. */ + case 0x0A: /* Start. */ + case 0x0B: /* Continue */ + case 0x0C: /* Stop */ + case 0x0E: /* Active Sensing. */ + SEQ_MIDIOUT(dev, evt); + break; + case 0x0F: /* Reset */ + SEQ_MIDIOUT(dev, MIDI_SYSTEM_PREFIX); + SEQ_MIDIOUT(dev, 0x7e); + SEQ_MIDIOUT(dev, 0x7f); + SEQ_MIDIOUT(dev, 0x09); + SEQ_MIDIOUT(dev, 0x01); + SEQ_MIDIOUT(dev, 0xf7); + break; + case 0x01: /* MTC Quarter frame */ + case 0x03: /* Song Select. */ + SEQ_MIDIOUT(dev, evt); + SEQ_MIDIOUT(dev, d1); + case 0x02: /* Song Position Pointer. */ + SEQ_MIDIOUT(dev, evt); + SEQ_MIDIOUT(dev, d1); + SEQ_MIDIOUT(dev, d2); + } + break; + } + + SEQ_DUMPBUF(); + return MMSYSERR_NOERROR; +} + +static UINT midi_out_data(WORD dev_id, UINT data) +{ + struct midi_dest *dest; + + TRACE("(%04X, %08X);\n", dev_id, data); + + if (dev_id >= num_dests) return MMSYSERR_BADDEVICEID; + dest = dests + dev_id; + if (!dest->bEnabled) return MIDIERR_NODEVICE; + + if (dest->fd == -1) + { + WARN("can't play !\n"); + return MIDIERR_NODEVICE; + } + switch (dest->caps.wTechnology) + { + case MOD_FMSYNTH: + return midi_out_fm_data(dev_id, data); + case MOD_MIDIPORT: + return midi_out_port_data(dev_id, data); + } + + WARN("Technology not supported (yet) %d !\n", dest->caps.wTechnology); + return MMSYSERR_NOTENABLED; +} NTSTATUS midi_out_message(void *args) { @@ -665,6 +953,9 @@ NTSTATUS midi_out_message(void *args) case MODM_CLOSE: *params->err = midi_out_close(params->dev_id, params->notify); break; + case MODM_DATA: + *params->err = midi_out_data(params->dev_id, params->param_1); + 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 75506d445bc..d56e11b8d23 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -276,13 +276,6 @@ struct midi_seq_open_params int fd; }; -struct midi_out_fm_load_params -{ - WORD dev_id; - int fd; - int ret; -}; - enum oss_funcs { oss_test_connect, @@ -312,13 +305,11 @@ enum oss_funcs oss_midi_out_message, oss_midi_seq_open, /* temporary */ - oss_midi_out_fm_reset, }; NTSTATUS midi_init(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_out_message(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_seq_open(void *args) DECLSPEC_HIDDEN; -NTSTATUS midi_out_fm_reset(void *args) DECLSPEC_HIDDEN; extern unixlib_handle_t oss_handle; -- 2.25.1

2 1

[PATCH 1/4] wineoss: Use separate functions to handle MODM_DATA for FM synths and ports.
by Huw Davies 21 Apr '22

21 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 538 ++++++++++++++++++++-------------------- 1 file changed, 268 insertions(+), 270 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index d66e926655d..70bc4b7b9bd 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -747,15 +747,274 @@ static DWORD modGetDevCaps(WORD wDevID, LPMIDIOUTCAPSW lpCaps, DWORD dwSize) return MMSYSERR_NOERROR; } +static UINT midi_out_fm_data(WORD dev_id, UINT data) +{ + struct midi_dest *dest = MidiOutDev + dev_id; + WORD evt = LOBYTE(LOWORD(data)); + WORD d1 = HIBYTE(LOWORD(data)); + WORD d2 = LOBYTE(HIWORD(data)); + sFMextra *extra = dest->lpExtra; + sVoice *voice = extra->voice; + sChannel *channel = extra->channel; + int chn = (evt & 0x0F), i, nv; + + /* FIXME: chorus depth controller is not used */ + + switch (evt & 0xF0) + { + case MIDI_NOTEOFF: + for (i = 0; i < dest->caps.wVoices; i++) + { + /* don't stop sustained notes */ + if (voice[i].status == sVS_PLAYING && voice[i].channel == chn && voice[i].note == d1) + { + voice[i].status = sVS_UNUSED; + SEQ_STOP_NOTE(dev_id, i, d1, d2); + } + } + break; + case MIDI_NOTEON: + if (d2 == 0) /* note off if velocity == 0 */ + { + for (i = 0; i < dest->caps.wVoices; i++) /* don't stop sustained notes */ + { + if (voice[i].status == sVS_PLAYING && voice[i].channel == chn && voice[i].note == d1) + { + voice[i].status = sVS_UNUSED; + SEQ_STOP_NOTE(dev_id, i, d1, 64); + } + } + break; + } + /* finding out in this order : + * - an empty voice + * - if replaying the same note on the same channel + * - the older voice (LRU) + */ + for (i = nv = 0; i < dest->caps.wVoices; i++) + { + if (voice[i].status == sVS_UNUSED || (voice[i].note == d1 && voice[i].channel == chn)) + { + nv = i; + break; + } + if (voice[i].cntMark < voice[0].cntMark) + nv = i; + } + TRACE("playing on voice=%d, pgm=%d, pan=0x%02X, vol=0x%02X, bender=0x%02X, note=0x%02X, vel=0x%02X\n", + nv, channel[chn].program, channel[chn].balance, channel[chn].volume, channel[chn].bender, d1, d2); + + SEQ_SET_PATCH(dev_id, nv, IS_DRUM_CHANNEL(extra, chn) ? + (128 + d1) : channel[chn].program); + SEQ_BENDER_RANGE(dev_id, nv, channel[chn].benderRange * 100); + SEQ_BENDER(dev_id, nv, channel[chn].bender); + SEQ_CONTROL(dev_id, nv, CTL_PAN, channel[chn].balance); + SEQ_CONTROL(dev_id, nv, CTL_EXPRESSION, channel[chn].expression); + SEQ_START_NOTE(dev_id, nv, d1, d2); + voice[nv].status = channel[chn].sustain ? sVS_SUSTAINED : sVS_PLAYING; + voice[nv].note = d1; + voice[nv].channel = chn; + voice[nv].cntMark = extra->counter++; + break; + case MIDI_KEY_PRESSURE: + for (i = 0; i < dest->caps.wVoices; i++) + if (voice[i].status != sVS_UNUSED && voice[i].channel == chn && voice[i].note == d1) + SEQ_KEY_PRESSURE(dev_id, i, d1, d2); + break; + case MIDI_CTL_CHANGE: + switch (d1) + { + case CTL_BANK_SELECT: channel[chn].bank = d2; break; + case CTL_MAIN_VOLUME: channel[chn].volume = d2; break; + case CTL_PAN: channel[chn].balance = d2; break; + case CTL_EXPRESSION: channel[chn].expression = d2; break; + case CTL_SUSTAIN: channel[chn].sustain = d2; + if (d2) + { + for (i = 0; i < dest->caps.wVoices; i++) + if (voice[i].status == sVS_PLAYING && voice[i].channel == chn) + voice[i].status = sVS_SUSTAINED; + } + else + { + for (i = 0; i < dest->caps.wVoices; i++) + { + if (voice[i].status == sVS_SUSTAINED && voice[i].channel == chn) + { + voice[i].status = sVS_UNUSED; + SEQ_STOP_NOTE(dev_id, i, voice[i].note, 64); + } + } + } + break; + case CTL_NONREG_PARM_NUM_LSB: channel[chn].nrgPmtLSB = d2; break; + case CTL_NONREG_PARM_NUM_MSB: channel[chn].nrgPmtMSB = d2; break; + case CTL_REGIST_PARM_NUM_LSB: channel[chn].regPmtLSB = d2; break; + case CTL_REGIST_PARM_NUM_MSB: channel[chn].regPmtMSB = d2; break; + case CTL_DATA_ENTRY: + switch ((channel[chn].regPmtMSB << 8) | channel[chn].regPmtLSB) + { + case 0x0000: + if (channel[chn].benderRange != d2) + { + channel[chn].benderRange = d2; + for (i = 0; i < dest->caps.wVoices; i++) + if (voice[i].channel == chn) + SEQ_BENDER_RANGE(dev_id, i, channel[chn].benderRange); + } + break; + + case 0x7F7F: + channel[chn].benderRange = 2; + for (i = 0; i < dest->caps.wVoices; i++) + if (voice[i].channel == chn) + SEQ_BENDER_RANGE(dev_id, i, channel[chn].benderRange); + break; + default: + TRACE("Data entry: regPmt=0x%02x%02x, nrgPmt=0x%02x%02x with %x\n", + channel[chn].regPmtMSB, channel[chn].regPmtLSB, + channel[chn].nrgPmtMSB, channel[chn].nrgPmtLSB, d2); + break; + } + break; + + case 0x78: /* all sounds off */ + /* FIXME: I don't know if I have to take care of the channel for this control? */ + for (i = 0; i < dest->caps.wVoices; i++) + { + if (voice[i].status != sVS_UNUSED && voice[i].channel == chn) + { + voice[i].status = sVS_UNUSED; + SEQ_STOP_NOTE(dev_id, i, voice[i].note, 64); + } + } + break; + case 0x7B: /* all notes off */ + /* FIXME: I don't know if I have to take care of the channel for this control? */ + for (i = 0; i < dest->caps.wVoices; i++) + { + if (voice[i].status == sVS_PLAYING && voice[i].channel == chn) + { + voice[i].status = sVS_UNUSED; + SEQ_STOP_NOTE(dev_id, i, voice[i].note, 64); + } + } + break; + default: + TRACE("Dropping MIDI control event 0x%02x(%02x) on channel %d\n", d1, d2, chn); + break; + } + break; + case MIDI_PGM_CHANGE: + channel[chn].program = d1; + break; + case MIDI_CHN_PRESSURE: + for (i = 0; i < dest->caps.wVoices; i++) + if (voice[i].status != sVS_UNUSED && voice[i].channel == chn) + SEQ_KEY_PRESSURE(dev_id, i, voice[i].note, d1); + + break; + case MIDI_PITCH_BEND: + channel[chn].bender = (d2 << 7) + d1; + for (i = 0; i < dest->caps.wVoices; i++) + if (voice[i].channel == chn) + SEQ_BENDER(dev_id, i, channel[chn].bender); + break; + case MIDI_SYSTEM_PREFIX: + switch (evt & 0x0F) + { + case 0x0F: /* Reset */ + OSS_CALL(midi_out_fm_reset, (void *)(UINT_PTR)dev_id); + break; + default: + WARN("Unsupported (yet) system event %02x\n", evt & 0x0F); + } + break; + default: + WARN("Internal error, shouldn't happen (event=%08x)\n", evt & 0xF0); + return MMSYSERR_NOTENABLED; + } + + SEQ_DUMPBUF(); + return MMSYSERR_NOERROR; +} + +static UINT midi_out_port_data(WORD dev_id, UINT data) +{ + WORD evt = LOBYTE(LOWORD(data)); + WORD d1 = HIBYTE(LOWORD(data)); + WORD d2 = LOBYTE(HIWORD(data)); + int dev = dev_id - MODM_NumFMSynthDevs; + + if (dev < 0) + { + WARN("Internal error on devID (%u) !\n", dev_id); + return MIDIERR_NODEVICE; + } + + switch (evt & 0xF0) + { + case MIDI_NOTEOFF: + case MIDI_NOTEON: + case MIDI_KEY_PRESSURE: + case MIDI_CTL_CHANGE: + case MIDI_PITCH_BEND: + SEQ_MIDIOUT(dev, evt); + SEQ_MIDIOUT(dev, d1); + SEQ_MIDIOUT(dev, d2); + break; + case MIDI_PGM_CHANGE: + case MIDI_CHN_PRESSURE: + SEQ_MIDIOUT(dev, evt); + SEQ_MIDIOUT(dev, d1); + break; + case MIDI_SYSTEM_PREFIX: + switch (evt & 0x0F) + { + case 0x00: /* System Exclusive, don't do it on MODM_DATA, should require MODM_LONGDATA */ + case 0x04: /* Undefined. */ + case 0x05: /* Undefined. */ + case 0x07: /* End of Exclusive. */ + case 0x09: /* Undefined. */ + case 0x0D: /* Undefined. */ + break; + case 0x06: /* Tune Request */ + case 0x08: /* Timing Clock. */ + case 0x0A: /* Start. */ + case 0x0B: /* Continue */ + case 0x0C: /* Stop */ + case 0x0E: /* Active Sensing. */ + SEQ_MIDIOUT(dev, evt); + break; + case 0x0F: /* Reset */ + SEQ_MIDIOUT(dev, MIDI_SYSTEM_PREFIX); + SEQ_MIDIOUT(dev, 0x7e); + SEQ_MIDIOUT(dev, 0x7f); + SEQ_MIDIOUT(dev, 0x09); + SEQ_MIDIOUT(dev, 0x01); + SEQ_MIDIOUT(dev, 0xf7); + break; + case 0x01: /* MTC Quarter frame */ + case 0x03: /* Song Select. */ + SEQ_MIDIOUT(dev, evt); + SEQ_MIDIOUT(dev, d1); + case 0x02: /* Song Position Pointer. */ + SEQ_MIDIOUT(dev, evt); + SEQ_MIDIOUT(dev, d1); + SEQ_MIDIOUT(dev, d2); + } + break; + } + + SEQ_DUMPBUF(); + return MMSYSERR_NOERROR; +} + /************************************************************************** * modData [internal] */ static DWORD modData(WORD wDevID, DWORD dwParam) { - WORD evt = LOBYTE(LOWORD(dwParam)); - WORD d1 = HIBYTE(LOWORD(dwParam)); - WORD d2 = LOBYTE(HIWORD(dwParam)); - TRACE("(%04X, %08X);\n", wDevID, dwParam); if (wDevID >= MODM_NumDevs) return MMSYSERR_BADDEVICEID; @@ -767,275 +1026,14 @@ static DWORD modData(WORD wDevID, DWORD dwParam) } switch (MidiOutDev[wDevID].caps.wTechnology) { case MOD_FMSYNTH: - /* FIXME: - * - chorus depth controller is not used - */ - { - sFMextra* extra = MidiOutDev[wDevID].lpExtra; - sVoice* voice = extra->voice; - sChannel* channel = extra->channel; - int chn = (evt & 0x0F); - int i, nv; - - switch (evt & 0xF0) { - case MIDI_NOTEOFF: - for (i = 0; i < MidiOutDev[wDevID].caps.wVoices; i++) { - /* don't stop sustained notes */ - if (voice[i].status == sVS_PLAYING && voice[i].channel == chn && voice[i].note == d1) { - voice[i].status = sVS_UNUSED; - SEQ_STOP_NOTE(wDevID, i, d1, d2); - } - } - break; - case MIDI_NOTEON: - if (d2 == 0) { /* note off if velocity == 0 */ - for (i = 0; i < MidiOutDev[wDevID].caps.wVoices; i++) { - /* don't stop sustained notes */ - if (voice[i].status == sVS_PLAYING && voice[i].channel == chn && voice[i].note == d1) { - voice[i].status = sVS_UNUSED; - SEQ_STOP_NOTE(wDevID, i, d1, 64); - } - } - break; - } - /* finding out in this order : - * - an empty voice - * - if replaying the same note on the same channel - * - the older voice (LRU) - */ - for (i = nv = 0; i < MidiOutDev[wDevID].caps.wVoices; i++) { - if (voice[i].status == sVS_UNUSED || - (voice[i].note == d1 && voice[i].channel == chn)) { - nv = i; - break; - } - if (voice[i].cntMark < voice[0].cntMark) { - nv = i; - } - } - TRACE( - "playing on voice=%d, pgm=%d, pan=0x%02X, vol=0x%02X, " - "bender=0x%02X, note=0x%02X, vel=0x%02X\n", - nv, channel[chn].program, - channel[chn].balance, - channel[chn].volume, - channel[chn].bender, d1, d2); - - SEQ_SET_PATCH(wDevID, nv, IS_DRUM_CHANNEL(extra, chn) ? - (128 + d1) : channel[chn].program); - SEQ_BENDER_RANGE(wDevID, nv, channel[chn].benderRange * 100); - SEQ_BENDER(wDevID, nv, channel[chn].bender); - SEQ_CONTROL(wDevID, nv, CTL_PAN, channel[chn].balance); - SEQ_CONTROL(wDevID, nv, CTL_EXPRESSION, channel[chn].expression); -#if 0 - /* FIXME: does not really seem to work on my SB card and - * screws everything up... so lay it down - */ - SEQ_CONTROL(wDevID, nv, CTL_MAIN_VOLUME, channel[chn].volume); -#endif - SEQ_START_NOTE(wDevID, nv, d1, d2); - voice[nv].status = channel[chn].sustain ? sVS_SUSTAINED : sVS_PLAYING; - voice[nv].note = d1; - voice[nv].channel = chn; - voice[nv].cntMark = extra->counter++; - break; - case MIDI_KEY_PRESSURE: - for (i = 0; i < MidiOutDev[wDevID].caps.wVoices; i++) { - if (voice[i].status != sVS_UNUSED && voice[i].channel == chn && voice[i].note == d1) { - SEQ_KEY_PRESSURE(wDevID, i, d1, d2); - } - } - break; - case MIDI_CTL_CHANGE: - switch (d1) { - case CTL_BANK_SELECT: channel[chn].bank = d2; break; - case CTL_MAIN_VOLUME: channel[chn].volume = d2; break; - case CTL_PAN: channel[chn].balance = d2; break; - case CTL_EXPRESSION: channel[chn].expression = d2; break; - case CTL_SUSTAIN: channel[chn].sustain = d2; - if (d2) { - for (i = 0; i < MidiOutDev[wDevID].caps.wVoices; i++) { - if (voice[i].status == sVS_PLAYING && voice[i].channel == chn) { - voice[i].status = sVS_SUSTAINED; - } - } - } else { - for (i = 0; i < MidiOutDev[wDevID].caps.wVoices; i++) { - if (voice[i].status == sVS_SUSTAINED && voice[i].channel == chn) { - voice[i].status = sVS_UNUSED; - SEQ_STOP_NOTE(wDevID, i, voice[i].note, 64); - } - } - } - break; - case CTL_NONREG_PARM_NUM_LSB: channel[chn].nrgPmtLSB = d2; break; - case CTL_NONREG_PARM_NUM_MSB: channel[chn].nrgPmtMSB = d2; break; - case CTL_REGIST_PARM_NUM_LSB: channel[chn].regPmtLSB = d2; break; - case CTL_REGIST_PARM_NUM_MSB: channel[chn].regPmtMSB = d2; break; - case CTL_DATA_ENTRY: - switch ((channel[chn].regPmtMSB << 8) | channel[chn].regPmtLSB) { - case 0x0000: - if (channel[chn].benderRange != d2) { - channel[chn].benderRange = d2; - for (i = 0; i < MidiOutDev[wDevID].caps.wVoices; i++) { - if (voice[i].channel == chn) { - SEQ_BENDER_RANGE(wDevID, i, channel[chn].benderRange); - } - } - } - break; - - case 0x7F7F: - channel[chn].benderRange = 2; - for (i = 0; i < MidiOutDev[wDevID].caps.wVoices; i++) { - if (voice[i].channel == chn) { - SEQ_BENDER_RANGE(wDevID, i, channel[chn].benderRange); - } - } - break; - default: - TRACE("Data entry: regPmt=0x%02x%02x, nrgPmt=0x%02x%02x with %x\n", - channel[chn].regPmtMSB, channel[chn].regPmtLSB, - channel[chn].nrgPmtMSB, channel[chn].nrgPmtLSB, - d2); - break; - } - break; - - case 0x78: /* all sounds off */ - /* FIXME: I don't know if I have to take care of the channel - * for this control ? - */ - for (i = 0; i < MidiOutDev[wDevID].caps.wVoices; i++) { - if (voice[i].status != sVS_UNUSED && voice[i].channel == chn) { - voice[i].status = sVS_UNUSED; - SEQ_STOP_NOTE(wDevID, i, voice[i].note, 64); - } - } - break; - case 0x7B: /* all notes off */ - /* FIXME: I don't know if I have to take care of the channel - * for this control ? - */ - for (i = 0; i < MidiOutDev[wDevID].caps.wVoices; i++) { - if (voice[i].status == sVS_PLAYING && voice[i].channel == chn) { - voice[i].status = sVS_UNUSED; - SEQ_STOP_NOTE(wDevID, i, voice[i].note, 64); - } - } - break; - default: - TRACE("Dropping MIDI control event 0x%02x(%02x) on channel %d\n", - d1, d2, chn); - break; - } - break; - case MIDI_PGM_CHANGE: - channel[chn].program = d1; - break; - case MIDI_CHN_PRESSURE: - for (i = 0; i < MidiOutDev[wDevID].caps.wVoices; i++) { - if (voice[i].status != sVS_UNUSED && voice[i].channel == chn) { - SEQ_KEY_PRESSURE(wDevID, i, voice[i].note, d1); - } - } - break; - case MIDI_PITCH_BEND: - channel[chn].bender = (d2 << 7) + d1; - for (i = 0; i < MidiOutDev[wDevID].caps.wVoices; i++) { - if (voice[i].channel == chn) { - SEQ_BENDER(wDevID, i, channel[chn].bender); - } - } - break; - case MIDI_SYSTEM_PREFIX: - switch (evt & 0x0F) { - case 0x0F: /* Reset */ - OSS_CALL(midi_out_fm_reset, (void *)(UINT_PTR)wDevID); - break; - default: - WARN("Unsupported (yet) system event %02x\n", evt & 0x0F); - } - break; - default: - WARN("Internal error, shouldn't happen (event=%08x)\n", evt & 0xF0); - return MMSYSERR_NOTENABLED; - } - } - break; + return midi_out_fm_data(wDevID, dwParam); case MOD_MIDIPORT: - { - int dev = wDevID - MODM_NumFMSynthDevs; - if (dev < 0) { - WARN("Internal error on devID (%u) !\n", wDevID); - return MIDIERR_NODEVICE; - } - - switch (evt & 0xF0) { - case MIDI_NOTEOFF: - case MIDI_NOTEON: - case MIDI_KEY_PRESSURE: - case MIDI_CTL_CHANGE: - case MIDI_PITCH_BEND: - SEQ_MIDIOUT(dev, evt); - SEQ_MIDIOUT(dev, d1); - SEQ_MIDIOUT(dev, d2); - break; - case MIDI_PGM_CHANGE: - case MIDI_CHN_PRESSURE: - SEQ_MIDIOUT(dev, evt); - SEQ_MIDIOUT(dev, d1); - break; - case MIDI_SYSTEM_PREFIX: - switch (evt & 0x0F) { - case 0x00: /* System Exclusive, don't do it on modData, - * should require modLongData*/ - case 0x04: /* Undefined. */ - case 0x05: /* Undefined. */ - case 0x07: /* End of Exclusive. */ - case 0x09: /* Undefined. */ - case 0x0D: /* Undefined. */ - break; - case 0x06: /* Tune Request */ - case 0x08: /* Timing Clock. */ - case 0x0A: /* Start. */ - case 0x0B: /* Continue */ - case 0x0C: /* Stop */ - case 0x0E: /* Active Sensing. */ - SEQ_MIDIOUT(dev, evt); - break; - case 0x0F: /* Reset */ - /* SEQ_MIDIOUT(dev, evt); - this other way may be better */ - SEQ_MIDIOUT(dev, MIDI_SYSTEM_PREFIX); - SEQ_MIDIOUT(dev, 0x7e); - SEQ_MIDIOUT(dev, 0x7f); - SEQ_MIDIOUT(dev, 0x09); - SEQ_MIDIOUT(dev, 0x01); - SEQ_MIDIOUT(dev, 0xf7); - break; - case 0x01: /* MTC Quarter frame */ - case 0x03: /* Song Select. */ - SEQ_MIDIOUT(dev, evt); - SEQ_MIDIOUT(dev, d1); - case 0x02: /* Song Position Pointer. */ - SEQ_MIDIOUT(dev, evt); - SEQ_MIDIOUT(dev, d1); - SEQ_MIDIOUT(dev, d2); - } - break; - } - } - break; - default: - WARN("Technology not supported (yet) %d !\n", - MidiOutDev[wDevID].caps.wTechnology); - return MMSYSERR_NOTENABLED; + return midi_out_port_data(wDevID, dwParam); } - SEQ_DUMPBUF(); - - return MMSYSERR_NOERROR; + WARN("Technology not supported (yet) %d !\n", + MidiOutDev[wDevID].caps.wTechnology); + return MMSYSERR_NOTENABLED; } /************************************************************************** -- 2.25.1

2 1

[PATCH v3 1/7] crypt32/tests: Add tests for short return string buffer.
by Paul Gofman 21 Apr '22

21 Apr '22

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v3: - fix compiler warning. dlls/crypt32/tests/str.c | 331 +++++++++++++++------------------------ 1 file changed, 127 insertions(+), 204 deletions(-) diff --git a/dlls/crypt32/tests/str.c b/dlls/crypt32/tests/str.c index a94381591c0..e10d5a4fb29 100644 --- a/dlls/crypt32/tests/str.c +++ b/dlls/crypt32/tests/str.c @@ -429,23 +429,31 @@ static void test_CertNameToStrA(void) test_NameToStrConversionA(&blob, CERT_SIMPLE_NAME_STR, "\"a\nb\"", FALSE); } -static void test_NameToStrConversionW(PCERT_NAME_BLOB pName, DWORD dwStrType, - LPCWSTR expected, BOOL todo) +#define test_NameToStrConversionW(a, b, c) test_NameToStrConversionW_(__LINE__, a, b, c) +static void test_NameToStrConversionW_(unsigned int line, PCERT_NAME_BLOB pName, DWORD dwStrType, LPCWSTR expected) { - WCHAR buffer[2000] = { 0 }; - DWORD i; + DWORD len, retlen, expected_len; + WCHAR buffer[2000]; - i = CertNameToStrW(X509_ASN_ENCODING,pName, dwStrType, NULL, 0); - todo_wine_if (todo) - ok(i == lstrlenW(expected) + 1, "Expected %d chars, got %ld\n", - lstrlenW(expected) + 1, i); - i = CertNameToStrW(X509_ASN_ENCODING,pName, dwStrType, buffer, ARRAY_SIZE(buffer)); - todo_wine_if (todo) - ok(i == lstrlenW(expected) + 1, "Expected %d chars, got %ld\n", - lstrlenW(expected) + 1, i); - todo_wine_if (todo) - ok(!lstrcmpW(buffer, expected), "Expected %s, got %s\n", - wine_dbgstr_w(expected), wine_dbgstr_w(buffer)); + expected_len = wcslen(expected) + 1; + memset(buffer, 0xcc, sizeof(buffer)); + len = CertNameToStrW(X509_ASN_ENCODING, pName, dwStrType, NULL, 0); + ok(len == expected_len, "line %u: expected %lu chars, got %lu\n", line, expected_len, len); + retlen = CertNameToStrW(X509_ASN_ENCODING, pName, dwStrType, buffer, ARRAY_SIZE(buffer)); + ok(retlen == len, "line %u: expected %lu chars, got %lu.\n", line, len, retlen); + ok(!wcscmp(buffer, expected), "Expected %s, got %s\n", wine_dbgstr_w(expected), wine_dbgstr_w(buffer)); + + memset(buffer, 0xcc, sizeof(buffer)); + retlen = CertNameToStrW(X509_ASN_ENCODING, pName, dwStrType, buffer, len - 1); + todo_wine ok(retlen == len - 1, "line %u: expected %lu chars, got %lu\n", line, len - 1, retlen); + ok(!wcsncmp(buffer, expected, retlen - 1), "line %u: expected %s, got %s\n", + line, wine_dbgstr_w(expected), wine_dbgstr_w(buffer)); + ok(!buffer[retlen - 1], "line %u: string is not zero terminated.\n", line); + + memset(buffer, 0xcc, sizeof(buffer)); + retlen = CertNameToStrW(X509_ASN_ENCODING, pName, dwStrType, buffer, 0); + todo_wine ok(retlen == len, "line %u: expected %lu chars, got %lu\n", line, len - 1, retlen); + ok(buffer[0] == 0xcccc, "line %u: got %s\n", line, wine_dbgstr_w(buffer)); } static void test_CertNameToStrW(void) @@ -479,95 +487,79 @@ static void test_CertNameToStrW(void) test_NameToStrConversionW(&context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR, - L"US, Minnesota, Minneapolis, CodeWeavers, Wine Development, localhost, aric(a)codeweavers.com", FALSE); + L"US, Minnesota, Minneapolis, CodeWeavers, Wine Development, localhost, aric(a)codeweavers.com"); test_NameToStrConversionW(&context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR | CERT_NAME_STR_SEMICOLON_FLAG, - L"US; Minnesota; Minneapolis; CodeWeavers; Wine Development; localhost; aric(a)codeweavers.com", FALSE); + L"US; Minnesota; Minneapolis; CodeWeavers; Wine Development; localhost; aric(a)codeweavers.com"); test_NameToStrConversionW(&context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR | CERT_NAME_STR_CRLF_FLAG, - L"US\r\nMinnesota\r\nMinneapolis\r\nCodeWeavers\r\nWine Development\r\nlocalhost\r\naric(a)codeweavers.com", - FALSE); + L"US\r\nMinnesota\r\nMinneapolis\r\nCodeWeavers\r\nWine Development\r\nlocalhost\r\naric(a)codeweavers.com"); test_NameToStrConversionW(&context->pCertInfo->Subject, CERT_OID_NAME_STR, L"2.5.4.6=US, 2.5.4.8=Minnesota, 2.5.4.7=Minneapolis, 2.5.4.10=CodeWeavers, 2.5.4.11=Wine Development," - " 2.5.4.3=localhost, 1.2.840.113549.1.9.1=aric(a)codeweavers.com", FALSE); + " 2.5.4.3=localhost, 1.2.840.113549.1.9.1=aric(a)codeweavers.com"); test_NameToStrConversionW(&context->pCertInfo->Subject, CERT_OID_NAME_STR | CERT_NAME_STR_SEMICOLON_FLAG, L"2.5.4.6=US; 2.5.4.8=Minnesota; 2.5.4.7=Minneapolis; 2.5.4.10=CodeWeavers; 2.5.4.11=Wine Development;" - " 2.5.4.3=localhost; 1.2.840.113549.1.9.1=aric(a)codeweavers.com", FALSE); + " 2.5.4.3=localhost; 1.2.840.113549.1.9.1=aric(a)codeweavers.com"); test_NameToStrConversionW(&context->pCertInfo->Subject, CERT_OID_NAME_STR | CERT_NAME_STR_CRLF_FLAG, L"2.5.4.6=US\r\n2.5.4.8=Minnesota\r\n2.5.4.7=Minneapolis\r\n2.5.4.10=CodeWeavers\r\n2.5.4.11=Wine " - "Development\r\n2.5.4.3=localhost\r\n1.2.840.113549.1.9.1=aric(a)codeweavers.com", FALSE); + "Development\r\n2.5.4.3=localhost\r\n1.2.840.113549.1.9.1=aric(a)codeweavers.com"); test_NameToStrConversionW(&context->pCertInfo->Subject, CERT_X500_NAME_STR | CERT_NAME_STR_SEMICOLON_FLAG | CERT_NAME_STR_REVERSE_FLAG, L"E=aric(a)codeweavers.com; CN=localhost; OU=Wine Development; O=CodeWeavers; L=Minneapolis; S=Minnesota; " - "C=US", FALSE); + "C=US"); CertFreeCertificateContext(context); } blob.pbData = encodedSimpleCN; blob.cbData = sizeof(encodedSimpleCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=1", FALSE); + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=1"); blob.pbData = encodedSingleQuotedCN; blob.cbData = sizeof(encodedSingleQuotedCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN='1'", - FALSE); - test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, - L"'1'", FALSE); + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN='1'"); + test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"'1'"); blob.pbData = encodedSpacedCN; blob.cbData = sizeof(encodedSpacedCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\" 1 \"", FALSE); - test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\" 1 \"", - FALSE); + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\" 1 \""); + test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\" 1 \""); blob.pbData = encodedQuotedCN; blob.cbData = sizeof(encodedQuotedCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"\"\"1\"\"\"", - FALSE); - test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"\"\"1\"\"\"", - FALSE); + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"\"\"1\"\"\""); + test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"\"\"1\"\"\""); blob.pbData = encodedMultipleAttrCN; blob.cbData = sizeof(encodedMultipleAttrCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"1+2\"", - FALSE); - test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, - L"\"1+2\"", FALSE); + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"1+2\""); + test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"1+2\""); blob.pbData = encodedCommaCN; blob.cbData = sizeof(encodedCommaCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"a,b\"", FALSE); - test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"a,b\"", - FALSE); + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"a,b\""); + test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"a,b\""); blob.pbData = encodedEqualCN; blob.cbData = sizeof(encodedEqualCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"a=b\"", FALSE); - test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"a=b\"", - FALSE); + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"a=b\""); + test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"a=b\""); blob.pbData = encodedLessThanCN; blob.cbData = sizeof(encodedLessThanCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"<\"", FALSE); - test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"<\"", - FALSE); + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"<\""); + test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"<\""); blob.pbData = encodedGreaterThanCN; blob.cbData = sizeof(encodedGreaterThanCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\">\"", - FALSE); - test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, - L"\">\"", FALSE); + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\">\""); + test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\">\""); blob.pbData = encodedHashCN; blob.cbData = sizeof(encodedHashCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"#\"", FALSE); - test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"#\"", - FALSE); + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"#\""); + test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"#\""); blob.pbData = encodedSemiCN; blob.cbData = sizeof(encodedSemiCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\";\"", FALSE); - test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\";\"", - FALSE); + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\";\""); + test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\";\""); blob.pbData = encodedNewlineCN; blob.cbData = sizeof(encodedNewlineCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"a\nb\"", FALSE); - test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"a\nb\"", - FALSE); + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"a\nb\""); + test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"a\nb\""); } struct StrToNameA @@ -747,153 +739,84 @@ static void test_CertStrToNameW(void) } } -static void test_CertGetNameStringA(void) +#define test_CertGetNameString_value(a, b, c, d) test_CertGetNameString_value_(__LINE__, a, b, c, d) +static void test_CertGetNameString_value_(unsigned int line, PCCERT_CONTEXT context, DWORD type, void *type_para, + const char *expected) +{ + WCHAR expectedW[512]; + DWORD len, retlen; + WCHAR strW[512]; + unsigned int i; + char str[512]; + + for (i = 0; expected[i]; ++i) + expectedW[i] = expected[i]; + expectedW[i] = 0; + + len = CertGetNameStringA(context, type, 0, type_para, NULL, 0); + ok(len == strlen(expected) + 1, "line %u: unexpected length %ld.\n", line, len); + retlen = CertGetNameStringA(context, type, 0, type_para, str, len); + ok(retlen == len, "line %u: unexpected len %lu, expected %lu.\n", line, retlen, len); + ok(!strcmp(str, expected), "line %u: unexpected value %s.\n", line, str); + str[0] = str[1] = 0xcc; + retlen = CertGetNameStringA(context, type, 0, type_para, str, len - 1); + todo_wine ok(retlen == 1, "line %u: Unexpected len %lu, expected 1.\n", line, retlen); + todo_wine ok(!str[0], "line %u: unexpected str[0] %#x.\n", line, str[0]); + ok(str[1] == expected[1], "line %u: unexpected str[1] %#x.\n", line, str[1]); + retlen = CertGetNameStringW(context, type, 0, type_para, strW, len); + ok(retlen == len, "line %u: unexpected len %lu, expected 1.\n", line, retlen); + ok(!wcscmp(strW, expectedW), "line %u: unexpected value %s.\n", line, debugstr_w(strW)); + strW[0] = strW[1] = 0xcccc; + retlen = CertGetNameStringW(context, type, 0, type_para, strW, len - 1); + todo_wine ok(retlen == len - 1, "line %u: unexpected len %lu, expected %lu.\n", line, retlen, len - 1); + ok(!wcsncmp(strW, expectedW, retlen - 1), "line %u: string data mismatch.\n", line); + ok(!strW[retlen - 1], "line %u: string is not zero terminated.\n", line); + retlen = CertGetNameStringA(context, type, 0, type_para, NULL, len - 1); + ok(retlen == len, "line %u: unexpected len %lu, expected %lu\n", line, retlen, len); + retlen = CertGetNameStringW(context, type, 0, type_para, NULL, len - 1); + ok(retlen == len, "line %u: unexpected len %lu, expected %lu\n", line, retlen, len); +} + +static void test_CertGetNameString(void) { + static const char aric[] = "aric(a)codeweavers.com"; + static const char localhost[] = "localhost"; PCCERT_CONTEXT context; + DWORD len, type; context = CertCreateCertificateContext(X509_ASN_ENCODING, cert, sizeof(cert)); - ok(context != NULL, "CertCreateCertificateContext failed: %08lx\n", - GetLastError()); - if (context) - { - static const char aric[] = "aric(a)codeweavers.com"; - static const char localhost[] = "localhost"; - DWORD len, type; - LPSTR str; - - /* Bad string types/types missing from the cert */ - len = CertGetNameStringA(NULL, 0, 0, NULL, NULL, 0); - ok(len == 1, "expected 1, got %ld\n", len); - len = CertGetNameStringA(context, 0, 0, NULL, NULL, 0); - ok(len == 1, "expected 1, got %ld\n", len); - len = CertGetNameStringA(context, CERT_NAME_URL_TYPE, 0, NULL, NULL, - 0); - ok(len == 1, "expected 1, got %ld\n", len); - - len = CertGetNameStringA(context, CERT_NAME_EMAIL_TYPE, 0, NULL, NULL, - 0); - ok(len == strlen(aric) + 1, "unexpected length %ld\n", len); - str = HeapAlloc(GetProcessHeap(), 0, len); - if (str) - { - len = CertGetNameStringA(context, CERT_NAME_EMAIL_TYPE, 0, NULL, - str, len); - ok(!strcmp(str, aric), "unexpected value %s\n", str); - HeapFree(GetProcessHeap(), 0, str); - } - - len = CertGetNameStringA(context, CERT_NAME_RDN_TYPE, 0, NULL, NULL, - 0); - ok(len == strlen(issuerStr) + 1, "unexpected length %ld\n", len); - str = HeapAlloc(GetProcessHeap(), 0, len); - if (str) - { - len = CertGetNameStringA(context, CERT_NAME_RDN_TYPE, 0, NULL, - str, len); - ok(!strcmp(str, issuerStr), "unexpected value %s\n", str); - HeapFree(GetProcessHeap(), 0, str); - } - type = 0; - len = CertGetNameStringA(context, CERT_NAME_RDN_TYPE, 0, &type, NULL, - 0); - ok(len == strlen(issuerStr) + 1, "unexpected length %ld\n", len); - str = HeapAlloc(GetProcessHeap(), 0, len); - if (str) - { - len = CertGetNameStringA(context, CERT_NAME_RDN_TYPE, 0, &type, - str, len); - ok(!strcmp(str, issuerStr), "unexpected value %s\n", str); - HeapFree(GetProcessHeap(), 0, str); - } - type = CERT_OID_NAME_STR; - len = CertGetNameStringA(context, CERT_NAME_RDN_TYPE, 0, &type, NULL, - 0); - ok(len == strlen(subjectStr) + 1, "unexpected length %ld\n", len); - str = HeapAlloc(GetProcessHeap(), 0, len); - if (str) - { - len = CertGetNameStringA(context, CERT_NAME_RDN_TYPE, 0, &type, - str, len); - ok(!strcmp(str, subjectStr), "unexpected value %s\n", str); - HeapFree(GetProcessHeap(), 0, str); - } - - len = CertGetNameStringA(context, CERT_NAME_ATTR_TYPE, 0, NULL, NULL, - 0); - ok(len == strlen(aric) + 1, "unexpected length %ld\n", len); - str = HeapAlloc(GetProcessHeap(), 0, len); - if (str) - { - len = CertGetNameStringA(context, CERT_NAME_ATTR_TYPE, 0, NULL, - str, len); - ok(!strcmp(str, aric), "unexpected value %s\n", str); - HeapFree(GetProcessHeap(), 0, str); - } - len = CertGetNameStringA(context, CERT_NAME_ATTR_TYPE, 0, - (void *)szOID_RSA_emailAddr, NULL, 0); - ok(len == strlen(aric) + 1, "unexpected length %ld\n", len); - str = HeapAlloc(GetProcessHeap(), 0, len); - if (str) - { - len = CertGetNameStringA(context, CERT_NAME_ATTR_TYPE, 0, - (void *)szOID_RSA_emailAddr, str, len); - ok(!strcmp(str, aric), "unexpected value %s\n", str); - HeapFree(GetProcessHeap(), 0, str); - } - len = CertGetNameStringA(context, CERT_NAME_ATTR_TYPE, 0, - (void *)szOID_COMMON_NAME, NULL, 0); - ok(len == strlen(localhost) + 1, "unexpected length %ld\n", len); - str = HeapAlloc(GetProcessHeap(), 0, len); - if (str) - { - len = CertGetNameStringA(context, CERT_NAME_ATTR_TYPE, 0, - (void *)szOID_COMMON_NAME, str, len); - ok(!strcmp(str, localhost), "unexpected value %s\n", str); - HeapFree(GetProcessHeap(), 0, str); - } - - len = CertGetNameStringA(context, CERT_NAME_SIMPLE_DISPLAY_TYPE, 0, - NULL, NULL, 0); - ok(len == strlen(localhost) + 1, "unexpected length %ld\n", len); - str = HeapAlloc(GetProcessHeap(), 0, len); - if (str) - { - len = CertGetNameStringA(context, CERT_NAME_SIMPLE_DISPLAY_TYPE, - 0, NULL, str, len); - ok(!strcmp(str, localhost), "unexpected value %s\n", str); - HeapFree(GetProcessHeap(), 0, str); - } - - len = CertGetNameStringA(context, CERT_NAME_FRIENDLY_DISPLAY_TYPE, 0, - NULL, NULL, 0); - ok(len == strlen(localhost) + 1, "unexpected length %ld\n", len); - str = HeapAlloc(GetProcessHeap(), 0, len); - if (str) - { - len = CertGetNameStringA(context, CERT_NAME_FRIENDLY_DISPLAY_TYPE, - 0, NULL, str, len); - ok(!strcmp(str, localhost), "unexpected value %s\n", str); - HeapFree(GetProcessHeap(), 0, str); - } - - len = CertGetNameStringA(context, CERT_NAME_DNS_TYPE, 0, NULL, NULL, - 0); - ok(len == strlen(localhost) + 1, "unexpected length %ld\n", len); - if (len > 1) - { - str = HeapAlloc(GetProcessHeap(), 0, len); - if (str) - { - len = CertGetNameStringA(context, CERT_NAME_DNS_TYPE, 0, NULL, - str, len); - ok(!strcmp(str, localhost), "unexpected value %s\n", str); - HeapFree(GetProcessHeap(), 0, str); - } - } - - CertFreeCertificateContext(context); - } + ok(!!context, "CertCreateCertificateContext failed, err %lu\n", GetLastError()); + + /* Bad string types/types missing from the cert */ + len = CertGetNameStringA(NULL, 0, 0, NULL, NULL, 0); + ok(len == 1, "expected 1, got %lu\n", len); + len = CertGetNameStringA(context, 0, 0, NULL, NULL, 0); + ok(len == 1, "expected 1, got %lu\n", len); + len = CertGetNameStringA(context, CERT_NAME_URL_TYPE, 0, NULL, NULL, 0); + ok(len == 1, "expected 1, got %lu\n", len); + + len = CertGetNameStringW(NULL, 0, 0, NULL, NULL, 0); + ok(len == 1, "expected 1, got %lu\n", len); + len = CertGetNameStringW(context, 0, 0, NULL, NULL, 0); + ok(len == 1, "expected 1, got %lu\n", len); + len = CertGetNameStringW(context, CERT_NAME_URL_TYPE, 0, NULL, NULL, 0); + ok(len == 1, "expected 1, got %lu\n", len); + + test_CertGetNameString_value(context, CERT_NAME_EMAIL_TYPE, NULL, aric); + test_CertGetNameString_value(context, CERT_NAME_RDN_TYPE, NULL, issuerStr); + type = 0; + test_CertGetNameString_value(context, CERT_NAME_RDN_TYPE, &type, issuerStr); + type = CERT_OID_NAME_STR; + test_CertGetNameString_value(context, CERT_NAME_RDN_TYPE, &type, subjectStr); + test_CertGetNameString_value(context, CERT_NAME_ATTR_TYPE, NULL, aric); + test_CertGetNameString_value(context, CERT_NAME_ATTR_TYPE, (void *)szOID_RSA_emailAddr, aric); + test_CertGetNameString_value(context, CERT_NAME_ATTR_TYPE, (void *)szOID_COMMON_NAME, localhost); + test_CertGetNameString_value(context, CERT_NAME_SIMPLE_DISPLAY_TYPE, NULL, localhost); + test_CertGetNameString_value(context, CERT_NAME_FRIENDLY_DISPLAY_TYPE, NULL, localhost); + test_CertGetNameString_value(context, CERT_NAME_DNS_TYPE, NULL, localhost); + + CertFreeCertificateContext(context); } START_TEST(str) @@ -904,5 +827,5 @@ START_TEST(str) test_CertNameToStrW(); test_CertStrToNameA(); test_CertStrToNameW(); - test_CertGetNameStringA(); + test_CertGetNameString(); } -- 2.35.1

1 6

[PATCH v5 1/8] msvcr100: Add _StructuredTaskCollection::_Schedule stub.
by Torge Matthies 21 Apr '22

21 Apr '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47375 Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> --- v4 -> v5: Changed the spec file entries for i386/arm in addition to win64. dlls/concrt140/concrt140.spec | 6 +++--- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 6 +++--- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr120_app/msvcr120_app.spec | 6 +++--- dlls/msvcrt/concurrency.c | 27 +++++++++++++++++++++++++++ 6 files changed, 41 insertions(+), 14 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index 50db9348327..6bb95661dd1 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -594,9 +594,9 @@ @ stub -arch=arm ?_RunAndWait@_TaskCollection@details@Concurrency@@QAA?AW4_TaskCollectionStatus@23@PAV_UnrealizedChore@23@@Z @ stub -arch=i386 ?_RunAndWait@_TaskCollection@details@Concurrency@@QAG?AW4_TaskCollectionStatus@23@PAV_UnrealizedChore@23@@Z @ stub -arch=win64 ?_RunAndWait@_TaskCollection@details@Concurrency@@QEAA?AW4_TaskCollectionStatus@23@PEAV_UnrealizedChore@23@@Z -@ stub -arch=arm ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAAXPAV_UnrealizedChore@23@@Z -@ stub -arch=i386 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAEXPAV_UnrealizedChore@23@@Z -@ stub -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z +@ thiscall -arch=arm ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAAXPAV_UnrealizedChore@23@@Z(ptr ptr) StructuredTaskCollection__Schedule +@ thiscall -arch=i386 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAEXPAV_UnrealizedChore@23@@Z(ptr ptr) StructuredTaskCollection__Schedule +@ thiscall -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z(ptr ptr) StructuredTaskCollection__Schedule @ stub -arch=arm ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAAXPAV_UnrealizedChore@23@PAVlocation@3@@Z @ stub -arch=i386 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAEXPAV_UnrealizedChore@23@PAVlocation@3@@Z @ stub -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@PEAVlocation@3@@Z diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 19b4cbe96d7..2a03df03e33 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -363,8 +363,8 @@ @ stub -arch=win64 ?_RunAndWait@_StructuredTaskCollection@details@Concurrency@@QEAA?AW4_TaskCollectionStatus@23@PEAV_UnrealizedChore@23@@Z @ stub -arch=win32 ?_RunAndWait@_TaskCollection@details@Concurrency@@QAG?AW4_TaskCollectionStatus@23@PAV_UnrealizedChore@23@@Z @ stub -arch=win64 ?_RunAndWait@_TaskCollection@details@Concurrency@@QEAA?AW4_TaskCollectionStatus@23@PEAV_UnrealizedChore@23@@Z -@ stub -arch=win32 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAEXPAV_UnrealizedChore@23@@Z -@ stub -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z +@ thiscall -arch=win32 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAEXPAV_UnrealizedChore@23@@Z(ptr ptr) StructuredTaskCollection__Schedule +@ thiscall -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z(ptr ptr) StructuredTaskCollection__Schedule @ stub -arch=win32 ?_Schedule@_TaskCollection@details@Concurrency@@QAEXPAV_UnrealizedChore@23@@Z @ stub -arch=win64 ?_Schedule@_TaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z @ thiscall -arch=win32 ?_SetSpinCount@?$_SpinWait@$00@details@Concurrency@@QAEXI@Z(ptr long) SpinWait__SetSpinCount diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 23840f85eda..2888bd97e00 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -614,9 +614,9 @@ @ stub -arch=arm ?_RunAndWait@_TaskCollection@details@Concurrency@@QAA?AW4_TaskCollectionStatus@23@PAV_UnrealizedChore@23@@Z @ stub -arch=i386 ?_RunAndWait@_TaskCollection@details@Concurrency@@QAG?AW4_TaskCollectionStatus@23@PAV_UnrealizedChore@23@@Z @ stub -arch=win64 ?_RunAndWait@_TaskCollection@details@Concurrency@@QEAA?AW4_TaskCollectionStatus@23@PEAV_UnrealizedChore@23@@Z -@ stub -arch=arm ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAAXPAV_UnrealizedChore@23@@Z -@ stub -arch=i386 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAEXPAV_UnrealizedChore@23@@Z -@ stub -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z +@ thiscall -arch=arm ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAAXPAV_UnrealizedChore@23@@Z(ptr ptr) StructuredTaskCollection__Schedule +@ thiscall -arch=i386 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAEXPAV_UnrealizedChore@23@@Z(ptr ptr) StructuredTaskCollection__Schedule +@ thiscall -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z(ptr ptr) StructuredTaskCollection__Schedule @ stub -arch=arm ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAAXPAV_UnrealizedChore@23@PAVlocation@3@@Z @ stub -arch=i386 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAEXPAV_UnrealizedChore@23@PAVlocation@3@@Z @ stub -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@PEAVlocation@3@@Z diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 64ddeed42f4..8ddc09bcaf8 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -596,9 +596,9 @@ @ stub -arch=arm ?_RunAndWait@_TaskCollection@details@Concurrency@@QAA?AW4_TaskCollectionStatus@23@PAV_UnrealizedChore@23@@Z @ stub -arch=i386 ?_RunAndWait@_TaskCollection@details@Concurrency@@QAG?AW4_TaskCollectionStatus@23@PAV_UnrealizedChore@23@@Z @ stub -arch=win64 ?_RunAndWait@_TaskCollection@details@Concurrency@@QEAA?AW4_TaskCollectionStatus@23@PEAV_UnrealizedChore@23@@Z -@ stub -arch=arm ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAAXPAV_UnrealizedChore@23@@Z -@ stub -arch=i386 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAEXPAV_UnrealizedChore@23@@Z -@ stub -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z +@ thiscall -arch=arm ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAAXPAV_UnrealizedChore@23@@Z(ptr ptr) StructuredTaskCollection__Schedule +@ thiscall -arch=i386 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAEXPAV_UnrealizedChore@23@@Z(ptr ptr) StructuredTaskCollection__Schedule +@ thiscall -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z(ptr ptr) StructuredTaskCollection__Schedule @ stub -arch=arm ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAAXPAV_UnrealizedChore@23@PAVlocation@3@@Z @ stub -arch=i386 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAEXPAV_UnrealizedChore@23@PAVlocation@3@@Z @ stub -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@PEAVlocation@3@@Z diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 05f408d6884..4eb7cb6a298 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -592,9 +592,9 @@ @ stub -arch=arm ?_RunAndWait@_TaskCollection@details@Concurrency@@QAA?AW4_TaskCollectionStatus@23@PAV_UnrealizedChore@23@@Z @ stub -arch=i386 ?_RunAndWait@_TaskCollection@details@Concurrency@@QAG?AW4_TaskCollectionStatus@23@PAV_UnrealizedChore@23@@Z @ stub -arch=win64 ?_RunAndWait@_TaskCollection@details@Concurrency@@QEAA?AW4_TaskCollectionStatus@23@PEAV_UnrealizedChore@23@@Z -@ stub -arch=arm ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAAXPAV_UnrealizedChore@23@@Z -@ stub -arch=i386 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAEXPAV_UnrealizedChore@23@@Z -@ stub -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z +@ thiscall -arch=arm ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAAXPAV_UnrealizedChore@23@@Z(ptr ptr) msvcr120.?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAAXPAV_UnrealizedChore@23@@Z +@ thiscall -arch=i386 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAEXPAV_UnrealizedChore@23@@Z(ptr ptr) msvcr120.?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAEXPAV_UnrealizedChore@23@@Z +@ thiscall -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z(ptr ptr) msvcr120.?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z @ stub -arch=arm ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAAXPAV_UnrealizedChore@23@PAVlocation@3@@Z @ stub -arch=i386 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAEXPAV_UnrealizedChore@23@PAVlocation@3@@Z @ stub -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@PEAVlocation@3@@Z diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 2ca6421b0e7..db6e34ad457 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -174,6 +174,20 @@ typedef struct cs_queue #endif } cs_queue; +#if _MSVCR_VER >= 100 + +typedef struct +{ + char dummy; +} UnrealizedChore; + +typedef struct +{ + char dummy; +} StructuredTaskCollection; + +#endif /* _MSVCR_VER >= 100 */ + typedef struct { ULONG_PTR unk_thread_id; @@ -1741,6 +1755,19 @@ bool __thiscall SpinWait__SpinOnce(SpinWait *this) } } +#if _MSVCR_VER >= 100 + +/* ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAAXPAV_UnrealizedChore@23@@Z */ +/* ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAEXPAV_UnrealizedChore@23@@Z */ +/* ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z */ +DEFINE_THISCALL_WRAPPER(StructuredTaskCollection__Schedule, 8) +void __thiscall StructuredTaskCollection__Schedule(StructuredTaskCollection *this, UnrealizedChore *chore) +{ + FIXME("(%p %p): stub!\n", this, chore); +} + +#endif /* _MSVCR_VER >= 100 */ + /* ??0critical_section@Concurrency@@QAE@XZ */ /* ??0critical_section@Concurrency@@QEAA@XZ */ DEFINE_THISCALL_WRAPPER(critical_section_ctor, 4) -- 2.36.0

3 11

[PATCH v4 1/6] user.exe: Implement SetSystemTimer() using SetTimer().
by Zebediah Figura 21 Apr '22

21 Apr '22

Avoid using SetSystemTimer() to specify a callback; it does not support one. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v3: Actually call the window procedure... v4: Rebase. dlls/user.exe16/message.c | 5 +++++ dlls/user.exe16/user_private.h | 2 ++ dlls/user.exe16/window.c | 4 ++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 819d9d9b837..46561d722ed 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -1292,6 +1292,11 @@ LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT lParam = MAKELPARAM( 0, convert_handle_32_to_16( lParam, GMEM_DDESHARE )); ret = callback( HWND_16(hwnd), msg, wParam, lParam, result, arg ); break; /* FIXME don't know how to free allocated memory (handle) !! */ + case WM_TIMER: + if (wParam & SYSTEM_TIMER_FLAG) + msg = WM_SYSTIMER; + ret = callback( HWND_16(hwnd), msg, wParam, lParam, result, arg ); + break; case SBM_SETRANGE: ret = callback( HWND_16(hwnd), SBM_SETRANGE16, 0, MAKELPARAM(wParam, lParam), result, arg ); break; diff --git a/dlls/user.exe16/user_private.h b/dlls/user.exe16/user_private.h index 8a325cf9fb2..0805997246b 100644 --- a/dlls/user.exe16/user_private.h +++ b/dlls/user.exe16/user_private.h @@ -95,6 +95,8 @@ extern void call_WH_CALLWNDPROC_hook( HWND16 hwnd, UINT16 msg, WPARAM16 wp, LPAR #define WM_SYSTIMER 0x0118 +#define SYSTEM_TIMER_FLAG 0x10000 + /* Dialog info structure (must match the user32 one) */ typedef struct tagDIALOGINFO { diff --git a/dlls/user.exe16/window.c b/dlls/user.exe16/window.c index 590b8ae9f7c..e54dd6a803e 100644 --- a/dlls/user.exe16/window.c +++ b/dlls/user.exe16/window.c @@ -111,7 +111,7 @@ UINT16 WINAPI SetTimer16( HWND16 hwnd, UINT16 id, UINT16 timeout, TIMERPROC16 pr UINT16 WINAPI SetSystemTimer16( HWND16 hwnd, UINT16 id, UINT16 timeout, TIMERPROC16 proc ) { TIMERPROC proc32 = (TIMERPROC)WINPROC_AllocProc16( (WNDPROC16)proc ); - return SetSystemTimer( WIN_Handle32(hwnd), id, timeout, proc32 ); + return SetTimer( WIN_Handle32(hwnd), (UINT_PTR)id | SYSTEM_TIMER_FLAG, timeout, proc32 ); } @@ -1087,7 +1087,7 @@ void WINAPI SwitchToThisWindow16( HWND16 hwnd, BOOL16 restore ) */ BOOL16 WINAPI KillSystemTimer16( HWND16 hwnd, UINT16 id ) { - return KillSystemTimer( WIN_Handle32(hwnd), id ); + return KillTimer( WIN_Handle32(hwnd), (UINT_PTR)id | SYSTEM_TIMER_FLAG ); } -- 2.35.1

3 12

[PATCH v2 1/7] crypt32/tests: Add tests for short return string buffer.
by Paul Gofman 21 Apr '22

21 Apr '22

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/crypt32/tests/str.c | 332 +++++++++++++++------------------------ 1 file changed, 127 insertions(+), 205 deletions(-) diff --git a/dlls/crypt32/tests/str.c b/dlls/crypt32/tests/str.c index a94381591c0..c91a27a0995 100644 --- a/dlls/crypt32/tests/str.c +++ b/dlls/crypt32/tests/str.c @@ -429,23 +429,30 @@ static void test_CertNameToStrA(void) test_NameToStrConversionA(&blob, CERT_SIMPLE_NAME_STR, "\"a\nb\"", FALSE); } -static void test_NameToStrConversionW(PCERT_NAME_BLOB pName, DWORD dwStrType, - LPCWSTR expected, BOOL todo) +#define test_NameToStrConversionW(a, b, c) test_NameToStrConversionW_(__LINE__, a, b, c) +static void test_NameToStrConversionW_(unsigned int line, PCERT_NAME_BLOB pName, DWORD dwStrType, LPCWSTR expected) { - WCHAR buffer[2000] = { 0 }; - DWORD i; - - i = CertNameToStrW(X509_ASN_ENCODING,pName, dwStrType, NULL, 0); - todo_wine_if (todo) - ok(i == lstrlenW(expected) + 1, "Expected %d chars, got %ld\n", - lstrlenW(expected) + 1, i); - i = CertNameToStrW(X509_ASN_ENCODING,pName, dwStrType, buffer, ARRAY_SIZE(buffer)); - todo_wine_if (todo) - ok(i == lstrlenW(expected) + 1, "Expected %d chars, got %ld\n", - lstrlenW(expected) + 1, i); - todo_wine_if (todo) - ok(!lstrcmpW(buffer, expected), "Expected %s, got %s\n", - wine_dbgstr_w(expected), wine_dbgstr_w(buffer)); + WCHAR buffer[2000]; + DWORD len, retlen; + + memset(buffer, 0xcc, sizeof(buffer)); + len = CertNameToStrW(X509_ASN_ENCODING, pName, dwStrType, NULL, 0); + ok(len == wcslen(expected) + 1, "line %u: expected %u chars, got %lu\n", line, wcslen(expected) + 1, len); + retlen = CertNameToStrW(X509_ASN_ENCODING, pName, dwStrType, buffer, ARRAY_SIZE(buffer)); + ok(retlen == len, "line %u: expected %lu chars, got %lu.\n", line, len, retlen); + ok(!wcscmp(buffer, expected), "Expected %s, got %s\n", wine_dbgstr_w(expected), wine_dbgstr_w(buffer)); + + memset(buffer, 0xcc, sizeof(buffer)); + retlen = CertNameToStrW(X509_ASN_ENCODING, pName, dwStrType, buffer, len - 1); + todo_wine ok(retlen == len - 1, "line %u: expected %lu chars, got %lu\n", line, len - 1, retlen); + ok(!wcsncmp(buffer, expected, retlen - 1), "line %u: expected %s, got %s\n", + line, wine_dbgstr_w(expected), wine_dbgstr_w(buffer)); + ok(!buffer[retlen - 1], "line %u: string is not zero terminated.\n", line); + + memset(buffer, 0xcc, sizeof(buffer)); + retlen = CertNameToStrW(X509_ASN_ENCODING, pName, dwStrType, buffer, 0); + todo_wine ok(retlen == len, "line %u: expected %lu chars, got %lu\n", line, len - 1, retlen); + ok(buffer[0] == 0xcccc, "line %u: got %s\n", line, wine_dbgstr_w(buffer)); } static void test_CertNameToStrW(void) @@ -479,95 +486,79 @@ static void test_CertNameToStrW(void) test_NameToStrConversionW(&context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR, - L"US, Minnesota, Minneapolis, CodeWeavers, Wine Development, localhost, aric(a)codeweavers.com", FALSE); + L"US, Minnesota, Minneapolis, CodeWeavers, Wine Development, localhost, aric(a)codeweavers.com"); test_NameToStrConversionW(&context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR | CERT_NAME_STR_SEMICOLON_FLAG, - L"US; Minnesota; Minneapolis; CodeWeavers; Wine Development; localhost; aric(a)codeweavers.com", FALSE); + L"US; Minnesota; Minneapolis; CodeWeavers; Wine Development; localhost; aric(a)codeweavers.com"); test_NameToStrConversionW(&context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR | CERT_NAME_STR_CRLF_FLAG, - L"US\r\nMinnesota\r\nMinneapolis\r\nCodeWeavers\r\nWine Development\r\nlocalhost\r\naric(a)codeweavers.com", - FALSE); + L"US\r\nMinnesota\r\nMinneapolis\r\nCodeWeavers\r\nWine Development\r\nlocalhost\r\naric(a)codeweavers.com"); test_NameToStrConversionW(&context->pCertInfo->Subject, CERT_OID_NAME_STR, L"2.5.4.6=US, 2.5.4.8=Minnesota, 2.5.4.7=Minneapolis, 2.5.4.10=CodeWeavers, 2.5.4.11=Wine Development," - " 2.5.4.3=localhost, 1.2.840.113549.1.9.1=aric(a)codeweavers.com", FALSE); + " 2.5.4.3=localhost, 1.2.840.113549.1.9.1=aric(a)codeweavers.com"); test_NameToStrConversionW(&context->pCertInfo->Subject, CERT_OID_NAME_STR | CERT_NAME_STR_SEMICOLON_FLAG, L"2.5.4.6=US; 2.5.4.8=Minnesota; 2.5.4.7=Minneapolis; 2.5.4.10=CodeWeavers; 2.5.4.11=Wine Development;" - " 2.5.4.3=localhost; 1.2.840.113549.1.9.1=aric(a)codeweavers.com", FALSE); + " 2.5.4.3=localhost; 1.2.840.113549.1.9.1=aric(a)codeweavers.com"); test_NameToStrConversionW(&context->pCertInfo->Subject, CERT_OID_NAME_STR | CERT_NAME_STR_CRLF_FLAG, L"2.5.4.6=US\r\n2.5.4.8=Minnesota\r\n2.5.4.7=Minneapolis\r\n2.5.4.10=CodeWeavers\r\n2.5.4.11=Wine " - "Development\r\n2.5.4.3=localhost\r\n1.2.840.113549.1.9.1=aric(a)codeweavers.com", FALSE); + "Development\r\n2.5.4.3=localhost\r\n1.2.840.113549.1.9.1=aric(a)codeweavers.com"); test_NameToStrConversionW(&context->pCertInfo->Subject, CERT_X500_NAME_STR | CERT_NAME_STR_SEMICOLON_FLAG | CERT_NAME_STR_REVERSE_FLAG, L"E=aric(a)codeweavers.com; CN=localhost; OU=Wine Development; O=CodeWeavers; L=Minneapolis; S=Minnesota; " - "C=US", FALSE); + "C=US"); CertFreeCertificateContext(context); } blob.pbData = encodedSimpleCN; blob.cbData = sizeof(encodedSimpleCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=1", FALSE); + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=1"); blob.pbData = encodedSingleQuotedCN; blob.cbData = sizeof(encodedSingleQuotedCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN='1'", - FALSE); - test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, - L"'1'", FALSE); + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN='1'"); + test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"'1'"); blob.pbData = encodedSpacedCN; blob.cbData = sizeof(encodedSpacedCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\" 1 \"", FALSE); - test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\" 1 \"", - FALSE); + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\" 1 \""); + test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\" 1 \""); blob.pbData = encodedQuotedCN; blob.cbData = sizeof(encodedQuotedCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"\"\"1\"\"\"", - FALSE); - test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"\"\"1\"\"\"", - FALSE); + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"\"\"1\"\"\""); + test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"\"\"1\"\"\""); blob.pbData = encodedMultipleAttrCN; blob.cbData = sizeof(encodedMultipleAttrCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"1+2\"", - FALSE); - test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, - L"\"1+2\"", FALSE); + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"1+2\""); + test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"1+2\""); blob.pbData = encodedCommaCN; blob.cbData = sizeof(encodedCommaCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"a,b\"", FALSE); - test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"a,b\"", - FALSE); + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"a,b\""); + test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"a,b\""); blob.pbData = encodedEqualCN; blob.cbData = sizeof(encodedEqualCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"a=b\"", FALSE); - test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"a=b\"", - FALSE); + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"a=b\""); + test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"a=b\""); blob.pbData = encodedLessThanCN; blob.cbData = sizeof(encodedLessThanCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"<\"", FALSE); - test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"<\"", - FALSE); + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"<\""); + test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"<\""); blob.pbData = encodedGreaterThanCN; blob.cbData = sizeof(encodedGreaterThanCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\">\"", - FALSE); - test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, - L"\">\"", FALSE); + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\">\""); + test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\">\""); blob.pbData = encodedHashCN; blob.cbData = sizeof(encodedHashCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"#\"", FALSE); - test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"#\"", - FALSE); + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"#\""); + test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"#\""); blob.pbData = encodedSemiCN; blob.cbData = sizeof(encodedSemiCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\";\"", FALSE); - test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\";\"", - FALSE); + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\";\""); + test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\";\""); blob.pbData = encodedNewlineCN; blob.cbData = sizeof(encodedNewlineCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"a\nb\"", FALSE); - test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"a\nb\"", - FALSE); + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"a\nb\""); + test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"a\nb\""); } struct StrToNameA @@ -747,153 +738,84 @@ static void test_CertStrToNameW(void) } } -static void test_CertGetNameStringA(void) +#define test_CertGetNameString_value(a, b, c, d) test_CertGetNameString_value_(__LINE__, a, b, c, d) +static void test_CertGetNameString_value_(unsigned int line, PCCERT_CONTEXT context, DWORD type, void *type_para, + const char *expected) +{ + WCHAR expectedW[512]; + DWORD len, retlen; + WCHAR strW[512]; + unsigned int i; + char str[512]; + + for (i = 0; expected[i]; ++i) + expectedW[i] = expected[i]; + expectedW[i] = 0; + + len = CertGetNameStringA(context, type, 0, type_para, NULL, 0); + ok(len == strlen(expected) + 1, "line %u: unexpected length %ld.\n", line, len); + retlen = CertGetNameStringA(context, type, 0, type_para, str, len); + ok(retlen == len, "line %u: unexpected len %lu, expected %lu.\n", line, retlen, len); + ok(!strcmp(str, expected), "line %u: unexpected value %s.\n", line, str); + str[0] = str[1] = 0xcc; + retlen = CertGetNameStringA(context, type, 0, type_para, str, len - 1); + todo_wine ok(retlen == 1, "line %u: Unexpected len %lu, expected 1.\n", line, retlen); + todo_wine ok(!str[0], "line %u: unexpected str[0] %#x.\n", line, str[0]); + ok(str[1] == expected[1], "line %u: unexpected str[1] %#x.\n", line, str[1]); + retlen = CertGetNameStringW(context, type, 0, type_para, strW, len); + ok(retlen == len, "line %u: unexpected len %lu, expected 1.\n", line, retlen); + ok(!wcscmp(strW, expectedW), "line %u: unexpected value %s.\n", line, debugstr_w(strW)); + strW[0] = strW[1] = 0xcccc; + retlen = CertGetNameStringW(context, type, 0, type_para, strW, len - 1); + todo_wine ok(retlen == len - 1, "line %u: unexpected len %lu, expected %lu.\n", line, retlen, len - 1); + ok(!wcsncmp(strW, expectedW, retlen - 1), "line %u: string data mismatch.\n", line); + ok(!strW[retlen - 1], "line %u: string is not zero terminated.\n", line); + retlen = CertGetNameStringA(context, type, 0, type_para, NULL, len - 1); + ok(retlen == len, "line %u: unexpected len %lu, expected %lu\n", line, retlen, len); + retlen = CertGetNameStringW(context, type, 0, type_para, NULL, len - 1); + ok(retlen == len, "line %u: unexpected len %lu, expected %lu\n", line, retlen, len); +} + +static void test_CertGetNameString(void) { + static const char aric[] = "aric(a)codeweavers.com"; + static const char localhost[] = "localhost"; PCCERT_CONTEXT context; + DWORD len, type; context = CertCreateCertificateContext(X509_ASN_ENCODING, cert, sizeof(cert)); - ok(context != NULL, "CertCreateCertificateContext failed: %08lx\n", - GetLastError()); - if (context) - { - static const char aric[] = "aric(a)codeweavers.com"; - static const char localhost[] = "localhost"; - DWORD len, type; - LPSTR str; - - /* Bad string types/types missing from the cert */ - len = CertGetNameStringA(NULL, 0, 0, NULL, NULL, 0); - ok(len == 1, "expected 1, got %ld\n", len); - len = CertGetNameStringA(context, 0, 0, NULL, NULL, 0); - ok(len == 1, "expected 1, got %ld\n", len); - len = CertGetNameStringA(context, CERT_NAME_URL_TYPE, 0, NULL, NULL, - 0); - ok(len == 1, "expected 1, got %ld\n", len); - - len = CertGetNameStringA(context, CERT_NAME_EMAIL_TYPE, 0, NULL, NULL, - 0); - ok(len == strlen(aric) + 1, "unexpected length %ld\n", len); - str = HeapAlloc(GetProcessHeap(), 0, len); - if (str) - { - len = CertGetNameStringA(context, CERT_NAME_EMAIL_TYPE, 0, NULL, - str, len); - ok(!strcmp(str, aric), "unexpected value %s\n", str); - HeapFree(GetProcessHeap(), 0, str); - } - - len = CertGetNameStringA(context, CERT_NAME_RDN_TYPE, 0, NULL, NULL, - 0); - ok(len == strlen(issuerStr) + 1, "unexpected length %ld\n", len); - str = HeapAlloc(GetProcessHeap(), 0, len); - if (str) - { - len = CertGetNameStringA(context, CERT_NAME_RDN_TYPE, 0, NULL, - str, len); - ok(!strcmp(str, issuerStr), "unexpected value %s\n", str); - HeapFree(GetProcessHeap(), 0, str); - } - type = 0; - len = CertGetNameStringA(context, CERT_NAME_RDN_TYPE, 0, &type, NULL, - 0); - ok(len == strlen(issuerStr) + 1, "unexpected length %ld\n", len); - str = HeapAlloc(GetProcessHeap(), 0, len); - if (str) - { - len = CertGetNameStringA(context, CERT_NAME_RDN_TYPE, 0, &type, - str, len); - ok(!strcmp(str, issuerStr), "unexpected value %s\n", str); - HeapFree(GetProcessHeap(), 0, str); - } - type = CERT_OID_NAME_STR; - len = CertGetNameStringA(context, CERT_NAME_RDN_TYPE, 0, &type, NULL, - 0); - ok(len == strlen(subjectStr) + 1, "unexpected length %ld\n", len); - str = HeapAlloc(GetProcessHeap(), 0, len); - if (str) - { - len = CertGetNameStringA(context, CERT_NAME_RDN_TYPE, 0, &type, - str, len); - ok(!strcmp(str, subjectStr), "unexpected value %s\n", str); - HeapFree(GetProcessHeap(), 0, str); - } - - len = CertGetNameStringA(context, CERT_NAME_ATTR_TYPE, 0, NULL, NULL, - 0); - ok(len == strlen(aric) + 1, "unexpected length %ld\n", len); - str = HeapAlloc(GetProcessHeap(), 0, len); - if (str) - { - len = CertGetNameStringA(context, CERT_NAME_ATTR_TYPE, 0, NULL, - str, len); - ok(!strcmp(str, aric), "unexpected value %s\n", str); - HeapFree(GetProcessHeap(), 0, str); - } - len = CertGetNameStringA(context, CERT_NAME_ATTR_TYPE, 0, - (void *)szOID_RSA_emailAddr, NULL, 0); - ok(len == strlen(aric) + 1, "unexpected length %ld\n", len); - str = HeapAlloc(GetProcessHeap(), 0, len); - if (str) - { - len = CertGetNameStringA(context, CERT_NAME_ATTR_TYPE, 0, - (void *)szOID_RSA_emailAddr, str, len); - ok(!strcmp(str, aric), "unexpected value %s\n", str); - HeapFree(GetProcessHeap(), 0, str); - } - len = CertGetNameStringA(context, CERT_NAME_ATTR_TYPE, 0, - (void *)szOID_COMMON_NAME, NULL, 0); - ok(len == strlen(localhost) + 1, "unexpected length %ld\n", len); - str = HeapAlloc(GetProcessHeap(), 0, len); - if (str) - { - len = CertGetNameStringA(context, CERT_NAME_ATTR_TYPE, 0, - (void *)szOID_COMMON_NAME, str, len); - ok(!strcmp(str, localhost), "unexpected value %s\n", str); - HeapFree(GetProcessHeap(), 0, str); - } - - len = CertGetNameStringA(context, CERT_NAME_SIMPLE_DISPLAY_TYPE, 0, - NULL, NULL, 0); - ok(len == strlen(localhost) + 1, "unexpected length %ld\n", len); - str = HeapAlloc(GetProcessHeap(), 0, len); - if (str) - { - len = CertGetNameStringA(context, CERT_NAME_SIMPLE_DISPLAY_TYPE, - 0, NULL, str, len); - ok(!strcmp(str, localhost), "unexpected value %s\n", str); - HeapFree(GetProcessHeap(), 0, str); - } - - len = CertGetNameStringA(context, CERT_NAME_FRIENDLY_DISPLAY_TYPE, 0, - NULL, NULL, 0); - ok(len == strlen(localhost) + 1, "unexpected length %ld\n", len); - str = HeapAlloc(GetProcessHeap(), 0, len); - if (str) - { - len = CertGetNameStringA(context, CERT_NAME_FRIENDLY_DISPLAY_TYPE, - 0, NULL, str, len); - ok(!strcmp(str, localhost), "unexpected value %s\n", str); - HeapFree(GetProcessHeap(), 0, str); - } - - len = CertGetNameStringA(context, CERT_NAME_DNS_TYPE, 0, NULL, NULL, - 0); - ok(len == strlen(localhost) + 1, "unexpected length %ld\n", len); - if (len > 1) - { - str = HeapAlloc(GetProcessHeap(), 0, len); - if (str) - { - len = CertGetNameStringA(context, CERT_NAME_DNS_TYPE, 0, NULL, - str, len); - ok(!strcmp(str, localhost), "unexpected value %s\n", str); - HeapFree(GetProcessHeap(), 0, str); - } - } - - CertFreeCertificateContext(context); - } + ok(!!context, "CertCreateCertificateContext failed, err %lu\n", GetLastError()); + + /* Bad string types/types missing from the cert */ + len = CertGetNameStringA(NULL, 0, 0, NULL, NULL, 0); + ok(len == 1, "expected 1, got %lu\n", len); + len = CertGetNameStringA(context, 0, 0, NULL, NULL, 0); + ok(len == 1, "expected 1, got %lu\n", len); + len = CertGetNameStringA(context, CERT_NAME_URL_TYPE, 0, NULL, NULL, 0); + ok(len == 1, "expected 1, got %lu\n", len); + + len = CertGetNameStringW(NULL, 0, 0, NULL, NULL, 0); + ok(len == 1, "expected 1, got %lu\n", len); + len = CertGetNameStringW(context, 0, 0, NULL, NULL, 0); + ok(len == 1, "expected 1, got %lu\n", len); + len = CertGetNameStringW(context, CERT_NAME_URL_TYPE, 0, NULL, NULL, 0); + ok(len == 1, "expected 1, got %lu\n", len); + + test_CertGetNameString_value(context, CERT_NAME_EMAIL_TYPE, NULL, aric); + test_CertGetNameString_value(context, CERT_NAME_RDN_TYPE, NULL, issuerStr); + type = 0; + test_CertGetNameString_value(context, CERT_NAME_RDN_TYPE, &type, issuerStr); + type = CERT_OID_NAME_STR; + test_CertGetNameString_value(context, CERT_NAME_RDN_TYPE, &type, subjectStr); + test_CertGetNameString_value(context, CERT_NAME_ATTR_TYPE, NULL, aric); + test_CertGetNameString_value(context, CERT_NAME_ATTR_TYPE, (void *)szOID_RSA_emailAddr, aric); + test_CertGetNameString_value(context, CERT_NAME_ATTR_TYPE, (void *)szOID_COMMON_NAME, localhost); + test_CertGetNameString_value(context, CERT_NAME_SIMPLE_DISPLAY_TYPE, NULL, localhost); + test_CertGetNameString_value(context, CERT_NAME_FRIENDLY_DISPLAY_TYPE, NULL, localhost); + test_CertGetNameString_value(context, CERT_NAME_DNS_TYPE, NULL, localhost); + + CertFreeCertificateContext(context); } START_TEST(str) @@ -904,5 +826,5 @@ START_TEST(str) test_CertNameToStrW(); test_CertStrToNameA(); test_CertStrToNameW(); - test_CertGetNameStringA(); + test_CertGetNameString(); } -- 2.35.1

2 7

[PATCH] kernelbase: Add support for progress callback in CopyFileEx.
by Alistair Leslie-Hughes 21 Apr '22

21 Apr '22

Based on patch by Michael Müller. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/kernel32/tests/file.c | 7 +---- dlls/kernelbase/file.c | 54 +++++++++++++++++++++++++++++++++++--- 2 files changed, 51 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 1fb9e98cf41..4f47dd8a51f 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1176,21 +1176,16 @@ static void test_CopyFileEx(void) ok(hfile != INVALID_HANDLE_VALUE, "failed to open destination file, error %ld\n", GetLastError()); SetLastError(0xdeadbeef); retok = CopyFileExA(source, dest, copy_progress_cb, hfile, NULL, 0); - todo_wine ok(!retok, "CopyFileExA unexpectedly succeeded\n"); - todo_wine ok(GetLastError() == ERROR_REQUEST_ABORTED, "expected ERROR_REQUEST_ABORTED, got %ld\n", GetLastError()); ok(GetFileAttributesA(dest) != INVALID_FILE_ATTRIBUTES, "file was deleted\n"); hfile = CreateFileA(dest, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, 0); - todo_wine ok(hfile != INVALID_HANDLE_VALUE, "failed to open destination file, error %ld\n", GetLastError()); SetLastError(0xdeadbeef); retok = CopyFileExA(source, dest, copy_progress_cb, hfile, NULL, 0); - todo_wine ok(!retok, "CopyFileExA unexpectedly succeeded\n"); - todo_wine ok(GetLastError() == ERROR_REQUEST_ABORTED, "expected ERROR_REQUEST_ABORTED, got %ld\n", GetLastError()); todo_wine ok(GetFileAttributesA(dest) == INVALID_FILE_ATTRIBUTES, "file was not deleted\n"); @@ -1205,7 +1200,7 @@ static void test_CopyFileEx(void) ret = DeleteFileA(source); ok(ret, "DeleteFileA failed with error %ld\n", GetLastError()); ret = DeleteFileA(dest); - ok(!ret, "DeleteFileA unexpectedly succeeded\n"); + todo_wine ok(!ret, "DeleteFileA unexpectedly succeeded\n"); } /* diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index 8ae982294f6..6803c79a4a4 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -490,6 +490,23 @@ BOOL WINAPI DECLSPEC_HOTPATCH AreFileApisANSI(void) return !oem_file_apis; } +static DWORD call_progress_dialog(LPPROGRESS_ROUTINE progress, LARGE_INTEGER size, LARGE_INTEGER transferred, + DWORD cbtype, HANDLE h1, HANDLE h2, void *param) +{ + DWORD cbret; + + cbret = progress( size, transferred, size, transferred, 1, cbtype, h1, h2, param ); + if (cbret == PROGRESS_STOP) + SetLastError( ERROR_REQUEST_ABORTED ); + else if (cbret == PROGRESS_CANCEL) + { + BOOLEAN disp = TRUE; + SetFileInformationByHandle( h2, FileDispositionInfo, &disp, sizeof(disp) ); + SetLastError( ERROR_REQUEST_ABORTED ); + } + + return cbret; +} /*********************************************************************** * CopyFileExW (kernelbase.@) @@ -499,11 +516,14 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT { static const int buffer_size = 65536; HANDLE h1, h2; - FILE_BASIC_INFORMATION info; + FILE_NETWORK_OPEN_INFORMATION info; + FILE_BASIC_INFORMATION basic_info; IO_STATUS_BLOCK io; DWORD count; BOOL ret = FALSE; char *buffer; + LARGE_INTEGER transferred; + DWORD cbret; if (!source || !dest) { @@ -533,7 +553,7 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT return FALSE; } - if (!set_ntstatus( NtQueryInformationFile( h1, &io, &info, sizeof(info), FileBasicInformation ))) + if (!set_ntstatus( NtQueryInformationFile( h1, &io, &info, sizeof(info), FileNetworkOpenInformation ))) { WARN("GetFileInformationByHandle returned error for %s\n", debugstr_w(source)); HeapFree( GetProcessHeap(), 0, buffer ); @@ -569,6 +589,17 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT return FALSE; } + if (progress) + { + transferred.QuadPart = 0; + + cbret = call_progress_dialog(progress, info.EndOfFile, transferred, CALLBACK_STREAM_SWITCH, h1, h2, param); + if (cbret == PROGRESS_QUIET) + progress = NULL; + else if (cbret != PROGRESS_CONTINUE) + goto done; + } + while (ReadFile( h1, buffer, buffer_size, &count, NULL ) && count) { char *p = buffer; @@ -578,13 +609,28 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT if (!WriteFile( h2, p, count, &res, NULL ) || !res) goto done; p += res; count -= res; + + if (progress) + { + transferred.QuadPart += res; + + cbret = call_progress_dialog(progress, info.EndOfFile, transferred, CALLBACK_CHUNK_FINISHED, h1, h2, param); + if (cbret == PROGRESS_QUIET) + progress = NULL; + else if (cbret != PROGRESS_CONTINUE) + goto done; + } } } ret = TRUE; done: /* Maintain the timestamp of source file to destination file */ - info.FileAttributes = 0; - NtSetInformationFile( h2, &io, &info, sizeof(info), FileBasicInformation ); + basic_info.CreationTime = info.CreationTime; + basic_info.LastAccessTime = info.LastAccessTime; + basic_info.LastWriteTime = info.LastWriteTime; + basic_info.ChangeTime = info.ChangeTime; + basic_info.FileAttributes = 0; + NtSetInformationFile( h2, &io, &basic_info, sizeof(basic_info), FileBasicInformation ); HeapFree( GetProcessHeap(), 0, buffer ); CloseHandle( h1 ); CloseHandle( h2 ); -- 2.35.1

2 1

[PATCH v3 3/3] webservices: Always set channel state to WS_CHANNEL_STATE_FAULTED when a send or receive operation failed.
by Hans Leidekker 21 Apr '22

21 Apr '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/channel.c | 58 ++++++++++++++++++++++++-------------- 1 file changed, 37 insertions(+), 21 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 56ad5692a6b..4c9f9c4ccff 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -1608,6 +1608,7 @@ HRESULT channel_send_message( WS_CHANNEL *handle, WS_MESSAGE *msg ) } hr = send_message_bytes( channel, msg ); + if (hr != S_OK) channel->state = WS_CHANNEL_STATE_FAULTED; LeaveCriticalSection( &channel->cs ); return hr; @@ -1723,11 +1724,15 @@ static HRESULT send_message( struct channel *channel, WS_MESSAGE *msg, const WS_ WS_WRITE_OPTION option, const void *body, ULONG size ) { HRESULT hr; - if ((hr = WsAddressMessage( msg, &channel->addr, NULL )) != S_OK) return hr; - if ((hr = message_set_action( msg, desc->action )) != S_OK) return hr; - if ((hr = init_writer( channel )) != S_OK) return hr; - if ((hr = write_message( channel, msg, desc->bodyElementDescription, option, body, size )) != S_OK) return hr; - return send_message_bytes( channel, msg ); + if ((hr = WsAddressMessage( msg, &channel->addr, NULL )) != S_OK) goto done; + if ((hr = message_set_action( msg, desc->action )) != S_OK) goto done; + if ((hr = init_writer( channel )) != S_OK) goto done; + if ((hr = write_message( channel, msg, desc->bodyElementDescription, option, body, size )) != S_OK) goto done; + hr = send_message_bytes( channel, msg ); + +done: + if (hr != S_OK) channel->state = WS_CHANNEL_STATE_FAULTED; + return hr; } struct send_message @@ -2260,11 +2265,7 @@ static HRESULT receive_message_bytes_session( struct channel *channel ) { ULONG size; if ((hr = build_dict( (const BYTE *)channel->read_buf, channel->read_size, &channel->dict_recv, - &size )) != S_OK) - { - if (hr == WS_E_QUOTA_EXCEEDED) channel->state = WS_CHANNEL_STATE_FAULTED; - return hr; - } + &size )) != S_OK) return hr; channel->read_size -= size; memmove( channel->read_buf, channel->read_buf + size, channel->read_size ); } @@ -2328,6 +2329,7 @@ HRESULT channel_receive_message( WS_CHANNEL *handle, WS_MESSAGE *msg ) } if ((hr = receive_message_bytes( channel, msg )) == S_OK) hr = init_reader( channel ); + if (hr != S_OK) channel->state = WS_CHANNEL_STATE_FAULTED; LeaveCriticalSection( &channel->cs ); return hr; @@ -2367,8 +2369,8 @@ static HRESULT receive_message( struct channel *channel, WS_MESSAGE *msg, const HRESULT hr; ULONG i; - if ((hr = receive_message_bytes( channel, msg )) != S_OK) return hr; - if ((hr = init_reader( channel )) != S_OK) return hr; + if ((hr = receive_message_bytes( channel, msg )) != S_OK) goto done; + if ((hr = init_reader( channel )) != S_OK) goto done; for (i = 0; i < count; i++) { @@ -2378,10 +2380,14 @@ static HRESULT receive_message( struct channel *channel, WS_MESSAGE *msg, const if (index) *index = i; break; } - if ((hr = WsResetMessage( msg, NULL )) != S_OK) return hr; - if ((hr = init_reader( channel )) != S_OK) return hr; + if ((hr = WsResetMessage( msg, NULL )) != S_OK) goto done; + if ((hr = init_reader( channel )) != S_OK) goto done; } - return (i == count) ? WS_E_INVALID_FORMAT : S_OK; + hr = (i == count) ? WS_E_INVALID_FORMAT : S_OK; + +done: + if (hr != S_OK) channel->state = WS_CHANNEL_STATE_FAULTED; + return hr; } struct receive_message @@ -2606,6 +2612,7 @@ static HRESULT read_message_start( struct channel *channel, WS_MESSAGE *msg ) HRESULT hr; if ((hr = receive_message_bytes( channel, msg )) == S_OK && (hr = init_reader( channel )) == S_OK) hr = WsReadEnvelopeStart( msg, channel->reader, NULL, NULL, NULL ); + if (hr != S_OK) channel->state = WS_CHANNEL_STATE_FAULTED; return hr; } @@ -2682,14 +2689,17 @@ HRESULT WINAPI WsReadMessageStart( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS return hr; } -static HRESULT read_message_end( WS_MESSAGE *msg ) +static HRESULT read_message_end( struct channel *channel, WS_MESSAGE *msg ) { - return WsReadEnvelopeEnd( msg, NULL ); + HRESULT hr = WsReadEnvelopeEnd( msg, NULL ); + if (hr != S_OK) channel->state = WS_CHANNEL_STATE_FAULTED; + return hr; } struct read_message_end { struct task task; + struct channel *channel; WS_MESSAGE *msg; WS_ASYNC_CONTEXT ctx; }; @@ -2699,7 +2709,7 @@ static void read_message_end_proc( struct task *task ) struct read_message_end *r = (struct read_message_end *)task; HRESULT hr; - hr = read_message_end( r->msg ); + hr = read_message_end( r->channel, r->msg ); TRACE( "calling %p(%#lx)\n", r->ctx.callback, hr ); r->ctx.callback( hr, WS_LONG_CALLBACK, r->ctx.callbackState ); @@ -2712,6 +2722,7 @@ static HRESULT queue_read_message_end( struct channel *channel, WS_MESSAGE *msg, if (!(r = malloc( sizeof(*r) ))) return E_OUTOFMEMORY; r->task.proc = read_message_end_proc; + r->channel = channel; r->msg = msg; r->ctx = *ctx; return queue_task( &channel->recv_q, &r->task ); @@ -2756,9 +2767,13 @@ HRESULT WINAPI WsReadMessageEnd( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_A static HRESULT write_message_start( struct channel *channel, WS_MESSAGE *msg ) { HRESULT hr; - if ((hr = init_writer( channel )) != S_OK) return hr; - if ((hr = WsAddressMessage( msg, &channel->addr, NULL )) != S_OK) return hr; - return WsWriteEnvelopeStart( msg, channel->writer, NULL, NULL, NULL ); + if ((hr = init_writer( channel )) != S_OK) goto done; + if ((hr = WsAddressMessage( msg, &channel->addr, NULL )) != S_OK) goto done; + hr = WsWriteEnvelopeStart( msg, channel->writer, NULL, NULL, NULL ); + +done: + if (hr != S_OK) channel->state = WS_CHANNEL_STATE_FAULTED; + return hr; } struct write_message_start @@ -2838,6 +2853,7 @@ static HRESULT write_message_end( struct channel *channel, WS_MESSAGE *msg ) { HRESULT hr; if ((hr = WsWriteEnvelopeEnd( msg, NULL )) == S_OK) hr = send_message_bytes( channel, msg ); + if (hr != S_OK) channel->state = WS_CHANNEL_STATE_FAULTED; return hr; } -- 2.30.2

1 0

[PATCH v3 2/3] webservices: Respect session dictionary size limits on receive dictionary.
by Hans Leidekker 21 Apr '22

21 Apr '22

From: Connor McAdams <cmcadams(a)codeweavers.com> v3: Use a helper to check channel state. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/channel.c | 66 ++++++++++++++++++++------------ dlls/webservices/tests/channel.c | 17 +++++++- 2 files changed, 57 insertions(+), 26 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 7dd78335e11..56ad5692a6b 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -328,7 +328,7 @@ static void reset_channel( struct channel *channel ) channel->session_state = SESSION_STATE_UNINITIALIZED; clear_addr( &channel->addr ); init_dict( &channel->dict_send, channel->dict_size ); - init_dict( &channel->dict_recv, 0 ); + init_dict( &channel->dict_recv, channel->dict_size ); channel->msg = NULL; channel->read_size = 0; channel->send_size = 0; @@ -486,6 +486,7 @@ static HRESULT create_channel( WS_CHANNEL_TYPE type, WS_CHANNEL_BINDING binding, channel->encoding = WS_ENCODING_XML_BINARY_SESSION_1; channel->dict_size = 2048; channel->dict_send.str_bytes_max = channel->dict_size; + channel->dict_recv.str_bytes_max = channel->dict_size; break; case WS_UDP_CHANNEL_BINDING: @@ -546,6 +547,7 @@ static HRESULT create_channel( WS_CHANNEL_TYPE type, WS_CHANNEL_BINDING binding, channel->dict_size = *(ULONG *)prop->value; channel->dict_send.str_bytes_max = channel->dict_size; + channel->dict_recv.str_bytes_max = channel->dict_size; break; default: @@ -875,6 +877,13 @@ static HRESULT queue_shutdown_session( struct channel *channel, const WS_ASYNC_C return queue_task( &channel->send_q, &s->task ); } +static HRESULT check_state( struct channel *channel, WS_CHANNEL_STATE state_expected ) +{ + if (channel->state == WS_CHANNEL_STATE_FAULTED) return WS_E_OBJECT_FAULTED; + if (channel->state != state_expected) return WS_E_INVALID_OPERATION; + return S_OK; +} + HRESULT WINAPI WsShutdownSessionChannel( WS_CHANNEL *handle, const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) { struct channel *channel = (struct channel *)handle; @@ -894,10 +903,10 @@ HRESULT WINAPI WsShutdownSessionChannel( WS_CHANNEL *handle, const WS_ASYNC_CONT LeaveCriticalSection( &channel->cs ); return E_INVALIDARG; } - if (channel->state != WS_CHANNEL_STATE_OPEN) + if ((hr = check_state( channel, WS_CHANNEL_STATE_OPEN )) != S_OK) { LeaveCriticalSection( &channel->cs ); - return WS_E_INVALID_OPERATION; + return hr; } if (!ctx) async_init( &async, &ctx_local ); @@ -1258,10 +1267,10 @@ HRESULT WINAPI WsOpenChannel( WS_CHANNEL *handle, const WS_ENDPOINT_ADDRESS *end LeaveCriticalSection( &channel->cs ); return E_INVALIDARG; } - if (channel->state != WS_CHANNEL_STATE_CREATED) + if ((hr = check_state( channel, WS_CHANNEL_STATE_CREATED )) != S_OK) { LeaveCriticalSection( &channel->cs ); - return WS_E_INVALID_OPERATION; + return hr; } if (!ctx) async_init( &async, &ctx_local ); @@ -1592,10 +1601,10 @@ HRESULT channel_send_message( WS_CHANNEL *handle, WS_MESSAGE *msg ) LeaveCriticalSection( &channel->cs ); return E_INVALIDARG; } - if (channel->state != WS_CHANNEL_STATE_OPEN) + if ((hr = check_state( channel, WS_CHANNEL_STATE_OPEN )) != S_OK) { LeaveCriticalSection( &channel->cs ); - return WS_E_INVALID_OPERATION; + return hr; } hr = send_message_bytes( channel, msg ); @@ -1786,10 +1795,10 @@ HRESULT WINAPI WsSendMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_MESS LeaveCriticalSection( &channel->cs ); return E_INVALIDARG; } - if (channel->state != WS_CHANNEL_STATE_OPEN) + if ((hr = check_state( channel, WS_CHANNEL_STATE_OPEN )) != S_OK) { LeaveCriticalSection( &channel->cs ); - return WS_E_INVALID_OPERATION; + return hr; } WsInitializeMessage( msg, WS_BLANK_MESSAGE, NULL, NULL ); @@ -1832,10 +1841,10 @@ HRESULT WINAPI WsSendReplyMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS LeaveCriticalSection( &channel->cs ); return E_INVALIDARG; } - if (channel->state != WS_CHANNEL_STATE_OPEN) + if ((hr = check_state( channel, WS_CHANNEL_STATE_OPEN )) != S_OK) { LeaveCriticalSection( &channel->cs ); - return WS_E_INVALID_OPERATION; + return hr; } WsInitializeMessage( msg, WS_REPLY_MESSAGE, NULL, NULL ); @@ -2201,6 +2210,11 @@ static HRESULT build_dict( const BYTE *buf, ULONG buflen, struct dictionary *dic init_dict( dict, 0 ); return WS_E_INVALID_FORMAT; } + if (size + dict->str_bytes + 1 > dict->str_bytes_max) + { + hr = WS_E_QUOTA_EXCEEDED; + goto error; + } buflen -= size; if (!(bytes = malloc( size ))) { @@ -2246,7 +2260,11 @@ static HRESULT receive_message_bytes_session( struct channel *channel ) { ULONG size; if ((hr = build_dict( (const BYTE *)channel->read_buf, channel->read_size, &channel->dict_recv, - &size )) != S_OK) return hr; + &size )) != S_OK) + { + if (hr == WS_E_QUOTA_EXCEEDED) channel->state = WS_CHANNEL_STATE_FAULTED; + return hr; + } channel->read_size -= size; memmove( channel->read_buf, channel->read_buf + size, channel->read_size ); } @@ -2303,10 +2321,10 @@ HRESULT channel_receive_message( WS_CHANNEL *handle, WS_MESSAGE *msg ) LeaveCriticalSection( &channel->cs ); return E_INVALIDARG; } - if (channel->state != WS_CHANNEL_STATE_OPEN) + if ((hr = check_state( channel, WS_CHANNEL_STATE_OPEN )) != S_OK) { LeaveCriticalSection( &channel->cs ); - return WS_E_INVALID_OPERATION; + return hr; } if ((hr = receive_message_bytes( channel, msg )) == S_OK) hr = init_reader( channel ); @@ -2443,10 +2461,10 @@ HRESULT WINAPI WsReceiveMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_M LeaveCriticalSection( &channel->cs ); return E_INVALIDARG; } - if (channel->state != WS_CHANNEL_STATE_OPEN) + if ((hr = check_state( channel, WS_CHANNEL_STATE_OPEN )) != S_OK) { LeaveCriticalSection( &channel->cs ); - return WS_E_INVALID_OPERATION; + return hr; } if (!ctx) async_init( &async, &ctx_local ); @@ -2561,10 +2579,10 @@ HRESULT WINAPI WsRequestReply( WS_CHANNEL *handle, WS_MESSAGE *request, const WS LeaveCriticalSection( &channel->cs ); return E_INVALIDARG; } - if (channel->state != WS_CHANNEL_STATE_OPEN) + if ((hr = check_state( channel, WS_CHANNEL_STATE_OPEN )) != S_OK) { LeaveCriticalSection( &channel->cs ); - return WS_E_INVALID_OPERATION; + return hr; } WsInitializeMessage( request, WS_REQUEST_MESSAGE, NULL, NULL ); @@ -2645,10 +2663,10 @@ HRESULT WINAPI WsReadMessageStart( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS LeaveCriticalSection( &channel->cs ); return E_INVALIDARG; } - if (channel->state != WS_CHANNEL_STATE_OPEN) + if ((hr = check_state( channel, WS_CHANNEL_STATE_OPEN )) != S_OK) { LeaveCriticalSection( &channel->cs ); - return WS_E_INVALID_OPERATION; + return hr; } if (!ctx) async_init( &async, &ctx_local ); @@ -2797,10 +2815,10 @@ HRESULT WINAPI WsWriteMessageStart( WS_CHANNEL *handle, WS_MESSAGE *msg, const W LeaveCriticalSection( &channel->cs ); return E_INVALIDARG; } - if (channel->state != WS_CHANNEL_STATE_OPEN) + if ((hr = check_state( channel, WS_CHANNEL_STATE_OPEN )) != S_OK) { LeaveCriticalSection( &channel->cs ); - return WS_E_INVALID_OPERATION; + return hr; } if (!ctx) async_init( &async, &ctx_local ); @@ -2877,10 +2895,10 @@ HRESULT WINAPI WsWriteMessageEnd( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_ LeaveCriticalSection( &channel->cs ); return E_INVALIDARG; } - if (channel->state != WS_CHANNEL_STATE_OPEN) + if ((hr = check_state( channel, WS_CHANNEL_STATE_OPEN )) != S_OK) { LeaveCriticalSection( &channel->cs ); - return WS_E_INVALID_OPERATION; + return hr; } if (!ctx) async_init( &async, &ctx_local ); diff --git a/dlls/webservices/tests/channel.c b/dlls/webservices/tests/channel.c index d5d35904c1c..7e0a9becbc5 100644 --- a/dlls/webservices/tests/channel.c +++ b/dlls/webservices/tests/channel.c @@ -822,6 +822,7 @@ static void client_duplex_session_dict( const struct listener_info *info ) WS_MESSAGE_DESCRIPTION desc; WS_ENDPOINT_ADDRESS addr; WS_CHANNEL_PROPERTY prop; + WS_CHANNEL_STATE state; int dict_str_cnt = 0; char elem_name[128]; WS_CHANNEL *channel; @@ -893,12 +894,24 @@ static void client_duplex_session_dict( const struct listener_info *info ) local_name.bytes = (BYTE *)short_dict_str; hr = WsReceiveMessage( channel, msg, descs, 1, WS_RECEIVE_REQUIRED_MESSAGE, WS_READ_REQUIRED_VALUE, NULL, &val, sizeof(val), NULL, NULL, NULL ); - todo_wine ok( hr == WS_E_QUOTA_EXCEEDED, "got %#lx\n", hr); + ok( hr == WS_E_QUOTA_EXCEEDED, "got %#lx\n", hr); + + state = 0xdeadbeef; + hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_STATE, &state, sizeof(state), NULL ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( state == WS_CHANNEL_STATE_FAULTED, "got %u\n", state ); + + hr = WsReceiveMessage( channel, msg, descs, 1, WS_RECEIVE_REQUIRED_MESSAGE, WS_READ_REQUIRED_VALUE, + NULL, &val, sizeof(val), NULL, NULL, NULL ); + ok( hr == WS_E_OBJECT_FAULTED, "got %#lx\n", hr ); + + hr = WsSendMessage( channel, msg, &desc, WS_WRITE_REQUIRED_VALUE, &val, sizeof(val), NULL, NULL ); + ok( hr == WS_E_OBJECT_FAULTED, "got %#lx\n", hr ); WsFreeMessage( msg ); hr = WsShutdownSessionChannel( channel, NULL, NULL ); - todo_wine ok( hr == WS_E_OBJECT_FAULTED, "got %#lx\n", hr ); + ok( hr == WS_E_OBJECT_FAULTED, "got %#lx\n", hr ); hr = WsCloseChannel( channel, NULL, NULL ); ok( hr == S_OK, "got %#lx\n", hr ); -- 2.30.2

1 0

[PATCH v3 1/3] webservices: Respect session dictionary size limits on send dictionary.
by Hans Leidekker 21 Apr '22

21 Apr '22

From: Connor McAdams <cmcadams(a)codeweavers.com> v3: Warn when maximum size is reached. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/channel.c | 21 +++++++++++++++------ dlls/webservices/string.c | 5 ++++- dlls/webservices/webservices_private.h | 4 +++- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 4941844afe5..7dd78335e11 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -327,8 +327,8 @@ static void reset_channel( struct channel *channel ) channel->state = WS_CHANNEL_STATE_CREATED; channel->session_state = SESSION_STATE_UNINITIALIZED; clear_addr( &channel->addr ); - clear_dict( &channel->dict_send ); - clear_dict( &channel->dict_recv ); + init_dict( &channel->dict_send, channel->dict_size ); + init_dict( &channel->dict_recv, 0 ); channel->msg = NULL; channel->read_size = 0; channel->send_size = 0; @@ -485,6 +485,7 @@ static HRESULT create_channel( WS_CHANNEL_TYPE type, WS_CHANNEL_BINDING binding, channel->u.tcp.socket = -1; channel->encoding = WS_ENCODING_XML_BINARY_SESSION_1; channel->dict_size = 2048; + channel->dict_send.str_bytes_max = channel->dict_size; break; case WS_UDP_CHANNEL_BINDING: @@ -544,6 +545,7 @@ static HRESULT create_channel( WS_CHANNEL_TYPE type, WS_CHANNEL_BINDING binding, } channel->dict_size = *(ULONG *)prop->value; + channel->dict_send.str_bytes_max = channel->dict_size; break; default: @@ -1615,6 +1617,13 @@ static HRESULT CALLBACK dict_cb( void *state, const WS_XML_STRING *str, BOOL *fo return S_OK; } + if (str->length + dict->str_bytes + 1 > dict->str_bytes_max) + { + WARN( "max string bytes exceeded\n" ); + *found = FALSE; + return hr; + } + if (!(bytes = malloc( str->length ))) return E_OUTOFMEMORY; memcpy( bytes, str->bytes, str->length ); if ((hr = insert_string( dict, bytes, str->length, index, id )) == S_OK) @@ -2184,12 +2193,12 @@ static HRESULT build_dict( const BYTE *buf, ULONG buflen, struct dictionary *dic { if ((hr = read_size( &ptr, buflen, &size )) != S_OK) { - clear_dict( dict ); + init_dict( dict, 0 ); return hr; } if (size > buflen) { - clear_dict( dict ); + init_dict( dict, 0 ); return WS_E_INVALID_FORMAT; } buflen -= size; @@ -2208,7 +2217,7 @@ static HRESULT build_dict( const BYTE *buf, ULONG buflen, struct dictionary *dic if ((hr = insert_string( dict, bytes, size, index, NULL )) != S_OK) { free( bytes ); - clear_dict( dict ); + init_dict( dict, 0 ); return hr; } ptr += size; @@ -2216,7 +2225,7 @@ static HRESULT build_dict( const BYTE *buf, ULONG buflen, struct dictionary *dic return S_OK; error: - clear_dict( dict ); + init_dict( dict, 0 ); return hr; } diff --git a/dlls/webservices/string.c b/dlls/webservices/string.c index 3ecdcea85a4..34e67101e66 100644 --- a/dlls/webservices/string.c +++ b/dlls/webservices/string.c @@ -131,7 +131,7 @@ static HRESULT grow_dict( struct dictionary *dict, ULONG size ) return S_OK; } -void clear_dict( struct dictionary *dict ) +void init_dict( struct dictionary *dict, ULONG str_bytes_max ) { ULONG i; assert( !dict->dict.isConst ); @@ -145,6 +145,8 @@ void clear_dict( struct dictionary *dict ) dict->sequence = NULL; dict->current_sequence = 0; dict->size = 0; + dict->str_bytes = 0; + dict->str_bytes_max = str_bytes_max; } HRESULT insert_string( struct dictionary *dict, unsigned char *data, ULONG len, int i, ULONG *ret_id ) @@ -162,6 +164,7 @@ HRESULT insert_string( struct dictionary *dict, unsigned char *data, ULONG len, dict->dict.strings[id].dictionary = &dict->dict; dict->dict.strings[id].id = id; dict->dict.stringCount++; + dict->str_bytes += len + 1; dict->sequence[id] = dict->current_sequence; diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index b352aa52d49..373ab6799a9 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -49,13 +49,15 @@ struct dictionary ULONG size; ULONG current_sequence; ULONG *sequence; + ULONG str_bytes; + ULONG str_bytes_max; }; extern struct dictionary dict_builtin DECLSPEC_HIDDEN; extern const struct dictionary dict_builtin_static DECLSPEC_HIDDEN; int find_string( const struct dictionary *, const unsigned char *, ULONG, ULONG * ) DECLSPEC_HIDDEN; HRESULT insert_string( struct dictionary *, unsigned char *, ULONG, int, ULONG * ) DECLSPEC_HIDDEN; -void clear_dict( struct dictionary * ) DECLSPEC_HIDDEN; +void init_dict( struct dictionary *, ULONG ) DECLSPEC_HIDDEN; HRESULT writer_set_lookup( WS_XML_WRITER *, BOOL ) DECLSPEC_HIDDEN; HRESULT writer_set_dict_callback( WS_XML_WRITER *, WS_DYNAMIC_STRING_CALLBACK, void * ) DECLSPEC_HIDDEN; -- 2.30.2

1 0

[PATCH 1/5] wined3d: Make loading from WINED3D_LOCATION_CLEARED into a texture op.
by Zebediah Figura 21 Apr '22

21 Apr '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/texture.c | 58 +++++++++++++++++++++++++++------- dlls/wined3d/wined3d_private.h | 3 ++ 2 files changed, 50 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index c495de171d5..18fd0847296 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -816,17 +816,8 @@ BOOL wined3d_texture_load_location(struct wined3d_texture *texture, if (current & WINED3D_LOCATION_CLEARED) { - struct wined3d_bo_address addr; - - /* FIXME: Clear textures on the GPU if possible. */ - - if (!wined3d_texture_prepare_location(texture, sub_resource_idx, context, WINED3D_LOCATION_SYSMEM)) - return FALSE; - wined3d_texture_get_bo_address(texture, sub_resource_idx, &addr, WINED3D_LOCATION_SYSMEM); - memset(addr.addr, 0, texture->sub_resources[sub_resource_idx].size); - wined3d_texture_validate_location(texture, sub_resource_idx, WINED3D_LOCATION_SYSMEM); - current |= WINED3D_LOCATION_SYSMEM; - + texture->texture_ops->texture_clear(texture, sub_resource_idx, context, location); + current = texture->sub_resources[sub_resource_idx].locations; if (current & location) return TRUE; } @@ -3447,6 +3438,20 @@ static void wined3d_texture_gl_unload_location(struct wined3d_texture *texture, } } +static void wined3d_texture_gl_clear(struct wined3d_texture *texture, + unsigned int sub_resource_idx, struct wined3d_context *context, unsigned int location) +{ + struct wined3d_bo_address addr; + + TRACE("texture %p, sub_resource_idx %u, context %p, location %s.\n", + texture, sub_resource_idx, context, wined3d_debug_location(location)); + + wined3d_texture_prepare_location(texture, sub_resource_idx, context, WINED3D_LOCATION_SYSMEM); + wined3d_texture_get_bo_address(texture, sub_resource_idx, &addr, WINED3D_LOCATION_SYSMEM); + memset(addr.addr, 0, texture->sub_resources[sub_resource_idx].size); + wined3d_texture_validate_location(texture, sub_resource_idx, WINED3D_LOCATION_SYSMEM); +} + static const struct wined3d_texture_ops texture_gl_ops = { wined3d_texture_gl_prepare_location, @@ -3454,6 +3459,7 @@ static const struct wined3d_texture_ops texture_gl_ops = wined3d_texture_gl_unload_location, wined3d_texture_gl_upload_data, wined3d_texture_gl_download_data, + wined3d_texture_gl_clear, }; struct wined3d_texture * __cdecl wined3d_texture_from_resource(struct wined3d_resource *resource) @@ -4681,6 +4687,20 @@ static void wined3d_texture_no3d_unload_location(struct wined3d_texture *texture TRACE("texture %p, context %p, location %s.\n", texture, context, wined3d_debug_location(location)); } +static void wined3d_texture_no3d_clear(struct wined3d_texture *texture, + unsigned int sub_resource_idx, struct wined3d_context *context, unsigned int location) +{ + struct wined3d_bo_address addr; + + TRACE("texture %p, sub_resource_idx %u, context %p, location %s.\n", + texture, sub_resource_idx, context, wined3d_debug_location(location)); + + wined3d_texture_prepare_location(texture, sub_resource_idx, context, WINED3D_LOCATION_SYSMEM); + wined3d_texture_get_bo_address(texture, sub_resource_idx, &addr, WINED3D_LOCATION_SYSMEM); + memset(addr.addr, 0, texture->sub_resources[sub_resource_idx].size); + wined3d_texture_validate_location(texture, sub_resource_idx, WINED3D_LOCATION_SYSMEM); +} + static const struct wined3d_texture_ops wined3d_texture_no3d_ops = { wined3d_texture_no3d_prepare_location, @@ -4688,6 +4708,7 @@ static const struct wined3d_texture_ops wined3d_texture_no3d_ops = wined3d_texture_no3d_unload_location, wined3d_texture_no3d_upload_data, wined3d_texture_no3d_download_data, + wined3d_texture_no3d_clear, }; HRESULT wined3d_texture_no3d_init(struct wined3d_texture *texture_no3d, struct wined3d_device *device, @@ -5458,6 +5479,20 @@ static void wined3d_texture_vk_unload_location(struct wined3d_texture *texture, } } +static void wined3d_texture_vk_clear(struct wined3d_texture *texture, + unsigned int sub_resource_idx, struct wined3d_context *context, unsigned int location) +{ + struct wined3d_bo_address addr; + + TRACE("texture %p, sub_resource_idx %u, context %p, location %s.\n", + texture, sub_resource_idx, context, wined3d_debug_location(location)); + + wined3d_texture_prepare_location(texture, sub_resource_idx, context, WINED3D_LOCATION_SYSMEM); + wined3d_texture_get_bo_address(texture, sub_resource_idx, &addr, WINED3D_LOCATION_SYSMEM); + memset(addr.addr, 0, texture->sub_resources[sub_resource_idx].size); + wined3d_texture_validate_location(texture, sub_resource_idx, WINED3D_LOCATION_SYSMEM); +} + static const struct wined3d_texture_ops wined3d_texture_vk_ops = { wined3d_texture_vk_prepare_location, @@ -5465,6 +5500,7 @@ static const struct wined3d_texture_ops wined3d_texture_vk_ops = wined3d_texture_vk_unload_location, wined3d_texture_vk_upload_data, wined3d_texture_vk_download_data, + wined3d_texture_vk_clear, }; HRESULT wined3d_texture_vk_init(struct wined3d_texture_vk *texture_vk, struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 54bccb3db5e..9cfb3a217d2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4393,6 +4393,9 @@ struct wined3d_texture_ops const struct wined3d_bo_address *dst_bo_addr, const struct wined3d_format *dst_format, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, unsigned int dst_row_pitch, unsigned int dst_slice_pitch); + /* "location" is a hint, and need not be the resulting location. */ + void (*texture_clear)(struct wined3d_texture *texture, unsigned int sub_resource_idx, + struct wined3d_context *context, unsigned int location); }; #define WINED3D_TEXTURE_COND_NP2 0x00000001 -- 2.35.1

3 9

[PATCH 1/3] msmpeg2vdec: Add stub dll.
by Mohamad Al-Jaf 21 Apr '22

21 Apr '22

Required for dxva video playback by Chromium-based browsers and the Chromium Embedded Framework, including Adobe Photoshop's tooltip hint videos. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- configure.ac | 1 + dlls/msmpeg2vdec/Makefile.in | 6 ++++++ dlls/msmpeg2vdec/main.c | 32 +++++++++++++++++++++++++++++++ dlls/msmpeg2vdec/msmpeg2vdec.spec | 8 ++++++++ 4 files changed, 47 insertions(+) create mode 100644 dlls/msmpeg2vdec/Makefile.in create mode 100644 dlls/msmpeg2vdec/main.c create mode 100644 dlls/msmpeg2vdec/msmpeg2vdec.spec diff --git a/configure.ac b/configure.ac index 48445cc7b2f..d2e0127f262 100644 --- a/configure.ac +++ b/configure.ac @@ -2750,6 +2750,7 @@ WINE_CONFIG_MAKEFILE(dlls/msimtf) WINE_CONFIG_MAKEFILE(dlls/msisip) WINE_CONFIG_MAKEFILE(dlls/msisys.ocx) WINE_CONFIG_MAKEFILE(dlls/msls31) +WINE_CONFIG_MAKEFILE(dlls/msmpeg2vdec) WINE_CONFIG_MAKEFILE(dlls/msnet32) WINE_CONFIG_MAKEFILE(dlls/mspatcha) WINE_CONFIG_MAKEFILE(dlls/mspatcha/tests) diff --git a/dlls/msmpeg2vdec/Makefile.in b/dlls/msmpeg2vdec/Makefile.in new file mode 100644 index 00000000000..54ada2f20c4 --- /dev/null +++ b/dlls/msmpeg2vdec/Makefile.in @@ -0,0 +1,6 @@ +MODULE = msmpeg2vdec.dll + +EXTRADLLFLAGS = -Wb,--prefer-native + +C_SRCS = \ + main.c diff --git a/dlls/msmpeg2vdec/main.c b/dlls/msmpeg2vdec/main.c new file mode 100644 index 00000000000..61ada37b2f6 --- /dev/null +++ b/dlls/msmpeg2vdec/main.c @@ -0,0 +1,32 @@ +/* + * 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 + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msmpeg2vdec); + +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, LPVOID *ppv) +{ + FIXME("(%s %s %p)\n", debugstr_guid(clsid), debugstr_guid(riid), ppv); + return CLASS_E_CLASSNOTAVAILABLE; +} diff --git a/dlls/msmpeg2vdec/msmpeg2vdec.spec b/dlls/msmpeg2vdec/msmpeg2vdec.spec new file mode 100644 index 00000000000..b81b77ce108 --- /dev/null +++ b/dlls/msmpeg2vdec/msmpeg2vdec.spec @@ -0,0 +1,8 @@ +@ stub GetH264DecoderFunctionTable +@ stub ?GetSurface@CVIDEOfilter@@QEAAJHPEAEJ@Z +@ stub ?GetSurfaceSize@CVIDEOfilter@@QEAAJHPEAJ@Z +@ stub ?LoadSurface@CVIDEOfilter@@QEAAJHPEAEK@Z +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() -- 2.36.0

2 7

[PATCH v2 3/3] win32u: Return -1 for NUMCOLORS with 8-bit display DCs.
by Zhiyi Zhang 21 Apr '22

21 Apr '22

According to tests, GetDeviceCaps(NUMCOLORS) returns -1 for display DCs when the current display mode is 8-bit on newer versions of Windows, which makes sense because lower bit depth display modes are actually emulated with 32-bit modes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52679 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/monitor.c | 2 +- dlls/win32u/driver.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index e595072c747..02bc6651dd3 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -3,6 +3,7 @@ * * Copyright 2005 Huw Davies * Copyright 2008 Dmitry Timoshkov + * Copyright 2019-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 @@ -2314,7 +2315,6 @@ static void test_display_dc(void) value = GetDeviceCaps(hdc, NUMCOLORS); if (bpps[i] > 8 || (bpps[i] == 8 && LOBYTE(LOWORD(GetVersion())) >= 6)) - todo_wine_if(bpps[i] == 8 && LOBYTE(LOWORD(GetVersion())) >= 6) ok(value == -1, "Expected -1, got %d.\n", value); else if (bpps[i] == 8 && LOBYTE(LOWORD(GetVersion())) < 6) ok(value > 16 && value <= 256, "Got %d.\n", value); diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 6b6f1a64ce8..c162a68c924 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -294,7 +294,8 @@ static INT CDECL nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) case LOGPIXELSY: return get_system_dpi(); case NUMCOLORS: bpp = NtGdiGetDeviceCaps( dev->hdc, BITSPIXEL ); - return (bpp > 8) ? -1 : (1 << bpp); + /* Newer versions of Windows return -1 for 8-bit and higher */ + return (bpp > 4) ? -1 : (1 << bpp); case COLORRES: /* The observed correspondence between BITSPIXEL and COLORRES is: * BITSPIXEL: 8 -> COLORRES: 18 -- 2.32.0

2 1

[PATCH v2 2/3] user32/tests: Test NUMCOLORS for display DCs.
by Zhiyi Zhang 21 Apr '22

21 Apr '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/monitor.c | 92 ++++++++++++++++++++++++++++++++++++- 1 file changed, 91 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index fdb13216ad9..e595072c747 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2187,8 +2187,10 @@ static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_ static void test_display_dc(void) { static const INT bpps[] = {1, 4, 8, 16, 24, 32}; + unsigned char buffer[sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)]; + BITMAPINFO *bmi = (BITMAPINFO *)buffer; + INT count, old_count, i, bpp, value; HBITMAP hbitmap, old_hbitmap; - INT count, old_count, i, bpp; DWORD device_idx, mode_idx; DEVMODEA dm, dm2, dm3; DISPLAY_DEVICEA dd; @@ -2241,7 +2243,95 @@ static void test_display_dc(void) winetest_pop_context(); } + /* Test selecting a DIB of a different depth into a display compatible DC */ + for (i = 0; i < ARRAY_SIZE(bpps); ++i) + { + winetest_push_context("bpp %d", bpps[i]); + + mem_dc = CreateCompatibleDC(hdc); + memset(buffer, 0, sizeof(buffer)); + bmi->bmiHeader.biSize = sizeof(bmi->bmiHeader); + bmi->bmiHeader.biWidth = dm.dmPelsWidth; + bmi->bmiHeader.biHeight = dm.dmPelsHeight; + bmi->bmiHeader.biBitCount = bpps[i]; + bmi->bmiHeader.biPlanes = 1; + bmi->bmiHeader.biCompression = BI_RGB; + hbitmap = CreateDIBSection(hdc, bmi, DIB_RGB_COLORS, NULL, NULL, 0); + ok(!!hbitmap, "CreateDIBSection failed, error %ld.\n", GetLastError()); + old_hbitmap = SelectObject(mem_dc, hbitmap); + ok(!!old_hbitmap, "Failed to select bitmap.\n"); + + value = GetDeviceCaps(mem_dc, BITSPIXEL); + ok(value == 32, "Expected 32, got %d.\n", value); + value = GetDeviceCaps(mem_dc, NUMCOLORS); + ok(value == -1, "Expected -1, got %d.\n", value); + + SelectObject(mem_dc, old_hbitmap); + DeleteObject(hbitmap); + DeleteDC(mem_dc); + + winetest_pop_context(); + } + + /* Test NUMCOLORS for display DCs */ + for (i = ARRAY_SIZE(bpps) - 1; i >= 0; --i) + { + winetest_push_context("bpp %d", bpps[i]); + + ret = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dm); + ok(ret, "EnumDisplaySettingsA failed.\n"); + if (bpps[i] == dm.dmBitsPerPel) + { + res = DISP_CHANGE_SUCCESSFUL; + } + else + { + memset(&dm2, 0, sizeof(dm2)); + dm2.dmSize = sizeof(dm2); + for (mode_idx = 0; EnumDisplaySettingsA(NULL, mode_idx, &dm2); ++mode_idx) + { + if (dm2.dmBitsPerPel == bpps[i]) + break; + } + if (dm2.dmBitsPerPel != bpps[i]) + { + skip("%d-bit display mode not found.\n", bpps[i]); + winetest_pop_context(); + continue; + } + + res = ChangeDisplaySettingsExA(NULL, &dm2, NULL, CDS_RESET, NULL); + /* Win8 TestBots */ + ok(res == DISP_CHANGE_SUCCESSFUL || broken(res == DISP_CHANGE_FAILED), + "ChangeDisplaySettingsExA returned unexpected %ld.\n", res); + } + + if (res == DISP_CHANGE_SUCCESSFUL) + { + value = GetDeviceCaps(hdc, BITSPIXEL); + ok(value == (bpps[i] == 4 ? 1 : bpps[i]), "Expected %d, got %d.\n", + (bpps[i] == 4 ? 1 : bpps[i]), value); + + value = GetDeviceCaps(hdc, NUMCOLORS); + if (bpps[i] > 8 || (bpps[i] == 8 && LOBYTE(LOWORD(GetVersion())) >= 6)) + todo_wine_if(bpps[i] == 8 && LOBYTE(LOWORD(GetVersion())) >= 6) + ok(value == -1, "Expected -1, got %d.\n", value); + else if (bpps[i] == 8 && LOBYTE(LOWORD(GetVersion())) < 6) + ok(value > 16 && value <= 256, "Got %d.\n", value); + else + ok(value == 1 << bpps[i], "Expected %d, got %d.\n", 1 << bpps[i], value); + } + winetest_pop_context(); + } + res = ChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); + /* Win8 TestBots */ + ok(res == DISP_CHANGE_SUCCESSFUL || broken(res == DISP_CHANGE_FAILED), + "ChangeDisplaySettingsExA returned unexpected %ld.\n", res); + /* Test selecting a DDB of the same color depth into a display compatible DC */ + ret = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dm); + ok(ret, "EnumDisplaySettingsA failed.\n"); + mem_dc = CreateCompatibleDC(hdc); bpp = GetDeviceCaps(mem_dc, BITSPIXEL); ok(bpp == dm.dmBitsPerPel, "Expected bpp %ld, got %d.\n", dm.dmBitsPerPel, bpp); -- 2.32.0

2 1

[PATCH v2 1/3] user32/tests: Avoid unnecessary display mode changes.
by Zhiyi Zhang 21 Apr '22

21 Apr '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 231843~231844. Avoid unnecessary display mode changes when possible. 2/3 is not merged to other tests because there aren't existing tests that can cover all the required display depths. Running all the user32 monitor tests takes <=25 seconds on the Linux TestBots. dlls/user32/tests/monitor.c | 35 ++++------------------------------- 1 file changed, 4 insertions(+), 31 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index d0d4ff1f324..fdb13216ad9 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -484,8 +484,6 @@ static void test_ChangeDisplaySettingsEx(void) } if (pSetThreadDpiAwarenessContext && context) pSetThreadDpiAwarenessContext(context); - res = ChangeDisplaySettingsExA(NULL, NULL, NULL, CDS_RESET, NULL); - ok(res == DISP_CHANGE_SUCCESSFUL, "Failed to reset default resolution: %ld\n", res); /* Save the original mode for all devices so that they can be restored at the end of tests */ device_count = 0; @@ -568,10 +566,6 @@ static void test_ChangeDisplaySettingsEx(void) broken(res == DISP_CHANGE_BADPARAM) || /* win10 */ broken(res == DISP_CHANGE_FAILED), /* win8 TestBot */ "ChangeDisplaySettingsExA %s returned unexpected %ld\n", devices[0].name, res); - res = ChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); - ok(res == DISP_CHANGE_SUCCESSFUL || - broken(res == DISP_CHANGE_FAILED), /* win8 TestBot */ - "ChangeDisplaySettingsExA %s returned unexpected %ld\n", devices[0].name, res); } /* Test that only specifying DM_POSITION in dmFields is not enough to detach an adapter */ @@ -2260,34 +2254,13 @@ static void test_display_dc(void) SelectObject(mem_dc, old_hbitmap); DeleteDC(mem_dc); - /* Tests after mode changes to a different resolution */ + /* Tests after mode changes to a mode with different resolution and color depth */ memset(&dm2, 0, sizeof(dm2)); dm2.dmSize = sizeof(dm2); for (mode_idx = 0; EnumDisplaySettingsA(NULL, mode_idx, &dm2); ++mode_idx) { - if (dm2.dmPelsWidth != dm.dmPelsWidth && dm2.dmPelsHeight != dm.dmPelsHeight) - break; - } - ok(dm2.dmPelsWidth && dm2.dmPelsWidth != dm.dmPelsWidth && dm2.dmPelsHeight != dm.dmPelsHeight, - "Failed to find a different resolution.\n"); - - res = ChangeDisplaySettingsExA(NULL, &dm2, NULL, CDS_RESET, NULL); - ok(res == DISP_CHANGE_SUCCESSFUL || broken(res == DISP_CHANGE_FAILED), /* Win8 TestBots */ - "ChangeDisplaySettingsExA returned unexpected %ld.\n", res); - if (res == DISP_CHANGE_SUCCESSFUL) - { - check_display_dc(hdc, &dm2, FALSE); - - res = ChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); - ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA returned unexpected %ld.\n", res); - } - - /* Tests after mode changes to a different color depth */ - memset(&dm2, 0, sizeof(dm2)); - dm2.dmSize = sizeof(dm2); - for (mode_idx = 0; EnumDisplaySettingsA(NULL, mode_idx, &dm2); ++mode_idx) - { - if (dm2.dmBitsPerPel != dm.dmBitsPerPel && dm2.dmBitsPerPel != 1) + if (dm2.dmPelsWidth != dm.dmPelsWidth && dm2.dmPelsHeight != dm.dmPelsHeight && + dm2.dmBitsPerPel != dm.dmBitsPerPel && dm2.dmBitsPerPel != 1) break; } if (dm2.dmBitsPerPel && dm2.dmBitsPerPel != dm.dmBitsPerPel) @@ -2357,7 +2330,7 @@ static void test_display_dc(void) } else { - win_skip("Failed to find a different color depth other than %lu.\n", dm.dmBitsPerPel); + win_skip("Failed to find a required display mode.\n"); } if (hbitmap) -- 2.32.0

2 1

Re: [PATCH v2 1/3] conhost: Save console settings as global defaults on first run
by Hugh McMaster 21 Apr '22

21 Apr '22

Hi Jacek, On Wed, 20 Apr 2022 at 23:10, Hugh McMaster wrote: > SetCurrentConsoleFontEx() only alters the active session settings; it > does not modify console registry settings. However, the call to > SetCurrentConsoleFontEx() could end up modifying the registry settings > if CreateFontIndirectW() fails, which is extremely unlikely since it > selects a font as close as possible to the LOGFONT parameters. > > On Windows, passing an invalid font face name via CONSOLE_FONT_INFOEX > generally results in the existing font remaining unchanged. On Windows > 10 1809 or more recent, the font seems to change to a default font, > Courier New. See [1] for some tests. > > Wine behaves similarly here. On my system, a simple test program set > the font from Liberation Mono to DejaVu Sans Mono. > > If you're concerned, it might be better to create a new code path for > set_output_info(). The call could check the returned value of > set_console_font() and, if it failed (however unlikely that is), make > a second call using the current active font (or get the first valid > font). > > That proposal probably didn't make a lot of sense, so I might prepare > a patch to make it clear. Let me know if you have a preference for > using the active font as a fallback or getting the first valid font. > > I was planning on making updates to the default font code later, but > it seems better to fix this now. Scratch all of that. A better and more practical solution for the SetCurrentConsoleFontex() and first-run code paths would be to call EnumFontFamiliesEx() to get a valid matching font. In the case of SetCurrentConsoleFontEx(), the font will either match or be very similar. This would mirror the behaviour seen on Windows. Font changes via the console dialog would not need that code path, as EnumFontFamiliesEx() is already used to get valid console font names and sizes. Hugh

1 0

[PATCH] include: Add Windows.Gaming.Input.FlightStick runtimeclass declaration.
by Biswapriyo Nath 21 Apr '22

21 Apr '22

1 0

[PATCH v2 4/5] apisetschema: Add api-ms-win-core-winrt-robuffer-l1-1-0.
by Zhiyi Zhang 21 Apr '22

21 Apr '22

Required for Iragon: Prologue. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/apisetschema/apisetschema.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/apisetschema/apisetschema.spec b/dlls/apisetschema/apisetschema.spec index dce332e51fb..b13d00f8844 100644 --- a/dlls/apisetschema/apisetschema.spec +++ b/dlls/apisetschema/apisetschema.spec @@ -147,6 +147,7 @@ apiset api-ms-win-core-winrt-error-l1-1-1 = combase.dll apiset api-ms-win-core-winrt-errorprivate-l1-1-1 = combase.dll apiset api-ms-win-core-winrt-l1-1-0 = combase.dll apiset api-ms-win-core-winrt-registration-l1-1-0 = combase.dll +apiset api-ms-win-core-winrt-robuffer-l1-1-0 = wintypes.dll apiset api-ms-win-core-winrt-roparameterizediid-l1-1-0 = combase.dll apiset api-ms-win-core-winrt-string-l1-1-1 = combase.dll apiset api-ms-win-core-wow64-l1-1-1 = kernelbase.dll -- 2.32.0

1 0

Jump to page:

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