April 2015 - Wine-commits - list.winehq.org

Stefan Dösinger : wined3d: Move the ARB_texture_rectangle check to init_format_texture_info.
by Alexandre Julliard 27 Apr '15

27 Apr '15

Module: wine Branch: master Commit: 0152b0dad33ee356f1dfeb7f3c0535de7c6aa1f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0152b0dad33ee356f1dfeb7f3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Apr 26 16:09:12 2015 +0200 wined3d: Move the ARB_texture_rectangle check to init_format_texture_info. --- dlls/wined3d/texture.c | 53 ++++++++++++++++++++++++++++++++------------------ dlls/wined3d/utils.c | 3 ++- 2 files changed, 36 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 589f8bf..916bcb2 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1076,6 +1076,9 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 UINT pow2_width, pow2_height; unsigned int i; HRESULT hr; + enum wined3d_gl_resource_type gl_type; + unsigned int required_flags = 0, ds_flags = WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL; + const struct wined3d_format *format; /* TODO: It should only be possible to create textures for formats * that are reported as supported. */ @@ -1084,6 +1087,7 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 WARN("(%p) : Texture cannot be created with a format of WINED3DFMT_UNKNOWN.\n", texture); return WINED3DERR_INVALIDCALL; } + format = wined3d_get_format(gl_info, desc->format); /* Non-power2 support. */ if (gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO]) @@ -1134,6 +1138,23 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 } } + if (desc->usage & WINED3DUSAGE_TEXTURE) + required_flags |= WINED3DFMT_FLAG_TEXTURE; + if (desc->usage & WINED3DUSAGE_RENDERTARGET) + required_flags |= WINED3DFMT_FLAG_RENDERTARGET; + /* WINED3DUSAGE_DEPTHSTENCIL needs WINED3DFMT_FLAG_DEPTH or WINED3DFMT_FLAG_STENCIL, not both. */ + + if ((format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & required_flags) == required_flags + && (!(desc->usage & WINED3DUSAGE_DEPTHSTENCIL) || (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & ds_flags)) + && (gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT] + || (desc->width == pow2_width && desc->height == pow2_height))) + gl_type = WINED3D_GL_RES_TYPE_TEX_2D; + else if ((format->flags[WINED3D_GL_RES_TYPE_TEX_RECT] & required_flags) == required_flags + && (!(desc->usage & WINED3DUSAGE_DEPTHSTENCIL) || (format->flags[WINED3D_GL_RES_TYPE_TEX_RECT] & ds_flags))) + gl_type = WINED3D_GL_RES_TYPE_TEX_RECT; + else + gl_type = WINED3D_GL_RES_TYPE_TEX_2D; /* No error, may be SCRATCH pool or emulated conditional np2. */ + if (FAILED(hr = wined3d_texture_init(texture, &texture2d_ops, 1, levels, desc, surface_flags, WINED3D_GL_RES_TYPE_TEX_2D, device, parent, parent_ops, &texture_resource_ops))) { @@ -1142,18 +1163,7 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 } /* Precalculated scaling for 'faked' non power of two texture coords. */ - if (gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT] - && (desc->width != pow2_width || desc->height != pow2_height)) - { - texture->pow2_matrix[0] = 1.0f; - texture->pow2_matrix[5] = 1.0f; - texture->pow2_matrix[10] = 1.0f; - texture->pow2_matrix[15] = 1.0f; - texture->target = GL_TEXTURE_2D; - texture->flags |= WINED3D_TEXTURE_COND_NP2; - } - else if (gl_info->supported[ARB_TEXTURE_RECTANGLE] - && (desc->width != pow2_width || desc->height != pow2_height)) + if (gl_type == WINED3D_GL_RES_TYPE_TEX_RECT) { texture->pow2_matrix[0] = (float)desc->width; texture->pow2_matrix[5] = (float)desc->height; @@ -1165,21 +1175,26 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 } else { - if ((desc->width != pow2_width) || (desc->height != pow2_height)) + texture->target = GL_TEXTURE_2D; + if (desc->width == pow2_width && desc->height == pow2_height) { - texture->pow2_matrix[0] = (((float)desc->width) / ((float)pow2_width)); - texture->pow2_matrix[5] = (((float)desc->height) / ((float)pow2_height)); - texture->flags &= ~WINED3D_TEXTURE_POW2_MAT_IDENT; + texture->pow2_matrix[0] = 1.0f; + texture->pow2_matrix[5] = 1.0f; } - else + else if (gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT]) { texture->pow2_matrix[0] = 1.0f; texture->pow2_matrix[5] = 1.0f; + texture->flags |= WINED3D_TEXTURE_COND_NP2; + } + else + { + texture->pow2_matrix[0] = (((float)desc->width) / ((float)pow2_width)); + texture->pow2_matrix[5] = (((float)desc->height) / ((float)pow2_height)); + texture->flags &= ~WINED3D_TEXTURE_POW2_MAT_IDENT; } - texture->pow2_matrix[10] = 1.0f; texture->pow2_matrix[15] = 1.0f; - texture->target = GL_TEXTURE_2D; } TRACE("xf(%f) yf(%f)\n", texture->pow2_matrix[0], texture->pow2_matrix[5]); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 405a79c..8a7075d 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1861,7 +1861,8 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win format->flags[WINED3D_GL_RES_TYPE_TEX_3D] |= format_texture_info[i].flags; if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) format->flags[WINED3D_GL_RES_TYPE_TEX_CUBE] |= format_texture_info[i].flags; - format->flags[WINED3D_GL_RES_TYPE_TEX_RECT] |= format_texture_info[i].flags; + if (gl_info->supported[ARB_TEXTURE_RECTANGLE]) + format->flags[WINED3D_GL_RES_TYPE_TEX_RECT] |= format_texture_info[i].flags; format->flags[WINED3D_GL_RES_TYPE_BUFFER] |= format_texture_info[i].flags; if (gl_info->supported[ARB_INTERNALFORMAT_QUERY2])

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 27 Apr '15

27 Apr '15

Module: wine Branch: master Commit: 7929155e55e1f25a09eb1174293ca9d098768657 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7929155e55e1f25a09eb11742… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Apr 25 09:52:46 2015 +0200 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/ddraw1.c | 10 +++++----- dlls/ddraw/tests/ddraw2.c | 10 +++++----- dlls/ddraw/tests/ddraw4.c | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index ab6bf36..839b2b7 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -5612,11 +5612,11 @@ static void test_lighting(void) memset(&light_desc, 0, sizeof(light_desc)); light_desc.dwSize = sizeof(light_desc); light_desc.dltType = D3DLIGHT_DIRECTIONAL; - U1(U(light_desc).dcvColor).r = 0.0f; - U2(U(light_desc).dcvColor).g = 0.0f; - U3(U(light_desc).dcvColor).b = 1.0f; - U4(U(light_desc).dcvColor).a = 1.0f; - light_desc.dvDirection.z = 1.0f; + U1(light_desc.dcvColor).r = 0.0f; + U2(light_desc.dcvColor).g = 0.0f; + U3(light_desc.dcvColor).b = 1.0f; + U4(light_desc.dcvColor).a = 1.0f; + U3(light_desc.dvDirection).z = 1.0f; hr = IDirect3DLight_SetLight(light, &light_desc); ok(SUCCEEDED(hr), "Failed to set light, hr %#x.\n", hr); hr = IDirect3DViewport_AddLight(viewport, light); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 11248f5..42f65bc 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -6587,11 +6587,11 @@ static void test_lighting(void) memset(&light_desc, 0, sizeof(light_desc)); light_desc.dwSize = sizeof(light_desc); light_desc.dltType = D3DLIGHT_DIRECTIONAL; - U1(U(light_desc).dcvColor).r = 0.0f; - U2(U(light_desc).dcvColor).g = 0.0f; - U3(U(light_desc).dcvColor).b = 1.0f; - U4(U(light_desc).dcvColor).a = 1.0f; - light_desc.dvDirection.z = 1.0f; + U1(light_desc.dcvColor).r = 0.0f; + U2(light_desc.dcvColor).g = 0.0f; + U3(light_desc.dcvColor).b = 1.0f; + U4(light_desc.dcvColor).a = 1.0f; + U3(light_desc.dvDirection).z = 1.0f; hr = IDirect3DLight_SetLight(light, (D3DLIGHT *)&light_desc); ok(SUCCEEDED(hr), "Failed to set light, hr %#x.\n", hr); hr = IDirect3DViewport2_AddLight(viewport, light); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index aedc11c..ddb7a1d 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -3938,11 +3938,11 @@ static void test_lighting(void) memset(&light_desc, 0, sizeof(light_desc)); light_desc.dwSize = sizeof(light_desc); light_desc.dltType = D3DLIGHT_DIRECTIONAL; - U1(U(light_desc).dcvColor).r = 1.0f; - U2(U(light_desc).dcvColor).g = 1.0f; - U3(U(light_desc).dcvColor).b = 1.0f; - U4(U(light_desc).dcvColor).a = 1.0f; - light_desc.dvDirection.z = 1.0f; + U1(light_desc.dcvColor).r = 1.0f; + U2(light_desc.dcvColor).g = 1.0f; + U3(light_desc.dcvColor).b = 1.0f; + U4(light_desc.dcvColor).a = 1.0f; + U3(light_desc.dvDirection).z = 1.0f; hr = IDirect3DLight_SetLight(light, (D3DLIGHT *)&light_desc); ok(SUCCEEDED(hr), "Failed to set light, hr %#x.\n", hr); hr = IDirect3DViewport3_AddLight(viewport, light);

1 0

Francois Gouget : ole32; Fix some storage32 comments and standardize some virtual table names.
by Alexandre Julliard 27 Apr '15

27 Apr '15

Module: wine Branch: master Commit: 770385262730eb88b27916aceadd620c329cc396 URL: http://source.winehq.org/git/wine.git/?a=commit;h=770385262730eb88b27916ace… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Apr 25 10:03:28 2015 +0200 ole32; Fix some storage32 comments and standardize some virtual table names. --- dlls/ole32/storage32.c | 86 +++++++++++++++++++++++++------------------------- 1 file changed, 43 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=770385262730eb88b2791…

1 0

Francois Gouget : kernel32/tests: Make test_StartupNoConsole() static.
by Alexandre Julliard 27 Apr '15

27 Apr '15

Module: wine Branch: master Commit: ad2c07888eb4bf433d7e8da19a974549f1ba4d1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad2c07888eb4bf433d7e8da19… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Apr 25 10:03:36 2015 +0200 kernel32/tests: Make test_StartupNoConsole() static. --- dlls/kernel32/tests/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 4f7c58d..6660af4 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2656,7 +2656,7 @@ static void test_BreakawayOk(HANDLE job) ok(ret, "SetInformationJobObject error %u\n", GetLastError()); } -void test_StartupNoConsole(void) +static void test_StartupNoConsole(void) { #ifndef _WIN64 char buffer[MAX_PATH];

1 0

Gerald Pfeifer : urlmon: Simplify a (redundant) expression in parse_canonicalize.
by Alexandre Julliard 27 Apr '15

27 Apr '15

Module: wine Branch: master Commit: 2cfdaaef557c1e2cb6b7454695e2c4ca3e381fd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cfdaaef557c1e2cb6b745469… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Apr 25 21:18:18 2015 +0200 urlmon: Simplify a (redundant) expression in parse_canonicalize. --- dlls/urlmon/uri.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index e43d372..48b485b 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -6842,8 +6842,7 @@ static HRESULT parse_canonicalize(const Uri *uri, DWORD flags, LPWSTR output, ptr = uri->canon_uri+uri->scheme_start+uri->scheme_len+1; pptr = &ptr; } - reduce_path = !(flags & URL_NO_META) && - !(flags & URL_DONT_SIMPLIFY) && + reduce_path = !(flags & URL_DONT_SIMPLIFY) && ptr && check_hierarchical(pptr); for(ptr = uri->canon_uri; ptr < uri->canon_uri+uri->canon_len; ++ptr) {

1 0

Mark Harmstone : include: Add buffered paint functions to uxtheme.h.
by Alexandre Julliard 27 Apr '15

27 Apr '15

Module: wine Branch: master Commit: 85d6a5b9c97dc3fbdab15f868a44e163380d3355 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85d6a5b9c97dc3fbdab15f868… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sat Apr 25 19:37:46 2015 +0100 include: Add buffered paint functions to uxtheme.h. --- include/uxtheme.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/uxtheme.h b/include/uxtheme.h index 4a43154..fa0d3cb 100644 --- a/include/uxtheme.h +++ b/include/uxtheme.h @@ -206,4 +206,11 @@ HPAINTBUFFER WINAPI BeginBufferedPaint(HDC, const RECT *, BP_BUFFERFORMAT, HRESULT WINAPI EndBufferedPaint(HPAINTBUFFER, BOOL); +HRESULT WINAPI BufferedPaintClear(HPAINTBUFFER, const RECT *); +HRESULT WINAPI BufferedPaintSetAlpha(HPAINTBUFFER, const RECT *, BYTE); +HRESULT WINAPI GetBufferedPaintBits(HPAINTBUFFER, RGBQUAD **, int *); +HDC WINAPI GetBufferedPaintDC(HPAINTBUFFER); +HDC WINAPI GetBufferedPaintTargetDC(HPAINTBUFFER); +HRESULT WINAPI GetBufferedPaintTargetRect(HPAINTBUFFER, RECT *prc); + #endif

1 0

Mark Harmstone : include: Add buffered animation functions to uxtheme.h.
by Alexandre Julliard 27 Apr '15

27 Apr '15

Module: wine Branch: master Commit: 4a1ebd7369ee8d7044a62887d9813c7aa3a5eeff URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a1ebd7369ee8d7044a62887d… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sat Apr 25 19:37:54 2015 +0100 include: Add buffered animation functions to uxtheme.h. --- include/uxtheme.h | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/include/uxtheme.h b/include/uxtheme.h index fa0d3cb..e6994a1 100644 --- a/include/uxtheme.h +++ b/include/uxtheme.h @@ -213,4 +213,32 @@ HDC WINAPI GetBufferedPaintDC(HPAINTBUFFER); HDC WINAPI GetBufferedPaintTargetDC(HPAINTBUFFER); HRESULT WINAPI GetBufferedPaintTargetRect(HPAINTBUFFER, RECT *prc); +/* double-buffered animation functions */ + +typedef HANDLE HANIMATIONBUFFER; + +typedef enum _BP_ANIMATIONSTYLE +{ + BPAS_NONE, + BPAS_LINEAR, + BPAS_CUBIC, + BPAS_SINE +} BP_ANIMATIONSTYLE; + +typedef struct _BP_ANIMATIONPARAMS +{ + DWORD cbSize; + DWORD dwFlags; + BP_ANIMATIONSTYLE style; + DWORD dwDuration; +} BP_ANIMATIONPARAMS, *PBP_ANIMATIONPARAMS; + +HANIMATIONBUFFER WINAPI BeginBufferedAnimation(HWND, HDC, const RECT *, + BP_BUFFERFORMAT, BP_PAINTPARAMS *, + BP_ANIMATIONPARAMS *, HDC *, HDC *); + +BOOL WINAPI BufferedPaintRenderAnimation(HWND, HDC); +HRESULT WINAPI BufferedPaintStopAllAnimations(HWND); +HRESULT WINAPI EndBufferedAnimation(HANIMATIONBUFFER, BOOL); + #endif

1 0

Nikolay Sivov : dwrite: Implement ApplyCharacterSpacing().
by Alexandre Julliard 27 Apr '15

27 Apr '15

Module: wine Branch: master Commit: 14158a71db73c4bfb4c293f67277fc2e79d310cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=14158a71db73c4bfb4c293f67… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 27 00:20:32 2015 +0300 dwrite: Implement ApplyCharacterSpacing(). --- dlls/dwrite/analyzer.c | 219 ++++++++++++++++++++++++++++++++++++++++++- dlls/dwrite/tests/analyzer.c | 162 ++++++++++++++++++++++++++++++++ 2 files changed, 379 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=14158a71db73c4bfb4c29…

1 0

Nikolay Sivov : dmime: Fix a couple of trace messages.
by Alexandre Julliard 27 Apr '15

27 Apr '15

Module: wine Branch: master Commit: 2d77891fab46d44fd694053012ca304cb9f89c07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d77891fab46d44fd69405301… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 27 00:38:53 2015 +0300 dmime: Fix a couple of trace messages. --- dlls/dmime/graph.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/graph.c b/dlls/dmime/graph.c index 76d4706..7975a4f 100644 --- a/dlls/dmime/graph.c +++ b/dlls/dmime/graph.c @@ -600,14 +600,14 @@ static HRESULT WINAPI PersistStream_Load(IPersistStream *iface, IStream* pStm) static HRESULT WINAPI PersistStream_Save(IPersistStream *iface, IStream *stream, BOOL clear_dirty) { IDirectMusicGraphImpl *This = impl_from_IPersistStream(iface); - FIXME("(%p) %p %d\n", This, stream, clear_dirty); + TRACE("(%p) %p %d\n", This, stream, clear_dirty); return E_NOTIMPL; } static HRESULT WINAPI PersistStream_GetSizeMax(IPersistStream *iface, ULARGE_INTEGER *size) { IDirectMusicGraphImpl *This = impl_from_IPersistStream(iface); - FIXME("(%p) %p\n", This, size); + TRACE("(%p) %p\n", This, size); return E_NOTIMPL; }

1 0

Nikolay Sivov : dmime: Implement GetClassID() for IDirectMusicGraph.
by Alexandre Julliard 27 Apr '15

27 Apr '15

Module: wine Branch: master Commit: c6bc5f1a1ce5fb1a952ec443481505cd6ec85bab URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6bc5f1a1ce5fb1a952ec4434… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 27 00:42:54 2015 +0300 dmime: Implement GetClassID() for IDirectMusicGraph. --- dlls/dmime/graph.c | 5 +++-- dlls/dmime/tests/dmime.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/dmime/graph.c b/dlls/dmime/graph.c index 7975a4f..a784007 100644 --- a/dlls/dmime/graph.c +++ b/dlls/dmime/graph.c @@ -439,8 +439,9 @@ static ULONG WINAPI PersistStream_Release(IPersistStream *iface) static HRESULT WINAPI PersistStream_GetClassID(IPersistStream *iface, CLSID *clsid) { IDirectMusicGraphImpl *This = impl_from_IPersistStream(iface); - FIXME("(%p) %p: stub\n", This, clsid); - return E_NOTIMPL; + TRACE("(%p) %p\n", This, clsid); + *clsid = CLSID_DirectMusicGraph; + return S_OK; } static HRESULT WINAPI PersistStream_IsDirty(IPersistStream *iface) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index f7c018f..f833a10 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -421,8 +421,8 @@ static void test_graph(void) hr = IDirectMusicGraph_QueryInterface(dmg, &IID_IPersistStream, (void**)&ps); ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); hr = IPersistStream_GetClassID(ps, &class); - todo_wine ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); - todo_wine ok(IsEqualGUID(&class, &CLSID_DirectMusicGraph), + ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(IsEqualGUID(&class, &CLSID_DirectMusicGraph), "Expected class CLSID_DirectMusicGraph got %s\n", wine_dbgstr_guid(&class)); /* Unimplemented IPersistStream methods */

1 0