August 2019 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Always report WINEDDSCAPS_TEXTURE, WINEDDSCAPS_ZBUFFER and WINEDDSCAPS_MIPMAP.
by Alexandre Julliard 12 Aug '19

12 Aug '19

Module: wine Branch: master Commit: 5eca371a6ce7e72cabacd6ab34cb31e9665e6a07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5eca371a6ce7e72cabacd6ab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 11 14:23:15 2019 +0430 wined3d: Always report WINEDDSCAPS_TEXTURE, WINEDDSCAPS_ZBUFFER and WINEDDSCAPS_MIPMAP. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 14 ++++---------- dlls/ddraw/tests/ddraw2.c | 14 ++++---------- dlls/ddraw/tests/ddraw4.c | 14 ++++---------- dlls/ddraw/tests/ddraw7.c | 14 ++++---------- dlls/wined3d/adapter_gl.c | 5 +---- dlls/wined3d/adapter_vk.c | 5 +---- dlls/wined3d/directx.c | 5 ++++- 7 files changed, 22 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5eca371a6ce7e72cabac…

1 0

Henri Verbeet : wined3d: Report WINEDDSCAPS_BACKBUFFER and WINEDDSCAPS_FRONTBUFFER only on 3D devices.
by Alexandre Julliard 12 Aug '19

12 Aug '19

Module: wine Branch: master Commit: 4773e0add0dac03be820925ae60b0bdf5da05f0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4773e0add0dac03be820925a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 11 14:23:16 2019 +0430 wined3d: Report WINEDDSCAPS_BACKBUFFER and WINEDDSCAPS_FRONTBUFFER only on 3D devices. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 8 ++++++-- dlls/ddraw/tests/ddraw2.c | 8 ++++++-- dlls/ddraw/tests/ddraw4.c | 8 ++++++-- dlls/ddraw/tests/ddraw7.c | 8 ++++++-- dlls/wined3d/adapter_gl.c | 4 +++- dlls/wined3d/adapter_vk.c | 4 +++- dlls/wined3d/directx.c | 4 +--- 7 files changed, 31 insertions(+), 13 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 9efb60a..e7bd9e1 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -12894,6 +12894,7 @@ static void test_caps(void) DDCAPS hal_caps, hel_caps; IDirectDraw *ddraw; HRESULT hr; + BOOL no3d; caps_never = DDSCAPS_RESERVED1 | DDSCAPS_ALPHA @@ -12944,6 +12945,7 @@ static void test_caps(void) "Got unexpected caps %#x, expected %#x.\n", hel_caps.ddsOldCaps.dwCaps, hel_caps.ddsCaps.dwCaps); + no3d = !(hal_caps.ddsCaps.dwCaps & DDSCAPS_3DDEVICE); if (hal_caps.ddsCaps.dwCaps) { ok(!(hal_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); @@ -12952,7 +12954,8 @@ static void test_caps(void) } ok(!(hel_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); ok(!(~hel_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); - todo_wine ok(!(hel_caps.ddsCaps.dwCaps & caps_hal), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); + todo_wine_if(!no3d) ok(!(hel_caps.ddsCaps.dwCaps & caps_hal), + "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); IDirectDraw_Release(ddraw); @@ -13001,7 +13004,8 @@ static void test_caps(void) todo_wine ok(!hal_caps.ddsCaps.dwCaps, "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); ok(!(hel_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); ok(!(~hel_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); - todo_wine ok(!(hel_caps.ddsCaps.dwCaps & caps_hal), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); + todo_wine_if(!no3d) ok(!(hel_caps.ddsCaps.dwCaps & caps_hal), + "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); IDirectDraw_Release(ddraw); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index aa32b02..db0a39d 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -13771,6 +13771,7 @@ static void test_caps(void) IDirectDraw2 *ddraw; IDirectDraw *ddraw1; HRESULT hr; + BOOL no3d; caps_never = DDSCAPS_RESERVED1 | DDSCAPS_ALPHA @@ -13821,6 +13822,7 @@ static void test_caps(void) "Got unexpected caps %#x, expected %#x.\n", hel_caps.ddsOldCaps.dwCaps, hel_caps.ddsCaps.dwCaps); + no3d = !(hal_caps.ddsCaps.dwCaps & DDSCAPS_3DDEVICE); if (hal_caps.ddsCaps.dwCaps) { ok(!(hal_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); @@ -13829,7 +13831,8 @@ static void test_caps(void) } ok(!(hel_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); ok(!(~hel_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); - todo_wine ok(!(hel_caps.ddsCaps.dwCaps & caps_hal), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); + todo_wine_if(!no3d) ok(!(hel_caps.ddsCaps.dwCaps & caps_hal), + "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); IDirectDraw2_Release(ddraw); @@ -13884,7 +13887,8 @@ static void test_caps(void) todo_wine ok(!hal_caps.ddsCaps.dwCaps, "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); ok(!(hel_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); ok(!(~hel_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); - todo_wine ok(!(hel_caps.ddsCaps.dwCaps & caps_hal), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); + todo_wine_if(!no3d) ok(!(hel_caps.ddsCaps.dwCaps & caps_hal), + "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); IDirectDraw2_Release(ddraw); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index f08a6df..c182abf 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -16332,6 +16332,7 @@ static void test_caps(void) IDirectDraw4 *ddraw; IDirectDraw *ddraw1; HRESULT hr; + BOOL no3d; caps_never = DDSCAPS_RESERVED1 | DDSCAPS_ALPHA @@ -16382,6 +16383,7 @@ static void test_caps(void) "Got unexpected caps %#x, expected %#x.\n", hel_caps.ddsOldCaps.dwCaps, hel_caps.ddsCaps.dwCaps); + no3d = !(hal_caps.ddsCaps.dwCaps & DDSCAPS_3DDEVICE); if (hal_caps.ddsCaps.dwCaps) { ok(!(hal_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); @@ -16390,7 +16392,8 @@ static void test_caps(void) } ok(!(hel_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); ok(!(~hel_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); - todo_wine ok(!(hel_caps.ddsCaps.dwCaps & caps_hal), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); + todo_wine_if(!no3d) ok(!(hel_caps.ddsCaps.dwCaps & caps_hal), + "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); IDirectDraw4_Release(ddraw); @@ -16445,7 +16448,8 @@ static void test_caps(void) todo_wine ok(!hal_caps.ddsCaps.dwCaps, "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); ok(!(hel_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); ok(!(~hel_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); - todo_wine ok(!(hel_caps.ddsCaps.dwCaps & caps_hal), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); + todo_wine_if(!no3d) ok(!(hel_caps.ddsCaps.dwCaps & caps_hal), + "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); IDirectDraw4_Release(ddraw); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index f6c5022..48121b6 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -16304,6 +16304,7 @@ static void test_caps(void) DDCAPS hal_caps, hel_caps; IDirectDraw7 *ddraw; HRESULT hr; + BOOL no3d; caps_never = DDSCAPS_RESERVED1 | DDSCAPS_ALPHA @@ -16354,6 +16355,7 @@ static void test_caps(void) "Got unexpected caps %#x, expected %#x.\n", hel_caps.ddsOldCaps.dwCaps, hel_caps.ddsCaps.dwCaps); + no3d = !(hal_caps.ddsCaps.dwCaps & DDSCAPS_3DDEVICE); if (hal_caps.ddsCaps.dwCaps) { ok(!(hal_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); @@ -16362,7 +16364,8 @@ static void test_caps(void) } ok(!(hel_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); ok(!(~hel_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); - todo_wine ok(!(hel_caps.ddsCaps.dwCaps & caps_hal), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); + todo_wine_if(!no3d) ok(!(hel_caps.ddsCaps.dwCaps & caps_hal), + "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); IDirectDraw7_Release(ddraw); @@ -16411,7 +16414,8 @@ static void test_caps(void) todo_wine ok(!hal_caps.ddsCaps.dwCaps, "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); ok(!(hel_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); ok(!(~hel_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); - todo_wine ok(!(hel_caps.ddsCaps.dwCaps & caps_hal), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); + todo_wine_if(!no3d) ok(!(hel_caps.ddsCaps.dwCaps & caps_hal), + "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); IDirectDraw7_Release(ddraw); } diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index c8187e0..1287923 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4371,7 +4371,9 @@ static void adapter_gl_get_wined3d_caps(const struct wined3d_adapter *adapter, s const struct wined3d_d3d_info *d3d_info = &adapter->d3d_info; const struct wined3d_gl_info *gl_info = &adapter->gl_info; - caps->ddraw_caps.dds_caps |= WINEDDSCAPS_3DDEVICE + caps->ddraw_caps.dds_caps |= WINEDDSCAPS_BACKBUFFER + | WINEDDSCAPS_FRONTBUFFER + | WINEDDSCAPS_3DDEVICE | WINEDDSCAPS_VIDEOMEMORY; caps->ddraw_caps.caps |= WINEDDCAPS_3D; diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 3a1e817..f869318 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -297,7 +297,9 @@ static void adapter_vk_get_wined3d_caps(const struct wined3d_adapter *adapter, s const VkPhysicalDeviceLimits *limits = &adapter_vk->device_limits; BOOL sampler_anisotropy = limits->maxSamplerAnisotropy > 1.0f; - caps->ddraw_caps.dds_caps |= WINEDDSCAPS_3DDEVICE + caps->ddraw_caps.dds_caps |= WINEDDSCAPS_BACKBUFFER + | WINEDDSCAPS_FRONTBUFFER + | WINEDDSCAPS_3DDEVICE | WINEDDSCAPS_VIDEOMEMORY; caps->ddraw_caps.caps |= WINEDDCAPS_3D; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 83f90a7..201a5cf 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2192,9 +2192,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, unsigned in caps->ddraw_caps.ssb_color_key_caps = ckey_caps; caps->ddraw_caps.ssb_fx_caps = fx_caps; - caps->ddraw_caps.dds_caps = WINEDDSCAPS_BACKBUFFER - | WINEDDSCAPS_FLIP - | WINEDDSCAPS_FRONTBUFFER + caps->ddraw_caps.dds_caps = WINEDDSCAPS_FLIP | WINEDDSCAPS_OFFSCREENPLAIN | WINEDDSCAPS_PALETTE | WINEDDSCAPS_PRIMARYSURFACE

1 0

Henri Verbeet : wined3d: Report a few more ddraw surface caps on 3D devices.
by Alexandre Julliard 12 Aug '19

12 Aug '19

Module: wine Branch: master Commit: 96567c6900696d240d1641bd49d9b0832d8547bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=96567c6900696d240d1641bd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 11 14:23:17 2019 +0430 wined3d: Report a few more ddraw surface caps on 3D devices. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 6 ++++-- dlls/ddraw/tests/ddraw2.c | 6 ++++-- dlls/ddraw/tests/ddraw4.c | 6 ++++-- dlls/ddraw/tests/ddraw7.c | 6 ++++-- dlls/wined3d/adapter_gl.c | 7 ++++++- dlls/wined3d/adapter_vk.c | 6 +++++- 6 files changed, 27 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index e7bd9e1..acf8dd8 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -12950,7 +12950,8 @@ static void test_caps(void) { ok(!(hal_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); ok(!(~hal_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); - todo_wine ok(!(~hal_caps.ddsCaps.dwCaps & caps_hal), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); + todo_wine_if(no3d) ok(!(~hal_caps.ddsCaps.dwCaps & caps_hal), + "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); } ok(!(hel_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); ok(!(~hel_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); @@ -12979,7 +12980,8 @@ static void test_caps(void) ok(!(hal_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); ok(!(~hal_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); - todo_wine ok(!(~hal_caps.ddsCaps.dwCaps & caps_hal), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); + todo_wine_if(no3d) ok(!(~hal_caps.ddsCaps.dwCaps & caps_hal), + "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); todo_wine ok(!hel_caps.ddsCaps.dwCaps, "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); IDirectDraw_Release(ddraw); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index db0a39d..33bc943 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -13827,7 +13827,8 @@ static void test_caps(void) { ok(!(hal_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); ok(!(~hal_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); - todo_wine ok(!(~hal_caps.ddsCaps.dwCaps & caps_hal), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); + todo_wine_if(no3d) ok(!(~hal_caps.ddsCaps.dwCaps & caps_hal), + "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); } ok(!(hel_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); ok(!(~hel_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); @@ -13859,7 +13860,8 @@ static void test_caps(void) ok(!(hal_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); ok(!(~hal_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); - todo_wine ok(!(~hal_caps.ddsCaps.dwCaps & caps_hal), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); + todo_wine_if(no3d) ok(!(~hal_caps.ddsCaps.dwCaps & caps_hal), + "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); todo_wine ok(!hel_caps.ddsCaps.dwCaps, "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); IDirectDraw2_Release(ddraw); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index c182abf..567a8f3 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -16388,7 +16388,8 @@ static void test_caps(void) { ok(!(hal_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); ok(!(~hal_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); - todo_wine ok(!(~hal_caps.ddsCaps.dwCaps & caps_hal), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); + todo_wine_if(no3d) ok(!(~hal_caps.ddsCaps.dwCaps & caps_hal), + "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); } ok(!(hel_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); ok(!(~hel_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); @@ -16420,7 +16421,8 @@ static void test_caps(void) ok(!(hal_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); ok(!(~hal_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); - todo_wine ok(!(~hal_caps.ddsCaps.dwCaps & caps_hal), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); + todo_wine_if(no3d) ok(!(~hal_caps.ddsCaps.dwCaps & caps_hal), + "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); todo_wine ok(!hel_caps.ddsCaps.dwCaps, "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); IDirectDraw4_Release(ddraw); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 48121b6..4027c72 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -16360,7 +16360,8 @@ static void test_caps(void) { ok(!(hal_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); ok(!(~hal_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); - todo_wine ok(!(~hal_caps.ddsCaps.dwCaps & caps_hal), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); + todo_wine_if(no3d) ok(!(~hal_caps.ddsCaps.dwCaps & caps_hal), + "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); } ok(!(hel_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); ok(!(~hel_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); @@ -16389,7 +16390,8 @@ static void test_caps(void) ok(!(hal_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); ok(!(~hal_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); - todo_wine ok(!(~hal_caps.ddsCaps.dwCaps & caps_hal), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); + todo_wine_if(no3d) ok(!(~hal_caps.ddsCaps.dwCaps & caps_hal), + "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); todo_wine ok(!hel_caps.ddsCaps.dwCaps, "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); IDirectDraw7_Release(ddraw); diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 1287923..d32b664 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4372,9 +4372,14 @@ static void adapter_gl_get_wined3d_caps(const struct wined3d_adapter *adapter, s const struct wined3d_gl_info *gl_info = &adapter->gl_info; caps->ddraw_caps.dds_caps |= WINEDDSCAPS_BACKBUFFER + | WINEDDSCAPS_COMPLEX | WINEDDSCAPS_FRONTBUFFER | WINEDDSCAPS_3DDEVICE - | WINEDDSCAPS_VIDEOMEMORY; + | WINEDDSCAPS_VIDEOMEMORY + | WINEDDSCAPS_OWNDC + | WINEDDSCAPS_LOCALVIDMEM + | WINEDDSCAPS_NONLOCALVIDMEM; + caps->ddraw_caps.caps |= WINEDDCAPS_3D; if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT] || gl_info->supported[EXT_FRAMEBUFFER_OBJECT]) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index f869318..c3a1832 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -298,9 +298,13 @@ static void adapter_vk_get_wined3d_caps(const struct wined3d_adapter *adapter, s BOOL sampler_anisotropy = limits->maxSamplerAnisotropy > 1.0f; caps->ddraw_caps.dds_caps |= WINEDDSCAPS_BACKBUFFER + | WINEDDSCAPS_COMPLEX | WINEDDSCAPS_FRONTBUFFER | WINEDDSCAPS_3DDEVICE - | WINEDDSCAPS_VIDEOMEMORY; + | WINEDDSCAPS_VIDEOMEMORY + | WINEDDSCAPS_OWNDC + | WINEDDSCAPS_LOCALVIDMEM + | WINEDDSCAPS_NONLOCALVIDMEM; caps->ddraw_caps.caps |= WINEDDCAPS_3D; caps->Caps2 |= WINED3DCAPS2_CANGENMIPMAP;

1 0

Alex Henrie : kernel32: Silence FIXME about FIND_FIRST_EX_LARGE_FETCH.
by Alexandre Julliard 12 Aug '19

12 Aug '19

Module: wine Branch: master Commit: cbd038f75cb15abb36f8c3af3694e587aff47542 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbd038f75cb15abb36f8c3af… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 12 00:03:17 2019 -0600 kernel32: Silence FIXME about FIND_FIRST_EX_LARGE_FETCH. This flag is only relevant for performance. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index bd10260..bd7ebd1 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1981,7 +1981,7 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, TRACE("%s %d %p %d %p %x\n", debugstr_w(filename), level, data, search_op, filter, flags); - if (flags != 0) + if (flags & ~FIND_FIRST_EX_LARGE_FETCH) { FIXME("flags not implemented 0x%08x\n", flags ); }

1 0

Alexandre Julliard : kernel32: Move file handle functions to kernelbase.
by Alexandre Julliard 12 Aug '19

12 Aug '19

Module: wine Branch: master Commit: ccf4ca825cf943c445c43ecb31941dba75173736 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccf4ca825cf943c445c43ecb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 12 11:34:07 2019 +0200 kernel32: Move file handle functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 1016 +-------------------------------------- dlls/kernel32/kernel32.spec | 60 +-- dlls/kernelbase/Makefile.in | 1 + dlls/kernelbase/file.c | 913 +++++++++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.h | 3 + dlls/kernelbase/kernelbase.spec | 60 +-- 6 files changed, 984 insertions(+), 1069 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ccf4ca825cf943c445c4…

1 0

Alexandre Julliard : kernel32: Move some file name functions to kernelbase.
by Alexandre Julliard 12 Aug '19

12 Aug '19

Module: wine Branch: master Commit: 0b45fc4750ac62e39fa8060baab9dd5b92dd6020 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b45fc4750ac62e39fa8060b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 12 12:02:53 2019 +0200 kernel32: Move some file name functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 608 ---------------------------------------- dlls/kernel32/kernel32.spec | 30 +- dlls/kernelbase/file.c | 546 ++++++++++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 30 +- 4 files changed, 576 insertions(+), 638 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0b45fc4750ac62e39fa8…

1 0

Alexandre Julliard : kernel32: Move some module functions to kernelbase.
by Alexandre Julliard 12 Aug '19

12 Aug '19

Module: wine Branch: master Commit: 05d00276c627753487c571c30fddfc56c02ad37e URL: https://source.winehq.org/git/wine.git/?a=commit;h=05d00276c627753487c571c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 12 12:46:39 2019 +0200 kernel32: Move some module functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 14 +-- dlls/kernel32/module.c | 215 ---------------------------------------- dlls/kernelbase/kernelbase.spec | 14 +-- dlls/kernelbase/loader.c | 174 +++++++++++++++++++++++++++++++- 4 files changed, 186 insertions(+), 231 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=05d00276c627753487c5…

1 0

Alexandre Julliard : kernel32: Move some directory functions to kernelbase.
by Alexandre Julliard 12 Aug '19

12 Aug '19

Module: wine Branch: master Commit: 2c73a08655bff435a84257f33f3cd13ef7519122 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c73a08655bff435a84257f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 12 16:15:16 2019 +0200 kernel32: Move some directory functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 18 ++--- dlls/kernel32/path.c | 142 --------------------------------- dlls/kernelbase/file.c | 173 ++++++++++++++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.h | 3 + dlls/kernelbase/kernelbase.spec | 22 ++--- dlls/kernelbase/registry.c | 7 +- dlls/kernelbase/version.c | 15 ++-- 7 files changed, 206 insertions(+), 174 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2c73a08655bff435a842…

1 0

Andrew Eikum : winebus.sys: Report device revision number for hidraw, too.
by Alexandre Julliard 12 Aug '19

12 Aug '19

Module: wine Branch: master Commit: d5fb7383d0066c2c3f6abfd738619414ad8f1786 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5fb7383d0066c2c3f6abfd7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Aug 9 13:45:22 2019 -0500 winebus.sys: Report device revision number for hidraw, too. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 08ad876..d9311a9 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1124,10 +1124,23 @@ next_line: return (found_id && found_serial); } +static DWORD a_to_bcd(const char *s) +{ + DWORD r = 0; + const char *c; + int shift = strlen(s) - 1; + for (c = s; *c; ++c) + { + r |= (*c - '0') << (shift * 4); + --shift; + } + return r; +} + static void try_add_device(struct udev_device *dev) { DWORD vid = 0, pid = 0, version = 0; - struct udev_device *hiddev = NULL; + struct udev_device *hiddev = NULL, *walk_device; DEVICE_OBJECT *device = NULL; const char *subsystem; const char *devnode; @@ -1150,6 +1163,7 @@ static void try_add_device(struct udev_device *dev) hiddev = udev_device_get_parent_with_subsystem_devtype(dev, "hid", NULL); if (hiddev) { + const char *bcdDevice = NULL; #ifdef HAS_PROPER_INPUT_HEADER const platform_vtbl *other_vtbl = NULL; DEVICE_OBJECT *dup = NULL; @@ -1171,6 +1185,17 @@ static void try_add_device(struct udev_device *dev) &vid, &pid, &input, &serial); if (serial == NULL) serial = strdupAtoW(base_serial); + + walk_device = dev; + while (walk_device && !bcdDevice) + { + bcdDevice = udev_device_get_sysattr_value(walk_device, "bcdDevice"); + walk_device = udev_device_get_parent(walk_device); + } + if (bcdDevice) + { + version = a_to_bcd(bcdDevice); + } } #ifdef HAS_PROPER_INPUT_HEADER else

1 0

Jacek Caban : mshtml/tests: Fix events.html on some win10 versions.
by Alexandre Julliard 12 Aug '19

12 Aug '19

Module: wine Branch: master Commit: 1d9d2dc36a8c0b7ad2491099033a3b0370921596 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d9d2dc36a8c0b7ad2491099… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 12 14:01:52 2019 +0200 mshtml/tests: Fix events.html on some win10 versions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/events.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/events.html b/dlls/mshtml/tests/events.html index 8bf2c50..a58b0e3 100644 --- a/dlls/mshtml/tests/events.html +++ b/dlls/mshtml/tests/events.html @@ -288,8 +288,8 @@ window.onload = function() { ok(inlscr_complete_called, "onreadystatechange not fired"); ok(extern_res_script_rs === "eval,complete1," || extern_res_script_rs == "loaded0,eval,complete1,", "extern_res_script_rs = " + extern_res_script_rs + " expected (loaded0)?,eval,complete1,"); - ok(extern_http_script_rs === "loading,loaded,complete,", - "extern_http_script_rs = " + extern_http_script_rs + " expected loading,loaded,complete,"); + ok(extern_http_script_rs === "loading,loaded,complete," || extern_http_script_rs === "complete,", + "extern_http_script_rs = " + extern_http_script_rs + " expected loading,loaded,complete, or complete,"); ok(cnt == 1, "cnt=" + cnt + " exception during loading?"); ok(this === window, "this !== window");

1 0