August 2011 - Wine-Commits - list.winehq.org

Andrew Talbot : mscoree: Remove extern from function definitions.
by Alexandre Julliard Aug. 29, 2011

Aug. 29, 2011

Module: wine Branch: master Commit: fe29ad99a76d5aa53277cbd7408c27818404587b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe29ad99a76d5aa53277cbd74… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Aug 27 18:33:33 2011 +0100 mscoree: Remove extern from function definitions. --- dlls/mscoree/config.c | 2 +- dlls/mscoree/metahost.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/config.c b/dlls/mscoree/config.c index 3e16226..40c8378 100644 --- a/dlls/mscoree/config.c +++ b/dlls/mscoree/config.c @@ -427,7 +427,7 @@ static HRESULT parse_config(VARIANT input, parsed_config_file *result) return S_OK; } -extern HRESULT parse_config_file(LPCWSTR filename, parsed_config_file *result) +HRESULT parse_config_file(LPCWSTR filename, parsed_config_file *result) { IStream *stream; VARIANT var; diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 895d7f3..d69bf13 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -1147,7 +1147,7 @@ static struct CLRMetaHost GlobalCLRMetaHost = { { &CLRMetaHost_vtbl } }; -extern HRESULT CLRMetaHost_CreateInstance(REFIID riid, void **ppobj) +HRESULT CLRMetaHost_CreateInstance(REFIID riid, void **ppobj) { return ICLRMetaHost_QueryInterface(&GlobalCLRMetaHost.ICLRMetaHost_iface, riid, ppobj); }

1 0

Alexandre Julliard : ntdll: Try to match the language name when looking for a manifest file.
by Alexandre Julliard Aug. 29, 2011

Aug. 29, 2011

Module: wine Branch: master Commit: 2febc9d41a9258447ac55976c327d4851bbd2ada URL: http://source.winehq.org/git/wine.git/?a=commit;h=2febc9d41a9258447ac55976c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 27 13:54:03 2011 +0200 ntdll: Try to match the language name when looking for a manifest file. --- dlls/ntdll/actctx.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 80f69a8..cba0988 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -182,6 +182,7 @@ struct actctx_loader unsigned int allocated_dependencies; }; +static const WCHAR wildcardW[] = {'*',0}; static const WCHAR assemblyW[] = {'a','s','s','e','m','b','l','y',0}; static const WCHAR assemblyIdentityW[] = {'a','s','s','e','m','b','l','y','I','d','e','n','t','i','t','y',0}; static const WCHAR bindingRedirectW[] = {'b','i','n','d','i','n','g','R','e','d','i','r','e','c','t',0}; @@ -208,6 +209,7 @@ static const WCHAR iidW[] = {'i','i','d',0}; static const WCHAR languageW[] = {'l','a','n','g','u','a','g','e',0}; static const WCHAR manifestVersionW[] = {'m','a','n','i','f','e','s','t','V','e','r','s','i','o','n',0}; static const WCHAR nameW[] = {'n','a','m','e',0}; +static const WCHAR neutralW[] = {'n','e','u','t','r','a','l',0}; static const WCHAR newVersionW[] = {'n','e','w','V','e','r','s','i','o','n',0}; static const WCHAR oldVersionW[] = {'o','l','d','V','e','r','s','i','o','n',0}; static const WCHAR optionalW[] = {'o','p','t','i','o','n','a','l',0}; @@ -423,7 +425,6 @@ static BOOL is_matching_identity( const struct assembly_identity *id1, if (id1->language && id2->language && strcmpiW( id1->language, id2->language )) { - static const WCHAR wildcardW[] = {'*',0}; if (strcmpW( wildcardW, id1->language ) && strcmpW( wildcardW, id2->language )) return FALSE; } @@ -1799,12 +1800,12 @@ static WCHAR *lookup_manifest_file( HANDLE dir, struct assembly_identity *ai ) { static const WCHAR lookup_fmtW[] = {'%','s','_','%','s','_','%','s','_','%','u','.','%','u','.','*','.','*','_', - '*', /* FIXME */ - '.','m','a','n','i','f','e','s','t',0}; + '%','s','_','*','.','m','a','n','i','f','e','s','t',0}; WCHAR *lookup, *ret = NULL; UNICODE_STRING lookup_us; IO_STATUS_BLOCK io; + const WCHAR *lang = ai->language; unsigned int data_pos = 0, data_len; char buffer[8192]; @@ -1814,7 +1815,9 @@ static WCHAR *lookup_manifest_file( HANDLE dir, struct assembly_identity *ai ) + sizeof(lookup_fmtW) ))) return NULL; - sprintfW( lookup, lookup_fmtW, ai->arch, ai->name, ai->public_key, ai->version.major, ai->version.minor); + if (!lang || !strcmpiW( lang, neutralW )) lang = wildcardW; + sprintfW( lookup, lookup_fmtW, ai->arch, ai->name, ai->public_key, + ai->version.major, ai->version.minor, lang ); RtlInitUnicodeString( &lookup_us, lookup ); NtQueryDirectoryFile( dir, 0, NULL, NULL, &io, buffer, sizeof(buffer),

1 0

Matteo Bruni : d3d9/tests: Add unbound cube/volume texture tests.
by Alexandre Julliard Aug. 29, 2011

Aug. 29, 2011

Module: wine Branch: master Commit: e46378c764cd0b9c5b87634f7fb4bc6a2cbf692b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e46378c764cd0b9c5b87634f7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Aug 26 01:12:28 2011 +0200 d3d9/tests: Add unbound cube/volume texture tests. --- dlls/d3d9/tests/visual.c | 62 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 61 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 523bbc1..772aa2e 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -12188,7 +12188,7 @@ static void ds_size_test(IDirect3DDevice9 *device) static void unbound_sampler_test(IDirect3DDevice9 *device) { HRESULT hr; - IDirect3DPixelShader9 *ps; + IDirect3DPixelShader9 *ps, *ps_cube, *ps_volume; IDirect3DSurface9 *rt, *old_rt; DWORD color; @@ -12201,6 +12201,24 @@ static void unbound_sampler_test(IDirect3DDevice9 *device) 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ 0x0000ffff, /* end */ }; + static const DWORD ps_code_cube[] = + { + 0xffff0200, /* ps_2_0 */ + 0x0200001f, 0x98000000, 0xa00f0800, /* dcl_cube s0 */ + 0x0200001f, 0x80000000, 0xb00f0000, /* dcl t0 */ + 0x03000042, 0x800f0000, 0xb0e40000, 0xa0e40800, /* texld r0, t0, s0 */ + 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ + 0x0000ffff, /* end */ + }; + static const DWORD ps_code_volume[] = + { + 0xffff0200, /* ps_2_0 */ + 0x0200001f, 0xa0000000, 0xa00f0800, /* dcl_volume s0 */ + 0x0200001f, 0x80000000, 0xb00f0000, /* dcl t0 */ + 0x03000042, 0x800f0000, 0xb0e40000, 0xa0e40800, /* texld r0, t0, s0 */ + 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ + 0x0000ffff, /* end */ + }; static const struct { @@ -12220,6 +12238,10 @@ static void unbound_sampler_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_CreatePixelShader(device, ps_code, &ps); ok(SUCCEEDED(hr), "IDirect3DDevice9_CreatePixelShader failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreatePixelShader(device, ps_code_cube, &ps_cube); + ok(SUCCEEDED(hr), "IDirect3DDevice9_CreatePixelShader failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreatePixelShader(device, ps_code_volume, &ps_volume); + ok(SUCCEEDED(hr), "IDirect3DDevice9_CreatePixelShader failed, hr %#x.\n", hr); hr = IDirect3DDevice9_CreateRenderTarget(device, 64, 64, D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, 0, TRUE, &rt, NULL); ok(SUCCEEDED(hr), "IDirect3DDevice9_CreateRenderTarget failed, hr %#x.\n", hr); @@ -12253,6 +12275,42 @@ static void unbound_sampler_test(IDirect3DDevice9 *device) color = getPixelColorFromSurface(rt, 32, 32); ok(color == 0xff000000, "Unbound sampler color is %#x.\n", color); + /* Now try with a cube texture */ + hr = IDirect3DDevice9_SetPixelShader(device, ps_cube); + ok(SUCCEEDED(hr), "IDirect3DDevice9_SetPixelShader failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "IDirect3DDevice9_BeginScene failed, hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "IDirect3DDevice9_DrawPrimitiveUP failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "IDirect3DDevice9_EndScene failed, hr %#x.\n", hr); + } + + color = getPixelColorFromSurface(rt, 32, 32); + ok(color == 0xff000000, "Unbound sampler color is %#x.\n", color); + + /* And then with a volume texture */ + hr = IDirect3DDevice9_SetPixelShader(device, ps_volume); + ok(SUCCEEDED(hr), "IDirect3DDevice9_SetPixelShader failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "IDirect3DDevice9_BeginScene failed, hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "IDirect3DDevice9_DrawPrimitiveUP failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "IDirect3DDevice9_EndScene failed, hr %#x.\n", hr); + } + + color = getPixelColorFromSurface(rt, 32, 32); + ok(color == 0xff000000, "Unbound sampler color is %#x.\n", color); + hr = IDirect3DDevice9_SetRenderTarget(device, 0, old_rt); ok(SUCCEEDED(hr), "IDirect3DDevice9_SetRenderTarget failed, hr %#x.\n", hr); @@ -12262,6 +12320,8 @@ static void unbound_sampler_test(IDirect3DDevice9 *device) IDirect3DSurface9_Release(rt); IDirect3DSurface9_Release(old_rt); IDirect3DPixelShader9_Release(ps); + IDirect3DPixelShader9_Release(ps_cube); + IDirect3DPixelShader9_Release(ps_volume); } static void update_surface_test(IDirect3DDevice9 *device)

1 0

Alexandre Julliard : ntdll: Use the manifest with the highest matching version number.
by Alexandre Julliard Aug. 29, 2011

Aug. 29, 2011

Module: wine Branch: master Commit: f8397ef229a7351226922f9ccf98ba7ff8adc061 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8397ef229a7351226922f9cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 27 13:55:51 2011 +0200 ntdll: Use the manifest with the highest matching version number. --- dlls/ntdll/actctx.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index cba0988..a539e54 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -1824,6 +1824,7 @@ static WCHAR *lookup_manifest_file( HANDLE dir, struct assembly_identity *ai ) FileBothDirectoryInformation, FALSE, &lookup_us, TRUE ); if (io.u.Status == STATUS_SUCCESS) { + ULONG min_build = ai->version.build, min_revision = ai->version.revision; FILE_BOTH_DIR_INFORMATION *dir_info; WCHAR *tmp; ULONG build, revision; @@ -1847,19 +1848,18 @@ static WCHAR *lookup_manifest_file( HANDLE dir, struct assembly_identity *ai ) tmp = (WCHAR *)dir_info->FileName + (strchrW(lookup, '*') - lookup); build = atoiW(tmp); - if (build < ai->version.build) continue; + if (build < min_build) continue; tmp = strchrW(tmp, '.') + 1; revision = atoiW(tmp); - if (build == ai->version.build && revision < ai->version.revision) - continue; - ai->version.build = build; - ai->version.revision = revision; + if (build == min_build && revision < min_revision) continue; + ai->version.build = min_build = build; + ai->version.revision = min_revision = revision; + RtlFreeHeap( GetProcessHeap(), 0, ret ); if ((ret = RtlAllocateHeap( GetProcessHeap(), 0, dir_info->FileNameLength + sizeof(WCHAR) ))) { memcpy( ret, dir_info->FileName, dir_info->FileNameLength ); ret[dir_info->FileNameLength/sizeof(WCHAR)] = 0; } - break; } } else WARN("no matching file for %s\n", debugstr_w(lookup));

1 0

Matteo Bruni : wined3d: Keep track of the current texture type for each texture unit.
by Alexandre Julliard Aug. 29, 2011

Aug. 29, 2011

Module: wine Branch: master Commit: 0386b44bad2315919aec3e5943e4266b84468284 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0386b44bad2315919aec3e594… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Aug 26 01:12:26 2011 +0200 wined3d: Keep track of the current texture type for each texture unit. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/context.c | 10 +++++++++ dlls/wined3d/device.c | 3 +- dlls/wined3d/state.c | 3 +- dlls/wined3d/surface.c | 40 +++++++++++++------------------------ dlls/wined3d/texture.c | 6 +--- dlls/wined3d/wined3d_private.h | 6 +++- 7 files changed, 33 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0386b44bad2315919aec3…

1 0

Matteo Bruni : wined3d: Use dummy textures for all the texture targets.
by Alexandre Julliard Aug. 29, 2011

Aug. 29, 2011

Module: wine Branch: master Commit: 7c6bd2f287144dc5be75e0aa249968a71dc46c73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c6bd2f287144dc5be75e0aa2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Aug 26 01:12:27 2011 +0200 wined3d: Use dummy textures for all the texture targets. --- dlls/wined3d/context.c | 86 ++++++++++++++++++++++++++++++++++++++-- dlls/wined3d/device.c | 79 +++++++++++++++++++++++++++++++++---- dlls/wined3d/state.c | 4 +- dlls/wined3d/wined3d_private.h | 5 ++- 4 files changed, 159 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7c6bd2f287144dc5be75e…

1 0

Matteo Bruni : wined3d: Rename dummyTextureName variable.
by Alexandre Julliard Aug. 29, 2011

Aug. 29, 2011

Module: wine Branch: master Commit: afeecfd974b643a2161bff90dbffcf5d5255a1c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afeecfd974b643a2161bff90d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Aug 26 01:12:29 2011 +0200 wined3d: Rename dummyTextureName variable. --- dlls/wined3d/context.c | 6 +++--- dlls/wined3d/device.c | 12 ++++++------ dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index c50e670..de0933c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1263,7 +1263,7 @@ static void bind_dummy_textures(const struct wined3d_device *device, struct wine GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + i)); checkGLcall("glActiveTextureARB"); - glBindTexture(GL_TEXTURE_2D, device->dummyTextureName[i]); + glBindTexture(GL_TEXTURE_2D, device->dummy_texture_2d[i]); checkGLcall("glBindTexture"); if (gl_info->supported[ARB_TEXTURE_RECTANGLE]) @@ -1601,7 +1601,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, /* If this happens to be the first context for the device, dummy textures * are not created yet. In that case, they will be created (and bound) by * create_dummy_textures right after this context is initialized. */ - if (device->dummyTextureName[0]) + if (device->dummy_texture_2d[0]) bind_dummy_textures(device, ret); LEAVE_GL(); @@ -1974,7 +1974,7 @@ void context_bind_texture(struct wined3d_context *context, GLenum target, GLuint /* nothing to do */ break; case GL_TEXTURE_2D: - glBindTexture(GL_TEXTURE_2D, device->dummyTextureName[unit]); + glBindTexture(GL_TEXTURE_2D, device->dummy_texture_2d[unit]); checkGLcall("glBindTexture"); break; case GL_TEXTURE_RECTANGLE_ARB: diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8727ec0..91d8dd9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -992,11 +992,11 @@ static void create_dummy_textures(struct wined3d_device *device, struct wined3d_ /* Make appropriate texture active */ context_active_texture(context, gl_info, i); - glGenTextures(1, &device->dummyTextureName[i]); + glGenTextures(1, &device->dummy_texture_2d[i]); checkGLcall("glGenTextures"); - TRACE("Dummy 2D texture %u given name %u.\n", i, device->dummyTextureName[i]); + TRACE("Dummy 2D texture %u given name %u.\n", i, device->dummy_texture_2d[i]); - glBindTexture(GL_TEXTURE_2D, device->dummyTextureName[i]); + glBindTexture(GL_TEXTURE_2D, device->dummy_texture_2d[i]); checkGLcall("glBindTexture"); glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 1, 1, 0, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, &color); @@ -1079,14 +1079,14 @@ static void destroy_dummy_textures(struct wined3d_device *device, const struct w checkGLcall("glDeleteTextures(count, device->dummy_texture_rect)"); } - glDeleteTextures(count, device->dummyTextureName); - checkGLcall("glDeleteTextures(count, device->dummyTextureName)"); + glDeleteTextures(count, device->dummy_texture_2d); + checkGLcall("glDeleteTextures(count, device->dummy_texture_2d)"); LEAVE_GL(); memset(device->dummy_texture_cube, 0, gl_info->limits.textures * sizeof(*device->dummy_texture_cube)); memset(device->dummy_texture_3d, 0, gl_info->limits.textures * sizeof(*device->dummy_texture_3d)); memset(device->dummy_texture_rect, 0, gl_info->limits.textures * sizeof(*device->dummy_texture_rect)); - memset(device->dummyTextureName, 0, gl_info->limits.textures * sizeof(*device->dummyTextureName)); + memset(device->dummy_texture_2d, 0, gl_info->limits.textures * sizeof(*device->dummy_texture_2d)); } static LONG fullscreen_style(LONG style) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 56c939a..47eee79 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1722,7 +1722,7 @@ struct wined3d_device struct wined3d_surface *logo_surface; /* Textures for when no other textures are mapped */ - UINT dummyTextureName[MAX_COMBINED_SAMPLERS]; + UINT dummy_texture_2d[MAX_COMBINED_SAMPLERS]; UINT dummy_texture_rect[MAX_COMBINED_SAMPLERS]; UINT dummy_texture_3d[MAX_COMBINED_SAMPLERS]; UINT dummy_texture_cube[MAX_COMBINED_SAMPLERS];

1 0

Matteo Bruni : wined3d: Store maximum vertex attributes count.
by Alexandre Julliard Aug. 29, 2011

Aug. 29, 2011

Module: wine Branch: master Commit: c74c544cc63db4db465504e2602224155a0d1dca URL: http://source.winehq.org/git/wine.git/?a=commit;h=c74c544cc63db4db465504e26… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Aug 26 01:12:30 2011 +0200 wined3d: Store maximum vertex attributes count. --- dlls/wined3d/directx.c | 3 +++ dlls/wined3d/state.c | 8 +------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 506b875..515bc46 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2253,6 +2253,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) gl_info->limits.vertex_samplers = 0; gl_info->limits.combined_samplers = gl_info->limits.fragment_samplers + gl_info->limits.vertex_samplers; gl_info->limits.sampler_stages = 1; + gl_info->limits.vertex_attribs = 16; gl_info->limits.glsl_vs_float_constants = 0; gl_info->limits.glsl_ps_float_constants = 0; gl_info->limits.arb_vs_float_constants = 0; @@ -2446,6 +2447,8 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) gl_info->limits.vertex_samplers = tmp; glGetIntegerv(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB, &tmp); gl_info->limits.combined_samplers = tmp; + glGetIntegerv(GL_MAX_VERTEX_ATTRIBS_ARB, &tmp); + gl_info->limits.vertex_attribs = tmp; /* Loading GLSL sampler uniforms is much simpler if we can assume that the sampler setup * is known at shader link time. In a vertex shader + pixel shader combination this isn't diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 1535e3a..c4e0513 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3999,15 +3999,9 @@ static inline void unload_numbered_array(struct wined3d_context *context, int i) static void unload_numbered_arrays(struct wined3d_context *context) { /* disable any attribs (this is the same for both GLSL and ARB modes) */ - GLint maxAttribs = 16; int i; - /* Leave all the attribs disabled */ - glGetIntegerv(GL_MAX_VERTEX_ATTRIBS_ARB, &maxAttribs); - /* MESA does not support it right not */ - if (glGetError() != GL_NO_ERROR) - maxAttribs = 16; - for (i = 0; i < maxAttribs; ++i) { + for (i = 0; i < context->gl_info->limits.vertex_attribs; ++i) { unload_numbered_array(context, i); } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 47eee79..8fb5d27 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1456,6 +1456,7 @@ struct wined3d_gl_limits UINT anisotropy; float shininess; UINT samples; + UINT vertex_attribs; UINT glsl_varyings; UINT glsl_vs_float_constants;

1 0

Andrew Talbot : comctl32: Fix a logical operator typo.
by Alexandre Julliard Aug. 29, 2011

Aug. 29, 2011

Module: wine Branch: master Commit: dd5a1913ae4b8025418a9f688882114a007bd41c URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd5a1913ae4b8025418a9f688… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Aug 27 17:42:27 2011 +0100 comctl32: Fix a logical operator typo. --- dlls/comctl32/tooltips.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 2b29790..162867d 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -2014,7 +2014,7 @@ TOOLTIPS_SetFont (TOOLTIPS_INFO *infoPtr, HFONT hFont, BOOL redraw) lf.lfWeight = FW_BOLD; infoPtr->hTitleFont = CreateFontIndirectW(&lf); - if (redraw & (infoPtr->nCurrentTool != -1)) { + if (redraw && infoPtr->nCurrentTool != -1) { FIXME("full redraw needed!\n"); }

1 0

Alexandre Julliard : ntdll: Prefer loading native manifests over Wine ones.
by Alexandre Julliard Aug. 29, 2011

Aug. 29, 2011

Module: wine Branch: master Commit: 127b27414eb151fe48aa16e05399e37c115446ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=127b27414eb151fe48aa16e05… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 27 14:42:49 2011 +0200 ntdll: Prefer loading native manifests over Wine ones. --- dlls/ntdll/actctx.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index a539e54..d31a6a3 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -1801,6 +1801,7 @@ static WCHAR *lookup_manifest_file( HANDLE dir, struct assembly_identity *ai ) static const WCHAR lookup_fmtW[] = {'%','s','_','%','s','_','%','s','_','%','u','.','%','u','.','*','.','*','_', '%','s','_','*','.','m','a','n','i','f','e','s','t',0}; + static const WCHAR wine_trailerW[] = {'d','e','a','d','b','e','e','f','.','m','a','n','i','f','e','s','t',0}; WCHAR *lookup, *ret = NULL; UNICODE_STRING lookup_us; @@ -1852,8 +1853,21 @@ static WCHAR *lookup_manifest_file( HANDLE dir, struct assembly_identity *ai ) tmp = strchrW(tmp, '.') + 1; revision = atoiW(tmp); if (build == min_build && revision < min_revision) continue; - ai->version.build = min_build = build; - ai->version.revision = min_revision = revision; + tmp = strchrW(tmp, '_') + 1; + tmp = strchrW(tmp, '_') + 1; + if (!strcmpiW( tmp, wine_trailerW )) + { + /* prefer a non-Wine manifest if we already have one */ + /* we'll still load the builtin dll if specified through DllOverrides */ + if (ret) continue; + } + else + { + min_build = build; + min_revision = revision; + } + ai->version.build = build; + ai->version.revision = revision; RtlFreeHeap( GetProcessHeap(), 0, ret ); if ((ret = RtlAllocateHeap( GetProcessHeap(), 0, dir_info->FileNameLength + sizeof(WCHAR) ))) {

1 0