11 Dec
2008
11 Dec
'08
11:24 a.m.
Author: cwittich
Date: Thu Dec 11 05:24:32 2008
New Revision: 38012
URL: http://svn.reactos.org/svn/reactos?rev=38012&view=rev
Log:
convert most of syssetup to unicode
Modified:
trunk/reactos/dll/win32/syssetup/globals.h
trunk/reactos/dll/win32/syssetup/install.c
trunk/reactos/dll/win32/syssetup/wizard.c
Modified: trunk/reactos/dll/win32/syssetup/globals.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/globals…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/globals.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/globals.h [iso-8859-1] Thu Dec 11 05:24:32 2008
@@ -30,9 +30,9 @@
{
struct _TIMEZONE_ENTRY *Prev;
struct _TIMEZONE_ENTRY *Next;
- TCHAR Description[64]; /* 'Display' */
- TCHAR StandardName[32]; /* 'Std' */
- TCHAR DaylightName[32]; /* 'Dlt' */
+ WCHAR Description[64]; /* 'Display' */
+ WCHAR StandardName[32]; /* 'Std' */
+ WCHAR DaylightName[32]; /* 'Dlt' */
TZ_INFO TimezoneInfo; /* 'TZI' */
ULONG Index;
} TIMEZONE_ENTRY, *PTIMEZONE_ENTRY;
@@ -41,10 +41,10 @@
{
HFONT hTitleFont;
- TCHAR OwnerName[51];
- TCHAR OwnerOrganization[51];
- TCHAR ComputerName[MAX_COMPUTERNAME_LENGTH + 1]; /* max. 63 characters */
- TCHAR AdminPassword[15]; /* max. 14 characters */
+ WCHAR OwnerName[51];
+ WCHAR OwnerOrganization[51];
+ WCHAR ComputerName[MAX_COMPUTERNAME_LENGTH + 1]; /* max. 63 characters */
+ WCHAR AdminPassword[15]; /* max. 14 characters */
BOOL UnattendSetup;
BOOL DisableVmwInst;
DWORD BootCDRegtestActive;
Modified: trunk/reactos/dll/win32/syssetup/install.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Thu Dec 11 05:24:32 2008
@@ -304,13 +304,13 @@
CreateTempDir(
IN LPCWSTR VarName)
{
- TCHAR szTempDir[MAX_PATH];
- TCHAR szBuffer[MAX_PATH];
+ WCHAR szTempDir[MAX_PATH];
+ WCHAR szBuffer[MAX_PATH];
DWORD dwLength;
HKEY hKey;
- if (RegOpenKeyEx(HKEY_LOCAL_MACHINE,
- _T("SYSTEM\\CurrentControlSet\\Control\\Session
Manager\\Environment"),
+ if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,
+ L"SYSTEM\\CurrentControlSet\\Control\\Session
Manager\\Environment",
0,
KEY_QUERY_VALUE,
&hKey))
@@ -320,8 +320,8 @@
}
/* Get temp dir */
- dwLength = MAX_PATH * sizeof(TCHAR);
- if (RegQueryValueEx(hKey,
+ dwLength = MAX_PATH * sizeof(WCHAR);
+ if (RegQueryValueExW(hKey,
VarName,
NULL,
NULL,
@@ -334,7 +334,7 @@
}
/* Expand it */
- if (!ExpandEnvironmentStrings(szBuffer,
+ if (!ExpandEnvironmentStringsW(szBuffer,
szTempDir,
MAX_PATH))
{
@@ -344,7 +344,7 @@
}
/* Create profiles directory */
- if (!CreateDirectory(szTempDir, NULL))
+ if (!CreateDirectoryW(szTempDir, NULL))
{
if (GetLastError() != ERROR_ALREADY_EXISTS)
{
@@ -362,11 +362,11 @@
InstallSysSetupInfDevices(VOID)
{
INFCONTEXT InfContext;
- TCHAR LineBuffer[256];
+ WCHAR LineBuffer[256];
DWORD LineLength;
- if (!SetupFindFirstLine(hSysSetupInf,
- _T("DeviceInfsToInstall"),
+ if (!SetupFindFirstLineW(hSysSetupInf,
+ L"DeviceInfsToInstall",
NULL,
&InfContext))
{
@@ -375,7 +375,7 @@
do
{
- if (!SetupGetStringField(&InfContext,
+ if (!SetupGetStringFieldW(&InfContext,
0,
LineBuffer,
sizeof(LineBuffer)/sizeof(LineBuffer[0]),
@@ -384,7 +384,7 @@
return FALSE;
}
- if (!SetupDiInstallClass(NULL, LineBuffer, DI_QUIETINSTALL, NULL))
+ if (!SetupDiInstallClassW(NULL, LineBuffer, DI_QUIETINSTALL, NULL))
{
return FALSE;
}
@@ -397,12 +397,12 @@
InstallSysSetupInfComponents(VOID)
{
INFCONTEXT InfContext;
- TCHAR NameBuffer[256];
- TCHAR SectionBuffer[256];
+ WCHAR NameBuffer[256];
+ WCHAR SectionBuffer[256];
HINF hComponentInf = INVALID_HANDLE_VALUE;
- if (!SetupFindFirstLine(hSysSetupInf,
- _T("Infs.Always"),
+ if (!SetupFindFirstLineW(hSysSetupInf,
+ L"Infs.Always",
NULL,
&InfContext))
{
@@ -412,7 +412,7 @@
{
do
{
- if (!SetupGetStringField(&InfContext,
+ if (!SetupGetStringFieldW(&InfContext,
1, // Get the component name
NameBuffer,
sizeof(NameBuffer)/sizeof(NameBuffer[0]),
@@ -422,7 +422,7 @@
return FALSE;
}
- if (!SetupGetStringField(&InfContext,
+ if (!SetupGetStringFieldW(&InfContext,
2, // Get the component install section
SectionBuffer,
sizeof(SectionBuffer)/sizeof(SectionBuffer[0]),
@@ -445,7 +445,7 @@
return FALSE;
}
- if (!SetupInstallFromInfSection(NULL,
+ if (!SetupInstallFromInfSectionW(NULL,
hComponentInf,
SectionBuffer,
SPINST_ALL,
@@ -481,18 +481,18 @@
if (hSCManager == NULL)
goto cleanup;
- hService = OpenService(hSCManager, _T("PlugPlay"), SERVICE_CHANGE_CONFIG |
SERVICE_START);
+ hService = OpenServiceW(hSCManager, L"PlugPlay", SERVICE_CHANGE_CONFIG |
SERVICE_START);
if (hService == NULL)
goto cleanup;
- ret = ChangeServiceConfig(
+ ret = ChangeServiceConfigW(
hService,
SERVICE_NO_CHANGE, SERVICE_AUTO_START, SERVICE_NO_CHANGE,
NULL, NULL, NULL, NULL, NULL, NULL, NULL);
if (!ret)
goto cleanup;
- ret = StartService(hService, 0, NULL);
+ ret = StartServiceW(hService, 0, NULL);
if (!ret)
goto cleanup;
@@ -520,11 +520,11 @@
{
case WM_INITDIALOG:
{
- TCHAR szMsg[256];
-
- if (!LoadString(hDllInstance, IDS_STATUS_INSTALL_DEV, szMsg,
sizeof(szMsg)/sizeof(szMsg[0])))
+ WCHAR szMsg[256];
+
+ if (!LoadStringW(hDllInstance, IDS_STATUS_INSTALL_DEV, szMsg,
sizeof(szMsg)/sizeof(szMsg[0])))
return FALSE;
- SetDlgItemText(hwndDlg, IDC_STATUSLABEL, szMsg);
+ SetDlgItemTextW(hwndDlg, IDC_STATUSLABEL, szMsg);
return TRUE;
}
}
@@ -705,7 +705,7 @@
DWORD WINAPI
InstallLiveCD(IN HINSTANCE hInstance)
{
- STARTUPINFO StartupInfo;
+ STARTUPINFOW StartupInfo;
PROCESS_INFORMATION ProcessInformation;
BOOL res;
@@ -714,15 +714,15 @@
SetupCloseInfFile(hSysSetupInf);
/* Run the shell */
- StartupInfo.cb = sizeof(StartupInfo);
+ StartupInfo.cb = sizeof(STARTUPINFOW);
StartupInfo.lpReserved = NULL;
StartupInfo.lpDesktop = NULL;
StartupInfo.lpTitle = NULL;
StartupInfo.dwFlags = 0;
StartupInfo.cbReserved2 = 0;
StartupInfo.lpReserved2 = 0;
- res = CreateProcess(
- _T("userinit.exe"),
+ res = CreateProcessW(
+ L"userinit.exe",
NULL,
NULL,
NULL,
@@ -738,10 +738,10 @@
return 0;
cleanup:
- MessageBoxA(
+ MessageBoxW(
NULL,
- "You can shutdown your computer, or press ENTER to reboot",
- "ReactOS LiveCD",
+ L"You can shutdown your computer, or press ENTER to reboot",
+ L"ReactOS LiveCD",
MB_OK);
return 0;
}
Modified: trunk/reactos/dll/win32/syssetup/wizard.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Thu Dec 11 05:24:32 2008
@@ -14,7 +14,6 @@
#include <windows.h>
#include <windowsx.h>
#include <commctrl.h>
-#include <tchar.h>
#include <string.h>
#include <setupapi.h>
#include <pseh/pseh2.h>
@@ -71,12 +70,12 @@
PROCESS_INFORMATION ProcInfo;
MSG msg;
DWORD ret;
- STARTUPINFO si = {0};
+ STARTUPINFOW si = {0};
WCHAR InstallName[] = L"vmwinst.exe";
si.cb = sizeof(STARTUPINFO);
- if(CreateProcess(NULL, InstallName, NULL, NULL, TRUE, NORMAL_PRIORITY_CLASS,
+ if(CreateProcessW(NULL, InstallName, NULL, NULL, TRUE, NORMAL_PRIORITY_CLASS,
NULL, NULL, &si, &ProcInfo))
{
EnableWindow(hWnd, FALSE);
@@ -132,13 +131,13 @@
static HFONT
CreateTitleFont(VOID)
{
- NONCLIENTMETRICS ncm;
+ NONCLIENTMETRICSW ncm;
LOGFONTW LogFont;
HDC hdc;
INT FontSize;
HFONT hFont;
- ncm.cbSize = sizeof(NONCLIENTMETRICS);
+ ncm.cbSize = sizeof(NONCLIENTMETRICSW);
SystemParametersInfo(SPI_GETNONCLIENTMETRICS, 0, &ncm, 0);
LogFont = ncm.lfMessageFont;
@@ -171,7 +170,7 @@
switch (uMsg)
{
case WM_INITDIALOG:
- GplTextResource = FindResource(hDllInstance, MAKEINTRESOURCE(IDR_GPL),
_T("RT_TEXT"));
+ GplTextResource = FindResourceW(hDllInstance, MAKEINTRESOURCE(IDR_GPL),
L"RT_TEXT");
if (NULL == GplTextResource)
{
break;
@@ -323,7 +322,7 @@
{
return FALSE;
}
- ProjectsCount = LoadString(hDllInstance, IDS_ACKPROJECTS, Projects,
ProjectsSize);
+ ProjectsCount = LoadStringW(hDllInstance, IDS_ACKPROJECTS, Projects,
ProjectsSize);
if (0 == ProjectsCount)
{
HeapFree(GetProcessHeap(), 0, Projects);
@@ -401,16 +400,16 @@
static
BOOL
-WriteOwnerSettings(TCHAR * OwnerName,
- TCHAR * OwnerOrganization)
+WriteOwnerSettings(WCHAR * OwnerName,
+ WCHAR * OwnerOrganization)
{
HKEY hKey;
LONG res;
- res = RegOpenKeyEx(HKEY_LOCAL_MACHINE,
- _T("Software\\Microsoft\\Windows NT\\CurrentVersion"),
+ res = RegOpenKeyExW(HKEY_LOCAL_MACHINE,
+ L"Software\\Microsoft\\Windows NT\\CurrentVersion",
0,
KEY_ALL_ACCESS,
&hKey);
@@ -420,12 +419,12 @@
return FALSE;
}
- res = RegSetValueEx(hKey,
- _T("RegisteredOwner"),
+ res = RegSetValueExW(hKey,
+ L"RegisteredOwner",
0,
REG_SZ,
(LPBYTE)OwnerName,
- (_tcslen(OwnerName) + 1) * sizeof(TCHAR));
+ (wcslen(OwnerName) + 1) * sizeof(WCHAR));
if (res != ERROR_SUCCESS)
{
@@ -433,12 +432,12 @@
return FALSE;
}
- res = RegSetValueEx(hKey,
- _T("RegisteredOrganization"),
+ res = RegSetValueExW(hKey,
+ L"RegisteredOrganization",
0,
REG_SZ,
(LPBYTE)OwnerOrganization,
- (_tcslen(OwnerOrganization) + 1) * sizeof(TCHAR));
+ (wcslen(OwnerOrganization) + 1) * sizeof(WCHAR));
RegCloseKey(hKey);
return (res == ERROR_SUCCESS);
@@ -450,8 +449,8 @@
WPARAM wParam,
LPARAM lParam)
{
- TCHAR OwnerName[51];
- TCHAR OwnerOrganization[51];
+ WCHAR OwnerName[51];
+ WCHAR OwnerOrganization[51];
WCHAR Title[64];
WCHAR ErrorName[256];
LPNMHDR lpnm;
@@ -492,7 +491,7 @@
case PSN_WIZNEXT:
OwnerName[0] = 0;
- if (GetDlgItemText(hwndDlg, IDC_OWNERNAME, OwnerName, 50) == 0)
+ if (GetDlgItemTextW(hwndDlg, IDC_OWNERNAME, OwnerName, 50) == 0)
{
if (0 == LoadStringW(hDllInstance, IDS_REACTOS_SETUP, Title,
sizeof(Title) / sizeof(Title[0])))
{
@@ -502,7 +501,7 @@
{
wcscpy(ErrorName, L"Setup cannot continue until you enter your
name.");
}
- MessageBox(hwndDlg, ErrorName, Title, MB_ICONERROR | MB_OK);
+ MessageBoxW(hwndDlg, ErrorName, Title, MB_ICONERROR | MB_OK);
SetFocus(GetDlgItem(hwndDlg, IDC_OWNERNAME));
SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
@@ -538,11 +537,11 @@
}
static
BOOL
-WriteComputerSettings(TCHAR * ComputerName, HWND hwndDlg)
+WriteComputerSettings(WCHAR * ComputerName, HWND hwndDlg)
{
WCHAR Title[64];
WCHAR ErrorComputerName[256];
- if (!SetComputerName(ComputerName))
+ if (!SetComputerNameW(ComputerName))
{
if (0 == LoadStringW(hDllInstance, IDS_REACTOS_SETUP, Title, sizeof(Title) /
sizeof(Title[0])))
{
@@ -559,7 +558,7 @@
}
/* Try to also set DNS hostname */
- SetComputerNameEx(ComputerNamePhysicalDnsHostname, ComputerName);
+ SetComputerNameExW(ComputerNamePhysicalDnsHostname, ComputerName);
return TRUE;
}
@@ -570,9 +569,9 @@
WPARAM wParam,
LPARAM lParam)
{
- TCHAR ComputerName[MAX_COMPUTERNAME_LENGTH + 1];
- TCHAR Password1[15];
- TCHAR Password2[15];
+ WCHAR ComputerName[MAX_COMPUTERNAME_LENGTH + 1];
+ WCHAR Password1[15];
+ WCHAR Password2[15];
PWCHAR Password;
WCHAR Title[64];
WCHAR EmptyComputerName[256], NotMatchPassword[256], WrongPassword[256];
@@ -590,10 +589,10 @@
{
/* Retrieve current computer name */
Length = MAX_COMPUTERNAME_LENGTH + 1;
- GetComputerName(ComputerName, &Length);
+ GetComputerNameW(ComputerName, &Length);
/* Display current computer name */
- SetDlgItemText(hwndDlg, IDC_COMPUTERNAME, ComputerName);
+ SetDlgItemTextW(hwndDlg, IDC_COMPUTERNAME, ComputerName);
/* Set text limits */
SendDlgItemMessage(hwndDlg, IDC_COMPUTERNAME, EM_LIMITTEXT, 64, 0);
@@ -630,7 +629,7 @@
break;
case PSN_WIZNEXT:
- if (GetDlgItemText(hwndDlg, IDC_COMPUTERNAME, ComputerName, 64) == 0)
+ if (GetDlgItemTextW(hwndDlg, IDC_COMPUTERNAME, ComputerName, 64) == 0)
{
if (0 == LoadStringW(hDllInstance, IDS_WZD_COMPUTERNAME,
EmptyComputerName,
sizeof(EmptyComputerName) /
sizeof(EmptyComputerName[0])))
@@ -668,11 +667,11 @@
return TRUE;
}
#else
- GetDlgItemText(hwndDlg, IDC_ADMINPASSWORD1, Password1, 15);
- GetDlgItemText(hwndDlg, IDC_ADMINPASSWORD2, Password2, 15);
+ GetDlgItemTextW(hwndDlg, IDC_ADMINPASSWORD1, Password1, 15);
+ GetDlgItemTextW(hwndDlg, IDC_ADMINPASSWORD2, Password2, 15);
#endif
/* Check if passwords match */
- if (_tcscmp(Password1, Password2))
+ if (wcscmp(Password1, Password2))
{
if (0 == LoadStringW(hDllInstance, IDS_WZD_PASSWORDMATCH,
NotMatchPassword,
sizeof(NotMatchPassword) /
sizeof(NotMatchPassword[0])))
@@ -894,7 +893,7 @@
WCHAR szPath[MAX_PATH];
if (GetRosInstallCD(szPath, MAX_PATH))
{
- wsprintf(szBuffer, L"rundll32.exe shell32.dll,Control_RunDLL
intl.cpl,,/f:\"%s\\reactos\\unattend.inf\"", szPath);
+ swprintf(szBuffer, L"rundll32.exe shell32.dll,Control_RunDLL
intl.cpl,,/f:\"%S\\reactos\\unattend.inf\"", szPath);
}
else
{
@@ -949,7 +948,7 @@
static VOID
CreateTimeZoneList(PSETUPDATA SetupData)
{
- TCHAR szKeyName[256];
+ WCHAR szKeyName[256];
DWORD dwIndex;
DWORD dwNameSize;
DWORD dwValueSize;
@@ -960,8 +959,8 @@
PTIMEZONE_ENTRY Entry;
PTIMEZONE_ENTRY Current;
- if (RegOpenKeyEx(HKEY_LOCAL_MACHINE,
- _T("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones"),
+ if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,
+ L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones",
0,
KEY_ALL_ACCESS,
&hZonesKey))
@@ -970,8 +969,8 @@
dwIndex = 0;
while (TRUE)
{
- dwNameSize = 256 * sizeof(TCHAR);
- lError = RegEnumKeyEx(hZonesKey,
+ dwNameSize = 256 * sizeof(WCHAR);
+ lError = RegEnumKeyExW(hZonesKey,
dwIndex,
szKeyName,
&dwNameSize,
@@ -982,7 +981,7 @@
if (lError != ERROR_SUCCESS && lError != ERROR_MORE_DATA)
break;
- if (RegOpenKeyEx(hZonesKey,
+ if (RegOpenKeyExW(hZonesKey,
szKeyName,
0,
KEY_ALL_ACCESS,
@@ -997,8 +996,8 @@
}
dwValueSize = 64 * sizeof(TCHAR);
- if (RegQueryValueEx(hZoneKey,
- _T("Display"),
+ if (RegQueryValueExW(hZoneKey,
+ L"Display",
NULL,
NULL,
(LPBYTE)&Entry->Description,
@@ -1009,8 +1008,8 @@
}
dwValueSize = 32 * sizeof(TCHAR);
- if (RegQueryValueEx(hZoneKey,
- _T("Std"),
+ if (RegQueryValueExW(hZoneKey,
+ L"Std",
NULL,
NULL,
(LPBYTE)&Entry->StandardName,
@@ -1021,8 +1020,8 @@
}
dwValueSize = 32 * sizeof(WCHAR);
- if (RegQueryValueEx(hZoneKey,
- _T("Dlt"),
+ if (RegQueryValueExW(hZoneKey,
+ L"Dlt",
NULL,
NULL,
(LPBYTE)&Entry->DaylightName,
@@ -1033,8 +1032,8 @@
}
dwValueSize = sizeof(DWORD);
- if (RegQueryValueEx(hZoneKey,
- _T("Index"),
+ if (RegQueryValueExW(hZoneKey,
+ L"Index",
NULL,
NULL,
(LPBYTE)&Entry->Index,
@@ -1045,8 +1044,8 @@
}
dwValueSize = sizeof(TZ_INFO);
- if (RegQueryValueEx(hZoneKey,
- _T("TZI"),
+ if (RegQueryValueExW(hZoneKey,
+ L"TZI",
NULL,
NULL,
(LPBYTE)&Entry->TimezoneInfo,
@@ -1129,26 +1128,26 @@
static BOOL
GetTimeZoneListIndex(LPDWORD lpIndex)
{
- TCHAR szLanguageIdString[9];
+ WCHAR szLanguageIdString[9];
HKEY hKey;
DWORD dwValueSize;
DWORD Length;
- LPTSTR Buffer;
- LPTSTR Ptr;
- LPTSTR End;
+ LPWSTR Buffer;
+ LPWSTR Ptr;
+ LPWSTR End;
BOOL bFound = FALSE;
unsigned long iLanguageID;
- if (RegOpenKeyEx(HKEY_LOCAL_MACHINE,
- _T("SYSTEM\\CurrentControlSet\\Control\\NLS\\Language"),
+ if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,
+ L"SYSTEM\\CurrentControlSet\\Control\\NLS\\Language",
0,
KEY_ALL_ACCESS,
&hKey))
return FALSE;
dwValueSize = 9 * sizeof(TCHAR);
- if (RegQueryValueEx(hKey,
- _T("Default"),
+ if (RegQueryValueExW(hKey,
+ L"Default",
NULL,
NULL,
(LPBYTE)szLanguageIdString,
@@ -1158,19 +1157,19 @@
return FALSE;
}
- iLanguageID = _tcstoul(szLanguageIdString, NULL, 16);
+ iLanguageID = wcstoul(szLanguageIdString, NULL, 16);
RegCloseKey(hKey);
- if (RegOpenKeyEx(HKEY_LOCAL_MACHINE,
- _T("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones"),
+ if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,
+ L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones",
0,
KEY_ALL_ACCESS,
&hKey))
return FALSE;
dwValueSize = 0;
- if (RegQueryValueEx(hKey,
- _T("IndexMapping"),
+ if (RegQueryValueExW(hKey,
+ L"IndexMapping",
NULL,
NULL,
NULL,
@@ -1187,8 +1186,8 @@
return FALSE;
}
- if (RegQueryValueEx(hKey,
- _T("IndexMapping"),
+ if (RegQueryValueExW(hKey,
+ L"IndexMapping",
NULL,
NULL,
(LPBYTE)Buffer,
@@ -1204,8 +1203,8 @@
Ptr = Buffer;
while (*Ptr != 0)
{
- Length = _tcslen(Ptr);
- if (_tcstoul(Ptr, NULL, 16) == iLanguageID)
+ Length = wcslen(Ptr);
+ if (wcstoul(Ptr, NULL, 16) == iLanguageID)
bFound = TRUE;
Ptr = Ptr + Length + 1;
@@ -1214,12 +1213,12 @@
if (bFound)
{
- *lpIndex = _tcstoul(Ptr, &End, 10);
+ *lpIndex = wcstoul(Ptr, &End, 10);
HeapFree(GetProcessHeap(), 0, Buffer);
return TRUE;
}
- Length = _tcslen(Ptr);
+ Length = wcslen(Ptr);
Ptr = Ptr + Length + 1;
}
@@ -1283,9 +1282,9 @@
Entry = Entry->Next;
}
- _tcscpy(TimeZoneInformation.StandardName,
+ wcscpy(TimeZoneInformation.StandardName,
Entry->StandardName);
- _tcscpy(TimeZoneInformation.DaylightName,
+ wcscpy(TimeZoneInformation.DaylightName,
Entry->DaylightName);
TimeZoneInformation.Bias = Entry->TimezoneInfo.Bias;
@@ -2028,38 +2027,38 @@
ProcessUnattendInf(HINF hUnattendedInf)
{
INFCONTEXT InfContext;
- TCHAR szName[256];
- TCHAR szValue[MAX_PATH];
+ WCHAR szName[256];
+ WCHAR szValue[MAX_PATH];
DWORD LineLength;
HKEY hKey;
- if (!SetupFindFirstLine(hUnattendedInf,
- _T("Unattend"),
- _T("UnattendSetupEnabled"),
+ if (!SetupFindFirstLineW(hUnattendedInf,
+ L"Unattend",
+ L"UnattendSetupEnabled",
&InfContext))
{
DPRINT1("Error: Cant find UnattendSetupEnabled Key! %d\n",
GetLastError());
return FALSE;
}
- if (!SetupGetStringField(&InfContext,
+ if (!SetupGetStringFieldW(&InfContext,
1,
szValue,
- sizeof(szValue) / sizeof(TCHAR),
+ sizeof(szValue) / sizeof(WCHAR),
&LineLength))
{
DPRINT1("Error: SetupGetStringField failed with %d\n", GetLastError());
return FALSE;
}
- if (_tcscmp(szValue, _T("yes")) != 0)
+ if (wcscmp(szValue, L"yes") != 0)
{
DPRINT("Unattend setup was disabled by UnattendSetupEnabled key.\n");
return FALSE;
}
- if (!SetupFindFirstLine(hUnattendedInf,
- _T("Unattend"),
+ if (!SetupFindFirstLineW(hUnattendedInf,
+ L"Unattend",
NULL,
&InfContext))
{
@@ -2070,79 +2069,79 @@
do
{
- if (!SetupGetStringField(&InfContext,
+ if (!SetupGetStringFieldW(&InfContext,
0,
szName,
- sizeof(szName) / sizeof(TCHAR),
+ sizeof(szName) / sizeof(WCHAR),
&LineLength))
{
DPRINT1("Error: SetupGetStringField failed with %d\n",
GetLastError());
return FALSE;
}
- if (!SetupGetStringField(&InfContext,
+ if (!SetupGetStringFieldW(&InfContext,
1,
szValue,
- sizeof(szValue) / sizeof(TCHAR),
+ sizeof(szValue) / sizeof(WCHAR),
&LineLength))
{
DPRINT1("Error: SetupGetStringField failed with %d\n",
GetLastError());
return FALSE;
}
DPRINT1("Name %S Value %S\n",szName, szValue);
- if (!_tcscmp(szName, _T("FullName")))
+ if (!wcscmp(szName, L"FullName"))
{
if ((sizeof(SetupData.OwnerName) / sizeof(TCHAR)) > LineLength)
{
- _tcscpy(SetupData.OwnerName, szValue);
+ wcscpy(SetupData.OwnerName, szValue);
}
}
- else if (!_tcscmp(szName, _T("OrgName")))
+ else if (!wcscmp(szName, L"OrgName"))
{
- if ((sizeof(SetupData.OwnerOrganization) / sizeof(TCHAR)) > LineLength)
+ if ((sizeof(SetupData.OwnerOrganization) / sizeof(WCHAR)) > LineLength)
{
- _tcscpy(SetupData.OwnerOrganization, szValue);
+ wcscpy(SetupData.OwnerOrganization, szValue);
}
}
- else if (!_tcscmp(szName, _T("ComputerName")))
+ else if (!wcscmp(szName, L"ComputerName"))
{
- if ((sizeof(SetupData.ComputerName) / sizeof(TCHAR)) > LineLength)
- {
- _tcscpy(SetupData.ComputerName, szValue);
- }
- }
- else if (!_tcscmp(szName, _T("AdminPassword")))
+ if ((sizeof(SetupData.ComputerName) / sizeof(WCHAR)) > LineLength)
+ {
+ wcscpy(SetupData.ComputerName, szValue);
+ }
+ }
+ else if (!wcscmp(szName, L"AdminPassword"))
{
- if ((sizeof(SetupData.AdminPassword) / sizeof(TCHAR)) > LineLength)
+ if ((sizeof(SetupData.AdminPassword) / sizeof(WCHAR)) > LineLength)
{
- _tcscpy(SetupData.AdminPassword, szValue);
+ wcscpy(SetupData.AdminPassword, szValue);
}
}
- else if (!_tcscmp(szName, _T("TimeZoneIndex")))
+ else if (!wcscmp(szName, L"TimeZoneIndex"))
{
- SetupData.TimeZoneIndex = _ttoi(szValue);
+ SetupData.TimeZoneIndex = _wtoi(szValue);
}
- else if (!_tcscmp(szName, _T("DisableAutoDaylightTimeSet")))
+ else if (!wcscmp(szName, L"DisableAutoDaylightTimeSet"))
{
- SetupData.DisableAutoDaylightTimeSet = _ttoi(szValue);
+ SetupData.DisableAutoDaylightTimeSet = _wtoi(szValue);
}
- else if (!_tcscmp(szName, _T("DisableVmwInst")))
+ else if (!wcscmp(szName, L"DisableVmwInst"))
{
- if(!_tcscmp(szValue, _T("yes")))
+ if(!wcscmp(szValue, L"yes"))
SetupData.DisableVmwInst = 1;
else
SetupData.DisableVmwInst = 0;
}
- else if (!_tcscmp(szName, _T("BootCDRegTestActive")))
+ else if (!wcscmp(szName, L"BootCDRegTestActive"))
{
- SetupData.BootCDRegtestActive = _ttoi(szValue);
+ SetupData.BootCDRegtestActive = _wtoi(szValue);
}
}
while (SetupFindNextLine(&InfContext, &InfContext));
- if (RegOpenKeyEx(HKEY_LOCAL_MACHINE,
-
_T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\RunOnce"),
+ if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,
+
L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\RunOnce",
0,
KEY_SET_VALUE,
&hKey) != ERROR_SUCCESS)
@@ -2152,8 +2151,8 @@
}
- if (SetupFindFirstLine(hUnattendedInf,
- _T("GuiRunOnce"),
+ if (SetupFindFirstLineW(hUnattendedInf,
+ L"GuiRunOnce",
NULL,
&InfContext))
{
@@ -2161,25 +2160,25 @@
int i = 0;
do
{
- if(SetupGetStringField(&InfContext,
+ if(SetupGetStringFieldW(&InfContext,
0,
szValue,
- sizeof(szValue) / sizeof(TCHAR),
+ sizeof(szValue) / sizeof(WCHAR),
NULL))
{
- TCHAR szPath[MAX_PATH];
- _stprintf(szName, _T("%d"), i);
+ WCHAR szPath[MAX_PATH];
+ swprintf(szName, L"%d", i);
DPRINT("szName %S szValue %S\n", szName, szValue);
- if (ExpandEnvironmentStrings(szValue, szPath, MAX_PATH))
+ if (ExpandEnvironmentStringsW(szValue, szPath, MAX_PATH))
{
DPRINT("value %S\n", szPath);
- if (RegSetValueEx(hKey,
+ if (RegSetValueExW(hKey,
szName,
0,
REG_SZ,
(const BYTE*)szPath,
- (_tcslen(szPath)+1) * sizeof(TCHAR)) == ERROR_SUCCESS)
+ (wcslen(szPath)+1) * sizeof(WCHAR)) == ERROR_SUCCESS)
{
i++;
}
@@ -2272,7 +2271,7 @@
for (dwIndex = 0; dwIndex < dwLength; dwIndex++)
{
szDrive[0] = pDrive[dwIndex];
- if (GetDriveType(szDrive) == DRIVE_CDROM)
+ if (GetDriveTypeW(szDrive) == DRIVE_CDROM)
{
WCHAR szBuffer[MAX_PATH];
wcscpy(szBuffer, szDrive);