November 2014 - Wine-Devel - list.winehq.org

Re: [PATCH 4/5] d3d/tests: Table fog does not abs the fog coordinate (v2).

by Henri Verbeet

On 26 November 2014 at 19:08, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > + /* Needed to make AMD drivers happy. Yeah, it is not supposed to > + * have an effect on RHW draws. */ > + static const D3DMATRIX identity = > + {{{ > + 1.0f, 0.0f, 0.0f, 0.0f, > + 0.0f, 1.0f, 0.0f, 0.0f, > + 0.0f, 0.0f, 1.0f, 0.0f, > + 0.0f, 0.0f, 0.0f, 1.0f > + }}}; Is this the same projection matrix issue as in fog_test()/fog_with_shader_tests()/etc.?

Nov. 27, 2014

Re: [PATCH 1/5] wined3d: Vertex fog uses the absolute eye position z (v2).

by Henri Verbeet

On 26 November 2014 at 19:08, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > + conv.f = tests[i].start; > + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGSTART, conv.d); I don't care particularly much, but it might be nicer to just add the union to tests[], and then just use "tests[i].start.d" here. > START_TEST(ddraw7) > { > HMODULE module = GetModuleHandleA("ddraw.dll"); > @@ -8089,4 +8190,5 @@ START_TEST(ddraw7) > test_resource_priority(); > test_surface_desc_lock(); > fog_interpolation_test(); > + test_negative_fixedfunction_fog(); I prefer this name, but I think it's more important that equivalent tests have the same name between D3D versions. I'd probably just rename the d3d8 and d3d9 versions instead. For what it's worth, I still plan to merge device.c and visual.c at some point in the future, and I'll probably fixup the naming of the existing tests in visual.c around that time as well. > if (settings->ortho_fog) > + { > /* Need to undo the [0.0 - 1.0] -> [-1.0 - 1.0] transformation from D3D to GL coordinates. */ > shader_addline(buffer, "gl_FogFragCoord = gl_Position.z * 0.5 + 0.5;\n"); > + } > else > + { > shader_addline(buffer, "gl_FogFragCoord = ec_pos.z;\n"); > + if (!settings->transformed) > + shader_addline(buffer, "gl_FogFragCoord = abs(gl_FogFragCoord);\n"); > + } I think this looks pretty messy. I'd suggest if (settings->ortho_fog) shader_addline(...); else if (!settings->transformed) shader_addline(...); else shader_addline(...);

Nov. 27, 2014

Re: dpnet: Implement IDirectPlay8Address GetComponentByIndex

by Marvin

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=10489 Your paranoid android. === w8 (32 bit address) === The test timed out

Nov. 27, 2014

Re: dpnet: Implement IDirectPlay8Address GetComponentByIndex

by Nikolay Sivov

On 27.11.2014 8:11, Alistair Leslie-Hughes wrote: > + if(dwComponentID > list_count(&This->components)) > + return DPNERR_DOESNOTEXIST; > + > + LIST_FOR_EACH_ENTRY(entry, &This->components, struct component, entry) > + { > + if(count == dwComponentID) This means you really want to use array instead of a list. This will speed up GetNumComponents() and GetComponentByIndex(), while GetComponentByName() will still need to iterate.

Nov. 27, 2014

Re: [PATCH 5/5] d3d8/tests: Call TestCooperativeLevel after Present.

by Marvin

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=10483 Your paranoid android. === w8 (32 bit device) === device.c:1222: Test failed: TestCooperativeLevel failed, hr 0x88760868. device.c:1267: Test failed: Reset failed, hr 0x88760868. device.c:1269: Test failed: TestCooperativeLevel failed, hr 0x88760869. device.c:1273: Test failed: Got unexpected value 0 for D3DRS_LIGHTING. device.c:1280: Test failed: D3DVIEWPORT->X = 10, expected 0. device.c:1281: Test failed: D3DVIEWPORT->Y = 20, expected 0. device.c:1282: Test failed: D3DVIEWPORT->Width = 400, expected 800. device.c:1283: Test failed: D3DVIEWPORT->Height = 300, expected 600. device.c:1284: Test failed: D3DVIEWPORT->MinZ = 2.00000003e-001, expected 0. device.c:1285: Test failed: D3DVIEWPORT->MaxZ = 3.00000012e-001, expected 1. device.c:1290: Test failed: Screen width is 640, expected 800. device.c:1291: Test failed: Screen height is 480, expected 600. device.c:1297: Test failed: Back buffer width is 640, expected 800. device.c:1299: Test failed: Back buffer height is 480, expected 600. device.c:1329: Test failed: Screen width is 640, expected 1024. device.c:1330: Test failed: Screen height is 480, expected 768. device.c:2517: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2522: Test failed: The focus window is active. device.c:2530: Test failed: Got unexpected hr 0x88760869. device.c:2536: Test failed: Got unexpect screen size 800x600. device.c:2551: Test failed: Expected message 0x47 for window 0, but didn't receive it, i=1. device.c:2560: Test failed: Got unexpect screen size 800x600. device.c:2573: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2580: Test failed: Got unexpect width 640. device.c:2581: Test failed: Got unexpect height 480.

Nov. 26, 2014

Re: Wine web down?

by Jeremy Newman

Crash. These things always happen in the middle of the night. Cycled it first thing this morning. -N On 11/26/2014 06:59 AM, Bruno Jesus wrote: > It's been around 2 hours that I cannot access the web site, source, > bugzilla or appdb. Only wiki stands on (AFAIR it's in a different > server). Not even ping works. > > Is this a known maintenance operation? > > Bruno > >

Nov. 26, 2014

Re: [PATCH 2/2] winealsa: implement GetPropValue and return device path (try 3)

by Andrew Eikum

These two patches look OK to me. Andrew On Wed, Nov 19, 2014 at 07:07:57PM +0000, Mark Harmstone wrote: > --- > dlls/winealsa.drv/mmdevdrv.c | 114 ++++++++++++++++++++++++++++++++++++ > dlls/winealsa.drv/winealsa.drv.spec | 1 + > 2 files changed, 115 insertions(+) > > > diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c > index 5ad72f9..6b1456e 100644 > --- a/dlls/winealsa.drv/mmdevdrv.c > +++ b/dlls/winealsa.drv/mmdevdrv.c > @@ -3823,3 +3823,117 @@ HRESULT WINAPI AUDDRV_GetAudioSessionManager(IMMDevice *device, > > return S_OK; > } > + > +enum AudioDeviceConnectionType { > + AudioDeviceConnectionType_Unknown = 0, > + AudioDeviceConnectionType_PCI, > + AudioDeviceConnectionType_USB > +}; > + > +HRESULT WINAPI AUDDRV_GetPropValue(GUID *guid, const PROPERTYKEY *prop, PROPVARIANT *out) > +{ > + static const PROPERTYKEY devicepath_key = { /* undocumented? - {b3f8fa53-0004-438e-9003-51a46e139bfc},2 */ > + {0xb3f8fa53, 0x0004, 0x438e, {0x90, 0x03, 0x51, 0xa4, 0x6e, 0x13, 0x9b, 0xfc}}, 2 > + }; > + > + TRACE("%s, (%s,%u), %p\n", wine_dbgstr_guid(guid), wine_dbgstr_guid(&prop->fmtid), prop->pid, out); > + > + if(IsEqualPropertyKey(*prop, devicepath_key)) > + { > + char name[256], uevent[MAX_PATH]; > + EDataFlow flow; > + FILE *fuevent; > + int card, device; > + > + if(!get_alsa_name_by_guid(guid, name, sizeof(name), &flow)) > + { > + WARN("Unknown interface %s\n", debugstr_guid(guid)); > + return E_NOINTERFACE; > + } > + > + /* only implemented for identifiable devices, i.e. not "default" */ > + if(!sscanf(name, "plughw:%u,%u", &card, &device)) > + return E_NOTIMPL; > + > + sprintf(uevent, "/sys/class/sound/card%u/device/uevent", card); > + fuevent = fopen(uevent, "r"); > + > + if(fuevent){ > + enum AudioDeviceConnectionType connection = AudioDeviceConnectionType_Unknown; > + USHORT vendor_id = 0, product_id = 0; > + char *line = NULL; > + > + while(!feof(fuevent)) { > + char *val; > + size_t val_len, len = 0; > + > + if(getline(&line, &len, fuevent)<0) > + break; > + > + if((val = strchr(line, '='))) { > + val[0] = 0; > + val++; > + > + val_len = strlen(val); > + if(val_len > 0 && val[val_len - 1] == '\n') { val[val_len - 1] = 0; } > + > + if(!strcmp(line, "PCI_ID")){ > + connection = AudioDeviceConnectionType_PCI; > + if(sscanf(val, "%hX:%hX", &vendor_id, &product_id)<2){ > + WARN("Unexpected input when reading PCI_ID in uevent file.\n"); > + connection = AudioDeviceConnectionType_Unknown; > + break; > + } > + }else if(!strcmp(line, "DEVTYPE") && !strcmp(val,"usb_interface")) > + connection = AudioDeviceConnectionType_USB; > + else if(!strcmp(line, "PRODUCT")) > + if(sscanf(val, "%hx/%hx/", &vendor_id, &product_id)<2){ > + WARN("Unexpected input when reading PRODUCT in uevent file.\n"); > + connection = AudioDeviceConnectionType_Unknown; > + break; > + } > + } > + } > + > + if(line) > + free(line); > + > + fclose(fuevent); > + > + if(connection == AudioDeviceConnectionType_USB || connection == AudioDeviceConnectionType_PCI){ > + static const WCHAR usbformatW[] = { '{','1','}','.','U','S','B','\\','V','I','D','_', > + '%','0','4','X','&','P','I','D','_','%','0','4','X','\\', > + '%','u','&','%','0','8','X',0 }; /* "{1}.USB\VID_%04X&PID_%04X\%u&%08X" */ > + static const WCHAR pciformatW[] = { '{','1','}','.','H','D','A','U','D','I','O','\\','F','U','N','C','_','0','1','&', > + 'V','E','N','_','%','0','4','X','&','D','E','V','_', > + '%','0','4','X','\\','%','u','&','%','0','8','X',0 }; /* "{1}.HDAUDIO\FUNC_01&VEN_%04X&DEV_%04X\%u&%08X" */ > + UINT serial_number; > + > + /* As hardly any audio devices have serial numbers, Windows instead > + appears to use a persistent random number. We emulate this here > + by instead using the last 8 hex digits of the GUID. */ > + serial_number = (guid->Data4[4] << 24) | (guid->Data4[5] << 16) | (guid->Data4[6] << 8) | guid->Data4[7]; > + > + out->vt = VT_LPWSTR; > + out->u.pwszVal = CoTaskMemAlloc(128 * sizeof(WCHAR)); > + > + if(!out->u.pwszVal) > + return E_OUTOFMEMORY; > + > + if(connection == AudioDeviceConnectionType_USB) > + sprintfW( out->u.pwszVal, usbformatW, vendor_id, product_id, device, serial_number); > + else if(connection == AudioDeviceConnectionType_PCI) > + sprintfW( out->u.pwszVal, pciformatW, vendor_id, product_id, device, serial_number); > + > + return S_OK; > + } > + }else{ > + WARN("Could not open %s for reading\n", uevent); > + return E_NOTIMPL; > + } > + } > + > + TRACE("Unimplemented property %s,%u\n", wine_dbgstr_guid(&prop->fmtid), prop->pid); > + > + return E_NOTIMPL; > +} > diff --git a/dlls/winealsa.drv/winealsa.drv.spec b/dlls/winealsa.drv/winealsa.drv.spec > index 04fa05a..bd83ea2 100644 > --- a/dlls/winealsa.drv/winealsa.drv.spec > +++ b/dlls/winealsa.drv/winealsa.drv.spec > @@ -8,3 +8,4 @@ > @ stdcall -private GetEndpointIDs(long ptr ptr ptr ptr) AUDDRV_GetEndpointIDs > @ stdcall -private GetAudioEndpoint(ptr ptr ptr) AUDDRV_GetAudioEndpoint > @ stdcall -private GetAudioSessionManager(ptr ptr) AUDDRV_GetAudioSessionManager > +@ stdcall -private GetPropValue(ptr ptr ptr) AUDDRV_GetPropValue > >

Nov. 26, 2014

Wine web down?

by Bruno Jesus

It's been around 2 hours that I cannot access the web site, source, bugzilla or appdb. Only wiki stands on (AFAIR it's in a different server). Not even ping works. Is this a known maintenance operation? Bruno

Nov. 26, 2014

Re: [PATCH 4/5] d3d/tests: Table fog does not abs the fog coordinate.

by Stefan Dösinger

2014-11-26 3:26 GMT+01:00 Marvin <testbot(a)winehq.org>: > === w8 (32 bit ddraw7) === > ddraw7.c:8138: Test failed: Got unexpected color 0x000000ff, case 3. > ddraw7.c:8138: Test failed: Got unexpected color 0x000000ff, case 4. Looks like the rhw draw fails. Please skip this patch for now, I'll investigate.

Nov. 26, 2014

Re: [PATCH 5/5] d3d8/tests: Call TestCooperativeLevel after Present.

by Marvin

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=10453 Your paranoid android. === w8 (32 bit device) === device.c:1222: Test failed: TestCooperativeLevel failed, hr 0x88760868. device.c:1267: Test failed: Reset failed, hr 0x88760868. device.c:1269: Test failed: TestCooperativeLevel failed, hr 0x88760869. device.c:1273: Test failed: Got unexpected value 0 for D3DRS_LIGHTING. device.c:1280: Test failed: D3DVIEWPORT->X = 10, expected 0. device.c:1281: Test failed: D3DVIEWPORT->Y = 20, expected 0. device.c:1282: Test failed: D3DVIEWPORT->Width = 400, expected 800. device.c:1283: Test failed: D3DVIEWPORT->Height = 300, expected 600. device.c:1284: Test failed: D3DVIEWPORT->MinZ = 2.00000003e-001, expected 0. device.c:1285: Test failed: D3DVIEWPORT->MaxZ = 3.00000012e-001, expected 1. device.c:1290: Test failed: Screen width is 640, expected 800. device.c:1291: Test failed: Screen height is 480, expected 600. device.c:1297: Test failed: Back buffer width is 640, expected 800. device.c:1299: Test failed: Back buffer height is 480, expected 600. device.c:1329: Test failed: Screen width is 640, expected 1024. device.c:1330: Test failed: Screen height is 480, expected 768. device.c:2517: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2522: Test failed: The focus window is active. device.c:2530: Test failed: Got unexpected hr 0x88760869. device.c:2536: Test failed: Got unexpect screen size 800x600. device.c:2551: Test failed: Expected message 0x47 for window 0, but didn't receive it, i=1. device.c:2560: Test failed: Got unexpect screen size 800x600. device.c:2573: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2580: Test failed: Got unexpect width 640. device.c:2581: Test failed: Got unexpect height 480.

Nov. 26, 2014