Ros-diffs July 2015

ros-diffs@reactos.org

13 participants
257 discussions

[jimtabor] 68474: [Win32k] - Improve painting messages, separated functions and dual functions for isolating drawing issues. Next thing to do is fix Set Window Position; Still no SWP_FRAMECHANGED s...

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Jul 20 19:34:35 2015 New Revision: 68474 URL: http://svn.reactos.org/svn/reactos?rev=68474&view=rev Log: [Win32k] - Improve painting messages, separated functions and dual functions for isolating drawing issues. Next thing to do is fix Set Window Position; Still no SWP_FRAMECHANGED support. - See CORE-7447 for test results. Modified: trunk/reactos/win32ss/user/ntuser/defwnd.c trunk/reactos/win32ss/user/ntuser/message.c trunk/reactos/win32ss/user/ntuser/painting.c trunk/reactos/win32ss/user/ntuser/painting.h trunk/reactos/win32ss/user/ntuser/simplecall.c trunk/reactos/win32ss/user/ntuser/window.c trunk/reactos/win32ss/user/ntuser/winpos.c trunk/reactos/win32ss/user/ntuser/winpos.h Modified: trunk/reactos/win32ss/user/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/defwnd… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] Mon Jul 20 19:34:35 2015 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Win32k subsystem * PURPOSE: Miscellaneous User functions - * FILE: subsystems/win32/win32k/ntuser/defwnd.c + * FILE: win32ss/user/ntuser/defwnd.c * PROGRAMER: */ @@ -638,6 +638,7 @@ } if ( IntIsWindow(UserHMGetHandle(pwnd)) ) + { if ( iconic ) { /* Single click brings up the system menu when iconized */ @@ -647,6 +648,7 @@ co_IntSendMessage( UserHMGetHandle(pwnd), WM_SYSCOMMAND, SC_MOUSEMENU + HTSYSMENU, MAKELONG(pt.x,pt.y)); } } + } } // @@ -773,7 +775,7 @@ { case HTERROR: { - //// This is the real fix for CORE-6129! This was a "Code Whole". + //// This is the real fix for CORE-6129! This was a "Code hole". USER_REFERENCE_ENTRY Ref; if (Msg == WM_LBUTTONDOWN) @@ -1107,19 +1109,21 @@ case WM_SYNCPAINT: { - PREGION Rgn; + HRGN hRgn; Wnd->state &= ~WNDS_SYNCPAINTPENDING; - ERR("WM_SYNCPAINT\n"); - Rgn = IntSysCreateRectpRgn(0, 0, 0, 0); - if (Rgn) - { - if (co_UserGetUpdateRgn(Wnd, Rgn, FALSE) != NULLREGION) + TRACE("WM_SYNCPAINT\n"); + hRgn = NtGdiCreateRectRgn(0, 0, 0, 0); + if (hRgn) + { + if (co_UserGetUpdateRgn(Wnd, hRgn, FALSE) != NULLREGION) { + PREGION pRgn = REGION_LockRgn(hRgn); + if (pRgn) REGION_UnlockRgn(pRgn); if (!wParam) wParam = (RDW_ERASENOW | RDW_ERASE | RDW_FRAME | RDW_ALLCHILDREN); - co_UserRedrawWindow(Wnd, NULL, Rgn, wParam); + co_UserRedrawWindow(Wnd, NULL, pRgn, wParam); } - REGION_Delete(Rgn); + GreDeleteObject(hRgn); } return 0; } Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Mon Jul 20 19:34:35 2015 @@ -763,14 +763,14 @@ pMsg->lParam, -1); - if (pMsg->message == WM_PAINT) - { - PREGION Rgn; + if ( pMsg->message == WM_PAINT && + VerifyWnd(Window) && + Window->state & WNDS_PAINTNOTPROCESSED ) // <--- Cleared, paint was already processed! + { Window->state2 &= ~WNDS2_WMPAINTSENT; - /* send a WM_NCPAINT and WM_ERASEBKGND if the non-client area is still invalid */ - Rgn = IntSysCreateRectpRgn( 0, 0, 0, 0 ); - co_UserGetUpdateRgn( Window, Rgn, TRUE ); - REGION_Delete(Rgn); + /* send a WM_ERASEBKGND if the non-client area is still invalid */ + ERR("Message WM_PAINT\n"); + co_IntPaintWindows( Window, RDW_NOCHILDREN, FALSE ); } return retval; @@ -1076,7 +1076,7 @@ co_HOOK_CallHooks( WH_GETMESSAGE, HC_ACTION, RemoveMsg & PM_REMOVE, (LPARAM)pMsg); - if ( bGMSG ) break; + if ( bGMSG || pMsg->message == WM_PAINT) break; } if ( bGMSG ) Modified: trunk/reactos/win32ss/user/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] Mon Jul 20 19:34:35 2015 @@ -2,12 +2,15 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Win32k subsystem * PURPOSE: Window painting function - * FILE: subsystems/win32/win32k/ntuser/painting.c + * FILE: win32ss/user/ntuser/painting.c * PROGRAMER: Filip Navara (xnavara(a)volny.cz) */ #include <win32k.h> DBG_DEFAULT_CHANNEL(UserPainting); + +#define RDW_CLIPCHILDREN 4096 +#define RDW_NOUPDATEDIRTY 32768 /* PRIVATE FUNCTIONS **********************************************************/ @@ -33,21 +36,21 @@ { PWND ParentWnd; + if (Child->ExStyle & WS_EX_REDIRECTED) + return TRUE; + ParentWnd = Child->spwndParent; while (ParentWnd != NULL) { - if (!(ParentWnd->style & WS_VISIBLE) || - (ParentWnd->style & WS_MINIMIZE)) + if (!(ParentWnd->style & WS_VISIBLE) || + (ParentWnd->style & WS_MINIMIZE) || + !RECTL_bIntersectRect(WindowRect, WindowRect, &ParentWnd->rcClient) ) { return FALSE; } - if (!RECTL_bIntersectRect(WindowRect, WindowRect, &ParentWnd->rcClient)) - { - return FALSE; - } - - /* FIXME: Layered windows. */ + if (ParentWnd->ExStyle & WS_EX_REDIRECTED) + return TRUE; ParentWnd = ParentWnd->spwndParent; } @@ -56,9 +59,12 @@ } BOOL FASTCALL -IntValidateParent(PWND Child, PREGION ValidateRgn, BOOL Recurse) -{ +IntValidateParents(PWND Child, BOOL Recurse) +{ + RECTL ParentRect, Rect; + BOOL Start, Ret = TRUE; PWND ParentWnd = Child; + PREGION Rgn = NULL; if (ParentWnd->style & WS_CHILD) { @@ -66,9 +72,11 @@ ParentWnd = ParentWnd->spwndParent; while (ParentWnd->style & WS_CHILD); } -// Hax out for drawing issues. -// if (!(ParentWnd->state & WNDS_SYNCPAINTPENDING)) Recurse = FALSE; - + + // No pending nonclient paints. + if (!(ParentWnd->state & WNDS_SYNCPAINTPENDING)) Recurse = FALSE; + + Start = TRUE; ParentWnd = Child->spwndParent; while (ParentWnd) { @@ -78,17 +86,43 @@ if (ParentWnd->hrgnUpdate != 0) { if (Recurse) - return FALSE; + { + Ret = FALSE; + break; + } + // Start with child clipping. + if (Start) + { + Start = FALSE; + + Rect = Child->rcWindow; + + if (!IntIntersectWithParents(Child, &Rect)) break; + + Rgn = IntSysCreateRectpRgnIndirect(&Rect); + + if (Child->hrgnClip) + { + PREGION RgnClip = REGION_LockRgn(Child->hrgnClip); + IntGdiCombineRgn(Rgn, Rgn, RgnClip, RGN_AND); + REGION_UnlockRgn(RgnClip); + } + } + + ParentRect = ParentWnd->rcWindow; + + if (!IntIntersectWithParents(ParentWnd, &ParentRect)) break; IntInvalidateWindows( ParentWnd, - ValidateRgn, - RDW_VALIDATE | RDW_NOCHILDREN); - } - + Rgn, + RDW_VALIDATE | RDW_NOCHILDREN | RDW_NOUPDATEDIRTY); + } ParentWnd = ParentWnd->spwndParent; } - return TRUE; + if (Rgn) REGION_Delete(Rgn); + + return Ret; } /* @@ -113,7 +147,7 @@ Wnd->style & WS_VISIBLE) { // For testing, if you see this, break out the Champagne and have a party! - ERR("SendSyncPaint Wnd in State!\n"); + TRACE("SendSyncPaint Wnd in State!\n"); if (!IsListEmpty(&ptiWnd->SentMessagesListHead)) { // Scan sent queue messages to see if we received sync paint messages. @@ -136,7 +170,7 @@ } if (bSend) { - ERR("Sending WM_SYNCPAINT\n"); + TRACE("Sending WM_SYNCPAINT\n"); // This message has no parameters. But it does! Pass Flags along. co_IntSendMessageNoWait(UserHMGetHandle(Wnd), WM_SYNCPAINT, Flags, 0); Wnd->state |= WNDS_SYNCPAINTPENDING; @@ -165,7 +199,7 @@ } } -/** +/* * @name IntCalcWindowRgn * * Get a window or client region. @@ -207,7 +241,7 @@ return hRgnWindow; } -/** +/* * @name IntGetNCUpdateRgn * * Get non-client update region of a window and optionally validate it. @@ -227,7 +261,8 @@ { HRGN hRgnNonClient; HRGN hRgnWindow; - UINT RgnType; + UINT RgnType, NcType; + RECT update; if (Window->hrgnUpdate != NULL && Window->hrgnUpdate != HRGN_WINDOW) @@ -250,8 +285,10 @@ return HRGN_WINDOW; } - RgnType = NtGdiCombineRgn(hRgnNonClient, hRgnNonClient, - hRgnWindow, RGN_DIFF); + NcType = IntGdiGetRgnBox(hRgnNonClient, &update); + + RgnType = NtGdiCombineRgn(hRgnNonClient, hRgnNonClient, hRgnWindow, RGN_DIFF); + if (RgnType == ERROR) { GreDeleteObject(hRgnWindow); @@ -273,8 +310,7 @@ if (Validate) { - if (NtGdiCombineRgn(Window->hrgnUpdate, Window->hrgnUpdate, - hRgnWindow, RGN_AND) == NULLREGION) + if (NtGdiCombineRgn(Window->hrgnUpdate, Window->hrgnUpdate, hRgnWindow, RGN_AND) == NULLREGION) { IntGdiSetRegionOwner(Window->hrgnUpdate, GDI_OBJ_HMGR_POWNED); GreDeleteObject(Window->hrgnUpdate); @@ -285,6 +321,19 @@ } } + /* check if update rgn contains complete nonclient area */ + if (NcType == SIMPLEREGION) + { + RECT window; + IntGetWindowRect( Window, &window ); + + if (IntEqualRect( &window, &update )) + { + GreDeleteObject(hRgnNonClient); + hRgnNonClient = HRGN_WINDOW; + } + } + GreDeleteObject(hRgnWindow); return hRgnNonClient; @@ -292,6 +341,45 @@ else { return Window->hrgnUpdate; + } +} + +VOID FASTCALL +IntSendNCPaint(PWND pWnd, HRGN hRgn) +{ + pWnd->state &= ~WNDS_SENDNCPAINT; + + if ( pWnd == GetW32ThreadInfo()->MessageQueue->spwndActive && + !(pWnd->state & WNDS_ACTIVEFRAME)) + { + pWnd->state |= WNDS_ACTIVEFRAME; + pWnd->state &= ~WNDS_NONCPAINT; + hRgn = HRGN_WINDOW; + } + + if (pWnd->state2 & WNDS2_FORCEFULLNCPAINTCLIPRGN) + { + pWnd->state2 &= ~WNDS2_FORCEFULLNCPAINTCLIPRGN; + hRgn = HRGN_WINDOW; + } + + if (hRgn) co_IntSendMessage(UserHMGetHandle(pWnd), WM_NCPAINT, (WPARAM)hRgn, 0); +} + +VOID FASTCALL +IntSendChildNCPaint(PWND pWnd) +{ + pWnd = pWnd->spwndChild; + while(pWnd) + { + if (pWnd->hrgnUpdate == NULL && pWnd->state & WNDS_SENDNCPAINT) + { + USER_REFERENCE_ENTRY Ref; + UserRefObjectCo(pWnd, &Ref); + IntSendNCPaint(pWnd, HRGN_WINDOW); + UserDerefObjectCo(pWnd); + } + pWnd = pWnd->spwndNext; } } @@ -306,72 +394,66 @@ { HDC hDC; HWND hWnd = Wnd->head.h; - HRGN TempRegion; + HRGN TempRegion = NULL; Wnd->state &= ~WNDS_PAINTNOTPROCESSED; - if (Flags & (RDW_ERASENOW | RDW_UPDATENOW)) - { - if (Wnd->hrgnUpdate) - { - PREGION RgnUpdate = REGION_LockRgn(Wnd->hrgnUpdate); - if (RgnUpdate) - { - if (!IntValidateParent(Wnd, RgnUpdate, Recurse)) - { - REGION_UnlockRgn(RgnUpdate); - return; - } - REGION_UnlockRgn(RgnUpdate); - } - } - - if (Flags & RDW_UPDATENOW) - { - if ((Wnd->hrgnUpdate != NULL || - Wnd->state & WNDS_INTERNALPAINT)) - { - Wnd->state2 |= WNDS2_WMPAINTSENT; - co_IntSendMessage(hWnd, WM_PAINT, 0, 0); - } - } - else if (Wnd->head.pti == PsGetCurrentThreadWin32Thread()) - { - if (Wnd->state & WNDS_SENDNCPAINT) - { - TempRegion = IntGetNCUpdateRgn(Wnd, TRUE); - Wnd->state &= ~WNDS_SENDNCPAINT; - if ( Wnd == GetW32ThreadInfo()->MessageQueue->spwndActive && - !(Wnd->state & WNDS_ACTIVEFRAME)) + if (Wnd->state & WNDS_SENDNCPAINT || + Wnd->state & WNDS_SENDERASEBACKGROUND) + { + if (!(Wnd->style & WS_VISIBLE)) + { + Wnd->state &= ~(WNDS_SENDNCPAINT|WNDS_SENDERASEBACKGROUND|WNDS_ERASEBACKGROUND); + return; + } + else + { + if (Wnd->hrgnUpdate == NULL) + { + Wnd->state &= ~(WNDS_SENDERASEBACKGROUND|WNDS_ERASEBACKGROUND); + } + + if (Wnd->head.pti == PsGetCurrentThreadWin32Thread()) + { + if (Wnd->state & WNDS_SENDNCPAINT) { - Wnd->state |= WNDS_ACTIVEFRAME; - Wnd->state &= ~WNDS_NONCPAINT; + TempRegion = IntGetNCUpdateRgn(Wnd, TRUE); + + IntSendNCPaint(Wnd, TempRegion); + + if (TempRegion > HRGN_WINDOW && GreIsHandleValid(TempRegion)) + { + /* NOTE: The region can already be deleted! */ + GreDeleteObject(TempRegion); + } } - if (TempRegion) co_IntSendMessage(hWnd, WM_NCPAINT, (WPARAM)TempRegion, 0); - } - - if (Wnd->state & WNDS_SENDERASEBACKGROUND) - { - if (Wnd->hrgnUpdate) + + if (Wnd->state & WNDS_SENDERASEBACKGROUND) { - hDC = UserGetDCEx( Wnd, - Wnd->hrgnUpdate, - DCX_CACHE|DCX_USESTYLE|DCX_INTERSECTRGN|DCX_KEEPCLIPRGN); - - Wnd->state &= ~(WNDS_SENDERASEBACKGROUND|WNDS_ERASEBACKGROUND); - // Kill the loop, so Clear before we send. - if (!co_IntSendMessage(hWnd, WM_ERASEBKGND, (WPARAM)hDC, 0)) + PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); + if (Wnd->hrgnUpdate) { - Wnd->state |= (WNDS_SENDERASEBACKGROUND|WNDS_ERASEBACKGROUND); + hDC = UserGetDCEx( Wnd, + Wnd->hrgnUpdate, + DCX_CACHE|DCX_USESTYLE|DCX_INTERSECTRGN|DCX_KEEPCLIPRGN); + + if (Wnd->head.pti->ppi != pti->ppi) + { + ERR("Sending DC to another Process!!!\n"); + } + + Wnd->state &= ~(WNDS_SENDERASEBACKGROUND|WNDS_ERASEBACKGROUND); + // Kill the loop, so Clear before we send. + if (!co_IntSendMessage(hWnd, WM_ERASEBKGND, (WPARAM)hDC, 0)) + { + Wnd->state |= (WNDS_SENDERASEBACKGROUND|WNDS_ERASEBACKGROUND); + } + UserReleaseDC(Wnd, hDC, FALSE); } - UserReleaseDC(Wnd, hDC, FALSE); } } - } - } - else - { - Wnd->state &= ~(WNDS_SENDNCPAINT|WNDS_SENDERASEBACKGROUND|WNDS_ERASEBACKGROUND); + + } } /* @@ -385,19 +467,26 @@ /* * Paint child windows. */ + if (!(Flags & RDW_NOCHILDREN) && !(Wnd->style & WS_MINIMIZE) && - ((Flags & RDW_ALLCHILDREN) || !(Wnd->style & WS_CLIPCHILDREN)) ) + ( Flags & RDW_ALLCHILDREN || + (Flags & RDW_CLIPCHILDREN && Wnd->style & WS_CLIPCHILDREN) ) ) { HWND *List, *phWnd; + PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); if ((List = IntWinListChildren(Wnd))) { - /* FIXME: Handle WS_EX_TRANSPARENT */ for (phWnd = List; *phWnd; ++phWnd) { - Wnd = UserGetWindowObject(*phWnd); - if (Wnd && (Wnd->style & WS_VISIBLE)) + if ((Wnd = UserGetWindowObject(*phWnd)) == NULL) + continue; + + if (Wnd->head.pti != pti && Wnd->style & WS_CHILD) + continue; + + if (Wnd->style & WS_VISIBLE) { USER_REFERENCE_ENTRY Ref; UserRefObjectCo(Wnd, &Ref); @@ -411,10 +500,133 @@ } /* + * IntUpdateWindows + * + * Internal function used by IntRedrawWindow, simplecall. + */ + +VOID FASTCALL +co_IntUpdateWindows(PWND Wnd, ULONG Flags, BOOL Recurse) +{ + HWND hWnd = Wnd->head.h; + + if ((Wnd->hrgnUpdate != NULL || Wnd->state & WNDS_INTERNALPAINT)) + { + if (Wnd->hrgnUpdate) + { + if (!IntValidateParents(Wnd, Recurse)) + { + return; + } + } + + if (Wnd->state & WNDS_INTERNALPAINT) + { + Wnd->state &= ~WNDS_INTERNALPAINT; + + if (Wnd->hrgnUpdate == NULL) + MsqDecPaintCountQueue(Wnd->head.pti); + } + + Wnd->state |= WNDS_PAINTNOTPROCESSED; + Wnd->state &= ~WNDS_UPDATEDIRTY; + + Wnd->state2 |= WNDS2_WMPAINTSENT; + co_IntSendMessage(hWnd, WM_PAINT, 0, 0); + + if (Wnd->state & WNDS_PAINTNOTPROCESSED) + { + USER_REFERENCE_ENTRY Ref; + UserRefObjectCo(Wnd, &Ref); + co_IntPaintWindows(Wnd, RDW_NOCHILDREN, FALSE); + UserDerefObjectCo(Wnd); + } + } + + // Force flags as a toggle. Fixes msg:test_paint_messages:WmChildPaintNc. + Flags = (Flags & RDW_NOCHILDREN) ? RDW_NOCHILDREN : RDW_ALLCHILDREN; // All children is the default. + + /* + * Update child windows. + */ + + if (!(Flags & RDW_NOCHILDREN) && + Flags & RDW_ALLCHILDREN && + Wnd != UserGetDesktopWindow() ) + { + PWND Child; + + for (Child = Wnd->spwndChild; Child; Child = Child->spwndNext) + { + /* transparent window, check for non-transparent sibling to paint first, then skip it */ + if ( Child->ExStyle & WS_EX_TRANSPARENT && + ( Child->hrgnUpdate != NULL || Child->state & WNDS_INTERNALPAINT ) ) + { + PWND Next = Child->spwndNext; + while (Next) + { + if ( Next->hrgnUpdate != NULL || Next->state & WNDS_INTERNALPAINT ) break; + + Next = Next->spwndNext; + } + + if (Next) continue; + } + + if ( Child->style & WS_VISIBLE) + { + USER_REFERENCE_ENTRY Ref; + UserRefObjectCo(Child, &Ref); + co_IntUpdateWindows(Child, Flags, TRUE); + UserDerefObjectCo(Child); + } + } + } +} + +VOID FASTCALL +UserUpdateWindows(PWND pWnd, ULONG Flags) +{ + // If transparent and any sibling windows below needs to be painted, leave. + if (pWnd->ExStyle & WS_EX_TRANSPARENT) + { + PWND Next = pWnd->spwndNext; + + while(Next) + { + if ( Next->head.pti == pWnd->head.pti && + ( Next->hrgnUpdate != NULL || Next->state & WNDS_INTERNALPAINT) ) + { + return; + } + + Next = Next->spwndNext; + } + } + co_IntUpdateWindows(pWnd, Flags, FALSE); +} + +VOID FASTCALL +UserSyncAndPaintWindows(PWND pWnd, ULONG Flags) +{ + PWND Parent = pWnd; + // Find parent, if it needs to be painted, leave. + while(TRUE) + { + if ((Parent = Parent->spwndParent) == NULL) break; + if ( Parent->style & WS_CLIPCHILDREN ) break; + if ( Parent->hrgnUpdate != NULL || Parent->state & WNDS_INTERNALPAINT ) return; + } + + IntSendSyncPaint(pWnd, Flags); + co_IntPaintWindows(pWnd, Flags, FALSE); +} + +/* * IntInvalidateWindows * * Internal function used by IntRedrawWindow, UserRedrawDesktop, - * co_WinPosSetWindowPos, IntValidateParent, co_UserRedrawWindow. + * co_WinPosSetWindowPos, co_UserRedrawWindow. */ VOID FASTCALL IntInvalidateWindows(PWND Wnd, PREGION Rgn, ULONG Flags) @@ -422,53 +634,58 @@ INT RgnType = NULLREGION; BOOL HadPaintMessage; - TRACE("IntInvalidateWindows start\n"); - - Wnd->state |= WNDS_PAINTNOTPROCESSED; - - /* - * If the nonclient is not to be redrawn, clip the region to the client - * rect - */ - if (0 != (Flags & RDW_INVALIDATE) && 0 == (Flags & RDW_FRAME)) - { - PREGION RgnClient; - - RgnClient = IntSysCreateRectpRgnIndirect(&Wnd->rcClient); - if (RgnClient) - { - RgnType = IntGdiCombineRgn(Rgn, Rgn, RgnClient, RGN_AND); - REGION_Delete(RgnClient); - } - } - - /* - * Clip the given region with window rectangle (or region) - */ - - if (!Wnd->hrgnClip || (Wnd->style & WS_MINIMIZE)) - { - PREGION RgnWindow = IntSysCreateRectpRgnIndirect(&Wnd->rcWindow); - if (RgnWindow) - { - RgnType = IntGdiCombineRgn(Rgn, Rgn, RgnWindow, RGN_AND); - REGION_Delete(RgnWindow); + TRACE("IntInvalidateWindows start Rgn %p\n",Rgn); + + if ( Rgn > PRGN_WINDOW ) + { + /* + * If the nonclient is not to be redrawn, clip the region to the client + * rect + */ + if ((Flags & RDW_INVALIDATE) != 0 && (Flags & RDW_FRAME) == 0) + { + PREGION RgnClient; + + RgnClient = IntSysCreateRectpRgnIndirect(&Wnd->rcClient); + if (RgnClient) + { + RgnType = IntGdiCombineRgn(Rgn, Rgn, RgnClient, RGN_AND); + REGION_Delete(RgnClient); + } + } + + /* + * Clip the given region with window rectangle (or region) + */ + + if (!Wnd->hrgnClip || (Wnd->style & WS_MINIMIZE)) + { + PREGION RgnWindow = IntSysCreateRectpRgnIndirect(&Wnd->rcWindow); + if (RgnWindow) + { + RgnType = IntGdiCombineRgn(Rgn, Rgn, RgnWindow, RGN_AND); + REGION_Delete(RgnWindow); + } + } + else + { + PREGION RgnClip = REGION_LockRgn(Wnd->hrgnClip); + if (RgnClip) + { + REGION_bOffsetRgn(Rgn, + -Wnd->rcWindow.left, + -Wnd->rcWindow.top); + RgnType = IntGdiCombineRgn(Rgn, Rgn, RgnClip, RGN_AND); + REGION_bOffsetRgn(Rgn, + Wnd->rcWindow.left, + Wnd->rcWindow.top); + REGION_UnlockRgn(RgnClip); + } } } else { - PREGION RgnClip = REGION_LockRgn(Wnd->hrgnClip); - if (RgnClip) - { - REGION_bOffsetRgn(Rgn, - -Wnd->rcWindow.left, - -Wnd->rcWindow.top); - RgnType = IntGdiCombineRgn(Rgn, Rgn, RgnClip, RGN_AND); - REGION_bOffsetRgn(Rgn, - Wnd->rcWindow.left, - Wnd->rcWindow.top); - REGION_UnlockRgn(RgnClip); - } + RgnType == NULLREGION; } /* @@ -489,7 +706,7 @@ Wnd->state |= WNDS_INTERNALPAINT; } - if (Flags & RDW_INVALIDATE && RgnType != NULLREGION) + if (Flags & RDW_INVALIDATE ) { PREGION RgnUpdate; @@ -505,47 +722,64 @@ if (Flags & RDW_FRAME) Wnd->state |= WNDS_SENDNCPAINT; + if (Flags & RDW_ERASE) Wnd->state |= WNDS_SENDERASEBACKGROUND; - if (Wnd->hrgnUpdate == NULL) - { - Wnd->hrgnUpdate = NtGdiCreateRectRgn(0, 0, 0, 0); - IntGdiSetRegionOwner(Wnd->hrgnUpdate, GDI_OBJ_HMGR_PUBLIC); - } - - RgnUpdate = REGION_LockRgn(Wnd->hrgnUpdate); - if (RgnUpdate) - { - RgnType = IntGdiCombineRgn(RgnUpdate, RgnUpdate, Rgn, RGN_OR); - REGION_UnlockRgn(RgnUpdate); - if (RgnType == NULLREGION) - { - IntGdiSetRegionOwner(Wnd->hrgnUpdate, GDI_OBJ_HMGR_POWNED); - GreDeleteObject(Wnd->hrgnUpdate); - Wnd->hrgnUpdate = NULL; - } - } - Flags |= RDW_FRAME; // For children. - } + if (RgnType != NULLREGION && Rgn > PRGN_WINDOW) + { + if (Wnd->hrgnUpdate == NULL) + { + Wnd->hrgnUpdate = NtGdiCreateRectRgn(0, 0, 0, 0); + IntGdiSetRegionOwner(Wnd->hrgnUpdate, GDI_OBJ_HMGR_PUBLIC); + } + + if (Wnd->hrgnUpdate != HRGN_WINDOW) + { + RgnUpdate = REGION_LockRgn(Wnd->hrgnUpdate); + if (RgnUpdate) + { + RgnType = IntGdiCombineRgn(RgnUpdate, RgnUpdate, Rgn, RGN_OR); + REGION_UnlockRgn(RgnUpdate); + if (RgnType == NULLREGION) + { + IntGdiSetRegionOwner(Wnd->hrgnUpdate, GDI_OBJ_HMGR_POWNED); + GreDeleteObject(Wnd->hrgnUpdate); + Wnd->hrgnUpdate = NULL; + } + } + } + } + + Flags |= RDW_ERASE|RDW_FRAME; // For children. + + } + + if (!HadPaintMessage && IntIsWindowDirty(Wnd)) + { + MsqIncPaintCountQueue(Wnd->head.pti); + } + } // The following flags are used to validate the window. else if (Flags & (RDW_VALIDATE|RDW_NOINTERNALPAINT|RDW_NOERASE|RDW_NOFRAME)) { - /* FIXME: Handle WNDS_UPDATEDIRTY */ + if (Wnd->state & WNDS_UPDATEDIRTY && !(Flags & RDW_NOUPDATEDIRTY)) + return; if (Flags & RDW_NOINTERNALPAINT) { Wnd->state &= ~WNDS_INTERNALPAINT; } - if (Flags & RDW_VALIDATE && RgnType != NULLREGION) + if (Flags & RDW_VALIDATE) { if (Flags & RDW_NOFRAME) Wnd->state &= ~WNDS_SENDNCPAINT; + if (Flags & RDW_NOERASE) Wnd->state &= ~(WNDS_SENDERASEBACKGROUND|WNDS_ERASEBACKGROUND); - if (Wnd->hrgnUpdate != NULL) + if (Wnd->hrgnUpdate > HRGN_WINDOW && RgnType != NULLREGION && Rgn > PRGN_WINDOW) { PREGION RgnUpdate = REGION_LockRgn(Wnd->hrgnUpdate); @@ -554,7 +788,7 @@ RgnType = IntGdiCombineRgn(RgnUpdate, RgnUpdate, Rgn, RGN_DIFF); REGION_UnlockRgn(RgnUpdate); - if(RgnType == NULLREGION) + if (RgnType == NULLREGION) { IntGdiSetRegionOwner(Wnd->hrgnUpdate, GDI_OBJ_HMGR_POWNED); GreDeleteObject(Wnd->hrgnUpdate); @@ -562,9 +796,16 @@ } } } - + // If update is null, do not erase. if (Wnd->hrgnUpdate == NULL) + { Wnd->state &= ~(WNDS_SENDERASEBACKGROUND|WNDS_ERASEBACKGROUND); + } + } + + if (HadPaintMessage && !IntIsWindowDirty(Wnd)) + { + MsqDecPaintCountQueue(Wnd->head.pti); } } @@ -572,9 +813,10 @@ * Process children if needed */ - if (!(Flags & RDW_NOCHILDREN) && !(Wnd->style & WS_MINIMIZE) && + if (!(Flags & RDW_NOCHILDREN) && + !(Wnd->style & WS_MINIMIZE) && ((Flags & RDW_ALLCHILDREN) || !(Wnd->style & WS_CLIPCHILDREN))) - { + { PWND Child; for (Child = Wnd->spwndChild; Child; Child = Child->spwndNext) @@ -587,24 +829,12 @@ PREGION RgnTemp = IntSysCreateRectpRgn(0, 0, 0, 0); if (RgnTemp) { - IntGdiCombineRgn(RgnTemp, Rgn, 0, RGN_COPY); - IntInvalidateWindows(Child, RgnTemp, Flags); + if (Rgn > PRGN_WINDOW) IntGdiCombineRgn(RgnTemp, Rgn, 0, RGN_COPY); + IntInvalidateWindows(Child, ((Rgn > PRGN_WINDOW)?RgnTemp:Rgn), Flags); REGION_Delete(RgnTemp); } } } - } - - /* - * Fake post paint messages to window message queue if needed - */ - - if (HadPaintMessage != IntIsWindowDirty(Wnd)) - { - if (HadPaintMessage) - MsqDecPaintCountQueue(Wnd->head.pti); - else - MsqIncPaintCountQueue(Wnd->head.pti); } TRACE("IntInvalidateWindows exit\n"); } @@ -652,7 +882,7 @@ ULONG Flags) { PREGION TmpRgn = NULL; - TRACE("co_UserRedrawWindow start\n"); + TRACE("co_UserRedrawWindow start Rgn %p\n",UpdateRgn); /* * Step 1. @@ -662,6 +892,11 @@ if (!IntIsWindowDrawable(Window)) { return TRUE; // Just do nothing!!! + } + + if (Window == NULL) + { + Window = UserGetDesktopWindow(); } /* @@ -672,38 +907,59 @@ if (Flags & (RDW_INVALIDATE | RDW_VALIDATE)) // Both are OKAY! { + /* We can't hold lock on GDI objects while doing roundtrips to user mode, + * so use a copy instead */ if (UpdateRgn) { TmpRgn = IntSysCreateRectpRgn(0, 0, 0, 0); - if (IntGdiCombineRgn(TmpRgn, UpdateRgn, NULL, RGN_COPY) == NULLREGION) + + if (UpdateRgn > PRGN_WINDOW) { - REGION_Delete(TmpRgn); - TmpRgn = NULL; + IntGdiCombineRgn(TmpRgn, UpdateRgn, NULL, RGN_COPY); } - else + + if (Window != UserGetDesktopWindow()) { - REGION_bOffsetRgn(TmpRgn, Window->rcClient.left, Window->rcClient.top); + REGION_bOffsetRgn(TmpRgn, Window->rcClient.left, Window->rcClient.top); } } - else if (UpdateRect != NULL) - { - if (!RECTL_bIsEmptyRect(UpdateRect)) - { - TmpRgn = IntSysCreateRectpRgnIndirect(UpdateRect); - REGION_bOffsetRgn(TmpRgn, Window->rcClient.left, Window->rcClient.top); - } - } - else if ((Flags & (RDW_INVALIDATE | RDW_FRAME)) == (RDW_INVALIDATE | RDW_FRAME) || - (Flags & (RDW_VALIDATE | RDW_NOFRAME)) == (RDW_VALIDATE | RDW_NOFRAME)) - { - if (!RECTL_bIsEmptyRect(&Window->rcWindow)) - TmpRgn = IntSysCreateRectpRgnIndirect(&Window->rcWindow); - } else { - if (!RECTL_bIsEmptyRect(&Window->rcClient)) - TmpRgn = IntSysCreateRectpRgnIndirect(&Window->rcClient); - } + if (UpdateRect != NULL) + { + if (Window == UserGetDesktopWindow()) + { + TmpRgn = IntSysCreateRectpRgnIndirect(UpdateRect); + } + else + { + TmpRgn = IntSysCreateRectpRgn(Window->rcClient.left + UpdateRect->left, + Window->rcClient.top + UpdateRect->top, + Window->rcClient.left + UpdateRect->right, + Window->rcClient.top + UpdateRect->bottom); + } + } + else + { + if ((Flags & (RDW_INVALIDATE | RDW_FRAME)) == (RDW_INVALIDATE | RDW_FRAME) || + (Flags & (RDW_VALIDATE | RDW_NOFRAME)) == (RDW_VALIDATE | RDW_NOFRAME)) + { + if (!RECTL_bIsEmptyRect(&Window->rcWindow)) + TmpRgn = IntSysCreateRectpRgnIndirect(&Window->rcWindow); + } + else + { + if (!RECTL_bIsEmptyRect(&Window->rcClient)) + TmpRgn = IntSysCreateRectpRgnIndirect(&Window->rcClient); + } + } + } + } + + /* Fixes test RDW_INTERNALPAINT behavior */ + if (TmpRgn == NULL) + { + TmpRgn = PRGN_WINDOW; // Need a region so the bits can be set!!! } /* @@ -722,10 +978,16 @@ * Repaint and erase windows if needed. */ - if (Flags & (RDW_ERASENOW | RDW_UPDATENOW)) - { - if (Flags & RDW_ERASENOW) IntSendSyncPaint(Window, Flags); - co_IntPaintWindows(Window, Flags, FALSE); + if (Flags & RDW_UPDATENOW) + { + UserUpdateWindows(Window, Flags); + } + else if (Flags & RDW_ERASENOW) + { + if ((Flags & (RDW_NOCHILDREN|RDW_ALLCHILDREN)) == 0) + Flags |= RDW_CLIPCHILDREN; + + UserSyncAndPaintWindows(Window, Flags); } /* @@ -733,7 +995,7 @@ * Cleanup ;-) */ - if (TmpRgn != NULL) + if (TmpRgn > PRGN_WINDOW) { REGION_Delete(TmpRgn); } @@ -750,6 +1012,14 @@ Wnd->state & WNDS_INTERNALPAINT ) ); } +/* + Conditions to paint any window: + + 1. Update region is not null. + 2. Internal paint flag is set. + 3. Paint count is not zero. + + */ PWND FASTCALL IntFindWindowToRepaint(PWND Window, PTHREADINFO Thread) { @@ -758,27 +1028,28 @@ for (; Window != NULL; Window = Window->spwndNext) { - if (IntWndBelongsToThread(Window, Thread) && - IntIsWindowDirty(Window)) - { - /* Make sure all non-transparent siblings are already drawn. */ - if (Window->ExStyle & WS_EX_TRANSPARENT) - { - for (TempWindow = Window->spwndNext; TempWindow != NULL; - TempWindow = TempWindow->spwndNext) + if (IntWndBelongsToThread(Window, Thread)) + { + if (IntIsWindowDirty(Window)) + { + /* Make sure all non-transparent siblings are already drawn. */ + if (Window->ExStyle & WS_EX_TRANSPARENT) { - if (!(TempWindow->ExStyle & WS_EX_TRANSPARENT) && - IntWndBelongsToThread(TempWindow, Thread) && - IntIsWindowDirty(TempWindow)) + for (TempWindow = Window->spwndNext; TempWindow != NULL; + TempWindow = TempWindow->spwndNext) { - return TempWindow; + if (!(TempWindow->ExStyle & WS_EX_TRANSPARENT) && + IntWndBelongsToThread(TempWindow, Thread) && + IntIsWindowDirty(TempWindow)) + { + return TempWindow; + } } } - } - - return Window; - } - + return Window; + } + } + /* find a child of the specified window that needs repainting */ if (Window->spwndChild) { hChild = IntFindWindowToRepaint(Window->spwndChild, Thread); @@ -798,7 +1069,7 @@ MSG *Message, BOOL Remove) { - PWND PaintWnd; + PWND PaintWnd, StartWnd; if ((MsgFilterMin != 0 || MsgFilterMax != 0) && (MsgFilterMin > WM_PAINT || MsgFilterMax < WM_PAINT)) @@ -809,19 +1080,26 @@ ERR("WM_PAINT is in a System Thread!\n"); } - PaintWnd = IntFindWindowToRepaint(UserGetDesktopWindow(), Thread); + StartWnd = UserGetDesktopWindow(); + PaintWnd = IntFindWindowToRepaint(StartWnd, Thread); Message->hwnd = PaintWnd ? UserHMGetHandle(PaintWnd) : NULL; - if (Message->hwnd == NULL) - { - ERR("PAINTING BUG: Thread marked as containing dirty windows, but no dirty windows found! Counts %u\n",Thread->cPaintsReady); - /* Hack to stop spamming the debuglog ! */ + if (Message->hwnd == NULL && Thread->cPaintsReady) + { + // Find note in window.c:"PAINTING BUG". + ERR("WARNING SOMETHING HAS GONE WRONG: Thread marked as containing dirty windows, but no dirty windows found! Counts %u\n",Thread->cPaintsReady); + /* Hack to stop spamming the debug log ! */ Thread->cPaintsReady = 0; return FALSE; } - if (Window != NULL && PaintWnd != Window) + if (Message->hwnd == NULL) + return FALSE; + + if (!(Window == NULL || + PaintWnd == Window || + IntIsChildWindow(Window, PaintWnd))) /* check that it is a child of the specified parent */ return FALSE; if (PaintWnd->state & WNDS_INTERNALPAINT) @@ -830,8 +1108,20 @@ if (!PaintWnd->hrgnUpdate) MsqDecPaintCountQueue(Thread); } - PaintWnd->state2 &= ~WNDS2_WMPAINTSENT; + PaintWnd->state2 &= ~WNDS2_STARTPAINT; PaintWnd->state &= ~WNDS_UPDATEDIRTY; + + Window = PaintWnd; + while( Window && Window != UserGetDesktopWindow()) + { + // Role back and check for clip children, do not set if any. + if (Window->spwndParent && !(Window->spwndParent->style & WS_CLIPCHILDREN)) + { + PaintWnd->state2 |= WNDS2_WMPAINTSENT; + } + Window = Window->spwndParent; + } + Message->wParam = Message->lParam = 0; Message->message = WM_PAINT; return TRUE; @@ -915,7 +1205,7 @@ return FALSE; /* Update the window just incase. */ - co_IntPaintWindows( pwnd, RDW_ERASENOW|RDW_UPDATENOW, FALSE); + co_IntUpdateWindows( pwnd, RDW_ALLCHILDREN, FALSE); hdcSrc = UserGetDCEx( pwnd, NULL, DCX_CACHE|DCX_WINDOW); /* Print window to printer context. */ @@ -1072,6 +1362,10 @@ HDC FASTCALL IntBeginPaint(PWND Window, PPAINTSTRUCT Ps) { + RECT Rect; + INT type; + BOOL Erase = FALSE; + co_UserHideCaret(Window); Window->state2 |= WNDS2_STARTPAINT; @@ -1080,36 +1374,50 @@ if (Window->state & WNDS_SENDNCPAINT) { HRGN hRgn; - + // Application can keep update dirty. + do + { + Window->state &= ~WNDS_UPDATEDIRTY; + hRgn = IntGetNCUpdateRgn(Window, FALSE); + IntSendNCPaint(Window, hRgn); + if (hRgn > HRGN_WINDOW && GreIsHandleValid(hRgn)) + { + /* NOTE: The region can already be deleted! */ + GreDeleteObject(hRgn); + } + } + while(Window->state & WNDS_UPDATEDIRTY); + } + else + { Window->state &= ~WNDS_UPDATEDIRTY; - hRgn = IntGetNCUpdateRgn(Window, FALSE); - Window->state &= ~WNDS_SENDNCPAINT; - co_IntSendMessage(UserHMGetHandle(Window), WM_NCPAINT, (WPARAM)hRgn, 0); - if (hRgn != HRGN_WINDOW && hRgn != NULL && GreIsHandleValid(hRgn)) - { - /* NOTE: The region can already be deleted! */ - GreDeleteObject(hRgn); - } - } - else - { - Window->state &= ~WNDS_UPDATEDIRTY; } RtlZeroMemory(Ps, sizeof(PAINTSTRUCT)); + if (Window->state2 & WNDS2_ENDPAINTINVALIDATE) + { + ERR("BP: Another thread invalidated this window\n"); + } + Ps->hdc = UserGetDCEx( Window, - Window->hrgnUpdate, - DCX_INTERSECTRGN | DCX_USESTYLE); + Window->hrgnUpdate, + DCX_INTERSECTRGN | DCX_USESTYLE); if (!Ps->hdc) { return NULL; } + // If set, always clear flags out due to the conditions later on for sending the message. + if (Window->state & WNDS_SENDERASEBACKGROUND) + { + Window->state &= ~(WNDS_SENDERASEBACKGROUND|WNDS_ERASEBACKGROUND); + Erase = TRUE; + } + if (Window->hrgnUpdate != NULL) { MsqDecPaintCountQueue(Window->head.pti); - GdiGetClipBox(Ps->hdc, &Ps->rcPaint); IntGdiSetRegionOwner(Window->hrgnUpdate, GDI_OBJ_HMGR_POWNED); /* The region is part of the dc now and belongs to the process! */ Window->hrgnUpdate = NULL; @@ -1118,15 +1426,19 @@ { if (Window->state & WNDS_INTERNALPAINT) MsqDecPaintCountQueue(Window->head.pti); - - IntGetClientRect(Window, &Ps->rcPaint); - } + } + + type = GdiGetClipBox(Ps->hdc, &Ps->rcPaint); + + IntGetClientRect(Window, &Rect); Window->state &= ~WNDS_INTERNALPAINT; - if (Window->state & WNDS_SENDERASEBACKGROUND) - { - Window->state &= ~(WNDS_SENDERASEBACKGROUND|WNDS_ERASEBACKGROUND); + if ( Erase && // Set to erase, + type != NULLREGION && // don't erase if the clip box is empty, + (!(Window->pcls->style & CS_PARENTDC) || // not parent dc or + RECTL_bIntersectRect( &Rect, &Rect, &Ps->rcPaint) ) ) // intersecting. + { Ps->fErase = !co_IntSendMessage(UserHMGetHandle(Window), WM_ERASEBKGND, (WPARAM)Ps->hdc, 0); if ( Ps->fErase ) { @@ -1137,18 +1449,9 @@ { Ps->fErase = FALSE; } - if (Window->hrgnUpdate) - { - if (!(Window->style & WS_CLIPCHILDREN)) - { - PWND Child; - for (Child = Window->spwndChild; Child; Child = Child->spwndNext) - { - if (Child->hrgnUpdate == NULL && Child->state & WNDS_SENDNCPAINT) // Helped fixing test_redrawnow. - IntInvalidateWindows(Child, NULL, RDW_FRAME | RDW_ERASE | RDW_INVALIDATE | RDW_ALLCHILDREN); - } - } - } + + IntSendChildNCPaint(Window); + return Ps->hdc; } @@ -1160,6 +1463,12 @@ hdc = Ps->hdc; UserReleaseDC(Wnd, hdc, TRUE); + + if (Wnd->state2 & WNDS2_ENDPAINTINVALIDATE) + { + ERR("EP: Another thread invalidated this window\n"); + Wnd->state2 &= ~WNDS2_ENDPAINTINVALIDATE; + } Wnd->state2 &= ~(WNDS2_WMPAINTSENT|WNDS2_STARTPAINT); @@ -1310,40 +1619,130 @@ return Ret; } +/* + GetUpdateRgn, this fails the same as the old one. + */ INT FASTCALL -co_UserGetUpdateRgn(PWND Window, PREGION Rgn, BOOL bErase) -{ - int RegionType; - RECTL Rect; - PREGION UpdateRgn; - - ASSERT_REFS_CO(Window); - - Window->state &= ~WNDS_UPDATEDIRTY; - - if (Window->hrgnUpdate == NULL) - { - REGION_SetRectRgn(Rgn, 0, 0, 0, 0); - return NULLREGION; - } - - UpdateRgn = REGION_LockRgn(Window->hrgnUpdate); - if (!UpdateRgn) - return ERROR; - - Rect = Window->rcClient; - IntIntersectWithParents(Window, &Rect); - REGION_SetRectRgn(Rgn, Rect.left, Rect.top, Rect.right, Rect.bottom); - RegionType = IntGdiCombineRgn(Rgn, Rgn, UpdateRgn, RGN_AND); - REGION_bOffsetRgn(Rgn, -Window->rcClient.left, -Window->rcClient.top); - REGION_UnlockRgn(UpdateRgn); - - if (bErase && RegionType != NULLREGION && RegionType != ERROR) - { - co_UserRedrawWindow(Window, NULL, NULL, RDW_ERASENOW | RDW_NOCHILDREN); - } - +co_UserGetUpdateRgn(PWND Window, HRGN hRgn, BOOL bErase) +{ + int RegionType; + BOOL Type; + RECTL Rect; + + ASSERT_REFS_CO(Window); + + if (bErase) + { + USER_REFERENCE_ENTRY Ref; + UserRefObjectCo(Window, &Ref); + co_IntPaintWindows(Window, RDW_NOCHILDREN, FALSE); + UserDerefObjectCo(Window); + } + + Window->state &= ~WNDS_UPDATEDIRTY; + + if (Window->hrgnUpdate == NULL) + { + NtGdiSetRectRgn(hRgn, 0, 0, 0, 0); + return NULLREGION; + } + + Rect = Window->rcClient; + Type = IntIntersectWithParents(Window, &Rect); + + if (Window->hrgnUpdate == HRGN_WINDOW) + { + // Trap it out. + ERR("GURn: Caller is passing Window Region 1\n"); + if (!Type) + { + NtGdiSetRectRgn(hRgn, 0, 0, 0, 0); + return NULLREGION; + } + + RegionType = SIMPLEREGION; + + if (Window != UserGetDesktopWindow()) // Window->fnid == FNID_DESKTOP + { + RECTL_vOffsetRect(&Rect, + -Window->rcClient.left, + -Window->rcClient.top); + } + GreSetRectRgnIndirect(hRgn, &Rect); + } + else + { + HRGN hrgnTemp = GreCreateRectRgnIndirect(&Rect); + + RegionType = NtGdiCombineRgn(hRgn, hrgnTemp, Window->hrgnUpdate, RGN_AND); + + if (RegionType == ERROR || RegionType == NULLREGION) + { + if (hrgnTemp) GreDeleteObject(hrgnTemp); + NtGdiSetRectRgn(hRgn, 0, 0, 0, 0); + return NULLREGION; + } + + if (Window != UserGetDesktopWindow()) // Window->fnid == FNID_DESKTOP + { + NtGdiOffsetRgn(hRgn, + -Window->rcClient.left, + -Window->rcClient.top); + } + if (hrgnTemp) GreDeleteObject(hrgnTemp); + } return RegionType; +} + +BOOL FASTCALL +co_UserGetUpdateRect(PWND Window, PRECT pRect, BOOL bErase) +{ + INT RegionType; + BOOL Ret = TRUE; + + if (bErase) + { + USER_REFERENCE_ENTRY Ref; + UserRefObjectCo(Window, &Ref); + co_IntPaintWindows(Window, RDW_NOCHILDREN, FALSE); + UserDerefObjectCo(Window); + } + + Window->state &= ~WNDS_UPDATEDIRTY; + + if (Window->hrgnUpdate == NULL) + { + pRect->left = pRect->top = pRect->right = pRect->bottom = 0; + Ret = FALSE; + } + else + { + /* Get the update region bounding box. */ + if (Window->hrgnUpdate == HRGN_WINDOW) + { + *pRect = Window->rcClient; + ERR("GURt: Caller is retrieving Window Region 1\n"); + } + else + { + RegionType = IntGdiGetRgnBox(Window->hrgnUpdate, pRect); + + if (RegionType != ERROR && RegionType != NULLREGION) + RECTL_bIntersectRect(pRect, pRect, &Window->rcClient); + } + + if (IntIntersectWithParents(Window, pRect)) + { + RECTL_vOffsetRect(pRect, + -Window->rcClient.left, + -Window->rcClient.top); + } + else + { + pRect->left = pRect->top = pRect->right = pRect->bottom = 0; + } + } + return Ret; } /* @@ -1359,8 +1758,6 @@ DECLARE_RETURN(INT); PWND Window; INT ret; - USER_REFERENCE_ENTRY Ref; - PREGION Rgn = NULL; TRACE("Enter NtUserGetUpdateRgn\n"); UserEnterExclusive(); @@ -1370,36 +1767,11 @@ RETURN(ERROR); } - /* Use a system region, we can't hold GDI locks when doing roundtrips to user mode */ - Rgn = IntSysCreateRectpRgn(0, 0, 0, 0); - if (!Rgn) - RETURN(ERROR); - - UserRefObjectCo(Window, &Ref); - ret = co_UserGetUpdateRgn(Window, Rgn, bErase); - UserDerefObjectCo(Window); + ret = co_UserGetUpdateRgn(Window, hRgn, bErase); RETURN(ret); CLEANUP: - if (Rgn && (_ret_ != ERROR)) - { - PREGION TheRgn = REGION_LockRgn(hRgn); - if (!TheRgn) - { - EngSetLastError(ERROR_INVALID_HANDLE); - _ret_ = ERROR; - } - else - { - IntGdiCombineRgn(TheRgn, Rgn, NULL, RGN_COPY); - REGION_UnlockRgn(TheRgn); - } - } - - if (Rgn) - REGION_Delete(Rgn); - TRACE("Leave NtUserGetUpdateRgn, ret=%i\n",_ret_); UserLeave(); END_CLEANUP; @@ -1417,9 +1789,8 @@ { PWND Window; RECTL Rect; - INT RegionType; - PREGION RgnData; NTSTATUS Status; + BOOL Ret; DECLARE_RETURN(BOOL); TRACE("Enter NtUserGetUpdateRect\n"); @@ -1430,48 +1801,7 @@ RETURN(FALSE); } - Window->state &= ~WNDS_UPDATEDIRTY; - - if (Window->hrgnUpdate == NULL) - { - Rect.left = Rect.top = Rect.right = Rect.bottom = 0; - } - else - { - /* Get the update region bounding box. */ - if (Window->hrgnUpdate == HRGN_WINDOW) - { - Rect = Window->rcClient; - } - else - { - RgnData = REGION_LockRgn(Window->hrgnUpdate); - ASSERT(RgnData != NULL); - RegionType = REGION_GetRgnBox(RgnData, &Rect); - REGION_UnlockRgn(RgnData); - - if (RegionType != ERROR && RegionType != NULLREGION) - RECTL_bIntersectRect(&Rect, &Rect, &Window->rcClient); - } - - if (IntIntersectWithParents(Window, &Rect)) - { - RECTL_vOffsetRect(&Rect, - -Window->rcClient.left, - -Window->rcClient.top); - } else - { - Rect.left = Rect.top = Rect.right = Rect.bottom = 0; - } - } - - if (bErase && !RECTL_bIsEmptyRect(&Rect)) - { - USER_REFERENCE_ENTRY Ref; - UserRefObjectCo(Window, &Ref); - co_UserRedrawWindow(Window, NULL, NULL, RDW_ERASENOW | RDW_NOCHILDREN); - UserDerefObjectCo(Window); - } + Ret = co_UserGetUpdateRect(Window, &Rect, bErase); if (UnsafeRect != NULL) { @@ -1483,7 +1813,7 @@ } } - RETURN(!RECTL_bIsEmptyRect(&Rect)); + RETURN(Ret); CLEANUP: TRACE("Leave NtUserGetUpdateRect, ret=%i\n",_ret_); @@ -1549,27 +1879,22 @@ RETURN( FALSE); } - /* We can't hold lock on GDI obects while doing roundtrips to user mode, - * so use a copy instead */ - if (hrgnUpdate) - { - PREGION RgnTemp; - - RgnUpdate = IntSysCreateRectpRgn(0, 0, 0, 0); + /* We can't hold lock on GDI objects while doing roundtrips to user mode, + * so it will be copied. + */ + if (hrgnUpdate > HRGN_WINDOW) + { + RgnUpdate = REGION_LockRgn(hrgnUpdate); if (!RgnUpdate) { EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); RETURN(FALSE); } - - RgnTemp = REGION_LockRgn(hrgnUpdate); - if (!RgnTemp) - { - EngSetLastError(ERROR_INVALID_HANDLE); - RETURN(FALSE); - } - IntGdiCombineRgn(RgnUpdate, RgnTemp, NULL, RGN_COPY); - REGION_UnlockRgn(RgnTemp); + REGION_UnlockRgn(RgnUpdate); + } + else if (hrgnUpdate == HRGN_WINDOW) // Trap it out. + { + ERR("NTRW: Caller is passing Window Region 1\n"); } UserRefObjectCo(Wnd, &Ref); @@ -1584,11 +1909,48 @@ RETURN( Ret); CLEANUP: - if (RgnUpdate) - REGION_Delete(RgnUpdate); TRACE("Leave NtUserRedrawWindow, ret=%i\n",_ret_); UserLeave(); END_CLEANUP; +} + +/* + Old GetUpdateRgn, for scrolls, see above note. + */ +INT FASTCALL +co_IntGetUpdateRgn(PWND Window, PREGION Rgn, BOOL bErase) +{ + int RegionType; + RECTL Rect; + PREGION UpdateRgn; + + ASSERT_REFS_CO(Window); + + if (bErase) + { + co_IntPaintWindows(Window, RDW_NOCHILDREN, FALSE); + } + + Window->state &= ~WNDS_UPDATEDIRTY; + + if (Window->hrgnUpdate == NULL) + { + REGION_SetRectRgn(Rgn, 0, 0, 0, 0); + return NULLREGION; + } + + UpdateRgn = REGION_LockRgn(Window->hrgnUpdate); + if (!UpdateRgn) + return ERROR; + + Rect = Window->rcClient; + IntIntersectWithParents(Window, &Rect); + REGION_SetRectRgn(Rgn, Rect.left, Rect.top, Rect.right, Rect.bottom); + RegionType = IntGdiCombineRgn(Rgn, Rgn, UpdateRgn, RGN_AND); + REGION_bOffsetRgn(Rgn, -Window->rcClient.left, -Window->rcClient.top); + REGION_UnlockRgn(UpdateRgn); + + return RegionType; } static @@ -1935,7 +2297,7 @@ RETURN(ERROR); } - rdw_flags = (flags & SW_ERASE) && (flags & SW_INVALIDATE) ? RDW_INVALIDATE | RDW_ERASE : RDW_INVALIDATE ; + rdw_flags = (flags & SW_ERASE) && (flags & SW_INVALIDATE) ? RDW_INVALIDATE | RDW_ERASE : RDW_INVALIDATE ; rcCaret = rcScroll; hwndCaret = co_IntFixCaret(Window, &rcCaret, flags); @@ -1963,7 +2325,7 @@ RETURN(ERROR); } - if (co_UserGetUpdateRgn(Window, RgnTemp, FALSE) != NULLREGION) + if (co_IntGetUpdateRgn(Window, RgnTemp, FALSE) != NULLREGION) { PREGION RgnClip = IntSysCreateRectpRgnIndirect(&rcClip); if (RgnClip) @@ -1973,11 +2335,16 @@ RgnWinupd = IntSysCreateRectpRgn( 0, 0, 0, 0); IntGdiCombineRgn( RgnWinupd, RgnTemp, 0, RGN_COPY); } + REGION_bOffsetRgn(RgnTemp, dx, dy); + IntGdiCombineRgn(RgnTemp, RgnTemp, RgnClip, RGN_AND); + if (hrgnUpdate) IntGdiCombineRgn( RgnWinupd, RgnWinupd, RgnTemp, RGN_OR ); + co_UserRedrawWindow(Window, NULL, RgnTemp, rdw_flags ); + REGION_Delete(RgnClip); } } @@ -1990,8 +2357,10 @@ POINT ClientOrigin; USER_REFERENCE_ENTRY WndRef; RECTL rcDummy; + LPARAM lParam; IntGetClientOrigin(Window, &ClientOrigin); + for (Child = Window->spwndChild; Child; Child = Child->spwndNext) { rcChild = Child->rcWindow; @@ -2000,12 +2369,19 @@ rcChild.right -= ClientOrigin.x; rcChild.bottom -= ClientOrigin.y; - if (! prcUnsafeScroll || RECTL_bIntersectRect(&rcDummy, &rcChild, &rcScroll)) + if (!prcUnsafeScroll || RECTL_bIntersectRect(&rcDummy, &rcChild, &rcScroll)) { UserRefObjectCo(Child, &WndRef); - co_WinPosSetWindowPos(Child, 0, rcChild.left + dx, rcChild.top + dy, 0, 0, - SWP_NOZORDER | SWP_NOSIZE | SWP_NOACTIVATE | - SWP_NOREDRAW | SWP_DEFERERASE); + + if (Window->spwndParent == UserGetDesktopWindow()) // Window->spwndParent->fnid == FNID_DESKTOP ) + lParam = MAKELONG(Child->rcClient.left, Child->rcClient.top); + else + lParam = MAKELONG(rcChild.left + dx, rcChild.top + dy); + + /* wine sends WM_POSCHANGING, WM_POSCHANGED messages */ + /* windows sometimes a WM_MOVE */ + co_IntSendMessage(UserHMGetHandle(Child), WM_MOVE, 0, lParam); + UserDerefObjectCo(Child); } } @@ -2013,9 +2389,11 @@ if (flags & (SW_INVALIDATE | SW_ERASE)) { - co_UserRedrawWindow(Window, NULL, RgnUpdate, rdw_flags | - ((flags & SW_ERASE) ? RDW_ERASENOW : 0) | - ((flags & SW_SCROLLCHILDREN) ? RDW_ALLCHILDREN : 0)); + co_UserRedrawWindow( Window, + NULL, + RgnUpdate, + rdw_flags | /* HACK */ + ((flags & SW_SCROLLCHILDREN) ? RDW_ALLCHILDREN : RDW_NOCHILDREN) ); } if (hwndCaret && (CaretWnd = UserGetWindowObject(hwndCaret))) Modified: trunk/reactos/win32ss/user/ntuser/painting.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.h [iso-8859-1] Mon Jul 20 19:34:35 2015 @@ -8,13 +8,25 @@ #define FLASHW_KILLSYSTIMER 0x00004000 #define FLASHW_ACTIVE 0x00008000 +#define PRGN_NULL ((PREGION)0) /* NULL empty region */ +#define PRGN_WINDOW ((PREGION)1) /* region from window rcWindow */ +#define PRGN_MONITOR ((PREGION)2) /* region from monitor region. */ + +#define GreCreateRectRgnIndirect(prc) \ + NtGdiCreateRectRgn((prc)->left, (prc)->top, (prc)->right, (prc)->bottom) + +#define GreSetRectRgnIndirect(hRgn, prc) \ + NtGdiSetRectRgn(hRgn, (prc)->left, (prc)->top, (prc)->right, (prc)->bottom); + BOOL FASTCALL co_UserRedrawWindow(PWND Wnd, const RECTL* UpdateRect, PREGION UpdateRgn, ULONG Flags); VOID FASTCALL IntInvalidateWindows(PWND Window, PREGION Rgn, ULONG Flags); BOOL FASTCALL IntGetPaintMessage(PWND Window, UINT MsgFilterMin, UINT MsgFilterMax, PTHREADINFO Thread, MSG *Message, BOOL Remove); INT FASTCALL UserRealizePalette(HDC); -INT FASTCALL co_UserGetUpdateRgn(PWND, PREGION, BOOL); +INT FASTCALL co_UserGetUpdateRgn(PWND, HRGN, BOOL); +BOOL FASTCALL co_UserGetUpdateRect(PWND, PRECT, BOOL); VOID FASTCALL co_IntPaintWindows(PWND Window, ULONG Flags, BOOL Recurse); -BOOL FASTCALL IntValidateParent(PWND Child, PREGION ValidateRgn, BOOL Recurse); +VOID FASTCALL IntSendSyncPaint(PWND, ULONG); +VOID FASTCALL co_IntUpdateWindows(PWND, ULONG, BOOL); BOOL FASTCALL IntIsWindowDirty(PWND); BOOL FASTCALL IntEndPaint(PWND,PPAINTSTRUCT); HDC FASTCALL IntBeginPaint(PWND,PPAINTSTRUCT); Modified: trunk/reactos/win32ss/user/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/simple… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] Mon Jul 20 19:34:35 2015 @@ -544,7 +544,8 @@ break; case HWNDLOCK_ROUTINE_UPDATEWINDOW: - Ret = co_UserRedrawWindow( Window, NULL, 0, RDW_UPDATENOW | RDW_ALLCHILDREN); + co_IntUpdateWindows(Window, RDW_ALLCHILDREN, FALSE); + Ret = TRUE; break; } Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Mon Jul 20 19:34:35 2015 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Win32k subsystem * PURPOSE: Windows - * FILE: subsystems/win32/win32k/ntuser/window.c + * FILE: win32ss/user/ntuser/window.c * PROGRAMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) */ @@ -570,6 +570,23 @@ if (ThreadData->MessageQueue->spwndCapture == Window) { IntReleaseCapture(); + } + + //// Now kill those remaining "PAINTING BUG: Thread marked as containing dirty windows" spam!!! + if ( Window->hrgnUpdate != NULL || Window->state & WNDS_INTERNALPAINT ) + { + MsqDecPaintCountQueue(Window->head.pti); + if (Window->hrgnUpdate > HRGN_WINDOW && GreIsHandleValid(Window->hrgnUpdate)) + { + GreDeleteObject(Window->hrgnUpdate); + } + Window->hrgnUpdate = NULL; + Window->state &= ~WNDS_INTERNALPAINT; + } + + if (Window->state & (WNDS_SENDERASEBACKGROUND|WNDS_SENDNCPAINT)) + { + Window->state &= ~(WNDS_SENDERASEBACKGROUND|WNDS_SENDNCPAINT); } if ( ((Window->style & (WS_CHILD|WS_POPUP)) != WS_CHILD) && Modified: trunk/reactos/win32ss/user/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winpos… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] Mon Jul 20 19:34:35 2015 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: Windows - * FILE: subsystems/win32/win32k/ntuser/window.c + * FILE: win32ss/user/ntuser/window.c * PROGRAMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) */ @@ -81,6 +81,29 @@ */ } } + +BOOL FASTCALL +IntGetWindowRect(PWND Wnd, RECTL *Rect) +{ + ASSERT( Wnd ); + ASSERT( Rect ); + if (!Wnd) return FALSE; + if ( Wnd != UserGetDesktopWindow()) // Wnd->fnid != FNID_DESKTOP ) + { + *Rect = Wnd->rcWindow; + } + else + { + Rect->left = Rect->top = 0; + Rect->right = Wnd->rcWindow.right; + Rect->bottom = Wnd->rcWindow.bottom; +/* Do this until Init bug is fixed. This sets 640x480, see InitMetrics. + Rect->right = GetSystemMetrics(SM_CXSCREEN); + Rect->bottom = GetSystemMetrics(SM_CYSCREEN); +*/ } + return TRUE; +} + INT FASTCALL IntMapWindowPoints(PWND FromWnd, PWND ToWnd, LPPOINT lpPoints, UINT cPoints) @@ -1099,6 +1122,38 @@ } static +BOOL +IntValidateParent(PWND Child, PREGION ValidateRgn) +{ + PWND ParentWnd = Child; + + if (ParentWnd->style & WS_CHILD) + { + do + ParentWnd = ParentWnd->spwndParent; + while (ParentWnd->style & WS_CHILD); + } + + ParentWnd = Child->spwndParent; + while (ParentWnd) + { + if (ParentWnd->style & WS_CLIPCHILDREN) + break; + + if (ParentWnd->hrgnUpdate != 0) + { + IntInvalidateWindows( ParentWnd, + ValidateRgn, + RDW_VALIDATE | RDW_NOCHILDREN); + } + + ParentWnd = ParentWnd->spwndParent; + } + + return TRUE; +} + +static VOID FASTCALL FixClientRect(PRECTL ClientRect, PRECTL WindowRect) { @@ -1320,8 +1375,6 @@ } } - WinPos->flags |= SWP_NOCLIENTMOVE | SWP_NOCLIENTSIZE; - if (!(WinPos->flags & SWP_NOMOVE)) { INT X, Y; @@ -1331,9 +1384,6 @@ Parent = Window->spwndParent; - // Fix wine msg test_SetParent:WmSetParentSeq_2:19 wParam bits. - WinPos->flags &= ~SWP_NOCLIENTMOVE; - // Parent child position issue is in here. SetParent_W7 test CORE-6651. if (//((Window->style & WS_CHILD) != 0) && <- Fixes wine msg test_SetParent: "rects do not match", the last test. Parent && @@ -1353,6 +1403,7 @@ RECTL_vOffsetRect(ClientRect, X - Window->rcWindow.left, Y - Window->rcWindow.top); } + WinPos->flags |= SWP_NOCLIENTMOVE | SWP_NOCLIENTSIZE; TRACE( "hwnd %p, after %p, swp %d,%d %dx%d flags %08x\n", WinPos->hwnd, WinPos->hwndInsertAfter, WinPos->x, WinPos->y, @@ -1387,7 +1438,6 @@ TRACE("(%p) hInsertAfter = %p\n", Window, hWndInsertAfter ); - Owner = Window->spwndOwner ? Window->spwndOwner->head.h : NULL; Style = Window->style; if (Style & WS_CHILD) @@ -1395,6 +1445,8 @@ TRACE("Window is child\n"); return hWndInsertAfter; } + + Owner = Window->spwndOwner ? Window->spwndOwner->head.h : NULL; if (Owner) { @@ -1438,7 +1490,7 @@ if (hWndInsertAfter == HWND_BOTTOM) { - ERR("Window is HWND_BOTTOM\n"); + ERR("Window is HWND_BOTTOM hwnd %p\n",hWndInsertAfter); if (List) ExFreePoolWithTag(List, USERTAG_WINDOWLIST); goto done; } @@ -1981,7 +2033,7 @@ 0); UserReleaseDC(Window, Dc, FALSE); - IntValidateParent(Window, CopyRgn, FALSE); + IntValidateParent(Window, CopyRgn); GreDeleteObject(DcRgn); } } @@ -2004,6 +2056,7 @@ { RgnType = IntGdiCombineRgn(DirtyRgn, VisAfter, 0, RGN_COPY); } + if (RgnType != ERROR && RgnType != NULLREGION) { /* old code @@ -2017,23 +2070,16 @@ PWND Parent = Window->spwndParent; - REGION_bOffsetRgn( DirtyRgn, - Window->rcWindow.left, - Window->rcWindow.top); - if ( (Window->style & WS_CHILD) && - (Parent) && - !(Parent->style & WS_CLIPCHILDREN)) + REGION_bOffsetRgn( DirtyRgn, Window->rcWindow.left, Window->rcWindow.top); + + if ( (Window->style & WS_CHILD) && (Parent) && !(Parent->style & WS_CLIPCHILDREN)) { - IntInvalidateWindows( Parent, - DirtyRgn, - RDW_ERASE | RDW_INVALIDATE); - co_IntPaintWindows(Parent, RDW_ERASENOW, FALSE); + IntInvalidateWindows( Parent, DirtyRgn, RDW_ERASE | RDW_INVALIDATE); + co_IntPaintWindows(Parent, RDW_NOCHILDREN, FALSE); } else { - IntInvalidateWindows( Window, - DirtyRgn, - RDW_ERASE | RDW_FRAME | RDW_INVALIDATE | RDW_ALLCHILDREN); + IntInvalidateWindows( Window, DirtyRgn, RDW_ERASE | RDW_FRAME | RDW_INVALIDATE | RDW_ALLCHILDREN); } } REGION_Delete(DirtyRgn); Modified: trunk/reactos/win32ss/user/ntuser/winpos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winpos… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winpos.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winpos.h [iso-8859-1] Mon Jul 20 19:34:35 2015 @@ -44,6 +44,16 @@ y - pwnd->rcWindow.top); } +FORCEINLINE BOOL +IntEqualRect(RECTL *lprc1, RECTL *lprc2) +{ + if (lprc1 == NULL || lprc2 == NULL) + return FALSE; + + return (lprc1->left == lprc2->left) && (lprc1->top == lprc2->top) && + (lprc1->right == lprc2->right) && (lprc1->bottom == lprc2->bottom); +} + BOOL FASTCALL ActivateOtherWindowMin(PWND); UINT FASTCALL co_WinPosArrangeIconicWindows(PWND parent); BOOL FASTCALL IntGetClientOrigin(PWND Window, LPPOINT Point); @@ -58,3 +68,4 @@ PWND FASTCALL IntRealChildWindowFromPoint(PWND,LONG,LONG); BOOL FASTCALL IntScreenToClient(PWND,LPPOINT); BOOL FASTCALL IntClientToScreen(PWND,LPPOINT); +BOOL FASTCALL IntGetWindowRect(PWND,RECTL*);

9 years, 5 months

[ekohl] 68473: [DISKPART] - Use the partition list code from usetup. Scan all harddisks at startup and keep the list alive as long as diskpart is running. - Use the partiton list in the 'select dis...

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Jul 20 19:17:06 2015 New Revision: 68473 URL: http://svn.reactos.org/svn/reactos?rev=68473&view=rev Log: [DISKPART] - Use the partition list code from usetup. Scan all harddisks at startup and keep the list alive as long as diskpart is running. - Use the partiton list in the 'select disk' and 'list disk' commands. - Implement the 'list disk' and 'list partition' commmands. - Add required strings. Added: trunk/reactos/base/system/diskpart/partlist.c (with props) Modified: trunk/reactos/base/system/diskpart/CMakeLists.txt trunk/reactos/base/system/diskpart/diskpart.c trunk/reactos/base/system/diskpart/diskpart.h trunk/reactos/base/system/diskpart/lang/en-US.rc trunk/reactos/base/system/diskpart/lang/ro-RO.rc trunk/reactos/base/system/diskpart/lang/ru-RU.rc trunk/reactos/base/system/diskpart/lang/sq-AL.rc trunk/reactos/base/system/diskpart/lang/tr-TR.rc trunk/reactos/base/system/diskpart/list.c trunk/reactos/base/system/diskpart/resource.h trunk/reactos/base/system/diskpart/select.c Modified: trunk/reactos/base/system/diskpart/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/CMake… ============================================================================== --- trunk/reactos/base/system/diskpart/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/CMakeLists.txt [iso-8859-1] Mon Jul 20 19:17:06 2015 @@ -28,6 +28,7 @@ merge.c offline.c online.c + partlist.c recover.c remove.c repair.c Modified: trunk/reactos/base/system/diskpart/diskpart.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/diskp… ============================================================================== --- trunk/reactos/base/system/diskpart/diskpart.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/diskpart.c [iso-8859-1] Mon Jul 20 19:17:06 2015 @@ -17,6 +17,7 @@ #include <winuser.h> /* FUNCTIONS ******************************************************************/ + VOID PrintResourceString(INT resID, ...) { @@ -95,17 +96,20 @@ LPCWSTR tmpBuffer = NULL; WCHAR appTitle[50]; int index, timeout; + int result = EXIT_SUCCESS; /* Sets the title of the program so the user will have an easier time determining the current program, especially if diskpart is running a script */ LoadStringW(GetModuleHandle(NULL), IDS_APP_HEADER, (LPWSTR)appTitle, 50); SetConsoleTitleW(appTitle); - + /* Sets the timeout value to 0 just in case the user doesn't specify a value */ timeout = 0; + CreatePartitionList(); + /* If there are no command arguments, then go straight to the interpreter */ if (argc < 2) { @@ -127,7 +131,8 @@ { /* If there is no flag, then return an error */ PrintResourceString(IDS_ERROR_MSG_BAD_ARG, argv[index]); - return EXIT_FAILURE; + result = EXIT_FAILURE; + goto done; } /* Checks for the /? flag first since the program @@ -135,7 +140,8 @@ if (_wcsicmp(tmpBuffer, L"?") == 0) { PrintResourceString(IDS_APP_USAGE); - return EXIT_SUCCESS; + result = EXIT_SUCCESS; + goto done; } /* Checks for the script flag */ else if (_wcsicmp(tmpBuffer, L"s") == 0) @@ -164,7 +170,8 @@ { /* Assume that the flag doesn't exist. */ PrintResourceString(IDS_ERROR_MSG_BAD_ARG, tmpBuffer); - return EXIT_FAILURE; + result = EXIT_FAILURE; + goto done; } } @@ -180,18 +187,25 @@ Sleep(timeout * 1000); if (RunScript(script) == FALSE) - return EXIT_FAILURE; + { + result = EXIT_FAILURE; + goto done; + } } else { /* Exit failure since the user wanted to run a script */ PrintResourceString(IDS_ERROR_MSG_NO_SCRIPT, script); - return EXIT_FAILURE; + result = EXIT_FAILURE; + goto done; } } /* Let the user know the program is exiting */ PrintResourceString(IDS_APP_LEAVING); - return EXIT_SUCCESS; -} +done: + DestroyPartitionList(); + + return result; +} Modified: trunk/reactos/base/system/diskpart/diskpart.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/diskp… ============================================================================== --- trunk/reactos/base/system/diskpart/diskpart.h [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/diskpart.h [iso-8859-1] Mon Jul 20 19:17:06 2015 @@ -17,6 +17,11 @@ #define WIN32_NO_STATUS #include <windef.h> #include <winbase.h> +#include <winreg.h> +#include <winuser.h> +#include <wincon.h> + +/* #define NTOS_MODE_USER #include <ndk/exfuncs.h> #include <ndk/iofuncs.h> @@ -24,6 +29,19 @@ #include <ndk/psfuncs.h> #include <ndk/rtlfuncs.h> #include <ndk/umfuncs.h> +*/ + +#define NTOS_MODE_USER +#include <ndk/cmfuncs.h> +#include <ndk/exfuncs.h> +#include <ndk/iofuncs.h> +#include <ndk/kefuncs.h> +#include <ndk/mmfuncs.h> +#include <ndk/obfuncs.h> +#include <ndk/psfuncs.h> +#include <ndk/rtlfuncs.h> +#include <ndk/setypes.h> +#include <ndk/umfuncs.h> #include "resource.h" @@ -50,10 +68,115 @@ #define MAX_STRING_SIZE 1024 #define MAX_ARGS_COUNT 256 + +typedef enum _FORMATSTATE +{ + Unformatted, + UnformattedOrDamaged, + UnknownFormat, + Preformatted, + Formatted +} FORMATSTATE, *PFORMATSTATE; + +typedef struct _PARTENTRY +{ + LIST_ENTRY ListEntry; + + struct _DISKENTRY *DiskEntry; + + ULARGE_INTEGER StartSector; + ULARGE_INTEGER SectorCount; + + BOOLEAN BootIndicator; + UCHAR PartitionType; + ULONG HiddenSectors; + ULONG PartitionNumber; + ULONG PartitionIndex; + + CHAR DriveLetter; + CHAR VolumeLabel[17]; + CHAR FileSystemName[9]; + + BOOLEAN LogicalPartition; + + /* Partition is partitioned disk space */ + BOOLEAN IsPartitioned; + + /* Partition is new. Table does not exist on disk yet */ + BOOLEAN New; + + /* Partition was created automatically. */ + BOOLEAN AutoCreate; + + FORMATSTATE FormatState; + + /* Partition must be checked */ + BOOLEAN NeedsCheck; + + struct _FILE_SYSTEM_ITEM *FileSystem; +} PARTENTRY, *PPARTENTRY; + + +typedef struct _BIOSDISKENTRY +{ + LIST_ENTRY ListEntry; + ULONG DiskNumber; + ULONG Signature; + ULONG Checksum; + BOOLEAN Recognized; + CM_DISK_GEOMETRY_DEVICE_DATA DiskGeometry; + CM_INT13_DRIVE_PARAMETER Int13DiskData; +} BIOSDISKENTRY, *PBIOSDISKENTRY; + + +typedef struct _DISKENTRY +{ + LIST_ENTRY ListEntry; + + ULONGLONG Cylinders; + ULONG TracksPerCylinder; + ULONG SectorsPerTrack; + ULONG BytesPerSector; + + ULARGE_INTEGER SectorCount; + ULONG SectorAlignment; + ULONG CylinderAlignment; + + BOOLEAN BiosFound; + ULONG BiosDiskNumber; +// ULONG Signature; +// ULONG Checksum; + + ULONG DiskNumber; + USHORT Port; + USHORT Bus; + USHORT Id; + + /* Has the partition list been modified? */ + BOOLEAN Dirty; + + BOOLEAN NewDisk; + BOOLEAN NoMbr; /* MBR is absent */ + + UNICODE_STRING DriverName; + + PDRIVE_LAYOUT_INFORMATION LayoutBuffer; + + PPARTENTRY ExtendedPartition; + + LIST_ENTRY PrimaryPartListHead; + LIST_ENTRY LogicalPartListHead; + +} DISKENTRY, *PDISKENTRY; + + /* GLOBAL VARIABLES ***********************************************************/ -ULONG CurrentDisk; -ULONG CurrentPartition; +extern LIST_ENTRY DiskListHead; +extern LIST_ENTRY BiosDiskListHead; + +extern PDISKENTRY CurrentDisk; +extern PPARTENTRY CurrentPartition; /* PROTOTYPES *****************************************************************/ @@ -144,6 +267,13 @@ /* online.c */ BOOL online_main(INT argc, LPWSTR *argv); +/* partlist.c */ +NTSTATUS +CreatePartitionList(VOID); + +VOID +DestroyPartitionList(VOID); + /* recover.c */ BOOL recover_main(INT argc, LPWSTR *argv); Modified: trunk/reactos/base/system/diskpart/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/lang/… ============================================================================== --- trunk/reactos/base/system/diskpart/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/lang/en-US.rc [iso-8859-1] Mon Jul 20 19:17:06 2015 @@ -40,6 +40,10 @@ IDS_LIST_DISK_HEAD "\n Disk ### Status Size Free Dyn Gpt\n" IDS_LIST_DISK_LINE " -------- ---------- ------- ------- --- ---\n" IDS_LIST_DISK_FORMAT "%c %7lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" + IDS_LIST_PARTITION_HEAD "\n Partition Type Size Offset\n" + IDS_LIST_PARTITION_LINE " ------------- ---------------- ------- -------\n" + IDS_LIST_PARTITION_FORMAT "%c Partition %2lu %-16s %4I64u %-2s %4I64u %-2s\n" + IDS_LIST_PARTITION_NO_DISK "\nThere is no disk for listing partitions.\nPlease select a disk and try again.\n\n" IDS_LIST_VOLUME_HEAD " Volume ### Ltr Label\n" END @@ -48,10 +52,13 @@ BEGIN IDS_SELECT_NO_DISK "\nThere is no disk currently selected.\nPlease select a disk and try again.\n\n" IDS_SELECT_DISK "\nDisk %lu is now the selected disk.\n\n" + IDS_SELECT_DISK_INVALID "\nInvalid disk.\n\n" + IDS_SELECT_NO_PARTITION "\nThere is no partition currently selected.\nPlease select a disk and try again.\n\n" + IDS_SELECT_PARTITION "\nPartition %lu is now the selected partition.\n\n" + IDS_SELECT_PARTITION_NO_DISK "\nThere is no disk for selecting a partition.\nPlease select a disk and try again.\n\n" + IDS_SELECT_PARTITION_INVALID "\nInvalid partition.\n\n" IDS_SELECT_NO_VOLUME "\nThere is no volume currently selected.\nPlease select a disk and try again.\n\n" IDS_SELECT_VOLUME "\nVolume %lu is now the selected volume.\n\n" - IDS_SELECT_NO_PARTITION "\nThere is no partition currently selected.\nPlease select a disk and try again.\n\n" - IDS_SELECT_PARTITION "\nPartition %lu is now the selected partition.\n\n" END /* Disk Status */ @@ -122,7 +129,6 @@ IDS_ERROR_MSG_NO_SCRIPT "Error opening script: %s\n" IDS_ERROR_MSG_BAD_ARG "Error processing argument: %s\n" IDS_ERROR_INVALID_ARGS "Invalid arguments\n" - IDS_ERROR_INVALID_DISK "Invalid disk\n" END /* Active help descriptions */ Modified: trunk/reactos/base/system/diskpart/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/lang/… ============================================================================== --- trunk/reactos/base/system/diskpart/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/lang/ro-RO.rc [iso-8859-1] Mon Jul 20 19:17:06 2015 @@ -41,6 +41,10 @@ IDS_LIST_DISK_HEAD "\n Disc ### Stare Dimensiune Liber Dyn Gpt\n" IDS_LIST_DISK_LINE " -------- ---------- ---------- ------- --- ---\n" IDS_LIST_DISK_FORMAT "%c %7lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" + IDS_LIST_PARTITION_HEAD "\n Partition Type Size Offset\n" + IDS_LIST_PARTITION_LINE " ------------- ---------------- ------- -------\n" + IDS_LIST_PARTITION_FORMAT "%c Partition %2lu %-16s %4I64u %-2s %4I64u %-2s\n" + IDS_LIST_PARTITION_NO_DISK "\nThere is no disk for listing partitions.\nPlease select a disk and try again.\n\n" IDS_LIST_VOLUME_HEAD "Volum ###\tLtr\tEtichetÄ\n" END @@ -49,10 +53,13 @@ BEGIN IDS_SELECT_NO_DISK "\nThere is no disk currently selected.\nPlease select a disk and try again.\n\n" IDS_SELECT_DISK "\nDisk %lu is now the selected disk.\n\n" + IDS_SELECT_DISK_INVALID "\nInvalid disk.\n\n" + IDS_SELECT_NO_PARTITION "\nThere is no partition currently selected.\nPlease select a disk and try again.\n\n" + IDS_SELECT_PARTITION "\nPartition %lu is now the selected partition.\n\n" + IDS_SELECT_PARTITION_NO_DISK "\nThere is no disk for selecting a partition.\nPlease select a disk and try again.\n\n" + IDS_SELECT_PARTITION_INVALID "\nInvalid partition.\n\n" IDS_SELECT_NO_VOLUME "\nThere is no volume currently selected.\nPlease select a disk and try again.\n\n" IDS_SELECT_VOLUME "\nVolume %lu is now the selected volume.\n\n" - IDS_SELECT_NO_PARTITION "\nThere is no partition currently selected.\nPlease select a disk and try again.\n\n" - IDS_SELECT_PARTITION "\nPartition %lu is now the selected partition.\n\n" END /* Disk Status */ @@ -123,7 +130,6 @@ IDS_ERROR_MSG_NO_SCRIPT "Eroare la deschiderea fiÈierului script: %s\n" IDS_ERROR_MSG_BAD_ARG "Eroare la prelucrarea argumentului: %s\n" IDS_ERROR_INVALID_ARGS "Invalid arguments\n" - IDS_ERROR_INVALID_DISK "Invalid disk\n" END /* Active help descriptions */ Modified: trunk/reactos/base/system/diskpart/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/lang/… ============================================================================== --- trunk/reactos/base/system/diskpart/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/lang/ru-RU.rc [iso-8859-1] Mon Jul 20 19:17:06 2015 @@ -42,6 +42,10 @@ IDS_LIST_DISK_HEAD "\n ÐÐ¸ÑÐº ### Ð¡Ð¾ÑÑÐ¾ÑÐ½Ð¸Ðµ Ð Ð°Ð·Ð¼ÐµÑ Ð¡Ð²Ð¾Ð±Ð¾Ð´Ð½Ð¾ ÐÐ¸Ð½ GPT\n" IDS_LIST_DISK_LINE " -------- ---------- ------- -------- --- ---\n" IDS_LIST_DISK_FORMAT "%c %7lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" + IDS_LIST_PARTITION_HEAD "\n Partition Type Size Offset\n" + IDS_LIST_PARTITION_LINE " ------------- ---------------- ------- -------\n" + IDS_LIST_PARTITION_FORMAT "%c Partition %2lu %-16s %4I64u %-2s %4I64u %-2s\n" + IDS_LIST_PARTITION_NO_DISK "\nThere is no disk for listing partitions.\nPlease select a disk and try again.\n\n" IDS_LIST_VOLUME_HEAD "Ð¢Ð¾Ð¼ ###\tÐÐ¼Ñ\tÐÐµÑÐºÐ°\n" END @@ -50,10 +54,13 @@ BEGIN IDS_SELECT_NO_DISK "\nThere is no disk currently selected.\nPlease select a disk and try again.\n\n" IDS_SELECT_DISK "\nDisk %lu is now the selected disk.\n\n" + IDS_SELECT_DISK_INVALID "\nInvalid disk.\n\n" + IDS_SELECT_NO_PARTITION "\nThere is no partition currently selected.\nPlease select a disk and try again.\n\n" + IDS_SELECT_PARTITION "\nPartition %lu is now the selected partition.\n\n" + IDS_SELECT_PARTITION_NO_DISK "\nThere is no disk for selecting a partition.\nPlease select a disk and try again.\n\n" + IDS_SELECT_PARTITION_INVALID "\nInvalid partition.\n\n" IDS_SELECT_NO_VOLUME "\nThere is no volume currently selected.\nPlease select a disk and try again.\n\n" IDS_SELECT_VOLUME "\nVolume %lu is now the selected volume.\n\n" - IDS_SELECT_NO_PARTITION "\nThere is no partition currently selected.\nPlease select a disk and try again.\n\n" - IDS_SELECT_PARTITION "\nPartition %lu is now the selected partition.\n\n" END /* Disk Status */ @@ -124,7 +131,6 @@ IDS_ERROR_MSG_NO_SCRIPT "ÐÑÐ¸Ð±ÐºÐ° Ð¾ÑÐºÑÑÑÐ¸Ñ ÑÐºÑÐ¸Ð¿ÑÐ°: %s\n" IDS_ERROR_MSG_BAD_ARG "ÐÑÐ¸Ð±ÐºÐ° Ð¾Ð±ÑÐ°Ð±Ð¾ÑÐºÐ¸ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð²: %s\n" IDS_ERROR_INVALID_ARGS "Invalid arguments\n" - IDS_ERROR_INVALID_DISK "Invalid disk\n" END /* Active help descriptions */ Modified: trunk/reactos/base/system/diskpart/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/lang/… ============================================================================== --- trunk/reactos/base/system/diskpart/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/lang/sq-AL.rc [iso-8859-1] Mon Jul 20 19:17:06 2015 @@ -44,6 +44,10 @@ IDS_LIST_DISK_HEAD "\n Disk ### Status Size Free Dyn Gpt\n" IDS_LIST_DISK_LINE " -------- ---------- ------- ------- --- ---\n" IDS_LIST_DISK_FORMAT "%c %7lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" + IDS_LIST_PARTITION_HEAD "\n Partition Type Size Offset\n" + IDS_LIST_PARTITION_LINE "%c ------------- ---------------- ------- -------\n" + IDS_LIST_PARTITION_FORMAT " Partition %2lu %-16s %4I64u %-2s %4I64u %-2s\n" + IDS_LIST_PARTITION_NO_DISK "\nThere is no disk for listing partitions.\nPlease select a disk and try again.\n\n" IDS_LIST_VOLUME_HEAD "Volume ###\tLtr\tLabel\n" END @@ -52,10 +56,13 @@ BEGIN IDS_SELECT_NO_DISK "\nThere is no disk currently selected.\nPlease select a disk and try again.\n\n" IDS_SELECT_DISK "\nDisk %lu is now the selected disk.\n\n" + IDS_SELECT_DISK_INVALID "\nInvalid disk.\n\n" + IDS_SELECT_NO_PARTITION "\nThere is no partition currently selected.\nPlease select a disk and try again.\n\n" + IDS_SELECT_PARTITION "\nPartition %lu is now the selected partition.\n\n" + IDS_SELECT_PARTITION_NO_DISK "\nThere is no disk for selecting a partition.\nPlease select a disk and try again.\n\n" + IDS_SELECT_PARTITION_INVALID "\nInvalid partition.\n\n" IDS_SELECT_NO_VOLUME "\nThere is no volume currently selected.\nPlease select a disk and try again.\n\n" IDS_SELECT_VOLUME "\nVolume %lu is now the selected volume.\n\n" - IDS_SELECT_NO_PARTITION "\nThere is no partition currently selected.\nPlease select a disk and try again.\n\n" - IDS_SELECT_PARTITION "\nPartition %lu is now the selected partition.\n\n" END /* Disk Status */ @@ -126,7 +133,6 @@ IDS_ERROR_MSG_NO_SCRIPT "Error nÃ« hapjen e skriptes: %s\n" IDS_ERROR_MSG_BAD_ARG "Error argumenti i procesimit: %s\n" IDS_ERROR_INVALID_ARGS "Invalid arguments\n" - IDS_ERROR_INVALID_DISK "Invalid disk\n" END /* Active help descriptions */ Modified: trunk/reactos/base/system/diskpart/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/lang/… ============================================================================== --- trunk/reactos/base/system/diskpart/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/lang/tr-TR.rc [iso-8859-1] Mon Jul 20 19:17:06 2015 @@ -42,6 +42,10 @@ IDS_LIST_DISK_HEAD "\n Disk ### Durum Boyut BoÅ Dev Gpt\n" IDS_LIST_DISK_LINE " -------- ---------- ------- ------- --- ---\n" IDS_LIST_DISK_FORMAT "%c %7lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" + IDS_LIST_PARTITION_HEAD "\n Partition Type Size Offset\n" + IDS_LIST_PARTITION_LINE " ------------- ---------------- ------- -------\n" + IDS_LIST_PARTITION_FORMAT "%c Partition %2lu %-16s %4I64u %-2s %4I64u %-2s\n" + IDS_LIST_PARTITION_NO_DISK "\nThere is no disk for listing partitions.\nPlease select a disk and try again.\n\n" IDS_LIST_VOLUME_HEAD "Birim ###\tHarf\tEtiket\n" END @@ -50,10 +54,13 @@ BEGIN IDS_SELECT_NO_DISK "\nThere is no disk currently selected.\nPlease select a disk and try again.\n\n" IDS_SELECT_DISK "\nDisk %lu is now the selected disk.\n\n" + IDS_SELECT_DISK_INVALID "\nInvalid disk.\n\n" + IDS_SELECT_NO_PARTITION "\nThere is no partition currently selected.\nPlease select a disk and try again.\n\n" + IDS_SELECT_PARTITION "\nPartition %lu is now the selected partition.\n\n" + IDS_SELECT_PARTITION_NO_DISK "\nThere is no disk for selecting a partition.\nPlease select a disk and try again.\n\n" + IDS_SELECT_PARTITION_INVALID "\nInvalid partition.\n\n" IDS_SELECT_NO_VOLUME "\nThere is no volume currently selected.\nPlease select a disk and try again.\n\n" IDS_SELECT_VOLUME "\nVolume %lu is now the selected volume.\n\n" - IDS_SELECT_NO_PARTITION "\nThere is no partition currently selected.\nPlease select a disk and try again.\n\n" - IDS_SELECT_PARTITION "\nPartition %lu is now the selected partition.\n\n" END /* Disk Status */ @@ -124,7 +131,6 @@ IDS_ERROR_MSG_NO_SCRIPT "Betik aÃ§mada yanlÄ±ÅlÄ±k: %s\n" IDS_ERROR_MSG_BAD_ARG "DeÄiÅtirgen iÅlemede yanlÄ±ÅlÄ±k: %s\n" IDS_ERROR_INVALID_ARGS "Invalid arguments\n" - IDS_ERROR_INVALID_DISK "Invalid disk\n" END /* Active help descriptions */ Modified: trunk/reactos/base/system/diskpart/list.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/list.… ============================================================================== --- trunk/reactos/base/system/diskpart/list.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/list.c [iso-8859-1] Mon Jul 20 19:17:06 2015 @@ -11,6 +11,8 @@ #define NDEBUG #include <debug.h> +/* FUNCTIONS ******************************************************************/ + static ULONGLONG RoundingDivide( @@ -25,115 +27,54 @@ VOID ListDisk(VOID) { - WCHAR Buffer[MAX_PATH]; - OBJECT_ATTRIBUTES ObjectAttributes; - SYSTEM_DEVICE_INFORMATION Sdi; - IO_STATUS_BLOCK Iosb; - DISK_GEOMETRY DiskGeometry; - ULONG ReturnSize; - ULONG DiskNumber; - UNICODE_STRING Name; - HANDLE FileHandle; - NTSTATUS Status; - - ULARGE_INTEGER DiskSize; - ULARGE_INTEGER FreeSize; + PLIST_ENTRY Entry; + PDISKENTRY DiskEntry; + ULONGLONG DiskSize; + ULONGLONG FreeSize; LPWSTR lpSizeUnit; LPWSTR lpFreeUnit; - - - Status = NtQuerySystemInformation(SystemDeviceInformation, - &Sdi, - sizeof(SYSTEM_DEVICE_INFORMATION), - &ReturnSize); - if (!NT_SUCCESS(Status)) - { - return; - } /* Header labels */ PrintResourceString(IDS_LIST_DISK_HEAD); PrintResourceString(IDS_LIST_DISK_LINE); - for (DiskNumber = 0; DiskNumber < Sdi.NumberOfDisks; DiskNumber++) - { - swprintf(Buffer, - L"\\Device\\Harddisk%d\\Partition0", - DiskNumber); - RtlInitUnicodeString(&Name, - Buffer); - - InitializeObjectAttributes(&ObjectAttributes, - &Name, - 0, - NULL, - NULL); - - Status = NtOpenFile(&FileHandle, - FILE_READ_DATA | FILE_READ_ATTRIBUTES | SYNCHRONIZE, - &ObjectAttributes, - &Iosb, - FILE_SHARE_READ, - FILE_SYNCHRONOUS_IO_NONALERT); - if (NT_SUCCESS(Status)) - { - Status = NtDeviceIoControlFile(FileHandle, - NULL, - NULL, - NULL, - &Iosb, - IOCTL_DISK_GET_DRIVE_GEOMETRY, - NULL, - 0, - &DiskGeometry, - sizeof(DISK_GEOMETRY)); - if (NT_SUCCESS(Status)) - { - DiskSize.QuadPart = DiskGeometry.Cylinders.QuadPart * - (ULONGLONG)DiskGeometry.TracksPerCylinder * - (ULONGLONG)DiskGeometry.SectorsPerTrack * - (ULONGLONG)DiskGeometry.BytesPerSector; - if (DiskSize.QuadPart >= 10737418240) /* 10 GB */ - { - DiskSize.QuadPart = RoundingDivide(DiskSize.QuadPart, 1073741824); - lpSizeUnit = L"GB"; - } - else - { - DiskSize.QuadPart = RoundingDivide(DiskSize.QuadPart, 1048576); - if (DiskSize.QuadPart == 0) - DiskSize.QuadPart = 1; - lpSizeUnit = L"MB"; - } - - /* FIXME */ - FreeSize.QuadPart = 0; - lpFreeUnit = L"B"; - - PrintResourceString(IDS_LIST_DISK_FORMAT, - (CurrentDisk == DiskNumber) ? L'*': ' ', - DiskNumber, - L"Online", - DiskSize.QuadPart, - lpSizeUnit, - FreeSize.QuadPart, - lpFreeUnit, - L" ", - L" "); - } - else - { - printf("Status 0x%lx\n", Status); - - } - - NtClose(FileHandle); + Entry = DiskListHead.Flink; + while (Entry != &DiskListHead) + { + DiskEntry = CONTAINING_RECORD(Entry, DISKENTRY, ListEntry); + + DiskSize = DiskEntry->SectorCount.QuadPart * + (ULONGLONG)DiskEntry->BytesPerSector; + + if (DiskSize >= 10737418240) /* 10 GB */ + { + DiskSize = RoundingDivide(DiskSize, 1073741824); + lpSizeUnit = L"GB"; } else { - printf("Status 0x%lx\n", Status); - - } + DiskSize = RoundingDivide(DiskSize, 1048576); + if (DiskSize == 0) + DiskSize = 1; + lpSizeUnit = L"MB"; + } + + /* FIXME */ + FreeSize = 0; + lpFreeUnit = L"B"; + + PrintResourceString(IDS_LIST_DISK_FORMAT, + (CurrentDisk == DiskEntry) ? L'*': ' ', + DiskEntry->DiskNumber, + L"Online", + DiskSize, + lpSizeUnit, + FreeSize, + lpFreeUnit, + L" ", + L" "); + + Entry = Entry->Flink; } wprintf(L"\n\n"); @@ -143,7 +84,137 @@ VOID ListPartition(VOID) { - printf("List Partition!!\n"); + PLIST_ENTRY Entry; + PPARTENTRY PartEntry; + ULONGLONG PartSize; + ULONGLONG PartOffset; + LPWSTR lpSizeUnit; + LPWSTR lpOffsetUnit; + ULONG PartNumber = 1; + + if (CurrentDisk == NULL) + { + PrintResourceString(IDS_LIST_PARTITION_NO_DISK); + return; + } + + /* Header labels */ + PrintResourceString(IDS_LIST_PARTITION_HEAD); + PrintResourceString(IDS_LIST_PARTITION_LINE); + + Entry = CurrentDisk->PrimaryPartListHead.Flink; + while (Entry != &CurrentDisk->PrimaryPartListHead) + { + PartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry); + + if (PartEntry->PartitionType != 0) + { + PartSize = PartEntry->SectorCount.QuadPart * CurrentDisk->BytesPerSector; + + if (PartSize >= 10737418240) /* 10 GB */ + { + PartSize = RoundingDivide(PartSize, 1073741824); + lpSizeUnit = L"GB"; + } + else if (PartSize >= 10485760) /* 10 MB */ + { + PartSize = RoundingDivide(PartSize, 1048576); + lpSizeUnit = L"MB"; + } + else + { + PartSize = RoundingDivide(PartSize, 1024); + lpSizeUnit = L"KB"; + } + + PartOffset = PartEntry->StartSector.QuadPart * CurrentDisk->BytesPerSector; + + if (PartOffset >= 10737418240) /* 10 GB */ + { + PartOffset = RoundingDivide(PartOffset, 1073741824); + lpOffsetUnit = L"GB"; + } + else if (PartOffset >= 10485760) /* 10 MB */ + { + PartOffset = RoundingDivide(PartOffset, 1048576); + lpOffsetUnit = L"MB"; + } + else + { + PartOffset = RoundingDivide(PartOffset, 1024); + lpOffsetUnit = L"KB"; + } + + PrintResourceString(IDS_LIST_PARTITION_FORMAT, + (CurrentPartition == PartEntry) ? L'*': ' ', + PartNumber++, + IsContainerPartition(PartEntry->PartitionType) ? L"Extended" : L"Primary", + PartSize, + lpSizeUnit, + PartOffset, + lpOffsetUnit); + } + + Entry = Entry->Flink; + } + + Entry = CurrentDisk->LogicalPartListHead.Flink; + while (Entry != &CurrentDisk->LogicalPartListHead) + { + PartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry); + + if (PartEntry->PartitionType != 0) + { + PartSize = PartEntry->SectorCount.QuadPart * CurrentDisk->BytesPerSector; + + if (PartSize >= 10737418240) /* 10 GB */ + { + PartSize = RoundingDivide(PartSize, 1073741824); + lpSizeUnit = L"GB"; + } + else if (PartSize >= 10485760) /* 10 MB */ + { + PartSize = RoundingDivide(PartSize, 1048576); + lpSizeUnit = L"MB"; + } + else + { + PartSize = RoundingDivide(PartSize, 1024); + lpSizeUnit = L"KB"; + } + + PartOffset = PartEntry->StartSector.QuadPart * CurrentDisk->BytesPerSector; + + if (PartOffset >= 10737418240) /* 10 GB */ + { + PartOffset = RoundingDivide(PartOffset, 1073741824); + lpOffsetUnit = L"GB"; + } + else if (PartOffset >= 10485760) /* 10 MB */ + { + PartOffset = RoundingDivide(PartOffset, 1048576); + lpOffsetUnit = L"MB"; + } + else + { + PartOffset = RoundingDivide(PartOffset, 1024); + lpOffsetUnit = L"KB"; + } + + PrintResourceString(IDS_LIST_PARTITION_FORMAT, + (CurrentPartition == PartEntry) ? L'*': ' ', + PartNumber++, + L"Logical", + PartSize, + lpSizeUnit, + PartOffset, + lpOffsetUnit); + } + + Entry = Entry->Flink; + } + + wprintf(L"\n"); } static Added: trunk/reactos/base/system/diskpart/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/partl… ============================================================================== --- trunk/reactos/base/system/diskpart/partlist.c (added) +++ trunk/reactos/base/system/diskpart/partlist.c [iso-8859-1] Mon Jul 20 19:17:06 2015 @@ -0,0 +1,1186 @@ +/* + * PROJECT: ReactOS DiskPart + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/diskpart/diskpart.c + * PURPOSE: Manages all the partitions of the OS in an interactive way + * PROGRAMMERS: Eric Kohl + */ + +/* INCLUDES *******************************************************************/ + +#include "diskpart.h" + +#include <stdlib.h> +#include <winbase.h> +#include <wincon.h> +#include <winuser.h> + +#include <ntddscsi.h> + +#define NDEBUG +#include <debug.h> + +#define InsertAscendingList(ListHead, NewEntry, Type, ListEntryField, SortField)\ +{\ + PLIST_ENTRY current;\ +\ + current = (ListHead)->Flink;\ + while (current != (ListHead))\ + {\ + if (CONTAINING_RECORD(current, Type, ListEntryField)->SortField >=\ + (NewEntry)->SortField)\ + {\ + break;\ + }\ + current = current->Flink;\ + }\ +\ + InsertTailList(current, &((NewEntry)->ListEntryField));\ +} + +/* We have to define it there, because it is not in the MS DDK */ +#define PARTITION_EXT2 0x83 + +#define PARTITION_TBL_SIZE 4 + +#include <pshpack1.h> + +typedef struct _PARTITION +{ + unsigned char BootFlags; /* bootable? 0=no, 128=yes */ + unsigned char StartingHead; /* beginning head number */ + unsigned char StartingSector; /* beginning sector number */ + unsigned char StartingCylinder; /* 10 bit nmbr, with high 2 bits put in begsect */ + unsigned char PartitionType; /* Operating System type indicator code */ + unsigned char EndingHead; /* ending head number */ + unsigned char EndingSector; /* ending sector number */ + unsigned char EndingCylinder; /* also a 10 bit nmbr, with same high 2 bit trick */ + unsigned int StartingBlock; /* first sector relative to start of disk */ + unsigned int SectorCount; /* number of sectors in partition */ +} PARTITION, *PPARTITION; + +typedef struct _PARTITION_SECTOR +{ + UCHAR BootCode[440]; /* 0x000 */ + ULONG Signature; /* 0x1B8 */ + UCHAR Reserved[2]; /* 0x1BC */ + PARTITION Partition[PARTITION_TBL_SIZE]; /* 0x1BE */ + USHORT Magic; /* 0x1FE */ +} PARTITION_SECTOR, *PPARTITION_SECTOR; + +#include <poppack.h> + + +/* GLOBALS ********************************************************************/ + +LIST_ENTRY DiskListHead; +LIST_ENTRY BiosDiskListHead; + +PDISKENTRY CurrentDisk = NULL; +PPARTENTRY CurrentPartition = NULL; + + +/* FUNCTIONS ******************************************************************/ + +ULONGLONG +AlignDown( + IN ULONGLONG Value, + IN ULONG Alignment) +{ + ULONGLONG Temp; + + Temp = Value / Alignment; + + return Temp * Alignment; +} + +static +VOID +GetDriverName( + PDISKENTRY DiskEntry) +{ + RTL_QUERY_REGISTRY_TABLE QueryTable[2]; + WCHAR KeyName[32]; + NTSTATUS Status; + + RtlInitUnicodeString(&DiskEntry->DriverName, + NULL); + + swprintf(KeyName, + L"\\Scsi\\Scsi Port %lu", + DiskEntry->Port); + + RtlZeroMemory(&QueryTable, + sizeof(QueryTable)); + + QueryTable[0].Name = L"Driver"; + QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT; + QueryTable[0].EntryContext = &DiskEntry->DriverName; + + Status = RtlQueryRegistryValues(RTL_REGISTRY_DEVICEMAP, + KeyName, + QueryTable, + NULL, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("RtlQueryRegistryValues() failed (Status %lx)\n", Status); + } +} + +static +NTSTATUS +NTAPI +DiskIdentifierQueryRoutine( + PWSTR ValueName, + ULONG ValueType, + PVOID ValueData, + ULONG ValueLength, + PVOID Context, + PVOID EntryContext) +{ + PBIOSDISKENTRY BiosDiskEntry = (PBIOSDISKENTRY)Context; + UNICODE_STRING NameU; + + if (ValueType == REG_SZ && + ValueLength == 20 * sizeof(WCHAR)) + { + NameU.Buffer = (PWCHAR)ValueData; + NameU.Length = NameU.MaximumLength = 8 * sizeof(WCHAR); + RtlUnicodeStringToInteger(&NameU, 16, &BiosDiskEntry->Checksum); + + NameU.Buffer = (PWCHAR)ValueData + 9; + RtlUnicodeStringToInteger(&NameU, 16, &BiosDiskEntry->Signature); + + return STATUS_SUCCESS; + } + + return STATUS_UNSUCCESSFUL; +} + +static +NTSTATUS +NTAPI +DiskConfigurationDataQueryRoutine( + PWSTR ValueName, + ULONG ValueType, + PVOID ValueData, + ULONG ValueLength, + PVOID Context, + PVOID EntryContext) +{ + PBIOSDISKENTRY BiosDiskEntry = (PBIOSDISKENTRY)Context; + PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; + PCM_DISK_GEOMETRY_DEVICE_DATA DiskGeometry; + ULONG i; + + if (ValueType != REG_FULL_RESOURCE_DESCRIPTOR || + ValueLength < sizeof(CM_FULL_RESOURCE_DESCRIPTOR)) + return STATUS_UNSUCCESSFUL; + + FullResourceDescriptor = (PCM_FULL_RESOURCE_DESCRIPTOR)ValueData; + + /* Hm. Version and Revision are not set on Microsoft Windows XP... */ +#if 0 + if (FullResourceDescriptor->PartialResourceList.Version != 1 || + FullResourceDescriptor->PartialResourceList.Revision != 1) + return STATUS_UNSUCCESSFUL; +#endif + + for (i = 0; i < FullResourceDescriptor->PartialResourceList.Count; i++) + { + if (FullResourceDescriptor->PartialResourceList.PartialDescriptors[i].Type != CmResourceTypeDeviceSpecific || + FullResourceDescriptor->PartialResourceList.PartialDescriptors[i].u.DeviceSpecificData.DataSize != sizeof(CM_DISK_GEOMETRY_DEVICE_DATA)) + continue; + + DiskGeometry = (PCM_DISK_GEOMETRY_DEVICE_DATA)&FullResourceDescriptor->PartialResourceList.PartialDescriptors[i + 1]; + BiosDiskEntry->DiskGeometry = *DiskGeometry; + + return STATUS_SUCCESS; + } + + return STATUS_UNSUCCESSFUL; +} + +static +NTSTATUS +NTAPI +SystemConfigurationDataQueryRoutine( + PWSTR ValueName, + ULONG ValueType, + PVOID ValueData, + ULONG ValueLength, + PVOID Context, + PVOID EntryContext) +{ + PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; + PCM_INT13_DRIVE_PARAMETER* Int13Drives = (PCM_INT13_DRIVE_PARAMETER*)Context; + ULONG i; + + if (ValueType != REG_FULL_RESOURCE_DESCRIPTOR || + ValueLength < sizeof (CM_FULL_RESOURCE_DESCRIPTOR)) + return STATUS_UNSUCCESSFUL; + + FullResourceDescriptor = (PCM_FULL_RESOURCE_DESCRIPTOR)ValueData; + + /* Hm. Version and Revision are not set on Microsoft Windows XP... */ +#if 0 + if (FullResourceDescriptor->PartialResourceList.Version != 1 || + FullResourceDescriptor->PartialResourceList.Revision != 1) + return STATUS_UNSUCCESSFUL; +#endif + + for (i = 0; i < FullResourceDescriptor->PartialResourceList.Count; i++) + { + if (FullResourceDescriptor->PartialResourceList.PartialDescriptors[i].Type != CmResourceTypeDeviceSpecific || + FullResourceDescriptor->PartialResourceList.PartialDescriptors[i].u.DeviceSpecificData.DataSize % sizeof(CM_INT13_DRIVE_PARAMETER) != 0) + continue; + + *Int13Drives = (CM_INT13_DRIVE_PARAMETER*)RtlAllocateHeap(RtlGetProcessHeap(), 0, + FullResourceDescriptor->PartialResourceList.PartialDescriptors[i].u.DeviceSpecificData.DataSize); + if (*Int13Drives == NULL) + return STATUS_NO_MEMORY; + + memcpy(*Int13Drives, + &FullResourceDescriptor->PartialResourceList.PartialDescriptors[i + 1], + FullResourceDescriptor->PartialResourceList.PartialDescriptors[i].u.DeviceSpecificData.DataSize); + return STATUS_SUCCESS; + } + + return STATUS_UNSUCCESSFUL; +} + + +#define ROOT_NAME L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System\\MultifunctionAdapter" + +static +VOID +EnumerateBiosDiskEntries(VOID) +{ + RTL_QUERY_REGISTRY_TABLE QueryTable[3]; + WCHAR Name[120]; + ULONG AdapterCount; + ULONG DiskCount; + NTSTATUS Status; + PCM_INT13_DRIVE_PARAMETER Int13Drives; + PBIOSDISKENTRY BiosDiskEntry; + + memset(QueryTable, 0, sizeof(QueryTable)); + + QueryTable[1].Name = L"Configuration Data"; + QueryTable[1].QueryRoutine = SystemConfigurationDataQueryRoutine; + Int13Drives = NULL; + Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, + L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System", + &QueryTable[1], + (PVOID)&Int13Drives, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Unable to query the 'Configuration Data' key in '\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System', status=%lx\n", Status); + return; + } + + AdapterCount = 0; + while (1) + { + swprintf(Name, L"%s\\%lu", ROOT_NAME, AdapterCount); + Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, + Name, + &QueryTable[2], + NULL, + NULL); + if (!NT_SUCCESS(Status)) + { + break; + } + + swprintf(Name, L"%s\\%lu\\DiskController", ROOT_NAME, AdapterCount); + Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, + Name, + &QueryTable[2], + NULL, + NULL); + if (NT_SUCCESS(Status)) + { + while (1) + { + swprintf(Name, L"%s\\%lu\\DiskController\\0", ROOT_NAME, AdapterCount); + Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, + Name, + &QueryTable[2], + NULL, + NULL); + if (!NT_SUCCESS(Status)) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, Int13Drives); + return; + } + + swprintf(Name, L"%s\\%lu\\DiskController\\0\\DiskPeripheral", ROOT_NAME, AdapterCount); + Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, + Name, + &QueryTable[2], + NULL, + NULL); + if (NT_SUCCESS(Status)) + { + QueryTable[0].Name = L"Identifier"; + QueryTable[0].QueryRoutine = DiskIdentifierQueryRoutine; + QueryTable[1].Name = L"Configuration Data"; + QueryTable[1].QueryRoutine = DiskConfigurationDataQueryRoutine; + + DiskCount = 0; + while (1) + { + BiosDiskEntry = (BIOSDISKENTRY*)RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BIOSDISKENTRY)); + if (BiosDiskEntry == NULL) + { + break; + } + + swprintf(Name, L"%s\\%lu\\DiskController\\0\\DiskPeripheral\\%lu", ROOT_NAME, AdapterCount, DiskCount); + Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, + Name, + QueryTable, + (PVOID)BiosDiskEntry, + NULL); + if (!NT_SUCCESS(Status)) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, BiosDiskEntry); + break; + } + + BiosDiskEntry->DiskNumber = DiskCount; + BiosDiskEntry->Recognized = FALSE; + + if (DiskCount < Int13Drives[0].NumberDrives) + { + BiosDiskEntry->Int13DiskData = Int13Drives[DiskCount]; + } + else + { + DPRINT1("Didn't find int13 drive datas for disk %u\n", DiskCount); + } + + InsertTailList(&BiosDiskListHead, &BiosDiskEntry->ListEntry); + + DPRINT("DiskNumber: %lu\n", BiosDiskEntry->DiskNumber); + DPRINT("Signature: %08lx\n", BiosDiskEntry->Signature); + DPRINT("Checksum: %08lx\n", BiosDiskEntry->Checksum); + DPRINT("BytesPerSector: %lu\n", BiosDiskEntry->DiskGeometry.BytesPerSector); + DPRINT("NumberOfCylinders: %lu\n", BiosDiskEntry->DiskGeometry.NumberOfCylinders); + DPRINT("NumberOfHeads: %lu\n", BiosDiskEntry->DiskGeometry.NumberOfHeads); + DPRINT("DriveSelect: %02x\n", BiosDiskEntry->Int13DiskData.DriveSelect); + DPRINT("MaxCylinders: %lu\n", BiosDiskEntry->Int13DiskData.MaxCylinders); + DPRINT("SectorsPerTrack: %d\n", BiosDiskEntry->Int13DiskData.SectorsPerTrack); + DPRINT("MaxHeads: %d\n", BiosDiskEntry->Int13DiskData.MaxHeads); + DPRINT("NumberDrives: %d\n", BiosDiskEntry->Int13DiskData.NumberDrives); + + DiskCount++; + } + } + + RtlFreeHeap(RtlGetProcessHeap(), 0, Int13Drives); + return; + } + } + + AdapterCount++; + } + + RtlFreeHeap(RtlGetProcessHeap(), 0, Int13Drives); +} + + +static +VOID +AddPartitionToDisk( + ULONG DiskNumber, + PDISKENTRY DiskEntry, + ULONG PartitionIndex, + BOOLEAN LogicalPartition) +{ + PPARTITION_INFORMATION PartitionInfo; + PPARTENTRY PartEntry; + + PartitionInfo = &DiskEntry->LayoutBuffer->PartitionEntry[PartitionIndex]; + if (PartitionInfo->PartitionType == 0 || + (LogicalPartition == TRUE && IsContainerPartition(PartitionInfo->PartitionType))) + return; + + PartEntry = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(PARTENTRY)); + if (PartEntry == NULL) + { + return; + } + + PartEntry->DiskEntry = DiskEntry; + + PartEntry->StartSector.QuadPart = (ULONGLONG)PartitionInfo->StartingOffset.QuadPart / DiskEntry->BytesPerSector; + PartEntry->SectorCount.QuadPart = (ULONGLONG)PartitionInfo->PartitionLength.QuadPart / DiskEntry->BytesPerSector; + + PartEntry->BootIndicator = PartitionInfo->BootIndicator; + PartEntry->PartitionType = PartitionInfo->PartitionType; + PartEntry->HiddenSectors = PartitionInfo->HiddenSectors; + + PartEntry->LogicalPartition = LogicalPartition; + PartEntry->IsPartitioned = TRUE; + PartEntry->PartitionNumber = PartitionInfo->PartitionNumber; + PartEntry->PartitionIndex = PartitionIndex; + + if (IsContainerPartition(PartEntry->PartitionType)) + { + PartEntry->FormatState = Unformatted; + + if (LogicalPartition == FALSE && DiskEntry->ExtendedPartition == NULL) + DiskEntry->ExtendedPartition = PartEntry; + } + else if ((PartEntry->PartitionType == PARTITION_FAT_12) || + (PartEntry->PartitionType == PARTITION_FAT_16) || + (PartEntry->PartitionType == PARTITION_HUGE) || + (PartEntry->PartitionType == PARTITION_XINT13) || + (PartEntry->PartitionType == PARTITION_FAT32) || + (PartEntry->PartitionType == PARTITION_FAT32_XINT13)) + { +#if 0 + if (CheckFatFormat()) + { + PartEntry->FormatState = Preformatted; + } + else + { + PartEntry->FormatState = Unformatted; + } +#endif + PartEntry->FormatState = Preformatted; + } + else if (PartEntry->PartitionType == PARTITION_EXT2) + { +#if 0 + if (CheckExt2Format()) + { + PartEntry->FormatState = Preformatted; + } + else + { + PartEntry->FormatState = Unformatted; + } +#endif + PartEntry->FormatState = Preformatted; + } + else if (PartEntry->PartitionType == PARTITION_IFS) + { +#if 0 + if (CheckNtfsFormat()) + { + PartEntry->FormatState = Preformatted; + } + else if (CheckHpfsFormat()) + { + PartEntry->FormatState = Preformatted; + } + else + { + PartEntry->FormatState = Unformatted; + } +#endif + PartEntry->FormatState = Preformatted; + } + else + { + PartEntry->FormatState = UnknownFormat; + } + + if (LogicalPartition) + InsertTailList(&DiskEntry->LogicalPartListHead, + &PartEntry->ListEntry); + else + InsertTailList(&DiskEntry->PrimaryPartListHead, + &PartEntry->ListEntry); +} + + +static +VOID +ScanForUnpartitionedDiskSpace( + PDISKENTRY DiskEntry) +{ + ULONGLONG LastStartSector; + ULONGLONG LastSectorCount; + ULONGLONG LastUnusedSectorCount; + PPARTENTRY PartEntry; + PPARTENTRY NewPartEntry; + PLIST_ENTRY Entry; + + DPRINT("ScanForUnpartitionedDiskSpace()\n"); + + if (IsListEmpty(&DiskEntry->PrimaryPartListHead)) + { + DPRINT1("No primary partition!\n"); + + /* Create a partition table that represents the empty disk */ + NewPartEntry = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(PARTENTRY)); + if (NewPartEntry == NULL) + return; + + NewPartEntry->DiskEntry = DiskEntry; + + NewPartEntry->IsPartitioned = FALSE; + NewPartEntry->StartSector.QuadPart = (ULONGLONG)DiskEntry->SectorAlignment; + NewPartEntry->SectorCount.QuadPart = AlignDown(DiskEntry->SectorCount.QuadPart, DiskEntry->SectorAlignment) - + NewPartEntry->StartSector.QuadPart; + + DPRINT1("First Sector: %I64u\n", NewPartEntry->StartSector.QuadPart); + DPRINT1("Last Sector: %I64u\n", NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart - 1); + DPRINT1("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart); + + NewPartEntry->FormatState = Unformatted; + + InsertTailList(&DiskEntry->PrimaryPartListHead, + &NewPartEntry->ListEntry); + + return; + } + + /* Start partition at head 1, cylinder 0 */ + LastStartSector = DiskEntry->SectorAlignment; + LastSectorCount = 0ULL; + LastUnusedSectorCount = 0ULL; + + Entry = DiskEntry->PrimaryPartListHead.Flink; + while (Entry != &DiskEntry->PrimaryPartListHead) + { + PartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry); + + if (PartEntry->PartitionType != PARTITION_ENTRY_UNUSED || + PartEntry->SectorCount.QuadPart != 0ULL) + { + LastUnusedSectorCount = + PartEntry->StartSector.QuadPart - (LastStartSector + LastSectorCount); + + if (PartEntry->StartSector.QuadPart > (LastStartSector + LastSectorCount) && + LastUnusedSectorCount >= (ULONGLONG)DiskEntry->SectorAlignment) + { + DPRINT("Unpartitioned disk space %I64u sectors\n", LastUnusedSectorCount); + + NewPartEntry = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(PARTENTRY)); + if (NewPartEntry == NULL) + return; + + NewPartEntry->DiskEntry = DiskEntry; + + NewPartEntry->IsPartitioned = FALSE; + NewPartEntry->StartSector.QuadPart = LastStartSector + LastSectorCount; + NewPartEntry->SectorCount.QuadPart = AlignDown(NewPartEntry->StartSector.QuadPart + LastUnusedSectorCount, DiskEntry->SectorAlignment) - + NewPartEntry->StartSector.QuadPart; + + DPRINT1("First Sector: %I64u\n", NewPartEntry->StartSector.QuadPart); + DPRINT1("Last Sector: %I64u\n", NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart - 1); + DPRINT1("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart); + + NewPartEntry->FormatState = Unformatted; + + /* Insert the table into the list */ + InsertTailList(&PartEntry->ListEntry, + &NewPartEntry->ListEntry); + } + + LastStartSector = PartEntry->StartSector.QuadPart; + LastSectorCount = PartEntry->SectorCount.QuadPart; + } + + Entry = Entry->Flink; + } + + /* Check for trailing unpartitioned disk space */ + if ((LastStartSector + LastSectorCount) < DiskEntry->SectorCount.QuadPart) + { + LastUnusedSectorCount = AlignDown(DiskEntry->SectorCount.QuadPart - (LastStartSector + LastSectorCount), DiskEntry->SectorAlignment); + + if (LastUnusedSectorCount >= (ULONGLONG)DiskEntry->CylinderAlignment) + { + DPRINT1("Unpartitioned disk space: %I64u sectors\n", LastUnusedSectorCount); + + NewPartEntry = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(PARTENTRY)); + if (NewPartEntry == NULL) + return; + + NewPartEntry->DiskEntry = DiskEntry; + + NewPartEntry->IsPartitioned = FALSE; + NewPartEntry->StartSector.QuadPart = LastStartSector + LastSectorCount; + NewPartEntry->SectorCount.QuadPart = AlignDown(NewPartEntry->StartSector.QuadPart + LastUnusedSectorCount, DiskEntry->SectorAlignment) - + NewPartEntry->StartSector.QuadPart; + + DPRINT1("First Sector: %I64u\n", NewPartEntry->StartSector.QuadPart); + DPRINT1("Last Sector: %I64u\n", NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart - 1); + DPRINT1("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart); + + NewPartEntry->FormatState = Unformatted; + + /* Append the table to the list */ + InsertTailList(&DiskEntry->PrimaryPartListHead, + &NewPartEntry->ListEntry); + } + } + + if (DiskEntry->ExtendedPartition != NULL) + { + if (IsListEmpty(&DiskEntry->LogicalPartListHead)) + { + DPRINT1("No logical partition!\n"); + + /* Create a partition table entry that represents the empty extended partition */ + NewPartEntry = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(PARTENTRY)); + if (NewPartEntry == NULL) + return; + + NewPartEntry->DiskEntry = DiskEntry; + NewPartEntry->LogicalPartition = TRUE; + + NewPartEntry->IsPartitioned = FALSE; + NewPartEntry->StartSector.QuadPart = DiskEntry->ExtendedPartition->StartSector.QuadPart + (ULONGLONG)DiskEntry->SectorAlignment; + NewPartEntry->SectorCount.QuadPart = DiskEntry->ExtendedPartition->SectorCount.QuadPart - (ULONGLONG)DiskEntry->SectorAlignment; + + DPRINT1("First Sector: %I64u\n", NewPartEntry->StartSector.QuadPart); + DPRINT1("Last Sector: %I64u\n", NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart - 1); + DPRINT1("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart); + + NewPartEntry->FormatState = Unformatted; + + InsertTailList(&DiskEntry->LogicalPartListHead, + &NewPartEntry->ListEntry); + + return; + } + + /* Start partition at head 1, cylinder 0 */ + LastStartSector = DiskEntry->ExtendedPartition->StartSector.QuadPart + (ULONGLONG)DiskEntry->SectorAlignment; + LastSectorCount = 0ULL; + LastUnusedSectorCount = 0ULL; + + Entry = DiskEntry->LogicalPartListHead.Flink; + while (Entry != &DiskEntry->LogicalPartListHead) + { + PartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry); + + if (PartEntry->PartitionType != PARTITION_ENTRY_UNUSED || + PartEntry->SectorCount.QuadPart != 0ULL) + { + LastUnusedSectorCount = + PartEntry->StartSector.QuadPart - (ULONGLONG)DiskEntry->SectorAlignment - (LastStartSector + LastSectorCount); + + if ((PartEntry->StartSector.QuadPart - (ULONGLONG)DiskEntry->SectorAlignment) > (LastStartSector + LastSectorCount) && + LastUnusedSectorCount >= (ULONGLONG)DiskEntry->SectorAlignment) + { + DPRINT("Unpartitioned disk space %I64u sectors\n", LastUnusedSectorCount); + + NewPartEntry = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(PARTENTRY)); + if (NewPartEntry == NULL) + return; + + NewPartEntry->DiskEntry = DiskEntry; + NewPartEntry->LogicalPartition = TRUE; + + NewPartEntry->IsPartitioned = FALSE; + NewPartEntry->StartSector.QuadPart = LastStartSector + LastSectorCount; + NewPartEntry->SectorCount.QuadPart = AlignDown(NewPartEntry->StartSector.QuadPart + LastUnusedSectorCount, DiskEntry->SectorAlignment) - + NewPartEntry->StartSector.QuadPart; + + DPRINT("First Sector: %I64u\n", NewPartEntry->StartSector.QuadPart); + DPRINT("Last Sector: %I64u\n", NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart - 1); + DPRINT("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart); + + NewPartEntry->FormatState = Unformatted; + + /* Insert the table into the list */ + InsertTailList(&PartEntry->ListEntry, + &NewPartEntry->ListEntry); + } + + LastStartSector = PartEntry->StartSector.QuadPart; + LastSectorCount = PartEntry->SectorCount.QuadPart; + } + + Entry = Entry->Flink; + } + + /* Check for trailing unpartitioned disk space */ + if ((LastStartSector + LastSectorCount) < DiskEntry->ExtendedPartition->StartSector.QuadPart + DiskEntry->ExtendedPartition->SectorCount.QuadPart) + { + LastUnusedSectorCount = AlignDown(DiskEntry->ExtendedPartition->StartSector.QuadPart + DiskEntry->ExtendedPartition->SectorCount.QuadPart - (LastStartSector + LastSectorCount), + DiskEntry->SectorAlignment); + + if (LastUnusedSectorCount >= (ULONGLONG)DiskEntry->SectorAlignment) + { + DPRINT("Unpartitioned disk space: %I64u sectors\n", LastUnusedSectorCount); + + NewPartEntry = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(PARTENTRY)); + if (NewPartEntry == NULL) + return; + + NewPartEntry->DiskEntry = DiskEntry; + NewPartEntry->LogicalPartition = TRUE; + + NewPartEntry->IsPartitioned = FALSE; + NewPartEntry->StartSector.QuadPart = LastStartSector + LastSectorCount; + NewPartEntry->SectorCount.QuadPart = AlignDown(NewPartEntry->StartSector.QuadPart + LastUnusedSectorCount, DiskEntry->SectorAlignment) - + NewPartEntry->StartSector.QuadPart; + + DPRINT("First Sector: %I64u\n", NewPartEntry->StartSector.QuadPart); + DPRINT("Last Sector: %I64u\n", NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart - 1); + DPRINT("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart); + + NewPartEntry->FormatState = Unformatted; + + /* Append the table to the list */ + InsertTailList(&DiskEntry->LogicalPartListHead, + &NewPartEntry->ListEntry); + } + } + } + + DPRINT("ScanForUnpartitionedDiskSpace() done\n"); +} + + +static +VOID +AddDiskToList( + HANDLE FileHandle, + ULONG DiskNumber) +{ + DISK_GEOMETRY DiskGeometry; + SCSI_ADDRESS ScsiAddress; + PDISKENTRY DiskEntry; + IO_STATUS_BLOCK Iosb; + NTSTATUS Status; + PPARTITION_SECTOR Mbr; + PULONG Buffer; + LARGE_INTEGER FileOffset; + WCHAR Identifier[20]; + ULONG Checksum; + ULONG Signature; + ULONG i; + PLIST_ENTRY ListEntry; + PBIOSDISKENTRY BiosDiskEntry; + ULONG LayoutBufferSize; + PDRIVE_LAYOUT_INFORMATION NewLayoutBuffer; + + Status = NtDeviceIoControlFile(FileHandle, + NULL, + NULL, + NULL, + &Iosb, + IOCTL_DISK_GET_DRIVE_GEOMETRY, + NULL, + 0, + &DiskGeometry, + sizeof(DISK_GEOMETRY)); + if (!NT_SUCCESS(Status)) + { + return; + } + + if (DiskGeometry.MediaType != FixedMedia && + DiskGeometry.MediaType != RemovableMedia) + { + return; + } + + Status = NtDeviceIoControlFile(FileHandle, + NULL, + NULL, + NULL, + &Iosb, + IOCTL_SCSI_GET_ADDRESS, + NULL, + 0, + &ScsiAddress, + sizeof(SCSI_ADDRESS)); + if (!NT_SUCCESS(Status)) + { + return; + } + + Mbr = (PARTITION_SECTOR*)RtlAllocateHeap(RtlGetProcessHeap(), + 0, + DiskGeometry.BytesPerSector); + if (Mbr == NULL) + { + return; + } + + FileOffset.QuadPart = 0; + Status = NtReadFile(FileHandle, + NULL, + NULL, + NULL, + &Iosb, + (PVOID)Mbr, + DiskGeometry.BytesPerSector, + &FileOffset, + NULL); + if (!NT_SUCCESS(Status)) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, Mbr); + DPRINT1("NtReadFile failed, status=%x\n", Status); + return; + } + Signature = Mbr->Signature; + + /* Calculate the MBR checksum */ + Checksum = 0; + Buffer = (PULONG)Mbr; + for (i = 0; i < 128; i++) + { + Checksum += Buffer[i]; + } + Checksum = ~Checksum + 1; + + swprintf(Identifier, L"%08x-%08x-A", Checksum, Signature); + DPRINT("Identifier: %S\n", Identifier); + + DiskEntry = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(DISKENTRY)); + if (DiskEntry == NULL) + { + return; + } + +// DiskEntry->Checksum = Checksum; +// DiskEntry->Signature = Signature; + DiskEntry->BiosFound = FALSE; + + /* Check if this disk has a valid MBR */ + if (Mbr->BootCode[0] == 0 && Mbr->BootCode[1] == 0) + DiskEntry->NoMbr = TRUE; + else + DiskEntry->NoMbr = FALSE; + + /* Free Mbr sector buffer */ + RtlFreeHeap(RtlGetProcessHeap(), 0, Mbr); + + ListEntry = BiosDiskListHead.Flink; + while (ListEntry != &BiosDiskListHead) + { + BiosDiskEntry = CONTAINING_RECORD(ListEntry, BIOSDISKENTRY, ListEntry); + /* FIXME: + * Compare the size from bios and the reported size from driver. + * If we have more than one disk with a zero or with the same signatur + * we must create new signatures and reboot. After the reboot, + * it is possible to identify the disks. + */ + if (BiosDiskEntry->Signature == Signature && + BiosDiskEntry->Checksum == Checksum && + !BiosDiskEntry->Recognized) + { + if (!DiskEntry->BiosFound) + { + DiskEntry->BiosDiskNumber = BiosDiskEntry->DiskNumber; + DiskEntry->BiosFound = TRUE; + BiosDiskEntry->Recognized = TRUE; + } + else + { + } + } + ListEntry = ListEntry->Flink; + } + + if (!DiskEntry->BiosFound) + { +#if 0 + RtlFreeHeap(ProcessHeap, 0, DiskEntry); + return; +#else + DPRINT1("WARNING: Setup could not find a matching BIOS disk entry. Disk %d is not be bootable by the BIOS!\n", DiskNumber); +#endif + } + + InitializeListHead(&DiskEntry->PrimaryPartListHead); + InitializeListHead(&DiskEntry->LogicalPartListHead); + + DiskEntry->Cylinders = DiskGeometry.Cylinders.QuadPart; + DiskEntry->TracksPerCylinder = DiskGeometry.TracksPerCylinder; + DiskEntry->SectorsPerTrack = DiskGeometry.SectorsPerTrack; + DiskEntry->BytesPerSector = DiskGeometry.BytesPerSector; + + DPRINT("Cylinders %I64u\n", DiskEntry->Cylinders); + DPRINT("TracksPerCylinder %I64u\n", DiskEntry->TracksPerCylinder); + DPRINT("SectorsPerTrack %I64u\n", DiskEntry->SectorsPerTrack); + DPRINT("BytesPerSector %I64u\n", DiskEntry->BytesPerSector); + + DiskEntry->SectorCount.QuadPart = DiskGeometry.Cylinders.QuadPart * + (ULONGLONG)DiskGeometry.TracksPerCylinder * + (ULONGLONG)DiskGeometry.SectorsPerTrack; + + DiskEntry->SectorAlignment = DiskGeometry.SectorsPerTrack; + DiskEntry->CylinderAlignment = DiskGeometry.SectorsPerTrack * DiskGeometry.TracksPerCylinder; + + DPRINT1("SectorCount: %I64u\n", DiskEntry->SectorCount); + DPRINT1("SectorAlignment: %lu\n", DiskEntry->SectorAlignment); + DPRINT1("CylinderAlignment: %lu\n", DiskEntry->CylinderAlignment); + + DiskEntry->DiskNumber = DiskNumber; + DiskEntry->Port = ScsiAddress.PortNumber; + DiskEntry->Bus = ScsiAddress.PathId; + DiskEntry->Id = ScsiAddress.TargetId; + + GetDriverName(DiskEntry); + + InsertAscendingList(&DiskListHead, DiskEntry, DISKENTRY, ListEntry, DiskNumber); + + /* Allocate a layout buffer with 4 partition entries first */ + LayoutBufferSize = sizeof(DRIVE_LAYOUT_INFORMATION) + + ((4 - ANYSIZE_ARRAY) * sizeof(PARTITION_INFORMATION)); + DiskEntry->LayoutBuffer = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + LayoutBufferSize); + if (DiskEntry->LayoutBuffer == NULL) + { + DPRINT1("Failed to allocate the disk layout buffer!\n"); + return; + } + + for (;;) + { + DPRINT1("Buffer size: %lu\n", LayoutBufferSize); + Status = NtDeviceIoControlFile(FileHandle, + NULL, + NULL, + NULL, + &Iosb, + IOCTL_DISK_GET_DRIVE_LAYOUT, + NULL, + 0, + DiskEntry->LayoutBuffer, + LayoutBufferSize); + if (NT_SUCCESS(Status)) + break; + + if (Status != STATUS_BUFFER_TOO_SMALL) + { + DPRINT1("NtDeviceIoControlFile() failed (Status: 0x%08lx)\n", Status); + return; + } + + LayoutBufferSize += 4 * sizeof(PARTITION_INFORMATION); + NewLayoutBuffer = RtlReAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + DiskEntry->LayoutBuffer, + LayoutBufferSize); + if (NewLayoutBuffer == NULL) + { + DPRINT1("Failed to reallocate the disk layout buffer!\n"); + return; + } + + DiskEntry->LayoutBuffer = NewLayoutBuffer; + } + + DPRINT1("PartitionCount: %lu\n", DiskEntry->LayoutBuffer->PartitionCount); + +#ifdef DUMP_PARTITION_TABLE + DumpPartitionTable(DiskEntry); +#endif + + if (DiskEntry->LayoutBuffer->PartitionEntry[0].StartingOffset.QuadPart != 0 && + DiskEntry->LayoutBuffer->PartitionEntry[0].PartitionLength.QuadPart != 0 && + DiskEntry->LayoutBuffer->PartitionEntry[0].PartitionType != 0) + { + if ((DiskEntry->LayoutBuffer->PartitionEntry[0].StartingOffset.QuadPart / DiskEntry->BytesPerSector) % DiskEntry->SectorsPerTrack == 0) + { + DPRINT("Use %lu Sector alignment!\n", DiskEntry->SectorsPerTrack); + } + else if (DiskEntry->LayoutBuffer->PartitionEntry[0].StartingOffset.QuadPart % (1024 * 1024) == 0) + { + DPRINT1("Use megabyte (%lu Sectors) alignment!\n", (1024 * 1024) / DiskEntry->BytesPerSector); + } + else + { + DPRINT1("No matching aligment found! Partiton 1 starts at %I64u\n", DiskEntry->LayoutBuffer->PartitionEntry[0].StartingOffset.QuadPart); + } + } + else + { + DPRINT1("No valid partiton table found! Use megabyte (%lu Sectors) alignment!\n", (1024 * 1024) / DiskEntry->BytesPerSector); + } + + + if (DiskEntry->LayoutBuffer->PartitionCount == 0) + { + DiskEntry->NewDisk = TRUE; + DiskEntry->LayoutBuffer->PartitionCount = 4; + + for (i = 0; i < 4; i++) + DiskEntry->LayoutBuffer->PartitionEntry[i].RewritePartition = TRUE; + } + else + { + for (i = 0; i < 4; i++) + { + AddPartitionToDisk(DiskNumber, + DiskEntry, + i, + FALSE); + } + + for (i = 4; i < DiskEntry->LayoutBuffer->PartitionCount; i += 4) + { + AddPartitionToDisk(DiskNumber, + DiskEntry, + i, + TRUE); + } + } + + ScanForUnpartitionedDiskSpace(DiskEntry); +} + + +NTSTATUS +CreatePartitionList(VOID) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + SYSTEM_DEVICE_INFORMATION Sdi; + IO_STATUS_BLOCK Iosb; + ULONG ReturnSize; + NTSTATUS Status; + ULONG DiskNumber; + WCHAR Buffer[MAX_PATH]; + UNICODE_STRING Name; + HANDLE FileHandle; + + CurrentDisk = NULL; + CurrentPartition = NULL; + +// BootDisk = NULL; +// BootPartition = NULL; + +// TempDisk = NULL; +// TempPartition = NULL; +// FormatState = Start; + + InitializeListHead(&DiskListHead); + InitializeListHead(&BiosDiskListHead); + + EnumerateBiosDiskEntries(); + + Status = NtQuerySystemInformation(SystemDeviceInformation, + &Sdi, + sizeof(SYSTEM_DEVICE_INFORMATION), + &ReturnSize); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + for (DiskNumber = 0; DiskNumber < Sdi.NumberOfDisks; DiskNumber++) + { + swprintf(Buffer, + L"\\Device\\Harddisk%d\\Partition0", + DiskNumber); + RtlInitUnicodeString(&Name, + Buffer); + + InitializeObjectAttributes(&ObjectAttributes, + &Name, + 0, + NULL, + NULL); + + Status = NtOpenFile(&FileHandle, + FILE_READ_DATA | FILE_READ_ATTRIBUTES | SYNCHRONIZE, + &ObjectAttributes, + &Iosb, + FILE_SHARE_READ, + FILE_SYNCHRONOUS_IO_NONALERT); + if (NT_SUCCESS(Status)) + { + AddDiskToList(FileHandle, + DiskNumber); + + NtClose(FileHandle); + } + } + +// UpdateDiskSignatures(List); + +// AssignDriveLetters(List); + + return STATUS_SUCCESS; +} + + +VOID +DestroyPartitionList(VOID) +{ + PDISKENTRY DiskEntry; + PBIOSDISKENTRY BiosDiskEntry; + PPARTENTRY PartEntry; + PLIST_ENTRY Entry; + + /* Release disk and partition info */ + while (!IsListEmpty(&DiskListHead)) + { + Entry = RemoveHeadList(&DiskListHead); + DiskEntry = CONTAINING_RECORD(Entry, DISKENTRY, ListEntry); + + /* Release driver name */ + RtlFreeUnicodeString(&DiskEntry->DriverName); + + /* Release primary partition list */ + while (!IsListEmpty(&DiskEntry->PrimaryPartListHead)) + { + Entry = RemoveHeadList(&DiskEntry->PrimaryPartListHead); + PartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry); + + RtlFreeHeap(RtlGetProcessHeap(), 0, PartEntry); + } + + /* Release logical partition list */ + while (!IsListEmpty(&DiskEntry->LogicalPartListHead)) + { + Entry = RemoveHeadList(&DiskEntry->LogicalPartListHead); + PartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry); + + RtlFreeHeap(RtlGetProcessHeap(), 0, PartEntry); + } + + /* Release layout buffer */ + if (DiskEntry->LayoutBuffer != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, DiskEntry->LayoutBuffer); + + + /* Release disk entry */ + RtlFreeHeap(RtlGetProcessHeap(), 0, DiskEntry); + } + + /* Release the bios disk info */ + while(!IsListEmpty(&BiosDiskListHead)) + { + Entry = RemoveHeadList(&BiosDiskListHead); + BiosDiskEntry = CONTAINING_RECORD(Entry, BIOSDISKENTRY, ListEntry); + + RtlFreeHeap(RtlGetProcessHeap(), 0, BiosDiskEntry); + } +} + +/* EOF */ Propchange: trunk/reactos/base/system/diskpart/partlist.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/system/diskpart/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/resou… ============================================================================== --- trunk/reactos/base/system/diskpart/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/resource.h [iso-8859-1] Mon Jul 20 19:17:06 2015 @@ -35,14 +35,21 @@ #define IDS_LIST_DISK_HEAD 3300 #define IDS_LIST_DISK_LINE 3301 #define IDS_LIST_DISK_FORMAT 3302 -#define IDS_LIST_VOLUME_HEAD 3303 +#define IDS_LIST_PARTITION_HEAD 3303 +#define IDS_LIST_PARTITION_LINE 3304 +#define IDS_LIST_PARTITION_FORMAT 3305 +#define IDS_LIST_PARTITION_NO_DISK 3306 +#define IDS_LIST_VOLUME_HEAD 3307 #define IDS_SELECT_NO_DISK 4400 #define IDS_SELECT_DISK 4401 -#define IDS_SELECT_NO_VOLUME 4402 -#define IDS_SELECT_VOLUME 4403 -#define IDS_SELECT_NO_PARTITION 4404 -#define IDS_SELECT_PARTITION 4405 +#define IDS_SELECT_DISK_INVALID 4402 +#define IDS_SELECT_NO_PARTITION 4403 +#define IDS_SELECT_PARTITION 4404 +#define IDS_SELECT_PARTITION_NO_DISK 4405 +#define IDS_SELECT_PARTITION_INVALID 4406 +#define IDS_SELECT_NO_VOLUME 4407 +#define IDS_SELECT_VOLUME 4408 #define IDS_STATUS_YES 31 #define IDS_STATUS_NO 32 @@ -135,4 +142,3 @@ #define IDS_HELP_CMD_UNIQUEID 140 #define IDS_ERROR_INVALID_ARGS 211 -#define IDS_ERROR_INVALID_DISK 212 Modified: trunk/reactos/base/system/diskpart/select.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/selec… ============================================================================== --- trunk/reactos/base/system/diskpart/select.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/select.c [iso-8859-1] Mon Jul 20 19:17:06 2015 @@ -11,10 +11,7 @@ #define NDEBUG #include <debug.h> - -ULONG CurrentDisk = (ULONG)-1; -ULONG CurrentPartition = (ULONG)-1; - +/* FUNCTIONS ******************************************************************/ static VOID @@ -22,10 +19,9 @@ INT argc, LPWSTR *argv) { - SYSTEM_DEVICE_INFORMATION Sdi; - ULONG ReturnSize; - NTSTATUS Status; - LONG value; + PLIST_ENTRY Entry; + PDISKENTRY DiskEntry; + LONG lValue; LPWSTR endptr = NULL; DPRINT("Select Disk()\n"); @@ -38,40 +34,40 @@ if (argc == 2) { - if (CurrentDisk == (ULONG)-1) + if (CurrentDisk == NULL) PrintResourceString(IDS_SELECT_NO_DISK); else - PrintResourceString(IDS_SELECT_DISK, CurrentDisk); + PrintResourceString(IDS_SELECT_DISK, CurrentDisk->DiskNumber); return; } - value = wcstol(argv[2], &endptr, 10); - if (((value == 0) && (endptr == argv[2])) || - (value < 0)) + lValue = wcstol(argv[2], &endptr, 10); + if (((lValue == 0) && (endptr == argv[2])) || + (lValue < 0)) { PrintResourceString(IDS_ERROR_INVALID_ARGS); return; } - Status = NtQuerySystemInformation(SystemDeviceInformation, - &Sdi, - sizeof(SYSTEM_DEVICE_INFORMATION), - &ReturnSize); - if (!NT_SUCCESS(Status)) + CurrentDisk = NULL; + + Entry = DiskListHead.Flink; + while (Entry != &DiskListHead) { - return; + DiskEntry = CONTAINING_RECORD(Entry, DISKENTRY, ListEntry); + + if (DiskEntry->DiskNumber == (ULONG)lValue) + { + CurrentDisk = DiskEntry; + CurrentPartition = NULL; + PrintResourceString(IDS_SELECT_DISK, CurrentDisk->DiskNumber); + return; + } + + Entry = Entry->Flink; } - if ((ULONG)value >= Sdi.NumberOfDisks) - { - PrintResourceString(IDS_ERROR_INVALID_DISK); - return; - } - - CurrentDisk = (ULONG)value; - CurrentPartition = (ULONG)-1; - - PrintResourceString(IDS_SELECT_DISK, CurrentDisk); + PrintResourceString(IDS_SELECT_DISK_INVALID); } @@ -81,8 +77,11 @@ INT argc, LPWSTR *argv) { - LONG value; + PLIST_ENTRY Entry; + PPARTENTRY PartEntry; + LONG lValue; LPWSTR endptr = NULL; + ULONG PartNumber = 1; DPRINT("Select Partition()\n"); @@ -92,28 +91,69 @@ return; } + if (CurrentDisk == NULL) + { + PrintResourceString(IDS_SELECT_PARTITION_NO_DISK); + return; + } + if (argc == 2) { - if (CurrentPartition == (ULONG)-1) + if (CurrentPartition == NULL) PrintResourceString(IDS_SELECT_NO_PARTITION); else PrintResourceString(IDS_SELECT_PARTITION, CurrentPartition); return; } - value = wcstol(argv[2], &endptr, 10); - if (((value == 0) && (endptr == argv[2])) || - (value < 0)) + lValue = wcstol(argv[2], &endptr, 10); + if (((lValue == 0) && (endptr == argv[2])) || + (lValue < 0)) { PrintResourceString(IDS_ERROR_INVALID_ARGS); return; } - /* FIXME: Check the new partition number */ + Entry = CurrentDisk->PrimaryPartListHead.Flink; + while (Entry != &CurrentDisk->PrimaryPartListHead) + { + PartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry); - CurrentPartition = (ULONG)value; + if (PartEntry->PartitionType != 0) + { + if (PartNumber == (ULONG)lValue) + { + CurrentPartition = PartEntry; + PrintResourceString(IDS_SELECT_PARTITION, PartNumber); + return; + } - PrintResourceString(IDS_SELECT_PARTITION, CurrentPartition); + PartNumber++; + } + + Entry = Entry->Flink; + } + + Entry = CurrentDisk->LogicalPartListHead.Flink; + while (Entry != &CurrentDisk->LogicalPartListHead) + { + PartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry); + + if (PartEntry->PartitionType != 0) + { + if (PartNumber == (ULONG)lValue) + { + CurrentPartition = PartEntry; + PrintResourceString(IDS_SELECT_PARTITION, PartNumber); + return; + } + + PartNumber++; + } + Entry = Entry->Flink; + } + + PrintResourceString(IDS_SELECT_PARTITION_INVALID); }

9 years, 5 months

[cfinck] 68472: [SPOOLSS] Rewrite RevertToPrinterSelf and ImpersonatePrinterClient. In contrast to what I first thought, they shall also work when the thread has no impersonation token. This occurs...

by cfinck＠svn.reactos.org

Author: cfinck Date: Mon Jul 20 16:15:52 2015 New Revision: 68472 URL: http://svn.reactos.org/svn/reactos?rev=68472&view=rev Log: [SPOOLSS] Rewrite RevertToPrinterSelf and ImpersonatePrinterClient. In contrast to what I first thought, they shall also work when the thread has no impersonation token. This occurs for example when spooler functions are called from a thread that doesn't originate from a RPC request. The rewritten functions also provide proper error codes. The native behaviour of these functions was verified through API Monitoring under Windows. Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/context.c Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/context.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/context.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/context.c [iso-8859-1] Mon Jul 20 16:15:52 2015 @@ -13,21 +13,43 @@ BOOL WINAPI ImpersonatePrinterClient(HANDLE hToken) { + DWORD cbReturned; + DWORD dwErrorCode; + TOKEN_TYPE Type; + + // Sanity check if (!hToken) { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; + dwErrorCode = ERROR_INVALID_HANDLE; + goto Cleanup; } - if (!SetThreadToken(NULL, hToken)) + // Get the type of the supplied token. + if (!GetTokenInformation(hToken, TokenType, &Type, sizeof(TOKEN_TYPE), &cbReturned)) { - ERR("SetThreadToken failed with error %lu!\n", GetLastError()); - CloseHandle(hToken); - return FALSE; + dwErrorCode = GetLastError(); + ERR("GetTokenInformation failed with error %lu!\n", dwErrorCode); + goto Cleanup; } - CloseHandle(hToken); - return TRUE; + // Check if this is an impersonation token and only set it as the thread token in this case. + // This is not always an impersonation token, see RevertToPrinterSelf. + if (Type == TokenImpersonation) + { + if (!SetThreadToken(NULL, hToken)) + { + dwErrorCode = GetLastError(); + ERR("SetThreadToken failed with error %lu!\n", dwErrorCode); + goto Cleanup; + } + } + +Cleanup: + if (hToken) + CloseHandle(hToken); + + SetLastError(dwErrorCode); + return (dwErrorCode == ERROR_SUCCESS); } /** @@ -41,22 +63,42 @@ HANDLE WINAPI RevertToPrinterSelf() { - HANDLE hToken; + DWORD dwErrorCode; + HANDLE hReturnValue = NULL; + HANDLE hToken = NULL; - // Retrieve our current impersonation token - if (!OpenThreadToken(GetCurrentThread(), TOKEN_IMPERSONATE, TRUE, &hToken)) + // All spoolss code is usually called after impersonating the client. In this case, we can retrieve our current thread impersonation token using OpenThreadToken. + // But in rare occasions, spoolss code is also called from a higher-privileged thread that doesn't impersonate the client. Then we don't get an impersonation token. + // Anyway, we can't just return nothing in this case, because this is being treated as failure by the caller. So we return the token of the current process. + // This behaviour is verified with Windows! + if (OpenThreadToken(GetCurrentThread(), TOKEN_IMPERSONATE, TRUE, &hToken)) { - ERR("OpenThreadToken failed with error %lu!\n", GetLastError()); - return NULL; + // Tell the thread to stop impersonating. + if (!SetThreadToken(NULL, NULL)) + { + dwErrorCode = GetLastError(); + ERR("SetThreadToken failed with error %lu!\n", dwErrorCode); + goto Cleanup; + } + } + else if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken)) + { + dwErrorCode = GetLastError(); + ERR("OpenProcessToken failed with error %lu!\n", dwErrorCode); + goto Cleanup; } - // Tell the thread to stop impersonating - if (!SetThreadToken(NULL, NULL)) - { - ERR("SetThreadToken failed with error %lu!\n", GetLastError()); - return NULL; - } + // We were successful, return a token! + dwErrorCode = ERROR_SUCCESS; + hReturnValue = hToken; - // Return the token required for reverting back to impersonation in ImpersonatePrinterClient - return hToken; + // Don't let the cleanup routine close this. + hToken = NULL; + +Cleanup: + if (hToken) + CloseHandle(hToken); + + SetLastError(dwErrorCode); + return hReturnValue; }

9 years, 5 months

[cfinck] 68471: It's bugfixing time! [LOCALSPL] - A Print Job has more optional fields than I thought. Only do a wcslen on them if they are not NULL. - Make the code for checking changed fields mor...

by cfinck＠svn.reactos.org

Author: cfinck Date: Mon Jul 20 15:21:03 2015 New Revision: 68471 URL: http://svn.reactos.org/svn/reactos?rev=68471&view=rev Log: It's bugfixing time! [LOCALSPL] - A Print Job has more optional fields than I thought. Only do a wcslen on them if they are not NULL. - Make the code for checking changed fields more robust. Add checks for NULL to the Find and Compare functions. - Fix some wrong parameters given to CopyMemory. - Set the pPort field of a LOCAL_PRINTER structure. [WINSPOOL] Only pass the datatype from the DOC_INFO_1W structure of StartDocPrinterW to SetJobW if it's not NULL. For StartDocPrinterW, this means that the datatype shall not be changed while SetJobW would return ERROR_INVALID_DATATYPE if none was passed. Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printers.c branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/monitors.c branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/ports.c branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/precomp.h branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printers.c branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printprocessors.c Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printers.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printers.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printers.c [iso-8859-1] Mon Jul 20 15:21:03 2015 @@ -89,7 +89,9 @@ } // Add our document information. - pJobInfo1->pDatatype = pDocInfo1->pDatatype; + if (pDocInfo1->pDatatype) + pJobInfo1->pDatatype = pDocInfo1->pDatatype; + pJobInfo1->pDocument = pDocInfo1->pDocName; // Set the new job information. Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c [iso-8859-1] Mon Jul 20 15:21:03 2015 @@ -13,6 +13,36 @@ // Local Variables static DWORD _dwLastJobID; + +/** + * @name _EqualStrings + * + * Returns whether two strings are equal. + * Unlike wcscmp, this function also works with NULL strings. + * + * @param pwszA + * First string to compare. + * + * @param pwszB + * Second string to compare. + * + * @return + * TRUE if the strings are equal, FALSE if they differ. + */ +static __inline BOOL +_EqualStrings(PCWSTR pwszA, PCWSTR pwszB) +{ + if (!pwszA && !pwszB) + return TRUE; + + if (pwszA && !pwszB) + return FALSE; + + if (!pwszA && pwszB) + return FALSE; + + return (wcscmp(pwszA, pwszB) == 0); +} static BOOL _GetNextJobID(PDWORD dwJobID) @@ -112,8 +142,8 @@ if (pwszOutput) { - CopyMemory(pwszOutput, wszSpoolDirectory, cchSpoolDirectory); - CopyMemory(&pwszOutput[cchSpoolDirectory], wszPrintersPath, cchPrintersPath); + CopyMemory(pwszOutput, wszSpoolDirectory, cchSpoolDirectory * sizeof(WCHAR)); + CopyMemory(&pwszOutput[cchSpoolDirectory], wszPrintersPath, cchPrintersPath * sizeof(WCHAR)); swprintf(&pwszOutput[cchSpoolDirectory + cchPrintersPath], L"%05lu.", dwJobID); CopyMemory(&pwszOutput[cchSpoolDirectory + cchPrintersPath + cchSpoolerFile], pwszExtension, (cchExtension + 1) * sizeof(WCHAR)); } @@ -291,7 +321,7 @@ cchMachineName = wcslen(pwszMachineName); pJob->pwszMachineName = DllAllocSplMem((cchMachineName + cchDoubleBackslash + 1) * sizeof(WCHAR)); CopyMemory(pJob->pwszMachineName, wszDoubleBackslash, cchDoubleBackslash * sizeof(WCHAR)); - CopyMemory(pJob->pwszMachineName + cchDoubleBackslash, pwszMachineName, (cchMachineName + 1) * sizeof(WCHAR)); + CopyMemory(&pJob->pwszMachineName[cchDoubleBackslash], pwszMachineName, (cchMachineName + 1) * sizeof(WCHAR)); // Add the job to the Global Job List. if (!InsertElementSkiplist(&GlobalJobList, pJob)) @@ -406,17 +436,23 @@ _LocalGetJobLevel1(PLOCAL_PRINTER_HANDLE pPrinterHandle, PLOCAL_JOB pJob, PBYTE* ppStart, PBYTE* ppEnd, DWORD cbBuf, PDWORD pcbNeeded) { DWORD cbDatatype = (wcslen(pJob->pwszDatatype) + 1) * sizeof(WCHAR); - DWORD cbDocumentName = (wcslen(pJob->pwszDocumentName) + 1) * sizeof(WCHAR); + DWORD cbDocumentName = 0; DWORD cbMachineName = (wcslen(pJob->pwszMachineName) + 1) * sizeof(WCHAR); DWORD cbPrinterName = (wcslen(pJob->pPrinter->pwszPrinterName) + 1) * sizeof(WCHAR); DWORD cbStatus = 0; - DWORD cbUserName = (wcslen(pJob->pwszUserName) + 1) * sizeof(WCHAR); + DWORD cbUserName = 0; DWORD dwErrorCode; JOB_INFO_1W JobInfo1 = { 0 }; - // A Status Message is optional. + // Calculate the lengths of the optional values. + if (pJob->pwszDocumentName) + cbDocumentName = (wcslen(pJob->pwszDocumentName) + 1) * sizeof(WCHAR); + if (pJob->pwszStatus) cbStatus = (wcslen(pJob->pwszStatus) + 1) * sizeof(WCHAR); + + if (pJob->pwszUserName) + cbUserName = (wcslen(pJob->pwszUserName) + 1) * sizeof(WCHAR); // Check if the supplied buffer is large enough. *pcbNeeded += sizeof(JOB_INFO_1W) + cbDatatype + cbDocumentName + cbMachineName + cbPrinterName + cbStatus + cbUserName; @@ -431,10 +467,6 @@ JobInfo1.pDatatype = (PWSTR)*ppEnd; CopyMemory(*ppEnd, pJob->pwszDatatype, cbDatatype); - *ppEnd -= cbDocumentName; - JobInfo1.pDocument = (PWSTR)*ppEnd; - CopyMemory(*ppEnd, pJob->pwszDocumentName, cbDocumentName); - *ppEnd -= cbMachineName; JobInfo1.pMachineName = (PWSTR)*ppEnd; CopyMemory(*ppEnd, pJob->pwszMachineName, cbMachineName); @@ -443,6 +475,14 @@ JobInfo1.pPrinterName = (PWSTR)*ppEnd; CopyMemory(*ppEnd, pJob->pPrinter->pwszPrinterName, cbPrinterName); + // Copy the optional values. + if (cbDocumentName) + { + *ppEnd -= cbDocumentName; + JobInfo1.pDocument = (PWSTR)*ppEnd; + CopyMemory(*ppEnd, pJob->pwszDocumentName, cbDocumentName); + } + if (cbStatus) { *ppEnd -= cbStatus; @@ -450,9 +490,12 @@ CopyMemory(*ppEnd, pJob->pwszStatus, cbStatus); } - *ppEnd -= cbUserName; - JobInfo1.pUserName = (PWSTR)*ppEnd; - CopyMemory(*ppEnd, pJob->pwszUserName, cbUserName); + if (cbUserName) + { + *ppEnd -= cbUserName; + JobInfo1.pUserName = (PWSTR)*ppEnd; + CopyMemory(*ppEnd, pJob->pwszUserName, cbUserName); + } // Fill the rest of the structure. JobInfo1.JobId = pJob->dwJobID; @@ -475,15 +518,15 @@ { DWORD cbDatatype = (wcslen(pJob->pwszDatatype) + 1) * sizeof(WCHAR); DWORD cbDevMode = pJob->pDevMode->dmSize + pJob->pDevMode->dmDriverExtra; - DWORD cbDocumentName = (wcslen(pJob->pwszDocumentName) + 1) * sizeof(WCHAR); + DWORD cbDocumentName = 0; DWORD cbDriverName = (wcslen(pJob->pPrinter->pwszPrinterDriver) + 1) * sizeof(WCHAR); DWORD cbMachineName = (wcslen(pJob->pwszMachineName) + 1) * sizeof(WCHAR); - DWORD cbNotifyName = (wcslen(pJob->pwszNotifyName) + 1) * sizeof(WCHAR); + DWORD cbNotifyName = 0; DWORD cbPrinterName = (wcslen(pJob->pPrinter->pwszPrinterName) + 1) * sizeof(WCHAR); DWORD cbPrintProcessor = (wcslen(pJob->pPrintProcessor->pwszName) + 1) * sizeof(WCHAR); DWORD cbPrintProcessorParameters = 0; DWORD cbStatus = 0; - DWORD cbUserName = (wcslen(pJob->pwszUserName) + 1) * sizeof(WCHAR); + DWORD cbUserName = 0; DWORD dwErrorCode; FILETIME ftNow; FILETIME ftSubmitted; @@ -491,12 +534,21 @@ ULARGE_INTEGER uliNow; ULARGE_INTEGER uliSubmitted; - // Print Processor Parameters and Status Message are optional. + // Calculate the lengths of the optional values. + if (pJob->pwszDocumentName) + cbDocumentName = (wcslen(pJob->pwszDocumentName) + 1) * sizeof(WCHAR); + + if (pJob->pwszNotifyName) + cbNotifyName = (wcslen(pJob->pwszNotifyName) + 1) * sizeof(WCHAR); + if (pJob->pwszPrintProcessorParameters) cbPrintProcessorParameters = (wcslen(pJob->pwszPrintProcessorParameters) + 1) * sizeof(WCHAR); if (pJob->pwszStatus) cbStatus = (wcslen(pJob->pwszStatus) + 1) * sizeof(WCHAR); + + if (pJob->pwszUserName) + cbUserName = (wcslen(pJob->pwszUserName) + 1) * sizeof(WCHAR); // Check if the supplied buffer is large enough. *pcbNeeded += sizeof(JOB_INFO_2W) + cbDatatype + cbDevMode + cbDocumentName + cbDriverName + cbMachineName + cbNotifyName + cbPrinterName + cbPrintProcessor + cbPrintProcessorParameters + cbStatus + cbUserName; @@ -515,10 +567,6 @@ JobInfo2.pDevMode = (PDEVMODEW)*ppEnd; CopyMemory(*ppEnd, pJob->pDevMode, cbDevMode); - *ppEnd -= cbDocumentName; - JobInfo2.pDocument = (PWSTR)*ppEnd; - CopyMemory(*ppEnd, pJob->pwszDocumentName, cbDocumentName); - *ppEnd -= cbDriverName; JobInfo2.pDriverName = (PWSTR)*ppEnd; CopyMemory(*ppEnd, pJob->pPrinter->pwszPrinterDriver, cbDriverName); @@ -527,10 +575,6 @@ JobInfo2.pMachineName = (PWSTR)*ppEnd; CopyMemory(*ppEnd, pJob->pwszMachineName, cbMachineName); - *ppEnd -= cbNotifyName; - JobInfo2.pNotifyName = (PWSTR)*ppEnd; - CopyMemory(*ppEnd, pJob->pwszNotifyName, cbNotifyName); - *ppEnd -= cbPrinterName; JobInfo2.pPrinterName = (PWSTR)*ppEnd; CopyMemory(*ppEnd, pJob->pPrinter->pwszPrinterName, cbPrinterName); @@ -539,6 +583,21 @@ JobInfo2.pPrintProcessor = (PWSTR)*ppEnd; CopyMemory(*ppEnd, pJob->pPrintProcessor->pwszName, cbPrintProcessor); + // Copy the optional values. + if (cbDocumentName) + { + *ppEnd -= cbDocumentName; + JobInfo2.pDocument = (PWSTR)*ppEnd; + CopyMemory(*ppEnd, pJob->pwszDocumentName, cbDocumentName); + } + + if (cbNotifyName) + { + *ppEnd -= cbNotifyName; + JobInfo2.pNotifyName = (PWSTR)*ppEnd; + CopyMemory(*ppEnd, pJob->pwszNotifyName, cbNotifyName); + } + if (cbPrintProcessorParameters) { *ppEnd -= cbPrintProcessorParameters; @@ -553,9 +612,12 @@ CopyMemory(*ppEnd, pJob->pwszStatus, cbStatus); } - *ppEnd -= cbUserName; - JobInfo2.pUserName = (PWSTR)*ppEnd; - CopyMemory(*ppEnd, pJob->pwszUserName, cbUserName); + if (cbUserName) + { + *ppEnd -= cbUserName; + JobInfo2.pUserName = (PWSTR)*ppEnd; + CopyMemory(*ppEnd, pJob->pwszUserName, cbUserName); + } // Time in JOB_INFO_2W is the number of milliseconds elapsed since the job was submitted. Calculate this time. if (!SystemTimeToFileTime(&pJob->stSubmitted, &ftSubmitted)) @@ -658,7 +720,7 @@ } // Check if the datatype has changed. - if (wcscmp(pJob->pwszDatatype, pJobInfo->pDatatype) != 0) + if (!_EqualStrings(pJob->pwszDatatype, pJobInfo->pDatatype)) { // Use the new value. if (!ReallocSplStr(&pJob->pwszDatatype, pJobInfo->pDatatype)) @@ -669,8 +731,8 @@ } } - // Check if the document name has changed. - if (wcscmp(pJob->pwszDocumentName, pJobInfo->pDocument) != 0) + // Check if the document name has changed. An empty string is permitted here! + if (!_EqualStrings(pJob->pwszDocumentName, pJobInfo->pDocument)) { // Use the new value. if (!ReallocSplStr(&pJob->pwszDocumentName, pJobInfo->pDocument)) @@ -681,8 +743,8 @@ } } - // Check if the status message has changed. - if ((!pJob->pwszStatus && pJobInfo->pStatus) || wcscmp(pJob->pwszStatus, pJobInfo->pStatus) != 0) + // Check if the status message has changed. An empty string is permitted here! + if (!_EqualStrings(pJob->pwszStatus, pJobInfo->pStatus)) { // Use the new value. if (!ReallocSplStr(&pJob->pwszStatus, pJobInfo->pStatus)) @@ -693,8 +755,8 @@ } } - // Check if the user name has changed. - if (wcscmp(pJob->pwszUserName, pJobInfo->pUserName) != 0) + // Check if the user name has changed. An empty string is permitted here! + if (!_EqualStrings(pJob->pwszUserName, pJobInfo->pUserName) != 0) { // The new user name doesn't need to exist, so no additional verification is required. @@ -763,7 +825,7 @@ } // Check if the datatype has changed. - if (wcscmp(pJob->pwszDatatype, pJobInfo->pDatatype) != 0) + if (!_EqualStrings(pJob->pwszDatatype, pJobInfo->pDatatype)) { // Use the new value. if (!ReallocSplStr(&pJob->pwszDatatype, pJobInfo->pDatatype)) @@ -774,8 +836,8 @@ } } - // Check if the document name has changed. - if (wcscmp(pJob->pwszDocumentName, pJobInfo->pDocument) != 0) + // Check if the document name has changed. An empty string is permitted here! + if (!_EqualStrings(pJob->pwszDocumentName, pJobInfo->pDocument)) { // Use the new value. if (!ReallocSplStr(&pJob->pwszDocumentName, pJobInfo->pDocument)) @@ -786,8 +848,8 @@ } } - // Check if the notify name has changed. - if (wcscmp(pJob->pwszNotifyName, pJobInfo->pNotifyName) != 0) + // Check if the notify name has changed. An empty string is permitted here! + if (!_EqualStrings(pJob->pwszNotifyName, pJobInfo->pNotifyName)) { // The new notify name doesn't need to exist, so no additional verification is required. @@ -800,8 +862,8 @@ } } - // Check if the (optional) Print Processor Parameters have changed. - if ((!pJob->pwszPrintProcessorParameters && pJobInfo->pParameters) || wcscmp(pJob->pwszPrintProcessorParameters, pJobInfo->pParameters) != 0) + // Check if the Print Processor Parameters have changed. An empty string is permitted here! + if (!_EqualStrings(pJob->pwszPrintProcessorParameters, pJobInfo->pParameters)) { // Use the new value. if (!ReallocSplStr(&pJob->pwszPrintProcessorParameters, pJobInfo->pParameters)) @@ -812,8 +874,8 @@ } } - // Check if the (optional) Status Message has changed. - if ((!pJob->pwszStatus && pJobInfo->pStatus) || wcscmp(pJob->pwszStatus, pJobInfo->pStatus) != 0) + // Check if the Status Message has changed. An empty string is permitted here! + if (!_EqualStrings(pJob->pwszStatus, pJobInfo->pStatus)) { // Use the new value. if (!ReallocSplStr(&pJob->pwszStatus, pJobInfo->pStatus)) @@ -824,8 +886,8 @@ } } - // Check if the user name has changed. - if (wcscmp(pJob->pwszUserName, pJobInfo->pUserName) != 0) + // Check if the user name has changed. An empty string is permitted here! + if (!_EqualStrings(pJob->pwszUserName, pJobInfo->pUserName)) { // The new user name doesn't need to exist, so no additional verification is required. @@ -1201,15 +1263,21 @@ pJob->pPrintProcessor = pPrintProcessor; pJob->pDevMode = DuplicateDevMode((PDEVMODEW)((ULONG_PTR)pShadowFile + pShadowFile->offDevMode)); pJob->pwszDatatype = AllocSplStr((PCWSTR)((ULONG_PTR)pShadowFile + pShadowFile->offDatatype)); - pJob->pwszDocumentName = AllocSplStr((PCWSTR)((ULONG_PTR)pShadowFile + pShadowFile->offDocumentName)); pJob->pwszMachineName = AllocSplStr((PCWSTR)((ULONG_PTR)pShadowFile + pShadowFile->offMachineName)); - pJob->pwszNotifyName = AllocSplStr((PCWSTR)((ULONG_PTR)pShadowFile + pShadowFile->offNotifyName)); + CopyMemory(&pJob->stSubmitted, &pShadowFile->stSubmitted, sizeof(SYSTEMTIME)); + + // Copy the optional values. + if (pShadowFile->offDocumentName) + pJob->pwszDocumentName = AllocSplStr((PCWSTR)((ULONG_PTR)pShadowFile + pShadowFile->offDocumentName)); + + if (pShadowFile->offNotifyName) + pJob->pwszNotifyName = AllocSplStr((PCWSTR)((ULONG_PTR)pShadowFile + pShadowFile->offNotifyName)); if (pShadowFile->offPrintProcessorParameters) pJob->pwszPrintProcessorParameters = AllocSplStr((PCWSTR)((ULONG_PTR)pShadowFile + pShadowFile->offPrintProcessorParameters)); - pJob->pwszUserName = AllocSplStr((PCWSTR)((ULONG_PTR)pShadowFile + pShadowFile->offUserName)); - CopyMemory(&pJob->stSubmitted, &pShadowFile->stSubmitted, sizeof(SYSTEMTIME)); + if (pShadowFile->offUserName) + pJob->pwszUserName = AllocSplStr((PCWSTR)((ULONG_PTR)pShadowFile + pShadowFile->offUserName)); // Jobs read from shadow files were always added using AddJob. pJob->bAddedJob = TRUE; @@ -1230,17 +1298,17 @@ WriteJobShadowFile(PWSTR pwszFilePath, const PLOCAL_JOB pJob) { BOOL bReturnValue = FALSE; - DWORD cbDatatype; - DWORD cbDevMode; - DWORD cbDocumentName; + DWORD cbDatatype = (wcslen(pJob->pwszDatatype) + 1) * sizeof(WCHAR); + DWORD cbDevMode = pJob->pDevMode->dmSize + pJob->pDevMode->dmDriverExtra; + DWORD cbDocumentName = 0; DWORD cbFileSize; - DWORD cbMachineName; - DWORD cbNotifyName; - DWORD cbPrinterDriver; - DWORD cbPrinterName; - DWORD cbPrintProcessor; + DWORD cbMachineName = (wcslen(pJob->pwszMachineName) + 1) * sizeof(WCHAR); + DWORD cbNotifyName = 0; + DWORD cbPrinterDriver = (wcslen(pJob->pPrinter->pwszPrinterDriver) + 1) * sizeof(WCHAR); + DWORD cbPrinterName = (wcslen(pJob->pPrinter->pwszPrinterName) + 1) * sizeof(WCHAR); + DWORD cbPrintProcessor = (wcslen(pJob->pPrintProcessor->pwszName) + 1) * sizeof(WCHAR); DWORD cbPrintProcessorParameters = 0; - DWORD cbUserName; + DWORD cbUserName = 0; DWORD cbWritten; DWORD dwCurrentOffset; HANDLE hSHDFile = INVALID_HANDLE_VALUE; @@ -1255,20 +1323,18 @@ goto Cleanup; } - // Compute the total size of the shadow file. - cbDatatype = (wcslen(pJob->pwszDatatype) + 1) * sizeof(WCHAR); - cbDevMode = pJob->pDevMode->dmSize + pJob->pDevMode->dmDriverExtra; - cbDocumentName = (wcslen(pJob->pwszDocumentName) + 1) * sizeof(WCHAR); - cbMachineName = (wcslen(pJob->pwszMachineName) + 1) * sizeof(WCHAR); - cbNotifyName = (wcslen(pJob->pwszNotifyName) + 1) * sizeof(WCHAR); - cbPrinterDriver = (wcslen(pJob->pPrinter->pwszPrinterDriver) + 1) * sizeof(WCHAR); - cbPrinterName = (wcslen(pJob->pPrinter->pwszPrinterName) + 1) * sizeof(WCHAR); - cbPrintProcessor = (wcslen(pJob->pPrintProcessor->pwszName) + 1) * sizeof(WCHAR); - cbUserName = (wcslen(pJob->pwszUserName) + 1) * sizeof(WCHAR); - - // Print Processor Parameters are optional. + // Calculate the lengths of the optional values and the total size of the shadow file. + if (pJob->pwszDocumentName) + cbDocumentName = (wcslen(pJob->pwszDocumentName) + 1) * sizeof(WCHAR); + + if (pJob->pwszNotifyName) + cbNotifyName = (wcslen(pJob->pwszNotifyName) + 1) * sizeof(WCHAR); + if (pJob->pwszPrintProcessorParameters) cbPrintProcessorParameters = (wcslen(pJob->pwszPrintProcessorParameters) + 1) * sizeof(WCHAR); + + if (pJob->pwszUserName) + cbUserName = (wcslen(pJob->pwszUserName) + 1) * sizeof(WCHAR); cbFileSize = sizeof(SHD_HEADER) + cbDatatype + cbDocumentName + cbDevMode + cbMachineName + cbNotifyName + cbPrinterDriver + cbPrinterName + cbPrintProcessor + cbPrintProcessorParameters + cbUserName; @@ -1306,10 +1372,6 @@ pShadowFile->offDatatype = dwCurrentOffset; dwCurrentOffset += cbDatatype; - CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, pJob->pwszDocumentName, cbDocumentName); - pShadowFile->offDocumentName = dwCurrentOffset; - dwCurrentOffset += cbDocumentName; - CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, pJob->pDevMode, cbDevMode); pShadowFile->offDevMode = dwCurrentOffset; dwCurrentOffset += cbDevMode; @@ -1323,10 +1385,6 @@ pShadowFile->offMachineName = dwCurrentOffset; dwCurrentOffset += cbMachineName; - CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, pJob->pwszNotifyName, cbNotifyName); - pShadowFile->offNotifyName = dwCurrentOffset; - dwCurrentOffset += cbNotifyName; - CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, pJob->pPrinter->pwszPrinterName, cbPrinterName); pShadowFile->offPrinterName = dwCurrentOffset; dwCurrentOffset += cbPrinterName; @@ -1335,6 +1393,21 @@ pShadowFile->offPrintProcessor = dwCurrentOffset; dwCurrentOffset += cbPrintProcessor; + // Copy the optional values. + if (cbDocumentName) + { + CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, pJob->pwszDocumentName, cbDocumentName); + pShadowFile->offDocumentName = dwCurrentOffset; + dwCurrentOffset += cbDocumentName; + } + + if (cbNotifyName) + { + CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, pJob->pwszNotifyName, cbNotifyName); + pShadowFile->offNotifyName = dwCurrentOffset; + dwCurrentOffset += cbNotifyName; + } + if (cbPrintProcessorParameters) { CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, pJob->pwszPrintProcessorParameters, cbPrintProcessorParameters); @@ -1342,9 +1415,12 @@ dwCurrentOffset += cbPrintProcessorParameters; } - CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, pJob->pwszUserName, cbUserName); - pShadowFile->offUserName = dwCurrentOffset; - dwCurrentOffset += cbUserName; + if (cbUserName) + { + CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, pJob->pwszUserName, cbUserName); + pShadowFile->offUserName = dwCurrentOffset; + dwCurrentOffset += cbUserName; + } // Write the file. if (!WriteFile(hSHDFile, pShadowFile, cbFileSize, &cbWritten, NULL)) Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/monitors.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/monitors.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/monitors.c [iso-8859-1] Mon Jul 20 15:21:03 2015 @@ -16,6 +16,9 @@ { PLIST_ENTRY pEntry; PLOCAL_PRINT_MONITOR pPrintMonitor; + + if (!pwszName) + return NULL; for (pEntry = PrintMonitorList.Flink; pEntry != &PrintMonitorList; pEntry = pEntry->Flink) { Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/ports.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/ports.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/ports.c [iso-8859-1] Mon Jul 20 15:21:03 2015 @@ -16,6 +16,9 @@ { PLIST_ENTRY pEntry; PLOCAL_PORT pPort; + + if (!pwszName) + return NULL; for (pEntry = _PortList.Flink; pEntry != &_PortList; pEntry = pEntry->Flink) { Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/precomp.h [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/precomp.h [iso-8859-1] Mon Jul 20 15:21:03 2015 @@ -129,9 +129,9 @@ PLOCAL_PRINT_PROCESSOR pPrintProcessor; /** Associated Print Processor to this Job */ DWORD dwPriority; /** Priority of this Job from MIN_PRIORITY to MAX_PRIORITY, default being DEF_PRIORITY */ SYSTEMTIME stSubmitted; /** Time of the submission of this Job */ - PWSTR pwszUserName; /** User that submitted the Job */ - PWSTR pwszNotifyName; /** User that shall be notified about the status of the Job */ - PWSTR pwszDocumentName; /** Name of the Document that is printed */ + PWSTR pwszUserName; /** Optional; User that submitted the Job */ + PWSTR pwszNotifyName; /** Optional; User that shall be notified about the status of the Job */ + PWSTR pwszDocumentName; /** Optional; Name of the Document that is printed */ PWSTR pwszDatatype; /** Datatype of the Document */ PWSTR pwszOutputFile; /** Output File to spool the Job to */ PWSTR pwszPrintProcessorParameters; /** Optional; Parameters for the chosen Print Processor */ Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printers.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printers.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printers.c [iso-8859-1] Mon Jul 20 15:21:03 2015 @@ -167,6 +167,7 @@ pPrinter->pwszPrinterName = AllocSplStr(wszPrinterName); pPrinter->pPrintProcessor = pPrintProcessor; + pPrinter->pPort = pPort; InitializePrinterJobList(pPrinter); // Get the printer driver. Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printprocessors.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printprocessors.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printprocessors.c [iso-8859-1] Mon Jul 20 15:21:03 2015 @@ -78,6 +78,9 @@ DWORD i; PDATATYPES_INFO_1W pCurrentDatatype = pPrintProcessor->pDatatypesInfo1; + if (!pwszDatatype) + return FALSE; + for (i = 0; i < pPrintProcessor->dwDatatypeCount; i++) { if (wcsicmp(pCurrentDatatype->pName, pwszDatatype) == 0) @@ -94,6 +97,9 @@ { PLIST_ENTRY pEntry; PLOCAL_PRINT_PROCESSOR pPrintProcessor; + + if (!pwszName) + return NULL; for (pEntry = _PrintProcessorList.Flink; pEntry != &_PrintProcessorList; pEntry = pEntry->Flink) {

9 years, 5 months

[akhaldi] 68470: [OLE32_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jul 19 23:12:15 2015 New Revision: 68470 URL: http://svn.reactos.org/svn/reactos?rev=68470&view=rev Log: [OLE32_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/rostests/winetests/ole32/CMakeLists.txt trunk/rostests/winetests/ole32/clipboard.c trunk/rostests/winetests/ole32/compobj.c trunk/rostests/winetests/ole32/dragdrop.c trunk/rostests/winetests/ole32/ole2.c trunk/rostests/winetests/ole32/storage32.c trunk/rostests/winetests/ole32/usrmarshal.c Modified: trunk/rostests/winetests/ole32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/CMakeList… ============================================================================== --- trunk/rostests/winetests/ole32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/CMakeLists.txt [iso-8859-1] Sun Jul 19 23:12:15 2015 @@ -22,4 +22,9 @@ target_link_libraries(ole32_winetest uuid) set_module_type(ole32_winetest win32cui) add_importlibs(ole32_winetest oleaut32 ole32 user32 gdi32 advapi32 msvcrt kernel32) + +if(MSVC) + add_importlibs(ole32_winetest ntdll) +endif() + add_cd_file(TARGET ole32_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/ole32/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/clipboard… ============================================================================== --- trunk/rostests/winetests/ole32/clipboard.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/clipboard.c [iso-8859-1] Sun Jul 19 23:12:15 2015 @@ -102,7 +102,7 @@ if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IEnumFORMATETC)) { IEnumFORMATETC_AddRef(iface); - *ppvObj = This; + *ppvObj = &This->IEnumFORMATETC_iface; return S_OK; } *ppvObj = NULL; @@ -135,7 +135,8 @@ EnumFormatImpl *This = impl_from_IEnumFORMATETC(iface); ULONG count, i; - trace("next: count %d cur %d\n", celt, This->cur); + if (winetest_debug > 1) + trace("next: count %d cur %d\n", celt, This->cur); if(!rgelt) return E_INVALIDARG; @@ -207,7 +208,7 @@ if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDataObject)) { IDataObject_AddRef(iface); - *ppvObj = This; + *ppvObj = &This->IDataObject_iface; return S_OK; } *ppvObj = NULL; Modified: trunk/rostests/winetests/ole32/compobj.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/compobj.c… ============================================================================== --- trunk/rostests/winetests/ole32/compobj.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/compobj.c [iso-8859-1] Sun Jul 19 23:12:15 2015 @@ -1563,7 +1563,7 @@ ok( !WaitForSingleObject(thread, 10000), "wait timed out\n" ); GetExitCodeThread(thread, &exitcode); hr = exitcode; - ok(hr == RPC_E_WRONG_THREAD, "CoRevokeClassObject called from different " + ok(hr == RPC_E_WRONG_THREAD || broken(hr == S_OK) /* win8 */, "CoRevokeClassObject called from different " "thread to where registered should return RPC_E_WRONG_THREAD instead of 0x%08x\n", hr); thread = CreateThread(NULL, 0, register_class_object_thread, NULL, 0, &tid); @@ -1973,7 +1973,12 @@ ok(lr == ERROR_SUCCESS, "Couldn't open CLSID key\n"); lr = RegCreateKeyExA(clsidkey, deadbeefA, 0, NULL, 0, KEY_WRITE, NULL, &deadbeefkey, NULL); - ok(lr == ERROR_SUCCESS, "Couldn't create class key\n"); + if (lr) { + win_skip("CoGetTreatAsClass() tests will be skipped (failed to create a test key, error %d)\n", + GetLastError()); + RegCloseKey(clsidkey); + return; + } hr = pCoTreatAsClass(&deadbeef, &deadbeef); ok(hr == REGDB_E_WRITEREGDB, "CoTreatAsClass gave wrong error: %08x\n", hr); Modified: trunk/rostests/winetests/ole32/dragdrop.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/dragdrop.… ============================================================================== --- trunk/rostests/winetests/ole32/dragdrop.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/dragdrop.c [iso-8859-1] Sun Jul 19 23:12:15 2015 @@ -452,13 +452,16 @@ ok(droptarget_refs >= 1, "DropTarget refs should be at least one\n"); OleUninitialize(); - ok(droptarget_refs >= 1, "DropTarget refs should be at least one\n"); - - hr = RevokeDragDrop(hwnd); - ok_ole_success(hr, "RevokeDragDrop"); - ok(droptarget_refs == 0 || - broken(droptarget_refs == 1), /* NT4 */ - "DropTarget refs should be zero not %d\n", droptarget_refs); + + /* Win 8 releases the ref in OleUninitialize() */ + if (droptarget_refs >= 1) + { + hr = RevokeDragDrop(hwnd); + ok_ole_success(hr, "RevokeDragDrop"); + ok(droptarget_refs == 0 || + broken(droptarget_refs == 1), /* NT4 */ + "DropTarget refs should be zero not %d\n", droptarget_refs); + } hr = RevokeDragDrop(NULL); ok(hr == DRAGDROP_E_INVALIDHWND, "RevokeDragDrop with NULL hwnd should return DRAGDROP_E_INVALIDHWND instead of 0x%08x\n", hr); Modified: trunk/rostests/winetests/ole32/ole2.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/ole2.c?re… ============================================================================== --- trunk/rostests/winetests/ole32/ole2.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/ole2.c [iso-8859-1] Sun Jul 19 23:12:15 2015 @@ -1688,6 +1688,113 @@ IStorage_Release(pStorage); } + +static const WCHAR CONTENTS[] = {'C','O','N','T','E','N','T','S',0}; + +/* 2 x 1 x 32 bpp dib. PelsPerMeter = 200x400 */ +static BYTE dib[] = +{ + 0x42, 0x4d, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x36, 0x00, 0x00, 0x00, 0x28, 0x00, + + 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, + 0x00, 0x00, 0x01, 0x00, 0x20, 0x00, 0x00, 0x00, + + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x00, + 0x00, 0x00, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, + + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff +}; + +static IStorage *create_storage( int num ) +{ + IStorage *stg; + IStream *stm; + HRESULT hr; + ULONG written; + + hr = StgCreateDocfile( NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_CREATE | STGM_DELETEONRELEASE, 0, &stg ); + ok( hr == S_OK, "got %08x\n", hr); + hr = IStorage_SetClass( stg, &CLSID_Picture_Dib ); + ok( hr == S_OK, "got %08x\n", hr); + hr = IStorage_CreateStream( stg, CONTENTS, STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_CREATE, 0, 0, &stm ); + ok( hr == S_OK, "got %08x\n", hr); + if (num == 1) /* Set biXPelsPerMeter = 0 */ + { + dib[0x26] = 0; + dib[0x27] = 0; + } + hr = IStream_Write( stm, dib, sizeof(dib), &written ); + ok( hr == S_OK, "got %08x\n", hr); + IStream_Release( stm ); + return stg; +} + +static void test_data_cache_dib_contents_stream(int num) +{ + HRESULT hr; + IUnknown *unk; + IPersistStorage *persist; + IDataObject *data; + IViewObject2 *view; + IStorage *stg; + FORMATETC fmt = {CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }; + STGMEDIUM med; + CLSID cls; + SIZEL sz; + + hr = CreateDataCache( NULL, &CLSID_Picture_Metafile, &IID_IUnknown, (void *)&unk ); + ok( SUCCEEDED(hr), "got %08x\n", hr ); + hr = IUnknown_QueryInterface( unk, &IID_IPersistStorage, (void *)&persist ); + ok( SUCCEEDED(hr), "got %08x\n", hr ); + hr = IUnknown_QueryInterface( unk, &IID_IDataObject, (void *)&data ); + ok( SUCCEEDED(hr), "got %08x\n", hr ); + hr = IUnknown_QueryInterface( unk, &IID_IViewObject2, (void *)&view ); + ok( SUCCEEDED(hr), "got %08x\n", hr ); + + stg = create_storage( num ); + + hr = IPersistStorage_Load( persist, stg ); + ok( SUCCEEDED(hr), "got %08x\n", hr ); + IStorage_Release( stg ); + + hr = IPersistStorage_GetClassID( persist, &cls ); + ok( SUCCEEDED(hr), "got %08x\n", hr ); + ok( IsEqualCLSID( &cls, &CLSID_Picture_Dib ), "class id mismatch\n" ); + + hr = IDataObject_GetData( data, &fmt, &med ); + ok( SUCCEEDED(hr), "got %08x\n", hr ); + if (SUCCEEDED(hr)) + { + ok( med.tymed == TYMED_HGLOBAL, "got %x\n", med.tymed ); + ReleaseStgMedium( &med ); + } + + hr = IViewObject2_GetExtent( view, DVASPECT_CONTENT, -1, NULL, &sz ); + ok( SUCCEEDED(hr), "got %08x\n", hr ); + if (num == 0) + { + ok( sz.cx == 1000, "got %d\n", sz.cx ); + ok( sz.cy == 250, "got %d\n", sz.cy ); + } + else + { + HDC hdc = GetDC( 0 ); + LONG x = 2 * 2540 / GetDeviceCaps( hdc, LOGPIXELSX ); + LONG y = 1 * 2540 / GetDeviceCaps( hdc, LOGPIXELSY ); + ok( sz.cx == x, "got %d %d\n", sz.cx, x ); + ok( sz.cy == y, "got %d %d\n", sz.cy, y ); + + ReleaseDC( 0, hdc ); + } + + IViewObject2_Release( view ); + IDataObject_Release( data ); + IPersistStorage_Release( persist ); + IUnknown_Release( unk ); +} + static void test_default_handler(void) { HRESULT hr; @@ -1970,14 +2077,90 @@ Unknown_Release }; +static HRESULT WINAPI OleRun_QueryInterface(IRunnableObject *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IRunnableObject)) { + *ppv = iface; + } + + if (*ppv) + { + IUnknown_AddRef((IUnknown *)*ppv); + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI OleRun_AddRef(IRunnableObject *iface) +{ + return 2; +} + +static ULONG WINAPI OleRun_Release(IRunnableObject *iface) +{ + return 1; +} + +static HRESULT WINAPI OleRun_GetRunningClass(IRunnableObject *iface, CLSID *clsid) +{ + ok(0, "unxpected\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleRun_Run(IRunnableObject *iface, LPBINDCTX ctx) +{ + ok(ctx == NULL, "got %p\n", ctx); + return 0xdeadc0de; +} + +static BOOL WINAPI OleRun_IsRunning(IRunnableObject *iface) +{ + ok(0, "unxpected\n"); + return FALSE; +} + +static HRESULT WINAPI OleRun_LockRunning(IRunnableObject *iface, BOOL lock, + BOOL last_unlock_closes) +{ + ok(0, "unxpected\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleRun_SetContainedObject(IRunnableObject *iface, BOOL contained) +{ + ok(0, "unxpected\n"); + return E_NOTIMPL; +} + +static const IRunnableObjectVtbl oleruntestvtbl = +{ + OleRun_QueryInterface, + OleRun_AddRef, + OleRun_Release, + OleRun_GetRunningClass, + OleRun_Run, + OleRun_IsRunning, + OleRun_LockRunning, + OleRun_SetContainedObject +}; + static IUnknown unknown = { &UnknownVtbl }; +static IRunnableObject testrunnable = { &oleruntestvtbl }; static void test_OleRun(void) { HRESULT hr; + /* doesn't support IRunnableObject */ hr = OleRun(&unknown); ok(hr == S_OK, "OleRun failed 0x%08x\n", hr); + + hr = OleRun((IUnknown*)&testrunnable); + ok(hr == 0xdeadc0de, "got 0x%08x\n", hr); } static void test_OleLockRunning(void) @@ -2393,6 +2576,8 @@ ok_ole_success(hr, "CoRevokeClassObject"); test_data_cache(); + test_data_cache_dib_contents_stream( 0 ); + test_data_cache_dib_contents_stream( 1 ); test_default_handler(); test_runnable(); test_OleRun(); Modified: trunk/rostests/winetests/ole32/storage32.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/storage32… ============================================================================== --- trunk/rostests/winetests/ole32/storage32.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/storage32.c [iso-8859-1] Sun Jul 19 23:12:15 2015 @@ -59,6 +59,201 @@ WideCharToMultiByte(CP_ACP, 0, strw1, -1, stra1, sizeof(stra1), NULL, NULL); WideCharToMultiByte(CP_ACP, 0, strw2, -1, stra2, sizeof(stra2), NULL, NULL); return lstrcmpA(stra1, stra2); +} + +typedef struct TestLockBytes { + ILockBytes ILockBytes_iface; + LONG ref; + BYTE* contents; + ULONG size; + ULONG buffer_size; + HRESULT lock_hr; + ULONG locks_supported; + ULONG lock_called; +} TestLockBytes; + +static inline TestLockBytes *impl_from_ILockBytes(ILockBytes *iface) +{ + return CONTAINING_RECORD(iface, TestLockBytes, ILockBytes_iface); +} + +static HRESULT WINAPI TestLockBytes_QueryInterface(ILockBytes *iface, REFIID iid, + void **ppv) +{ + TestLockBytes *This = impl_from_ILockBytes(iface); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_ILockBytes, iid)) + *ppv = &This->ILockBytes_iface; + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI TestLockBytes_AddRef(ILockBytes *iface) +{ + TestLockBytes *This = impl_from_ILockBytes(iface); + ULONG ref = InterlockedIncrement(&This->ref); + return ref; +} + +static ULONG WINAPI TestLockBytes_Release(ILockBytes *iface) +{ + TestLockBytes *This = impl_from_ILockBytes(iface); + ULONG ref = InterlockedDecrement(&This->ref); + return ref; +} + +static HRESULT WINAPI TestLockBytes_ReadAt(ILockBytes *iface, + ULARGE_INTEGER ulOffset, void *pv, ULONG cb, ULONG *pcbRead) +{ + TestLockBytes *This = impl_from_ILockBytes(iface); + ULONG dummy; + + if (!pv) return E_INVALIDARG; + + if (!pcbRead) pcbRead = &dummy; + + if (ulOffset.QuadPart >= This->size) + { + *pcbRead = 0; + return S_OK; + } + + cb = min(cb, This->size - ulOffset.QuadPart); + + *pcbRead = cb; + memcpy(pv, &This->contents[ulOffset.QuadPart], cb); + + return S_OK; +} + +static HRESULT WINAPI TestLockBytes_WriteAt(ILockBytes *iface, + ULARGE_INTEGER ulOffset, const void *pv, ULONG cb, ULONG *pcbWritten) +{ + TestLockBytes *This = impl_from_ILockBytes(iface); + HRESULT hr; + ULONG dummy; + + if (!pv) return E_INVALIDARG; + + if (!pcbWritten) pcbWritten = &dummy; + + if (ulOffset.QuadPart + cb > This->size) + { + ULARGE_INTEGER new_size; + new_size.QuadPart = ulOffset.QuadPart + cb; + hr = ILockBytes_SetSize(iface, new_size); + if (FAILED(hr)) return hr; + } + + *pcbWritten = cb; + memcpy(&This->contents[ulOffset.QuadPart], pv, cb); + + return S_OK; +} + +static HRESULT WINAPI TestLockBytes_Flush(ILockBytes *iface) +{ + return S_OK; +} + +static HRESULT WINAPI TestLockBytes_SetSize(ILockBytes *iface, + ULARGE_INTEGER cb) +{ + TestLockBytes *This = impl_from_ILockBytes(iface); + + if (This->buffer_size < cb.QuadPart) + { + ULONG new_buffer_size = max(This->buffer_size * 2, cb.QuadPart); + BYTE* new_buffer = HeapAlloc(GetProcessHeap(), 0, new_buffer_size); + if (!new_buffer) return E_OUTOFMEMORY; + memcpy(new_buffer, This->contents, This->size); + HeapFree(GetProcessHeap(), 0, This->contents); + This->contents = new_buffer; + } + + if (cb.QuadPart > This->size) + memset(&This->contents[This->size], 0, cb.QuadPart - This->size); + + This->size = cb.QuadPart; + + return S_OK; +} + +static HRESULT WINAPI TestLockBytes_LockRegion(ILockBytes *iface, + ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) +{ + TestLockBytes *This = impl_from_ILockBytes(iface); + This->lock_called++; + return This->lock_hr; +} + +static HRESULT WINAPI TestLockBytes_UnlockRegion(ILockBytes *iface, + ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) +{ + TestLockBytes *This = impl_from_ILockBytes(iface); + return This->lock_hr; +} + +static HRESULT WINAPI TestLockBytes_Stat(ILockBytes *iface, + STATSTG *pstatstg, DWORD grfStatFlag) +{ + TestLockBytes *This = impl_from_ILockBytes(iface); + static const WCHAR dummy_name[] = {'d','u','m','m','y',0}; + + if (!pstatstg) return E_INVALIDARG; + + memset(pstatstg, 0, sizeof(STATSTG)); + + if (!(grfStatFlag & STATFLAG_NONAME)) + { + pstatstg->pwcsName = CoTaskMemAlloc(sizeof(dummy_name)); + if (!pstatstg->pwcsName) return E_OUTOFMEMORY; + memcpy(pstatstg->pwcsName, dummy_name, sizeof(dummy_name)); + } + + pstatstg->type = STGTY_LOCKBYTES; + pstatstg->cbSize.QuadPart = This->size; + pstatstg->grfLocksSupported = This->locks_supported; + + return S_OK; +} + +static ILockBytesVtbl TestLockBytes_Vtbl = { + TestLockBytes_QueryInterface, + TestLockBytes_AddRef, + TestLockBytes_Release, + TestLockBytes_ReadAt, + TestLockBytes_WriteAt, + TestLockBytes_Flush, + TestLockBytes_SetSize, + TestLockBytes_LockRegion, + TestLockBytes_UnlockRegion, + TestLockBytes_Stat +}; + +static void CreateTestLockBytes(TestLockBytes **This) +{ + *This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**This)); + + if (*This) + { + (*This)->ILockBytes_iface.lpVtbl = &TestLockBytes_Vtbl; + (*This)->ref = 1; + } +} + +static void DeleteTestLockBytes(TestLockBytes *This) +{ + ok(This->ILockBytes_iface.lpVtbl == &TestLockBytes_Vtbl, "test lock bytes %p deleted with incorrect vtable\n", This); + ok(This->ref == 1, "test lock bytes %p deleted with %i references instead of 1\n", This, This->ref); + HeapFree(GetProcessHeap(), 0, This->contents); + HeapFree(GetProcessHeap(), 0, This); } static void test_hglobal_storage_stat(void) @@ -3157,22 +3352,22 @@ BOOL todo; }; -static const int priority_locked_bytes[] = { 0x58, 0x81, 0x93, -1 }; -static const int rwex_locked_bytes[] = { 0x93, 0xa7, 0xbb, 0xcf, -1 }; -static const int rw_locked_bytes[] = { 0x93, 0xa7, -1 }; -static const int nosn_locked_bytes[] = { 0x6c, 0x93, 0xa7, 0xcf, -1 }; -static const int rwdw_locked_bytes[] = { 0x93, 0xa7, 0xcf, -1 }; -static const int wodw_locked_bytes[] = { 0xa7, 0xcf, -1 }; -static const int tr_locked_bytes[] = { 0x93, -1 }; +static const int priority_locked_bytes[] = { 0x158, 0x181, 0x193, -1 }; +static const int rwex_locked_bytes[] = { 0x193, 0x1a7, 0x1bb, 0x1cf, -1 }; +static const int rw_locked_bytes[] = { 0x193, 0x1a7, -1 }; +static const int nosn_locked_bytes[] = { 0x16c, 0x193, 0x1a7, 0x1cf, -1 }; +static const int rwdw_locked_bytes[] = { 0x193, 0x1a7, 0x1cf, -1 }; +static const int wodw_locked_bytes[] = { 0x1a7, 0x1cf, -1 }; +static const int tr_locked_bytes[] = { 0x193, -1 }; static const int no_locked_bytes[] = { -1 }; -static const int roex_locked_bytes[] = { 0x93, 0xbb, 0xcf, -1 }; - -static const int rwex_fail_ranges[] = { 0x93,0xe3, -1 }; -static const int rw_fail_ranges[] = { 0xbb,0xe3, -1 }; -static const int rwdw_fail_ranges[] = { 0xa7,0xe3, -1 }; -static const int dw_fail_ranges[] = { 0xa7,0xcf, -1 }; -static const int tr_fail_ranges[] = { 0xbb,0xcf, -1 }; -static const int pr_fail_ranges[] = { 0x80,0x81, 0xbb,0xcf, -1 }; +static const int roex_locked_bytes[] = { 0x193, 0x1bb, 0x1cf, -1 }; + +static const int rwex_fail_ranges[] = { 0x193,0x1e3, -1 }; +static const int rw_fail_ranges[] = { 0x1bb,0x1e3, -1 }; +static const int rwdw_fail_ranges[] = { 0x1a7,0x1e3, -1 }; +static const int dw_fail_ranges[] = { 0x1a7,0x1cf, -1 }; +static const int tr_fail_ranges[] = { 0x1bb,0x1cf, -1 }; +static const int pr_fail_ranges[] = { 0x180,0x181, 0x1bb,0x1cf, -1 }; static const int roex_fail_ranges[] = { 0x0,-1 }; static const struct lock_test lock_tests[] = { @@ -3189,8 +3384,8 @@ { STGM_READWRITE|STGM_TRANSACTED|STGM_SHARE_DENY_WRITE, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwdw_locked_bytes, rwdw_fail_ranges, FALSE }, { STGM_READ|STGM_SHARE_DENY_WRITE, FALSE, GENERIC_READ, FILE_SHARE_READ, no_locked_bytes, dw_fail_ranges, TRUE }, { STGM_READ|STGM_TRANSACTED, FALSE, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, tr_locked_bytes, tr_fail_ranges, FALSE }, - { STGM_READ|STGM_SHARE_EXCLUSIVE, FALSE, GENERIC_READ, FILE_SHARE_READ, roex_locked_bytes, roex_fail_ranges, TRUE }, - { STGM_READ|STGM_SHARE_EXCLUSIVE|STGM_TRANSACTED, FALSE, GENERIC_READ, FILE_SHARE_READ, roex_locked_bytes, roex_fail_ranges, TRUE }, + { STGM_READ|STGM_SHARE_EXCLUSIVE, FALSE, GENERIC_READ, FILE_SHARE_READ, roex_locked_bytes, roex_fail_ranges, FALSE }, + { STGM_READ|STGM_SHARE_EXCLUSIVE|STGM_TRANSACTED, FALSE, GENERIC_READ, FILE_SHARE_READ, roex_locked_bytes, roex_fail_ranges, FALSE }, }; static BOOL can_open(LPCWSTR filename, DWORD access, DWORD sharing) @@ -3317,7 +3512,7 @@ ol.u.s.OffsetHigh = 0; ol.hEvent = NULL; - for (ol.u.s.Offset = 0x7fffff00; ol.u.s.Offset != 0x80000000; ol.u.s.Offset++) + for (ol.u.s.Offset = 0x7ffffe00; ol.u.s.Offset != 0x80000000; ol.u.s.Offset++) { if (LockFileEx(hfile, LOCKFILE_EXCLUSIVE_LOCK|LOCKFILE_FAIL_IMMEDIATELY, 0, 1, 0, &ol)) locked = FALSE; @@ -3329,7 +3524,7 @@ UnlockFileEx(hfile, 0, 1, 0, &ol); - if ((ol.u.s.Offset&0xff) == *next_lock) + if ((ol.u.s.Offset&0x1ff) == *next_lock) { expect_locked = TRUE; next_lock++; @@ -3366,14 +3561,17 @@ ol.u.s.OffsetHigh = 0; ol.hEvent = NULL; - for (ol.u.s.Offset = 0x7fffff00; ol.u.s.Offset != 0x80000000; ol.u.s.Offset++) + for (ol.u.s.Offset = 0x7ffffe00; ol.u.s.Offset != 0x80000000; ol.u.s.Offset++) { if (ol.u.s.Offset == 0x7fffff92 || (ol.u.s.Offset == 0x7fffff80 && current->stg_mode == (STGM_TRANSACTED|STGM_READWRITE)) || (ol.u.s.Offset == 0x7fffff80 && current->stg_mode == (STGM_TRANSACTED|STGM_READ))) continue; /* This makes opens hang */ - LockFileEx(hfile, LOCKFILE_EXCLUSIVE_LOCK, 0, 1, 0, &ol); + if (ol.u.s.Offset < 0x7fffff00) + LockFileEx(hfile, 0, 0, 1, 0, &ol); + else + LockFileEx(hfile, LOCKFILE_EXCLUSIVE_LOCK, 0, 1, 0, &ol); hr = StgOpenStorage(filename, NULL, current->stg_mode, NULL, 0, &stg); ok(hr == S_OK || hr == STG_E_LOCKVIOLATION || hr == STG_E_SHAREVIOLATION, "failed with unexpected hr %x\n", hr); @@ -3383,11 +3581,11 @@ failed = FAILED(hr); - if (!expect_failed && (ol.u.s.Offset&0xff) == next_range[0]) + if (!expect_failed && (ol.u.s.Offset&0x1ff) == next_range[0]) { expect_failed = TRUE; } - else if (expect_failed && (ol.u.s.Offset&0xff) == next_range[1]) + else if (expect_failed && (ol.u.s.Offset&0x1ff) == next_range[1]) { expect_failed = FALSE; next_range += 2; @@ -3644,6 +3842,54 @@ CloseHandle(hfile); DeleteFileA(filenameA); +} + +static void test_custom_lockbytes(void) +{ + static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; + TestLockBytes* lockbytes; + HRESULT hr; + IStorage* stg; + IStream* stm; + + CreateTestLockBytes(&lockbytes); + + hr = StgCreateDocfileOnILockBytes(&lockbytes->ILockBytes_iface, STGM_CREATE|STGM_READWRITE|STGM_TRANSACTED, 0, &stg); + ok(hr==S_OK, "StgCreateDocfileOnILockBytes failed %x\n", hr); + + hr = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, 0, &stm); + ok(hr==S_OK, "IStorage_CreateStream failed %x\n", hr); + + IStream_Release(stm); + + hr = IStorage_Commit(stg, 0); + + IStorage_Release(stg); + + ok(!lockbytes->lock_called, "unexpected call to LockRegion\n"); + + lockbytes->locks_supported = LOCK_WRITE|LOCK_EXCLUSIVE|LOCK_ONLYONCE; + + hr = StgCreateDocfileOnILockBytes(&lockbytes->ILockBytes_iface, STGM_CREATE|STGM_READWRITE|STGM_TRANSACTED, 0, &stg); + ok(hr==S_OK, "StgCreateDocfileOnILockBytes failed %x\n", hr); + + hr = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, 0, &stm); + ok(hr==S_OK, "IStorage_CreateStream failed %x\n", hr); + + IStream_Release(stm); + + hr = IStorage_Commit(stg, 0); + + IStorage_Release(stg); + + ok(lockbytes->lock_called, "expected LockRegion to be called\n"); + + lockbytes->lock_hr = STG_E_INVALIDFUNCTION; + + hr = StgCreateDocfileOnILockBytes(&lockbytes->ILockBytes_iface, STGM_CREATE|STGM_READWRITE|STGM_TRANSACTED, 0, &stg); + ok(hr==STG_E_INVALIDFUNCTION, "StgCreateDocfileOnILockBytes failed %x\n", hr); + + DeleteTestLockBytes(lockbytes); } START_TEST(storage32) @@ -3694,4 +3940,5 @@ test_locking(); test_transacted_shared(); test_overwrite(); -} + test_custom_lockbytes(); +} Modified: trunk/rostests/winetests/ole32/usrmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/usrmarsha… ============================================================================== --- trunk/rostests/winetests/ole32/usrmarshal.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/usrmarshal.c [iso-8859-1] Sun Jul 19 23:12:15 2015 @@ -50,13 +50,22 @@ unsigned char * __RPC_USER HMETAFILEPICT_UserUnmarshal(ULONG *, unsigned char *, HMETAFILEPICT *); void __RPC_USER HMETAFILEPICT_UserFree(ULONG *, HMETAFILEPICT *); +ULONG __RPC_USER HBRUSH_UserSize(ULONG *, ULONG, HBRUSH *); +unsigned char * __RPC_USER HBRUSH_UserMarshal(ULONG *, unsigned char *, HBRUSH *); +unsigned char * __RPC_USER HBRUSH_UserUnmarshal(ULONG *, unsigned char *, HBRUSH *); +void __RPC_USER HBRUSH_UserFree(ULONG *, HBRUSH *); + +static BOOL g_expect_user_alloc; static void * WINAPI user_allocate(SIZE_T size) { + ok(g_expect_user_alloc, "unexpected user_allocate call\n"); return CoTaskMemAlloc(size); } +static BOOL g_expect_user_free; static void WINAPI user_free(void *p) { + ok(g_expect_user_free, "unexpected user_free call\n"); CoTaskMemFree(p); } @@ -207,7 +216,6 @@ GlobalUnlock(hglobal); actual_size = GlobalSize(hglobal); expected_size = actual_size + 5 * sizeof(DWORD); - trace("%d: actual size %d\n", block_size, actual_size); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); size = HGLOBAL_UserSize(&umcb.Flags, 0, &hglobal); /* native is poorly programmed and allocates 4/8 bytes more than it needs to @@ -410,7 +418,6 @@ init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); size = HMETAFILEPICT_UserSize(&umcb.Flags, 0, &hmfp); ok(size > 20, "size should be at least 20 bytes, not %d\n", size); - trace("size is %d\n", size); buffer = HeapAlloc(GetProcessHeap(), 0, size); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); buffer_end = HMETAFILEPICT_UserMarshal(&umcb.Flags, buffer, &hmfp); @@ -476,6 +483,17 @@ HeapFree(GetProcessHeap(), 0, buffer); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); HMETAFILEPICT_UserFree(&umcb.Flags, &hmfp2); +} + +typedef struct +{ + IUnknown IUnknown_iface; + LONG refs; +} TestUnknown; + +static inline TestUnknown *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, TestUnknown, IUnknown_iface); } static HRESULT WINAPI Test_IUnknown_QueryInterface( @@ -498,12 +516,14 @@ static ULONG WINAPI Test_IUnknown_AddRef(LPUNKNOWN iface) { - return 2; /* non-heap-based object */ + TestUnknown *This = impl_from_IUnknown(iface); + return InterlockedIncrement(&This->refs); } static ULONG WINAPI Test_IUnknown_Release(LPUNKNOWN iface) { - return 1; /* non-heap-based object */ + TestUnknown *This = impl_from_IUnknown(iface); + return InterlockedDecrement(&This->refs); } static const IUnknownVtbl TestUnknown_Vtbl = @@ -548,7 +568,7 @@ /* the rest can be NULLs */ }; -static IUnknown Test_Unknown = { &TestUnknown_Vtbl }; +static TestUnknown Test_Unknown = { {&TestUnknown_Vtbl}, 1 }; static IStream Test_Stream = { &TestStream_Vtbl }; ULONG __RPC_USER WdtpInterfacePointer_UserSize(ULONG *, ULONG, ULONG, IUnknown *, REFIID); @@ -588,7 +608,8 @@ /* Now for a non-NULL pointer. The marshalled data are two size DWORDS and then the result of CoMarshalInterface called with the LOWORD of the ctx */ - unk = &Test_Unknown; + unk = &Test_Unknown.IUnknown_iface; + Test_Unknown.refs = 1; CreateStreamOnHGlobal(h, TRUE, &stm); CoMarshalInterface(stm, &IID_IUnknown, unk, LOWORD(ctx), NULL, MSHLFLAGS_NORMAL); @@ -596,15 +617,17 @@ IStream_Seek(stm, zero, STREAM_SEEK_CUR, &pos); marshal_size = pos.u.LowPart; marshal_data = GlobalLock(h); - trace("marshal_size %x\n", marshal_size); +todo_wine + ok(Test_Unknown.refs == 2, "got %d\n", Test_Unknown.refs); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, umcb_ctx); size = WdtpInterfacePointer_UserSize(&umcb.Flags, ctx, 0, unk, &IID_IUnknown); ok(size >= marshal_size + 2 * sizeof(DWORD), "marshal size %x got %x\n", marshal_size, size); - trace("WdtpInterfacePointer_UserSize returned %x\n", size); buffer = HeapAlloc(GetProcessHeap(), 0, size); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, umcb_ctx); buffer_end = WdtpInterfacePointer_UserMarshal(&umcb.Flags, ctx, buffer, unk, &IID_IUnknown); +todo_wine + ok(Test_Unknown.refs == 2, "got %d\n", Test_Unknown.refs); wireip = buffer; ok(buffer_end == buffer + marshal_size + 2 * sizeof(DWORD), "buffer_end %p buffer %p\n", buffer_end, buffer); @@ -625,6 +648,7 @@ init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, umcb_ctx); WdtpInterfacePointer_UserUnmarshal(&umcb.Flags, buffer, &unk2, &IID_IUnknown); ok(unk2 != NULL, "IUnknown object didn't unmarshal properly\n"); + ok(Test_Unknown.refs == 2, "got %d\n", Test_Unknown.refs); HeapFree(GetProcessHeap(), 0, buffer); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_INPROC); IUnknown_Release(unk2); @@ -657,7 +681,7 @@ unsigned char *buffer, *buffer_end, *expect_buffer, *expect_buffer_end; ULONG size, expect_size; STGMEDIUM med, med2; - IUnknown *unk = &Test_Unknown; + IUnknown *unk = &Test_Unknown.IUnknown_iface; IStream *stm = &Test_Stream; /* TYMED_NULL with pUnkForRelease */ @@ -753,6 +777,211 @@ STGMEDIUM_UserFree(&umcb.Flags, &med2); HeapFree(GetProcessHeap(), 0, expect_buffer); +} + +static void test_marshal_SNB(void) +{ + static const WCHAR str1W[] = {'s','t','r','i','n','g','1',0}; + static const WCHAR str2W[] = {'s','t','r','2',0}; + unsigned char *buffer, *src, *mbuf; + MIDL_STUB_MESSAGE stub_msg; + WCHAR **ptrW, *dataW; + USER_MARSHAL_CB umcb; + RPC_MESSAGE rpc_msg; + RemSNB *wiresnb; + SNB snb, snb2; + ULONG size; + + /* 4 bytes alignment */ + snb = NULL; + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); + size = SNB_UserSize(&umcb.Flags, 3, &snb); + ok(size == 16, "Size should be 16, instead of %d\n", size); + + /* NULL block */ + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); + size = SNB_UserSize(&umcb.Flags, 0, &snb); + ok(size == 12, "Size should be 12, instead of %d\n", size); + + buffer = HeapAlloc(GetProcessHeap(), 0, size); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); + mbuf = SNB_UserMarshal(&umcb.Flags, buffer, &snb); + ok(mbuf == buffer + size, "got %p, %p\n", mbuf, buffer + size); + + wiresnb = (RemSNB*)buffer; + ok(wiresnb->ulCntStr == 0, "got %u\n", wiresnb->ulCntStr); + ok(wiresnb->ulCntChar == 0, "got %u\n", wiresnb->ulCntChar); + ok(*(ULONG*)wiresnb->rgString == 0, "got %u\n", *(ULONG*)wiresnb->rgString); + + snb2 = NULL; + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); + SNB_UserUnmarshal(&umcb.Flags, buffer, &snb2); + ok(snb2 == NULL, "got %p\n", snb2); + + HeapFree(GetProcessHeap(), 0, buffer); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); + SNB_UserFree(&umcb.Flags, &snb2); + + /* block with actual data */ + + /* allocate source block, n+1 pointers first, then data */ + src = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR*)*3 + sizeof(str1W) + sizeof(str2W)); + ptrW = (WCHAR**)src; + dataW = *ptrW = (WCHAR*)(src + 3*sizeof(WCHAR*)); + ptrW++; + *ptrW = (WCHAR*)(src + 3*sizeof(WCHAR*) + sizeof(str1W)); + ptrW++; + *ptrW = NULL; + lstrcpyW(dataW, str1W); + dataW += lstrlenW(str1W) + 1; + lstrcpyW(dataW, str2W); + + snb = (SNB)src; + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); + size = SNB_UserSize(&umcb.Flags, 0, &snb); + ok(size == 38, "Size should be 38, instead of %d\n", size); + + buffer = HeapAlloc(GetProcessHeap(), 0, size); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); + SNB_UserMarshal(&umcb.Flags, buffer, &snb); + + wiresnb = (RemSNB*)buffer; + ok(wiresnb->ulCntStr == 13, "got %u\n", wiresnb->ulCntStr); + ok(wiresnb->ulCntChar == 2, "got %u\n", wiresnb->ulCntChar); + /* payload length is stored one more time, as ULONG */ + ok(*(ULONG*)wiresnb->rgString == wiresnb->ulCntStr, "got %u\n", *(ULONG*)wiresnb->rgString); + dataW = &wiresnb->rgString[2]; + ok(!lstrcmpW(dataW, str1W), "marshalled string 0: %s\n", wine_dbgstr_w(dataW)); + dataW += sizeof(str1W)/sizeof(WCHAR); + ok(!lstrcmpW(dataW, str2W), "marshalled string 1: %s\n", wine_dbgstr_w(dataW)); + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); + + g_expect_user_alloc = TRUE; + snb2 = NULL; + SNB_UserUnmarshal(&umcb.Flags, buffer, &snb2); + g_expect_user_alloc = FALSE; + + ptrW = snb2; + ok(!lstrcmpW(*ptrW, str1W), "unmarshalled string 0: %s\n", wine_dbgstr_w(*ptrW)); + ptrW++; + ok(!lstrcmpW(*ptrW, str2W), "unmarshalled string 1: %s\n", wine_dbgstr_w(*ptrW)); + ptrW++; + ok(*ptrW == NULL, "expected terminating NULL ptr, got %p, start %p\n", *ptrW, snb2); + + HeapFree(GetProcessHeap(), 0, buffer); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); + + g_expect_user_free = TRUE; + SNB_UserFree(&umcb.Flags, &snb2); + g_expect_user_free = FALSE; + + HeapFree(GetProcessHeap(), 0, src); +} + +static void test_marshal_HDC(void) +{ + MIDL_STUB_MESSAGE stub_msg; + HDC hdc = GetDC(0), hdc2; + USER_MARSHAL_CB umcb; + RPC_MESSAGE rpc_msg; + unsigned char *buffer; + wireHDC wirehdc; + ULONG size; + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); + size = HDC_UserSize(&umcb.Flags, 0, &hdc); + ok(size == sizeof(*wirehdc), "Wrong size %d\n", size); + + buffer = HeapAlloc(GetProcessHeap(), 0, size); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); + HDC_UserMarshal(&umcb.Flags, buffer, &hdc); + wirehdc = (wireHDC)buffer; + ok(wirehdc->fContext == WDT_INPROC_CALL, "Context should be WDT_INPROC_CALL instead of 0x%08x\n", wirehdc->fContext); + ok(wirehdc->u.hInproc == (LONG_PTR)hdc, "Marshaled value should be %p instead of %x\n", hdc, wirehdc->u.hRemote); + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); + HDC_UserUnmarshal(&umcb.Flags, buffer, &hdc2); + ok(hdc == hdc2, "Didn't unmarshal properly\n"); + HeapFree(GetProcessHeap(), 0, buffer); + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); + HDC_UserFree(&umcb.Flags, &hdc2); + ReleaseDC(0, hdc); +} + +static void test_marshal_HICON(void) +{ + static const BYTE bmp_bits[1024]; + MIDL_STUB_MESSAGE stub_msg; + HICON hIcon, hIcon2; + USER_MARSHAL_CB umcb; + RPC_MESSAGE rpc_msg; + unsigned char *buffer; + wireHICON wirehicon; + ULONG size; + + hIcon = CreateIcon(0, 16, 16, 1, 1, bmp_bits, bmp_bits); + ok(hIcon != 0, "CreateIcon failed\n"); + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); + size = HICON_UserSize(&umcb.Flags, 0, &hIcon); + ok(size == sizeof(*wirehicon), "Wrong size %d\n", size); + + buffer = HeapAlloc(GetProcessHeap(), 0, size); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); + HICON_UserMarshal(&umcb.Flags, buffer, &hIcon); + wirehicon = (wireHICON)buffer; + ok(wirehicon->fContext == WDT_INPROC_CALL, "Context should be WDT_INPROC_CALL instead of 0x%08x\n", wirehicon->fContext); + ok(wirehicon->u.hInproc == (LONG_PTR)hIcon, "Marshaled value should be %p instead of %x\n", hIcon, wirehicon->u.hRemote); + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); + HICON_UserUnmarshal(&umcb.Flags, buffer, &hIcon2); + ok(hIcon == hIcon2, "Didn't unmarshal properly\n"); + HeapFree(GetProcessHeap(), 0, buffer); + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); + HICON_UserFree(&umcb.Flags, &hIcon2); + DestroyIcon(hIcon); +} + +static void test_marshal_HBRUSH(void) +{ + MIDL_STUB_MESSAGE stub_msg; + HBRUSH hBrush, hBrush2; + USER_MARSHAL_CB umcb; + RPC_MESSAGE rpc_msg; + unsigned char *buffer; + LOGBRUSH logbrush; + wireHBRUSH wirehbrush; + ULONG size; + + logbrush.lbStyle = BS_SOLID; + logbrush.lbColor = RGB(0, 0, 0); + logbrush.lbHatch = 0; + + hBrush = CreateBrushIndirect(&logbrush); + ok(hBrush != 0, "CreateBrushIndirect failed\n"); + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); + size = HBRUSH_UserSize(&umcb.Flags, 0, &hBrush); + ok(size == sizeof(*wirehbrush), "Wrong size %d\n", size); + + buffer = HeapAlloc(GetProcessHeap(), 0, size); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); + HBRUSH_UserMarshal(&umcb.Flags, buffer, &hBrush); + wirehbrush = (wireHBRUSH)buffer; + ok(wirehbrush->fContext == WDT_INPROC_CALL, "Context should be WDT_INPROC_CALL instead of 0x%08x\n", wirehbrush->fContext); + ok(wirehbrush->u.hInproc == (LONG_PTR)hBrush, "Marshaled value should be %p instead of %x\n", hBrush, wirehbrush->u.hRemote); + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); + HBRUSH_UserUnmarshal(&umcb.Flags, buffer, &hBrush2); + ok(hBrush == hBrush2, "Didn't unmarshal properly\n"); + HeapFree(GetProcessHeap(), 0, buffer); + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); + HBRUSH_UserFree(&umcb.Flags, &hBrush2); + DeleteObject(hBrush); } START_TEST(usrmarshal) @@ -767,6 +996,10 @@ test_marshal_HMETAFILEPICT(); test_marshal_WdtpInterfacePointer(); test_marshal_STGMEDIUM(); + test_marshal_SNB(); + test_marshal_HDC(); + test_marshal_HICON(); + test_marshal_HBRUSH(); CoUninitialize(); }

9 years, 5 months

[akhaldi] 68469: [OLE32] Sync with Wine Staging 1.7.47. CORE-9924

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jul 19 23:10:53 2015 New Revision: 68469 URL: http://svn.reactos.org/svn/reactos?rev=68469&view=rev Log: [OLE32] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/reactos/dll/win32/ole32/bindctx.c trunk/reactos/dll/win32/ole32/clipboard.c trunk/reactos/dll/win32/ole32/compobj.c trunk/reactos/dll/win32/ole32/compositemoniker.c trunk/reactos/dll/win32/ole32/datacache.c trunk/reactos/dll/win32/ole32/defaulthandler.c trunk/reactos/dll/win32/ole32/filelockbytes.c trunk/reactos/dll/win32/ole32/filemoniker.c trunk/reactos/dll/win32/ole32/hglobalstream.c trunk/reactos/dll/win32/ole32/itemmoniker.c trunk/reactos/dll/win32/ole32/marshal.c trunk/reactos/dll/win32/ole32/moniker.c trunk/reactos/dll/win32/ole32/ole2.c trunk/reactos/dll/win32/ole32/ole2impl.c trunk/reactos/dll/win32/ole32/ole32.spec trunk/reactos/dll/win32/ole32/olestd.h trunk/reactos/dll/win32/ole32/pointermoniker.c trunk/reactos/dll/win32/ole32/rpc.c trunk/reactos/dll/win32/ole32/stg_prop.c trunk/reactos/dll/win32/ole32/storage32.c trunk/reactos/dll/win32/ole32/storage32.h trunk/reactos/dll/win32/ole32/usrmarshal.c trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/ole32/bindctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/bindctx.c?… Modified: trunk/reactos/dll/win32/ole32/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/clipboard.… Modified: trunk/reactos/dll/win32/ole32/compobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compobj.c?… Modified: trunk/reactos/dll/win32/ole32/compositemoniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compositem… Modified: trunk/reactos/dll/win32/ole32/datacache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/datacache.… Modified: trunk/reactos/dll/win32/ole32/defaulthandler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/defaulthan… Modified: trunk/reactos/dll/win32/ole32/filelockbytes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/filelockby… Modified: trunk/reactos/dll/win32/ole32/filemoniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/filemonike… Modified: trunk/reactos/dll/win32/ole32/hglobalstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/hglobalstr… Modified: trunk/reactos/dll/win32/ole32/itemmoniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/itemmonike… Modified: trunk/reactos/dll/win32/ole32/marshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/marshal.c?… Modified: trunk/reactos/dll/win32/ole32/moniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/moniker.c?… Modified: trunk/reactos/dll/win32/ole32/ole2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole2.c?rev… Modified: trunk/reactos/dll/win32/ole32/ole2impl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole2impl.c… Modified: trunk/reactos/dll/win32/ole32/ole32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32.spec… Modified: trunk/reactos/dll/win32/ole32/olestd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/olestd.h?r… Modified: trunk/reactos/dll/win32/ole32/pointermoniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/pointermon… Modified: trunk/reactos/dll/win32/ole32/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/rpc.c?rev=… Modified: trunk/reactos/dll/win32/ole32/stg_prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/stg_prop.c… Modified: trunk/reactos/dll/win32/ole32/storage32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/storage32.… Modified: trunk/reactos/dll/win32/ole32/storage32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/storage32.… Modified: trunk/reactos/dll/win32/ole32/usrmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/usrmarshal… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

9 years, 5 months

[akhaldi] 68468: [ODBCCP32_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jul 19 23:09:55 2015 New Revision: 68468 URL: http://svn.reactos.org/svn/reactos?rev=68468&view=rev Log: [ODBCCP32_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/rostests/winetests/odbccp32/CMakeLists.txt trunk/rostests/winetests/odbccp32/misc.c Modified: trunk/rostests/winetests/odbccp32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/odbccp32/CMakeL… ============================================================================== --- trunk/rostests/winetests/odbccp32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/odbccp32/CMakeLists.txt [iso-8859-1] Sun Jul 19 23:09:55 2015 @@ -1,5 +1,5 @@ add_executable(odbccp32_winetest misc.c testlist.c) set_module_type(odbccp32_winetest win32cui) -add_importlibs(odbccp32_winetest odbccp32 msvcrt kernel32) +add_importlibs(odbccp32_winetest odbccp32 advapi32 msvcrt kernel32) add_cd_file(TARGET odbccp32_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/odbccp32/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/odbccp32/misc.c… ============================================================================== --- trunk/rostests/winetests/odbccp32/misc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/odbccp32/misc.c [iso-8859-1] Sun Jul 19 23:09:55 2015 @@ -21,6 +21,7 @@ #include "windef.h" #include "winbase.h" +#include "winreg.h" #include "odbcinst.h" static void test_SQLConfigMode(void) @@ -129,9 +130,68 @@ ok(path_out != 0xcafe, "Expected path_out to show the correct amount of bytes\n"); } +static void test_SQLWritePrivateProfileString(void) +{ + static const WCHAR odbc_key[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C','\\','O','D','B','C','.','I','N','I','\\','w','i','n','e','o','d','b','c',0}; + static const WCHAR abcd_key[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C','\\','a','b','c','d','.','I','N','I','\\','w','i','n','e','o','d','b','c',0}; + static const WCHAR abcdini_key[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C','\\','a','b','c','d','.','I','N','I',0 }; + BOOL ret; + LONG reg_ret; + DWORD error_code; + + ret = SQLWritePrivateProfileString("wineodbc", "testing" , "value", ""); + ok(!ret, "SQLWritePrivateProfileString passed\n"); + SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); + ok(error_code == ODBC_ERROR_INVALID_STR, "SQLInstallerErrorW ret: %d\n", error_code); + + ret = SQLWritePrivateProfileString("wineodbc", "testing" , "value", NULL); + ok(!ret, "SQLWritePrivateProfileString passed\n"); + SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); + ok(error_code == ODBC_ERROR_INVALID_STR, "SQLInstallerErrorW ret: %d\n", error_code); + + ret = SQLWritePrivateProfileString("wineodbc", "testing" , "value", "odbc.ini"); + ok(ret, "SQLWritePrivateProfileString failed\n"); + if(ret) + { + HKEY hkey; + + reg_ret = RegOpenKeyExW(HKEY_CURRENT_USER, odbc_key, 0, KEY_READ, &hkey); + ok(reg_ret == ERROR_SUCCESS, "RegOpenKeyExW failed\n"); + if(reg_ret == ERROR_SUCCESS) + { + reg_ret = RegDeleteKeyW(HKEY_CURRENT_USER, odbc_key); + ok(reg_ret == ERROR_SUCCESS, "RegDeleteKeyW failed\n"); + + RegCloseKey(hkey); + } + } + + ret = SQLWritePrivateProfileString("wineodbc", "testing" , "value", "abcd.ini"); + ok(ret, "SQLWritePrivateProfileString failed\n"); + if(ret) + { + HKEY hkey; + + reg_ret = RegOpenKeyExW(HKEY_CURRENT_USER, abcd_key, 0, KEY_READ, &hkey); + ok(reg_ret == ERROR_SUCCESS, "RegOpenKeyExW failed\n"); + if(reg_ret == ERROR_SUCCESS) + { + reg_ret = RegDeleteKeyW(HKEY_CURRENT_USER, abcd_key); + ok(reg_ret == ERROR_SUCCESS, "RegDeleteKeyW failed\n"); + + RegCloseKey(hkey); + } + + /* Cleanup key */ + reg_ret = RegDeleteKeyW(HKEY_CURRENT_USER, abcdini_key); + ok(reg_ret == ERROR_SUCCESS, "RegDeleteKeyW failed\n"); + } +} + START_TEST(misc) { test_SQLConfigMode(); test_SQLInstallerError(); test_SQLInstallDriverManager(); + test_SQLWritePrivateProfileString(); }

9 years, 5 months

[akhaldi] 68467: [ODBCCP32] Sync with Wine Staging 1.7.47. CORE-9924

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jul 19 23:09:04 2015 New Revision: 68467 URL: http://svn.reactos.org/svn/reactos?rev=68467&view=rev Log: [ODBCCP32] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/reactos/dll/win32/odbccp32/odbccp32.c trunk/reactos/dll/win32/odbccp32/odbccp32.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/odbccp32/odbccp32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/odbccp32/odbccp3… ============================================================================== --- trunk/reactos/dll/win32/odbccp32/odbccp32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/odbccp32/odbccp32.c [iso-8859-1] Sun Jul 19 23:09:04 2015 @@ -59,6 +59,7 @@ static const WCHAR odbc_error_component_not_found[] = {'C','o','m','p','o','n','e','n','t',' ','n','o','t',' ','f','o','u','n','d',0}; static const WCHAR odbc_error_out_of_mem[] = {'O','u','t',' ','o','f',' ','m','e','m','o','r','y',0}; static const WCHAR odbc_error_invalid_param_sequence[] = {'I','n','v','a','l','i','d',' ','p','a','r','a','m','e','t','e','r',' ','s','e','q','u','e','n','c','e',0}; +static const WCHAR odbc_error_invalid_param_string[] = {'I','n','v','a','l','i','d',' ','p','a','r','a','m','e','t','e','r',' ','s','t','r','i','n','g',0}; /* Push an error onto the error stack, taking care of ranges etc. */ static void push_error(int code, LPCWSTR msg) @@ -76,6 +77,33 @@ { num_errors = 0; } + +static inline void * heap_alloc(size_t len) +{ + return HeapAlloc(GetProcessHeap(), 0, len); +} + +static inline BOOL heap_free(void *mem) +{ + return HeapFree(GetProcessHeap(), 0, mem); +} + +static inline WCHAR *heap_strdupAtoW(const char *str) +{ + LPWSTR ret = NULL; + + if(str) { + DWORD len; + + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + ret = heap_alloc(len*sizeof(WCHAR)); + if(ret) + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + } + + return ret; +} + BOOL WINAPI ODBCCPlApplet( LONG i, LONG j, LONG * p1, LONG * p2) { @@ -239,7 +267,7 @@ BOOL WINAPI SQLCreateDataSourceW(HWND hwnd, LPCWSTR lpszDS) { clear_errors(); - FIXME("\n"); + FIXME("%p %s\n", hwnd, debugstr_w(lpszDS)); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -247,7 +275,7 @@ BOOL WINAPI SQLCreateDataSource(HWND hwnd, LPCSTR lpszDS) { clear_errors(); - FIXME("\n"); + FIXME("%p %s\n", hwnd, debugstr_a(lpszDS)); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -256,7 +284,7 @@ WORD cbBufMax, WORD *pcbBufOut) { clear_errors(); - FIXME("\n"); + FIXME("%s %p %d %p\n", debugstr_w(lpszInfFile), lpszBuf, cbBufMax, pcbBufOut); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -265,7 +293,7 @@ WORD cbBufMax, WORD *pcbBufOut) { clear_errors(); - FIXME("\n"); + FIXME("%s %p %d %p\n", debugstr_a(lpszInfFile), lpszBuf, cbBufMax, pcbBufOut); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -273,6 +301,7 @@ BOOL WINAPI SQLGetConfigMode(UWORD *pwConfigMode) { clear_errors(); + TRACE("%p\n", pwConfigMode); if (pwConfigMode) *pwConfigMode = config_mode; return TRUE; @@ -290,6 +319,9 @@ BOOL success = FALSE; /* The value we will return */ clear_errors(); + + TRACE("%p %d %p\n", lpszBuf, cbBufMax, pcbBufOut); + if (!lpszBuf || cbBufMax == 0) { push_error(ODBC_ERROR_INVALID_BUFF_LEN, odbc_error_invalid_buff_len); @@ -345,6 +377,9 @@ int size_wbuf = cbBufMax; LPWSTR wbuf; WORD size_used; + + TRACE("%p %d %p\n", lpszBuf, cbBufMax, pcbBufOut); + wbuf = HeapAlloc(GetProcessHeap(), 0, size_wbuf*sizeof(WCHAR)); if (wbuf) { @@ -372,7 +407,9 @@ LPCWSTR lpszFilename) { clear_errors(); - FIXME("\n"); + FIXME("%s %s %s %p %d %s\n", debugstr_w(lpszSection), debugstr_w(lpszEntry), + debugstr_w(lpszDefault), RetBuffer, cbRetBuffer, + debugstr_w(lpszFilename)); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -382,7 +419,9 @@ LPCSTR lpszFilename) { clear_errors(); - FIXME("\n"); + FIXME("%s %s %s %p %d %s\n", debugstr_a(lpszSection), debugstr_a(lpszEntry), + debugstr_a(lpszDefault), RetBuffer, cbRetBuffer, + debugstr_a(lpszFilename)); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -392,7 +431,8 @@ WORD *pcbPathOut, DWORD *pvOption) { clear_errors(); - FIXME("\n"); + FIXME("%p %s %d %p %p %d %p %p\n", hwndParent, debugstr_w(lpszName), cbNameMax, + pcbNameOut, lpszPath, cbPathMax, pcbPathOut, pvOption); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -402,7 +442,8 @@ WORD *pcbPathOut, DWORD *pvOption) { clear_errors(); - FIXME("\n"); + FIXME("%p %s %d %p %p %d %p %p\n", hwndParent, debugstr_a(lpszName), cbNameMax, + pcbNameOut, lpszPath, cbPathMax, pcbPathOut, pvOption); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -582,7 +623,8 @@ LPCWSTR lpszSrcPath, LPCWSTR lpszDrivers) { clear_errors(); - FIXME("\n"); + FIXME("%p %s %s %s\n", hwndParent, debugstr_w(lpszInfFile), + debugstr_w(lpszSrcPath), debugstr_w(lpszDrivers)); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -591,7 +633,8 @@ LPCSTR lpszSrcPath, LPCSTR lpszDrivers) { clear_errors(); - FIXME("\n"); + FIXME("%p %s %s %s\n", hwndParent, debugstr_a(lpszInfFile), + debugstr_a(lpszSrcPath), debugstr_a(lpszDrivers)); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -795,21 +838,21 @@ BOOL WINAPI SQLManageDataSources(HWND hwnd) { clear_errors(); - FIXME("\n"); + FIXME("%p\n", hwnd); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } SQLRETURN WINAPI SQLPostInstallerErrorW(DWORD fErrorCode, LPCWSTR szErrorMsg) { - FIXME("\n"); + FIXME("%u %s\n", fErrorCode, debugstr_w(szErrorMsg)); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } SQLRETURN WINAPI SQLPostInstallerError(DWORD fErrorCode, LPCSTR szErrorMsg) { - FIXME("\n"); + FIXME("%u %s\n", fErrorCode, debugstr_a(szErrorMsg)); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -819,7 +862,8 @@ WORD *pcbString) { clear_errors(); - FIXME("\n"); + FIXME("%s %s %s %s %d %p\n", debugstr_w(lpszFileName), debugstr_w(lpszAppName), + debugstr_w(lpszKeyName), debugstr_w(lpszString), cbString, pcbString); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -829,7 +873,8 @@ WORD *pcbString) { clear_errors(); - FIXME("\n"); + FIXME("%s %s %s %s %d %p\n", debugstr_a(lpszFileName), debugstr_a(lpszAppName), + debugstr_a(lpszKeyName), debugstr_a(lpszString), cbString, pcbString); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -846,7 +891,7 @@ LPDWORD lpdwUsageCount) { clear_errors(); - FIXME("stub\n"); + FIXME("%s %d %p\n", debugstr_w(lpszDriver), fRemoveDSN, lpdwUsageCount); if (lpdwUsageCount) *lpdwUsageCount = 1; return TRUE; } @@ -855,7 +900,7 @@ LPDWORD lpdwUsageCount) { clear_errors(); - FIXME("stub\n"); + FIXME("%s %d %p\n", debugstr_a(lpszDriver), fRemoveDSN, lpdwUsageCount); if (lpdwUsageCount) *lpdwUsageCount = 1; return TRUE; } @@ -863,7 +908,7 @@ BOOL WINAPI SQLRemoveDriverManager(LPDWORD pdwUsageCount) { clear_errors(); - FIXME("stub\n"); + FIXME("%p\n", pdwUsageCount); if (pdwUsageCount) *pdwUsageCount = 1; return TRUE; } @@ -871,7 +916,7 @@ BOOL WINAPI SQLRemoveDSNFromIniW(LPCWSTR lpszDSN) { clear_errors(); - FIXME("\n"); + FIXME("%s\n", debugstr_w(lpszDSN)); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -879,7 +924,7 @@ BOOL WINAPI SQLRemoveDSNFromIni(LPCSTR lpszDSN) { clear_errors(); - FIXME("\n"); + FIXME("%s\n", debugstr_a(lpszDSN)); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -887,7 +932,7 @@ BOOL WINAPI SQLRemoveTranslatorW(LPCWSTR lpszTranslator, LPDWORD lpdwUsageCount) { clear_errors(); - FIXME("\n"); + FIXME("%s %p\n", debugstr_w(lpszTranslator), lpdwUsageCount); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -895,7 +940,7 @@ BOOL WINAPI SQLRemoveTranslator(LPCSTR lpszTranslator, LPDWORD lpdwUsageCount) { clear_errors(); - FIXME("\n"); + FIXME("%s %p\n", debugstr_a(lpszTranslator), lpdwUsageCount); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -903,6 +948,8 @@ BOOL WINAPI SQLSetConfigMode(UWORD wConfigMode) { clear_errors(); + TRACE("%u\n", wConfigMode); + if (wConfigMode > ODBC_SYSTEM_DSN) { push_error(ODBC_ERROR_INVALID_PARAM_SEQUENCE, odbc_error_invalid_param_sequence); @@ -918,7 +965,7 @@ BOOL WINAPI SQLValidDSNW(LPCWSTR lpszDSN) { clear_errors(); - FIXME("\n"); + FIXME("%s\n", debugstr_w(lpszDSN)); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -926,7 +973,7 @@ BOOL WINAPI SQLValidDSN(LPCSTR lpszDSN) { clear_errors(); - FIXME("\n"); + FIXME("%s\n", debugstr_a(lpszDSN)); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -934,7 +981,7 @@ BOOL WINAPI SQLWriteDSNToIniW(LPCWSTR lpszDSN, LPCWSTR lpszDriver) { clear_errors(); - FIXME("\n"); + FIXME("%s %s\n", debugstr_w(lpszDSN), debugstr_w(lpszDriver)); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -942,7 +989,7 @@ BOOL WINAPI SQLWriteDSNToIni(LPCSTR lpszDSN, LPCSTR lpszDriver) { clear_errors(); - FIXME("\n"); + FIXME("%s %s\n", debugstr_a(lpszDSN), debugstr_a(lpszDriver)); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -951,7 +998,8 @@ LPCWSTR lpszKeyName, LPCWSTR lpszString) { clear_errors(); - FIXME("\n"); + FIXME("%s %s %s %s\n", debugstr_w(lpszFileName), debugstr_w(lpszAppName), + debugstr_w(lpszKeyName), debugstr_w(lpszString)); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -960,7 +1008,8 @@ LPCSTR lpszKeyName, LPCSTR lpszString) { clear_errors(); - FIXME("\n"); + FIXME("%s %s %s %s\n", debugstr_a(lpszFileName), debugstr_a(lpszAppName), + debugstr_a(lpszKeyName), debugstr_a(lpszString)); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -968,17 +1017,62 @@ BOOL WINAPI SQLWritePrivateProfileStringW(LPCWSTR lpszSection, LPCWSTR lpszEntry, LPCWSTR lpszString, LPCWSTR lpszFilename) { - clear_errors(); - FIXME("\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + LONG ret; + HKEY hkey; + WCHAR softwareodbc[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C',0}; + + clear_errors(); + TRACE("%s %s %s %s\n", debugstr_w(lpszSection), debugstr_w(lpszEntry), + debugstr_w(lpszString), debugstr_w(lpszFilename)); + + if(!lpszFilename || !*lpszFilename) + { + push_error(ODBC_ERROR_INVALID_STR, odbc_error_invalid_param_string); + return FALSE; + } + + if ((ret = RegCreateKeyW(HKEY_CURRENT_USER, softwareodbc, &hkey)) == ERROR_SUCCESS) + { + HKEY hkeyfilename; + + if ((ret = RegCreateKeyW(hkey, lpszFilename, &hkeyfilename)) == ERROR_SUCCESS) + { + HKEY hkey_section; + + if ((ret = RegCreateKeyW(hkeyfilename, lpszSection, &hkey_section)) == ERROR_SUCCESS) + { + ret = RegSetValueExW(hkey_section, lpszEntry, 0, REG_SZ, (BYTE*)lpszString, (lstrlenW(lpszString)+1)*sizeof(WCHAR)); + RegCloseKey(hkey_section); + } + + RegCloseKey(hkeyfilename); + } + + RegCloseKey(hkey); + } + + return ret == ERROR_SUCCESS; } BOOL WINAPI SQLWritePrivateProfileString(LPCSTR lpszSection, LPCSTR lpszEntry, LPCSTR lpszString, LPCSTR lpszFilename) { - clear_errors(); - FIXME("\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} + BOOL ret; + WCHAR *sect, *entry, *string, *file; + clear_errors(); + TRACE("%s %s %s %s\n", lpszSection, lpszEntry, lpszString, lpszFilename); + + sect = heap_strdupAtoW(lpszSection); + entry = heap_strdupAtoW(lpszEntry); + string = heap_strdupAtoW(lpszString); + file = heap_strdupAtoW(lpszFilename); + + ret = SQLWritePrivateProfileStringW(sect, entry, string, file); + + heap_free(sect); + heap_free(entry); + heap_free(string); + heap_free(file); + + return ret; +} Modified: trunk/reactos/dll/win32/odbccp32/odbccp32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/odbccp32/odbccp3… ============================================================================== --- trunk/reactos/dll/win32/odbccp32/odbccp32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/odbccp32/odbccp32.spec [iso-8859-1] Sun Jul 19 23:09:04 2015 @@ -1,6 +1,6 @@ 2 stdcall SQLInstallDriver(str str str long ptr) 3 stdcall SQLInstallDriverManager(ptr long ptr) -4 stdcall SQLGetInstalledDrivers(str long ptr) +4 stdcall SQLGetInstalledDrivers(ptr long ptr) 5 stdcall SQLGetAvailableDrivers(str ptr long ptr) 6 stdcall SQLConfigDataSource(ptr long str str) 7 stdcall SQLRemoveDefaultDataSource() @@ -11,7 +11,7 @@ 12 stdcall SQLCreateDataSource(ptr str) 13 stdcall SQLGetTranslator(ptr str long ptr ptr long ptr ptr) 14 stdcall SQLWritePrivateProfileString(str str str str) -15 stdcall SQLGetPrivateProfileString(str str str str long str) +15 stdcall SQLGetPrivateProfileString(str str str ptr long str) 16 stdcall SQLValidDSN(str) 17 stdcall SQLRemoveDriverManager(ptr) 18 stdcall SQLInstallTranslator(str str str ptr long ptr long ptr) @@ -31,7 +31,7 @@ 112 stub SelectTransDlg 202 stdcall SQLInstallDriverW(wstr wstr wstr long ptr) 203 stdcall SQLInstallDriverManagerW(ptr long ptr) -204 stdcall SQLGetInstalledDriversW(wstr long ptr) +204 stdcall SQLGetInstalledDriversW(ptr long ptr) 205 stdcall SQLGetAvailableDriversW(wstr ptr long ptr) 206 stdcall SQLConfigDataSourceW(ptr long wstr wstr) 208 stdcall SQLWriteDSNToIniW(wstr wstr) @@ -40,7 +40,7 @@ 212 stdcall SQLCreateDataSourceW(ptr wstr) 213 stdcall SQLGetTranslatorW(ptr wstr long ptr ptr long ptr ptr) 214 stdcall SQLWritePrivateProfileStringW(wstr wstr wstr wstr) -215 stdcall SQLGetPrivateProfileStringW(wstr wstr wstr wstr long wstr) +215 stdcall SQLGetPrivateProfileStringW(wstr wstr wstr ptr long wstr) 216 stdcall SQLValidDSNW(wstr) 218 stdcall SQLInstallTranslatorW(wstr wstr wstr ptr long ptr long ptr) 219 stdcall SQLRemoveTranslatorW(wstr ptr) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Jul 19 23:09:04 2015 @@ -144,7 +144,7 @@ reactos/dll/win32/ntprint # Synced to WineStaging-1.7.37 reactos/dll/win32/objsel # Synced to WineStaging-1.7.37 reactos/dll/win32/odbc32 # Synced to WineStaging-1.7.37. Depends on port of Linux ODBC. -reactos/dll/win32/odbccp32 # Synced to WineStaging-1.7.37 +reactos/dll/win32/odbccp32 # Synced to WineStaging-1.7.47 reactos/dll/win32/ole32 # Synced to WineStaging-1.7.37 reactos/dll/win32/oleacc # Synced to WineStaging-1.7.37 reactos/dll/win32/oleaut32 # Synced to WineStaging-1.7.37

9 years, 5 months

[akhaldi] 68466: [MSXML3_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jul 19 23:07:29 2015 New Revision: 68466 URL: http://svn.reactos.org/svn/reactos?rev=68466&view=rev Log: [MSXML3_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/rostests/winetests/msxml3/domdoc.c Modified: trunk/rostests/winetests/msxml3/domdoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/domdoc.c… ============================================================================== --- trunk/rostests/winetests/msxml3/domdoc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msxml3/domdoc.c [iso-8859-1] Sun Jul 19 23:07:29 2015 @@ -2243,10 +2243,9 @@ ok( tag != NULL, "tag was null\n"); ok( !lstrcmpW( tag, szSSearch ), "incorrect tag name\n"); SysFreeString( tag ); + + IXMLDOMElement_Release( element ); } - - if (element) - IXMLDOMElement_Release( element ); ok(IXMLDOMDocument_Release( doc ) == 0, "document is not destroyed\n"); free_bstrs();

9 years, 5 months

[akhaldi] 68465: [MSXML3] Sync with Wine Staging 1.7.47. CORE-9924

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jul 19 23:07:13 2015 New Revision: 68465 URL: http://svn.reactos.org/svn/reactos?rev=68465&view=rev Log: [MSXML3] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/reactos/dll/win32/msxml3/domdoc.c trunk/reactos/dll/win32/msxml3/node.c trunk/reactos/dll/win32/msxml3/saxreader.c trunk/reactos/dll/win32/msxml3/xslpattern.l trunk/reactos/dll/win32/msxml3/xslpattern.yy.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msxml3/domdoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/domdoc.c?… ============================================================================== --- trunk/reactos/dll/win32/msxml3/domdoc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/domdoc.c [iso-8859-1] Sun Jul 19 23:07:13 2015 @@ -2120,7 +2120,13 @@ case 1: /* Only takes UTF-8 strings. * NOT NULL-terminated. */ - SafeArrayAccessData(psa, (void**)&str); + hr = SafeArrayAccessData(psa, (void**)&str); + if (FAILED(hr)) + { + This->error = hr; + WARN("failed to access array data, 0x%08x\n", hr); + break; + } SafeArrayGetUBound(psa, 1, &len); if ((xmldoc = doparse(This, str, ++len, XML_CHAR_ENCODING_UTF8))) Modified: trunk/reactos/dll/win32/msxml3/node.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/node.c?re… ============================================================================== --- trunk/reactos/dll/win32/msxml3/node.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/node.c [iso-8859-1] Sun Jul 19 23:07:13 2015 @@ -1598,7 +1598,29 @@ FIXME("(%p)->(%p)\n", This, domNodeType); - *domNodeType = This->node.node->type; + switch (This->node.node->type) + { + case XML_ELEMENT_NODE: + case XML_ATTRIBUTE_NODE: + case XML_TEXT_NODE: + case XML_CDATA_SECTION_NODE: + case XML_ENTITY_REF_NODE: + case XML_ENTITY_NODE: + case XML_PI_NODE: + case XML_COMMENT_NODE: + case XML_DOCUMENT_NODE: + case XML_DOCUMENT_TYPE_NODE: + case XML_DOCUMENT_FRAG_NODE: + case XML_NOTATION_NODE: + /* we only care about this set of types, libxml2 type values are + exactly what we need */ + *domNodeType = (DOMNodeType)This->node.node->type; + break; + default: + *domNodeType = NODE_INVALID; + break; + } + return S_OK; } @@ -1997,9 +2019,11 @@ pUnk = create_doc_fragment( node ); break; case XML_DTD_NODE: + case XML_DOCUMENT_TYPE_NODE: pUnk = create_doc_type( node ); break; - default: { + case XML_ENTITY_NODE: + case XML_NOTATION_NODE: { unknode *new_node; FIXME("only creating basic node for type %d\n", node->type); @@ -2012,7 +2036,11 @@ new_node->ref = 1; init_xmlnode(&new_node->node, node, &new_node->IXMLDOMNode_iface, NULL); pUnk = (IUnknown*)&new_node->IXMLDOMNode_iface; - } + break; + } + default: + ERR("Called for unsupported node type %d\n", node->type); + return NULL; } hr = IUnknown_QueryInterface(pUnk, &IID_IXMLDOMNode, (LPVOID*)&ret); Modified: trunk/reactos/dll/win32/msxml3/saxreader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/saxreader… ============================================================================== --- trunk/reactos/dll/win32/msxml3/saxreader.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/saxreader.c [iso-8859-1] Sun Jul 19 23:07:13 2015 @@ -646,7 +646,7 @@ { WCHAR msg[1024]; if(!FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM, - NULL, hr, 0, msg, sizeof(msg), NULL)) + NULL, hr, 0, msg, sizeof(msg)/sizeof(msg[0]), NULL)) { FIXME("MSXML errors not yet supported.\n"); msg[0] = '\0'; Modified: trunk/reactos/dll/win32/msxml3/xslpattern.l URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/xslpatter… ============================================================================== --- trunk/reactos/dll/win32/msxml3/xslpattern.l [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/xslpattern.l [iso-8859-1] Sun Jul 19 23:07:13 2015 @@ -152,6 +152,7 @@ %% +xmlChar* XSLPattern_to_XPath(xmlXPathContextPtr, xmlChar const*) DECLSPEC_HIDDEN; xmlChar* XSLPattern_to_XPath(xmlXPathContextPtr ctxt, xmlChar const* xslpat_str) { parser_param p; Modified: trunk/reactos/dll/win32/msxml3/xslpattern.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/xslpatter… ============================================================================== --- trunk/reactos/dll/win32/msxml3/xslpattern.yy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/xslpattern.yy.c [iso-8859-1] Sun Jul 19 23:07:13 2015 @@ -2211,6 +2211,7 @@ +xmlChar* XSLPattern_to_XPath(xmlXPathContextPtr, xmlChar const*) DECLSPEC_HIDDEN; xmlChar* XSLPattern_to_XPath(xmlXPathContextPtr ctxt, xmlChar const* xslpat_str) { parser_param p; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Jul 19 23:07:13 2015 @@ -134,7 +134,7 @@ reactos/dll/win32/msvidc32 # Synced to WineStaging-1.7.37 reactos/dll/win32/msxml # Synced to WineStaging-1.7.37 reactos/dll/win32/msxml2 # Synced to WineStaging-1.7.37 -reactos/dll/win32/msxml3 # Synced to WineStaging-1.7.37 +reactos/dll/win32/msxml3 # Synced to WineStaging-1.7.47 reactos/dll/win32/msxml4 # Synced to WineStaging-1.7.37 reactos/dll/win32/msxml6 # Synced to WineStaging-1.7.37 reactos/dll/win32/nddeapi # Synced to WineStaging-1.7.37

9 years, 5 months

← Newer
1
...
9
10
11
12
13
14
15
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2015