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

Phil Costin : wined3d: Create stub for D3DPERF_SetOptions function.
by Alexandre Julliard 26 May '06

26 May '06

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

Alexandre Julliard : Fixed a couple of instances of the old FSF address that crept back in.
by Alexandre Julliard 26 May '06

26 May '06

Module: wine Branch: master Commit: 52476a1124aafdeda0380277ae49fac4683257cc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=52476a1124aafdeda038027… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 26 12:08:32 2006 +0200 Fixed a couple of instances of the old FSF address that crept back in. --- dlls/crypt32/context.c | 2 +- dlls/gphoto2.ds/gphoto2_Ko.rc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c index c464900..a88286b 100644 --- a/dlls/crypt32/context.c +++ b/dlls/crypt32/context.c @@ -13,7 +13,7 @@ * * 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 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <assert.h> #include <stdarg.h> diff --git a/dlls/gphoto2.ds/gphoto2_Ko.rc b/dlls/gphoto2.ds/gphoto2_Ko.rc index 5262662..6e2c4cd 100644 --- a/dlls/gphoto2.ds/gphoto2_Ko.rc +++ b/dlls/gphoto2.ds/gphoto2_Ko.rc @@ -16,7 +16,7 @@ * * 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 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT

1 0

Mikołaj Zalewski : comctl32: header: Put the new item in place of the hot divider instead of swapping.
by Alexandre Julliard 26 May '06

26 May '06

Module: wine Branch: master Commit: ee430bf7b8093940640d8c03b4c8fdcc6c623b82 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ee430bf7b8093940640d8c0… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Fri May 26 00:01:25 2006 +0200 comctl32: header: Put the new item in place of the hot divider instead of swapping. --- dlls/comctl32/header.c | 89 ++++++++++++++++++++++++++---------------------- 1 files changed, 49 insertions(+), 40 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index dccc6a2..d47e7f5 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -195,6 +195,32 @@ HEADER_OrderToIndex(HWND hwnd, WPARAM wP return infoPtr->order[iorder]; } +static void +HEADER_ChangeItemOrder(HEADER_INFO *infoPtr, INT iItem, INT iNewOrder) +{ + HEADER_ITEM *lpItem = &infoPtr->items[iItem]; + INT i, nMin, nMax; + + TRACE("%d: %d->%d\n", iItem, lpItem->iOrder, iNewOrder); + if (lpItem->iOrder < iNewOrder) + { + memmove(&infoPtr->order[lpItem->iOrder], + &infoPtr->order[lpItem->iOrder + 1], + (iNewOrder - lpItem->iOrder) * sizeof(INT)); + } + if (iNewOrder < lpItem->iOrder) + { + memmove(&infoPtr->order[iNewOrder + 1], + &infoPtr->order[iNewOrder], + (lpItem->iOrder - iNewOrder) * sizeof(INT)); + } + infoPtr->order[iNewOrder] = iItem; + nMin = min(lpItem->iOrder, iNewOrder); + nMax = max(lpItem->iOrder, iNewOrder); + for (i = nMin; i <= nMax; i++) + infoPtr->items[infoPtr->order[i]].iOrder = i; +} + /* Note: if iItem is the last item then this function returns infoPtr->uNumItem */ static INT HEADER_NextItem(HWND hwnd, INT iItem) @@ -1434,30 +1460,9 @@ HEADER_SetItemT (HWND hwnd, INT nItem, L lpItem = &infoPtr->items[nItem]; HEADER_StoreHDItemInHeader(lpItem, phdi->mask, phdi, bUnicode); + /* FIXME: check it order is not out of bound */ if (phdi->mask & HDI_ORDER) - { - INT i, nMin, nMax; - - if (lpItem->iOrder < phdi->iOrder) - { - memmove(&infoPtr->order[lpItem->iOrder], - &infoPtr->order[lpItem->iOrder + 1], - (phdi->iOrder - lpItem->iOrder) * sizeof(INT)); - } - if (phdi->iOrder < lpItem->iOrder) - { - memmove(&infoPtr->order[phdi->iOrder + 1], - &infoPtr->order[phdi->iOrder], - (lpItem->iOrder - phdi->iOrder) * sizeof(INT)); - } - infoPtr->order[phdi->iOrder] = nItem; - nMin = min(lpItem->iOrder, phdi->iOrder); - nMax = max(lpItem->iOrder, phdi->iOrder); - for (i = nMin; i <= nMax; i++) - { - infoPtr->items[infoPtr->order[i]].iOrder = infoPtr->order[i]; - } - } + HEADER_ChangeItemOrder(infoPtr, nItem, phdi->iOrder); HEADER_SendHeaderNotifyT (hwnd, HDN_ITEMCHANGEDW, nItem, phdi->mask, &hdNotify); @@ -1667,32 +1672,36 @@ HEADER_LButtonUp (HWND hwnd, WPARAM wPar if (infoPtr->bPressed) { if (infoPtr->bDragging) { + HEADER_ITEM *lpItem = &infoPtr->items[infoPtr->iMoveItem]; + INT iNewOrder; + 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)) + lpItem->bDown=FALSE; + + if (infoPtr->iHotDivider == -1) + iNewOrder = -1; + else if (infoPtr->iHotDivider == infoPtr->uNumItem) + iNewOrder = infoPtr->uNumItem-1; + else { - 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; + iNewOrder = HEADER_IndexToOrder(hwnd, infoPtr->iHotDivider); + if (iNewOrder > lpItem->iOrder) + iNewOrder--; + } + /* FIXME: the new order field should be sent, not the old one */ + if (iNewOrder != -1 && + !HEADER_SendHeaderNotifyT(hwnd, HDN_ENDDRAG, infoPtr->iMoveItem, HDI_ORDER, NULL)) + { + HEADER_ChangeItemOrder(infoPtr, infoPtr->iMoveItem, iNewOrder); infoPtr->bRectsValid = FALSE; InvalidateRect(hwnd, NULL, FALSE); } else InvalidateRect(hwnd, &infoPtr->items[infoPtr->iMoveItem].rect, FALSE); + + HEADER_SetHotDivider(hwnd, FALSE, -1); } else if (!(dwStyle&HDS_DRAGDROP) || !HEADER_IsDragDistance(infoPtr, &pt)) {

1 0

Mikołaj Zalewski : comctl32: header: Implement HDM_SETHOTDIVIDER.
by Alexandre Julliard 26 May '06

26 May '06

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

Mikołaj Zalewski : comctl32: header: Implement HDM_CREATEDRAGIMAGE.
by Alexandre Julliard 26 May '06

26 May '06

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: listview: Apply the HDS_DRAGDROP header style if needed.
by Alexandre Julliard 26 May '06

26 May '06

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: Fix an order-related bug in HEADER_InternalHitTest.
by Alexandre Julliard 26 May '06

26 May '06

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

Dmitry Timoshkov : mapi32: Break out of the loop as soon as MSI call succeeds.
by Alexandre Julliard 26 May '06

26 May '06

Module: wine Branch: master Commit: 44c3d3288cb1b8154e8a16f16ec2576c5844082f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=44c3d3288cb1b8154e8a16f… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri May 26 13:35:47 2006 +0900 mapi32: Break out of the loop as soon as MSI call succeeds. --- dlls/mapi32/util.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/mapi32/util.c b/dlls/mapi32/util.c index d3184c6..9d75f14 100644 --- a/dlls/mapi32/util.c +++ b/dlls/mapi32/util.c @@ -878,7 +878,10 @@ BOOL WINAPI FGetComponentPath(LPCSTR com if (pMsiProvideQualifiedComponentA(component, qualifier, install ? INSTALLMODE_DEFAULT : INSTALLMODE_EXISTING, dll_path, &dll_path_length) == ERROR_SUCCESS) + { ret = TRUE; + break; + } if (qualifier != lcid_ver) break; }

1 0

Dmitry Timoshkov : gdi: Add more const qualifiers.
by Alexandre Julliard 26 May '06

26 May '06

Module: wine Branch: master Commit: 0a4f4b23cfe1a2f3799589c0ae84a9374520ec44 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0a4f4b23cfe1a2f3799589c… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri May 26 13:34:50 2006 +0900 gdi: Add more const qualifiers. --- dlls/gdi/freetype.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdi/freetype.c b/dlls/gdi/freetype.c index 6bbf4f8..8317eb1 100644 --- a/dlls/gdi/freetype.c +++ b/dlls/gdi/freetype.c @@ -213,7 +213,7 @@ typedef struct tagFace { typedef struct tagFamily { struct list entry; - WCHAR *FamilyName; + const WCHAR *FamilyName; struct list faces; } Family; @@ -275,7 +275,7 @@ struct tagGdiFont { typedef struct { struct list entry; - WCHAR *font_name; + const WCHAR *font_name; struct list links; } SYSTEM_LINKS; @@ -319,7 +319,7 @@ static const WCHAR FixedSys_Value[] = {' static const WCHAR System_Value[] = {'F','O','N','T','S','.','F','O','N','\0'}; static const WCHAR OEMFont_Value[] = {'O','E','M','F','O','N','T','.','F','O','N','\0'}; -static const WCHAR const *SystemFontValues[4] = { +static const WCHAR * const SystemFontValues[4] = { System_Value, OEMFont_Value, FixedSys_Value, @@ -348,7 +348,7 @@ static const WCHAR VietnameseW[] = {'V', static const WCHAR WesternW[] = {'W','e','s','t','e','r','n','\0'}; static const WCHAR OEM_DOSW[] = {'O','E','M','/','D','O','S','\0'}; -static const WCHAR *ElfScriptsW[32] = { /* these are in the order of the fsCsb[0] bits */ +static const WCHAR * const ElfScriptsW[32] = { /* these are in the order of the fsCsb[0] bits */ WesternW, /*00*/ Central_EuropeanW, CyrillicW, @@ -447,7 +447,7 @@ static Face *find_face_from_filename(con { Family *family; Face *face; - char *file; + const char *file; DWORD len = WideCharToMultiByte(CP_UNIXCP, 0, file_name, -1, NULL, 0, NULL, NULL); char *file_nameA = HeapAlloc(GetProcessHeap(), 0, len); Face *ret = NULL; @@ -1256,7 +1256,7 @@ static void load_system_fonts(void) { HKEY hkey; WCHAR data[MAX_PATH], windowsdir[MAX_PATH], pathW[MAX_PATH]; - const WCHAR **value; + const WCHAR * const *value; DWORD dlen, type; static const WCHAR fmtW[] = {'%','s','\\','%','s','\0'}; char *unixname;

1 0

Juan Lang : crypt32: Implement CertSerializeCRLStoreElement.
by Alexandre Julliard 26 May '06

26 May '06

Module: wine Branch: master Commit: f94d49dcd4c161d38b8568ee8c9a5d4dd5358f64 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f94d49dcd4c161d38b8568e… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Thu May 25 19:43:30 2006 -0700 crypt32: Implement CertSerializeCRLStoreElement. --- dlls/crypt32/crypt32.spec | 2 + dlls/crypt32/crypt32_private.h | 2 + dlls/crypt32/serialize.c | 76 ++++++++++++++++++++++------------------ dlls/crypt32/store.c | 10 +++++ 4 files changed, 55 insertions(+), 35 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 88dba5b..8900bec 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -30,7 +30,7 @@ @ stdcall CertDuplicateStore(ptr) @ stdcall CertEnumCRLContextProperties(ptr long) @ stdcall CertEnumCRLsInStore(ptr ptr) -@ stub CertEnumCTLContextProperties +@ stdcall CertEnumCTLContextProperties(ptr long) @ stdcall CertEnumCTLsInStore(ptr ptr) @ stdcall CertEnumCertificateContextProperties(ptr long) @ stdcall CertEnumCertificatesInStore(long ptr) diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 5b39b12..67306b3 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -56,6 +56,7 @@ typedef BOOL (WINAPI *AddEncodedContextT typedef const void *(WINAPI *DuplicateContextFunc)(const void *context); typedef const void *(WINAPI *EnumContextsInStoreFunc)(HCERTSTORE hCertStore, const void *pPrevContext); +typedef DWORD (WINAPI *EnumPropertiesFunc)(const void *context, DWORD dwPropId); typedef BOOL (WINAPI *GetContextPropertyFunc)(const void *context, DWORD dwPropID, void *pvData, DWORD *pcbData); typedef BOOL (WINAPI *SetContextPropertyFunc)(const void *context, @@ -73,6 +74,7 @@ typedef struct _WINE_CONTEXT_INTERFACE AddEncodedContextToStoreFunc addEncodedToStore; DuplicateContextFunc duplicate; EnumContextsInStoreFunc enumContextsInStore; + EnumPropertiesFunc enumProps; GetContextPropertyFunc getProp; SetContextPropertyFunc setProp; SerializeElementFunc serialize; diff --git a/dlls/crypt32/serialize.c b/dlls/crypt32/serialize.c index f1f3989..b0765a7 100644 --- a/dlls/crypt32/serialize.c +++ b/dlls/crypt32/serialize.c @@ -36,45 +36,29 @@ typedef struct _WINE_CERT_PROP_HEADER DWORD cb; } WINE_CERT_PROP_HEADER, *PWINE_CERT_PROP_HEADER; -BOOL WINAPI CertSerializeCRLStoreElement(PCCRL_CONTEXT pCrlContext, - DWORD dwFlags, BYTE *pbElement, DWORD *pcbElement) -{ - FIXME("(%p, %08lx, %p, %p): stub\n", pCrlContext, dwFlags, pbElement, - pcbElement); - return FALSE; -} - -BOOL WINAPI CertSerializeCTLStoreElement(PCCTL_CONTEXT pCtlContext, - DWORD dwFlags, BYTE *pbElement, DWORD *pcbElement) -{ - FIXME("(%p, %08lx, %p, %p): stub\n", pCtlContext, dwFlags, pbElement, - pcbElement); - return FALSE; -} - -BOOL WINAPI CertSerializeCertificateStoreElement(PCCERT_CONTEXT pCertContext, - DWORD dwFlags, BYTE *pbElement, DWORD *pcbElement) +static BOOL CRYPT_SerializeStoreElement(const void *context, + const BYTE *encodedContext, DWORD cbEncodedContext, DWORD contextPropID, + PCWINE_CONTEXT_INTERFACE contextInterface, DWORD dwFlags, BYTE *pbElement, + DWORD *pcbElement) { BOOL ret; - TRACE("(%p, %08lx, %p, %p)\n", pCertContext, dwFlags, pbElement, - pcbElement); + TRACE("(%p, %p, %08lx, %p, %p)\n", context, contextInterface, dwFlags, + pbElement, pcbElement); - if (pCertContext) + if (context) { - DWORD bytesNeeded = sizeof(WINE_CERT_PROP_HEADER) + - pCertContext->cbCertEncoded; + DWORD bytesNeeded = sizeof(WINE_CERT_PROP_HEADER) + cbEncodedContext; DWORD prop = 0; ret = TRUE; do { - prop = CertEnumCertificateContextProperties(pCertContext, prop); + prop = contextInterface->enumProps(context, prop); if (prop) { DWORD propSize = 0; - ret = CertGetCertificateContextProperty(pCertContext, - prop, NULL, &propSize); + ret = contextInterface->getProp(context, prop, NULL, &propSize); if (ret) bytesNeeded += sizeof(WINE_CERT_PROP_HEADER) + propSize; } @@ -99,13 +83,13 @@ BOOL WINAPI CertSerializeCertificateStor prop = 0; do { - prop = CertEnumCertificateContextProperties(pCertContext, prop); + prop = contextInterface->enumProps(context, prop); if (prop) { DWORD propSize = 0; - ret = CertGetCertificateContextProperty(pCertContext, - prop, NULL, &propSize); + ret = contextInterface->getProp(context, prop, NULL, + &propSize); if (ret) { if (bufSize < propSize) @@ -118,8 +102,8 @@ BOOL WINAPI CertSerializeCertificateStor } if (buf) { - ret = CertGetCertificateContextProperty( - pCertContext, prop, buf, &propSize); + ret = contextInterface->getProp(context, prop, buf, + &propSize); if (ret) { hdr = (PWINE_CERT_PROP_HEADER)pbElement; @@ -142,11 +126,11 @@ BOOL WINAPI CertSerializeCertificateStor CryptMemFree(buf); hdr = (PWINE_CERT_PROP_HEADER)pbElement; - hdr->propID = CERT_CERT_PROP_ID; + hdr->propID = contextPropID; hdr->unknown = 1; - hdr->cb = pCertContext->cbCertEncoded; + hdr->cb = cbEncodedContext; memcpy(pbElement + sizeof(WINE_CERT_PROP_HEADER), - pCertContext->pbCertEncoded, pCertContext->cbCertEncoded); + encodedContext, cbEncodedContext); } } else @@ -154,6 +138,30 @@ BOOL WINAPI CertSerializeCertificateStor return ret; } +BOOL WINAPI CertSerializeCertificateStoreElement(PCCERT_CONTEXT pCertContext, + DWORD dwFlags, BYTE *pbElement, DWORD *pcbElement) +{ + return CRYPT_SerializeStoreElement(pCertContext, + pCertContext->pbCertEncoded, pCertContext->cbCertEncoded, + CERT_CERT_PROP_ID, pCertInterface, dwFlags, pbElement, pcbElement); +} + +BOOL WINAPI CertSerializeCRLStoreElement(PCCRL_CONTEXT pCrlContext, + DWORD dwFlags, BYTE *pbElement, DWORD *pcbElement) +{ + return CRYPT_SerializeStoreElement(pCrlContext, + pCrlContext->pbCrlEncoded, pCrlContext->cbCrlEncoded, + CERT_CRL_PROP_ID, pCRLInterface, dwFlags, pbElement, pcbElement); +} + +BOOL WINAPI CertSerializeCTLStoreElement(PCCTL_CONTEXT pCtlContext, + DWORD dwFlags, BYTE *pbElement, DWORD *pcbElement) +{ + return CRYPT_SerializeStoreElement(pCtlContext, + pCtlContext->pbCtlEncoded, pCtlContext->cbCtlEncoded, + CERT_CTL_PROP_ID, pCRLInterface, dwFlags, pbElement, pcbElement); +} + /* Looks for the property with ID propID in the buffer buf. Returns a pointer * to its header if a valid header is found, NULL if not. Valid means the * length of thte property won't overrun buf, and the unknown field is 1. diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 774d2b3..6d3a1be 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -47,6 +47,7 @@ static const WINE_CONTEXT_INTERFACE gCer (AddEncodedContextToStoreFunc)CertAddEncodedCertificateToStore, (DuplicateContextFunc)CertDuplicateCertificateContext, (EnumContextsInStoreFunc)CertEnumCertificatesInStore, + (EnumPropertiesFunc)CertEnumCertificateContextProperties, (GetContextPropertyFunc)CertGetCertificateContextProperty, (SetContextPropertyFunc)CertSetCertificateContextProperty, (SerializeElementFunc)CertSerializeCertificateStoreElement, @@ -61,6 +62,7 @@ static const WINE_CONTEXT_INTERFACE gCRL (AddEncodedContextToStoreFunc)CertAddEncodedCRLToStore, (DuplicateContextFunc)CertDuplicateCRLContext, (EnumContextsInStoreFunc)CertEnumCRLsInStore, + (EnumPropertiesFunc)CertEnumCRLContextProperties, (GetContextPropertyFunc)CertGetCRLContextProperty, (SetContextPropertyFunc)CertSetCRLContextProperty, (SerializeElementFunc)CertSerializeCRLStoreElement, @@ -75,6 +77,7 @@ static const WINE_CONTEXT_INTERFACE gCTL (AddEncodedContextToStoreFunc)CertAddEncodedCTLToStore, (DuplicateContextFunc)CertDuplicateCTLContext, (EnumContextsInStoreFunc)CertEnumCTLsInStore, + (EnumPropertiesFunc)CertEnumCTLContextProperties, (GetContextPropertyFunc)CertGetCTLContextProperty, (SetContextPropertyFunc)CertSetCTLContextProperty, (SerializeElementFunc)CertSerializeCTLStoreElement, @@ -2240,6 +2243,13 @@ BOOL WINAPI CertControlStore(HCERTSTORE return ret; } +DWORD WINAPI CertEnumCTLContextProperties(PCCTL_CONTEXT pCTLContext, + DWORD dwPropId) +{ + FIXME("(%p, %ld): stub\n", pCTLContext, dwPropId); + return 0; +} + BOOL WINAPI CertGetCTLContextProperty(PCCTL_CONTEXT pCTLContext, DWORD dwPropId, void *pvData, DWORD *pcbData) {

1 0