March 2018 - Wine-commits - list.winehq.org

Michael Müller : wbemprox: Add InstalledDisplayDrivers for Win32_VideoController.
by Alexandre Julliard 01 Mar '18

01 Mar '18

Module: wine Branch: master Commit: 7e14d29837e5149800f9b7a8d6263eb1408fa7cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e14d29837e5149800f9b7a8… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Mar 1 17:20:38 2018 +0100 wbemprox: Add InstalledDisplayDrivers for Win32_VideoController. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index bfcd51c..90b3704 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -243,6 +243,8 @@ static const WCHAR prop_indexW[] = {'I','n','d','e','x',0}; static const WCHAR prop_installdateW[] = {'I','n','s','t','a','l','l','D','a','t','e',0}; +static const WCHAR prop_installeddisplaydriversW[]= + {'I','n','s','t','a','l','l','e','d','D','i','s','p','l','a','y','D','r','i','v','e','r','s',0}; static const WCHAR prop_interfaceindexW[] = {'I','n','t','e','r','f','a','c','e','I','n','d','e','x',0}; static const WCHAR prop_interfacetypeW[] = @@ -717,6 +719,7 @@ static const struct column col_videocontroller[] = { prop_descriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_deviceidW, CIM_STRING|COL_FLAG_KEY }, { prop_driverversionW, CIM_STRING }, + { prop_installeddisplaydriversW,CIM_STRING }, { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_pnpdeviceidW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_statusW, CIM_STRING }, @@ -1126,6 +1129,7 @@ struct record_videocontroller const WCHAR *description; const WCHAR *device_id; const WCHAR *driverversion; + const WCHAR *installeddriver; const WCHAR *name; const WCHAR *pnpdevice_id; const WCHAR *status; @@ -3233,6 +3237,29 @@ static WCHAR *get_pnpdeviceid( DXGI_ADAPTER_DESC *desc ) return ret; } +#define HW_VENDOR_AMD 0x1002 +#define HW_VENDOR_NVIDIA 0x10de +#define HW_VENDOR_VMWARE 0x15ad +#define HW_VENDOR_INTEL 0x8086 + +static const WCHAR *get_installeddriver( UINT vendorid ) +{ + static const WCHAR driver_amdW[] = {'a','t','i','c','f','x','3','2','.','d','l','l',0}; + static const WCHAR driver_intelW[] = {'i','g','d','u','m','d','i','m','3','2','.','d','l','l',0}; + static const WCHAR driver_nvidiaW[] = {'n','v','d','3','d','u','m','.','d','l','l',0}; + static const WCHAR driver_wineW[] = {'w','i','n','e','.','d','l','l',0}; + + /* FIXME: wined3d has a better table, but we can not access this information through dxgi */ + + if (vendorid == HW_VENDOR_AMD) + return driver_amdW; + else if (vendorid == HW_VENDOR_NVIDIA) + return driver_nvidiaW; + else if (vendorid == HW_VENDOR_INTEL) + return driver_intelW; + return driver_wineW; +} + static enum fill_status fill_videocontroller( struct table *table, const struct expr *cond ) { static const WCHAR fmtW[] = {'%','u',' ','x',' ','%','u',' ','x',' ','%','I','6','4','u',' ','c','o','l','o','r','s',0}; @@ -3277,6 +3304,7 @@ done: rec->description = heap_strdupW( name ); rec->device_id = videocontroller_deviceidW; rec->driverversion = videocontroller_driverversionW; + rec->installeddriver = get_installeddriver( desc.VendorId ); rec->name = heap_strdupW( name ); rec->pnpdevice_id = get_pnpdeviceid( &desc ); rec->status = videocontroller_statusW;

1 0

Michael Müller : wbemprox: Add DriverDate for Win32_VideoController.
by Alexandre Julliard 01 Mar '18

01 Mar '18

Module: wine Branch: master Commit: 854482c3b26a3534b9092f3dc71df0037936449c URL: https://source.winehq.org/git/wine.git/?a=commit;h=854482c3b26a3534b9092f3d… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Mar 1 17:20:39 2018 +0100 wbemprox: Add DriverDate for Win32_VideoController. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 90b3704..9dfc939 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -215,6 +215,8 @@ static const WCHAR prop_domainroleW[] = {'D','o','m','a','i','n','R','o','l','e',0}; static const WCHAR prop_driveW[] = {'D','r','i','v','e',0}; +static const WCHAR prop_driverdateW[] = + {'D','r','i','v','e','r','D','a','t','e',0}; static const WCHAR prop_drivernameW[] = {'D','r','i','v','e','r','N','a','m','e',0}; static const WCHAR prop_driverversionW[] = @@ -718,6 +720,7 @@ static const struct column col_videocontroller[] = { prop_currentverticalresW, CIM_UINT32, VT_I4 }, { prop_descriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_deviceidW, CIM_STRING|COL_FLAG_KEY }, + { prop_driverdateW, CIM_DATETIME }, { prop_driverversionW, CIM_STRING }, { prop_installeddisplaydriversW,CIM_STRING }, { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, @@ -819,6 +822,8 @@ static const WCHAR videocontroller_dactypeW[] = {'I','n','t','e','g','r','a','t','e','d',' ','R','A','M','D','A','C',0}; static const WCHAR videocontroller_deviceidW[] = {'V','i','d','e','o','C','o','n','t','r','o','l','l','e','r','1',0}; +static const WCHAR videocontroller_driverdateW[] = + {'2','0','1','7','0','1','0','1','0','0','0','0','0','0','.','0','0','0','0','0','0','+','0','0','0',0}; static const WCHAR videocontroller_driverversionW[] = {'1','.','0',0}; static const WCHAR videocontroller_statusW[] = @@ -1128,6 +1133,7 @@ struct record_videocontroller UINT32 current_verticalres; const WCHAR *description; const WCHAR *device_id; + const WCHAR *driverdate; const WCHAR *driverversion; const WCHAR *installeddriver; const WCHAR *name; @@ -3303,6 +3309,7 @@ done: rec->current_verticalres = vres; rec->description = heap_strdupW( name ); rec->device_id = videocontroller_deviceidW; + rec->driverdate = videocontroller_driverdateW; rec->driverversion = videocontroller_driverversionW; rec->installeddriver = get_installeddriver( desc.VendorId ); rec->name = heap_strdupW( name );

1 0

Hans Leidekker : wbemprox/tests: Add tests for Win32_VideoController.
by Alexandre Julliard 01 Mar '18

01 Mar '18

Module: wine Branch: master Commit: d306f596d31b79e7e43cc004944ed6df9fc7f7af URL: https://source.winehq.org/git/wine.git/?a=commit;h=d306f596d31b79e7e43cc004… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Mar 1 17:20:40 2018 +0100 wbemprox/tests: Add tests for Win32_VideoController. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/tests/query.c | 76 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 1c0f5f2..7028d7b 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1556,6 +1556,81 @@ static void test_Win32_Processor( IWbemServices *services ) SysFreeString( wql ); } +static void test_Win32_VideoController( IWbemServices *services ) +{ + static const WCHAR configmanagererrorcodeW[] = + {'C','o','n','f','i','g','M','a','n','a','g','e','r','E','r','r','o','r','C','o','d','e',0}; + static const WCHAR driverdateW[] = + {'D','r','i','v','e','r','D','a','t','e',0}; + static const WCHAR installeddisplaydriversW[]= + {'I','n','s','t','a','l','l','e','d','D','i','s','p','l','a','y','D','r','i','v','e','r','s',0}; + static const WCHAR statusW[] = + {'S','t','a','t','u','s',0}; + static const WCHAR queryW[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', + 'V','i','d','e','o','C','o','n','t','r','o','l','l','e','r',0}; + BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + VARIANT val; + CIMTYPE type; + HRESULT hr; + DWORD count; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + if (hr != S_OK) + { + win_skip( "Win32_VideoController not available\n" ); + return; + } + + for (;;) + { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, configmanagererrorcodeW, 0, &val, &type, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); + trace( "configmanagererrorcode %d\n", V_I4( &val ) ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, driverdateW, 0, &val, &type, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_DATETIME, "unexpected type 0x%x\n", type ); + trace( "driverdate %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, installeddisplaydriversW, 0, &val, &type, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR || V_VT( &val ) == VT_NULL, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "installeddisplaydrivers %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, statusW, 0, &val, &type, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "status %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + IWbemClassObject_Release( obj ); + } + + SysFreeString( query ); + SysFreeString( wql ); +} + START_TEST(query) { static const WCHAR cimv2W[] = {'R','O','O','T','\\','C','I','M','V','2',0}; @@ -1598,6 +1673,7 @@ START_TEST(query) test_PhysicalMemory( services ); test_IP4RouteTable( services ); test_Win32_Processor( services ); + test_Win32_VideoController( services ); SysFreeString( path ); IWbemServices_Release( services );

1 0

Michael Stefaniuc : dswave/tests: Add IDirectMusicObject::ParseDescriptor( ) tests.
by Alexandre Julliard 01 Mar '18

01 Mar '18

Module: wine Branch: master Commit: 1d3f08ece009abfcdb1612695ef2b2d6b3a3a5e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d3f08ece009abfcdb161269… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Feb 28 00:05:00 2018 +0100 dswave/tests: Add IDirectMusicObject::ParseDescriptor() tests. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dswave/tests/dswave.c | 191 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 191 insertions(+) diff --git a/dlls/dswave/tests/dswave.c b/dlls/dswave/tests/dswave.c index 531afb5..be36fd2 100644 --- a/dlls/dswave/tests/dswave.c +++ b/dlls/dswave/tests/dswave.c @@ -22,8 +22,11 @@ #include <windef.h> #include <initguid.h> #include <wine/test.h> +#include <ole2.h> #include <dmusici.h> +#include <dmusicf.h> +DEFINE_GUID(GUID_NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); DEFINE_GUID(IID_IDirectMusicWavePRIVATE, 0x69e934e4, 0x97f1, 0x4f1d, 0x88, 0xe8, 0xf2, 0xac, 0x88, 0x67, 0x13, 0x27); @@ -97,6 +100,193 @@ static void test_COM(void) while (IDirectMusicObject_Release(dmo)); } +struct chunk { + FOURCC id; + DWORD size; + FOURCC type; +}; + +#define CHUNK_HDR_SIZE (sizeof(FOURCC) + sizeof(DWORD)) + +/* Generate a RIFF file format stream from an array of FOURCC ids. + RIFF and LIST need to be followed by the form type respectively list type, + followed by the chunks of the list and terminated with 0. */ +static IStream *gen_riff_stream(const FOURCC *ids) +{ + static const LARGE_INTEGER zero; + int level = -1; + DWORD *sizes[4]; /* Stack for the sizes of RIFF and LIST chunks */ + char riff[1024]; + char *p = riff; + struct chunk *ck; + IStream *stream; + + do { + ck = (struct chunk *)p; + ck->id = *ids++; + switch (ck->id) { + case 0: + *sizes[level] = p - (char *)sizes[level] - sizeof(DWORD); + level--; + break; + case FOURCC_LIST: + case FOURCC_RIFF: + level++; + sizes[level] = &ck->size; + ck->type = *ids++; + p += sizeof(*ck); + break; + case DMUS_FOURCC_GUID_CHUNK: + ck->size = sizeof(GUID_NULL); + p += CHUNK_HDR_SIZE; + memcpy(p, &GUID_NULL, sizeof(GUID_NULL)); + p += ck->size; + break; + case DMUS_FOURCC_VERSION_CHUNK: + { + DMUS_VERSION ver = {5, 8}; + + ck->size = sizeof(ver); + p += CHUNK_HDR_SIZE; + memcpy(p, &ver, sizeof(ver)); + p += ck->size; + break; + } + case mmioFOURCC('I','N','A','M'): + ck->size = 5; + p += CHUNK_HDR_SIZE; + strcpy(p, "INAM"); + p += ck->size; + break; + default: + { + /* Just convert the FOURCC id to a WCHAR string */ + WCHAR *s; + + ck->size = 5 * sizeof(WCHAR); + p += CHUNK_HDR_SIZE; + s = (WCHAR *)p; + s[0] = (char)(ck->id); + s[1] = (char)(ck->id >> 8); + s[2] = (char)(ck->id >> 16); + s[3] = (char)(ck->id >> 24); + s[4] = 0; + p += ck->size; + } + } + } while (level >= 0); + + ck = (struct chunk *)riff; + CreateStreamOnHGlobal(NULL, TRUE, &stream); + IStream_Write(stream, riff, ck->size + CHUNK_HDR_SIZE, NULL); + IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); + + return stream; +} + +static void test_parsedescriptor(void) +{ + IDirectMusicObject *dmo; + IStream *stream; + DMUS_OBJECTDESC desc = {0}; + HRESULT hr; + const WCHAR s_inam[] = {'I','N','A','M','\0'}; + const FOURCC alldesc[] = + { + FOURCC_RIFF, mmioFOURCC('W','A','V','E'), DMUS_FOURCC_CATEGORY_CHUNK, FOURCC_LIST, + DMUS_FOURCC_UNFO_LIST, DMUS_FOURCC_UNAM_CHUNK, DMUS_FOURCC_UCOP_CHUNK, + DMUS_FOURCC_UCMT_CHUNK, DMUS_FOURCC_USBJ_CHUNK, 0, DMUS_FOURCC_VERSION_CHUNK, + DMUS_FOURCC_GUID_CHUNK, 0 + }; + const FOURCC dupes[] = + { + FOURCC_RIFF, mmioFOURCC('W','A','V','E'), DMUS_FOURCC_CATEGORY_CHUNK, + DMUS_FOURCC_CATEGORY_CHUNK, DMUS_FOURCC_VERSION_CHUNK, DMUS_FOURCC_VERSION_CHUNK, + DMUS_FOURCC_GUID_CHUNK, DMUS_FOURCC_GUID_CHUNK, FOURCC_LIST, DMUS_FOURCC_INFO_LIST, + mmioFOURCC('I','N','A','M'), 0, FOURCC_LIST, DMUS_FOURCC_INFO_LIST, + mmioFOURCC('I','N','A','M'), 0, 0 + }; + FOURCC empty[] = {FOURCC_RIFF, mmioFOURCC('W','A','V','E'), 0}; + FOURCC inam[] = + { + FOURCC_RIFF, mmioFOURCC('W','A','V','E'), FOURCC_LIST, DMUS_FOURCC_UNFO_LIST, + mmioFOURCC('I','N','A','M'), 0, 0 + }; + + hr = CoCreateInstance(&CLSID_DirectSoundWave, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicObject, (void **)&dmo); + ok(hr == S_OK, "DirectSoundWave create failed: %08x, expected S_OK\n", hr); + + /* Nothing loaded */ + hr = IDirectMusicObject_GetDescriptor(dmo, &desc); + todo_wine ok(hr == E_INVALIDARG, "GetDescriptor failed: %08x, expected E_INVALIDARG\n", hr); + todo_wine ok(!desc.dwValidData, "Got valid data %#x, expected 0\n", desc.dwValidData); + + /* Empty RIFF stream */ + stream = gen_riff_stream(empty); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + todo_wine ok(!desc.dwValidData, "Got valid data %#x, expected 0\n", desc.dwValidData); + IStream_Release(stream); + + /* Wrong form */ + empty[1] = DMUS_FOURCC_CONTAINER_FORM; + stream = gen_riff_stream(empty); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + todo_wine ok(hr == DMUS_E_CHUNKNOTFOUND, + "ParseDescriptor failed: %08x, expected DMUS_E_CHUNKNOTFOUND\n", hr); + + /* All desc chunks, only DMUS_OBJ_OBJECT and DMUS_OBJ_VERSION supported */ + stream = gen_riff_stream(alldesc); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + todo_wine ok(desc.dwValidData == (DMUS_OBJ_OBJECT | DMUS_OBJ_VERSION), + "Got valid data %#x, expected DMUS_OBJ_OBJECT | DMUS_OBJ_VERSION\n", desc.dwValidData); + ok(IsEqualGUID(&desc.guidObject, &GUID_NULL), "Got object guid %s, expected GUID_NULL\n", + wine_dbgstr_guid(&desc.guidClass)); + ok(desc.vVersion.dwVersionMS == 5 && desc.vVersion.dwVersionLS == 8, + "Got version %u.%u, expected 5.8\n", desc.vVersion.dwVersionMS, + desc.vVersion.dwVersionLS); + IStream_Release(stream); + + /* UNFO list with INAM */ + inam[3] = DMUS_FOURCC_UNFO_LIST; + stream = gen_riff_stream(inam); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + todo_wine ok(!desc.dwValidData, "Got valid data %#x, expected 0\n", desc.dwValidData); + IStream_Release(stream); + + /* INFO list with INAM */ + inam[3] = DMUS_FOURCC_INFO_LIST; + stream = gen_riff_stream(inam); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + todo_wine ok(desc.dwValidData == DMUS_OBJ_NAME, "Got valid data %#x, expected DMUS_OBJ_NAME\n", + desc.dwValidData); + todo_wine ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'INAM'\n", + wine_dbgstr_w(desc.wszName)); + IStream_Release(stream); + + /* Duplicated chunks */ + stream = gen_riff_stream(dupes); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + todo_wine ok(desc.dwValidData == (DMUS_OBJ_OBJECT | DMUS_OBJ_NAME | DMUS_OBJ_VERSION), + "Got valid data %#x, expected DMUS_OBJ_OBJECT | DMUS_OBJ_NAME | DMUS_OBJ_VERSION\n", + desc.dwValidData); + todo_wine ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'INAM'\n", + wine_dbgstr_w(desc.wszName)); + IStream_Release(stream); + + IDirectMusicObject_Release(dmo); +} + static void test_dswave(void) { IDirectMusicObject *dmo; @@ -140,6 +330,7 @@ START_TEST(dswave) } test_COM(); test_dswave(); + test_parsedescriptor(); CoUninitialize(); }

1 0

Piotr Caban : user32: Fix itemData passed in ListBox WM_MEASUREITEM message.
by Alexandre Julliard 01 Mar '18

01 Mar '18

Module: wine Branch: master Commit: 3c5c9b157771828419cb5d7e831d46813ede041f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c5c9b157771828419cb5d7e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 28 17:36:51 2018 +0100 user32: Fix itemData passed in ListBox WM_MEASUREITEM message. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index f6b936a..8df6763 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -1538,7 +1538,7 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, RtlMoveMemory( item + 1, item, (descr->nb_items - index) * sizeof(LB_ITEMDATA) ); item->str = str; - item->data = data; + item->data = HAS_STRINGS(descr) ? 0 : data; item->height = 0; item->selected = FALSE; descr->nb_items++; @@ -1553,7 +1553,7 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, mis.CtlType = ODT_LISTBOX; mis.CtlID = id; mis.itemID = index; - mis.itemData = descr->items[index].data; + mis.itemData = data; mis.itemHeight = descr->item_height; SendMessageW( descr->owner, WM_MEASUREITEM, id, (LPARAM)&mis ); item->height = mis.itemHeight ? mis.itemHeight : 1; @@ -1594,7 +1594,6 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, static LRESULT LISTBOX_InsertString( LB_DESCR *descr, INT index, LPCWSTR str ) { LPWSTR new_str = NULL; - ULONG_PTR data = 0; LRESULT ret; if (HAS_STRINGS(descr)) @@ -1608,10 +1607,9 @@ static LRESULT LISTBOX_InsertString( LB_DESCR *descr, INT index, LPCWSTR str ) } strcpyW(new_str, str); } - else data = (ULONG_PTR)str; if (index == -1) index = descr->nb_items; - if ((ret = LISTBOX_InsertItem( descr, index, new_str, data )) != 0) + if ((ret = LISTBOX_InsertItem( descr, index, new_str, (ULONG_PTR)str )) != 0) { HeapFree( GetProcessHeap(), 0, new_str ); return ret;

1 0

Piotr Caban : user32/tests: Add listbox WM_MEASUREITEM tests.
by Alexandre Julliard 01 Mar '18

01 Mar '18

Module: wine Branch: master Commit: 43df3f468f2d3364345a685ca9f236a8502fa3a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43df3f468f2d3364345a685c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 28 17:37:03 2018 +0100 user32/tests: Add listbox WM_MEASUREITEM tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/listbox.c | 55 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 91d4675..88d3adb 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -46,6 +46,15 @@ static const char * const strings[4] = { static const char BAD_EXTENSION[] = "*.badtxt"; +static int strcmp_aw(LPCWSTR strw, const char *stra) +{ + WCHAR buf[1024]; + + if (!stra) return 1; + MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, sizeof(buf)/sizeof(WCHAR)); + return lstrcmpW(strw, buf); +} + static HWND create_listbox (DWORD add_style, HWND parent) { @@ -239,6 +248,31 @@ static LRESULT WINAPI main_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARA { switch (msg) { + case WM_MEASUREITEM: + { + DWORD style = GetWindowLongA(GetWindow(hwnd, GW_CHILD), GWL_STYLE); + MEASUREITEMSTRUCT *mi = (void*)lparam; + + ok(wparam == mi->CtlID, "got wParam=%08lx, expected %08x\n", wparam, mi->CtlID); + ok(mi->CtlType == ODT_LISTBOX, "mi->CtlType = %u\n", mi->CtlType); + ok(mi->CtlID == 1, "mi->CtlID = %u\n", mi->CtlID); + ok(mi->itemHeight, "mi->itemHeight = 0\n"); + + if (mi->itemID > 4 || style & LBS_OWNERDRAWFIXED) + break; + + if (style & LBS_HASSTRINGS) + { + ok(!strcmp_aw((WCHAR*)mi->itemData, strings[mi->itemID]), + "mi->itemData = %s (%d)\n", wine_dbgstr_w((WCHAR*)mi->itemData), mi->itemID); + } + else + { + ok((void*)mi->itemData == strings[mi->itemID], + "mi->itemData = %08lx, expected %p\n", mi->itemData, strings[mi->itemID]); + } + break; + } case WM_DRAWITEM: { RECT rc_item, rc_client, rc_clip; @@ -1822,6 +1856,26 @@ static void test_extents(void) DestroyWindow(parent); } +static void test_WM_MEASUREITEM(void) +{ + HWND parent, listbox; + LRESULT data; + + parent = create_parent(); + listbox = create_listbox(WS_CHILD | LBS_OWNERDRAWVARIABLE, parent); + + data = SendMessageA(listbox, LB_GETITEMDATA, 0, 0); + ok(data == (LRESULT)strings[0], "data = %08lx, expected %p\n", data, strings[0]); + DestroyWindow(parent); + + parent = create_parent(); + listbox = create_listbox(WS_CHILD | LBS_OWNERDRAWVARIABLE | LBS_HASSTRINGS, parent); + + data = SendMessageA(listbox, LB_GETITEMDATA, 0, 0); + ok(!data, "data = %08lx\n", data); + DestroyWindow(parent); +} + START_TEST(listbox) { const struct listbox_test SS = @@ -1905,4 +1959,5 @@ START_TEST(listbox) test_GetListBoxInfo(); test_missing_lbuttonup(); test_extents(); + test_WM_MEASUREITEM(); }

1 0

Piotr Caban : comctl32: Fix itemData passed in ListBox WM_MEASUREITEM message.
by Alexandre Julliard 01 Mar '18

01 Mar '18

Module: wine Branch: master Commit: 0bb2cb3d998cfb6a3a98e469807b7a0e5f55ca15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bb2cb3d998cfb6a3a98e469… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 28 17:37:10 2018 +0100 comctl32: Fix itemData passed in ListBox WM_MEASUREITEM message. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 3184e20..94712fd 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -1533,7 +1533,7 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, RtlMoveMemory( item + 1, item, (descr->nb_items - index) * sizeof(LB_ITEMDATA) ); item->str = str; - item->data = data; + item->data = HAS_STRINGS(descr) ? 0 : data; item->height = 0; item->selected = FALSE; descr->nb_items++; @@ -1548,7 +1548,7 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, mis.CtlType = ODT_LISTBOX; mis.CtlID = id; mis.itemID = index; - mis.itemData = descr->items[index].data; + mis.itemData = data; mis.itemHeight = descr->item_height; SendMessageW( descr->owner, WM_MEASUREITEM, id, (LPARAM)&mis ); item->height = mis.itemHeight ? mis.itemHeight : 1; @@ -1589,7 +1589,6 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, static LRESULT LISTBOX_InsertString( LB_DESCR *descr, INT index, LPCWSTR str ) { LPWSTR new_str = NULL; - ULONG_PTR data = 0; LRESULT ret; if (HAS_STRINGS(descr)) @@ -1603,10 +1602,9 @@ static LRESULT LISTBOX_InsertString( LB_DESCR *descr, INT index, LPCWSTR str ) } strcpyW(new_str, str); } - else data = (ULONG_PTR)str; if (index == -1) index = descr->nb_items; - if ((ret = LISTBOX_InsertItem( descr, index, new_str, data )) != 0) + if ((ret = LISTBOX_InsertItem( descr, index, new_str, (ULONG_PTR)str )) != 0) { HeapFree( GetProcessHeap(), 0, new_str ); return ret;

1 0

Piotr Caban : comctl32/tests: Add listbox WM_MEASUREITEM tests.
by Alexandre Julliard 01 Mar '18

01 Mar '18

Module: wine Branch: master Commit: 2c0f6d9614062ceef3063a20065e7ee654927ce6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c0f6d9614062ceef3063a20… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 28 17:37:18 2018 +0100 comctl32/tests: Add listbox WM_MEASUREITEM tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listbox.c | 55 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index 23c2e2b..1513bea 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -43,6 +43,15 @@ static const char * const strings[4] = { static const char BAD_EXTENSION[] = "*.badtxt"; +static int strcmp_aw(LPCWSTR strw, const char *stra) +{ + WCHAR buf[1024]; + + if (!stra) return 1; + MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, sizeof(buf)/sizeof(WCHAR)); + return lstrcmpW(strw, buf); +} + static HWND create_listbox(DWORD add_style, HWND parent) { INT_PTR ctl_id = 0; @@ -229,6 +238,31 @@ static LRESULT WINAPI main_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARA { switch (msg) { + case WM_MEASUREITEM: + { + DWORD style = GetWindowLongA(GetWindow(hwnd, GW_CHILD), GWL_STYLE); + MEASUREITEMSTRUCT *mi = (void*)lparam; + + ok(wparam == mi->CtlID, "got wParam=%08lx, expected %08x\n", wparam, mi->CtlID); + ok(mi->CtlType == ODT_LISTBOX, "mi->CtlType = %u\n", mi->CtlType); + ok(mi->CtlID == 1, "mi->CtlID = %u\n", mi->CtlID); + ok(mi->itemHeight, "mi->itemHeight = 0\n"); + + if (mi->itemID > 4 || style & LBS_OWNERDRAWFIXED) + break; + + if (style & LBS_HASSTRINGS) + { + ok(!strcmp_aw((WCHAR*)mi->itemData, strings[mi->itemID]), + "mi->itemData = %s (%d)\n", wine_dbgstr_w((WCHAR*)mi->itemData), mi->itemID); + } + else + { + ok((void*)mi->itemData == strings[mi->itemID], + "mi->itemData = %08lx, expected %p\n", mi->itemData, strings[mi->itemID]); + } + break; + } case WM_DRAWITEM: { RECT rc_item, rc_client, rc_clip; @@ -1837,6 +1871,26 @@ static void test_listbox(void) run_test(EMS_NS); } +static void test_WM_MEASUREITEM(void) +{ + HWND parent, listbox; + LRESULT data; + + parent = create_parent(); + listbox = create_listbox(WS_CHILD | LBS_OWNERDRAWVARIABLE, parent); + + data = SendMessageA(listbox, LB_GETITEMDATA, 0, 0); + ok(data == (LRESULT)strings[0], "data = %08lx, expected %p\n", data, strings[0]); + DestroyWindow(parent); + + parent = create_parent(); + listbox = create_listbox(WS_CHILD | LBS_OWNERDRAWVARIABLE | LBS_HASSTRINGS, parent); + + data = SendMessageA(listbox, LB_GETITEMDATA, 0, 0); + ok(!data, "data = %08lx\n", data); + DestroyWindow(parent); +} + START_TEST(listbox) { ULONG_PTR ctx_cookie; @@ -1859,6 +1913,7 @@ START_TEST(listbox) test_GetListBoxInfo(); test_missing_lbuttonup(); test_extents(); + test_WM_MEASUREITEM(); unload_v6_module(ctx_cookie, hCtx); }

1 0

Henri Verbeet : wined3d: Explicitly calculate the sub-resource level in fb_copy_to_texture_direct( ).
by Alexandre Julliard 01 Mar '18

01 Mar '18

Module: wine Branch: master Commit: 6be6bf7d708521f6c97f398cd308011b3e5efa64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6be6bf7d708521f6c97f398c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 1 10:04:51 2018 +0330 wined3d: Explicitly calculate the sub-resource level in fb_copy_to_texture_direct(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 12370ed..668cfba 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1722,9 +1722,9 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, struct wined3d_surface *src_surface, const RECT *src_rect, const RECT *dst_rect_in, enum wined3d_texture_filter_type filter) { + unsigned int src_width, src_height, src_pow2_width, src_pow2_height, src_level; unsigned int src_sub_resource_idx = surface_get_sub_resource_idx(src_surface); unsigned int dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface); - unsigned int src_width, src_height, src_pow2_width, src_pow2_height; struct wined3d_texture *src_texture = src_surface->container; struct wined3d_texture *dst_texture = dst_surface->container; struct wined3d_device *device = dst_texture->resource.device; @@ -1752,10 +1752,11 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st wined3d_texture_load(dst_texture, context, FALSE); offscreen_buffer = context_get_offscreen_gl_buffer(context); - src_width = wined3d_texture_get_level_width(src_texture, src_surface->texture_level); - src_height = wined3d_texture_get_level_height(src_texture, src_surface->texture_level); - src_pow2_width = wined3d_texture_get_level_pow2_width(src_texture, src_surface->texture_level); - src_pow2_height = wined3d_texture_get_level_pow2_height(src_texture, src_surface->texture_level); + src_level = src_sub_resource_idx % src_texture->level_count; + src_width = wined3d_texture_get_level_width(src_texture, src_level); + src_height = wined3d_texture_get_level_height(src_texture, src_level); + src_pow2_width = wined3d_texture_get_level_pow2_width(src_texture, src_level); + src_pow2_height = wined3d_texture_get_level_pow2_height(src_texture, src_level); src_offscreen = wined3d_resource_is_offscreen(&src_texture->resource); noBackBufferBackup = src_offscreen && wined3d_settings.offscreen_rendering_mode == ORM_FBO;

1 0

Henri Verbeet : wined3d: Explicitly calculate the sub-resource level in surface_blt_special().
by Alexandre Julliard 01 Mar '18

01 Mar '18

Module: wine Branch: master Commit: 28d0ee637a6517d0e53d8722fa70a5e8ec639d77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28d0ee637a6517d0e53d8722… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 1 10:04:52 2018 +0330 wined3d: Explicitly calculate the sub-resource level in surface_blt_special(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 668cfba..b6235ce 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2113,7 +2113,7 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE if ((src_swapchain || src_surface == rt) && !dst_swapchain) { - unsigned int src_width, src_height; + unsigned int src_level, src_width, src_height; /* Blit from render target to texture */ BOOL stretchx; @@ -2147,8 +2147,9 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE * back buffer. This is slower than reading line per line, thus not used for flipping * -> If the app wants a scaled image with a dest rect that is bigger than the fb, it has to be copied * pixel by pixel. */ - src_width = wined3d_texture_get_level_width(src_texture, src_surface->texture_level); - src_height = wined3d_texture_get_level_height(src_texture, src_surface->texture_level); + src_level = surface_get_sub_resource_idx(src_surface) % src_texture->level_count; + src_width = wined3d_texture_get_level_width(src_texture, src_level); + src_height = wined3d_texture_get_level_height(src_texture, src_level); if (!stretchx || dst_rect->right - dst_rect->left > src_width || dst_rect->bottom - dst_rect->top > src_height) {

1 0