Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-15 13:45:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

revers guiconsole.c changes that was mistake committed in r28057

Browse source 
svn path=/trunk/; revision=28058
This commit is contained in:
Magnus Olsen 2007-07-31 21:41:15 +00:00
parent d848c8c8f4
commit 71705afb69
1 changed files with 10 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
reactos/subsystems/win32/csrss/win32csr/guiconsole.c
View file

@ -139,8 +139,8 @@ GuiConsoleAppendMenuItems(HMENU hMenu,
hSubMenu = CreatePopupMenu(); hSubMenu = CreatePopupMenu();
if (hSubMenu != NULL) if (hSubMenu != NULL)
{ {
/*GuiConsoleAppendMenuItems(hSubMenu, GuiConsoleAppendMenuItems(hSubMenu,
Items[i].SubMenu);*/ Items[i].SubMenu);
if (!AppendMenuW(hMenu, if (!AppendMenuW(hMenu,
MF_STRING | MF_POPUP, MF_STRING | MF_POPUP,
@ -148,7 +148,6 @@ GuiConsoleAppendMenuItems(HMENU hMenu,
szMenuString)) szMenuString))
{ {
DestroyMenu(hSubMenu); DestroyMenu(hSubMenu);
DPRINT1("DestroyMenu \n");
} }
} }
} }
@ -180,14 +179,9 @@ GuiConsoleCreateSysMenu(PCSRSS_CONSOLE Console)
FALSE); FALSE);
if (hMenu != NULL) if (hMenu != NULL)
{ {
DPRINT1("adding menu\n");
GuiConsoleAppendMenuItems(hMenu, GuiConsoleAppendMenuItems(hMenu,
GuiConsoleMainMenuItems); GuiConsoleMainMenuItems);
} }
else
{
DPRINT1("This should never happen, GetSystemMenu == NULL \n");
}
} }
static VOID FASTCALL static VOID FASTCALL
@ -242,12 +236,10 @@ GuiConsoleOpenUserRegistryPathPerProcessId(DWORD ProcessId, PHANDLE hProcHandle,
RtlFreeUnicodeString(&SidName); RtlFreeUnicodeString(&SidName);
CloseHandle(hProcessToken); CloseHandle(hProcessToken);
CloseHandle(hProcess); if (hProcHandle)
*hProcHandle = hProcess;
//if (hProcHandle) else
// *hProcHandle = hProcess; CloseHandle(hProcess);
//else
// CloseHandle(hProcess);
if (res != ERROR_SUCCESS) if (res != ERROR_SUCCESS)
return FALSE; return FALSE;
@ -284,26 +276,21 @@ GuiConsoleOpenUserSettings(PGUI_CONSOLE_DATA GuiData, DWORD ProcessId, PHKEY hSu
DPRINT("GuiConsoleOpenUserSettings entered\n"); DPRINT("GuiConsoleOpenUserSettings entered\n");
DPRINT1("ProcessId %d\n",ProcessId);
if (!GuiConsoleOpenUserRegistryPathPerProcessId(ProcessId, &hProcess, &hKey, samDesired)) if (!GuiConsoleOpenUserRegistryPathPerProcessId(ProcessId, &hProcess, &hKey, samDesired))
{ {
DPRINT1("GuiConsoleOpenUserRegistryPathPerProcessId failed\n"); DPRINT("GuiConsoleOpenUserRegistryPathPerProcessId failed\n");
return FALSE; return FALSE;
} }
hProcess = OpenProcess( PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, ProcessId );
/* FIXME we do not getting the process name so no menu will be loading, why ?*/ /* FIXME we do not getting the process name so no menu will be loading, why ?*/
fLength = GetProcessImageFileNameW(hProcess, szProcessName, sizeof(GuiData->szProcessName) / sizeof(WCHAR)); fLength = GetProcessImageFileNameW(hProcess, szProcessName, sizeof(GuiData->szProcessName) / sizeof(WCHAR));
CloseHandle(hProcess); CloseHandle(hProcess);
DPRINT1("szProcessName3 : %S\n",szProcessName); //DPRINT1("szProcessName3 : %S\n",szProcessName);
if (!fLength) if (!fLength)
{ {
DPRINT1("GetProcessImageFileNameW failed(0x%x)ProcessId %d\n", GetLastError(),hProcess); DPRINT("GetProcessImageFileNameW failed(0x%x)ProcessId %d\n", GetLastError(),hProcess);
return FALSE; return FALSE;
} }
/* /*
@ -671,8 +658,6 @@ GuiConsoleHandleNcCreate(HWND hWnd, CREATESTRUCTW *Create)
if (Console->ProcessList.Flink != &Console->ProcessList) if (Console->ProcessList.Flink != &Console->ProcessList)
{ {
ProcessData = CONTAINING_RECORD(Console->ProcessList.Flink, CSRSS_PROCESS_DATA, ProcessEntry); ProcessData = CONTAINING_RECORD(Console->ProcessList.Flink, CSRSS_PROCESS_DATA, ProcessEntry);
DPRINT1("PtrToUlong(ProcessData->ProcessId) == %d",PtrToUlong(ProcessData->ProcessId));
if (GuiConsoleOpenUserSettings(GuiData, PtrToUlong(ProcessData->ProcessId), &hKey, KEY_READ, FALSE)) if (GuiConsoleOpenUserSettings(GuiData, PtrToUlong(ProcessData->ProcessId), &hKey, KEY_READ, FALSE))
{ {
GuiConsoleReadUserSettings(hKey, Console, GuiData, Console->ActiveBuffer); GuiConsoleReadUserSettings(hKey, Console, GuiData, Console->ActiveBuffer);
@ -1278,20 +1263,13 @@ GuiConsoleHandleNcDestroy(HWND hWnd)
{ {
PCSRSS_CONSOLE Console; PCSRSS_CONSOLE Console;
PGUI_CONSOLE_DATA GuiData; PGUI_CONSOLE_DATA GuiData;
HMENU menu;
GuiConsoleGetDataPointers(hWnd, &Console, &GuiData); GuiConsoleGetDataPointers(hWnd, &Console, &GuiData);
KillTimer(hWnd, 1); KillTimer(hWnd, 1);
Console->PrivateData = NULL; Console->PrivateData = NULL;
DeleteCriticalSection(&GuiData->Lock); DeleteCriticalSection(&GuiData->Lock);
GetSystemMenu(hWnd, TRUE);
menu = GetSystemMenu(hWnd, TRUE);
if (menu == NULL)
{
DPRINT1("This should never happen, GetSystemMenu == NULL \n");
}
if (GuiData->ConsoleLibrary) if (GuiData->ConsoleLibrary)
FreeLibrary(GuiData->ConsoleLibrary); FreeLibrary(GuiData->ConsoleLibrary);