ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-02 04:13:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

[EXPLORER_NEW]

Browse Source 
- Do not use printf for startup debug messages
- Fix some (alas, not all) TCHAR misuse

svn path=/trunk/; revision=58265
This commit is contained in:
Thomas Faber
2013-02-02 11:31:30 +00:00
parent 2c829c1ad2
commit ffc5070e19
4 changed files with 29 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/base/shell/explorer-new/explorer.c
+1 -1
View File
@@ -332,7 +332,7 @@ GetVersionInfoString(IN TCHAR *szFileName,
(LPVOID *)&lpszLocalBuf,
&cbLen) != 0)
{
wcsncpy(szBuffer, lpszLocalBuf, cbBufLen);
_tcsncpy(szBuffer, lpszLocalBuf, cbBufLen / sizeof(*szBuffer));
bRet = TRUE;
break;
reactos/base/shell/explorer-new/precomp.h
+3 -3
View File
@@ -79,12 +79,12 @@ Win32DbgPrint(const char *filename, int line, const char *lpFormat, ...)
}
#define ASSERT(cond) \
if (!(cond)) { \
do if (!(cond)) { \
Win32DbgPrint(__FILE__, __LINE__, "ASSERTION %s FAILED!\n", #cond); \
}
} while (0)
#define DbgPrint(fmt, ...) \
Win32DbgPrint(__FILE__, __LINE__, fmt, ##__VA_ARGS__);
Win32DbgPrint(__FILE__, __LINE__, fmt, ##__VA_ARGS__)
extern HINSTANCE hExplorerInstance;
extern HMODULE hUser32;
reactos/base/shell/explorer-new/startup.c
+24 -27
View File
@@ -75,12 +75,12 @@ static int runCmd(LPWSTR cmdline, LPCWSTR dir, BOOL wait, BOOL minimized)
if (!CreateProcessW(NULL, szCmdLineExp, NULL, NULL, FALSE, 0, NULL, dir, &si, &info))
{
printf("Failed to run command (%ld)\n", GetLastError());
DbgPrint("Failed to run command (%lu)\n", GetLastError());
return INVALID_RUNCMD_RETURN;
}
printf("Successfully ran command\n");
DbgPrint("Successfully ran command\n");
if (wait)
{ /* wait for the process to exit */
@@ -114,9 +114,9 @@ static BOOL ProcessRunKeys(HKEY hkRoot, LPCWSTR szKeyName, BOOL bDelete,
WCHAR *szValue = NULL;
if (hkRoot == HKEY_LOCAL_MACHINE)
wprintf(L"processing %s entries under HKLM\n", szKeyName);
DbgPrint("processing %ls entries under HKLM\n", szKeyName);
else
wprintf(L"processing %s entries under HKCU\n", szKeyName);
DbgPrint("processing %ls entries under HKCU\n", szKeyName);
res = RegOpenKeyExW(hkRoot,
L"Software\\Microsoft\\Windows\\CurrentVersion",
@@ -125,8 +125,7 @@ static BOOL ProcessRunKeys(HKEY hkRoot, LPCWSTR szKeyName, BOOL bDelete,
&hkWin);
if (res != ERROR_SUCCESS)
{
printf("RegOpenKey failed on Software\\Microsoft\\Windows\\CurrentVersion (%ld)\n",
res);
DbgPrint("RegOpenKey failed on Software\\Microsoft\\Windows\\CurrentVersion (%ld)\n", res);
goto end;
}
@@ -140,12 +139,12 @@ static BOOL ProcessRunKeys(HKEY hkRoot, LPCWSTR szKeyName, BOOL bDelete,
{
if (res == ERROR_FILE_NOT_FOUND)
{
printf("Key doesn't exist - nothing to be done\n");
DbgPrint("Key doesn't exist - nothing to be done\n");
res = ERROR_SUCCESS;
}
else
printf("RegOpenKey failed on run key (%ld)\n", res);
DbgPrint("RegOpenKeyEx failed on run key (%ld)\n", res);
goto end;
}
@@ -164,14 +163,14 @@ static BOOL ProcessRunKeys(HKEY hkRoot, LPCWSTR szKeyName, BOOL bDelete,
NULL);
if (res != ERROR_SUCCESS)
{
printf("Couldn't query key info (%ld)\n", res);
DbgPrint("Couldn't query key info (%ld)\n", res);
goto end;
}
if (i == 0)
{
printf("No commands to execute.\n");
DbgPrint("No commands to execute.\n");
res = ERROR_SUCCESS;
goto end;
@@ -182,7 +181,7 @@ static BOOL ProcessRunKeys(HKEY hkRoot, LPCWSTR szKeyName, BOOL bDelete,
cbMaxCmdLine);
if (szCmdLine == NULL)
{
printf("Couldn't allocate memory for the commands to be executed\n");
DbgPrint("Couldn't allocate memory for the commands to be executed\n");
res = ERROR_NOT_ENOUGH_MEMORY;
goto end;
@@ -194,7 +193,7 @@ static BOOL ProcessRunKeys(HKEY hkRoot, LPCWSTR szKeyName, BOOL bDelete,
cchMaxValue * sizeof(*szValue));
if (szValue == NULL)
{
printf("Couldn't allocate memory for the value names\n");
DbgPrint("Couldn't allocate memory for the value names\n");
res = ERROR_NOT_ENOUGH_MEMORY;
goto end;
@@ -217,7 +216,7 @@ static BOOL ProcessRunKeys(HKEY hkRoot, LPCWSTR szKeyName, BOOL bDelete,
&cbDataLength);
if (res != ERROR_SUCCESS)
{
printf("Couldn't read in value %ld - %ld\n", i, res);
DbgPrint("Couldn't read in value %lu - %ld\n", i, res);
continue;
}
@@ -227,12 +226,12 @@ static BOOL ProcessRunKeys(HKEY hkRoot, LPCWSTR szKeyName, BOOL bDelete,
if (bDelete && (res = RegDeleteValueW(hkRun, szValue)) != ERROR_SUCCESS)
{
printf("Couldn't delete value - %ld, %ld. Running command anyways.\n", i, res);
DbgPrint("Couldn't delete value - %lu, %ld. Running command anyways.\n", i, res);
}
if (type != REG_SZ)
{
printf("Incorrect type of value #%ld (%ld)\n", i, type);
DbgPrint("Incorrect type of value #%lu (%lu)\n", i, type);
continue;
}
@@ -240,10 +239,10 @@ static BOOL ProcessRunKeys(HKEY hkRoot, LPCWSTR szKeyName, BOOL bDelete,
res = runCmd(szCmdLine, NULL, bSynchronous, FALSE);
if (res == INVALID_RUNCMD_RETURN)
{
printf("Error running cmd #%ld (%ld)\n", i, GetLastError());
DbgPrint("Error running cmd #%lu (%lu)\n", i, GetLastError());
}
printf("Done processing cmd #%ld\n", i);
DbgPrint("Done processing cmd #%lu\n", i);
}
res = ERROR_SUCCESS;
@@ -257,7 +256,7 @@ end:
if (hkWin != NULL)
RegCloseKey(hkWin);
printf("done\n");
DbgPrint("done\n");
return res == ERROR_SUCCESS ? TRUE : FALSE;
}
@@ -269,24 +268,22 @@ ProcessStartupItems(VOID)
/* TODO: ProcessRunKeys already checks SM_CLEANBOOT -- items prefixed with * should probably run even in safe mode */
BOOL bNormalBoot = GetSystemMetrics(SM_CLEANBOOT) == 0; /* Perform the operations that are performed every boot */
/* First, set the current directory to SystemRoot */
TCHAR gen_path[MAX_PATH];
WCHAR gen_path[MAX_PATH];
DWORD res;
HKEY hSessionKey, hKey;
HRESULT hr;
res = GetWindowsDirectory(gen_path, sizeof(gen_path));
res = GetWindowsDirectoryW(gen_path, sizeof(gen_path) / sizeof(gen_path[0]));
if (res == 0)
{
printf("Couldn't get the windows directory - error %ld\n",
GetLastError());
DbgPrint("Couldn't get the windows directory - error %lu\n", GetLastError());
return 100;
}
if (!SetCurrentDirectory(gen_path))
if (!SetCurrentDirectoryW(gen_path))
{
wprintf(L"Cannot set the dir to %s (%ld)\n", gen_path, GetLastError());
DbgPrint("Cannot set the dir to %ls (%lu)\n", gen_path, GetLastError());
return 100;
}
@@ -297,7 +294,7 @@ ProcessStartupItems(VOID)
LONG Error;
DWORD dwDisp;
Error = RegCreateKeyEx(hSessionKey, L"StartupHasBeenRun", 0, NULL, REG_OPTION_VOLATILE, KEY_WRITE, NULL, &hKey, &dwDisp);
Error = RegCreateKeyExW(hSessionKey, L"StartupHasBeenRun", 0, NULL, REG_OPTION_VOLATILE, KEY_WRITE, NULL, &hKey, &dwDisp);
RegCloseKey(hSessionKey);
if (Error == ERROR_SUCCESS)
{
@@ -333,7 +330,7 @@ ProcessStartupItems(VOID)
if (res && bNormalBoot && (SHRestricted(REST_NOCURRENTUSERRUNONCE) == 0))
res = ProcessRunKeys(HKEY_CURRENT_USER, L"RunOnce", TRUE, FALSE);
printf("Operation done\n");
DbgPrint("Operation done\n");
return res ? 0 : 101;
}
reactos/base/shell/explorer-new/trayntfy.c
+1 -1
View File
@@ -758,7 +758,7 @@ TrayClockWnd_UpdateTheme(IN OUT PTRAY_CLOCK_WND_DATA This)
TMT_FONT,
&clockFont);
hFont = CreateFontIndirect(&clockFont);
hFont = CreateFontIndirectW(&clockFont);
TrayClockWnd_SetFont(This,
hFont,