March 2022 - Wine-commits - list.winehq.org

Huw Davies : winealsa: Remove several unused members.
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: wine Branch: master Commit: 8686fc82f0b113bc336cabf80c4e4709a6e884c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8686fc82f0b113bc336cabf8… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 14 10:21:47 2022 +0000 winealsa: Remove several unused members. 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/winealsa.drv/midi.c | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index e61dae12860..699790d380d 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -60,14 +60,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi); typedef struct { int state; /* -1 disabled, 0 is no recording started, 1 in recording, bit 2 set if in sys exclusive recording */ - DWORD bufsize; MIDIOPENDESC midiDesc; WORD wFlags; LPMIDIHDR lpQueueHdr; - DWORD dwTotalPlayed; - unsigned char incoming[3]; - unsigned char incPrev; - char incLen; DWORD startTime; MIDIINCAPSW caps; snd_seq_addr_t addr; @@ -75,12 +70,8 @@ typedef struct { typedef struct { BOOL bEnabled; - DWORD bufsize; MIDIOPENDESC midiDesc; WORD wFlags; - LPMIDIHDR lpQueueHdr; - DWORD dwTotalPlayed; - void* lpExtra; /* according to port type (MIDI, FM...), extra data when needed */ MIDIOUTCAPSW caps; snd_seq_addr_t addr; int port_out; @@ -497,11 +488,8 @@ static DWORD midOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) MidiInDev[wDevID].wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); MidiInDev[wDevID].lpQueueHdr = NULL; - MidiInDev[wDevID].dwTotalPlayed = 0; - MidiInDev[wDevID].bufsize = 0x3FFF; MidiInDev[wDevID].midiDesc = *lpDesc; MidiInDev[wDevID].state = 0; - MidiInDev[wDevID].incLen = 0; MidiInDev[wDevID].startTime = 0; /* Connect our app port to the device port */ @@ -571,7 +559,6 @@ static DWORD midClose(WORD wDevID) LeaveCriticalSection(&midiSeqLock); midiCloseSeq(); - MidiInDev[wDevID].bufsize = 0; MIDI_NotifyClient(wDevID, MIM_CLOSE, 0L, 0L); MidiInDev[wDevID].midiDesc.hMidi = 0; @@ -752,8 +739,6 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) return MMSYSERR_INVALFLAG; } - MidiOutDev[wDevID].lpExtra = 0; - switch (MidiOutDev[wDevID].caps.wTechnology) { case MOD_FMSYNTH: case MOD_MIDIPORT: @@ -769,10 +754,6 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) } MidiOutDev[wDevID].wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); - - MidiOutDev[wDevID].lpQueueHdr = NULL; - MidiOutDev[wDevID].dwTotalPlayed = 0; - MidiOutDev[wDevID].bufsize = 0x3FFF; MidiOutDev[wDevID].midiDesc = *lpDesc; EnterCriticalSection(&midiSeqLock); @@ -853,10 +834,6 @@ static DWORD modClose(WORD wDevID) return MMSYSERR_NOTENABLED; } - HeapFree(GetProcessHeap(), 0, MidiOutDev[wDevID].lpExtra); - MidiOutDev[wDevID].lpExtra = 0; - - MidiOutDev[wDevID].bufsize = 0; MIDI_NotifyClient(wDevID, MOM_CLOSE, 0L, 0L); MidiOutDev[wDevID].midiDesc.hMidi = 0; return ret;

1 0

Huw Davies : winealsa: Remove a workaround for versions of alsa-lib before 1.0.12.
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: wine Branch: master Commit: 52e262370a9383cd0595e8a588535291440bbc6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=52e262370a9383cd0595e8a5… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 14 10:21:48 2022 +0000 winealsa: Remove a workaround for versions of alsa-lib before 1.0.12. Version 1.0.12 was released in 2006. 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/winealsa.drv/midi.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 699790d380d..e65cae6cda5 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -54,10 +54,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi); -#ifndef SND_SEQ_PORT_TYPE_PORT -#define SND_SEQ_PORT_TYPE_PORT (1<<19) /* Appears in version 1.0.12rc1 */ -#endif - typedef struct { int state; /* -1 disabled, 0 is no recording started, 1 in recording, bit 2 set if in sys exclusive recording */ MIDIOPENDESC midiDesc;

1 0

Huw Davies : winealsa: Move the midi seq lock to the unixlib.
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: wine Branch: master Commit: c02386390cd8c1a87e86c6180ae3aa929199bffe URL: https://source.winehq.org/git/wine.git/?a=commit;h=c02386390cd8c1a87e86c618… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 14 10:21:49 2022 +0000 winealsa: Move the midi seq lock 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/winealsa.drv/Makefile.in | 1 + dlls/winealsa.drv/alsa.c | 2 + dlls/winealsa.drv/alsamidi.c | 64 ++++++++++++++++++++++++++++ dlls/winealsa.drv/midi.c | 97 +++++++++++++++++++++---------------------- dlls/winealsa.drv/unixlib.h | 4 ++ 5 files changed, 118 insertions(+), 50 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c02386390cd8c1a87e86…

1 0

Paul Gofman : winhttp: Fix filling TIMEVAL in netconn_create().
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: wine Branch: master Commit: e87d79fc495e416320471b4b28d6bf942ce3795e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e87d79fc495e416320471b4b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Mar 14 13:31:26 2022 +0300 winhttp: Fix filling TIMEVAL in netconn_create(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/net.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 19fafb25804..09ed5e222d1 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -229,7 +229,7 @@ DWORD netconn_create( struct hostdata *host, const struct sockaddr_storage *sock if (ret == WSAEWOULDBLOCK || ret == WSAEINPROGRESS) { FD_SET set; - TIMEVAL timeval = { 0, timeout * 1000 }; + TIMEVAL timeval = { timeout / 1000, (timeout % 1000) * 1000 }; int res; FD_ZERO( &set );

1 0

Paul Gofman : winhttp: Return an winhttp error from netconn_create() on connection failure.
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: wine Branch: master Commit: 550fdbd1de2872da7f3758c264bf27afcb23063a URL: https://source.winehq.org/git/wine.git/?a=commit;h=550fdbd1de2872da7f3758c2… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Mar 14 13:31:27 2022 +0300 winhttp: Return an winhttp error from netconn_create() on connection failure. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/net.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 09ed5e222d1..5e4c55fad6a 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -246,7 +246,7 @@ DWORD netconn_create( struct hostdata *host, const struct sockaddr_storage *sock WARN( "unable to connect to host (%lu)\n", ret ); closesocket( conn->socket ); free( conn ); - return ret; + return ret == ERROR_WINHTTP_TIMEOUT ? ERROR_WINHTTP_TIMEOUT : ERROR_WINHTTP_CANNOT_CONNECT; } *ret_conn = conn;

1 0

Alexandre Julliard : dwrite: Only use __builtin_popcount in PE builds.
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: wine Branch: master Commit: 73b94f8f94abab874dd24d91f43917ba76f76383 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73b94f8f94abab874dd24d91… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 14 11:22:23 2022 +0100 dwrite: Only use __builtin_popcount in PE builds. It's not compatible with -mabi=ms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index f04b70db193..c671218c486 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -3435,7 +3435,7 @@ static unsigned int opentype_layout_is_glyph_covered(const struct dwrite_fonttab static inline unsigned int dwrite_popcount(unsigned int x) { -#if defined(__GNUC__) && (__GNUC__ >= 4) +#if defined(__MINGW32__) return __builtin_popcount(x); #else x -= x >> 1 & 0x55555555;

1 0

Alexandre Julliard : wined3d: Only use __builtin_popcount in PE builds.
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: wine Branch: master Commit: a3e9ed6fc8a84b4b1e9ed19af617b73fc3c3650e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3e9ed6fc8a84b4b1e9ed19a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 14 11:22:40 2022 +0100 wined3d: Only use __builtin_popcount in PE builds. It's not compatible with -mabi=ms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bc3b9699fa6..577377f8dd4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -405,7 +405,7 @@ static inline float float_24_to_32(DWORD in) static inline unsigned int wined3d_popcount(unsigned int x) { -#if defined(__GNUC__) && (__GNUC__ >= 4) +#if defined(__MINGW32__) return __builtin_popcount(x); #else x -= x >> 1 & 0x55555555;

1 0

Alexandre Julliard : vkd3d: Only use __builtin_popcount in PE builds.
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: wine Branch: master Commit: 7c908186ec5c09f72d92c468abda6562b3da82e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c908186ec5c09f72d92c468… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 14 11:22:47 2022 +0100 vkd3d: Only use __builtin_popcount in PE builds. It's not compatible with -mabi=ms. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52664 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/include/private/vkd3d_common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/include/private/vkd3d_common.h b/libs/vkd3d/include/private/vkd3d_common.h index 6e57e05c7e2..4ee8ccd4325 100644 --- a/libs/vkd3d/include/private/vkd3d_common.h +++ b/libs/vkd3d/include/private/vkd3d_common.h @@ -65,7 +65,7 @@ static inline unsigned int vkd3d_popcount(unsigned int v) { #ifdef _MSC_VER return __popcnt(v); -#elif defined(__GNUC__) && (__GNUC__ >= 4) +#elif defined(__MINGW32__) return __builtin_popcount(v); #else v -= (v >> 1) & 0x55555555;

1 0

Daniel Lehman : server: Always close previous IRP handle.
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: wine Branch: master Commit: 2fc3d7eb2912b189ab38c0683f16e97cf9987362 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2fc3d7eb2912b189ab38c068… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Mar 10 16:18:13 2022 -0800 server: Always close previous IRP handle. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/device.c b/server/device.c index d6288920bf4..436dac6bfe9 100644 --- a/server/device.c +++ b/server/device.c @@ -959,7 +959,6 @@ DECL_HANDLER(get_next_device_request) if (req->prev) { set_irp_result( irp, req->iosb_status, get_req_data(), get_req_data_size(), req->result ); - close_handle( current->process, req->prev ); /* avoid an extra round-trip for close */ } else { @@ -977,6 +976,9 @@ DECL_HANDLER(get_next_device_request) set_irp_result( irp, req->status, NULL, 0, 0 ); } + if (req->prev) + close_handle( current->process, req->prev ); /* avoid an extra round-trip for close */ + free_irp_params( irp ); release_object( irp ); manager->current_call = NULL;

1 0

Zebediah Figura : wined3d: Try to load winevulkan.dll instead of vulkan-1.dll.
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: wine Branch: master Commit: 93217a4ad272f61162f25b71e1decf588796aef1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93217a4ad272f61162f25b71… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Mar 11 15:56:45 2022 -0600 wined3d: Try to load winevulkan.dll instead of vulkan-1.dll. The Khronos Vulkan loader calls into dxgi, which results in infinite recursion. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52640 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/adapter_vk.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 506c7167f31..2752a0ac0b3 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -219,7 +219,8 @@ static BOOL wined3d_load_vulkan(struct wined3d_vk_info *vk_info) { struct vulkan_ops *vk_ops = &vk_info->vk_ops; - if (!(vk_info->vulkan_lib = LoadLibraryA("vulkan-1.dll"))) + if (!(vk_info->vulkan_lib = LoadLibraryA("winevulkan.dll")) + && !(vk_info->vulkan_lib = LoadLibraryA("vulkan-1.dll"))) { WARN("Failed to load vulkan-1.dll.\n"); return FALSE;

1 0