Some tchar fixes

svn path=/trunk/; revision=24212
This commit is contained in:
Thomas Bluemel 2006-09-20 09:54:00 +00:00
parent d0e354f6c1
commit 8e90ccee4d
3 changed files with 12 additions and 10 deletions

View file

@ -4,9 +4,10 @@
#include <windows.h> #include <windows.h>
#include <commctrl.h> #include <commctrl.h>
#include <tchar.h> #include <tchar.h>
#include <stdio.h>
#include <lm.h> #include <lm.h>
#include <cpl.h> #include <cpl.h>
#include <shellapi.h> //shellexecute #include <shellapi.h>
#include "resource.h" #include "resource.h"
#define NUM_APPLETS (1) #define NUM_APPLETS (1)

View file

@ -1,8 +1,6 @@
<module name="sysdm" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_SYSDM}" installbase="system32" installname="sysdm.cpl" usewrc="false"> <module name="sysdm" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_SYSDM}" installbase="system32" installname="sysdm.cpl" usewrc="false" unicode="yes">
<importlibrary definition="sysdm.def" /> <importlibrary definition="sysdm.def" />
<include base="sysdm">.</include> <include base="sysdm">.</include>
<define name="UNICODE" />
<define name="_UNICODE" />
<define name="__REACTOS__" /> <define name="__REACTOS__" />
<define name="__USE_W32API" /> <define name="__USE_W32API" />
<define name="_WIN32_IE">0x600</define> <define name="_WIN32_IE">0x600</define>
@ -31,4 +29,5 @@
<file>userprofile.c</file> <file>userprofile.c</file>
<file>virtmem.c</file> <file>virtmem.c</file>
<file>sysdm.rc</file> <file>sysdm.rc</file>
<pch>precomp.h</pch>
</module> </module>

View file

@ -41,6 +41,8 @@ ReadPageFileSettings(PVIRTMEM pVirtMem)
dwDataSize); dwDataSize);
if (pVirtMem->szPagingFiles != NULL) if (pVirtMem->szPagingFiles != NULL)
{ {
ZeroMemory(pVirtMem->szPagingFiles,
dwDataSize);
if(RegQueryValueEx(hkey, if(RegQueryValueEx(hkey,
_T("PagingFiles"), _T("PagingFiles"),
NULL, NULL,
@ -154,7 +156,7 @@ ParseMemSettings(PVIRTMEM pVirtMem)
{ {
TCHAR szVol[MAX_PATH + 2]; TCHAR szVol[MAX_PATH + 2];
wsprintf(szVol, _T("[%s]"), szVolume); _stprintf(szVol, _T("[%s]"), szVolume);
Item.iSubItem = 1; Item.iSubItem = 1;
Item.pszText = szVol; Item.pszText = szVol;
@ -166,7 +168,7 @@ ParseMemSettings(PVIRTMEM pVirtMem)
{ {
TCHAR szSize[64]; TCHAR szSize[64];
wsprintf(szSize, _T("%i - %i"), InitialSize, MaxSize); _stprintf(szSize, _T("%i - %i"), InitialSize, MaxSize);
Item.iSubItem = 2; Item.iSubItem = 2;
Item.pszText = szSize; Item.pszText = szSize;
@ -198,10 +200,10 @@ WritePageFileSettings(PVIRTMEM pVirtMem)
{ {
TCHAR szText[256]; TCHAR szText[256];
wsprintf(szText, _T("%s\\pagefile.sys %i %i"), _stprintf(szText, _T("%s\\pagefile.sys %i %i"),
pVirtMem->Pagefile[i].szDrive, pVirtMem->Pagefile[i].szDrive,
pVirtMem->Pagefile[i].InitialValue, pVirtMem->Pagefile[i].InitialValue,
pVirtMem->Pagefile[i].MaxValue); pVirtMem->Pagefile[i].MaxValue);
/* Add it to our overall registry string */ /* Add it to our overall registry string */
lstrcat(szPagingFiles + nPos, szText); lstrcat(szPagingFiles + nPos, szText);