Ros-diffs March 2005

ros-diffs@reactos.org

26 participants
609 discussions

[gvg] 14125: Thomas Larsen <sikker2004@yahoo.com>

by gvg＠svn.reactos.com

Thomas Larsen <sikker2004(a)yahoo.com> - added danish language Modified: trunk/reactos/subsys/system/reporterror/En.rc Added: trunk/reactos/subsys/system/reporterror/dk.rc Modified: trunk/reactos/subsys/system/reporterror/reporterror.rc _____ Modified: trunk/reactos/subsys/system/reporterror/En.rc --- trunk/reactos/subsys/system/reporterror/En.rc 2005-03-16 09:02:07 UTC (rev 14124) +++ trunk/reactos/subsys/system/reporterror/En.rc 2005-03-16 09:10:23 UTC (rev 14125) @@ -14,7 +14,7 @@ CAPTION "Error reporting assistant" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Please describe what you were trying to do when the error occurred.\n\nClick 'Next' to send the report to the ReacOS project or 'Cancel' to not send any information.",-1,10,0,225,40 + LTEXT "Please describe what you were trying to do when the error occurred.\n\nClick 'Next' to send the report to the ReactOS project or 'Cancel' to not send any information.",-1,10,0,225,40 LTEXT "Your e-mail address (optional):",-1,10,40,120,20 EDITTEXT IDE_SUBMIT_REPORT_YOUR_EMAIL, 110,40,150,12 LTEXT "Description of problem (optional):",-1,10,55,120,20 _____ Added: trunk/reactos/subsys/system/reporterror/dk.rc --- trunk/reactos/subsys/system/reporterror/dk.rc 2005-03-16 09:02:07 UTC (rev 14124) +++ trunk/reactos/subsys/system/reporterror/dk.rc 2005-03-16 09:10:23 UTC (rev 14125) @@ -0,0 +1,54 @@ +LANGUAGE LANG_DANISH, SUBLANG_DEFAULT + +IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Fejl Meddeler Assistenten" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Systemet er blev genoprettet fra en fejl.", -1, 115, 15, 160, 24 + LTEXT "Ïnsker du at indsende en fejl rapport til ReactOS Projektet?", -1, 115, 35, 160, 17 +END + +IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Fejl Meddeler Assistenten" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Beskriv venligst hvad du pr°vede at g°re inden fejlen opstod.\n\nKlik pÕ 'Nµste' for at indsende rapporten til ReactOS Projektet eller 'Fortryd' for ikke at indsende nogle informationer.",-1,10,0,225,40 + LTEXT "Din e-mail adresse (valgfri):",-1,10,40,120,20 + EDITTEXT IDE_SUBMIT_REPORT_YOUR_EMAIL, 110,40,150,12 + LTEXT "Beskrivelse af problemet (valgfri):",-1,10,55,120,20 + EDITTEXT IDE_SUBMIT_REPORT_PROBLEM_DESCRIPTION,10,65,250,55,ES_WANTRETURN|ES_MULT ILINE|ES_LEFT|WS_BORDER|WS_TABSTOP|WS_VSCROLL +END + +IDD_SUBMITTING_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Fejl Meddeler Assistenten" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "{STATUS}",IDC_SUBMISSION_STATUS,25,58,225,8 + CONTROL "", IDC_SUBMITTING_IN_PROGRESS, "msctls_progress32", PBS_MARQUEE | WS_CHILD | WS_VISIBLE | WS_BORDER, 25, 80, 225, 8 +END + +IDD_SUBMITTED_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Fejl Meddeler Assistenten" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Din fejl rapport blev vellykket indsendt til ReactOS Projektet. Mange Tak.",-1,25,5,225,20 +END + +STRINGTABLE +BEGIN + IDS_WIZARD_NAME "Rapporterings Fejl ved indsendelse til ReactOS Projektet" + IDS_FAILED_TO_CONTACT_SERVER "Systemet var ikke i stand til at kontakte Fejl Rapportings Serveren.\nVµr venlig at sikre dig at dit system er forbundet til Internettet." + IDS_FAILED_TO_DELIVER_ERROR_REPORT "Systemet var ikke i stand til at levere Fejl Rapporten." +END + +STRINGTABLE +BEGIN + IDS_CONTACTING_SERVER "Kontakter Fejl Rapporterings Serveren Vent Venligst..." + IDS_FAILED_TO_INITIALIZE_WINSOCK "Fejl opstod da man fors°gte at initialisere Winsock 2.0 (Reactos Fejl Kode %d)" + IDS_FAILED_TO_LOCATE_SERVER "Kunne ikke komme i kontakt med Fejl Rapportings Serveren. Pr°v Venligst igen Senere.." +END + Property changes on: trunk/reactos/subsys/system/reporterror/dk.rc ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/subsys/system/reporterror/reporterror.rc --- trunk/reactos/subsys/system/reporterror/reporterror.rc 2005-03-16 09:02:07 UTC (rev 14124) +++ trunk/reactos/subsys/system/reporterror/reporterror.rc 2005-03-16 09:10:23 UTC (rev 14125) @@ -16,3 +16,4 @@ #include "En.rc" #include "De.rc" +#include "Dk.rc"

19 years, 6 months

[arty] 14124: consw has not been needed for a long time.

by arty＠svn.reactos.com

consw has not been needed for a long time. Modified: trunk/reactos/apps/utils/Makefile Deleted: trunk/reactos/apps/utils/consw/ _____ Modified: trunk/reactos/apps/utils/Makefile --- trunk/reactos/apps/utils/Makefile 2005-03-16 08:37:19 UTC (rev 14123) +++ trunk/reactos/apps/utils/Makefile 2005-03-16 09:02:07 UTC (rev 14124) @@ -9,7 +9,7 @@ # Console system utilities # cabman cat net objdir partinfo pice ps sc stats -UTIL_APPS = cat objdir partinfo pnpdump sc shutdown stats tickcount consw ps +UTIL_APPS = cat objdir partinfo pnpdump sc shutdown stats tickcount ps UTIL_NET_APPS = arp finger ftp ipconfig netstat ping route telnet whois

19 years, 6 months

[gvg] 14123: Drop old tag

by gvg＠svn.reactos.com

Drop old tag Deleted: tags/Wine-20050211-sync/

19 years, 6 months

[gvg] 14122: Tag Wine sync

by gvg＠svn.reactos.com

Tag Wine sync Added: tags/Wine-20050310-sync/reactos/ _____ Copied: tags/Wine-20050310-sync/reactos (from rev 14121, trunk/reactos)

19 years, 6 months

[gvg] 14121: Create tag for Wine sync

by gvg＠svn.reactos.com

Create tag for Wine sync Added: tags/Wine-20050310-sync/

19 years, 6 months

[gvg] 14120: Update status

by gvg＠svn.reactos.com

Update status Modified: trunk/reactos/doc/README.WINE _____ Modified: trunk/reactos/doc/README.WINE --- trunk/reactos/doc/README.WINE 2005-03-16 08:30:38 UTC (rev 14119) +++ trunk/reactos/doc/README.WINE 2005-03-16 08:34:44 UTC (rev 14120) @@ -26,52 +26,55 @@ work to import a new dll. The following build tools are derived from Wine. +reactos/tools/unicode # Synced to Wine-20050310 +reactos/tools/wpp # Synced to Wine-20050310 reactos/tools/bin2res # Resource to binary converter -reactos/tools/winebuild # Synced to Wine-20050211 +reactos/tools/winebuild # Synced to Wine-20050310 reactos/tools/wmc # Wine Message Compiler -reactos/tools/wrc # Synced to Wine-20050211 +reactos/tools/wrc # Synced to Wine-20050310 +reactos/tools/widl # Synced to Wine-20050310 The following shared libraries are a 100% port from Winehq sources. -reactos/lib/cabinet # Synced to Wine-20050211 -reactos/lib/comctl32 # Synced to Wine-20050211 -reactos/lib/comdlg32 # Synced to Wine-20050211 -reactos/lib/dinput # Synced to Wine-20050211 -reactos/lib/dinput8 # Synced to Wine-20050211 -reactos/lib/icmp # Synced to Wine-20050211 +reactos/lib/cabinet # Synced to Wine-20050310 +reactos/lib/comctl32 # Synced to Wine-20050310 +reactos/lib/comdlg32 # Synced to Wine-20050310 +reactos/lib/dinput # Synced to Wine-20050310 +reactos/lib/dinput8 # Synced to Wine-20050310 +reactos/lib/icmp # Synced to Wine-20050310 reactos/lib/iphlpapi # Out of sync reactos/lib/imagehlp # Patches for BindImage need review and submission to winehq. reactos/lib/msvcrt20 # Out of sync -reactos/lib/mpr # Synced to Wine-20050211 +reactos/lib/mpr # Synced to Wine-20050310 reactos/lib/msacm # Out of sync -reactos/lib/msimg32 # Synced to Wine-20050211 -reactos/lib/msi # Synced to Wine-20050211 +reactos/lib/msimg32 # Synced to Wine-20050310 +reactos/lib/msi # Synced to Wine-20050310 reactos/lib/msvideo # Out of sync reactos/lib/netapi32 # Out of sync reactos/lib/odbc32 # In sync. Depends on port of Linux ODBC. -reactos/lib/ole32 # Synced to Wine-20050211 -reactos/lib/oleaut32 # Synced to Wine-20050211 -reactos/lib/oledlg # Synced to Wine-20050211 -reactos/lib/olepro32 # Synced to Wine-20050211 -reactos/lib/richedit # Synced to Wine-20050211 -reactos/lib/rpcrt4 # Synced to Wine-20050211 -reactos/lib/setupapi # Synced to Wine-20050125 # CVS -reactos/lib/shell32 # Synced to Wine-20050211 -reactos/lib/shdocvw # Synced to Wine-20050211 -reactos/lib/shlwapi # Synced to Wine-20050211 +reactos/lib/ole32 # Synced to Wine-20050310 +reactos/lib/oleaut32 # Synced to Wine-20050310 +reactos/lib/oledlg # Synced to Wine-20050310 +reactos/lib/olepro32 # Synced to Wine-20050310 +reactos/lib/riched20 # Synced to Wine-20050310 +reactos/lib/richedit # Synced to Wine-20050310 +reactos/lib/rpcrt4 # Synced to Wine-20050310 +reactos/lib/setupapi # Synced to Wine-20050310 +reactos/lib/shell32 # Synced to Wine-20050310 +reactos/lib/shdocvw # Synced to Wine-20050310 +reactos/lib/shlwapi # Synced to Wine-20050310 reactos/lib/twain # Out of sync -reactos/lib/unicode # Dependancy on this lib needs to be removed. Synced to Wine-20050211 -reactos/lib/urlmon # Synced to Wine-20050211 +reactos/lib/urlmon # Synced to Wine-20050310 reactos/lib/version # Out of sync reactos/lib/wininet # Out of sync -reactos/lib/winmm # Synced to Wine-20050211 -reactos/lib/winmm/midimap # Synced to Wine-20050211 -reactos/lib/winmm/wavemap # Synced to Wine-20050211 +reactos/lib/winmm # Synced to Wine-20050310 +reactos/lib/winmm/midimap # Synced to Wine-20050310 +reactos/lib/winmm/wavemap # Synced to Wine-20050310 ReactOS shares the following programs with Winehq. reactos/subsys/system/regedit # Out of sync reactos/subsys/system/expand # Out of sync -reactos/subsys/system/msiexec # Synced to Wine-20050211 +reactos/subsys/system/msiexec # Synced to Wine-20050311 In addition the following libs, dlls and source files are mostly based on code ported from Winehq CVS. If you are looking to update something in these files

19 years, 6 months

[gvg] 14119: Tag new vendor drop, remove old tag

by gvg＠svn.reactos.com

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]

19 years, 6 months

[gvg] 14118: Sync to Wine-20050310:

by gvg＠svn.reactos.com

Sync to Wine-20050310: Michael Jung <mjung(a)iss.tu-darmstadt.de> - Beginning of a shell namespace extension to browse the unix filesystem. - Fixed parsing of ITEMIDLIST in InitializeTreeView. - Added some documentation. - Fixed a crash occuring when the user double-clicks a leaf item. Dimitrie O. Paun <dpaun(a)rogers.com> - Add support for .exe's with exported functions. Francois Gouget <fgouget(a)free.fr> - Assorted spelling fixes. - Add the -noname flag to match the Platform SDK. - Don't hardcode ordinals if which are not hardcoded on Windows. Juan Lang <juan_lang(a)yahoo.com> - Convert more API calls to Unicode. - Convert tabs to space, wrap long lines, make indenting consistent. - Convert a few calls to Unicode. Mike McCormack <mike(a)codeweavers.com> - handle IFileSystemBindData in ISF_Desktop_fnParseDisplayName - more Unicode conversion - handle IFileSystemBindData in IShellFolder::ParseDisplayName - convert IShellFolder::ParseDisplayName to use Unicode - Remove tabs and make formatting consistent. - Reindent some code to improve readability. - Define some extra SHFGI values. - Remove tabs and reformat. - Use lstrcmpiA in preference to strcasecmp. - Make lstr* functions inline inside Wine. - implement loading and saving of MSI advertised shortcut info - make more test cases pass - read and write the location block - improve the binary compatibility of lnk files - Cleanup, create unicode versions of _ILCreateFromPath, _ILCreateGuidFromStr, and _ILCreateFromFindData. Jon Griffiths <jon_p_griffiths(a)yahoo.com> - Documentation spelling fixes. Hans Leidekker <hans(a)it.vu.nl> - Revert wrong -noname markup for Drag*, DoEnvironmentSubst and SHGetNewLinkInfo{A,W}. - Also mark stub exports -noname when they are exported by ordinal only on win98/2k. - Implementation level stubs for SheChangeDirA, SheGetDirA, SHHelpShortcuts_RunDLL{A,W}. - New spec file stubs for Control_RunDLLAsUserW, FixupOptionalComponents, OCInstall, SHChangeNotifySuspendResume, SHCreateProcessAsUserW, SHExtractIconsW, SHInvokePrinterCommand{A,W}, SHIsFileAvailableOffline, SHLoadNonloadedIconOverlayIdentifiers, SHPathPrepareForWrite{A,W}, ShellExec_RunDLL{,A,W}, SHGetIconOverlayIndex{A,W}. - Mark exports -noname when they are exported by ordinal only on win98/2k. Marcelo Duarte <wine-devel(a)bol.com.br> - Update the resources for Portuguese. Filip Navara <xnavara(a)volny.cz> - Don't crash if ShellFolder doesn't implement the IID_ISFHelper interface. Dmitry Timoshkov <dmitry(a)codeweavers.com> - Fix prototypes of GetClassLongA/W, GetClassLongPtrA/W and SetClassLongA/W according to SDK definitions. - Add prototypes for SetClassLongPtrA/W, protect some GWL_ and GCL_ constants from using in Wine or in _WIN64 mode. - Fix all places in Wine affected by the above changes. - Convert winemenubuilder to unicode. Alex Villacis Lasso <a_villacis(a)palosanto.com> - Change SUBLANG_DEFAULT to SUBLANG_NEUTRAL for LANG_SPANISH in all resources, so that Spanish locales other than Spain also use Spanish resources. Marcus Meissner <marcus(a)jet.franken.de> - Output some more informations. - Mark one global variable static. Huw Davies <huw(a)codeweavers.com> - SetPath("") should return S_OK. SetPath("nonexistent_path") should return S_FALSE. - Don't prepend '\\' to the subkey name. Joris Huizer <jorishuizer(a)planet.nl> - renamed file_operation_delete and to shfileops_delete - renamed file_operation_checkFlags to shfileops_check_flags - added helper function shfileops_do_operation() - added helper function shfileops_get_parent_attr() - added helper function shfileops_get_parent_attr2() - various cleanups in SHFileOperationW using these functions Ge van Geldorp <gvg(a)reactos.com> - Error numbers >= 32 are to be expected. Modified: trunk/reactos/lib/shell32/Makefile.in Modified: trunk/reactos/lib/shell32/brsfolder.c Modified: trunk/reactos/lib/shell32/classes.c Modified: trunk/reactos/lib/shell32/clipboard.c Modified: trunk/reactos/lib/shell32/dialogs.c Modified: trunk/reactos/lib/shell32/enumidlist.c Modified: trunk/reactos/lib/shell32/enumidlist.h Modified: trunk/reactos/lib/shell32/folders.c Modified: trunk/reactos/lib/shell32/pidl.c Modified: trunk/reactos/lib/shell32/pidl.h Modified: trunk/reactos/lib/shell32/shell32.spec Modified: trunk/reactos/lib/shell32/shell32_Es.rc Modified: trunk/reactos/lib/shell32/shell32_Pt.rc Modified: trunk/reactos/lib/shell32/shell32_main.c Modified: trunk/reactos/lib/shell32/shell32_main.h Modified: trunk/reactos/lib/shell32/shelllink.c Modified: trunk/reactos/lib/shell32/shellpath.c Modified: trunk/reactos/lib/shell32/shfldr.h Modified: trunk/reactos/lib/shell32/shfldr_desktop.c Modified: trunk/reactos/lib/shell32/shfldr_fs.c Modified: trunk/reactos/lib/shell32/shfldr_mycomp.c Added: trunk/reactos/lib/shell32/shfldr_unixfs.c Modified: trunk/reactos/lib/shell32/shlexec.c Modified: trunk/reactos/lib/shell32/shlfileop.c Modified: trunk/reactos/lib/shell32/shlfolder.c Modified: trunk/reactos/lib/shell32/shlfsbind.c Modified: trunk/reactos/lib/shell32/shlview.c _____ Modified: trunk/reactos/lib/shell32/Makefile.in --- trunk/reactos/lib/shell32/Makefile.in 2005-03-16 03:12:32 UTC (rev 14117) +++ trunk/reactos/lib/shell32/Makefile.in 2005-03-16 07:51:01 UTC (rev 14118) @@ -37,6 +37,7 @@ shfldr_desktop.c \ shfldr_fs.c \ shfldr_mycomp.c \ + shfldr_unixfs.c \ shlexec.c \ shlfileop.c \ shlfolder.c \ @@ -77,7 +78,7 @@ $(LDPATH) $(RC16) $(RC16FLAGS) -fo$@ $(SRCDIR)/version16.rc shell.spec.c: shell.spec version16.res - $(WINEBUILD) $(DEFS) $(DLLFLAGS) -o $@ --main-module $(MODULE) --res version16.res --dll $(SRCDIR)/shell.spec + $(WINEBUILD) $(DEFS) $(DLLFLAGS) --dll -o $@ --main-module $(MODULE) --res version16.res --export $(SRCDIR)/shell.spec authors.c: $(TOPSRCDIR)/AUTHORS (LC_ALL=C; export LC_ALL; echo 'const char * const SHELL_Authors[] = {' && \ _____ Modified: trunk/reactos/lib/shell32/brsfolder.c --- trunk/reactos/lib/shell32/brsfolder.c 2005-03-16 03:12:32 UTC (rev 14117) +++ trunk/reactos/lib/shell32/brsfolder.c 2005-03-16 07:51:01 UTC (rev 14118) @@ -55,68 +55,95 @@ return SHCONTF_FOLDERS | (ulFlags & BIF_BROWSEINCLUDEFILES ? SHCONTF_NONFOLDERS : 0); } +/********************************************************************** ******** + * InitializeTreeView [Internal] + * + * Called from WM_INITDIALOG handler. + * + * PARAMS + * hwndParent [I] The BrowseForFolder dialog + * root [I] ITEMIDLIST of the root shell folder + */ static void InitializeTreeView(HWND hwndParent, LPCITEMIDLIST root) { - HIMAGELIST hImageList; - IShellFolder * lpsf; - HRESULT hr; - IEnumIDList * pEnumIL = NULL; - LPITEMIDLIST parentofroot; - parentofroot = ILClone(root); - ILRemoveLastID(parentofroot); + LPITEMIDLIST pidlParent, pidlChild; + HIMAGELIST hImageList; + HRESULT hr; + IShellFolder *lpsfParent, *lpsfRoot; + IEnumIDList * pEnumChildren = NULL; - hwndTreeView = GetDlgItem (hwndParent, IDD_TREEVIEW); - Shell_GetImageList(NULL, &hImageList); + TRACE("dlg=%p tree=%p\n", hwndParent, hwndTreeView ); + + hwndTreeView = GetDlgItem (hwndParent, IDD_TREEVIEW); + if (!hwndTreeView) { + FIXME("Could not get handle to treeview control! Error: %08lx\n", GetLastError()); + return; + } + Shell_GetImageList(NULL, &hImageList); - TRACE("dlg=%p tree=%p\n", hwndParent, hwndTreeView ); + if (hImageList) + TreeView_SetImageList(hwndTreeView, hImageList, 0); - if (hImageList && hwndTreeView) - TreeView_SetImageList(hwndTreeView, hImageList, 0); + /* We want to call InsertTreeViewItem down the code, in order to insert + * the root item of the treeview. Due to InsertTreeViewItem's signature, + * we need the following to do this: + * + * + An ITEMIDLIST corresponding to _the parent_ of root. + * + An ITEMIDLIST, which is a relative path from root's parent to root + * (containing a single SHITEMID). + * + An IShellFolder interface pointer of root's parent folder. + * + * If root is 'Desktop', then root's parent is also 'Desktop'. + */ - if (_ILIsDesktop (root)) { - hr = SHGetDesktopFolder(&lpsf); - } else { - IShellFolder * lpsfdesktop; + pidlParent = ILClone(root); + ILRemoveLastID(pidlParent); + pidlChild = ILClone(ILFindLastID(root)); + + if (_ILIsDesktop(pidlParent)) { + hr = SHGetDesktopFolder(&lpsfParent); + } else { + IShellFolder *lpsfDesktop; + hr = SHGetDesktopFolder(&lpsfDesktop); + if (!SUCCEEDED(hr)) { + WARN("SHGetDesktopFolder failed! hr = %08lx\n", hr); + return; + } + hr = IShellFolder_BindToObject(lpsfDesktop, pidlParent, 0, &IID_IShellFolder, (LPVOID*)&lpsfParent); + IShellFolder_Release(lpsfDesktop); + } + + if (!SUCCEEDED(hr)) { + WARN("Could not bind to parent shell folder! hr = %08lx\n", hr); + return; + } - hr = SHGetDesktopFolder(&lpsfdesktop); - if (SUCCEEDED(hr)) { - hr = IShellFolder_BindToObject(lpsfdesktop, parentofroot, 0,(REFIID)&IID_IShellFolder,(LPVOID *)&lpsf); - IShellFolder_Release(lpsfdesktop); - } - } - if (SUCCEEDED(hr)) - { - IShellFolder * pSFRoot; - if (_ILIsPidlSimple(root)) - { - pSFRoot = lpsf; - IShellFolder_AddRef(pSFRoot); - } - else - hr = IShellFolder_BindToObject(lpsf,ILFindLastID(root),0,&IID_IShellFolder,(L PVOID *)&pSFRoot); - if (SUCCEEDED(hr)) - { - hr = IShellFolder_EnumObjects( - pSFRoot, - hwndParent, - BrowseFlagsToSHCONTF(lpBrowseInfo->ulFlags), - &pEnumIL); - IShellFolder_Release(pSFRoot); - } - } + if (pidlChild && pidlChild->mkid.cb) { + hr = IShellFolder_BindToObject(lpsfParent, pidlChild, 0, &IID_IShellFolder, (LPVOID*)&lpsfRoot); + } else { + lpsfRoot = lpsfParent; + hr = IShellFolder_AddRef(lpsfParent); + } + + if (!SUCCEEDED(hr)) { + WARN("Could not bind to root shell folder! hr = %08lx\n", hr); + IShellFolder_Release(lpsfParent); + return; + } - if (SUCCEEDED(hr) && hwndTreeView) - { - TreeView_DeleteAllItems(hwndTreeView); - TreeView_Expand(hwndTreeView, - InsertTreeViewItem(lpsf, _ILIsPidlSimple(root) ? root : ILFindLastID(root), parentofroot, pEnumIL, TVI_ROOT), - TVE_EXPAND); - } + hr = IShellFolder_EnumObjects(lpsfRoot, hwndParent, BrowseFlagsToSHCONTF(lpBrowseInfo->ulFlags), &pEnumChildren); + if (!SUCCEEDED(hr)) { + WARN("Could not get child iterator! hr = %08lx\n", hr); + IShellFolder_Release(lpsfParent); + IShellFolder_Release(lpsfRoot); + return; + } - if (SUCCEEDED(hr)) - IShellFolder_Release(lpsf); + TreeView_DeleteAllItems(hwndTreeView); + TreeView_Expand(hwndTreeView, InsertTreeViewItem(lpsfParent, pidlChild, pidlParent, pEnumChildren, TVI_ROOT), TVE_EXPAND); - TRACE("done\n"); + IShellFolder_Release(lpsfRoot); + IShellFolder_Release(lpsfParent); } static int GetIcon(LPITEMIDLIST lpi, UINT uFlags) @@ -149,12 +176,27 @@ typedef struct tagID { - LPSHELLFOLDER lpsfParent; - LPITEMIDLIST lpi; - LPITEMIDLIST lpifq; - IEnumIDList* pEnumIL; + LPSHELLFOLDER lpsfParent; /* IShellFolder of the parent */ + LPITEMIDLIST lpi; /* PIDL relativ to parent */ + LPITEMIDLIST lpifq; /* Fully qualified PIDL */ + IEnumIDList* pEnumIL; /* Children iterator */ } TV_ITEMDATA, *LPTV_ITEMDATA; +/********************************************************************** ******** + * GetName [Internal] + * + * Query a shell folder for the display name of one of it's children + * + * PARAMS + * lpsf [I] IShellFolder interface of the folder to be queried. + * lpi [I] ITEMIDLIST of the child, relative to parent + * dwFlags [I] as in IShellFolder::GetDisplayNameOf + * lpFriendlyName [O] The desired display name in unicode + * + * RETURNS + * Success: TRUE + * Failure: FALSE + */ static BOOL GetName(LPSHELLFOLDER lpsf, LPCITEMIDLIST lpi, DWORD dwFlags, LPWSTR lpFriendlyName) { BOOL bSuccess=TRUE; @@ -175,7 +217,22 @@ return bSuccess; } -static HTREEITEM InsertTreeViewItem(IShellFolder * lpsf, LPCITEMIDLIST pidl, LPCITEMIDLIST pidlParent, IEnumIDList* pEnumIL, HTREEITEM hParent) +/********************************************************************** ******** + * InsertTreeViewItem [Internal] + * + * PARAMS + * lpsf [I] IShellFolder interface of the item's parent shell folder + * pidl [I] ITEMIDLIST of the child to insert, relativ to parent + * pidlParent [I] ITEMIDLIST of the parent shell folder + * pEnumIL [I] Iterator for the children of the item to be inserted + * hParent [I] The treeview-item that represents the parent shell folder + * + * RETURNS + * Success: Handle to the created and inserted treeview-item + * Failure: NULL + */ +static HTREEITEM InsertTreeViewItem(IShellFolder * lpsf, LPCITEMIDLIST pidl, + LPCITEMIDLIST pidlParent, IEnumIDList* pEnumIL, HTREEITEM hParent) { TVITEMW tvi; TVINSERTSTRUCTW tvins; @@ -211,6 +268,18 @@ return (HTREEITEM)TreeView_InsertItemW(hwndTreeView, &tvins); } +/********************************************************************** ******** + * FillTreeView [Internal] + * + * For each child (given by lpe) of the parent shell folder, which is given by + * lpsf and whose PIDL is pidl, insert a treeview-item right under hParent + * + * PARAMS + * lpsf [I] IShellFolder interface of the parent shell folder + * pidl [I] ITEMIDLIST of the parent shell folder + * hParent [I] The treeview item that represents the parent shell folder + * lpe [I] An iterator for the children of the parent shell folder + */ static void FillTreeView(IShellFolder * lpsf, LPITEMIDLIST pidl, HTREEITEM hParent, IEnumIDList* lpe) { HTREEITEM hPrev = 0; @@ -219,7 +288,11 @@ HRESULT hr; HWND hwnd=GetParent(hwndTreeView); - TRACE("%p %p %x\n",lpsf, pidl, (INT)hParent); + TRACE("%p %p %x %p\n",lpsf, pidl, (INT)hParent, lpe); + + /* No IEnumIDList -> No children */ + if (!lpe) return; + SetCapture(GetParent(hwndTreeView)); SetCursor(LoadCursorA(0, (LPSTR)IDC_WAIT)); _____ Modified: trunk/reactos/lib/shell32/classes.c --- trunk/reactos/lib/shell32/classes.c 2005-03-16 03:12:32 UTC (rev 14117) +++ trunk/reactos/lib/shell32/classes.c 2005-03-16 07:51:01 UTC (rev 14118) @@ -116,7 +116,7 @@ BOOL HCR_GetExecuteCommandW( HKEY hkeyClass, LPCWSTR szClass, LPCWSTR szVerb, LPWSTR szDest, DWORD len ) { - static const WCHAR swShell[] = {'\\','s','h','e','l','l','\\',0}; + static const WCHAR swShell[] = {'s','h','e','l','l','\\',0}; static const WCHAR swCommand[] = {'\\','c','o','m','m','a','n','d',0}; BOOL ret = FALSE; _____ Modified: trunk/reactos/lib/shell32/clipboard.c --- trunk/reactos/lib/shell32/clipboard.c 2005-03-16 03:12:32 UTC (rev 14117) +++ trunk/reactos/lib/shell32/clipboard.c 2005-03-16 07:51:01 UTC (rev 14118) @@ -26,7 +26,7 @@ * - a right mousebutton-copy sets the following formats: * classic: * Shell IDList Array - * Prefered Drop Effect + * Preferred Drop Effect * Shell Object Offsets * HDROP * FileName _____ Modified: trunk/reactos/lib/shell32/dialogs.c --- trunk/reactos/lib/shell32/dialogs.c 2005-03-16 03:12:32 UTC (rev 14117) +++ trunk/reactos/lib/shell32/dialogs.c 2005-03-16 07:51:01 UTC (rev 14118) @@ -127,9 +127,9 @@ case WM_INITDIALOG : prfdp = (RUNFILEDLGPARAMS *)lParam ; SetWindowTextA (hwnd, prfdp->lpstrTitle) ; - SetClassLongA (hwnd, GCL_HICON, (LPARAM)prfdp->hIcon) ; - SendMessageA (GetDlgItem (hwnd, 12297), STM_SETICON, - (WPARAM)LoadIconA (NULL, (LPSTR)IDI_WINLOGO), 0); + SetClassLongPtrW (hwnd, GCLP_HICON, (LPARAM)prfdp->hIcon) ; + SendMessageW (GetDlgItem (hwnd, 12297), STM_SETICON, + (WPARAM)LoadIconW (NULL, (LPCWSTR)IDI_WINLOGO), 0); FillList (GetDlgItem (hwnd, 12298), NULL) ; SetFocus (GetDlgItem (hwnd, 12298)) ; return TRUE ; @@ -283,7 +283,7 @@ if (NULL != pszLatest) { - if (!strcasecmp (pszCmd, pszLatest)) + if (!lstrcmpiA(pszCmd, pszLatest)) { /* sprintf (szDbgMsg, "Found existing (%d).\n", Nix) ; _____ Modified: trunk/reactos/lib/shell32/enumidlist.c --- trunk/reactos/lib/shell32/enumidlist.c 2005-03-16 03:12:32 UTC (rev 14117) +++ trunk/reactos/lib/shell32/enumidlist.c 2005-03-16 07:51:01 UTC (rev 14118) @@ -25,6 +25,7 @@ #define COBJMACROS #include "wine/debug.h" +#include "wine/unicode.h" #include "windef.h" #include "winbase.h" #include "winreg.h" @@ -103,24 +104,27 @@ */ BOOL CreateFolderEnumList( IEnumIDList *list, - LPCSTR lpszPath, + LPCWSTR lpszPath, DWORD dwFlags) { LPITEMIDLIST pidl=NULL; - WIN32_FIND_DATAA stffile; + WIN32_FIND_DATAW stffile; HANDLE hFile; - CHAR szPath[MAX_PATH]; + WCHAR szPath[MAX_PATH]; BOOL succeeded = TRUE; + const static WCHAR stars[] = { '*','.','*',0 }; + const static WCHAR dot[] = { '.',0 }; + const static WCHAR dotdot[] = { '.','.',0 }; - TRACE("(%p)->(path=%s flags=0x%08lx) \n",list,debugstr_a(lpszPath),dwFlags); + TRACE("(%p)->(path=%s flags=0x%08lx) \n",list,debugstr_w(lpszPath),dwFlags); if(!lpszPath || !lpszPath[0]) return FALSE; - strcpy(szPath, lpszPath); - PathAddBackslashA(szPath); - strcat(szPath,"*.*"); + strcpyW(szPath, lpszPath); + PathAddBackslashW(szPath); + strcatW(szPath,stars); - hFile = FindFirstFileA(szPath,&stffile); + hFile = FindFirstFileW(szPath,&stffile); if ( hFile != INVALID_HANDLE_VALUE ) { BOOL findFinished = FALSE; @@ -132,21 +136,21 @@ { if ( (stffile.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) && dwFlags & SHCONTF_FOLDERS && - strcmp (stffile.cFileName, ".") && strcmp (stffile.cFileName, "..")) + strcmpW(stffile.cFileName, dot) && strcmpW(stffile.cFileName, dotdot)) { - pidl = _ILCreateFromFindDataA(&stffile); + pidl = _ILCreateFromFindDataW(&stffile); succeeded = succeeded && AddToEnumList(list, pidl); } else if (!(stffile.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) && dwFlags & SHCONTF_NONFOLDERS) { - pidl = _ILCreateFromFindDataA(&stffile); + pidl = _ILCreateFromFindDataW(&stffile); succeeded = succeeded && AddToEnumList(list, pidl); } } if (succeeded) { - if (!FindNextFileA(hFile, &stffile)) + if (!FindNextFileW(hFile, &stffile)) { if (GetLastError() == ERROR_NO_MORE_FILES) findFinished = TRUE; _____ Modified: trunk/reactos/lib/shell32/enumidlist.h --- trunk/reactos/lib/shell32/enumidlist.h 2005-03-16 03:12:32 UTC (rev 14117) +++ trunk/reactos/lib/shell32/enumidlist.h 2005-03-16 07:51:01 UTC (rev 14118) @@ -25,6 +25,6 @@ /* Enumerates the folders and/or files (depending on dwFlags) in lpszPath and * adds them to the already-created list. */ -BOOL CreateFolderEnumList(IEnumIDList *list, LPCSTR lpszPath, DWORD dwFlags); +BOOL CreateFolderEnumList(IEnumIDList *list, LPCWSTR lpszPath, DWORD dwFlags); #endif /* ndef __ENUMIDLIST_H__ */ _____ Modified: trunk/reactos/lib/shell32/folders.c --- trunk/reactos/lib/shell32/folders.c 2005-03-16 03:12:32 UTC (rev 14117) +++ trunk/reactos/lib/shell32/folders.c 2005-03-16 07:51:01 UTC (rev 14118) @@ -328,7 +328,7 @@ found = TRUE; } - else if (!strcasecmp(sTemp, "lnkfile")) + else if (!lstrcmpiA(sTemp, "lnkfile")) { /* extract icon from shell shortcut */ IShellFolder* dsf; _____ Modified: trunk/reactos/lib/shell32/pidl.c --- trunk/reactos/lib/shell32/pidl.c 2005-03-16 03:12:32 UTC (rev 14117) +++ trunk/reactos/lib/shell32/pidl.c 2005-03-16 07:51:01 UTC (rev 14118) @@ -1,7 +1,7 @@ /* - * pidl Handling + * pidl Handling * - * Copyright 1998 Juergen Schmied + * Copyright 1998 Juergen Schmied * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -57,7 +57,7 @@ extern BOOL WINAPI Free(LPVOID); /*********************************************************************** ** - * ILGetDisplayNameEx [SHELL32.186] + * ILGetDisplayNameEx [SHELL32.186] * * Retrieves the display name of an ItemIDList * @@ -75,106 +75,108 @@ */ BOOL WINAPI ILGetDisplayNameExA(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPSTR path, DWORD type) { - BOOL ret = FALSE; - WCHAR wPath[MAX_PATH]; + BOOL ret = FALSE; + WCHAR wPath[MAX_PATH]; - TRACE("%p %p %p %ld\n", psf, pidl, path, type); + TRACE("%p %p %p %ld\n", psf, pidl, path, type); - if (!pidl || !path) - return FALSE; + if (!pidl || !path) + return FALSE; - ret = ILGetDisplayNameExW(psf, pidl, wPath, type); - WideCharToMultiByte(CP_ACP, 0, wPath, -1, path, MAX_PATH, NULL, NULL); - TRACE("%p %p %s\n", psf, pidl, debugstr_a(path)); + ret = ILGetDisplayNameExW(psf, pidl, wPath, type); + WideCharToMultiByte(CP_ACP, 0, wPath, -1, path, MAX_PATH, NULL, NULL); + TRACE("%p %p %s\n", psf, pidl, debugstr_a(path)); - return ret; + return ret; } BOOL WINAPI ILGetDisplayNameExW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPWSTR path, DWORD type) { - LPSHELLFOLDER psfParent, lsf = psf; - HRESULT ret = NO_ERROR; - LPCITEMIDLIST pidllast; - STRRET strret; - DWORD flag; + LPSHELLFOLDER psfParent, lsf = psf; + HRESULT ret = NO_ERROR; + LPCITEMIDLIST pidllast; + STRRET strret; + DWORD flag; - TRACE("%p %p %p %ld\n", psf, pidl, path, type); + TRACE("%p %p %p %ld\n", psf, pidl, path, type); - if (!pidl || !path) - return FALSE; + if (!pidl || !path) + return FALSE; - if (!lsf) - { - ret = SHGetDesktopFolder(&lsf); - if (FAILED(ret)) - return FALSE; - } + if (!lsf) + { + ret = SHGetDesktopFolder(&lsf); + if (FAILED(ret)) + return FALSE; + } - if (type >= 0 && type <= 2) - { - switch (type) - { - case ILGDN_FORPARSING: - flag = SHGDN_FORPARSING | SHGDN_FORADDRESSBAR; - break; - case ILGDN_NORMAL: - flag = SHGDN_NORMAL; - break; - case ILGDN_INFOLDER: - flag = SHGDN_INFOLDER; - break; - default: - FIXME("Unknown type parameter = %lx\n", type); - flag = SHGDN_FORPARSING | SHGDN_FORADDRESSBAR; - break; - } - if (!*(const WORD*)pidl || type == ILGDN_FORPARSING) - { - ret = IShellFolder_GetDisplayNameOf(lsf, pidl, flag, &strret); - if (SUCCEEDED(ret)) - { - ret = StrRetToStrNW(path, MAX_PATH, &strret, pidl); - } - } - else - { - ret = SHBindToParent(pidl, &IID_IShellFolder, (LPVOID*)&psfParent, &pidllast); - if (SUCCEEDED(ret)) - { - ret = IShellFolder_GetDisplayNameOf(psfParent, pidllast, flag, &strret); - if (SUCCEEDED(ret)) - { - ret = StrRetToStrNW(path, MAX_PATH, &strret, pidllast); - } - IShellFolder_Release(psfParent); - } - } - } + if (type >= 0 && type <= 2) + { + switch (type) + { + case ILGDN_FORPARSING: + flag = SHGDN_FORPARSING | SHGDN_FORADDRESSBAR; + break; + case ILGDN_NORMAL: + flag = SHGDN_NORMAL; + break; + case ILGDN_INFOLDER: + flag = SHGDN_INFOLDER; + break; + default: + FIXME("Unknown type parameter = %lx\n", type); + flag = SHGDN_FORPARSING | SHGDN_FORADDRESSBAR; + break; + } + if (!*(const WORD*)pidl || type == ILGDN_FORPARSING) + { + ret = IShellFolder_GetDisplayNameOf(lsf, pidl, flag, &strret); + if (SUCCEEDED(ret)) + { + ret = StrRetToStrNW(path, MAX_PATH, &strret, pidl); + } + } + else + { + ret = SHBindToParent(pidl, &IID_IShellFolder, (LPVOID*)&psfParent, &pidllast); + if (SUCCEEDED(ret)) + { + ret = IShellFolder_GetDisplayNameOf(psfParent, pidllast, flag, &strret); + if (SUCCEEDED(ret)) + { + ret = StrRetToStrNW(path, MAX_PATH, &strret, pidllast); + } + IShellFolder_Release(psfParent); + } + } + } - TRACE("%p %p %s\n", psf, pidl, debugstr_w(path)); + TRACE("%p %p %s\n", psf, pidl, debugstr_w(path)); - if (!psf) - IShellFolder_Release(lsf); - return SUCCEEDED(ret); + if (!psf) + IShellFolder_Release(lsf); + return SUCCEEDED(ret); } BOOL WINAPI ILGetDisplayNameEx(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPVOID path, DWORD type) { - TRACE_(shell)("%p %p %p %ld\n", psf, pidl, path, type); - if (SHELL_OsIsUnicode()) - return ILGetDisplayNameExW(psf, pidl, path, type); - return ILGetDisplayNameExA(psf, pidl, path, type); + TRACE_(shell)("%p %p %p %ld\n", psf, pidl, path, type); + + if (SHELL_OsIsUnicode()) + return ILGetDisplayNameExW(psf, pidl, path, type); + return ILGetDisplayNameExA(psf, pidl, path, type); } /*********************************************************************** ** - * ILGetDisplayName [SHELL32.15] + * ILGetDisplayName [SHELL32.15] */ BOOL WINAPI ILGetDisplayName(LPCITEMIDLIST pidl, LPVOID path) { - TRACE_(shell)("%p %p\n", pidl, path); - if (SHELL_OsIsUnicode()) - return ILGetDisplayNameExW(NULL, pidl, path, ILGDN_FORPARSING); - return ILGetDisplayNameExA(NULL, pidl, path, ILGDN_FORPARSING); + TRACE_(shell)("%p %p\n", pidl, path); + + if (SHELL_OsIsUnicode()) + return ILGetDisplayNameExW(NULL, pidl, path, ILGDN_FORPARSING); + return ILGetDisplayNameExA(NULL, pidl, path, ILGDN_FORPARSING); } /*********************************************************************** ** @@ -185,20 +187,21 @@ */ LPITEMIDLIST WINAPI ILFindLastID(LPCITEMIDLIST pidl) { - LPCITEMIDLIST pidlLast = pidl; + LPCITEMIDLIST pidlLast = pidl; - TRACE("(pidl=%p)\n",pidl); + TRACE("(pidl=%p)\n",pidl); - if (!pidl) - return NULL; + if (!pidl) + return NULL; - while (pidl->mkid.cb) - { - pidlLast = pidl; - pidl = ILGetNext(pidl); - } - return (LPITEMIDLIST)pidlLast; + while (pidl->mkid.cb) + { + pidlLast = pidl; + pidl = ILGetNext(pidl); + } + return (LPITEMIDLIST)pidlLast; } + /*********************************************************************** ** * ILRemoveLastID [SHELL32.17] * @@ -207,12 +210,12 @@ */ BOOL WINAPI ILRemoveLastID(LPITEMIDLIST pidl) { - TRACE_(shell)("pidl=%p\n",pidl); + TRACE_(shell)("pidl=%p\n",pidl); - if (!pidl || !pidl->mkid.cb) - return 0; - ILFindLastID(pidl)->mkid.cb = 0; - return 1; + if (!pidl || !pidl->mkid.cb) + return 0; + ILFindLastID(pidl)->mkid.cb = 0; + return 1; } /*********************************************************************** ** @@ -222,22 +225,24 @@ * duplicate an idlist */ LPITEMIDLIST WINAPI ILClone (LPCITEMIDLIST pidl) -{ DWORD len; - LPITEMIDLIST newpidl; +{ + DWORD len; + LPITEMIDLIST newpidl; - if (!pidl) - return NULL; + if (!pidl) + return NULL; - len = ILGetSize(pidl); - newpidl = (LPITEMIDLIST)SHAlloc(len); - if (newpidl) - memcpy(newpidl,pidl,len); + len = ILGetSize(pidl); + newpidl = (LPITEMIDLIST)SHAlloc(len); + if (newpidl) + memcpy(newpidl,pidl,len); - TRACE("pidl=%p newpidl=%p\n",pidl, newpidl); - pdump(pidl); + TRACE("pidl=%p newpidl=%p\n",pidl, newpidl); + pdump(pidl); - return newpidl; + return newpidl; } + /*********************************************************************** ** * ILCloneFirst [SHELL32.19] * @@ -245,27 +250,28 @@ * duplicates the first idlist of a complex pidl */ LPITEMIDLIST WINAPI ILCloneFirst(LPCITEMIDLIST pidl) -{ DWORD len; - LPITEMIDLIST pidlNew = NULL; +{ + DWORD len; + LPITEMIDLIST pidlNew = NULL; - TRACE("pidl=%p \n",pidl); - pdump(pidl); + TRACE("pidl=%p \n",pidl); + pdump(pidl); - if (pidl) - { - len = pidl->mkid.cb; - pidlNew = (LPITEMIDLIST) SHAlloc (len+2); - if (pidlNew) - { - memcpy(pidlNew,pidl,len+2); /* 2 -> mind a desktop pidl */ + if (pidl) + { + len = pidl->mkid.cb; + pidlNew = (LPITEMIDLIST) SHAlloc (len+2); + if (pidlNew) + { + memcpy(pidlNew,pidl,len+2); /* 2 -> mind a desktop pidl */ - if (len) - ILGetNext(pidlNew)->mkid.cb = 0x00; - } - } - TRACE("-- newpidl=%p\n",pidlNew); + if (len) + ILGetNext(pidlNew)->mkid.cb = 0x00; + } + } + TRACE("-- newpidl=%p\n",pidlNew); - return pidlNew; + return pidlNew; } /*********************************************************************** ** @@ -275,51 +281,58 @@ * the first two bytes are the len, the pidl is following then */ HRESULT WINAPI ILLoadFromStream (IStream * pStream, LPITEMIDLIST * ppPidl) -{ WORD wLen = 0; - DWORD dwBytesRead; - HRESULT ret = E_FAIL; +{ + WORD wLen = 0; + DWORD dwBytesRead; + HRESULT ret = E_FAIL; - TRACE_(shell)("%p %p\n", pStream , ppPidl); + TRACE_(shell)("%p %p\n", pStream , ppPidl); - if (*ppPidl) - { SHFree(*ppPidl); - *ppPidl = NULL; - } + if (*ppPidl) + { + SHFree(*ppPidl); + *ppPidl = NULL; + } - IStream_AddRef (pStream); + IStream_AddRef (pStream); - if (SUCCEEDED(IStream_Read(pStream, (LPVOID)&wLen, 2, &dwBytesRead))) - { - TRACE("PIDL length is %d\n", wLen); - if (wLen != 0) { - *ppPidl = SHAlloc (wLen); - if (SUCCEEDED(IStream_Read(pStream, *ppPidl , wLen, &dwBytesRead))) { - TRACE("Stream read OK\n"); - ret = S_OK; - } else { - WARN("reading pidl failed\n"); - SHFree(*ppPidl); - *ppPidl = NULL; - } - } else { - *ppPidl = NULL; - ret = S_OK; - } - } + if (SUCCEEDED(IStream_Read(pStream, (LPVOID)&wLen, 2, &dwBytesRead))) + { + TRACE("PIDL length is %d\n", wLen); + if (wLen != 0) + { + *ppPidl = SHAlloc (wLen); + if (SUCCEEDED(IStream_Read(pStream, *ppPidl , wLen, &dwBytesRead))) + { + TRACE("Stream read OK\n"); + ret = S_OK; + } + else + { + WARN("reading pidl failed\n"); + SHFree(*ppPidl); + *ppPidl = NULL; + } + } + else + { + *ppPidl = NULL; + ret = S_OK; + } + } - /* we are not yet fully compatible */ - if (*ppPidl && !pcheck(*ppPidl)) - { - WARN("Check failed\n"); - SHFree(*ppPidl); - *ppPidl = NULL; - } + /* we are not yet fully compatible */ + if (*ppPidl && !pcheck(*ppPidl)) + { + WARN("Check failed\n"); + SHFree(*ppPidl); + *ppPidl = NULL; + } - - IStream_Release (pStream); - TRACE("done\n"); - return ret; + IStream_Release (pStream); + TRACE("done\n"); + return ret; } /*********************************************************************** ** @@ -330,30 +343,29 @@ */ HRESULT WINAPI ILSaveToStream (IStream * pStream, LPCITEMIDLIST pPidl) { - LPCITEMIDLIST pidl; - WORD wLen = 0; - HRESULT ret = E_FAIL; + LPCITEMIDLIST pidl; + WORD wLen = 0; + HRESULT ret = E_FAIL; - TRACE_(shell)("%p %p\n", pStream, pPidl); + TRACE_(shell)("%p %p\n", pStream, pPidl); - IStream_AddRef (pStream); + IStream_AddRef (pStream); - pidl = pPidl; - while (pidl->mkid.cb) - { - wLen += sizeof(WORD) + pidl->mkid.cb; - pidl = ILGetNext(pidl); - } + pidl = pPidl; + while (pidl->mkid.cb) + { + wLen += sizeof(WORD) + pidl->mkid.cb; + pidl = ILGetNext(pidl); + } - if (SUCCEEDED(IStream_Write(pStream, (LPVOID)&wLen, 2, NULL))) - { - if (SUCCEEDED(IStream_Write(pStream, pPidl, wLen, NULL))) - { ret = S_OK; - } - } - IStream_Release (pStream); + if (SUCCEEDED(IStream_Write(pStream, (LPVOID)&wLen, 2, NULL))) + { + if (SUCCEEDED(IStream_Write(pStream, pPidl, wLen, NULL))) + ret = S_OK; + } + IStream_Release (pStream); - return ret; + return ret; } /*********************************************************************** ** @@ -375,45 +387,37 @@ */ HRESULT WINAPI SHILCreateFromPathA(LPCSTR path, LPITEMIDLIST * ppidl, DWORD * attributes) { - LPSHELLFOLDER sf; - WCHAR lpszDisplayName[MAX_PATH]; - DWORD pchEaten; - HRESULT ret = E_FAIL; + WCHAR lpszDisplayName[MAX_PATH]; - TRACE_(shell)("%s %p 0x%08lx\n", path, ppidl, attributes ? *attributes : 0); + TRACE_(shell)("%s %p 0x%08lx\n", path, ppidl, attributes ? *attributes : 0); - if (!MultiByteToWideChar(CP_ACP, 0, path, -1, lpszDisplayName, MAX_PATH)) - lpszDisplayName[MAX_PATH-1] = 0; + if (!MultiByteToWideChar(CP_ACP, 0, path, -1, lpszDisplayName, MAX_PATH)) + lpszDisplayName[MAX_PATH-1] = 0; - if (SUCCEEDED (SHGetDesktopFolder(&sf))) - { - ret = IShellFolder_ParseDisplayName(sf, 0, NULL, lpszDisplayName, &pchEaten, ppidl, attributes); - IShellFolder_Release(sf); - } - return ret; + return SHILCreateFromPathW(lpszDisplayName, ppidl, attributes); } HRESULT WINAPI SHILCreateFromPathW(LPCWSTR path, LPITEMIDLIST * ppidl, DWORD * attributes) { - LPSHELLFOLDER sf; - DWORD pchEaten; - HRESULT ret = E_FAIL; + LPSHELLFOLDER sf; + DWORD pchEaten; + HRESULT ret = E_FAIL; - TRACE_(shell)("%s %p 0x%08lx\n", debugstr_w(path), ppidl, attributes ? *attributes : 0); + TRACE_(shell)("%s %p 0x%08lx\n", debugstr_w(path), ppidl, attributes ? *attributes : 0); - if (SUCCEEDED (SHGetDesktopFolder(&sf))) - { - ret = IShellFolder_ParseDisplayName(sf, 0, NULL, (LPWSTR)path, &pchEaten, ppidl, attributes); - IShellFolder_Release(sf); - } - return ret; + if (SUCCEEDED (SHGetDesktopFolder(&sf))) + { + ret = IShellFolder_ParseDisplayName(sf, 0, NULL, (LPWSTR)path, &pchEaten, ppidl, attributes); + IShellFolder_Release(sf); + } + return ret; } HRESULT WINAPI SHILCreateFromPathAW (LPCVOID path, LPITEMIDLIST * ppidl, DWORD * attributes) { - if ( SHELL_OsIsUnicode()) - return SHILCreateFromPathW (path, ppidl, attributes); - return SHILCreateFromPathA (path, ppidl, attributes); + if ( SHELL_OsIsUnicode()) + return SHILCreateFromPathW (path, ppidl, attributes); + return SHILCreateFromPathA (path, ppidl, attributes); } /*********************************************************************** ** @@ -422,9 +426,9 @@ * Create an ItemIDList to one of the special folders. * PARAMS - * hwndOwner [in] - * nFolder [in] CSIDL_xxxxx - * fCreate [in] Create folder if it does not exist + * hwndOwner [in] + * nFolder [in] CSIDL_xxxxx + * fCreate [in] Create folder if it does not exist * * RETURNS * Success: The newly created pidl @@ -436,14 +440,15 @@ * shells IMalloc interface, aka ILFree. */ LPITEMIDLIST WINAPI SHCloneSpecialIDList(HWND hwndOwner, DWORD nFolder, BOOL fCreate) -{ LPITEMIDLIST ppidl; - TRACE_(shell)("(hwnd=%p,csidl=0x%lx,%s).\n", hwndOwner, nFolder, fCreate ? "T" : "F"); +{ + LPITEMIDLIST ppidl; + TRACE_(shell)("(hwnd=%p,csidl=0x%lx,%s).\n", hwndOwner, nFolder, fCreate ? "T" : "F"); - if (fCreate) - nFolder |= CSIDL_FLAG_CREATE; + if (fCreate) + nFolder |= CSIDL_FLAG_CREATE; - SHGetSpecialFolderLocation(hwndOwner, nFolder, &ppidl); - return ppidl; + SHGetSpecialFolderLocation(hwndOwner, nFolder, &ppidl); + return ppidl; } /*********************************************************************** ** @@ -461,21 +466,22 @@ * exported by ordinal. */ [truncated at 1000 lines; 10070 more skipped]

19 years, 6 months

[ion] 14117: Fix dillo/vncviewer regressions (semaphore bug). thanks to art and waxdragon for notifying me of the regressions.

by ion＠svn.reactos.com

Fix dillo/vncviewer regressions (semaphore bug). thanks to art and waxdragon for notifying me of the regressions. Modified: trunk/reactos/ntoskrnl/ex/sem.c _____ Modified: trunk/reactos/ntoskrnl/ex/sem.c --- trunk/reactos/ntoskrnl/ex/sem.c 2005-03-15 23:47:13 UTC (rev 14116) +++ trunk/reactos/ntoskrnl/ex/sem.c 2005-03-16 03:12:32 UTC (rev 14117) @@ -95,7 +95,7 @@ } /* Make sure the counts make sense */ - if (!MaximumCount || !InitialCount || InitialCount > MaximumCount) { + if (!MaximumCount || InitialCount < 0 || InitialCount > MaximumCount) { DPRINT("Invalid Count Data!\n"); return STATUS_INVALID_PARAMETER;

19 years, 6 months

[gvg] 14116: Don't crash when debugger asks for invalid memory location

by gvg＠svn.reactos.com

Don't crash when debugger asks for invalid memory location Modified: trunk/reactos/ntoskrnl/kd/gdbstub.c _____ Modified: trunk/reactos/ntoskrnl/kd/gdbstub.c --- trunk/reactos/ntoskrnl/kd/gdbstub.c 2005-03-15 23:33:54 UTC (rev 14115) +++ trunk/reactos/ntoskrnl/kd/gdbstub.c 2005-03-15 23:47:13 UTC (rev 14116) @@ -377,7 +377,9 @@ ch = *Address; GspAccessLocation = NULL; if (MayFault && GspMemoryError) - return (Buffer); + { + return (Buffer); + } *Buffer++ = HexChars[(ch >> 4) & 0xf]; *Buffer++ = HexChars[ch & 0xf]; Address++; @@ -427,7 +429,7 @@ ch = (CHAR)(HexValue (*Buffer++) << 4); ch = (CHAR)(ch + HexValue (*Buffer++)); - GspAccessLocation = Address; + GspAccessLocation = current; *current = ch; GspAccessLocation = NULL; current++; @@ -436,7 +438,9 @@ { MmSetPageProtect (NULL, page, oldprot); if (GspMemoryError) - return (Buffer); + { + return (Buffer); + } } } @@ -1103,7 +1107,6 @@ LONG NewPC; PCHAR ptr; LONG Esp; - KIRQL OldIrql; /* FIXME: Stop on other CPUs too */ /* Disable hardware debugging while we are inside the stub */ @@ -1122,16 +1125,11 @@ { GspAccessLocation = NULL; GspMemoryError = TRUE; - Context->Eip += 2; + TrapFrame->Eip += 2; } else { /* Don't switch threads */ - OldIrql = KeGetCurrentIrql(); - if (OldIrql < DISPATCH_LEVEL) - { - KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); - } /* Always use the current thread when entering the exception handler */ if (NULL != GspDbgThread) @@ -1334,10 +1332,6 @@ #else #error Unknown compiler for inline assembler #endif - if (OldIrql < DISPATCH_LEVEL) - { - KeLowerIrql(OldIrql); - } KeContextToTrapFrame(Context, TrapFrame); return ((SigVal == 5) ? (kdContinue) : (kdHandleException)); @@ -1475,17 +1469,17 @@ if (Phase == 0) { - DbgPrint("Module 'hal.dll' loaded at 0x%.08x.\n", LdrHalBase); - - GspInitialized = TRUE; - GspRunThread = PsGetCurrentThread(); + GspInitialized = TRUE; + GspRunThread = PsGetCurrentThread(); - ObReferenceObject(GspRunThread); + ObReferenceObject(GspRunThread); -/* GspDbgThread = PsGetCurrentThread(); */ - GspDbgThread = NULL; - GspEnumThread = NULL; +/* GspDbgThread = PsGetCurrentThread(); */ + GspDbgThread = NULL; + GspEnumThread = NULL; + HalDisplayString("Waiting for GDB to attach\n"); + DbgPrint("Module 'hal.dll' loaded at 0x%.08x.\n", LdrHalBase); DbgBreakPointWithStatus (DBG_STATUS_CONTROL_C); } else if (Phase == 1) @@ -1543,8 +1537,6 @@ GspOutBuffer[3 + Length] = '\0'; GspPutPacketNoWait (&GspOutBuffer[0]); } -#else - HalDisplayString(Message); #endif }

19 years, 6 months

← Newer
1
...
25
26
27
28
29
30
31
...
61
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2005