Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sserapion] 44578: Try to fix build with rosbe 1.5 x86
by sserapion＠svn.reactos.org 14 Dec '09

14 Dec '09

Author: sserapion Date: Mon Dec 14 19:42:30 2009 New Revision: 44578 URL: http://svn.reactos.org/svn/reactos?rev=44578&view=rev Log: Try to fix build with rosbe 1.5 x86 Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/io/iomgr/irp.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32.rbuild branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] Mon Dec 14 19:42:30 2009 @@ -1622,7 +1622,7 @@ OUT PULONG pSessionId) { /* Return the session */ - *pSessionId = IoGetRequestorProcess(Irp)->Session; + *pSessionId = (ULONG_PTR)IoGetRequestorProcess(Irp)->Session; return STATUS_SUCCESS; } Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/win32.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32.rbuild [iso-8859-1] Mon Dec 14 19:42:30 2009 @@ -1,11 +1,9 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> -<if property="USERMODE" value="1"> - <directory name="csrss"> - <xi:include href="csrss/csrss.rbuild" /> - </directory> -</if> +<directory name="csrss"> + <xi:include href="csrss/csrss.rbuild" /> +</directory> <directory name="win32k"> <xi:include href="win32k/win32k.rbuild" /> </directory> Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak [iso-8859-1] Mon Dec 14 19:42:30 2009 @@ -9,7 +9,11 @@ # FIXME: disabled until RosBE stops sucking # BUILTIN_CPPFLAGS+= -nostdinc +ifeq ($(ROS_ARCH),i386) +BUILTIN_CFLAGS+= -fno-optimize-sibling-calls -fno-set-stack-executable +else BUILTIN_CFLAGS+= -fno-optimize-sibling-calls +endif BUILTIN_CXXFLAGS+= -fno-optimize-sibling-calls #(module, source, dependencies, cflags, output) Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Mon Dec 14 19:42:30 2009 @@ -480,8 +480,15 @@ fputs ( "BUILTIN_CXXINCLUDES+= $(TARGET_CPPFLAGS)\n", fMakefile ); fprintf ( fMakefile, "PROJECT_CCLIBS := \"$(shell ${TARGET_CC} -print-libgcc-file-name)\"\n" ); - fprintf ( fMakefile, "PROJECT_CXXLIBS := \"$(shell ${TARGET_CPP} -print-file-name=libstdc++.a)\" \"$(shell ${TARGET_CPP} -print-libgcc-file-name)\" \"$(shell ${TARGET_CPP} -print-file-name=libmingw32.a)\" \"$(shell ${TARGET_CPP} -print-file-name=libmingwex.a)\" \"$(shell ${TARGET_CPP} -print-file-name=libgcc_eh.a)\"\n" ); - + fprintf ( fMakefile, "PROJECT_CXXLIBS := \"$(shell ${TARGET_CPP} -print-file-name=libstdc++.a)\" \"$(shell ${TARGET_CPP} -print-libgcc-file-name)\" \"$(shell ${TARGET_CPP} -print-file-name=libmingw32.a)\" \"$(shell ${TARGET_CPP} -print-file-name=libmingwex.a)\" " ); + + /* hack to get libgcc_eh.a, should check mingw version or something */ + if (Environment::GetArch() == "amd64") + fprintf ( fMakefile, " \"$(shell ${TARGET_CPP} -print-file-name=libgcc_eh.a)\"" ); + /* hack to get _get_output_format, needed by libmingwex */ + else if (Environment::GetArch() == "i386") + fprintf ( fMakefile, "\"$(shell ${TARGET_CPP} -print-file-name=ofmt_stub.a)\""); + fprintf ( fMakefile,"\n"); } MingwModuleHandler::GenerateParameters ( "PROJECT", "+=", ProjectNode.non_if_data ); MingwModuleHandler::GenerateParameters ( "PROJECT_HOST", "+=", ProjectNode.host_non_if_data );

1 0

[gadamopoulos] 44577: [user32] SetClipboardData: fix return value Fixes one user32:clipbloard test
by gadamopoulos＠svn.reactos.org 14 Dec '09

14 Dec '09

Author: gadamopoulos Date: Mon Dec 14 16:41:58 2009 New Revision: 44577 URL: http://svn.reactos.org/svn/reactos?rev=44577&view=rev Log: [user32] SetClipboardData: fix return value Fixes one user32:clipbloard test Modified: trunk/reactos/dll/win32/user32/windows/clipboard.c Modified: trunk/reactos/dll/win32/user32/windows/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/clipboard.c [iso-8859-1] Mon Dec 14 16:41:58 2009 @@ -270,6 +270,12 @@ { size = GlobalSize(hMem); ret = NtUserSetClipboardData(uFormat, pMem, size); + + //On success NtUserSetClipboardData returns pMem + //however caller expects us to return hMem + if (ret == pMem) + ret = hMem; + //should i unlock hMem? GlobalUnlock(hMem); }

1 0

[jimtabor] 44576: [Win32k] - Continuing the moving into WND structure with minor desktop structure changes. - Tested: wine user32 tests, AbiWord 2.6.8, FF 3.5, OOo 2.4.3 and Seamonkey 2.0.
by jimtabor＠svn.reactos.org 14 Dec '09

14 Dec '09

Author: jimtabor Date: Mon Dec 14 07:48:40 2009 New Revision: 44576 URL: http://svn.reactos.org/svn/reactos?rev=44576&view=rev Log: [Win32k] - Continuing the moving into WND structure with minor desktop structure changes. - Tested: wine user32 tests, AbiWord 2.6.8, FF 3.5, OOo 2.4.3 and Seamonkey 2.0. Modified: trunk/reactos/subsystems/win32/win32k/include/desktop.h trunk/reactos/subsystems/win32/win32k/include/window.h trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c trunk/reactos/subsystems/win32/win32k/ntuser/painting.c trunk/reactos/subsystems/win32/win32k/ntuser/vis.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c Modified: trunk/reactos/subsystems/win32/win32k/include/desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/desktop.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/desktop.h [iso-8859-1] Mon Dec 14 07:48:40 2009 @@ -27,7 +27,7 @@ PWIN32HEAP pheapDesktop; PSECTION_OBJECT DesktopHeapSection; - PDESKTOPINFO DesktopInfo; + PDESKTOPINFO pDeskInfo; PWND spwndMessage; } DESKTOP, *PDESKTOP; Modified: trunk/reactos/subsystems/win32/win32k/include/window.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] Mon Dec 14 07:48:40 2009 @@ -27,8 +27,6 @@ /* Pointer to the thread information */ PTHREADINFO pti; // Use Wnd->head.pti - /* Pointer to the desktop */ - PDESKTOPINFO Desktop; /* system menu handle. */ HMENU SystemMenu; /* Entry in the thread's list of windows. */ @@ -36,7 +34,7 @@ /* Handle for the window. */ HWND hSelf; /* Window flags. */ - ULONG Flags; + ULONG state; /* Handle of region of the window to be updated. */ HANDLE UpdateRegion; /* Handle of the window region. */ @@ -59,7 +57,6 @@ PWINDOW_SCROLLINFO Scroll; PETHREAD OwnerThread; // Use Wnd->head.pti HWND hWndLastPopup; /* handle to last active popup window (wine doesn't use pointer, for unk. reason)*/ - ULONG Status; /* counter for tiled child windows */ ULONG TiledCounter; /* WNDOBJ list */ @@ -67,14 +64,14 @@ } WINDOW_OBJECT; /* PWINDOW_OBJECT already declared at top of file */ /* Window flags. */ -#define WINDOWOBJECT_NEED_SIZE (0x00000001) // WNDS_SENDSIZEMOVEMSGS? -#define WINDOWOBJECT_NEED_ERASEBKGND (0x00000002) // WNDS_ERASEBACKGROUND -#define WINDOWOBJECT_NEED_NCPAINT (0x00000004) // WNDS_SENDNCPAINT -#define WINDOWOBJECT_NEED_INTERNALPAINT (0x00000008) // WNDS_INTERNALPAINT +#define WINDOWOBJECT_NEED_SIZE WNDS_SENDSIZEMOVEMSGS +#define WINDOWOBJECT_NEED_ERASEBKGND WNDS_ERASEBACKGROUND +#define WINDOWOBJECT_NEED_NCPAINT WNDS_SENDNCPAINT +#define WINDOWOBJECT_NEED_INTERNALPAINT WNDS_INTERNALPAINT #define WINDOWOBJECT_RESTOREMAX (0x00000020) // Set/Clr WS_MAXIMIZE && Clr/Set WS_EX2_VERTICALLYMAXIMIZEDLEFT/RIGHT -#define WINDOWSTATUS_DESTROYING (0x1) // WNDS2_INDESTROY -#define WINDOWSTATUS_DESTROYED (0x2) // WNDS_DESTROYED +#define WINDOWSTATUS_DESTROYING WNDS2_INDESTROY +#define WINDOWSTATUS_DESTROYED WNDS_DESTROYED #define HAS_DLGFRAME(Style, ExStyle) \ (((ExStyle) & WS_EX_DLGMODALFRAME) || \ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Mon Dec 14 07:48:40 2009 @@ -1032,23 +1032,23 @@ DesktopInfoSize = FIELD_OFFSET(DESKTOPINFO, szDesktopName[(lpszDesktopName->Length / sizeof(WCHAR)) + 1]); - DesktopObject->DesktopInfo = RtlAllocateHeap(DesktopObject->pheapDesktop, + DesktopObject->pDeskInfo = RtlAllocateHeap(DesktopObject->pheapDesktop, HEAP_NO_SERIALIZE, DesktopInfoSize); - if (DesktopObject->DesktopInfo == NULL) + if (DesktopObject->pDeskInfo == NULL) { ObDereferenceObject(DesktopObject); DPRINT1("Failed to create the DESKTOP structure!\n"); RETURN(NULL); } - RtlZeroMemory(DesktopObject->DesktopInfo, + RtlZeroMemory(DesktopObject->pDeskInfo, DesktopInfoSize); - DesktopObject->DesktopInfo->pvDesktopBase = DesktopHeapSystemBase; - DesktopObject->DesktopInfo->pvDesktopLimit = (PVOID)((ULONG_PTR)DesktopHeapSystemBase + HeapSize); - RtlCopyMemory(DesktopObject->DesktopInfo->szDesktopName, + DesktopObject->pDeskInfo->pvDesktopBase = DesktopHeapSystemBase; + DesktopObject->pDeskInfo->pvDesktopLimit = (PVOID)((ULONG_PTR)DesktopHeapSystemBase + HeapSize); + RtlCopyMemory(DesktopObject->pDeskInfo->szDesktopName, lpszDesktopName->Buffer, lpszDesktopName->Length); @@ -1928,7 +1928,7 @@ if (GetWin32ClientInfo()->pDeskInfo == NULL) { GetWin32ClientInfo()->pDeskInfo = - (PVOID)((ULONG_PTR)DesktopObject->DesktopInfo - + (PVOID)((ULONG_PTR)DesktopObject->pDeskInfo - GetWin32ClientInfo()->ulClientDelta); } } @@ -1979,7 +1979,7 @@ pci->ulClientDelta = DesktopHeapGetUserDelta(); if (DesktopObject) { - pci->pDeskInfo = (PVOID)((ULONG_PTR)DesktopObject->DesktopInfo - pci->ulClientDelta); + pci->pDeskInfo = (PVOID)((ULONG_PTR)DesktopObject->pDeskInfo - pci->ulClientDelta); } } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Mon Dec 14 07:48:40 2009 @@ -1462,7 +1462,7 @@ Msg.hwnd = FocusMessageQueue->FocusWindow; DPRINT("Msg.hwnd = %x\n", Msg.hwnd); - FocusMessageQueue->Desktop->DesktopInfo->LastInputWasKbd = TRUE; + FocusMessageQueue->Desktop->pDeskInfo->LastInputWasKbd = TRUE; IntGetCursorLocation(FocusMessageQueue->Desktop->WindowStation, &Msg.pt); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Mon Dec 14 07:48:40 2009 @@ -571,7 +571,7 @@ { /* post the message to the other window */ Msg->hwnd = Wnd->hSelf; - if(!(Wnd->Status & WINDOWSTATUS_DESTROYING)) + if(!(Wnd->state & WINDOWSTATUS_DESTROYING)) { MsqPostMessage(Wnd->MessageQueue, Msg, FALSE, Msg->message == WM_MOUSEMOVE ? QS_MOUSEMOVE : @@ -1163,7 +1163,7 @@ return FALSE; } - if ( Window->Status & WINDOWSTATUS_DESTROYING ) + if ( Window->state & WINDOWSTATUS_DESTROYING ) { DPRINT1("Attempted to post message to window 0x%x that is being destroyed!\n", Wnd); /* FIXME - last error code? */ @@ -1290,7 +1290,7 @@ RETURN( FALSE); } - if (Window->Status & WINDOWSTATUS_DESTROYING) + if (Window->state & WINDOWSTATUS_DESTROYING) { /* FIXME - last error? */ DPRINT1("Attempted to send message to window 0x%x that is being destroyed!\n", hWnd); @@ -1457,7 +1457,7 @@ } /* Check for an exiting window. */ - if (Window && Window->Status & WINDOWSTATUS_DESTROYING) + if (Window && Window->state & WINDOWSTATUS_DESTROYING) { DPRINT1("co_IntDoSendMessage Window Exiting!\n"); } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] Mon Dec 14 07:48:40 2009 @@ -471,7 +471,7 @@ if (pti->Desktop != NULL) { - pti->pDeskInfo = pti->Desktop->DesktopInfo; + pti->pDeskInfo = pti->Desktop->pDeskInfo; } else { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Mon Dec 14 07:48:40 2009 @@ -839,7 +839,7 @@ Msg.hwnd = FocusMessageQueue->FocusWindow; DPRINT("Msg.hwnd = %x\n", Msg.hwnd); - FocusMessageQueue->Desktop->DesktopInfo->LastInputWasKbd = TRUE; + FocusMessageQueue->Desktop->pDeskInfo->LastInputWasKbd = TRUE; IntGetCursorLocation(FocusMessageQueue->Desktop->WindowStation, &Msg.pt); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] Mon Dec 14 07:48:40 2009 @@ -195,7 +195,7 @@ GDIOBJ_SetOwnership(Window->UpdateRegion, PsGetCurrentProcess()); GreDeleteObject(Window->UpdateRegion); Window->UpdateRegion = NULL; - if (!(Window->Flags & WINDOWOBJECT_NEED_INTERNALPAINT)) + if (!(Window->state & WINDOWOBJECT_NEED_INTERNALPAINT)) MsqDecPaintCountQueue(Window->MessageQueue); } } @@ -237,17 +237,17 @@ if (Flags & RDW_UPDATENOW) { if (Window->UpdateRegion != NULL || - Window->Flags & WINDOWOBJECT_NEED_INTERNALPAINT) + Window->state & WINDOWOBJECT_NEED_INTERNALPAINT) { co_IntSendMessage(hWnd, WM_PAINT, 0, 0); } } else { - if (Window->Flags & WINDOWOBJECT_NEED_NCPAINT) + if (Window->state & WINDOWOBJECT_NEED_NCPAINT) { TempRegion = IntGetNCUpdateRgn(Window, TRUE); - Window->Flags &= ~WINDOWOBJECT_NEED_NCPAINT; + Window->state &= ~WINDOWOBJECT_NEED_NCPAINT; MsqDecPaintCountQueue(Window->MessageQueue); co_IntSendMessage(hWnd, WM_NCPAINT, (WPARAM)TempRegion, 0); if ((HANDLE) 1 != TempRegion && NULL != TempRegion) @@ -257,7 +257,7 @@ } } - if (Window->Flags & WINDOWOBJECT_NEED_ERASEBKGND) + if (Window->state & WINDOWOBJECT_NEED_ERASEBKGND) { if (Window->UpdateRegion) { @@ -266,7 +266,7 @@ DCX_INTERSECTRGN | DCX_KEEPCLIPRGN); if (co_IntSendMessage(hWnd, WM_ERASEBKGND, (WPARAM)hDC, 0)) { - Window->Flags &= ~WINDOWOBJECT_NEED_ERASEBKGND; + Window->state &= ~WINDOWOBJECT_NEED_ERASEBKGND; } UserReleaseDC(Window, hDC, FALSE); } @@ -367,8 +367,8 @@ */ HadPaintMessage = Window->UpdateRegion != NULL || - Window->Flags & WINDOWOBJECT_NEED_INTERNALPAINT; - HadNCPaintMessage = Window->Flags & WINDOWOBJECT_NEED_NCPAINT; + Window->state & WINDOWOBJECT_NEED_INTERNALPAINT; + HadNCPaintMessage = Window->state & WINDOWOBJECT_NEED_NCPAINT; /* * Update the region and flags @@ -391,9 +391,9 @@ } if (Flags & RDW_FRAME) - Window->Flags |= WINDOWOBJECT_NEED_NCPAINT; + Window->state |= WINDOWOBJECT_NEED_NCPAINT; if (Flags & RDW_ERASE) - Window->Flags |= WINDOWOBJECT_NEED_ERASEBKGND; + Window->state |= WINDOWOBJECT_NEED_ERASEBKGND; Flags |= RDW_FRAME; } @@ -412,21 +412,21 @@ } if (Window->UpdateRegion == NULL) - Window->Flags &= ~WINDOWOBJECT_NEED_ERASEBKGND; + Window->state &= ~WINDOWOBJECT_NEED_ERASEBKGND; if (Flags & RDW_NOFRAME) - Window->Flags &= ~WINDOWOBJECT_NEED_NCPAINT; + Window->state &= ~WINDOWOBJECT_NEED_NCPAINT; if (Flags & RDW_NOERASE) - Window->Flags &= ~WINDOWOBJECT_NEED_ERASEBKGND; + Window->state &= ~WINDOWOBJECT_NEED_ERASEBKGND; } if (Flags & RDW_INTERNALPAINT) { - Window->Flags |= WINDOWOBJECT_NEED_INTERNALPAINT; + Window->state |= WINDOWOBJECT_NEED_INTERNALPAINT; } if (Flags & RDW_NOINTERNALPAINT) { - Window->Flags &= ~WINDOWOBJECT_NEED_INTERNALPAINT; + Window->state &= ~WINDOWOBJECT_NEED_INTERNALPAINT; } /* @@ -459,8 +459,8 @@ */ HasPaintMessage = Window->UpdateRegion != NULL || - Window->Flags & WINDOWOBJECT_NEED_INTERNALPAINT; - HasNCPaintMessage = Window->Flags & WINDOWOBJECT_NEED_NCPAINT; + Window->state & WINDOWOBJECT_NEED_INTERNALPAINT; + HasNCPaintMessage = Window->state & WINDOWOBJECT_NEED_NCPAINT; if (HasPaintMessage != HadPaintMessage) { @@ -612,8 +612,8 @@ PWND Wnd = Window->Wnd; return (Wnd->style & WS_VISIBLE) && ((Window->UpdateRegion != NULL) || - (Window->Flags & WINDOWOBJECT_NEED_INTERNALPAINT) || - (Window->Flags & WINDOWOBJECT_NEED_NCPAINT)); + (Window->state & WINDOWOBJECT_NEED_INTERNALPAINT) || + (Window->state & WINDOWOBJECT_NEED_NCPAINT)); } HWND FASTCALL @@ -770,12 +770,12 @@ co_UserHideCaret(Window); - if (Window->Flags & WINDOWOBJECT_NEED_NCPAINT) + if (Window->state & WINDOWOBJECT_NEED_NCPAINT) { HRGN hRgn; hRgn = IntGetNCUpdateRgn(Window, FALSE); - Window->Flags &= ~WINDOWOBJECT_NEED_NCPAINT; + Window->state &= ~WINDOWOBJECT_NEED_NCPAINT; MsqDecPaintCountQueue(Window->MessageQueue); co_IntSendMessage(hWnd, WM_NCPAINT, (WPARAM)hRgn, 0); if (hRgn != (HANDLE)1 && hRgn != NULL) @@ -803,17 +803,17 @@ } else { - if (Window->Flags & WINDOWOBJECT_NEED_INTERNALPAINT) + if (Window->state & WINDOWOBJECT_NEED_INTERNALPAINT) MsqDecPaintCountQueue(Window->MessageQueue); IntGetClientRect(Window, &Ps.rcPaint); } - Window->Flags &= ~WINDOWOBJECT_NEED_INTERNALPAINT; - - if (Window->Flags & WINDOWOBJECT_NEED_ERASEBKGND) - { - Window->Flags &= ~WINDOWOBJECT_NEED_ERASEBKGND; + Window->state &= ~WINDOWOBJECT_NEED_INTERNALPAINT; + + if (Window->state & WINDOWOBJECT_NEED_ERASEBKGND) + { + Window->state &= ~WINDOWOBJECT_NEED_ERASEBKGND; Ps.fErase = !co_IntSendMessage(hWnd, WM_ERASEBKGND, (WPARAM)Ps.hdc, 0); } else Modified: trunk/reactos/subsystems/win32/win32k/ntuser/vis.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/vis.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/vis.c [iso-8859-1] Mon Dec 14 07:48:40 2009 @@ -68,8 +68,8 @@ CurrentWindow = Window->spwndParent; while (CurrentWindow) { - if ( CurrentWindow->Status & WINDOWSTATUS_DESTROYING || - CurrentWindow->Status & WINDOWSTATUS_DESTROYED ) + if ( CurrentWindow->state & WINDOWSTATUS_DESTROYING || // state2 + CurrentWindow->state & WINDOWSTATUS_DESTROYED ) { DPRINT1("ATM the Current Window or Parent is dead!\n"); return NULL; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Mon Dec 14 07:48:40 2009 @@ -123,7 +123,7 @@ } Window = (PWINDOW_OBJECT)UserGetObject(gHandleTable, hWnd, otWindow); - if (!Window || 0 != (Window->Status & WINDOWSTATUS_DESTROYED)) + if (!Window || 0 != (Window->state & WINDOWSTATUS_DESTROYED)) { SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE); return NULL; @@ -365,12 +365,12 @@ Wnd = Window->Wnd; - if(Window->Status & WINDOWSTATUS_DESTROYING) + if(Window->state & WINDOWSTATUS_DESTROYING) { DPRINT("Tried to call IntDestroyWindow() twice\n"); return 0; } - Window->Status |= WINDOWSTATUS_DESTROYING; + Window->state |= WINDOWSTATUS_DESTROYING; Wnd->style &= ~WS_VISIBLE; IntNotifyWinEvent(EVENT_OBJECT_DESTROY, Wnd, OBJID_WINDOW, 0); @@ -431,7 +431,7 @@ MsqRemoveWindowMessagesFromQueue(Window); /* from now on no messages can be sent to this window anymore */ - Window->Status |= WINDOWSTATUS_DESTROYED; + Window->state |= WINDOWSTATUS_DESTROYED; Wnd->state |= WNDS_DESTROYED; Wnd->fnid |= FNID_FREED; @@ -1315,7 +1315,7 @@ BOOL FASTCALL IntIsWindowInDestroy(PWINDOW_OBJECT Window) { - return ((Window->Status & WINDOWSTATUS_DESTROYING) == WINDOWSTATUS_DESTROYING); + return ((Window->state & WINDOWSTATUS_DESTROYING) == WINDOWSTATUS_DESTROYING); } @@ -1339,7 +1339,7 @@ { lpwndpl->showCmd = SW_HIDE; } - else if (0 != (Window->Flags & WINDOWOBJECT_RESTOREMAX) || + else if (0 != (Window->state & WINDOWOBJECT_RESTOREMAX) || 0 != (Wnd->style & WS_MAXIMIZE)) { lpwndpl->showCmd = SW_MAXIMIZE; @@ -1850,7 +1850,7 @@ { /* If there is no desktop window yet, we must be creating it */ pti->Desktop->DesktopWindow = hWnd; - pti->Desktop->DesktopInfo->Wnd = Wnd; + pti->Desktop->pDeskInfo->Wnd = Wnd; } /* @@ -2014,7 +2014,7 @@ if (!(dwStyle & WS_POPUP)) { dwStyle |= WS_CAPTION; - Window->Flags |= WINDOWOBJECT_NEED_SIZE; + Window->state |= WINDOWOBJECT_NEED_SIZE; DPRINT("4: Style is now %lx\n", dwStyle); } } @@ -2334,7 +2334,7 @@ IntNotifyWinEvent(EVENT_OBJECT_CREATE, Window->Wnd, OBJID_WINDOW, 0); /* Send move and size messages. */ - if (!(Window->Flags & WINDOWOBJECT_NEED_SIZE)) + if (!(Window->state & WINDOWOBJECT_NEED_SIZE)) { LONG lParam; @@ -4070,7 +4070,7 @@ { Safepl.showCmd = SW_HIDE; } - else if ((0 != (Window->Flags & WINDOWOBJECT_RESTOREMAX) || + else if ((0 != (Window->state & WINDOWOBJECT_RESTOREMAX) || 0 != (Wnd->style & WS_MAXIMIZE)) && 0 == (Wnd->style & WS_MINIMIZE)) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] Mon Dec 14 07:48:40 2009 @@ -325,12 +325,12 @@ { if (Wnd->style & WS_MAXIMIZE) { - Window->Flags |= WINDOWOBJECT_RESTOREMAX; + Window->state |= WINDOWOBJECT_RESTOREMAX; Wnd->style &= ~WS_MAXIMIZE; } else { - Window->Flags &= ~WINDOWOBJECT_RESTOREMAX; + Window->state &= ~WINDOWOBJECT_RESTOREMAX; } co_UserRedrawWindow(Window, NULL, 0, RDW_VALIDATE | RDW_NOERASE | RDW_NOINTERNALPAINT); @@ -364,7 +364,7 @@ if (Wnd->style & WS_MINIMIZE) { Wnd->style &= ~WS_MINIMIZE; - if (Window->Flags & WINDOWOBJECT_RESTOREMAX) + if (Window->state & WINDOWOBJECT_RESTOREMAX) { co_WinPosGetMinMaxInfo(Window, &Size, &Wnd->InternalPos.MaxPos, NULL, NULL); @@ -1478,12 +1478,12 @@ /* FIXME: Check for window destruction. */ - if ((Window->Flags & WINDOWOBJECT_NEED_SIZE) && - !(Window->Status & WINDOWSTATUS_DESTROYING)) + if ((Window->state & WINDOWOBJECT_NEED_SIZE) && + !(Window->state & WINDOWSTATUS_DESTROYING)) { WPARAM wParam = SIZE_RESTORED; - Window->Flags &= ~WINDOWOBJECT_NEED_SIZE; + Window->state &= ~WINDOWOBJECT_NEED_SIZE; if (Wnd->style & WS_MAXIMIZE) { wParam = SIZE_MAXIMIZED;

1 0

[jimtabor] 44575: [Win32k] - Michael Martin found a create window and crash exit issue by testing programs from http://www.magma.ca/~wjr/ PEview. Fixed by replacing UserFreeWindowInfo with co_UserDestroyWindow at cleanup exit. - Added more window death and thread checks. - Started the morphing into WND structure from window object. - Tested: wine user32 tests, AbiWord 2.6.8, Seamonkey 2.0, FF 3.5 and OOo 2.4.3.
by jimtabor＠svn.reactos.org 14 Dec '09

14 Dec '09

Author: jimtabor Date: Mon Dec 14 06:02:56 2009 New Revision: 44575 URL: http://svn.reactos.org/svn/reactos?rev=44575&view=rev Log: [Win32k] - Michael Martin found a create window and crash exit issue by testing programs from http://www.magma.ca/~wjr/ PEview. Fixed by replacing UserFreeWindowInfo with co_UserDestroyWindow at cleanup exit. - Added more window death and thread checks. - Started the morphing into WND structure from window object. - Tested: wine user32 tests, AbiWord 2.6.8, Seamonkey 2.0, FF 3.5 and OOo 2.4.3. Modified: trunk/reactos/subsystems/win32/win32k/include/input.h trunk/reactos/subsystems/win32/win32k/include/window.h trunk/reactos/subsystems/win32/win32k/ntuser/class.c trunk/reactos/subsystems/win32/win32k/ntuser/focus.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c trunk/reactos/subsystems/win32/win32k/ntuser/painting.c trunk/reactos/subsystems/win32/win32k/ntuser/vis.c trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c Modified: trunk/reactos/subsystems/win32/win32k/include/input.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/input.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/input.h [iso-8859-1] Mon Dec 14 06:02:56 2009 @@ -43,6 +43,7 @@ BOOL UserInitDefaultKeyboardLayout(); PKBL UserHklToKbl(HKL hKl); BOOL FASTCALL UserAttachThreadInput(PTHREADINFO,PTHREADINFO,BOOL); +BOOL FASTCALL IntConnectThreadInput(PTHREADINFO,PTHREADINFO*,PUSER_MESSAGE_QUEUE*); #define ThreadHasInputAccess(W32Thread) \ (TRUE) Modified: trunk/reactos/subsystems/win32/win32k/include/window.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] Mon Dec 14 06:02:56 2009 @@ -26,7 +26,7 @@ PWND Wnd; /* Pointer to the thread information */ - PTHREADINFO ti; + PTHREADINFO pti; // Use Wnd->head.pti /* Pointer to the desktop */ PDESKTOPINFO Desktop; /* system menu handle. */ @@ -43,21 +43,21 @@ HANDLE WindowRegion; /* Pointer to the owning thread's message queue. */ PUSER_MESSAGE_QUEUE MessageQueue; - struct _WINDOW_OBJECT* FirstChild; + struct _WINDOW_OBJECT* spwndChild; struct _WINDOW_OBJECT* LastChild; - struct _WINDOW_OBJECT* NextSibling; - struct _WINDOW_OBJECT* PrevSibling; + struct _WINDOW_OBJECT* spwndNext; + struct _WINDOW_OBJECT* spwndPrev; /* Entry in the list of thread windows. */ LIST_ENTRY ThreadListEntry; /* Handle to the parent window. */ - struct _WINDOW_OBJECT* Parent; + struct _WINDOW_OBJECT* spwndParent; /* Handle to the owner window. */ - HWND hOwner; + HWND hOwner; // Use spwndOwner /* DC Entries (DCE) */ PDCE Dce; /* Scrollbar info */ PWINDOW_SCROLLINFO Scroll; - PETHREAD OwnerThread; + PETHREAD OwnerThread; // Use Wnd->head.pti HWND hWndLastPopup; /* handle to last active popup window (wine doesn't use pointer, for unk. reason)*/ ULONG Status; /* counter for tiled child windows */ @@ -71,7 +71,7 @@ #define WINDOWOBJECT_NEED_ERASEBKGND (0x00000002) // WNDS_ERASEBACKGROUND #define WINDOWOBJECT_NEED_NCPAINT (0x00000004) // WNDS_SENDNCPAINT #define WINDOWOBJECT_NEED_INTERNALPAINT (0x00000008) // WNDS_INTERNALPAINT -#define WINDOWOBJECT_RESTOREMAX (0x00000020) +#define WINDOWOBJECT_RESTOREMAX (0x00000020) // Set/Clr WS_MAXIMIZE && Clr/Set WS_EX2_VERTICALLYMAXIMIZEDLEFT/RIGHT #define WINDOWSTATUS_DESTROYING (0x1) // WNDS2_INDESTROY #define WINDOWSTATUS_DESTROYED (0x2) // WNDS_DESTROYED @@ -88,7 +88,7 @@ (((Style) & WS_BORDER) || (!((Style) & (WS_CHILD | WS_POPUP)))) #define IntIsDesktopWindow(WndObj) \ - (WndObj->Parent == NULL) + (WndObj->spwndParent == NULL) #define IntIsBroadcastHwnd(hWnd) \ (hWnd == HWND_BROADCAST || hWnd == HWND_TOPMOST) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] Mon Dec 14 06:02:56 2009 @@ -2195,7 +2195,7 @@ Window = UserGetWindowObject(hWnd); if (Window != NULL) { - if (Window->ti->ppi != pi) + if (Window->pti->ppi != pi) { SetLastWin32Error(ERROR_ACCESS_DENIED); goto Cleanup; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] Mon Dec 14 06:02:56 2009 @@ -178,7 +178,7 @@ HWND Ret; PWINDOW_OBJECT Child, OwnerWnd; - for(Child = Root->FirstChild; Child; Child = Child->NextSibling) + for(Child = Root->spwndChild; Child; Child = Child->spwndNext) { OwnerWnd = UserGetWindowObject(Child->hOwner); if(!OwnerWnd) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Mon Dec 14 06:02:56 2009 @@ -291,10 +291,10 @@ { BOOL SameThread = FALSE; - if (Window->ti == ((PTHREADINFO)PsGetCurrentThreadWin32Thread())) + if (Window->pti == ((PTHREADINFO)PsGetCurrentThreadWin32Thread())) SameThread = TRUE; - if ((!SameThread && (Window->ti->fsHooks & HOOKID_TO_FLAG(WH_CALLWNDPROC))) || + if ((!SameThread && (Window->pti->fsHooks & HOOKID_TO_FLAG(WH_CALLWNDPROC))) || (SameThread && ISITHOOKED(WH_CALLWNDPROC)) ) { CWPSTRUCT CWP; @@ -314,10 +314,10 @@ { BOOL SameThread = FALSE; - if (Window->ti == ((PTHREADINFO)PsGetCurrentThreadWin32Thread())) + if (Window->pti == ((PTHREADINFO)PsGetCurrentThreadWin32Thread())) SameThread = TRUE; - if ((!SameThread && (Window->ti->fsHooks & HOOKID_TO_FLAG(WH_CALLWNDPROCRET))) || + if ((!SameThread && (Window->pti->fsHooks & HOOKID_TO_FLAG(WH_CALLWNDPROCRET))) || (SameThread && ISITHOOKED(WH_CALLWNDPROCRET)) ) { CWPRETSTRUCT CWPR; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Mon Dec 14 06:02:56 2009 @@ -77,9 +77,9 @@ Window = UserGetWindowObject(hWnd); - if (Window && Window->ti) + if (Window && Window->pti) { - if (Window->ti->fsHooks & HOOKID_TO_FLAG(WH_FOREGROUNDIDLE)) + if (Window->pti->fsHooks & HOOKID_TO_FLAG(WH_FOREGROUNDIDLE)) { co_HOOK_CallHooks(WH_FOREGROUNDIDLE,HC_ACTION,0,0); } @@ -582,7 +582,7 @@ if (DesktopWindow) { UserRefObjectCo(DesktopWindow, &Ref);//can DesktopWindow be NULL? - Desk = DesktopWindow->ti->pDeskInfo; + Desk = DesktopWindow->pti->pDeskInfo; } /* Process messages in the message queue itself. */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] Mon Dec 14 06:02:56 2009 @@ -41,7 +41,7 @@ PWINDOW_OBJECT ParentWindow; PWND ParentWnd; - ParentWindow = Child->Parent; + ParentWindow = Child->spwndParent; while (ParentWindow != NULL) { ParentWnd = ParentWindow->Wnd; @@ -58,7 +58,7 @@ /* FIXME: Layered windows. */ - ParentWindow = ParentWindow->Parent; + ParentWindow = ParentWindow->spwndParent; } return TRUE; @@ -67,7 +67,7 @@ BOOL FASTCALL IntValidateParent(PWINDOW_OBJECT Child, HRGN hValidateRgn, BOOL Recurse) { - PWINDOW_OBJECT ParentWindow = Child->Parent; + PWINDOW_OBJECT ParentWindow = Child->spwndParent; PWND ParentWnd; while (ParentWindow) @@ -85,7 +85,7 @@ RDW_VALIDATE | RDW_NOCHILDREN); } - ParentWindow = ParentWindow->Parent; + ParentWindow = ParentWindow->spwndParent; } return TRUE; @@ -438,7 +438,7 @@ { PWINDOW_OBJECT Child; - for (Child = Window->FirstChild; Child; Child = Child->NextSibling) + for (Child = Window->spwndChild; Child; Child = Child->spwndNext) { if (Child->Wnd->style & WS_VISIBLE) { @@ -494,7 +494,7 @@ PWINDOW_OBJECT WndObject; PWND Wnd; - for (WndObject = Window; WndObject != NULL; WndObject = WndObject->Parent) + for (WndObject = Window; WndObject != NULL; WndObject = WndObject->spwndParent) { Wnd = WndObject->Wnd; if (!(Wnd->style & WS_VISIBLE) || @@ -623,7 +623,7 @@ PWINDOW_OBJECT TempWindow; PWND Wnd, TempWnd; - for (; Window != NULL; Window = Window->NextSibling) + for (; Window != NULL; Window = Window->spwndNext) { Wnd = Window->Wnd; if (IntWndBelongsToThread(Window, Thread) && @@ -632,8 +632,8 @@ /* Make sure all non-transparent siblings are already drawn. */ if (Wnd->ExStyle & WS_EX_TRANSPARENT) { - for (TempWindow = Window->NextSibling; TempWindow != NULL; - TempWindow = TempWindow->NextSibling) + for (TempWindow = Window->spwndNext; TempWindow != NULL; + TempWindow = TempWindow->spwndNext) { TempWnd = TempWindow->Wnd; if (!(TempWnd->ExStyle & WS_EX_TRANSPARENT) && @@ -648,9 +648,9 @@ return Window->hSelf; } - if (Window->FirstChild) - { - hChild = IntFindWindowToRepaint(Window->FirstChild, Thread); + if (Window->spwndChild) + { + hChild = IntFindWindowToRepaint(Window->spwndChild, Thread); if (hChild != NULL) return hChild; } @@ -825,7 +825,7 @@ if (!(Wnd->style & WS_CLIPCHILDREN)) { PWINDOW_OBJECT Child; - for (Child = Window->FirstChild; Child; Child = Child->NextSibling) + for (Child = Window->spwndChild; Child; Child = Child->spwndNext) { IntInvalidateWindows(Child, Window->UpdateRegion, RDW_FRAME | RDW_ERASE | RDW_INVALIDATE | RDW_ALLCHILDREN); } @@ -1406,7 +1406,7 @@ RECTL rcDummy; IntGetClientOrigin(Window, &ClientOrigin); - for (Child = Window->FirstChild; Child; Child = Child->NextSibling) + for (Child = Window->spwndChild; Child; Child = Child->spwndNext) { rcChild = Child->Wnd->rcWindow; rcChild.left -= ClientOrigin.x; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/vis.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/vis.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/vis.c [iso-8859-1] Mon Dec 14 06:02:56 2009 @@ -65,11 +65,18 @@ PreviousWindow = Window; PreviousWnd = PreviousWindow->Wnd; - CurrentWindow = Window->Parent; + CurrentWindow = Window->spwndParent; while (CurrentWindow) { + if ( CurrentWindow->Status & WINDOWSTATUS_DESTROYING || + CurrentWindow->Status & WINDOWSTATUS_DESTROYED ) + { + DPRINT1("ATM the Current Window or Parent is dead!\n"); + return NULL; + } + CurrentWnd = CurrentWindow->Wnd; - if (!(CurrentWnd) || !(CurrentWnd->style & WS_VISIBLE)) + if (!CurrentWnd || !(CurrentWnd->style & WS_VISIBLE)) { GreDeleteObject(VisRgn); return NULL; @@ -82,7 +89,7 @@ if ((PreviousWnd->style & WS_CLIPSIBLINGS) || (PreviousWnd == Wnd && ClipSiblings)) { - CurrentSibling = CurrentWindow->FirstChild; + CurrentSibling = CurrentWindow->spwndChild; while (CurrentSibling != NULL && CurrentSibling != PreviousWindow) { CurrentSiblingWnd = CurrentSibling->Wnd; @@ -100,18 +107,18 @@ NtGdiCombineRgn(VisRgn, VisRgn, ClipRgn, RGN_DIFF); GreDeleteObject(ClipRgn); } - CurrentSibling = CurrentSibling->NextSibling; + CurrentSibling = CurrentSibling->spwndNext; } } PreviousWindow = CurrentWindow; PreviousWnd = PreviousWindow->Wnd; - CurrentWindow = CurrentWindow->Parent; + CurrentWindow = CurrentWindow->spwndParent; } if (ClipChildren) { - CurrentWindow = Window->FirstChild; + CurrentWindow = Window->spwndChild; while (CurrentWindow) { CurrentWnd = CurrentWindow->Wnd; @@ -129,7 +136,7 @@ NtGdiCombineRgn(VisRgn, VisRgn, ClipRgn, RGN_DIFF); GreDeleteObject(ClipRgn); } - CurrentWindow = CurrentWindow->NextSibling; + CurrentWindow = CurrentWindow->spwndNext; } } @@ -160,7 +167,7 @@ Temp = NtGdiCreateRectRgn(0, 0, 0, 0); NtGdiCombineRgn(Temp, NewlyExposed, NULL, RGN_COPY); - Parent = Window->Parent; + Parent = Window->spwndParent; if(Parent) { ParentWnd = Parent->Wnd; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] Mon Dec 14 06:02:56 2009 @@ -242,7 +242,7 @@ PWINDOW_OBJECT Parent; PWND ParentWnd; - Parent = Window->Parent; + Parent = Window->spwndParent; if(!Parent) { hRgnVisible = NULL; @@ -391,7 +391,7 @@ Flags &= ~(DCX_PARENTCLIP | DCX_CLIPCHILDREN); } - Parent = (Window ? Window->Parent : NULL); + Parent = (Window ? Window->spwndParent : NULL); if (NULL == Window || !(Wnd->style & WS_CHILD) || NULL == Parent) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Mon Dec 14 06:02:56 2009 @@ -180,7 +180,7 @@ } else if (Wnd->Wnd->style & WS_CHILD) { - return Wnd->Parent; + return Wnd->spwndParent; } return NULL; @@ -220,7 +220,7 @@ if (!Window) return NULL; - for (Child = Window->FirstChild; Child; Child = Child->NextSibling) + for (Child = Window->spwndChild; Child; Child = Child->spwndNext) ++NumChildren; List = ExAllocatePoolWithTag(PagedPool, (NumChildren + 1) * sizeof(HWND), TAG_WINLIST); @@ -230,9 +230,9 @@ SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); return NULL; } - for (Child = Window->FirstChild, Index = 0; + for (Child = Window->spwndChild, Index = 0; Child != NULL; - Child = Child->NextSibling, ++Index) + Child = Child->spwndNext, ++Index) List[Index] = Child->hSelf; List[Index] = NULL; @@ -494,8 +494,8 @@ /* dereference the class */ IntDereferenceClass(Wnd->pcls, - Window->ti->pDeskInfo, - Window->ti->ppi); + Window->pti->pDeskInfo, + Window->pti->ppi); Wnd->pcls = NULL; if(Window->WindowRegion) @@ -504,7 +504,7 @@ } ASSERT(Window->Wnd != NULL); - UserFreeWindowInfo(Window->ti, Window); + UserFreeWindowInfo(Window->pti, Window); UserDereferenceObject(Window); @@ -978,7 +978,7 @@ break; } - Window = Window->Parent; + Window = Window->spwndParent; } return(FALSE); @@ -1003,7 +1003,7 @@ return FALSE; } - Window = Window->Parent; + Window = Window->spwndParent; } if(Window && Wnd->style & WS_VISIBLE) @@ -1054,34 +1054,34 @@ WndParent->Wnd, WndPrevSibling ? WndPrevSibling->Wnd : NULL); - Wnd->Parent = WndParent; - if ((Wnd->PrevSibling = WndPrevSibling)) + Wnd->spwndParent = WndParent; + if ((Wnd->spwndPrev = WndPrevSibling)) { /* link after WndPrevSibling */ - if ((Wnd->NextSibling = WndPrevSibling->NextSibling)) - Wnd->NextSibling->PrevSibling = Wnd; - else if ((Parent = Wnd->Parent)) + if ((Wnd->spwndNext = WndPrevSibling->spwndNext)) + Wnd->spwndNext->spwndPrev = Wnd; + else if ((Parent = Wnd->spwndParent)) { if(Parent->LastChild == WndPrevSibling) Parent->LastChild = Wnd; } - Wnd->PrevSibling->NextSibling = Wnd; + Wnd->spwndPrev->spwndNext = Wnd; } else { /* link at top */ - Parent = Wnd->Parent; - if ((Wnd->NextSibling = WndParent->FirstChild)) - Wnd->NextSibling->PrevSibling = Wnd; + Parent = Wnd->spwndParent; + if ((Wnd->spwndNext = WndParent->spwndChild)) + Wnd->spwndNext->spwndPrev = Wnd; else if (Parent) { Parent->LastChild = Wnd; - Parent->FirstChild = Wnd; + Parent->spwndChild = Wnd; return; } if(Parent) { - Parent->FirstChild = Wnd; + Parent->spwndChild = Wnd; } } @@ -1159,7 +1159,7 @@ if (Wnd->OwnerThread->ThreadsProcess != PsGetCurrentProcess()) return NULL; - WndOldParent = Wnd->Parent; + WndOldParent = Wnd->spwndParent; if (WndOldParent) UserReferenceObject(WndOldParent); /* caller must deref */ @@ -1170,11 +1170,11 @@ if (0 == (Wnd->Wnd->ExStyle & WS_EX_TOPMOST)) { /* Not a TOPMOST window, put after TOPMOSTs of new parent */ - Sibling = WndNewParent->FirstChild; + Sibling = WndNewParent->spwndChild; while (NULL != Sibling && 0 != (Sibling->Wnd->ExStyle & WS_EX_TOPMOST)) { InsertAfter = Sibling; - Sibling = Sibling->NextSibling; + Sibling = Sibling->spwndNext; } } if (NULL == InsertAfter) @@ -1270,21 +1270,21 @@ VOID FASTCALL IntUnlinkWindow(PWINDOW_OBJECT Wnd) { - PWINDOW_OBJECT WndParent = Wnd->Parent; + PWINDOW_OBJECT WndParent = Wnd->spwndParent; IntUnlinkWnd(Wnd->Wnd); - if (Wnd->NextSibling) - Wnd->NextSibling->PrevSibling = Wnd->PrevSibling; + if (Wnd->spwndNext) + Wnd->spwndNext->spwndPrev = Wnd->spwndPrev; else if (WndParent && WndParent->LastChild == Wnd) - WndParent->LastChild = Wnd->PrevSibling; - - if (Wnd->PrevSibling) - Wnd->PrevSibling->NextSibling = Wnd->NextSibling; - else if (WndParent && WndParent->FirstChild == Wnd) - WndParent->FirstChild = Wnd->NextSibling; - - Wnd->PrevSibling = Wnd->NextSibling = Wnd->Parent = NULL; + WndParent->LastChild = Wnd->spwndPrev; + + if (Wnd->spwndPrev) + Wnd->spwndPrev->spwndNext = Wnd->spwndNext; + else if (WndParent && WndParent->spwndChild == Wnd) + WndParent->spwndChild = Wnd->spwndNext; + + Wnd->spwndPrev = Wnd->spwndNext = Wnd->spwndParent = NULL; } BOOL FASTCALL @@ -1297,7 +1297,7 @@ return FALSE; } - for(Child = Window->FirstChild; Child; Child = Child->NextSibling) + for(Child = Window->spwndChild; Child; Child = Child->spwndNext) { if(Child->hOwner && Child->Wnd->style & WS_VISIBLE) { @@ -1440,7 +1440,7 @@ } if((Parent = UserGetWindowObject(hwndParent)) && - (Window = Parent->FirstChild)) + (Window = Parent->spwndChild)) { BOOL bGoDown = TRUE; @@ -1468,20 +1468,20 @@ break; } } - if (Window->FirstChild && bChildren) + if (Window->spwndChild && bChildren) { - Window = Window->FirstChild; + Window = Window->spwndChild; continue; } bGoDown = FALSE; } - if (Window->NextSibling) + if (Window->spwndNext) { - Window = Window->NextSibling; + Window = Window->spwndNext; bGoDown = TRUE; continue; } - Window = Window->Parent; + Window = Window->spwndParent; if (Window == Parent) { break; @@ -1856,7 +1856,7 @@ /* * Fill out the structure describing it. */ - Window->ti = ti; + Window->pti = ti; Wnd->pcls = Class; Class = NULL; @@ -1867,7 +1867,7 @@ Window->MessageQueue = pti->MessageQueue; IntReferenceMessageQueue(Window->MessageQueue); - Window->Parent = ParentWindow; + Window->spwndParent = ParentWindow; Wnd->spwndParent = ParentWindow ? ParentWindow->Wnd : NULL; if (Wnd->spwndParent != NULL && hWndParent != 0) { @@ -1955,10 +1955,10 @@ } Window->OwnerThread = PsGetCurrentThread(); - Window->FirstChild = NULL; + Window->spwndChild = NULL; Window->LastChild = NULL; - Window->PrevSibling = NULL; - Window->NextSibling = NULL; + Window->spwndPrev = NULL; + Window->spwndNext = NULL; Wnd->spwndNext = NULL; Wnd->spwndPrev = NULL; @@ -2302,11 +2302,11 @@ if (!(dwExStyle & WS_EX_TOPMOST)) { InsertAfter = NULL; - Sibling = ParentWindow->FirstChild; + Sibling = ParentWindow->spwndChild; while (Sibling && (Sibling->Wnd->ExStyle & WS_EX_TOPMOST)) { InsertAfter = Sibling; - Sibling = Sibling->NextSibling; + Sibling = Sibling->spwndNext; } } else @@ -2468,7 +2468,8 @@ CLEANUP: if (!_ret_ && Window && Window->Wnd && ti) - UserFreeWindowInfo(ti, Window); + co_UserDestroyWindow(Window); +// UserFreeWindowInfo(ti, Window); if (Window) { UserDerefObjectCo(Window); @@ -2625,7 +2626,8 @@ DPRINT("co_UserDestroyWindow \n"); /* Check for owner thread */ - if ((Window->OwnerThread != PsGetCurrentThread())) + if ( (Window->OwnerThread != PsGetCurrentThread()) || + Wnd->head.pti != PsGetCurrentThreadWin32Thread() ) { SetLastWin32Error(ERROR_ACCESS_DENIED); return FALSE; @@ -3121,7 +3123,7 @@ { case GA_PARENT: { - WndAncestor = Wnd->Parent; + WndAncestor = Wnd->spwndParent; break; } @@ -3132,7 +3134,7 @@ for(;;) { - if(!(Parent = WndAncestor->Parent)) + if(!(Parent = WndAncestor->spwndParent)) { break; } @@ -3686,15 +3688,15 @@ switch (Relationship) { case GW_HWNDFIRST: - if((Parent = Window->Parent)) + if((Parent = Window->spwndParent)) { - if (Parent->FirstChild) - hWndResult = Parent->FirstChild->hSelf; + if (Parent->spwndChild) + hWndResult = Parent->spwndChild->hSelf; } break; case GW_HWNDLAST: - if((Parent = Window->Parent)) + if((Parent = Window->spwndParent)) { if (Parent->LastChild) hWndResult = Parent->LastChild->hSelf; @@ -3702,13 +3704,13 @@ break; case GW_HWNDNEXT: - if (Window->NextSibling) - hWndResult = Window->NextSibling->hSelf; + if (Window->spwndNext) + hWndResult = Window->spwndNext->hSelf; break; case GW_HWNDPREV: - if (Window->PrevSibling) - hWndResult = Window->PrevSibling->hSelf; + if (Window->spwndPrev) + hWndResult = Window->spwndPrev->hSelf; break; case GW_OWNER: @@ -3718,8 +3720,8 @@ } break; case GW_CHILD: - if (Window->FirstChild) - hWndResult = Window->FirstChild->hSelf; + if (Window->spwndChild) + hWndResult = Window->spwndChild->hSelf; break; } @@ -3793,7 +3795,7 @@ break; case GWL_HWNDPARENT: - Parent = Window->Parent; + Parent = Window->spwndParent; if(Parent) { if (Parent && Parent->hSelf == IntGetDesktopWindow()) @@ -3919,7 +3921,7 @@ break; case GWL_HWNDPARENT: - Parent = Window->Parent; + Parent = Window->spwndParent; if (Parent && (Parent->hSelf == IntGetDesktopWindow())) OldValue = (LONG) IntSetOwner(Window->hSelf, (HWND) NewValue); else Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] Mon Dec 14 06:02:56 2009 @@ -161,7 +161,7 @@ WndTo = Window; for (;;) { - if (!(WndTo = WndTo->NextSibling)) break; + if (!(WndTo = WndTo->spwndNext)) break; if (can_activate_window( WndTo )) break; } @@ -260,7 +260,7 @@ PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); PDESKTOP Desktop = pti->Desktop; /* Or rather get it from the window? */ - Parent = Window->Parent; + Parent = Window->spwndParent; if(Parent) { if(IntIsDesktopWindow(Parent)) @@ -519,7 +519,7 @@ params.rgrc[0] = *WindowRect; params.rgrc[1] = Window->Wnd->rcWindow; params.rgrc[2] = Window->Wnd->rcClient; - Parent = Window->Parent; + Parent = Window->spwndParent; if (0 != (Wnd->style & WS_CHILD) && Parent) { RECTL_vOffsetRect(&(params.rgrc[0]), - Parent->Wnd->rcClient.left, @@ -608,7 +608,7 @@ PWINDOW_OBJECT Parent; X = WinPos->x; Y = WinPos->y; - Parent = Window->Parent; + Parent = Window->spwndParent; if ((0 != (Wnd->style & WS_CHILD)) && Parent) { X += Parent->Wnd->rcClient.left; @@ -733,7 +733,7 @@ { PWINDOW_OBJECT Child; - ASSERT(Window != Window->FirstChild); + ASSERT(Window != Window->spwndChild); Window->Wnd->rcWindow.left += MoveX; Window->Wnd->rcWindow.right += MoveX; @@ -745,7 +745,7 @@ Window->Wnd->rcClient.top += MoveY; Window->Wnd->rcClient.bottom += MoveY; - for(Child = Window->FirstChild; Child; Child = Child->NextSibling) + for(Child = Window->spwndChild; Child; Child = Child->spwndNext) { WinPosInternalMoveWindow(Child, MoveX, MoveY); } @@ -839,7 +839,7 @@ && HWND_NOTOPMOST != WinPos->hwndInsertAfter && HWND_BOTTOM != WinPos->hwndInsertAfter) { - PWINDOW_OBJECT InsAfterWnd, Parent = Window->Parent; + PWINDOW_OBJECT InsAfterWnd, Parent = Window->spwndParent; InsAfterWnd = UserGetWindowObject(WinPos->hwndInsertAfter); @@ -979,7 +979,7 @@ PWINDOW_OBJECT Sibling; PWINDOW_OBJECT InsertAfterWindow; - if ((ParentWindow = Window->Parent)) + if ((ParentWindow = Window->spwndParent)) { if (HWND_TOPMOST == WinPos.hwndInsertAfter) { @@ -989,11 +989,11 @@ || HWND_NOTOPMOST == WinPos.hwndInsertAfter) { InsertAfterWindow = NULL; - Sibling = ParentWindow->FirstChild; + Sibling = ParentWindow->spwndChild; while (NULL != Sibling && 0 != (Sibling->Wnd->ExStyle & WS_EX_TOPMOST)) { InsertAfterWindow = Sibling; - Sibling = Sibling->NextSibling; + Sibling = Sibling->spwndNext; } if (NULL != InsertAfterWindow) { @@ -1023,10 +1023,10 @@ UserDereferenceObject(InsertAfterWindow); if ((HWND_TOPMOST == WinPos.hwndInsertAfter) || (0 != (Window->Wnd->ExStyle & WS_EX_TOPMOST) - && NULL != Window->PrevSibling - && 0 != (Window->PrevSibling->Wnd->ExStyle & WS_EX_TOPMOST)) - || (NULL != Window->NextSibling - && 0 != (Window->NextSibling->Wnd->ExStyle & WS_EX_TOPMOST))) + && NULL != Window->spwndPrev + && 0 != (Window->spwndPrev->Wnd->ExStyle & WS_EX_TOPMOST)) + || (NULL != Window->spwndNext + && 0 != (Window->spwndNext->Wnd->ExStyle & WS_EX_TOPMOST))) { Window->Wnd->ExStyle |= WS_EX_TOPMOST; } @@ -1074,7 +1074,7 @@ co_UserRedrawWindow(Window, NULL, 0, RDW_VALIDATE | RDW_NOFRAME | RDW_NOERASE | RDW_NOINTERNALPAINT | RDW_ALLCHILDREN); if ((Window->Wnd->style & WS_VISIBLE) && - Window->Parent == UserGetDesktopWindow()) + Window->spwndParent == UserGetDesktopWindow()) { co_IntShellHookNotify(HSHELL_WINDOWDESTROYED, (LPARAM)Window->hSelf); } @@ -1083,7 +1083,7 @@ else if (WinPos.flags & SWP_SHOWWINDOW) { if (!(Window->Wnd->style & WS_VISIBLE) && - Window->Parent == UserGetDesktopWindow()) + Window->spwndParent == UserGetDesktopWindow()) { co_IntShellHookNotify(HSHELL_WINDOWCREATED, (LPARAM)Window->hSelf); } @@ -1237,7 +1237,7 @@ GreDeleteObject(DirtyRgn); */ - PWINDOW_OBJECT Parent = Window->Parent; + PWINDOW_OBJECT Parent = Window->spwndParent; NtGdiOffsetRgn(DirtyRgn, Window->Wnd->rcWindow.left, @@ -1472,7 +1472,7 @@ IntIsChildWindow(Window, ThreadFocusWindow))) { //faxme: as long as we have ref on Window, we also, indirectly, have ref on parent... - co_UserSetFocus(Window->Parent); + co_UserSetFocus(Window->spwndParent); } } @@ -1521,10 +1521,10 @@ /* find child of 'parent' that contains the given point (in parent-relative coords) */ PWINDOW_OBJECT child_window_from_point(PWINDOW_OBJECT parent, int x, int y ) { - PWINDOW_OBJECT Wnd;// = parent->FirstChild; + PWINDOW_OBJECT Wnd;// = parent->spwndChild; // LIST_FOR_EACH_ENTRY( Wnd, &parent->children, struct window, entry ) - for (Wnd = parent->FirstChild; Wnd; Wnd = Wnd->NextSibling) + for (Wnd = parent->spwndChild; Wnd; Wnd = Wnd->spwndNext) { if (!IntPtInWindow( Wnd, x, y )) continue; /* skip it */

1 0

[jimtabor] 44574: - Silence debug prints.
by jimtabor＠svn.reactos.org 13 Dec '09

13 Dec '09

Author: jimtabor Date: Sun Dec 13 22:55:06 2009 New Revision: 44574 URL: http://svn.reactos.org/svn/reactos?rev=44574&view=rev Log: - Silence debug prints. Modified: trunk/reactos/dll/win32/user32/windows/class.c Modified: trunk/reactos/dll/win32/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/class.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/class.c [iso-8859-1] Sun Dec 13 22:55:06 2009 @@ -981,7 +981,7 @@ lpwcx->cbClsExtra < 0 || lpwcx->cbWndExtra < 0 || lpwcx->lpszClassName == NULL) { - ERR("RegisterClassExWOWW Invalid Parameter Error!\n"); + TRACE("RegisterClassExWOWW Invalid Parameter Error!\n"); SetLastError(ERROR_INVALID_PARAMETER); return 0; } @@ -1002,7 +1002,7 @@ */ if (lpwcx->hInstance == User32Instance) { - ERR("RegisterClassExWOWW User32Instance!\n"); + TRACE("RegisterClassExWOWW User32Instance!\n"); SetLastError(ERROR_INVALID_PARAMETER); return 0; }

1 0

[gadamopoulos] 44573: [win32k] - Remove an unused reactos only syscall
by gadamopoulos＠svn.reactos.org 13 Dec '09

13 Dec '09

Author: gadamopoulos Date: Sun Dec 13 21:57:03 2009 New Revision: 44573 URL: http://svn.reactos.org/svn/reactos?rev=44573&view=rev Log: [win32k] - Remove an unused reactos only syscall Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Sun Dec 13 21:57:03 2009 @@ -3136,12 +3136,6 @@ int fnBar, LPSCROLLINFO lpsi); -/* Should be done in usermode and use NtUserGetCPD. */ -LONG -NTAPI -NtUserGetWindowLong(HWND hWnd, DWORD Index, BOOL Ansi); - - /* (other FocusedItem values give the position of the focused item) */ #define NO_SELECTED_ITEM 0xffff Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Sun Dec 13 21:57:03 2009 @@ -3821,35 +3821,6 @@ return Result; } - -/* - * NtUserGetWindowLong - * - * The NtUserGetWindowLong function retrieves information about the specified - * window. The function also retrieves the 32-bit (long) value at the - * specified offset into the extra window memory. - * - * Status - * @implemented - */ - -LONG APIENTRY -NtUserGetWindowLong(HWND hWnd, DWORD Index, BOOL Ansi) -{ - DECLARE_RETURN(LONG); - - DPRINT("Enter NtUserGetWindowLong(%x,%d,%d)\n", hWnd, (INT)Index, Ansi); - UserEnterExclusive(); - - RETURN(UserGetWindowLong(hWnd, Index, Ansi)); - -CLEANUP: - DPRINT("Leave NtUserGetWindowLong, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; -} - - LONG FASTCALL co_UserSetWindowLong(HWND hWnd, DWORD Index, LONG NewValue, BOOL Ansi) Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Sun Dec 13 21:57:03 2009 @@ -690,7 +690,6 @@ NtUserGetMinMaxInfo 3 NtUserGetMonitorInfo 2 NtUserGetScrollInfo 3 -NtUserGetWindowLong 3 NtUserMenuInfo 3 NtUserMenuItemInfo 5 NtUserMonitorFromPoint 3

1 0

[janderwald] 44572: - Fix build
by janderwald＠svn.reactos.org 13 Dec '09

13 Dec '09

Author: janderwald Date: Sun Dec 13 21:11:11 2009 New Revision: 44572 URL: http://svn.reactos.org/svn/reactos?rev=44572&view=rev Log: - Fix build Modified: trunk/reactos/base/applications/sndrec32/lang/sk-SK.rc Modified: trunk/reactos/base/applications/sndrec32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/sk-SK.rc [iso-8859-1] Sun Dec 13 21:11:11 2009 @@ -3,7 +3,7 @@ * LAST UPDATE: xx-xx-xxxx */ -LANGUAGE SLOVAK, SUBLANG_DEFAULT +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT IDC_REACTOS_SNDREC32 ACCELERATORS BEGIN

1 0

[gadamopoulos] 44571: [user32] Optimize GetWindow by moving it completely to user mode [win32k] Remove reactos only syscall NtUserGetWindow
by gadamopoulos＠svn.reactos.org 13 Dec '09

13 Dec '09

Author: gadamopoulos Date: Sun Dec 13 21:01:21 2009 New Revision: 44571 URL: http://svn.reactos.org/svn/reactos?rev=44571&view=rev Log: [user32] Optimize GetWindow by moving it completely to user mode [win32k] Remove reactos only syscall NtUserGetWindow Modified: trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Sun Dec 13 21:01:21 2009 @@ -1024,8 +1024,36 @@ FoundWnd = DesktopPtrToUser(Wnd->spwndOwner); break; + case GW_HWNDFIRST: + if(Wnd->spwndParent != NULL) + { + FoundWnd = DesktopPtrToUser(Wnd->spwndParent); + if (FoundWnd->spwndChild != NULL) + FoundWnd = DesktopPtrToUser(FoundWnd->spwndChild); + } + break; + case GW_HWNDNEXT: + if (Wnd->spwndNext != NULL) + FoundWnd = DesktopPtrToUser(Wnd->spwndNext); + break; + + case GW_HWNDPREV: + if (Wnd->spwndPrev != NULL) + FoundWnd = DesktopPtrToUser(Wnd->spwndPrev); + break; + + case GW_CHILD: + if (Wnd->spwndChild != NULL) + FoundWnd = DesktopPtrToUser(Wnd->spwndChild); + break; + + case GW_HWNDLAST: + FoundWnd = Wnd; + while ( FoundWnd->spwndNext != NULL) + FoundWnd = DesktopPtrToUser(FoundWnd->spwndNext); + break; + default: - /* FIXME: Optimize! Fall back to NtUserGetWindow for now... */ Wnd = NULL; break; } @@ -1038,9 +1066,6 @@ /* Do nothing */ } _SEH2_END; - - if (!Wnd) /* Fall back to win32k... */ - Ret = NtUserGetWindow(hWnd, uCmd); return Ret; } Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Sun Dec 13 21:01:21 2009 @@ -3136,10 +3136,6 @@ int fnBar, LPSCROLLINFO lpsi); -HWND -NTAPI -NtUserGetWindow(HWND hWnd, UINT Relationship); - /* Should be done in usermode and use NtUserGetCPD. */ LONG NTAPI Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Sun Dec 13 21:01:21 2009 @@ -1014,6 +1014,31 @@ return FALSE; } +VOID FASTCALL +IntLinkWnd( + PWND Wnd, + PWND WndParent, + PWND WndPrevSibling) /* set to NULL if top sibling */ +{ + Wnd->spwndParent = WndParent; + if ((Wnd->spwndPrev = WndPrevSibling)) + { + /* link after WndPrevSibling */ + if ((Wnd->spwndNext = WndPrevSibling->spwndNext)) + Wnd->spwndNext->spwndPrev = Wnd; + + Wnd->spwndPrev->spwndNext = Wnd; + } + else + { + /* link at top */ + if ((Wnd->spwndNext = WndParent->spwndChild)) + Wnd->spwndNext->spwndPrev = Wnd; + + WndParent->spwndChild = Wnd; + } + +} /* link the window into siblings and parent. children are kept in place. */ VOID FASTCALL @@ -1025,8 +1050,11 @@ { PWINDOW_OBJECT Parent; + IntLinkWnd(Wnd->Wnd, + WndParent->Wnd, + WndPrevSibling ? WndPrevSibling->Wnd : NULL); + Wnd->Parent = WndParent; - Wnd->Wnd->spwndParent = WndParent ? WndParent->Wnd : NULL; if ((Wnd->PrevSibling = WndPrevSibling)) { /* link after WndPrevSibling */ @@ -1221,12 +1249,30 @@ return TRUE; } +/* unlink the window from siblings and parent. children are kept in place. */ +VOID FASTCALL +IntUnlinkWnd(PWND Wnd) +{ + if (Wnd->spwndNext) + Wnd->spwndNext->spwndPrev = Wnd->spwndPrev; + + if (Wnd->spwndPrev) + Wnd->spwndPrev->spwndNext = Wnd->spwndNext; + + if (Wnd->spwndParent && Wnd->spwndParent->spwndChild == Wnd) + Wnd->spwndParent->spwndChild = Wnd->spwndNext; + + Wnd->spwndParent = Wnd->spwndPrev = Wnd->spwndNext = Wnd->spwndParent = NULL; +} + /* unlink the window from siblings and parent. children are kept in place. */ VOID FASTCALL IntUnlinkWindow(PWINDOW_OBJECT Wnd) { PWINDOW_OBJECT WndParent = Wnd->Parent; + + IntUnlinkWnd(Wnd->Wnd); if (Wnd->NextSibling) Wnd->NextSibling->PrevSibling = Wnd->PrevSibling; @@ -1239,8 +1285,6 @@ WndParent->FirstChild = Wnd->NextSibling; Wnd->PrevSibling = Wnd->NextSibling = Wnd->Parent = NULL; - if (Wnd->Wnd) - Wnd->Wnd->spwndParent = NULL; } BOOL FASTCALL @@ -1915,6 +1959,11 @@ Window->LastChild = NULL; Window->PrevSibling = NULL; Window->NextSibling = NULL; + + Wnd->spwndNext = NULL; + Wnd->spwndPrev = NULL; + Wnd->spwndChild = NULL; + Wnd->cbwndExtra = Wnd->pcls->cbwndExtra; InitializeListHead(&Wnd->PropListHead); @@ -3675,32 +3724,6 @@ } return hWndResult; -} - -/* - * NtUserGetWindow - * - * The NtUserGetWindow function retrieves a handle to a window that has the - * specified relationship (Z order or owner) to the specified window. - * - * Status - * @implemented - */ - -HWND APIENTRY -NtUserGetWindow(HWND hWnd, UINT Relationship) -{ - DECLARE_RETURN(HWND); - - DPRINT("Enter NtUserGetWindow\n"); - UserEnterShared(); - - RETURN(UserGetWindow(hWnd, Relationship)); - -CLEANUP: - DPRINT("Leave NtUserGetWindow, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; } /* Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Sun Dec 13 21:01:21 2009 @@ -690,7 +690,6 @@ NtUserGetMinMaxInfo 3 NtUserGetMonitorInfo 2 NtUserGetScrollInfo 3 -NtUserGetWindow 2 NtUserGetWindowLong 3 NtUserMenuInfo 3 NtUserMenuItemInfo 5

1 0

[dgorbachev] 44570: Slovak translations by Mario Kacmar. Added: SndRec32, RunOnce. Updated: Paint. Bug #5021.
by dgorbachev＠svn.reactos.org 13 Dec '09

13 Dec '09

Author: dgorbachev Date: Sun Dec 13 19:09:08 2009 New Revision: 44570 URL: http://svn.reactos.org/svn/reactos?rev=44570&view=rev Log: Slovak translations by Mario Kacmar. Added: SndRec32, RunOnce. Updated: Paint. Bug #5021. Added: trunk/reactos/base/applications/sndrec32/lang/sk-SK.rc (with props) trunk/reactos/base/system/runonce/lang/sk-SK.rc (with props) trunk/reactos/dll/cpl/liccpa/liccpa.rbuild (with props) Modified: trunk/reactos/base/applications/paint/lang/en-GB.rc trunk/reactos/base/applications/paint/lang/en-US.rc trunk/reactos/base/applications/paint/lang/sk-SK.rc trunk/reactos/base/applications/sndrec32/rsrc.rc trunk/reactos/base/system/runonce/rsrc.rc Modified: trunk/reactos/base/applications/paint/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/en-GB.rc [iso-8859-1] Sun Dec 13 19:09:08 2009 @@ -65,7 +65,7 @@ END MENUITEM "Full screen\tCtrl+F", IDM_VIEWFULLSCREEN END - + POPUP "&Image" BEGIN MENUITEM "Rotate/Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR @@ -76,12 +76,12 @@ MENUITEM "Delete image\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE MENUITEM "Draw opaque", IDM_IMAGEDRAWOPAQUE END - + POPUP "&Colours" BEGIN MENUITEM "Edit palette...", IDM_COLORSEDITPALETTE END - + POPUP "&?" BEGIN MENUITEM "Help topics", IDM_HELPHELPTOPICS Modified: trunk/reactos/base/applications/paint/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/en-US.rc [iso-8859-1] Sun Dec 13 19:09:08 2009 @@ -65,7 +65,7 @@ END MENUITEM "Full screen\tCtrl+F", IDM_VIEWFULLSCREEN END - + POPUP "&Image" BEGIN MENUITEM "Rotate/Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR @@ -76,12 +76,12 @@ MENUITEM "Delete image\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE MENUITEM "Draw opaque", IDM_IMAGEDRAWOPAQUE END - + POPUP "&Colors" BEGIN MENUITEM "Edit palette...", IDM_COLORSEDITPALETTE END - + POPUP "&?" BEGIN MENUITEM "Help topics", IDM_HELPHELPTOPICS Modified: trunk/reactos/base/applications/paint/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/sk-SK.rc [iso-8859-1] Sun Dec 13 19:09:08 2009 @@ -4,6 +4,7 @@ * FILE: base/applications/paint/lang/sk-SK.rc * PURPOSE: Slovak Language resource file * TRANSLATORS: Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * LastChanged: 21-10-2009 */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT @@ -201,6 +202,6 @@ IDS_TOOLTIP16, "Zaoblený obdånik" IDS_OPENFILTER, "Súbory bitových máp (*.bmp;*.dib)\1*.bmp;*.dib\1Vetky súbory (*.*)\1*.*\1" IDS_SAVEFILTER, "24-bitová mapa (*.bmp;*.dib)\1*.bmp;*.dib\1" - IDS_FILESIZE, "%d bytes" - IDS_PRINTRES, "%d x %d pixels per meter" -END + IDS_FILESIZE, "%d bajtov" + IDS_PRINTRES, "%d x %d pixelov na meter" +END Added: trunk/reactos/base/applications/sndrec32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/sk-SK.rc (added) +++ trunk/reactos/base/applications/sndrec32/lang/sk-SK.rc [iso-8859-1] Sun Dec 13 19:09:08 2009 @@ -1,0 +1,48 @@ +/* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * DATE OF TR.: 13-12-2009 + * LAST UPDATE: xx-xx-xxxx + */ + +LANGUAGE SLOVAK, SUBLANG_DEFAULT + +IDC_REACTOS_SNDREC32 ACCELERATORS +BEGIN + "?", IDM_ABOUT, ASCII, ALT + "/", IDM_ABOUT, ASCII, ALT +END + +IDD_ABOUTBOX DIALOGEX 0, 0, 196, 75 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Èo je reactOS_sndrec32" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + ICON 128,IDC_REACTOS_SNDREC32,19,14,21,20 + LTEXT "reactOS_sndrec32, verzia 1.0",IDC_STATIC,56,16,114,8,SS_NOPREFIX + LTEXT "Autorské práva (C) 2009",IDC_STATIC,55,25,114,8 + DEFPUSHBUTTON "OK",IDOK,139,54,50,14,WS_GROUP +END + +IDR_MENU1 MENU +BEGIN + POPUP "&Súbor" + BEGIN + MENUITEM "Nový", ID_NEW + MENUITEM "Otvori...", ID_FILE_OPEN + MENUITEM "Uloi", ID_FILE_SAVE, GRAYED + MENUITEM "Uloi ako...", ID_FILE_SAVEAS, GRAYED + MENUITEM SEPARATOR + MENUITEM "Skonèi", ID_EXIT + END + MENUITEM "todo1", 0 + MENUITEM "todo2", 0 + POPUP "?" + BEGIN + MENUITEM "È&o je...", ID__ABOUT + END +END + +STRINGTABLE +BEGIN + IDS_APP_TITLE "reactOS_sndrec32" + IDC_REACTOS_SNDREC32 "REACTOS_SNDREC32" +END Propchange: trunk/reactos/base/applications/sndrec32/lang/sk-SK.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/sndrec32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/rsrc.rc [iso-8859-1] Sun Dec 13 19:09:08 2009 @@ -20,3 +20,5 @@ #include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/it-IT.rc" +#include "lang/sk-SK.rc" + Added: trunk/reactos/base/system/runonce/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/runonce/lang/s… ============================================================================== --- trunk/reactos/base/system/runonce/lang/sk-SK.rc (added) +++ trunk/reactos/base/system/runonce/lang/sk-SK.rc [iso-8859-1] Sun Dec 13 19:09:08 2009 @@ -1,0 +1,16 @@ +/* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * DATE OF TR.: 13-12-2009 + * LAST UPDATE: xx-xx-xxxx + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +IDD_RUNONCE_DLG DIALOG DISCARDABLE 0, 0, 239, 170 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Intalácia systému ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Systém ReactOS teraz nastavuje nasledujúce poloky:", -1, 38, 8, 196, 18 + LISTBOX IDC_COMP_LIST, 36, 32, 197, 131, LBS_OWNERDRAWVARIABLE | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + ICON IDI_ICON, -1, 5, 6, 21, 20 +END Propchange: trunk/reactos/base/system/runonce/lang/sk-SK.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/system/runonce/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/runonce/rsrc.r… ============================================================================== --- trunk/reactos/base/system/runonce/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/runonce/rsrc.rc [iso-8859-1] Sun Dec 13 19:09:08 2009 @@ -1,3 +1,5 @@ #include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/ru-RU.rc" +#include "lang/sk-SK.rc" + Added: trunk/reactos/dll/cpl/liccpa/liccpa.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/liccpa/liccpa.rbui… ============================================================================== --- trunk/reactos/dll/cpl/liccpa/liccpa.rbuild (added) +++ trunk/reactos/dll/cpl/liccpa/liccpa.rbuild [iso-8859-1] Sun Dec 13 19:09:08 2009 @@ -1,0 +1,15 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="liccpa" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_LICCPA}" installbase="system32" installname="liccpa.cpl" unicode="yes"> + <importlibrary definition="liccpa.def" /> + <include base="liccpa">.</include> + <library>kernel32</library> + <library>advapi32</library> + <library>user32</library> + <library>comctl32</library> + <library>ole32</library> + <library>uuid</library> + <library>shell32</library> + <file>liccpa.c</file> + <file>liccpa.rc</file> +</module> Propchange: trunk/reactos/dll/cpl/liccpa/liccpa.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[gschneider] 44569: [reg] Update reg.c to current Wine
by gschneider＠svn.reactos.org 13 Dec '09

13 Dec '09

Author: gschneider Date: Sun Dec 13 18:27:13 2009 New Revision: 44569 URL: http://svn.reactos.org/svn/reactos?rev=44569&view=rev Log: [reg] Update reg.c to current Wine Modified: trunk/reactos/base/applications/cmdutils/reg/reg.c Modified: trunk/reactos/base/applications/cmdutils/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/reg.c [iso-8859-1] Sun Dec 13 18:27:13 2009 @@ -255,7 +255,8 @@ /* FIXME: Prompt for delete */ } - if (!value_name) + /* Delete subtree only if no /v* option is given */ + if (!value_name && !value_empty && !value_all) { if (RegDeleteTreeW(root,p)!=ERROR_SUCCESS) {

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs