March 2018 - Wine-commits - list.winehq.org

Michael Stefaniuc : dmime: Reimplement ParseDescriptor for DMGraph.
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: 156aceebbe29560c4ff561185b92a533230b2ad4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=156aceebbe29560c4ff56118… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Mar 11 22:20:42 2018 +0100 dmime: Reimplement ParseDescriptor for DMGraph. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/graph.c | 172 ++++++++--------------------------------------- dlls/dmime/tests/dmime.c | 17 ++--- 2 files changed, 34 insertions(+), 155 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=156aceebbe29560c4ff5…

1 0

Michael Stefaniuc : dmime/tests: Add ParseDescriptor NULL pointer tests.
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: 387a9f70387efdb5e16af5b44558360ddedf8677 URL: https://source.winehq.org/git/wine.git/?a=commit;h=387a9f70387efdb5e16af5b4… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Mar 11 22:20:43 2018 +0100 dmime/tests: Add ParseDescriptor NULL pointer tests. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/tests/dmime.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 69d8a99..d259e41 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -781,6 +781,19 @@ static void test_parsedescriptor(void) wine_dbgstr_guid(&desc.guidClass), forms[i].class); IStream_Release(stream); + /* NULL pointers */ + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + hr = IDirectMusicObject_ParseDescriptor(dmo, NULL, &desc); + ok(hr == E_POINTER, "ParseDescriptor failed: %08x, expected E_POINTER\n", hr); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, NULL); + if (forms[i].needs_size) + ok(hr == E_INVALIDARG, "ParseDescriptor failed: %08x, expected E_INVALIDARG\n", hr); + else + ok(hr == E_POINTER, "ParseDescriptor failed: %08x, expected E_POINTER\n", hr); + hr = IDirectMusicObject_ParseDescriptor(dmo, NULL, NULL); + ok(hr == E_POINTER, "ParseDescriptor failed: %08x, expected E_POINTER\n", hr); + /* Wrong form */ empty[1] = DMUS_FOURCC_CONTAINER_FORM; stream = gen_riff_stream(empty);

1 0

Akihiro Sagawa : user32: Add more ex-style trace messages.
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: 8960cf3d44d26c8d3043734ef2a6bb2bb019ea20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8960cf3d44d26c8d3043734e… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Mar 11 22:14:20 2018 +0900 user32: Add more ex-style trace messages. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 794f333..8c89768 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1292,7 +1292,10 @@ static void dump_window_styles( DWORD style, DWORD exstyle ) if(exstyle & WS_EX_STATICEDGE) TRACE(" WS_EX_STATICEDGE"); if(exstyle & WS_EX_APPWINDOW) TRACE(" WS_EX_APPWINDOW"); if(exstyle & WS_EX_LAYERED) TRACE(" WS_EX_LAYERED"); + if(exstyle & WS_EX_NOINHERITLAYOUT) TRACE(" WS_EX_NOINHERITLAYOUT"); if(exstyle & WS_EX_LAYOUTRTL) TRACE(" WS_EX_LAYOUTRTL"); + if(exstyle & WS_EX_COMPOSITED) TRACE(" WS_EX_COMPOSITED"); + if(exstyle & WS_EX_NOACTIVATE) TRACE(" WS_EX_NOACTIVATE"); #define DUMPED_EX_STYLES \ ((DWORD)(WS_EX_DLGMODALFRAME | \ @@ -1313,7 +1316,10 @@ static void dump_window_styles( DWORD style, DWORD exstyle ) WS_EX_STATICEDGE | \ WS_EX_APPWINDOW | \ WS_EX_LAYERED | \ - WS_EX_LAYOUTRTL)) + WS_EX_NOINHERITLAYOUT | \ + WS_EX_LAYOUTRTL | \ + WS_EX_COMPOSITED |\ + WS_EX_NOACTIVATE)) if(exstyle & ~DUMPED_EX_STYLES) TRACE(" %08x", exstyle & ~DUMPED_EX_STYLES); TRACE("\n");

1 0

Alistair Leslie-Hughes : crypt32: Add CryptSIPRetrieveSubjectGuidForCatalogFile stub.
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: de8a1603aaf4dabc50a6e54473646550f86601a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de8a1603aaf4dabc50a6e544… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Mar 11 07:07:11 2018 +0000 crypt32: Add CryptSIPRetrieveSubjectGuidForCatalogFile stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/crypt32.spec | 1 + dlls/crypt32/sip.c | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index fc0955e..0bc78a1 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -177,6 +177,7 @@ @ stdcall CryptSIPRemoveProvider(ptr) @ stdcall CryptSIPRemoveSignedDataMsg(ptr long) @ stdcall CryptSIPRetrieveSubjectGuid(wstr long ptr) +@ stdcall CryptSIPRetrieveSubjectGuidForCatalogFile(wstr long ptr) @ stdcall CryptSIPVerifyIndirectData(ptr ptr) @ stub CryptSetAsyncParam @ stdcall CryptSetOIDFunctionValue(long str str wstr long ptr long) diff --git a/dlls/crypt32/sip.c b/dlls/crypt32/sip.c index 8b561fd..b0c4692 100644 --- a/dlls/crypt32/sip.c +++ b/dlls/crypt32/sip.c @@ -801,3 +801,13 @@ BOOL WINAPI CryptSIPVerifyIndirectData(SIP_SUBJECTINFO* pSubjectInfo, TRACE("returning %d\n", ret); return ret; } + +/*********************************************************************** + * CryptSIPRetrieveSubjectGuidForCatalogFile (CRYPT32.@) + */ +BOOL WINAPI CryptSIPRetrieveSubjectGuidForCatalogFile(LPCWSTR filename, HANDLE handle, GUID *subject) +{ + FIXME("(%s %p %p)\n", debugstr_w(filename), handle, subject); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; +}

1 0

Zebediah Figura : devenum: Register legacy AM filters as devenum codecs, not through FilterMapper2.
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: 5b4a18283b45fd27312a5dac2334b0cb00789ed9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b4a18283b45fd27312a5dac… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Mar 10 22:11:51 2018 -0600 devenum: Register legacy AM filters as devenum codecs, not through FilterMapper2. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/Makefile.in | 4 +- dlls/devenum/createdevenum.c | 256 +++++++++++++++++++++++++-------------- dlls/devenum/fil_data.idl | 47 +++++++ dlls/devenum/tests/devenum.c | 76 +++++++++++- dlls/quartz/tests/filtermapper.c | 18 +++ 5 files changed, 307 insertions(+), 94 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5b4a18283b45fd27312a…

1 0

Matteo Bruni : wined3d: Restore the correct sub resource in texture2d_load_fb_texture().
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: cca2867b3c9eab1730c34ec82ecaf82823196520 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cca2867b3c9eab1730c34ec8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 12 12:54:45 2018 +0330 wined3d: Restore the correct sub resource in texture2d_load_fb_texture(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index fa25b03..e98541c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1518,7 +1518,7 @@ void texture2d_load_fb_texture(struct wined3d_texture *texture, checkGLcall("glCopyTexSubImage2D"); if (restore_texture) - context_restore(context, restore_texture->sub_resources[sub_resource_idx].u.surface); + context_restore(context, restore_texture->sub_resources[restore_idx].u.surface); } /* Does a direct frame buffer -> texture copy. Stretching is done with single

1 0

Matteo Bruni : d3d9: Create single-level textures if the format doesn' t support AUTOGENMIPMAP.
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: ec74a30a180728820f1d720094ba09cdfeb6aed4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec74a30a180728820f1d7200… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 9 12:10:39 2018 -0600 d3d9: Create single-level textures if the format doesn't support AUTOGENMIPMAP. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/texture.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index e7efe73..0858be9 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1339,9 +1339,22 @@ HRESULT texture_init(struct d3d9_texture *texture, struct d3d9_device *device, WARN("D3DUSAGE_AUTOGENMIPMAP texture with %u levels, returning D3DERR_INVALIDCALL.\n", levels); return D3DERR_INVALIDCALL; } - flags |= WINED3D_TEXTURE_CREATE_GENERATE_MIPMAPS; + wined3d_mutex_lock(); + hr = wined3d_check_device_format(device->d3d_parent->wined3d, 0, WINED3D_DEVICE_TYPE_HAL, WINED3DFMT_B8G8R8A8_UNORM, + WINED3DUSAGE_TEXTURE | WINED3DUSAGE_QUERY_GENMIPMAP, WINED3D_RTYPE_TEXTURE_2D, wined3dformat_from_d3dformat(format)); + wined3d_mutex_unlock(); + if (hr == D3D_OK) + { + flags |= WINED3D_TEXTURE_CREATE_GENERATE_MIPMAPS; + levels = 0; + } + else + { + WARN("D3DUSAGE_AUTOGENMIPMAP not supported on D3DFORMAT %#x, creating a texture " + "with a single level.\n", format); + levels = 1; + } texture->autogen_filter_type = D3DTEXF_LINEAR; - levels = 0; } else {

1 0

Matteo Bruni : d3d9/tests: Add a visual test for D3DUSAGE_AUTOGENMIPMAP with unsupported format.
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: 009765bb630916a74295f165827833d4aa11a316 URL: https://source.winehq.org/git/wine.git/?a=commit;h=009765bb630916a74295f165… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 9 12:10:40 2018 -0600 d3d9/tests: Add a visual test for D3DUSAGE_AUTOGENMIPMAP with unsupported format. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 3686fc6..358ed1d 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -6455,6 +6455,76 @@ static void test_mipmap_autogen(void) color = getPixelColor(device, 440, 270); ok(color == 0x0000ff00, "Unexpected color 0x%08x.\n", color); + /* Test format not supporting D3DUSAGE_AUTOGENMIPMAP. */ + hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, D3DUSAGE_AUTOGENMIPMAP, D3DRTYPE_TEXTURE, D3DFMT_A1R5G5B5); + if (hr != D3DOK_NOAUTOGEN) + { + skip("D3DFMT_A1R5G5B5 support is not D3DOK_NOAUTOGEN (%#x).\n", hr); + } + else + { + hr = IDirect3DDevice9_CreateTexture(device, 1024, 1024, 0, D3DUSAGE_AUTOGENMIPMAP, + D3DFMT_A1R5G5B5, D3DPOOL_MANAGED, &texture, 0); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + hr = IDirect3DTexture9_LockRect(texture, 0, &lr, NULL, 0); + ok(SUCCEEDED(hr), "Failed to map texture, hr %#x.\n", hr); + for (y = 0; y < 1024; ++y) + { + for (x = 0; x < 1024; ++x) + { + WORD *dst = (WORD *)(((BYTE *)lr.pBits) + y * lr.Pitch + x * 2); + POINT pt; + + pt.x = x; + pt.y = y; + if (PtInRect(&r1, pt)) + *dst = 0xfc00; + else if (PtInRect(&r2, pt)) + *dst = 0x83e0; + else if (PtInRect(&r3, pt)) + *dst = 0x801f; + else if (PtInRect(&r4, pt)) + *dst = 0x8000; + else + *dst = 0xffff; + } + } + hr = IDirect3DTexture9_UnlockRect(texture, 0); + ok(SUCCEEDED(hr), "Failed to unmap texture, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)texture); + ok(SUCCEEDED(hr), "Failed to set texture, %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + IDirect3DTexture9_Release(texture); + + color = getPixelColor(device, 200, 200); + ok(color == 0x00ffffff, "Unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 280, 200); + ok(color == 0x000000ff, "Unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 360, 200); + ok(color == 0x00000000, "Unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 440, 200); + ok(color == 0x00ffffff, "Unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 200, 270); + ok(color == 0x00ffffff, "Unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 280, 270); + ok(color == 0x00ff0000, "Unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 360, 270); + ok(color == 0x0000ff00, "Unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 440, 270); + ok(color == 0x00ffffff, "Unexpected color 0x%08x.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + } + IDirect3DSurface9_Release(backbuffer); refcount = IDirect3DDevice9_Release(device);

1 0

Matteo Bruni : include: Add d3d9 enum values and defines for dual source blending.
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: 5147ffe42e626e4c165c4767dfa3cf2d62bfe846 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5147ffe42e626e4c165c4767… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 9 12:10:41 2018 -0600 include: Add d3d9 enum values and defines for dual source blending. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d9caps.h | 32 ++++++++++++++++++-------------- include/d3d9types.h | 4 ++++ 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/include/d3d9caps.h b/include/d3d9caps.h index 424b20c..24ba14c 100644 --- a/include/d3d9caps.h +++ b/include/d3d9caps.h @@ -73,20 +73,24 @@ #define D3DLINECAPS_FOG 0x10 #define D3DLINECAPS_ANTIALIAS 0x20 -#define D3DPBLENDCAPS_ZERO 0x00000001 -#define D3DPBLENDCAPS_ONE 0x00000002 -#define D3DPBLENDCAPS_SRCCOLOR 0x00000004 -#define D3DPBLENDCAPS_INVSRCCOLOR 0x00000008 -#define D3DPBLENDCAPS_SRCALPHA 0x00000010 -#define D3DPBLENDCAPS_INVSRCALPHA 0x00000020 -#define D3DPBLENDCAPS_DESTALPHA 0x00000040 -#define D3DPBLENDCAPS_INVDESTALPHA 0x00000080 -#define D3DPBLENDCAPS_DESTCOLOR 0x00000100 -#define D3DPBLENDCAPS_INVDESTCOLOR 0x00000200 -#define D3DPBLENDCAPS_SRCALPHASAT 0x00000400 -#define D3DPBLENDCAPS_BOTHSRCALPHA 0x00000800 -#define D3DPBLENDCAPS_BOTHINVSRCALPHA 0x00001000 -#define D3DPBLENDCAPS_BLENDFACTOR 0x00002000 +#define D3DPBLENDCAPS_ZERO __MSABI_LONG(0x00000001) +#define D3DPBLENDCAPS_ONE __MSABI_LONG(0x00000002) +#define D3DPBLENDCAPS_SRCCOLOR __MSABI_LONG(0x00000004) +#define D3DPBLENDCAPS_INVSRCCOLOR __MSABI_LONG(0x00000008) +#define D3DPBLENDCAPS_SRCALPHA __MSABI_LONG(0x00000010) +#define D3DPBLENDCAPS_INVSRCALPHA __MSABI_LONG(0x00000020) +#define D3DPBLENDCAPS_DESTALPHA __MSABI_LONG(0x00000040) +#define D3DPBLENDCAPS_INVDESTALPHA __MSABI_LONG(0x00000080) +#define D3DPBLENDCAPS_DESTCOLOR __MSABI_LONG(0x00000100) +#define D3DPBLENDCAPS_INVDESTCOLOR __MSABI_LONG(0x00000200) +#define D3DPBLENDCAPS_SRCALPHASAT __MSABI_LONG(0x00000400) +#define D3DPBLENDCAPS_BOTHSRCALPHA __MSABI_LONG(0x00000800) +#define D3DPBLENDCAPS_BOTHINVSRCALPHA __MSABI_LONG(0x00001000) +#define D3DPBLENDCAPS_BLENDFACTOR __MSABI_LONG(0x00002000) +#ifndef D3D_DISABLE_9EX +#define D3DPBLENDCAPS_SRCCOLOR2 __MSABI_LONG(0x00004000) +#define D3DPBLENDCAPS_INVSRCCOLOR2 __MSABI_LONG(0x00008000) +#endif #define D3DPCMPCAPS_NEVER 0x01 #define D3DPCMPCAPS_LESS 0x02 diff --git a/include/d3d9types.h b/include/d3d9types.h index ed14e9b..bb7e3a0 100644 --- a/include/d3d9types.h +++ b/include/d3d9types.h @@ -679,6 +679,10 @@ typedef enum _D3DBLEND { D3DBLEND_BOTHINVSRCALPHA = 13, D3DBLEND_BLENDFACTOR = 14, D3DBLEND_INVBLENDFACTOR = 15, +#ifndef D3D_DISABLE_9EX + D3DBLEND_SRCCOLOR2 = 16, + D3DBLEND_INVSRCCOLOR2 = 17, +#endif D3DBLEND_FORCE_DWORD = 0x7fffffff } D3DBLEND;

1 0

Matteo Bruni : include: Update d3d9 headers.
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: 2c1a8b3b774e2ffe9b13c9e0446e4e1864a610ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c1a8b3b774e2ffe9b13c9e0… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 9 12:10:42 2018 -0600 include: Update d3d9 headers. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d9caps.h | 37 +++++++++++-------- include/d3d9types.h | 101 ++++++++++++++++++++++++++++++++++------------------ 2 files changed, 88 insertions(+), 50 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2c1a8b3b774e2ffe9b13…

1 0