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

Hans Leidekker : winhttp: Don't send any data if the verb is GET.
by Alexandre Julliard July 27, 2011

July 27, 2011

Module: wine Branch: master Commit: ae05ce459fb929471d9498fd7e96414f6b07daaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae05ce459fb929471d9498fd7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 27 07:57:37 2011 +0200 winhttp: Don't send any data if the verb is GET. --- dlls/winhttp/request.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 4da4508..ef5c2cb 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2162,6 +2162,7 @@ struct winhttp_request HINTERNET hsession; HINTERNET hconnect; HINTERNET hrequest; + WCHAR *verb; HANDLE wait; HANDLE cancel; char *buffer; @@ -2202,6 +2203,7 @@ static ULONG WINAPI winhttp_request_Release( CloseHandle( request->wait ); CloseHandle( request->cancel ); heap_free( request->buffer ); + heap_free( request->verb ); heap_free( request ); } return refs; @@ -2444,6 +2446,7 @@ static HRESULT WINAPI winhttp_request_Open( debugstr_variant(&async)); if (!method || !url) return E_INVALIDARG; + if (!(request->verb = strdupW( method ))) return E_OUTOFMEMORY; memset( &uc, 0, sizeof(uc) ); uc.dwStructSize = sizeof(uc); @@ -2703,7 +2706,7 @@ static HRESULT WINAPI winhttp_request_Send( return HRESULT_FROM_WIN32( get_last_error() ); } VariantInit( &array ); - if (VariantChangeType( &array, &body, 0, VT_ARRAY|VT_UI1 ) == S_OK) + if (strcmpW( request->verb, getW ) && VariantChangeType( &array, &body, 0, VT_ARRAY|VT_UI1 ) == S_OK) { SAFEARRAY *sa = V_ARRAY( &array ); if ((hr = SafeArrayAccessData( sa, (void **)&ptr )) != S_OK) return hr; @@ -2986,6 +2989,7 @@ static HRESULT WINAPI winhttp_request_Abort( CloseHandle( request->wait ); CloseHandle( request->cancel ); heap_free( request->buffer ); + heap_free( request->verb ); request->state = REQUEST_STATE_INVALID; request->hrequest = NULL; request->hconnect = NULL; @@ -2993,6 +2997,7 @@ static HRESULT WINAPI winhttp_request_Abort( request->wait = NULL; request->cancel = NULL; request->buffer = NULL; + request->verb = NULL; request->offset = 0; request->bytes_available = 0; request->bytes_read = 0;

1 0

Henri Verbeet : wined3d: Introduce a "state" variable in device_stream_info_from_declaration().
by Alexandre Julliard July 27, 2011

July 27, 2011

Module: wine Branch: master Commit: bd1429e2480af3a6d62b5ae334e7048ec3cfc906 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd1429e2480af3a6d62b5ae33… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 26 19:52:42 2011 +0200 wined3d: Introduce a "state" variable in device_stream_info_from_declaration(). --- dlls/wined3d/device.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d3ee3f7..9b6fc96 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -174,8 +174,9 @@ static BOOL fixed_get_input(BYTE usage, BYTE usage_idx, unsigned int *regnum) void device_stream_info_from_declaration(struct wined3d_device *device, BOOL use_vshader, struct wined3d_stream_info *stream_info, BOOL *fixup) { + const struct wined3d_state *state = &device->stateBlock->state; /* We need to deal with frequency data! */ - struct wined3d_vertex_declaration *declaration = device->stateBlock->state.vertex_declaration; + struct wined3d_vertex_declaration *declaration = state->vertex_declaration; unsigned int i; stream_info->use_map = 0; @@ -189,7 +190,7 @@ void device_stream_info_from_declaration(struct wined3d_device *device, for (i = 0; i < declaration->element_count; ++i) { const struct wined3d_vertex_declaration_element *element = &declaration->elements[i]; - const struct wined3d_stream_state *stream = &device->stateBlock->state.streams[element->input_slot]; + const struct wined3d_stream_state *stream = &state->streams[element->input_slot]; struct wined3d_buffer *buffer = stream->buffer; struct wined3d_bo_address data; BOOL stride_used; @@ -205,7 +206,7 @@ void device_stream_info_from_declaration(struct wined3d_device *device, data.addr = NULL; stride = stream->stride; - if (device->stateBlock->state.user_stream) + if (state->user_stream) { TRACE("Stream %u is UP, %p\n", element->input_slot, buffer); data.buffer_object = 0; @@ -221,13 +222,13 @@ void device_stream_info_from_declaration(struct wined3d_device *device, * sources. In most sane cases the pointer - offset will still be > 0, otherwise it will wrap * around to some big value. Hope that with the indices, the driver wraps it back internally. If * not, drawStridedSlow is needed, including a vertex buffer path. */ - if (device->stateBlock->state.load_base_vertex_index < 0) + if (state->load_base_vertex_index < 0) { WARN("load_base_vertex_index is < 0 (%d), not using VBOs.\n", - device->stateBlock->state.load_base_vertex_index); + state->load_base_vertex_index); data.buffer_object = 0; data.addr = buffer_get_sysmem(buffer, &device->adapter->gl_info); - if ((UINT_PTR)data.addr < -device->stateBlock->state.load_base_vertex_index * stride) + if ((UINT_PTR)data.addr < -state->load_base_vertex_index * stride) { FIXME("System memory vertex data load offset is negative!\n"); } @@ -262,7 +263,7 @@ void device_stream_info_from_declaration(struct wined3d_device *device, /* TODO: Assuming vertexdeclarations are usually used with the * same or a similar shader, it might be worth it to store the * last used output slot and try that one first. */ - stride_used = vshader_get_input(device->stateBlock->state.vertex_shader, + stride_used = vshader_get_input(state->vertex_shader, element->usage, element->usage_idx, &idx); } else @@ -310,7 +311,7 @@ void device_stream_info_from_declaration(struct wined3d_device *device, } device->num_buffer_queries = 0; - if (!device->stateBlock->state.user_stream) + if (!state->user_stream) { WORD map = stream_info->use_map; @@ -323,7 +324,7 @@ void device_stream_info_from_declaration(struct wined3d_device *device, if (!(map & 1)) continue; element = &stream_info->elements[i]; - buffer = device->stateBlock->state.streams[element->stream_idx].buffer; + buffer = state->streams[element->stream_idx].buffer; wined3d_buffer_preload(buffer); /* If the preload dropped the buffer object, update the stream info. */

1 0

Matteo Bruni : ddraw/tests: Rename a variable.
by Alexandre Julliard July 27, 2011

July 27, 2011

Module: wine Branch: master Commit: 2308f4cfda047ecf1c2b3cb92407cf3eb93a999d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2308f4cfda047ecf1c2b3cb92… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jul 22 19:37:57 2011 +0200 ddraw/tests: Rename a variable. --- dlls/ddraw/tests/visual.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index b6c8006..f946f3e 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -423,14 +423,14 @@ static void fog_test(IDirect3DDevice7 *device) D3DDEVICEDESC7 caps; /* Gets full z based fog with linear fog, no fog with specular color */ - struct sVertex unstransformed_1[] = { + struct sVertex untransformed_1[] = { {-1, -1, 0.1f, 0xFFFF0000, 0xFF000000 }, {-1, 0, 0.1f, 0xFFFF0000, 0xFF000000 }, { 0, 0, 0.1f, 0xFFFF0000, 0xFF000000 }, { 0, -1, 0.1f, 0xFFFF0000, 0xFF000000 }, }; /* Ok, I am too lazy to deal with transform matrices */ - struct sVertex unstransformed_2[] = { + struct sVertex untransformed_2[] = { {-1, 0, 1.0f, 0xFFFF0000, 0xFF000000 }, {-1, 1, 1.0f, 0xFFFF0000, 0xFF000000 }, { 0, 1, 1.0f, 0xFFFF0000, 0xFF000000 }, @@ -483,7 +483,7 @@ static void fog_test(IDirect3DDevice7 *device) { /* Untransformed, vertex fog = NONE, table fog = NONE: Read the fog weighting from the specular color */ hr = IDirect3DDevice7_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_SPECULAR, - unstransformed_1, 4, Indices, 6, 0); + untransformed_1, 4, Indices, 6, 0); ok(hr == D3D_OK, "DrawIndexedPrimitive returned %08x\n", hr); /* That makes it use the Z value */ @@ -493,7 +493,7 @@ static void fog_test(IDirect3DDevice7 *device) * Use the Z value as input into the equation */ hr = IDirect3DDevice7_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_SPECULAR, - unstransformed_2, 4, Indices, 6, 0); + untransformed_2, 4, Indices, 6, 0); ok(hr == D3D_OK, "DrawIndexedPrimitive returned %08x\n", hr); /* transformed verts */

1 0

Henri Verbeet : wined3d: Get rid of the redundant state_table parameter to context_invalidate_state ().
by Alexandre Julliard July 27, 2011

July 27, 2011

Module: wine Branch: master Commit: 68d692f49ccb70b40019ff6e9691dc191dda122f URL: http://source.winehq.org/git/wine.git/?a=commit;h=68d692f49ccb70b40019ff6e9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 26 19:52:44 2011 +0200 wined3d: Get rid of the redundant state_table parameter to context_invalidate_state(). --- dlls/wined3d/context.c | 97 +++++++++++++++++++++++------------------------- 1 files changed, 46 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=68d692f49ccb70b40019f…

1 0

Matteo Bruni : d3d9/tests: Rename a variable.
by Alexandre Julliard July 27, 2011

July 27, 2011

Module: wine Branch: master Commit: 85e729cf5d3295eec1291dc3a4e917d1d9cc824a URL: http://source.winehq.org/git/wine.git/?a=commit;h=85e729cf5d3295eec1291dc3a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jul 22 19:47:54 2011 +0200 d3d9/tests: Rename a variable. --- dlls/d3d9/tests/visual.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 16047bf..761a385 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -877,14 +877,14 @@ static void fog_test(IDirect3DDevice9 *device) int i; /* Gets full z based fog with linear fog, no fog with specular color */ - struct sVertex unstransformed_1[] = { + struct sVertex untransformed_1[] = { {-1, -1, 0.1f, 0xFFFF0000, 0xFF000000 }, {-1, 0, 0.1f, 0xFFFF0000, 0xFF000000 }, { 0, 0, 0.1f, 0xFFFF0000, 0xFF000000 }, { 0, -1, 0.1f, 0xFFFF0000, 0xFF000000 }, }; /* Ok, I am too lazy to deal with transform matrices */ - struct sVertex unstransformed_2[] = { + struct sVertex untransformed_2[] = { {-1, 0, 1.0f, 0xFFFF0000, 0xFF000000 }, {-1, 1, 1.0f, 0xFFFF0000, 0xFF000000 }, { 0, 1, 1.0f, 0xFFFF0000, 0xFF000000 }, @@ -960,8 +960,8 @@ static void fog_test(IDirect3DDevice9 *device) ok( hr == D3D_OK, "SetFVF returned %08x\n", hr); /* Untransformed, vertex fog = NONE, table fog = NONE: Read the fog weighting from the specular color */ hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, - 2 /*PrimCount */, Indices, D3DFMT_INDEX16, unstransformed_1, - sizeof(unstransformed_1[0])); + 2 /*PrimCount */, Indices, D3DFMT_INDEX16, untransformed_1, + sizeof(untransformed_1[0])); ok(hr == D3D_OK, "DrawIndexedPrimitiveUP returned %08x\n", hr); /* That makes it use the Z value */ @@ -971,8 +971,8 @@ static void fog_test(IDirect3DDevice9 *device) * Use the Z value as input into the equation */ hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, - 2 /*PrimCount */, Indices, D3DFMT_INDEX16, unstransformed_2, - sizeof(unstransformed_1[0])); + 2 /*PrimCount */, Indices, D3DFMT_INDEX16, untransformed_2, + sizeof(untransformed_2[0])); ok(hr == D3D_OK, "DrawIndexedPrimitiveUP returned %08x\n", hr); /* transformed verts */ @@ -1051,12 +1051,12 @@ static void fog_test(IDirect3DDevice9 *device) * color and has fixed fogstart and fogend. */ hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, - 2 /*PrimCount */, Indices, D3DFMT_INDEX16, unstransformed_1, - sizeof(unstransformed_1[0])); + 2 /*PrimCount */, Indices, D3DFMT_INDEX16, untransformed_1, + sizeof(untransformed_1[0])); ok(hr == D3D_OK, "DrawIndexedPrimitiveUP returned %08x\n", hr); hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, - 2 /*PrimCount */, Indices, D3DFMT_INDEX16, unstransformed_2, - sizeof(unstransformed_1[0])); + 2 /*PrimCount */, Indices, D3DFMT_INDEX16, untransformed_2, + sizeof(untransformed_2[0])); ok(hr == D3D_OK, "DrawIndexedPrimitiveUP returned %08x\n", hr); hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZRHW | D3DFVF_DIFFUSE | D3DFVF_SPECULAR);

1 0

Matteo Bruni : d3d9/tests: Fix some messages.
by Alexandre Julliard July 27, 2011

July 27, 2011

Module: wine Branch: master Commit: 9a790806bdfe6873de2af9c0a68271fcde093956 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a790806bdfe6873de2af9c0a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jul 22 20:01:25 2011 +0200 d3d9/tests: Fix some messages. --- dlls/d3d9/tests/visual.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 761a385..7651069 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -940,19 +940,19 @@ static void fog_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGENABLE, TRUE); ok(hr == D3D_OK, "Turning on fog calculations returned %08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGCOLOR, 0xFF00FF00 /* A nice green */); - ok(hr == D3D_OK, "Turning on fog calculations returned %08x\n", hr); + ok(hr == D3D_OK, "Setting fog color returned %#08x\n", hr); /* First test: Both table fog and vertex fog off */ hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGTABLEMODE, D3DFOG_NONE); ok(hr == D3D_OK, "Turning off table fog returned %08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGVERTEXMODE, D3DFOG_NONE); - ok(hr == D3D_OK, "Turning off table fog returned %08x\n", hr); + ok(hr == D3D_OK, "Turning off vertex fog returned %08x\n", hr); /* Start = 0, end = 1. Should be default, but set them */ hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGSTART, *((DWORD *) &start)); ok(hr == D3D_OK, "Setting fog start returned %08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGEND, *((DWORD *) &end)); - ok(hr == D3D_OK, "Setting fog start returned %08x\n", hr); + ok(hr == D3D_OK, "Setting fog end returned %08x\n", hr); if(IDirect3DDevice9_BeginScene(device) == D3D_OK) { @@ -966,7 +966,7 @@ static void fog_test(IDirect3DDevice9 *device) /* That makes it use the Z value */ hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGVERTEXMODE, D3DFOG_LINEAR); - ok(hr == D3D_OK, "Turning off table fog returned %08x\n", hr); + ok(hr == D3D_OK, "Setting fog vertex mode to D3DFOG_LINEAR returned %#08x\n", hr); /* Untransformed, vertex fog != none (or table fog != none): * Use the Z value as input into the equation */ @@ -1035,12 +1035,12 @@ static void fog_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGSTART, *((DWORD *) &start)); ok(hr == D3D_OK, "Setting fog start returned %08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGEND, *((DWORD *) &end)); - ok(hr == D3D_OK, "Setting fog start returned %08x\n", hr); + ok(hr == D3D_OK, "Setting fog end returned %08x\n", hr); hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_SPECULAR); ok( hr == D3D_OK, "SetFVF returned %08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGVERTEXMODE, D3DFOG_LINEAR); - ok( hr == D3D_OK, "IDirect3DDevice9_SetRenderState %08x\n", hr); + ok( hr == D3D_OK, "Setting fog vertex mode to D3DFOG_LINEAR returned %08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGTABLEMODE, D3DFOG_NONE); ok( hr == D3D_OK, "Setting fog table mode to D3DFOG_LINEAR returned %08x\n", hr); @@ -1154,7 +1154,7 @@ static void fog_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGEND, *((DWORD *) &end)); ok(hr == D3D_OK, "Setting fog end returned %08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGVERTEXMODE, D3DFOG_LINEAR); - ok( hr == D3D_OK, "IDirect3DDevice9_SetRenderState %08x\n", hr); + ok( hr == D3D_OK, "Setting fog vertex mode to D3DFOG_LINEAR returned %08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGTABLEMODE, D3DFOG_LINEAR); ok( hr == D3D_OK, "Setting fog table mode to D3DFOG_LINEAR returned %08x\n", hr); }

1 0

Hans Leidekker : winhttp: Include the extra info part of the URL in the request.
by Alexandre Julliard July 27, 2011

July 27, 2011

Module: wine Branch: master Commit: 2295c6379692552ea86e952941784af1a3ecc17e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2295c6379692552ea86e95294… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 27 07:57:17 2011 +0200 winhttp: Include the extra info part of the URL in the request. --- dlls/winhttp/request.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index af69a41..4da4508 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1,7 +1,7 @@ /* * Copyright 2004 Mike McCormack for CodeWeavers * Copyright 2006 Rob Shearman for CodeWeavers - * Copyright 2008 Hans Leidekker for CodeWeavers + * Copyright 2008, 2011 Hans Leidekker for CodeWeavers * Copyright 2009 Juan Lang * * This library is free software; you can redistribute it and/or @@ -2450,18 +2450,19 @@ static HRESULT WINAPI winhttp_request_Open( uc.dwSchemeLength = ~0u; uc.dwHostNameLength = ~0u; uc.dwUrlPathLength = ~0u; + uc.dwExtraInfoLength = ~0u; if (!WinHttpCrackUrl( url, 0, 0, &uc )) return HRESULT_FROM_WIN32( get_last_error() ); if (!(hostname = heap_alloc( (uc.dwHostNameLength + 1) * sizeof(WCHAR) ))) return E_OUTOFMEMORY; memcpy( hostname, uc.lpszHostName, uc.dwHostNameLength * sizeof(WCHAR) ); hostname[uc.dwHostNameLength] = 0; - if (!(path = heap_alloc( (uc.dwUrlPathLength + 1) * sizeof(WCHAR) ))) + if (!(path = heap_alloc( (uc.dwUrlPathLength + uc.dwExtraInfoLength + 1) * sizeof(WCHAR) ))) { heap_free( hostname ); return E_OUTOFMEMORY; } - memcpy( path, uc.lpszUrlPath, uc.dwUrlPathLength * sizeof(WCHAR) ); - path[uc.dwUrlPathLength] = 0; + memcpy( path, uc.lpszUrlPath, (uc.dwUrlPathLength + uc.dwExtraInfoLength) * sizeof(WCHAR) ); + path[uc.dwUrlPathLength + uc.dwExtraInfoLength] = 0; if (V_BOOL( &async ) == VARIANT_TRUE) flags |= WINHTTP_FLAG_ASYNC; if (!(hsession = WinHttpOpen( user_agentW, WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, NULL, NULL, flags )))

1 0

Matteo Bruni : ddraw/tests: Fix some messages.
by Alexandre Julliard July 27, 2011

July 27, 2011

Module: wine Branch: master Commit: b6af8a7ef94f2307eb1180b6da56fd28428d8b25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6af8a7ef94f2307eb1180b6d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jul 22 19:38:52 2011 +0200 ddraw/tests: Fix some messages. --- dlls/ddraw/tests/visual.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index f946f3e..24ca8dc 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -465,19 +465,19 @@ static void fog_test(IDirect3DDevice7 *device) hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGENABLE, TRUE); ok(hr == D3D_OK, "Turning on fog calculations returned %08x\n", hr); hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGCOLOR, 0xFF00FF00 /* A nice green */); - ok(hr == D3D_OK, "Turning on fog calculations returned %08x\n", hr); + ok(hr == D3D_OK, "Setting fog color returned %08x\n", hr); /* First test: Both table fog and vertex fog off */ hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGTABLEMODE, D3DFOG_NONE); ok(hr == D3D_OK, "Turning off table fog returned %08x\n", hr); hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGVERTEXMODE, D3DFOG_NONE); - ok(hr == D3D_OK, "Turning off table fog returned %08x\n", hr); + ok(hr == D3D_OK, "Turning off vertex fog returned %08x\n", hr); /* Start = 0, end = 1. Should be default, but set them */ hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGSTART, *((DWORD *) &start)); ok(hr == D3D_OK, "Setting fog start returned %08x\n", hr); hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGEND, *((DWORD *) &end)); - ok(hr == D3D_OK, "Setting fog start returned %08x\n", hr); + ok(hr == D3D_OK, "Setting fog end returned %08x\n", hr); if(IDirect3DDevice7_BeginScene(device) == D3D_OK) { @@ -488,7 +488,7 @@ static void fog_test(IDirect3DDevice7 *device) /* That makes it use the Z value */ hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGVERTEXMODE, D3DFOG_LINEAR); - ok(hr == D3D_OK, "Turning off table fog returned %08x\n", hr); + ok(hr == D3D_OK, "Setting fog vertex mode to D3DFOG_LINEAR returned %08x\n", hr); /* Untransformed, vertex fog != none (or table fog != none): * Use the Z value as input into the equation */

1 0

Henri Verbeet : wined3d: Only invalidate state for the current context in wined3d_surface_depth_blt_fbo ().
by Alexandre Julliard July 27, 2011

July 27, 2011

Module: wine Branch: master Commit: 51c0f2a78764a83e81422a80c7ef8af59f92db88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51c0f2a78764a83e81422a80c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 26 19:52:46 2011 +0200 wined3d: Only invalidate state for the current context in wined3d_surface_depth_blt_fbo(). --- dlls/wined3d/surface.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 77d13df..d34bcd5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1145,21 +1145,21 @@ static void wined3d_surface_depth_blt_fbo(struct wined3d_device *device, struct if (gl_mask & GL_DEPTH_BUFFER_BIT) { glDepthMask(GL_TRUE); - device_invalidate_state(device, STATE_RENDER(WINED3DRS_ZWRITEENABLE)); + context_invalidate_state(context, STATE_RENDER(WINED3DRS_ZWRITEENABLE)); } if (gl_mask & GL_STENCIL_BUFFER_BIT) { if (context->gl_info->supported[EXT_STENCIL_TWO_SIDE]) { glDisable(GL_STENCIL_TEST_TWO_SIDE_EXT); - device_invalidate_state(device, STATE_RENDER(WINED3DRS_TWOSIDEDSTENCILMODE)); + context_invalidate_state(context, STATE_RENDER(WINED3DRS_TWOSIDEDSTENCILMODE)); } glStencilMask(~0U); - device_invalidate_state(device, STATE_RENDER(WINED3DRS_STENCILWRITEMASK)); + context_invalidate_state(context, STATE_RENDER(WINED3DRS_STENCILWRITEMASK)); } glDisable(GL_SCISSOR_TEST); - device_invalidate_state(device, STATE_RENDER(WINED3DRS_SCISSORTESTENABLE)); + context_invalidate_state(context, STATE_RENDER(WINED3DRS_SCISSORTESTENABLE)); gl_info->fbo_ops.glBlitFramebuffer(src_rect->left, src_rect->top, src_rect->right, src_rect->bottom, dst_rect->left, dst_rect->top, dst_rect->right, dst_rect->bottom, gl_mask, GL_NEAREST);

1 0

Henri Verbeet : wined3d: Get rid of the use_vshader parameter to device_stream_info_from_declaration ().
by Alexandre Julliard July 27, 2011

July 27, 2011

Module: wine Branch: master Commit: 26cd7b835d9ea6f7c8b329832bef7be24f07fc4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=26cd7b835d9ea6f7c8b329832… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 26 19:52:43 2011 +0200 wined3d: Get rid of the use_vshader parameter to device_stream_info_from_declaration(). --- dlls/wined3d/device.c | 28 +++++++++++++++++----------- dlls/wined3d/drawprim.c | 14 +++++++++----- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 27 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9b6fc96..f1901bf 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -172,11 +172,12 @@ static BOOL fixed_get_input(BYTE usage, BYTE usage_idx, unsigned int *regnum) /* Context activation is done by the caller. */ void device_stream_info_from_declaration(struct wined3d_device *device, - BOOL use_vshader, struct wined3d_stream_info *stream_info, BOOL *fixup) + struct wined3d_stream_info *stream_info, BOOL *fixup) { const struct wined3d_state *state = &device->stateBlock->state; /* We need to deal with frequency data! */ struct wined3d_vertex_declaration *declaration = state->vertex_declaration; + BOOL use_vshader; unsigned int i; stream_info->use_map = 0; @@ -184,7 +185,7 @@ void device_stream_info_from_declaration(struct wined3d_device *device, /* Check for transformed vertices, disable vertex shader if present. */ stream_info->position_transformed = declaration->position_transformed; - if (declaration->position_transformed) use_vshader = FALSE; + use_vshader = state->vertex_shader && !declaration->position_transformed; /* Translate the declaration into strided data. */ for (i = 0; i < declaration->element_count; ++i) @@ -426,7 +427,7 @@ void device_update_stream_info(struct wined3d_device *device, const struct wined else { TRACE("============================= Vertex Declaration =============================\n"); - device_stream_info_from_declaration(device, !!state->vertex_shader, stream_info, &fixup); + device_stream_info_from_declaration(device, stream_info, &fixup); } if (state->vertex_shader && !stream_info->position_transformed) @@ -3517,10 +3518,12 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, UINT src_start_idx, UINT dst_idx, UINT vertex_count, struct wined3d_buffer *dst_buffer, struct wined3d_vertex_declaration *declaration, DWORD flags, DWORD dst_fvf) { - BOOL vbo = FALSE, streamWasUP = device->stateBlock->state.user_stream; + struct wined3d_state *state = &device->stateBlock->state; + BOOL vbo = FALSE, streamWasUP = state->user_stream; struct wined3d_stream_info stream_info; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; + struct wined3d_shader *vs; HRESULT hr; TRACE("device %p, src_start_idx %u, dst_idx %u, vertex_count %u, " @@ -3535,12 +3538,15 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, context = context_acquire(device, NULL); gl_info = context->gl_info; - /* ProcessVertices reads from vertex buffers, which have to be assigned. DrawPrimitive and DrawPrimitiveUP - * control the streamIsUP flag, thus restore it afterwards. - */ - device->stateBlock->state.user_stream = FALSE; - device_stream_info_from_declaration(device, FALSE, &stream_info, &vbo); - device->stateBlock->state.user_stream = streamWasUP; + /* ProcessVertices reads from vertex buffers, which have to be assigned. + * DrawPrimitive and DrawPrimitiveUP control the streamIsUP flag, thus + * restore it afterwards. */ + vs = state->vertex_shader; + state->vertex_shader = NULL; + state->user_stream = FALSE; + device_stream_info_from_declaration(device, &stream_info, &vbo); + state->user_stream = streamWasUP; + state->vertex_shader = vs; if (vbo || src_start_idx) { @@ -3559,7 +3565,7 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, e = &stream_info.elements[i]; if (e->data.buffer_object) { - struct wined3d_buffer *vb = device->stateBlock->state.streams[e->stream_idx].buffer; + struct wined3d_buffer *vb = state->streams[e->stream_idx].buffer; e->data.buffer_object = 0; e->data.addr = (BYTE *)((ULONG_PTR)e->data.addr + (ULONG_PTR)buffer_get_sysmem(vb, gl_info)); ENTER_GL(); diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 3179343..bbcfc59 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -790,9 +790,11 @@ HRESULT tesselate_rectpatch(struct wined3d_device *This, struct WineD3DRectPatch { unsigned int i, j, num_quads, out_vertex_size, buffer_size, d3d_out_vertex_size; float max_x = 0.0f, max_y = 0.0f, max_z = 0.0f, neg_z = 0.0f; + struct wined3d_state *state = &This->stateBlock->state; struct wined3d_stream_info stream_info; struct wined3d_stream_info_element *e; struct wined3d_context *context; + struct wined3d_shader *vs; const BYTE *data; const WINED3DRECTPATCH_INFO *info = &patch->RectPatchInfo; DWORD vtxStride; @@ -805,15 +807,17 @@ HRESULT tesselate_rectpatch(struct wined3d_device *This, struct WineD3DRectPatch context = context_acquire(This, NULL); context_apply_blit_state(context, This); - /* First, locate the position data. This is provided in a vertex buffer in the stateblock. - * Beware of vbos - */ - device_stream_info_from_declaration(This, FALSE, &stream_info, NULL); + /* First, locate the position data. This is provided in a vertex buffer in + * the stateblock. Beware of VBOs. */ + vs = state->vertex_shader; + state->vertex_shader = NULL; + device_stream_info_from_declaration(This, &stream_info, NULL); + state->vertex_shader = vs; e = &stream_info.elements[WINED3D_FFP_POSITION]; if (e->data.buffer_object) { - struct wined3d_buffer *vb = This->stateBlock->state.streams[e->stream_idx].buffer; + struct wined3d_buffer *vb = state->streams[e->stream_idx].buffer; e->data.addr = (BYTE *)((ULONG_PTR)e->data.addr + (ULONG_PTR)buffer_get_sysmem(vb, context->gl_info)); } vtxStride = e->stride; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cfa565f..a7699b5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1759,7 +1759,7 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL void device_resource_add(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void device_resource_released(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void device_stream_info_from_declaration(struct wined3d_device *device, - BOOL use_vshader, struct wined3d_stream_info *stream_info, BOOL *fixup) DECLSPEC_HIDDEN; + struct wined3d_stream_info *stream_info, BOOL *fixup) DECLSPEC_HIDDEN; void device_switch_onscreen_ds(struct wined3d_device *device, struct wined3d_context *context, struct wined3d_surface *depth_stencil) DECLSPEC_HIDDEN; void device_update_stream_info(struct wined3d_device *device, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN;

1 0