Tag new vendor drop, remove old tag Deleted: vendor/wine/dlls/cabinet/Wine-20050211/ Added: vendor/wine/dlls/cabinet/Wine-20050310/ Deleted: vendor/wine/dlls/comctl32/Wine-20050211/ Added: vendor/wine/dlls/comctl32/Wine-20050310/ Deleted: vendor/wine/dlls/comctl32/Wine-20050310/comctl32.spec Added: vendor/wine/dlls/comctl32/Wine-20050310/comctl32.spec Deleted: vendor/wine/dlls/comctl32/Wine-20050310/comctl_Es.rc Added: vendor/wine/dlls/comctl32/Wine-20050310/comctl_Es.rc Deleted: vendor/wine/dlls/comctl32/Wine-20050310/draglist.c Added: vendor/wine/dlls/comctl32/Wine-20050310/draglist.c Deleted: vendor/wine/dlls/comctl32/Wine-20050310/header.c Added: vendor/wine/dlls/comctl32/Wine-20050310/header.c Deleted: vendor/wine/dlls/comctl32/Wine-20050310/imagelist.c Added: vendor/wine/dlls/comctl32/Wine-20050310/imagelist.c Deleted: vendor/wine/dlls/comctl32/Wine-20050310/listview.c Added: vendor/wine/dlls/comctl32/Wine-20050310/listview.c Deleted: vendor/wine/dlls/comctl32/Wine-20050310/rebar.c Added: vendor/wine/dlls/comctl32/Wine-20050310/rebar.c Deleted: vendor/wine/dlls/comctl32/Wine-20050310/status.c Added: vendor/wine/dlls/comctl32/Wine-20050310/status.c Deleted: vendor/wine/dlls/comctl32/Wine-20050310/string.c Added: vendor/wine/dlls/comctl32/Wine-20050310/string.c Deleted: vendor/wine/dlls/comctl32/Wine-20050310/syslink.c Added: vendor/wine/dlls/comctl32/Wine-20050310/syslink.c Deleted: vendor/wine/dlls/comctl32/Wine-20050310/tab.c Added: vendor/wine/dlls/comctl32/Wine-20050310/tab.c Deleted: vendor/wine/dlls/comctl32/Wine-20050310/treeview.c Added: vendor/wine/dlls/comctl32/Wine-20050310/treeview.c Deleted: vendor/wine/dlls/commdlg/Wine-20050211/ Added: vendor/wine/dlls/commdlg/Wine-20050310/ Deleted: vendor/wine/dlls/commdlg/Wine-20050310/cdlg32.c Added: vendor/wine/dlls/commdlg/Wine-20050310/cdlg32.c Deleted: vendor/wine/dlls/commdlg/Wine-20050310/cdlg_En.rc Added: vendor/wine/dlls/commdlg/Wine-20050310/cdlg_En.rc Deleted: vendor/wine/dlls/commdlg/Wine-20050310/cdlg_Es.rc Added: vendor/wine/dlls/commdlg/Wine-20050310/cdlg_Es.rc Deleted: vendor/wine/dlls/commdlg/Wine-20050310/cdlg_Pt.rc Added: vendor/wine/dlls/commdlg/Wine-20050310/cdlg_Pt.rc Deleted: vendor/wine/dlls/commdlg/Wine-20050310/cdlg_xx.rc Added: vendor/wine/dlls/commdlg/Wine-20050310/cdlg_xx.rc Deleted: vendor/wine/dlls/commdlg/Wine-20050310/colordlg.c Added: vendor/wine/dlls/commdlg/Wine-20050310/colordlg.c Deleted: vendor/wine/dlls/commdlg/Wine-20050310/colordlg16.c Added: vendor/wine/dlls/commdlg/Wine-20050310/colordlg16.c Deleted: vendor/wine/dlls/commdlg/Wine-20050310/filedlg.c Added: vendor/wine/dlls/commdlg/Wine-20050310/filedlg.c Deleted: vendor/wine/dlls/commdlg/Wine-20050310/finddlg.c Added: vendor/wine/dlls/commdlg/Wine-20050310/finddlg.c Deleted: vendor/wine/dlls/commdlg/Wine-20050310/fontdlg.c Added: vendor/wine/dlls/commdlg/Wine-20050310/fontdlg.c Deleted: vendor/wine/dlls/commdlg/Wine-20050310/fontdlg16.c Added: vendor/wine/dlls/commdlg/Wine-20050310/fontdlg16.c Deleted: vendor/wine/dlls/dinput/Wine-20050211/ Added: vendor/wine/dlls/dinput/Wine-20050310/ Deleted: vendor/wine/dlls/dinput/Wine-20050310/joystick_linuxinput.c Added: vendor/wine/dlls/dinput/Wine-20050310/joystick_linuxinput.c Deleted: vendor/wine/dlls/dinput/Wine-20050310/keyboard.c Added: vendor/wine/dlls/dinput/Wine-20050310/keyboard.c Deleted: vendor/wine/dlls/dinput/Wine-20050310/mouse.c Added: vendor/wine/dlls/dinput/Wine-20050310/mouse.c Deleted: vendor/wine/dlls/dinput8/Wine-20050211/ Added: vendor/wine/dlls/dinput8/Wine-20050310/ Added: vendor/wine/dlls/dsound/Wine-20050310/ Deleted: vendor/wine/dlls/dsound/Wine-20050310/buffer.c Added: vendor/wine/dlls/dsound/Wine-20050310/buffer.c Deleted: vendor/wine/dlls/dsound/Wine-20050310/capture.c Added: vendor/wine/dlls/dsound/Wine-20050310/capture.c Deleted: vendor/wine/dlls/dsound/Wine-20050310/dsound.c Added: vendor/wine/dlls/dsound/Wine-20050310/dsound.c Deleted: vendor/wine/dlls/dsound/Wine-20050310/dsound_main.c Added: vendor/wine/dlls/dsound/Wine-20050310/dsound_main.c Deleted: vendor/wine/dlls/dsound/Wine-20050310/dsound_private.h Added: vendor/wine/dlls/dsound/Wine-20050310/dsound_private.h Deleted: vendor/wine/dlls/dsound/Wine-20050310/mixer.c Added: vendor/wine/dlls/dsound/Wine-20050310/mixer.c Deleted: vendor/wine/dlls/dsound/Wine-20050310/primary.c Added: vendor/wine/dlls/dsound/Wine-20050310/primary.c Deleted: vendor/wine/dlls/dsound/Wine-20050310/propset.c Added: vendor/wine/dlls/dsound/Wine-20050310/propset.c Deleted: vendor/wine/dlls/dsound/Wine-20050310/regsvr.c Added: vendor/wine/dlls/dsound/Wine-20050310/regsvr.c Deleted: vendor/wine/dlls/dsound/Wine-20050310/sound3d.c Added: vendor/wine/dlls/dsound/Wine-20050310/sound3d.c Deleted: vendor/wine/dlls/icmp/Wine-20050211/ Added: vendor/wine/dlls/icmp/Wine-20050310/ Deleted: vendor/wine/dlls/mpr/Wine-20050211/ Added: vendor/wine/dlls/mpr/Wine-20050310/ Deleted: vendor/wine/dlls/mpr/Wine-20050310/mpr_De.rc Added: vendor/wine/dlls/mpr/Wine-20050310/mpr_De.rc Deleted: vendor/wine/dlls/mpr/Wine-20050310/mpr_En.rc Added: vendor/wine/dlls/mpr/Wine-20050310/mpr_En.rc Deleted: vendor/wine/dlls/mpr/Wine-20050310/mpr_Es.rc Added: vendor/wine/dlls/mpr/Wine-20050310/mpr_Es.rc Deleted: vendor/wine/dlls/mpr/Wine-20050310/mpr_Fr.rc Added: vendor/wine/dlls/mpr/Wine-20050310/mpr_Fr.rc Deleted: vendor/wine/dlls/mpr/Wine-20050310/mpr_Pt.rc Added: vendor/wine/dlls/mpr/Wine-20050310/mpr_Pt.rc Deleted: vendor/wine/dlls/msi/Wine-20050211/ Added: vendor/wine/dlls/msi/Wine-20050310/ Deleted: vendor/wine/dlls/msi/Wine-20050310/Makefile.in [truncated at 100 lines; 291 more skipped] _____
Copied: vendor/wine/dlls/cabinet/Wine-20050310 (from rev 14050, vendor/wine/dlls/cabinet/current) _____
Copied: vendor/wine/dlls/comctl32/Wine-20050310 (from rev 14050, vendor/wine/dlls/comctl32/current) _____
Deleted: vendor/wine/dlls/comctl32/Wine-20050310/comctl32.spec --- vendor/wine/dlls/comctl32/current/comctl32.spec 2005-03-14 07:21:20 UTC (rev 14050) +++ vendor/wine/dlls/comctl32/Wine-20050310/comctl32.spec 2005-03-16 08:30:38 UTC (rev 14119) @@ -1,188 +0,0 @@
-# Functions exported by the Win95 comctl32.dll -# (these need to have these exact ordinals, because some win95 dlls -# import comctl32.dll by ordinal) -# This list was created from a comctl32.dll v5.81 (IE5.01). - - 2 stdcall MenuHelp(long long long long long long ptr) - 3 stdcall ShowHideMenuCtl(long long ptr) - 4 stdcall GetEffectiveClientRect(long long long) - 5 stdcall DrawStatusTextA(long ptr str long) - 6 stdcall CreateStatusWindowA(long str long long) - 7 stdcall CreateToolbar(long long long long long long ptr long) - 8 stdcall CreateMappedBitmap(long long long ptr long) - 9 stdcall -noname DPA_LoadStream(ptr ptr ptr long) - 10 stdcall -noname DPA_SaveStream(ptr ptr ptr long) - 11 stdcall -noname DPA_Merge(ptr ptr long ptr ptr long) -#12 stub Cctl1632_ThunkData32 - 13 stdcall MakeDragList(long) - 14 stdcall LBItemFromPt(long long long long) - 15 stdcall DrawInsert(long long long) - 16 stdcall CreateUpDownControl(long long long long long long long long long long long long) - 17 stdcall InitCommonControls() - 71 stdcall -noname Alloc(long) - 72 stdcall -noname ReAlloc(ptr long) - 73 stdcall -noname Free(ptr) - 74 stdcall -noname GetSize(ptr) -151 stdcall -noname CreateMRUListA(ptr) -152 stdcall -noname FreeMRUList(long) -153 stdcall -noname AddMRUStringA(long str) -154 stdcall -noname EnumMRUListA(long long ptr long) -155 stdcall -noname FindMRUStringA(long str ptr) -156 stdcall -noname DelMRUString(long long) -157 stdcall -noname CreateMRUListLazyA(ptr long long long) -163 stub -noname CreatePage -164 stub -noname CreateProxyPage -167 stdcall -noname AddMRUData(long ptr long) -169 stdcall -noname FindMRUData(long ptr long ptr) -233 stdcall -noname Str_GetPtrA(str str long) -234 stdcall -noname Str_SetPtrA(str str) -235 stdcall -noname Str_GetPtrW(wstr wstr long) -236 stdcall -noname Str_SetPtrW(wstr wstr) -320 stdcall -noname DSA_Create(long long) -321 stdcall -noname DSA_Destroy(ptr) -322 stdcall -noname DSA_GetItem(ptr long long) -323 stdcall -noname DSA_GetItemPtr(ptr long) -324 stdcall -noname DSA_InsertItem(ptr long long) -325 stdcall -noname DSA_SetItem (ptr long long) -326 stdcall -noname DSA_DeleteItem(ptr long) -327 stdcall -noname DSA_DeleteAllItems(ptr) -328 stdcall -noname DPA_Create(long) -329 stdcall -noname DPA_Destroy(ptr) -330 stdcall -noname DPA_Grow(ptr long) -331 stdcall -noname DPA_Clone(ptr ptr) -332 stdcall -noname DPA_GetPtr(ptr long) -333 stdcall -noname DPA_GetPtrIndex(ptr ptr) -334 stdcall -noname DPA_InsertPtr(ptr long ptr) -335 stdcall -noname DPA_SetPtr(ptr long ptr) -336 stdcall -noname DPA_DeletePtr(ptr long) -337 stdcall -noname DPA_DeleteAllPtrs(ptr) -338 stdcall -noname DPA_Sort(ptr ptr long) -339 stdcall -noname DPA_Search(ptr ptr long ptr long long) -340 stdcall -noname DPA_CreateEx(long long) -341 stdcall -noname SendNotify(long long long ptr) -342 stdcall -noname SendNotifyEx(long long long ptr long) -350 stdcall -noname StrChrA(str str) -351 stdcall -noname StrRChrA(str str long) -352 stdcall -noname StrCmpNA(str str long) -353 stdcall -noname StrCmpNIA(str str long) -354 stdcall -noname StrStrA(str str) -355 stdcall -noname StrStrIA(str str) -356 stdcall -noname StrCSpnA(str str) -357 stdcall -noname StrToIntA(str) -358 stdcall -noname StrChrW(wstr long) -359 stdcall -noname StrRChrW(wstr wstr long) -360 stdcall -noname StrCmpNW(wstr wstr long) -361 stdcall -noname StrCmpNIW(wstr wstr long) -362 stdcall -noname StrStrW(wstr wstr) -363 stdcall -noname StrStrIW(wstr wstr) -364 stdcall -noname StrCSpnW(wstr wstr) -365 stdcall -noname StrToIntW(wstr) -366 stdcall -noname StrChrIA(str long) -367 stdcall -noname StrChrIW(wstr long) -368 stdcall -noname StrRChrIA(str str long) -369 stdcall -noname StrRChrIW(wstr wstr long) -372 stdcall -noname StrRStrIA(str str str) -373 stdcall -noname StrRStrIW(wstr wstr wstr) -374 stdcall -noname StrCSpnIA(str str) -375 stdcall -noname StrCSpnIW(wstr wstr) -376 stdcall -noname IntlStrEqWorkerA(long str str long) -377 stdcall -noname IntlStrEqWorkerW(long wstr wstr long) -382 stdcall -noname SmoothScrollWindow(ptr) -383 stub -noname DoReaderMode -384 stdcall -noname SetPathWordBreakProc(ptr long) -385 stdcall -noname DPA_EnumCallback(long long long) -386 stdcall -noname DPA_DestroyCallback(ptr ptr long) -387 stdcall -noname DSA_EnumCallback(ptr ptr long) -388 stdcall -noname DSA_DestroyCallback(ptr ptr long) -389 stub -noname SHGetProcessDword -390 stdcall -noname ImageList_SetColorTable(ptr long long ptr) -400 stdcall -noname CreateMRUListW(ptr) -401 stdcall -noname AddMRUStringW(long wstr) -402 stdcall -noname FindMRUStringW(long wstr ptr) -403 stdcall -noname EnumMRUListW(long long ptr long) -404 stdcall -noname CreateMRUListLazyW(ptr long long long) -410 stdcall SetWindowSubclass(long ptr long long) -411 stdcall GetWindowSubclass(long ptr long ptr) -412 stdcall RemoveWindowSubclass(long ptr long) -413 stdcall DefSubclassProc(long long long long) -414 stdcall -noname MirrorIcon(ptr ptr) -415 stdcall -noname DrawTextWrap(long wstr long ptr long) user32.DrawTextW -416 stdcall -noname DrawTextExPrivWrap(long wstr long ptr long ptr) user32.DrawTextExW -417 stdcall -noname ExtTextOutWrap(long long long long ptr wstr long ptr) gdi32.ExtTextOutW -418 stdcall -noname GetCharWidthWrap(long long long long) gdi32.GetCharWidthW -419 stdcall -noname GetTextExtentPointWrap(long wstr long ptr) gdi32.GetTextExtentPointW -420 stdcall -noname GetTextExtentPoint32Wrap(long wstr long ptr) gdi32.GetTextExtentPoint32W -421 stdcall -noname TextOutWrap(long long long wstr long) gdi32.TextOutW - -# Functions imported by name - -@ stdcall CreatePropertySheetPage(ptr) CreatePropertySheetPageA -@ stdcall CreatePropertySheetPageA(ptr) -@ stdcall CreatePropertySheetPageW(ptr) -@ stdcall CreateStatusWindow(long str long long) CreateStatusWindowA -@ stdcall CreateStatusWindowW(long wstr long long) -@ stdcall CreateToolbarEx(long long long long long long ptr long long long long long long) -@ stdcall DestroyPropertySheetPage(long) -@ stdcall DllGetVersion(ptr) COMCTL32_DllGetVersion -@ stdcall DllInstall(long ptr) COMCTL32_DllInstall -@ stdcall DrawStatusText(long ptr ptr long) DrawStatusTextA -@ stdcall DrawStatusTextW(long ptr wstr long) -@ stdcall FlatSB_EnableScrollBar (long long long) -@ stdcall FlatSB_GetScrollInfo (long long ptr) -@ stdcall FlatSB_GetScrollPos (long long) -@ stdcall FlatSB_GetScrollProp (long long ptr) -@ stdcall FlatSB_GetScrollRange (long long ptr ptr) -@ stdcall FlatSB_SetScrollInfo (long long ptr long) -@ stdcall FlatSB_SetScrollPos (long long long long) -@ stdcall FlatSB_SetScrollProp (long long long long) -@ stdcall FlatSB_SetScrollRange (long long long long long) -@ stdcall FlatSB_ShowScrollBar (long long long) -@ stdcall GetMUILanguage() -@ stdcall ImageList_Add(ptr long long) -@ stdcall ImageList_AddIcon(ptr long) -@ stdcall ImageList_AddMasked(ptr long long) -@ stdcall ImageList_BeginDrag(ptr long long long) -@ stdcall ImageList_Copy(ptr long ptr long long) -@ stdcall ImageList_Create(long long long long long) -@ stdcall ImageList_Destroy(ptr) -@ stdcall ImageList_DragEnter(long long long) -@ stdcall ImageList_DragLeave(long) -@ stdcall ImageList_DragMove(long long) -@ stdcall ImageList_DragShowNolock(long) -@ stdcall ImageList_Draw(ptr long long long long long) -@ stdcall ImageList_DrawEx(ptr long long long long long long long long long) -@ stdcall ImageList_DrawIndirect(ptr) -@ stdcall ImageList_Duplicate(ptr) -@ stdcall ImageList_EndDrag() -@ stdcall ImageList_GetBkColor(ptr) -@ stdcall ImageList_GetDragImage(ptr ptr) -@ stdcall ImageList_GetFlags(ptr) -@ stdcall ImageList_GetIcon(ptr long long) -@ stdcall ImageList_GetIconSize(ptr ptr ptr) -@ stdcall ImageList_GetImageCount(ptr) -@ stdcall ImageList_GetImageInfo(ptr long ptr) -@ stdcall ImageList_GetImageRect(ptr long ptr) -@ stdcall ImageList_LoadImage(long str long long long long long) ImageList_LoadImageA -@ stdcall ImageList_LoadImageA(long str long long long long long) -@ stdcall ImageList_LoadImageW(long wstr long long long long long) -@ stdcall ImageList_Merge(ptr long ptr long long long) -@ stdcall ImageList_Read(ptr) -@ stdcall ImageList_Remove(ptr long) -@ stdcall ImageList_Replace(ptr long long long) -@ stdcall ImageList_ReplaceIcon(ptr long long) -@ stdcall ImageList_SetBkColor(ptr long) -@ stdcall ImageList_SetDragCursorImage(ptr long long long) -@ stdcall ImageList_SetFilter(ptr long long) -@ stdcall ImageList_SetFlags(ptr long) -@ stdcall ImageList_SetIconSize(ptr long long) -@ stdcall ImageList_SetImageCount(ptr long) -@ stdcall ImageList_SetOverlayImage(ptr long long) -@ stdcall ImageList_Write(ptr ptr) -@ stdcall InitCommonControlsEx(ptr) -@ stdcall InitMUILanguage(long) -@ stdcall InitializeFlatSB(long) -@ stdcall PropertySheet(ptr) PropertySheetA -@ stdcall PropertySheetA(ptr) -@ stdcall PropertySheetW(ptr) -@ stdcall UninitializeFlatSB(long) -@ stdcall _TrackMouseEvent(ptr) _____
Copied: vendor/wine/dlls/comctl32/Wine-20050310/comctl32.spec (from rev 14051, vendor/wine/dlls/comctl32/current/comctl32.spec) _____
Deleted: vendor/wine/dlls/comctl32/Wine-20050310/comctl_Es.rc --- vendor/wine/dlls/comctl32/current/comctl_Es.rc 2005-03-14 07:21:20 UTC (rev 14050) +++ vendor/wine/dlls/comctl32/Wine-20050310/comctl_Es.rc 2005-03-16 08:30:38 UTC (rev 14119) @@ -1,87 +0,0 @@
-/* - * Copyright 2003 JosÚ Manuel Ferrer Ortiz - * - * 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 - */ - -LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT - -IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 -STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Propiedades de " -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "Aceptar", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP - PUSHBUTTON "Cancelar", IDCANCEL,58,122,50,14 - PUSHBUTTON "&Aplicar", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED - PUSHBUTTON "Ayuda", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP - CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS _MULTILINE,4,4,212,114 -END - - -IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Ayudante" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "Terminar", IDC_FINISH_BUTTON,121,138,50,14 - DEFPUSHBUTTON "&Siguiente >", IDC_NEXT_BUTTON,121,138,50,14 - PUSHBUTTON "< &Anterior", IDC_BACK_BUTTON,71,138,50,14 - PUSHBUTTON "Cancelar", IDCANCEL,178,138,50,14 - PUSHBUTTON "Ayuda", IDHELP,235,138,50,14,WS_GROUP - LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN - CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 - LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE -END - - -IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Personalizar barra de herramientas" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "&Cerrar", IDCANCEL,308,6,44,14 - PUSHBUTTON "R&estaurar", IDC_RESET_BTN,308,23,44,14 - PUSHBUTTON "&Ayuda", IDC_HELP_BTN,308,40,44,14 - PUSHBUTTON "Mover A&rriba", IDC_MOVEUP_BTN,308,74,44,14 - PUSHBUTTON "Mover A&bajo", IDC_MOVEDN_BTN,308,91,44,14 - LTEXT "Botones &disponibles:", -1,4,5,84,10 - LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP - PUSHBUTTON "A&±adir ->", IDOK, 131, 42, 44, 14 - PUSHBUTTON "<- &Eliminar", IDC_REMOVE_BTN,131,62,44,14 - LTEXT "B&otones de la barra:", -1,182,5,78,10 - LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP -END - -STRINGTABLE DISCARDABLE -{ - IDS_CLOSE "Cerrar" -} - -STRINGTABLE DISCARDABLE -{ - IDM_TODAY "Hoy:" - IDM_GOTODAY "Ir a hoy" -} - -STRINGTABLE DISCARDABLE -{ - IDS_SEPARATOR "Separador" -} - -STRINGTABLE DISCARDABLE -{ - HKY_NONE "Ninguno" -} _____
Copied: vendor/wine/dlls/comctl32/Wine-20050310/comctl_Es.rc (from rev 14051, vendor/wine/dlls/comctl32/current/comctl_Es.rc) _____
Deleted: vendor/wine/dlls/comctl32/Wine-20050310/draglist.c --- vendor/wine/dlls/comctl32/current/draglist.c 2005-03-14 07:21:20 UTC (rev 14050) +++ vendor/wine/dlls/comctl32/Wine-20050310/draglist.c 2005-03-16 08:30:38 UTC (rev 14119) @@ -1,345 +0,0 @@
-/* - * Drag List control - * - * Copyright 1999 Eric Kohl - * Copyright 2004 Robert Shearman - * - * 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 - * - * NOTES - * - * This code was audited for completeness against the documented features - * of Comctl32.dll version 6.0 on Mar. 10, 2004, by Robert Shearman. - * - * Unless otherwise noted, we believe this code to be complete, as per - * the specification mentioned above. - * If you discover missing features or bugs please note them below. - * - */ - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "commctrl.h" -#include "comctl32.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(commctrl); - -/* for compiler compatibility we only accept literal ASCII strings */ -#undef TEXT -#define TEXT(string) string - -#define DRAGLIST_SUBCLASSID 0 -#define DRAGLIST_SCROLLPERIOD 200 -#define DRAGLIST_TIMERID 666 - -/* properties relating to IDI_DRAGICON */ -#define DRAGICON_HOTSPOT_X 17 -#define DRAGICON_HOTSPOT_Y 7 -#define DRAGICON_HEIGHT 32 - -/* internal Wine specific data for the drag list control */ -typedef struct _DRAGLISTDATA -{ - /* are we currently in dragging mode? */ - BOOL dragging; - - /* cursor to use as determined by DL_DRAGGING notification. - * NOTE: as we use LoadCursor we don't have to use DeleteCursor - * when we are finished with it */ - HCURSOR cursor; - - /* optimisation so that we don't have to load the cursor - * all of the time whilst dragging */ - LRESULT last_dragging_response; - - /* prevents flicker with drawing drag arrow */ - RECT last_drag_icon_rect; -} DRAGLISTDATA; - -UINT uDragListMessage = 0; /* registered window message code */ -static DWORD dwLastScrollTime = 0; -static HICON hDragArrow = NULL; - -/********************************************************************** * - * DragList_Notify (internal) - * - * Sends notification messages to the parent control. Note that it - * does not use WM_NOTIFY like the rest of the controls, but a registered - * window message. - */ -static LRESULT DragList_Notify(HWND hwndLB, UINT uNotification) -{ - DRAGLISTINFO dli; - dli.hWnd = hwndLB; - dli.uNotification = uNotification; - GetCursorPos(&dli.ptCursor); - return SendMessageW(GetParent(hwndLB), uDragListMessage, GetDlgCtrlID(hwndLB), (LPARAM)&dli); -} - -/* cleans up after dragging */ -static inline void DragList_EndDrag(HWND hwnd, DRAGLISTDATA * data) -{ - KillTimer(hwnd, DRAGLIST_TIMERID); - ReleaseCapture(); - /* clear any drag insert icon present */ - InvalidateRect(GetParent(hwnd), &data->last_drag_icon_rect, TRUE); - /* clear data for next use */ - memset(data, 0, sizeof(*data)); -} - -/********************************************************************** * - * DragList_SubclassWindowProc (internal) - * - * Handles certain messages to enable dragging for the ListBox and forwards - * the rest to the ListBox. - */ -static LRESULT CALLBACK -DragList_SubclassWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_PTR uIdSubclass, DWORD_PTR dwRefData) -{ - DRAGLISTDATA * data = (DRAGLISTDATA*)dwRefData; - switch (uMsg) - { - case WM_LBUTTONDOWN: - SetFocus(hwnd); - data->dragging = DragList_Notify(hwnd, DL_BEGINDRAG); - if (data->dragging) - { - SetCapture(hwnd); - SetTimer(hwnd, DRAGLIST_TIMERID, DRAGLIST_SCROLLPERIOD, NULL); - } - /* note that we don't absorb this message to let the list box - * do its thing (normally selecting an item) */ - break; - - case WM_KEYDOWN: - case WM_RBUTTONDOWN: - /* user cancelled drag by either right clicking or - * by pressing the escape key */ - if ((data->dragging) && - ((uMsg == WM_RBUTTONDOWN) || (wParam == VK_ESCAPE))) - { - /* clean up and absorb message */ - DragList_EndDrag(hwnd, data); - DragList_Notify(hwnd, DL_CANCELDRAG); - return 0; - } - break; - - case WM_MOUSEMOVE: - case WM_TIMER: - if (data->dragging) - { - LRESULT cursor = DragList_Notify(hwnd, DL_DRAGGING); - /* optimisation so that we don't have to load the cursor - * all of the time whilst dragging */ - if (data->last_dragging_response != cursor) - { - switch (cursor) - { - case DL_STOPCURSOR: - data->cursor = LoadCursorW(NULL, (LPCWSTR)IDC_NO); - SetCursor(data->cursor); - break; - case DL_COPYCURSOR: - data->cursor = LoadCursorW(COMCTL32_hModule, (LPCWSTR)IDC_COPY); - SetCursor(data->cursor); - break; - case DL_MOVECURSOR: - data->cursor = LoadCursorW(NULL, (LPCWSTR)IDC_ARROW); - SetCursor(data->cursor); - break; - } - data->last_dragging_response = cursor; - } - /* don't pass this message on to List Box */ - return 0; - } - break; - - case WM_LBUTTONUP: - if (data->dragging) - { - DragList_EndDrag(hwnd, data); - DragList_Notify(hwnd, DL_DROPPED); - } - break; - - case WM_GETDLGCODE: - /* tell dialog boxes that we want to receive WM_KEYDOWN events - * for keys like VK_ESCAPE */ - if (data->dragging) - return DLGC_WANTALLKEYS; - break; - case WM_NCDESTROY: - RemoveWindowSubclass(hwnd, DragList_SubclassWindowProc, DRAGLIST_SUBCLASSID); - Free(data); - break; - } - return DefSubclassProc(hwnd, uMsg, wParam, lParam); -} - -/********************************************************************** * - * MakeDragList (COMCTL32.13) - * - * Makes a normal ListBox into a DragList by subclassing it. - * - * RETURNS - * Success: Non-zero - * Failure: Zero - */ -BOOL WINAPI MakeDragList (HWND hwndLB) -{ - DRAGLISTDATA * data = Alloc(sizeof(DRAGLISTDATA)); - - TRACE("(%p)\n", hwndLB); - - if (!uDragListMessage) - uDragListMessage = RegisterWindowMessageA(DRAGLISTMSGSTRING); - - return SetWindowSubclass(hwndLB, DragList_SubclassWindowProc, DRAGLIST_SUBCLASSID, (DWORD_PTR)data); -} - -/********************************************************************** * - * DrawInsert (COMCTL32.15) - * - * Draws insert arrow by the side of the ListBox item in the parent window. - * - * RETURNS - * Nothing. - */ -VOID WINAPI DrawInsert (HWND hwndParent, HWND hwndLB, INT nItem) -{ - RECT rcItem, rcListBox, rcDragIcon; - HDC hdc; - DRAGLISTDATA * data; - - TRACE("(%p %p %d)\n", hwndParent, hwndLB, nItem); - - if (!hDragArrow) - hDragArrow = LoadIconW(COMCTL32_hModule, (LPCWSTR)IDI_DRAGARROW); - - if (LB_ERR == SendMessageW(hwndLB, LB_GETITEMRECT, nItem, (LPARAM)&rcItem)) - return; - - if (!GetWindowRect(hwndLB, &rcListBox)) - return; - - /* convert item rect to parent co-ordinates */ - if (!MapWindowPoints(hwndLB, hwndParent, (LPPOINT)&rcItem, 2)) - return; - - /* convert list box rect to parent co-ordinates */ - if (!MapWindowPoints(HWND_DESKTOP, hwndParent, (LPPOINT)&rcListBox, 2)) - return; - - rcDragIcon.left = rcListBox.left - DRAGICON_HOTSPOT_X; - rcDragIcon.top = rcItem.top - DRAGICON_HOTSPOT_Y; - rcDragIcon.right = rcListBox.left; - rcDragIcon.bottom = rcDragIcon.top + DRAGICON_HEIGHT; - - if (!GetWindowSubclass(hwndLB, DragList_SubclassWindowProc, DRAGLIST_SUBCLASSID, (DWORD_PTR*)&data)) - return; - - if (nItem < 0) - SetRectEmpty(&rcDragIcon); - - /* prevent flicker by only redrawing when necessary */ - if (!EqualRect(&rcDragIcon, &data->last_drag_icon_rect)) - { - /* get rid of any previous inserts drawn */ - RedrawWindow(hwndParent, &data->last_drag_icon_rect, NULL, - RDW_INTERNALPAINT | RDW_ERASE | RDW_INVALIDATE | RDW_UPDATENOW); - - CopyRect(&data->last_drag_icon_rect, &rcDragIcon); - - if (nItem >= 0) - { - hdc = GetDC(hwndParent); - - DrawIcon(hdc, rcDragIcon.left, rcDragIcon.top, hDragArrow); - - ReleaseDC(hwndParent, hdc); - } - } -} - -/********************************************************************** * - * LBItemFromPt (COMCTL32.14) - * - * Gets the index of the ListBox item under the specified point, - * scrolling if bAutoScroll is TRUE and pt is outside of the ListBox. - * - * RETURNS - * The ListBox item ID if pt is over a list item or -1 otherwise. - */ -INT WINAPI LBItemFromPt (HWND hwndLB, POINT pt, BOOL bAutoScroll) -{ - RECT rcClient; - INT nIndex; - DWORD dwScrollTime; - - TRACE("(%p %ld x %ld %s)\n", - hwndLB, pt.x, pt.y, bAutoScroll ? "TRUE" : "FALSE"); - - ScreenToClient (hwndLB, &pt); - GetClientRect (hwndLB, &rcClient); - nIndex = (INT)SendMessageA (hwndLB, LB_GETTOPINDEX, 0, 0); - - if (PtInRect (&rcClient, pt)) - { - /* point is inside -- get the item index */ - while (TRUE) - { - if (SendMessageA (hwndLB, LB_GETITEMRECT, nIndex, (LPARAM)&rcClient) == LB_ERR) - return -1; - - if (PtInRect (&rcClient, pt)) - return nIndex; - - nIndex++; - } - } - else - { - /* point is outside */ - if (!bAutoScroll) - return -1; - - if ((pt.x > rcClient.right) || (pt.x < rcClient.left)) - return -1; - - if (pt.y < 0) - nIndex--; - else - nIndex++; - - dwScrollTime = GetTickCount (); - - if ((dwScrollTime - dwLastScrollTime) < DRAGLIST_SCROLLPERIOD) - return -1; - - dwLastScrollTime = dwScrollTime; - - SendMessageA (hwndLB, LB_SETTOPINDEX, (WPARAM)nIndex, 0); - } - - return -1; -} _____
Copied: vendor/wine/dlls/comctl32/Wine-20050310/draglist.c (from rev 14051, vendor/wine/dlls/comctl32/current/draglist.c) _____
Deleted: vendor/wine/dlls/comctl32/Wine-20050310/header.c --- vendor/wine/dlls/comctl32/current/header.c 2005-03-14 07:21:20 UTC (rev 14050) +++ vendor/wine/dlls/comctl32/Wine-20050310/header.c 2005-03-16 08:30:38 UTC (rev 14119) @@ -1,1872 +0,0 @@
-/* - * 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 a 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; - - 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 (GetWindowLongA (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); - - 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); - SendMessageA (infoPtr->hwndNotify, WM_DRAWITEM, - (WPARAM)dis.CtlID, (LPARAM)&dis); - if (oldBkMode != TRANSPARENT) - SetBkMode(hdc, oldBkMode); - } - else { - UINT uTextJustify = DT_LEFT; - - if ((phdi->fmt & HDF_JUSTIFYMASK) == HDF_CENTER) - uTextJustify = DT_CENTER; - else if ((phdi->fmt & HDF_JUSTIFYMASK) == HDF_RIGHT) - uTextJustify = DT_RIGHT; - - if ((phdi->fmt & HDF_BITMAP) && !(phdi->fmt & HDF_BITMAP_ON_RIGHT) && (phdi->hbm)) { - BITMAP bmp; - HDC hdcBitmap; - INT yD, yS, cx, cy, rx, ry; - - GetObjectA (phdi->hbm, sizeof(BITMAP), (LPVOID)&bmp); - - ry = r.bottom - r.top; - rx = r.right - r.left; - - if (ry >= bmp.bmHeight) { - cy = bmp.bmHeight; - yD = r.top + (ry - bmp.bmHeight) / 2; - yS = 0; - } - else { - cy = ry; - yD = r.top; - yS = (bmp.bmHeight - ry) / 2; - - } - - if (rx >= bmp.bmWidth + infoPtr->iMargin) { - cx = bmp.bmWidth; - } - else { - cx = rx - infoPtr->iMargin; - } - - hdcBitmap = CreateCompatibleDC (hdc); - SelectObject (hdcBitmap, phdi->hbm); - BitBlt (hdc, r.left + infoPtr->iMargin, yD, cx, cy, hdcBitmap, 0, yS, SRCCOPY); - DeleteDC (hdcBitmap); - - r.left += (bmp.bmWidth + infoPtr->iMargin); - } - - - if ((phdi->fmt & HDF_BITMAP) && (phdi->fmt & HDF_BITMAP_ON_RIGHT) && (phdi->hbm)) { - BITMAP bmp; - HDC hdcBitmap; - INT xD, yD, yS, cx, cy, rx, ry, tx; - RECT textRect; - - GetObjectA (phdi->hbm, sizeof(BITMAP), (LPVOID)&bmp); - - textRect = r; - if (phdi->fmt & HDF_STRING) { - DrawTextW (hdc, phdi->pszText, -1, - &textRect, DT_LEFT|DT_VCENTER|DT_SINGLELINE|DT_CALCRECT); - tx = textRect.right - textRect.left; - } - else - tx = 0; - ry = r.bottom - r.top; - rx = r.right - r.left; - - if (ry >= bmp.bmHeight) { - cy = bmp.bmHeight; - yD = r.top + (ry - bmp.bmHeight) / 2; - yS = 0; - } - else { - cy = ry; - yD = r.top; - yS = (bmp.bmHeight - ry) / 2; - - } - - if (r.left + tx + bmp.bmWidth + 2*infoPtr->iMargin <= r.right) { - cx = bmp.bmWidth; - xD = r.left + tx + infoPtr->iMargin; - } - else { - if (rx >= bmp.bmWidth + infoPtr->iMargin ) { - cx = bmp.bmWidth; - xD = r.right - bmp.bmWidth - infoPtr->iMargin; - r.right = xD - infoPtr->iMargin; - } - else { - cx = rx - infoPtr->iMargin; - xD = r.left; - r.right = r.left; - } - } - - hdcBitmap = CreateCompatibleDC (hdc); - SelectObject (hdcBitmap, phdi->hbm); - BitBlt (hdc, xD, yD, cx, cy, hdcBitmap, 0, yS, SRCCOPY); - DeleteDC (hdcBitmap); - } - - if ((phdi->fmt & HDF_IMAGE) && !(phdi->fmt & HDF_BITMAP_ON_RIGHT) && (infoPtr->himl)) { - r.left += infoPtr->iMargin; - ImageList_DrawEx(infoPtr->himl, phdi->iImage, hdc, r.left, r.top + (r.bottom-r.top- infoPtr->himl->cy)/2, - infoPtr->himl->cx, r.bottom-r.top, CLR_DEFAULT, CLR_DEFAULT, 0); - r.left += infoPtr->himl->cx; - } - - if ((phdi->fmt & HDF_IMAGE) && (phdi->fmt & HDF_BITMAP_ON_RIGHT) && (infoPtr->himl)) { - RECT textRect; - INT tx; - - textRect = r; - if (phdi->fmt & HDF_STRING) { - DrawTextW (hdc, phdi->pszText, -1, - &textRect, DT_LEFT|DT_VCENTER|DT_SINGLELINE|DT_CALCRECT); - tx = textRect.right - textRect.left; - } - else - tx = 0; - ImageList_DrawEx(infoPtr->himl, phdi->iImage, hdc, r.left + tx + 2*infoPtr->iMargin, - r.top + (r.bottom-r.top-infoPtr->himl->cy)/2, infoPtr->himl->cx, r.bottom-r.top, - CLR_DEFAULT, CLR_DEFAULT, 0); - } - - 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); - r.left += infoPtr->iMargin; - r.right -= infoPtr->iMargin; - SetTextColor (hdc, (bHotTrack) ? COLOR_HIGHLIGHT : COLOR_BTNTEXT); - DrawTextW (hdc, phdi->pszText, -1, - &r, uTextJustify|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; [truncated at 1000 lines; 180594 more skipped]