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

Alexandre Julliard : pdh: Use strncmpiW instead of memicmpW for strings without embedded nulls.
by Alexandre Julliard 09 May '19

09 May '19

Module: wine Branch: master Commit: f1fe6d54154f58f261917c853a0e526547212b38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1fe6d54154f58f261917c85… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 8 08:34:41 2019 -0500 pdh: Use strncmpiW instead of memicmpW for strings without embedded nulls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/pdh/pdh_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index 7ef91f1..11c917a 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -213,7 +213,7 @@ static BOOL is_local_machine( const WCHAR *name, DWORD len ) DWORD buflen = ARRAY_SIZE(buf); if (!GetComputerNameW( buf, &buflen )) return FALSE; - return len == buflen && !memicmpW( name, buf, buflen ); + return len == buflen && !strncmpiW( name, buf, buflen ); } static BOOL pdh_match_path( LPCWSTR fullpath, LPCWSTR path )

1 0

Alexandre Julliard : qmgr: Use strncmpiW instead of memicmpW for strings without embedded nulls.
by Alexandre Julliard 09 May '19

09 May '19

Module: wine Branch: master Commit: 0ab48967bd110114a50cae5fb9d024bfa8d92ee7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ab48967bd110114a50cae5f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 8 08:34:48 2019 -0500 qmgr: Use strncmpiW instead of memicmpW for strings without embedded nulls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qmgr/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qmgr/file.c b/dlls/qmgr/file.c index dbdfc97..e717dc8 100644 --- a/dlls/qmgr/file.c +++ b/dlls/qmgr/file.c @@ -459,7 +459,7 @@ static BOOL transfer_file_local(BackgroundCopyFileImpl *file, const WCHAR *tmpna transitionJobState(job, BG_JOB_STATE_QUEUED, BG_JOB_STATE_TRANSFERRING); - if (strlenW(file->info.RemoteName) > 7 && !memicmpW(file->info.RemoteName, fileW, 7)) + if (strlenW(file->info.RemoteName) > 7 && !strncmpiW(file->info.RemoteName, fileW, 7)) ptr = file->info.RemoteName + 7; else ptr = file->info.RemoteName;

1 0

Alexandre Julliard : shlwapi: Use strncmpiW instead of memicmpW for strings without embedded nulls.
by Alexandre Julliard 09 May '19

09 May '19

Module: wine Branch: master Commit: 388a3ef908140b3e9c5c4a103f588268675b14d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=388a3ef908140b3e9c5c4a10… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 8 08:34:56 2019 -0500 shlwapi: Use strncmpiW instead of memicmpW for strings without embedded nulls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/url.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index fb38920..72cc461 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -138,7 +138,7 @@ static DWORD get_scheme_code(LPCWSTR scheme, DWORD scheme_len) for(i = 0; i < ARRAY_SIZE(shlwapi_schemes); i++) { if(scheme_len == strlenW(shlwapi_schemes[i].scheme_name) - && !memicmpW(scheme, shlwapi_schemes[i].scheme_name, scheme_len)) + && !strncmpiW(scheme, shlwapi_schemes[i].scheme_name, scheme_len)) return shlwapi_schemes[i].scheme_number; }

1 0

Alexandre Julliard : urlmon: Use strncmpiW instead of memicmpW for strings without embedded nulls.
by Alexandre Julliard 09 May '19

09 May '19

Module: wine Branch: master Commit: 1dd25f2deaafd7834ce981603316734ab2843ecb URL: https://source.winehq.org/git/wine.git/?a=commit;h=1dd25f2deaafd7834ce98160… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 8 08:35:05 2019 -0500 urlmon: Use strncmpiW instead of memicmpW for strings without embedded nulls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/uri.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 92978dc..07026ea 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -3889,7 +3889,7 @@ static HRESULT compare_file_paths(const Uri *a, const Uri *b, BOOL *ret) } /* Fast path */ - if(a->path_len == b->path_len && !memicmpW(a->canon_uri+a->path_start, b->canon_uri+b->path_start, a->path_len)) { + if(a->path_len == b->path_len && !strncmpiW(a->canon_uri+a->path_start, b->canon_uri+b->path_start, a->path_len)) { *ret = TRUE; return S_OK; } @@ -3909,7 +3909,7 @@ static HRESULT compare_file_paths(const Uri *a, const Uri *b, BOOL *ret) len_a = canonicalize_path_hierarchical(a->canon_uri+a->path_start, a->path_len, a->scheme_type, FALSE, 0, FALSE, canon_path_a); len_b = canonicalize_path_hierarchical(b->canon_uri+b->path_start, b->path_len, b->scheme_type, FALSE, 0, FALSE, canon_path_b); - *ret = len_a == len_b && !memicmpW(canon_path_a, canon_path_b, len_a); + *ret = len_a == len_b && !strncmpiW(canon_path_a, canon_path_b, len_a); heap_free(canon_path_a); heap_free(canon_path_b);

1 0

Alexandre Julliard : userenv: Use strncmpiW instead of memicmpW for strings without embedded nulls.
by Alexandre Julliard 09 May '19

09 May '19

Module: wine Branch: master Commit: 3c53e06b7bfa7aaccd068e910185f23b788c83de URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c53e06b7bfa7aaccd068e91… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 8 08:35:15 2019 -0500 userenv: Use strncmpiW instead of memicmpW for strings without embedded nulls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/userenv/userenv_main.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index 11a4f75..4a38c9a 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -111,15 +111,13 @@ static void set_registry_variables(WCHAR **env, HKEY hkey, DWORD type, BOOL set_ if (ret != ERROR_SUCCESS) break; - if (!memicmpW(name, SystemRootW, ARRAY_SIZE(SystemRootW))) - continue; - if (!memicmpW(name, SystemDriveW, ARRAY_SIZE(SystemDriveW))) - continue; + if (!strcmpiW(name, SystemRootW)) continue; + if (!strcmpiW(name, SystemDriveW)) continue; RtlInitUnicodeString(&us_name, name); us_value.Buffer = value; us_value.MaximumLength = sizeof(value); - if (!memicmpW(name, PATHW, ARRAY_SIZE(PATHW)) && + if (!strncmpiW(name, PATHW, ARRAY_SIZE(PATHW)) && !RtlQueryEnvironmentVariable_U(*env, &us_name, &us_value)) { if (!set_path)

1 0

Alexandre Julliard : wbemprox: Use strncmpiW instead of memicmpW for strings without embedded nulls.
by Alexandre Julliard 09 May '19

09 May '19

Module: wine Branch: master Commit: cea239e9051e8f343c1866cd8667a71fa33af4b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cea239e9051e8f343c1866cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 8 08:35:23 2019 -0500 wbemprox: Use strncmpiW instead of memicmpW for strings without embedded nulls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/wbemlocator.c | 9 ++++----- dlls/wbemprox/wql.y | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/wbemprox/wbemlocator.c b/dlls/wbemprox/wbemlocator.c index fe26a87..998dc0e 100644 --- a/dlls/wbemprox/wbemlocator.c +++ b/dlls/wbemprox/wbemlocator.c @@ -101,8 +101,8 @@ static BOOL is_local_machine( const WCHAR *server ) static HRESULT parse_resource( const WCHAR *resource, WCHAR **server, WCHAR **namespace ) { static const WCHAR rootW[] = {'R','O','O','T'}; - static const WCHAR cimv2W[] = {'C','I','M','V','2'}; - static const WCHAR defaultW[] = {'D','E','F','A','U','L','T'}; + static const WCHAR cimv2W[] = {'C','I','M','V','2',0}; + static const WCHAR defaultW[] = {'D','E','F','A','U','L','T',0}; HRESULT hr = WBEM_E_INVALID_NAMESPACE; const WCHAR *p, *q; unsigned int len; @@ -133,7 +133,7 @@ static HRESULT parse_resource( const WCHAR *resource, WCHAR **server, WCHAR **na p = q; while (*q && *q != '\\' && *q != '/') q++; len = q - p; - if (len >= ARRAY_SIZE( rootW ) && memicmpW( rootW, p, len )) goto done; + if (len >= ARRAY_SIZE( rootW ) && strncmpiW( rootW, p, len )) goto done; if (!*q) { hr = S_OK; @@ -141,8 +141,7 @@ static HRESULT parse_resource( const WCHAR *resource, WCHAR **server, WCHAR **na } q++; len = strlenW( q ); - if ((len != ARRAY_SIZE( cimv2W ) || memicmpW( q, cimv2W, len )) && - (len != ARRAY_SIZE( defaultW ) || memicmpW( q, defaultW, len ))) + if (strcmpiW( q, cimv2W ) && strcmpiW( q, defaultW )) goto done; if (!(*namespace = heap_alloc( (len + 1) * sizeof(WCHAR) ))) hr = E_OUTOFMEMORY; else diff --git a/dlls/wbemprox/wql.y b/dlls/wbemprox/wql.y index 75ce5b0..236a37d 100644 --- a/dlls/wbemprox/wql.y +++ b/dlls/wbemprox/wql.y @@ -579,7 +579,7 @@ static int cmp_keyword( const void *arg1, const void *arg2 ) int len = min( key1->len, key2->len ); int ret; - if ((ret = memicmpW( key1->name, key2->name, len ))) return ret; + if ((ret = strncmpiW( key1->name, key2->name, len ))) return ret; if (key1->len < key2->len) return -1; else if (key1->len > key2->len) return 1; return 0;

1 0

Alexandre Julliard : webservices: Use strncmpiW instead of memicmpW for strings without embedded nulls.
by Alexandre Julliard 09 May '19

09 May '19

Module: wine Branch: master Commit: 08a899d433e5b638b5cc18d5c81330dea38d7c04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08a899d433e5b638b5cc18d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 8 08:35:31 2019 -0500 webservices: Use strncmpiW instead of memicmpW for strings without embedded nulls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/url.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/webservices/url.c b/dlls/webservices/url.c index fd8d33a..1ffcc13 100644 --- a/dlls/webservices/url.c +++ b/dlls/webservices/url.c @@ -39,19 +39,19 @@ static const WCHAR netpipe[] = {'n','e','t','.','p','i','p','e'}; static WS_URL_SCHEME_TYPE scheme_type( const WCHAR *str, ULONG len ) { - if (len == ARRAY_SIZE( http ) && !memicmpW( str, http, ARRAY_SIZE( http ))) + if (len == ARRAY_SIZE( http ) && !strncmpiW( str, http, ARRAY_SIZE( http ))) return WS_URL_HTTP_SCHEME_TYPE; - if (len == ARRAY_SIZE( https ) && !memicmpW( str, https, ARRAY_SIZE( https ))) + if (len == ARRAY_SIZE( https ) && !strncmpiW( str, https, ARRAY_SIZE( https ))) return WS_URL_HTTPS_SCHEME_TYPE; - if (len == ARRAY_SIZE( nettcp ) && !memicmpW( str, nettcp, ARRAY_SIZE( nettcp ))) + if (len == ARRAY_SIZE( nettcp ) && !strncmpiW( str, nettcp, ARRAY_SIZE( nettcp ))) return WS_URL_NETTCP_SCHEME_TYPE; - if (len == ARRAY_SIZE( soapudp ) && !memicmpW( str, soapudp, ARRAY_SIZE( soapudp ))) + if (len == ARRAY_SIZE( soapudp ) && !strncmpiW( str, soapudp, ARRAY_SIZE( soapudp ))) return WS_URL_SOAPUDP_SCHEME_TYPE; - if (len == ARRAY_SIZE( netpipe ) && !memicmpW( str, netpipe, ARRAY_SIZE( netpipe ))) + if (len == ARRAY_SIZE( netpipe ) && !strncmpiW( str, netpipe, ARRAY_SIZE( netpipe ))) return WS_URL_NETPIPE_SCHEME_TYPE; return ~0u;

1 0

Paul Gofman : ddraw: Fix vertex count in d3d_device3_DrawIndexedPrimitiveVB().
by Alexandre Julliard 09 May '19

09 May '19

Module: wine Branch: master Commit: 08d630e250d24d6f0f8c1f6106dff0397b4d058e URL: https://source.winehq.org/git/wine.git/?a=commit;h=08d630e250d24d6f0f8c1f61… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue May 7 21:57:53 2019 +0300 ddraw: Fix vertex count in d3d_device3_DrawIndexedPrimitiveVB(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47129 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 19 ++++++++++++------- dlls/ddraw/tests/ddraw4.c | 10 +++++++--- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 054e2dc..18e5854 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4518,19 +4518,24 @@ static HRESULT WINAPI d3d_device7_DrawIndexedPrimitiveVB_FPUPreserve(IDirect3DDe } static HRESULT WINAPI d3d_device3_DrawIndexedPrimitiveVB(IDirect3DDevice3 *iface, - D3DPRIMITIVETYPE PrimitiveType, IDirect3DVertexBuffer *D3DVertexBuf, WORD *Indices, - DWORD IndexCount, DWORD Flags) + D3DPRIMITIVETYPE primitive_type, IDirect3DVertexBuffer *vertex_buffer, + WORD *indices, DWORD index_count, DWORD flags) { + struct d3d_vertex_buffer *vb = + unsafe_impl_from_IDirect3DVertexBuffer7((IDirect3DVertexBuffer7 *)vertex_buffer); struct d3d_device *device = impl_from_IDirect3DDevice3(iface); - struct d3d_vertex_buffer *vb = unsafe_impl_from_IDirect3DVertexBuffer7((IDirect3DVertexBuffer7 *)D3DVertexBuf); + DWORD stride; TRACE("iface %p, primitive_type %#x, vb %p, indices %p, index_count %u, flags %#x.\n", - iface, PrimitiveType, D3DVertexBuf, Indices, IndexCount, Flags); + iface, primitive_type, vertex_buffer, indices, index_count, flags); - setup_lighting(device, vb->fvf, Flags); + setup_lighting(device, vb->fvf, flags); + + if (!(stride = get_flexible_vertex_size(vb->fvf))) + return D3D_OK; - return IDirect3DDevice7_DrawIndexedPrimitiveVB(&device->IDirect3DDevice7_iface, PrimitiveType, - &vb->IDirect3DVertexBuffer7_iface, 0, IndexCount, Indices, IndexCount, Flags); + return IDirect3DDevice7_DrawIndexedPrimitiveVB(&device->IDirect3DDevice7_iface, primitive_type, + &vb->IDirect3DVertexBuffer7_iface, 0, vb->size / stride, indices, index_count, flags); } /***************************************************************************** diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 0116106..cb7582c 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -15523,12 +15523,16 @@ static void test_sysmem_draw(void) } quad[] = { + {{ 0.0f, 0.0f, 0.0f}, 0x00000000}, + {{ 0.0f, 0.0f, 0.0f}, 0x00000000}, + {{ 0.0f, 0.0f, 0.0f}, 0x00000000}, + {{ 0.0f, 0.0f, 0.0f}, 0x00000000}, {{-1.0f, -1.0f, 0.0f}, 0xffff0000}, {{-1.0f, 1.0f, 0.0f}, 0xff00ff00}, {{ 1.0f, -1.0f, 0.0f}, 0xff0000ff}, {{ 1.0f, 1.0f, 0.0f}, 0xffffffff}, }; - static WORD indices[] = {0, 1, 2, 3}; + static WORD indices[] = {4, 5, 6, 7}; window = create_window(); ok(!!window, "Failed to create a window.\n"); @@ -15557,7 +15561,7 @@ static void test_sysmem_draw(void) vb_desc.dwSize = sizeof(vb_desc); vb_desc.dwCaps = D3DVBCAPS_SYSTEMMEMORY; vb_desc.dwFVF = D3DFVF_XYZ | D3DFVF_DIFFUSE; - vb_desc.dwNumVertices = 4; + vb_desc.dwNumVertices = ARRAY_SIZE(quad); hr = IDirect3D3_CreateVertexBuffer(d3d, &vb_desc, &vb, 0, NULL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -15572,7 +15576,7 @@ static void test_sysmem_draw(void) hr = IDirect3DDevice3_BeginScene(device); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice3_DrawPrimitiveVB(device, D3DPT_TRIANGLESTRIP, vb, 0, 4, 0); + hr = IDirect3DDevice3_DrawPrimitiveVB(device, D3DPT_TRIANGLESTRIP, vb, 4, 4, 0); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice3_EndScene(device); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);

1 0

Józef Kucia : wined3d: Propagate HRESULTs in context creation functions.
by Alexandre Julliard 09 May '19

09 May '19

Module: wine Branch: master Commit: ad5a448d7e95d4d6c94312fb65a872591d399e6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad5a448d7e95d4d6c94312fb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 8 12:04:06 2019 +0200 wined3d: Propagate HRESULTs in context creation functions. 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/adapter_gl.c | 5 +++-- dlls/wined3d/adapter_vk.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 1f4ba79..b08ba62 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4277,17 +4277,18 @@ static void adapter_gl_destroy_device(struct wined3d_device *device) static HRESULT adapter_gl_create_context(struct wined3d_swapchain *swapchain, struct wined3d_context **context) { struct wined3d_context_gl *context_gl; + HRESULT hr; TRACE("swapchain %p, context %p.\n", swapchain, context); if (!(context_gl = heap_alloc_zero(sizeof(*context_gl)))) return E_OUTOFMEMORY; - if (FAILED(wined3d_context_gl_init(context_gl, swapchain))) + if (FAILED(hr = wined3d_context_gl_init(context_gl, swapchain))) { WARN("Failed to initialise context.\n"); heap_free(context_gl); - return E_FAIL; + return hr; } TRACE("Created context %p.\n", context_gl); diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index d39e651..fad78ae 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -291,17 +291,18 @@ static void adapter_vk_destroy_device(struct wined3d_device *device) static HRESULT adapter_vk_create_context(struct wined3d_swapchain *swapchain, struct wined3d_context **context) { struct wined3d_context *context_vk; + HRESULT hr; TRACE("swapchain %p, context %p.\n", swapchain, context); if (!(context_vk = heap_alloc_zero(sizeof(*context_vk)))) return E_OUTOFMEMORY; - if (FAILED(wined3d_context_vk_init(context_vk, swapchain))) + if (FAILED(hr = wined3d_context_vk_init(context_vk, swapchain))) { WARN("Failed to initialise context.\n"); heap_free(context_vk); - return E_FAIL; + return hr; } TRACE("Created context %p.\n", context_vk);

1 0

Henri Verbeet : wined3d: Move the "texture_type" field from struct wined3d_context to struct wined3d_context_gl.
by Alexandre Julliard 09 May '19

09 May '19

Module: wine Branch: master Commit: c5b09fd2312234ce8e47a7a030782caa38b23cac URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5b09fd2312234ce8e47a7a0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 8 18:09:34 2019 +0430 wined3d: Move the "texture_type" field from struct wined3d_context to struct wined3d_context_gl. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 22 +++++++++++----------- dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9aa78f5..1a45eca 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1478,12 +1478,12 @@ void wined3d_context_cleanup(struct wined3d_context *context) DWORD err = GetLastError(); ERR("wglDeleteContext(%p) failed, last error %#x.\n", context->glCtx, err); } - - heap_free(context->texture_type); } void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) { + heap_free(context_gl->texture_type); + wined3d_context_cleanup(&context_gl->c); } @@ -2009,8 +2009,8 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi } } - if (!(context->texture_type = heap_calloc(gl_info->limits.combined_samplers, - sizeof(*context->texture_type)))) + if (!(context_gl->texture_type = heap_calloc(gl_info->limits.combined_samplers, + sizeof(*context_gl->texture_type)))) return E_FAIL; target = &context->current_rt.texture->resource; @@ -2093,7 +2093,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi { ERR("Failed to set pixel format %d on device context %p.\n", context->pixel_format, context->hdc); context_release(context); - heap_free(context->texture_type); + heap_free(context_gl->texture_type); return E_FAIL; } @@ -2103,7 +2103,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi if (!(ctx = context_create_wgl_attribs(gl_info, context->hdc, share_ctx))) { context_release(context); - heap_free(context->texture_type); + heap_free(context_gl->texture_type); return E_FAIL; } } @@ -2113,7 +2113,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi { ERR("Failed to create a WGL context.\n"); context_release(context); - heap_free(context->texture_type); + heap_free(context_gl->texture_type); return E_FAIL; } @@ -2123,7 +2123,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi context_release(context); if (!wglDeleteContext(ctx)) ERR("wglDeleteContext(%p) failed, last error %#x.\n", ctx, GetLastError()); - heap_free(context->texture_type); + heap_free(context_gl->texture_type); return E_FAIL; } } @@ -2143,7 +2143,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi context_release(context); if (!wglDeleteContext(ctx)) ERR("wglDeleteContext(%p) failed, last error %#x.\n", ctx, GetLastError()); - heap_free(context->texture_type); + heap_free(context_gl->texture_type); return E_FAIL; } @@ -2541,7 +2541,7 @@ void wined3d_context_gl_bind_texture(struct wined3d_context_gl *context_gl, GLen target = GL_NONE; unit = context_gl->c.active_texture; - old_texture_type = context_gl->c.texture_type[unit]; + old_texture_type = context_gl->texture_type[unit]; if (old_texture_type != target) { switch (old_texture_type) @@ -2586,7 +2586,7 @@ void wined3d_context_gl_bind_texture(struct wined3d_context_gl *context_gl, GLen ERR("Unexpected texture target %#x.\n", old_texture_type); } - context_gl->c.texture_type[unit] = target; + context_gl->texture_type[unit] = target; } checkGLcall("bind texture"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 03c6977..b8edf68 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1954,7 +1954,6 @@ struct wined3d_context UINT blit_w, blit_h; enum fogsource fog_source; DWORD active_texture; - DWORD *texture_type; UINT instance_count; @@ -2038,6 +2037,8 @@ HRESULT wined3d_context_no3d_init(struct wined3d_context *context_no3d, struct wined3d_context_gl { struct wined3d_context c; + + GLenum *texture_type; }; static inline struct wined3d_context_gl *wined3d_context_gl(struct wined3d_context *context)

1 0