September 2006 - Wine-Commits

Mikołaj Zalewski : comctl32: toolbar: Don' t leak the intoPtr->bitmaps during resizing and destruction.
by Alexandre Julliard Sept. 20, 2006

Sept. 20, 2006

Module: wine Branch: master Commit: 5facde470e677022a31edbe124b39a3ac56b0d71 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5facde470e677022a31edbe… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Sep 18 12:01:49 2006 +0200 comctl32: toolbar: Don't leak the intoPtr->bitmaps during resizing and destruction. --- dlls/comctl32/toolbar.c | 13 ++----------- 1 files changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 6fb200c..9a04ecf 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -2751,17 +2751,7 @@ TOOLBAR_AddBitmap (HWND hwnd, WPARAM wPa TRACE("Number of bitmap infos: %d\n", infoPtr->nNumBitmapInfos); - if (infoPtr->nNumBitmapInfos == 0) - { - infoPtr->bitmaps = Alloc(sizeof(TBITMAP_INFO)); - } - else - { - TBITMAP_INFO *oldBitmaps = infoPtr->bitmaps; - infoPtr->bitmaps = Alloc((infoPtr->nNumBitmapInfos + 1) * sizeof(TBITMAP_INFO)); - memcpy(&infoPtr->bitmaps[0], &oldBitmaps[0], infoPtr->nNumBitmapInfos * sizeof(TBITMAP_INFO)); - } - + infoPtr->bitmaps = ReAlloc(infoPtr->bitmaps, (infoPtr->nNumBitmapInfos + 1) * sizeof(TBITMAP_INFO)); infoPtr->bitmaps[infoPtr->nNumBitmapInfos].nButtons = nButtons; infoPtr->bitmaps[infoPtr->nNumBitmapInfos].hInst = lpAddBmp->hInst; infoPtr->bitmaps[infoPtr->nNumBitmapInfos].nID = lpAddBmp->nID; @@ -5672,6 +5662,7 @@ TOOLBAR_Destroy (HWND hwnd, WPARAM wPara /* delete temporary buffer for tooltip text */ Free (infoPtr->pszTooltipText); + Free (infoPtr->bitmaps); /* bitmaps list */ /* delete button data */ if (infoPtr->buttons)

1 0

Alexandre Julliard : include: Exception filters should return LONG, not DWORD.
by Alexandre Julliard Sept. 20, 2006

Sept. 20, 2006

Module: wine Branch: master Commit: 530e76503537466f873f7980c4db4df6a0efc14a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=530e76503537466f873f798… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 20 11:26:59 2006 +0200 include: Exception filters should return LONG, not DWORD. Also move UnhandledExceptionFilter definitions to winbase.h since they are there in the latest SDK. --- dlls/kernel32/except.c | 4 ++-- dlls/ntdll/thread.c | 2 +- include/winbase.h | 5 +++++ include/wine/exception.h | 4 ++-- include/winnt.h | 6 ------ 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/except.c b/dlls/kernel32/except.c index 8ff81f2..ed31ab9 100644 --- a/dlls/kernel32/except.c +++ b/dlls/kernel32/except.c @@ -440,7 +440,7 @@ inline static BOOL check_no_exec( void * /******************************************************************* * UnhandledExceptionFilter (KERNEL32.@) */ -DWORD WINAPI UnhandledExceptionFilter(PEXCEPTION_POINTERS epointers) +LONG WINAPI UnhandledExceptionFilter(PEXCEPTION_POINTERS epointers) { const EXCEPTION_RECORD *rec = epointers->ExceptionRecord; @@ -469,7 +469,7 @@ DWORD WINAPI UnhandledExceptionFilter(PE if (top_filter) { - DWORD ret = top_filter( epointers ); + LONG ret = top_filter( epointers ); if (ret != EXCEPTION_CONTINUE_SEARCH) return ret; } diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index dbcc5a6..364c86d 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -302,7 +302,7 @@ HANDLE thread_init(void) return exe_file; } -typedef ULONG (WINAPI *PUNHANDLED_EXCEPTION_FILTER)(PEXCEPTION_POINTERS); +typedef LONG (WINAPI *PUNHANDLED_EXCEPTION_FILTER)(PEXCEPTION_POINTERS); static PUNHANDLED_EXCEPTION_FILTER get_unhandled_exception_filter(void) { static PUNHANDLED_EXCEPTION_FILTER unhandled_exception_filter; diff --git a/include/winbase.h b/include/winbase.h index 8bc83cf..b6788f3 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -131,6 +131,9 @@ typedef PCONTEXT LPCONTEXT; typedef PEXCEPTION_RECORD LPEXCEPTION_RECORD; typedef PEXCEPTION_POINTERS LPEXCEPTION_POINTERS; +typedef LONG (CALLBACK *PTOP_LEVEL_EXCEPTION_FILTER)(PEXCEPTION_POINTERS); +typedef PTOP_LEVEL_EXCEPTION_FILTER LPTOP_LEVEL_EXCEPTION_FILTER; + #define OFS_MAXPATHNAME 128 typedef struct _OFSTRUCT { @@ -1978,6 +1981,7 @@ BOOL WINAPI SetThreadPriorityBoos BOOL WINAPI SetThreadToken(PHANDLE,HANDLE); BOOL WINAPI SetTimeZoneInformation(const TIME_ZONE_INFORMATION *); BOOL WINAPI SetTokenInformation(HANDLE,TOKEN_INFORMATION_CLASS,LPVOID,DWORD); +LPTOP_LEVEL_EXCEPTION_FILTER WINAPI SetUnhandledExceptionFilter(LPTOP_LEVEL_EXCEPTION_FILTER); BOOL WINAPI SetVolumeLabelA(LPCSTR,LPCSTR); BOOL WINAPI SetVolumeLabelW(LPCWSTR,LPCWSTR); #define SetVolumeLabel WINELIB_NAME_AW(SetVolumeLabel) @@ -2005,6 +2009,7 @@ BOOL WINAPI TransactNamedPipe(HAN BOOL WINAPI TransmitCommChar(HANDLE,CHAR); BOOL WINAPI TryEnterCriticalSection(CRITICAL_SECTION *lpCrit); BOOL WINAPI TzSpecificLocalTimeToSystemTime(LPTIME_ZONE_INFORMATION,LPSYSTEMTIME,LPSYSTEMTIME); +LONG WINAPI UnhandledExceptionFilter(PEXCEPTION_POINTERS); BOOL WINAPI UnlockFile(HANDLE,DWORD,DWORD,DWORD,DWORD); BOOL WINAPI UnlockFileEx(HANDLE,DWORD,DWORD,DWORD,LPOVERLAPPED); #define UnlockSegment(handle) GlobalUnfix((HANDLE)(handle)) diff --git a/include/wine/exception.h b/include/wine/exception.h index f90866b..eebfdfb 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -120,13 +120,13 @@ #define __FINALLY(func) \ } while (0); -typedef DWORD (CALLBACK *__WINE_FILTER)(PEXCEPTION_POINTERS); +typedef LONG (CALLBACK *__WINE_FILTER)(PEXCEPTION_POINTERS); typedef void (CALLBACK *__WINE_FINALLY)(BOOL); /* convenience handler for page fault exceptions */ #define __EXCEPT_PAGE_FAULT __EXCEPT( (__WINE_FILTER)1 ) -#define WINE_EXCEPTION_FILTER(func) DWORD WINAPI func( EXCEPTION_POINTERS *__eptr ) +#define WINE_EXCEPTION_FILTER(func) LONG WINAPI func( EXCEPTION_POINTERS *__eptr ) #define WINE_FINALLY_FUNC(func) void WINAPI func( BOOL __normal ) #define GetExceptionInformation() (__eptr) diff --git a/include/winnt.h b/include/winnt.h index 05e0276..3bbbcac 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -1855,12 +1855,6 @@ typedef struct _EXCEPTION_REGISTRATION_R */ typedef LONG (CALLBACK *PVECTORED_EXCEPTION_HANDLER)(PEXCEPTION_POINTERS ExceptionInfo); -typedef LONG (CALLBACK *PTOP_LEVEL_EXCEPTION_FILTER)(PEXCEPTION_POINTERS ExceptionInfo); -typedef PTOP_LEVEL_EXCEPTION_FILTER LPTOP_LEVEL_EXCEPTION_FILTER; - -DWORD WINAPI UnhandledExceptionFilter( PEXCEPTION_POINTERS epointers ); -LPTOP_LEVEL_EXCEPTION_FILTER -WINAPI SetUnhandledExceptionFilter( LPTOP_LEVEL_EXCEPTION_FILTER filter ); typedef struct _NT_TIB {

1 0

Mikołaj Zalewski : include: Win64 fix in TBBUTTON.
by Alexandre Julliard Sept. 20, 2006

Sept. 20, 2006

Module: wine Branch: master Commit: f6fecda89672f96fda740b893c07bdd56ef3461d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f6fecda89672f96fda740b8… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Sep 18 12:05:24 2006 +0200 include: Win64 fix in TBBUTTON. --- include/commctrl.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/commctrl.h b/include/commctrl.h index 87712ae..5bee93f 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -1293,7 +1293,11 @@ typedef struct _TBBUTTON { INT idCommand; BYTE fsState; BYTE fsStyle; +#ifdef _WIN64 + BYTE bReserved[6]; +#else BYTE bReserved[2]; +#endif DWORD_PTR dwData; INT_PTR iString; } TBBUTTON, *PTBBUTTON, *LPTBBUTTON;

1 0

Mikołaj Zalewski : comctl32: header: Update the header comment.
by Alexandre Julliard Sept. 20, 2006

Sept. 20, 2006

Module: wine Branch: master Commit: 5564266a8ac1e96ba5563b7df57fced0d4f65c69 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5564266a8ac1e96ba5563b7… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Sep 18 11:59:24 2006 +0200 comctl32: header: Update the header comment. --- dlls/comctl32/header.c | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index c0938a9..1d4f1fd 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -4,6 +4,7 @@ * Copyright 1998 Eric Kohl * Copyright 2000 Eric Kohl for CodeWeavers * Copyright 2003 Maxime Bellenge + * Copyright 2006 Mikolaj Zalewski * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,15 +21,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, 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 - * + * - Imagelist support (completed?) + * - Hottrack support (completed?) + * - Custom draw support (completed?) + * - Filters support (HDS_FILTER, HDI_FILTER, HDM_*FILTER*, HDN_*FILTER*) + * - New Windows Vista features */ #include <stdarg.h>

1 0

Mikołaj Zalewski : comctl32: header: Remove the nOldWidth.
by Alexandre Julliard Sept. 20, 2006

Sept. 20, 2006

Module: wine Branch: master Commit: e4f36895131dd3a2c1565275e8119eea4d3aea86 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e4f36895131dd3a2c156527… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Sep 18 11:58:02 2006 +0200 comctl32: header: Remove the nOldWidth. --- dlls/comctl32/header.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index c52a054..c0938a9 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -84,7 +84,6 @@ typedef struct 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 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 */ @@ -1581,7 +1580,6 @@ HEADER_LButtonDown (HWND hwnd, WPARAM wP infoPtr->bCaptured = TRUE; infoPtr->bTracking = TRUE; infoPtr->iMoveItem = nItem; - infoPtr->nOldWidth = iCurrWidth; infoPtr->xTrackOffset = infoPtr->items[nItem].rect.right - pt.x; if (!(dwStyle & HDS_FULLDRAG)) { @@ -1674,11 +1672,8 @@ HEADER_LButtonUp (HWND hwnd, WPARAM wPar ReleaseDC (hwnd, hdc); } - if (HEADER_SendNotifyWithIntFieldT(hwnd, HDN_ITEMCHANGINGW, infoPtr->iMoveItem, HDI_WIDTH, iNewWidth)) - { - infoPtr->items[infoPtr->iMoveItem].cxy = infoPtr->nOldWidth; - } - else { + if (!HEADER_SendNotifyWithIntFieldT(hwnd, HDN_ITEMCHANGINGW, infoPtr->iMoveItem, HDI_WIDTH, iNewWidth)) + { infoPtr->items[infoPtr->iMoveItem].cxy = iNewWidth; HEADER_SendNotifyWithIntFieldT(hwnd, HDN_ITEMCHANGEDW, infoPtr->iMoveItem, HDI_WIDTH, iNewWidth); }

1 0

Mikołaj Zalewski : comctl32: header: Send new values in notifies during resize and drag-drop instead of the old ones .
by Alexandre Julliard Sept. 20, 2006

Sept. 20, 2006

Module: wine Branch: master Commit: bd7f9321a0af9c466bf6343bb1b7b7dced96c266 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bd7f9321a0af9c466bf6343… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Sep 18 11:55:42 2006 +0200 comctl32: header: Send new values in notifies during resize and drag-drop instead of the old ones. This also fixes the notify format of HDN_ITEMCLICKED(A/W). --- dlls/comctl32/header.c | 124 +++++++++++++++++++++++------------------------- 1 files changed, 60 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=bd7f9321a0af9c466bf…

1 0

Mikołaj Zalewski : comctl32: header: Merge the simple delete and complex delete.
by Alexandre Julliard Sept. 20, 2006

Sept. 20, 2006

Module: wine Branch: master Commit: f85ceb1be30aa844acc195ac474f4e01bd76a4b3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f85ceb1be30aa844acc195a… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Sep 18 11:50:32 2006 +0200 comctl32: header: Merge the simple delete and complex delete. --- dlls/comctl32/header.c | 62 +++++++++++++++++++----------------------------- 1 files changed, 24 insertions(+), 38 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index eee9b36..bb4173e 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -1060,54 +1060,40 @@ HEADER_DeleteItem (HWND hwnd, WPARAM wPa { HEADER_INFO *infoPtr = HEADER_GetInfoPtr(hwnd); INT iItem = (INT)wParam; + INT iOrder; + INT i; TRACE("[iItem=%d]\n", iItem); if ((iItem < 0) || (iItem >= (INT)infoPtr->uNumItem)) return FALSE; - if (infoPtr->uNumItem == 1) { - TRACE("Simple delete!\n"); - HEADER_DisposeItem(&infoPtr->items[0]); - Free (infoPtr->items); - Free(infoPtr->order); - infoPtr->items = 0; - infoPtr->order = 0; - infoPtr->uNumItem = 0; - } - else { - INT i; - INT iOrder; - TRACE("Complex delete! [iItem=%d]\n", iItem); - - for (i = 0; i < infoPtr->uNumItem; i++) - TRACE("%d: order=%d, iOrder=%d, ->iOrder=%d\n", i, infoPtr->order[i], infoPtr->items[i].iOrder, infoPtr->items[infoPtr->order[i]].iOrder); - HEADER_DisposeItem(&infoPtr->items[iItem]); - iOrder = infoPtr->items[iItem].iOrder; - - infoPtr->uNumItem--; - memmove(&infoPtr->items[iItem], &infoPtr->items[iItem + 1], - (infoPtr->uNumItem - iItem) * sizeof(HEADER_ITEM)); - memmove(&infoPtr->order[iOrder], &infoPtr->order[iOrder + 1], - (infoPtr->uNumItem - iOrder) * sizeof(INT)); - infoPtr->items = ReAlloc(infoPtr->items, sizeof(HEADER_ITEM) * infoPtr->uNumItem); - infoPtr->order = ReAlloc(infoPtr->order, sizeof(INT) * infoPtr->uNumItem); - - /* Correct the orders */ - for (i = 0; i < infoPtr->uNumItem; i++) - { - if (infoPtr->order[i] > iItem) - infoPtr->order[i]--; - if (i >= iOrder) - infoPtr->items[infoPtr->order[i]].iOrder = i; - } + for (i = 0; i < infoPtr->uNumItem; i++) + TRACE("%d: order=%d, iOrder=%d, ->iOrder=%d\n", i, infoPtr->order[i], infoPtr->items[i].iOrder, infoPtr->items[infoPtr->order[i]].iOrder); - for (i = 0; i < infoPtr->uNumItem; i++) - TRACE("%d: order=%d, iOrder=%d, ->iOrder=%d\n", i, infoPtr->order[i], infoPtr->items[i].iOrder, infoPtr->items[infoPtr->order[i]].iOrder); + iOrder = infoPtr->items[iItem].iOrder; + HEADER_DisposeItem(&infoPtr->items[iItem]); + + infoPtr->uNumItem--; + memmove(&infoPtr->items[iItem], &infoPtr->items[iItem + 1], + (infoPtr->uNumItem - iItem) * sizeof(HEADER_ITEM)); + memmove(&infoPtr->order[iOrder], &infoPtr->order[iOrder + 1], + (infoPtr->uNumItem - iOrder) * sizeof(INT)); + infoPtr->items = ReAlloc(infoPtr->items, sizeof(HEADER_ITEM) * infoPtr->uNumItem); + infoPtr->order = ReAlloc(infoPtr->order, sizeof(INT) * infoPtr->uNumItem); + + /* Correct the orders */ + for (i = 0; i < infoPtr->uNumItem; i++) + { + if (infoPtr->order[i] > iItem) + infoPtr->order[i]--; + if (i >= iOrder) + infoPtr->items[infoPtr->order[i]].iOrder = i; } + for (i = 0; i < infoPtr->uNumItem; i++) + TRACE("%d: order=%d, iOrder=%d, ->iOrder=%d\n", i, infoPtr->order[i], infoPtr->items[i].iOrder, infoPtr->items[infoPtr->order[i]].iOrder); HEADER_SetItemBounds (hwnd); - InvalidateRect(hwnd, NULL, FALSE); return TRUE;

1 0

Mikołaj Zalewski : comctl32: header: Simplify the insert/delete code by using ReAlloc.
by Alexandre Julliard Sept. 20, 2006

Sept. 20, 2006

Module: wine Branch: master Commit: d98b9a465595ea93db9742242f300bf35dcb250e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d98b9a465595ea93db97422… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Sep 18 11:44:38 2006 +0200 comctl32: header: Simplify the insert/delete code by using ReAlloc. --- dlls/comctl32/header.c | 84 +++++++++++------------------------------------- 1 files changed, 20 insertions(+), 64 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 3ed3d51..eee9b36 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -1076,7 +1076,6 @@ HEADER_DeleteItem (HWND hwnd, WPARAM wPa infoPtr->uNumItem = 0; } else { - HEADER_ITEM *oldItems = infoPtr->items; INT i; INT iOrder; TRACE("Complex delete! [iItem=%d]\n", iItem); @@ -1087,26 +1086,14 @@ HEADER_DeleteItem (HWND hwnd, WPARAM wPa 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)); - } - + memmove(&infoPtr->items[iItem], &infoPtr->items[iItem + 1], + (infoPtr->uNumItem - iItem) * sizeof(HEADER_ITEM)); + memmove(&infoPtr->order[iOrder], &infoPtr->order[iOrder + 1], + (infoPtr->uNumItem - iOrder) * sizeof(INT)); + infoPtr->items = ReAlloc(infoPtr->items, sizeof(HEADER_ITEM) * infoPtr->uNumItem); + infoPtr->order = ReAlloc(infoPtr->order, sizeof(INT) * infoPtr->uNumItem); + /* Correct the orders */ - if (iOrder < infoPtr->uNumItem) - { - memmove(&infoPtr->order[iOrder], &infoPtr->order[iOrder + 1], - (infoPtr->uNumItem - iOrder) * sizeof(INT)); - } - for (i = 0; i < infoPtr->uNumItem; i++) { if (infoPtr->order[i] > iItem) @@ -1117,7 +1104,6 @@ HEADER_DeleteItem (HWND hwnd, WPARAM wPa for (i = 0; i < infoPtr->uNumItem; i++) TRACE("%d: order=%d, iOrder=%d, ->iOrder=%d\n", i, infoPtr->order[i], infoPtr->items[i].iOrder, infoPtr->items[infoPtr->order[i]].iOrder); - Free (oldItems); } HEADER_SetItemBounds (hwnd); @@ -1300,46 +1286,18 @@ HEADER_InsertItemT (HWND hwnd, INT nItem else if (infoPtr->uNumItem < iOrder) iOrder = infoPtr->uNumItem; - if (infoPtr->uNumItem == 0) { - infoPtr->items = Alloc (sizeof (HEADER_ITEM)); - infoPtr->order = Alloc(sizeof(INT)); - infoPtr->uNumItem++; - } - else { - HEADER_ITEM *oldItems = infoPtr->items; - INT *oldOrder = infoPtr->order; - - 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)); - } - } - - infoPtr->order = Alloc(sizeof(INT) * infoPtr->uNumItem); - memcpy(infoPtr->order, oldOrder, iOrder * sizeof(INT)); - infoPtr->order[iOrder] = nItem; - memcpy(&infoPtr->order[iOrder + 1], &oldOrder[iOrder], - (infoPtr->uNumItem - iOrder - 1) * sizeof(INT)); - - Free (oldItems); - Free(oldOrder); - } - + infoPtr->uNumItem++; + infoPtr->items = ReAlloc(infoPtr->items, sizeof(HEADER_ITEM) * infoPtr->uNumItem); + infoPtr->order = ReAlloc(infoPtr->order, sizeof(INT) * infoPtr->uNumItem); + + /* make space for the new item */ + memmove(&infoPtr->items[nItem + 1], &infoPtr->items[nItem], + (infoPtr->uNumItem - nItem - 1) * sizeof(HEADER_ITEM)); + memmove(&infoPtr->order[iOrder + 1], &infoPtr->order[iOrder], + (infoPtr->uNumItem - iOrder - 1) * sizeof(INT)); + + /* update the order array */ + infoPtr->order[iOrder] = nItem; for (i = 0; i < infoPtr->uNumItem; i++) { if (i != iOrder && infoPtr->order[i] >= nItem) @@ -1352,6 +1310,7 @@ HEADER_InsertItemT (HWND hwnd, INT nItem /* cxy, fmt and lParam are copied even if not in the HDITEM mask */ copyMask = phdi->mask | HDI_WIDTH | HDI_FORMAT | HDI_LPARAM; HEADER_StoreHDItemInHeader(lpItem, copyMask, phdi, bUnicode); + lpItem->iOrder = iOrder; /* set automatically some format bits */ if (phdi->mask & HDI_TEXT) @@ -1367,10 +1326,7 @@ HEADER_InsertItemT (HWND hwnd, INT nItem if (phdi->mask & HDI_IMAGE) lpItem->fmt |= HDF_IMAGE; - lpItem->iOrder = iOrder; - HEADER_SetItemBounds (hwnd); - InvalidateRect(hwnd, NULL, FALSE); return nItem;

1 0

Mikołaj Zalewski : comctl32: header: Test the header order-management code and fix some bugs.
by Alexandre Julliard Sept. 20, 2006

Sept. 20, 2006

Module: wine Branch: master Commit: 8ab78e18c639b47312ab722e3e2482e95bf45f83 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8ab78e18c639b47312ab722… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Sep 18 11:42:50 2006 +0200 comctl32: header: Test the header order-management code and fix some bugs. --- dlls/comctl32/header.c | 17 +++++---- dlls/comctl32/tests/header.c | 81 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 41c4071..3ed3d51 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -1105,13 +1105,14 @@ HEADER_DeleteItem (HWND hwnd, WPARAM wPa { memmove(&infoPtr->order[iOrder], &infoPtr->order[iOrder + 1], (infoPtr->uNumItem - iOrder) * sizeof(INT)); - for (i = 0; i < infoPtr->uNumItem; i++) - { - if (infoPtr->order[i] > iItem) - infoPtr->order[i]--; - if (i >= iOrder) - infoPtr->items[infoPtr->order[i]].iOrder = infoPtr->order[i]; - } + } + + for (i = 0; i < infoPtr->uNumItem; i++) + { + if (infoPtr->order[i] > iItem) + infoPtr->order[i]--; + if (i >= iOrder) + infoPtr->items[infoPtr->order[i]].iOrder = i; } for (i = 0; i < infoPtr->uNumItem; i++) @@ -1343,7 +1344,7 @@ HEADER_InsertItemT (HWND hwnd, INT nItem { if (i != iOrder && infoPtr->order[i] >= nItem) infoPtr->order[i]++; - infoPtr->items[infoPtr->order[i]].iOrder = infoPtr->order[i]; + infoPtr->items[infoPtr->order[i]].iOrder = i; } lpItem = &infoPtr->items[nItem]; diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 0084a71..7805f79 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -479,6 +479,86 @@ static void test_header_control (void) } +static void check_order(const int expected_id[], const int expected_order[], + int count, const char *type) +{ + int i; + HDITEMA hdi; + + ok(getItemCount(hWndHeader) == count, "Invalid item count in order tests\n"); + for (i = 0; i < count; i++) + { + hdi.mask = HDI_LPARAM|HDI_ORDER; + SendMessage(hWndHeader, HDM_GETITEMA, i, (LPARAM)&hdi); + ok(hdi.lParam == expected_id[i], + "Invalid item ids after '%s'- item %d has lParam %d\n", type, i, (int)hdi.lParam); + ok(hdi.iOrder == expected_order[i], + "Invalid item order after '%s'- item %d has iOrder %d\n", type, i, hdi.iOrder); + } +} + +static void test_header_order (void) +{ + const int rand1[] = {0, 1, 1, 0, 4}; + const int rand2[] = {4, 5, 6, 7, 4}; + const int rand3[] = {5, 5, 1, 6, 1}; + const int rand4[] = {1, 5, 2, 7, 6, 1, 4, 2, 3, 2}; + const int rand5[] = {7, 8, 5, 6, 7, 2, 1, 9, 10, 10}; + const int rand6[] = {2, 8, 3, 4, 0}; + + const int ids1[] = {3, 0, 2, 1, 4}; + const int ord1[] = {0, 1, 2, 3, 4}; + const int ids2[] = {3, 9, 7, 0, 2, 1, 4, 8, 6, 5}; + const int ord2[] = {0, 4, 7, 1, 2, 3, 9, 8, 6, 5}; + const int ord3[] = {0, 3, 9, 2, 1, 8, 7, 6, 5, 4}; + const int ids4[] = {9, 0, 1, 8, 6}; + const int ord4[] = {1, 0, 4, 3, 2}; + + char buffer[20]; + HDITEMA hdi; + int i; + + hWndHeader = create_header_control(); + + ZeroMemory(&hdi, sizeof(HDITEMA)); + hdi.mask = HDI_TEXT | HDI_LPARAM; + hdi.pszText = buffer; + strcpy(buffer, "test"); + + for (i = 0; i < 5; i++) + { + hdi.lParam = i; + SendMessage(hWndHeader, HDM_INSERTITEMA, rand1[i], (LPARAM)&hdi); + rand(); + } + check_order(ids1, ord1, 5, "insert without iOrder"); + + hdi.mask |= HDI_ORDER; + for (i = 0; i < 5; i++) + { + hdi.lParam = i + 5; + hdi.iOrder = rand2[i]; + SendMessage(hWndHeader, HDM_INSERTITEMA, rand3[i], (LPARAM)&hdi); + rand(); rand(); + } + check_order(ids2, ord2, 10, "insert with order"); + + hdi.mask = HDI_ORDER; + for (i=0; i<10; i++) + { + hdi.iOrder = rand5[i]; + SendMessage(hWndHeader, HDM_SETITEMA, rand4[i], (LPARAM)&hdi); + rand(); rand(); + } + check_order(ids2, ord3, 10, "setitems changing order"); + + for (i=0; i<5; i++) + SendMessage(hWndHeader, HDM_DELETEITEM, rand6[i], 0); + check_order(ids4, ord4, 5, "deleteitem"); + + DestroyWindow(hWndHeader); +} + LRESULT CALLBACK HeaderTestWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch(msg) { @@ -545,6 +625,7 @@ START_TEST(header) init(); test_header_control(); + test_header_order(); DestroyWindow(hHeaderParentWnd); }

1 0

Juan Lang : wincrypt.h: Add more missing definitions and prototypes.
by Alexandre Julliard Sept. 20, 2006

Sept. 20, 2006

Module: wine Branch: master Commit: 38f9f0c4bdc2ac2a8f65df00ce5d4361a5329723 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=38f9f0c4bdc2ac2a8f65df0… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Tue Sep 19 20:11:56 2006 -0700 wincrypt.h: Add more missing definitions and prototypes. --- include/wincrypt.h | 163 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 163 insertions(+), 0 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index 18ea897..4e0a11c 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -1160,6 +1160,81 @@ typedef struct _CRYPT_URL_INFO { DWORD *rgcGroupEntry; } CRYPT_URL_INFO, *PCRYPT_URL_INFO; +#define URL_OID_CERTIFICATE_ISSUER ((LPCSTR)1) +#define URL_OID_CERTIFICATE_CRL_DIST_POINT ((LPCSTR)2) +#define URL_OID_CTL_ISSUER ((LPCSTR)3) +#define URL_OID_CTL_NEXT_UPDATE ((LPCSTR)4) +#define URL_OID_CRL_ISSUER ((LPCSTR)5) +#define URL_OID_CERTIFICATE_FRESHEST_CRL ((LPCSTR)6) +#define URL_OID_CRL_FRESHEST_CRL ((LPCSTR)7) +#define URL_OID_CROSS_CERT_DIST_POINT ((LPCSTR)8) + +typedef HANDLE HCRYPTASYNC, *PHCRYPTASYNC; + +typedef void (WINAPI *PFN_CRYPT_ASYNC_PARAM_FREE_FUNC)(LPSTR pszParamOid, + LPVOID pvParam); + +typedef struct _CRYPT_CREDENTIALS { + DWORD cbSize; + LPCSTR pszCredentialsOid; + LPVOID pvCredentials; +} CRYPT_CREDENTIALS, *PCRYPT_CREDENTIALS; + +#define CREDENTIAL_OID_PASSWORD_CREDENTIALS_A ((LPCSTR)1) +#define CREDENTIAL_OID_PASSWORD_CREDENTIALS_W ((LPCSTR)2) +#define CREDENTIAL_OID_PASSWORD_CREDENTIALS \ + WINELIB_NAME_AW(CREDENTIAL_OID_PASSWORD_CREDENTIALS_) + +typedef struct _CRYPT_PASSWORD_CREDENTIALSA { + DWORD cbSize; + LPSTR pszUsername; + LPSTR pszPassword; +} CRYPT_PASSWORD_CREDENTIALSA, *PCRYPT_PASSWORD_CREDENTIALSA; + +typedef struct _CRYPT_PASSWORD_CREDENTIALSW { + DWORD cbSize; + LPWSTR pszUsername; + LPWSTR pszPassword; +} CRYPT_PASSWORD_CREDENTIALSW, *PCRYPT_PASSWORD_CREDENTIALSW; +#define CRYPT_PASSWORD_CREDENTIALS WINELIB_NAME_AW(CRYPT_PASSWORD_CREDENTIALS) +#define PCRYPT_PASSWORD_CREDENTIALS WINELIB_NAME_AW(PCRYPT_PASSWORD_CREDENTIALS) + +typedef struct _CRYPT_RETRIEVE_AUX_INFO { + DWORD cbSize; + FILETIME *pLastSyncTime; + DWORD dwMaxUrlRetrievalByteCount; +} CRYPT_RETRIEVE_AUX_INFO, *PCRYPT_RETRIEVE_AUX_INFO; + +#define CONTEXT_OID_CREATE_OBJECT_CONTEXT_FUNC "ContextDllCreateObjectContext" + +#define CONTEXT_OID_CERTIFICATE ((LPCSTR)1) +#define CONTEXT_OID_CRL ((LPCSTR)2) +#define CONTEXT_OID_CTL ((LPCSTR)3) +#define CONTEXT_OID_PKCS7 ((LPCSTR)4) +#define CONTEXT_OID_CAPI2_ANY ((LPCSTR)5) + +#define CRYPT_RETRIEVE_MULTIPLE_OBJECTS 0x00000001 +#define CRYPT_CACHE_ONLY_RETRIEVAL 0x00000002 +#define CRYPT_WIRE_ONLY_RETRIEVAL 0x00000004 +#define CRYPT_DONT_CACHE_RESULT 0x00000008 +#define CRYPT_ASYNC_RETRIEVAL 0x00000010 +#define CRYPT_STICKY_CACHE_RETRIEVAL 0x00001000 +#define CRYPT_LDAP_SCOPE_BASE_ONLY_RETRIEVAL 0x00002000 +#define CRYPT_OFFLINE_CHECK_RETRIEVAL 0x00004000 +#define CRYPT_LDAP_INSERT_ENTRY_ATTRIBUTE 0x00008000 +#define CRYPT_LDAP_SIGN_RETRIEVAL 0x00010000 +#define CRYPT_NO_AUTH_RETRIEVAL 0x00020000 +#define CRYPT_LDAP_AREC_EXCLUSIVE_RETRIEVAL 0x00040000 +#define CRYPT_AIA_RETRIEVAL 0x00080000 + +#define CRYPT_VERIFY_CONTEXT_SIGNATURE 0x00000020 +#define CRYPT_VERIFY_DATA_HASH 0x00000040 +#define CRYPT_KEEP_TIME_VALID 0x00000080 +#define CRYPT_DONT_VERIFY_SIGNATURE 0x00000100 +#define CRYPT_DONT_CHECK_TIME_VALIDITY 0x00000200 +#define CRYPT_CHECK_FRESHNESS_TIME_VALIDITY 0x00000400 +#define CRYPT_ACCUMULATIVE_TIMEOUT 0x00000800 + /* OID group IDs */ #define CRYPT_HASH_ALG_OID_GROUP_ID 1 #define CRYPT_ENCRYPT_ALG_OID_GROUP_ID 2 @@ -2817,6 +2892,75 @@ #define CRYPT_FORMAT_COMMA 0x1000 #define CRYPT_FORMAT_SEMICOLON CRYPT_FORMAT_RDN_SEMICOLON #define CRYPT_FORMAT_CRLF CRYPT_FORMAT_RDN_CRLF +/* CryptQueryObject types and flags */ +#define CERT_QUERY_OBJECT_FILE 1 +#define CERT_QUERY_OBJECT_BLOB 2 + +#define CERT_QUERY_CONTENT_CERT 1 +#define CERT_QUERY_CONTENT_CTL 2 +#define CERT_QUERY_CONTENT_CRL 3 +#define CERT_QUERY_CONTENT_SERIALIZED_STORE 4 +#define CERT_QUERY_CONTENT_SERIALIZED_CERT 5 +#define CERT_QUERY_CONTENT_SERIALIZED_CTL 6 +#define CERT_QUERY_CONTENT_SERIALIZED_CRL 7 +#define CERT_QUERY_CONTENT_PKCS7_SIGNED 8 +#define CERT_QUERY_CONTENT_PKCS7_UNSIGNED 9 +#define CERT_QUERY_CONTENT_PKCS7_SIGNED_EMBED 10 +#define CERT_QUERY_CONTENT_PKCS10 11 +#define CERT_QUERY_CONTENT_PFX 12 +#define CERT_QUERY_CONTENT_CERT_PAIR 13 + +#define CERT_QUERY_CONTENT_FLAG_CERT (1 << CERT_QUERY_CONTENT_CERT) +#define CERT_QUERY_CONTENT_FLAG_CTL (1 << CERT_QUERY_CONTENT_CTL) +#define CERT_QUERY_CONTENT_FLAG_CRL (1 << CERT_QUERY_CONTENT_CRL) +#define CERT_QUERY_CONTENT_FLAG_SERIALIZED_STORE \ + (1 << CERT_QUERY_CONTENT_SERIALIZED_STORE) +#define CERT_QUERY_CONTENT_FLAG_SERIALIZED_CERT \ + (1 << CERT_QUERY_CONTENT_SERIALIZED_CERT) +#define CERT_QUERY_CONTENT_FLAG_SERIALIZED_CTL \ + (1 << CERT_QUERY_CONTENT_SERIALIZED_CTL) +#define CERT_QUERY_CONTENT_FLAG_SERIALIZED_CRL \ + (1 << CERT_QUERY_CONTENT_SERIALIZED_CRL) +#define CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED \ + (1 << CERT_QUERY_CONTENT_PKCS7_SIGNED) +#define CERT_QUERY_CONTENT_FLAG_PKCS7_UNSIGNED \ + (1 << CERT_QUERY_CONTENT_PKCS7_UNSIGNED) +#define CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED_EMBED \ + (1 << CERT_QUERY_CONTENT_PKCS7_SIGNED_EMBED) +#define CERT_QUERY_CONTENT_FLAG_PKCS10 (1 << CERT_QUERY_CONTENT_PKCS10) +#define CERT_QUERY_CONTENT_FLAG_PFX (1 << CERT_QUERY_CONTENT_PFX) +#define CERT_QUERY_CONTENT_FLAG_CERT_PAIR (1 << CERT_QUERY_CONTENT_CERT_PAIR) + +#define CERT_QUERY_CONTENT_FLAG_ALL \ + CERT_QUERY_CONTENT_FLAG_CERT | \ + CERT_QUERY_CONTENT_FLAG_CTL | \ + CERT_QUERY_CONTENT_FLAG_CRL | \ + CERT_QUERY_CONTENT_FLAG_SERIALIZED_STORE | \ + CERT_QUERY_CONTENT_FLAG_SERIALIZED_CERT | \ + CERT_QUERY_CONTENT_FLAG_SERIALIZED_CTL | \ + CERT_QUERY_CONTENT_FLAG_SERIALIZED_CRL | \ + CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED | \ + CERT_QUERY_CONTENT_FLAG_PKCS7_UNSIGNED | \ + CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED_EMBED | \ + CERT_QUERY_CONTENT_FLAG_PKCS10 | \ + CERT_QUERY_CONTENT_FLAG_PFX | \ + CERT_QUERY_CONTENT_FLAG_CERT_PAIR + +#define CERT_QUERY_FORMAT_BINARY 1 +#define CERT_QUERY_FORMAT_BASE64_ENCODED 2 +#define CERT_QUERY_FORMAT_ASN_ASCII_HEX_ENCODED 3 + +#define CERT_QUERY_FORMAT_FLAG_BINARY (1 << CERT_QUERY_FORMAT_BINARY) +#define CERT_QUERY_FORMAT_FLAG_BASE64_ENCODED \ + (1 << CERT_QUERY_FORMAT_BASE64_ENCODED) +#define CERT_QUERY_FORMAT_FLAG_ASN_ASCII_HEX_ENCODED \ + (1 << CERT_QUERY_FORMAT_ASN_ASCII_HEX_ENCODED) + +#define CERT_QUERY_FORMAT_FLAG_ALL \ + CERT_QUERY_FORMAT_FLAG_BINARY | \ + CERT_QUERY_FORMAT_FLAG_BASE64_ENCODED | \ + CERT_QUERY_FORMAT_FLAG_ASN_ASCII_HEX_ENCODED \ + #define CERT_SET_KEY_PROV_HANDLE_PROP_ID 0x00000001 #define CERT_SET_KEY_CONTEXT_PROP_ID 0x00000001 @@ -2947,6 +3091,13 @@ BOOL WINAPI CryptStringToBinaryW(LPCWSTR DWORD *pdwSkip, DWORD *pdwFlags); #define CryptStringToBinary WINELIB_NAME_AW(CryptStringToBinary) +BOOL WINAPI CryptCreateAsyncHandle(DWORD dwFlags, PHCRYPTASYNC phAsync); +BOOL WINAPI CryptSetAsyncParam(HCRYPTASYNC hAsync, LPSTR pszParamOid, + LPVOID pvParam, PFN_CRYPT_ASYNC_PARAM_FREE_FUNC pfnFree); +BOOL WINAPI CryptGetAsyncParam(HCRYPTASYNC hAsync, LPSTR pszParamOid, + LPVOID *ppvParam, PFN_CRYPT_ASYNC_PARAM_FREE_FUNC *ppfnFree); +BOOL WINAPI CryptCloseAsyncHandle(HCRYPTASYNC hAsync); + BOOL WINAPI CryptRegisterDefaultOIDFunction(DWORD,LPCSTR,DWORD,LPCWSTR); BOOL WINAPI CryptRegisterOIDFunction(DWORD,LPCSTR,LPCSTR,LPCWSTR,LPCSTR); BOOL WINAPI CryptGetOIDFunctionValue(DWORD dwEncodingType, LPCSTR pszFuncName, @@ -3292,6 +3443,8 @@ LONG WINAPI CertVerifyCRLTimeValidity(LP PCRL_INFO pCrlInfo); LONG WINAPI CertVerifyTimeValidity(LPFILETIME pTimeToVerify, PCERT_INFO pCertInfo); +BOOL WINAPI CertVerifyValidityNesting(PCERT_INFO pSubjectInfo, + PCERT_INFO pIssuerInfo); BOOL WINAPI CertVerifyCTLUsage(DWORD dwEncodingType, DWORD dwSubjectType, void *pvSubject, PCTL_USAGE pSubjectUsage, DWORD dwFlags, @@ -3421,6 +3574,16 @@ BOOL WINAPI CryptGetObjectUrl(LPCSTR psz PCRYPT_URL_ARRAY pUrlArray, DWORD *pcbUrlArray, PCRYPT_URL_INFO pUrlInfo, DWORD *pcbUrlInfo, LPVOID pvReserved); +BOOL WINAPI CryptRetrieveObjectByUrlA(LPCSTR pszURL, LPCSTR pszObjectOid, + DWORD dwRetrievalFlags, DWORD dwTimeout, LPVOID *ppvObject, + HCRYPTASYNC hAsyncRetrieve, PCRYPT_CREDENTIALS pCredentials, LPVOID pvVerify, + PCRYPT_RETRIEVE_AUX_INFO pAuxInfo); +BOOL WINAPI CryptRetrieveObjectByUrlW(LPCWSTR pszURL, LPCSTR pszObjectOid, + DWORD dwRetrievalFlags, DWORD dwTimeout, LPVOID *ppvObject, + HCRYPTASYNC hAsyncRetrieve, PCRYPT_CREDENTIALS pCredentials, LPVOID pvVerify, + PCRYPT_RETRIEVE_AUX_INFO pAuxInfo); +#define CryptRetrieveObjectByUrl WINELIB_NAME_AW(CryptRetrieveObjectByUrl) + #ifdef __cplusplus } #endif

1 0