regedit: Explicitly use ANSI functions in regedit helper functions.
This commit is contained in:
parent
87bd8ef6e1
commit
3e19c4ca3b
@ -141,29 +141,29 @@ static BOOL PerformRegAction(REGEDIT_ACTION action, LPSTR s)
|
|||||||
|
|
||||||
if (strcmp(filename, "-") == 0)
|
if (strcmp(filename, "-") == 0)
|
||||||
{
|
{
|
||||||
reg_file=stdin;
|
reg_file = stdin;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
int size;
|
int size;
|
||||||
|
|
||||||
size=SearchPath(NULL, filename, NULL,0, NULL, NULL);
|
size = SearchPathA(NULL, filename, NULL, 0, NULL, NULL);
|
||||||
if (size>0)
|
if (size > 0)
|
||||||
{
|
{
|
||||||
realname=HeapAlloc(GetProcessHeap(), 0, size);
|
realname = HeapAlloc(GetProcessHeap(), 0, size);
|
||||||
size=SearchPath(NULL, filename, NULL, size, realname, NULL);
|
size = SearchPathA(NULL, filename, NULL, size, realname, NULL);
|
||||||
}
|
}
|
||||||
if (size==0)
|
if (size == 0)
|
||||||
{
|
{
|
||||||
fprintf(stderr, "%s: File not found \"%s\" (%d)\n",
|
fprintf(stderr, "%s: File not found \"%s\" (%d)\n",
|
||||||
getAppName(), filename, GetLastError());
|
getAppName(), filename, GetLastError());
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
reg_file = fopen(realname, "r");
|
reg_file = fopen(realname, "r");
|
||||||
if (reg_file==NULL)
|
if (reg_file == NULL)
|
||||||
{
|
{
|
||||||
perror("");
|
perror("");
|
||||||
fprintf(stderr,"%s: Can't open file \"%s\"\n", getAppName(), filename);
|
fprintf(stderr, "%s: Can't open file \"%s\"\n", getAppName(), filename);
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -890,8 +890,8 @@ static void REGPROC_print_error(void)
|
|||||||
int status;
|
int status;
|
||||||
|
|
||||||
error_code = GetLastError ();
|
error_code = GetLastError ();
|
||||||
status = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
|
status = FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
|
||||||
NULL, error_code, 0, (LPTSTR) &lpMsgBuf, 0, NULL);
|
NULL, error_code, 0, (LPSTR) &lpMsgBuf, 0, NULL);
|
||||||
if (!status) {
|
if (!status) {
|
||||||
fprintf(stderr,"%s: Cannot display message for error %d, status %d\n",
|
fprintf(stderr,"%s: Cannot display message for error %d, status %d\n",
|
||||||
getAppName(), error_code, GetLastError());
|
getAppName(), error_code, GetLastError());
|
||||||
|
Loading…
x
Reference in New Issue
Block a user