October 2018 - Wine-Commits

Alexandre Julliard : kernel32: Make a copy of the process environment in CreateProcessW().
by Alexandre Julliard Oct. 8, 2018

Oct. 8, 2018

Module: wine Branch: master Commit: 2475cb767d5878b70f0ea4519d3918cc18483968 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2475cb767d5878b70f0ea451… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 8 16:27:42 2018 +0200 kernel32: Make a copy of the process environment in CreateProcessW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index f7808af..18c0f08 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2626,7 +2626,19 @@ static BOOL create_process_impl( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_A if (GetCurrentDirectoryW(MAX_PATH, buf)) unixdir = wine_get_unix_file_name( buf ); } - if (env && !(flags & CREATE_UNICODE_ENVIRONMENT)) /* convert environment to unicode */ + if (!env) + { + WCHAR *e; + + RtlAcquirePebLock(); + e = env = NtCurrentTeb()->Peb->ProcessParameters->Environment; + while (*e) e += strlenW(e) + 1; + e++; /* final null */ + envW = HeapAlloc( GetProcessHeap(), 0, (e - (WCHAR *)env) * sizeof(WCHAR) ); + memcpy( envW, env, (e - (WCHAR *)env) * sizeof(WCHAR) ); + RtlReleasePebLock(); + } + else if (!(flags & CREATE_UNICODE_ENVIRONMENT)) /* convert environment to unicode */ { char *e = env; DWORD lenW; @@ -2636,8 +2648,8 @@ static BOOL create_process_impl( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_A lenW = MultiByteToWideChar( CP_ACP, 0, env, e - (char*)env, NULL, 0 ); envW = HeapAlloc( GetProcessHeap(), 0, lenW * sizeof(WCHAR) ); MultiByteToWideChar( CP_ACP, 0, env, e - (char*)env, envW, lenW ); - flags |= CREATE_UNICODE_ENVIRONMENT; } + flags |= CREATE_UNICODE_ENVIRONMENT; info->hThread = info->hProcess = 0; info->dwProcessId = info->dwThreadId = 0;

1 0

Hans Leidekker : wmic: Output Unicode text with BOM when redirected.
by Alexandre Julliard Oct. 8, 2018

Oct. 8, 2018

Module: wine Branch: master Commit: a7f0dc07b2378d707845f416e08bdf1173dcdf2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7f0dc07b2378d707845f416… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 8 15:53:10 2018 +0200 wmic: Output Unicode text with BOM when redirected. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wmic/main.c | 57 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 24 deletions(-) diff --git a/programs/wmic/main.c b/programs/wmic/main.c index b2ec7e2..f01aad7 100644 --- a/programs/wmic/main.c +++ b/programs/wmic/main.c @@ -124,32 +124,17 @@ static WCHAR *find_prop( IWbemClassObject *class, const WCHAR *prop ) static int output_string( HANDLE handle, const WCHAR *msg, ... ) { va_list va_args; - int wlen; - DWORD count, ret; + int len; + DWORD count; WCHAR buffer[8192]; va_start( va_args, msg ); - vsprintfW( buffer, msg, va_args ); + len = vsnprintfW( buffer, ARRAY_SIZE(buffer), msg, va_args ); va_end( va_args ); - wlen = strlenW( buffer ); - ret = WriteConsoleW( handle, buffer, wlen, &count, NULL ); - if (!ret) - { - DWORD len; - char *msgA; - - /* On Windows WriteConsoleW() fails if the output is redirected. So fall - * back to WriteFile(), assuming the console encoding is still the right - * one in that case. - */ - len = WideCharToMultiByte( GetConsoleOutputCP(), 0, buffer, wlen, NULL, 0, NULL, NULL ); - if (!(msgA = HeapAlloc( GetProcessHeap(), 0, len * sizeof(char) ))) return 0; - - WideCharToMultiByte( GetConsoleOutputCP(), 0, buffer, wlen, msgA, len, NULL, NULL ); - WriteFile( handle, msgA, len, &count, FALSE ); - HeapFree( GetProcessHeap(), 0, msgA ); - } + if (!WriteConsoleW( handle, buffer, len, &count, NULL )) + WriteFile( handle, buffer, len * sizeof(WCHAR), &count, FALSE ); + return count; } @@ -162,13 +147,37 @@ static int output_error( int msg ) return output_string( GetStdHandle(STD_ERROR_HANDLE), fmtW, buffer ); } +static int output_header( const WCHAR *prop ) +{ + static const WCHAR bomW[] = {0xfeff}, fmtW[] = {'%','s','\r','\n',0}; + int len; + DWORD count; + WCHAR buffer[8192]; + + len = snprintfW( buffer, ARRAY_SIZE(buffer), fmtW, prop ); + + if (!WriteConsoleW( GetStdHandle(STD_OUTPUT_HANDLE), buffer, len, &count, NULL )) /* redirected */ + { + WriteFile( GetStdHandle(STD_OUTPUT_HANDLE), bomW, sizeof(bomW), &count, FALSE ); + WriteFile( GetStdHandle(STD_OUTPUT_HANDLE), buffer, len * sizeof(WCHAR), &count, FALSE ); + count += sizeof(bomW); + } + + return count; +} + +static int output_line( const WCHAR *str ) +{ + static const WCHAR fmtW[] = {'%','s','\r','\n',0}; + return output_string( GetStdHandle(STD_OUTPUT_HANDLE), fmtW, str ); +} + static int query_prop( const WCHAR *class, const WCHAR *propname ) { static const WCHAR select_allW[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ',0}; static const WCHAR cimv2W[] = {'R','O','O','T','\\','C','I','M','V','2',0}; static const WCHAR wqlW[] = {'W','Q','L',0}; static const WCHAR newlineW[] = {'\r','\n',0}; - static const WCHAR fmtW[] = {'%','s','\r','\n',0}; HRESULT hr; IWbemLocator *locator = NULL; IWbemServices *services = NULL; @@ -218,13 +227,13 @@ static int query_prop( const WCHAR *class, const WCHAR *propname ) output_error( STRING_INVALID_QUERY ); goto done; } - output_string( GetStdHandle(STD_OUTPUT_HANDLE), fmtW, prop ); + output_header( prop ); first = FALSE; } if (IWbemClassObject_Get( obj, prop, 0, &v, NULL, NULL ) == WBEM_S_NO_ERROR) { VariantChangeType( &v, &v, 0, VT_BSTR ); - output_string( GetStdHandle(STD_OUTPUT_HANDLE), fmtW, V_BSTR( &v ) ); + output_line( V_BSTR( &v ) ); VariantClear( &v ); } IWbemClassObject_Release( obj );

1 0

Hans Leidekker : wmic: Write errors to stderr.
by Alexandre Julliard Oct. 8, 2018

Oct. 8, 2018

Module: wine Branch: master Commit: 72ba957778164d9afc806ded62b5ac08bd75895f URL: https://source.winehq.org/git/wine.git/?a=commit;h=72ba957778164d9afc806ded… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 8 15:53:08 2018 +0200 wmic: Write errors to stderr. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wmic/main.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/programs/wmic/main.c b/programs/wmic/main.c index f4a5bc7..2cb618d 100644 --- a/programs/wmic/main.c +++ b/programs/wmic/main.c @@ -121,7 +121,7 @@ static WCHAR *find_prop( IWbemClassObject *class, const WCHAR *prop ) return ret; } -static int output_string( const WCHAR *msg, ... ) +static int output_string( HANDLE handle, const WCHAR *msg, ... ) { va_list va_args; int wlen; @@ -133,7 +133,7 @@ static int output_string( const WCHAR *msg, ... ) va_end( va_args ); wlen = strlenW( buffer ); - ret = WriteConsoleW( GetStdHandle(STD_OUTPUT_HANDLE), buffer, wlen, &count, NULL ); + ret = WriteConsoleW( handle, buffer, wlen, &count, NULL ); if (!ret) { DWORD len; @@ -147,19 +147,19 @@ static int output_string( const WCHAR *msg, ... ) if (!(msgA = HeapAlloc( GetProcessHeap(), 0, len * sizeof(char) ))) return 0; WideCharToMultiByte( GetConsoleOutputCP(), 0, buffer, wlen, msgA, len, NULL, NULL ); - WriteFile( GetStdHandle(STD_OUTPUT_HANDLE), msgA, len, &count, FALSE ); + WriteFile( handle, msgA, len, &count, FALSE ); HeapFree( GetProcessHeap(), 0, msgA ); } return count; } -static int output_message( int msg ) +static int output_error( int msg ) { static const WCHAR fmtW[] = {'%','s',0}; WCHAR buffer[8192]; LoadStringW( GetModuleHandleW(NULL), msg, buffer, ARRAY_SIZE(buffer)); - return output_string( fmtW, buffer ); + return output_string( GetStdHandle(STD_ERROR_HANDLE), fmtW, buffer ); } static int query_prop( const WCHAR *class, const WCHAR *propname ) @@ -215,21 +215,21 @@ static int query_prop( const WCHAR *class, const WCHAR *propname ) { if (!(prop = find_prop( obj, propname ))) { - output_message( STRING_INVALID_QUERY ); + output_error( STRING_INVALID_QUERY ); goto done; } - output_string( fmtW, prop ); + output_string( GetStdHandle(STD_OUTPUT_HANDLE), fmtW, prop ); first = FALSE; } if (IWbemClassObject_Get( obj, prop, 0, &v, NULL, NULL ) == WBEM_S_NO_ERROR) { VariantChangeType( &v, &v, 0, VT_BSTR ); - output_string( fmtW, V_BSTR( &v ) ); + output_string( GetStdHandle(STD_OUTPUT_HANDLE), fmtW, V_BSTR( &v ) ); VariantClear( &v ); } IWbemClassObject_Release( obj ); } - output_string( newlineW ); + output_string( GetStdHandle(STD_OUTPUT_HANDLE), newlineW ); ret = 0; done: @@ -278,7 +278,7 @@ int wmain(int argc, WCHAR *argv[]) { if (++i >= argc) { - output_message( STRING_INVALID_PATH ); + output_error( STRING_INVALID_PATH ); return 1; } class = argv[i]; @@ -288,7 +288,7 @@ int wmain(int argc, WCHAR *argv[]) class = find_class( argv[i] ); if (!class) { - output_message( STRING_ALIAS_NOT_FOUND ); + output_error( STRING_ALIAS_NOT_FOUND ); return 1; } } @@ -305,6 +305,6 @@ int wmain(int argc, WCHAR *argv[]) } not_supported: - output_message( STRING_CMDLINE_NOT_SUPPORTED ); + output_error( STRING_CMDLINE_NOT_SUPPORTED ); return 1; }

1 0

Huw Davies : winedbg: Ignore ^C events in the parent 32-bit process.
by Alexandre Julliard Oct. 8, 2018

Oct. 8, 2018

Module: wine Branch: master Commit: 8908bdbb737a76a99fb194d5a465063fa35c2f08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8908bdbb737a76a99fb194d5… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 8 13:57:52 2018 +0100 winedbg: Ignore ^C events in the parent 32-bit process. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/winedbg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 0e45186..8634c0f 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -652,6 +652,7 @@ static void restart_if_wow64(void) if (CreateProcessW( filename, GetCommandLineW(), NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi )) { WINE_TRACE( "restarting %s\n", wine_dbgstr_w(filename) ); + SetConsoleCtrlHandler( NULL, TRUE ); /* Ignore ^C */ WaitForSingleObject( pi.hProcess, INFINITE ); GetExitCodeProcess( pi.hProcess, &exit_code ); ExitProcess( exit_code );

1 0

Henri Verbeet : d3d11/tests: Add depth bias clamp tests.
by Alexandre Julliard Oct. 8, 2018

Oct. 8, 2018

Module: wine Branch: master Commit: 4c940b0d3e89a411a2d8247c54bab4779f4e8c2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c940b0d3e89a411a2d8247c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 8 22:13:41 2018 +0330 d3d11/tests: Add depth bias clamp tests. This is pretty much a copy of the d3d10core tests by Zebediah. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 203 ++++++++++++++++++++++++++--------------------- 1 file changed, 114 insertions(+), 89 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4c940b0d3e89a411a2d8…

1 0

Zebediah Figura : d3d10core/tests: Add depth bias clamp tests.
by Alexandre Julliard Oct. 8, 2018

Oct. 8, 2018

Module: wine Branch: master Commit: 2f2f0de550829d045a38449e979a47f1d900c25f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f2f0de550829d045a38449e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Oct 8 22:13:40 2018 +0330 d3d10core/tests: Add depth bias clamp tests. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 198 ++++++++++++++++++++++----------------- 1 file changed, 111 insertions(+), 87 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2f2f0de550829d045a38…

1 0

Hans Leidekker : wmic: Don't write an extra newline at the end.
by Alexandre Julliard Oct. 8, 2018

Oct. 8, 2018

Module: wine Branch: master Commit: 462897797992ca58a06531f760a209f1658b8eea URL: https://source.winehq.org/git/wine.git/?a=commit;h=462897797992ca58a06531f7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 8 15:53:11 2018 +0200 wmic: Don't write an extra newline at the end. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wmic/main.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/programs/wmic/main.c b/programs/wmic/main.c index f01aad7..85b76de 100644 --- a/programs/wmic/main.c +++ b/programs/wmic/main.c @@ -177,7 +177,6 @@ static int query_prop( const WCHAR *class, const WCHAR *propname ) static const WCHAR select_allW[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ',0}; static const WCHAR cimv2W[] = {'R','O','O','T','\\','C','I','M','V','2',0}; static const WCHAR wqlW[] = {'W','Q','L',0}; - static const WCHAR newlineW[] = {'\r','\n',0}; HRESULT hr; IWbemLocator *locator = NULL; IWbemServices *services = NULL; @@ -238,7 +237,6 @@ static int query_prop( const WCHAR *class, const WCHAR *propname ) } IWbemClassObject_Release( obj ); } - output_string( GetStdHandle(STD_OUTPUT_HANDLE), newlineW ); ret = 0; done:

1 0

Hans Leidekker : wmic: Pad output with spaces.
by Alexandre Julliard Oct. 8, 2018

Oct. 8, 2018

Module: wine Branch: master Commit: c0f00105b5c148cba07d6f00e557a08cabbf82e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0f00105b5c148cba07d6f00… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 8 15:53:12 2018 +0200 wmic: Pad output with spaces. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wmic/main.c | 49 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 17 deletions(-) diff --git a/programs/wmic/main.c b/programs/wmic/main.c index 85b76de..5d50045 100644 --- a/programs/wmic/main.c +++ b/programs/wmic/main.c @@ -147,14 +147,14 @@ static int output_error( int msg ) return output_string( GetStdHandle(STD_ERROR_HANDLE), fmtW, buffer ); } -static int output_header( const WCHAR *prop ) +static int output_header( const WCHAR *prop, ULONG column_width ) { - static const WCHAR bomW[] = {0xfeff}, fmtW[] = {'%','s','\r','\n',0}; + static const WCHAR bomW[] = {0xfeff}, fmtW[] = {'%','-','*','s','\r','\n',0}; int len; DWORD count; WCHAR buffer[8192]; - len = snprintfW( buffer, ARRAY_SIZE(buffer), fmtW, prop ); + len = snprintfW( buffer, ARRAY_SIZE(buffer), fmtW, column_width, prop ); if (!WriteConsoleW( GetStdHandle(STD_OUTPUT_HANDLE), buffer, len, &count, NULL )) /* redirected */ { @@ -166,10 +166,10 @@ static int output_header( const WCHAR *prop ) return count; } -static int output_line( const WCHAR *str ) +static int output_line( const WCHAR *str, ULONG column_width ) { - static const WCHAR fmtW[] = {'%','s','\r','\n',0}; - return output_string( GetStdHandle(STD_OUTPUT_HANDLE), fmtW, str ); + static const WCHAR fmtW[] = {'%','-','*','s','\r','\n',0}; + return output_string( GetStdHandle(STD_OUTPUT_HANDLE), fmtW, column_width, str ); } static int query_prop( const WCHAR *class, const WCHAR *propname ) @@ -186,6 +186,9 @@ static int query_prop( const WCHAR *class, const WCHAR *propname ) WCHAR *prop = NULL; BOOL first = TRUE; int len, ret = -1; + IWbemClassObject *obj; + ULONG count, width = 0; + VARIANT v; WINE_TRACE("%s, %s\n", debugstr_w(class), debugstr_w(propname)); @@ -210,29 +213,41 @@ static int query_prop( const WCHAR *class, const WCHAR *propname ) hr = IWbemServices_ExecQuery( services, wql, query, flags, NULL, &result ); if (hr != S_OK) goto done; - for (;;) + for (;;) /* get column width */ { - IWbemClassObject *obj; - ULONG count; - VARIANT v; + IEnumWbemClassObject_Next( result, WBEM_INFINITE, 1, &obj, &count ); + if (!count) break; + if (!prop && !(prop = find_prop( obj, propname ))) + { + output_error( STRING_INVALID_QUERY ); + goto done; + } + if (IWbemClassObject_Get( obj, prop, 0, &v, NULL, NULL ) == WBEM_S_NO_ERROR) + { + VariantChangeType( &v, &v, 0, VT_BSTR ); + width = max( strlenW( V_BSTR( &v ) ), width ); + VariantClear( &v ); + } + IWbemClassObject_Release( obj ); + } + width += 2; + + IEnumWbemClassObject_Reset( result ); + for (;;) + { IEnumWbemClassObject_Next( result, WBEM_INFINITE, 1, &obj, &count ); if (!count) break; if (first) { - if (!(prop = find_prop( obj, propname ))) - { - output_error( STRING_INVALID_QUERY ); - goto done; - } - output_header( prop ); + output_header( prop, width ); first = FALSE; } if (IWbemClassObject_Get( obj, prop, 0, &v, NULL, NULL ) == WBEM_S_NO_ERROR) { VariantChangeType( &v, &v, 0, VT_BSTR ); - output_line( V_BSTR( &v ) ); + output_line( V_BSTR( &v ), width ); VariantClear( &v ); } IWbemClassObject_Release( obj );

1 0

Dmitry Timoshkov : crypt32: Implement CryptUnregisterOIDInfo.
by Alexandre Julliard Oct. 8, 2018

Oct. 8, 2018

Module: wine Branch: master Commit: 0b89c5a264186c6893d4f24bdd017d5f71f668f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b89c5a264186c6893d4f24b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Oct 5 16:40:47 2018 +0800 crypt32: Implement CryptUnregisterOIDInfo. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/crypt32.spec | 2 +- dlls/crypt32/oid.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 0bc78a1..64d5aa9 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -194,7 +194,7 @@ @ stdcall CryptUnprotectMemory(ptr long long) @ stdcall CryptUnregisterDefaultOIDFunction(long str wstr) @ stdcall CryptUnregisterOIDFunction(long str str) -@ stub CryptUnregisterOIDInfo +@ stdcall CryptUnregisterOIDInfo(ptr) @ stdcall CryptVerifyCertificateSignature(long long ptr long ptr) @ stdcall CryptVerifyCertificateSignatureEx(long long long ptr long ptr long ptr) @ stdcall CryptVerifyDetachedMessageHash(ptr ptr long long ptr ptr ptr ptr) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index c9b0b41..e9ccab7 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -1,6 +1,7 @@ /* * Copyright 2002 Mike McCormack for CodeWeavers * Copyright 2005-2006 Juan Lang + * Copyright 2018 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -653,6 +654,48 @@ error_close_key: } /*********************************************************************** + * CryptUnregisterOIDInfo (CRYPT32.@) + */ +BOOL WINAPI CryptUnregisterOIDInfo(PCCRYPT_OID_INFO info) +{ + char *key_name; + HKEY root; + DWORD err; + + TRACE("(%p)\n", info); + + if (!info || info->cbSize != sizeof(*info) || !info->pszOID) + { + SetLastError(E_INVALIDARG); + return FALSE; + } + + err = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Cryptography\\OID\\EncodingType 0\\CryptDllFindOIDInfo", 0, KEY_ALL_ACCESS, &root); + if (err != ERROR_SUCCESS) + { + SetLastError(err); + return FALSE; + } + + key_name = CryptMemAlloc(strlen(info->pszOID) + 16); + if (key_name) + { + sprintf(key_name, "%s!%u", info->pszOID, info->dwGroupId); + err = RegDeleteKeyA(root, key_name); + } + else + err = ERROR_OUTOFMEMORY; + + CryptMemFree(key_name); + RegCloseKey(root); + + if (err) + SetLastError(err); + + return !err; +} + +/*********************************************************************** * CryptRegisterOIDInfo (CRYPT32.@) */ BOOL WINAPI CryptRegisterOIDInfo(PCCRYPT_OID_INFO pInfo, DWORD dwFlags)

1 0

Henri Verbeet : wined3d: Add GPU information for NVIDIA GeForce GT 720.
by Alexandre Julliard Oct. 8, 2018

Oct. 8, 2018

Module: wine Branch: master Commit: 55d4f63164fc1c8c4b2b5170620ded566b69acb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55d4f63164fc1c8c4b2b5170… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 8 22:13:38 2018 +0330 wined3d: Add GPU information for NVIDIA GeForce GT 720. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 3 insertions(+) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 6941459..b62c86a 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1714,6 +1714,7 @@ cards_nvidia_mesa[] = {"NV117", CARD_NVIDIA_GEFORCE_GTX750}, /* Kepler */ {"NV108", CARD_NVIDIA_GEFORCE_GT740M}, + {"NV106", CARD_NVIDIA_GEFORCE_GT720}, {"NVF1", CARD_NVIDIA_GEFORCE_GTX780TI}, {"NVF0", CARD_NVIDIA_GEFORCE_GTX780}, {"NVE6", CARD_NVIDIA_GEFORCE_GTX770M}, diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index fb67fe4..f4aabb5 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -283,6 +283,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX675MX, "NVIDIA GeForce GTX 675MX", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX680, "NVIDIA GeForce GTX 680", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX690, "NVIDIA GeForce GTX 690", DRIVER_NVIDIA_GEFORCE8, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT720, "NVIDIA GeForce GT 720", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT730, "NVIDIA GeForce GT 730", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT730M, "NVIDIA GeForce GT 730M", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT740M, "NVIDIA GeForce GT 740M", DRIVER_NVIDIA_GEFORCE8, 2048}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ccb7130..20e626c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2386,6 +2386,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX675MX = 0x11a7, CARD_NVIDIA_GEFORCE_GTX680 = 0x1180, CARD_NVIDIA_GEFORCE_GTX690 = 0x1188, + CARD_NVIDIA_GEFORCE_GT720 = 0x128b, CARD_NVIDIA_GEFORCE_GT730 = 0x1287, CARD_NVIDIA_GEFORCE_GT730M = 0x0fe1, CARD_NVIDIA_GEFORCE_GT740M = 0x1292,

1 0