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

Matteo Bruni : wined3d: Reduce initial wined3d_string_buffer buffer size to 32.
by Alexandre Julliard April 27, 2015

April 27, 2015

Module: wine Branch: master Commit: 54b4df6731cd7b9660ac3b9e1c16deef5bc92fb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54b4df6731cd7b9660ac3b9e1… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Apr 24 22:25:42 2015 +0200 wined3d: Reduce initial wined3d_string_buffer buffer size to 32. Also try to avoid unnecessary HeapReAlloc() + vsnprintf() loops when we know the required size of the buffer. --- dlls/wined3d/shader.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 612b055..2d50ced 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -253,7 +253,7 @@ void string_buffer_clear(struct wined3d_string_buffer *buffer) BOOL string_buffer_init(struct wined3d_string_buffer *buffer) { - buffer->buffer_size = 16384; + buffer->buffer_size = 32; if (!(buffer->buffer = HeapAlloc(GetProcessHeap(), 0, buffer->buffer_size))) { ERR("Failed to allocate shader buffer memory.\n"); @@ -274,6 +274,7 @@ int shader_vaddline(struct wined3d_string_buffer *buffer, const char *format, va unsigned int rem; int rc; char *new_buffer; + unsigned int new_buffer_size; for (;;) { @@ -283,14 +284,17 @@ int shader_vaddline(struct wined3d_string_buffer *buffer, const char *format, va if (rc >= 0 /* C89 */ && (unsigned int)rc < rem /* C99 */) break; - if (!(new_buffer = HeapReAlloc(GetProcessHeap(), 0, buffer->buffer, buffer->buffer_size * 2))) + new_buffer_size = buffer->buffer_size * 2; + while (rc > 0 && (unsigned int)rc >= new_buffer_size - buffer->content_size) + new_buffer_size *= 2; + if (!(new_buffer = HeapReAlloc(GetProcessHeap(), 0, buffer->buffer, new_buffer_size))) { ERR("Failed to grow buffer.\n"); buffer->buffer[buffer->content_size] = '\0'; return -1; } buffer->buffer = new_buffer; - buffer->buffer_size = buffer->buffer_size * 2; + buffer->buffer_size = new_buffer_size; } buffer->content_size += rc;

1 0

Jacek Caban : wininet: Initialize send and receive timeouts to 0.
by Alexandre Julliard April 24, 2015

April 24, 2015

Module: wine Branch: master Commit: 07520fbf12dff4b400892aabd30ef65c4bb59997 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07520fbf12dff4b400892aabd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 24 14:39:29 2015 +0200 wininet: Initialize send and receive timeouts to 0. --- dlls/wininet/http.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 04cd281..8a872e8 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -5827,8 +5827,8 @@ DWORD HTTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, session->password = heap_strdupW(lpszPassword); session->hostPort = serverPort; session->connect_timeout = hIC->connect_timeout; - session->send_timeout = INFINITE; - session->receive_timeout = INFINITE; + session->send_timeout = 0; + session->receive_timeout = 0; /* Don't send a handle created callback if this handle was created with InternetOpenUrl */ if (!(session->hdr.dwInternalFlags & INET_OPENURL))

1 0

Hans Leidekker : msvcrt: Handle NULL arguments in _mbscmp.
by Alexandre Julliard April 24, 2015

April 24, 2015

Module: wine Branch: master Commit: bbd0e56a5832b8b6135d9300005747d07ec33cd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbd0e56a5832b8b6135d93000… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 24 14:48:04 2015 +0200 msvcrt: Handle NULL arguments in _mbscmp. --- dlls/msvcrt/mbcs.c | 3 +++ dlls/msvcrt/tests/string.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 044c2bd..4c85b90 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -24,6 +24,7 @@ */ #include <stdio.h> +#include <limits.h> #include "msvcrt.h" #include "wine/unicode.h" @@ -769,6 +770,8 @@ unsigned char* CDECL _mbsnbcpy(unsigned char* dst, const unsigned char* src, MSV */ int CDECL _mbscmp(const unsigned char* str, const unsigned char* cmp) { + if (!str || !cmp) return INT_MAX; + if(get_mbcinfo()->ismbcodepage) { unsigned int strc, cmpc; diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index cf609f7..3893ba7 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2874,6 +2874,36 @@ static void test__wcsset_s(void) ok(str[2] == 'b', "str[2] = %d\n", str[2]); } +static void test__mbscmp(void) +{ + static const unsigned char a[] = {'a',0}, b[] = {'b',0}; + int ret; + + if (!p_mbrlen) + { + win_skip("_mbscmp tests\n"); + return; + } + + ret = _mbscmp(NULL, NULL); + ok(ret == INT_MAX, "got %d\n", ret); + + ret = _mbscmp(a, NULL); + ok(ret == INT_MAX, "got %d\n", ret); + + ret = _mbscmp(NULL, a); + ok(ret == INT_MAX, "got %d\n", ret); + + ret = _mbscmp(a, a); + ok(!ret, "got %d\n", ret); + + ret = _mbscmp(a, b); + ok(ret == -1, "got %d\n", ret); + + ret = _mbscmp(b, a); + ok(ret == 1, "got %d\n", ret); +} + START_TEST(string) { char mem[100]; @@ -2981,4 +3011,5 @@ START_TEST(string) test_strxfrm(); test__strnset_s(); test__wcsset_s(); + test__mbscmp(); }

1 0

Hans Leidekker : msvcr120: Add _ismbcprint export.
by Alexandre Julliard April 24, 2015

April 24, 2015

Module: wine Branch: master Commit: da7f6c8b644caf45006520cd0e59cff17126a132 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da7f6c8b644caf45006520cd0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 24 14:48:26 2015 +0200 msvcr120: Add _ismbcprint export. --- dlls/msvcr120/msvcr120.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index c14ac45..811dcee 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1345,7 +1345,7 @@ @ stub _ismbclegal_l @ stub _ismbclower(long) @ stub _ismbclower_l -@ stub _ismbcprint(long) +@ cdecl _ismbcprint(long) @ stub _ismbcprint_l @ cdecl _ismbcpunct(long) @ stub _ismbcpunct_l

1 0

Hans Leidekker : advapi32: Return fake handles from RegisterTraceGuidsW.
by Alexandre Julliard April 24, 2015

April 24, 2015

Module: wine Branch: master Commit: 191b1bfbba1863c8970bee0fa026c14f91d8e93c URL: http://source.winehq.org/git/wine.git/?a=commit;h=191b1bfbba1863c8970bee0fa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 24 14:48:49 2015 +0200 advapi32: Return fake handles from RegisterTraceGuidsW. --- dlls/advapi32/eventlog.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index bebb08b..191d817 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -772,6 +772,17 @@ ULONG WINAPI RegisterTraceGuidsW( WMIDPREQUEST RequestAddress, FIXME("(%p, %p, %s, %u, %p, %s, %s, %p): stub\n", RequestAddress, RequestContext, debugstr_guid(ControlGuid), GuidCount, TraceGuidReg, debugstr_w(MofImagePath), debugstr_w(MofResourceName), RegistrationHandle); + + if (TraceGuidReg) + { + ULONG i; + for (i = 0; i < GuidCount; i++) + { + FIXME(" register trace class %s\n", debugstr_guid(TraceGuidReg[i].Guid)); + TraceGuidReg[i].RegHandle = (HANDLE)0xdeadbeef; + } + } + *RegistrationHandle = (TRACEHANDLE)0xdeadbeef; return ERROR_SUCCESS; }

1 0

Huw Davies : rpcrt4/tests: Fix some tests on Win 8.
by Alexandre Julliard April 24, 2015

April 24, 2015

Module: wine Branch: master Commit: 9f2c668c99cba9f4dc905810f4c290a587162c6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f2c668c99cba9f4dc905810f… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 23 13:17:32 2015 +0100 rpcrt4/tests: Fix some tests on Win 8. --- dlls/rpcrt4/tests/cstub.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index de0c224..d098d60 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -397,6 +397,8 @@ static BOOL check_address(void *actual, void *expected) { static void *ole32_start = NULL; static void *ole32_end = NULL; + static void *combase_start = NULL; + static void *combase_end = NULL; if (actual == expected) return TRUE; @@ -412,7 +414,21 @@ static BOOL check_address(void *actual, void *expected) ole32_end = (void *)((char *) ole32_start + nt_headers->OptionalHeader.SizeOfImage); } - return ole32_start <= actual && actual < ole32_end; + if (ole32_start <= actual && actual < ole32_end) + return TRUE; + + /* On Win8, actual can be located inside combase.dll */ + if (combase_start == NULL || combase_end == NULL) + { + PIMAGE_NT_HEADERS nt_headers; + combase_start = (void *) GetModuleHandleA("combase.dll"); + if (combase_start == NULL) + return FALSE; + nt_headers = (PIMAGE_NT_HEADERS)((char *) combase_start + ((PIMAGE_DOS_HEADER) combase_start)->e_lfanew); + combase_end = (void *)((char *) combase_start + nt_headers->OptionalHeader.SizeOfImage); + } + + return (combase_start <= actual && actual < combase_end); } static const ExtendedProxyFileInfo my_proxy_file_info =

1 0

Nikolay Sivov : msdmo: Add more tracing.
by Alexandre Julliard April 24, 2015

April 24, 2015

Module: wine Branch: master Commit: 70297c424ad717b270e7aaf5c48b32b0e22ccd95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70297c424ad717b270e7aaf5c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 23 11:13:10 2015 +0300 msdmo: Add more tracing. --- dlls/msdmo/dmoreg.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index 7ae01a1..dea079a 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -506,7 +506,6 @@ static HRESULT WINAPI IEnumDMO_fnNext( WCHAR ** Names, DWORD * pcItemsFetched) { - FILETIME ft; HKEY hkey; WCHAR szNextKey[MAX_PATH]; WCHAR szGuidKey[64]; @@ -529,7 +528,7 @@ static HRESULT WINAPI IEnumDMO_fnNext( This->index++; len = MAX_PATH; - ret = RegEnumKeyExW(This->hkey, This->index, szNextKey, &len, NULL, NULL, NULL, &ft); + ret = RegEnumKeyExW(This->hkey, This->index, szNextKey, &len, NULL, NULL, NULL, NULL); if (ret != ERROR_SUCCESS) { hres = HRESULT_FROM_WIN32(ret); @@ -552,6 +551,7 @@ static HRESULT WINAPI IEnumDMO_fnNext( wsprintfW(szKey, szCat2Fmt, szDMORootKey, szNextKey); ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, szKey, 0, KEY_READ, &hkey); + TRACE("testing %s\n", debugstr_w(szKey)); if (This->pInTypes) { @@ -571,6 +571,12 @@ static HRESULT WINAPI IEnumDMO_fnNext( pInTypes = (DMO_PARTIAL_MEDIATYPE*) szValue; + TRACE("read %d intypes for %s:\n", cInTypes, debugstr_w(szKey)); + for (i = 0; i < cInTypes; i++) { + TRACE("intype %d: type %s, subtype %s\n", i, debugstr_guid(&pInTypes[i].type), + debugstr_guid(&pInTypes[i].subtype)); + } + for (i = 0; i < This->cInTypes; i++) { for (j = 0; j < cInTypes; j++) @@ -608,6 +614,12 @@ static HRESULT WINAPI IEnumDMO_fnNext( pOutTypes = (DMO_PARTIAL_MEDIATYPE*) szValue; + TRACE("read %d outtypes for %s:\n", cOutTypes, debugstr_w(szKey)); + for (i = 0; i < cOutTypes; i++) { + TRACE("outtype %d: type %s, subtype %s\n", i, debugstr_guid(&pOutTypes[i].type), + debugstr_guid(&pOutTypes[i].subtype)); + } + for (i = 0; i < This->cOutTypes; i++) { for (j = 0; j < cOutTypes; j++)

1 0

Stefan Dösinger : wined3d: Move the EXT_texture3D check to init_format_texture_info.
by Alexandre Julliard April 24, 2015

April 24, 2015

Module: wine Branch: master Commit: 072e1a3fb26336ee9f363529695dcbae84da64d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=072e1a3fb26336ee9f3635296… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 24 10:33:50 2015 +0200 wined3d: Move the EXT_texture3D check to init_format_texture_info. --- dlls/wined3d/directx.c | 9 --------- dlls/wined3d/utils.c | 9 ++++++++- dlls/wined3d/volume.c | 5 ----- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7e0d530..84c3aa2 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4490,15 +4490,6 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad case WINED3D_RTYPE_VOLUME_TEXTURE: case WINED3D_RTYPE_VOLUME: - /* Volume is to VolumeTexture what Surface is to Texture, but its - * usage caps are not documented. Most driver seem to offer - * (nearly) the same on Volume and VolumeTexture, so do that too. */ - if (!gl_info->supported[EXT_TEXTURE3D]) - { - TRACE("[FAILED] - No volume texture support.\n"); - return WINED3DERR_NOTAVAILABLE; - } - /* The GL_EXT_texture_compression_s3tc spec requires that loading * an s3tc compressed texture results in an error. While the D3D * refrast does support s3tc volumes, at least the nvidia Windows diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index fadd0c9..1d34440 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1852,10 +1852,17 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win format->glFormat = format_texture_info[i].gl_format; format->glType = format_texture_info[i].gl_type; format->color_fixup = COLOR_FIXUP_IDENTITY; - format_set_flag(format, format_texture_info[i].flags); format->height_scale.numerator = 1; format->height_scale.denominator = 1; + format->flags[WINED3D_GL_RES_TYPE_TEX_1D] |= format_texture_info[i].flags; + format->flags[WINED3D_GL_RES_TYPE_TEX_2D] |= format_texture_info[i].flags; + if (gl_info->supported[EXT_TEXTURE3D]) + format->flags[WINED3D_GL_RES_TYPE_TEX_3D] |= format_texture_info[i].flags; + 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; + format->flags[WINED3D_GL_RES_TYPE_BUFFER] |= format_texture_info[i].flags; + if (gl_info->supported[ARB_INTERNALFORMAT_QUERY2]) { query_format_flag(gl_info, format, format->glInternal, GL_VERTEX_TEXTURE, diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index a231081..5241286 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -748,11 +748,6 @@ static HRESULT volume_init(struct wined3d_volume *volume, struct wined3d_texture HRESULT hr; UINT size; - if (!gl_info->supported[EXT_TEXTURE3D]) - { - WARN("Volume cannot be created - no volume texture support.\n"); - return WINED3DERR_INVALIDCALL; - } /* TODO: Write tests for other resources and move this check * to resource_init, if applicable. */ if (desc->usage & WINED3DUSAGE_DYNAMIC

1 0

Stefan Dösinger : wined3d: Query info for each resource type from ARB_internalformat_query2.
by Alexandre Julliard April 24, 2015

April 24, 2015

Module: wine Branch: master Commit: 9def5ff4098db8be848ef101c8dd7a85d7781fdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9def5ff4098db8be848ef101c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 24 10:33:49 2015 +0200 wined3d: Query info for each resource type from ARB_internalformat_query2. --- dlls/wined3d/utils.c | 159 +++++++++++++++++++++++++++++++++++---------------- 1 file changed, 109 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9def5ff4098db8be848ef…

1 0

Stefan Dösinger : wined3d: Read flags of the right resource type in check_device_format.
by Alexandre Julliard April 24, 2015

April 24, 2015

Module: wine Branch: master Commit: e4e1e7d8d3995309c7d97f575389ab7174e328a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4e1e7d8d3995309c7d97f575… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 24 10:33:48 2015 +0200 wined3d: Read flags of the right resource type in check_device_format. --- dlls/wined3d/directx.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 230a224..7e0d530 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4250,7 +4250,8 @@ HRESULT CDECL wined3d_check_device_multisample_type(const struct wined3d *wined3 /* Check if the given DisplayFormat + DepthStencilFormat combination is valid for the Adapter */ static BOOL CheckDepthStencilCapability(const struct wined3d_adapter *adapter, - const struct wined3d_format *display_format, const struct wined3d_format *ds_format) + const struct wined3d_format *display_format, const struct wined3d_format *ds_format, + enum wined3d_gl_resource_type gl_type) { /* Only allow depth/stencil formats */ if (!(ds_format->depth_size || ds_format->stencil_size)) return FALSE; @@ -4270,7 +4271,7 @@ static BOOL CheckDepthStencilCapability(const struct wined3d_adapter *adapter, if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { /* With FBOs WGL limitations do not apply, but the format needs to be FBO attachable */ - if (ds_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) + if (ds_format->flags[gl_type] & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) return TRUE; } else @@ -4292,10 +4293,11 @@ static BOOL CheckDepthStencilCapability(const struct wined3d_adapter *adapter, /* Check the render target capabilities of a format */ static BOOL CheckRenderTargetCapability(const struct wined3d_adapter *adapter, - const struct wined3d_format *adapter_format, const struct wined3d_format *check_format) + const struct wined3d_format *adapter_format, const struct wined3d_format *check_format, + enum wined3d_gl_resource_type gl_type) { /* Filter out non-RT formats */ - if (!(check_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_RENDERTARGET)) + if (!(check_format->flags[gl_type] & WINED3DFMT_FLAG_RENDERTARGET)) return FALSE; if (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER) { @@ -4378,7 +4380,8 @@ static BOOL CheckSurfaceCapability(const struct wined3d_adapter *adapter, if (check_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_TEXTURE) return TRUE; /* All depth stencil formats are supported on surfaces */ - if (CheckDepthStencilCapability(adapter, adapter_format, check_format)) return TRUE; + if (CheckDepthStencilCapability(adapter, adapter_format, check_format, WINED3D_GL_RES_TYPE_TEX_2D)) + return TRUE; /* If opengl can't process the format natively, the blitter may be able to convert it */ if (adapter->blitter->blit_supported(&adapter->gl_info, &adapter->d3d_info, @@ -4413,6 +4416,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad const struct wined3d_format *format = wined3d_get_format(gl_info, check_format_id); DWORD format_flags = 0; DWORD allowed_usage; + enum wined3d_gl_resource_type gl_type; TRACE("wined3d %p, adapter_idx %u, device_type %s, adapter_format %s, usage %s, %s,\n" "resource_type %s, check_format %s.\n", @@ -4443,6 +4447,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad | WINED3DUSAGE_QUERY_SRGBWRITE | WINED3DUSAGE_QUERY_VERTEXTEXTURE | WINED3DUSAGE_QUERY_WRAPANDMIP; + gl_type = WINED3D_GL_RES_TYPE_TEX_CUBE; break; case WINED3D_RTYPE_SURFACE: @@ -4455,6 +4460,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad allowed_usage = WINED3DUSAGE_DEPTHSTENCIL | WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING; + gl_type = WINED3D_GL_RES_TYPE_TEX_2D; break; case WINED3D_RTYPE_TEXTURE: @@ -4479,6 +4485,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad | WINED3DUSAGE_QUERY_SRGBWRITE | WINED3DUSAGE_QUERY_VERTEXTEXTURE | WINED3DUSAGE_QUERY_WRAPANDMIP; + gl_type = WINED3D_GL_RES_TYPE_TEX_2D; break; case WINED3D_RTYPE_VOLUME_TEXTURE: @@ -4520,6 +4527,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad | WINED3DUSAGE_QUERY_SRGBWRITE | WINED3DUSAGE_QUERY_VERTEXTEXTURE | WINED3DUSAGE_QUERY_WRAPANDMIP; + gl_type = WINED3D_GL_RES_TYPE_TEX_3D; break; default: @@ -4547,10 +4555,10 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad if (usage & WINED3DUSAGE_QUERY_LEGACYBUMPMAP) format_flags |= WINED3DFMT_FLAG_BUMPMAP; - if ((format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & format_flags) != format_flags) + if ((format->flags[gl_type] & format_flags) != format_flags) { TRACE("Requested format flags %#x, but format %s only has %#x.\n", - format_flags, debug_d3dformat(check_format_id), format->flags[WINED3D_GL_RES_TYPE_TEX_2D]); + format_flags, debug_d3dformat(check_format_id), format->flags[gl_type]); return WINED3DERR_NOTAVAILABLE; } @@ -4561,7 +4569,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad } if ((usage & WINED3DUSAGE_DEPTHSTENCIL) - && !CheckDepthStencilCapability(adapter, adapter_format, format)) + && !CheckDepthStencilCapability(adapter, adapter_format, format, gl_type)) { TRACE("Requested WINED3DUSAGE_DEPTHSTENCIL, but format %s is not supported for depth / stencil buffers.\n", debug_d3dformat(check_format_id)); @@ -4569,7 +4577,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad } if ((usage & WINED3DUSAGE_RENDERTARGET) - && !CheckRenderTargetCapability(adapter, adapter_format, format)) + && !CheckRenderTargetCapability(adapter, adapter_format, format, gl_type)) { TRACE("Requested WINED3DUSAGE_RENDERTARGET, but format %s is not supported for render targets.\n", debug_d3dformat(check_format_id));

1 0