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

Dmitry Timoshkov : combase: Make ProgIDFromCLSID() work in WoW64 setup.
by Alexandre Julliard March 16, 2022

March 16, 2022

Module: wine Branch: master Commit: cd2904fa1af81f112e8a6509b99a9eccf98dfb2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd2904fa1af81f112e8a6509… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Mar 16 13:14:41 2022 +0300 combase: Make ProgIDFromCLSID() work in WoW64 setup. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index de2375fba78..8133408559f 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -1249,6 +1249,8 @@ HRESULT WINAPI DECLSPEC_HOTPATCH ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *progi ACTCTX_SECTION_KEYED_DATA data; LONG progidlen = 0; HKEY hkey; + REGSAM opposite = (sizeof(void *) > sizeof(int)) ? KEY_WOW64_32KEY : KEY_WOW64_64KEY; + BOOL is_wow64; HRESULT hr; if (!progid) @@ -1277,8 +1279,12 @@ HRESULT WINAPI DECLSPEC_HOTPATCH ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *progi } hr = open_key_for_clsid(clsid, L"ProgID", KEY_READ, &hkey); - if (FAILED(hr)) - return hr; + if (FAILED(hr) && (opposite == KEY_WOW64_32KEY || (IsWow64Process(GetCurrentProcess(), &is_wow64) && is_wow64))) + { + hr = open_key_for_clsid(clsid, L"ProgID", opposite | KEY_READ, &hkey); + if (FAILED(hr)) + return hr; + } if (RegQueryValueW(hkey, NULL, NULL, &progidlen)) hr = REGDB_E_CLASSNOTREG;

1 0

Huw Davies : winealsa: Move MODM_CLOSE to the unixlib.
by Alexandre Julliard March 16, 2022

March 16, 2022

Module: wine Branch: master Commit: 30c18bdfd4d1caa269f0086bc0fe59f6e22e0203 URL: https://source.winehq.org/git/wine.git/?a=commit;h=30c18bdfd4d1caa269f0086b… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 15 16:19:03 2022 +0000 winealsa: Move MODM_CLOSE 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/alsamidi.c | 57 ++++++++++++++++++++++++++++++++++++++++++++ dlls/winealsa.drv/midi.c | 47 ------------------------------------ 2 files changed, 57 insertions(+), 47 deletions(-) diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index a7a5a211484..a92c08793af 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -471,6 +471,60 @@ static UINT midi_out_open(WORD dev_id, MIDIOPENDESC *midi_desc, UINT flags, stru 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) + { + WARN("bad device ID : %d\n", dev_id); + 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->seq == NULL) + { + WARN("can't close !\n"); + return MMSYSERR_ERROR; + } + + switch (dest->caps.wTechnology) + { + case MOD_FMSYNTH: + case MOD_MIDIPORT: + case MOD_SYNTH: + seq_lock(); + TRACE("Deleting port :%d, connected to %d:%d\n", dest->port_out, dest->addr.client, dest->addr.port); + snd_seq_delete_simple_port(dest->seq, dest->port_out); + dest->port_out = -1; + seq_unlock(); + seq_close(); + dest->seq = NULL; + break; + default: + WARN("Technology not supported (yet) %d !\n", dest->caps.wTechnology); + return MMSYSERR_NOTENABLED; + } + + 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; @@ -488,6 +542,9 @@ NTSTATUS midi_out_message(void *args) 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; diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index c77d479162b..5f8d855c9fb 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -122,7 +122,6 @@ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, wDevID, wMsg, dwParam1, dwParam2); switch (wMsg) { - case MOM_CLOSE: case MOM_DONE: case MOM_POSITIONCB: if (wDevID > MODM_NumDevs) return; @@ -631,50 +630,6 @@ static DWORD modGetDevCaps(WORD wDevID, LPMIDIOUTCAPSW lpCaps, DWORD dwSize) 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].seq == NULL) { - WARN("can't close !\n"); - return MMSYSERR_ERROR; - } - - switch (MidiOutDev[wDevID].caps.wTechnology) { - case MOD_FMSYNTH: - case MOD_MIDIPORT: - case MOD_SYNTH: - seq_lock(); - TRACE("Deleting port :%d, connected to %d:%d\n", MidiOutDev[wDevID].port_out, MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port); - snd_seq_delete_simple_port(MidiOutDev[wDevID].seq, MidiOutDev[wDevID].port_out); - MidiOutDev[wDevID].port_out = -1; - seq_unlock(); - midiCloseSeq(); - MidiOutDev[wDevID].seq = NULL; - break; - default: - WARN("Technology not supported (yet) %d !\n", - MidiOutDev[wDevID].caps.wTechnology); - return MMSYSERR_NOTENABLED; - } - - MIDI_NotifyClient(wDevID, MOM_CLOSE, 0L, 0L); - MidiOutDev[wDevID].midiDesc.hMidi = 0; - return ret; -} - /************************************************************************** * modData [internal] */ @@ -1051,8 +1006,6 @@ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, case DRVM_INIT: ALSA_MidiInit(); return 0; - case MODM_CLOSE: - return modClose(wDevID); case MODM_DATA: return modData(wDevID, dwParam1); case MODM_LONGDATA:

1 0

Huw Davies : winealsa: Move MODM_OPEN to the unixlib.
by Alexandre Julliard March 16, 2022

March 16, 2022

Module: wine Branch: master Commit: 7ff6c8738ba7cc4edde84f6375884253b7d8a729 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ff6c8738ba7cc4edde84f63… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 15 16:19:02 2022 +0000 winealsa: Move MODM_OPEN 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/alsa.c | 1 + dlls/winealsa.drv/alsamidi.c | 133 +++++++++++++++++++++++++++++++++++++++++++ dlls/winealsa.drv/midi.c | 127 +++++++++-------------------------------- dlls/winealsa.drv/unixlib.h | 26 +++++++++ 4 files changed, 186 insertions(+), 101 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7ff6c8738ba7cc4edde8…

1 0

Daniel Lehman : kernelbase: Check for invalid value in FileTimeToSystemTime.
by Alexandre Julliard March 16, 2022

March 16, 2022

Module: wine Branch: master Commit: a5d14fa980542fcf26aeb5fa41e098b042f7b29d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5d14fa980542fcf26aeb5fa… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Mar 15 10:15:13 2022 -0700 kernelbase: Check for invalid value in FileTimeToSystemTime. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/time.c | 2 -- dlls/kernelbase/file.c | 8 +++++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c index fdef78a4466..ee818a0e4a1 100644 --- a/dlls/kernel32/tests/time.c +++ b/dlls/kernel32/tests/time.c @@ -400,11 +400,9 @@ static void test_FileTimeToSystemTime(void) ft.dwLowDateTime = -1; SetLastError(0xdeadbeef); ret = FileTimeToSystemTime(&ft, &st); - todo_wine { ok(!ret, "expected failure\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); - } } static void test_FileTimeToLocalFileTime(void) diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index c6dc904044a..a3a4b4f480b 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -3874,8 +3874,14 @@ BOOL WINAPI DECLSPEC_HOTPATCH FileTimeToLocalFileTime( const FILETIME *utc, FILE BOOL WINAPI DECLSPEC_HOTPATCH FileTimeToSystemTime( const FILETIME *ft, SYSTEMTIME *systime ) { TIME_FIELDS tf; + const LARGE_INTEGER *li = (const LARGE_INTEGER *)ft; - RtlTimeToTimeFields( (const LARGE_INTEGER *)ft, &tf ); + if (li->QuadPart < 0) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + RtlTimeToTimeFields( li, &tf ); systime->wYear = tf.Year; systime->wMonth = tf.Month; systime->wDay = tf.Day;

1 0

Huw Davies : winealsa: Add a temporary syscall to return the snd_seq handle.
by Alexandre Julliard March 16, 2022

March 16, 2022

Module: wine Branch: master Commit: 43e5657111c44046b438ceef230d9c0154a957fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=43e5657111c44046b438ceef… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 15 16:19:01 2022 +0000 winealsa: Add a temporary syscall to return the snd_seq handle. 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/alsa.c | 1 + dlls/winealsa.drv/alsamidi.c | 51 +++++++++++++++++++++++++++++++++++++------- dlls/winealsa.drv/midi.c | 49 ++++++++++-------------------------------- dlls/winealsa.drv/unixlib.h | 9 ++++++++ 4 files changed, 64 insertions(+), 46 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 76e4b98caaf..16c0c7c387d 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -2447,4 +2447,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = midi_init, midi_seq_lock, /* temporary */ + midi_seq_open, }; diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index 86e092bd977..e1fca85b3b4 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -55,6 +55,7 @@ static struct midi_dest dests[MAX_MIDIOUTDRV]; static struct midi_src srcs[MAX_MIDIINDRV]; static snd_seq_t *midi_seq; static unsigned int seq_refs; +static int port_in = -1; static void seq_lock(void) { @@ -74,7 +75,7 @@ NTSTATUS midi_seq_lock(void *args) return STATUS_SUCCESS; } -static int seq_open(void) +static snd_seq_t *seq_open(int *port_in_ret) { static int midi_warn; @@ -87,12 +88,28 @@ static int seq_open(void) WARN("Error opening ALSA sequencer.\n"); midi_warn = 1; seq_unlock(); - return -1; + return NULL; } + snd_seq_set_client_name(midi_seq, "WINE midi driver"); } seq_refs++; + + if (port_in_ret) + { + if (port_in < 0) + { + port_in = snd_seq_create_simple_port(midi_seq, "WINE ALSA Input", + SND_SEQ_PORT_CAP_WRITE | SND_SEQ_PORT_CAP_SUBS_READ | SND_SEQ_PORT_CAP_SUBS_WRITE, + SND_SEQ_PORT_TYPE_MIDI_GENERIC | SND_SEQ_PORT_TYPE_APPLICATION); + if (port_in < 0) + TRACE("Unable to create input port\n"); + else + TRACE("Input port %d created successfully\n", port_in); + } + *port_in_ret = port_in; + } seq_unlock(); - return 0; + return midi_seq; } static void seq_close(void) @@ -100,12 +117,29 @@ static void seq_close(void) seq_lock(); if (--seq_refs == 0) { + if (port_in >= 0) + { + snd_seq_delete_simple_port(midi_seq, port_in); + port_in = -1; + } snd_seq_close(midi_seq); midi_seq = NULL; } seq_unlock(); } +NTSTATUS midi_seq_open(void *args) +{ + struct midi_seq_open_params *params = args; + + if (!params->close) + params->seq = seq_open(params->port_in); + else + seq_close(); + + return STATUS_SUCCESS; +} + static int alsa_to_win_device_type(unsigned int type) { /* MOD_MIDIPORT output port @@ -270,6 +304,7 @@ NTSTATUS midi_init(void *args) static BOOL init_done; snd_seq_client_info_t *cinfo; snd_seq_port_info_t *pinfo; + snd_seq_t *seq; if (init_done) { *params->err = ERROR_ALREADY_INITIALIZED; @@ -280,7 +315,7 @@ NTSTATUS midi_init(void *args) init_done = TRUE; /* try to open device */ - if (seq_open() == -1) { + if (!(seq = seq_open(NULL))) { *params->err = ERROR_OPEN_FAILED; return STATUS_SUCCESS; } @@ -290,10 +325,10 @@ NTSTATUS midi_init(void *args) /* First, search for all internal midi devices */ snd_seq_client_info_set_client(cinfo, -1); - while (snd_seq_query_next_client(midi_seq, cinfo) >= 0) { + while (snd_seq_query_next_client(seq, cinfo) >= 0) { snd_seq_port_info_set_client(pinfo, snd_seq_client_info_get_client(cinfo)); snd_seq_port_info_set_port(pinfo, -1); - while (snd_seq_query_next_port(midi_seq, pinfo) >= 0) { + while (snd_seq_query_next_port(seq, pinfo) >= 0) { unsigned int cap = snd_seq_port_info_get_capability(pinfo); unsigned int type = snd_seq_port_info_get_type(pinfo); if (!(type & SND_SEQ_PORT_TYPE_PORT)) @@ -303,10 +338,10 @@ NTSTATUS midi_init(void *args) /* Second, search for all external ports */ snd_seq_client_info_set_client(cinfo, -1); - while (snd_seq_query_next_client(midi_seq, cinfo) >= 0) { + while (snd_seq_query_next_client(seq, cinfo) >= 0) { snd_seq_port_info_set_client(pinfo, snd_seq_client_info_get_client(cinfo)); snd_seq_port_info_set_port(pinfo, -1); - while (snd_seq_query_next_port(midi_seq, pinfo) >= 0) { + while (snd_seq_query_next_port(seq, pinfo) >= 0) { unsigned int cap = snd_seq_port_info_get_capability(pinfo); unsigned int type = snd_seq_port_info_get_type(pinfo); if (type & SND_SEQ_PORT_TYPE_PORT) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index fae6ddf8615..535f3dbd348 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -55,12 +55,8 @@ static int MODM_NumDevs = 0; /* this is the total number of MIDI out devices found */ static int MIDM_NumDevs = 0; -static snd_seq_t* midiSeq = NULL; -static int numOpenMidiSeq = 0; static int numStartedMidiIn = 0; -static int port_in; - static CRITICAL_SECTION crit_sect; /* protects all MidiIn buffer queues */ static CRITICAL_SECTION_DEBUG critsect_debug = { @@ -152,40 +148,18 @@ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, DriverCallback(dwCallBack, uFlags, hDev, wMsg, dwInstance, dwParam1, dwParam2); } -static BOOL midi_warn = TRUE; /************************************************************************** * midiOpenSeq [internal] */ static snd_seq_t *midiOpenSeq(int *port_in_ret) { - seq_lock(); - if (numOpenMidiSeq == 0) { - if (snd_seq_open(&midiSeq, "default", SND_SEQ_OPEN_DUPLEX, 0) < 0) - { - if (midi_warn) - { - WARN("Error opening ALSA sequencer.\n"); - } - midi_warn = FALSE; - seq_unlock(); - return NULL; - } + struct midi_seq_open_params params; - /* Setting the client name is the only init to do */ - snd_seq_set_client_name(midiSeq, "WINE midi driver"); + params.port_in = port_in_ret; + params.close = 0; + ALSA_CALL(midi_seq_open, &params); - port_in = snd_seq_create_simple_port(midiSeq, "WINE ALSA Input", - SND_SEQ_PORT_CAP_WRITE|SND_SEQ_PORT_CAP_SUBS_READ|SND_SEQ_PORT_CAP_SUBS_WRITE, - SND_SEQ_PORT_TYPE_MIDI_GENERIC|SND_SEQ_PORT_TYPE_APPLICATION); - if (port_in < 0) - TRACE("Unable to create input port\n"); - else - TRACE("Input port %d created successfully\n", port_in); - } - numOpenMidiSeq++; - seq_unlock(); - if (port_in_ret) *port_in_ret = port_in; - return midiSeq; + return params.seq; } /************************************************************************** @@ -193,13 +167,12 @@ static snd_seq_t *midiOpenSeq(int *port_in_ret) */ static int midiCloseSeq(void) { - seq_lock(); - if (--numOpenMidiSeq == 0) { - snd_seq_delete_simple_port(midiSeq, port_in); - snd_seq_close(midiSeq); - midiSeq = NULL; - } - seq_unlock(); + struct midi_seq_open_params params; + + params.port_in = NULL; + params.close = 1; + ALSA_CALL(midi_seq_open, &params); + return 0; } diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index e0ae16b97d9..d69ab980f42 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -241,6 +241,13 @@ struct midi_init_params void *dests, *srcs; }; +struct midi_seq_open_params +{ + int close; + snd_seq_t *seq; + int *port_in; +}; + enum alsa_funcs { alsa_get_endpoint_ids, @@ -269,11 +276,13 @@ enum alsa_funcs alsa_midi_init, alsa_midi_seq_lock, /* temporary */ + alsa_midi_seq_open, }; NTSTATUS midi_init(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_seq_lock(void *args) DECLSPEC_HIDDEN; +NTSTATUS midi_seq_open(void *args) DECLSPEC_HIDDEN; extern unixlib_handle_t alsa_handle;

1 0

Huw Davies : winealsa: Store the snd_seq handle and the input port in the device data.
by Alexandre Julliard March 16, 2022

March 16, 2022

Module: wine Branch: master Commit: 8656ec92dff916487c91ab09ebb9666c50357e89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8656ec92dff916487c91ab09… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 15 16:19:00 2022 +0000 winealsa: Store the snd_seq handle and the input port in the device data. This is to avoid accessing more global variables and generally makes things a bit cleaner. 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 | 85 ++++++++++++++++++++++++--------------------- dlls/winealsa.drv/unixlib.h | 3 ++ 2 files changed, 49 insertions(+), 39 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8656ec92dff916487c91…

1 0

Huw Davies : winealsa: Move midi_init to unixlib.
by Alexandre Julliard March 16, 2022

March 16, 2022

Module: wine Branch: master Commit: a2eb8b31b0b91b5b8c799413a4faef71b05657f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2eb8b31b0b91b5b8c799413… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 15 16:18:59 2022 +0000 winealsa: Move midi_init to 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/alsa.c | 1 + dlls/winealsa.drv/alsamidi.c | 265 +++++++++++++++++++++++++++++++++++++++++++ dlls/winealsa.drv/midi.c | 250 +++------------------------------------- dlls/winealsa.drv/unixlib.h | 34 ++++++ 4 files changed, 314 insertions(+), 236 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a2eb8b31b0b91b5b8c79…

1 0

Paul Gofman : winhttp: Use default thread pool.
by Alexandre Julliard March 16, 2022

March 16, 2022

Module: wine Branch: master Commit: 482a8b7de70a24a961ec87f5cfc97bef1e90c5b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=482a8b7de70a24a961ec87f5… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Mar 15 19:07:25 2022 +0300 winhttp: Use default thread pool. 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/request.c | 86 ++++++++++++++++++++++++++++-------------- dlls/winhttp/session.c | 1 + dlls/winhttp/winhttp_private.h | 7 +++- 3 files changed, 64 insertions(+), 30 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index a825ac71d33..fe703c19109 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -122,54 +122,82 @@ static const WCHAR *attribute_table[] = NULL /* WINHTTP_QUERY_PASSPORT_CONFIG = 78 */ }; -static DWORD start_queue( struct queue *queue ) +void init_queue( struct queue *queue ) { - if (queue->pool) return ERROR_SUCCESS; - - if (!(queue->pool = CreateThreadpool( NULL ))) return GetLastError(); - SetThreadpoolThreadMinimum( queue->pool, 1 ); - SetThreadpoolThreadMaximum( queue->pool, 1 ); - - memset( &queue->env, 0, sizeof(queue->env) ); - queue->env.Version = 1; - queue->env.Pool = queue->pool; - - TRACE("started %p\n", queue); - return ERROR_SUCCESS; + InitializeSRWLock( &queue->lock ); + list_init( &queue->queued_tasks ); + queue->callback_running = FALSE; } void stop_queue( struct queue *queue ) { - if (!queue->pool) return; - CloseThreadpool( queue->pool ); - queue->pool = NULL; + assert( list_empty( &queue->queued_tasks )); TRACE("stopped %p\n", queue); } -static void CALLBACK task_callback( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work ) +static struct task_header *get_next_task( struct queue *queue ) { - struct task_header *task_hdr = ctx; + struct list *entry; - task_hdr->callback( task_hdr ); - release_object( task_hdr->obj ); - free( task_hdr ); + AcquireSRWLockExclusive( &queue->lock ); + assert( queue->callback_running ); + if ((entry = list_head( &queue->queued_tasks ))) + list_remove( entry ); + else + queue->callback_running = FALSE; + ReleaseSRWLockExclusive( &queue->lock ); + if (!entry) return NULL; + return LIST_ENTRY( entry, struct task_header, entry ); +} + +static void CALLBACK task_callback( TP_CALLBACK_INSTANCE *instance, void *ctx ) +{ + struct task_header *task, *next_task; + struct queue *queue = ctx; + + TRACE( "instance %p.\n", instance ); + + task = get_next_task( queue ); + while (task) + { + task->callback( task ); + /* Queue object may be freed by release_object() unless there is another task referencing it. */ + next_task = get_next_task( queue ); + release_object( task->obj ); + free( task ); + task = next_task; + } + TRACE( "instance %p exiting.\n", instance ); } static DWORD queue_task( struct queue *queue, TASK_CALLBACK task, struct task_header *task_hdr, struct object_header *obj ) { - TP_WORK *work; - DWORD ret; - - if ((ret = start_queue( queue ))) return ret; + BOOL callback_running; - if (!(work = CreateThreadpoolWork( task_callback, task_hdr, &queue->env ))) return GetLastError(); TRACE("queueing %p in %p\n", task_hdr, queue); task_hdr->callback = task; task_hdr->obj = obj; addref_object( obj ); - SubmitThreadpoolWork( work ); - CloseThreadpoolWork( work ); + + AcquireSRWLockExclusive( &queue->lock ); + list_add_tail( &queue->queued_tasks, &task_hdr->entry ); + if (!(callback_running = queue->callback_running)) + { + if ((queue->callback_running = TrySubmitThreadpoolCallback( task_callback, queue, NULL ))) + callback_running = TRUE; + else + list_remove( &task_hdr->entry ); + } + ReleaseSRWLockExclusive( &queue->lock ); + + if (!callback_running) + { + release_object( obj ); + free( task_hdr ); + ERR( "Submiting threadpool callback failed, err %lu.\n", GetLastError() ); + return ERROR_OUTOFMEMORY; + } return ERROR_SUCCESS; } @@ -3096,6 +3124,8 @@ HINTERNET WINAPI WinHttpWebSocketCompleteUpgrade( HINTERNET hrequest, DWORD_PTR socket->hdr.notify_mask = request->hdr.notify_mask; socket->hdr.context = context; InitializeSRWLock( &socket->send_lock ); + init_queue( &socket->send_q ); + init_queue( &socket->recv_q ); addref_object( &request->hdr ); socket->request = request; diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 7c55adb8475..3b00d2448d1 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1160,6 +1160,7 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, const WCHAR *verb, cons request->hdr.notify_mask = connect->hdr.notify_mask; request->hdr.context = connect->hdr.context; request->hdr.redirect_policy = connect->hdr.redirect_policy; + init_queue( &request->queue ); addref_object( &connect->hdr ); request->connect = connect; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 35f3e64b5a3..4754d9258d1 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -159,8 +159,9 @@ struct authinfo struct queue { - TP_POOL *pool; - TP_CALLBACK_ENVIRON env; + SRWLOCK lock; + struct list queued_tasks; + BOOL callback_running; }; enum request_flags @@ -277,6 +278,7 @@ typedef void (*TASK_CALLBACK)( void *ctx ); struct task_header { + struct list entry; TASK_CALLBACK callback; struct object_header *obj; }; @@ -355,6 +357,7 @@ BOOL free_handle( HINTERNET ) DECLSPEC_HIDDEN; void send_callback( struct object_header *, DWORD, LPVOID, DWORD ) DECLSPEC_HIDDEN; void close_connection( struct request * ) DECLSPEC_HIDDEN; +void init_queue( struct queue *queue ) DECLSPEC_HIDDEN; void stop_queue( struct queue * ) DECLSPEC_HIDDEN; void netconn_close( struct netconn * ) DECLSPEC_HIDDEN;

1 0

Paul Gofman : winhttp: Manage task cleanup in task_callback() and queue_task().
by Alexandre Julliard March 16, 2022

March 16, 2022

Module: wine Branch: master Commit: 88334e1c1875477c623754819ab0c47f11ddd1d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88334e1c1875477c62375481… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Mar 15 19:07:24 2022 +0300 winhttp: Manage task cleanup in task_callback() and queue_task(). 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/request.c | 164 ++++++++++++++--------------------------- dlls/winhttp/winhttp_private.h | 9 +-- 2 files changed, 55 insertions(+), 118 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=88334e1c1875477c6237…

1 0

Paul Gofman : winhttp: Use a single thread pool wrapper callback for async tasks.
by Alexandre Julliard March 16, 2022

March 16, 2022

Module: wine Branch: master Commit: d8a358033f69c148a153694c589adb3f8a239695 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8a358033f69c148a153694c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Mar 15 19:07:23 2022 +0300 winhttp: Use a single thread pool wrapper callback for async tasks. 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/request.c | 74 +++++++++++++++++++++++------------------- dlls/winhttp/winhttp_private.h | 15 +++++++++ 2 files changed, 56 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d8a358033f69c148a153…

1 0