April 2022 - Wine-devel - list.winehq.org

[PATCH 1/6] win32u: Move NtUserSetMenuContextHelpId implementation from user32.
by Jacek Caban 20 Apr '22

20 Apr '22

3 2

[PATCH 0/3] winepulse: Add Wow64 handlers.
by Huw Davies 20 Apr '22

20 Apr '22

Since the wineoss queue has stalled for today, I thought I'd send in the Wow64 handlers for winepulse. The first two patches can be tested with a regular setup. The third requires enabling the new Wow64 mode (see the patch below). With that applied you build and install 32-bit and 64-bit versions of Wine and then run a 32-bit app with wine64. There's obviously no graphics at this point, but the 32-bit mmdevapi tests run well. Huw D. M. Davies (3): winepulse: Use handles to represent the stream. winepulse: Return offsets rather than ptrs to the strings. winepulse: Implement Wow64 entry points in the Unix library. dlls/winepulse.drv/mmdevdrv.c | 17 +- dlls/winepulse.drv/pulse.c | 522 ++++++++++++++++++++++++++++++++-- dlls/winepulse.drv/unixlib.h | 44 ++- 3 files changed, 524 insertions(+), 59 deletions(-) -- diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index d750f7a7579..b18f1c7fba9 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1548,8 +1548,8 @@ static NTSTATUS MODULE_InitDLL( WINE_MODREF *wm, UINT reason, LPVOID lpReserved if (wm->ldr.Flags & LDR_DONT_RESOLVE_REFS) return STATUS_SUCCESS; if (wm->ldr.TlsIndex != -1) call_tls_callbacks( wm->ldr.DllBase, reason ); - if (wm->ldr.Flags & LDR_WINE_INTERNAL && reason == DLL_PROCESS_ATTACH) - unix_funcs->init_builtin_dll( wm->ldr.DllBase ); +// if (wm->ldr.Flags & LDR_WINE_INTERNAL && reason == DLL_PROCESS_ATTACH) +// unix_funcs->init_builtin_dll( wm->ldr.DllBase ); if (!entry) return STATUS_SUCCESS; if (TRACE_ON(relay)) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index ee958ae71f4..2bb5e8bbf83 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1919,7 +1919,7 @@ static RTL_USER_PROCESS_PARAMETERS *build_initial_params( void **module ) if (!status) { if (main_image_info.ImageCharacteristics & IMAGE_FILE_DLL) status = STATUS_INVALID_IMAGE_FORMAT; - if (main_image_info.Machine != current_machine) status = STATUS_INVALID_IMAGE_FORMAT; +// if (main_image_info.Machine != current_machine) status = STATUS_INVALID_IMAGE_FORMAT; } if (status) /* try launching it through start.exe */

5 5

[PATCH 1/5] webservices: Don't advance binary encoding reader if record type doesn't match.
by Connor McAdams 20 Apr '22

20 Apr '22

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/webservices/reader.c | 18 ++++++++++++------ dlls/webservices/tests/reader.c | 15 ++++++--------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 7da0c8335ea..b22bcbd51b1 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1486,8 +1486,9 @@ static HRESULT read_attribute_value_bin( struct reader *reader, WS_XML_ATTRIBUTE GUID guid; HRESULT hr; - if ((hr = read_byte( reader, &type )) != S_OK) return hr; + if ((hr = read_peek( reader, &type, 1 )) != S_OK) return hr; if (!is_text_type( type )) return WS_E_INVALID_FORMAT; + read_skip( reader, 1 ); switch (type) { @@ -1771,9 +1772,10 @@ static HRESULT read_attribute_bin( struct reader *reader, WS_XML_ATTRIBUTE **ret unsigned char type = 0; HRESULT hr; - if ((hr = read_byte( reader, &type )) != S_OK) return hr; + if ((hr = read_peek( reader, &type, 1 )) != S_OK) return hr; if (!is_attribute_type( type )) return WS_E_INVALID_FORMAT; if (!(attr = calloc( 1, sizeof(*attr) ))) return E_OUTOFMEMORY; + read_skip( reader, 1 ); if (type >= RECORD_PREFIX_ATTRIBUTE_A && type <= RECORD_PREFIX_ATTRIBUTE_Z) { @@ -2068,8 +2070,9 @@ static HRESULT read_element_bin( struct reader *reader ) unsigned char type; HRESULT hr; - if ((hr = read_byte( reader, &type )) != S_OK) return hr; + if ((hr = read_peek( reader, &type, 1 )) != S_OK) return hr; if (!is_element_type( type )) return WS_E_INVALID_FORMAT; + read_skip( reader, 1 ); if (!(elem = alloc_element_pair())) return E_OUTOFMEMORY; node = (struct node *)elem; @@ -2480,8 +2483,9 @@ static HRESULT read_text_bin( struct reader *reader ) GUID uuid; HRESULT hr; - if ((hr = read_byte( reader, &type )) != S_OK) return hr; + if ((hr = read_peek( reader, &type, 1 )) != S_OK) return hr; if (!is_text_type( type ) || !(parent = find_parent( reader ))) return WS_E_INVALID_FORMAT; + read_skip( reader, 1 ); switch (type) { @@ -2835,8 +2839,9 @@ static HRESULT read_endelement_bin( struct reader *reader ) if (!(reader->current->flags & NODE_FLAG_TEXT_WITH_IMPLICIT_END_ELEMENT)) { - if ((hr = read_byte( reader, &type )) != S_OK) return hr; + if ((hr = read_peek( reader, &type, 1 )) != S_OK) return hr; if (type != RECORD_ENDELEMENT) return WS_E_INVALID_FORMAT; + read_skip( reader, 1 ); } if (!(parent = find_parent( reader ))) return WS_E_INVALID_FORMAT; @@ -2917,8 +2922,9 @@ static HRESULT read_comment_bin( struct reader *reader ) ULONG len; HRESULT hr; - if ((hr = read_byte( reader, &type )) != S_OK) return hr; + if ((hr = read_peek( reader, &type, 1 )) != S_OK) return hr; if (type != RECORD_COMMENT) return WS_E_INVALID_FORMAT; + read_skip( reader, 1 ); if ((hr = read_int31( reader, &len )) != S_OK) return hr; if (!(parent = find_parent( reader ))) return WS_E_INVALID_FORMAT; diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 1a2cd1fe420..f62697b9662 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -5764,15 +5764,12 @@ static void test_binary_encoding(void) hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_READ_REQUIRED_POINTER, heap, &test_struct, sizeof(test_struct), NULL ); - todo_wine ok( hr == S_OK, "got %#lx\n", hr ); - if (SUCCEEDED(hr)) - { - ok( test_struct->a == 1, "got %d\n", test_struct->a ); - ok( !!test_struct->s, "s is not set\n" ); - ok( test_struct->s->s_a == 1, "got %d\n", test_struct->s->s_a ); - ok( test_struct->s->s_b == 0, "got %d\n", test_struct->s->s_b ); - ok( test_struct->b == 1, "got %d\n", test_struct->b ); - } + ok( hr == S_OK, "got %#lx\n", hr ); + ok( test_struct->a == 1, "got %d\n", test_struct->a ); + ok( !!test_struct->s, "s is not set\n" ); + ok( test_struct->s->s_a == 1, "got %d\n", test_struct->s->s_a ); + ok( test_struct->s->s_b == 0, "got %d\n", test_struct->s->s_b ); + ok( test_struct->b == 1, "got %d\n", test_struct->b ); WsFreeHeap( heap ); WsFreeReader( reader ); -- 2.25.1

2 9

[tools 1/2] testbot/web: Always return "ro" or false in CollectionBlock::DisplayProperty().
by Francois Gouget 20 Apr '22

20 Apr '22

This better matches FormPage::DisplayProperty() and opens the door to later extending collection blocks to support edition. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 2 +- testbot/web/JobDetails.pl | 6 +----- testbot/web/PatchesList.pl | 5 ++--- testbot/web/admin/UsersList.pl | 3 +-- testbot/web/admin/VMDetails.pl | 4 ++-- testbot/web/admin/VMsList.pl | 5 ++--- testbot/web/index.pl | 5 ++--- 7 files changed, 11 insertions(+), 19 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 3e3ee2952..bd0c8f6eb 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -179,7 +179,7 @@ sub DisplayProperty($$) { my ($self, $PropertyDescriptor) = @_; - return $PropertyDescriptor->GetClass ne "Detailref"; + return $PropertyDescriptor->GetClass eq "Detailref" ? "" : "ro"; } sub GetSortedItems($$) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 2c7901a75..f681ca5d6 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -49,11 +49,7 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return $PropertyName eq "StepNo" || $PropertyName eq "TaskNo" || - $PropertyName eq "Status" || $PropertyName eq "VM" || - $PropertyName eq "Timeout" || $PropertyName eq "FileName" || - $PropertyName eq "CmdLineArg" || $PropertyName eq "Started" || - $PropertyName eq "Ended" || $PropertyName eq "TestFailures"; + return $PropertyName =~ /^(?:StepNo|TaskNo|Status|VM|Timeout|FileName|CmdLineArg|Started|Ended|TestFailures)$/ ? "ro" : ""; } diff --git a/testbot/web/PatchesList.pl b/testbot/web/PatchesList.pl index 48c8382e7..a1c5171df 100644 --- a/testbot/web/PatchesList.pl +++ b/testbot/web/PatchesList.pl @@ -40,9 +40,8 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - - return $PropertyName eq "Received" || $PropertyName eq "Disposition" || - $PropertyName eq "FromName" || $PropertyName eq "Subject"; + return $PropertyName =~ /^(?:Received|Disposition|FromName|Subject)$/ ? "ro" : + ""; } sub GenerateDataView($$$) diff --git a/testbot/web/admin/UsersList.pl b/testbot/web/admin/UsersList.pl index bc5ced8a7..368a6ceac 100644 --- a/testbot/web/admin/UsersList.pl +++ b/testbot/web/admin/UsersList.pl @@ -42,8 +42,7 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return $PropertyName eq "Name" || $PropertyName eq "EMail" || - $PropertyName eq "Status" || $PropertyName eq "RealName"; + return $PropertyName =~ /^(?:Name|EMail|Status|RealName)$/ ? "ro" : ""; } sub GenerateDataCell($$$) diff --git a/testbot/web/admin/VMDetails.pl b/testbot/web/admin/VMDetails.pl index 35b26811a..fd2d40de3 100644 --- a/testbot/web/admin/VMDetails.pl +++ b/testbot/web/admin/VMDetails.pl @@ -40,8 +40,8 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return "" if ($PropertyName =~ /^(?:ChildPid|ChildDeadline|Errors)$/); - return $self->SUPER::DisplayProperty($PropertyDescriptor); + return $PropertyName =~ /^(?:ChildPid|ChildDeadline|Errors)$/ ? "" : + $self->SUPER::DisplayProperty($PropertyDescriptor); } sub Save($) diff --git a/testbot/web/admin/VMsList.pl b/testbot/web/admin/VMsList.pl index f8162c63e..6c3ff2036 100644 --- a/testbot/web/admin/VMsList.pl +++ b/testbot/web/admin/VMsList.pl @@ -38,9 +38,8 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return $PropertyName eq "Name" || $PropertyName eq "Type" || - $PropertyName eq "Role" || $PropertyName eq "Status" || - $PropertyName eq "Description"; + return $PropertyName =~ /^(?:Name|Type|Role|Status|Description)$/ ? "ro" : + ""; } sub OnItemAction($$$) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index a18920533..0b8a9cb78 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -183,9 +183,8 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return $PropertyName eq "Name" || $PropertyName eq "Type" || - $PropertyName eq "Role" || $PropertyName eq "Status" || - $PropertyName eq "Description"; + return $PropertyName =~ /^(?:Name|Type|Role|Status|Description)$/ ? "ro" : + ""; } -- 2.30.2

1 1

[tools] testbot/cgi: Fix the CollectionBlock::GenerateHeaderRow() prototype.
by Francois Gouget 20 Apr '22

20 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 0a737c71c..e849d5a59 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -336,7 +336,7 @@ sub GenerateHeaderCell($$$) print "</th>\n"; } -sub GenerateHeaderRow($$$) +sub GenerateHeaderRow($$) { my ($self, $Row) = @_; -- 2.30.2

1 0

[tools] testbot/web: Simplify the register page's DisplayProperty().
by Francois Gouget 20 Apr '22

20 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Register.pl | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/testbot/web/Register.pl b/testbot/web/Register.pl index b10be75e7..b31dc14c1 100644 --- a/testbot/web/Register.pl +++ b/testbot/web/Register.pl @@ -79,15 +79,9 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - - my $Display; - if ($PropertyName ne "Name" && $PropertyName ne "EMail" && - $PropertyName ne "RealName") - { - return ""; - } - - return $self->SUPER::DisplayProperty($PropertyDescriptor); + return $PropertyName =~ /^(?:Name|EMail|RealName)$/ ? + $self->SUPER::DisplayProperty($PropertyDescriptor) : + ""; } sub GenerateFields($) -- 2.30.2

1 0

[tools] testbot/cgi: Fix the CollectionBlock::GenerateHeaderView() documentation.
by Francois Gouget 20 Apr '22

20 Apr '22

The Row and Rows fields were undocumented and there was a bug in the POD formatting. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index bd0c8f6eb..0a737c71c 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -241,7 +241,13 @@ The base link to the item details page if any. See GetDetailsPage(). =item ItemActions The list of per-item actions. -=cut +=item Row +The row index; 0 for the header. + +=item Rows +The total number of rows (excluding the header). + +=back =back =cut -- 2.30.2

1 0

[tools] testbot/web: Use GenerateDataView() for the users list.
by Francois Gouget 20 Apr '22

20 Apr '22

There is no need to override GenerateDataCell(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/admin/UsersList.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/web/admin/UsersList.pl b/testbot/web/admin/UsersList.pl index 368a6ceac..dcdb8111c 100644 --- a/testbot/web/admin/UsersList.pl +++ b/testbot/web/admin/UsersList.pl @@ -45,7 +45,7 @@ sub DisplayProperty($$) return $PropertyName =~ /^(?:Name|EMail|Status|RealName)$/ ? "ro" : ""; } -sub GenerateDataCell($$$) +sub GenerateDataView($$$) { my ($self, $Row, $PropertyDescriptor) = @_; @@ -83,11 +83,11 @@ sub GenerateDataCell($$$) ($Class, $Label) = ('usernone', 'none'); } my $DetailsLink = $self->GetDetailsLink($Row); - print "<td><a href='$DetailsLink'><span class='$Class'>$Label</span></a></td>"; + print "<a href='$DetailsLink'><span class='$Class'>$Label</span></a>"; } else { - $self->SUPER::GenerateDataCell($Row, $PropertyDescriptor); + $self->SUPER::GenerateDataView($Row, $PropertyDescriptor); } } -- 2.30.2

1 0

[PATCH 5/5 v2] wineoss: Move MODM_OPEN and MODM_CLOSE to the unixlib.
by Andrew Eikum 20 Apr '22

20 Apr '22

From: Huw Davies <huw(a)codeweavers.com> They are both moved together because of the memory allocated for "lpExtra". Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 180 ++++++---------------------------- dlls/wineoss.drv/oss.c | 2 +- dlls/wineoss.drv/ossmidi.c | 191 +++++++++++++++++++++++++++++++++++-- dlls/wineoss.drv/unixlib.h | 28 +++++- 4 files changed, 235 insertions(+), 166 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 7d21dd32ae8..d66e926655d 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -149,6 +149,15 @@ static LRESULT OSS_MidiExit(void) return 0; } +static void notify_client(struct notify_context *notify) +{ + TRACE("dev_id = %d msg = %d param1 = %04lX param2 = %04lX\n", + notify->dev_id, notify->msg, notify->param_1, notify->param_2); + + DriverCallback(notify->callback, notify->flags, notify->device, notify->msg, + notify->instance, notify->param_1, notify->param_2); +} + /************************************************************************** * MIDI_NotifyClient [internal] */ @@ -164,8 +173,6 @@ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, wDevID, wMsg, dwParam1, dwParam2); switch (wMsg) { - case MOM_OPEN: - case MOM_CLOSE: case MOM_DONE: case MOM_POSITIONCB: if (wDevID > MODM_NumDevs) return; @@ -723,20 +730,6 @@ typedef struct sFMextra { */ } sFMextra; -/************************************************************************** - * modFMLoad [internal] - */ -static int modFMLoad(WORD dev, int fd) -{ - struct midi_out_fm_load_params params; - - params.dev_id = dev; - params.fd = fd; - OSS_CALL(midi_out_fm_load, &params); - - return params.ret; -} - #define IS_DRUM_CHANNEL(_xtra, _chn) ((_xtra)->drumSetMask & (1 << (_chn))) /************************************************************************** @@ -754,132 +747,6 @@ static DWORD modGetDevCaps(WORD wDevID, LPMIDIOUTCAPSW lpCaps, DWORD dwSize) return MMSYSERR_NOERROR; } -/************************************************************************** - * modOpen [internal] - */ -static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) -{ - int fd = -1; - - TRACE("(%04X, %p, %08X);\n", wDevID, lpDesc, dwFlags); - if (lpDesc == NULL) { - WARN("Invalid Parameter !\n"); - return MMSYSERR_INVALPARAM; - } - if (wDevID >= MODM_NumDevs) { - TRACE("MAX_MIDIOUTDRV reached !\n"); - return MMSYSERR_BADDEVICEID; - } - if (MidiOutDev[wDevID].midiDesc.hMidi != 0) { - WARN("device already open !\n"); - return MMSYSERR_ALLOCATED; - } - if (!MidiOutDev[wDevID].bEnabled) { - WARN("device disabled !\n"); - return MIDIERR_NODEVICE; - } - if ((dwFlags & ~CALLBACK_TYPEMASK) != 0) { - WARN("bad dwFlags\n"); - return MMSYSERR_INVALFLAG; - } - - MidiOutDev[wDevID].lpExtra = 0; - - switch (MidiOutDev[wDevID].caps.wTechnology) { - case MOD_FMSYNTH: - { - void* extra; - - extra = HeapAlloc(GetProcessHeap(), 0, - offsetof(struct sFMextra, voice[MidiOutDev[wDevID].caps.wVoices])); - - if (extra == 0) { - WARN("can't alloc extra data !\n"); - return MMSYSERR_NOMEM; - } - MidiOutDev[wDevID].lpExtra = extra; - fd = midiOpenSeq(); - if (fd < 0) { - MidiOutDev[wDevID].lpExtra = 0; - HeapFree(GetProcessHeap(), 0, extra); - return MMSYSERR_ERROR; - } - if (modFMLoad(wDevID, fd) < 0) { - midiCloseSeq(fd); - MidiOutDev[wDevID].lpExtra = 0; - HeapFree(GetProcessHeap(), 0, extra); - return MMSYSERR_ERROR; - } - OSS_CALL(midi_out_fm_reset, (void *)(UINT_PTR)wDevID); - } - break; - case MOD_MIDIPORT: - case MOD_SYNTH: - fd = midiOpenSeq(); - if (fd < 0) { - return MMSYSERR_ALLOCATED; - } - break; - default: - WARN("Technology not supported (yet) %d !\n", - MidiOutDev[wDevID].caps.wTechnology); - return MMSYSERR_NOTENABLED; - } - - MidiOutDev[wDevID].wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); - - MidiOutDev[wDevID].lpQueueHdr = NULL; - MidiOutDev[wDevID].midiDesc = *lpDesc; - MidiOutDev[wDevID].fd = fd; - - MIDI_NotifyClient(wDevID, MOM_OPEN, 0L, 0L); - TRACE("Successful !\n"); - return MMSYSERR_NOERROR; -} - - -/************************************************************************** - * modClose [internal] - */ -static DWORD modClose(WORD wDevID) -{ - int ret = MMSYSERR_NOERROR; - - TRACE("(%04X);\n", wDevID); - - if (MidiOutDev[wDevID].midiDesc.hMidi == 0) { - WARN("device not opened !\n"); - return MMSYSERR_ERROR; - } - /* FIXME: should test that no pending buffer is still in the queue for - * playing */ - - if (MidiOutDev[wDevID].fd == -1) { - WARN("can't close !\n"); - return MMSYSERR_ERROR; - } - - switch (MidiOutDev[wDevID].caps.wTechnology) { - case MOD_FMSYNTH: - case MOD_SYNTH: - case MOD_MIDIPORT: - midiCloseSeq(MidiOutDev[wDevID].fd); - break; - default: - WARN("Technology not supported (yet) %d !\n", - MidiOutDev[wDevID].caps.wTechnology); - return MMSYSERR_NOTENABLED; - } - - HeapFree(GetProcessHeap(), 0, MidiOutDev[wDevID].lpExtra); - MidiOutDev[wDevID].lpExtra = 0; - MidiOutDev[wDevID].fd = -1; - - MIDI_NotifyClient(wDevID, MOM_CLOSE, 0L, 0L); - MidiOutDev[wDevID].midiDesc.hMidi = 0; - return ret; -} - /************************************************************************** * modData [internal] */ @@ -1378,6 +1245,10 @@ DWORD WINAPI OSS_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { + struct midi_out_message_params params; + struct notify_context notify; + UINT err; + TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); @@ -1386,14 +1257,6 @@ DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return OSS_MidiInit(); case DRVM_EXIT: return OSS_MidiExit(); - case DRVM_ENABLE: - case DRVM_DISABLE: - /* FIXME: Pretend this is supported */ - return 0; - case MODM_OPEN: - return modOpen(wDevID, (LPMIDIOPENDESC)dwParam1, dwParam2); - case MODM_CLOSE: - return modClose(wDevID); case MODM_DATA: return modData(wDevID, dwParam1); case MODM_LONGDATA: @@ -1412,10 +1275,21 @@ DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return 0; case MODM_RESET: return modReset(wDevID); - default: - TRACE("Unsupported message\n"); } - return MMSYSERR_NOTSUPPORTED; + + params.dev_id = wDevID; + params.msg = wMsg; + params.user = dwUser; + params.param_1 = dwParam1; + params.param_2 = dwParam2; + params.err = &err; + params.notify = &notify; + + OSS_CALL(midi_out_message, &params); + + if (!err && notify.send_notify) notify_client(&notify); + + return err; } /************************************************************************** diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 902685c11b8..1bd5ddb5762 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1406,8 +1406,8 @@ unixlib_entry_t __wine_unix_call_funcs[] = set_event_handle, is_started, midi_init, + midi_out_message, midi_seq_open, - midi_out_fm_load, midi_out_fm_reset, }; diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c index dcafbe609d9..613b070fde5 100644 --- a/dlls/wineoss.drv/ossmidi.c +++ b/dlls/wineoss.drv/ossmidi.c @@ -424,11 +424,8 @@ void seqbuf_dump(void) extern const unsigned char midiFMInstrumentPatches[16 * 128]; extern const unsigned char midiFMDrumsPatches[16 * 128]; -NTSTATUS midi_out_fm_load(void *args) +static int midi_out_fm_load(WORD dev_id, int fd) { - struct midi_out_fm_load_params *params = args; - WORD dev_id = params->dev_id; - int fd = params->fd; struct sbi_instrument sbi; int i; @@ -444,8 +441,7 @@ NTSTATUS midi_out_fm_load(void *args) if (write(fd, &sbi, sizeof(sbi)) == -1) { WARN("Couldn't write patch for instrument %d, errno %d (%s)!\n", sbi.channel, errno, strerror(errno)); - params->ret = -1; - return STATUS_SUCCESS; + return -1; } } for (i = 0; i < 128; i++) @@ -456,12 +452,10 @@ NTSTATUS midi_out_fm_load(void *args) if (write(fd, &sbi, sizeof(sbi)) == -1) { WARN("Couldn't write patch for drum %d, errno %d (%s)!\n", sbi.channel, errno, strerror(errno)); - params->ret = -1; - return STATUS_SUCCESS; + return -1; } } - params->ret = 0; - return STATUS_SUCCESS; + return 0; } NTSTATUS midi_out_fm_reset(void *args) @@ -501,3 +495,180 @@ NTSTATUS midi_out_fm_reset(void *args) return STATUS_SUCCESS; } + +static void set_out_notify(struct notify_context *notify, struct midi_dest *dest, WORD dev_id, WORD msg, + UINT_PTR param_1, UINT_PTR param_2) +{ + notify->send_notify = TRUE; + notify->dev_id = dev_id; + notify->msg = msg; + notify->param_1 = param_1; + notify->param_2 = param_2; + notify->callback = dest->midiDesc.dwCallback; + notify->flags = dest->wFlags; + notify->device = dest->midiDesc.hMidi; + notify->instance = dest->midiDesc.dwInstance; +} + +static UINT midi_out_open(WORD dev_id, MIDIOPENDESC *midi_desc, UINT flags, struct notify_context *notify) +{ + struct midi_dest *dest; + int fd = -1; + + TRACE("(%04X, %p, %08X);\n", dev_id, midi_desc, flags); + if (midi_desc == NULL) + { + WARN("Invalid Parameter !\n"); + return MMSYSERR_INVALPARAM; + } + if (dev_id >= num_dests) + { + TRACE("MAX_MIDIOUTDRV reached !\n"); + return MMSYSERR_BADDEVICEID; + } + dest = dests + dev_id; + if (dest->midiDesc.hMidi != 0) + { + WARN("device already open !\n"); + return MMSYSERR_ALLOCATED; + } + if (!dest->bEnabled) + { + WARN("device disabled !\n"); + return MIDIERR_NODEVICE; + } + if ((flags & ~CALLBACK_TYPEMASK) != 0) + { + WARN("bad flags\n"); + return MMSYSERR_INVALFLAG; + } + + dest->lpExtra = NULL; + + switch (dest->caps.wTechnology) + { + case MOD_FMSYNTH: + { + void *extra; + + extra = malloc(offsetof(struct sFMextra, voice[dest->caps.wVoices])); + if (!extra) + { + WARN("can't alloc extra data !\n"); + return MMSYSERR_NOMEM; + } + dest->lpExtra = extra; + fd = seq_open(); + if (fd < 0) + { + dest->lpExtra = NULL; + free(extra); + return MMSYSERR_ERROR; + } + if (midi_out_fm_load(dev_id, fd) < 0) + { + seq_close(fd); + dest->lpExtra = NULL; + free(extra); + return MMSYSERR_ERROR; + } + midi_out_fm_reset((void *)(UINT_PTR)dev_id); + break; + } + case MOD_MIDIPORT: + case MOD_SYNTH: + fd = seq_open(); + if (fd < 0) + return MMSYSERR_ALLOCATED; + break; + default: + WARN("Technology not supported (yet) %d !\n", dest->caps.wTechnology); + return MMSYSERR_NOTENABLED; + } + + dest->wFlags = HIWORD(flags & CALLBACK_TYPEMASK); + + dest->lpQueueHdr= NULL; + dest->midiDesc = *midi_desc; + dest->fd = fd; + + set_out_notify(notify, dest, dev_id, MOM_OPEN, 0, 0); + TRACE("Successful !\n"); + return MMSYSERR_NOERROR; +} + +static UINT midi_out_close(WORD dev_id, struct notify_context *notify) +{ + struct midi_dest *dest; + + TRACE("(%04X);\n", dev_id); + + if (dev_id >= num_dests) + { + TRACE("MAX_MIDIOUTDRV reached !\n"); + return MMSYSERR_BADDEVICEID; + } + dest = dests + dev_id; + + if (dest->midiDesc.hMidi == 0) + { + WARN("device not opened !\n"); + return MMSYSERR_ERROR; + } + /* FIXME: should test that no pending buffer is still in the queue for + * playing */ + + if (dest->fd == -1) + { + WARN("can't close !\n"); + return MMSYSERR_ERROR; + } + + switch (dest->caps.wTechnology) + { + case MOD_FMSYNTH: + case MOD_SYNTH: + case MOD_MIDIPORT: + seq_close(dest->fd); + break; + default: + WARN("Technology not supported (yet) %d !\n", dest->caps.wTechnology); + return MMSYSERR_NOTENABLED; + } + + free(dest->lpExtra); + dest->lpExtra = NULL; + dest->fd = -1; + + set_out_notify(notify, dest, dev_id, MOM_CLOSE, 0, 0); + dest->midiDesc.hMidi = 0; + return MMSYSERR_NOERROR; +} + + +NTSTATUS midi_out_message(void *args) +{ + struct midi_out_message_params *params = args; + + params->notify->send_notify = FALSE; + + switch (params->msg) + { + case DRVM_ENABLE: + case DRVM_DISABLE: + /* FIXME: Pretend this is supported */ + *params->err = MMSYSERR_NOERROR; + break; + case MODM_OPEN: + *params->err = midi_out_open(params->dev_id, (MIDIOPENDESC *)params->param_1, params->param_2, params->notify); + break; + case MODM_CLOSE: + *params->err = midi_out_close(params->dev_id, params->notify); + break; + default: + TRACE("Unsupported message\n"); + *params->err = MMSYSERR_NOTSUPPORTED; + } + + return STATUS_SUCCESS; +} diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index ecca092d540..75506d445bc 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -246,6 +246,30 @@ struct midi_init_params struct midi_src *srcs; }; +struct notify_context +{ + BOOL send_notify; + WORD dev_id; + WORD msg; + UINT_PTR param_1; + UINT_PTR param_2; + UINT_PTR callback; + UINT flags; + HANDLE device; + UINT_PTR instance; +}; + +struct midi_out_message_params +{ + UINT dev_id; + UINT msg; + UINT_PTR user; + UINT_PTR param_1; + UINT_PTR param_2; + UINT *err; + struct notify_context *notify; +}; + struct midi_seq_open_params { int close; @@ -285,15 +309,15 @@ enum oss_funcs oss_set_event_handle, oss_is_started, oss_midi_init, + oss_midi_out_message, oss_midi_seq_open, /* temporary */ - oss_midi_out_fm_load, 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_load(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_out_fm_reset(void *args) DECLSPEC_HIDDEN; extern unixlib_handle_t oss_handle; -- 2.36.0

2 1

[PATCH 4/5 v2] wineoss: Add a temporary midi_out_fm_reset syscall.
by Andrew Eikum 20 Apr '22

20 Apr '22

From: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 40 +------------ dlls/wineoss.drv/oss.c | 1 + dlls/wineoss.drv/ossmidi.c | 113 +++++++++++++++++++++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 2 + 4 files changed, 118 insertions(+), 38 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 3d2552007cd..7d21dd32ae8 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -737,42 +737,6 @@ static int modFMLoad(WORD dev, int fd) return params.ret; } -/************************************************************************** - * modFMReset [internal] - */ -static void modFMReset(WORD wDevID) -{ - sFMextra* extra = MidiOutDev[wDevID].lpExtra; - sVoice* voice = extra->voice; - sChannel* channel = extra->channel; - int i; - - for (i = 0; i < MidiOutDev[wDevID].caps.wVoices; i++) { - if (voice[i].status != sVS_UNUSED) { - SEQ_STOP_NOTE(wDevID, i, voice[i].note, 64); - } - SEQ_KEY_PRESSURE(wDevID, i, 127, 0); - SEQ_CONTROL(wDevID, i, SEQ_VOLMODE, VOL_METHOD_LINEAR); - voice[i].note = 0; - voice[i].channel = -1; - voice[i].cntMark = 0; - voice[i].status = sVS_UNUSED; - } - for (i = 0; i < 16; i++) { - channel[i].program = 0; - channel[i].bender = 8192; - channel[i].benderRange = 2; - channel[i].bank = 0; - channel[i].volume = 127; - channel[i].balance = 64; - channel[i].expression = 0; - channel[i].sustain = 0; - } - extra->counter = 0; - extra->drumSetMask = 1 << 9; /* channel 10 is normally drums, sometimes 16 also */ - SEQ_DUMPBUF(); -} - #define IS_DRUM_CHANNEL(_xtra, _chn) ((_xtra)->drumSetMask & (1 << (_chn))) /************************************************************************** @@ -846,7 +810,7 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) HeapFree(GetProcessHeap(), 0, extra); return MMSYSERR_ERROR; } - modFMReset(wDevID); + OSS_CALL(midi_out_fm_reset, (void *)(UINT_PTR)wDevID); } break; case MOD_MIDIPORT: @@ -1120,7 +1084,7 @@ static DWORD modData(WORD wDevID, DWORD dwParam) case MIDI_SYSTEM_PREFIX: switch (evt & 0x0F) { case 0x0F: /* Reset */ - modFMReset(wDevID); + OSS_CALL(midi_out_fm_reset, (void *)(UINT_PTR)wDevID); break; default: WARN("Unsupported (yet) system event %02x\n", evt & 0x0F); diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 2fc6c81e560..902685c11b8 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1409,4 +1409,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = midi_seq_open, midi_out_fm_load, + midi_out_fm_reset, }; diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c index ba5dbca7e4f..dcafbe609d9 100644 --- a/dlls/wineoss.drv/ossmidi.c +++ b/dlls/wineoss.drv/ossmidi.c @@ -52,6 +52,47 @@ static unsigned int num_dests, num_srcs, num_synths, seq_refs; static struct midi_dest dests[MAX_MIDIOUTDRV]; static struct midi_src srcs[MAX_MIDIINDRV]; +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; + WINE_DEFAULT_DEBUG_CHANNEL(midi); static int oss_to_win_device_type(int type) @@ -346,6 +387,40 @@ wrapup: return STATUS_SUCCESS; } +/* 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 = seq_open(); + 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; + } + seq_close(fd); +} + extern const unsigned char midiFMInstrumentPatches[16 * 128]; extern const unsigned char midiFMDrumsPatches[16 * 128]; @@ -388,3 +463,41 @@ NTSTATUS midi_out_fm_load(void *args) params->ret = 0; return STATUS_SUCCESS; } + +NTSTATUS midi_out_fm_reset(void *args) +{ + WORD dev_id = (WORD)(UINT_PTR)args; + struct midi_dest *dest = dests + dev_id; + sFMextra *extra = dest->lpExtra; + sVoice *voice = extra->voice; + sChannel *channel = extra->channel; + int i; + + for (i = 0; i < dest->caps.wVoices; i++) + { + if (voice[i].status != sVS_UNUSED) + SEQ_STOP_NOTE(dev_id, i, voice[i].note, 64); + SEQ_KEY_PRESSURE(dev_id, i, 127, 0); + SEQ_CONTROL(dev_id, i, SEQ_VOLMODE, VOL_METHOD_LINEAR); + voice[i].note = 0; + voice[i].channel = -1; + voice[i].cntMark = 0; + voice[i].status = sVS_UNUSED; + } + for (i = 0; i < 16; i++) + { + channel[i].program = 0; + channel[i].bender = 8192; + channel[i].benderRange = 2; + channel[i].bank = 0; + channel[i].volume = 127; + channel[i].balance = 64; + channel[i].expression = 0; + channel[i].sustain = 0; + } + extra->counter = 0; + extra->drumSetMask = 1 << 9; /* channel 10 is normally drums, sometimes 16 also */ + SEQ_DUMPBUF(); + + return STATUS_SUCCESS; +} diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 4dab53f5148..ecca092d540 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -288,11 +288,13 @@ enum oss_funcs oss_midi_seq_open, /* temporary */ oss_midi_out_fm_load, + oss_midi_out_fm_reset, }; NTSTATUS midi_init(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_seq_open(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_out_fm_load(void *args) DECLSPEC_HIDDEN; +NTSTATUS midi_out_fm_reset(void *args) DECLSPEC_HIDDEN; extern unixlib_handle_t oss_handle; -- 2.36.0

2 1