November 2007 - Wine-commits

Rob Shearman : rpcrt4: Fix the tests for up_enum16.
by Alexandre Julliard 27 Nov '07

27 Nov '07

Module: wine Branch: master Commit: 41713097314354fb37df2cb71d78624d9e08a0df URL: http://source.winehq.org/git/wine.git/?a=commit;h=41713097314354fb37df2cb71… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Nov 27 12:32:48 2007 +0000 rpcrt4: Fix the tests for up_enum16. It is different to the other base types as it has a different size on the wire to in memory, so it can't just be set to the buffer when unmarshalling. --- dlls/rpcrt4/tests/ndr_marshall.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index f64c766..06b7b51 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -247,16 +247,21 @@ todo_wine { StubMsg.IsClient = 0; ptr = NdrPointerUnmarshall( &StubMsg, &mem, formattypes, 0 ); ok(ptr == NULL, "%s: ret %p\n", msgpfx, ptr); + if (formattypes[2] == 0xd /* FC_ENUM16 */) + ok(mem != StubMsg.BufferStart + wiredatalen - srcsize, "%s: mem points to buffer %p %p\n", msgpfx, mem, StubMsg.BufferStart); + else todo_wine { - ok(mem == StubMsg.BufferStart + wiredatalen - srcsize, "%s: mem doesn't point to buffer %p %p\n", msgpfx, mem, StubMsg.BufferStart); + ok(mem == StubMsg.BufferStart + wiredatalen - srcsize, "%s: mem doesn't point to buffer %p %p\n", msgpfx, mem, StubMsg.BufferStart); } ok(!cmp(mem, memsrc, size), "%s: incorrecly unmarshaled\n", msgpfx); ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); ok(StubMsg.MemorySize == 0, "%s: memorysize %d\n", msgpfx, StubMsg.MemorySize); + if (formattypes[2] != 0xd /* FC_ENUM16 */) { todo_wine { - ok(my_alloc_called == num_additional_allocs, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); - my_alloc_called = 0; + ok(my_alloc_called == num_additional_allocs, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); + my_alloc_called = 0; } + } } HeapFree(GetProcessHeap(), 0, mem_orig); HeapFree(GetProcessHeap(), 0, StubMsg.BufferStart);

1 0

Rob Shearman : wininet: Don' t clear the auth data for Basic authentication in HTTP_InsertAuthorizationForHeader .
by Alexandre Julliard 27 Nov '07

27 Nov '07

Module: wine Branch: master Commit: 01826e0c98dab3e546d7e974bc8bfc2a2b29df12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01826e0c98dab3e546d7e974b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Nov 27 14:19:50 2007 +0000 wininet: Don't clear the auth data for Basic authentication in HTTP_InsertAuthorizationForHeader. It isn't tracked per connection, unlike NTLM authentication, and so the server will return a 401 error and try to get us to authenticate again. However, this doesn't work as the authentication information is assumed by the code to be valid for the whole connection. --- dlls/wininet/http.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 5f27bd2..6845883 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1193,6 +1193,7 @@ static BOOL HTTP_InsertAuthorizationForHeader( LPWININETHTTPREQW lpwhr, struct H if (pAuthInfo && pAuthInfo->auth_data_len) { static const WCHAR wszSpace[] = {' ',0}; + static const WCHAR wszBasic[] = {'B','a','s','i','c',0}; unsigned int len; /* scheme + space + base64 encoded data (3/2/1 bytes data -> 4 bytes of characters) */ @@ -1208,10 +1209,14 @@ static BOOL HTTP_InsertAuthorizationForHeader( LPWININETHTTPREQW lpwhr, struct H authorization+strlenW(authorization)); /* clear the data as it isn't valid now that it has been sent to the - * server */ - HeapFree(GetProcessHeap(), 0, pAuthInfo->auth_data); - pAuthInfo->auth_data = NULL; - pAuthInfo->auth_data_len = 0; + * server, unless it's Basic authentication which doesn't do + * connection tracking */ + if (strcmpiW(pAuthInfo->scheme, wszBasic)) + { + HeapFree(GetProcessHeap(), 0, pAuthInfo->auth_data); + pAuthInfo->auth_data = NULL; + pAuthInfo->auth_data_len = 0; + } } TRACE("Inserting authorization: %s\n", debugstr_w(authorization));

1 0

Alexandre Julliard : server: When merging mouse messages ignore the window if it isn't set.
by Alexandre Julliard 27 Nov '07

27 Nov '07

Module: wine Branch: master Commit: 942a70dc64ba513c1fc0fe9c81ae731e9434fe76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=942a70dc64ba513c1fc0fe9c8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 27 16:43:00 2007 +0100 server: When merging mouse messages ignore the window if it isn't set. --- server/queue.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/queue.c b/server/queue.c index f6d6ca4..320bdb0 100644 --- a/server/queue.c +++ b/server/queue.c @@ -407,7 +407,7 @@ static int merge_message( struct thread_input *input, const struct message *msg if (!ptr) return 0; prev = LIST_ENTRY( ptr, struct message, entry ); if (prev->result) return 0; - if (prev->win != msg->win) return 0; + if (prev->win && msg->win && prev->win != msg->win) return 0; if (prev->msg != msg->msg) return 0; if (prev->type != msg->type) return 0; /* now we can merge it */

1 0

Stefan Dösinger : wined3d: Correctly handle the y offset with offscreen rendering.
by Alexandre Julliard 27 Nov '07

27 Nov '07

Module: wine Branch: master Commit: f2c19fbc0b5dbe67193355e69ec679dbf4a025e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2c19fbc0b5dbe67193355e69… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Nov 21 23:46:15 2007 +0100 wined3d: Correctly handle the y offset with offscreen rendering. This fixes a regression introduced with the MAD patch. --- dlls/wined3d/state.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index d5bf992..0d735cb 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3373,6 +3373,7 @@ static void vertexdeclaration(DWORD state, IWineD3DStateBlockImpl *stateblock, W */ if (useVertexShaderFunction) { device->posFixup[1] = device->render_offscreen ? -1.0 : 1.0; + device->posFixup[3] = -device->posFixup[1] / stateblock->viewport.Height; } } @@ -3496,7 +3497,7 @@ static void viewport(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCon checkGLcall("glViewport"); stateblock->wineD3DDevice->posFixup[2] = 1.0 / stateblock->viewport.Width; - stateblock->wineD3DDevice->posFixup[3] = -1.0 / stateblock->viewport.Height; + stateblock->wineD3DDevice->posFixup[3] = -stateblock->wineD3DDevice->posFixup[1] / stateblock->viewport.Height; if(!isStateDirty(context, STATE_TRANSFORM(WINED3DTS_PROJECTION))) { transform_projection(STATE_TRANSFORM(WINED3DTS_PROJECTION), stateblock, context); }

1 0

David Adam : include: Header files for d3dx9_xx.
by Alexandre Julliard 27 Nov '07

27 Nov '07

Module: wine Branch: master Commit: 9b34a2d21bee971d99d2824972d0d3f3cde77a6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b34a2d21bee971d99d282497… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Tue Nov 27 00:36:20 2007 +0100 include: Header files for d3dx9_xx. --- include/Makefile.in | 3 + include/d3dx9.h | 27 + include/d3dx9math.h | 350 ++++++++++++++ include/d3dx9math.inl | 1268 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 1648 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b34a2d21bee971d99d28…

1 0

Rob Shearman : credui: Fix a test failure on Windows XP.
by Alexandre Julliard 27 Nov '07

27 Nov '07

Module: wine Branch: master Commit: 0f9e568933925b283aa1a7bd20fdd8b27db94046 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f9e568933925b283aa1a7bd2… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Nov 27 12:32:39 2007 +0000 credui: Fix a test failure on Windows XP. --- dlls/credui/tests/credui.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/credui/tests/credui.c b/dlls/credui/tests/credui.c index 692e586..969b096 100644 --- a/dlls/credui/tests/credui.c +++ b/dlls/credui/tests/credui.c @@ -41,7 +41,8 @@ static void test_CredUIPromptForCredentials(void) credui_info.hbmBanner = NULL; ret = CredUIConfirmCredentialsW(NULL, TRUE); - ok(ret == ERROR_INVALID_PARAMETER, "CredUIConfirmCredentials should have returned ERROR_INVALID_PARAMETER instead of %d\n", ret); + ok(ret == ERROR_INVALID_PARAMETER /* 2003 + */ || ret == ERROR_NOT_FOUND /* XP */, + "CredUIConfirmCredentials should have returned ERROR_INVALID_PARAMETER or ERROR_NOT_FOUND instead of %d\n", ret); ret = CredUIConfirmCredentialsW(wszServerName, TRUE); ok(ret == ERROR_NOT_FOUND, "CredUIConfirmCredentials should have returned ERROR_NOT_FOUND instead of %d\n", ret);

1 0

Stefan Dösinger : d3d9: Add a test for vertex shader input matching.
by Alexandre Julliard 27 Nov '07

27 Nov '07

Module: wine Branch: master Commit: 02ebbd1fe5ed4abd01aa10be558a3a229d3bdc05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02ebbd1fe5ed4abd01aa10be5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Nov 21 22:16:12 2007 +0100 d3d9: Add a test for vertex shader input matching. --- dlls/d3d9/tests/visual.c | 459 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 458 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=02ebbd1fe5ed4abd01aa1…

1 0

Stefan Dösinger : wined3d: Make SRGB write correction working with 1.x shaders in arb.
by Alexandre Julliard 27 Nov '07

27 Nov '07

Module: wine Branch: master Commit: d2ac521cd3b43fb1b9f4a25f12b68ef408ba6b7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2ac521cd3b43fb1b9f4a25f1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 20 15:29:18 2007 +0100 wined3d: Make SRGB write correction working with 1.x shaders in arb. --- dlls/wined3d/pixelshader.c | 26 +++++++++++++++++--------- 1 files changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index b9fbd75..a131439 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -414,8 +414,16 @@ static inline VOID IWineD3DPixelShaderImpl_GenerateShader( shader_addline(&buffer, "MAD_SAT TMP_FOG, fragment.fogcoord, state.fog.params.y, state.fog.params.z;\n"); if(This->srgb_enabled) { + const char *color_reg; + + if (This->baseShader.hex_version < WINED3DPS_VERSION(2,0)) { + color_reg = "R0"; + } else { + color_reg = "TMP_COLOR"; + } + if (This->baseShader.hex_version < WINED3DPS_VERSION(2,0)) { - shader_addline(&buffer, "LRP TMP_COLOR.rgb, TMP_FOG.x, R0, state.fog.color;\n"); + shader_addline(&buffer, "LRP R0.rgb, TMP_FOG.x, R0, state.fog.color;\n"); shader_addline(&buffer, "MOV result.color.a, R0.a;\n"); } else { shader_addline(&buffer, "LRP TMP_COLOR.rgb, TMP_FOG.x, TMP_COLOR, state.fog.color;\n"); @@ -424,20 +432,20 @@ static inline VOID IWineD3DPixelShaderImpl_GenerateShader( /* Perform sRGB write correction. See GLX_EXT_framebuffer_sRGB */ /* Calculate the > 0.0031308 case */ - shader_addline(&buffer, "POW TMP.x, TMP_COLOR.x, srgb_pow.x;\n"); - shader_addline(&buffer, "POW TMP.y, TMP_COLOR.y, srgb_pow.y;\n"); - shader_addline(&buffer, "POW TMP.z, TMP_COLOR.z, srgb_pow.z;\n"); + shader_addline(&buffer, "POW TMP.x, %s.x, srgb_pow.x;\n", color_reg); + shader_addline(&buffer, "POW TMP.y, %s.y, srgb_pow.y;\n", color_reg); + shader_addline(&buffer, "POW TMP.z, %s.z, srgb_pow.z;\n", color_reg); shader_addline(&buffer, "MUL TMP, TMP, srgb_mul_hi;\n"); shader_addline(&buffer, "SUB TMP, TMP, srgb_sub_hi;\n"); /* Calculate the < case */ - shader_addline(&buffer, "MUL TMP2, srgb_mul_low, TMP_COLOR;\n"); + shader_addline(&buffer, "MUL TMP2, srgb_mul_low, %s;\n", color_reg); /* Get 1.0 / 0.0 masks for > 0.0031308 and < 0.0031308 */ - shader_addline(&buffer, "SLT TA, srgb_comparison, TMP_COLOR;\n"); - shader_addline(&buffer, "SGE TB, srgb_comparison, TMP_COLOR;\n"); + shader_addline(&buffer, "SLT TA, srgb_comparison, %s;\n", color_reg); + shader_addline(&buffer, "SGE TB, srgb_comparison, %s;\n", color_reg); /* Store the components > 0.0031308 in the destination */ - shader_addline(&buffer, "MUL TMP_COLOR, TMP, TA;\n"); + shader_addline(&buffer, "MUL %s, TMP, TA;\n", color_reg); /* Add the components that are < 0.0031308 */ - shader_addline(&buffer, "MAD result.color.xyz, TMP2, TB, TMP_COLOR;\n"); + shader_addline(&buffer, "MAD result.color.xyz, TMP2, TB, %s;\n", color_reg); /* [0.0;1.0] clamping. Not needed, this is done implicitly */ } else { if (This->baseShader.hex_version < WINED3DPS_VERSION(2,0)) {

1 0

Stefan Dösinger : wined3d: Fog is applied after sRGB correction.
by Alexandre Julliard 27 Nov '07

27 Nov '07

Module: wine Branch: master Commit: ba5c61ba20893e081921b70a5f3e2202f204aae6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba5c61ba20893e081921b70a5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 20 17:58:59 2007 +0100 wined3d: Fog is applied after sRGB correction. --- dlls/d3d9/tests/visual.c | 102 ++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/pixelshader.c | 82 ++++++++++++++--------------------- 2 files changed, 134 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ba5c61ba20893e081921b…

1 0

Stefan Dösinger : wined3d: Downgrade an ERR to a WARN.
by Alexandre Julliard 27 Nov '07

27 Nov '07

Module: wine Branch: master Commit: 46647e58fad2d7b666c89a7f10495b9c3f6f923c URL: http://source.winehq.org/git/wine.git/?a=commit;h=46647e58fad2d7b666c89a7f1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 20 21:16:25 2007 +0100 wined3d: Downgrade an ERR to a WARN. --- dlls/wined3d/device.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8be3385..3ddbc77 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6340,7 +6340,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderTarget(IWineD3DDevice *iface, TRACE("(%p) : Setting rendertarget %d to %p\n", This, RenderTargetIndex, pRenderTarget); if (RenderTargetIndex >= GL_LIMITS(buffers)) { - ERR("(%p) : Only %d render targets are supported.\n", This, GL_LIMITS(buffers)); + WARN("(%p) : Unsupported target %u set, returning WINED3DERR_INVALIDCALL(only %u supported)\n", + This, RenderTargetIndex, GL_LIMITS(buffers)); return WINED3DERR_INVALIDCALL; }

1 0