January 2013 - Wine-Commits

Alex Henrie : advapi32: Destination length -1 means no limit.
by Alexandre Julliard Jan. 31, 2013

Jan. 31, 2013

Module: wine Branch: master Commit: 142afabb4113e4fb904117230ed4306aa5a2109e URL: http://source.winehq.org/git/wine.git/?a=commit;h=142afabb4113e4fb904117230… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jan 30 22:31:16 2013 -0700 advapi32: Destination length -1 means no limit. --- dlls/advapi32/crypt.c | 32 +++++++++++++++++++------------- dlls/advapi32/tests/crypt.c | 11 ++++++++++- 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 5f44728..3eb4213 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -27,6 +27,7 @@ #include "config.h" #include "wine/port.h" +#include <limits.h> #include <time.h> #include <stdlib.h> #include <stdio.h> @@ -109,33 +110,38 @@ static inline PWSTR CRYPT_GetTypeKeyName(DWORD dwType, BOOL user) return keyname; } -/* CRYPT_UnicodeTOANSI +/* CRYPT_UnicodeToANSI * wstr - unicode string - * str - pointer to ANSI string - * strsize - size of buffer pointed to by str or -1 if we have to do the allocation + * str - pointer to ANSI string or pointer to null pointer if we have to do the allocation + * strsize - size of buffer pointed to by str * * returns TRUE if unsuccessful, FALSE otherwise. * if wstr is NULL, returns TRUE and sets str to NULL! Value of str should be checked after call */ static inline BOOL CRYPT_UnicodeToANSI(LPCWSTR wstr, LPSTR* str, int strsize) { - int count; - if (!wstr) { *str = NULL; return TRUE; } - count = WideCharToMultiByte(CP_ACP, 0, wstr, -1, NULL, 0, NULL, NULL); - if (strsize == -1) - *str = CRYPT_Alloc(count * sizeof(CHAR)); - else - count = min( count, strsize ); + + if (!*str) + { + strsize = WideCharToMultiByte(CP_ACP, 0, wstr, -1, NULL, 0, NULL, NULL); + *str = CRYPT_Alloc(strsize * sizeof(CHAR)); + } + else if (strsize < 0) + { + strsize = INT_MAX; /* windows will pretend that the buffer is infinitely long */ + } + if (*str) { - WideCharToMultiByte(CP_ACP, 0, wstr, -1, *str, count, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, wstr, -1, *str, strsize, NULL, NULL); return TRUE; } + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } @@ -481,13 +487,13 @@ BOOL WINAPI CryptAcquireContextW (HCRYPTPROV *phProv, LPCWSTR pszContainer, goto error; } pProv->pVTable->dwProvType = dwProvType; - if(!CRYPT_UnicodeToANSI(provname, &provnameA, -1)) + if(!CRYPT_UnicodeToANSI(provname, &provnameA, 0)) { /* CRYPT_UnicodeToANSI calls SetLastError */ goto error; } pProv->pVTable->pszProvName = provnameA; - if(!CRYPT_UnicodeToANSI(pszContainer, &pszContainerA, -1)) + if(!CRYPT_UnicodeToANSI(pszContainer, &pszContainerA, 0)) { /* CRYPT_UnicodeToANSI calls SetLastError */ goto error; diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 4820d27..5f4d4e2 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -561,7 +561,16 @@ static void test_enum_providers(void) if (!(provider = LocalAlloc(LMEM_ZEROINIT, providerLen))) return; - providerLen = 0xdeadbeef; + providerLen = -1; + result = pCryptEnumProvidersA(dwIndex, NULL, 0, &type, provider, &providerLen); + ok(result, "expected TRUE, got %d\n", result); + ok(type==dwType, "expected %d, got %d\n", dwType, type); + if (pszProvName) + ok(!strcmp(pszProvName, provider), "expected %s, got %s\n", pszProvName, provider); + ok(cbName==providerLen, "expected %d, got %d\n", cbName, providerLen); + + providerLen = -1000; + provider[0] = 0; result = pCryptEnumProvidersA(dwIndex, NULL, 0, &type, provider, &providerLen); ok(result, "expected TRUE, got %d\n", result); ok(type==dwType, "expected %d, got %d\n", dwType, type);

1 0

Jeremy Newman : rename .cvsignore, to .gitignore
by Jeremy Newman Jan. 31, 2013

Jan. 31, 2013

Module: website Branch: master Commit: f24c6f1c8b0af80824e284748bd8bfc33b509b16 URL: http://source.winehq.org/git/website.git/?a=commit;h=f24c6f1c8b0af80824e284… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Jan 31 11:17:23 2013 -0600 rename .cvsignore, to .gitignore --- templates/en/{.cvsignore => .gitignore} | 0 templates/he/.cvsignore | 2 -- 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/templates/en/.cvsignore b/templates/en/.gitignore similarity index 100% rename from templates/en/.cvsignore rename to templates/en/.gitignore diff --git a/templates/he/.cvsignore b/templates/he/.cvsignore deleted file mode 100644 index 0ba44f6..0000000 --- a/templates/he/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -docs -winapi_stats.template

1 0

Jeremy Newman : rename zh_CN to zh-cn
by Jeremy Newman Jan. 31, 2013

Jan. 31, 2013

Module: website Branch: master Commit: faa55d7055a855ed701958ba9cf8fdb55d4b68fb URL: http://source.winehq.org/git/website.git/?a=commit;h=faa55d7055a855ed701958… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Jan 31 11:15:28 2013 -0600 rename zh_CN to zh-cn --- images/lang/{zh.png => zh-cn.png} | Bin 494 -> 494 bytes include/data.php | 8 ++++---- templates/{zh_CN => zh-cn}/about.template | 0 templates/{zh_CN => zh-cn}/download.template | 0 templates/{zh_CN => zh-cn}/global/404.template | 0 templates/{zh_CN => zh-cn}/help.template | 0 templates/{zh_CN => zh-cn}/home.template | 0 templates/{zh_CN => zh-cn}/lang.template | 0 templates/{zh_CN => zh-cn}/news.template | 0 templates/{zh_CN => zh-cn}/search.template | 0 10 files changed, 4 insertions(+), 4 deletions(-) diff --git a/images/lang/zh.png b/images/lang/zh-cn.png similarity index 100% rename from images/lang/zh.png rename to images/lang/zh-cn.png diff --git a/include/data.php b/include/data.php index 1422f4f..92cf10d 100644 --- a/include/data.php +++ b/include/data.php @@ -64,10 +64,10 @@ class data 'name' => 'Türkçe', 'change' => 'Lisan Değiştir' ), - 'zh_CN' => array( - 'name' => '简体中文', - 'change' => '选择语言' - ) + 'zh-cn' => array( + 'name' => '简体中文', + 'change' => '选择语言' + ) ); } } diff --git a/templates/zh_CN/about.template b/templates/zh-cn/about.template similarity index 100% rename from templates/zh_CN/about.template rename to templates/zh-cn/about.template diff --git a/templates/zh_CN/download.template b/templates/zh-cn/download.template similarity index 100% rename from templates/zh_CN/download.template rename to templates/zh-cn/download.template diff --git a/templates/zh_CN/global/404.template b/templates/zh-cn/global/404.template similarity index 100% rename from templates/zh_CN/global/404.template rename to templates/zh-cn/global/404.template diff --git a/templates/zh_CN/help.template b/templates/zh-cn/help.template similarity index 100% rename from templates/zh_CN/help.template rename to templates/zh-cn/help.template diff --git a/templates/zh_CN/home.template b/templates/zh-cn/home.template similarity index 100% rename from templates/zh_CN/home.template rename to templates/zh-cn/home.template diff --git a/templates/zh_CN/lang.template b/templates/zh-cn/lang.template similarity index 100% rename from templates/zh_CN/lang.template rename to templates/zh-cn/lang.template diff --git a/templates/zh_CN/news.template b/templates/zh-cn/news.template similarity index 100% rename from templates/zh_CN/news.template rename to templates/zh-cn/news.template diff --git a/templates/zh_CN/search.template b/templates/zh-cn/search.template similarity index 100% rename from templates/zh_CN/search.template rename to templates/zh-cn/search.template

1 0

Jeremy Newman : get_lang(): fix so language variations work, with fallback to parent
by Jeremy Newman Jan. 31, 2013

Jan. 31, 2013

Module: website Branch: master Commit: ea50e81793068139d5026f460cfa390b2c478c64 URL: http://source.winehq.org/git/website.git/?a=commit;h=ea50e81793068139d5026f… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Jan 31 11:14:39 2013 -0600 get_lang(): fix so language variations work, with fallback to parent --- include/html.php | 44 +++++++++++++++++++++++++++++--------------- 1 files changed, 29 insertions(+), 15 deletions(-) diff --git a/include/html.php b/include/html.php index 9b2e83c..be3c02d 100644 --- a/include/html.php +++ b/include/html.php @@ -322,35 +322,49 @@ class html // default from config $lang = $GLOBALS['config']->lang; - // get lang + // load language from URL or cookie if (isset($_COOKIE['lang']) and in_array($_COOKIE['lang'], $GLOBALS['config']->languages)) { - // load language from URL or cookie debug("global", "lang from cookie: {$_COOKIE['lang']}"); $lang = $_COOKIE['lang']; + return $lang; } - else if (isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])) + + // load from web browser environment + if (isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])) { - // load from web browser environment $hal = preg_split("/\;/", $_SERVER["HTTP_ACCEPT_LANGUAGE"]); $avail = preg_split('/\,/', array_shift($hal)); - if (isset($avail[0])) + if (!empty($avail)) { - // if first language is a variation, use the parent language - if (strlen($avail[0]) > 2) - $avail[0] = substr($avail[0], 0, 2); - // check to make sure lang is defined in our config - if (in_array($avail[0], $GLOBALS['config']->languages)) + // loop through languages + $avail = array_map("strtolower", $avail); + foreach ($avail as $inLang) { - debug("global", "lang from browser: {$avail[0]}"); - $lang = $avail[0]; + // check to see if langage is available + if (in_array($inLang, $GLOBALS['config']->languages)) + { + debug("global", "lang from browser: {$inLang}"); + return $inLang; + } + + // check to see if variation of langage is available + if (strlen($inLang) > 2) + { + $inLangAlt = substr($inLang, 0, 2); + if (in_array($inLangAlt, $GLOBALS['config']->languages)) + { + debug("global", "lang from browser: {$inLangAlt}"); + return $inLangAlt; + } + } } } unset($hal, $avail); } - - // return language - debug("global", "lang: {$lang}"); + + // return default language + debug("global", "lang default: {$lang}"); return $lang; }

1 0

Jeremy Newman : adding zh-cn as availale language
by Jeremy Newman Jan. 31, 2013

Jan. 31, 2013

Module: website Branch: master Commit: b72bbd24e07b88892a87599502c33d9dc6655404 URL: http://source.winehq.org/git/website.git/?a=commit;h=b72bbd24e07b88892a8759… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Jan 31 11:14:08 2013 -0600 adding zh-cn as availale language --- include/winehq.conf.sample | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/winehq.conf.sample b/include/winehq.conf.sample index 5a247c1..1eb97fb 100644 --- a/include/winehq.conf.sample +++ b/include/winehq.conf.sample @@ -22,7 +22,7 @@ theme: winehq lang: en # available languages -(a)languages: en, de, es, fr, he, pl, pt, tr +(a)languages: en, de, es, fr, he, pl, pt, tr, zh-cn # default base URLS (if you run the site, in a subdir, set base_root) base_root:

1 0

Jactry Zeng : Added Simplified Chinese translation
by Jeremy Newman Jan. 31, 2013

Jan. 31, 2013

Module: website Branch: master Commit: 5054db446d69730e5290aee265bfd971ccb2f3e6 URL: http://source.winehq.org/git/website.git/?a=commit;h=5054db446d69730e5290ae… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Thu Jan 31 11:34:57 2013 +0800 Added Simplified Chinese translation Hi folks, this is Simplified Chinese translation for Wine's website, it's my first patch, thanks Qian Hong, Aron Xu, Jeremy and Hin-Tak for review. I appreciate for any comment. :-) -- Regards, Jactry Zeng <html> <head> <meta http-equiv="content-type" content="text/html; charset=GB2312"> </head> <body bgcolor="#FFFFFF" text="#000000"> Hi folks, this is Simplified Chinese translation for Wine's website, it's my first patch, thanks Qian Hong, Aron Xu, Jeremy and Hin-Tak for review. <meta charset="utf-8"> I appreciate for any comment. :-) <meta charset="utf-8"> <span style="color: rgb(34, 34, 34); font-family: arial, sans-serif; font-size: 14px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px; background-color: rgb(255, 255, 255); display: inline !important; float: none;">-- Regards, Jactry Zeng <meta charset="utf-8"> </body> </html> >From 55c688c3519eacf0a8506abfe645aa20ac21e11b Mon Sep 17 00:00:00 2001 From: Jactry Zeng <jactry92(a)gmail.com> Date: Thu, 31 Jan 2013 11:00:41 +0800 Subject: add Simplified Chinese translation for Wine's website To: wine-patches <wine-patches(a)winehq.org> Reply-To: wine-devel <wine-devel(a)winehq.org> --- include/data.php | 6 +- templates/zh_CN/about.template | 46 ++++++++ templates/zh_CN/download.template | 199 +++++++++++++++++++++++++++++++++++ templates/zh_CN/global/404.template | 16 +++ templates/zh_CN/help.template | 97 +++++++++++++++++ templates/zh_CN/home.template | 90 ++++++++++++++++ templates/zh_CN/lang.template | 12 ++ templates/zh_CN/news.template | 16 +++ templates/zh_CN/search.template | 26 +++++ 9 files changed, 507 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=5054db446d69730e52…

1 0

Charles Davis : winebuild: Use Clang to assemble if found.
by Alexandre Julliard Jan. 30, 2013

Jan. 30, 2013

Module: wine Branch: master Commit: c14bdaf1ddb7d0e5587f63f1216b61c9ecb7a8c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c14bdaf1ddb7d0e5587f63f12… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Mon Jan 28 13:42:12 2013 -0700 winebuild: Use Clang to assemble if found. --- tools/winebuild/utils.c | 38 ++++++++++++++++++++++++++++++++++---- 1 files changed, 34 insertions(+), 4 deletions(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 559e476..262ff3a 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -288,8 +288,6 @@ char *find_tool( const char *name, const char * const *names ) unsigned int i, len; struct stat st; - if (target_alias) return strmake( "%s-%s", target_alias, name ); - if (!dirs) { char *path; @@ -322,6 +320,8 @@ char *find_tool( const char *name, const char * const *names ) while (*names) { len = strlen(*names) + sizeof(EXEEXT) + 1; + if (target_alias) + len += strlen(target_alias) + 1; file = xmalloc( maxlen + len ); for (i = 0; i < count; i++) @@ -330,6 +330,12 @@ char *find_tool( const char *name, const char * const *names ) p = file + strlen(file); if (p == file) *p++ = '.'; if (p[-1] != '/') *p++ = '/'; + if (target_alias) + { + strcpy( p, target_alias ); + p += strlen(p); + *p++ = '-'; + } strcpy( p, *names ); strcat( p, EXEEXT ); @@ -338,21 +344,38 @@ char *find_tool( const char *name, const char * const *names ) free( file ); names++; } - return xstrdup( name ); + return NULL; } struct strarray *get_as_command(void) { + static int as_is_clang = 0; struct strarray *args = strarray_init(); if (!as_command) { + as_command = find_tool( "clang", NULL ); + if (as_command) as_is_clang = 1; + } + + if (!as_command) + { static const char * const commands[] = { "gas", "as", NULL }; as_command = find_tool( "as", commands ); } + + if (!as_command) + fatal_error( "cannot find suitable assembler\n" ); + strarray_add_one( args, as_command ); - if (force_pointer_size) + if (as_is_clang) + { + strarray_add( args, "-xassembler", "-c", NULL ); + if (force_pointer_size) + strarray_add_one( args, (force_pointer_size == 8) ? "-m64" : "-m32" ); + } + else if (force_pointer_size) { switch (target_platform) { @@ -386,6 +409,10 @@ struct strarray *get_ld_command(void) static const char * const commands[] = { "ld", "gld", NULL }; ld_command = find_tool( "ld", commands ); } + + if (!ld_command) + fatal_error( "cannot find suitable linker\n" ); + strarray_add_one( args, ld_command ); if (force_pointer_size) @@ -421,6 +448,9 @@ const char *get_nm_command(void) static const char * const commands[] = { "nm", "gnm", NULL }; nm_command = find_tool( "nm", commands ); } + + if (!nm_command) + fatal_error( "cannot find suitable name lister\n" ); return nm_command; }

1 0

Sergey Guralnik : winemenubuilder: Try to wait for creating icon files.
by Alexandre Julliard Jan. 30, 2013

Jan. 30, 2013

Module: wine Branch: master Commit: 79808429c16c9bec8026cbd57158dcff26691334 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79808429c16c9bec8026cbd57… Author: Sergey Guralnik <serhio(a)etersoft.ru> Date: Wed Jan 23 15:07:44 2013 +0200 winemenubuilder: Try to wait for creating icon files. --- programs/winemenubuilder/winemenubuilder.c | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 5a5789f..c931363 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1055,10 +1055,19 @@ static HRESULT open_icon(LPCWSTR filename, int index, BOOL bWait, IStream **ppSt hr = open_module_icon(filename, index, ppStream); if (FAILED(hr)) { - static const WCHAR dot_icoW[] = {'.','i','c','o',0}; - int len = strlenW(filename); - if (len >= 4 && strcmpiW(&filename[len - 4], dot_icoW) == 0) - hr = SHCreateStreamOnFileW(filename, STGM_READ, ppStream); + if(bWait && hr == HRESULT_FROM_WIN32(ERROR_MOD_NOT_FOUND)) + { + WINE_WARN("Can't find file: %s, give a chance to parent process to create it\n", + wine_dbgstr_w(filename)); + return hr; + } + else + { + static const WCHAR dot_icoW[] = {'.','i','c','o',0}; + int len = strlenW(filename); + if (len >= 4 && strcmpiW(&filename[len - 4], dot_icoW) == 0) + hr = SHCreateStreamOnFileW(filename, STGM_READ, ppStream); + } } if (FAILED(hr)) hr = open_file_type_icon(filename, ppStream);

1 0

Hans Leidekker : msi: Set _BrowseProperty to INSTALLDIR.
by Alexandre Julliard Jan. 30, 2013

Jan. 30, 2013

Module: wine Branch: master Commit: 166a7e993cb0033fac7ec2712c346558fb7bd100 URL: http://source.winehq.org/git/wine.git/?a=commit;h=166a7e993cb0033fac7ec2712… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 30 16:28:17 2013 +0100 msi: Set _BrowseProperty to INSTALLDIR. --- dlls/msi/package.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index f8f818d..db0ec25 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -749,6 +749,8 @@ static VOID set_installer_properties(MSIPACKAGE *package) static const WCHAR szPrintHoodFolder[] = {'P','r','i','n','t','H','o','o','d','F','o','l','d','e','r',0}; static const WCHAR szRecentFolder[] = {'R','e','c','e','n','t','F','o','l','d','e','r',0}; static const WCHAR szComputerName[] = {'C','o','m','p','u','t','e','r','N','a','m','e',0}; + static const WCHAR szBrowseProperty[] = {'_','B','r','o','w','s','e','P','r','o','p','e','r','t','y',0}; + static const WCHAR szInstallDir[] = {'I','N','S','T','A','L','L','D','I','R',0}; /* * Other things that probably should be set: @@ -1020,6 +1022,7 @@ static VOID set_installer_properties(MSIPACKAGE *package) msi_free( computername ); } } + msi_set_property( package->db, szBrowseProperty, szInstallDir, -1 ); } static UINT msi_load_summary_properties( MSIPACKAGE *package )

1 0

Hans Leidekker : wbemprox: Build a PNP device ID that better matches the graphics card.
by Alexandre Julliard Jan. 30, 2013

Jan. 30, 2013

Module: wine Branch: master Commit: 71f0dd6044d6d01f5d274e7fadc425116fe73722 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71f0dd6044d6d01f5d274e7fa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 30 16:27:22 2013 +0100 wbemprox: Build a PNP device ID that better matches the graphics card. --- dlls/wbemprox/builtin.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 699d051..d97ca67 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -343,7 +343,7 @@ static const struct column col_videocontroller[] = { prop_descriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_deviceidW, CIM_STRING|COL_FLAG_KEY }, { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_pnpdeviceidW, CIM_STRING } + { prop_pnpdeviceidW, CIM_STRING|COL_FLAG_DYNAMIC } }; static const WCHAR baseboard_manufacturerW[] = @@ -395,10 +395,6 @@ static const WCHAR sounddevice_productnameW[] = {'W','i','n','e',' ','A','u','d','i','o',' ','D','e','v','i','c','e',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_pnpdeviceidW[] = - {'P','C','I','\\','V','E','N','_','1','0','0','2','&','D','E','V','_','6','7','1','8','&', - 'S','U','B','S','Y','S','_','2','2','0','1','1','4','5','8','&','R','E','V','_','0','0','\\', - '4','&','3','8','A','C','1','8','A','C','&','0','&','0','0','0','9',0}; #include "pshpack1.h" struct record_baseboard @@ -1206,6 +1202,19 @@ static UINT32 get_bits_per_pixel( UINT *hres, UINT *vres ) return ret; } +static WCHAR *get_pnpdeviceid( DXGI_ADAPTER_DESC *desc ) +{ + static const WCHAR fmtW[] = + {'P','C','I','\\','V','E','N','_','%','0','4','X','&','D','E','V','_','%','0','4','X', + '&','S','U','B','S','Y','S','_','%','0','8','X','&','R','E','V','_','%','0','2','X','\\', + '0','&','D','E','A','D','B','E','E','F','&','0','&','D','E','A','D',0}; + WCHAR *ret; + + if (!(ret = heap_alloc( sizeof(fmtW) + 2 * sizeof(WCHAR) ))) return NULL; + sprintfW( ret, fmtW, desc->VendorId, desc->DeviceId, desc->SubSysId, desc->Revision ); + return ret; +} + static void fill_videocontroller( struct table *table ) { @@ -1241,7 +1250,7 @@ done: rec->description = heap_strdupW( name ); rec->device_id = videocontroller_deviceidW; rec->name = heap_strdupW( name ); - rec->pnpdevice_id = videocontroller_pnpdeviceidW; + rec->pnpdevice_id = get_pnpdeviceid( &desc ); TRACE("created 1 row\n"); table->num_rows = 1;

1 0