marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel32: Open the INI file in PROFILE_GetSection. 

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
master
Zebediah Figura 2020-06-21 19:24:12 -05:00 committed by Alexandre Julliard
parent 60f344852d
commit 9fa54bf690
1 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
dlls/kernel32/profile.c
View File

@ -856,16 +856,26 @@ static BOOL PROFILE_Open( LPCWSTR filename, BOOL write_access )
* Returns all keys of a section. * Returns all keys of a section.
* If return_values is TRUE, also include the corresponding values. * If return_values is TRUE, also include the corresponding values.
*/ */
static INT PROFILE_GetSection( PROFILESECTION *section, LPCWSTR section_name, static INT PROFILE_GetSection( const WCHAR *filename, LPCWSTR section_name,
LPWSTR buffer, UINT len, BOOL return_values ) LPWSTR buffer, UINT len, BOOL return_values )
{ {
PROFILESECTION *section;
PROFILEKEY *key; PROFILEKEY *key;
if(!buffer) return 0; if(!buffer) return 0;
TRACE("%s,%p,%u\n", debugstr_w(section_name), buffer, len); TRACE("%s,%p,%u\n", debugstr_w(section_name), buffer, len);
while (section) EnterCriticalSection( &PROFILE_CritSect );
if (!PROFILE_Open( filename, FALSE ))
{
LeaveCriticalSection( &PROFILE_CritSect );
buffer[0] = 0;
return 0;
}
for (section = CurProfile->section; section; section = section->next)
{ {
if (!strcmpiW( section->name, section_name )) if (!strcmpiW( section->name, section_name ))
{ {
@ -889,6 +899,9 @@ static INT PROFILE_GetSection( PROFILESECTION *section, LPCWSTR section_name,
} }
} }
*buffer = '\0'; *buffer = '\0';
LeaveCriticalSection( &PROFILE_CritSect );
if (len <= 1) if (len <= 1)
/*If either lpszSection or lpszKey is NULL and the supplied /*If either lpszSection or lpszKey is NULL and the supplied
destination buffer is too small to hold all the strings, destination buffer is too small to hold all the strings,
@ -901,9 +914,11 @@ static INT PROFILE_GetSection( PROFILESECTION *section, LPCWSTR section_name,
} }
return oldlen - len; return oldlen - len;
} }
section = section->next;
} }
buffer[0] = buffer[1] = '\0'; buffer[0] = buffer[1] = '\0';
LeaveCriticalSection( &PROFILE_CritSect );
return 0; return 0;
} }
@ -1039,6 +1054,16 @@ INT WINAPI GetPrivateProfileStringW( LPCWSTR section, LPCWSTR entry,
if (!buffer || !len) return 0; if (!buffer || !len) return 0;
if (!def_val) def_val = emptyW; if (!def_val) def_val = emptyW;
if (!section) return GetPrivateProfileSectionNamesW( buffer, len, filename ); if (!section) return GetPrivateProfileSectionNamesW( buffer, len, filename );
if (!entry)
{
ret = PROFILE_GetSection( filename, section, buffer, len, FALSE );
if (!buffer[0])
{
PROFILE_CopyEntry( buffer, def_val, len );
ret = strlenW( buffer );
}
return ret;
}
/* strip any trailing ' ' of def_val. */ /* strip any trailing ' ' of def_val. */
p = def_val + strlenW(def_val) - 1; p = def_val + strlenW(def_val) - 1;
@ -1059,22 +1084,10 @@ INT WINAPI GetPrivateProfileStringW( LPCWSTR section, LPCWSTR entry,
if (PROFILE_Open( filename, FALSE )) if (PROFILE_Open( filename, FALSE ))
{ {
if (entry) PROFILEKEY *key = PROFILE_Find( &CurProfile->section, section, entry, FALSE, FALSE );
{ PROFILE_CopyEntry( buffer, (key && key->value) ? key->value : def_val, len );
PROFILEKEY *key = PROFILE_Find( &CurProfile->section, section, entry, FALSE, FALSE ); TRACE("-> %s\n", debugstr_w( buffer ));
PROFILE_CopyEntry( buffer, (key && key->value) ? key->value : def_val, len ); ret = strlenW( buffer );
TRACE("-> %s\n", debugstr_w( buffer ));
ret = strlenW( buffer );
}
else
{
ret = PROFILE_GetSection( CurProfile->section, section, buffer, len, FALSE );
if (!buffer[0])
{
PROFILE_CopyEntry( buffer, def_val, len );
ret = strlenW( buffer );
}
}
} }
else else
{ {
@ -1229,8 +1242,6 @@ UINT WINAPI GetPrivateProfileIntA( LPCSTR section, LPCSTR entry,
INT WINAPI GetPrivateProfileSectionW( LPCWSTR section, LPWSTR buffer, INT WINAPI GetPrivateProfileSectionW( LPCWSTR section, LPWSTR buffer,
DWORD len, LPCWSTR filename ) DWORD len, LPCWSTR filename )
{ {
int ret = 0;
if (!section || !buffer) if (!section || !buffer)
{ {
SetLastError(ERROR_INVALID_PARAMETER); SetLastError(ERROR_INVALID_PARAMETER);
@ -1239,14 +1250,7 @@ INT WINAPI GetPrivateProfileSectionW( LPCWSTR section, LPWSTR buffer,
TRACE("(%s, %p, %d, %s)\n", debugstr_w(section), buffer, len, debugstr_w(filename)); TRACE("(%s, %p, %d, %s)\n", debugstr_w(section), buffer, len, debugstr_w(filename));
RtlEnterCriticalSection( &PROFILE_CritSect ); return PROFILE_GetSection( filename, section, buffer, len, TRUE );
if (PROFILE_Open( filename, FALSE ))
ret = PROFILE_GetSection(CurProfile->section, section, buffer, len, TRUE);
RtlLeaveCriticalSection( &PROFILE_CritSect );
return ret;
} }
/*********************************************************************** /***********************************************************************