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

Zebediah Figura : xactengine: Use the xaudio2 channel.
by Alexandre Julliard May 26, 2023

May 26, 2023

Module: wine Branch: master Commit: 47ee70a84e4cb50d33e2ab754aabab5032090434 URL: https://gitlab.winehq.org/wine/wine/-/commit/47ee70a84e4cb50d33e2ab754aabab… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Apr 19 13:30:31 2023 -0500 xactengine: Use the xaudio2 channel. Unify this with the rest of xaudio. --- dlls/xactengine3_7/xact_dll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index f2737e0a9bd..b0f8ec13ac4 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -36,7 +36,7 @@ #include "wine/debug.h" #include "wine/rbtree.h" -WINE_DEFAULT_DEBUG_CHANNEL(xact3); +WINE_DEFAULT_DEBUG_CHANNEL(xaudio2); #if XACT3_VER < 0x0300 #define IID_IXACT3Engine IID_IXACTEngine

1 0

Anton Baskanov : dsound: Use the value from SetFrequency when 3D processing is disabled.
by Alexandre Julliard May 26, 2023

May 26, 2023

Module: wine Branch: master Commit: ef2d8d8e5db96a14a4848a30c440b82d9a3c2766 URL: https://gitlab.winehq.org/wine/wine/-/commit/ef2d8d8e5db96a14a4848a30c440b8… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Tue Apr 25 17:55:58 2023 +0700 dsound: Use the value from SetFrequency when 3D processing is disabled. --- dlls/dsound/sound3d.c | 2 ++ dlls/dsound/tests/ds3d.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index 0008e34755d..7ad37a30f8d 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -196,6 +196,8 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) /* this one is here only to eliminate annoying warning message */ dsb->volpan.lVolume = dsb->ds3db_lVolume; DSOUND_RecalcVolPan (&dsb->volpan); + dsb->freq = dsb->ds3db_freq; + DSOUND_RecalcFormat(dsb); return; } diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index 781d23e876f..a8da83df6e1 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -1454,7 +1454,6 @@ static void test_doppler(GUID *guid, BOOL play) check_doppler(dsound, listener, play, DS3DMODE_HEADRELATIVE, 0, -90, 1, -90, 22050, 29400); - /* Wine TODO: The frequency is not updated. */ check_doppler(dsound, listener, play, DS3DMODE_DISABLE, 0, 0, 1, -90, 22050, 22050); IDirectSound3DListener_Release(listener);

1 0

Anton Baskanov : dsound/tests: Test distance and Doppler factor.
by Alexandre Julliard May 26, 2023

May 26, 2023

Module: wine Branch: master Commit: 23eca82ac333f1f5a9feb6edb2c022a3e7e59f98 URL: https://gitlab.winehq.org/wine/wine/-/commit/23eca82ac333f1f5a9feb6edb2c022… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Mon Apr 24 14:58:07 2023 +0700 dsound/tests: Test distance and Doppler factor. --- dlls/dsound/tests/ds3d.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index a8da83df6e1..14f83d9c0a0 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -1456,6 +1456,44 @@ static void test_doppler(GUID *guid, BOOL play) check_doppler(dsound, listener, play, DS3DMODE_DISABLE, 0, 0, 1, -90, 22050, 22050); + hr = IDirectSound3DListener_SetDistanceFactor(listener, 10, DS3D_DEFERRED); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + /* Wine TODO: The distance factor has no effect. */ + check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 0.1f, -9, 22050, 29400); + /* Wine TODO: The distance factor has no effect. */ + check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 0.1f, 9, 22050, 17640); + /* Wine TODO: The distance factor has no effect. */ + check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 9, 0.1f, 0, 22050, 29400); + /* Wine TODO: The distance factor has no effect. */ + check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, -9, 0.1f, 0, 22050, 17640); + /* Wine TODO: The distance factor has no effect. */ + check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 0.1f, -24, 22050, 44100); + /* Wine TODO: The distance factor has no effect. */ + check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 0.1f, 24, 22050, 14700); + + hr = IDirectSound3DListener_SetDistanceFactor(listener, DS3D_DEFAULTDISTANCEFACTOR, DS3D_DEFERRED); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IDirectSound3DListener_SetDopplerFactor(listener, 2, DS3D_DEFERRED); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + /* Wine TODO: The Doppler factor has no effect. */ + check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 1, -45, 22050, 29400); + /* Wine TODO: The Doppler factor has no effect. */ + check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 1, 45, 22050, 17640); + /* Wine TODO: The Doppler factor has no effect. */ + check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 45, 1, 0, 22050, 29400); + /* Wine TODO: The Doppler factor has no effect. */ + check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, -45, 1, 0, 22050, 17640); + /* Wine TODO: The Doppler factor has no effect. */ + check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 1, -120, 22050, 44100); + /* Wine TODO: The Doppler factor has no effect. */ + check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 1, 120, 22050, 14700); + + hr = IDirectSound3DListener_SetDopplerFactor(listener, DS3D_DEFAULTDOPPLERFACTOR, DS3D_DEFERRED); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + IDirectSound3DListener_Release(listener); ref = IDirectSoundBuffer_Release(primary); ok(!ref, "Got outstanding refcount %ld.\n", ref);

1 0

Anton Baskanov : dsound: Take distance and Doppler factor into account.
by Alexandre Julliard May 26, 2023

May 26, 2023

Module: wine Branch: master Commit: 69d088ca5b0e85337d6f0c1c8655721a8fef0575 URL: https://gitlab.winehq.org/wine/wine/-/commit/69d088ca5b0e85337d6f0c1c865572… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Mon Apr 24 15:07:32 2023 +0700 dsound: Take distance and Doppler factor into account. --- dlls/dsound/sound3d.c | 5 +++-- dlls/dsound/tests/ds3d.c | 12 ------------ 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index 7ad37a30f8d..3fa9ff6801f 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, flLimitedVel; + D3DVALUE flFreq, flRelativeVel, flLimitedVel, flVelocityFactor; TRACE("(%p)\n",dsb); @@ -308,7 +308,8 @@ 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)); + flVelocityFactor = dsb->device->ds3dl.flDistanceFactor * dsb->device->ds3dl.flDopplerFactor; + flLimitedVel = max(-DEFAULT_VELOCITY/2, min(DEFAULT_VELOCITY/2, flRelativeVel * flVelocityFactor)); /* formula taken from Gianicoli D.: Physics, 4th edition: */ flFreq = dsb->ds3db_freq * (DEFAULT_VELOCITY/(DEFAULT_VELOCITY + flLimitedVel)); TRACE("doppler: Relative velocity (component) = %f => Doppler shift: %ld Hz -> %f Hz\n", diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index 14f83d9c0a0..9c65f674b3b 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -1459,17 +1459,11 @@ static void test_doppler(GUID *guid, BOOL play) hr = IDirectSound3DListener_SetDistanceFactor(listener, 10, DS3D_DEFERRED); ok(hr == S_OK, "Got hr %#lx.\n", hr); - /* Wine TODO: The distance factor has no effect. */ check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 0.1f, -9, 22050, 29400); - /* Wine TODO: The distance factor has no effect. */ check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 0.1f, 9, 22050, 17640); - /* Wine TODO: The distance factor has no effect. */ check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 9, 0.1f, 0, 22050, 29400); - /* Wine TODO: The distance factor has no effect. */ check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, -9, 0.1f, 0, 22050, 17640); - /* Wine TODO: The distance factor has no effect. */ check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 0.1f, -24, 22050, 44100); - /* Wine TODO: The distance factor has no effect. */ check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 0.1f, 24, 22050, 14700); hr = IDirectSound3DListener_SetDistanceFactor(listener, DS3D_DEFAULTDISTANCEFACTOR, DS3D_DEFERRED); @@ -1478,17 +1472,11 @@ static void test_doppler(GUID *guid, BOOL play) hr = IDirectSound3DListener_SetDopplerFactor(listener, 2, DS3D_DEFERRED); ok(hr == S_OK, "Got hr %#lx.\n", hr); - /* Wine TODO: The Doppler factor has no effect. */ check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 1, -45, 22050, 29400); - /* Wine TODO: The Doppler factor has no effect. */ check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 1, 45, 22050, 17640); - /* Wine TODO: The Doppler factor has no effect. */ check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 45, 1, 0, 22050, 29400); - /* Wine TODO: The Doppler factor has no effect. */ check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, -45, 1, 0, 22050, 17640); - /* Wine TODO: The Doppler factor has no effect. */ check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 1, -120, 22050, 44100); - /* Wine TODO: The Doppler factor has no effect. */ check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 1, 120, 22050, 14700); hr = IDirectSound3DListener_SetDopplerFactor(listener, DS3D_DEFAULTDOPPLERFACTOR, DS3D_DEFERRED);

1 0

Anton Baskanov : dsound/tests: Test Doppler shift with 3D processing disabled.
by Alexandre Julliard May 26, 2023

May 26, 2023

Module: wine Branch: master Commit: e7304f7dc697a64560e0511d1f3bc0a826d2aa40 URL: https://gitlab.winehq.org/wine/wine/-/commit/e7304f7dc697a64560e0511d1f3bc0… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Tue Apr 25 17:54:45 2023 +0700 dsound/tests: Test Doppler shift with 3D processing disabled. --- dlls/dsound/tests/ds3d.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index 9f5752a203c..781d23e876f 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -1454,6 +1454,9 @@ static void test_doppler(GUID *guid, BOOL play) check_doppler(dsound, listener, play, DS3DMODE_HEADRELATIVE, 0, -90, 1, -90, 22050, 29400); + /* Wine TODO: The frequency is not updated. */ + check_doppler(dsound, listener, play, DS3DMODE_DISABLE, 0, 0, 1, -90, 22050, 22050); + IDirectSound3DListener_Release(listener); ref = IDirectSoundBuffer_Release(primary); ok(!ref, "Got outstanding refcount %ld.\n", ref);

1 0

Anton Baskanov : dsound: Fix Doppler shift in head-relative mode.
by Alexandre Julliard May 26, 2023

May 26, 2023

Module: wine Branch: master Commit: 15de4251d10e35ab6ba9a62fdffeeb971bfe570b URL: https://gitlab.winehq.org/wine/wine/-/commit/15de4251d10e35ab6ba9a62fdffeeb… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Mon Apr 24 14:51:56 2023 +0700 dsound: Fix Doppler shift in head-relative mode. --- dlls/dsound/sound3d.c | 7 +++---- dlls/dsound/tests/ds3d.c | 1 - 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index c22a3d5509f..0008e34755d 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -182,12 +182,14 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) /* we need to calculate distance between buffer and listener*/ vDistance = VectorBetweenTwoPoints(&dsb->device->ds3dl.vPosition, &dsb->ds3db_ds3db.vPosition); flDistance = VectorMagnitude (&vDistance); + vRelativeVel = VectorBetweenTwoPoints(&dsb->device->ds3dl.vVelocity, &dsb->ds3db_ds3db.vVelocity); break; case DS3DMODE_HEADRELATIVE: TRACE("Head-relative 3D processing mode\n"); /* distance between buffer and listener is same as buffer's position */ vDistance = dsb->ds3db_ds3db.vPosition; flDistance = VectorMagnitude (&vDistance); + vRelativeVel = dsb->ds3db_ds3db.vVelocity; break; default: TRACE("3D processing disabled\n"); @@ -293,14 +295,11 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) dsb->freq = dsb->ds3db_freq; /* doppler shift*/ - vRelativeVel = VectorBetweenTwoPoints(&dsb->device->ds3dl.vVelocity, &dsb->ds3db_ds3db.vVelocity); if (!VectorMagnitude(&dsb->ds3db_ds3db.vVelocity) && !VectorMagnitude(&dsb->device->ds3dl.vVelocity)) { TRACE("doppler: Buffer and Listener don't have velocities\n"); } - else if (!(dsb->ds3db_ds3db.vVelocity.x == dsb->device->ds3dl.vVelocity.x && - dsb->ds3db_ds3db.vVelocity.y == dsb->device->ds3dl.vVelocity.y && - dsb->ds3db_ds3db.vVelocity.z == dsb->device->ds3dl.vVelocity.z) && + else if (!(vRelativeVel.x == 0.0f && vRelativeVel.y == 0.0f && vRelativeVel.z == 0.0f) && !(vDistance.x == 0.0f && vDistance.y == 0.0f && vDistance.z == 0.0f)) { /* calculate length of vRelativeVel component which causes Doppler Effect diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index 9ad8e3e58fc..9f5752a203c 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -1452,7 +1452,6 @@ static void test_doppler(GUID *guid, BOOL play) /* The shifted frequency is limited to DSBFREQUENCY_MAX. */ check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 1, -90, 176400, 200000); - /* Wine TODO: The frequency is too low. */ check_doppler(dsound, listener, play, DS3DMODE_HEADRELATIVE, 0, -90, 1, -90, 22050, 29400); IDirectSound3DListener_Release(listener);

1 0

Anton Baskanov : dsound/tests: Test Doppler shift in head-relative mode.
by Alexandre Julliard May 26, 2023

May 26, 2023

Module: wine Branch: master Commit: aed3f7fb4df3966f28ad7843a09f1c43f0f2c10d URL: https://gitlab.winehq.org/wine/wine/-/commit/aed3f7fb4df3966f28ad7843a09f1c… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Mon Apr 24 14:47:23 2023 +0700 dsound/tests: Test Doppler shift in head-relative mode. --- dlls/dsound/tests/ds3d.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index 9c149dbcd9b..9ad8e3e58fc 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -1452,6 +1452,9 @@ static void test_doppler(GUID *guid, BOOL play) /* The shifted frequency is limited to DSBFREQUENCY_MAX. */ check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 1, -90, 176400, 200000); + /* Wine TODO: The frequency is too low. */ + check_doppler(dsound, listener, play, DS3DMODE_HEADRELATIVE, 0, -90, 1, -90, 22050, 29400); + IDirectSound3DListener_Release(listener); ref = IDirectSoundBuffer_Release(primary); ok(!ref, "Got outstanding refcount %ld.\n", ref);

1 0

Floris Renaud : po: Update Dutch translation.
by Alexandre Julliard May 26, 2023

May 26, 2023

Module: wine Branch: master Commit: fd6fc3de590547b5c35be1f7718f9765d8ac4064 URL: https://gitlab.winehq.org/wine/wine/-/commit/fd6fc3de590547b5c35be1f7718f97… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Fri May 26 10:49:27 2023 +0200 po: Update Dutch translation. --- po/nl.po | 55 ++++++++++++------------------------------------------- 1 file changed, 12 insertions(+), 43 deletions(-) diff --git a/po/nl.po b/po/nl.po index 4c332f15104..2c190570586 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2023-05-03 16:25+0200\n" +"PO-Revision-Date: 2023-05-26 10:45+0200\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -17213,38 +17213,6 @@ msgid "regsvr32: Successfully uninstalled DLL '%1'\n" msgstr "regsvr32: Verwijderen van DLL '%1' gelukt\n" #: programs/start/start.rc:56 -#, fuzzy -#| msgid "" -#| "Start a program, or open a document in the program normally used for " -#| "files\n" -#| "with that suffix.\n" -#| "Usage:\n" -#| "start [options] program_filename [...]\n" -#| "start [options] document_filename\n" -#| "\n" -#| "Options:\n" -#| "\"title\" Specifies the title of the child windows.\n" -#| "/d directory Start the program in the specified directory.\n" -#| "/b Don't create a new console for the program.\n" -#| "/i Start the program with fresh environment variables.\n" -#| "/min Start the program minimized.\n" -#| "/max Start the program maximized.\n" -#| "/low Start the program in the idle priority class.\n" -#| "/normal Start the program in the normal priority class.\n" -#| "/high Start the program in the high priority class.\n" -#| "/realtime Start the program in the realtime priority class.\n" -#| "/abovenormal Start the program in the abovenormal priority class.\n" -#| "/belownormal Start the program in the belownormal priority class.\n" -#| "/node n Start the program on the specified NUMA node.\n" -#| "/affinity mask Start the program with the specified affinity mask.\n" -#| "/wait Wait for the started program to finish, then exit with " -#| "its\n" -#| "exit code.\n" -#| "/unix Use a Unix filename and start the file like Windows\n" -#| "Explorer.\n" -#| "/exec Exec the specified file (for internal Wine usage).\n" -#| "/ProgIDOpen Open a document using the specified progID.\n" -#| "/? Display this help and exit.\n" msgid "" "Start a program, or open a document in the program normally used for files\n" "with that suffix.\n" @@ -17283,9 +17251,9 @@ msgstr "" "start [opties] document-naam\n" "\n" "Opties:\n" -"\"titel\" Specificeer de titel van het \"child\" venster.\n" -"/d map Start het programma in de gespecificeerde map.\n" -"/b Creeer geen nieuwe console voor het programma.\n" +"\"titel\" Bepaalt de titel van de onderliggende vensters.\n" +"/d map Start het programma vanaf de gegeven map.\n" +"/b Maak geen nieuwe console voor het programma.\n" "/i Start het programma met verse omgevingsvariabelen.\n" "/min Start het programma geminimaliseerd op.\n" "/max Start het programma gemaximaliseerd op.\n" @@ -17293,16 +17261,17 @@ msgstr "" "/normal Start het programma met normale prioriteit op.\n" "/high Start het programma met hoge prioriteit op.\n" "/realtime Start het programma met \"realtime\" prioriteit op.\n" -"/abovenormal Start het programma in \"abovenormal\" prioriteit op.\n" -"/belownormal Start het programma in \"belownormal\" prioriteit op.\n" -"/node n Start het programma op de gespecificeerde NUMA node.\n" -"/affinity mask Start het program met het gespecificeerde affiniteitsmasker.\n" -"/wait Wacht tot het gestarte programma beeindigd is, dan afsluiten\n" -" met de exit code.\n" +"/abovenormal Start het programma met \"abovenormal\" prioriteit op.\n" +"/belownormal Start het programma met \"belownormal\" prioriteit op.\n" +"/node n Start het programma op de gegeven NUMA node.\n" +"/affinity mask Start het program met het gegeven affiniteitsmasker.\n" +"/machine arch Forceer de gegeven architectuur (x86,arm,amd64,arm64).\n" +"/wait Wacht tot het programma is beëindigd en sluit af met\n" +" zijn exit code.\n" "/unix Gebruik een Unix bestandsnaam en start het bestand zoals\n" " Windows Verkenner.\n" "/exec Voer het opgegeven bestand uit (intern gebruikt in Wine).\n" -"/ProgIDOpen Open een document met het specificeerde progID.\n" +"/ProgIDOpen Open een document met het gegeven progID.\n" "/? Toon deze hulp en eindig.\n" #: programs/start/start.rc:58

1 0

Zebediah Figura : vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_min().
by Alexandre Julliard May 26, 2023

May 26, 2023

Module: vkd3d Branch: master Commit: c805eb1191eb0a9b576cf2b83bbb32cc81f24e41 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c805eb1191eb0a9b576cf2b83bbb3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Nov 11 18:55:55 2022 -0600 vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_min(). --- libs/vkd3d-shader/hlsl_constant_ops.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index e249bd2a..ae2fd5a5 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -434,29 +434,29 @@ static bool fold_max(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, cons return true; } -static bool fold_min(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, - struct hlsl_ir_constant *src1, struct hlsl_ir_constant *src2) +static bool fold_min(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type, + const struct hlsl_ir_constant *src1, const struct hlsl_ir_constant *src2) { - enum hlsl_base_type type = dst->node.data_type->base_type; + enum hlsl_base_type type = dst_type->base_type; unsigned int k; assert(type == src1->node.data_type->base_type); assert(type == src2->node.data_type->base_type); - for (k = 0; k < dst->node.data_type->dimx; ++k) + for (k = 0; k < dst_type->dimx; ++k) { switch (type) { case HLSL_TYPE_INT: - dst->value.u[k].i = min(src1->value.u[k].i, src2->value.u[k].i); + dst->u[k].i = min(src1->value.u[k].i, src2->value.u[k].i); break; case HLSL_TYPE_UINT: - dst->value.u[k].u = min(src1->value.u[k].u, src2->value.u[k].u); + dst->u[k].u = min(src1->value.u[k].u, src2->value.u[k].u); break; default: - FIXME("Fold min for type %s.\n", debug_hlsl_type(ctx, dst->node.data_type)); + FIXME("Fold min for type %s.\n", debug_hlsl_type(ctx, dst_type)); return false; } } @@ -612,7 +612,7 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, break; case HLSL_OP2_MIN: - success = fold_min(ctx, res, arg1, arg2); + success = fold_min(ctx, &res->value, instr->data_type, arg1, arg2); break; case HLSL_OP2_BIT_XOR:

1 0

Jan Sikorski : vkd3d-shader/spirv: Ensure that the OpLabel emitted vkd3d_spirv_builder_begin_main_function() gets terminated.
by Alexandre Julliard May 26, 2023

May 26, 2023

Module: vkd3d Branch: master Commit: bb680e73de4ac22700ec89b1f466eea8da0a2120 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/bb680e73de4ac22700ec89b1f466e… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Thu May 25 10:12:35 2023 +0200 vkd3d-shader/spirv: Ensure that the OpLabel emitted vkd3d_spirv_builder_begin_main_function() gets terminated. --- libs/vkd3d-shader/spirv.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 29423028..cc0b63e8 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2244,6 +2244,7 @@ struct spirv_compiler struct vkd3d_push_constant_buffer_binding *push_constants; const struct vkd3d_shader_spirv_target_info *spirv_target_info; + bool main_block_open; bool after_declarations_section; struct shader_signature input_signature; struct shader_signature output_signature; @@ -5211,6 +5212,7 @@ static void spirv_compiler_emit_initial_declarations(struct spirv_compiler *comp if (compiler->shader_type != VKD3D_SHADER_TYPE_HULL) { vkd3d_spirv_builder_begin_main_function(builder); + compiler->main_block_open = true; } } @@ -7509,6 +7511,8 @@ static int spirv_compiler_emit_control_flow_instruction(struct spirv_compiler *c if (cf_info) cf_info->inside_block = false; + else + compiler->main_block_open = false; break; case VKD3DSIH_RETP: @@ -9469,6 +9473,9 @@ static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, if (result < 0) return result; + if (compiler->main_block_open) + vkd3d_spirv_build_op_return(builder); + if (!is_in_default_phase(compiler)) spirv_compiler_leave_shader_phase(compiler); else

1 0