ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-01 19:26:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Win32 structure cleanup (WIP):

Browse Source 
- make use of pdesktop member in WINDOW structure
- replace usage of Wnd->ti->Desktop with Wnd->pdesktop->DesktopInfo

svn path=/trunk/; revision=36819
This commit is contained in:
Timo Kreuzer
2008-10-19 00:43:54 +00:00
parent 891379c597
commit e287c51858
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/subsystems/win32/win32k/ntuser/window.c
+8 -7
View File
@@ -343,12 +343,12 @@ UserFreeWindowInfo(PW32THREADINFO ti, PWINDOW_OBJECT WindowObject)
{
Wnd->WindowName.Length = 0;
Wnd->WindowName.MaximumLength = 0;
DesktopHeapFree(Wnd->ti->Desktop,
DesktopHeapFree(Wnd->pdesktop->DesktopInfo,
Wnd->WindowName.Buffer);
Wnd->WindowName.Buffer = NULL;
}
DesktopHeapFree(ti->Desktop, Wnd);
DesktopHeapFree(Wnd->pdesktop->DesktopInfo, Wnd);
WindowObject->Wnd = NULL;
}
@@ -1601,7 +1601,7 @@ co_IntCreateWindowEx(DWORD dwExStyle,
Class = IntReferenceClass(Class,
ClassLink,
ti->Desktop);
pti->Desktop->DesktopInfo);
if (Class == NULL)
{
DPRINT1("Failed to reference window class!\n");
@@ -1619,7 +1619,7 @@ co_IntCreateWindowEx(DWORD dwExStyle,
otWindow, sizeof(WINDOW_OBJECT));
if (Window)
{
Window->Wnd = DesktopHeapAlloc(ti->Desktop,
Window->Wnd = DesktopHeapAlloc(pti->Desktop->DesktopInfo,
sizeof(WINDOW) + Class->WndExtra);
if (!Window->Wnd)
goto AllocErr;
@@ -1630,6 +1630,7 @@ co_IntCreateWindowEx(DWORD dwExStyle,
Wnd->ti = ti;
Wnd->pi = ti->kpi;
Wnd->pdesktop = pti->Desktop;
Wnd->hWndLastActive = hWnd;
}
@@ -1718,7 +1719,7 @@ AllocErr:
if (NULL != WindowName->Buffer && WindowName->Length > 0)
{
Wnd->WindowName.Buffer = DesktopHeapAlloc(Wnd->ti->Desktop,
Wnd->WindowName.Buffer = DesktopHeapAlloc(Wnd->pdesktop->DesktopInfo,
WindowName->Length + sizeof(UNICODE_NULL));
if (Wnd->WindowName.Buffer == NULL)
{
@@ -4591,11 +4592,11 @@ NtUserDefSetText(HWND hWnd, PUNICODE_STRING WindowText)
Wnd->WindowName.Buffer = NULL;
if (buf != NULL)
{
DesktopHeapFree(Wnd->ti->Desktop,
DesktopHeapFree(Wnd->pdesktop->DesktopInfo,
buf);
}
Wnd->WindowName.Buffer = DesktopHeapAlloc(Wnd->ti->Desktop,
Wnd->WindowName.Buffer = DesktopHeapAlloc(Wnd->pdesktop->DesktopInfo,
SafeText.Length + sizeof(UNICODE_NULL));
if (Wnd->WindowName.Buffer != NULL)
{