May 2006 - Wine-Commits - list.winehq.org

Phil Costin : wined3d: Create stub for D3DPERF_SetOptions function.
by Alexandre Julliard May 26, 2006

May 26, 2006

Module: wine Branch: master Commit: 46047402a35923357d2eac3b2c4405f2efac103c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=46047402a35923357d2eac3… Author: Phil Costin <philcostin(a)hotmail.com> Date: Thu May 25 22:49:02 2006 +0100 wined3d: Create stub for D3DPERF_SetOptions function. --- dlls/d3d9/d3d9.spec | 1 + dlls/d3d9/d3d9_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/d3d9.spec b/dlls/d3d9/d3d9.spec index 77dd882..24e3ce6 100644 --- a/dlls/d3d9/d3d9.spec +++ b/dlls/d3d9/d3d9.spec @@ -3,3 +3,4 @@ @ stdcall Direct3DCreate9(long) @ stdcall ValidatePixelShader(ptr long long ptr) @ stdcall ValidateVertexShader(ptr long long ptr) +@ stdcall D3DPERF_SetOptions(long) diff --git a/dlls/d3d9/d3d9_main.c b/dlls/d3d9/d3d9_main.c index 467d71d..3ef5441 100644 --- a/dlls/d3d9/d3d9_main.c +++ b/dlls/d3d9/d3d9_main.c @@ -93,3 +93,12 @@ BOOL WINAPI ValidatePixelShader(LPVOID p FIXME("(%p %d %d %p): stub\n", pFunction, param1, param2, toto); return TRUE; } + +/*********************************************************************** + * D3DPERF_SetOptions (D3D9.@) + * + */ +void WINAPI D3DPERF_SetOptions(DWORD options) +{ + FIXME("(%#lx) : stub\n", options); +}

1 0

Mikołaj Zalewski : comctl32: header: Draw the drag image and hot dividers while dragging an item.
by Alexandre Julliard May 26, 2006

May 26, 2006

Module: wine Branch: master Commit: 7ab41112ae49ba10a4f9f07fe5e4b4c0521f713c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7ab41112ae49ba10a4f9f07… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu May 25 23:53:24 2006 +0200 comctl32: header: Draw the drag image and hot dividers while dragging an item. --- dlls/comctl32/header.c | 108 +++++++++++++++++++++++++++++++++++++----------- 1 files changed, 83 insertions(+), 25 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 3242bbd..dccc6a2 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -32,6 +32,7 @@ */ #include <stdarg.h> +#include <stdlib.h> #include <string.h> #include "windef.h" @@ -77,7 +78,9 @@ typedef struct HCURSOR hcurDivopen; /* handle to a cursor (used over dividers) <-||-> */ BOOL bCaptured; /* Is the mouse captured? */ BOOL bPressed; /* Is a header item pressed (down)? */ + BOOL bDragging; /* Are we dragging an item? */ BOOL bTracking; /* Is in tracking mode? */ + POINT ptLButtonDown; /* The point where the left button was pressed */ 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 */ @@ -512,6 +515,9 @@ HEADER_Refresh (HWND hwnd, HDC hdc) /* get rect for the bar, adjusted for the border */ GetClientRect (hwnd, &rect); + + if (infoPtr->bDragging) + ImageList_DragShowNolock(FALSE); hFont = infoPtr->hFont ? infoPtr->hFont : GetStockObject (SYSTEM_FONT); hOldFont = SelectObject (hdc, hFont); @@ -546,6 +552,9 @@ HEADER_Refresh (HWND hwnd, HDC hdc) if (infoPtr->iHotDivider != -1) HEADER_DrawHotDivider(hwnd, hdc); + + if (infoPtr->bDragging) + ImageList_DragShowNolock(TRUE); SelectObject (hdc, hOldFont); } @@ -1556,6 +1565,16 @@ HEADER_GetFont (HWND hwnd) } +static BOOL +HEADER_IsDragDistance(HEADER_INFO *infoPtr, POINT *pt) +{ + /* Windows allows for a mouse movement before starting the drag. We use the + * SM_CXDOUBLECLICK/SM_CYDOUBLECLICK as that distance. + */ + return (abs(infoPtr->ptLButtonDown.x - pt->x)>GetSystemMetrics(SM_CXDOUBLECLK) || + abs(infoPtr->ptLButtonDown.y - pt->y)>GetSystemMetrics(SM_CYDOUBLECLK)); +} + static LRESULT HEADER_LButtonDblClk (HWND hwnd, WPARAM wParam, LPARAM lParam) { @@ -1594,7 +1613,9 @@ HEADER_LButtonDown (HWND hwnd, WPARAM wP SetCapture (hwnd); infoPtr->bCaptured = TRUE; infoPtr->bPressed = TRUE; + infoPtr->bDragging = FALSE; infoPtr->iMoveItem = nItem; + infoPtr->ptLButtonDown = pt; infoPtr->items[nItem].bDown = TRUE; @@ -1644,7 +1665,37 @@ HEADER_LButtonUp (HWND hwnd, WPARAM wPar HEADER_InternalHitTest (hwnd, &pt, &flags, &nItem); if (infoPtr->bPressed) { - if ((nItem == infoPtr->iMoveItem) && (flags == HHT_ONHEADER)) { + if (infoPtr->bDragging) + { + ImageList_DragShowNolock(FALSE); + ImageList_EndDrag(); + infoPtr->items[infoPtr->iMoveItem].bDown=FALSE; + /* FIXME: the new order field should be sent, not the old one */ + if (!HEADER_SendHeaderNotifyT(hwnd, HDN_ENDDRAG, infoPtr->iMoveItem, HDI_ORDER, NULL)) + { + HEADER_ITEM *lpItem; + INT newindex = HEADER_IndexToOrder(hwnd,nItem); + INT oldindex = HEADER_IndexToOrder(hwnd,infoPtr->iMoveItem); + + TRACE("Exchanging [index:order] [%d:%d] [%d:%d]\n", + infoPtr->iMoveItem,oldindex,nItem,newindex); + lpItem= &infoPtr->items[nItem]; + lpItem->iOrder=oldindex; + + lpItem= &infoPtr->items[infoPtr->iMoveItem]; + lpItem->iOrder = newindex; + + infoPtr->order[oldindex] = nItem; + infoPtr->order[newindex] = infoPtr->iMoveItem; + + infoPtr->bRectsValid = FALSE; + InvalidateRect(hwnd, NULL, FALSE); + } + else + InvalidateRect(hwnd, &infoPtr->items[infoPtr->iMoveItem].rect, FALSE); + } + else if (!(dwStyle&HDS_DRAGDROP) || !HEADER_IsDragDistance(infoPtr, &pt)) + { infoPtr->items[infoPtr->iMoveItem].bDown = FALSE; hdc = GetDC (hwnd); HEADER_RefreshItem (hwnd, hdc, infoPtr->iMoveItem); @@ -1652,27 +1703,6 @@ HEADER_LButtonUp (HWND hwnd, WPARAM wPar HEADER_SendClickNotify (hwnd, HDN_ITEMCLICKA, infoPtr->iMoveItem); } - else if (flags == HHT_ONHEADER) - { - HEADER_ITEM *lpItem; - INT newindex = HEADER_IndexToOrder(hwnd,nItem); - INT oldindex = HEADER_IndexToOrder(hwnd,infoPtr->iMoveItem); - - TRACE("Exchanging [index:order] [%d:%d] [%d:%d]\n", - infoPtr->iMoveItem,oldindex,nItem,newindex); - lpItem= &infoPtr->items[nItem]; - lpItem->iOrder=oldindex; - - lpItem= &infoPtr->items[infoPtr->iMoveItem]; - lpItem->iOrder = newindex; - - infoPtr->order[oldindex] = nItem; - infoPtr->order[newindex] = infoPtr->iMoveItem; - - infoPtr->bRectsValid = FALSE; - InvalidateRect(hwnd, NULL, FALSE); - /* FIXME: Should some WM_NOTIFY be sent */ - } TRACE("Released item %d!\n", infoPtr->iMoveItem); infoPtr->bPressed = FALSE; @@ -1735,7 +1765,6 @@ HEADER_NotifyFormat (HWND hwnd, WPARAM w return 0; } - static LRESULT HEADER_MouseLeave (HWND hwnd, WPARAM wParam, LPARAM lParam) { @@ -1779,7 +1808,36 @@ HEADER_MouseMove (HWND hwnd, WPARAM wPar } if (infoPtr->bCaptured) { - if (infoPtr->bPressed) { + /* check if we should drag the header */ + if (infoPtr->bPressed && !infoPtr->bDragging && dwStyle&HDS_DRAGDROP + && HEADER_IsDragDistance(infoPtr, &pt)) + { + if (!HEADER_SendHeaderNotifyT(hwnd, HDN_BEGINDRAG, infoPtr->iMoveItem, 0, NULL)) + { + HIMAGELIST hDragItem = (HIMAGELIST)HEADER_CreateDragImage(hwnd, infoPtr->iMoveItem); + if (hDragItem != NULL) + { + HEADER_ITEM *lpItem = &infoPtr->items[infoPtr->iMoveItem]; + TRACE("Starting item drag\n"); + ImageList_BeginDrag(hDragItem, 0, pt.x - lpItem->rect.left, 0); + ImageList_DragShowNolock(TRUE); + ImageList_Destroy(hDragItem); + infoPtr->bDragging = TRUE; + } + } + } + + if (infoPtr->bDragging) + { + POINT drag; + drag.x = pt.x; + drag.y = 0; + ClientToScreen(hwnd, &drag); + ImageList_DragMove(drag.x, drag.y); + HEADER_SetHotDivider(hwnd, TRUE, lParam); + } + + if (infoPtr->bPressed && !infoPtr->bDragging) { BOOL oldState = infoPtr->items[infoPtr->iMoveItem].bDown; if ((nItem == infoPtr->iMoveItem) && (flags == HHT_ONHEADER)) infoPtr->items[infoPtr->iMoveItem].bDown = TRUE; @@ -1836,7 +1894,7 @@ HEADER_MouseMove (HWND hwnd, WPARAM wPar if (hotTrackEnabled) { TRACKMOUSEEVENT tme; - if (oldHotItem != infoPtr->iHotItem) { + if (oldHotItem != infoPtr->iHotItem && !infoPtr->bDragging) { hdc = GetDC (hwnd); if (oldHotItem != -1) HEADER_RefreshItem (hwnd, hdc, oldHotItem); if (infoPtr->iHotItem != -1) HEADER_RefreshItem (hwnd, hdc, infoPtr->iHotItem);

1 0

Pierre d'Herbemont : wineprefixcreate: Obtain wine and wineserver from the bindir, instead of relaying on the PATH.
by Alexandre Julliard May 26, 2006

May 26, 2006

Module: wine Branch: master Commit: 6997ce7c9d4c2f3b8304b3fbdbc0476b2b2d4cee URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6997ce7c9d4c2f3b8304b3f… Author: Pierre d'Herbemont <stegefin(a)free.fr> Date: Thu May 25 15:20:59 2006 +0200 wineprefixcreate: Obtain wine and wineserver from the bindir, instead of relaying on the PATH. --- tools/wineprefixcreate.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/wineprefixcreate.in b/tools/wineprefixcreate.in index 7898456..7ac5c8c 100644 --- a/tools/wineprefixcreate.in +++ b/tools/wineprefixcreate.in @@ -168,13 +168,13 @@ # Copy the .inf script and run it cp "$datadir/wine.inf" "$CROOT/windows/inf/wine.inf" export WINEPREFIX -"${WINELOADER:-wine}" rundll32.exe setupapi.dll,InstallHinfSection DefaultInstall 128 wine.inf +"${WINELOADER:-$bindir/wine}" rundll32.exe setupapi.dll,InstallHinfSection DefaultInstall 128 wine.inf # Wait for the wineserver to finish if [ $do_wait = 1 ] then - "${WINESERVER:-wineserver}" -w + "${WINESERVER:-$bindir/wineserver}" -w fi if [ $quiet = 0 ]

1 0

Mikołaj Zalewski : comctl32: header: Fix an order-related bug in HEADER_InternalHitTest.
by Alexandre Julliard May 26, 2006

May 26, 2006

Module: wine Branch: master Commit: 89b62b48c6e530bc943faf9d615eb94cc58b9e8e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=89b62b48c6e530bc943faf9… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu May 25 23:51:03 2006 +0200 comctl32: header: Fix an order-related bug in HEADER_InternalHitTest. --- dlls/comctl32/header.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index fb37923..3242bbd 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -199,6 +199,12 @@ HEADER_NextItem(HWND hwnd, INT iItem) return HEADER_OrderToIndex(hwnd, HEADER_IndexToOrder(hwnd, iItem)+1); } +static INT +HEADER_PrevItem(HWND hwnd, INT iItem) +{ + return HEADER_OrderToIndex(hwnd, HEADER_IndexToOrder(hwnd, iItem)-1); +} + static void HEADER_SetItemBounds (HWND hwnd) { @@ -594,19 +600,19 @@ HEADER_InternalHitTest (HWND hwnd, LPPOI TRACE("ON HEADER %d\n", iCount); return; } - if (iCount > 0) { + if (HEADER_IndexToOrder(hwnd, iCount) > 0) { rcTest = rect; rcTest.right = rcTest.left + DIVIDER_WIDTH; if (PtInRect (&rcTest, *lpPt)) { if (bNoWidth) { *pFlags |= HHT_ONDIVOPEN; - *pItem = iCount - 1; + *pItem = HEADER_PrevItem(hwnd, iCount); TRACE("ON DIVOPEN %d\n", *pItem); return; } else { *pFlags |= HHT_ONDIVIDER; - *pItem = iCount - 1; + *pItem = HEADER_PrevItem(hwnd, iCount); TRACE("ON DIVIDER %d\n", *pItem); return; }

1 0

Mikołaj Zalewski : comctl32: listview: Apply the HDS_DRAGDROP header style if needed.
by Alexandre Julliard May 26, 2006

May 26, 2006

Module: wine Branch: master Commit: bfe030dfeddbfc1eb3255366d72428c7fb24b397 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bfe030dfeddbfc1eb325536… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Fri May 26 00:05:27 2006 +0200 comctl32: listview: Apply the HDS_DRAGDROP header style if needed. Apply the HDS_DRAGDROP header style if the listview has the LVS_EX_HEADERDRAGDROP. Block the columns reordering as the listview doesn't support them. --- dlls/comctl32/listview.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index dbc1733..60c3083 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6874,6 +6874,16 @@ static DWORD LISTVIEW_SetExtendedListVie himl = LISTVIEW_CreateCheckBoxIL(infoPtr); LISTVIEW_SetImageList(infoPtr, LVSIL_STATE, himl); } + + if((infoPtr->dwLvExStyle ^ dwOldStyle) & LVS_EX_HEADERDRAGDROP) + { + DWORD dwStyle = GetWindowLongW(infoPtr->hwndHeader, GWL_STYLE); + if (infoPtr->dwLvExStyle & LVS_EX_HEADERDRAGDROP) + dwStyle |= HDS_DRAGDROP; + else + dwStyle &= ~HDS_DRAGDROP; + SetWindowLongW(infoPtr->hwndHeader, GWL_STYLE, dwStyle); + } return dwOldStyle; } @@ -8461,6 +8471,10 @@ static LRESULT LISTVIEW_HeaderNotificati infoPtr->xTrackLine = -1; break; + case HDN_ENDDRAG: + FIXME("Changing column order not implemented\n"); + return TRUE; + case HDN_ITEMCHANGINGW: case HDN_ITEMCHANGINGA: return notify_forward_header(infoPtr, lpnmh);

1 0

Mikołaj Zalewski : comctl32: header: Implement HDM_CREATEDRAGIMAGE.
by Alexandre Julliard May 26, 2006

May 26, 2006

Module: wine Branch: master Commit: 4301543533261a6c58abf3a9a9a9908d31d636c9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4301543533261a6c58abf3a… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu May 25 23:46:53 2006 +0200 comctl32: header: Implement HDM_CREATEDRAGIMAGE. --- dlls/comctl32/header.c | 33 +++++++++++++++++++++++++++++++-- 1 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 81a8b92..f034e7b 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -875,8 +875,37 @@ HEADER_SendClickNotify (HWND hwnd, UINT static LRESULT HEADER_CreateDragImage (HWND hwnd, WPARAM wParam) { - FIXME("empty stub!\n"); - return 0; + HEADER_INFO *infoPtr = HEADER_GetInfoPtr(hwnd); + HEADER_ITEM *lpItem; + HIMAGELIST himl; + HBITMAP hMemory, hOldBitmap; + HDC hMemoryDC; + HDC hDeviceDC; + int height, width; + + if (wParam < 0 || wParam >= infoPtr->uNumItem) + return FALSE; + lpItem = &infoPtr->items[wParam]; + width = lpItem->rect.right - lpItem->rect.left; + height = lpItem->rect.bottom - lpItem->rect.top; + + hDeviceDC = GetDC(NULL); + hMemoryDC = CreateCompatibleDC(hDeviceDC); + hMemory = CreateCompatibleBitmap(hDeviceDC, width, height); + ReleaseDC(NULL, hDeviceDC); + hOldBitmap = SelectObject(hMemoryDC, hMemory); + SetViewportOrgEx(hMemoryDC, -lpItem->rect.left, -lpItem->rect.top, NULL); + HEADER_DrawItem(hwnd, hMemoryDC, wParam, FALSE); + hMemory = SelectObject(hMemoryDC, hOldBitmap); + DeleteDC(hMemoryDC); + + if (hMemory == NULL) /* if anything failed */ + return FALSE; + + himl = ImageList_Create(width, height, ILC_COLORDDB, 1, 1); + ImageList_Add(himl, hMemory, NULL); + DeleteObject(hMemory); + return (LRESULT)himl; }

1 0

Mikołaj Zalewski : comctl32: header: Implement HDM_SETHOTDIVIDER.
by Alexandre Julliard May 26, 2006

May 26, 2006

Module: wine Branch: master Commit: 7e461db20391547f312439d96ce2b9629e2d8211 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7e461db20391547f312439d… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu May 25 23:48:39 2006 +0200 comctl32: header: Implement HDM_SETHOTDIVIDER. --- dlls/comctl32/header.c | 110 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 107 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index f034e7b..fb37923 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -83,6 +83,7 @@ typedef struct 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 iHotDivider; /* index of the hot divider (used while dragging an item or by HDM_SETHOTDIVIDER) */ INT iMargin; /* width of the margin that surrounds a bitmap */ HIMAGELIST himl; /* handle to an image list (may be 0) */ @@ -94,6 +95,7 @@ typedef struct #define VERT_BORDER 4 #define DIVIDER_WIDTH 10 +#define HOT_DIVIDER_WIDTH 2 #define MAX_HEADER_TEXT_LEN 260 #define HDN_UNICODE_OFFSET 20 #define HDN_FIRST_UNICODE (HDN_FIRST-HDN_UNICODE_OFFSET) @@ -190,6 +192,13 @@ HEADER_OrderToIndex(HWND hwnd, WPARAM wP return infoPtr->order[iorder]; } +/* Note: if iItem is the last item then this function returns infoPtr->uNumItem */ +static INT +HEADER_NextItem(HWND hwnd, INT iItem) +{ + return HEADER_OrderToIndex(hwnd, HEADER_IndexToOrder(hwnd, iItem)+1); +} + static void HEADER_SetItemBounds (HWND hwnd) { @@ -227,6 +236,37 @@ HEADER_Size (HWND hwnd, WPARAM wParam) return 0; } +static void HEADER_GetHotDividerRect(HWND hwnd, HEADER_INFO *infoPtr, RECT *r) +{ + INT iDivider = infoPtr->iHotDivider; + if (infoPtr->uNumItem > 0) + { + HEADER_ITEM *lpItem; + + if (iDivider < infoPtr->uNumItem) + { + lpItem = &infoPtr->items[iDivider]; + r->left = lpItem->rect.left - HOT_DIVIDER_WIDTH/2; + r->right = lpItem->rect.left + HOT_DIVIDER_WIDTH/2; + } + else + { + lpItem = &infoPtr->items[HEADER_OrderToIndex(hwnd, infoPtr->uNumItem-1)]; + r->left = lpItem->rect.right - HOT_DIVIDER_WIDTH/2; + r->right = lpItem->rect.right + HOT_DIVIDER_WIDTH/2; + } + r->top = lpItem->rect.top; + r->bottom = lpItem->rect.bottom; + } + else + { + RECT clientRect; + GetClientRect(hwnd, &clientRect); + *r = clientRect; + r->right = r->left + HOT_DIVIDER_WIDTH/2; + } +} + static INT HEADER_DrawItem (HWND hwnd, HDC hdc, INT iItem, BOOL bHotTrack) @@ -440,6 +480,18 @@ HEADER_DrawItem (HWND hwnd, HDC hdc, INT return phdi->rect.right; } +static void +HEADER_DrawHotDivider(HWND hwnd, HDC hdc) +{ + HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); + HBRUSH brush; + RECT r; + + HEADER_GetHotDividerRect(hwnd, infoPtr, &r); + brush = CreateSolidBrush(GetSysColor(COLOR_HIGHLIGHT)); + FillRect(hdc, &r, brush); + DeleteObject(brush); +} static void HEADER_Refresh (HWND hwnd, HDC hdc) @@ -485,7 +537,9 @@ HEADER_Refresh (HWND hwnd, HDC hdc) DrawEdge (hdc, &rect, EDGE_ETCHED, BF_BOTTOM|BF_MIDDLE); } } - + + if (infoPtr->iHotDivider != -1) + HEADER_DrawHotDivider(hwnd, hdc); SelectObject (hdc, hOldFont); } @@ -871,7 +925,6 @@ HEADER_SendClickNotify (HWND hwnd, UINT (WPARAM)nmhdr.hdr.idFrom, (LPARAM)&nmhdr); } - static LRESULT HEADER_CreateDragImage (HWND hwnd, WPARAM wParam) { @@ -908,6 +961,55 @@ HEADER_CreateDragImage (HWND hwnd, WPARA return (LRESULT)himl; } +static LRESULT +HEADER_SetHotDivider(HWND hwnd, WPARAM wParam, LPARAM lParam) +{ + HEADER_INFO *infoPtr = HEADER_GetInfoPtr(hwnd); + INT iDivider; + RECT r; + + if (wParam) + { + POINT pt; + UINT flags; + pt.x = (INT)(SHORT)LOWORD(lParam); + pt.y = 0; + HEADER_InternalHitTest (hwnd, &pt, &flags, &iDivider); + + if (flags & HHT_TOLEFT) + iDivider = 0; + else if (flags & HHT_NOWHERE || flags & HHT_TORIGHT) + iDivider = infoPtr->uNumItem; + else + { + HEADER_ITEM *lpItem = &infoPtr->items[iDivider]; + if (pt.x > (lpItem->rect.left+lpItem->rect.right)/2) + iDivider = HEADER_NextItem(hwnd, iDivider); + } + } + else + iDivider = (INT)lParam; + + /* Note; wParam==FALSE, lParam==-1 is valid and is used to clear the hot divider */ + if (iDivider<-1 || iDivider>(int)infoPtr->uNumItem) + return iDivider; + + if (iDivider != infoPtr->iHotDivider) + { + if (infoPtr->iHotDivider != -1) + { + HEADER_GetHotDividerRect(hwnd, infoPtr, &r); + InvalidateRect(hwnd, &r, FALSE); + } + infoPtr->iHotDivider = iDivider; + if (iDivider != -1) + { + HEADER_GetHotDividerRect(hwnd, infoPtr, &r); + InvalidateRect(hwnd, &r, FALSE); + } + } + return iDivider; +} static LRESULT HEADER_DeleteItem (HWND hwnd, WPARAM wParam) @@ -1390,6 +1492,7 @@ HEADER_Create (HWND hwnd, WPARAM wParam, infoPtr->iMoveItem = 0; infoPtr->himl = 0; infoPtr->iHotItem = -1; + infoPtr->iHotDivider = -1; infoPtr->iMargin = 3*GetSystemMetrics(SM_CXEDGE); infoPtr->nNotifyFormat = SendMessageW (infoPtr->hwndNotify, WM_NOTIFYFORMAT, (WPARAM)hwnd, NF_QUERY); @@ -1901,7 +2004,8 @@ HEADER_WindowProc (HWND hwnd, UINT msg, /* case HDM_SETFILTERCHANGETIMEOUT: */ -/* case HDM_SETHOTDIVIDER: */ + case HDM_SETHOTDIVIDER: + return HEADER_SetHotDivider(hwnd, wParam, lParam); case HDM_SETIMAGELIST: return HEADER_SetImageList (hwnd, (HIMAGELIST)lParam);

1 0

Mike McCormack : winapi: IMAGE_OPTIONAL_HEADER has different members on x86-64.
by Alexandre Julliard May 26, 2006

May 26, 2006

Module: wine Branch: master Commit: 1cf527c3a32ea070c9d827f804d43e4271cf1b4c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1cf527c3a32ea070c9d827f… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri May 26 12:36:42 2006 +0900 winapi: IMAGE_OPTIONAL_HEADER has different members on x86-64. --- tools/winapi/tests.dat | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index 9b3c83f..016e95c 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -694,7 +694,7 @@ IMAGE_IMPORT_DESCRIPTOR IMAGE_LINENUMBER IMAGE_LOAD_CONFIG_DIRECTORY IMAGE_NT_HEADERS -IMAGE_OPTIONAL_HEADER +!IMAGE_OPTIONAL_HEADER # different on Win64 IMAGE_OS2_HEADER IMAGE_RELOCATION IMAGE_RESOURCE_DATA_ENTRY

1 0

Mike McCormack : rpcrt4: Remove unused IN and OUT macros.
by Alexandre Julliard May 26, 2006

May 26, 2006

Module: wine Branch: master Commit: 3742333581dfbec54f3451956c87798047d3dd44 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3742333581dfbec54f34519… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri May 26 12:36:03 2006 +0900 rpcrt4: Remove unused IN and OUT macros. --- include/rpcndr.h | 58 +++++++++++++++++++++++++++--------------------------- 1 files changed, 29 insertions(+), 29 deletions(-) diff --git a/include/rpcndr.h b/include/rpcndr.h index 6f43bb4..42e5b1c 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -30,7 +30,7 @@ #endif #include <basetsd.h> -/* stupid #if can't handle casts... this __stupidity +/* stupid #if can't handle casts... this __stupidity is just a workaround for that limitation */ #define __NDR_CHAR_REP_MASK 0x000fL @@ -451,67 +451,67 @@ typedef struct _SCONTEXT_QUEUE { /* Context Handles */ RPCRTAPI RPC_BINDING_HANDLE RPC_ENTRY - NDRCContextBinding( IN NDR_CCONTEXT CContext ); + NDRCContextBinding( NDR_CCONTEXT CContext ); RPCRTAPI void RPC_ENTRY - NDRCContextMarshall( IN NDR_CCONTEXT CContext, OUT void *pBuff ); + NDRCContextMarshall( NDR_CCONTEXT CContext, void *pBuff ); RPCRTAPI void RPC_ENTRY - NDRCContextUnmarshall( OUT NDR_CCONTEXT *pCContext, IN RPC_BINDING_HANDLE hBinding, - IN void *pBuff, IN unsigned long DataRepresentation ); + NDRCContextUnmarshall( NDR_CCONTEXT *pCContext, RPC_BINDING_HANDLE hBinding, + void *pBuff, unsigned long DataRepresentation ); RPCRTAPI void RPC_ENTRY - NDRSContextMarshall( IN NDR_SCONTEXT CContext, OUT void *pBuff, IN NDR_RUNDOWN userRunDownIn ); + NDRSContextMarshall( NDR_SCONTEXT CContext, void *pBuff, NDR_RUNDOWN userRunDownIn ); RPCRTAPI NDR_SCONTEXT RPC_ENTRY - NDRSContextUnmarshall( IN void *pBuff, IN unsigned long DataRepresentation ); + NDRSContextUnmarshall( void *pBuff, unsigned long DataRepresentation ); RPCRTAPI void RPC_ENTRY - NDRSContextMarshallEx( IN RPC_BINDING_HANDLE BindingHandle, IN NDR_SCONTEXT CContext, - OUT void *pBuff, IN NDR_RUNDOWN userRunDownIn ); + NDRSContextMarshallEx( RPC_BINDING_HANDLE BindingHandle, NDR_SCONTEXT CContext, + void *pBuff, NDR_RUNDOWN userRunDownIn ); RPCRTAPI void RPC_ENTRY - NDRSContextMarshall2( IN RPC_BINDING_HANDLE BindingHandle, IN NDR_SCONTEXT CContext, - OUT void *pBuff, IN NDR_RUNDOWN userRunDownIn, IN void * CtxGuard, - IN unsigned long Flags ); + NDRSContextMarshall2( RPC_BINDING_HANDLE BindingHandle, NDR_SCONTEXT CContext, + void *pBuff, NDR_RUNDOWN userRunDownIn, void * CtxGuard, + unsigned long Flags ); RPCRTAPI NDR_SCONTEXT RPC_ENTRY - NDRSContextUnmarshallEx( IN RPC_BINDING_HANDLE BindingHandle, IN void *pBuff, - IN unsigned long DataRepresentation ); + NDRSContextUnmarshallEx( RPC_BINDING_HANDLE BindingHandle, void *pBuff, + unsigned long DataRepresentation ); RPCRTAPI NDR_SCONTEXT RPC_ENTRY - NDRSContextUnmarshall2( IN RPC_BINDING_HANDLE BindingHandle, IN void *pBuff, - IN unsigned long DataRepresentation, IN void *CtxGuard, - IN unsigned long Flags ); + NDRSContextUnmarshall2( RPC_BINDING_HANDLE BindingHandle, void *pBuff, + unsigned long DataRepresentation, void *CtxGuard, + unsigned long Flags ); RPCRTAPI void RPC_ENTRY NdrClientContextMarshall ( PMIDL_STUB_MESSAGE pStubMsg, NDR_CCONTEXT ContextHandle, int fCheck ); RPCRTAPI void RPC_ENTRY - NdrClientContextUnmarshall( IN PMIDL_STUB_MESSAGE pStubMsg, OUT NDR_CCONTEXT* pContextHandle, - IN RPC_BINDING_HANDLE BindHandle ); + NdrClientContextUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, NDR_CCONTEXT* pContextHandle, + RPC_BINDING_HANDLE BindHandle ); RPCRTAPI void RPC_ENTRY NdrServerContextMarshall ( PMIDL_STUB_MESSAGE pStubMsg, NDR_SCONTEXT ContextHandle, NDR_RUNDOWN RundownRoutine ); RPCRTAPI NDR_SCONTEXT RPC_ENTRY - NdrServerContextUnmarshall( IN PMIDL_STUB_MESSAGE pStubMsg ); + NdrServerContextUnmarshall( PMIDL_STUB_MESSAGE pStubMsg ); RPCRTAPI void RPC_ENTRY NdrContextHandleSize( PMIDL_STUB_MESSAGE pStubMsg, unsigned char* pMemory, PFORMAT_STRING pFormat ); RPCRTAPI NDR_SCONTEXT RPC_ENTRY - NdrContextHandleInitialize( IN PMIDL_STUB_MESSAGE pStubMsg, IN PFORMAT_STRING pFormat ); + NdrContextHandleInitialize( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat ); RPCRTAPI void RPC_ENTRY NdrServerContextNewMarshall( PMIDL_STUB_MESSAGE pStubMsg, NDR_SCONTEXT ContextHandle, NDR_RUNDOWN RundownRoutine, PFORMAT_STRING pFormat ); RPCRTAPI NDR_SCONTEXT RPC_ENTRY - NdrServerContextNewUnmarshall( IN PMIDL_STUB_MESSAGE pStubMsg, IN PFORMAT_STRING pFormat ); + NdrServerContextNewUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat ); RPCRTAPI void RPC_ENTRY - RpcSsDestroyClientContext( IN void **ContextHandle ); + RpcSsDestroyClientContext( void **ContextHandle ); RPCRTAPI void RPC_ENTRY NdrSimpleTypeMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char* pMemory, unsigned char FormatChar ); @@ -600,10 +600,10 @@ RPCRTAPI void RPC_ENTRY NdrOleFree( void* NodeToFree ); RPCRTAPI void RPC_ENTRY - NdrClientInitializeNew( PRPC_MESSAGE pRpcMessage, PMIDL_STUB_MESSAGE pStubMsg, + NdrClientInitializeNew( PRPC_MESSAGE pRpcMessage, PMIDL_STUB_MESSAGE pStubMsg, PMIDL_STUB_DESC pStubDesc, unsigned int ProcNum ); RPCRTAPI unsigned char* RPC_ENTRY - NdrServerInitializeNew( PRPC_MESSAGE pRpcMsg, PMIDL_STUB_MESSAGE pStubMsg, PMIDL_STUB_DESC pStubDesc ); + NdrServerInitializeNew( PRPC_MESSAGE pRpcMsg, PMIDL_STUB_MESSAGE pStubMsg, PMIDL_STUB_DESC pStubDesc ); RPCRTAPI unsigned char* RPC_ENTRY NdrGetBuffer( MIDL_STUB_MESSAGE *stubmsg, unsigned long buflen, RPC_BINDING_HANDLE handle ); RPCRTAPI void RPC_ENTRY @@ -638,13 +638,13 @@ RPCRTAPI void RPC_ENTRY RPCRTAPI void RPC_ENTRY NdrRpcSmSetClientToOsf( PMIDL_STUB_MESSAGE pMessage ); RPCRTAPI void * RPC_ENTRY - NdrRpcSmClientAllocate( IN size_t Size ); + NdrRpcSmClientAllocate( size_t Size ); RPCRTAPI void RPC_ENTRY - NdrRpcSmClientFree( IN void *NodeToFree ); + NdrRpcSmClientFree( void *NodeToFree ); RPCRTAPI void * RPC_ENTRY - NdrRpcSsDefaultAllocate( IN size_t Size ); + NdrRpcSsDefaultAllocate( size_t Size ); RPCRTAPI void RPC_ENTRY - NdrRpcSsDefaultFree( IN void *NodeToFree ); + NdrRpcSsDefaultFree( void *NodeToFree ); #ifdef __cplusplus }

1 0

Jason Green : wined3d: Move the GLSL registry check again.
by Alexandre Julliard May 26, 2006

May 26, 2006

Module: wine Branch: master Commit: cef19b57690db3957e054ffc7d761c8804cc9d76 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cef19b57690db3957e054ff… Author: Jason Green <jave27(a)gmail.com> Date: Fri May 26 00:33:13 2006 -0400 wined3d: Move the GLSL registry check again. --- dlls/wined3d/device.c | 10 ++++++++++ dlls/wined3d/directx.c | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 07edde1..eff9504 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1733,6 +1733,16 @@ #endif } + /* Determine shader mode to use based on GL caps */ + if (GL_SUPPORT(ARB_SHADING_LANGUAGE_100) && wined3d_settings.glslRequested + && (wined3d_settings.vs_mode == VS_HW || wined3d_settings.ps_mode == PS_HW)) + wined3d_settings.shader_mode = SHADER_GLSL; + else if ((GL_SUPPORT(ARB_VERTEX_PROGRAM) && wined3d_settings.vs_mode == VS_HW) || + (GL_SUPPORT(ARB_FRAGMENT_PROGRAM) && wined3d_settings.ps_mode == PS_HW)) + wined3d_settings.shader_mode = SHADER_ARB; + else + wined3d_settings.shader_mode = SHADER_SW; + /* Initialize the current view state */ This->modelview_valid = 1; This->proj_valid = 0; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0bb5589..ec9c5d7 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1696,16 +1696,6 @@ #endif *pCaps->MaxStreams = MAX_STREAMS; *pCaps->MaxStreamStride = 1024; - /* Determine shader mode to use based on GL caps */ - if (GL_SUPPORT(ARB_SHADING_LANGUAGE_100) && wined3d_settings.glslRequested - && (wined3d_settings.vs_mode == VS_HW || wined3d_settings.ps_mode == PS_HW)) - wined3d_settings.shader_mode = SHADER_GLSL; - else if ((GL_SUPPORT(ARB_VERTEX_PROGRAM) && wined3d_settings.vs_mode == VS_HW) || - (GL_SUPPORT(ARB_FRAGMENT_PROGRAM) && wined3d_settings.ps_mode == PS_HW)) - wined3d_settings.shader_mode = SHADER_ARB; - else - wined3d_settings.shader_mode = SHADER_SW; - if (wined3d_settings.vs_mode == VS_HW && wined3d_settings.shader_mode == SHADER_GLSL && DeviceType != WINED3DDEVTYPE_REF) { *pCaps->VertexShaderVersion = D3DVS_VERSION(3,0);

1 0