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

Michael Stefaniuc : maintainers: Add a DirectMusic section.
by Alexandre Julliard 01 Mar '18

01 Mar '18

Module: wine Branch: master Commit: 5ed6fd9ade3f630e68eed077b7ca86dcd48a64b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ed6fd9ade3f630e68eed077… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Mar 1 19:00:03 2018 +0100 maintainers: Add a DirectMusic section. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index d957e31..20b5678 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -90,6 +90,11 @@ DirectInput P: Andrew Eikum <aeikum(a)codeweavers.com> F: dlls/dinput/ +DirectMusic +M: Michael Stefaniuc <mstefani(a)winehq.org> +F: dlls/dm*/ +F: dlls/dswave/ + DirectPlay M: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> F: dlls/dplayx/

1 0

Piotr Caban : msvcrt: Fix misleading indentation in gets.
by Alexandre Julliard 01 Mar '18

01 Mar '18

Module: wine Branch: master Commit: a44794af67ace4bca152480bb2be3d141c36b39c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a44794af67ace4bca152480b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 1 15:30:57 2018 +0100 msvcrt: Fix misleading indentation in gets. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 6d0c1ae..7022e48 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -4714,9 +4714,11 @@ char * CDECL MSVCRT_gets(char *buf) MSVCRT__lock_file(MSVCRT_stdin); for(cc = MSVCRT__fgetc_nolock(MSVCRT_stdin); cc != MSVCRT_EOF && cc != '\n'; - cc = MSVCRT__fgetc_nolock(MSVCRT_stdin)) - if(cc != '\r') *buf++ = (char)cc; - + cc = MSVCRT__fgetc_nolock(MSVCRT_stdin)) + { + if(cc != '\r') + *buf++ = (char)cc; + } *buf = '\0'; TRACE("got '%s'\n", buf_start);

1 0

Roderick Colenbrander : winevulkan/winex11: Implement vkCreateInstance.
by Alexandre Julliard 01 Mar '18

01 Mar '18

Module: wine Branch: master Commit: 75b68a8585f3f3de23d56d35b9e0b08d952014d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=75b68a8585f3f3de23d56d35… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Mar 1 16:37:03 2018 +0100 winevulkan/winex11: Implement vkCreateInstance. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 74 ++++++++++++++++++++++++++++++++++++++++ configure.ac | 9 +++++ dlls/winevulkan/vulkan.c | 49 ++++++++++++++++++++++++-- dlls/winevulkan/vulkan_private.h | 45 ++++++++++++++++++++++++ dlls/winex11.drv/vulkan.c | 67 +++++++++++++++++++++++++++++++++--- include/config.h.in | 3 ++ 6 files changed, 240 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=75b68a8585f3f3de23d5…

1 0

Roderick Colenbrander : winevulkan: Add instance funcs stubs.
by Alexandre Julliard 01 Mar '18

01 Mar '18

Module: wine Branch: master Commit: 586a18995ff114e2f7a5c19205e46b0174dfb680 URL: https://source.winehq.org/git/wine.git/?a=commit;h=586a18995ff114e2f7a5c192… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Mar 1 16:37:04 2018 +0100 winevulkan: Add instance funcs stubs. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/Makefile.in | 3 +- dlls/winevulkan/make_vulkan | 194 ++++++++++++++++++++++++++++++++++++++- dlls/winevulkan/vulkan.c | 13 +-- dlls/winevulkan/vulkan_private.h | 12 +++ dlls/winevulkan/vulkan_thunks.c | 106 +++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.h | 9 ++ 6 files changed, 322 insertions(+), 15 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=586a18995ff114e2f7a5…

1 0

Roderick Colenbrander : winevulkan: Implement vkDestroyInstance.
by Alexandre Julliard 01 Mar '18

01 Mar '18

Module: wine Branch: master Commit: 539a757728bb5a2294c3f9abfc97bfdc6ef8b0aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=539a757728bb5a2294c3f9ab… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Mar 1 16:37:05 2018 +0100 winevulkan: Implement vkDestroyInstance. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 17 ++++++++++++++++- dlls/winevulkan/vulkan.c | 10 ++++++++++ dlls/winevulkan/vulkan_thunks.c | 5 ----- dlls/winevulkan/vulkan_thunks.h | 3 +++ 4 files changed, 29 insertions(+), 6 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index c22619a..6c6cf2e 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -89,7 +89,7 @@ FUNCTION_OVERRIDES = { "vkGetInstanceProcAddr": {"dispatch" : False, "driver" : True, "thunk" : False}, # Instance functions - "vkDestroyInstance" : {"dispatch" : True, "driver" : True, "thunk" : True }, + "vkDestroyInstance" : {"dispatch" : True, "driver" : True, "thunk" : False }, } @@ -1032,6 +1032,21 @@ class VkGenerator(object): f.write("/* For use by vk_icdGetInstanceProcAddr / vkGetInstanceProcAddr */\n") f.write("void *wine_vk_get_instance_proc_addr(const char *name) DECLSPEC_HIDDEN;\n\n") + # Generate prototypes for device and instance functions requiring a custom implementation. + f.write("/* Functions for which we have custom implementations outside of the thunks. */\n") + for vk_func in self.registry.funcs.values(): + if not vk_func.is_required(): + continue + + if vk_func.is_global_func(): + continue + + if vk_func.needs_thunk(): + continue + + f.write("{0};\n".format(vk_func.prototype("WINAPI", prefix="wine_", postfix="DECLSPEC_HIDDEN"))) + f.write("\n") + f.write("#endif /* __WINE_VULKAN_THUNKS_H */\n") def generate_vulkan_h(self, f): diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 9d2cdd2..85836bd 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -108,6 +108,16 @@ err: return res; } +void WINAPI wine_vkDestroyInstance(VkInstance instance, const VkAllocationCallbacks *allocator) +{ + TRACE("%p, %p\n", instance, allocator); + + if (allocator) + FIXME("Support allocation allocators\n"); + + wine_vk_instance_free(instance); +} + static VkResult WINAPI wine_vkEnumerateInstanceExtensionProperties(const char *layer_name, uint32_t *count, VkExtensionProperties *properties) { diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 57d4f35..c1c0b07 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -16,11 +16,6 @@ static VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice physicalDevice, cons return VK_ERROR_OUT_OF_HOST_MEMORY; } -static void WINAPI wine_vkDestroyInstance(VkInstance instance, const VkAllocationCallbacks *pAllocator) -{ - FIXME("stub: %p, %p\n", instance, pAllocator); -} - static VkResult WINAPI wine_vkEnumerateDeviceExtensionProperties(VkPhysicalDevice physicalDevice, const char *pLayerName, uint32_t *pPropertyCount, VkExtensionProperties *pProperties) { FIXME("stub: %p, %p, %p, %p\n", physicalDevice, pLayerName, pPropertyCount, pProperties); diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index dbfd83c..969bf12 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -6,4 +6,7 @@ /* For use by vk_icdGetInstanceProcAddr / vkGetInstanceProcAddr */ void *wine_vk_get_instance_proc_addr(const char *name) DECLSPEC_HIDDEN; +/* Functions for which we have custom implementations outside of the thunks. */ +void WINAPI wine_vkDestroyInstance(VkInstance instance, const VkAllocationCallbacks *pAllocator) DECLSPEC_HIDDEN; + #endif /* __WINE_VULKAN_THUNKS_H */

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

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

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

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

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