From 4f332e610e2ed2d97f125901c3d0179fe7ed6a8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Nicolaysen=20S=C3=B8rnes?= Date: Sun, 21 Sep 2008 23:26:32 +0200 Subject: [PATCH] regedit: Fix some fprintf arguments. --- programs/regedit/regproc.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index ce26319e278..bdbdba94907 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -576,8 +576,10 @@ static void processRegEntry(WCHAR* stdInput, BOOL isUnicode) delete_registry_key(stdInput + 1); } else if ( openKeyW(stdInput) != ERROR_SUCCESS ) { + char* stdInputA = GetMultiByteString(stdInput); fprintf(stderr,"%s: setValue failed to open key %s\n", - getAppName(), stdInput); + getAppName(), stdInputA); + HeapFree(GetProcessHeap(), 0, stdInputA); } } else if( currentKeyHandle && (( stdInput[0] == '@') || /* reading a default @=data pair */ @@ -1063,11 +1065,17 @@ static void export_hkey(FILE *file, HKEY key, } default: + { + char* key_nameA = GetMultiByteString(*reg_key_name_buf); + char* value_nameA = GetMultiByteString(*val_name_buf); fprintf(stderr,"%s: warning - unsupported registry format '%d', " "treat as binary\n", getAppName(), value_type); - fprintf(stderr,"key name: \"%s\"\n", *reg_key_name_buf); - fprintf(stderr,"value name:\"%s\"\n\n", *val_name_buf); + fprintf(stderr,"key name: \"%s\"\n", key_nameA); + fprintf(stderr,"value name:\"%s\"\n\n", value_nameA); + HeapFree(GetProcessHeap(), 0, key_nameA); + HeapFree(GetProcessHeap(), 0, value_nameA); + } /* falls through */ case REG_MULTI_SZ: /* falls through */