- reduce differences to trunk

svn path=/branches/ros-amd64-bringup/; revision=37925
This commit is contained in:
Timo Kreuzer
2008-12-08 07:36:10 +00:00
parent dc1e12189e
commit d14238f78f
5 changed files with 6 additions and 6 deletions
+1 -1
View File
@@ -15,4 +15,4 @@
/* Macro for calling "rundll32.exe"
According to MSDN, ShellExecute returns a value greater than 32 if the operation was successful. */
#define RUNDLL(param) ((int)(INT_PTR)ShellExecute(NULL, _T("open"), _T("rundll32.exe"), (param), NULL, SW_SHOWDEFAULT) > 32)
#define RUNDLL(param) ((INT_PTR)ShellExecute(NULL, _T("open"), _T("rundll32.exe"), (param), NULL, SW_SHOWDEFAULT) > 32)
@@ -185,10 +185,10 @@ GetAutostartEntriesFromRegistry ( HKEY hRootKey, TCHAR* KeyName )
switch (PtrToLong(hRootKey))
{
case (((LONG_PTR)HKEY_LOCAL_MACHINE) & 0xff):
case PtrToLong(HKEY_LOCAL_MACHINE):
_tcscpy(Path, _T("HKLM\\\0"));
break;
case (((LONG_PTR)HKEY_CURRENT_USER) & 0xff):
case PtrToLong(HKEY_CURRENT_USER):
_tcscpy(Path, _T("HKCU\\\0"));
break;
default:
+1 -1
View File
@@ -478,7 +478,7 @@ VOID DIALOG_FileSaveAs(VOID)
OFN_HIDEREADONLY | OFN_EXPLORER | OFN_ENABLETEMPLATE | OFN_ENABLEHOOK;
saveas.lpstrDefExt = szDefaultExt;
saveas.lpTemplateName = MAKEINTRESOURCE(DIALOG_ENCODING);
saveas.lpfnHook = (LPOFNHOOKPROC)DIALOG_FileSaveAs_Hook;
saveas.lpfnHook = DIALOG_FileSaveAs_Hook;
if (GetSaveFileName(&saveas)) {
SetFileName(szPath);
+1 -1
View File
@@ -307,7 +307,7 @@ static BOOL RunFile(LPTSTR filename)
ret = (hShExt)(NULL, _T("open"), filename, NULL, NULL, SW_SHOWNORMAL);
TRACE ("RunFile: ShellExecuteA/W returned %p\n", (DWORD_PTR)ret);
TRACE ("RunFile: ShellExecuteA/W returned 0x%p\n", ret);
FreeLibrary(hShell32);
return (((DWORD_PTR)ret) > 32);
+1 -1
View File
@@ -5,4 +5,4 @@
@ stdcall DbgPrompt(ptr ptr long)
@ stdcall RtlAssert(ptr ptr long ptr)
@ stdcall RtlUnwind(ptr ptr ptr ptr)
@ stdcall vDbgPrintExWithPrefix(ptr long long ptr ptr)
@ stdcall vDbgPrintExWithPrefix(ptr long long ptr ptr)