March 2016 - Wine-Commits - list.winehq.org

Piotr Caban : msvcrt: Handle try blocks inside current catch block in nested frame handler.
by Alexandre Julliard March 16, 2016

March 16, 2016

Module: wine Branch: master Commit: 2d4b48a58d8a4a79eaf922f6b9c0375a38bce9b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d4b48a58d8a4a79eaf922f6b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 15 13:41:08 2016 +0100 msvcrt: Handle try blocks inside current catch block in nested frame handler. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_i386.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 116a429..56165c0 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -461,6 +461,9 @@ static inline void call_catch_block( PEXCEPTION_RECORD rec, cxx_exception_frame { const tryblock_info *tryblock = &descr->tryblock[i]; + /* only handle try blocks inside current catch block */ + if (catch_frame && nested_trylevel > tryblock->start_level) continue; + if (trylevel < tryblock->start_level) continue; if (trylevel > tryblock->end_level) continue;

1 0

Bruno Jesus : msrle32: Use the correct number of colors when biClrUsed = 0.
by Alexandre Julliard March 16, 2016

March 16, 2016

Module: wine Branch: master Commit: 373a02c64169d4fc039a93153b66987057fee553 URL: http://source.winehq.org/git/wine.git/?a=commit;h=373a02c64169d4fc039a93153… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Mar 16 01:14:11 2016 +0800 msrle32: Use the correct number of colors when biClrUsed = 0. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msrle32/msrle32.c | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index 2682812..6688040 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -1567,8 +1567,16 @@ static LRESULT DecompressGetFormat(CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, size = lpbiIn->biSize; - if (lpbiIn->biBitCount <= 8) - size += lpbiIn->biClrUsed * sizeof(RGBQUAD); + if (lpbiIn->biBitCount <= 8) { + int colors; + + if (lpbiIn->biClrUsed == 0) + colors = 1 << lpbiIn->biBitCount; + else + colors = lpbiIn->biClrUsed; + + size += colors * sizeof(RGBQUAD); + } if (lpbiOut != NULL) { memcpy(lpbiOut, lpbiIn, size); @@ -1647,27 +1655,33 @@ static LRESULT DecompressBegin(CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, if (lpbiIn->biCompression != BI_RGB) { + int colors; + + if (lpbiIn->biBitCount <= 8 && lpbiIn->biClrUsed == 0) + colors = 1 << lpbiIn->biBitCount; + else + colors = lpbiIn->biClrUsed; + rgbIn = (const RGBQUAD*)((const BYTE*)lpbiIn + lpbiIn->biSize); rgbOut = (const RGBQUAD*)((const BYTE*)lpbiOut + lpbiOut->biSize); switch (lpbiOut->biBitCount) { case 4: case 8: - pi->palette_map = LocalAlloc(LPTR, lpbiIn->biClrUsed); + pi->palette_map = LocalAlloc(LPTR, colors); if (pi->palette_map == NULL) return ICERR_MEMORY; - for (i = 0; i < lpbiIn->biClrUsed; i++) { - pi->palette_map[i] = MSRLE32_GetNearestPaletteIndex(lpbiOut->biClrUsed, rgbOut, rgbIn[i]); - } + for (i = 0; i < colors; i++) + pi->palette_map[i] = MSRLE32_GetNearestPaletteIndex(colors, rgbOut, rgbIn[i]); break; case 15: case 16: - pi->palette_map = LocalAlloc(LPTR, lpbiIn->biClrUsed * 2); + pi->palette_map = LocalAlloc(LPTR, colors * 2); if (pi->palette_map == NULL) return ICERR_MEMORY; - for (i = 0; i < lpbiIn->biClrUsed; i++) { + for (i = 0; i < colors; i++) { WORD color; if (lpbiOut->biBitCount == 15) @@ -1683,10 +1697,10 @@ static LRESULT DecompressBegin(CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, break; case 24: case 32: - pi->palette_map = LocalAlloc(LPTR, lpbiIn->biClrUsed * sizeof(RGBQUAD)); + pi->palette_map = LocalAlloc(LPTR, colors * sizeof(RGBQUAD)); if (pi->palette_map == NULL) return ICERR_MEMORY; - memcpy(pi->palette_map, rgbIn, lpbiIn->biClrUsed * sizeof(RGBQUAD)); + memcpy(pi->palette_map, rgbIn, colors * sizeof(RGBQUAD)); break; }; }

1 0

Jens Reyer : winegcc: Document WINEBUILD in the manpage.
by Alexandre Julliard March 16, 2016

March 16, 2016

Module: wine Branch: master Commit: d2d44610a2b66d8aff886729db03be7e7da09e6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2d44610a2b66d8aff886729d… Author: Jens Reyer <jre.winesim(a)gmail.com> Date: Tue Mar 15 17:28:00 2016 +0100 winegcc: Document WINEBUILD in the manpage. Signed-off-by: Jens Reyer <jre.winesim(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.man.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/winegcc/winegcc.man.in b/tools/winegcc/winegcc.man.in index f4fecc7..b4fc12d 100644 --- a/tools/winegcc/winegcc.man.in +++ b/tools/winegcc/winegcc.man.in @@ -67,6 +67,13 @@ Do not add the winecrt0 library when linking. .IP \fB-Wb,\fIoption\fR Pass an option to winebuild. If \fIoption\fR contains commas, it is split into multiple options at the commas. +.SH ENVIRONMENT +.TP +.B WINEBUILD +Specifies the path and name of the \fBwinebuild\fR binary that will be +launched automatically by \fBwinegcc\fR. +If not set, \fBwinegcc\fR will look for a file named \fIwinebuild\fR +in the path. .SH DEFINES winegcc defines __WINE__, for code that needs to know when it is being compiled under Wine. It also defines WIN32, _WIN32, __WIN32,

1 0

Henri Verbeet : ddraw: Just return an error if we failed to find the predecessor in ddraw_surface_delete_attached_surface ().
by Alexandre Julliard March 16, 2016

March 16, 2016

Module: wine Branch: master Commit: 644724d32cf832db895c4ed58a1e0ac31363077c URL: http://source.winehq.org/git/wine.git/?a=commit;h=644724d32cf832db895c4ed58… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 15 16:55:11 2016 +0100 ddraw: Just return an error if we failed to find the predecessor in ddraw_surface_delete_attached_surface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 9e28655..3709b94 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1982,16 +1982,16 @@ static HRESULT ddraw_surface_delete_attached_surface(struct ddraw_surface *surfa } /* Find the predecessor of the detached surface */ - while (prev) + while (prev->next_attached != attachment) { - if (prev->next_attached == attachment) - break; - prev = prev->next_attached; + if (!(prev = prev->next_attached)) + { + ERR("Failed to find predecessor of %p.\n", attachment); + wined3d_mutex_unlock(); + return DDERR_SURFACENOTATTACHED; + } } - /* There must be a surface, otherwise there's a bug */ - assert(prev); - /* Unchain the surface */ prev->next_attached = attachment->next_attached; attachment->next_attached = NULL;

1 0

Henri Verbeet : ddraw: Avoid d3d_device_update_depth_stencil() in ddraw_surface_delete_attached_surface().
by Alexandre Julliard March 16, 2016

March 16, 2016

Module: wine Branch: master Commit: 130bd9d8c73a5199524645ce5f83544646c80642 URL: http://source.winehq.org/git/wine.git/?a=commit;h=130bd9d8c73a5199524645ce5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 15 16:55:10 2016 +0100 ddraw: Avoid d3d_device_update_depth_stencil() in ddraw_surface_delete_attached_surface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 4259c10..9e28655 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1997,9 +1997,14 @@ static HRESULT ddraw_surface_delete_attached_surface(struct ddraw_surface *surfa attachment->next_attached = NULL; attachment->first_attached = attachment; - /* Check if the wined3d depth stencil needs updating. */ - if (surface->ddraw->d3ddevice) - d3d_device_update_depth_stencil(surface->ddraw->d3ddevice); + /* Check if the wined3d depth stencil needs updating. Note that we don't + * just call d3d_device_update_depth_stencil() here since it uses + * QueryInterface(). Some applications, SCP - Containment Breach in + * particular, modify the QueryInterface() pointer in the surface vtbl + * but don't cleanup properly after the relevant dll is unloaded. */ + if (attachment->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER + && wined3d_device_get_depth_stencil_view(surface->ddraw->wined3d_device) == surface->wined3d_rtv) + wined3d_device_set_depth_stencil_view(surface->ddraw->wined3d_device, NULL); wined3d_mutex_unlock(); /* Set attached_iface to NULL before releasing it, the surface may go

1 0

Henri Verbeet : wined3d: Allow swapchain sample counts to be overridden with a registry key.
by Alexandre Julliard March 16, 2016

March 16, 2016

Module: wine Branch: master Commit: 91f0b0010347fc501ba6c0ad7179dd23c9dfa142 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91f0b0010347fc501ba6c0ad7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 15 16:55:08 2016 +0100 wined3d: Allow swapchain sample counts to be overridden with a registry key. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 26 ++++++++++++++++++++++++++ dlls/wined3d/wined3d_main.c | 4 ++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 31 insertions(+) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 9f3a36b..3033773 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -814,6 +814,28 @@ static void swapchain_update_render_to_fbo(struct wined3d_swapchain *swapchain) swapchain->render_to_fbo = TRUE; } +static void wined3d_swapchain_apply_sample_count_override(const struct wined3d_swapchain *swapchain, + enum wined3d_format_id format_id, enum wined3d_multisample_type *type, DWORD *quality) +{ + const struct wined3d_gl_info *gl_info; + const struct wined3d_format *format; + enum wined3d_multisample_type t; + + if (wined3d_settings.sample_count == ~0u) + return; + + gl_info = &swapchain->device->adapter->gl_info; + if (!(format = wined3d_get_format(gl_info, format_id))) + return; + + if ((t = min(wined3d_settings.sample_count, gl_info->limits.samples))) + while (!(format->multisample_types & 1u << (t - 1))) + ++t; + TRACE("Using sample count %u.\n", t); + *type = t; + *quality = 0; +} + static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3d_device *device, struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) { @@ -878,6 +900,8 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 } } swapchain->desc = *desc; + wined3d_swapchain_apply_sample_count_override(swapchain, swapchain->desc.backbuffer_format, + &swapchain->desc.multisample_type, &swapchain->desc.multisample_quality); swapchain_update_render_to_fbo(swapchain); TRACE("Creating front buffer.\n"); @@ -1277,6 +1301,8 @@ HRESULT CDECL wined3d_swapchain_resize_buffers(struct wined3d_swapchain *swapcha swapchain, buffer_count, width, height, debug_d3dformat(format_id), multisample_type, multisample_quality); + wined3d_swapchain_apply_sample_count_override(swapchain, format_id, &multisample_type, &multisample_quality); + if (buffer_count && buffer_count != swapchain->desc.backbuffer_count) FIXME("Cannot change the back buffer count yet.\n"); diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 45e41ad..71dc180 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -80,6 +80,7 @@ struct wined3d_settings wined3d_settings = 0, /* The default of memory is set in init_driver_info */ NULL, /* No wine logo by default */ TRUE, /* Multisampling enabled by default. */ + ~0u, /* Don't force a specific sample count by default. */ FALSE, /* No strict draw ordering. */ TRUE, /* Don't try to render onscreen by default. */ FALSE, /* Don't range check relative addressing indices in float constants. */ @@ -291,6 +292,9 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) wined3d_settings.allow_multisampling = FALSE; } } + if (!get_config_key_dword(hkey, appkey, "SampleCount", &wined3d_settings.sample_count)) + ERR_(winediag)("Forcing sample count to %u. This may not be compatible with all applications.\n", + wined3d_settings.sample_count); if (!get_config_key(hkey, appkey, "StrictDrawOrdering", buffer, size) && !strcmp(buffer,"enabled")) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 23d8565..206cac5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -288,6 +288,7 @@ struct wined3d_settings UINT64 emulated_textureram; char *logo; int allow_multisampling; + unsigned int sample_count; BOOL strict_draw_ordering; BOOL always_offscreen; BOOL check_float_constants;

1 0

Henri Verbeet : ddraw: Do not destroy surfaces that are still attached.
by Alexandre Julliard March 16, 2016

March 16, 2016

Module: wine Branch: master Commit: 9ff40749f92d773f6aed74ba5e018daf8e3838f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ff40749f92d773f6aed74ba5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 15 16:55:09 2016 +0100 ddraw: Do not destroy surfaces that are still attached. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index d133e7e..4259c10 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -531,7 +531,14 @@ static void ddraw_surface_cleanup(struct ddraw_surface *surface) ULONG ddraw_surface_release_iface(struct ddraw_surface *This) { - ULONG iface_count = InterlockedDecrement(&This->iface_count); + ULONG iface_count; + + /* Prevent the surface from being destroyed if it's still attached to + * another surface. It will be destroyed when the root is destroyed. */ + if (This->iface_count == 1 && This->attached_iface) + IUnknown_AddRef(This->attached_iface); + iface_count = InterlockedDecrement(&This->iface_count); + TRACE("%p decreasing iface count to %u.\n", This, iface_count); if (iface_count == 0) @@ -5623,20 +5630,10 @@ static void STDMETHODCALLTYPE ddraw_surface_wined3d_object_destroyed(void *paren TRACE("surface %p.\n", surface); - /* Check for attached surfaces and detach them. */ + /* This shouldn't happen, ddraw_surface_release_iface() should prevent the + * surface from being destroyed in this case. */ if (surface->first_attached != surface) - { - /* Well, this shouldn't happen: The surface being attached is - * referenced in AddAttachedSurface(), so it shouldn't be released - * until DeleteAttachedSurface() is called, because the refcount is - * held. It looks like the application released it often enough to - * force this. */ - WARN("Surface is still attached to surface %p.\n", surface->first_attached); - - /* The refcount will drop to -1 here */ - if (FAILED(ddraw_surface_delete_attached_surface(surface->first_attached, surface, surface->attached_iface))) - ERR("DeleteAttachedSurface failed.\n"); - } + ERR("Surface is still attached to surface %p.\n", surface->first_attached); while (surface->next_attached) if (FAILED(ddraw_surface_delete_attached_surface(surface,

1 0

Józef Kucia : d3d10core/tests: Add more create texture tests.
by Alexandre Julliard March 15, 2016

March 15, 2016

Module: wine Branch: master Commit: 4a8b305ed736a5ec5f7b8a3111c813d6519dcabc URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a8b305ed736a5ec5f7b8a311… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 15 10:52:46 2016 +0100 d3d10core/tests: Add more create texture tests. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index e9ae8d9..00d4482 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -539,6 +539,9 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R8G8_TYPELESS, D3D10_BIND_SHADER_RESOURCE, TRUE, FALSE}, {DXGI_FORMAT_R16_TYPELESS, D3D10_BIND_SHADER_RESOURCE, TRUE, FALSE}, {DXGI_FORMAT_R8_TYPELESS, D3D10_BIND_SHADER_RESOURCE, TRUE, FALSE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, D3D11_BIND_DEPTH_STENCIL, FALSE, FALSE}, + {DXGI_FORMAT_D24_UNORM_S8_UINT, D3D11_BIND_RENDER_TARGET, FALSE, FALSE}, + {DXGI_FORMAT_D32_FLOAT, D3D11_BIND_RENDER_TARGET, FALSE, FALSE}, }; if (!(device = create_device())) @@ -819,9 +822,15 @@ static void test_create_texture3d(void) } tests[] = { + {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D11_BIND_VERTEX_BUFFER, FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D11_BIND_INDEX_BUFFER, FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D11_BIND_CONSTANT_BUFFER, FALSE, TRUE}, {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D10_BIND_SHADER_RESOURCE, TRUE, FALSE}, {DXGI_FORMAT_R16G16B16A16_TYPELESS, D3D10_BIND_SHADER_RESOURCE, TRUE, FALSE}, {DXGI_FORMAT_R10G10B10A2_TYPELESS, D3D10_BIND_SHADER_RESOURCE, TRUE, FALSE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, D3D11_BIND_DEPTH_STENCIL, FALSE, FALSE}, + {DXGI_FORMAT_D24_UNORM_S8_UINT, D3D11_BIND_RENDER_TARGET, FALSE, FALSE}, + {DXGI_FORMAT_D32_FLOAT, D3D11_BIND_RENDER_TARGET, FALSE, FALSE}, }; if (!(device = create_device()))

1 0

Józef Kucia : wined3d: Introduce debug_color().
by Alexandre Julliard March 15, 2016

March 15, 2016

Module: wine Branch: master Commit: c099f3a0607f9e6bfbd7adf4692c42d8ed5dce6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c099f3a0607f9e6bfbd7adf46… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 15 10:52:47 2016 +0100 wined3d: Introduce debug_color(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 39 +++++++++++++++------------------------ dlls/wined3d/state.c | 18 +++++------------- dlls/wined3d/utils.c | 8 ++++++++ dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 29 insertions(+), 37 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d032184..53e6420 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1559,14 +1559,13 @@ HRESULT CDECL wined3d_device_set_light(struct wined3d_device *device, } /* Initialize the object. */ - TRACE("Light %d setting to type %d, Diffuse(%f,%f,%f,%f), Specular(%f,%f,%f,%f), Ambient(%f,%f,%f,%f)\n", - light_idx, light->type, - light->diffuse.r, light->diffuse.g, light->diffuse.b, light->diffuse.a, - light->specular.r, light->specular.g, light->specular.b, light->specular.a, - light->ambient.r, light->ambient.g, light->ambient.b, light->ambient.a); - TRACE("... Pos(%f,%f,%f), Dir(%f,%f,%f)\n", light->position.x, light->position.y, light->position.z, - light->direction.x, light->direction.y, light->direction.z); - TRACE("... Range(%f), Falloff(%f), Theta(%f), Phi(%f)\n", + TRACE("Light %u setting to type %#x, diffuse %s, specular %s, ambient %s, " + "position {%.8e, %.8e, %.8e}, direction {%.8e, %.8e, %.8e}, " + "range %.8e, falloff %.8e, theta %.8e, phi %.8e.\n", + light_idx, light->type, debug_color(&light->diffuse), + debug_color(&light->specular), debug_color(&light->ambient), + light->position.x, light->position.y, light->position.z, + light->direction.x, light->direction.y, light->direction.z, light->range, light->falloff, light->theta, light->phi); /* Update the live definitions if the light is currently assigned a glIndex. */ @@ -1900,18 +1899,10 @@ void CDECL wined3d_device_get_material(const struct wined3d_device *device, stru *material = device->state.material; - TRACE("diffuse {%.8e, %.8e, %.8e, %.8e}\n", - material->diffuse.r, material->diffuse.g, - material->diffuse.b, material->diffuse.a); - TRACE("ambient {%.8e, %.8e, %.8e, %.8e}\n", - material->ambient.r, material->ambient.g, - material->ambient.b, material->ambient.a); - TRACE("specular {%.8e, %.8e, %.8e, %.8e}\n", - material->specular.r, material->specular.g, - material->specular.b, material->specular.a); - TRACE("emissive {%.8e, %.8e, %.8e, %.8e}\n", - material->emissive.r, material->emissive.g, - material->emissive.b, material->emissive.a); + TRACE("diffuse %s\n", debug_color(&material->diffuse)); + TRACE("ambient %s\n", debug_color(&material->ambient)); + TRACE("specular %s\n", debug_color(&material->specular)); + TRACE("emissive %s\n", debug_color(&material->emissive)); TRACE("power %.8e.\n", material->power); } @@ -3373,8 +3364,8 @@ HRESULT CDECL wined3d_device_end_scene(struct wined3d_device *device) HRESULT CDECL wined3d_device_clear(struct wined3d_device *device, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) { - TRACE("device %p, rect_count %u, rects %p, flags %#x, color {%.8e, %.8e, %.8e, %.8e}, depth %.8e, stencil %u.\n", - device, rect_count, rects, flags, color->r, color->g, color->b, color->a, depth, stencil); + TRACE("device %p, rect_count %u, rects %p, flags %#x, color %s, depth %.8e, stencil %u.\n", + device, rect_count, rects, flags, debug_color(color), depth, stencil); if (!rect_count && rects) { @@ -4092,8 +4083,8 @@ HRESULT CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *devi struct wined3d_resource *resource; RECT r; - TRACE("device %p, view %p, rect %s, color {%.8e, %.8e, %.8e, %.8e}.\n", - device, view, wine_dbgstr_rect(rect), color->r, color->g, color->b, color->a); + TRACE("device %p, view %p, rect %s, color %s.\n", + device, view, wine_dbgstr_rect(rect), debug_color(color)); resource = view->resource; if (resource->type != WINED3D_RTYPE_TEXTURE_2D) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 55e91c5..ec49d56 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -263,7 +263,7 @@ static void state_ambient(struct wined3d_context *context, const struct wined3d_ struct wined3d_color color; wined3d_color_from_d3dcolor(&color, state->render_states[WINED3D_RS_AMBIENT]); - TRACE("Setting ambient to {%.8e, %.8e, %.8e, %.8e}.\n", color.r, color.g, color.b, color.a); + TRACE("Setting ambient to %s.\n", debug_color(&color)); gl_info->gl_ops.gl.p_glLightModelfv(GL_LIGHT_MODEL_AMBIENT, &color.r); checkGLcall("glLightModel for MODEL_AMBIENT"); } @@ -712,18 +712,10 @@ static void state_specularenable(struct wined3d_context *context, const struct w } } - TRACE("diffuse {%.8e, %.8e, %.8e, %.8e}\n", - state->material.diffuse.r, state->material.diffuse.g, - state->material.diffuse.b, state->material.diffuse.a); - TRACE("ambient {%.8e, %.8e, %.8e, %.8e}\n", - state->material.ambient.r, state->material.ambient.g, - state->material.ambient.b, state->material.ambient.a); - TRACE("specular {%.8e, %.8e, %.8e, %.8e}\n", - state->material.specular.r, state->material.specular.g, - state->material.specular.b, state->material.specular.a); - TRACE("emissive {%.8e, %.8e, %.8e, %.8e}\n", - state->material.emissive.r, state->material.emissive.g, - state->material.emissive.b, state->material.emissive.a); + TRACE("diffuse %s\n", debug_color(&state->material.diffuse)); + TRACE("ambient %s\n", debug_color(&state->material.ambient)); + TRACE("specular %s\n", debug_color(&state->material.specular)); + TRACE("emissive %s\n", debug_color(&state->material.emissive)); gl_info->gl_ops.gl.p_glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, (float *)&state->material.ambient); checkGLcall("glMaterialfv(GL_AMBIENT)"); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 5cd482e..e210a8a 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3278,6 +3278,14 @@ const char *debug_box(const struct wined3d_box *box) box->right, box->bottom, box->back); } +const char *debug_color(const struct wined3d_color *color) +{ + if (!color) + return "(null)"; + return wine_dbg_sprintf("{%.8e, %.8e, %.8e, %.8e}", + color->r, color->g, color->b, color->a); +} + const char *debug_d3dformat(enum wined3d_format_id format_id) { switch (format_id) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index df16d63..ec7de5a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2991,6 +2991,7 @@ void swapchain_update_draw_bindings(struct wined3d_swapchain *swapchain) DECLSPE /* Trace routines */ const char *debug_box(const struct wined3d_box *box) DECLSPEC_HIDDEN; +const char *debug_color(const struct wined3d_color *color) DECLSPEC_HIDDEN; const char *debug_d3dshaderinstructionhandler(enum WINED3D_SHADER_INSTRUCTION_HANDLER handler_idx) DECLSPEC_HIDDEN; const char *debug_d3dformat(enum wined3d_format_id format_id) DECLSPEC_HIDDEN; const char *debug_d3ddevicetype(enum wined3d_device_type device_type) DECLSPEC_HIDDEN;

1 0

Józef Kucia : d3d11: Translate WINED3DERR_INVALIDCALL to E_INVALIDARG in d3d_texture{2d, 3d}_init().
by Alexandre Julliard March 15, 2016

March 15, 2016

Module: wine Branch: master Commit: f1c58a93afa39c69cd121e90f86b2b93d23d3830 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1c58a93afa39c69cd121e90f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 15 10:52:45 2016 +0100 d3d11: Translate WINED3DERR_INVALIDCALL to E_INVALIDARG in d3d_texture{2d, 3d}_init(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10_1/tests/d3d10_1.c | 2 +- dlls/d3d10core/tests/device.c | 2 +- dlls/d3d11/device.c | 4 ++-- dlls/d3d11/tests/d3d11.c | 16 ++++++++-------- dlls/d3d11/texture.c | 4 +++- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/d3d10_1/tests/d3d10_1.c b/dlls/d3d10_1/tests/d3d10_1.c index 7eba447..ccea06b 100644 --- a/dlls/d3d10_1/tests/d3d10_1.c +++ b/dlls/d3d10_1/tests/d3d10_1.c @@ -221,7 +221,7 @@ static void test_create_device(void) swapchain_desc.BufferDesc.Format = DXGI_FORMAT_BC5_UNORM; hr = D3D10CreateDeviceAndSwapChain1(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0, supported_feature_level, D3D10_1_SDK_VERSION, &swapchain_desc, &swapchain, &device); - todo_wine ok(hr == E_INVALIDARG, "D3D10CreateDeviceAndSwapChain1 returned %#x.\n", hr); + ok(hr == E_INVALIDARG, "D3D10CreateDeviceAndSwapChain1 returned %#x.\n", hr); ok(!swapchain, "Got unexpected swapchain pointer %p.\n", swapchain); ok(!device, "Got unexpected device pointer %p.\n", device); diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 22f1e9e..e9ae8d9 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -522,7 +522,7 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D10_BIND_CONSTANT_BUFFER, FALSE, TRUE}, {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D10_BIND_SHADER_RESOURCE, TRUE, FALSE}, {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D10_BIND_RENDER_TARGET, TRUE, FALSE}, - {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D10_BIND_DEPTH_STENCIL, FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D10_BIND_DEPTH_STENCIL, FALSE, FALSE}, {DXGI_FORMAT_R32G32B32_TYPELESS, D3D10_BIND_SHADER_RESOURCE, TRUE, FALSE}, {DXGI_FORMAT_R16G16B16A16_TYPELESS, D3D10_BIND_SHADER_RESOURCE, TRUE, FALSE}, {DXGI_FORMAT_R16G16B16A16_TYPELESS, D3D10_BIND_RENDER_TARGET, TRUE, FALSE}, diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 6ec154f..240c995 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -4849,7 +4849,7 @@ static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_devic FIXME("device_parent %p, container_parent %p, wined3d_desc %p, wined3d_texture %p partial stub!\n", device_parent, container_parent, wined3d_desc, wined3d_texture); - FIXME("Implement DXGI<->wined3d usage conversion\n"); + FIXME("Implement DXGI<->wined3d usage conversion.\n"); desc.Width = wined3d_desc->width; desc.Height = wined3d_desc->height; @@ -4866,7 +4866,7 @@ static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_devic if (FAILED(hr = d3d10_device_CreateTexture2D(&device->ID3D10Device1_iface, &desc, NULL, &texture_iface))) { - ERR("CreateTexture2D failed, returning %#x\n", hr); + WARN("CreateTexture2D failed, returning %#x.\n", hr); return hr; } diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index ebed409..e8b6914 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -606,7 +606,7 @@ static void test_create_device(void) swapchain_desc.BufferDesc.Format = DXGI_FORMAT_BC5_UNORM; hr = D3D11CreateDeviceAndSwapChain(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, &swapchain_desc, &swapchain, &device, &feature_level, &immediate_context); - todo_wine ok(hr == E_INVALIDARG, "D3D11CreateDeviceAndSwapChain returned %#x.\n", hr); + ok(hr == E_INVALIDARG, "D3D11CreateDeviceAndSwapChain returned %#x.\n", hr); ok(!swapchain, "Got unexpected swapchain pointer %p.\n", swapchain); ok(!device, "Got unexpected device pointer %p.\n", device); ok(!feature_level, "Got unexpected feature level %#x.\n", feature_level); @@ -742,7 +742,7 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D11_BIND_CONSTANT_BUFFER, FALSE, TRUE}, {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D11_BIND_SHADER_RESOURCE, TRUE, FALSE}, {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D11_BIND_RENDER_TARGET, TRUE, FALSE}, - {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D11_BIND_DEPTH_STENCIL, FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D11_BIND_DEPTH_STENCIL, FALSE, FALSE}, {DXGI_FORMAT_R32G32B32_TYPELESS, D3D11_BIND_SHADER_RESOURCE, TRUE, FALSE}, {DXGI_FORMAT_R16G16B16A16_TYPELESS, D3D11_BIND_SHADER_RESOURCE, TRUE, FALSE}, {DXGI_FORMAT_R16G16B16A16_TYPELESS, D3D11_BIND_RENDER_TARGET, TRUE, FALSE}, @@ -759,9 +759,9 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R8G8_TYPELESS, D3D11_BIND_SHADER_RESOURCE, TRUE, FALSE}, {DXGI_FORMAT_R16_TYPELESS, D3D11_BIND_SHADER_RESOURCE, TRUE, FALSE}, {DXGI_FORMAT_R8_TYPELESS, D3D11_BIND_SHADER_RESOURCE, TRUE, FALSE}, - {DXGI_FORMAT_R8G8B8A8_UNORM, D3D11_BIND_DEPTH_STENCIL, FALSE, TRUE}, - {DXGI_FORMAT_D24_UNORM_S8_UINT, D3D11_BIND_RENDER_TARGET, FALSE, TRUE}, - {DXGI_FORMAT_D32_FLOAT, D3D11_BIND_RENDER_TARGET, FALSE, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, D3D11_BIND_DEPTH_STENCIL, FALSE, FALSE}, + {DXGI_FORMAT_D24_UNORM_S8_UINT, D3D11_BIND_RENDER_TARGET, FALSE, FALSE}, + {DXGI_FORMAT_D32_FLOAT, D3D11_BIND_RENDER_TARGET, FALSE, FALSE}, }; if (!(device = create_device(NULL))) @@ -1074,9 +1074,9 @@ static void test_create_texture3d(void) {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D11_BIND_SHADER_RESOURCE, TRUE, FALSE}, {DXGI_FORMAT_R16G16B16A16_TYPELESS, D3D11_BIND_SHADER_RESOURCE, TRUE, FALSE}, {DXGI_FORMAT_R10G10B10A2_TYPELESS, D3D11_BIND_SHADER_RESOURCE, TRUE, FALSE}, - {DXGI_FORMAT_R8G8B8A8_UNORM, D3D11_BIND_DEPTH_STENCIL, FALSE, TRUE}, - {DXGI_FORMAT_D24_UNORM_S8_UINT, D3D11_BIND_RENDER_TARGET, FALSE, TRUE}, - {DXGI_FORMAT_D32_FLOAT, D3D11_BIND_RENDER_TARGET, FALSE, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, D3D11_BIND_DEPTH_STENCIL, FALSE, FALSE}, + {DXGI_FORMAT_D24_UNORM_S8_UINT, D3D11_BIND_RENDER_TARGET, FALSE, FALSE}, + {DXGI_FORMAT_D32_FLOAT, D3D11_BIND_RENDER_TARGET, FALSE, FALSE}, }; if (!(device = create_device(NULL))) diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 11bda45..c6cdc29 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -482,7 +482,7 @@ static HRESULT d3d_texture2d_init(struct d3d_texture2d *texture, struct d3d_devi WARN("Failed to create wined3d texture, hr %#x.\n", hr); wined3d_private_store_cleanup(&texture->private_store); wined3d_mutex_unlock(); - if (hr == WINED3DERR_NOTAVAILABLE) + if (hr == WINED3DERR_NOTAVAILABLE || hr == WINED3DERR_INVALIDCALL) hr = E_INVALIDARG; return hr; } @@ -936,6 +936,8 @@ static HRESULT d3d_texture3d_init(struct d3d_texture3d *texture, struct d3d_devi WARN("Failed to create wined3d texture, hr %#x.\n", hr); wined3d_private_store_cleanup(&texture->private_store); wined3d_mutex_unlock(); + if (hr == WINED3DERR_INVALIDCALL) + hr = E_INVALIDARG; return hr; } wined3d_mutex_unlock();

1 0