June 2018 - Wine-Devel - list.winehq.org

Re: [PATCH 2/5] d3d9/tests: Test how state is reset after DrawPrimitive[Indexed]UP().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

June 6, 2018

Re: [PATCH 3/5] wined3d: Set stream stride and offset even when buffer is NULL.

by Matteo Bruni

2018-06-06 18:35 GMT+02:00 Henri Verbeet <hverbeet(a)gmail.com>: > On 6 June 2018 at 00:32, Matteo Bruni <mbruni(a)codeweavers.com> wrote: >> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> >> --- >> dlls/d3d8/device.c | 8 ++++++++ >> dlls/d3d9/device.c | 8 ++++++++ >> dlls/d3d9/tests/device.c | 2 +- >> dlls/d3d9/tests/visual.c | 2 +- >> dlls/wined3d/device.c | 6 ++---- >> 5 files changed, 20 insertions(+), 6 deletions(-) >> > This introduces test failures: > > ../../../../../src/wine-git/tools/runtest -q -P wine -T ../../.. -M > d3d10core.dll -p d3d10core_test.exe.so device && touch device.ok > device.c:5496: Test succeeded inside todo block: Got unexpected stride > 0 in slot 0. > device.c:5497: Test succeeded inside todo block: Got unexpected offset > 0 in slot 0. > device.c:5496: Test succeeded inside todo block: Got unexpected stride > 0 in slot 1. > device.c:5497: Test succeeded inside todo block: Got unexpected offset > 0 in slot 1. > device.c:5496: Test succeeded inside todo block: Got unexpected stride > 0 in slot 2. > device.c:5497: Test succeeded inside todo block: Got unexpected offset > 0 in slot 2. > device.c:5496: Test succeeded inside todo block: Got unexpected stride > 0 in slot 3. > device.c:5497: Test succeeded inside todo block: Got unexpected offset > 0 in slot 3. > device.c:5496: Test succeeded inside todo block: Got unexpected stride > 0 in slot 4. > device.c:5497: Test succeeded inside todo block: Got unexpected offset > 0 in slot 4. > device.c:5496: Test succeeded inside todo block: Got unexpected stride > 0 in slot 5. > device.c:5497: Test succeeded inside todo block: Got unexpected offset > 0 in slot 5. > device.c:5496: Test succeeded inside todo block: Got unexpected stride > 0 in slot 6. > device.c:5497: Test succeeded inside todo block: Got unexpected offset > 0 in slot 6. > device.c:5496: Test succeeded inside todo block: Got unexpected stride > 0 in slot 7. > device.c:5497: Test succeeded inside todo block: Got unexpected offset > 0 in slot 7. > device.c:5496: Test succeeded inside todo block: Got unexpected stride > 0 in slot 8. > device.c:5497: Test succeeded inside todo block: Got unexpected offset > 0 in slot 8. > device.c:5496: Test succeeded inside todo block: Got unexpected stride > 0 in slot 9. > device.c:5497: Test succeeded inside todo block: Got unexpected offset > 0 in slot 9. > device.c:5496: Test succeeded inside todo block: Got unexpected stride > 0 in slot 10. > device.c:5497: Test succeeded inside todo block: Got unexpected offset > 0 in slot 10. > device.c:5496: Test succeeded inside todo block: Got unexpected stride > 0 in slot 11. > device.c:5497: Test succeeded inside todo block: Got unexpected offset > 0 in slot 11. > device.c:5496: Test succeeded inside todo block: Got unexpected stride > 0 in slot 12. > device.c:5497: Test succeeded inside todo block: Got unexpected offset > 0 in slot 12. > device.c:5496: Test succeeded inside todo block: Got unexpected stride > 0 in slot 13. > device.c:5497: Test succeeded inside todo block: Got unexpected offset > 0 in slot 13. > device.c:5496: Test succeeded inside todo block: Got unexpected stride > 0 in slot 14. > device.c:5497: Test succeeded inside todo block: Got unexpected offset > 0 in slot 14. > device.c:5496: Test succeeded inside todo block: Got unexpected stride > 0 in slot 15. > device.c:5497: Test succeeded inside todo block: Got unexpected offset > 0 in slot 15. > > ../../../../../src/wine-git/tools/runtest -q -P wine -T ../../.. -M > d3d11.dll -p d3d11_test.exe.so d3d11 && touch d3d11.ok > d3d11.c:10652: Test succeeded inside todo block: Got unexpected stride > 0 in slot 0. > d3d11.c:10653: Test succeeded inside todo block: Got unexpected offset > 0 in slot 0. > d3d11.c:10652: Test succeeded inside todo block: Got unexpected stride > 0 in slot 1. > d3d11.c:10653: Test succeeded inside todo block: Got unexpected offset > 0 in slot 1. > d3d11.c:10652: Test succeeded inside todo block: Got unexpected stride > 0 in slot 2. > d3d11.c:10653: Test succeeded inside todo block: Got unexpected offset > 0 in slot 2. > d3d11.c:10652: Test succeeded inside todo block: Got unexpected stride > 0 in slot 3. > d3d11.c:10653: Test succeeded inside todo block: Got unexpected offset > 0 in slot 3. > d3d11.c:10652: Test succeeded inside todo block: Got unexpected stride > 0 in slot 4. > d3d11.c:10653: Test succeeded inside todo block: Got unexpected offset > 0 in slot 4. > d3d11.c:10652: Test succeeded inside todo block: Got unexpected stride > 0 in slot 5. > d3d11.c:10653: Test succeeded inside todo block: Got unexpected offset > 0 in slot 5. > d3d11.c:10652: Test succeeded inside todo block: Got unexpected stride > 0 in slot 6. > d3d11.c:10653: Test succeeded inside todo block: Got unexpected offset > 0 in slot 6. > d3d11.c:10652: Test succeeded inside todo block: Got unexpected stride > 0 in slot 7. > d3d11.c:10653: Test succeeded inside todo block: Got unexpected offset > 0 in slot 7. > d3d11.c:10652: Test succeeded inside todo block: Got unexpected stride > 0 in slot 8. > d3d11.c:10653: Test succeeded inside todo block: Got unexpected offset > 0 in slot 8. > d3d11.c:10652: Test succeeded inside todo block: Got unexpected stride > 0 in slot 9. > d3d11.c:10653: Test succeeded inside todo block: Got unexpected offset > 0 in slot 9. > d3d11.c:10652: Test succeeded inside todo block: Got unexpected stride > 0 in slot 10. > d3d11.c:10653: Test succeeded inside todo block: Got unexpected offset > 0 in slot 10. > d3d11.c:10652: Test succeeded inside todo block: Got unexpected stride > 0 in slot 11. > d3d11.c:10653: Test succeeded inside todo block: Got unexpected offset > 0 in slot 11. > d3d11.c:10652: Test succeeded inside todo block: Got unexpected stride > 0 in slot 12. > d3d11.c:10653: Test succeeded inside todo block: Got unexpected offset > 0 in slot 12. > d3d11.c:10652: Test succeeded inside todo block: Got unexpected stride > 0 in slot 13. > d3d11.c:10653: Test succeeded inside todo block: Got unexpected offset > 0 in slot 13. > d3d11.c:10652: Test succeeded inside todo block: Got unexpected stride > 0 in slot 14. > d3d11.c:10653: Test succeeded inside todo block: Got unexpected offset > 0 in slot 14. > d3d11.c:10652: Test succeeded inside todo block: Got unexpected stride > 0 in slot 15. > d3d11.c:10653: Test succeeded inside todo block: Got unexpected offset > 0 in slot 15. > d3d11.c:20644: Tests skipped: Raw buffers are not supported. > d3d11.c:20644: Tests skipped: Raw buffers are not supported. > > ../../../../../src/wine-git/tools/runtest -q -P wine -T ../../.. -M > d3dx10_43.dll -p d3dx10_43_test.exe.so d3dx10 && touch d3dx10.ok > d3dx10.c:483: Test succeeded inside todo block: Got unexpected stride > 0 in slot 0. > d3dx10.c:484: Test succeeded inside todo block: Got unexpected offset > 0 in slot 0. > d3dx10.c:483: Test succeeded inside todo block: Got unexpected stride > 0 in slot 1. > d3dx10.c:484: Test succeeded inside todo block: Got unexpected offset > 0 in slot 1. > d3dx10.c:483: Test succeeded inside todo block: Got unexpected stride > 0 in slot 2. > d3dx10.c:484: Test succeeded inside todo block: Got unexpected offset > 0 in slot 2. > d3dx10.c:483: Test succeeded inside todo block: Got unexpected stride > 0 in slot 3. > d3dx10.c:484: Test succeeded inside todo block: Got unexpected offset > 0 in slot 3. > d3dx10.c:483: Test succeeded inside todo block: Got unexpected stride > 0 in slot 4. > d3dx10.c:484: Test succeeded inside todo block: Got unexpected offset > 0 in slot 4. > d3dx10.c:483: Test succeeded inside todo block: Got unexpected stride > 0 in slot 5. > d3dx10.c:484: Test succeeded inside todo block: Got unexpected offset > 0 in slot 5. > d3dx10.c:483: Test succeeded inside todo block: Got unexpected stride > 0 in slot 6. > d3dx10.c:484: Test succeeded inside todo block: Got unexpected offset > 0 in slot 6. > d3dx10.c:483: Test succeeded inside todo block: Got unexpected stride > 0 in slot 7. > d3dx10.c:484: Test succeeded inside todo block: Got unexpected offset > 0 in slot 7. > d3dx10.c:483: Test succeeded inside todo block: Got unexpected stride > 0 in slot 8. > d3dx10.c:484: Test succeeded inside todo block: Got unexpected offset > 0 in slot 8. > d3dx10.c:483: Test succeeded inside todo block: Got unexpected stride > 0 in slot 9. > d3dx10.c:484: Test succeeded inside todo block: Got unexpected offset > 0 in slot 9. > d3dx10.c:483: Test succeeded inside todo block: Got unexpected stride > 0 in slot 10. > d3dx10.c:484: Test succeeded inside todo block: Got unexpected offset > 0 in slot 10. > d3dx10.c:483: Test succeeded inside todo block: Got unexpected stride > 0 in slot 11. > d3dx10.c:484: Test succeeded inside todo block: Got unexpected offset > 0 in slot 11. > d3dx10.c:483: Test succeeded inside todo block: Got unexpected stride > 0 in slot 12. > d3dx10.c:484: Test succeeded inside todo block: Got unexpected offset > 0 in slot 12. > d3dx10.c:483: Test succeeded inside todo block: Got unexpected stride > 0 in slot 13. > d3dx10.c:484: Test succeeded inside todo block: Got unexpected offset > 0 in slot 13. > d3dx10.c:483: Test succeeded inside todo block: Got unexpected stride > 0 in slot 14. > d3dx10.c:484: Test succeeded inside todo block: Got unexpected offset > 0 in slot 14. > d3dx10.c:483: Test succeeded inside todo block: Got unexpected stride > 0 in slot 15. > d3dx10.c:484: Test succeeded inside todo block: Got unexpected offset > 0 in slot 15. Urgh, not sure how I missed these...

June 6, 2018

Re: [PATCH 3/5] wined3d: Set stream stride and offset even when buffer is NULL.

by Henri Verbeet

On 6 June 2018 at 00:32, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> > --- > dlls/d3d8/device.c | 8 ++++++++ > dlls/d3d9/device.c | 8 ++++++++ > dlls/d3d9/tests/device.c | 2 +- > dlls/d3d9/tests/visual.c | 2 +- > dlls/wined3d/device.c | 6 ++---- > 5 files changed, 20 insertions(+), 6 deletions(-) > This introduces test failures: ../../../../../src/wine-git/tools/runtest -q -P wine -T ../../.. -M d3d10core.dll -p d3d10core_test.exe.so device && touch device.ok device.c:5496: Test succeeded inside todo block: Got unexpected stride 0 in slot 0. device.c:5497: Test succeeded inside todo block: Got unexpected offset 0 in slot 0. device.c:5496: Test succeeded inside todo block: Got unexpected stride 0 in slot 1. device.c:5497: Test succeeded inside todo block: Got unexpected offset 0 in slot 1. device.c:5496: Test succeeded inside todo block: Got unexpected stride 0 in slot 2. device.c:5497: Test succeeded inside todo block: Got unexpected offset 0 in slot 2. device.c:5496: Test succeeded inside todo block: Got unexpected stride 0 in slot 3. device.c:5497: Test succeeded inside todo block: Got unexpected offset 0 in slot 3. device.c:5496: Test succeeded inside todo block: Got unexpected stride 0 in slot 4. device.c:5497: Test succeeded inside todo block: Got unexpected offset 0 in slot 4. device.c:5496: Test succeeded inside todo block: Got unexpected stride 0 in slot 5. device.c:5497: Test succeeded inside todo block: Got unexpected offset 0 in slot 5. device.c:5496: Test succeeded inside todo block: Got unexpected stride 0 in slot 6. device.c:5497: Test succeeded inside todo block: Got unexpected offset 0 in slot 6. device.c:5496: Test succeeded inside todo block: Got unexpected stride 0 in slot 7. device.c:5497: Test succeeded inside todo block: Got unexpected offset 0 in slot 7. device.c:5496: Test succeeded inside todo block: Got unexpected stride 0 in slot 8. device.c:5497: Test succeeded inside todo block: Got unexpected offset 0 in slot 8. device.c:5496: Test succeeded inside todo block: Got unexpected stride 0 in slot 9. device.c:5497: Test succeeded inside todo block: Got unexpected offset 0 in slot 9. device.c:5496: Test succeeded inside todo block: Got unexpected stride 0 in slot 10. device.c:5497: Test succeeded inside todo block: Got unexpected offset 0 in slot 10. device.c:5496: Test succeeded inside todo block: Got unexpected stride 0 in slot 11. device.c:5497: Test succeeded inside todo block: Got unexpected offset 0 in slot 11. device.c:5496: Test succeeded inside todo block: Got unexpected stride 0 in slot 12. device.c:5497: Test succeeded inside todo block: Got unexpected offset 0 in slot 12. device.c:5496: Test succeeded inside todo block: Got unexpected stride 0 in slot 13. device.c:5497: Test succeeded inside todo block: Got unexpected offset 0 in slot 13. device.c:5496: Test succeeded inside todo block: Got unexpected stride 0 in slot 14. device.c:5497: Test succeeded inside todo block: Got unexpected offset 0 in slot 14. device.c:5496: Test succeeded inside todo block: Got unexpected stride 0 in slot 15. device.c:5497: Test succeeded inside todo block: Got unexpected offset 0 in slot 15. ../../../../../src/wine-git/tools/runtest -q -P wine -T ../../.. -M d3d11.dll -p d3d11_test.exe.so d3d11 && touch d3d11.ok d3d11.c:10652: Test succeeded inside todo block: Got unexpected stride 0 in slot 0. d3d11.c:10653: Test succeeded inside todo block: Got unexpected offset 0 in slot 0. d3d11.c:10652: Test succeeded inside todo block: Got unexpected stride 0 in slot 1. d3d11.c:10653: Test succeeded inside todo block: Got unexpected offset 0 in slot 1. d3d11.c:10652: Test succeeded inside todo block: Got unexpected stride 0 in slot 2. d3d11.c:10653: Test succeeded inside todo block: Got unexpected offset 0 in slot 2. d3d11.c:10652: Test succeeded inside todo block: Got unexpected stride 0 in slot 3. d3d11.c:10653: Test succeeded inside todo block: Got unexpected offset 0 in slot 3. d3d11.c:10652: Test succeeded inside todo block: Got unexpected stride 0 in slot 4. d3d11.c:10653: Test succeeded inside todo block: Got unexpected offset 0 in slot 4. d3d11.c:10652: Test succeeded inside todo block: Got unexpected stride 0 in slot 5. d3d11.c:10653: Test succeeded inside todo block: Got unexpected offset 0 in slot 5. d3d11.c:10652: Test succeeded inside todo block: Got unexpected stride 0 in slot 6. d3d11.c:10653: Test succeeded inside todo block: Got unexpected offset 0 in slot 6. d3d11.c:10652: Test succeeded inside todo block: Got unexpected stride 0 in slot 7. d3d11.c:10653: Test succeeded inside todo block: Got unexpected offset 0 in slot 7. d3d11.c:10652: Test succeeded inside todo block: Got unexpected stride 0 in slot 8. d3d11.c:10653: Test succeeded inside todo block: Got unexpected offset 0 in slot 8. d3d11.c:10652: Test succeeded inside todo block: Got unexpected stride 0 in slot 9. d3d11.c:10653: Test succeeded inside todo block: Got unexpected offset 0 in slot 9. d3d11.c:10652: Test succeeded inside todo block: Got unexpected stride 0 in slot 10. d3d11.c:10653: Test succeeded inside todo block: Got unexpected offset 0 in slot 10. d3d11.c:10652: Test succeeded inside todo block: Got unexpected stride 0 in slot 11. d3d11.c:10653: Test succeeded inside todo block: Got unexpected offset 0 in slot 11. d3d11.c:10652: Test succeeded inside todo block: Got unexpected stride 0 in slot 12. d3d11.c:10653: Test succeeded inside todo block: Got unexpected offset 0 in slot 12. d3d11.c:10652: Test succeeded inside todo block: Got unexpected stride 0 in slot 13. d3d11.c:10653: Test succeeded inside todo block: Got unexpected offset 0 in slot 13. d3d11.c:10652: Test succeeded inside todo block: Got unexpected stride 0 in slot 14. d3d11.c:10653: Test succeeded inside todo block: Got unexpected offset 0 in slot 14. d3d11.c:10652: Test succeeded inside todo block: Got unexpected stride 0 in slot 15. d3d11.c:10653: Test succeeded inside todo block: Got unexpected offset 0 in slot 15. d3d11.c:20644: Tests skipped: Raw buffers are not supported. d3d11.c:20644: Tests skipped: Raw buffers are not supported. ../../../../../src/wine-git/tools/runtest -q -P wine -T ../../.. -M d3dx10_43.dll -p d3dx10_43_test.exe.so d3dx10 && touch d3dx10.ok d3dx10.c:483: Test succeeded inside todo block: Got unexpected stride 0 in slot 0. d3dx10.c:484: Test succeeded inside todo block: Got unexpected offset 0 in slot 0. d3dx10.c:483: Test succeeded inside todo block: Got unexpected stride 0 in slot 1. d3dx10.c:484: Test succeeded inside todo block: Got unexpected offset 0 in slot 1. d3dx10.c:483: Test succeeded inside todo block: Got unexpected stride 0 in slot 2. d3dx10.c:484: Test succeeded inside todo block: Got unexpected offset 0 in slot 2. d3dx10.c:483: Test succeeded inside todo block: Got unexpected stride 0 in slot 3. d3dx10.c:484: Test succeeded inside todo block: Got unexpected offset 0 in slot 3. d3dx10.c:483: Test succeeded inside todo block: Got unexpected stride 0 in slot 4. d3dx10.c:484: Test succeeded inside todo block: Got unexpected offset 0 in slot 4. d3dx10.c:483: Test succeeded inside todo block: Got unexpected stride 0 in slot 5. d3dx10.c:484: Test succeeded inside todo block: Got unexpected offset 0 in slot 5. d3dx10.c:483: Test succeeded inside todo block: Got unexpected stride 0 in slot 6. d3dx10.c:484: Test succeeded inside todo block: Got unexpected offset 0 in slot 6. d3dx10.c:483: Test succeeded inside todo block: Got unexpected stride 0 in slot 7. d3dx10.c:484: Test succeeded inside todo block: Got unexpected offset 0 in slot 7. d3dx10.c:483: Test succeeded inside todo block: Got unexpected stride 0 in slot 8. d3dx10.c:484: Test succeeded inside todo block: Got unexpected offset 0 in slot 8. d3dx10.c:483: Test succeeded inside todo block: Got unexpected stride 0 in slot 9. d3dx10.c:484: Test succeeded inside todo block: Got unexpected offset 0 in slot 9. d3dx10.c:483: Test succeeded inside todo block: Got unexpected stride 0 in slot 10. d3dx10.c:484: Test succeeded inside todo block: Got unexpected offset 0 in slot 10. d3dx10.c:483: Test succeeded inside todo block: Got unexpected stride 0 in slot 11. d3dx10.c:484: Test succeeded inside todo block: Got unexpected offset 0 in slot 11. d3dx10.c:483: Test succeeded inside todo block: Got unexpected stride 0 in slot 12. d3dx10.c:484: Test succeeded inside todo block: Got unexpected offset 0 in slot 12. d3dx10.c:483: Test succeeded inside todo block: Got unexpected stride 0 in slot 13. d3dx10.c:484: Test succeeded inside todo block: Got unexpected offset 0 in slot 13. d3dx10.c:483: Test succeeded inside todo block: Got unexpected stride 0 in slot 14. d3dx10.c:484: Test succeeded inside todo block: Got unexpected offset 0 in slot 14. d3dx10.c:483: Test succeeded inside todo block: Got unexpected stride 0 in slot 15. d3dx10.c:484: Test succeeded inside todo block: Got unexpected offset 0 in slot 15.

June 6, 2018

Re: [PATCH 1/5] wined3d: Declare the correct number and type of fragment shader color outputs.

by Matteo Bruni

2018-06-06 18:30 GMT+02:00 Henri Verbeet <hverbeet(a)gmail.com>: > On 6 June 2018 at 18:25, Matteo Bruni <matteo.mystral(a)gmail.com> wrote: >> Hmm, it was intentional but it looks like it doesn't matter in >> practice. We only execute that if (!needs_legacy_glsl_syntax()), which >> means GLSL 1.30+ and thus OpenGL 3.0+. That requires that >> GL_MAX_DRAW_BUFFERS is >= 8. OpenGL ES apparently only mandates 4 draw >> buffers so things would be a bit more murky there, except that there >> is no glBindFragDataLocation() in ES at all (you're supposed to use >> layout qualifiers in the fragment shader instead - I guess I'll have >> to rework it again to handle that). >> >> Anyway, I can switch to gl_info->limits.buffers, it shouldn't hurt and >> I have to resend it anyway... >> > I don't think it (currently) happens in practice, but > gl_info->limits.buffers can potentially be larger than > MAX_RENDER_TARGET_VIEWS. Yeah, it's currently clamped to MAX_RENDER_TARGET_VIEWS. I can also leave this as-is :)

June 6, 2018

Re: [PATCH 1/5] wined3d: Declare the correct number and type of fragment shader color outputs.

by Henri Verbeet

On 6 June 2018 at 18:25, Matteo Bruni <matteo.mystral(a)gmail.com> wrote: > Hmm, it was intentional but it looks like it doesn't matter in > practice. We only execute that if (!needs_legacy_glsl_syntax()), which > means GLSL 1.30+ and thus OpenGL 3.0+. That requires that > GL_MAX_DRAW_BUFFERS is >= 8. OpenGL ES apparently only mandates 4 draw > buffers so things would be a bit more murky there, except that there > is no glBindFragDataLocation() in ES at all (you're supposed to use > layout qualifiers in the fragment shader instead - I guess I'll have > to rework it again to handle that). > > Anyway, I can switch to gl_info->limits.buffers, it shouldn't hurt and > I have to resend it anyway... > I don't think it (currently) happens in practice, but gl_info->limits.buffers can potentially be larger than MAX_RENDER_TARGET_VIEWS.

June 6, 2018

Re: [PATCH 1/5] wined3d: Declare the correct number and type of fragment shader color outputs.

by Matteo Bruni

2018-06-06 3:32 GMT+02:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > Hi Matteo, > > > On 06/06/18 08:32, Matteo Bruni wrote: >> { >> - GL_EXTCALL(glBindFragDataLocation(program_id, 0, "ps_out")); >> - checkGLcall("glBindFragDataLocation"); >> + for (i = 0; i < MAX_RENDER_TARGET_VIEWS; ++i) > Is there a reason why MAX_RENDER_TARGET_VIEWS is used instead of > "gl_info->limits.buffers"? Hmm, it was intentional but it looks like it doesn't matter in practice. We only execute that if (!needs_legacy_glsl_syntax()), which means GLSL 1.30+ and thus OpenGL 3.0+. That requires that GL_MAX_DRAW_BUFFERS is >= 8. OpenGL ES apparently only mandates 4 draw buffers so things would be a bit more murky there, except that there is no glBindFragDataLocation() in ES at all (you're supposed to use layout qualifiers in the fragment shader instead - I guess I'll have to rework it again to handle that). Anyway, I can switch to gl_info->limits.buffers, it shouldn't hurt and I have to resend it anyway...

June 6, 2018

Re: [PATCH 4/4] winevulkan: Update Vulkan support to 1.0.76.

by Roderick Colenbrander

On Wed, Jun 6, 2018 at 2:20 AM, Józef Kucia <joseph.kucia(a)gmail.com> wrote: > On Tue, Jun 5, 2018 at 3:19 PM, Alexandre Julliard <julliard(a)winehq.org> wrote: >> Roderick Colenbrander <thunderbird2k(a)gmail.com> writes: >> >>> Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> >>> --- >>> dlls/vulkan-1/vulkan-1.spec | 28 + >>> dlls/winevulkan/make_vulkan | 206 +- >>> dlls/winevulkan/vk.xml | 6448 ++++++++++++++++++++++++++------------- >> >> I'd suggest downloading vk.xml like we do for the OpenGL spec >> files. It's not clear that the license exception also applies to the >> source file, so I think it would be better if we didn't distribute it. > > Thanks. I've submitted a patch to remove vk.xml from the repository. > The patch is probably stuck in the moderation queue. Thanks, I didn't have time for it yet (busy week).

June 6, 2018

Re: [PATCH 4/4] msi: Implement deferral for standard and custom actions.

by Zebediah Figura

On 06/06/18 04:05, Hans Leidekker wrote: > On Wed, 2018-06-06 at 00:59 -0500, Zebediah Figura wrote: >> Fixes https://bugs.winehq.org/show_bug.cgi?id=34989. >> >> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> >> --- >> Tested for regressions against winetricks-test and Microsoft Office 2010. > > The patch looks good but it introduces an error in the wine-mono installer: > > 0017:trace:msi:HANDLE_CustomType34 cmd L"rundll32 setupapi.dll,InstallHinfSection DefaultInstall 128 C:\\windows\\mono\\mono-2.0\\support\\dotnetfakedlls.inf" dir L"C:\\windows\\mono\\mono-2.0\\support\\" > 0017:err:msi:execute_command unable to execute command 267 > > Looks like custom action INSTALLFAKEDLLS depended on the wrong order. Marking > it as a deferred custom action should fix that. > > > Thanks; I've sent a pull request to wine-mono.

June 6, 2018

Re: [PATCH] imm32/tests: Use the available ARRAY_SIZE() macro

by Aric Stewart

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> On 6/5/18 1:09 PM, Michael Stefaniuc wrote: > Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> > --- > dlls/imm32/tests/imm32.c | 14 ++++++-------- > 1 file changed, 6 insertions(+), 8 deletions(-) > > diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c > index be3ddfce03..ee1aeb3965 100644 > --- a/dlls/imm32/tests/imm32.c > +++ b/dlls/imm32/tests/imm32.c > @@ -26,8 +26,6 @@ > #include "imm.h" > #include "ddk/imm.h" > > -#define NUMELEMS(array) (sizeof((array))/sizeof((array)[0])) > - > static BOOL (WINAPI *pImmAssociateContextEx)(HWND,HIMC,DWORD); > static BOOL (WINAPI *pImmIsUIMessageA)(HWND,UINT,WPARAM,LPARAM); > static UINT (WINAPI *pSendInput) (UINT, INPUT*, size_t); > @@ -73,7 +71,7 @@ static LRESULT CALLBACK get_msg_filter(int nCode, WPARAM wParam, LPARAM lParam) > MSG *msg = (MSG*)lParam; > > if ((msg->hwnd == msg_spy.hwnd || msg_spy.hwnd == NULL) && > - (msg_spy.i_msg < NUMELEMS(msg_spy.msgs))) > + (msg_spy.i_msg < ARRAY_SIZE(msg_spy.msgs))) > { > msg_spy.msgs[msg_spy.i_msg].msg.hwnd = msg->hwnd; > msg_spy.msgs[msg_spy.i_msg].msg.message = msg->message; > @@ -94,7 +92,7 @@ static LRESULT CALLBACK call_wnd_proc_filter(int nCode, WPARAM wParam, > CWPSTRUCT *cwp = (CWPSTRUCT*)lParam; > > if (((cwp->hwnd == msg_spy.hwnd || msg_spy.hwnd == NULL)) && > - (msg_spy.i_msg < NUMELEMS(msg_spy.msgs))) > + (msg_spy.i_msg < ARRAY_SIZE(msg_spy.msgs))) > { > memcpy(&msg_spy.msgs[msg_spy.i_msg].msg, cwp, sizeof(msg_spy.msgs[0].msg)); > msg_spy.msgs[msg_spy.i_msg].post = FALSE; > @@ -126,7 +124,7 @@ static imm_msgs* msg_spy_find_next_msg(UINT message, UINT *start) { > > msg_spy_pump_msg_queue(); > > - if (msg_spy.i_msg >= NUMELEMS(msg_spy.msgs)) > + if (msg_spy.i_msg >= ARRAY_SIZE(msg_spy.msgs)) > fprintf(stdout, "%s:%d: msg_spy: message buffer overflow!\n", > __FILE__, __LINE__); > > @@ -1067,8 +1065,8 @@ static BOOL CALLBACK is_ime_window_proc(HWND hWnd, LPARAM param) > static const WCHAR imeW[] = {'I','M','E',0}; > WCHAR class_nameW[16]; > HWND *ime_window = (HWND *)param; > - if (GetClassNameW(hWnd, class_nameW, sizeof(class_nameW)/sizeof(class_nameW[0])) && > - !lstrcmpW(class_nameW, imeW)) { > + if (GetClassNameW(hWnd, class_nameW, ARRAY_SIZE(class_nameW)) && !lstrcmpW(class_nameW, imeW)) > + { > *ime_window = hWnd; > return FALSE; > } > @@ -1229,7 +1227,7 @@ static void test_default_ime_window_creation(void) > { FALSE, FALSE } > }; > > - for (i = 0; i < sizeof(testcases)/sizeof(testcases[0]); i++) > + for (i = 0; i < ARRAY_SIZE(testcases); i++) > { > thread = CreateThread(NULL, 0, test_default_ime_window_cb, &testcases[i], 0, NULL); > ok(thread != NULL, "CreateThread failed with error %u\n", GetLastError()); >

June 6, 2018

Re: [PATCH] ntoskrnl: Have MmIsAddressValid use IsBadReadPtr.

by Derek Lesho

Hi Thomas, in your example, does &Base refer to the base of ntoskrnl.exe? If so, why are you allocating a buffer there, wouldn't that corrupt the memory of ntoskrnl, or am I misunderstanding what your code is doing. On windows, do drivers have access to change the memory of ntoskrnl? Atleast in EAC, they find the address of a function inside of the ntoskrnl address space, and continuously decrement the address until MMisAddressValid returns FALSE. Without my patch, wine always returns FALSE to EAC, even on the first address check. On Wed, Jun 6, 2018 at 3:51 AM, Thomas Faber <thomas.faber(a)reactos.org> wrote: > > On 2018-06-06 04:36, Zhiyi Zhang wrote: > > The function is meant to be used in nt kernel space, however wineserver is > > in user space as far as I know. So we would need different implementation. > > > > May be we could do something like return !IsBadWritePtr(VirtualAddress, 1) || !IsBadReadPtr(VirtualAddress, 1). > > And write a test to verify such behavior. > > IsBadReadPtr(x) implies IsBadWritePtr(x), since Windows does not have a > concept of "write-only" access to pages. So checking both seems > unnecessary. > The real difference between IsBadReadPtr and MmIsAddressValid is that > the former can actually _make_ the address valid by causing a page > fault (and paging in or zeroing the page). MmIsAddressValid on the > other hand would simply look at the current state of the page table > entry without side effects. > > This stuff isn't hard to test per se, but a full test that's correct for > Windows kernel land will not currently work in Wine due to unimplemented > Mm stuff, e.g. > > for (protection in [PAGE_NOACCESS, PAGE_READONLY, PAGE_READWRITE]) > { > ZwAllocateVirtualMemory(..., &Base, ..., MEM_COMMIT, protection); > // physical page is not assigned until first access > todo_wine ok(!MmIsAddressValid(Base, 1), ...); > // force a physical page to appear and prevent it from getting paged out > mdl = IoAllocateMdl(Base, 1, FALSE, FALSE, NULL); > __TRY { MmProbeAndLockPages(mdl, UserMode, IoModifyAccess); todo_wine ok(protection != PAGE_NOACCESS, ...); } > __EXCEPT_PAGE_FAULT { ok(protection == PAGE_NOACCESS, ...); goto Next; } > // the system address is now guaranteed to be valid > todo_wine ok(MmIsAddressValid(MmGetSystemAddressForMdlSafe(mdl, NormalPagePriority), 1), ...); > MmUnlockPages... > Next: > IoFreeMdl... > ZwFreeVirtualMemory... > } > > ... has a todo with pretty much every ok(), with or without the patch :\ > > > With some luck, the simpler > void test_function() > { > ok(MmIsAddressValid((void*)test_function, ...); // fails in master, succeeds with patch? > ptr = ExAllocatePoolWithTag(NonPagedPool, ...) > ok(MmIsAddressValid(ptr, ...); > ExFreePoolWithTag... > ok(!MmIsAddressValid(NULL), ...); > } > > might be enough to show that the patch is correct though.

June 6, 2018