Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-16 09:26:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix TCHAR/WCHAR mixtures

Browse source 
spotted by Christoph_vW

svn path=/trunk/; revision=22527
This commit is contained in:
Johannes Anderwald 2006-06-23 17:14:29 +00:00
parent 06cb1d0c38
commit 3a721c0824
5 changed files with 43 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/cpl/powercfg/advanced.c
View file

@ -137,7 +137,7 @@ POWER_ACTION GetPowerActionFromPolicy(POWER_ACTION_POLICY * Policy)
// to PowerActionNone and sets the Flags & EventCode // to PowerActionNone and sets the Flags & EventCode
swprintf(szBuffer, L"Action: %x EventCode %x Flags %x",Policy->Action, Policy->EventCode, Policy->Flags); _stprintf(szBuffer, L"Action: %x EventCode %x Flags %x",Policy->Action, Policy->EventCode, Policy->Flags);
MessageBoxW(NULL, szBuffer, NULL, MB_OK); MessageBoxW(NULL, szBuffer, NULL, MB_OK);
*/ */

31
reactos/dll/cpl/powercfg/alarms.c
View file

@ -14,6 +14,7 @@
#include <commctrl.h> #include <commctrl.h>
#include <cpl.h> #include <cpl.h>
#include <stdio.h> #include <stdio.h>
#include <tchar.h>
#include "resource.h" #include "resource.h"
#include "powercfg.h" #include "powercfg.h"
@ -69,19 +70,19 @@ BOOLEAN Ala_InitData(HWND hwndDlg)
if (LoadString(hApplet, IDS_PROCENT, szTemp, MAX_PATH)) if (LoadString(hApplet, IDS_PROCENT, szTemp, MAX_PATH))
{ {
swprintf(szBatteryLevel,szTemp,gGPP.user.DischargePolicy[DISCHARGE_POLICY_LOW].BatteryLevel); _stprintf(szBatteryLevel,szTemp,gGPP.user.DischargePolicy[DISCHARGE_POLICY_LOW].BatteryLevel);
SetWindowText(GetDlgItem(hwndDlg, IDC_ALARMVALUE1),szBatteryLevel); SetWindowText(GetDlgItem(hwndDlg, IDC_ALARMVALUE1),szBatteryLevel);
} }
SendMessageW(GetDlgItem(hwndDlg, IDC_ALARMBAR1), SendMessage(GetDlgItem(hwndDlg, IDC_ALARMBAR1),
TBM_SETRANGE, TBM_SETRANGE,
(WPARAM)TRUE, (WPARAM)TRUE,
(LPARAM)MAKELONG(0, 100)); (LPARAM)MAKELONG(0, 100));
SendMessageW(GetDlgItem(hwndDlg, IDC_ALARMBAR1), SendMessage(GetDlgItem(hwndDlg, IDC_ALARMBAR1),
TBM_SETTICFREQ, TBM_SETTICFREQ,
(WPARAM)TRUE, (WPARAM)TRUE,
(LPARAM)20); (LPARAM)20);
SendMessageW(GetDlgItem(hwndDlg, IDC_ALARMBAR1), SendMessage(GetDlgItem(hwndDlg, IDC_ALARMBAR1),
TBM_SETPOS, TBM_SETPOS,
(WPARAM)TRUE, (WPARAM)TRUE,
(LPARAM)gGPP.user.DischargePolicy[DISCHARGE_POLICY_LOW].BatteryLevel); (LPARAM)gGPP.user.DischargePolicy[DISCHARGE_POLICY_LOW].BatteryLevel);
@ -100,14 +101,14 @@ BOOLEAN Ala_InitData(HWND hwndDlg)
{ {
if (LoadString(hApplet, IDS_SOUND, szSound, MAX_PATH) && LoadString(hApplet, IDS_TEXT, szText, MAX_PATH)) if (LoadString(hApplet, IDS_SOUND, szSound, MAX_PATH) && LoadString(hApplet, IDS_TEXT, szText, MAX_PATH))
{ {
swprintf(szMessage,L"%s, %s",szSound,szText); _stprintf(szMessage,_T("%s, %s"),szSound,szText);
} }
} }
else else
{ {
if (LoadString(hApplet, IDS_TEXT, szText, MAX_PATH)) if (LoadString(hApplet, IDS_TEXT, szText, MAX_PATH))
{ {
swprintf(szMessage,L"%s",szText); _stprintf(szMessage,_T("%s"),szText);
} }
} }
} }
@ -117,7 +118,7 @@ BOOLEAN Ala_InitData(HWND hwndDlg)
{ {
if (LoadString(hApplet, IDS_SOUND, szSound, MAX_PATH)) if (LoadString(hApplet, IDS_SOUND, szSound, MAX_PATH))
{ {
swprintf(szMessage,L"%s",szSound); _stprintf(szMessage,_T("%s"),szSound);
} }
} }
} }
@ -131,28 +132,28 @@ BOOLEAN Ala_InitData(HWND hwndDlg)
} }
if (gGPP.user.DischargePolicy[DISCHARGE_POLICY_CRITICAL].Enable) if (gGPP.user.DischargePolicy[DISCHARGE_POLICY_CRITICAL].Enable)
{ {
SendMessageW(GetDlgItem(hwndDlg, IDC_ALARM2), SendMessage(GetDlgItem(hwndDlg, IDC_ALARM2),
BM_SETCHECK, BM_SETCHECK,
(gGPP.user.DischargePolicy[DISCHARGE_POLICY_CRITICAL].Enable ? BST_CHECKED : BST_UNCHECKED), (gGPP.user.DischargePolicy[DISCHARGE_POLICY_CRITICAL].Enable ? BST_CHECKED : BST_UNCHECKED),
(LPARAM)0); (LPARAM)0);
if (LoadString(hApplet, IDS_PROCENT, szTemp, MAX_PATH)) if (LoadString(hApplet, IDS_PROCENT, szTemp, MAX_PATH))
{ {
swprintf(szBatteryLevel,szTemp,gGPP.user.DischargePolicy[DISCHARGE_POLICY_CRITICAL].BatteryLevel); _stprintf(szBatteryLevel,szTemp,gGPP.user.DischargePolicy[DISCHARGE_POLICY_CRITICAL].BatteryLevel);
SetWindowText(GetDlgItem(hwndDlg, IDC_ALARMVALUE2),szBatteryLevel); SetWindowText(GetDlgItem(hwndDlg, IDC_ALARMVALUE2),szBatteryLevel);
} }
SendMessageW(GetDlgItem(hwndDlg, IDC_ALARMBAR2), SendMessage(GetDlgItem(hwndDlg, IDC_ALARMBAR2),
TBM_SETRANGE, TBM_SETRANGE,
(WPARAM)TRUE, (WPARAM)TRUE,
(LPARAM)MAKELONG(0, 100)); (LPARAM)MAKELONG(0, 100));
SendMessageW(GetDlgItem(hwndDlg, IDC_ALARMBAR2), SendMessage(GetDlgItem(hwndDlg, IDC_ALARMBAR2),
TBM_SETPOS, TBM_SETPOS,
(WPARAM)TRUE, (WPARAM)TRUE,
(LPARAM)gGPP.user.DischargePolicy[DISCHARGE_POLICY_CRITICAL].BatteryLevel); (LPARAM)gGPP.user.DischargePolicy[DISCHARGE_POLICY_CRITICAL].BatteryLevel);
if (LoadString(hApplet, gGPP.user.DischargePolicy[DISCHARGE_POLICY_CRITICAL].PowerPolicy.Action+IDS_PowerActionNone1, szAction, MAX_PATH)) if (LoadString(hApplet, gGPP.user.DischargePolicy[DISCHARGE_POLICY_CRITICAL].PowerPolicy.Action+IDS_PowerActionNone1, szAction, MAX_PATH))
{ {
SendMessageW(GetDlgItem(hwndDlg, IDC_ALARMAKTION2), SendMessage(GetDlgItem(hwndDlg, IDC_ALARMAKTION2),
WM_SETTEXT, WM_SETTEXT,
(WPARAM)0, (WPARAM)0,
(LPARAM)szAction); (LPARAM)szAction);
@ -167,14 +168,14 @@ BOOLEAN Ala_InitData(HWND hwndDlg)
{ {
if (LoadString(hApplet, IDS_TEXT, szText, MAX_PATH) && LoadString(hApplet, IDS_SOUND, szSound, MAX_PATH)) if (LoadString(hApplet, IDS_TEXT, szText, MAX_PATH) && LoadString(hApplet, IDS_SOUND, szSound, MAX_PATH))
{ {
swprintf(szMessage,L"%s, %s",szSound,szText); _stprintf(szMessage,_T("%s, %s"),szSound,szText);
} }
} }
else else
{ {
if (LoadString(hApplet, IDS_TEXT, szText, MAX_PATH)) if (LoadString(hApplet, IDS_TEXT, szText, MAX_PATH))
{ {
swprintf(szMessage,L"%s",szText); _stprintf(szMessage,_T("%s"),szText);
} }
} }
} }
@ -184,7 +185,7 @@ BOOLEAN Ala_InitData(HWND hwndDlg)
{ {
if (LoadString(hApplet, IDS_SOUND, szSound, MAX_PATH)) if (LoadString(hApplet, IDS_SOUND, szSound, MAX_PATH))
{ {
swprintf(szMessage,L"%s",szSound); _stprintf(szMessage,_T("%s"),szSound);
} }
} }
} }

19
reactos/dll/cpl/powercfg/hibernate.c
View file

@ -15,6 +15,7 @@
#include <commctrl.h> #include <commctrl.h>
#include <cpl.h> #include <cpl.h>
#include <stdio.h> #include <stdio.h>
#include <tchar.h>
#include "resource.h" #include "resource.h"
#include "powercfg.h" #include "powercfg.h"
@ -65,22 +66,22 @@ void Hib_InitDialog(HWND hwndDlg)
{ {
SYSTEM_POWER_CAPABILITIES PowerCaps; SYSTEM_POWER_CAPABILITIES PowerCaps;
MEMORYSTATUSEX msex; MEMORYSTATUSEX msex;
WCHAR szSize[MAX_PATH]; TCHAR szSize[MAX_PATH];
WCHAR szTemp[MAX_PATH]; TCHAR szTemp[MAX_PATH];
ULARGE_INTEGER FreeBytesAvailable, TotalNumberOfBytes, TotalNumberOfFreeBytes; ULARGE_INTEGER FreeBytesAvailable, TotalNumberOfBytes, TotalNumberOfFreeBytes;
if (GetPwrCapabilities(&PowerCaps)) if (GetPwrCapabilities(&PowerCaps))
{ {
if (PowerCaps.HiberFilePresent) if (PowerCaps.HiberFilePresent)
{ {
SendMessageW(GetDlgItem(hwndDlg, IDC_HIBERNATEFILE), SendMessage(GetDlgItem(hwndDlg, IDC_HIBERNATEFILE),
BM_SETCHECK, BM_SETCHECK,
(WPARAM)BST_CHECKED, (WPARAM)BST_CHECKED,
(LPARAM)0); (LPARAM)0);
} }
else else
{ {
SendMessageW(GetDlgItem(hwndDlg, IDC_HIBERNATEFILE), SendMessage(GetDlgItem(hwndDlg, IDC_HIBERNATEFILE),
BM_SETCHECK, BM_SETCHECK,
(WPARAM)BST_UNCHECKED, (WPARAM)BST_UNCHECKED,
(LPARAM)0); (LPARAM)0);
@ -106,7 +107,7 @@ void Hib_InitDialog(HWND hwndDlg)
{ {
if (LoadString(hApplet, IDS_SIZEMB, szTemp, MAX_PATH)) if (LoadString(hApplet, IDS_SIZEMB, szTemp, MAX_PATH))
{ {
swprintf(szSize,szTemp,TotalNumberOfFreeBytes.QuadPart / 0x100000); _stprintf(szSize,szTemp,TotalNumberOfFreeBytes.QuadPart / 0x100000);
SetWindowText(GetDlgItem(hwndDlg, IDC_FREESPACE),szSize); SetWindowText(GetDlgItem(hwndDlg, IDC_FREESPACE),szSize);
} }
} }
@ -114,7 +115,7 @@ void Hib_InitDialog(HWND hwndDlg)
{ {
if (LoadString(hApplet, IDS_SIZEBYTS, szTemp, MAX_PATH)) if (LoadString(hApplet, IDS_SIZEBYTS, szTemp, MAX_PATH))
{ {
swprintf(szSize,szTemp,TotalNumberOfFreeBytes.QuadPart); _stprintf(szSize,szTemp,TotalNumberOfFreeBytes.QuadPart);
SetWindowText(GetDlgItem(hwndDlg, IDC_FREESPACE),szSize); SetWindowText(GetDlgItem(hwndDlg, IDC_FREESPACE),szSize);
} }
} }
@ -123,7 +124,7 @@ void Hib_InitDialog(HWND hwndDlg)
{ {
if (LoadString(hApplet, IDS_SIZEMB, szTemp, MAX_PATH)) if (LoadString(hApplet, IDS_SIZEMB, szTemp, MAX_PATH))
{ {
swprintf(szSize,szTemp,msex.ullTotalPhys/0x100000); _stprintf(szSize,szTemp,msex.ullTotalPhys/0x100000);
SetWindowText(GetDlgItem(hwndDlg, IDC_SPACEFORHIBERNATEFILE),szSize); SetWindowText(GetDlgItem(hwndDlg, IDC_SPACEFORHIBERNATEFILE),szSize);
} }
} }
@ -131,7 +132,7 @@ void Hib_InitDialog(HWND hwndDlg)
{ {
if (LoadString(hApplet, IDS_SIZEBYTS, szTemp, MAX_PATH)) if (LoadString(hApplet, IDS_SIZEBYTS, szTemp, MAX_PATH))
{ {
swprintf(szSize,szTemp,msex.ullTotalPhys); _stprintf(szSize,szTemp,msex.ullTotalPhys);
SetWindowText(GetDlgItem(hwndDlg, IDC_SPACEFORHIBERNATEFILE),szSize); SetWindowText(GetDlgItem(hwndDlg, IDC_SPACEFORHIBERNATEFILE),szSize);
} }
} }
@ -152,7 +153,7 @@ INT_PTR Hib_SaveData(HWND hwndDlg)
{ {
BOOLEAN bHibernate; BOOLEAN bHibernate;
bHibernate = (BOOLEAN)SendMessageW(GetDlgItem(hwndDlg, IDC_HIBERNATEFILE), bHibernate = (BOOLEAN)SendMessage(GetDlgItem(hwndDlg, IDC_HIBERNATEFILE),
BM_GETCHECK, BM_GETCHECK,
(WPARAM)0, (WPARAM)0,
(LPARAM)0); (LPARAM)0);

2
reactos/dll/cpl/powercfg/powercfg.c
View file

@ -27,7 +27,7 @@ INT_PTR CALLBACK hibernateProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lP
HINSTANCE hApplet = 0; HINSTANCE hApplet = 0;
GLOBAL_POWER_POLICY gGPP; GLOBAL_POWER_POLICY gGPP;
WCHAR langSel[255]; TCHAR langSel[255];
/* Applets */ /* Applets */
APPLET Applets[NUM_APPLETS] = APPLET Applets[NUM_APPLETS] =

30
reactos/dll/cpl/powercfg/powershemes.c
View file

@ -220,7 +220,7 @@ BOOLEAN Pos_InitData()
return TRUE; return TRUE;
} }
BOOLEAN CALLBACK callback_EnumPwrScheme(UINT uiIndex, DWORD dwName, LPWSTR sName, DWORD dwDesc, BOOLEAN CALLBACK callback_EnumPwrScheme(UINT uiIndex, DWORD dwName, LPTSTR sName, DWORD dwDesc,
LPWSTR sDesc, PPOWER_POLICY pp,LPARAM lParam ) LPWSTR sDesc, PPOWER_POLICY pp,LPARAM lParam )
{ {
int index; int index;
@ -237,21 +237,21 @@ BOOLEAN CALLBACK callback_EnumPwrScheme(UINT uiIndex, DWORD dwName, LPWSTR sName
memcpy(&gPP[guiIndex], pp, sizeof(POWER_POLICY)); memcpy(&gPP[guiIndex], pp, sizeof(POWER_POLICY));
guiIndex++; guiIndex++;
index = SendMessageW(hList, index = SendMessage(hList,
CB_ADDSTRING, CB_ADDSTRING,
0, 0,
(LPARAM)sName); (LPARAM)sName);
if (index == CB_ERR) if (index == CB_ERR)
return FALSE; return FALSE;
SendMessageW(hList, SendMessage(hList,
CB_SETITEMDATA, CB_SETITEMDATA,
index, index,
(LPARAM)uiIndex); (LPARAM)uiIndex);
if (aps == uiIndex) if (aps == uiIndex)
{ {
SendMessageW(hList, SendMessage(hList,
CB_SELECTSTRING, CB_SELECTSTRING,
TRUE, TRUE,
(LPARAM)sName); (LPARAM)sName);
@ -307,7 +307,7 @@ void Pos_InitPage(HWND hwndDlg)
{ {
int ifrom=0,i=0,imin=0; int ifrom=0,i=0,imin=0;
HWND hwnd = NULL; HWND hwnd = NULL;
WCHAR szName[MAX_PATH]; TCHAR szName[MAX_PATH];
LRESULT index; LRESULT index;
for(i=1;i<9;i++) for(i=1;i<9;i++)
@ -353,7 +353,7 @@ void Pos_InitPage(HWND hwndDlg)
{ {
if (LoadString(hApplet, ifrom, szName, MAX_PATH)) if (LoadString(hApplet, ifrom, szName, MAX_PATH))
{ {
index = SendMessageW(hwnd, index = SendMessage(hwnd,
CB_ADDSTRING, CB_ADDSTRING,
0, 0,
(LPARAM)szName); (LPARAM)szName);
@ -361,7 +361,7 @@ void Pos_InitPage(HWND hwndDlg)
if (index == CB_ERR) if (index == CB_ERR)
return; return;
SendMessageW(hwnd, SendMessage(hwnd,
CB_SETITEMDATA, CB_SETITEMDATA,
index, index,
(LPARAM)Sec[ifrom-IDS_TIMEOUT16]); (LPARAM)Sec[ifrom-IDS_TIMEOUT16]);
@ -369,14 +369,14 @@ void Pos_InitPage(HWND hwndDlg)
} }
if (LoadString(hApplet, IDS_TIMEOUT16, szName, MAX_PATH)) if (LoadString(hApplet, IDS_TIMEOUT16, szName, MAX_PATH))
{ {
index = SendMessageW(hwnd, index = SendMessage(hwnd,
CB_ADDSTRING, CB_ADDSTRING,
0, 0,
(LPARAM)szName); (LPARAM)szName);
if (index == CB_ERR) if (index == CB_ERR)
return; return;
SendMessageW(hwnd, SendMessage(hwnd,
CB_SETITEMDATA, CB_SETITEMDATA,
index, index,
(LPARAM)Sec[0]); (LPARAM)Sec[0]);
@ -388,12 +388,12 @@ void LoadConfig(HWND hwndDlg)
{ {
INT i=0, iCurSel=0; INT i=0, iCurSel=0;
UINT uiIndex; UINT uiIndex;
WCHAR szProfile[MAX_PATH]; TCHAR szProfile[MAX_PATH];
WCHAR szTemp[MAX_PATH]; TCHAR szTemp[MAX_PATH];
WCHAR szConfig[MAX_PATH]; TCHAR szConfig[MAX_PATH];
POWER_POLICY pp; POWER_POLICY pp;
iCurSel = SendMessageW(GetDlgItem(hwndDlg, IDC_ENERGYLIST), iCurSel = SendMessage(GetDlgItem(hwndDlg, IDC_ENERGYLIST),
CB_GETCURSEL, CB_GETCURSEL,
0, 0,
0); 0);
@ -408,7 +408,7 @@ void LoadConfig(HWND hwndDlg)
SendMessage(GetDlgItem(hwndDlg, IDC_ENERGYLIST), CB_GETLBTEXT, uiIndex, (LPARAM)szProfile); SendMessage(GetDlgItem(hwndDlg, IDC_ENERGYLIST), CB_GETLBTEXT, uiIndex, (LPARAM)szProfile);
if(LoadString(hApplet, IDS_CONFIG1, szTemp, MAX_PATH)) if(LoadString(hApplet, IDS_CONFIG1, szTemp, MAX_PATH))
{ {
swprintf(szConfig,szTemp,szProfile); _stprintf(szConfig,szTemp,szProfile);
SetWindowText(GetDlgItem(hwndDlg, IDC_GRPDETAIL),szConfig); SetWindowText(GetDlgItem(hwndDlg, IDC_GRPDETAIL),szConfig);
} }
} }
@ -479,7 +479,7 @@ void Pos_SaveData(HWND hwndDlg)
{ {
INT iCurSel=0,tmp=0; INT iCurSel=0,tmp=0;
iCurSel = SendMessageW(GetDlgItem(hwndDlg, IDC_ENERGYLIST), iCurSel = SendMessage(GetDlgItem(hwndDlg, IDC_ENERGYLIST),
CB_GETCURSEL, CB_GETCURSEL,
0, 0,
0); 0);