Zebediah Figura : kernel32: Get rid of the last parameter to PROFILE_CopyEntry().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 60f344852d06e66e59957675ee94332d0b1e073c
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=60f344852d06e66e59957675e...

Author: Zebediah Figura 
Date:   Sun Jun 21 19:24:11 2020 -0500

kernel32: Get rid of the last parameter to PROFILE_CopyEntry().

Signed-off-by: Zebediah Figura 
Signed-off-by: Alexandre Julliard

---

dlls/kernel32/profile.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c
index 02c6fa5efb..7c50fb9a61 100644
--- a/dlls/kernel32/profile.c
+++ b/dlls/kernel32/profile.c
@@ -101,14 +101,13 @@ static const char hex[16] = "0123456789ABCDEF";
  * Copy the content of an entry into a buffer, removing quotes, and possibly
  * translating environment variables.
  */
-static void PROFILE_CopyEntry( LPWSTR buffer, LPCWSTR value, int len,
-                               BOOL strip_quote )
+static void PROFILE_CopyEntry( LPWSTR buffer, LPCWSTR value, int len )
 {
     WCHAR quote = '\0';

if(!buffer) return;

-    if (strip_quote && ((*value == ''') || (*value == '"')))
+    if (*value == ''' || *value == '"')
     {
         if (value[1] && (value[strlenW(value)-1] == *value)) quote = *value++;
     }
@@ -877,14 +876,14 @@ static INT PROFILE_GetSection( PROFILESECTION *section, LPCWSTR section_name,
                 if (!*key->name && !key->value) continue;  /* Skip empty lines */
                 if (IS_ENTRY_COMMENT(key->name)) continue;  /* Skip comments */
                 if (!return_values && !key->value) continue;  /* Skip lines w.o. '=' */
-                PROFILE_CopyEntry( buffer, key->name, len - 1, 0 );
+                lstrcpynW( buffer, key->name, len - 1 );
                 len -= strlenW(buffer) + 1;
                 buffer += strlenW(buffer) + 1;
    	if (len < 2)
    	    break;
    	if (return_values && key->value) {
    		buffer[-1] = '=';
-			PROFILE_CopyEntry ( buffer, key->value, len - 1, 0 );
+                    lstrcpynW( buffer, key->value, len - 1 );
    		len -= strlenW(buffer) + 1;
    		buffer += strlenW(buffer) + 1;
                 }
@@ -1063,7 +1062,7 @@ INT WINAPI GetPrivateProfileStringW( LPCWSTR section, LPCWSTR entry,
         if (entry)
         {
             PROFILEKEY *key = PROFILE_Find( &CurProfile->section, section, entry, FALSE, FALSE );
-            PROFILE_CopyEntry( buffer, (key && key->value) ? key->value : def_val, len, TRUE );
+            PROFILE_CopyEntry( buffer, (key && key->value) ? key->value : def_val, len );
             TRACE("-> %s\n", debugstr_w( buffer ));
             ret = strlenW( buffer );
         }
@@ -1072,7 +1071,7 @@ INT WINAPI GetPrivateProfileStringW( LPCWSTR section, LPCWSTR entry,
             ret = PROFILE_GetSection( CurProfile->section, section, buffer, len, FALSE );
             if (!buffer[0])
             {
-                PROFILE_CopyEntry( buffer, def_val, len, TRUE );
+                PROFILE_CopyEntry( buffer, def_val, len );
                 ret = strlenW( buffer );
             }
         }