July 2020 - Wine-Commits - list.winehq.org

Piotr Caban : msvcrt: Don't use isdigitW.
by Alexandre Julliard July 15, 2020

July 15, 2020

Module: wine Branch: master Commit: b2e235a8e8777d1530862b6d293ed9075a92405a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2e235a8e8777d1530862b6d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 15 14:05:57 2020 +0200 msvcrt: Don't use isdigitW. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index e962d00868..af09d38af4 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1977,19 +1977,19 @@ INT CDECL MSVCRT_iswcntrl( MSVCRT_wchar_t wc ) } /********************************************************************* - * iswdigit (MSVCRT.@) + * _iswdigit_l (MSVCRT.@) */ -INT CDECL MSVCRT_iswdigit( MSVCRT_wchar_t wc ) +INT CDECL MSVCRT__iswdigit_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) { - return isdigitW( wc ); + return MSVCRT__iswctype_l( wc, MSVCRT__DIGIT, locale ); } /********************************************************************* - * _iswdigit_l (MSVCRT.@) + * iswdigit (MSVCRT.@) */ -INT CDECL MSVCRT__iswdigit_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) +INT CDECL MSVCRT_iswdigit( MSVCRT_wchar_t wc ) { - return isdigitW( wc ); + return MSVCRT__iswdigit_l( wc, NULL ); } /*********************************************************************

1 0

Piotr Caban : msvcrt: Don't use isupperW.
by Alexandre Julliard July 15, 2020

July 15, 2020

Module: wine Branch: master Commit: da164d19e84034c9947726bb192216bfe300f898 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da164d19e84034c9947726bb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 15 14:06:29 2020 +0200 msvcrt: Don't use isupperW. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index f3dac854d8..fb494ebe39 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2074,19 +2074,19 @@ INT CDECL MSVCRT_iswspace( MSVCRT_wchar_t wc ) } /********************************************************************* - * iswupper (MSVCRT.@) + * _iswupper_l (MSVCRT.@) */ -INT CDECL MSVCRT_iswupper( MSVCRT_wchar_t wc ) +int CDECL MSVCRT__iswupper_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) { - return isupperW( wc ); + return MSVCRT__iswctype_l( wc, MSVCRT__UPPER, locale ); } /********************************************************************* - * _iswupper_l (MSVCRT.@) + * iswupper (MSVCRT.@) */ -int CDECL MSVCRT__iswupper_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) +INT CDECL MSVCRT_iswupper( MSVCRT_wchar_t wc ) { - return isupperW( wc ); + return MSVCRT__iswupper_l( wc, NULL ); } /*********************************************************************

1 0

Zebediah Figura : kernel32: Implement registry mapping in GetPrivateProfileSectionNames().
by Alexandre Julliard July 15, 2020

July 15, 2020

Module: wine Branch: master Commit: 3c1ebfdf82242e28ef697c139e0e94cb5ceb3fcd URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c1ebfdf82242e28ef697c13… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jul 12 20:32:10 2020 -0500 kernel32: Implement registry mapping in GetPrivateProfileSectionNames(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/profile.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index abd5429c8d..6d8d64fc81 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -1807,11 +1807,26 @@ DWORD WINAPI GetPrivateProfileSectionNamesW( LPWSTR buffer, DWORD size, LPCWSTR filename) { DWORD ret = 0; + HKEY key; + + if ((key = open_file_mapping_key( filename ))) + { + WCHAR *section; + DWORD i; + + for (i = 0; (section = enum_key( key, i )); ++i) + { + lstrcpynW( buffer + ret, section, size - ret - 1 ); + ret = min( ret + strlenW( section ) + 1, size - 1 ); + } + + RegCloseKey( key ); + } RtlEnterCriticalSection( &PROFILE_CritSect ); if (PROFILE_Open( filename, FALSE )) - ret = PROFILE_GetSectionNames(buffer, size); + ret += PROFILE_GetSectionNames( buffer + ret, size - ret ); RtlLeaveCriticalSection( &PROFILE_CritSect );

1 0

Zebediah Figura : kernel32: Implement deleting mapped sections.
by Alexandre Julliard July 15, 2020

July 15, 2020

Module: wine Branch: master Commit: 6e9d3d2014145930f688f4c5c9043d5112d41b6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e9d3d2014145930f688f4c5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jul 12 20:32:12 2020 -0500 kernel32: Implement deleting mapped sections. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/profile.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 64 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index d4f2b32654..bfaba6cdeb 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -1263,6 +1263,68 @@ static DWORD get_section( const WCHAR *filename, const WCHAR *section, return ret; } +static void delete_key_values( HKEY key ) +{ + WCHAR *entry; + + while ((entry = enum_key( key, 0 ))) + { + RegDeleteValueW( key, entry ); + HeapFree( GetProcessHeap(), 0, entry ); + } +} + +static BOOL delete_section( const WCHAR *filename, const WCHAR *section ) +{ + HKEY key, subkey, section_key; + + if ((key = open_file_mapping_key( filename ))) + { + if (!RegOpenKeyExW( key, section, 0, KEY_READ, &subkey )) + { + WCHAR *entry, *path; + HKEY entry_key; + DWORD i; + + for (i = 0; (entry = enum_key( subkey, i )); ++i) + { + if (!(path = get_key_value( subkey, entry ))) + { + HeapFree( GetProcessHeap(), 0, path ); + continue; + } + + entry_key = open_mapped_key( path, TRUE ); + HeapFree( GetProcessHeap(), 0, path ); + if (!entry_key) + { + HeapFree( GetProcessHeap(), 0, entry ); + continue; + } + + if (entry[0]) + RegDeleteValueW( entry_key, entry ); + else + delete_key_values( entry_key ); + + HeapFree( GetProcessHeap(), 0, entry ); + RegCloseKey( entry_key ); + } + + RegCloseKey( subkey ); + } + else if (get_mapped_section_key( filename, section, NULL, TRUE, &section_key )) + { + delete_key_values( section_key ); + RegCloseKey( section_key ); + } + + RegCloseKey( key ); + } + + return PROFILE_DeleteSection( filename, section ); +} + /********************* API functions **********************************/ @@ -1608,7 +1670,7 @@ BOOL WINAPI WritePrivateProfileStringW( LPCWSTR section, LPCWSTR entry, LeaveCriticalSection( &PROFILE_CritSect ); return FALSE; } - if (!entry) return PROFILE_DeleteSection( filename, section ); + if (!entry) return delete_section( filename, section ); if (get_mapped_section_key( filename, section, entry, TRUE, &key )) { @@ -1686,7 +1748,7 @@ BOOL WINAPI WritePrivateProfileSectionW( LPCWSTR section, LeaveCriticalSection( &PROFILE_CritSect ); return FALSE; } - if (!string) return PROFILE_DeleteSection( filename, section ); + if (!string) return delete_section( filename, section ); if ((key = open_file_mapping_key( filename ))) {

1 0

Zebediah Figura : kernel32/tests: Add tests for profile registry mapping.
by Alexandre Julliard July 15, 2020

July 15, 2020

Module: wine Branch: master Commit: 4ea42892539d84e6fd5bb864d18ef26d0e2038d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ea42892539d84e6fd5bb864… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jul 12 20:32:13 2020 -0500 kernel32/tests: Add tests for profile registry mapping. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/profile.c | 419 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 419 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4ea42892539d84e6fd5b…

1 0

Zebediah Figura : kernel32: Implement retrieving mapped sections.
by Alexandre Julliard July 15, 2020

July 15, 2020

Module: wine Branch: master Commit: 9ed6d24ed83d20796e2c5190365c26426a0c6a87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ed6d24ed83d20796e2c5190… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jul 12 20:32:09 2020 -0500 kernel32: Implement retrieving mapped sections. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/profile.c | 125 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 123 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 27057e62f7..abd5429c8d 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -1040,6 +1040,30 @@ static HKEY open_file_mapping_key( const WCHAR *filename ) return NULL; } +static WCHAR *enum_key( HKEY key, DWORD i ) +{ + WCHAR *value, *new_value; + DWORD max = 256, len; + LSTATUS res; + + if (!(value = HeapAlloc( GetProcessHeap(), 0, max * sizeof(WCHAR) ))) return NULL; + len = max; + while ((res = RegEnumValueW( key, i, value, &len, NULL, NULL, NULL, NULL )) == ERROR_MORE_DATA) + { + max *= 2; + if (!(new_value = HeapReAlloc( GetProcessHeap(), 0, value, max * sizeof(WCHAR) ))) + { + HeapFree( GetProcessHeap(), 0, value ); + return NULL; + } + value = new_value; + len = max; + } + if (!res) return value; + HeapFree( GetProcessHeap(), 0, value ); + return NULL; +} + static WCHAR *get_key_value( HKEY key, const WCHAR *value ) { DWORD size = 0; @@ -1142,6 +1166,103 @@ static BOOL get_mapped_section_key( const WCHAR *filename, const WCHAR *section, return TRUE; } +static DWORD get_mapped_section( HKEY key, WCHAR *buffer, DWORD size, BOOL return_values ) +{ + WCHAR *entry, *value; + DWORD i, ret = 0; + + for (i = 0; (entry = enum_key( key, i )); ++i) + { + lstrcpynW( buffer + ret, entry, size - ret - 1 ); + ret = min( ret + strlenW( entry ) + 1, size - 1 ); + if (return_values && ret < size - 1 && (value = get_key_value( key, entry ))) + { + buffer[ret - 1] = '='; + lstrcpynW( buffer + ret, value, size - ret - 1 ); + ret = min( ret + strlenW( value ) + 1, size - 1 ); + HeapFree( GetProcessHeap(), 0, value ); + } + HeapFree( GetProcessHeap(), 0, entry ); + } + + return ret; +} + +static DWORD get_section( const WCHAR *filename, const WCHAR *section, + WCHAR *buffer, DWORD size, BOOL return_values ) +{ + HKEY key, subkey, section_key; + BOOL use_ini = TRUE; + DWORD ret = 0; + WCHAR *path; + + if ((key = open_file_mapping_key( filename ))) + { + if (!RegOpenKeyExW( key, section, 0, KEY_READ, &subkey )) + { + WCHAR *entry, *value; + HKEY entry_key; + DWORD i; + + for (i = 0; (entry = enum_key( subkey, i )); ++i) + { + if (!(path = get_key_value( subkey, entry ))) + { + HeapFree( GetProcessHeap(), 0, entry ); + continue; + } + + entry_key = open_mapped_key( path, FALSE ); + HeapFree( GetProcessHeap(), 0, path ); + if (!entry_key) + { + HeapFree( GetProcessHeap(), 0, entry ); + continue; + } + + if (entry[0]) + { + if ((value = get_key_value( entry_key, entry ))) + { + lstrcpynW( buffer + ret, entry, size - ret - 1 ); + ret = min( ret + strlenW( entry ) + 1, size - 1 ); + if (return_values && ret < size - 1) + { + buffer[ret - 1] = '='; + lstrcpynW( buffer + ret, value, size - ret - 1 ); + ret = min( ret + strlenW( value ) + 1, size - 1 ); + } + HeapFree( GetProcessHeap(), 0, value ); + } + } + else + { + ret = get_mapped_section( entry_key, buffer, size, return_values ); + use_ini = FALSE; + } + + HeapFree( GetProcessHeap(), 0, entry ); + RegCloseKey( entry_key ); + } + + RegCloseKey( subkey ); + } + else if (get_mapped_section_key( filename, section, NULL, FALSE, &section_key )) + { + ret = get_mapped_section( section_key, buffer, size, return_values ); + use_ini = FALSE; + RegCloseKey( section_key ); + } + + RegCloseKey( key ); + } + + if (use_ini) + ret += PROFILE_GetSection( filename, section, buffer + ret, size - ret, return_values ); + + return ret; +} + /********************* API functions **********************************/ @@ -1182,7 +1303,7 @@ INT WINAPI GetPrivateProfileStringW( LPCWSTR section, LPCWSTR entry, if (!section) return GetPrivateProfileSectionNamesW( buffer, len, filename ); if (!entry) { - ret = PROFILE_GetSection( filename, section, buffer, len, FALSE ); + ret = get_section( filename, section, buffer, len, FALSE ); if (!buffer[0]) { PROFILE_CopyEntry( buffer, def_val, len ); @@ -1400,7 +1521,7 @@ INT WINAPI GetPrivateProfileSectionW( LPCWSTR section, LPWSTR buffer, TRACE("(%s, %p, %d, %s)\n", debugstr_w(section), buffer, len, debugstr_w(filename)); - return PROFILE_GetSection( filename, section, buffer, len, TRUE ); + return get_section( filename, section, buffer, len, TRUE ); } /***********************************************************************

1 0

Zebediah Figura : kernel32: Implement registry mapping in WritePrivateProfileStringW().
by Alexandre Julliard July 15, 2020

July 15, 2020

Module: wine Branch: master Commit: 73fc0a18a693c179d676d38fe8cf0df8f7679ea9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73fc0a18a693c179d676d38f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jul 12 20:32:08 2020 -0500 kernel32: Implement registry mapping in WritePrivateProfileStringW(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/profile.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 3e06543a66..27057e62f7 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -1473,6 +1473,9 @@ BOOL WINAPI WritePrivateProfileStringW( LPCWSTR section, LPCWSTR entry, LPCWSTR string, LPCWSTR filename ) { BOOL ret = FALSE; + HKEY key; + + TRACE("(%s, %s, %s, %s)\n", debugstr_w(section), debugstr_w(entry), debugstr_w(string), debugstr_w(filename)); if (!section && !entry && !string) /* documented "file flush" case */ { @@ -1486,6 +1489,20 @@ BOOL WINAPI WritePrivateProfileStringW( LPCWSTR section, LPCWSTR entry, } if (!entry) return PROFILE_DeleteSection( filename, section ); + if (get_mapped_section_key( filename, section, entry, TRUE, &key )) + { + LSTATUS res; + + if (string) + res = RegSetValueExW( key, entry, 0, REG_SZ, (const BYTE *)string, + (strlenW( string ) + 1) * sizeof(WCHAR) ); + else + res = RegDeleteValueW( key, entry ); + RegCloseKey( key ); + if (res) SetLastError( res ); + return !res; + } + EnterCriticalSection( &PROFILE_CritSect ); if (PROFILE_Open( filename, TRUE ))

1 0

Zebediah Figura : kernel32: Implement registry mapping in GetPrivateProfileStringW().
by Alexandre Julliard July 15, 2020

July 15, 2020

Module: wine Branch: master Commit: 7c4f2d5342a8673af994077ed2e586b0f3410583 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c4f2d5342a8673af994077e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jul 12 20:32:07 2020 -0500 kernel32: Implement registry mapping in GetPrivateProfileStringW(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=4096 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/profile.c | 170 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 160 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 2cf0819023..3e06543a66 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -29,7 +29,9 @@ #include "winbase.h" #include "winnls.h" #include "winerror.h" +#include "winreg.h" #include "winternl.h" +#include "shlwapi.h" #include "wine/unicode.h" #include "wine/library.h" #include "wine/debug.h" @@ -1016,6 +1018,129 @@ static BOOL PROFILE_SetString( LPCWSTR section_name, LPCWSTR key_name, return TRUE; } +static HKEY open_file_mapping_key( const WCHAR *filename ) +{ + static const WCHAR mapping_pathW[] = {'S','o','f','t','w','a','r','e', + '\\','M','i','c','r','o','s','o','f','t', + '\\','W','i','n','d','o','w','s',' ','N','T', + '\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n', + '\\','I','n','i','F','i','l','e','M','a','p','p','i','n','g',0}; + static HKEY mapping_key; + HKEY key; + + EnterCriticalSection( &PROFILE_CritSect ); + + if (!mapping_key && RegOpenKeyExW( HKEY_LOCAL_MACHINE, mapping_pathW, 0, KEY_WOW64_64KEY, &mapping_key )) + mapping_key = NULL; + + LeaveCriticalSection( &PROFILE_CritSect ); + + if (mapping_key && !RegOpenKeyExW( mapping_key, PathFindFileNameW( filename ), 0, KEY_READ, &key )) + return key; + return NULL; +} + +static WCHAR *get_key_value( HKEY key, const WCHAR *value ) +{ + DWORD size = 0; + WCHAR *data; + + if (RegGetValueW( key, NULL, value, RRF_RT_REG_SZ | RRF_NOEXPAND, NULL, NULL, &size )) return NULL; + if (!(data = HeapAlloc( GetProcessHeap(), 0, size ))) return NULL; + if (!RegGetValueW( key, NULL, value, RRF_RT_REG_SZ | RRF_NOEXPAND, NULL, (BYTE *)data, &size )) return data; + HeapFree( GetProcessHeap(), 0, data ); + return NULL; +} + +static HKEY open_mapped_key( const WCHAR *path, BOOL write ) +{ + static const WCHAR softwareW[] = {'S','o','f','t','w','a','r','e','\\',0}; + static const WCHAR usrW[] = {'U','S','R',':'}; + static const WCHAR sysW[] = {'S','Y','S',':'}; + WCHAR *combined_path; + const WCHAR *p; + LSTATUS res; + HKEY key; + + TRACE("%s\n", debugstr_w( path )); + + for (p = path; strchr("!#@", *p); p++) + FIXME("ignoring %c modifier\n", *p); + + if (!strncmpW( p, usrW, ARRAY_SIZE( usrW ) )) + { + if (write) + res = RegCreateKeyExW( HKEY_CURRENT_USER, p + 4, 0, NULL, 0, KEY_READ | KEY_WRITE, NULL, &key, NULL ); + else + res = RegOpenKeyExW( HKEY_CURRENT_USER, p + 4, 0, KEY_READ, &key ); + return res ? NULL : key; + } + + if (!strncmpW( p, sysW, ARRAY_SIZE( sysW ) )) + { + p += 4; + if (!(combined_path = HeapAlloc( GetProcessHeap(), 0, + (ARRAY_SIZE( softwareW ) + strlenW( p )) * sizeof(WCHAR) ))) + return NULL; + strcpyW( combined_path, softwareW ); + strcatW( combined_path, p ); + if (write) + res = RegCreateKeyExW( HKEY_LOCAL_MACHINE, combined_path, 0, NULL, + 0, KEY_READ | KEY_WRITE, NULL, &key, NULL ); + else + res = RegOpenKeyExW( HKEY_LOCAL_MACHINE, combined_path, 0, KEY_READ, &key ); + HeapFree( GetProcessHeap(), 0, combined_path ); + return res ? NULL : key; + } + + FIXME("unhandled path syntax %s\n", debugstr_w( path )); + return NULL; +} + +/* returns TRUE if the given section + name is mapped */ +static BOOL get_mapped_section_key( const WCHAR *filename, const WCHAR *section, + const WCHAR *name, BOOL write, HKEY *ret_key ) +{ + static const WCHAR backslashW[] = {'\\',0}; + WCHAR *path = NULL, *combined_path; + HKEY key, subkey = NULL; + + if (!(key = open_file_mapping_key( filename ))) + return FALSE; + + if (!RegOpenKeyExW( key, section, 0, KEY_READ, &subkey )) + { + if (!(path = get_key_value( subkey, name ))) + path = get_key_value( subkey, NULL ); + RegCloseKey( subkey ); + RegCloseKey( key ); + if (!path) return FALSE; + } + else + { + if (!(path = get_key_value( key, section ))) + { + if ((path = get_key_value( key, NULL ))) + { + if ((combined_path = HeapAlloc( GetProcessHeap(), 0, + (strlenW( path ) + strlenW( section ) + 2) * sizeof(WCHAR) ))) + { + strcpyW( combined_path, path ); + strcatW( combined_path, backslashW ); + strcatW( combined_path, section ); + } + HeapFree( GetProcessHeap(), 0, path ); + path = combined_path; + } + } + RegCloseKey( key ); + if (!path) return FALSE; + } + + *ret_key = open_mapped_key( path, write ); + HeapFree( GetProcessHeap(), 0, path ); + return TRUE; +} /********************* API functions **********************************/ @@ -1047,6 +1172,7 @@ INT WINAPI GetPrivateProfileStringW( LPCWSTR section, LPCWSTR entry, int ret; LPWSTR defval_tmp = NULL; const WCHAR *p; + HKEY key; TRACE("%s,%s,%s,%p,%u,%s\n", debugstr_w(section), debugstr_w(entry), debugstr_w(def_val), buffer, len, debugstr_w(filename)); @@ -1080,22 +1206,46 @@ INT WINAPI GetPrivateProfileStringW( LPCWSTR section, LPCWSTR entry, def_val = defval_tmp; } - RtlEnterCriticalSection( &PROFILE_CritSect ); - - if (PROFILE_Open( filename, FALSE )) + if (get_mapped_section_key( filename, section, entry, FALSE, &key )) { - PROFILEKEY *key = PROFILE_Find( &CurProfile->section, section, entry, FALSE, FALSE ); - PROFILE_CopyEntry( buffer, (key && key->value) ? key->value : def_val, len ); - TRACE("-> %s\n", debugstr_w( buffer )); + if (key) + { + WCHAR *value; + + if ((value = get_key_value( key, entry ))) + { + lstrcpynW( buffer, value, len ); + HeapFree( GetProcessHeap(), 0, value ); + } + else + lstrcpynW( buffer, def_val, len ); + + RegCloseKey( key ); + } + else + lstrcpynW( buffer, def_val, len ); + ret = strlenW( buffer ); } else { - lstrcpynW( buffer, def_val, len ); - ret = strlenW( buffer ); - } + EnterCriticalSection( &PROFILE_CritSect ); - RtlLeaveCriticalSection( &PROFILE_CritSect ); + if (PROFILE_Open( filename, FALSE )) + { + PROFILEKEY *key = PROFILE_Find( &CurProfile->section, section, entry, FALSE, FALSE ); + PROFILE_CopyEntry( buffer, (key && key->value) ? key->value : def_val, len ); + TRACE("-> %s\n", debugstr_w( buffer )); + ret = strlenW( buffer ); + } + else + { + lstrcpynW( buffer, def_val, len ); + ret = strlenW( buffer ); + } + + LeaveCriticalSection( &PROFILE_CritSect ); + } HeapFree(GetProcessHeap(), 0, defval_tmp);

1 0

Serge Gautherie : crypt32: Check CRYPT_ConstructBitBlob() return value in CRYPT_ExportKeyTrans().
by Alexandre Julliard July 15, 2020

July 15, 2020

Module: wine Branch: master Commit: 3e8b07309c293d00e6b71164373e52c0dd19f29f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e8b07309c293d00e6b71164… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Sat Jul 4 22:32:30 2020 +0200 crypt32: Check CRYPT_ConstructBitBlob() return value in CRYPT_ExportKeyTrans(). Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/msg.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index f591a5e72e..5df03f7c99 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1574,9 +1574,8 @@ static BOOL WINAPI CRYPT_ExportKeyTrans( ret = CRYPT_ConstructAlgorithmId(&keyInfo.Algorithm, &pKeyTransEncodeInfo->KeyEncryptionAlgorithm); if (ret) - CRYPT_ConstructBitBlob(&keyInfo.PublicKey, + ret = CRYPT_ConstructBitBlob(&keyInfo.PublicKey, &pKeyTransEncodeInfo->RecipientPublicKey); - if (ret) ret = CryptImportPublicKeyInfo(pKeyTransEncodeInfo->hCryptProv, X509_ASN_ENCODING, &keyInfo, &expKey);

1 0

Zebediah Figura : kernel32: Implement registry mapping in WritePrivateProfileSection().
by Alexandre Julliard July 15, 2020

July 15, 2020

Module: wine Branch: master Commit: d2b83336c7b219b3267035bd6ab9af5480184743 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2b83336c7b219b3267035bd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jul 12 20:32:11 2020 -0500 kernel32: Implement registry mapping in WritePrivateProfileSection(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/profile.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 6d8d64fc81..d4f2b32654 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -1674,6 +1674,7 @@ BOOL WINAPI WritePrivateProfileSectionW( LPCWSTR section, { BOOL ret = FALSE; LPWSTR p; + HKEY key, section_key; if (!section && !string) { @@ -1687,6 +1688,44 @@ BOOL WINAPI WritePrivateProfileSectionW( LPCWSTR section, } if (!string) return PROFILE_DeleteSection( filename, section ); + if ((key = open_file_mapping_key( filename ))) + { + /* replace existing entries, but only if they are mapped, and do not + * delete any keys */ + + const WCHAR *entry, *p; + + for (entry = string; *entry; entry += strlenW( entry ) + 1) + { + if ((p = strchrW( entry, '=' ))) + { + WCHAR *entry_copy; + p++; + if (!(entry_copy = HeapAlloc( GetProcessHeap(), 0, (p - entry) * sizeof(WCHAR) ))) + { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + RegCloseKey( key ); + return FALSE; + } + lstrcpynW( entry_copy, entry, p - entry ); + if (get_mapped_section_key( filename, section, entry_copy, TRUE, &section_key )) + { + LSTATUS res = RegSetValueExW( section_key, entry_copy, 0, REG_SZ, (const BYTE *)p, + (strlenW( p ) + 1) * sizeof(WCHAR) ); + RegCloseKey( section_key ); + if (res) + { + SetLastError( res ); + RegCloseKey( key ); + return FALSE; + } + } + } + } + RegCloseKey( key ); + return TRUE; + } + EnterCriticalSection( &PROFILE_CritSect ); if (PROFILE_Open( filename, TRUE ))

1 0