wine-commits March 2018

wine-commits@winehq.org

2 participants
785 discussions

Michael Müller : include: Add PathCchCombineEx() definition.
by Alexandre Julliard 01 Mar '18

01 Mar '18

Module: wine Branch: master Commit: 34d7e94a629d27c6e7c775912bb7a6bba7bcc82b URL: https://source.winehq.org/git/wine.git/?a=commit;h=34d7e94a629d27c6e7c77591… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Feb 28 13:54:16 2018 +0300 include: Add PathCchCombineEx() definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/pathcch.h | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index f1bcba3..72304d6 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -494,6 +494,7 @@ SOURCES = \ opnrst.idl \ optary.idl \ patchapi.h \ + pathcch.h \ pdh.h \ pdhmsg.h \ perflib.h \ diff --git a/include/pathcch.h b/include/pathcch.h new file mode 100644 index 0000000..8831c52 --- /dev/null +++ b/include/pathcch.h @@ -0,0 +1,26 @@ +/* + * Copyright 2017 Michael Müller + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define PATHCCH_NONE 0x00 +#define PATHCCH_ALLOW_LONG_PATHS 0x01 +#define PATHCCH_FORCE_ENABLE_LONG_NAME_PROCESS 0x02 +#define PATHCCH_FORCE_DISABLE_LONG_NAME_PROCESS 0x04 +#define PATHCCH_DO_NOT_NORMALIZE_SEGMENTS 0x08 +#define PATHCCH_ENSURE_IS_EXTENDED_LENGTH_PATH 0x10 + +HRESULT WINAPI PathCchCombineEx(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2, DWORD flags);

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

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 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

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 Status for Win32_VideoController.
by Alexandre Julliard 01 Mar '18

01 Mar '18

Module: wine Branch: master Commit: 6dc5eee71bf207c76bc4fec10e3c3bf01b11922e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6dc5eee71bf207c76bc4fec1… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Mar 1 17:20:37 2018 +0100 wbemprox: Add Status 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 6584399..bfcd51c 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -361,6 +361,8 @@ static const WCHAR prop_startingoffsetW[] = {'S','t','a','r','t','i','n','g','O','f','f','s','e','t',0}; static const WCHAR prop_stateW[] = {'S','t','a','t','e',0}; +static const WCHAR prop_statusW[] = + {'S','t','a','t','u','s',0}; static const WCHAR prop_statusinfoW[] = {'S','t','a','t','u','s','I','n','f','o',0}; static const WCHAR prop_strvalueW[] = @@ -717,6 +719,7 @@ static const struct column col_videocontroller[] = { prop_driverversionW, CIM_STRING }, { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_pnpdeviceidW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_statusW, CIM_STRING }, { prop_videoarchitectureW, CIM_UINT16, VT_I4 }, { prop_videomemorytypeW, CIM_UINT16, VT_I4 }, { prop_videomodedescriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, @@ -815,6 +818,8 @@ 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_driverversionW[] = {'1','.','0',0}; +static const WCHAR videocontroller_statusW[] = + {'O','K',0}; #include "pshpack1.h" struct record_baseboard @@ -1123,6 +1128,7 @@ struct record_videocontroller const WCHAR *driverversion; const WCHAR *name; const WCHAR *pnpdevice_id; + const WCHAR *status; UINT16 videoarchitecture; UINT16 videomemorytype; const WCHAR *videomodedescription; @@ -3273,6 +3279,7 @@ done: rec->driverversion = videocontroller_driverversionW; rec->name = heap_strdupW( name ); rec->pnpdevice_id = get_pnpdeviceid( &desc ); + rec->status = videocontroller_statusW; rec->videoarchitecture = 2; /* Unknown */ rec->videomemorytype = 2; /* Unknown */ wsprintfW( mode, fmtW, hres, vres, (UINT64)1 << rec->current_bitsperpixel );

1 0

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

01 Mar '18

Module: wine Branch: master Commit: d42026af6e8b370f772347b44a491f1ae9a8cea8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d42026af6e8b370f772347b4… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Mar 1 17:20:36 2018 +0100 wbemprox: Add ConfigManagerErrorCode 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 | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 22dcec5..6584399 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -165,6 +165,8 @@ static const WCHAR prop_codesetW[] = {'C','o','d','e','S','e','t',0}; static const WCHAR prop_commandlineW[] = {'C','o','m','m','a','n','d','L','i','n','e',0}; +static const WCHAR prop_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 prop_countrycodeW[] = {'C','o','u','n','t','r','y','C','o','d','e',0}; static const WCHAR prop_cpustatusW[] = @@ -700,24 +702,25 @@ static const struct column col_systemsecurity[] = }; static const struct column col_videocontroller[] = { - { prop_adapterdactypeW, CIM_STRING }, - { prop_adapterramW, CIM_UINT32, VT_I4 }, - { prop_availabilityW, CIM_UINT16 }, - { prop_captionW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_currentbitsperpixelW, CIM_UINT32, VT_I4 }, - { prop_currenthorizontalresW, CIM_UINT32, VT_I4 }, - { prop_currentrefreshrateW, CIM_UINT32, VT_I4 }, - { prop_currentscanmodeW, CIM_UINT16, VT_I4 }, - { prop_currentverticalresW, CIM_UINT32, VT_I4 }, - { prop_descriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_deviceidW, CIM_STRING|COL_FLAG_KEY }, - { prop_driverversionW, CIM_STRING }, - { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_pnpdeviceidW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_videoarchitectureW, CIM_UINT16, VT_I4 }, - { prop_videomemorytypeW, CIM_UINT16, VT_I4 }, - { prop_videomodedescriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_videoprocessorW, CIM_STRING|COL_FLAG_DYNAMIC } + { prop_adapterdactypeW, CIM_STRING }, + { prop_adapterramW, CIM_UINT32, VT_I4 }, + { prop_availabilityW, CIM_UINT16 }, + { prop_captionW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_configmanagererrorcodeW, CIM_UINT32, VT_I4 }, + { prop_currentbitsperpixelW, CIM_UINT32, VT_I4 }, + { prop_currenthorizontalresW, CIM_UINT32, VT_I4 }, + { prop_currentrefreshrateW, CIM_UINT32, VT_I4 }, + { prop_currentscanmodeW, CIM_UINT16, VT_I4 }, + { prop_currentverticalresW, CIM_UINT32, VT_I4 }, + { prop_descriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_deviceidW, CIM_STRING|COL_FLAG_KEY }, + { prop_driverversionW, CIM_STRING }, + { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_pnpdeviceidW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_videoarchitectureW, CIM_UINT16, VT_I4 }, + { prop_videomemorytypeW, CIM_UINT16, VT_I4 }, + { prop_videomodedescriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_videoprocessorW, CIM_STRING|COL_FLAG_DYNAMIC }, }; static const WCHAR baseboard_manufacturerW[] = @@ -1109,6 +1112,7 @@ struct record_videocontroller UINT32 adapter_ram; UINT16 availability; const WCHAR *caption; + UINT32 config_errorcode; UINT32 current_bitsperpixel; UINT32 current_horizontalres; UINT32 current_refreshrate; @@ -3257,6 +3261,7 @@ done: rec->adapter_dactype = videocontroller_dactypeW; rec->adapter_ram = vidmem; rec->availability = 3; /* Running or Full Power */ + rec->config_errorcode = 0; /* no error */ rec->caption = heap_strdupW( name ); rec->current_bitsperpixel = get_bits_per_pixel( &hres, &vres ); rec->current_horizontalres = hres;

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 01 Mar '18

01 Mar '18

Module: wine Branch: master Commit: 3e3423124a9672d0c89a1b6040fafec1a6d2cc0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e3423124a9672d0c89a1b60… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Mar 1 17:41:45 2018 +0200 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/po/fi.po b/po/fi.po index e1eeffb..695abbf 100644 --- a/po/fi.po +++ b/po/fi.po @@ -6663,10 +6663,8 @@ msgid "Connection reset by peer.\n" msgstr "Vastapuoli nollasi yhteyden.\n" #: winerror.mc:3760 -#, fuzzy -#| msgid "Message 0x%1 not found in file %2.\n" msgid "No Signature found in file.\n" -msgstr "Viestiä 0x%1 ei löytynyt tiedostosta %2.\n" +msgstr "Tiedostosta ei löytynyt allekirjoitusta.\n" #: localspl.rc:31 localui.rc:31 winspool.rc:30 msgid "Local Port"

1 0

Józef Kucia : kernel32: Treat Vulkan environment variables as special variables.
by Alexandre Julliard 01 Mar '18

01 Mar '18

Module: wine Branch: master Commit: 665ce1c5eb3bcc579fd4a58e5ce1631051dfe61e URL: https://source.winehq.org/git/wine.git/?a=commit;h=665ce1c5eb3bcc579fd4a58e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 1 17:04:58 2018 +0100 kernel32: Treat Vulkan environment variables as special variables. We do not want to inherit Vulkan environment variables from the Unix environment, e.g. VK_ICD_FILENAMES confuses Windows Vulkan loader. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 0a3fd70..b883087 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -136,7 +136,8 @@ static inline BOOL is_special_env_var( const char *var ) !strncmp( var, "HOME=", sizeof("HOME=")-1 ) || !strncmp( var, "TEMP=", sizeof("TEMP=")-1 ) || !strncmp( var, "TMP=", sizeof("TMP=")-1 ) || - !strncmp( var, "QT_", sizeof("QT_")-1 )); + !strncmp( var, "QT_", sizeof("QT_")-1 ) || + !strncmp( var, "VK_", sizeof("VK_")-1 )); }

1 0

Józef Kucia : configure: Sort AC_ARG_WITH() calls.
by Alexandre Julliard 01 Mar '18

01 Mar '18

Module: wine Branch: master Commit: 6ae777319e8bc33fd8d0ba7a12f6eb13bf938761 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ae777319e8bc33fd8d0ba7a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 1 16:37:06 2018 +0100 configure: Sort AC_ARG_WITH() calls. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 16 ++++++++-------- configure.ac | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/configure b/configure index 20be8b9..28e678e 100755 --- a/configure +++ b/configure @@ -860,9 +860,9 @@ with_png with_pthread with_pulse with_sane +with_sdl with_tiff with_udev -with_sdl with_v4l with_vulkan with_xcomposite @@ -2436,9 +2436,9 @@ Optional Packages: --without-pthread do not use the pthread library --without-pulse do not use PulseAudio sound support --without-sane do not use SANE (scanner support) + --without-sdl do not use SDL --without-tiff do not use TIFF --without-udev do not use udev (plug and play support) - --without-sdl do not use SDL --without-v4l do not use v4l1 (v4l support) --without-vulkan do not use Vulkan --without-xcomposite do not use the Xcomposite extension @@ -3737,6 +3737,12 @@ if test "${with_sane+set}" = set; then : fi +# Check whether --with-sdl was given. +if test "${with_sdl+set}" = set; then : + withval=$with_sdl; +fi + + # Check whether --with-tiff was given. if test "${with_tiff+set}" = set; then : withval=$with_tiff; @@ -3749,12 +3755,6 @@ if test "${with_udev+set}" = set; then : fi -# Check whether --with-sdl was given. -if test "${with_sdl+set}" = set; then : - withval=$with_sdl; -fi - - # Check whether --with-v4l was given. if test "${with_v4l+set}" = set; then : withval=$with_v4l; diff --git a/configure.ac b/configure.ac index 3b93966..2695c67 100644 --- a/configure.ac +++ b/configure.ac @@ -77,9 +77,9 @@ AC_ARG_WITH(pthread, AS_HELP_STRING([--without-pthread],[do not use the pthrea [if test "x$withval" = "xno"; then ac_cv_header_pthread_h=no; fi]) AC_ARG_WITH(pulse, AS_HELP_STRING([--without-pulse],[do not use PulseAudio sound support])) AC_ARG_WITH(sane, AS_HELP_STRING([--without-sane],[do not use SANE (scanner support)])) +AC_ARG_WITH(sdl, AS_HELP_STRING([--without-sdl],[do not use SDL])) AC_ARG_WITH(tiff, AS_HELP_STRING([--without-tiff],[do not use TIFF])) AC_ARG_WITH(udev, AS_HELP_STRING([--without-udev],[do not use udev (plug and play support)])) -AC_ARG_WITH(sdl, AS_HELP_STRING([--without-sdl],[do not use SDL])) AC_ARG_WITH(v4l, AS_HELP_STRING([--without-v4l],[do not use v4l1 (v4l support)])) AC_ARG_WITH(vulkan, AS_HELP_STRING([--without-vulkan],[do not use Vulkan])) AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xcomposite extension]),

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2018