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

Rémi Bernon : include: Use nested namespaces in windows.storage.streams.idl.
by Alexandre Julliard April 28, 2022

April 28, 2022

Module: wine Branch: master Commit: 007e51719bb539c511bae174451fd4bd1fcf57e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=007e51719bb539c511bae174… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 28 14:20:34 2022 +0200 include: Use nested namespaces in windows.storage.streams.idl. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.storage.streams.idl | 56 +++++++++++-------------------------- 1 file changed, 16 insertions(+), 40 deletions(-) diff --git a/include/windows.storage.streams.idl b/include/windows.storage.streams.idl index 59b15761af0..ba58e74687d 100644 --- a/include/windows.storage.streams.idl +++ b/include/windows.storage.streams.idl @@ -24,47 +24,23 @@ import "inspectable.idl"; import "eventtoken.idl"; import "windows.foundation.idl"; -namespace Windows -{ - namespace Foundation - { - interface IClosable; - } -} - -namespace Windows -{ - namespace Storage - { - namespace Streams - { - interface IContentTypeProvider; - interface IInputStream; - interface IOutputStream; - interface IRandomAccessStream; - interface IRandomAccessStreamWithContentType; - } - } -} +namespace Windows.Storage.Streams { + interface IContentTypeProvider; + interface IInputStream; + interface IOutputStream; + interface IRandomAccessStream; + interface IRandomAccessStreamWithContentType; -namespace Windows -{ - namespace Storage + [ + uuid(cc254827-4b3d-438f-9232-10c76bc7e038), + ] + interface IRandomAccessStreamWithContentType : IInspectable + requires + Windows.Storage.Streams.IRandomAccessStream, + Windows.Foundation.IClosable, + Windows.Storage.Streams.IInputStream, + Windows.Storage.Streams.IOutputStream, + Windows.Storage.Streams.IContentTypeProvider { - namespace Streams - { - [ - uuid(cc254827-4b3d-438f-9232-10c76bc7e038), - ] - interface IRandomAccessStreamWithContentType : IInspectable - requires - Windows.Storage.Streams.IRandomAccessStream, - Windows.Foundation.IClosable, - Windows.Storage.Streams.IInputStream, - Windows.Storage.Streams.IOutputStream, - Windows.Storage.Streams.IContentTypeProvider - { - } - } } }

1 0

Huw Davies : wineoss: Simplify the midi in dispatcher.
by Alexandre Julliard April 28, 2022

April 28, 2022

Module: wine Branch: master Commit: 9a7924a687e5ae53a076de823d34976f99d04421 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a7924a687e5ae53a076de82… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 28 08:49:55 2022 -0500 wineoss: Simplify the midi in dispatcher. The continue statement looks a bit awkward at the moment, but a future patch will introduce more code into the for loop. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/midi.c | 42 ++++++++++++++---------------------------- 1 file changed, 14 insertions(+), 28 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index fe73d97f5ab..1a5b348da9f 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -320,12 +320,23 @@ static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime) } } +static void handle_midi_data(unsigned char *buffer, unsigned int len) +{ + unsigned int time = GetTickCount(), i; + + for (i = 0; i < len; i += (buffer[i] & 0x80) ? 8 : 4) + { + if (buffer[i] != SEQ_MIDIPUTC) continue; + + midReceiveChar(buffer[i + 2], buffer[i + 1], time); + } +} + static DWORD WINAPI midRecThread(void *arg) { int fd = (int)(INT_PTR)arg; unsigned char buffer[256]; - int len, idx; - DWORD dwTime; + int len; struct pollfd pfd; TRACE("Thread startup\n"); @@ -349,32 +360,7 @@ static DWORD WINAPI midRecThread(void *arg) continue; } - dwTime = GetTickCount(); - - for (idx = 0; idx < len; ) { - if (buffer[idx] & 0x80) { - TRACE( - "Reading<8> %02x %02x %02x %02x %02x %02x %02x %02x\n", - buffer[idx + 0], buffer[idx + 1], - buffer[idx + 2], buffer[idx + 3], - buffer[idx + 4], buffer[idx + 5], - buffer[idx + 6], buffer[idx + 7]); - idx += 8; - } else { - switch (buffer[idx + 0]) { - case SEQ_WAIT: - case SEQ_ECHO: - break; - case SEQ_MIDIPUTC: - midReceiveChar(buffer[idx + 2], buffer[idx + 1], dwTime); - break; - default: - TRACE("Unsupported event %d\n", buffer[idx + 0]); - break; - } - idx += 4; - } - } + handle_midi_data(buffer, len); } return 0; }

1 0

Biswapriyo Nath : include: Add Windows.Storage.Streams.Buffer runtimeclass declaration.
by Alexandre Julliard April 28, 2022

April 28, 2022

Module: wine Branch: master Commit: 842115bbb874f7a2d3c8e8db2430fa3b1b8f16a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=842115bbb874f7a2d3c8e8db… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Thu Apr 28 14:20:35 2022 +0200 include: Add Windows.Storage.Streams.Buffer runtimeclass declaration. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.storage.streams.idl | 51 +++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/include/windows.storage.streams.idl b/include/windows.storage.streams.idl index ba58e74687d..bb107b25976 100644 --- a/include/windows.storage.streams.idl +++ b/include/windows.storage.streams.idl @@ -25,11 +25,50 @@ import "eventtoken.idl"; import "windows.foundation.idl"; namespace Windows.Storage.Streams { + interface IBuffer; + interface IBufferFactory; + interface IBufferStatics; interface IContentTypeProvider; interface IInputStream; interface IOutputStream; interface IRandomAccessStream; interface IRandomAccessStreamWithContentType; + runtimeclass Buffer; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + uuid(905a0fe0-bc53-11df-8c49-001e4fc686da) + ] + interface IBuffer : IInspectable + { + [propget] HRESULT Capacity([out, retval] UINT32 *value); + [propget] HRESULT Length([out, retval] UINT32 *value); + [propput] HRESULT Length([in] UINT32 value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Storage.Streams.Buffer), + uuid(71af914d-c10f-484b-bc50-14bc623b3a27) + ] + interface IBufferFactory : IInspectable + { + HRESULT Create([in, range(0x00000000, 0x7fffffff)] UINT32 capacity, + [out, retval] Windows.Storage.Streams.Buffer **value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Storage.Streams.Buffer), + uuid(e901e65b-d716-475a-a90a-af7229b1e741) + ] + interface IBufferStatics : IInspectable + { + HRESULT CreateCopyFromMemoryBuffer([in] Windows.Foundation.IMemoryBuffer *input, + [out, retval] Windows.Storage.Streams.Buffer **value); + HRESULT CreateMemoryBufferOverIBuffer([in] Windows.Storage.Streams.IBuffer *input, + [out, retval] Windows.Foundation.MemoryBuffer **value); + } [ uuid(cc254827-4b3d-438f-9232-10c76bc7e038), @@ -43,4 +82,16 @@ namespace Windows.Storage.Streams { Windows.Storage.Streams.IContentTypeProvider { } + + [ + activatable(Windows.Storage.Streams.IBufferFactory, Windows.Foundation.UniversalApiContract, 1.0), + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.Storage.Streams.IBufferStatics, Windows.Foundation.UniversalApiContract, 1.0), + threading(both) + ] + runtimeclass Buffer + { + [default] interface Windows.Storage.Streams.IBuffer; + } }

1 0

Zebediah Figura : wined3d: Refuse blits between height-scaled formats in the CPU blitter.
by Alexandre Julliard April 28, 2022

April 28, 2022

Module: wine Branch: master Commit: 374c58ccb175538019a54a80076b8b89e2379f8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=374c58ccb175538019a54a80… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Apr 27 21:23:57 2022 -0500 wined3d: Refuse blits between height-scaled formats in the CPU blitter. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3216439f32b..5feeba3be2d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -853,6 +853,14 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int goto release; } + if ((src_fmt_flags | dst_fmt_flags) & WINED3DFMT_FLAG_HEIGHT_SCALE) + { + FIXME("Unsupported blit between height-scaled formats (src %s, dst %s).\n", + debug_d3dformat(src_format->id), debug_d3dformat(dst_format->id)); + hr = E_NOTIMPL; + goto release; + } + if (filter != WINED3D_TEXF_NONE && filter != WINED3D_TEXF_POINT && (src_width != dst_width || src_height != dst_height)) {

1 0

Zebediah Figura : wined3d: Refuse blits between height-scaled formats in the raw blitter.
by Alexandre Julliard April 28, 2022

April 28, 2022

Module: wine Branch: master Commit: 29f91b916a433a0ed60e1219e850fc86863ca44e URL: https://source.winehq.org/git/wine.git/?a=commit;h=29f91b916a433a0ed60e1219… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Apr 27 21:23:59 2022 -0500 wined3d: Refuse blits between height-scaled formats in the raw blitter. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index a73b3b55e4b..5fd38b49132 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -6458,6 +6458,7 @@ static DWORD raw_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit * We also can't copy between depth/stencil and colour resources, since * the formats are considered incompatible in OpenGL. */ if (op != WINED3D_BLIT_OP_RAW_BLIT || !gl_formats_compatible(src_texture, src_location, dst_texture, dst_location) + || ((src_texture->resource.format_flags | dst_texture->resource.format_flags) & WINED3DFMT_FLAG_HEIGHT_SCALE) || (src_texture->resource.format->id == dst_texture->resource.format->id && (!(src_location & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) || !(dst_location & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)))))

1 0

Jacek Caban : winex11: Move XdndLeave event handler to event.c.
by Alexandre Julliard April 28, 2022

April 28, 2022

Module: wine Branch: master Commit: ace09cf315dba49913eb3e2eec12e4d7b482885b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ace09cf315dba49913eb3e2e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Apr 24 22:36:32 2022 +0200 winex11: Move XdndLeave event handler to event.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/event.c | 9 ++++++++- dlls/winex11.drv/unixlib.h | 1 + dlls/winex11.drv/x11drv.h | 1 - dlls/winex11.drv/xdnd.c | 6 +++++- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index a02f0340010..729a0a7eab6 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -1920,6 +1920,13 @@ static void handle_xdnd_drop_event( HWND hwnd, XClientMessageEvent *event ) } +static void handle_xdnd_leave_event( HWND hwnd, XClientMessageEvent *event ) +{ + UINT type = DND_LEAVE_EVENT; + handle_dnd_event( &type ); +} + + struct client_message_handler { int atom; /* protocol atom */ @@ -1935,7 +1942,7 @@ static const struct client_message_handler client_messages[] = { XATOM_XdndEnter, handle_xdnd_enter_event }, { XATOM_XdndPosition, handle_xdnd_position_event }, { XATOM_XdndDrop, handle_xdnd_drop_event }, - { XATOM_XdndLeave, X11DRV_XDND_LeaveEvent } + { XATOM_XdndLeave, handle_xdnd_leave_event } }; diff --git a/dlls/winex11.drv/unixlib.h b/dlls/winex11.drv/unixlib.h index 41120385e60..537a8e0326a 100644 --- a/dlls/winex11.drv/unixlib.h +++ b/dlls/winex11.drv/unixlib.h @@ -31,6 +31,7 @@ struct format_entry enum dnd_event_type { DND_DROP_EVENT, + DND_LEAVE_EVENT, DND_POSITION_EVENT, }; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index c17dc45594c..69aa69404f4 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -294,7 +294,6 @@ extern BOOL IME_SetCompositionString(DWORD dwIndex, LPCVOID lpComp, DWORD dwReadLen) DECLSPEC_HIDDEN; extern void IME_SetResultString(LPWSTR lpResult, DWORD dwResultlen) DECLSPEC_HIDDEN; -extern void X11DRV_XDND_LeaveEvent( HWND hWnd, XClientMessageEvent *event ) DECLSPEC_HIDDEN; extern void handle_dnd_enter_event( struct format_entry *formats, ULONG size ) DECLSPEC_HIDDEN; extern UINT handle_dnd_event( void *params ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 9de0b60d0cd..8240bbbf5d6 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -342,7 +342,7 @@ static DWORD handle_drop_event( struct dnd_drop_event_params *params ) * * Handle an XdndLeave event. */ -void X11DRV_XDND_LeaveEvent( HWND hWnd, XClientMessageEvent *event ) +static NTSTATUS handle_leave_event(void) { IDropTarget *dropTarget; @@ -362,6 +362,7 @@ void X11DRV_XDND_LeaveEvent( HWND hWnd, XClientMessageEvent *event ) } X11DRV_XDND_FreeDragDropOp(); + return 0; } @@ -736,6 +737,9 @@ UINT handle_dnd_event( void *params ) case DND_DROP_EVENT: return handle_drop_event( params ); + case DND_LEAVE_EVENT: + return handle_leave_event(); + case DND_POSITION_EVENT: return handle_position_event( params );

1 0

Huw Davies : wineoss: Make the MIM_LONGDATA time relative to the start time.
by Alexandre Julliard April 28, 2022

April 28, 2022

Module: wine Branch: master Commit: 718c52cfd9b9043e2d18981903dc8d732c5b3f2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=718c52cfd9b9043e2d189819… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 28 08:51:13 2022 -0500 wineoss: Make the MIM_LONGDATA time relative to the start time. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/midi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 77bd37d3f2a..564a2431472 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -300,7 +300,6 @@ static void handle_regular_data(struct midi_src *src, unsigned char value, UINT if (to_send) { src->incLen = 0; - time -= src->startTime; MIDI_NotifyClient(src - MidiInDev, MIM_DATA, to_send, time); } } @@ -321,6 +320,8 @@ static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime) return; } + dwTime -= MidiInDev[wDevID].startTime; + if (value == 0xf0 || MidiInDev[wDevID].state & 2) /* system exclusive */ handle_sysex_data(MidiInDev + wDevID, value, dwTime); else

1 0

Huw Davies : wineoss: Move the sysex handling to a separate helper.
by Alexandre Julliard April 28, 2022

April 28, 2022

Module: wine Branch: master Commit: 96fe738087b9d8fe1913769dfd4931382da1e34e URL: https://source.winehq.org/git/wine.git/?a=commit;h=96fe738087b9d8fe1913769d… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 28 08:50:36 2022 -0500 wineoss: Move the sysex handling to a separate helper. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/midi.c | 67 +++++++++++++++++++++++++++++-------------------- 1 file changed, 40 insertions(+), 27 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 462fd3625f0..2c1e8b3a4d7 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -210,6 +210,43 @@ static int midiCloseSeq(int fd) return 0; } +static void handle_sysex_data(struct midi_src *src, unsigned char value, UINT time) +{ + MIDIHDR *hdr; + BOOL done = FALSE; + + src->state |= 2; + src->incLen = 0; + + in_buffer_lock(); + + hdr = src->lpQueueHdr; + if (hdr) + { + BYTE *data = (BYTE *)hdr->lpData; + + data[hdr->dwBytesRecorded++] = value; + if (hdr->dwBytesRecorded == hdr->dwBufferLength) + done = TRUE; + } + + if (value == 0xf7) /* end */ + { + src->state &= ~2; + done = TRUE; + } + + if (done && hdr) + { + src->lpQueueHdr = hdr->lpNext; + hdr->dwFlags &= ~MHDR_INQUEUE; + hdr->dwFlags |= MHDR_DONE; + MIDI_NotifyClient(src - MidiInDev, MIM_LONGDATA, (UINT_PTR)hdr, time); + } + + in_buffer_unlock(); +} + /************************************************************************** * midReceiveChar [internal] */ @@ -228,33 +265,9 @@ static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime) return; } - if (value == 0xf0 || MidiInDev[wDevID].state & 2) { /* system exclusive */ - LPMIDIHDR lpMidiHdr; - BOOL sbfb = FALSE; - - MidiInDev[wDevID].state |= 2; - MidiInDev[wDevID].incLen = 0; - in_buffer_lock(); - if ((lpMidiHdr = MidiInDev[wDevID].lpQueueHdr) != NULL) { - LPBYTE lpData = (LPBYTE) lpMidiHdr->lpData; - - lpData[lpMidiHdr->dwBytesRecorded++] = value; - if (lpMidiHdr->dwBytesRecorded == lpMidiHdr->dwBufferLength) { - sbfb = TRUE; - } - } - if (value == 0xF7) { /* then end */ - MidiInDev[wDevID].state &= ~2; - sbfb = TRUE; - } - if (sbfb && lpMidiHdr != NULL) { - lpMidiHdr = MidiInDev[wDevID].lpQueueHdr; - MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext; - lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; - lpMidiHdr->dwFlags |= MHDR_DONE; - MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime); - } - in_buffer_unlock(); + if (value == 0xf0 || MidiInDev[wDevID].state & 2) /* system exclusive */ + { + handle_sysex_data(MidiInDev + wDevID, value, dwTime); return; }

1 0

Huw Davies : wineoss: Combine midReceiveChar() into handle_midi_data().
by Alexandre Julliard April 28, 2022

April 28, 2022

Module: wine Branch: master Commit: 3b4dbc29711b2a161b07b189ad1c8eededb240dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b4dbc29711b2a161b07b189… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 28 08:51:27 2022 -0500 wineoss: Combine midReceiveChar() into handle_midi_data(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/midi.c | 39 ++++++++++++++------------------------- 1 file changed, 14 insertions(+), 25 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 564a2431472..e36a737624a 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -304,39 +304,28 @@ static void handle_regular_data(struct midi_src *src, unsigned char value, UINT } } -/************************************************************************** - * midReceiveChar [internal] - */ -static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime) -{ - TRACE("Adding %02xh to %d[%d]\n", value, wDevID, MidiInDev[wDevID].incLen); - - if (wDevID >= MIDM_NumDevs) { - WARN("bad devID\n"); - return; - } - if (MidiInDev[wDevID].state <= 0) { - TRACE("disabled or input not started, thrown away\n"); - return; - } - - dwTime -= MidiInDev[wDevID].startTime; - - if (value == 0xf0 || MidiInDev[wDevID].state & 2) /* system exclusive */ - handle_sysex_data(MidiInDev + wDevID, value, dwTime); - else - handle_regular_data(MidiInDev + wDevID, value, dwTime); -} - static void handle_midi_data(unsigned char *buffer, unsigned int len) { unsigned int time = GetTickCount(), i; + struct midi_src *src; + unsigned char value; + WORD dev_id; for (i = 0; i < len; i += (buffer[i] & 0x80) ? 8 : 4) { if (buffer[i] != SEQ_MIDIPUTC) continue; - midReceiveChar(buffer[i + 2], buffer[i + 1], time); + dev_id = buffer[i + 2]; + value = buffer[i + 1]; + + if (dev_id >= MIDM_NumDevs) continue; + src = MidiInDev + dev_id; + if (src->state <= 0) continue; + + if (value == 0xf0 || src->state & 2) /* system exclusive */ + handle_sysex_data(src, value, time - src->startTime); + else + handle_regular_data(src, value, time - src->startTime); } }

1 0

Louis Lenders : wbemprox: Add RegisterdUser property to Win32_Operatingsystem.
by Alexandre Julliard April 28, 2022

April 28, 2022

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

1 0