March 2016 - Wine-devel - list.winehq.org

Re: [v3] d3dx9: support setting texture through SetValue in effect.
by Matteo Bruni 08 Mar '16

08 Mar '16

2016-03-06 9:39 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- a/dlls/d3dx9_36/tests/effect.c > +++ b/dlls/d3dx9_36/tests/effect.c > @@ -2389,6 +2389,43 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) > } > } > > +static void test_effect_setvalue_object(IDirect3DDevice9 *device) > +{ > + ID3DXEffect *effect; > + D3DXHANDLE parameter; > + IDirect3DTexture9 *texture; > + IDirect3DTexture9 *texture_set; > + HRESULT hr; > + ULONG count; > + > + hr = D3DXCreateEffect(device, test_effect_parameter_value_blob_object, > + sizeof(test_effect_parameter_value_blob_object), NULL, NULL, 0, NULL, &effect, NULL); > + ok(hr == D3D_OK, "Got result %#x, expected 0 (D3D_OK).\n", hr); > + > + parameter = effect->lpVtbl->GetParameterByName(effect, NULL, "tex"); > + ok(parameter != NULL, "GetParameterByName failed, got %p\n", parameter); > + > + texture = NULL; > + hr = D3DXCreateTexture(device, D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, 0, D3DPOOL_DEFAULT, &texture); > + ok(hr == D3D_OK, "Got result %#x, expected 0 (D3D_OK).\n", hr); > + hr = effect->lpVtbl->SetValue(effect, parameter, &texture, sizeof(IDirect3DTexture9 **)); That sizeof() happens to have the right value (because IDirect3DTexture9 * is also a pointer type) although it's technically incorrect. It's generally preferred to use the variable instead of the type in sizeof when possible (e.g. in this case sizeof(texture)), that would have avoided this mistake and it also helps in other cases. The other two calls to {GS}etValue below have the same issue.

1 0

[PATCH RFC] programs/winedevice.exe: allow group loading
by Aric Stewart 07 Mar '16

07 Mar '16

Here is a patch Sebastian Lackner wanted to see. This is continued work to allow group loading and working off of moving to using IoCreateDriver and such in winedevice. Still using a mailslot which I know Sebastian does not like. But it works quite well. -aric --- programs/winedevice/device.c | 190 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 170 insertions(+), 20 deletions(-)

1 0

Re: [PATCH] webservices: Fixed memory leaks in one error condition (Coverity)
by Hans Leidekker 07 Mar '16

07 Mar '16

Hi Marcus, > diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c > index 72e75c3..688bc2b 100644 > --- a/dlls/webservices/reader.c > +++ b/dlls/webservices/reader.c > @@ -928,7 +928,7 @@ static HRESULT read_attribute( struct reader *reader, WS_XML_ATTRIBUTE **ret ) > WS_XML_UTF8_TEXT *text; > unsigned int len = 0, ch, skip, quote; > const unsigned char *start; > - WS_XML_STRING *prefix, *localname; > + WS_XML_STRING *prefix, *localname = NULL; > HRESULT hr = WS_E_INVALID_FORMAT; > > if (!(attr = heap_alloc_zero( sizeof(*attr) ))) return E_OUTOFMEMORY; > @@ -948,7 +948,11 @@ static HRESULT read_attribute( struct reader *reader, WS_XML_ATTRIBUTE **ret ) > if (WsXmlStringEquals( prefix, &xmlns, NULL ) == S_OK) > { > attr->isXmlNs = 1; > - if (!(attr->prefix = alloc_xml_string( localname->bytes, localname->length ))) goto error; > + heap_free (prefix); > + if (!(attr->prefix = alloc_xml_string( localname->bytes, localname->length ))) { > + heap_free (localname); > + goto error; > + } > attr->localName = localname; > } > else Please replace tabs with spaces and use the same formatting as surrounding code. Otherwise it looks good, thanks.

1 0

Re: ddraw/tests: Fix function name in multiple ok() messages. (resend)
by Marvin 07 Mar '16

07 Mar '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=21242 Your paranoid android. === w1064 (32 bit dsurface) === dsurface.c:144: Test failed: Destination data after blitting is not correct dsurface.c:178: Test failed: Destination data after blitting is not correct dsurface.c:357: Test failed: Surface data after srckey blit does not match dsurface.c:382: Test failed: Surface data after src override key blit does not match dsurface.c:436: Test failed: Surface data after dest key blit does not match dsurface.c:462: Test failed: Surface data after dest key override blit does not match dsurface.c:524: Test failed: Surface data with src key and dest key blit does not match === w864 (64 bit dsurface) === dsurface.c:144: Test failed: Destination data after blitting is not correct dsurface.c:178: Test failed: Destination data after blitting is not correct dsurface.c:357: Test failed: Surface data after srckey blit does not match dsurface.c:382: Test failed: Surface data after src override key blit does not match dsurface.c:436: Test failed: Surface data after dest key blit does not match dsurface.c:462: Test failed: Surface data after dest key override blit does not match dsurface.c:524: Test failed: Surface data with src key and dest key blit does not match === w1064 (64 bit dsurface) === dsurface.c:144: Test failed: Destination data after blitting is not correct dsurface.c:178: Test failed: Destination data after blitting is not correct dsurface.c:357: Test failed: Surface data after srckey blit does not match dsurface.c:382: Test failed: Surface data after src override key blit does not match dsurface.c:436: Test failed: Surface data after dest key blit does not match dsurface.c:462: Test failed: Surface data after dest key override blit does not match dsurface.c:524: Test failed: Surface data with src key and dest key blit does not match

1 0

Re: user32: Do not block sending/posting WM_NOTIFY messages.
by Marvin 07 Mar '16

07 Mar '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=21241 Your paranoid android. === w1064 (32 bit msg) === msg.c:6417: Test failed: Update region shouldn't be empty msg.c:6651: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6653: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different === w864 (64 bit msg) === msg.c:6417: Test failed: Update region shouldn't be empty msg.c:6651: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6653: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different === w1064 (64 bit msg) === msg.c:6417: Test failed: Update region shouldn't be empty msg.c:6651: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6653: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different

2 1

Re: make_xftmpl: Remove getopt prototype
by Alexandre Julliard 07 Mar '16

07 Mar '16

André Hentschel <nerv(a)dawncrow.de> writes: > @@ -92,8 +92,6 @@ static const struct keyword reserved_words[] = { > {"WORD", TOKEN_WORD} > }; > > -extern int getopt(int argc, char *const *argv, const char *optstring); This was explicitly added for MSVC builds. -- Alexandre Julliard julliard(a)winehq.org

1 0

Problems about License Compatibility
by Jianqiu Zhang 07 Mar '16

07 Mar '16

Hi, I am writing packet.dll which is a dependency of windows native wpcap.dll , Source can be get from winpcap.org , When I try to impelment it in wine, I found that I need to use the Packet32.h from packet.dll , Which has a different license than wine(LGPL), And I am not familar with solving license compability, Is there anyone that know how to solve this problem? Thanks in advance I Attach the License for Packet32.h below -- snip -- /* * Copyright (c) 1999 - 2005 NetGroup, Politecnico di Torino (Italy) * Copyright (c) 2005 - 2007 CACE Technologies, Davis (California) * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the name of the Politecnico di Torino, CACE Technologies * nor the names of its contributors may be used to endorse or promote * products derived from this software without specific prior written * permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * */

3 2

Re: ntdll: add stub for RtlAddAccessDeniedObjectAce and forward to AddAccessDeniedObjectAce in advapi32
by Alexandre Julliard 07 Mar '16

07 Mar '16

Louis Lenders <xerox.xerox2000x(a)gmail.com> writes: > Signed-off-by: Louis Lenders <xerox.xerox2000x at gmail.com> I'll apply this one, but next time could you please put a valid email address here? Thanks. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [v2] d3dx9: support setting texture through SetValue in effect.
by Paul Gofman 06 Mar '16

06 Mar '16

I will add a fall through message, thanks for the notice On 03/06/2016 11:29 AM, Paul Gofman wrote: > Hi Alistair, no, there is actual copy of data below there which is > required for this case either. Thanks, Paul. > > On Sun, 6 Mar 2016 at 06:16, Alistair Leslie-Hughes > <leslie_alistair(a)hotmail.com <mailto:leslie_alistair(a)hotmail.com>> wrote: > > Hi Paul, > I think you have missed a break in the switch or a message to > state fall through. > > > Alistair >

1 0

re: [v2] d3dx9: support setting texture through SetValue in effect.
by Alistair Leslie-Hughes 06 Mar '16

06 Mar '16

Hi Paul, I think you have missed a break in the switch or a message to state fall through. Alistair

1 0