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

Huw Davies : winealsa: Move get_prop_value to the unixlib.
by Alexandre Julliard March 14, 2022

March 14, 2022

Module: wine Branch: master Commit: c6bfab87390f4f41536d8e5619adbcc4e0fd289c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6bfab87390f4f41536d8e56… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 14 10:21:46 2022 +0000 winealsa: Move get_prop_value 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 | 181 ++++++++++++++++++++++++++++++++++++++++++- dlls/winealsa.drv/mmdevdrv.c | 177 +++++------------------------------------- dlls/winealsa.drv/unixlib.h | 13 ++++ 3 files changed, 213 insertions(+), 158 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c6bfab87390f4f41536d…

1 0

Bernhard Kölbl : windows.media.speech: Add SpeechRecognitionListConstraint stub.
by Alexandre Julliard March 14, 2022

March 14, 2022

Module: wine Branch: master Commit: ab9fa4c6797bb1c3ba78a373ef51fe73cef63a3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab9fa4c6797bb1c3ba78a373… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Mon Mar 14 11:06:37 2022 +0100 windows.media.speech: Add SpeechRecognitionListConstraint stub. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/listconstraint.c | 202 ++++++++++++++++++++++++++++- dlls/windows.media.speech/tests/speech.c | 29 +++-- 2 files changed, 215 insertions(+), 16 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ab9fa4c6797bb1c3ba78…

1 0

Paul Gofman : winhttp: Fix filling TIMEVAL in netconn_create().
by Alexandre Julliard March 14, 2022

March 14, 2022

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

Huw Davies : winealsa: Remove several unused members.
by Alexandre Julliard March 14, 2022

March 14, 2022

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

Eric Pouech : ntdll/tests: Use correct integral type.
by Alexandre Julliard March 14, 2022

March 14, 2022

Module: wine Branch: master Commit: f74474072a5e4123ebfb78469623263adfa61580 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f74474072a5e4123ebfb7846… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 12 09:37:40 2022 +0100 ntdll/tests: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index a99b1e46b06..442aadfd784 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -2425,7 +2425,8 @@ static void test_restore_context(void) EXCEPTION_RECORD rec; _JUMP_BUFFER buf; CONTEXT ctx; - int i, pass; + int i; + LONG pass; if (!pRtlUnwindEx || !pRtlRestoreContext || !pRtlCaptureContext || !p_setjmp) { @@ -4900,7 +4901,7 @@ static void CALLBACK test_unwind_apc(ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR a static void test_unwind_from_apc(void) { NTSTATUS status; - int pass; + LONG pass; if (!pNtQueueApcThread) { @@ -8648,7 +8649,7 @@ static void test_user_apc(void) { NTSTATUS status; CONTEXT context; - int pass; + LONG pass; if (!pNtQueueApcThread) { @@ -8818,7 +8819,7 @@ static void suspend_process_proc(void) { HANDLE event = OpenEventA(SYNCHRONIZE, FALSE, suspend_process_event_name); HANDLE event2 = OpenEventA(SYNCHRONIZE | EVENT_MODIFY_STATE, FALSE, suspend_process_event2_name); - unsigned int count; + DWORD count; NTSTATUS status; HANDLE thread;

1 0

Huw Davies : winealsa: Remove a workaround for versions of alsa-lib before 1.0.12.
by Alexandre Julliard March 14, 2022

March 14, 2022

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

Bernhard Kölbl : include/windows.media.speechrecognition.idl: Add SpeechRecognitionListConstraint class.
by Alexandre Julliard March 14, 2022

March 14, 2022

Module: wine Branch: master Commit: 0e06ae50a74a9ee9f1a94088c8a1cad6d3901830 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e06ae50a74a9ee9f1a94088… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Mon Mar 14 11:06:34 2022 +0100 include/windows.media.speechrecognition.idl: Add SpeechRecognitionListConstraint class. And its dependencies. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.media.speechrecognition.idl | 43 +++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/include/windows.media.speechrecognition.idl b/include/windows.media.speechrecognition.idl index d83547a9a02..79107aab1bf 100644 --- a/include/windows.media.speechrecognition.idl +++ b/include/windows.media.speechrecognition.idl @@ -46,6 +46,8 @@ namespace Windows { interface ISpeechRecognitionConstraint; interface ISpeechRecognitionHypothesis; interface ISpeechRecognitionHypothesisGeneratedEventArgs; + interface ISpeechRecognitionListConstraint; + interface ISpeechRecognitionListConstraintFactory; interface ISpeechRecognitionQualityDegradingEventArgs; interface ISpeechRecognitionResult; interface ISpeechRecognitionResult2; @@ -64,6 +66,7 @@ namespace Windows { runtimeclass SpeechRecognitionCompilationResult; runtimeclass SpeechRecognitionHypothesis; runtimeclass SpeechRecognitionHypothesisGeneratedEventArgs; + runtimeclass SpeechRecognitionListConstraint; runtimeclass SpeechRecognitionQualityDegradingEventArgs; runtimeclass SpeechRecognitionResult; runtimeclass SpeechRecognitionSemanticInterpretation; @@ -273,6 +276,35 @@ namespace Windows { [propget] HRESULT Hypothesis([out, retval] Windows.Media.SpeechRecognition.SpeechRecognitionHypothesis **value); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.SpeechRecognition.SpeechRecognitionListConstraint), + uuid(09c487e9-e4ad-4526-81f2-4946fb481d98) + ] + interface ISpeechRecognitionListConstraint : IInspectable + requires + Windows.Media.SpeechRecognition.ISpeechRecognitionConstraint + { + [propget] HRESULT Commands([out, retval] Windows.Foundation.Collections.IVector<HSTRING> **value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.SpeechRecognition.SpeechRecognitionListConstraint), + uuid(40f3cdc7-562a-426a-9f3b-3b4e282be1d5) + ] + interface ISpeechRecognitionListConstraintFactory : IInspectable + { + HRESULT Create( + [in] Windows.Foundation.Collections.IIterable<HSTRING> *commands, + [out, retval] Windows.Media.SpeechRecognition.SpeechRecognitionListConstraint **listconstraint); + + HRESULT CreateWithTag( + [in] Windows.Foundation.Collections.IIterable<HSTRING> *commands, + [in] HSTRING tag, + [out, retval] Windows.Media.SpeechRecognition.SpeechRecognitionListConstraint **listconstraint); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.Media.SpeechRecognition.SpeechRecognitionQualityDegradingEventArgs), @@ -498,6 +530,17 @@ namespace Windows { [default] interface Windows.Media.SpeechRecognition.ISpeechRecognitionHypothesisGeneratedEventArgs; } + [ + activatable(Windows.Media.SpeechRecognition.ISpeechRecognitionListConstraintFactory, Windows.Foundation.UniversalApiContract, 1.0), + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile) + ] + runtimeclass SpeechRecognitionListConstraint + { + [default] interface Windows.Media.SpeechRecognition.ISpeechRecognitionListConstraint; + interface Windows.Media.SpeechRecognition.ISpeechRecognitionConstraint; + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(agile)

1 0

Gijs Vermeulen : advapi32: Add GetThreadWaitChain stub.
by Alexandre Julliard March 14, 2022

March 14, 2022

Module: wine Branch: master Commit: d867196553ed3c8088bc2fa0cb2c9dd48ae7f7e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d867196553ed3c8088bc2fa0… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sun Mar 13 00:27:59 2022 +0100 advapi32: Add GetThreadWaitChain stub. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi.c | 9 +++++++++ dlls/advapi32/advapi32.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/advapi.c b/dlls/advapi32/advapi.c index 0145b2d843d..cbd4612425d 100644 --- a/dlls/advapi32/advapi.c +++ b/dlls/advapi32/advapi.c @@ -304,3 +304,12 @@ HWCT WINAPI OpenThreadWaitChainSession(DWORD flags, PWAITCHAINCALLBACK callback) SetLastError(ERROR_NOT_SUPPORTED); return NULL; } + +BOOL WINAPI GetThreadWaitChain(HWCT handle, DWORD_PTR ctx, DWORD flags, DWORD thread_id, DWORD *node_count, + WAITCHAIN_NODE_INFO *node_info_arr, BOOL *is_cycle) +{ + FIXME( "handle %p, ctx %Ix, flags %ld, thread_id %ld, node_count %p, node_info_arr %p, is_cycle %p stub!\n", + handle, ctx, flags, thread_id, node_count, node_info_arr, is_cycle ); + SetLastError(ERROR_NOT_SUPPORTED); + return FALSE; +} diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index f17e1f2645e..3b5f587d40e 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -370,7 +370,7 @@ @ stdcall -import GetSidSubAuthorityCount(ptr) @ stub GetSiteSidFromToken # @ stub GetStringConditionFromBinary -# @ stub GetThreadWaitChain +@ stdcall GetThreadWaitChain(ptr ptr long long ptr ptr ptr) @ stdcall -import GetTokenInformation(long long ptr long ptr) @ stdcall GetTraceEnableFlags(int64) ntdll.EtwGetTraceEnableFlags @ stdcall GetTraceEnableLevel(int64) ntdll.EtwGetTraceEnableLevel

1 0

Gijs Vermeulen : setupapi: Add SetupDiGetClassRegistryPropertyW stub.
by Alexandre Julliard March 14, 2022

March 14, 2022

Module: wine Branch: master Commit: b8a4b9f93b1e9c12a5b543d3ebd62080c2f3a692 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8a4b9f93b1e9c12a5b543d3… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sat Mar 12 22:48:44 2022 +0100 setupapi: Add SetupDiGetClassRegistryPropertyW stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52520 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/setupapi.spec | 1 + dlls/setupapi/stubs.c | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 1b3f5cc6bd8..06d423373b8 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -336,6 +336,7 @@ @ stub SetupDiGetClassImageListExW @ stub SetupDiGetClassInstallParamsA @ stub SetupDiGetClassInstallParamsW +@ stdcall SetupDiGetClassRegistryPropertyW(ptr long ptr ptr long ptr wstr ptr) @ stub SetupDiGetDeviceInfoListClass @ stdcall SetupDiGetDeviceInfoListDetailA(ptr ptr) @ stdcall SetupDiGetDeviceInfoListDetailW(ptr ptr) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index af058b8eac8..4b1585c8df6 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -667,3 +667,12 @@ CONFIGRET WINAPI CM_Request_Device_EjectW(DEVINST dev, PPNP_VETO_TYPE type, LPWS FIXME("(0x%08lx, %p, %p, %lu, 0x%08lx) stub\n", dev, type, name, length, flags); return CR_SUCCESS; } + +BOOL WINAPI SetupDiGetClassRegistryPropertyW(const GUID *class, DWORD prop, DWORD *datatype, BYTE *buff, DWORD size, + DWORD *req_size, const WCHAR *name, VOID *reserved) +{ + FIXME("class %s, prop %ld, datatype %p, buff %p, size %ld, req_size %p, name %s, reserved %p stub!\n", + debugstr_guid(class), prop, datatype, buff, size, req_size, debugstr_w(name), reserved); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +}

1 0

Eric Pouech : oleaut32/tests: Ensure (re)definition of EXPECTRES for all integer types.
by Alexandre Julliard March 14, 2022

March 14, 2022

Module: wine Branch: master Commit: 3f7ef33e5b926f5a98167a6132e3fd64775ead5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f7ef33e5b926f5a98167a61… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 12 09:36:44 2022 +0100 oleaut32/tests: Ensure (re)definition of EXPECTRES for all integer types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartype.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 46897085d05..c368c5129bb 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -648,6 +648,8 @@ static void test_VarI1ChangeTypeEx(void) #undef CONV_TYPE #define CONV_TYPE BYTE +#undef EXPECTRES +#define EXPECTRES(res, x) _EXPECTRES(res, x, "%u") static void test_VarUI1FromI1(void) { @@ -942,6 +944,8 @@ static void test_VarUI1ChangeTypeEx(void) #undef CONV_TYPE #define CONV_TYPE SHORT +#undef EXPECTRES +#define EXPECTRES(res, x) _EXPECTRES(res, x, "%d") static void test_VarI2FromI1(void) { @@ -1178,6 +1182,8 @@ static void test_VarI2ChangeTypeEx(void) #undef CONV_TYPE #define CONV_TYPE USHORT +#undef EXPECTRES +#define EXPECTRES(res, x) _EXPECTRES(res, x, "%u") static void test_VarUI2FromI1(void) { @@ -1411,6 +1417,8 @@ static void test_VarUI2ChangeTypeEx(void) #undef CONV_TYPE #define CONV_TYPE LONG +#undef EXPECTRES +#define EXPECTRES(res, x) _EXPECTRES(res, x, "%d") static void test_VarI4FromI1(void) {

1 0