November 2021 - Wine-commits

Alexandre Julliard : netapi32: Use the ntdll Unicode string functions instead of wine/unicode.h.
by Alexandre Julliard 30 Nov '21

30 Nov '21

Module: wine Branch: master Commit: 58e30bca68cc8a40a2c6a3dea269884469dc7921 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58e30bca68cc8a40a2c6a3de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 30 12:54:01 2021 +0100 netapi32: Use the ntdll Unicode string functions instead of wine/unicode.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netapi32/unixlib.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/netapi32/unixlib.c b/dlls/netapi32/unixlib.c index 8d61774b7d7..23881b470d9 100644 --- a/dlls/netapi32/unixlib.c +++ b/dlls/netapi32/unixlib.c @@ -42,7 +42,6 @@ #include "winternl.h" #include "lm.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "unixlib.h" @@ -67,8 +66,8 @@ static NET_API_STATUS (*pNetWkstaGetInfo)( const char *, unsigned int, unsigned static DWORD netapi_wcstoumbs( const WCHAR *src, char *dst, DWORD dstlen ) { - if (!dst) return 3 * strlenW( src ) + 1; - return ntdll_wcstoumbs( src, strlenW( src ) + 1, dst, dstlen, FALSE ); + if (!dst) return 3 * wcslen( src ) + 1; + return ntdll_wcstoumbs( src, wcslen( src ) + 1, dst, dstlen, FALSE ); } static DWORD netapi_umbstowcs( const char *src, WCHAR *dst, DWORD dstlen )

1 0

Alexandre Julliard : winspool: Use the ntdll Unicode string functions instead of wine/unicode.h.
by Alexandre Julliard 30 Nov '21

30 Nov '21

Module: wine Branch: master Commit: e2033fcf54b4742b25852fd2225696698041a3c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2033fcf54b4742b25852fd2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 30 12:54:08 2021 +0100 winspool: Use the ntdll Unicode string functions instead of wine/unicode.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/cups.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/winspool.drv/cups.c b/dlls/winspool.drv/cups.c index 830f0c91332..766f5c9bb09 100644 --- a/dlls/winspool.drv/cups.c +++ b/dlls/winspool.drv/cups.c @@ -109,7 +109,6 @@ #include "winspool.h" #include "ddk/winsplp.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "wine/unixlib.h" #include "wspool.h" @@ -205,7 +204,7 @@ static char *get_unix_file_name( LPCWSTR path ) char *buffer; nt_name.Buffer = (WCHAR *)path; - nt_name.MaximumLength = nt_name.Length = lstrlenW( path ) * sizeof(WCHAR); + nt_name.MaximumLength = nt_name.Length = wcslen( path ) * sizeof(WCHAR); InitializeObjectAttributes( &attr, &nt_name, 0, 0, NULL ); for (;;) { @@ -372,8 +371,8 @@ static NTSTATUS enum_printers( void *args ) location = cups_get_optionW( "printer-location", dests[i].num_options, dests[i].options ); name_len = strlen( dests[i].name ) + 1; - comment_len = comment ? strlenW( comment ) + 1 : 0; - location_len = location ? strlenW( location ) + 1 : 0; + comment_len = comment ? wcslen( comment ) + 1 : 0; + location_len = location ? wcslen( location ) + 1 : 0; needed += (name_len + comment_len + location_len) * sizeof(WCHAR); if (needed <= *params->size) @@ -427,7 +426,7 @@ static NTSTATUS get_ppd( void *args ) char *printer_name; int len; - len = strlenW( params->printer ); + len = wcslen( params->printer ); printer_name = malloc( len * 3 + 1 ); ntdll_wcstoumbs( params->printer, len + 1, printer_name, len * 3 + 1, FALSE ); @@ -502,7 +501,7 @@ static BOOL schedule_pipe( const WCHAR *cmd, const WCHAR *filename ) if (!(unixname = get_unix_file_name( filename ))) return FALSE; - len = strlenW( cmd ); + len = wcslen( cmd ); cmdA = malloc( len * 3 + 1); ntdll_wcstoumbs( cmd, len + 1, cmdA, len * 3 + 1, FALSE ); @@ -580,7 +579,7 @@ static BOOL schedule_unixfile( const WCHAR *output, const WCHAR *filename ) if (!(unixname = get_unix_file_name( filename ))) return FALSE; - len = strlenW( output ); + len = wcslen( output ); outputA = malloc( len * 3 + 1); ntdll_wcstoumbs( output, len + 1, outputA, len * 3 + 1, FALSE ); @@ -598,7 +597,7 @@ static BOOL schedule_lpr( const WCHAR *printer_name, const WCHAR *filename ) { static const WCHAR lpr[] = { 'l','p','r',' ','-','P','\'' }; static const WCHAR quote[] = { '\'',0 }; - int printer_len = strlenW( printer_name ); + int printer_len = wcslen( printer_name ); WCHAR *cmd; BOOL ret; @@ -628,11 +627,11 @@ static BOOL schedule_cups( const WCHAR *printer_name, const WCHAR *filename, con BOOL ret; if (!(unixname = get_unix_file_name( filename ))) return FALSE; - len = strlenW( printer_name ); + len = wcslen( printer_name ); queue = malloc( len * 3 + 1); ntdll_wcstoumbs( printer_name, len + 1, queue, len * 3 + 1, FALSE ); - len = strlenW( document_title ); + len = wcslen( document_title ); unix_doc_title = malloc( len * 3 + 1 ); ntdll_wcstoumbs( document_title, len + 1, unix_doc_title, len + 3 + 1, FALSE ); @@ -671,10 +670,10 @@ static NTSTATUS schedule_job( void *args ) if (params->wine_port[0]) return schedule_unixfile( params->wine_port, params->filename ); - if (!strncmpW( params->port, LPR_Port, ARRAY_SIZE(LPR_Port) - 1 )) + if (!wcsncmp( params->port, LPR_Port, ARRAY_SIZE(LPR_Port) - 1 )) return schedule_lpr( params->port + ARRAY_SIZE(LPR_Port) - 1, params->filename ); - if (!strncmpW( params->port, CUPS_Port, ARRAY_SIZE(CUPS_Port) - 1 )) + if (!wcsncmp( params->port, CUPS_Port, ARRAY_SIZE(CUPS_Port) - 1 )) return schedule_cups( params->port + ARRAY_SIZE(CUPS_Port) - 1, params->filename, params->document_title ); return FALSE;

1 0

Jacek Caban : win32u: Implement NtUserGetDisplayConfigBufferSizes.
by Alexandre Julliard 30 Nov '21

30 Nov '21

Module: wine Branch: master Commit: cf7111e86ae58ad45b98d880c279926598623da5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf7111e86ae58ad45b98d880… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 30 13:24:18 2021 +0100 win32u: Implement NtUserGetDisplayConfigBufferSizes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/Makefile.in | 1 + dlls/win32u/font.c | 4 +- dlls/win32u/gdiobj.c | 1 + dlls/win32u/sysparams.c | 467 +++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 4 + dlls/win32u/wrappers.c | 6 + include/ntuser.h | 2 + 8 files changed, 484 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cf7111e86ae58ad45b98…

1 0

Jacek Caban : win32u: Introduce UpdateDisplayDevice user driver entry point.
by Alexandre Julliard 30 Nov '21

30 Nov '21

Module: wine Branch: master Commit: f8817ce2d588b37414de503bae5f58d39a7070b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8817ce2d588b37414de503b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 30 13:24:28 2021 +0100 win32u: Introduce UpdateDisplayDevice user driver entry point. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 1 + dlls/win32u/driver.c | 13 ++++++++ dlls/win32u/sysparams.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++- include/wine/gdi_driver.h | 39 +++++++++++++++++++++++- 4 files changed, 126 insertions(+), 2 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index a1a64f42b6f..9ff676aca22 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -347,6 +347,7 @@ static struct user_driver_funcs lazy_load_driver = loaderdrv_EnumDisplayMonitors, loaderdrv_EnumDisplaySettingsEx, loaderdrv_GetMonitorInfo, + NULL, /* windowing functions */ loaderdrv_CreateDesktopWindow, loaderdrv_CreateWindow, diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 9f682fa8eea..93c2ff1da4c 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -832,6 +832,11 @@ static BOOL CDECL nulldrv_GetMonitorInfo( HMONITOR handle, MONITORINFO *info ) return FALSE; } +static void CDECL nulldrv_UpdateDisplayDevices( const struct gdi_device_manager *manager, + BOOL force, void *param ) +{ +} + static BOOL CDECL nulldrv_CreateDesktopWindow( HWND hwnd ) { return TRUE; @@ -1044,6 +1049,12 @@ static void CDECL loaderdrv_UpdateClipboard(void) load_driver()->pUpdateClipboard(); } +static void CDECL loaderdrv_UpdateDisplayDevices( const struct gdi_device_manager *manager, + BOOL force, void *param ) +{ + load_driver()->pUpdateDisplayDevices( manager, force, param ); +} + static const struct user_driver_funcs lazy_load_driver = { .pActivateKeyboardLayout = loaderdrv_ActivateKeyboardLayout, @@ -1053,6 +1064,7 @@ static const struct user_driver_funcs lazy_load_driver = .pToUnicodeEx = loaderdrv_ToUnicodeEx, .pUnregisterHotKey = loaderdrv_UnregisterHotKey, .pVkKeyScanEx = loaderdrv_VkKeyScanEx, + .pUpdateDisplayDevices = loaderdrv_UpdateDisplayDevices, .pUpdateClipboard = loaderdrv_UpdateClipboard, .pScrollDC = nulldrv_ScrollDC, }; @@ -1093,6 +1105,7 @@ void CDECL __wine_set_display_driver( struct user_driver_funcs *driver, UINT ver SET_USER_FUNC(EnumDisplayMonitors); SET_USER_FUNC(EnumDisplaySettingsEx); SET_USER_FUNC(GetMonitorInfo); + SET_USER_FUNC(UpdateDisplayDevices); SET_USER_FUNC(CreateDesktopWindow); SET_USER_FUNC(CreateWindow); SET_USER_FUNC(DestroyWindow); diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 1074a2ad797..871c2a50e43 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -336,7 +336,40 @@ static BOOL read_monitor_settings( struct adapter *adapter, DWORD index, struct return TRUE; } -static BOOL update_display_cache(void) +struct device_manager_ctx +{ + unsigned int gpu_count; +}; + +static void add_gpu( const struct gdi_gpu *gpu, void *param ) +{ + struct device_manager_ctx *ctx = param; + FIXME( "\n" ); + ctx->gpu_count++; +} + +static void add_adapter( const struct gdi_adapter *adapter, void *param ) +{ + FIXME( "\n" ); +} + +static void add_monitor( const struct gdi_monitor *monitor, void *param ) +{ + FIXME( "\n" ); +} + +static const struct gdi_device_manager device_manager = +{ + add_gpu, + add_adapter, + add_monitor, +}; + +static void release_display_manager_ctx( struct device_manager_ctx *ctx ) +{ +} + +static BOOL update_display_cache_from_registry(void) { DWORD adapter_id, monitor_id, size; KEY_FULL_INFORMATION key; @@ -409,6 +442,46 @@ static BOOL update_display_cache(void) return ret; } +static BOOL update_display_cache(void) +{ + struct device_manager_ctx ctx = { 0 }; + + user_driver->pUpdateDisplayDevices( &device_manager, FALSE, &ctx ); + release_display_manager_ctx( &ctx ); + + if (update_display_cache_from_registry()) return TRUE; + if (ctx.gpu_count) + { + ERR( "driver reported devices, but we failed to read them\n" ); + return FALSE; + } + + user_driver->pUpdateDisplayDevices( &device_manager, TRUE, &ctx ); + if (!ctx.gpu_count) + { + static const struct gdi_monitor default_monitor = + { + .rc_work.right = 1024, + .rc_work.bottom = 768, + .rc_monitor.right = 1024, + .rc_monitor.bottom = 768, + .state_flags = DISPLAY_DEVICE_ACTIVE | DISPLAY_DEVICE_ATTACHED, + }; + + TRACE( "adding default fake monitor\n "); + add_monitor( &default_monitor, &ctx ); + } + release_display_manager_ctx( &ctx ); + + if (!update_display_cache_from_registry()) + { + ERR( "failed to read display config\n" ); + return FALSE; + } + + return TRUE; +} + static BOOL lock_display_devices(void) { if (!update_display_cache()) return FALSE; diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 994b082d5b4..b8e088282e5 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -167,7 +167,7 @@ struct gdi_dc_funcs }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 70 +#define WINE_GDI_DRIVER_VERSION 71 #define GDI_PRIORITY_NULL_DRV 0 /* null driver */ #define GDI_PRIORITY_FONT_DRV 100 /* any font driver */ @@ -229,6 +229,42 @@ static inline ULONG window_surface_release( struct window_surface *surface ) return ret; } +/* display manager interface, used to initialize display device registry data */ + +struct gdi_gpu +{ + ULONG_PTR id; + WCHAR name[128]; /* name */ + UINT vendor_id; /* PCI ID */ + UINT device_id; + UINT subsys_id; + UINT revision_id; + GUID vulkan_uuid; /* Vulkan device UUID */ +}; + +struct gdi_adapter +{ + ULONG_PTR id; + DWORD state_flags; +}; + +struct gdi_monitor +{ + WCHAR name[128]; /* name */ + RECT rc_monitor; /* RcMonitor in MONITORINFO struct */ + RECT rc_work; /* RcWork in MONITORINFO struct */ + DWORD state_flags; /* StateFlags in DISPLAY_DEVICE struct */ + unsigned char *edid; /* Extended Device Identification Data */ + UINT edid_len; +}; + +struct gdi_device_manager +{ + void (*add_gpu)( const struct gdi_gpu *gpu, void *param ); + void (*add_adapter)( const struct gdi_adapter *adapter, void *param ); + void (*add_monitor)( const struct gdi_monitor *monitor, void *param ); +}; + struct tagUPDATELAYEREDWINDOWINFO; struct user_driver_funcs @@ -258,6 +294,7 @@ struct user_driver_funcs BOOL (CDECL *pEnumDisplayMonitors)(HDC,LPRECT,MONITORENUMPROC,LPARAM); BOOL (CDECL *pEnumDisplaySettingsEx)(LPCWSTR,DWORD,LPDEVMODEW,DWORD); BOOL (CDECL *pGetMonitorInfo)(HMONITOR,MONITORINFO*); + void (CDECL *pUpdateDisplayDevices)(const struct gdi_device_manager *,BOOL,void*); /* windowing functions */ BOOL (CDECL *pCreateDesktopWindow)(HWND); BOOL (CDECL *pCreateWindow)(HWND);

1 0

Huw Davies : winecoreaudio: Move midi_in_add_buffer to the unixlib.
by Alexandre Julliard 29 Nov '21

29 Nov '21

Module: wine Branch: master Commit: 27bda12c99bb753c7fa753c53c4030806f1eeaea URL: https://source.winehq.org/git/wine.git/?a=commit;h=27bda12c99bb753c7fa753c5… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 29 11:26:46 2021 +0000 winecoreaudio: Move midi_in_add_buffer to the unixlib. 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/winecoreaudio.drv/coremidi.c | 46 +++++++++++++++++++++++++++++++++++ dlls/winecoreaudio.drv/midi.c | 50 --------------------------------------- 2 files changed, 46 insertions(+), 50 deletions(-) diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index 8e12ad1a3c5..5d89b69e007 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -809,6 +809,49 @@ static DWORD midi_in_close(WORD dev_id, struct notify_context *notify) return MMSYSERR_NOERROR; } +static DWORD midi_in_add_buffer(WORD dev_id, MIDIHDR *hdr, DWORD hdr_size) +{ + MIDIHDR **next; + + TRACE("dev_id = %d hdr = %p hdr_size = %d\n", dev_id, hdr, hdr_size); + + if (dev_id >= num_srcs) + { + WARN("bad device ID : %d\n", dev_id); + return MMSYSERR_BADDEVICEID; + } + if (!hdr || hdr_size < offsetof(MIDIHDR, dwOffset) || !hdr->dwBufferLength) + { + WARN("Invalid Parameter\n"); + return MMSYSERR_INVALPARAM; + } + if (hdr->dwFlags & MHDR_INQUEUE) + { + WARN("Still playing\n"); + return MIDIERR_STILLPLAYING; + } + if (!(hdr->dwFlags & MHDR_PREPARED)) + { + WARN("Unprepared\n"); + return MIDIERR_UNPREPARED; + } + + hdr->dwFlags &= ~WHDR_DONE; + hdr->dwFlags |= MHDR_INQUEUE; + hdr->dwBytesRecorded = 0; + hdr->lpNext = NULL; + + midi_in_lock((void *)TRUE); + + next = &srcs[dev_id].lpQueueHdr; + while (*next) next = &(*next)->lpNext; + *next = hdr; + + midi_in_lock((void *)FALSE); + + return MMSYSERR_NOERROR; +} + static DWORD midi_in_prepare(WORD dev_id, MIDIHDR *hdr, DWORD hdr_size) { TRACE("dev_id = %d hdr = %p hdr_size = %d\n", dev_id, hdr, hdr_size); @@ -966,6 +1009,9 @@ NTSTATUS midi_in_message(void *args) case MIDM_CLOSE: *params->err = midi_in_close(params->dev_id, params->notify); break; + case MIDM_ADDBUFFER: + *params->err = midi_in_add_buffer(params->dev_id, (MIDIHDR *)params->param_1, params->param_2); + break; case MIDM_PREPARE: *params->err = midi_in_prepare(params->dev_id, (MIDIHDR *)params->param_1, params->param_2); break; diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 7894b4da906..4eb68c8b1d7 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -142,54 +142,6 @@ static void midi_lock( BOOL lock ) UNIX_CALL(midi_in_lock, (void *)lock); } -static DWORD MIDIIn_AddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) -{ - TRACE("wDevID=%d lpMidiHdr=%p dwSize=%d\n", wDevID, lpMidiHdr, dwSize); - - if (wDevID >= MIDIIn_NumDevs) { - WARN("bad device ID : %d\n", wDevID); - return MMSYSERR_BADDEVICEID; - } - if (lpMidiHdr == NULL) { - WARN("Invalid Parameter\n"); - return MMSYSERR_INVALPARAM; - } - if (dwSize < offsetof(MIDIHDR,dwOffset)) { - WARN("Invalid Parameter\n"); - return MMSYSERR_INVALPARAM; - } - if (lpMidiHdr->dwBufferLength == 0) { - WARN("Invalid Parameter\n"); - return MMSYSERR_INVALPARAM; - } - if (lpMidiHdr->dwFlags & MHDR_INQUEUE) { - WARN("Still playing\n"); - return MIDIERR_STILLPLAYING; - } - if (!(lpMidiHdr->dwFlags & MHDR_PREPARED)) { - WARN("Unprepared\n"); - return MIDIERR_UNPREPARED; - } - - midi_lock( TRUE ); - lpMidiHdr->dwFlags &= ~WHDR_DONE; - lpMidiHdr->dwFlags |= MHDR_INQUEUE; - lpMidiHdr->dwBytesRecorded = 0; - lpMidiHdr->lpNext = 0; - if (sources[wDevID].lpQueueHdr == 0) { - sources[wDevID].lpQueueHdr = lpMidiHdr; - } else { - LPMIDIHDR ptr; - for (ptr = sources[wDevID].lpQueueHdr; - ptr->lpNext != 0; - ptr = ptr->lpNext); - ptr->lpNext = lpMidiHdr; - } - midi_lock( FALSE ); - - return MMSYSERR_NOERROR; -} - static DWORD MIDIIn_Reset(WORD wDevID) { DWORD dwTime = GetTickCount(); @@ -384,8 +336,6 @@ DWORD WINAPI CoreAudio_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWOR TRACE("%d %08x %08lx %08lx %08lx\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); switch (wMsg) { - case MIDM_ADDBUFFER: - return MIDIIn_AddBuffer(wDevID, (LPMIDIHDR)dwParam1, dwParam2); case MIDM_RESET: return MIDIIn_Reset(wDevID); }

1 0

Huw Davies : winecoreaudio: Pass the time relative to the start time to the callback.
by Alexandre Julliard 29 Nov '21

29 Nov '21

Module: wine Branch: master Commit: 01ad503004cf8ea6b0bd8f544ee131fc86abc580 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01ad503004cf8ea6b0bd8f54… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 29 11:26:47 2021 +0000 winecoreaudio: Pass the time relative to the start time to the callback. This matches the behaviour of the other instance of the invocation of the MIM_LONGDATA callback. It's rather difficult to reliably write a test for this, but it has been observed to be the case on Windows. 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/winecoreaudio.drv/midi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 4eb68c8b1d7..ab861d44525 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -159,7 +159,7 @@ static DWORD MIDIIn_Reset(WORD wDevID) lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; lpMidiHdr->dwFlags |= MHDR_DONE; /* FIXME: when called from 16 bit, lpQueueHdr needs to be a segmented ptr */ - MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime); + MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime - sources[wDevID].startTime); } midi_lock( FALSE );

1 0

Huw Davies : winecoreaudio: Move midi_in_reset to the unixlib.
by Alexandre Julliard 29 Nov '21

29 Nov '21

Module: wine Branch: master Commit: ac1059ff606d1d34817a73ba4951ed4a79fad9a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac1059ff606d1d34817a73ba… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 29 11:26:48 2021 +0000 winecoreaudio: Move midi_in_reset to the unixlib. The headers are removed one at a time so that each notification can be reported back to the client-side. If there are remaining headers, the unixlib will return ERROR_RETRY to request that the client calls again. 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/winecoreaudio.drv/coremidi.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/winecoreaudio.drv/midi.c | 36 +++++------------------------------- 2 files changed, 41 insertions(+), 31 deletions(-) diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index 5d89b69e007..9dc9f452c29 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -934,6 +934,39 @@ static DWORD midi_in_stop(WORD dev_id) return MMSYSERR_NOERROR; } +static DWORD midi_in_reset(WORD dev_id, struct notify_context *notify) +{ + DWORD cur_time = NtGetTickCount(); + DWORD err = MMSYSERR_NOERROR; + struct midi_src *src; + MIDIHDR *hdr; + + TRACE("%d\n", dev_id); + + if (dev_id >= num_srcs) + { + WARN("bad device ID : %d\n", dev_id); + return MMSYSERR_BADDEVICEID; + } + src = srcs + dev_id; + + midi_in_lock((void *)TRUE); + + if (src->lpQueueHdr) + { + hdr = src->lpQueueHdr; + src->lpQueueHdr = hdr->lpNext; + hdr->dwFlags &= ~MHDR_INQUEUE; + hdr->dwFlags |= MHDR_DONE; + set_in_notify(notify, src, dev_id, MIM_LONGDATA, (DWORD_PTR)hdr, cur_time - src->startTime); + if (src->lpQueueHdr) err = ERROR_RETRY; /* ask the client to call again */ + } + + midi_in_lock((void *)FALSE); + + return err; +} + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -1030,6 +1063,9 @@ NTSTATUS midi_in_message(void *args) case MIDM_STOP: *params->err = midi_in_stop(params->dev_id); break; + case MIDM_RESET: + *params->err = midi_in_reset(params->dev_id, params->notify); + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index ab861d44525..dcb9a7e1b69 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -142,30 +142,6 @@ static void midi_lock( BOOL lock ) UNIX_CALL(midi_in_lock, (void *)lock); } -static DWORD MIDIIn_Reset(WORD wDevID) -{ - DWORD dwTime = GetTickCount(); - - TRACE("%d\n", wDevID); - if (wDevID >= MIDIIn_NumDevs) { - WARN("bad device ID : %d\n", wDevID); - return MMSYSERR_BADDEVICEID; - } - - midi_lock( TRUE ); - while (sources[wDevID].lpQueueHdr) { - LPMIDIHDR lpMidiHdr = sources[wDevID].lpQueueHdr; - sources[wDevID].lpQueueHdr = lpMidiHdr->lpNext; - lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; - lpMidiHdr->dwFlags |= MHDR_DONE; - /* FIXME: when called from 16 bit, lpQueueHdr needs to be a segmented ptr */ - MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime - sources[wDevID].startTime); - } - midi_lock( FALSE ); - - return MMSYSERR_NOERROR; -} - /* * MIDI In Mach message handling */ @@ -335,10 +311,6 @@ DWORD WINAPI CoreAudio_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWOR DWORD err; TRACE("%d %08x %08lx %08lx %08lx\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); - switch (wMsg) { - case MIDM_RESET: - return MIDIIn_Reset(wDevID); - } params.dev_id = wDevID; params.msg = wMsg; @@ -348,9 +320,11 @@ DWORD WINAPI CoreAudio_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWOR params.err = &err; params.notify = &notify; - UNIX_CALL(midi_in_message, &params); - - if (!err && notify.send_notify) notify_client(&notify); + do + { + UNIX_CALL(midi_in_message, &params); + if ((!err || err == ERROR_RETRY) && notify.send_notify) notify_client(&notify); + } while (err == ERROR_RETRY); return err; }

1 0

Nikolay Sivov : dxva2/tests: Fix some test failures on HW devices.
by Alexandre Julliard 29 Nov '21

29 Nov '21

Module: wine Branch: master Commit: 8a43d0808a8cba8b30d5ed2e00f36d260ff2f796 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a43d0808a8cba8b30d5ed2e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 29 16:02:50 2021 +0300 dxva2/tests: Fix some test failures on HW devices. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52106 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxva2/tests/dxva2.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c index 01f8f568e6a..5de39fe1360 100644 --- a/dlls/dxva2/tests/dxva2.c +++ b/dlls/dxva2/tests/dxva2.c @@ -575,7 +575,6 @@ static void test_progressive_device(void) static const D3DFORMAT input_formats[] = { - D3DFMT_A8R8G8B8, D3DFMT_X8R8G8B8, D3DFMT_YUY2, MAKEFOURCC('N','V','1','2'), @@ -666,7 +665,6 @@ static void test_progressive_device(void) hr = IDirectXVideoProcessor_GetVideoProcessorCaps(processor, &caps); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(caps.DeviceCaps == DXVA2_VPDev_HardwareDevice, "Unexpected device type %#x.\n", caps.DeviceCaps); - ok(caps.InputPool == D3DPOOL_DEFAULT, "Unexpected input pool %#x.\n", caps.InputPool); ok(!caps.NumForwardRefSamples, "Unexpected sample count.\n"); ok(!caps.NumBackwardRefSamples, "Unexpected sample count.\n"); ok(!caps.Reserved, "Unexpected field.\n");

1 0

Bernhard Kölbl : gdiplus: Introduce dst palette parameter to convert_pixels().
by Alexandre Julliard 29 Nov '21

29 Nov '21

Module: wine Branch: master Commit: ec29292141ac39d2f7625ddae8e1547dd818eabd URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec29292141ac39d2f7625dda… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Mon Nov 29 15:28:33 2021 +0100 gdiplus: Introduce dst palette parameter to convert_pixels(). Make it possible to define a destination colour palette when using convert_pixels(), so converting a bitmap from a non indexed format to an indexed format does not produce an empty image. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 4 ++-- dlls/gdiplus/graphics.c | 2 +- dlls/gdiplus/image.c | 20 +++++++++++--------- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 22213e9f278..7ae8cc564c9 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -207,8 +207,8 @@ extern void convert_32bppARGB_to_32bppPARGB(UINT width, UINT height, BYTE *dst_bits, INT dst_stride, const BYTE *src_bits, INT src_stride) DECLSPEC_HIDDEN; extern GpStatus convert_pixels(INT width, INT height, - INT dst_stride, BYTE *dst_bits, PixelFormat dst_format, - INT src_stride, const BYTE *src_bits, PixelFormat src_format, ColorPalette *palette) DECLSPEC_HIDDEN; + INT dst_stride, BYTE *dst_bits, PixelFormat dst_format, ColorPalette *dst_palette, + INT src_stride, const BYTE *src_bits, PixelFormat src_format, ColorPalette *src_palette) DECLSPEC_HIDDEN; extern PixelFormat apply_image_attributes(const GpImageAttributes *attributes, LPBYTE data, UINT width, UINT height, INT stride, ColorAdjustType type, PixelFormat fmt) DECLSPEC_HIDDEN; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 4a428c49869..65cdf96510d 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3350,7 +3350,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image dst_format = PixelFormat32bppRGB; convert_pixels(bitmap->width, bitmap->height, - bitmap->width*4, temp_bits, dst_format, + bitmap->width*4, temp_bits, dst_format, bitmap->image.palette, bitmap->stride, bitmap->bits, bitmap->format, bitmap->image.palette); } diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 862f7fea111..518a9bf8689 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -591,8 +591,9 @@ GpStatus WINGDIPAPI GdipBitmapSetPixel(GpBitmap* bitmap, INT x, INT y, GpStatus convert_pixels(INT width, INT height, INT dst_stride, BYTE *dst_bits, PixelFormat dst_format, + ColorPalette *dst_palette, INT src_stride, const BYTE *src_bits, PixelFormat src_format, - ColorPalette *palette) + ColorPalette *src_palette) { INT x, y; @@ -612,7 +613,7 @@ GpStatus convert_pixels(INT width, INT height, ARGB argb; \ BYTE *color = (BYTE *)&argb; \ getpixel_function(&index, src_bits+src_stride*y, x); \ - argb = (palette && index < palette->Count) ? palette->Entries[index] : 0; \ + argb = (src_palette && index < src_palette->Count) ? src_palette->Entries[index] : 0; \ setpixel_function(color[2], color[1], color[0], color[3], dst_bits+dst_stride*y, x); \ } \ return Ok; \ @@ -633,7 +634,7 @@ GpStatus convert_pixels(INT width, INT height, for (x=0; x<width; x++) { \ BYTE r, g, b, a; \ getpixel_function(&r, &g, &b, &a, src_bits+src_stride*y, x); \ - setpixel_function(r, g, b, a, dst_bits+dst_stride*y, x, palette); \ + setpixel_function(r, g, b, a, dst_bits+dst_stride*y, x, dst_palette); \ } \ return Ok; \ } while (0); @@ -1137,7 +1138,7 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, /* Make sure we can convert to the requested format. */ if (flags & ImageLockModeRead) { - stat = convert_pixels(0, 0, 0, NULL, format, 0, NULL, bitmap->format, NULL); + stat = convert_pixels(0, 0, 0, NULL, format, NULL, 0, NULL, bitmap->format, NULL); if (stat == NotImplemented) { FIXME("cannot read bitmap from %x to %x\n", bitmap->format, format); @@ -1150,7 +1151,7 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, * the original format. */ if (flags & ImageLockModeWrite) { - stat = convert_pixels(0, 0, 0, NULL, bitmap->format, 0, NULL, format, NULL); + stat = convert_pixels(0, 0, 0, NULL, bitmap->format, NULL, 0, NULL, format, NULL); if (stat == NotImplemented) { FIXME("cannot write bitmap from %x to %x\n", format, bitmap->format); @@ -1190,7 +1191,7 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, } stat = convert_pixels(act_rect.Width, act_rect.Height, - lockeddata->Stride, lockeddata->Scan0, format, + lockeddata->Stride, lockeddata->Scan0, format, bitmap->image.palette, bitmap->stride, bitmap->bits + bitmap->stride * act_rect.Y + PIXELFORMATBPP(bitmap->format) * act_rect.X / 8, bitmap->format, bitmap->image.palette); @@ -1267,10 +1268,11 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, fixme = TRUE; } + /* FIXME: Pass src_palette generated from lockeddata->PixelFormat. */ stat = convert_pixels(lockeddata->Width, lockeddata->Height, bitmap->stride, bitmap->bits + bitmap->stride * bitmap->locky + PIXELFORMATBPP(bitmap->format) * bitmap->lockx / 8, - bitmap->format, + bitmap->format, bitmap->image.palette, lockeddata->Stride, lockeddata->Scan0, lockeddata->PixelFormat, NULL); if (stat != Ok) @@ -1314,7 +1316,7 @@ GpStatus WINGDIPAPI GdipCloneBitmapArea(REAL x, REAL y, REAL width, REAL height, if (stat == Ok) { stat = convert_pixels(area.Width, area.Height, (*dstBitmap)->stride, (*dstBitmap)->bits, (*dstBitmap)->format, - srcBitmap->stride, + (*dstBitmap)->image.palette, srcBitmap->stride, srcBitmap->bits + srcBitmap->stride * area.Y + PIXELFORMATBPP(srcBitmap->format) * area.X / 8, srcBitmap->format, srcBitmap->image.palette); @@ -1545,7 +1547,7 @@ GpStatus WINGDIPAPI GdipCreateHBITMAPFromBitmap(GpBitmap* bitmap, } stat = convert_pixels(width, height, -width*4, - bits + (width * 4 * (height - 1)), PixelFormat32bppPARGB, + bits + (width * 4 * (height - 1)), PixelFormat32bppPARGB, bitmap->image.palette, bitmap->stride, bitmap->bits, bitmap->format, bitmap->image.palette); if (stat != Ok) {

1 0

Bernhard Kölbl : gdiplus: Add simple test for bitmap clone from rgb values to indexed.
by Alexandre Julliard 29 Nov '21

29 Nov '21

Module: wine Branch: master Commit: d3275f5f6a5a3d78615ed1991efc446e91ed4855 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3275f5f6a5a3d78615ed199… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Mon Nov 29 15:28:34 2021 +0100 gdiplus: Add simple test for bitmap clone from rgb values to indexed. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/image.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 2175c1748e0..ca08ae49ad7 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -5102,9 +5102,44 @@ static void test_PARGB_conversion(void) static void test_CloneBitmapArea(void) { + /* 3x3 pixeldata in various formats: red, green, blue, yellow, turquoise, pink, black, gray, white */ + static BYTE bmp_3x3_data_32bpp_argb[] = { + 0xff,0x00,0x00,0xff, 0x00,0xff,0x00,0xff, 0x00,0x00,0xff,0xff, + 0xff,0xff,0x00,0xff, 0x00,0xff,0xff,0xff, 0xff,0x00,0xff,0xff, + 0xff,0xff,0xff,0xff, 0x80,0x80,0x80,0xff, 0x00,0x00,0x00,0xff + }; + static BYTE bmp_3x3_data_32bpp_rgb[] = { + 0xff,0x00,0x00,0x00, 0x00,0xff,0x00,0x00, 0x00,0x00,0xff,0x00, + 0xff,0xff,0x00,0x00, 0x00,0xff,0xff,0x00, 0xff,0x00,0xff,0x00, + 0xff,0xff,0xff,0x00, 0x80,0x80,0x80,0x00, 0x00,0x00,0x00,0x00 + }; + static BYTE bmp_3x3_data_24bpp_rgb[] = { + 0xff,0x00,0x00, 0x00,0xff,0x00, 0x00,0x00,0xff, + 0xff,0xff,0x00, 0x00,0xff,0xff, 0xff,0x00,0xff, + 0xff,0xff,0xff, 0x80,0x80,0x80, 0x00,0x00,0x00 + }; + + static const struct test_data { + BYTE *src_pixeldata; + PixelFormat src_format; + PixelFormat dst_format; + } td[] = + { + { bmp_3x3_data_32bpp_argb, PixelFormat32bppARGB, PixelFormat8bppIndexed }, + { bmp_3x3_data_32bpp_argb, PixelFormat32bppARGB, PixelFormat4bppIndexed }, + { bmp_3x3_data_32bpp_argb, PixelFormat32bppARGB, PixelFormat1bppIndexed }, + { bmp_3x3_data_32bpp_rgb, PixelFormat32bppRGB, PixelFormat8bppIndexed }, + { bmp_3x3_data_32bpp_rgb, PixelFormat32bppRGB, PixelFormat4bppIndexed }, + { bmp_3x3_data_32bpp_rgb, PixelFormat32bppRGB, PixelFormat1bppIndexed }, + { bmp_3x3_data_24bpp_rgb, PixelFormat24bppRGB, PixelFormat8bppIndexed }, + { bmp_3x3_data_24bpp_rgb, PixelFormat24bppRGB, PixelFormat4bppIndexed }, + { bmp_3x3_data_24bpp_rgb, PixelFormat24bppRGB, PixelFormat1bppIndexed }, + }; + GpStatus status; GpBitmap *bitmap, *copy; BitmapData data, data2; + INT x, y, i; status = GdipCreateBitmapFromScan0(1, 1, 0, PixelFormat24bppRGB, NULL, &bitmap); expect(Ok, status); @@ -5123,6 +5158,40 @@ static void test_CloneBitmapArea(void) GdipDisposeImage((GpImage *)copy); GdipDisposeImage((GpImage *)bitmap); + + for(i=0; i<ARRAY_SIZE(td); i++) + { + status = GdipCreateBitmapFromScan0(3, 3, 4*3, td[i].src_format, td[i].src_pixeldata, &bitmap); + expect(Ok, status); + + status = GdipCloneBitmapAreaI(0, 0, 3, 3, td[i].dst_format, bitmap, &copy); + expect(Ok, status); + + for (y=0; y<3; y++) + for (x=0; x<3; x++) + { + BOOL match; + ARGB color_orig; + ARGB color_copy; + + status = GdipBitmapGetPixel(bitmap, x, y, &color_orig); + expect(Ok, status); + + status = GdipBitmapGetPixel(copy, x, y, &color_copy); + expect(Ok, status); + + if(td[i].dst_format == PixelFormat1bppIndexed) + color_orig = (color_orig >> 16 & 0xff) + (color_orig >> 8 & 0xff) + (color_orig & 0xff) + > 0x17d ? 0xffffffff : 0xff000000; + + match = color_match(color_orig, color_copy, 0x00); + ok(match == TRUE, "Colors 0x%08x and 0x%08x do not match! (Conversion from %x to %x)\n", + color_orig, color_copy, td[i].src_format, td[i].dst_format); + } + + GdipDisposeImage((GpImage *)copy); + GdipDisposeImage((GpImage *)bitmap); + } } static void test_supported_encoders(void)

1 0