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

wine 64bit support on mac.
by Diego Vicioso 21 Apr '16

21 Apr '16

Hello. So, I have tested 64bit support on os X. So far, I have encountered one problem, gta iv 64bit refuses to load a command line file I have placed in the gta iv folder. This is only in the 64bit version of wine. In the 32bit version, it works well. I have a linux ubuntu partition partition so I’ll test on that. thanks Sent from my mac

1 0

Re: [PATCH] hidclass.sys: add missing case/missing heapfree (Coverity)
by Aric Stewart 21 Apr '16

21 Apr '16

On 4/20/16 1:16 PM, Marcus Meissner wrote: > 1358558 Resource leak > > (actually switch on the enum, then the compiler will see missing cases) > > Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> > --- > dlls/hidclass.sys/pnp.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c > index d97184f..9ada261 100644 > --- a/dlls/hidclass.sys/pnp.c > +++ b/dlls/hidclass.sys/pnp.c > @@ -295,7 +295,7 @@ NTSTATUS WINAPI HID_PNP_Dispatch(DEVICE_OBJECT *device, IRP *irp) > ULONG type = irpsp->Parameters.QueryId.IdType; > WCHAR *id = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WCHAR)*REGSTR_VAL_MAX_HCID_LEN); > TRACE("IRP_MN_QUERY_ID[%i]\n", type); > - switch (type) > + switch (irpsp->Parameters.QueryId.IdType) > { > case BusQueryHardwareIDs: > case BusQueryCompatibleIDs: > @@ -326,6 +326,10 @@ NTSTATUS WINAPI HID_PNP_Dispatch(DEVICE_OBJECT *device, IRP *irp) > irp->IoStatus.Information = (ULONG_PTR)id; > rc = STATUS_SUCCESS; > break; > + case BusQueryDeviceSerialNumber: > + FIXME("BusQueryDeviceSerialNumber not implemented\n"); > + HeapFree(GetProcessHeap(), 0, id); > + break; > } > break; > } > If we are switching on the irpsp->Parameters.QueryId.IdType then maybe we should remove the "type" variable all together? It is only used in the TRACE statement then. -aric

1 0

Re: [PATCH] winex11.drv: Use GMEM_FIXED memory for storing clipboard data.
by Alexandre Julliard 21 Apr '16

21 Apr '16

Rafał Harabień <rafalh1992(a)o2.pl> writes: > Tested behavior in Win 10. MSDN says clipboard uses GMEM_SHARED handles but its not true. > Some applications depends on GetClipboardData returning valid pointer to data instead of handle. > Commit fixes pasting from clipboard in Multi Theft Auto: San Andreas. > > Signed-off-by: Rafał Harabień <rafalh1992(a)o2.pl> > --- > dlls/user32/tests/clipboard.c | 58 ++++++++++++++++++++++++++++++++ > dlls/winex11.drv/clipboard.c | 77 +++++++++++++++++++++++++++++++++---------- > 2 files changed, 117 insertions(+), 18 deletions(-) This breaks the tests: ../../../tools/runtest -q -P wine -T ../../.. -M ole32.dll -p ole32_test.exe.so clipboard && touch clipboard.ok clipboard.c:897: Test failed: got 0x145048 clipboard.c:914: Test failed: got 0x145048 Makefile:184: recipe for target 'clipboard.ok' failed -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 2/2] gdi32/enhmfdrv: Don't drop viewport/window transformation in StretchBlt
by Huw Davies 21 Apr '16

21 Apr '16

On Wed, Apr 20, 2016 at 06:35:19PM +0200, Piotr Caban wrote: > diff --git a/dlls/gdi32/enhmfdrv/bitblt.c b/dlls/gdi32/enhmfdrv/bitblt.c > index d6d0fe7..ed03c1f 100644 > --- a/dlls/gdi32/enhmfdrv/bitblt.c > +++ b/dlls/gdi32/enhmfdrv/bitblt.c > @@ -122,7 +122,7 @@ BOOL EMFDRV_StretchBlt( PHYSDEV devDst, struct bitblt_coords *dst, > pEMR->dwRop = rop; > pEMR->xSrc = src->log_x; > pEMR->ySrc = src->log_y; > - GetWorldTransform(devSrc->hdc, &pEMR->xformSrc); > + GetTransform(devSrc->hdc, 0x204, &pEMR->xformSrc); > pEMR->crBkColorSrc = GetBkColor(devSrc->hdc); > pEMR->iUsageSrc = DIB_RGB_COLORS; > pEMR->offBmiSrc = emrSize; > This really needs a test, particularly as the docs say it should be the World -> Page transform. I agree, World -> Device makes more sense though. Huw.

1 0

Re: [2/2] shell32/tests: Check if error status is reset after successful file copy
by Marvin 21 Apr '16

21 Apr '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=22410 Your paranoid android. === wvistau64 (32 bit shlfileop) === shlfileop.c:297: Test failed: SHGetFileInfoA(test4.txt/) should return 1, got 0x0 shlfileop.c:2439: Test failed: SHGetNewLinkInfoA failed, err=0 shlfileop.c:2448: Test failed: SHGetNewLinkInfoA failed, err=0 shlfileop.c:2452: Test failed: does not start with C:\Users\Public\Documents\testdir2 shlfileop.c:2455: Test failed: does not end with .lnk shlfileop.c:83: Test failed: Failure to open file shlfileop.c:2461: Test failed: SHGetNewLinkInfoA failed, err=0 shlfileop.c:2465: Test failed: s does not start with C:\Users\Public\Documents\testdir2 shlfileop.c:2468: Test failed: s does not end with .lnk === wvistau64 (64 bit shlfileop) === shlfileop.c:297: Test failed: SHGetFileInfoA(test4.txt/) should return 1, got 0x0 shlfileop.c:2439: Test failed: SHGetNewLinkInfoA failed, err=1008 shlfileop.c:2448: Test failed: SHGetNewLinkInfoA failed, err=1008 shlfileop.c:2452: Test failed: does not start with C:\Users\Public\Documents\testdir2 shlfileop.c:2455: Test failed: does not end with .lnk shlfileop.c:83: Test failed: Failure to open file shlfileop.c:2461: Test failed: SHGetNewLinkInfoA failed, err=1008 shlfileop.c:2465: Test failed: does not start with C:\Users\Public\Documents\testdir2 shlfileop.c:2468: Test failed: does not end with .lnk shlfileop.c:2470: Test failed: and are the same

2 1

Re: [2/2] shell32/tests: Check if error status is reset after successful file copy
by Marvin 21 Apr '16

21 Apr '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=22409 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: mmdevapi/tests: Use RegQueryValueExW() for compatibility with Windows XP.
by Andrew Eikum 20 Apr '16

20 Apr '16

mmdevapi doesn't exist on winxp. I'm not opposed to this change, but does it matter? Andrew On Wed, Apr 20, 2016 at 11:52:11AM +0200, Francois Gouget wrote: > RegGetValueW() was added later and should be avoided in the conformance tests. > > Signed-off-by: Francois Gouget <fgouget(a)free.fr> > --- > dlls/mmdevapi/tests/propstore.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/mmdevapi/tests/propstore.c b/dlls/mmdevapi/tests/propstore.c > index 06fe690..665136f 100644 > --- a/dlls/mmdevapi/tests/propstore.c > +++ b/dlls/mmdevapi/tests/propstore.c > @@ -173,7 +173,7 @@ static void test_setvalue_on_wow64(IPropertyStore *store) > > /* Note: the registry key exists even without calling IPropStore::Commit */ > size = sizeof(regval); > - ret = RegGetValueW(props, NULL, bogusW, RRF_RT_DWORD, &type, &regval, &size); > + ret = RegQueryValueExW(props, bogusW, NULL, &type, (LPBYTE)&regval, &size); > ok(ret == ERROR_SUCCESS, "Couldn't get bogus propertykey value: %u\n", ret); > ok(type == REG_DWORD, "Got wrong value type: %u\n", type); > ok(regval == 0xAB, "Got wrong value: 0x%x\n", regval); > -- > 2.8.0.rc3 > >

2 2

Re: [PATCH 4/7] wined3d: Allocate system memory for complete textures.
by Marvin 20 Apr '16

20 Apr '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=22399 Your paranoid android. === w864 (64 bit device) === device.c:4317: Test failed: cw is 0xf60, expected 0x7f. device.c:4326: Test failed: Callback cw is 0xf60, expected 0x7f. === w1064 (64 bit device) === device.c:4317: Test failed: cw is 0xf60, expected 0x7f. device.c:4326: Test failed: Callback cw is 0xf60, expected 0x7f.

1 0

Re: [PATCH 4/7] wined3d: Allocate system memory for complete textures.
by Marvin 20 Apr '16

20 Apr '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=22398 Your paranoid android. === w8 (32 bit device) === device.c:1372: Test failed: TestCooperativeLevel failed, hr 0x88760868. device.c:1417: Test failed: Reset failed, hr 0x88760868. device.c:1419: Test failed: TestCooperativeLevel failed, hr 0x88760869. device.c:1423: Test failed: Got unexpected value 0 for D3DRS_LIGHTING. device.c:1430: Test failed: D3DVIEWPORT->X = 10, expected 0. device.c:1431: Test failed: D3DVIEWPORT->Y = 20, expected 0. device.c:1432: Test failed: D3DVIEWPORT->Width = 400, expected 800. device.c:1433: Test failed: D3DVIEWPORT->Height = 300, expected 600. device.c:1434: Test failed: D3DVIEWPORT->MinZ = 2.00000003e-001, expected 0. device.c:1435: Test failed: D3DVIEWPORT->MaxZ = 3.00000012e-001, expected 1. device.c:1440: Test failed: Screen width is 640, expected 800. device.c:1441: Test failed: Screen height is 480, expected 600. device.c:1447: Test failed: Back buffer width is 640, expected 800. device.c:1449: Test failed: Back buffer height is 480, expected 600. device.c:1479: Test failed: Screen width is 640, expected 1024. device.c:1480: Test failed: Screen height is 480, expected 768. device.c:2725: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2730: Test failed: The focus window is active. device.c:2738: Test failed: Got unexpected hr 0x88760869. device.c:2742: Test failed: Got unexpect screen size 800x600. device.c:2757: Test failed: Expected message 0x47 for window 0, but didn't receive it, i=1. device.c:2766: Test failed: Got unexpect screen size 800x600. device.c:2779: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2787: Test failed: Got unexpect width 640. device.c:2788: Test failed: Got unexpect height 480. === w864 (32 bit device) === device.c:1372: Test failed: TestCooperativeLevel failed, hr 0x88760868. device.c:1417: Test failed: Reset failed, hr 0x88760868. device.c:1419: Test failed: TestCooperativeLevel failed, hr 0x88760869. device.c:1423: Test failed: Got unexpected value 0 for D3DRS_LIGHTING. device.c:1430: Test failed: D3DVIEWPORT->X = 10, expected 0. device.c:1431: Test failed: D3DVIEWPORT->Y = 20, expected 0. device.c:1432: Test failed: D3DVIEWPORT->Width = 400, expected 800. device.c:1433: Test failed: D3DVIEWPORT->Height = 300, expected 600. device.c:1434: Test failed: D3DVIEWPORT->MinZ = 2.00000003e-001, expected 0. device.c:1435: Test failed: D3DVIEWPORT->MaxZ = 3.00000012e-001, expected 1. device.c:1440: Test failed: Screen width is 640, expected 800. device.c:1441: Test failed: Screen height is 480, expected 600. device.c:1447: Test failed: Back buffer width is 640, expected 800. device.c:1449: Test failed: Back buffer height is 480, expected 600. device.c:1479: Test failed: Screen width is 640, expected 1024. device.c:1480: Test failed: Screen height is 480, expected 768. device.c:2725: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2730: Test failed: The focus window is active. device.c:2738: Test failed: Got unexpected hr 0x88760869. device.c:2742: Test failed: Got unexpect screen size 800x600. device.c:2757: Test failed: Expected message 0x47 for window 0, but didn't receive it, i=1. device.c:2766: Test failed: Got unexpect screen size 800x600. device.c:2779: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2787: Test failed: Got unexpect width 640. device.c:2788: Test failed: Got unexpect height 480.

1 0

Re: [PATCH v2 1/8] wined3d: Alpha test emulation for core profile contexts.
by Henri Verbeet 20 Apr '16

20 Apr '16

On 19 April 2016 at 18:56, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > + /* alpha_func is the PASS condition, not the DISCARD condition. Instead of > + * flipping all the operators here, just negate the comparison below. */ As an aside, note that in general inverting operators isn't safe if there are potential NaNs involved. > + static const char *comparison_operator[] = > + { > + "", /* WINED3D_CMP_NEVER */ > + "<", /* WINED3D_CMP_LESS */ > + "==", /* WINED3D_CMP_EQUAL */ > + "<=", /* WINED3D_CMP_LESSEQUAL */ > + ">", /* WINED3D_CMP_GREATER */ > + "!=", /* WINED3D_CMP_NOTEQUAL */ > + ">=", /* WINED3D_CMP_GREATEREQUAL */ > + "" /* WINED3D_CMP_ALWAYS */ > + }; I should have noticed the first time, but I think you'll want to make the string pointers const as well. > @@ -3091,6 +3091,13 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 > args->pointsprite = state->render_states[WINED3D_RS_POINTSPRITEENABLE] > && state->gl_primitive_type == GL_POINTS; > > + if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) > + args->alpha_test_func = WINED3D_CMP_ALWAYS - 1; > + else > + args->alpha_test_func = (state->render_states[WINED3D_RS_ALPHATESTENABLE] > + ? wined3d_sanitize_cmp_func(state->render_states[WINED3D_RS_ALPHAFUNC]) > + : WINED3D_CMP_ALWAYS) - 1; For what it's worth, what I originally had in mind was mapping WINED3D_CMP_ALWAYS to 0. I.e., masking with 7. This works as well.

2 2