June 2015 - Wine-devel - list.winehq.org

Re: riched: Added ITextDocument2 definition and corresponding tests
by Marvin 13 Jun '15

13 Jun '15

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=14249 Your paranoid android. === w2000pro (32 bit richole) === richole.c:178: Test failed: error: 126

1 0

Re: [PATCH] ntdll: link libunwind if present
by Ken Thomases 13 Jun '15

13 Jun '15

Hi, On Jun 13, 2015, at 5:17 AM, Marcus Meissner <marcus(a)jet.franken.de> wrote: > On openSUSE 13.1/13.2 otherwise ntdll x86_64 build will fail with: > … This new link error is <https://bugs.winehq.org/show_bug.cgi?id=38713>. > (probably on x86 it all is inlined, but this is not the case for x86_64) The new code that introduced this issue is in x86_64-only code (signal_x86_64.c). Thanks for your attempt to fix the problem I created. I'm not sure why your configure check is in an if statement having to do with the support for CFI directives. Also, the symbol you're checking for (_U_dyn_register) seems suspicious. It's not mentioned in the link errors. Also, I'm not sure it's a reliable export from libunwind. As indicated in the bug report, libunwind does annoying symbol renaming that's not consistent among platforms. (It's definitely not present on OS X, although that's because Apple provides a somewhat customized interface.) Erich Hoover and I are working on a different approach on the bug. He attached a patch and I attached a counter-proposal patch. I'd appreciate if you could check that mine solves the problem for you. Thanks, Ken

1 0

Re: odbccp32: Implement SQLGetPrivateProfileString (try 4)
by Nikolay Sivov 13 Jun '15

13 Jun '15

On 13.06.2015 12:41, Alistair Leslie-Hughes wrote: > + ret = SQLGetPrivateProfileStringW(sect, entry, string, retval, cbRetBuffer, file); > + if(ret) > + { > + int i, len; > + > + len = ret < cbRetBuffer ? ret : cbRetBuffer; > + for (i=0; i < len; i++) > + RetBuffer[i] = retval[i]; > + RetBuffer[i] = 0; > + } You can't convert it like that, the idea is to do A->W conversion for inputs and W->A for output. Inputs are handled by heap_strdupAtoW(), so you need a single WideCharToMultiByte for retbuffer.

1 0

Re: [PATCH] oledb32: free memory on error exit (Coverity)
by Nikolay Sivov 13 Jun '15

13 Jun '15

On 13.06.2015 8:54, Marcus Meissner wrote: > 966609 Resource leak > --- > dlls/oledb32/datainit.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c > index 3c5293a..3a6c924 100644 > --- a/dlls/oledb32/datainit.c > +++ b/dlls/oledb32/datainit.c > @@ -520,6 +520,8 @@ static HRESULT get_dbpropset_from_proplist(struct dbprops *props, DBPROPSET **pr > if (FAILED(hr)) > { > ERR("failed to init property %s value as type %d\n", debugstr_w(pair->name), descr->type); > + CoTaskMemFree(*propset); > + *propset = NULL; > return hr; > } > > free_dbpropset() should be used for that, otherwise you'll still be leaking values.

1 0

Re: [PATCH 1/6] msvcp110: Add tr2_sys__File_size implementation and test.(try 4)
by Piotr Caban 12 Jun '15

12 Jun '15

On 06/11/15 17:43, YongHao Hu wrote: > +@ cdecl -ret64 -arch=win32 ?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z(str) msvcp120.?tr2_sys__File_size > +@ cdecl -ret64 -arch=win64 ?_File_size(a)sys@tr2(a)std@@YA_KPEBD(a)Z(str) msvcp120.?tr2_sys__File_size This is not going to work. Thanks, Piotr

2 1

Re: [1/3] include: Add stuff related to WSAPoll() (try 2)
by Alexandre Julliard 12 Jun '15

12 Jun '15

Bruno Jesus <00cpxxx(a)gmail.com> writes: > try 2: > I found the solution to typedef the struct pollfd just like it's done > with fd_set. Unfortunately that doesn't work on mingw: In file included from ../../../wine/include/winsock2.h:50:0, from ../../../wine/include/ws2tcpip.h:22, from ../../../wine/dlls/jsproxy/main.c:34: ../../../wine/include/winsock2.h:287:19: error: redefinition of ‘struct pollfd’ ../../../wine/include/ws2def.h:27:18: note: in definition of macro ‘WS’ In file included from ../../../wine/dlls/jsproxy/main.c:20:0: ../../../wine/include/wine/port.h:284:8: note: originally defined here -- Alexandre Julliard julliard(a)winehq.org

3 4

Re: [PATCH 2/2] dwrite: Fix splitted range length, initial test for GetMetrics()
by Marvin 12 Jun '15

12 Jun '15

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=14198 Your paranoid android. === wvistau64 (32 bit layout) === layout.c:2355: Test failed: got 4 === w2008s64 (32 bit layout) === layout.c:2355: Test failed: got 4 === w7u (32 bit layout) === layout.c:2355: Test failed: got 4 === wvistau64 (64 bit layout) === layout.c:2355: Test failed: got 4 === w2008s64 (64 bit layout) === layout.c:2355: Test failed: got 4

1 0

Re: [PATCH 5/6] msvcp110: Add tr2_sys__Make_dir implementation and test.
by Piotr Caban 12 Jun '15

12 Jun '15

Hi, On 06/11/15 17:45, YongHao Hu wrote: > + { "N:\\abc", -1 }, N:\\abc looks like a valid path for me. I guess this test will fail if someone have N: drive. Thanks, Piotr

1 0

Re: [1/1] advapi32/tests: Add preliminary event tracing tests. (try 3)
by Marvin 12 Jun '15

12 Jun '15

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=14196 Your paranoid android. === w2000pro (32 bit eventlog) === eventlog.c:768: Test failed: Expected ERROR_BAD_PATHNAME, got 87 eventlog.c:776: Test failed: Expected success eventlog.c:784: Test failed: Expected ERROR_ALREADY_EXISTS, got 87 === wxppro (32 bit eventlog) === eventlog.c:686: Test failed: Expected ERROR_BAD_LENGTH, got 87 eventlog.c:695: Test failed: Expected ERROR_BAD_LENGTH, got 87 eventlog.c:768: Test failed: Expected ERROR_BAD_PATHNAME, got 87 eventlog.c:776: Test failed: Expected success eventlog.c:784: Test failed: Expected ERROR_ALREADY_EXISTS, got 87 === w2003std (32 bit eventlog) === eventlog.c:686: Test failed: Expected ERROR_BAD_LENGTH, got 87 eventlog.c:695: Test failed: Expected ERROR_BAD_LENGTH, got 87 eventlog.c:768: Test failed: Expected ERROR_BAD_PATHNAME, got 87 eventlog.c:776: Test failed: Expected success eventlog.c:784: Test failed: Expected ERROR_ALREADY_EXISTS, got 87 === wvistau64 (32 bit eventlog) === eventlog.c:695: Test failed: Expected ERROR_BAD_LENGTH, got 87 eventlog.c:768: Test failed: Expected ERROR_BAD_PATHNAME, got 87 eventlog.c:776: Test failed: Expected success eventlog.c:784: Test failed: Expected ERROR_ALREADY_EXISTS, got 87 === w2008s64 (32 bit eventlog) === eventlog.c:695: Test failed: Expected ERROR_BAD_LENGTH, got 87 eventlog.c:768: Test failed: Expected ERROR_BAD_PATHNAME, got 87 eventlog.c:776: Test failed: Expected success eventlog.c:784: Test failed: Expected ERROR_ALREADY_EXISTS, got 87 === w7u (32 bit eventlog) === eventlog.c:695: Test failed: Expected ERROR_BAD_LENGTH, got 87 eventlog.c:768: Test failed: Expected ERROR_BAD_PATHNAME, got 87 eventlog.c:776: Test failed: Expected success eventlog.c:784: Test failed: Expected ERROR_ALREADY_EXISTS, got 87 === w8 (32 bit eventlog) === eventlog.c:695: Test failed: Expected ERROR_BAD_LENGTH, got 87 eventlog.c:768: Test failed: Expected ERROR_BAD_PATHNAME, got 87 eventlog.c:776: Test failed: Expected success eventlog.c:784: Test failed: Expected ERROR_ALREADY_EXISTS, got 87

1 0

Re: [PATCH 4/4] d3drm/tests: Add refcount tests for IDirect3DRMDevice*
by Stefan Dösinger 11 Jun '15

11 Jun '15

I think these tests are best integrated into CreateDeviceFromClipper. Similar tests are needed for the other creation methods, with some modifications. Check if the reference count of the surface passed to CreateDeviceFromSurface is incremented, and similarly for the device passed to CreateDeviceFromD3D. > Am 11.06.2015 um 13:51 schrieb Aaryaman Vasishta <jem456.vasishta(a)gmail.com>: > > The refcount tests for d3drm1 are the same for the device created from all three creation methods. > --- > dlls/d3drm/tests/d3drm.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 81 insertions(+) > > diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c > index ac4c8fe..ecf1d4d 100644 > --- a/dlls/d3drm/tests/d3drm.c > +++ b/dlls/d3drm/tests/d3drm.c > @@ -2367,6 +2367,86 @@ cleanup: > IDirectDraw_Release(ddraw1); > } > > +static void test_device_refcount(void) > +{ > + IDirect3DRM *d3drm1; > + IDirect3DRM2 *d3drm2; > + IDirect3DRM3 *d3drm3; > + IDirect3DRMDevice *device1; > + IDirect3DRMDevice2 *device2; > + IDirect3DRMDevice3 *device3; > + IDirectDrawClipper *clipper; > + HWND window; > + HRESULT hr; > + ULONG ref1, ref2, cref1, cref2; > + GUID driver; > + RECT rc; > + > + > + window = CreateWindowA("static", "d3drm_test", WS_OVERLAPPEDWINDOW, 0, 0, 300, 200, 0, 0, 0, 0); > + GetClientRect(window, &rc); > + hr = DirectDrawCreateClipper(0, &clipper, NULL); > + ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface (hr = %x)\n", hr); > + hr = IDirectDrawClipper_SetHWnd(clipper, 0, window); > + ok(hr == DD_OK, "Cannot set HWnd to Clipper (hr = %x)\n", hr); > + > + hr = Direct3DRMCreate(&d3drm1); > + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); > + ref1 = get_refcount((IUnknown *)d3drm1); > + cref1 = get_refcount((IUnknown *)clipper); > + memcpy(&driver, &IID_IDirect3DRGBDevice, sizeof(GUID)); > + hr = IDirect3DRM_CreateDeviceFromClipper(d3drm1, clipper, &driver, rc.right, rc.bottom, &device1); > + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice interface (hr = %x)\n", hr); > + ref2 = get_refcount((IUnknown *)d3drm1); > + cref2 = get_refcount((IUnknown *)clipper); > + ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %d , ref2 = %d\n", ref1, ref2); > + ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %d , cref2 = %d\n", cref1, cref2); > + if (device1) > + IDirect3DRMDevice_Release(device1); > + ref2 = get_refcount((IUnknown *)d3drm1); > + cref2 = get_refcount((IUnknown *)clipper); > + ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %d, ref2 = %d\n", ref1, ref2); > + ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %d, cref2 = %d\n", cref1, cref2); > + > + hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2); > + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface (hr = %x).\n", hr); > + ref1 = get_refcount((IUnknown *)d3drm1); > + cref1 = get_refcount((IUnknown *)clipper); > + hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, rc.right, rc.bottom, &device2); > + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice2 interface (hr = %x)\n", hr); > + ref2 = get_refcount((IUnknown *)d3drm1); > + cref2 = get_refcount((IUnknown *)clipper); > + ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %d , ref2 = %d\n", ref1, ref2); > + ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %d , cref2 = %d\n", cref1, cref2); > + if (device2) > + IDirect3DRMDevice2_Release(device2); > + ref2 = get_refcount((IUnknown *)d3drm1); > + cref2 = get_refcount((IUnknown *)clipper); > + ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %d, ref2 = %d\n", ref1, ref2); > + ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %d, cref2 = %d\n", cref1, cref2); > + > + hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3); > + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr); > + ref1 = get_refcount((IUnknown *)d3drm1); > + cref1 = get_refcount((IUnknown *)clipper); > + hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, rc.right, rc.bottom, &device3); > + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice3 interface (hr = %x)\n", hr); > + ref2 = get_refcount((IUnknown *)d3drm1); > + cref2 = get_refcount((IUnknown *)clipper); > + ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %d, ref2 = %d\n", ref1, ref2); > + ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %d , cref2 = %d\n", cref1, cref2); > + if (device3) > + IDirect3DRMDevice3_Release(device3); > + ref2 = get_refcount((IUnknown *)d3drm1); > + cref2 = get_refcount((IUnknown *)clipper); > + ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %d, ref2 = %d\n", ref1, ref2); > + ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %d, cref2 = %d\n", cref1, cref2); > + > + IDirectDrawClipper_Release(clipper); > + IDirect3DRM2_Release(d3drm2); > + IDirect3DRM3_Release(d3drm3); > +} > + > START_TEST(d3drm) > { > test_MeshBuilder(); > @@ -2387,4 +2467,5 @@ START_TEST(d3drm) > test_create_device_from_clipper(); > test_create_device_from_surface(); > test_create_device_from_d3d(); > + test_device_refcount(); > } > -- > 1.9.3 (Apple Git-50) > > >

2 1