ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

regedit: Avoid conversion to ANSI when importing hex values.

This commit is contained in:
Alexander Nicolaysen Sørnes 2008-08-27 23:29:08 +02:00 committed by Alexandre Julliard
parent b058648ae3
commit f7ff9e76f9
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
programs/regedit/regproc.c
View File

@ -113,28 +113,28 @@ static BOOL convertHexToDWord(WCHAR* str, DWORD *dw)
/******************************************************************************
* Converts a hex comma separated values list into a binary string.
*/
static BYTE* convertHexCSVToHex(WCHAR *strW, DWORD *size)
static BYTE* convertHexCSVToHex(WCHAR *str, DWORD *size)
{
char *s;
WCHAR *s;
BYTE *d, *data;
char* strA = GetMultiByteString(strW);
/* The worst case is 1 digit + 1 comma per byte */
*size=(strlen(strA)+1)/2;
*size=(lstrlenW(str)+1)/2;
data=HeapAlloc(GetProcessHeap(), 0, *size);
CHECK_ENOUGH_MEMORY(data);
s = strA;
s = str;
d = data;
*size=0;
while (*s != '\0') {
UINT wc;
char *end;
WCHAR *end;
wc = strtoul(s,&end,16);
wc = strtoulW(s,&end,16);
if (end == s || wc > 0xff || (*end && *end != ',')) {
char* strA = GetMultiByteString(s);
fprintf(stderr,"%s: ERROR converting CSV hex stream. Invalid value at '%s'\n",
getAppName(), s);
getAppName(), strA);
HeapFree(GetProcessHeap(), 0, data);
HeapFree(GetProcessHeap(), 0, strA);
return NULL;
@ -145,8 +145,6 @@ static BYTE* convertHexCSVToHex(WCHAR *strW, DWORD *size)
s = end;
}
HeapFree(GetProcessHeap(), 0, strA);
return data;
}