Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 22:13:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SETUPLIB][USETUP] Make the GENERIC_LIST store the items display text in UNICODE (and not in ANSI).

Browse source 
Only convert to ANSI when needed (e.g. in the display code for usetup).
The 1st-stage GUI setup will however use the UNICODE strings directly.

svn path=/branches/setup_improvements/; revision=75753
This commit is contained in:
Hermès Bélusca-Maïto 2017-09-03 19:46:26 +00:00
parent b86d19e936
commit 254aa472e8
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
7 changed files with 44 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

14
base/setup/lib/settings.c
View file

@ -323,7 +323,7 @@ typedef UCHAR
(NTAPI *PPROCESS_ENTRY_ROUTINE)(
IN PWCHAR KeyName,
IN PWCHAR KeyValue,
IN PCHAR DisplayText,
OUT PWCHAR DisplayText,
IN SIZE_T DisplayTextSize,
OUT PVOID* UserData,
OUT PBOOLEAN Current,
@ -344,7 +344,7 @@ AddEntriesFromInfSection(
PVOID UserData;
BOOLEAN Current;
UCHAR RetVal;
CHAR DisplayText[128];
WCHAR DisplayText[128];
if (!SetupFindFirstLineW(InfFile, SectionName, NULL, pContext))
return -1;
@ -404,7 +404,7 @@ NTAPI
DefaultProcessEntry(
IN PWCHAR KeyName,
IN PWCHAR KeyValue,
IN PCHAR DisplayText,
OUT PWCHAR DisplayText,
IN SIZE_T DisplayTextSize,
OUT PVOID* UserData,
OUT PBOOLEAN Current,
@ -422,7 +422,7 @@ DefaultProcessEntry(
}
wcscpy((PWCHAR)*UserData, KeyName);
sprintf(DisplayText, "%S", KeyValue);
wcscpy(DisplayText, KeyValue);
*Current = (CompareKey ? !_wcsicmp(KeyName, CompareKey) : FALSE);
@ -739,7 +739,7 @@ CreateDisplayDriverList(
}
#if 0
AppendGenericListEntry(List, "Other display driver", NULL, TRUE);
AppendGenericListEntry(List, L"Other display driver", NULL, TRUE);
#endif
return List;
@ -1086,7 +1086,7 @@ NTAPI
ProcessLangEntry(
IN PWCHAR KeyName,
IN PWCHAR KeyValue,
IN PCHAR DisplayText,
OUT PWCHAR DisplayText,
IN SIZE_T DisplayTextSize,
OUT PVOID* UserData,
OUT PBOOLEAN Current,
@ -1110,7 +1110,7 @@ ProcessLangEntry(
}
wcscpy((PWCHAR)*UserData, KeyName);
sprintf(DisplayText, "%S", KeyValue);
wcscpy(DisplayText, KeyValue);
*Current = FALSE;