May 2023 - Wine-commits - list.winehq.org

Anton Baskanov : dsound: Limit the Doppler shift to +-0.5 speed of sound.
by Alexandre Julliard 24 May '23

24 May '23

Module: wine Branch: master Commit: 315e998951b2e4aca7c56cbb4c2f988bf508b481 URL: https://gitlab.winehq.org/wine/wine/-/commit/315e998951b2e4aca7c56cbb4c2f98… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Mon Apr 24 09:19:43 2023 +0700 dsound: Limit the Doppler shift to +-0.5 speed of sound. --- dlls/dsound/sound3d.c | 5 +++-- dlls/dsound/tests/ds3d.c | 2 -- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index 7cccef6cfe4..9a975324607 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -168,7 +168,7 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) float a, ingain; /* doppler shift related stuff */ D3DVECTOR vRelativeVel; - D3DVALUE flFreq, flRelativeVel; + D3DVALUE flFreq, flRelativeVel, flLimitedVel; TRACE("(%p)\n",dsb); @@ -307,8 +307,9 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) NOTE: if buffer moves TOWARDS the listener, its velocity component is NEGATIVE if buffer moves AWAY from listener, its velocity component is POSITIVE */ flRelativeVel = ProjectVector(&vRelativeVel, &vDistance); + flLimitedVel = max(-DEFAULT_VELOCITY/2, min(DEFAULT_VELOCITY/2, flRelativeVel)); /* formula taken from Gianicoli D.: Physics, 4th edition: */ - flFreq = dsb->ds3db_freq * (DEFAULT_VELOCITY/(DEFAULT_VELOCITY + flRelativeVel)); + flFreq = dsb->ds3db_freq * (DEFAULT_VELOCITY/(DEFAULT_VELOCITY + flLimitedVel)); TRACE("doppler: Relative velocity (component) = %f => Doppler shift: %ld Hz -> %f Hz\n", flRelativeVel, dsb->ds3db_freq, flFreq); dsb->freq = flFreq; diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index 99a1f16cf8e..e7e1ab7ab81 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -1446,9 +1446,7 @@ static void test_doppler(GUID *guid, BOOL play) check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, -90, 1, 0, 22050, 17640); /* The Doppler shift is limited to +-0.5 speed of sound. */ - /* Wine TODO: The frequency is not limited. */ check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 1, -240, 22050, 44100); - /* Wine TODO: The frequency is not limited. */ check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 1, 240, 22050, 14700); IDirectSound3DListener_Release(listener);

1 0

Anton Baskanov : dsound/tests: Test that the shifted frequency is limited to DSBFREQUENCY_MAX.
by Alexandre Julliard 24 May '23

24 May '23

Module: wine Branch: master Commit: 3d5f2f879649d706bc17f6f6aea2723dba02602b URL: https://gitlab.winehq.org/wine/wine/-/commit/3d5f2f879649d706bc17f6f6aea272… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Mon Apr 24 09:31:33 2023 +0700 dsound/tests: Test that the shifted frequency is limited to DSBFREQUENCY_MAX. --- dlls/dsound/tests/ds3d.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index e7e1ab7ab81..77d3f09ec13 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -1449,6 +1449,10 @@ static void test_doppler(GUID *guid, BOOL play) check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 1, -240, 22050, 44100); check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 1, 240, 22050, 14700); + /* The shifted frequency is limited to DSBFREQUENCY_MAX. */ + /* Wine TODO: The frequency is not limited. */ + check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 1, -90, 176400, 200000); + IDirectSound3DListener_Release(listener); ref = IDirectSoundBuffer_Release(primary); ok(!ref, "Got outstanding refcount %ld.\n", ref);

1 0

Anton Baskanov : dsound: Clamp the shifted frequency to [DSBFREQUENCY_MIN, DSBFREQUENCY_MAX].
by Alexandre Julliard 24 May '23

24 May '23

Module: wine Branch: master Commit: b923aea7343a384cf03dd47b086138aecfd770b1 URL: https://gitlab.winehq.org/wine/wine/-/commit/b923aea7343a384cf03dd47b086138… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Mon Apr 24 10:20:30 2023 +0700 dsound: Clamp the shifted frequency to [DSBFREQUENCY_MIN, DSBFREQUENCY_MAX]. --- dlls/dsound/sound3d.c | 2 +- dlls/dsound/tests/ds3d.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index 9a975324607..c22a3d5509f 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -312,7 +312,7 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) flFreq = dsb->ds3db_freq * (DEFAULT_VELOCITY/(DEFAULT_VELOCITY + flLimitedVel)); TRACE("doppler: Relative velocity (component) = %f => Doppler shift: %ld Hz -> %f Hz\n", flRelativeVel, dsb->ds3db_freq, flFreq); - dsb->freq = flFreq; + dsb->freq = max(DSBFREQUENCY_MIN, min(DSBFREQUENCY_MAX, (DWORD)flFreq)); } DSOUND_RecalcFormat(dsb); diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index 77d3f09ec13..9c149dbcd9b 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -1450,7 +1450,6 @@ static void test_doppler(GUID *guid, BOOL play) check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 1, 240, 22050, 14700); /* The shifted frequency is limited to DSBFREQUENCY_MAX. */ - /* Wine TODO: The frequency is not limited. */ check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 1, -90, 176400, 200000); IDirectSound3DListener_Release(listener);

1 0

Davide Beatrici : winealsa: Move stream mode and period/duration initialization logic into unixlib.
by Alexandre Julliard 24 May '23

24 May '23

Module: wine Branch: master Commit: b08d7efa5e8e62f995b2e65fc18d139b7d8a9d57 URL: https://gitlab.winehq.org/wine/wine/-/commit/b08d7efa5e8e62f995b2e65fc18d13… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Wed May 24 11:29:54 2023 +0200 winealsa: Move stream mode and period/duration initialization logic into unixlib. --- dlls/winealsa.drv/alsa.c | 35 ++++++++++++++++++++++++++++++++++- dlls/winealsa.drv/mmdevdrv.c | 31 ------------------------------- 2 files changed, 34 insertions(+), 32 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 2ac126f411d..dbf85a7947e 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -85,6 +85,7 @@ struct alsa_stream #define EXTRA_SAFE_RT 40000 static const REFERENCE_TIME def_period = 100000; +static const REFERENCE_TIME min_period = 50000; static const WCHAR drv_keyW[] = {'S','o','f','t','w','a','r','e','\\', 'W','i','n','e','\\','D','r','i','v','e','r','s','\\', @@ -789,10 +790,42 @@ static NTSTATUS alsa_create_stream(void *args) snd_pcm_sw_params_t *sw_params = NULL; snd_pcm_format_t format; unsigned int rate, alsa_period_us, i; - WAVEFORMATEXTENSIBLE *fmtex; + WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE *)params->fmt; int err; SIZE_T size; + params->result = S_OK; + + if (params->share == AUDCLNT_SHAREMODE_SHARED) { + params->period = def_period; + if (params->duration < 3 * params->period) + params->duration = 3 * params->period; + } else { + if (fmtex->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE && + (fmtex->dwChannelMask == 0 || fmtex->dwChannelMask & SPEAKER_RESERVED)) + params->result = AUDCLNT_E_UNSUPPORTED_FORMAT; + else { + if (!params->period) + params->period = def_period; + if (params->period < min_period || params->period > 5000000) + params->result = AUDCLNT_E_INVALID_DEVICE_PERIOD; + else if (params->duration > 20000000) /* The smaller the period, the lower this limit. */ + params->result = AUDCLNT_E_BUFFER_SIZE_ERROR; + else if (params->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK) { + if (params->duration != params->period) + params->result = AUDCLNT_E_BUFDURATION_PERIOD_NOT_EQUAL; + + FIXME("EXCLUSIVE mode with EVENTCALLBACK\n"); + + params->result = AUDCLNT_E_DEVICE_IN_USE; + } else if (params->duration < 8 * params->period) + params->duration = 8 * params->period; /* May grow above 2s. */ + } + } + + if (FAILED(params->result)) + return STATUS_SUCCESS; + stream = calloc(1, sizeof(*stream)); if(!stream){ params->result = E_OUTOFMEMORY; diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 0126b1357a2..57a0ed06733 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -53,9 +53,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(alsa); #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) -static const REFERENCE_TIME DefaultPeriod = 100000; -static const REFERENCE_TIME MinimumPeriod = 50000; - static CRITICAL_SECTION g_sessions_lock; static CRITICAL_SECTION_DEBUG g_sessions_lock_debug = { @@ -607,34 +604,6 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, return E_INVALIDARG; } - if(mode == AUDCLNT_SHAREMODE_SHARED){ - period = DefaultPeriod; - if( duration < 3 * period) - duration = 3 * period; - }else{ - if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ - if(((WAVEFORMATEXTENSIBLE*)fmt)->dwChannelMask == 0 || - ((WAVEFORMATEXTENSIBLE*)fmt)->dwChannelMask & SPEAKER_RESERVED) - return AUDCLNT_E_UNSUPPORTED_FORMAT; - } - - if(!period) - period = DefaultPeriod; /* not minimum */ - if(period < MinimumPeriod || period > 5000000) - return AUDCLNT_E_INVALID_DEVICE_PERIOD; - if(duration > 20000000) /* the smaller the period, the lower this limit */ - return AUDCLNT_E_BUFFER_SIZE_ERROR; - if(flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK){ - if(duration != period) - return AUDCLNT_E_BUFDURATION_PERIOD_NOT_EQUAL; - FIXME("EXCLUSIVE mode with EVENTCALLBACK\n"); - return AUDCLNT_E_DEVICE_IN_USE; - }else{ - if( duration < 8 * period) - duration = 8 * period; /* may grow above 2s */ - } - } - sessions_lock(); if(This->stream){

1 0

Davide Beatrici : winecoreaudio: Move stream mode and period/duration initialization logic into unixlib.
by Alexandre Julliard 24 May '23

24 May '23

Module: wine Branch: master Commit: 396acb0ec3b2aa1707ca7f0e3bdfd1bd090be444 URL: https://gitlab.winehq.org/wine/wine/-/commit/396acb0ec3b2aa1707ca7f0e3bdfd1… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Wed May 24 11:31:51 2023 +0200 winecoreaudio: Move stream mode and period/duration initialization logic into unixlib. --- dlls/winecoreaudio.drv/coreaudio.c | 37 +++++++++++++++++++++++++++++++++++-- dlls/winecoreaudio.drv/mmdevdrv.c | 31 ------------------------------- 2 files changed, 35 insertions(+), 33 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 89265558a1d..d031b82583e 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -649,12 +649,45 @@ static AudioDeviceID dev_id_from_device(const char *device) static NTSTATUS unix_create_stream(void *args) { struct create_stream_params *params = args; - struct coreaudio_stream *stream = calloc(1, sizeof(*stream)); + struct coreaudio_stream *stream; AURenderCallbackStruct input; OSStatus sc; SIZE_T size; - if(!stream){ + params->result = S_OK; + + if (params->share == AUDCLNT_SHAREMODE_SHARED) { + params->period = def_period; + if (params->duration < 3 * params->period) + params->duration = 3 * params->period; + } else { + const WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE *)params->fmt; + if (fmtex->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE && + (fmtex->dwChannelMask == 0 || fmtex->dwChannelMask & SPEAKER_RESERVED)) + params->result = AUDCLNT_E_UNSUPPORTED_FORMAT; + else { + if (!params->period) + params->period = def_period; + if (params->period < min_period || params->period > 5000000) + params->result = AUDCLNT_E_INVALID_DEVICE_PERIOD; + else if (params->duration > 20000000) /* The smaller the period, the lower this limit. */ + params->result = AUDCLNT_E_BUFFER_SIZE_ERROR; + else if (params->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK) { + if (params->duration != params->period) + params->result = AUDCLNT_E_BUFDURATION_PERIOD_NOT_EQUAL; + + FIXME("EXCLUSIVE mode with EVENTCALLBACK\n"); + + params->result = AUDCLNT_E_DEVICE_IN_USE; + } else if (params->duration < 8 * params->period) + params->duration = 8 * params->period; /* May grow above 2s. */ + } + } + + if (FAILED(params->result)) + return STATUS_SUCCESS; + + if (!(stream = calloc(1, sizeof(*stream)))) { params->result = E_OUTOFMEMORY; return STATUS_SUCCESS; } diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index d8a2e9e5d21..0372e320680 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -48,9 +48,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(coreaudio); #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) -static const REFERENCE_TIME DefaultPeriod = 100000; -static const REFERENCE_TIME MinimumPeriod = 50000; - static const IAudioClient3Vtbl AudioClient3_Vtbl; extern const IAudioRenderClientVtbl AudioRenderClient_Vtbl; extern const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl; @@ -582,34 +579,6 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, return E_INVALIDARG; } - if(mode == AUDCLNT_SHAREMODE_SHARED){ - period = DefaultPeriod; - if( duration < 3 * period) - duration = 3 * period; - }else{ - if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ - if(((WAVEFORMATEXTENSIBLE*)fmt)->dwChannelMask == 0 || - ((WAVEFORMATEXTENSIBLE*)fmt)->dwChannelMask & SPEAKER_RESERVED) - return AUDCLNT_E_UNSUPPORTED_FORMAT; - } - - if(!period) - period = DefaultPeriod; /* not minimum */ - if(period < MinimumPeriod || period > 5000000) - return AUDCLNT_E_INVALID_DEVICE_PERIOD; - if(duration > 20000000) /* the smaller the period, the lower this limit */ - return AUDCLNT_E_BUFFER_SIZE_ERROR; - if(flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK){ - if(duration != period) - return AUDCLNT_E_BUFDURATION_PERIOD_NOT_EQUAL; - FIXME("EXCLUSIVE mode with EVENTCALLBACK\n"); - return AUDCLNT_E_DEVICE_IN_USE; - }else{ - if( duration < 8 * period) - duration = 8 * period; /* may grow above 2s */ - } - } - sessions_lock(); if(This->stream){

1 0

Davide Beatrici : wineoss: Move stream mode and period/duration initialization logic into unixlib.
by Alexandre Julliard 24 May '23

24 May '23

Module: wine Branch: master Commit: b87ee7d484079f5db78ebf692baed5cb5501b79f URL: https://gitlab.winehq.org/wine/wine/-/commit/b87ee7d484079f5db78ebf692baed5… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Wed May 24 11:33:57 2023 +0200 wineoss: Move stream mode and period/duration initialization logic into unixlib. --- dlls/wineoss.drv/mmdevdrv.c | 25 ------------------------- dlls/wineoss.drv/oss.c | 34 +++++++++++++++++++++++++++++++++- 2 files changed, 33 insertions(+), 26 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index c55176307f0..9537a2f92fc 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -50,9 +50,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(oss); #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) -static const REFERENCE_TIME DefaultPeriod = 100000; -static const REFERENCE_TIME MinimumPeriod = 50000; - typedef struct _OSSDevice { struct list entry; EDataFlow flow; @@ -581,28 +578,6 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, return E_INVALIDARG; } - if(mode == AUDCLNT_SHAREMODE_SHARED){ - period = DefaultPeriod; - if( duration < 3 * period) - duration = 3 * period; - }else{ - if(!period) - period = DefaultPeriod; /* not minimum */ - if(period < MinimumPeriod || period > 5000000) - return AUDCLNT_E_INVALID_DEVICE_PERIOD; - if(duration > 20000000) /* the smaller the period, the lower this limit */ - return AUDCLNT_E_BUFFER_SIZE_ERROR; - if(flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK){ - if(duration != period) - return AUDCLNT_E_BUFDURATION_PERIOD_NOT_EQUAL; - FIXME("EXCLUSIVE mode with EVENTCALLBACK\n"); - return AUDCLNT_E_DEVICE_IN_USE; - }else{ - if( duration < 8 * period) - duration = 8 * period; /* may grow above 2s */ - } - } - sessions_lock(); if(This->stream){ diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 585df97bc43..df03d3286d9 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -555,11 +555,43 @@ static ULONG_PTR zero_bits(void) static NTSTATUS oss_create_stream(void *args) { struct create_stream_params *params = args; - WAVEFORMATEXTENSIBLE *fmtex; + WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE *)params->fmt; struct oss_stream *stream; oss_audioinfo ai; SIZE_T size; + params->result = S_OK; + + if (params->share == AUDCLNT_SHAREMODE_SHARED) { + params->period = def_period; + if (params->duration < 3 * params->period) + params->duration = 3 * params->period; + } else { + if (fmtex->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE && + (fmtex->dwChannelMask == 0 || fmtex->dwChannelMask & SPEAKER_RESERVED)) + params->result = AUDCLNT_E_UNSUPPORTED_FORMAT; + else { + if (!params->period) + params->period = def_period; + if (params->period < min_period || params->period > 5000000) + params->result = AUDCLNT_E_INVALID_DEVICE_PERIOD; + else if (params->duration > 20000000) /* The smaller the period, the lower this limit. */ + params->result = AUDCLNT_E_BUFFER_SIZE_ERROR; + else if (params->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK) { + if (params->duration != params->period) + params->result = AUDCLNT_E_BUFDURATION_PERIOD_NOT_EQUAL; + + FIXME("EXCLUSIVE mode with EVENTCALLBACK\n"); + + params->result = AUDCLNT_E_DEVICE_IN_USE; + } else if (params->duration < 8 * params->period) + params->duration = 8 * params->period; /* May grow above 2s. */ + } + } + + if (FAILED(params->result)) + return STATUS_SUCCESS; + stream = calloc(1, sizeof(*stream)); if(!stream){ params->result = E_OUTOFMEMORY;

1 0

Paul Gofman : nsiproxy.sys: Detect PPP interface type from flags on Linux.
by Alexandre Julliard 24 May '23

24 May '23

Module: wine Branch: master Commit: 1ea5d470a21effb90b5a7442a47e7f714ce997dc URL: https://gitlab.winehq.org/wine/wine/-/commit/1ea5d470a21effb90b5a7442a47e7f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue May 23 19:52:45 2023 -0600 nsiproxy.sys: Detect PPP interface type from flags on Linux. VPN interfaces often have ARPHRD_NONE in ifr_hwaddr.sa_data but IFF_POINTOPOINT flag set. --- dlls/nsiproxy.sys/ndis.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index c34630d8aec..1fc66c3611b 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -170,6 +170,9 @@ static NTSTATUS if_get_physical( const char *name, UINT *type, IF_PHYSICAL_ADDRE break; } + if (*type == MIB_IF_TYPE_OTHER && !ioctl( fd, SIOCGIFFLAGS, &ifr ) && ifr.ifr_flags & IFF_POINTOPOINT) + *type = MIB_IF_TYPE_PPP; + err: close( fd ); return ret;

1 0

Alexandre Julliard : start: Implement the /machine option.
by Alexandre Julliard 24 May '23

24 May '23

Module: wine Branch: master Commit: 0b23d22bd6cc820468bac2eec1ac4e3d4564d2cb URL: https://gitlab.winehq.org/wine/wine/-/commit/0b23d22bd6cc820468bac2eec1ac4e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 24 09:14:50 2023 +0200 start: Implement the /machine option. --- po/ar.po | 13 +++++++------ po/ast.po | 13 +++++++------ po/bg.po | 13 +++++++------ po/ca.po | 45 +++++++++++++++++++++++++++++++++++++++------ po/cs.po | 13 +++++++------ po/da.po | 13 +++++++------ po/de.po | 45 +++++++++++++++++++++++++++++++++++++++------ po/el.po | 13 +++++++------ po/en.po | 20 +++++++++++--------- po/en_US.po | 20 +++++++++++--------- po/eo.po | 13 +++++++------ po/es.po | 13 +++++++------ po/fa.po | 13 +++++++------ po/fi.po | 45 +++++++++++++++++++++++++++++++++++++++------ po/fr.po | 45 +++++++++++++++++++++++++++++++++++++++------ po/he.po | 13 +++++++------ po/hi.po | 13 +++++++------ po/hr.po | 13 +++++++------ po/hu.po | 13 +++++++------ po/it.po | 13 +++++++------ po/ja.po | 45 +++++++++++++++++++++++++++++++++++++++------ po/ko.po | 45 +++++++++++++++++++++++++++++++++++++++------ po/lt.po | 45 +++++++++++++++++++++++++++++++++++++++------ po/ml.po | 13 +++++++------ po/nb_NO.po | 13 +++++++------ po/nl.po | 45 +++++++++++++++++++++++++++++++++++++++------ po/or.po | 13 +++++++------ po/pa.po | 13 +++++++------ po/pl.po | 45 +++++++++++++++++++++++++++++++++++++++------ po/pt_BR.po | 45 +++++++++++++++++++++++++++++++++++++++------ po/pt_PT.po | 13 +++++++------ po/rm.po | 13 +++++++------ po/ro.po | 13 +++++++------ po/ru.po | 45 +++++++++++++++++++++++++++++++++++++++------ po/si.po | 13 +++++++------ po/sk.po | 13 +++++++------ po/sl.po | 13 +++++++------ po/sr_RS(a)cyrillic.po | 13 +++++++------ po/sr_RS(a)latin.po | 13 +++++++------ po/sv.po | 13 +++++++------ po/ta.po | 13 +++++++------ po/te.po | 13 +++++++------ po/th.po | 13 +++++++------ po/tr.po | 45 +++++++++++++++++++++++++++++++++++++++------ po/uk.po | 13 +++++++------ po/wa.po | 13 +++++++------ po/wine.pot | 13 +++++++------ po/zh_CN.po | 45 +++++++++++++++++++++++++++++++++++++++------ po/zh_TW.po | 45 +++++++++++++++++++++++++++++++++++++++------ programs/start/start.c | 47 +++++++++++++++++++++++++++++------------------ programs/start/start.rc | 7 +++---- 51 files changed, 831 insertions(+), 322 deletions(-)

1 0

Alexandre Julliard : ntdll: Don't even try to load .so libraries for a different machine.
by Alexandre Julliard 24 May '23

24 May '23

Module: wine Branch: master Commit: bce5a7910e4b3cf38a52a6f42e4c81f720f364e9 URL: https://gitlab.winehq.org/wine/wine/-/commit/bce5a7910e4b3cf38a52a6f42e4c81… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 24 14:48:02 2023 +0200 ntdll: Don't even try to load .so libraries for a different machine. We are not going to support multi-machine .so modules. --- dlls/ntdll/unix/loader.c | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 4f485655fe2..cc99b3f76be 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1418,14 +1418,12 @@ static NTSTATUS open_builtin_pe_file( const char *name, OBJECT_ATTRIBUTES *attr, * open_builtin_so_file */ static NTSTATUS open_builtin_so_file( const char *name, OBJECT_ATTRIBUTES *attr, void **module, - SECTION_IMAGE_INFORMATION *image_info, - WORD machine, BOOL prefer_native ) + SECTION_IMAGE_INFORMATION *image_info, BOOL prefer_native ) { NTSTATUS status; int fd; *module = NULL; - if (machine != current_machine) return STATUS_DLL_NOT_FOUND; if ((fd = open( name, O_RDONLY )) == -1) return STATUS_DLL_NOT_FOUND; if (check_library_arch( fd )) @@ -1461,6 +1459,7 @@ static NTSTATUS find_builtin_dll( UNICODE_STRING *nt_name, void **module, SIZE_T OBJECT_ATTRIBUTES attr; NTSTATUS status = STATUS_DLL_NOT_FOUND; BOOL found_image = FALSE; + BOOL try_so = (search_machine == current_machine && (!load_machine || load_machine == search_machine)); for (i = namepos = 0; i < len; i++) if (nt_name->Buffer[i] == '/' || nt_name->Buffer[i] == '\\') namepos = i + 1; @@ -1493,9 +1492,12 @@ static NTSTATUS find_builtin_dll( UNICODE_STRING *nt_name, void **module, SIZE_T limit, load_machine, prefer_native ); ptr = prepend_build_dir_path( file + pos, ".dll", "", "/dlls" ); if (status != STATUS_DLL_NOT_FOUND) goto done; - strcpy( file + pos + len + 1, ".so" ); - status = open_builtin_so_file( ptr, &attr, module, image_info, load_machine, prefer_native ); - if (status != STATUS_DLL_NOT_FOUND) goto done; + if (try_so) + { + strcpy( file + pos + len + 1, ".so" ); + status = open_builtin_so_file( ptr, &attr, module, image_info, prefer_native ); + if (status != STATUS_DLL_NOT_FOUND) goto done; + } /* now as a program */ file[pos + len + 1] = 0; @@ -1504,9 +1506,12 @@ static NTSTATUS find_builtin_dll( UNICODE_STRING *nt_name, void **module, SIZE_T limit, load_machine, prefer_native ); ptr = prepend_build_dir_path( file + pos, ".exe", "", "/programs" ); if (status != STATUS_DLL_NOT_FOUND) goto done; - strcpy( file + pos + len + 1, ".so" ); - status = open_builtin_so_file( ptr, &attr, module, image_info, load_machine, prefer_native ); - if (status != STATUS_DLL_NOT_FOUND) goto done; + if (try_so) + { + strcpy( file + pos + len + 1, ".so" ); + status = open_builtin_so_file( ptr, &attr, module, image_info, prefer_native ); + if (status != STATUS_DLL_NOT_FOUND) goto done; + } } for (i = 0; dll_paths[i]; i++) @@ -1522,9 +1527,12 @@ static NTSTATUS find_builtin_dll( UNICODE_STRING *nt_name, void **module, SIZE_T ptr = prepend( ptr, so_dir, strlen(so_dir) ); ptr = prepend( ptr, dll_paths[i], strlen(dll_paths[i]) ); if (status != STATUS_DLL_NOT_FOUND) goto done; - strcpy( file + pos + len + 1, ".so" ); - status = open_builtin_so_file( ptr, &attr, module, image_info, load_machine, prefer_native ); - if (status != STATUS_DLL_NOT_FOUND) goto done; + if (try_so) + { + strcpy( file + pos + len + 1, ".so" ); + status = open_builtin_so_file( ptr, &attr, module, image_info, prefer_native ); + if (status != STATUS_DLL_NOT_FOUND) goto done; + } file[pos + len + 1] = 0; ptr = prepend( file + pos, dll_paths[i], strlen(dll_paths[i]) ); status = open_builtin_pe_file( ptr, &attr, module, size_ptr, image_info, limit, @@ -1535,8 +1543,9 @@ static NTSTATUS find_builtin_dll( UNICODE_STRING *nt_name, void **module, SIZE_T continue; } if (status != STATUS_DLL_NOT_FOUND) goto done; + if (!try_so) continue; strcpy( file + pos + len + 1, ".so" ); - status = open_builtin_so_file( ptr, &attr, module, image_info, load_machine, prefer_native ); + status = open_builtin_so_file( ptr, &attr, module, image_info, prefer_native ); if (status == STATUS_NOT_SUPPORTED) found_image = TRUE; else if (status != STATUS_DLL_NOT_FOUND) goto done; } @@ -1896,7 +1905,7 @@ static void load_ntdll(void) if (status == STATUS_DLL_NOT_FOUND) { sprintf( name, "%s/ntdll.dll.so", ntdll_dir ); - status = open_builtin_so_file( name, &attr, &module, &info, current_machine, FALSE ); + status = open_builtin_so_file( name, &attr, &module, &info, FALSE ); } if (status == STATUS_IMAGE_NOT_AT_BASE) relocate_ntdll( module ); else if (status) fatal_error( "failed to load %s error %x\n", name, status );

1 0

Alexandre Julliard : ntdll: Support the PS_ATTRIBUTE_MACHINE_TYPE attribute for new processes.
by Alexandre Julliard 24 May '23

24 May '23

Module: wine Branch: master Commit: 4356fe0d830759a4bc194f21f3c8fc3a36ca2ca0 URL: https://gitlab.winehq.org/wine/wine/-/commit/4356fe0d830759a4bc194f21f3c8fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 24 09:10:38 2023 +0200 ntdll: Support the PS_ATTRIBUTE_MACHINE_TYPE attribute for new processes. --- dlls/ntdll/unix/env.c | 8 +++++--- dlls/ntdll/unix/loader.c | 13 +++++++------ dlls/ntdll/unix/process.c | 10 ++++++++-- dlls/ntdll/unix/unix_private.h | 4 ++-- include/wine/server_protocol.h | 5 +++-- server/process.c | 2 ++ server/protocol.def | 1 + server/request.h | 1 + server/trace.c | 1 + 9 files changed, 30 insertions(+), 15 deletions(-)

1 0