[PATCH v2 1/2] kernel32: Call PROFILE_DeleteSection directly from WritePrivateProfile* functions.
Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/kernel32/profile.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-)
diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index dfda24446cb..63a400cce64 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -503,11 +503,12 @@ static BOOL PROFILE_DeleteSection( PROFILESECTION **section, LPCWSTR name ) *section = to_del->next; to_del->next = NULL; PROFILE_Free( to_del ); + CurProfile->changed = TRUE; return TRUE; } section = &(*section)->next; } - return FALSE; + return TRUE; }
@@ -971,15 +972,7 @@ static INT PROFILE_GetSectionNames( LPWSTR buffer, UINT len ) static BOOL PROFILE_SetString( LPCWSTR section_name, LPCWSTR key_name, LPCWSTR value, BOOL create_always ) { - if (!key_name) /* Delete a whole section */ - { - TRACE("(%s)\n", debugstr_w(section_name)); - CurProfile->changed |= PROFILE_DeleteSection( &CurProfile->section, - section_name ); - return TRUE; /* Even if PROFILE_DeleteSection() has failed, - this is not an error on application's level.*/ - } - else if (!value) /* Delete a key */ + if (!value) /* Delete a key */ { TRACE("(%s,%s)\n", debugstr_w(section_name), debugstr_w(key_name) ); CurProfile->changed |= PROFILE_DeleteKey( &CurProfile->section, @@ -1335,12 +1328,13 @@ BOOL WINAPI WritePrivateProfileStringW( LPCWSTR section, LPCWSTR entry, } else if (PROFILE_Open( filename, TRUE )) { - if (!section) { + if (!section) SetLastError(ERROR_FILE_NOT_FOUND); - } else { + else if (!entry) + ret = PROFILE_DeleteSection( &CurProfile->section, section ); + else ret = PROFILE_SetString( section, entry, string, FALSE); - if (ret) ret = PROFILE_FlushFile(); - } + if (ret) ret = PROFILE_FlushFile(); }
RtlLeaveCriticalSection( &PROFILE_CritSect ); @@ -1393,8 +1387,9 @@ BOOL WINAPI WritePrivateProfileSectionW( LPCWSTR section, } } else if (PROFILE_Open( filename, TRUE )) { - if (!string) {/* delete the named section*/ - ret = PROFILE_SetString(section,NULL,NULL, FALSE); + if (!string) + { + ret = PROFILE_DeleteSection( &CurProfile->section, section ); } else { PROFILE_DeleteAllKeys(section); ret = TRUE;
Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/kernel32/profile.c | 113 ++++++++++++++++++++++------------------ 1 file changed, 63 insertions(+), 50 deletions(-)
diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 63a400cce64..2cf0819023d 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -488,30 +488,6 @@ static PROFILESECTION *PROFILE_Load(HANDLE hFile, ENCODING * pEncoding) }
-/*********************************************************************** - * PROFILE_DeleteSection - * - * Delete a section from a profile tree. - */ -static BOOL PROFILE_DeleteSection( PROFILESECTION **section, LPCWSTR name ) -{ - while (*section) - { - if (!strcmpiW( (*section)->name, name )) - { - PROFILESECTION *to_del = *section; - *section = to_del->next; - to_del->next = NULL; - PROFILE_Free( to_del ); - CurProfile->changed = TRUE; - return TRUE; - } - section = &(*section)->next; - } - return TRUE; -} - - /*********************************************************************** * PROFILE_DeleteKey * @@ -923,6 +899,37 @@ static INT PROFILE_GetSection( const WCHAR *filename, LPCWSTR section_name, return 0; }
+static BOOL PROFILE_DeleteSection( const WCHAR *filename, const WCHAR *name ) +{ + PROFILESECTION **section; + + EnterCriticalSection( &PROFILE_CritSect ); + + if (!PROFILE_Open( filename, TRUE )) + { + LeaveCriticalSection( &PROFILE_CritSect ); + return FALSE; + } + + for (section = &CurProfile->section; *section; section = &(*section)->next) + { + if (!strcmpiW( (*section)->name, name )) + { + PROFILESECTION *to_del = *section; + *section = to_del->next; + to_del->next = NULL; + PROFILE_Free( to_del ); + CurProfile->changed = TRUE; + PROFILE_FlushFile(); + break; + } + } + + LeaveCriticalSection( &PROFILE_CritSect ); + return TRUE; +} + + /* See GetPrivateProfileSectionNamesA for documentation */ static INT PROFILE_GetSectionNames( LPWSTR buffer, UINT len ) { @@ -1317,27 +1324,30 @@ BOOL WINAPI WritePrivateProfileStringW( LPCWSTR section, LPCWSTR entry, { BOOL ret = FALSE;
- RtlEnterCriticalSection( &PROFILE_CritSect ); - if (!section && !entry && !string) /* documented "file flush" case */ { + EnterCriticalSection( &PROFILE_CritSect ); if (!filename || PROFILE_Open( filename, TRUE )) { - if (CurProfile) PROFILE_ReleaseFile(); /* always return FALSE in this case */ + if (CurProfile) PROFILE_ReleaseFile(); } + LeaveCriticalSection( &PROFILE_CritSect ); + return FALSE; } - else if (PROFILE_Open( filename, TRUE )) + if (!entry) return PROFILE_DeleteSection( filename, section ); + + EnterCriticalSection( &PROFILE_CritSect ); + + if (PROFILE_Open( filename, TRUE )) { if (!section) SetLastError(ERROR_FILE_NOT_FOUND); - else if (!entry) - ret = PROFILE_DeleteSection( &CurProfile->section, section ); else ret = PROFILE_SetString( section, entry, string, FALSE); if (ret) ret = PROFILE_FlushFile(); }
- RtlLeaveCriticalSection( &PROFILE_CritSect ); + LeaveCriticalSection( &PROFILE_CritSect ); return ret; }
@@ -1377,37 +1387,40 @@ BOOL WINAPI WritePrivateProfileSectionW( LPCWSTR section, BOOL ret = FALSE; LPWSTR p;
- RtlEnterCriticalSection( &PROFILE_CritSect ); - if (!section && !string) { + EnterCriticalSection( &PROFILE_CritSect ); if (!filename || PROFILE_Open( filename, TRUE )) { - if (CurProfile) PROFILE_ReleaseFile(); /* always return FALSE in this case */ + if (CurProfile) PROFILE_ReleaseFile(); } + LeaveCriticalSection( &PROFILE_CritSect ); + return FALSE; } - else if (PROFILE_Open( filename, TRUE )) { - if (!string) + if (!string) return PROFILE_DeleteSection( filename, section ); + + EnterCriticalSection( &PROFILE_CritSect ); + + if (PROFILE_Open( filename, TRUE )) + { + PROFILE_DeleteAllKeys(section); + ret = TRUE; + while (*string && ret) { - ret = PROFILE_DeleteSection( &CurProfile->section, section ); - } else { - PROFILE_DeleteAllKeys(section); - ret = TRUE; - while(*string && ret) { - LPWSTR buf = HeapAlloc( GetProcessHeap(), 0, (strlenW(string)+1) * sizeof(WCHAR) ); - strcpyW( buf, string ); - if((p = strchrW( buf, '='))) { - *p='\0'; - ret = PROFILE_SetString( section, buf, p+1, TRUE); - } - HeapFree( GetProcessHeap(), 0, buf ); - string += strlenW(string)+1; + WCHAR *buf = HeapAlloc( GetProcessHeap(), 0, (strlenW( string ) + 1) * sizeof(WCHAR) ); + strcpyW( buf, string ); + if ((p = strchrW( buf, '='))) + { + *p = '\0'; + ret = PROFILE_SetString( section, buf, p+1, TRUE ); } + HeapFree( GetProcessHeap(), 0, buf ); + string += strlenW( string ) + 1; } if (ret) ret = PROFILE_FlushFile(); }
- RtlLeaveCriticalSection( &PROFILE_CritSect ); + LeaveCriticalSection( &PROFILE_CritSect ); return ret; }
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=74358
Your paranoid android.
=== debiant (32 bit Chinese:China report) ===
kernel32: comm: Timeout
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=74357
Your paranoid android.
=== debiant (32 bit Chinese:China report) ===
kernel32: comm: Timeout
-
Marvin -
Zebediah Figura