Ros-diffs August 2005

ros-diffs@reactos.org

23 participants
669 discussions

[navaraf] 17018: Merge 16747 from trunk:

by navaraf＠svn.reactos.com

Merge 16747 from trunk: Don't use DeleteDC on DC handles returned by GetDC. Modified: branches/ros-branch-0_2_7/reactos/lib/comctl32/header.c _____ Modified: branches/ros-branch-0_2_7/reactos/lib/comctl32/header.c --- branches/ros-branch-0_2_7/reactos/lib/comctl32/header.c 2005-08-03 17:15:48 UTC (rev 17017) +++ branches/ros-branch-0_2_7/reactos/lib/comctl32/header.c 2005-08-03 17:16:24 UTC (rev 17018) @@ -1,1849 +1,1849 @@ -/* - * Header control - * - * Copyright 1998 Eric Kohl - * Copyright 2000 Eric Kohl for CodeWeavers - * Copyright 2003 Maxime Bellenge - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * TODO: - * - Imagelist support (partially). - * - Callback items (under construction). - * - Hottrack support (partially). - * - Custom draw support (including Notifications). - * - Drag and Drop support (including Notifications). - * - New messages. - * - Use notification format - * - Correct the order maintenance code to preserve valid order - * - */ - -#include <stdarg.h> -#include <string.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/unicode.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "commctrl.h" -#include "comctl32.h" -#include "imagelist.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(header); - -typedef struct -{ - INT cxy; - HBITMAP hbm; - LPWSTR pszText; - INT fmt; - LPARAM lParam; - INT iImage; - INT iOrder; /* see documentation of HD_ITEM */ - - BOOL bDown; /* is item pressed? (used for drawing) */ - RECT rect; /* bounding rectangle of the item */ -} HEADER_ITEM; - - -typedef struct -{ - HWND hwndNotify; /* Owner window to send notifications to */ - INT nNotifyFormat; /* format used for WM_NOTIFY messages */ - UINT uNumItem; /* number of items (columns) */ - INT nHeight; /* height of the header (pixels) */ - HFONT hFont; /* handle to the current font */ - HCURSOR hcurArrow; /* handle to the arrow cursor */ - HCURSOR hcurDivider; /* handle to a cursor (used over dividers) <-|-> */ - HCURSOR hcurDivopen; /* handle to a cursor (used over dividers) <-||-> */ - BOOL bCaptured; /* Is the mouse captured? */ - BOOL bPressed; /* Is a header item pressed (down)? */ - BOOL bTracking; /* Is in tracking mode? */ - BOOL bUnicode; /* Unicode flag */ - INT iMoveItem; /* index of tracked item. (Tracking mode) */ - INT xTrackOffset; /* distance between the right side of the tracked item and the cursor */ - INT xOldTrack; /* track offset (see above) after the last WM_MOUSEMOVE */ - INT nOldWidth; /* width of a sizing item after the last WM_MOUSEMOVE */ - INT iHotItem; /* index of hot item (cursor is over this item) */ - INT iMargin; /* width of the margin that surrounds a bitmap */ - - HIMAGELIST himl; /* handle to an image list (may be 0) */ - HEADER_ITEM *items; /* pointer to array of HEADER_ITEM's */ - BOOL bRectsValid; /* validity flag for bounding rectangles */ -} HEADER_INFO; - - -#define VERT_BORDER 3 -#define DIVIDER_WIDTH 10 - -#define HEADER_GetInfoPtr(hwnd) ((HEADER_INFO *)GetWindowLongPtrW(hwnd,0)) - - -inline static LRESULT -HEADER_IndexToOrder (HWND hwnd, INT iItem) -{ - HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); - HEADER_ITEM *lpItem = &infoPtr->items[iItem]; - return lpItem->iOrder; -} - - -static INT -HEADER_OrderToIndex(HWND hwnd, WPARAM wParam) -{ - HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); - INT iorder = (INT)wParam; - UINT i; - - if ((iorder <0) || iorder >infoPtr->uNumItem) - return iorder; - for (i=0; i<infoPtr->uNumItem; i++) - if (HEADER_IndexToOrder(hwnd,i) == iorder) - return i; - return iorder; -} - -static void -HEADER_SetItemBounds (HWND hwnd) -{ - HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); - HEADER_ITEM *phdi; - RECT rect; - unsigned int i; - int x; - - infoPtr->bRectsValid = TRUE; - - if (infoPtr->uNumItem == 0) - return; - - GetClientRect (hwnd, &rect); - - x = rect.left; - for (i = 0; i < infoPtr->uNumItem; i++) { - phdi = &infoPtr->items[HEADER_OrderToIndex(hwnd,i)]; - phdi->rect.top = rect.top; - phdi->rect.bottom = rect.bottom; - phdi->rect.left = x; - phdi->rect.right = phdi->rect.left + ((phdi->cxy>0)?phdi->cxy:0); - x = phdi->rect.right; - } -} - -static LRESULT -HEADER_Size (HWND hwnd, WPARAM wParam) -{ - HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); - - infoPtr->bRectsValid = FALSE; - - return 0; -} - - -static INT -HEADER_DrawItem (HWND hwnd, HDC hdc, INT iItem, BOOL bHotTrack) -{ - HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); - HEADER_ITEM *phdi = &infoPtr->items[iItem]; - RECT r; - INT oldBkMode, cxEdge = GetSystemMetrics(SM_CXEDGE); - - TRACE("DrawItem(iItem %d bHotTrack %d unicode flag %d)\n", iItem, bHotTrack, infoPtr->bUnicode); - - if (!infoPtr->bRectsValid) - HEADER_SetItemBounds(hwnd); - - r = phdi->rect; - if (r.right - r.left == 0) - return phdi->rect.right; - - if (GetWindowLongW (hwnd, GWL_STYLE) & HDS_BUTTONS) { - if (phdi->bDown) { - DrawEdge (hdc, &r, BDR_RAISEDOUTER, - BF_RECT | BF_FLAT | BF_MIDDLE | BF_ADJUST); - r.left += 2; - r.top += 2; - } - else - DrawEdge (hdc, &r, EDGE_RAISED, - BF_RECT | BF_SOFT | BF_MIDDLE | BF_ADJUST); - } - else - DrawEdge (hdc, &r, EDGE_ETCHED, BF_BOTTOM | BF_RIGHT | BF_ADJUST); - - r.left -= cxEdge; - r.right += cxEdge; - - if (phdi->fmt & HDF_OWNERDRAW) { - DRAWITEMSTRUCT dis; - dis.CtlType = ODT_HEADER; - dis.CtlID = GetWindowLongPtrW (hwnd, GWLP_ID); - dis.itemID = iItem; - dis.itemAction = ODA_DRAWENTIRE; - dis.itemState = phdi->bDown ? ODS_SELECTED : 0; - dis.hwndItem = hwnd; - dis.hDC = hdc; - dis.rcItem = r; - dis.itemData = phdi->lParam; - oldBkMode = SetBkMode(hdc, TRANSPARENT); - SendMessageW (infoPtr->hwndNotify, WM_DRAWITEM, - (WPARAM)dis.CtlID, (LPARAM)&dis); - if (oldBkMode != TRANSPARENT) - SetBkMode(hdc, oldBkMode); - } - else { - UINT rw, rh, /* width and height of r */ - *x = NULL, *w = NULL; /* x and width of the pic (bmp or img) which is part of cnt */ - /* cnt,txt,img,bmp */ - UINT cx, tx, ix, bx, - cw, tw, iw, bw; - BITMAP bmp; - - cw = tw = iw = bw = 0; - rw = r.right - r.left; - rh = r.bottom - r.top; - - if (phdi->fmt & HDF_STRING) { - RECT textRect; - - DrawTextW (hdc, phdi->pszText, -1, - &textRect, DT_LEFT|DT_VCENTER|DT_SINGLELINE|DT_CALCRECT); - cw = textRect.right - textRect.left + 2 * infoPtr->iMargin; - } - - if ((phdi->fmt & HDF_IMAGE) && (infoPtr->himl)) { - iw = infoPtr->himl->cx + 2 * infoPtr->iMargin; - x = &ix; - w = &iw; - } - - if ((phdi->fmt & HDF_BITMAP) && (phdi->hbm)) { - GetObjectW (phdi->hbm, sizeof(BITMAP), (LPVOID)&bmp); - bw = bmp.bmWidth + 2 * infoPtr->iMargin; - if (!iw) { - x = &bx; - w = &bw; - } - } - - if (bw || iw) - cw += *w; - - /* align cx using the unclipped cw */ - if ((phdi->fmt & HDF_JUSTIFYMASK) == HDF_LEFT) - cx = r.left; - else if ((phdi->fmt & HDF_JUSTIFYMASK) == HDF_CENTER) - cx = r.left + rw / 2 - cw / 2; - else /* HDF_RIGHT */ - cx = r.right - cw; - - /* clip cx & cw */ - if (cx < r.left) - cx = r.left; - if (cx + cw > r.right) - cw = r.right - cx; - - tx = cx + infoPtr->iMargin; - /* since cw might have changed we have to recalculate tw */ - tw = cw - infoPtr->iMargin * 2; - - if (iw || bw) { - tw -= *w; - if (phdi->fmt & HDF_BITMAP_ON_RIGHT) { - /* put pic behind text */ - *x = cx + tw + infoPtr->iMargin * 3; - } else { - *x = cx + infoPtr->iMargin; - /* move text behind pic */ - tx += *w; - } - } - - if (iw && bw) { - /* since we're done with the layout we can - now calculate the position of bmp which - has no influence on alignment and layout - because of img */ - if ((phdi->fmt & HDF_JUSTIFYMASK) == HDF_RIGHT) - bx = cx - bw + infoPtr->iMargin; - else - bx = cx + cw + infoPtr->iMargin; - } - - if (iw || bw) { - HDC hClipDC = GetDC(hwnd); - HRGN hClipRgn = CreateRectRgn(r.left, r.top, r.right, r.bottom); - SelectClipRgn(hClipDC, hClipRgn); - - if (bw) { - HDC hdcBitmap = CreateCompatibleDC (hClipDC); - SelectObject (hdcBitmap, phdi->hbm); - BitBlt (hClipDC, bx, r.top + ((INT)rh - bmp.bmHeight) / 2, - bmp.bmWidth, bmp.bmHeight, hdcBitmap, 0, 0, SRCCOPY); - DeleteDC (hdcBitmap); - } - - if (iw) { - ImageList_DrawEx (infoPtr->himl, phdi->iImage, hClipDC, - ix, r.top + ((INT)rh - infoPtr->himl->cy) / 2, - infoPtr->himl->cx, infoPtr->himl->cy, CLR_DEFAULT, CLR_DEFAULT, 0); - } - - DeleteObject(hClipRgn); - DeleteDC(hClipDC); - } - - if (((phdi->fmt & HDF_STRING) - || (!(phdi->fmt & (HDF_OWNERDRAW|HDF_STRING|HDF_BITMAP| - HDF_BITMAP_ON_RIGHT|HDF_IMAGE)))) /* no explicit format specified? */ - && (phdi->pszText)) { - oldBkMode = SetBkMode(hdc, TRANSPARENT); - SetTextColor (hdc, (bHotTrack) ? COLOR_HIGHLIGHT : COLOR_BTNTEXT); - r.left = tx; - r.right = tx + tw; - DrawTextW (hdc, phdi->pszText, -1, - &r, DT_LEFT|DT_END_ELLIPSIS|DT_VCENTER|DT_SINGLELINE); - if (oldBkMode != TRANSPARENT) - SetBkMode(hdc, oldBkMode); - } - }/*Ownerdrawn*/ - - return phdi->rect.right; -} - - -static void -HEADER_Refresh (HWND hwnd, HDC hdc) -{ - HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); - HFONT hFont, hOldFont; - RECT rect; - HBRUSH hbrBk; - UINT i; - INT x; - - /* get rect for the bar, adjusted for the border */ - GetClientRect (hwnd, &rect); - - hFont = infoPtr->hFont ? infoPtr->hFont : GetStockObject (SYSTEM_FONT); - hOldFont = SelectObject (hdc, hFont); - - /* draw Background */ - hbrBk = GetSysColorBrush(COLOR_3DFACE); - FillRect(hdc, &rect, hbrBk); - - x = rect.left; - for (i = 0; i < infoPtr->uNumItem; i++) { - x = HEADER_DrawItem (hwnd, hdc, HEADER_OrderToIndex(hwnd,i), FALSE); - } - - if ((x <= rect.right) && (infoPtr->uNumItem > 0)) { - rect.left = x; - if (GetWindowLongW (hwnd, GWL_STYLE) & HDS_BUTTONS) - DrawEdge (hdc, &rect, EDGE_RAISED, BF_TOP|BF_LEFT|BF_BOTTOM|BF_SOFT); - else - DrawEdge (hdc, &rect, EDGE_ETCHED, BF_BOTTOM); - } - - SelectObject (hdc, hOldFont); -} - - -static void -HEADER_RefreshItem (HWND hwnd, HDC hdc, INT iItem) -{ - HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); - HFONT hFont, hOldFont; - - hFont = infoPtr->hFont ? infoPtr->hFont : GetStockObject (SYSTEM_FONT); - hOldFont = SelectObject (hdc, hFont); - HEADER_DrawItem (hwnd, hdc, iItem, FALSE); - SelectObject (hdc, hOldFont); -} - - -static void -HEADER_InternalHitTest (HWND hwnd, LPPOINT lpPt, UINT *pFlags, INT *pItem) -{ - HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); - RECT rect, rcTest; - UINT iCount; - INT width; - BOOL bNoWidth; - - GetClientRect (hwnd, &rect); - - *pFlags = 0; - bNoWidth = FALSE; - if (PtInRect (&rect, *lpPt)) - { - if (infoPtr->uNumItem == 0) { - *pFlags |= HHT_NOWHERE; - *pItem = 1; - TRACE("NOWHERE\n"); - return; - } - else { - /* somewhere inside */ - for (iCount = 0; iCount < infoPtr->uNumItem; iCount++) { - rect = infoPtr->items[iCount].rect; - width = rect.right - rect.left; - if (width == 0) { - bNoWidth = TRUE; - continue; - } - if (PtInRect (&rect, *lpPt)) { - if (width <= 2 * DIVIDER_WIDTH) { - *pFlags |= HHT_ONHEADER; - *pItem = iCount; - TRACE("ON HEADER %d\n", iCount); - return; - } - if (iCount > 0) { - rcTest = rect; - rcTest.right = rcTest.left + DIVIDER_WIDTH; - if (PtInRect (&rcTest, *lpPt)) { - if (bNoWidth) { - *pFlags |= HHT_ONDIVOPEN; - *pItem = iCount - 1; - TRACE("ON DIVOPEN %d\n", *pItem); - return; - } - else { - *pFlags |= HHT_ONDIVIDER; - *pItem = iCount - 1; - TRACE("ON DIVIDER %d\n", *pItem); - return; - } - } - } - rcTest = rect; - rcTest.left = rcTest.right - DIVIDER_WIDTH; - if (PtInRect (&rcTest, *lpPt)) { - *pFlags |= HHT_ONDIVIDER; - *pItem = iCount; - TRACE("ON DIVIDER %d\n", *pItem); - return; - } - - *pFlags |= HHT_ONHEADER; - *pItem = iCount; - TRACE("ON HEADER %d\n", iCount); - return; - } - } - - /* check for last divider part (on nowhere) */ - rect = infoPtr->items[infoPtr->uNumItem-1].rect; - rect.left = rect.right; - rect.right += DIVIDER_WIDTH; - if (PtInRect (&rect, *lpPt)) { - if (bNoWidth) { - *pFlags |= HHT_ONDIVOPEN; - *pItem = infoPtr->uNumItem - 1; - TRACE("ON DIVOPEN %d\n", *pItem); - return; - } - else { - *pFlags |= HHT_ONDIVIDER; - *pItem = infoPtr->uNumItem-1; - TRACE("ON DIVIDER %d\n", *pItem); - return; - } - } - - *pFlags |= HHT_NOWHERE; - *pItem = 1; - TRACE("NOWHERE\n"); - return; - } - } - else { - if (lpPt->x < rect.left) { - TRACE("TO LEFT\n"); - *pFlags |= HHT_TOLEFT; - } - else if (lpPt->x > rect.right) { - TRACE("TO RIGHT\n"); - *pFlags |= HHT_TORIGHT; - } - - if (lpPt->y < rect.top) { - TRACE("ABOVE\n"); - *pFlags |= HHT_ABOVE; - } - else if (lpPt->y > rect.bottom) { - TRACE("BELOW\n"); - *pFlags |= HHT_BELOW; - } - } - - *pItem = 1; - TRACE("flags=0x%X\n", *pFlags); - return; -} - - -static void -HEADER_DrawTrackLine (HWND hwnd, HDC hdc, INT x) -{ - RECT rect; - HPEN hOldPen; - INT oldRop; - - GetClientRect (hwnd, &rect); - - hOldPen = SelectObject (hdc, GetStockObject (BLACK_PEN)); - oldRop = SetROP2 (hdc, R2_XORPEN); - MoveToEx (hdc, x, rect.top, NULL); - LineTo (hdc, x, rect.bottom); - SetROP2 (hdc, oldRop); - SelectObject (hdc, hOldPen); -} - - -static BOOL -HEADER_SendSimpleNotify (HWND hwnd, UINT code) -{ - HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); - NMHDR nmhdr; - - nmhdr.hwndFrom = hwnd; - nmhdr.idFrom = GetWindowLongPtrW (hwnd, GWLP_ID); - nmhdr.code = code; - - return (BOOL)SendMessageW (infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM)nmhdr.idFrom, (LPARAM)&nmhdr); -} - -static BOOL -HEADER_SendHeaderNotify (HWND hwnd, UINT code, INT iItem, INT mask) -{ - HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); - NMHEADERA nmhdr; - HDITEMA nmitem; - - nmhdr.hdr.hwndFrom = hwnd; - nmhdr.hdr.idFrom = GetWindowLongPtrW (hwnd, GWLP_ID); - nmhdr.hdr.code = code; - nmhdr.iItem = iItem; - nmhdr.iButton = 0; - nmhdr.pitem = &nmitem; - nmitem.mask = mask; - nmitem.cxy = infoPtr->items[iItem].cxy; - nmitem.hbm = infoPtr->items[iItem].hbm; - nmitem.pszText = NULL; - nmitem.cchTextMax = 0; -/* nmitem.pszText = infoPtr->items[iItem].pszText; */ -/* nmitem.cchTextMax = infoPtr->items[iItem].cchTextMax; */ - nmitem.fmt = infoPtr->items[iItem].fmt; - nmitem.lParam = infoPtr->items[iItem].lParam; - nmitem.iOrder = infoPtr->items[iItem].iOrder; - nmitem.iImage = infoPtr->items[iItem].iImage; - - return (BOOL)SendMessageW (infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM)nmhdr.hdr.idFrom, (LPARAM)&nmhdr); -} - - -static BOOL -HEADER_SendClickNotify (HWND hwnd, UINT code, INT iItem) -{ - HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); - NMHEADERA nmhdr; - - nmhdr.hdr.hwndFrom = hwnd; - nmhdr.hdr.idFrom = GetWindowLongPtrW (hwnd, GWLP_ID); - nmhdr.hdr.code = code; - nmhdr.iItem = iItem; - nmhdr.iButton = 0; - nmhdr.pitem = NULL; - - return (BOOL)SendMessageA (infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM)nmhdr.hdr.idFrom, (LPARAM)&nmhdr); -} - - -static LRESULT -HEADER_CreateDragImage (HWND hwnd, WPARAM wParam) -{ - FIXME("empty stub!\n"); - return 0; -} - - -static LRESULT -HEADER_DeleteItem (HWND hwnd, WPARAM wParam) -{ - HEADER_INFO *infoPtr = HEADER_GetInfoPtr(hwnd); - INT iItem = (INT)wParam; - - TRACE("[iItem=%d]\n", iItem); - - if ((iItem < 0) || (iItem >= (INT)infoPtr->uNumItem)) - return FALSE; - - if (infoPtr->uNumItem == 1) { - TRACE("Simple delete!\n"); - if (infoPtr->items[0].pszText) - Free (infoPtr->items[0].pszText); - Free (infoPtr->items); - infoPtr->items = 0; - infoPtr->uNumItem = 0; - } - else { - HEADER_ITEM *oldItems = infoPtr->items; - HEADER_ITEM *pItem; - INT i; - INT iOrder; - TRACE("Complex delete! [iItem=%d]\n", iItem); - - if (infoPtr->items[iItem].pszText) - Free (infoPtr->items[iItem].pszText); - iOrder = infoPtr->items[iItem].iOrder; - - infoPtr->uNumItem--; - infoPtr->items = Alloc (sizeof (HEADER_ITEM) * infoPtr->uNumItem); - /* pre delete copy */ - if (iItem > 0) { - memcpy (&infoPtr->items[0], &oldItems[0], - iItem * sizeof(HEADER_ITEM)); - } - - /* post delete copy */ - if (iItem < infoPtr->uNumItem) { - memcpy (&infoPtr->items[iItem], &oldItems[iItem+1], - (infoPtr->uNumItem - iItem) * sizeof(HEADER_ITEM)); - } - - /* Correct the orders */ - for (i=infoPtr->uNumItem, pItem = infoPtr->items; i; i--, pItem++) - { - if (pItem->iOrder > iOrder) - pItem->iOrder--; - } - Free (oldItems); - } - - HEADER_SetItemBounds (hwnd); - - InvalidateRect(hwnd, NULL, FALSE); - - return TRUE; -} - - -static LRESULT -HEADER_GetImageList (HWND hwnd) -{ - HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); - - return (LRESULT)infoPtr->himl; -} - - -static LRESULT -HEADER_GetItemA (HWND hwnd, WPARAM wParam, LPARAM lParam) -{ - HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); - HDITEMA *phdi = (HDITEMA*)lParam; - INT nItem = (INT)wParam; - HEADER_ITEM *lpItem; - - if (!phdi) - return FALSE; - - TRACE("[nItem=%d]\n", nItem); - - if (phdi->mask == 0) - return TRUE; - - if ((nItem < 0) || (nItem >= (INT)infoPtr->uNumItem)) { - lpItem = NULL; - } - else { - lpItem = &infoPtr->items[nItem]; - } - - if (phdi->mask & HDI_BITMAP) - phdi->hbm = (lpItem != NULL) ? lpItem->hbm : 0; - - if (phdi->mask & HDI_FORMAT) - phdi->fmt = (lpItem != NULL) ? lpItem->fmt : 0; - - if (phdi->mask & HDI_WIDTH) - phdi->cxy = (lpItem != NULL) ? lpItem->cxy : 0; - - if (phdi->mask & HDI_LPARAM) - phdi->lParam = (lpItem != NULL) ? lpItem->lParam : 0; - - if (phdi->mask & HDI_TEXT) { - if (lpItem == NULL) { - *phdi->pszText = 0; - } - else if (lpItem->pszText != LPSTR_TEXTCALLBACKW) { - if (lpItem->pszText) - WideCharToMultiByte (CP_ACP, 0, lpItem->pszText, -1, - phdi->pszText, phdi->cchTextMax, NULL, NULL); - else - *phdi->pszText = 0; - } - else - phdi->pszText = LPSTR_TEXTCALLBACKA; - } - - if (phdi->mask & HDI_IMAGE) - phdi->iImage = (lpItem != NULL) ? lpItem->iImage : 0; - - if (phdi->mask & HDI_ORDER) - phdi->iOrder = (lpItem != NULL) ? lpItem->iOrder : 0; - - return TRUE; -} - - -static LRESULT -HEADER_GetItemW (HWND hwnd, WPARAM wParam, LPARAM lParam) -{ - HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); - HDITEMW *phdi = (HDITEMW*)lParam; - INT nItem = (INT)wParam; - HEADER_ITEM *lpItem; - - if (!phdi) - return FALSE; - - TRACE("[nItem=%d]\n", nItem); - - if (phdi->mask == 0) - return TRUE; - - if ((nItem < 0) || (nItem >= (INT)infoPtr->uNumItem)) { - lpItem = NULL; - } - else { - lpItem = &infoPtr->items[nItem]; - } - - if (phdi->mask & HDI_BITMAP) - phdi->hbm = (lpItem != NULL) ? lpItem->hbm : 0; - - if (phdi->mask & HDI_FORMAT) - phdi->fmt = (lpItem != NULL) ? lpItem->fmt : 0; - - if (phdi->mask & HDI_WIDTH) - phdi->cxy = (lpItem != NULL) ? lpItem->cxy : 0; - - if (phdi->mask & HDI_LPARAM) - phdi->lParam = (lpItem != NULL) ? lpItem->lParam : 0; - - if (phdi->mask & HDI_TEXT) { - if (lpItem == NULL) { - *phdi->pszText = 0; - } - else if (lpItem->pszText != LPSTR_TEXTCALLBACKW) { - if (lpItem->pszText) - lstrcpynW (phdi->pszText, lpItem->pszText, phdi->cchTextMax); - else - *phdi->pszText = 0; - } - else - phdi->pszText = LPSTR_TEXTCALLBACKW; - } - - if (phdi->mask & HDI_IMAGE) - phdi->iImage = (lpItem != NULL) ? lpItem->iImage : 0; - - if (phdi->mask & HDI_ORDER) - phdi->iOrder = (lpItem != NULL) ? lpItem->iOrder : 0; - - return TRUE; -} - - -inline static LRESULT -HEADER_GetItemCount (HWND hwnd) -{ - HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); - return infoPtr->uNumItem; -} - - -static LRESULT -HEADER_GetItemRect (HWND hwnd, WPARAM wParam, LPARAM lParam) -{ - HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); - INT iItem = (INT)wParam; - LPRECT lpRect = (LPRECT)lParam; - - if ((iItem < 0) || (iItem >= (INT)infoPtr->uNumItem)) - return FALSE; - - lpRect->left = infoPtr->items[iItem].rect.left; - lpRect->right = infoPtr->items[iItem].rect.right; - lpRect->top = infoPtr->items[iItem].rect.top; - lpRect->bottom = infoPtr->items[iItem].rect.bottom; - - return TRUE; -} - - -static LRESULT -HEADER_GetOrderArray(HWND hwnd, WPARAM wParam, LPARAM lParam) -{ - int i; - LPINT order = (LPINT) lParam; - HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); - - if ((unsigned int)wParam <infoPtr->uNumItem) - return FALSE; - for (i=0; i<(int)wParam; i++) - *order++=HEADER_OrderToIndex(hwnd,i); - return TRUE; -} - -static LRESULT -HEADER_SetOrderArray(HWND hwnd, WPARAM wParam, LPARAM lParam) -{ - int i; - LPINT order = (LPINT) lParam; - HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); - HEADER_ITEM *lpItem; - - if ((unsigned int)wParam <infoPtr->uNumItem) - return FALSE; - for (i=0; i<(int)wParam; i++) - { - lpItem = &infoPtr->items[*order++]; - lpItem->iOrder=i; - } - infoPtr->bRectsValid=0; - InvalidateRect(hwnd, NULL, FALSE); - return TRUE; -} - -inline static LRESULT -HEADER_GetUnicodeFormat (HWND hwnd) -{ - HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); - return infoPtr->bUnicode; -} - - -static LRESULT -HEADER_HitTest (HWND hwnd, WPARAM wParam, LPARAM lParam) -{ - LPHDHITTESTINFO phti = (LPHDHITTESTINFO)lParam; - - HEADER_InternalHitTest (hwnd, &phti->pt, &phti->flags, &phti->iItem); - - if (phti->flags == HHT_NOWHERE) - return -1; - else - return phti->iItem; -} - - -static LRESULT -HEADER_InsertItemA (HWND hwnd, WPARAM wParam, LPARAM lParam) -{ - HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); - HDITEMA *phdi = (HDITEMA*)lParam; - INT nItem = (INT)wParam; - HEADER_ITEM *lpItem; - INT len, iOrder; - UINT i; - - if ((phdi == NULL) || (nItem < 0)) - return -1; - - if (nItem > infoPtr->uNumItem) - nItem = infoPtr->uNumItem; - - iOrder = (phdi->mask & HDI_ORDER) ? phdi->iOrder : nItem; - - if (infoPtr->uNumItem == 0) { - infoPtr->items = Alloc (sizeof (HEADER_ITEM)); - infoPtr->uNumItem++; - } - else { - HEADER_ITEM *oldItems = infoPtr->items; - - infoPtr->uNumItem++; - infoPtr->items = Alloc (sizeof (HEADER_ITEM) * infoPtr->uNumItem); - if (nItem == 0) { - memcpy (&infoPtr->items[1], &oldItems[0], - (infoPtr->uNumItem-1) * sizeof(HEADER_ITEM)); - } - else - { - /* pre insert copy */ - if (nItem > 0) { - memcpy (&infoPtr->items[0], &oldItems[0], - nItem * sizeof(HEADER_ITEM)); - } - - /* post insert copy */ - if (nItem < infoPtr->uNumItem - 1) { - memcpy (&infoPtr->items[nItem+1], &oldItems[nItem], - (infoPtr->uNumItem - nItem - 1) * sizeof(HEADER_ITEM)); - } - } - - Free (oldItems); - } - - for (i=0; i < infoPtr->uNumItem; i++) - { - if (infoPtr->items[i].iOrder >= iOrder) - infoPtr->items[i].iOrder++; - } - - lpItem = &infoPtr->items[nItem]; - lpItem->bDown = FALSE; - - if (phdi->mask & HDI_WIDTH) - lpItem->cxy = phdi->cxy; - - if (phdi->mask & HDI_TEXT) { - if (!phdi->pszText) /* null pointer check */ - phdi->pszText = ""; - if (phdi->pszText != LPSTR_TEXTCALLBACKA) { - len = MultiByteToWideChar(CP_ACP, 0, phdi->pszText, -1, NULL, 0); - lpItem->pszText = Alloc( len*sizeof(WCHAR) ); - MultiByteToWideChar(CP_ACP, 0, phdi->pszText, -1, lpItem->pszText, len); - } - else - lpItem->pszText = LPSTR_TEXTCALLBACKW; - } - - if (phdi->mask & HDI_FORMAT) - lpItem->fmt = phdi->fmt; - - if (lpItem->fmt == 0) - lpItem->fmt = HDF_LEFT; - - if (!(lpItem->fmt & HDF_STRING) && (phdi->mask & HDI_TEXT)) - { - lpItem->fmt |= HDF_STRING; - } - if (phdi->mask & HDI_BITMAP) - lpItem->hbm = phdi->hbm; - - if (phdi->mask & HDI_LPARAM) - lpItem->lParam = phdi->lParam; - - if (phdi->mask & HDI_IMAGE) - lpItem->iImage = phdi->iImage; - - lpItem->iOrder = iOrder; - - HEADER_SetItemBounds (hwnd); - - InvalidateRect(hwnd, NULL, FALSE); - - return nItem; -} - - -static LRESULT -HEADER_InsertItemW (HWND hwnd, WPARAM wParam, LPARAM lParam) -{ - HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); - HDITEMW *phdi = (HDITEMW*)lParam; - INT nItem = (INT)wParam; - HEADER_ITEM *lpItem; - INT len, iOrder; - UINT i; - - if ((phdi == NULL) || (nItem < 0)) - return -1; - - if (nItem > infoPtr->uNumItem) - nItem = infoPtr->uNumItem; - - iOrder = (phdi->mask & HDI_ORDER) ? phdi->iOrder : nItem; - - if (infoPtr->uNumItem == 0) { - infoPtr->items = Alloc (sizeof (HEADER_ITEM)); - infoPtr->uNumItem++; - } - else { - HEADER_ITEM *oldItems = infoPtr->items; - - infoPtr->uNumItem++; - infoPtr->items = Alloc (sizeof (HEADER_ITEM) * infoPtr->uNumItem); - if (nItem == 0) { - memcpy (&infoPtr->items[1], &oldItems[0], - (infoPtr->uNumItem-1) * sizeof(HEADER_ITEM)); [truncated at 1000 lines; 2703 more skipped]

19 years, 3 months

[navaraf] 17017: Merge 16746 from trunk:

by navaraf＠svn.reactos.com

Merge 16746 from trunk: Implement ValidateRect. Modified: branches/ros-branch-0_2_7/reactos/lib/user32/windows/paint.c _____ Modified: branches/ros-branch-0_2_7/reactos/lib/user32/windows/paint.c --- branches/ros-branch-0_2_7/reactos/lib/user32/windows/paint.c 2005-08-03 17:15:11 UTC (rev 17016) +++ branches/ros-branch-0_2_7/reactos/lib/user32/windows/paint.c 2005-08-03 17:15:48 UTC (rev 17017) @@ -227,7 +227,7 @@ /* - * @unimplemented + * @implemented */ BOOL STDCALL @@ -235,8 +235,7 @@ HWND hWnd, CONST RECT *lpRect) { - UNIMPLEMENTED; - return FALSE; + return RedrawWindow(hWnd, lpRect, 0, RDW_VALIDATE); }

19 years, 3 months

[navaraf] 17016: Merge 16737 from trunk:

by navaraf＠svn.reactos.com

Merge 16737 from trunk: Fix some bugs in DIB mapping code to prevent instant system crashes. Modified: branches/ros-branch-0_2_7/reactos/subsys/win32k/objects/dib.c _____ Modified: branches/ros-branch-0_2_7/reactos/subsys/win32k/objects/dib.c --- branches/ros-branch-0_2_7/reactos/subsys/win32k/objects/dib.c 2005-08-03 17:14:26 UTC (rev 17015) +++ branches/ros-branch-0_2_7/reactos/subsys/win32k/objects/dib.c 2005-08-03 17:15:11 UTC (rev 17016) @@ -175,7 +175,7 @@ RECTL DestRect; XLATEOBJ *XlateObj; PPALGDI hDCPalette; - //RGBQUAD *lpRGB; + //RGBQUAD *lpRGB; HPALETTE DDB_Palette, DIB_Palette; ULONG DDB_Palette_Type, DIB_Palette_Type; INT DIBWidth; @@ -190,7 +190,7 @@ //if (ColorUse == DIB_PAL_COLORS) // lpRGB = DIB_MapPaletteColors(hDC, bmi); //else - // lpRGB = &bmi->bmiColors[0]; + // lpRGB = &bmi->bmiColors; DestSurf = &bitmap->SurfObj; @@ -810,6 +810,7 @@ UINT Entries = 0; BITMAP bm; SIZEL Size; + RGBQUAD *lpRGB; DPRINT("format (%ld,%ld), planes %d, bpp %d, size %ld, colors %ld (%s)\n", bi->biWidth, bi->biHeight, bi->biPlanes, bi->biBitCount, @@ -846,7 +847,9 @@ } if(usage == DIB_PAL_COLORS) - memcpy(bmi->bmiColors, (UINT *)DIB_MapPaletteColors(dc, bmi), sizeof(UINT *)); + lpRGB = DIB_MapPaletteColors(dc, bmi); + else + lpRGB = bmi->bmiColors; // Allocate Memory for DIB and fill structure if (bm.bmBits) @@ -869,9 +872,9 @@ else switch(bi->biBitCount) { case 16: - dib->dsBitfields[0] = (bi->biCompression == BI_BITFIELDS) ? *(DWORD *)bmi->bmiColors : 0x7c00; - dib->dsBitfields[1] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)bmi->bmiColors + 1) : 0x03e0; - dib->dsBitfields[2] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)bmi->bmiColors + 2) : 0x001f; break; + dib->dsBitfields[0] = (bi->biCompression == BI_BITFIELDS) ? *(DWORD *)lpRGB : 0x7c00; + dib->dsBitfields[1] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)lpRGB + 1) : 0x03e0; + dib->dsBitfields[2] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)lpRGB + 2) : 0x001f; break; case 24: dib->dsBitfields[0] = 0xff0000; @@ -880,9 +883,9 @@ break; case 32: - dib->dsBitfields[0] = (bi->biCompression == BI_BITFIELDS) ? *(DWORD *)bmi->bmiColors : 0xff0000; - dib->dsBitfields[1] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)bmi->bmiColors + 1) : 0x00ff00; - dib->dsBitfields[2] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)bmi->bmiColors + 2) : 0x0000ff; + dib->dsBitfields[0] = (bi->biCompression == BI_BITFIELDS) ? *(DWORD *)lpRGB : 0xff0000; + dib->dsBitfields[1] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)lpRGB + 1) : 0x00ff00; + dib->dsBitfields[2] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)lpRGB + 2) : 0x0000ff; break; } dib->dshSection = section; @@ -901,12 +904,20 @@ bm.bmBits); if (! res) { + if (lpRGB != bmi->bmiColors) + { + ExFreePool(lpRGB); + } SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); return NULL; } bmp = BITMAPOBJ_LockBitmap(res); if (NULL == bmp) { + if (lpRGB != bmi->bmiColors) + { + ExFreePool(lpRGB); + } SetLastWin32Error(ERROR_INVALID_HANDLE); NtGdiDeleteObject(bmp); return NULL; @@ -921,7 +932,7 @@ if(bi->biBitCount == 8) { Entries = 256; } if (Entries) - bmp->hDIBPalette = PALETTE_AllocPaletteIndexedRGB(Entries, bmi->bmiColors); + bmp->hDIBPalette = PALETTE_AllocPaletteIndexedRGB(Entries, lpRGB); else bmp->hDIBPalette = PALETTE_AllocPalette(PAL_BITFIELDS, 0, NULL, dib->dsBitfields[0], @@ -946,6 +957,11 @@ if (res) { BITMAPOBJ_FreeBitmap(res); res = 0; } } + if (lpRGB != bmi->bmiColors) + { + ExFreePool(lpRGB); + } + if (bmp) { BITMAPOBJ_UnlockBitmap(bmp); @@ -1097,6 +1113,12 @@ return NULL; } + if (palGDI->Mode != PAL_INDEXED) + { + PALETTE_UnlockPalette(palGDI); + return NULL; + } + nNumColors = 1 << lpbmi->bmiHeader.biBitCount; if (lpbmi->bmiHeader.biClrUsed) {

19 years, 3 months

[navaraf] 17015: Merge 16736 from trunk:

by navaraf＠svn.reactos.com

Merge 16736 from trunk: Properly setup the I/O stack location in IopSecurityFile. Modified: branches/ros-branch-0_2_7/reactos/ntoskrnl/io/file.c _____ Modified: branches/ros-branch-0_2_7/reactos/ntoskrnl/io/file.c --- branches/ros-branch-0_2_7/reactos/ntoskrnl/io/file.c 2005-08-03 17:13:51 UTC (rev 17014) +++ branches/ros-branch-0_2_7/reactos/ntoskrnl/io/file.c 2005-08-03 17:14:26 UTC (rev 17015) @@ -324,6 +324,7 @@ /* Set Stack Parameters */ StackPtr = IoGetNextIrpStackLocation(Irp); + StackPtr->MajorFunction = MajorFunction; StackPtr->FileObject = FileObject; /* Set Parameters */

19 years, 3 months

[navaraf] 17014: Merge 16735 from trunk:

by navaraf＠svn.reactos.com

Merge 16735 from trunk: Don't allow setting menu for child windows in IntSetMenu. Modified: branches/ros-branch-0_2_7/reactos/subsys/win32k/ntuser/window.c _____ Modified: branches/ros-branch-0_2_7/reactos/subsys/win32k/ntuser/window.c --- branches/ros-branch-0_2_7/reactos/subsys/win32k/ntuser/window.c 2005-08-03 17:13:04 UTC (rev 17013) +++ branches/ros-branch-0_2_7/reactos/subsys/win32k/ntuser/window.c 2005-08-03 17:13:51 UTC (rev 17014) @@ -499,13 +499,19 @@ { PMENU_OBJECT OldMenuObject, NewMenuObject = NULL; + if ((WindowObject->Style & (WS_CHILD | WS_POPUP)) == WS_CHILD) + { + SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE); + return FALSE; + } + *Changed = (WindowObject->IDMenu != (UINT) Menu); if (! *Changed) { return TRUE; } - if (0 != WindowObject->IDMenu) + if (WindowObject->IDMenu) { OldMenuObject = IntGetMenuObject((HMENU) WindowObject->IDMenu); ASSERT(NULL == OldMenuObject || OldMenuObject->MenuInfo.Wnd == WindowObject->Self);

19 years, 3 months

[navaraf] 17013: Merge 16728 (ion) from trunk:

by navaraf＠svn.reactos.com

Merge 16728 (ion) from trunk: - Don't try to get the length of a possibly empty string. This fixes many menu applications (such as WinRAR). However I'm now getting a bug due to a double-free. It seems a GDI Object is being freed twice. Can anyone check this out please? Modified: branches/ros-branch-0_2_7/reactos/lib/user32/windows/menu.c _____ Modified: branches/ros-branch-0_2_7/reactos/lib/user32/windows/menu.c --- branches/ros-branch-0_2_7/reactos/lib/user32/windows/menu.c 2005-08-03 17:10:45 UTC (rev 17012) +++ branches/ros-branch-0_2_7/reactos/lib/user32/windows/menu.c 2005-08-03 17:13:04 UTC (rev 17013) @@ -3771,8 +3771,11 @@ } RtlCopyMemory(mii, &miiW, miiW.cbSize); - mii->dwTypeData = AnsiBuffer; - mii->cch = strlen(AnsiBuffer); + if (AnsiBuffer) + { + mii->dwTypeData = AnsiBuffer; + mii->cch = strlen(AnsiBuffer); + } return TRUE; }

19 years, 3 months

[navaraf] 17012: Merge 16725 from trunk:

by navaraf＠svn.reactos.com

Merge 16725 from trunk: Build Wine DLLs without the UNICODE and _UNICODE definitions. (Note: The Wine DLLs use A/W functions explicitely, so this doesn't have any performance impact.) Modified: branches/ros-branch-0_2_7/reactos/lib/comctl32/comctl32.xml Modified: branches/ros-branch-0_2_7/reactos/lib/comdlg32/comdlg32.xml Modified: branches/ros-branch-0_2_7/reactos/lib/dbghelp/dbghelp.xml Modified: branches/ros-branch-0_2_7/reactos/lib/msvideo/msvfw32.xml Modified: branches/ros-branch-0_2_7/reactos/lib/netapi32/netapi32.xml Modified: branches/ros-branch-0_2_7/reactos/lib/ole32/ole32.xml Modified: branches/ros-branch-0_2_7/reactos/lib/oleaut32/oleaut32.xml Modified: branches/ros-branch-0_2_7/reactos/lib/olepro32/olepro32.xml Modified: branches/ros-branch-0_2_7/reactos/lib/riched20/riched20.xml Modified: branches/ros-branch-0_2_7/reactos/lib/richedit/riched32.xml Modified: branches/ros-branch-0_2_7/reactos/lib/rpcrt4/rpcrt4.xml Modified: branches/ros-branch-0_2_7/reactos/lib/shdocvw/shdocvw.xml Modified: branches/ros-branch-0_2_7/reactos/lib/shlwapi/shlwapi.xml Modified: branches/ros-branch-0_2_7/reactos/lib/urlmon/urlmon.xml Modified: branches/ros-branch-0_2_7/reactos/lib/wininet/wininet.xml Modified: branches/ros-branch-0_2_7/reactos/lib/winmm/winmm.xml _____ Modified: branches/ros-branch-0_2_7/reactos/lib/comctl32/comctl32.xml --- branches/ros-branch-0_2_7/reactos/lib/comctl32/comctl32.xml 2005-08-03 17:10:30 UTC (rev 17011) +++ branches/ros-branch-0_2_7/reactos/lib/comctl32/comctl32.xml 2005-08-03 17:10:45 UTC (rev 17012) @@ -1,49 +1,47 @@ -<module name="comctl32" type="win32dll" baseaddress="${BASEADDRESS_COMCTL32}" installbase="system32" installname="comctl32.dll" warnings="true"> - <importlibrary definition="comctl32.spec.def" /> - <include base="comctl32">.</include> - <include base="ReactOS">include/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> - <define name="__REACTOS__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WINVER">0x501</define> - <library>wine</library> - <library>ntdll</library> - <library>kernel32</library> - <library>advapi32</library> - <library>gdi32</library> - <library>user32</library> - <library>winmm</library> - <file>animate.c</file> - <file>comboex.c</file> - <file>comctl32undoc.c</file> - <file>commctrl.c</file> - <file>datetime.c</file> - <file>draglist.c</file> - <file>flatsb.c</file> - <file>header.c</file> - <file>hotkey.c</file> - <file>imagelist.c</file> - <file>ipaddress.c</file> - <file>listview.c</file> - <file>monthcal.c</file> - <file>nativefont.c</file> - <file>pager.c</file> - <file>progress.c</file> - <file>propsheet.c</file> - <file>rebar.c</file> - <file>smoothscroll.c</file> - <file>string.c</file> - <file>status.c</file> - <file>syslink.c</file> - <file>tab.c</file> - <file>toolbar.c</file> - <file>tooltips.c</file> - <file>trackbar.c</file> - <file>treeview.c</file> - <file>updown.c</file> - <file>rsrc.rc</file> - <file>comctl32.spec</file> -</module> +<module name="comctl32" type="win32dll" baseaddress="${BASEADDRESS_COMCTL32}" installbase="system32" installname="comctl32.dll" warnings="true"> + <importlibrary definition="comctl32.spec.def" /> + <include base="comctl32">.</include> + <include base="ReactOS">include/wine</include> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <library>gdi32</library> + <library>user32</library> + <library>winmm</library> + <file>animate.c</file> + <file>comboex.c</file> + <file>comctl32undoc.c</file> + <file>commctrl.c</file> + <file>datetime.c</file> + <file>draglist.c</file> + <file>flatsb.c</file> + <file>header.c</file> + <file>hotkey.c</file> + <file>imagelist.c</file> + <file>ipaddress.c</file> + <file>listview.c</file> + <file>monthcal.c</file> + <file>nativefont.c</file> + <file>pager.c</file> + <file>progress.c</file> + <file>propsheet.c</file> + <file>rebar.c</file> + <file>smoothscroll.c</file> + <file>string.c</file> + <file>status.c</file> + <file>syslink.c</file> + <file>tab.c</file> + <file>toolbar.c</file> + <file>tooltips.c</file> + <file>trackbar.c</file> + <file>treeview.c</file> + <file>updown.c</file> + <file>rsrc.rc</file> + <file>comctl32.spec</file> +</module> _____ Modified: branches/ros-branch-0_2_7/reactos/lib/comdlg32/comdlg32.xml --- branches/ros-branch-0_2_7/reactos/lib/comdlg32/comdlg32.xml 2005-08-03 17:10:30 UTC (rev 17011) +++ branches/ros-branch-0_2_7/reactos/lib/comdlg32/comdlg32.xml 2005-08-03 17:10:45 UTC (rev 17012) @@ -1,34 +1,32 @@ -<module name="comdlg32" type="win32dll" baseaddress="${BASEADDRESS_COMDLG32}" installbase="system32" installname="comdlg32.dll" warnings="true" usewrc="false"> - <importlibrary definition="comdlg32.spec.def" /> - <include base="comdlg32">.</include> - <include base="ReactOS">include/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> - <define name="__REACTOS__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WINVER">0x501</define> - <library>wine</library> - <library>uuid</library> - <library>ntdll</library> - <library>kernel32</library> - <library>advapi32</library> - <library>gdi32</library> - <library>user32</library> - <library>comctl32</library> - <library>shell32</library> - <library>shlwapi</library> - <library>winspool</library> - <file>cdlg32.c</file> - <file>colordlg.c</file> - <file>filedlg.c</file> - <file>filedlg31.c</file> - <file>filedlgbrowser.c</file> - <file>filetitle.c</file> - <file>finddlg32.c</file> - <file>fontdlg.c</file> - <file>printdlg.c</file> - <file>rsrc.rc</file> - <file>comdlg32.spec</file> -</module> +<module name="comdlg32" type="win32dll" baseaddress="${BASEADDRESS_COMDLG32}" installbase="system32" installname="comdlg32.dll" warnings="true" usewrc="false"> + <importlibrary definition="comdlg32.spec.def" /> + <include base="comdlg32">.</include> + <include base="ReactOS">include/wine</include> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>uuid</library> + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <library>gdi32</library> + <library>user32</library> + <library>comctl32</library> + <library>shell32</library> + <library>shlwapi</library> + <library>winspool</library> + <file>cdlg32.c</file> + <file>colordlg.c</file> + <file>filedlg.c</file> + <file>filedlg31.c</file> + <file>filedlgbrowser.c</file> + <file>filetitle.c</file> + <file>finddlg32.c</file> + <file>fontdlg.c</file> + <file>printdlg.c</file> + <file>rsrc.rc</file> + <file>comdlg32.spec</file> +</module> _____ Modified: branches/ros-branch-0_2_7/reactos/lib/dbghelp/dbghelp.xml --- branches/ros-branch-0_2_7/reactos/lib/dbghelp/dbghelp.xml 2005-08-03 17:10:30 UTC (rev 17011) +++ branches/ros-branch-0_2_7/reactos/lib/dbghelp/dbghelp.xml 2005-08-03 17:10:45 UTC (rev 17012) @@ -1,36 +1,34 @@ -<module name="dbghelp" type="win32dll" baseaddress="${BASEADDRESS_DBGHELP}" installbase="system32" installname="dbghelp.dll" warnings="true"> - <importlibrary definition="dbghelp.spec.def" /> - <include base="dbghelp">.</include> - <include base="ReactOS">include/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> - <define name="__REACTOS__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WINVER">0x501</define> - <library>wine</library> - <library>ntdll</library> - <library>kernel32</library> - <library>psapi</library> - <library>pseh</library> - <file>coff.c</file> - <file>dbghelp.c</file> - <file>elf_module.c</file> - <file>image.c</file> - <file>memory.c</file> - <file>minidump.c</file> - <file>module.c</file> - <file>msc.c</file> - <file>path.c</file> - <file>pe_module.c</file> - <file>regex.c</file> - <file>source.c</file> - <file>stabs.c</file> - <file>stack.c</file> - <file>storage.c</file> - <file>symbol.c</file> - <file>type.c</file> - <file>dbghelp.rc</file> - <file>dbghelp.spec</file> -</module> +<module name="dbghelp" type="win32dll" baseaddress="${BASEADDRESS_DBGHELP}" installbase="system32" installname="dbghelp.dll" warnings="true"> + <importlibrary definition="dbghelp.spec.def" /> + <include base="dbghelp">.</include> + <include base="ReactOS">include/wine</include> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>ntdll</library> + <library>kernel32</library> + <library>psapi</library> + <library>pseh</library> + <file>coff.c</file> + <file>dbghelp.c</file> + <file>elf_module.c</file> + <file>image.c</file> + <file>memory.c</file> + <file>minidump.c</file> + <file>module.c</file> + <file>msc.c</file> + <file>path.c</file> + <file>pe_module.c</file> + <file>regex.c</file> + <file>source.c</file> + <file>stabs.c</file> + <file>stack.c</file> + <file>storage.c</file> + <file>symbol.c</file> + <file>type.c</file> + <file>dbghelp.rc</file> + <file>dbghelp.spec</file> +</module> _____ Modified: branches/ros-branch-0_2_7/reactos/lib/msvideo/msvfw32.xml --- branches/ros-branch-0_2_7/reactos/lib/msvideo/msvfw32.xml 2005-08-03 17:10:30 UTC (rev 17011) +++ branches/ros-branch-0_2_7/reactos/lib/msvideo/msvfw32.xml 2005-08-03 17:10:45 UTC (rev 17012) @@ -1,21 +1,19 @@ -<module name="msvfw32" type="win32dll" baseaddress="${BASEADDRESS_MSVFW32}" installbase="system32" installname="msvfw32.dll"> - <importlibrary definition="msvfw32.spec.def" /> - <include base="ReactOS">include/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> - <define name="__REACTOS__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WINVER">0x501</define> - <library>winmm</library> - <library>gdi32</library> - <library>comctl32</library> - <library>kernel32</library> - <library>ntdll</library> - <file>drawdib.c</file> - <file>mciwnd.c</file> - <file>msvfw32.rc</file> - <file>msvideo_main.c</file> - <file>msvfw32.spec</file> -</module> +<module name="msvfw32" type="win32dll" baseaddress="${BASEADDRESS_MSVFW32}" installbase="system32" installname="msvfw32.dll"> + <importlibrary definition="msvfw32.spec.def" /> + <include base="ReactOS">include/wine</include> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>winmm</library> + <library>gdi32</library> + <library>comctl32</library> + <library>kernel32</library> + <library>ntdll</library> + <file>drawdib.c</file> + <file>mciwnd.c</file> + <file>msvfw32.rc</file> + <file>msvideo_main.c</file> + <file>msvfw32.spec</file> +</module> _____ Modified: branches/ros-branch-0_2_7/reactos/lib/netapi32/netapi32.xml --- branches/ros-branch-0_2_7/reactos/lib/netapi32/netapi32.xml 2005-08-03 17:10:30 UTC (rev 17011) +++ branches/ros-branch-0_2_7/reactos/lib/netapi32/netapi32.xml 2005-08-03 17:10:45 UTC (rev 17012) @@ -1,30 +1,28 @@ -<module name="netapi32" type="win32dll" baseaddress="${BASEADDRESS_NETAPI32}" installbase="system32" installname="netapi32.dll" warnings="true"> - <importlibrary definition="netapi32.spec.def" /> - <include base="netapi32">.</include> - <include base="ReactOS">include/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> - <define name="__REACTOS__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WINVER">0x501</define> - <define name="_SVRAPI_" /> - <library>wine</library> - <library>ntdll</library> - <library>kernel32</library> - <library>advapi32</library> - <library>ws2_32</library> - <library>iphlpapi</library> - <file>access.c</file> - <file>apibuf.c</file> - <file>browsr.c</file> - <file>nbcmdqueue.c</file> - <file>nbnamecache.c</file> - <file>nbt.c</file> - <file>netapi32.c</file> - <file>netbios.c</file> - <file>wksta.c</file> - <file>netapi32.rc</file> - <file>netapi32.spec</file> -</module> +<module name="netapi32" type="win32dll" baseaddress="${BASEADDRESS_NETAPI32}" installbase="system32" installname="netapi32.dll" warnings="true"> + <importlibrary definition="netapi32.spec.def" /> + <include base="netapi32">.</include> + <include base="ReactOS">include/wine</include> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <define name="_SVRAPI_" /> + <library>wine</library> + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <library>ws2_32</library> + <library>iphlpapi</library> + <file>access.c</file> + <file>apibuf.c</file> + <file>browsr.c</file> + <file>nbcmdqueue.c</file> + <file>nbnamecache.c</file> + <file>nbt.c</file> + <file>netapi32.c</file> + <file>netbios.c</file> + <file>wksta.c</file> + <file>netapi32.rc</file> + <file>netapi32.spec</file> +</module> _____ Modified: branches/ros-branch-0_2_7/reactos/lib/ole32/ole32.xml --- branches/ros-branch-0_2_7/reactos/lib/ole32/ole32.xml 2005-08-03 17:10:30 UTC (rev 17011) +++ branches/ros-branch-0_2_7/reactos/lib/ole32/ole32.xml 2005-08-03 17:10:45 UTC (rev 17012) @@ -1,54 +1,52 @@ -<module name="ole32" type="win32dll" baseaddress="${BASEADDRESS_OLE32}" installbase="system32" installname="ole32.dll" warnings="true"> - <importlibrary definition="ole32.spec.def" /> - <include base="ole32">.</include> - <include base="ReactOS">include/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> - <define name="__REACTOS__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WINVER">0x501</define> - <define name="_STDDEF_H" /> - <library>wine</library> - <library>uuid</library> - <library>ntdll</library> - <library>kernel32</library> - <library>advapi32</library> - <library>gdi32</library> - <library>user32</library> - <library>rpcrt4</library> - <file>antimoniker.c</file> - <file>bindctx.c</file> - <file>clipboard.c</file> - <file>compobj.c</file> - <file>compositemoniker.c</file> - <file>datacache.c</file> - <file>dictionary.c</file> - <file>defaulthandler.c</file> - <file>errorinfo.c</file> - <file>filemoniker.c</file> - <file>ftmarshal.c</file> - <file>git.c</file> - <file>hglobalstream.c</file> - <file>ifs.c</file> - <file>itemmoniker.c</file> - <file>marshal.c</file> - <file>memlockbytes.c</file> - <file>moniker.c</file> - <file>ole2.c</file> - <file>ole2stubs.c</file> - <file>ole2impl.c</file> - <file>ole32_main.c</file> - <file>oleobj.c</file> - <file>oleproxy.c</file> - <file>regsvr.c</file> - <file>rpc.c</file> - <file>stg_bigblockfile.c</file> - <file>stg_prop.c</file> - <file>stg_stream.c</file> - <file>storage32.c</file> - <file>stubmanager.c</file> - <file>ole32res.rc</file> - <file>ole32.spec</file> -</module> +<module name="ole32" type="win32dll" baseaddress="${BASEADDRESS_OLE32}" installbase="system32" installname="ole32.dll" warnings="true"> + <importlibrary definition="ole32.spec.def" /> + <include base="ole32">.</include> + <include base="ReactOS">include/wine</include> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <define name="_STDDEF_H" /> + <library>wine</library> + <library>uuid</library> + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <library>gdi32</library> + <library>user32</library> + <library>rpcrt4</library> + <file>antimoniker.c</file> + <file>bindctx.c</file> + <file>clipboard.c</file> + <file>compobj.c</file> + <file>compositemoniker.c</file> + <file>datacache.c</file> + <file>dictionary.c</file> + <file>defaulthandler.c</file> + <file>errorinfo.c</file> + <file>filemoniker.c</file> + <file>ftmarshal.c</file> + <file>git.c</file> + <file>hglobalstream.c</file> + <file>ifs.c</file> + <file>itemmoniker.c</file> + <file>marshal.c</file> + <file>memlockbytes.c</file> + <file>moniker.c</file> + <file>ole2.c</file> + <file>ole2stubs.c</file> + <file>ole2impl.c</file> + <file>ole32_main.c</file> + <file>oleobj.c</file> + <file>oleproxy.c</file> + <file>regsvr.c</file> + <file>rpc.c</file> + <file>stg_bigblockfile.c</file> + <file>stg_prop.c</file> + <file>stg_stream.c</file> + <file>storage32.c</file> + <file>stubmanager.c</file> + <file>ole32res.rc</file> + <file>ole32.spec</file> +</module> _____ Modified: branches/ros-branch-0_2_7/reactos/lib/oleaut32/oleaut32.xml --- branches/ros-branch-0_2_7/reactos/lib/oleaut32/oleaut32.xml 2005-08-03 17:10:30 UTC (rev 17011) +++ branches/ros-branch-0_2_7/reactos/lib/oleaut32/oleaut32.xml 2005-08-03 17:10:45 UTC (rev 17012) @@ -1,45 +1,43 @@ -<module name="oleaut32" type="win32dll" baseaddress="${BASEADDRESS_OLEAUT32}" installbase="system32" installname="oleaut32.dll" warnings="true"> - <importlibrary definition="oleaut32.spec.def" /> - <include base="oleaut32">.</include> - <include base="ReactOS">include/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> - <define name="__REACTOS__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WINVER">0x501</define> - <define name="_STDDEF_H" /> - <define name="_OLEAUT32_" /> - <define name="COM_NO_WINDOWS_H" /> - <library>wine</library> - <library>uuid</library> - <library>ntdll</library> - <library>kernel32</library> - <library>advapi32</library> - <library>gdi32</library> - <library>user32</library> - <library>rpcrt4</library> - <library>ole32</library> - <library>comctl32</library> - <library>urlmon</library> - <file>connpt.c</file> - <file>dispatch.c</file> - <file>hash.c</file> - <file>oaidl_p.c</file> - <file>oleaut.c</file> - <file>olefont.c</file> - <file>olepicture.c</file> - <file>recinfo.c</file> - <file>regsvr.c</file> - <file>safearray.c</file> - <file>stubs.c</file> - <file>tmarshal.c</file> - <file>typelib.c</file> - <file>typelib2.c</file> - <file>usrmarshal.c</file> - <file>varformat.c</file> - <file>variant.c</file> - <file>vartype.c</file> - <file>oleaut32.spec</file> -</module> +<module name="oleaut32" type="win32dll" baseaddress="${BASEADDRESS_OLEAUT32}" installbase="system32" installname="oleaut32.dll" warnings="true"> + <importlibrary definition="oleaut32.spec.def" /> + <include base="oleaut32">.</include> + <include base="ReactOS">include/wine</include> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <define name="_STDDEF_H" /> + <define name="_OLEAUT32_" /> + <define name="COM_NO_WINDOWS_H" /> + <library>wine</library> + <library>uuid</library> + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <library>gdi32</library> + <library>user32</library> + <library>rpcrt4</library> + <library>ole32</library> + <library>comctl32</library> + <library>urlmon</library> + <file>connpt.c</file> + <file>dispatch.c</file> + <file>hash.c</file> + <file>oaidl_p.c</file> + <file>oleaut.c</file> + <file>olefont.c</file> + <file>olepicture.c</file> + <file>recinfo.c</file> + <file>regsvr.c</file> + <file>safearray.c</file> + <file>stubs.c</file> + <file>tmarshal.c</file> + <file>typelib.c</file> + <file>typelib2.c</file> + <file>usrmarshal.c</file> + <file>varformat.c</file> + <file>variant.c</file> + <file>vartype.c</file> + <file>oleaut32.spec</file> +</module> _____ Modified: branches/ros-branch-0_2_7/reactos/lib/olepro32/olepro32.xml --- branches/ros-branch-0_2_7/reactos/lib/olepro32/olepro32.xml 2005-08-03 17:10:30 UTC (rev 17011) +++ branches/ros-branch-0_2_7/reactos/lib/olepro32/olepro32.xml 2005-08-03 17:10:45 UTC (rev 17012) @@ -1,19 +1,17 @@ -<module name="olepro32" type="win32dll" baseaddress="${BASEADDRESS_OLEPRO32}" installbase="system32" installname="olepro32.dll"> - <importlibrary definition="olepro32.spec.def" /> - <include base="olepro32">.</include> - <include base="ReactOS">include/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> - <define name="__REACTOS__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WINVER">0x501</define> - <library>wine</library> - <library>ntdll</library> - <library>kernel32</library> - <library>oleaut32</library> - <file>olepro32stubs.c</file> - <file>olepro32.rc</file> - <file>olepro32.spec</file> -</module> +<module name="olepro32" type="win32dll" baseaddress="${BASEADDRESS_OLEPRO32}" installbase="system32" installname="olepro32.dll"> + <importlibrary definition="olepro32.spec.def" /> + <include base="olepro32">.</include> + <include base="ReactOS">include/wine</include> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>ntdll</library> + <library>kernel32</library> + <library>oleaut32</library> + <file>olepro32stubs.c</file> + <file>olepro32.rc</file> + <file>olepro32.spec</file> +</module> _____ Modified: branches/ros-branch-0_2_7/reactos/lib/riched20/riched20.xml --- branches/ros-branch-0_2_7/reactos/lib/riched20/riched20.xml 2005-08-03 17:10:30 UTC (rev 17011) +++ branches/ros-branch-0_2_7/reactos/lib/riched20/riched20.xml 2005-08-03 17:10:45 UTC (rev 17012) @@ -2,8 +2,6 @@ <importlibrary definition="riched20.spec.def" /> <include base="riched20">.</include> <include base="ReactOS">include/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> _____ Modified: branches/ros-branch-0_2_7/reactos/lib/richedit/riched32.xml --- branches/ros-branch-0_2_7/reactos/lib/richedit/riched32.xml 2005-08-03 17:10:30 UTC (rev 17011) +++ branches/ros-branch-0_2_7/reactos/lib/richedit/riched32.xml 2005-08-03 17:10:45 UTC (rev 17012) @@ -1,19 +1,17 @@ -<module name="riched32" type="win32dll" baseaddress="${BASEADDRESS_RICHED32}" installbase="system32" installname="riched32.dll"> - <importlibrary definition="riched32.spec.def" /> - <include base="riched32">.</include> - <include base="ReactOS">include/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> - <define name="__REACTOS__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WINVER">0x501</define> - <library>wine</library> - <library>ntdll</library> - <library>kernel32</library> - <library>user32</library> - <library>riched20</library> - <file>richedit.c</file> - <file>riched32.spec</file> -</module> +<module name="riched32" type="win32dll" baseaddress="${BASEADDRESS_RICHED32}" installbase="system32" installname="riched32.dll"> + <importlibrary definition="riched32.spec.def" /> + <include base="riched32">.</include> + <include base="ReactOS">include/wine</include> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>ntdll</library> + <library>kernel32</library> + <library>user32</library> + <library>riched20</library> + <file>richedit.c</file> + <file>riched32.spec</file> +</module> _____ Modified: branches/ros-branch-0_2_7/reactos/lib/rpcrt4/rpcrt4.xml --- branches/ros-branch-0_2_7/reactos/lib/rpcrt4/rpcrt4.xml 2005-08-03 17:10:30 UTC (rev 17011) +++ branches/ros-branch-0_2_7/reactos/lib/rpcrt4/rpcrt4.xml 2005-08-03 17:10:45 UTC (rev 17012) @@ -1,37 +1,35 @@ -<module name="rpcrt4" type="win32dll" baseaddress="${BASEADDRESS_RPCRT4}" installbase="system32" installname="rpcrt4.dll" warnings="true"> - <importlibrary definition="rpcrt4.spec.def" /> - <include base="rpcrt4">.</include> - <include base="ReactOS">include/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> - <define name="__REACTOS__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WINVER">0x501</define> - <define name="_STDDEF_H" /> - <define name="_RPCRT4_" /> - <define name="COM_NO_WINDOWS_H" /> - <define name="MSWMSG" /> - <library>wine</library> - <library>uuid</library> - <library>ntdll</library> - <library>kernel32</library> - <library>advapi32</library> - <library>iphlpapi</library> - <file>cproxy.c</file> - <file>cpsf.c</file> - <file>cstub.c</file> - <file>ndr_marshall.c</file> - <file>ndr_midl.c</file> - <file>ndr_ole.c</file> - <file>ndr_stubless.c</file> - <file>rpc_binding.c</file> - <file>rpc_epmap.c</file> - <file>rpc_message.c</file> - <file>rpc_server.c</file> - <file>rpcrt4_main.c</file> - <file>rpcss_np_client.c</file> - <file>rpcrt4.rc</file> - <file>rpcrt4.spec</file> -</module> +<module name="rpcrt4" type="win32dll" baseaddress="${BASEADDRESS_RPCRT4}" installbase="system32" installname="rpcrt4.dll" warnings="true"> + <importlibrary definition="rpcrt4.spec.def" /> + <include base="rpcrt4">.</include> + <include base="ReactOS">include/wine</include> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <define name="_STDDEF_H" /> + <define name="_RPCRT4_" /> + <define name="COM_NO_WINDOWS_H" /> + <define name="MSWMSG" /> + <library>wine</library> + <library>uuid</library> + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <library>iphlpapi</library> + <file>cproxy.c</file> + <file>cpsf.c</file> + <file>cstub.c</file> + <file>ndr_marshall.c</file> + <file>ndr_midl.c</file> + <file>ndr_ole.c</file> + <file>ndr_stubless.c</file> + <file>rpc_binding.c</file> + <file>rpc_epmap.c</file> + <file>rpc_message.c</file> + <file>rpc_server.c</file> + <file>rpcrt4_main.c</file> + <file>rpcss_np_client.c</file> + <file>rpcrt4.rc</file> + <file>rpcrt4.spec</file> +</module> _____ Modified: branches/ros-branch-0_2_7/reactos/lib/shdocvw/shdocvw.xml --- branches/ros-branch-0_2_7/reactos/lib/shdocvw/shdocvw.xml 2005-08-03 17:10:30 UTC (rev 17011) +++ branches/ros-branch-0_2_7/reactos/lib/shdocvw/shdocvw.xml 2005-08-03 17:10:45 UTC (rev 17012) @@ -1,32 +1,30 @@ -<module name="shdocvw" type="win32dll" baseaddress="${BASEADDRESS_SHDOCVW}" installbase="system32" installname="shdocvw.dll" usewrc="false" warnings="true"> - <importlibrary definition="shdocvw.spec.def" /> - <include base="shdocvw">.</include> - <include base="ReactOS">include/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> - <define name="__REACTOS__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WINVER">0x501</define> - <define name="_SHDOCVW_" /> - <library>wine</library> - <library>uuid</library> - <library>ntdll</library> - <library>kernel32</library> - <library>advapi32</library> - <library>user32</library> - <library>ole32</library> - <library>urlmon</library> - <file>classinfo.c</file> - <file>events.c</file> - <file>factory.c</file> - <file>misc.c</file> - <file>oleobject.c</file> - <file>persist.c</file> - <file>regsvr.c</file> - <file>shdocvw_main.c</file> - <file>webbrowser.c</file> - <file>shdocvw.rc</file> - <file>shdocvw.spec</file> -</module> +<module name="shdocvw" type="win32dll" baseaddress="${BASEADDRESS_SHDOCVW}" installbase="system32" installname="shdocvw.dll" usewrc="false" warnings="true"> + <importlibrary definition="shdocvw.spec.def" /> + <include base="shdocvw">.</include> + <include base="ReactOS">include/wine</include> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <define name="_SHDOCVW_" /> + <library>wine</library> + <library>uuid</library> + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <library>user32</library> + <library>ole32</library> + <library>urlmon</library> + <file>classinfo.c</file> + <file>events.c</file> + <file>factory.c</file> + <file>misc.c</file> + <file>oleobject.c</file> + <file>persist.c</file> + <file>regsvr.c</file> + <file>shdocvw_main.c</file> + <file>webbrowser.c</file> + <file>shdocvw.rc</file> + <file>shdocvw.spec</file> +</module> _____ Modified: branches/ros-branch-0_2_7/reactos/lib/shlwapi/shlwapi.xml --- branches/ros-branch-0_2_7/reactos/lib/shlwapi/shlwapi.xml 2005-08-03 17:10:30 UTC (rev 17011) +++ branches/ros-branch-0_2_7/reactos/lib/shlwapi/shlwapi.xml 2005-08-03 17:10:45 UTC (rev 17012) @@ -1,42 +1,40 @@ -<module name="shlwapi" type="win32dll" baseaddress="${BASEADDRESS_SHLWAPI}" installbase="system32" installname="shlwapi.dll" warnings="true"> - <importlibrary definition="shlwapi.spec.def" /> - <include base="shlwapi">.</include> - <include base="ReactOS">include/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> - <define name="__REACTOS__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WINVER">0x501</define> - <define name="_SHLWAPI_"/> - <define name="WINSHLWAPI">""</define> - <linkerflag>-nostdlib</linkerflag> - <linkerflag>-lgcc</linkerflag> - <library>wine</library> - <library>uuid</library> - <library>msvcrt</library> - <library>ntdll</library> - <library>kernel32</library> - <library>advapi32</library> - <library>gdi32</library> - <library>user32</library> - <library>ole32</library> - <library>oleaut32</library> - <file>assoc.c</file> - <file>clist.c</file> - <file>istream.c</file> - <file>msgbox.c</file> - <file>ordinal.c</file> - <file>path.c</file> - <file>reg.c</file> - <file>regstream.c</file> - <file>shlwapi_main.c</file> - <file>stopwatch.c</file> - <file>string.c</file> - <file>thread.c</file> - <file>url.c</file> - <file>wsprintf.c</file> - <file>shlwapi.rc</file> - <file>shlwapi.spec</file> -</module> +<module name="shlwapi" type="win32dll" baseaddress="${BASEADDRESS_SHLWAPI}" installbase="system32" installname="shlwapi.dll" warnings="true"> + <importlibrary definition="shlwapi.spec.def" /> + <include base="shlwapi">.</include> + <include base="ReactOS">include/wine</include> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <define name="_SHLWAPI_"/> + <define name="WINSHLWAPI">""</define> + <linkerflag>-nostdlib</linkerflag> + <linkerflag>-lgcc</linkerflag> + <library>wine</library> + <library>uuid</library> + <library>msvcrt</library> + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <library>gdi32</library> + <library>user32</library> + <library>ole32</library> + <library>oleaut32</library> + <file>assoc.c</file> + <file>clist.c</file> + <file>istream.c</file> + <file>msgbox.c</file> + <file>ordinal.c</file> + <file>path.c</file> + <file>reg.c</file> + <file>regstream.c</file> + <file>shlwapi_main.c</file> + <file>stopwatch.c</file> + <file>string.c</file> + <file>thread.c</file> + <file>url.c</file> + <file>wsprintf.c</file> + <file>shlwapi.rc</file> + <file>shlwapi.spec</file> +</module> _____ Modified: branches/ros-branch-0_2_7/reactos/lib/urlmon/urlmon.xml --- branches/ros-branch-0_2_7/reactos/lib/urlmon/urlmon.xml 2005-08-03 17:10:30 UTC (rev 17011) +++ branches/ros-branch-0_2_7/reactos/lib/urlmon/urlmon.xml 2005-08-03 17:10:45 UTC (rev 17012) @@ -1,29 +1,27 @@ -<module name="urlmon" type="win32dll" baseaddress="${BASEADDRESS_URLMON}" installbase="system32" installname="urlmon.dll" warnings="true"> - <importlibrary definition="urlmon.spec.def" /> - <include base="urlmon">.</include> - <include base="ReactOS">include/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> - <define name="__REACTOS__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WINVER">0x501</define> - <define name="_STDDEF_H" /> - <library>wine</library> - <library>uuid</library> - <library>ntdll</library> - <library>kernel32</library> - <library>advapi32</library> - <library>user32</library> - <library>ole32</library> - <library>shlwapi</library> - <library>cabinet</library> - <library>wininet</library> - <file>regsvr.c</file> - <file>sec_mgr.c</file> - <file>umon.c</file> - <file>umstream.c</file> - <file>urlmon_main.c</file> - <file>urlmon.spec</file> -</module> +<module name="urlmon" type="win32dll" baseaddress="${BASEADDRESS_URLMON}" installbase="system32" installname="urlmon.dll" warnings="true"> + <importlibrary definition="urlmon.spec.def" /> + <include base="urlmon">.</include> + <include base="ReactOS">include/wine</include> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <define name="_STDDEF_H" /> + <library>wine</library> + <library>uuid</library> + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <library>user32</library> + <library>ole32</library> + <library>shlwapi</library> + <library>cabinet</library> + <library>wininet</library> + <file>regsvr.c</file> + <file>sec_mgr.c</file> + <file>umon.c</file> + <file>umstream.c</file> + <file>urlmon_main.c</file> + <file>urlmon.spec</file> +</module> _____ Modified: branches/ros-branch-0_2_7/reactos/lib/wininet/wininet.xml --- branches/ros-branch-0_2_7/reactos/lib/wininet/wininet.xml 2005-08-03 17:10:30 UTC (rev 17011) +++ branches/ros-branch-0_2_7/reactos/lib/wininet/wininet.xml 2005-08-03 17:10:45 UTC (rev 17012) @@ -2,8 +2,6 @@ <importlibrary definition="wininet.spec.def" /> <include base="wininet">.</include> <include base="ReactOS">include/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> _____ Modified: branches/ros-branch-0_2_7/reactos/lib/winmm/winmm.xml --- branches/ros-branch-0_2_7/reactos/lib/winmm/winmm.xml 2005-08-03 17:10:30 UTC (rev 17011) +++ branches/ros-branch-0_2_7/reactos/lib/winmm/winmm.xml 2005-08-03 17:10:45 UTC (rev 17012) @@ -1,27 +1,25 @@ -<module name="winmm" type="win32dll" baseaddress="${BASEADDRESS_WINMM}" installbase="system32" installname="winmm.dll" warnings="true"> - <importlibrary definition="winmm.spec.def" /> - <include base="winmm">.</include> - <include base="ReactOS">include/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> - <define name="__REACTOS__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WINVER">0x501</define> - <library>wine</library> - <library>ntdll</library> - <library>kernel32</library> - <library>advapi32</library> - <library>user32</library> - <file>driver.c</file> - <file>joystick.c</file> - <file>lolvldrv.c</file> - <file>mci.c</file> - <file>mmio.c</file> - <file>playsound.c</file> - <file>time.c</file> - <file>winmm.c</file> - <file>winmm_res.rc</file> - <file>winmm.spec</file> -</module> +<module name="winmm" type="win32dll" baseaddress="${BASEADDRESS_WINMM}" installbase="system32" installname="winmm.dll" warnings="true"> + <importlibrary definition="winmm.spec.def" /> + <include base="winmm">.</include> + <include base="ReactOS">include/wine</include> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> [truncated at 1000 lines; 16 more skipped]

19 years, 3 months

[navaraf] 17011: Merge 16727 (ion/hbirr) from trunk:

by navaraf＠svn.reactos.com

Merge 16727 (ion/hbirr) from trunk: - Message Queue Fix, resolves a number of application regressions (Total Commander works again, for example). Patch by Hartmut Birr. To be commited into 0.2.7 after more testing. Modified: branches/ros-branch-0_2_7/reactos/subsys/win32k/ntuser/window.c _____ Modified: branches/ros-branch-0_2_7/reactos/subsys/win32k/ntuser/window.c --- branches/ros-branch-0_2_7/reactos/subsys/win32k/ntuser/window.c 2005-08-03 17:07:01 UTC (rev 17010) +++ branches/ros-branch-0_2_7/reactos/subsys/win32k/ntuser/window.c 2005-08-03 17:10:30 UTC (rev 17011) @@ -1577,6 +1577,7 @@ IntSetMenu(WindowObject, hMenu, &MenuChanged); } WindowObject->MessageQueue = PsGetWin32Thread()->MessageQueue; + IntReferenceMessageQueue(WindowObject->MessageQueue); WindowObject->Parent = (ParentWindow ? ParentWindow->Self : NULL); if((OwnerWindow = IntGetWindowObject(OwnerWindowHandle))) { @@ -2180,7 +2181,7 @@ if (Window->MessageQueue->CaptureWindow == Window->Self) Window->MessageQueue->CaptureWindow = NULL; IntUnLockMessageQueue(Window->MessageQueue); - + IntDereferenceMessageQueue(Window->MessageQueue); /* Call hooks */ #if 0 /* FIXME */ if (HOOK_CallHooks(WH_CBT, HCBT_DESTROYWND, (WPARAM) hwnd, 0, TRUE))

19 years, 3 months

[navaraf] 17010: Merge 16597 (hbirr) from trunk:

by navaraf＠svn.reactos.com

Merge 16597 (hbirr) from trunk: Used the kernel base address from the loader structure instead MmSystemRangeStart. MmSystemRangeStart isn't the base address with the 3GB switch. Modified: branches/ros-branch-0_2_7/reactos/hal/halx86/generic/halinit.c Modified: branches/ros-branch-0_2_7/reactos/hal/halx86/include/halp.h Modified: branches/ros-branch-0_2_7/reactos/hal/halx86/mp/apic.c Modified: branches/ros-branch-0_2_7/reactos/hal/halx86/mp/halinit_mp.c Modified: branches/ros-branch-0_2_7/reactos/hal/halx86/up/halinit_up.c Modified: branches/ros-branch-0_2_7/reactos/hal/halx86/xbox/halinit_xbox.c _____ Modified: branches/ros-branch-0_2_7/reactos/hal/halx86/generic/halinit.c --- branches/ros-branch-0_2_7/reactos/hal/halx86/generic/halinit.c 2005-08-03 17:05:36 UTC (rev 17009) +++ branches/ros-branch-0_2_7/reactos/hal/halx86/generic/halinit.c 2005-08-03 17:07:01 UTC (rev 17010) @@ -38,7 +38,7 @@ if (BootPhase == 0) { RtlZeroMemory(&HalpHooks, sizeof(HALP_HOOKS)); - HalpInitPhase0(); + HalpInitPhase0(LoaderBlock); } else if (BootPhase == 1) { _____ Modified: branches/ros-branch-0_2_7/reactos/hal/halx86/include/halp.h --- branches/ros-branch-0_2_7/reactos/hal/halx86/include/halp.h 2005-08-03 17:05:36 UTC (rev 17009) +++ branches/ros-branch-0_2_7/reactos/hal/halx86/include/halp.h 2005-08-03 17:07:01 UTC (rev 17010) @@ -38,7 +38,7 @@ PVOID HalpMapPhysMemory(ULONG PhysAddr, ULONG Size); /* Non-generic initialization */ -VOID HalpInitPhase0 (VOID); +VOID HalpInitPhase0 (PLOADER_PARAMETER_BLOCK LoaderBlock); /* DMA Page Register Structure 080 DMA RESERVED _____ Modified: branches/ros-branch-0_2_7/reactos/hal/halx86/mp/apic.c --- branches/ros-branch-0_2_7/reactos/hal/halx86/mp/apic.c 2005-08-03 17:05:36 UTC (rev 17009) +++ branches/ros-branch-0_2_7/reactos/hal/halx86/mp/apic.c 2005-08-03 17:07:01 UTC (rev 17010) @@ -83,6 +83,8 @@ WRITE_PORT_UCHAR((PUCHAR)0x71, value); \ }) +extern ULONG_PTR KernelBase; + /* FUNCTIONS *********************************************************************/ extern ULONG Read8254Timer(VOID); @@ -1035,7 +1037,7 @@ /* Write the page directory page */ Ke386GetPageTableDirectory(Common->PageDirectory); /* Write the kernel entry point */ - Common->NtProcessStartup = (ULONG_PTR)RtlImageNtHeader(MmSystemRangeStart)->OptionalHeader.AddressO fEntryPoint + (ULONG_PTR)MmSystemRangeStart; + Common->NtProcessStartup = (ULONG_PTR)RtlImageNtHeader((PVOID)KernelBase)->OptionalHeader.AddressOf EntryPoint + KernelBase; /* Write the state of the mae mode */ Common->PaeModeEnabled = Ke386GetCr4() & X86_CR4_PAE ? 1 : 0; _____ Modified: branches/ros-branch-0_2_7/reactos/hal/halx86/mp/halinit_mp.c --- branches/ros-branch-0_2_7/reactos/hal/halx86/mp/halinit_mp.c 2005-08-03 17:05:36 UTC (rev 17009) +++ branches/ros-branch-0_2_7/reactos/hal/halx86/mp/halinit_mp.c 2005-08-03 17:07:01 UTC (rev 17010) @@ -18,10 +18,11 @@ /* FUNCTIONS ***************************************************************/ extern BOOLEAN HaliFindSmpConfig(VOID); +ULONG_PTR KernelBase; /*********************************************************************** ****/ VOID -HalpInitPhase0(VOID) +HalpInitPhase0(PLOADER_PARAMETER_BLOCK LoaderBlock) { static BOOLEAN MPSInitialized = FALSE; @@ -29,7 +30,7 @@ /* Only initialize MP system once. Once called the first time, each subsequent call is part of the initialization sequence - for an application processor. */ + for an application processor. */ DPRINT("HalpInitPhase0()\n"); @@ -45,6 +46,10 @@ { KEBUGCHECK(0); } + + /* store the kernel base for later use */ + KernelBase = ((PLOADER_MODULE)LoaderBlock->ModsAddr)[0].ModStart; + } /* EOF */ _____ Modified: branches/ros-branch-0_2_7/reactos/hal/halx86/up/halinit_up.c --- branches/ros-branch-0_2_7/reactos/hal/halx86/up/halinit_up.c 2005-08-03 17:05:36 UTC (rev 17009) +++ branches/ros-branch-0_2_7/reactos/hal/halx86/up/halinit_up.c 2005-08-03 17:07:01 UTC (rev 17010) @@ -18,7 +18,7 @@ /* FUNCTIONS ***************************************************************/ VOID -HalpInitPhase0(VOID) +HalpInitPhase0(PLOADER_PARAMETER_BLOCK LoaderBlock) { HalpInitPICs(); _____ Modified: branches/ros-branch-0_2_7/reactos/hal/halx86/xbox/halinit_xbox.c --- branches/ros-branch-0_2_7/reactos/hal/halx86/xbox/halinit_xbox.c 2005-08-03 17:05:36 UTC (rev 17009) +++ branches/ros-branch-0_2_7/reactos/hal/halx86/xbox/halinit_xbox.c 2005-08-03 17:07:01 UTC (rev 17010) @@ -22,7 +22,7 @@ /* FUNCTIONS ***************************************************************/ VOID -HalpInitPhase0(VOID) +HalpInitPhase0(PLOADER_PARAMETER_BLOCK LoaderBlock) { HalpHooks.InitPciBus = HalpXboxInitPciBus;

19 years, 3 months

[navaraf] 17009: Merge 16596 (hbirr) from trunk:

by navaraf＠svn.reactos.com

Merge 16596 (hbirr) from trunk: Replaced KERNEL_BASE by MmSystemRangeStart. Modified: branches/ros-branch-0_2_7/reactos/ntoskrnl/ke/i386/exp.c Modified: branches/ros-branch-0_2_7/reactos/ntoskrnl/mm/marea.c _____ Modified: branches/ros-branch-0_2_7/reactos/ntoskrnl/ke/i386/exp.c --- branches/ros-branch-0_2_7/reactos/ntoskrnl/ke/i386/exp.c 2005-08-03 16:17:15 UTC (rev 17008) +++ branches/ros-branch-0_2_7/reactos/ntoskrnl/ke/i386/exp.c 2005-08-03 17:05:36 UTC (rev 17009) @@ -469,7 +469,7 @@ * Complete CPU context */ { - unsigned int cr2; + ULONG_PTR cr2; NTSTATUS Status; ULONG Esp0; @@ -528,7 +528,7 @@ */ if (ExceptionNr == 14) { - if (Ke386NoExecute && Tf->ErrorCode & 0x10 && cr2 >= KERNEL_BASE) + if (Ke386NoExecute && Tf->ErrorCode & 0x10 && cr2 >= (ULONG_PTR)MmSystemRangeStart) { KEBUGCHECKWITHTF(ATTEMPTED_EXECUTE_OF_NOEXECUTE_MEMORY, 0, 0, 0, 0, Tf); } _____ Modified: branches/ros-branch-0_2_7/reactos/ntoskrnl/mm/marea.c --- branches/ros-branch-0_2_7/reactos/ntoskrnl/mm/marea.c 2005-08-03 16:17:15 UTC (rev 17008) +++ branches/ros-branch-0_2_7/reactos/ntoskrnl/mm/marea.c 2005-08-03 17:05:36 UTC (rev 17009) @@ -971,7 +971,7 @@ *BaseAddress = MM_ROUND_DOWN(*BaseAddress, Granularity); if (AddressSpace->LowestAddress == MmSystemRangeStart && - *BaseAddress < (PVOID)KERNEL_BASE) + *BaseAddress < MmSystemRangeStart) { CHECKPOINT; return STATUS_ACCESS_VIOLATION;

19 years, 3 months

← Newer
1
...
56
57
58
59
60
61
62
...
67
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 August 2005