Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 73133: [BASE] Spelling fixes by Josh Soref. CORE-12286
by akhaldi＠svn.reactos.org 05 Nov '16

05 Nov '16

Author: akhaldi Date: Sat Nov 5 14:55:55 2016 New Revision: 73133 URL: http://svn.reactos.org/svn/reactos?rev=73133&view=rev Log: [BASE] Spelling fixes by Josh Soref. CORE-12286 Modified: trunk/reactos/base/applications/atactl/atactl.cpp trunk/reactos/base/applications/calc/help.txt trunk/reactos/base/applications/calc/rpn.c trunk/reactos/base/applications/calc/rpn_mpfr.c trunk/reactos/base/applications/calc/utl.c trunk/reactos/base/applications/calc/whatsnew.txt trunk/reactos/base/applications/calc/winmain.c trunk/reactos/base/applications/charmap/settings.c trunk/reactos/base/applications/charmap_new/GridView.cpp trunk/reactos/base/applications/clipbrd/scrollutils.c trunk/reactos/base/applications/clipbrd/scrollutils.h trunk/reactos/base/applications/dxdiag/sound.c trunk/reactos/base/applications/fltmc/lang/en-US.rc trunk/reactos/base/applications/fontview/display.c trunk/reactos/base/applications/fontview/fontview.c trunk/reactos/base/applications/games/solitaire/solgame.cpp trunk/reactos/base/applications/kbswitch/kbswitch.c trunk/reactos/base/applications/magnify/lang/en-US.rc trunk/reactos/base/applications/mplay32/mplay32.c trunk/reactos/base/applications/msconfig_new/srvpage.cpp trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.c trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c trunk/reactos/base/applications/mscutils/servman/dependencies_tv1.c trunk/reactos/base/applications/mscutils/servman/dependencies_tv2.c trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc trunk/reactos/base/applications/mscutils/servman/misc.c trunk/reactos/base/applications/mstsc/bitmap.c trunk/reactos/base/applications/mstsc/cache.c trunk/reactos/base/applications/mstsc/connectdialog.c trunk/reactos/base/applications/mstsc/constants.h trunk/reactos/base/applications/mstsc/licence.c trunk/reactos/base/applications/mstsc/precomp.h trunk/reactos/base/applications/mstsc/rdesktop.h trunk/reactos/base/applications/mstsc/rdp.c trunk/reactos/base/applications/mstsc/secure.c trunk/reactos/base/applications/mstsc/win32.c trunk/reactos/base/applications/network/arp/arp.c trunk/reactos/base/applications/network/ftp/cmds.c trunk/reactos/base/applications/network/ftp/ftp.c trunk/reactos/base/applications/network/ipconfig/ipconfig.c trunk/reactos/base/applications/network/netstat/netstat.c trunk/reactos/base/applications/network/netstat/netstat.h trunk/reactos/base/applications/network/tracert/tracert.c trunk/reactos/base/applications/network/tracert/tracert.h trunk/reactos/base/applications/rapps/available.c trunk/reactos/base/applications/rapps/loaddlg.c trunk/reactos/base/applications/rapps/resource.h trunk/reactos/base/applications/rapps/winmain.c trunk/reactos/base/applications/rapps_new/available.cpp trunk/reactos/base/applications/rapps_new/gui.cpp trunk/reactos/base/applications/rapps_new/loaddlg.cpp trunk/reactos/base/applications/rapps_new/resource.h trunk/reactos/base/applications/sc/usage.c trunk/reactos/base/applications/screensavers/logon/logon.c trunk/reactos/base/applications/shutdown/shutdown.c trunk/reactos/base/applications/sndrec32/audio_membuffer.cpp trunk/reactos/base/applications/sndrec32/audio_membuffer.hpp trunk/reactos/base/applications/sndrec32/audio_resampler_acm.cpp trunk/reactos/base/applications/sndrec32/audio_wavein.cpp trunk/reactos/base/applications/sndrec32/audio_wavein.hpp trunk/reactos/base/applications/sndrec32/sndrec32.cpp trunk/reactos/base/applications/sndvol32/dialog.c trunk/reactos/base/applications/sndvol32/sndvol32.c trunk/reactos/base/applications/taskmgr/graphctl.c trunk/reactos/base/applications/taskmgr/perfdata.c trunk/reactos/base/applications/taskmgr/perfpage.c trunk/reactos/base/applications/taskmgr/taskmgr.h trunk/reactos/base/services/eventlog/file.c trunk/reactos/base/services/svchost/svchost.c trunk/reactos/base/services/tcpsvcs/chargen.c trunk/reactos/base/services/tcpsvcs/qotd.c trunk/reactos/base/services/telnetd/syslog.c trunk/reactos/base/services/telnetd/syslog.h trunk/reactos/base/setup/usetup/cabinet.h trunk/reactos/base/setup/usetup/inicache.c trunk/reactos/base/setup/usetup/inicache.h trunk/reactos/base/setup/usetup/interface/devinst.c trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/partlist.c trunk/reactos/base/setup/usetup/partlist.h trunk/reactos/base/setup/usetup/progress.c trunk/reactos/base/setup/welcome/welcome.c trunk/reactos/base/shell/cmd/assoc.c trunk/reactos/base/shell/cmd/batch.c trunk/reactos/base/shell/cmd/call.c trunk/reactos/base/shell/cmd/choice.c trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/cmd.h trunk/reactos/base/shell/cmd/cmdinput.c trunk/reactos/base/shell/cmd/cmdtable.c trunk/reactos/base/shell/cmd/copy.c trunk/reactos/base/shell/cmd/del.c trunk/reactos/base/shell/cmd/dir.c trunk/reactos/base/shell/cmd/filecomp.c trunk/reactos/base/shell/cmd/files.txt trunk/reactos/base/shell/cmd/for.c trunk/reactos/base/shell/cmd/goto.c trunk/reactos/base/shell/cmd/history.txt trunk/reactos/base/shell/cmd/if.c trunk/reactos/base/shell/cmd/internal.c trunk/reactos/base/shell/cmd/lang/en-US.rc trunk/reactos/base/shell/cmd/misc.c trunk/reactos/base/shell/cmd/move.c trunk/reactos/base/shell/cmd/msgbox.c trunk/reactos/base/shell/cmd/pause.c trunk/reactos/base/shell/cmd/readme.txt trunk/reactos/base/shell/cmd/readme2.txt trunk/reactos/base/shell/cmd/ren.c trunk/reactos/base/shell/cmd/ren.txt trunk/reactos/base/shell/cmd/replace.c trunk/reactos/base/shell/cmd/strtoclr.c trunk/reactos/base/shell/cmd/where.c trunk/reactos/base/shell/explorer/shellservice.cpp trunk/reactos/base/shell/explorer/startmnucust.cpp trunk/reactos/base/shell/explorer/taskswnd.cpp trunk/reactos/base/shell/explorer/trayntfy.cpp trunk/reactos/base/shell/explorer/traywnd.cpp trunk/reactos/base/system/diskpart/interpreter.c trunk/reactos/base/system/diskpart/lang/en-US.rc trunk/reactos/base/system/diskpart/partlist.c trunk/reactos/base/system/regsvr32/regsvr32.c trunk/reactos/base/system/rundll32/rundll32.c trunk/reactos/base/system/services/database.c trunk/reactos/base/system/services/rpcserver.c trunk/reactos/base/system/services/services.c trunk/reactos/base/system/services/services.h trunk/reactos/base/system/smss/pagefile.c trunk/reactos/base/system/smss/sminit.c trunk/reactos/base/system/smss/smloop.c trunk/reactos/base/system/smss/smsubsys.c trunk/reactos/base/system/winlogon/winlogon.c trunk/reactos/base/system/winlogon/winlogon.h trunk/reactos/base/system/winlogon/wlx.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/atactl/atactl.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/atactl/a… Modified: trunk/reactos/base/applications/calc/help.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/hel… Modified: trunk/reactos/base/applications/calc/rpn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/rpn… Modified: trunk/reactos/base/applications/calc/rpn_mpfr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/rpn… Modified: trunk/reactos/base/applications/calc/utl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/utl… Modified: trunk/reactos/base/applications/calc/whatsnew.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/wha… Modified: trunk/reactos/base/applications/calc/winmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/win… Modified: trunk/reactos/base/applications/charmap/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… Modified: trunk/reactos/base/applications/charmap_new/GridView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap_… Modified: trunk/reactos/base/applications/clipbrd/scrollutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… Modified: trunk/reactos/base/applications/clipbrd/scrollutils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… Modified: trunk/reactos/base/applications/dxdiag/sound.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/s… Modified: trunk/reactos/base/applications/fltmc/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fltmc/la… Modified: trunk/reactos/base/applications/fontview/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… Modified: trunk/reactos/base/applications/fontview/fontview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… Modified: trunk/reactos/base/applications/games/solitaire/solgame.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… Modified: trunk/reactos/base/applications/magnify/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… Modified: trunk/reactos/base/applications/mplay32/mplay32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… Modified: trunk/reactos/base/applications/msconfig_new/srvpage.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/dependencies_tv1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/dependencies_tv2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mstsc/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/bi… Modified: trunk/reactos/base/applications/mstsc/cache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ca… Modified: trunk/reactos/base/applications/mstsc/connectdialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/co… Modified: trunk/reactos/base/applications/mstsc/constants.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/co… Modified: trunk/reactos/base/applications/mstsc/licence.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/li… Modified: trunk/reactos/base/applications/mstsc/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/pr… Modified: trunk/reactos/base/applications/mstsc/rdesktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rd… Modified: trunk/reactos/base/applications/mstsc/rdp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rd… Modified: trunk/reactos/base/applications/mstsc/secure.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/se… Modified: trunk/reactos/base/applications/mstsc/win32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/wi… Modified: trunk/reactos/base/applications/network/arp/arp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ftp/cmds.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ftp/ftp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/netstat/netstat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/netstat/netstat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/tracert/tracert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/tracert/tracert.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/rapps/available.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/av… Modified: trunk/reactos/base/applications/rapps/loaddlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/lo… Modified: trunk/reactos/base/applications/rapps/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Modified: trunk/reactos/base/applications/rapps/winmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/wi… Modified: trunk/reactos/base/applications/rapps_new/available.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… Modified: trunk/reactos/base/applications/rapps_new/gui.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… Modified: trunk/reactos/base/applications/rapps_new/loaddlg.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… Modified: trunk/reactos/base/applications/rapps_new/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… Modified: trunk/reactos/base/applications/sc/usage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/usage… Modified: trunk/reactos/base/applications/screensavers/logon/logon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… Modified: trunk/reactos/base/applications/shutdown/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… Modified: trunk/reactos/base/applications/sndrec32/audio_membuffer.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/sndrec32/audio_membuffer.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/sndrec32/audio_resampler_acm.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/sndrec32/audio_wavein.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/sndrec32/audio_wavein.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/sndrec32/sndrec32.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/sndvol32/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/sndvol32/sndvol32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/taskmgr/graphctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/perfdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/perfpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/taskmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/services/eventlog/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/fil… Modified: trunk/reactos/base/services/svchost/svchost.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/svchost/svch… Modified: trunk/reactos/base/services/tcpsvcs/chargen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tcpsvcs/char… Modified: trunk/reactos/base/services/tcpsvcs/qotd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tcpsvcs/qotd… Modified: trunk/reactos/base/services/telnetd/syslog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/telnetd/sysl… Modified: trunk/reactos/base/services/telnetd/syslog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/telnetd/sysl… Modified: trunk/reactos/base/setup/usetup/cabinet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/cabinet.… Modified: trunk/reactos/base/setup/usetup/inicache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/inicache… Modified: trunk/reactos/base/setup/usetup/inicache.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/inicache… Modified: trunk/reactos/base/setup/usetup/interface/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… Modified: trunk/reactos/base/setup/usetup/partlist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… Modified: trunk/reactos/base/setup/usetup/progress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/progress… Modified: trunk/reactos/base/setup/welcome/welcome.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/welcome… Modified: trunk/reactos/base/shell/cmd/assoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/assoc.c?rev… Modified: trunk/reactos/base/shell/cmd/batch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.c?rev… Modified: trunk/reactos/base/shell/cmd/call.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/call.c?rev=… Modified: trunk/reactos/base/shell/cmd/choice.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/choice.c?re… Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=7… Modified: trunk/reactos/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.h?rev=7… Modified: trunk/reactos/base/shell/cmd/cmdinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmdinput.c?… Modified: trunk/reactos/base/shell/cmd/cmdtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmdtable.c?… Modified: trunk/reactos/base/shell/cmd/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/copy.c?rev=… Modified: trunk/reactos/base/shell/cmd/del.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/del.c?rev=7… Modified: trunk/reactos/base/shell/cmd/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/dir.c?rev=7… Modified: trunk/reactos/base/shell/cmd/filecomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/filecomp.c?… Modified: trunk/reactos/base/shell/cmd/files.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/files.txt?r… Modified: trunk/reactos/base/shell/cmd/for.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/for.c?rev=7… Modified: trunk/reactos/base/shell/cmd/goto.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/goto.c?rev=… Modified: trunk/reactos/base/shell/cmd/history.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/history.txt… Modified: trunk/reactos/base/shell/cmd/if.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/if.c?rev=73… Modified: trunk/reactos/base/shell/cmd/internal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/internal.c?… Modified: trunk/reactos/base/shell/cmd/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/en-US.… Modified: trunk/reactos/base/shell/cmd/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/misc.c?rev=… Modified: trunk/reactos/base/shell/cmd/move.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/move.c?rev=… Modified: trunk/reactos/base/shell/cmd/msgbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/msgbox.c?re… Modified: trunk/reactos/base/shell/cmd/pause.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/pause.c?rev… Modified: trunk/reactos/base/shell/cmd/readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/readme.txt?… Modified: trunk/reactos/base/shell/cmd/readme2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/readme2.txt… Modified: trunk/reactos/base/shell/cmd/ren.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/ren.c?rev=7… Modified: trunk/reactos/base/shell/cmd/ren.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/ren.txt?rev… Modified: trunk/reactos/base/shell/cmd/replace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/replace.c?r… Modified: trunk/reactos/base/shell/cmd/strtoclr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/strtoclr.c?… Modified: trunk/reactos/base/shell/cmd/where.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/where.c?rev… Modified: trunk/reactos/base/shell/explorer/shellservice.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shells… Modified: trunk/reactos/base/shell/explorer/startmnucust.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/startm… Modified: trunk/reactos/base/shell/explorer/taskswnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/tasksw… Modified: trunk/reactos/base/shell/explorer/trayntfy.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traynt… Modified: trunk/reactos/base/shell/explorer/traywnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traywn… Modified: trunk/reactos/base/system/diskpart/interpreter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/inter… Modified: trunk/reactos/base/system/diskpart/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/lang/… Modified: trunk/reactos/base/system/diskpart/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/partl… Modified: trunk/reactos/base/system/regsvr32/regsvr32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/regsv… Modified: trunk/reactos/base/system/rundll32/rundll32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/rundl… Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… Modified: trunk/reactos/base/system/services/services.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… Modified: trunk/reactos/base/system/services/services.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… Modified: trunk/reactos/base/system/smss/pagefile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/pagefile.… Modified: trunk/reactos/base/system/smss/sminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/sminit.c?… Modified: trunk/reactos/base/system/smss/smloop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smloop.c?… Modified: trunk/reactos/base/system/smss/smsubsys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smsubsys.… Modified: trunk/reactos/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… Modified: trunk/reactos/base/system/winlogon/winlogon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… Modified: trunk/reactos/base/system/winlogon/wlx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/wlx.c…

1 0

[gadamopoulos] 73132: [BROWSEUI] - CShellBrowser: Add some checks for failures that we re missing. - CAddressEditBox: Add some checks for failures that we re missing. - SHCreateFromDesktop: Actuall...
by gadamopoulos＠svn.reactos.org 05 Nov '16

05 Nov '16

Author: gadamopoulos Date: Sat Nov 5 14:40:55 2016 New Revision: 73132 URL: http://svn.reactos.org/svn/reactos?rev=73132&view=rev Log: [BROWSEUI] - CShellBrowser: Add some checks for failures that we re missing. - CAddressEditBox: Add some checks for failures that we re missing. - SHCreateFromDesktop: Actually create the proxy desktop window when needed and keep its handle and prefer it when we try to find the proxy desktop window. - Wake the message queue of the proxy desktop after a browser thread exits so the proxy desktop can exit when the last browser thread exits. - Add a hack to prefer to show my documents if we ended up trying to open a browser window with a NULL pidl. This is a hack that is needed because SHExplorerParseCmdLine is broken. - Finally this fixes using "explorer /separate" and also fixes the separate process to exit when the last browser gets closed (this fix also applies to filebrowser.exe which no longer lives forever). CORE-12168 Modified: trunk/reactos/dll/win32/browseui/addresseditbox.cpp trunk/reactos/dll/win32/browseui/desktopipc.cpp trunk/reactos/dll/win32/browseui/shellbrowser.cpp Modified: trunk/reactos/dll/win32/browseui/addresseditbox.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/address… ============================================================================== --- trunk/reactos/dll/win32/browseui/addresseditbox.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/addresseditbox.cpp [iso-8859-1] Sat Nov 5 14:40:55 2016 @@ -348,13 +348,22 @@ hr = IUnknown_QueryService(fSite, SID_STopLevelBrowser, IID_PPV_ARG(IBrowserService, &isb)); if (FAILED_UNEXPECTEDLY(hr)) return hr; - isb->GetPidl(&absolutePIDL); - - SHBindToParent(absolutePIDL, IID_PPV_ARG(IShellFolder, &sf), &pidlChild); - - sf->GetDisplayNameOf(pidlChild, SHGDN_FORADDRESSBAR | SHGDN_FORPARSING, &ret); - - StrRetToBufW(&ret, pidlChild, buf, 4095); + + hr = isb->GetPidl(&absolutePIDL); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = SHBindToParent(absolutePIDL, IID_PPV_ARG(IShellFolder, &sf), &pidlChild); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = sf->GetDisplayNameOf(pidlChild, SHGDN_FORADDRESSBAR | SHGDN_FORPARSING, &ret); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = StrRetToBufW(&ret, pidlChild, buf, 4095); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; indexClosed = SHMapPIDLToSystemImageListIndex(sf, pidlChild, &indexOpen); Modified: trunk/reactos/dll/win32/browseui/desktopipc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/desktop… ============================================================================== --- trunk/reactos/dll/win32/browseui/desktopipc.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/desktopipc.cpp [iso-8859-1] Sat Nov 5 14:40:55 2016 @@ -5,6 +5,7 @@ #define PROXY_DESKTOP_CLASS L"Proxy Desktop" BOOL g_SeparateFolders = FALSE; +HWND g_hwndProxyDesktop = NULL; // fields indented more are unknown ;P struct HNFBlock @@ -70,13 +71,13 @@ END_MSG_MAP() }; -static CProxyDesktop * CreateProxyDesktop(IEThreadParamBlock * parameters) -{ - return new CProxyDesktop(parameters); -} - HWND FindShellProxy(LPITEMIDLIST pidl) { + /* If there is a proxy desktop in the current process use it */ + if (g_hwndProxyDesktop) + return g_hwndProxyDesktop; + + /* Try to find the desktop of the main explorer process */ if (!g_SeparateFolders) { HWND shell = GetShellWindow(); @@ -92,6 +93,7 @@ TRACE("Separate folders setting enabled. Ignoring main desktop.\n"); } + /* The main desktop can't be find so try to see if another process has a proxy desktop */ HWND proxy = FindWindow(PROXY_DESKTOP_CLASS, NULL); if (proxy) { @@ -355,6 +357,12 @@ if (parameters && parameters->offsetF8) parameters->offsetF8->AddRef(); + // HACK! This shouldn't happen! SHExplorerParseCmdLine needs fixing. + if (!parameters->directoryPIDL) + { + SHGetFolderLocation(NULL, CSIDL_PERSONAL, NULL, NULL, &parameters->directoryPIDL); + } + hResult = CShellBrowser_CreateInstance(parameters->directoryPIDL, parameters->dwFlags, IID_PPV_ARG(IBrowserService2, &browser)); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; @@ -401,6 +409,10 @@ /* Destroying the parameters releases the thread reference */ SHDestroyIETHREADPARAM(parameters); + + /* Wake up the proxy desktop thread so it can check whether the last browser thread exited */ + /* Use PostMessage in order to force GetMessage to return and check if all browser windows have exited */ + PostMessageW(FindShellProxy(NULL), WM_EXPLORER_1037, 0, 0); OleUninitialize(); @@ -630,9 +642,11 @@ // Else, start our own message loop! HRESULT hr = CoInitialize(NULL); - CProxyDesktop * proxy = CreateProxyDesktop(parameters); + CProxyDesktop * proxy = new CProxyDesktop(parameters); if (proxy) { + g_hwndProxyDesktop = proxy->Create(0); + LONG refCount; CComPtr<IUnknown> thread; if (SHCreateThreadRef(&refCount, &thread) >= 0) @@ -652,6 +666,8 @@ DispatchMessageW(&Msg); } + DestroyWindow(g_hwndProxyDesktop); + delete proxy; } Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/shellbr… ============================================================================== --- trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Sat Nov 5 14:40:55 2016 @@ -1040,25 +1040,27 @@ HIMAGELIST himlSmall, himlLarge; CComPtr<IShellFolder> sf; - SHBindToParent(absolutePIDL, IID_PPV_ARG(IShellFolder, &sf), &pidlChild); - - index = SHMapPIDLToSystemImageListIndex(sf, pidlChild, &indexOpen); - - Shell_GetImageLists(&himlLarge, &himlSmall); - - HICON icSmall = ImageList_GetIcon(himlSmall, indexOpen, 0); - HICON icLarge = ImageList_GetIcon(himlLarge, indexOpen, 0); - - /* Hack to make it possible to release the old icons */ - /* Something seems to go wrong with WM_SETICON */ - HICON oldSmall = (HICON)SendMessage(WM_GETICON, ICON_SMALL, 0); - HICON oldLarge = (HICON)SendMessage(WM_GETICON, ICON_BIG, 0); - - SendMessage(WM_SETICON, ICON_SMALL, reinterpret_cast<LPARAM>(icSmall)); - SendMessage(WM_SETICON, ICON_BIG, reinterpret_cast<LPARAM>(icLarge)); - - DestroyIcon(oldSmall); - DestroyIcon(oldLarge); + hResult = SHBindToParent(absolutePIDL, IID_PPV_ARG(IShellFolder, &sf), &pidlChild); + if (SUCCEEDED(hResult)) + { + index = SHMapPIDLToSystemImageListIndex(sf, pidlChild, &indexOpen); + + Shell_GetImageLists(&himlLarge, &himlSmall); + + HICON icSmall = ImageList_GetIcon(himlSmall, indexOpen, 0); + HICON icLarge = ImageList_GetIcon(himlLarge, indexOpen, 0); + + /* Hack to make it possible to release the old icons */ + /* Something seems to go wrong with WM_SETICON */ + HICON oldSmall = (HICON)SendMessage(WM_GETICON, ICON_SMALL, 0); + HICON oldLarge = (HICON)SendMessage(WM_GETICON, ICON_BIG, 0); + + SendMessage(WM_SETICON, ICON_SMALL, reinterpret_cast<LPARAM>(icSmall)); + SendMessage(WM_SETICON, ICON_BIG, reinterpret_cast<LPARAM>(icLarge)); + + DestroyIcon(oldSmall); + DestroyIcon(oldLarge); + } } FireCommandStateChangeAll();

1 0

[akhaldi] 73131: [0.4.3] * Merge shell32 fixes by Giannis in r73128. CORE-12106
by akhaldi＠svn.reactos.org 05 Nov '16

05 Nov '16

Author: akhaldi Date: Sat Nov 5 11:07:31 2016 New Revision: 73131 URL: http://svn.reactos.org/svn/reactos?rev=73131&view=rev Log: [0.4.3] * Merge shell32 fixes by Giannis in r73128. CORE-12106 Modified: branches/ros-branch-0_4_3/ (props changed) branches/ros-branch-0_4_3/reactos/ (props changed) branches/ros-branch-0_4_3/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp branches/ros-branch-0_4_3/reactos/dll/win32/shell32/folders/CFSFolder.cpp branches/ros-branch-0_4_3/reactos/dll/win32/shell32/folders/CRegFolder.cpp branches/ros-branch-0_4_3/reactos/dll/win32/shell32/shfldr.h branches/ros-branch-0_4_3/reactos/dll/win32/shell32/shlfolder.cpp Propchange: branches/ros-branch-0_4_3/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Nov 5 11:07:31 2016 @@ -1 +1 @@ -/trunk:73043,73072,73075,73077,73112-73114,73117 +/trunk:73043,73072,73075,73077,73112-73114,73117,73128 Propchange: branches/ros-branch-0_4_3/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Nov 5 11:07:31 2016 @@ -21,4 +21,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:73043,73072,73075,73077,73112-73114,73117 +/trunk/reactos:73043,73072,73075,73077,73112-73114,73117,73128 Modified: branches/ros-branch-0_4_3/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_3/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_3/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp [iso-8859-1] (original) +++ branches/ros-branch-0_4_3/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp [iso-8859-1] Sat Nov 5 11:07:31 2016 @@ -358,6 +358,8 @@ HRESULT WINAPI CDrivesFolder::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2) { + HRESULT hres; + if (!pidl1 || !pidl2) { ERR("Got null pidl pointer (%Ix %p %p)!\n", lParam, pidl1, pidl2); @@ -365,7 +367,7 @@ } if (_ILIsSpecialFolder(pidl1) || _ILIsSpecialFolder(pidl2)) - m_regFolder->CompareIDs(lParam, pidl1, pidl2); + return m_regFolder->CompareIDs(lParam, pidl1, pidl2); if (!_ILIsDrive(pidl1) || !_ILIsDrive(pidl2) || LOWORD(lParam) >= MYCOMPUTERSHELLVIEWCOLUMNS) return E_INVALIDARG; @@ -379,10 +381,12 @@ case 0: /* name */ { result = stricmp(pszDrive1, pszDrive2); - return MAKE_COMPARE_HRESULT(result); + hres = MAKE_COMPARE_HRESULT(result); + break; } case 1: /* Type */ { + /* We want to return immediately because SHELL32_CompareDetails also compares children. */ return SHELL32_CompareDetails(this, lParam, pidl1, pidl2); } case 2: /* Size */ @@ -406,10 +410,17 @@ else /* Size available */ Diff.QuadPart = Drive1Available.QuadPart - Drive2Available.QuadPart; - return MAKE_COMPARE_HRESULT(Diff.QuadPart); - } - } - return E_INVALIDARG; + hres = MAKE_COMPARE_HRESULT(Diff.QuadPart); + break; + } + default: + return E_INVALIDARG; + } + + if (HRESULT_CODE(hres) == 0) + return SHELL32_CompareChildren(this, lParam, pidl1, pidl2); + + return hres; } /************************************************************************** Modified: branches/ros-branch-0_4_3/reactos/dll/win32/shell32/folders/CFSFolder.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_3/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_3/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] (original) +++ branches/ros-branch-0_4_3/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] Sat Nov 5 11:07:31 2016 @@ -344,6 +344,10 @@ case 4: /* Attributes */ return SHELL32_CompareDetails(this, lParam, pidl1, pidl2); } + + if (result == 0) + return SHELL32_CompareChildren(this, lParam, pidl1, pidl2); + return MAKE_COMPARE_HRESULT(result); } Modified: branches/ros-branch-0_4_3/reactos/dll/win32/shell32/folders/CRegFolder.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_3/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_3/reactos/dll/win32/shell32/folders/CRegFolder.cpp [iso-8859-1] (original) +++ branches/ros-branch-0_4_3/reactos/dll/win32/shell32/folders/CRegFolder.cpp [iso-8859-1] Sat Nov 5 11:07:31 2016 @@ -282,21 +282,24 @@ return E_INVALIDARG; } - BOOL bIsGuidFolder1 = _ILIsSpecialFolder(pidl1); - BOOL bIsGuidFolder2 = _ILIsSpecialFolder(pidl2); - - if (!bIsGuidFolder1 && !bIsGuidFolder2) + GUID const *clsid1 = _ILGetGUIDPointer (pidl1); + GUID const *clsid2 = _ILGetGUIDPointer (pidl2); + + if (!clsid1 && !clsid2) { ERR("Got no guid pidl!\n"); return E_INVALIDARG; } - else if (bIsGuidFolder1 && bIsGuidFolder2) - { + else if (clsid1 && clsid2) + { + if (memcmp(clsid1, clsid2, sizeof(GUID)) == 0) + return SHELL32_CompareChildren(this, lParam, pidl1, pidl2); + return SHELL32_CompareDetails(this, lParam, pidl1, pidl2); } /* Guid folders come first compared to everything else */ - return MAKE_COMPARE_HRESULT(bIsGuidFolder1 ? -1 : 1); + return MAKE_COMPARE_HRESULT(clsid1 ? -1 : 1); } HRESULT WINAPI CRegFolder::CreateViewObject(HWND hwndOwner, REFIID riid, LPVOID *ppvOut) Modified: branches/ros-branch-0_4_3/reactos/dll/win32/shell32/shfldr.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_3/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_3/reactos/dll/win32/shell32/shfldr.h [iso-8859-1] (original) +++ branches/ros-branch-0_4_3/reactos/dll/win32/shell32/shfldr.h [iso-8859-1] Sat Nov 5 11:07:31 2016 @@ -53,6 +53,8 @@ HRESULT SHELL32_CompareDetails(IShellFolder2* isf, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2); +HRESULT SHELL32_CompareChildren(IShellFolder2* psf, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2); + HRESULT SHELL32_CoCreateInitSF (LPCITEMIDLIST pidlRoot, LPCWSTR pathRoot, LPCITEMIDLIST pidlChild, const GUID* clsid, int csidl, REFIID riid, LPVOID *ppvOut); Modified: branches/ros-branch-0_4_3/reactos/dll/win32/shell32/shlfolder.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_3/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_3/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] (original) +++ branches/ros-branch-0_4_3/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] Sat Nov 5 11:07:31 2016 @@ -435,6 +435,29 @@ return S_OK; } +HRESULT SHELL32_CompareChildren(IShellFolder2* psf, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) +{ + PUIDLIST_RELATIVE nextpidl1 = ILGetNext (pidl1); + PUIDLIST_RELATIVE nextpidl2 = ILGetNext (pidl2); + + bool isEmpty1 = _ILIsDesktop(nextpidl1); + bool isEmpty2 = _ILIsDesktop(nextpidl2); + if (isEmpty1 || isEmpty2) + return MAKE_COMPARE_HRESULT(isEmpty2 - isEmpty1); + + PITEMID_CHILD firstpidl = ILCloneFirst (pidl1); + if (!firstpidl) + return E_OUTOFMEMORY; + + CComPtr<IShellFolder> psf2; + HRESULT hr = psf->BindToObject(firstpidl, 0, IID_PPV_ARG(IShellFolder, &psf2)); + ILFree(firstpidl); + if (FAILED(hr)) + return MAKE_COMPARE_HRESULT(0); + + return psf2->CompareIDs(lParam, nextpidl1, nextpidl2); +} + HRESULT SHELL32_CompareDetails(IShellFolder2* isf, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) { SHELLDETAILS sd; @@ -458,6 +481,8 @@ return MAKE_COMPARE_HRESULT(1); int ret = wcsicmp(wszItem1, wszItem2); + if (ret == 0) + return SHELL32_CompareChildren(isf, lParam, pidl1, pidl2); return MAKE_COMPARE_HRESULT(ret); }

1 0

[gadamopoulos] 73130: [BROWSEUI] - CAddressEditBox: Implement handling relative paths in the addressbar of explore in addition to absolute paths.
by gadamopoulos＠svn.reactos.org 05 Nov '16

05 Nov '16

Author: gadamopoulos Date: Sat Nov 5 00:09:51 2016 New Revision: 73130 URL: http://svn.reactos.org/svn/reactos?rev=73130&view=rev Log: [BROWSEUI] - CAddressEditBox: Implement handling relative paths in the addressbar of explore in addition to absolute paths. Modified: trunk/reactos/dll/win32/browseui/addresseditbox.cpp Modified: trunk/reactos/dll/win32/browseui/addresseditbox.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/address… ============================================================================== --- trunk/reactos/dll/win32/browseui/addresseditbox.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/addresseditbox.cpp [iso-8859-1] Sat Nov 5 00:09:51 2016 @@ -90,16 +90,20 @@ ULONG attributes; HRESULT hr; HWND topLevelWindow; - - CComPtr<IShellBrowser> pisb; - hr = IUnknown_QueryService(fSite, SID_SShellBrowser, IID_PPV_ARG(IShellBrowser, &pisb)); + PIDLIST_ABSOLUTE pidlCurrent= NULL; + PIDLIST_RELATIVE pidlRelative = NULL; + CComPtr<IShellFolder> psfCurrent; + + CComPtr<IBrowserService> pbs; + hr = IUnknown_QueryService(fSite, SID_SShellBrowser, IID_PPV_ARG(IBrowserService, &pbs)); if (FAILED_UNEXPECTEDLY(hr)) return hr; - hr = IUnknown_GetWindow(pisb, &topLevelWindow); + hr = IUnknown_GetWindow(pbs, &topLevelWindow); if (FAILED_UNEXPECTEDLY(hr)) return hr; + /* Get the path to browse and expand it if needed */ LPWSTR input; int inputLength = fCombobox.GetWindowTextLength() + 2; @@ -124,13 +128,34 @@ } } + /* Try to parse a relative path and if it fails, try to browse an absolute path */ CComPtr<IShellFolder> psfDesktop; hr = SHGetDesktopFolder(&psfDesktop); + if (FAILED_UNEXPECTEDLY(hr)) + goto cleanup; + + hr = pbs->GetPidl(&pidlCurrent); + if (FAILED_UNEXPECTEDLY(hr)) + goto cleanup; + + hr = psfDesktop->BindToObject(pidlCurrent, NULL, IID_PPV_ARG(IShellFolder, &psfCurrent)); + if (FAILED_UNEXPECTEDLY(hr)) + goto cleanup; + + hr = psfCurrent->ParseDisplayName(topLevelWindow, NULL, address, &eaten, &pidlRelative, &attributes); if (SUCCEEDED(hr)) { - hr = psfDesktop->ParseDisplayName(topLevelWindow, NULL, address, &eaten, &pidlLastParsed, &attributes); - } - + pidlLastParsed = ILCombine(pidlCurrent, pidlRelative); + ILFree(pidlRelative); + goto cleanup; + } + + /* We couldn't parse a relative path, attempt to parse an absolute path */ + hr = psfDesktop->ParseDisplayName(topLevelWindow, NULL, address, &eaten, &pidlLastParsed, &attributes); + +cleanup: + if (pidlCurrent) + ILFree(pidlCurrent); if (address != input) delete [] address; delete [] input;

1 0

[gadamopoulos] 73129: [BROWSEUI] - CShellBrowser: Add a standard ShellObjectCreatorInit constructor and make its initializer take a pidl and flags. - Move BrowserThreadProc to desktopipc.cpp where ...
by gadamopoulos＠svn.reactos.org 04 Nov '16

04 Nov '16

Author: gadamopoulos Date: Fri Nov 4 23:56:02 2016 New Revision: 73129 URL: http://svn.reactos.org/svn/reactos?rev=73129&view=rev Log: [BROWSEUI] - CShellBrowser: Add a standard ShellObjectCreatorInit constructor and make its initializer take a pidl and flags. - Move BrowserThreadProc to desktopipc.cpp where the lifetime of the browser thread will be managed. Modified: trunk/reactos/dll/win32/browseui/browseui.h trunk/reactos/dll/win32/browseui/desktopipc.cpp trunk/reactos/dll/win32/browseui/shellbrowser.cpp Modified: trunk/reactos/dll/win32/browseui/browseui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… ============================================================================== --- trunk/reactos/dll/win32/browseui/browseui.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/browseui.h [iso-8859-1] Fri Nov 4 23:56:02 2016 @@ -10,6 +10,7 @@ #define USE_CUSTOM_INTERNETTOOLBAR 1 /* Constructors for the classes that are not exported */ +HRESULT CShellBrowser_CreateInstance(LPITEMIDLIST pidl, DWORD dwFlags, REFIID riid, void **ppv); HRESULT CTravelLog_CreateInstance(REFIID riid, void **ppv); HRESULT CBaseBar_CreateInstance(REFIID riid, void **ppv, BOOL vertical); HRESULT CBaseBarSite_CreateInstance(REFIID riid, void **ppv, BOOL bVertical); Modified: trunk/reactos/dll/win32/browseui/desktopipc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/desktop… ============================================================================== --- trunk/reactos/dll/win32/browseui/desktopipc.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/desktopipc.cpp [iso-8859-1] Fri Nov 4 23:56:02 2016 @@ -27,8 +27,6 @@ UINT pidlSize80; UINT pathLength; }; - -extern DWORD WINAPI BrowserThreadProc(LPVOID lpThreadParameter); class CProxyDesktop : public CComObjectRootEx<CComMultiThreadModelNoCS>, @@ -345,6 +343,70 @@ return params; } + +static HRESULT ExplorerMessageLoop(IEThreadParamBlock * parameters) +{ + CComPtr<IBrowserService2> browser; + HRESULT hResult; + MSG Msg; + BOOL Ret; + + // Tell the thread ref we are using it. + if (parameters && parameters->offsetF8) + parameters->offsetF8->AddRef(); + + hResult = CShellBrowser_CreateInstance(parameters->directoryPIDL, parameters->dwFlags, IID_PPV_ARG(IBrowserService2, &browser)); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + + while ((Ret = GetMessage(&Msg, NULL, 0, 0)) != 0) + { + if (Ret == -1) + { + // Error: continue or exit? + break; + } + + if (Msg.message == WM_QUIT) + break; + + if (browser->v_MayTranslateAccelerator(&Msg) != S_OK) + { + TranslateMessage(&Msg); + DispatchMessage(&Msg); + } + } + + int nrc = browser->Release(); + if (nrc > 0) + { + DbgPrint("WARNING: There are %d references to the CShellBrowser active or leaked.\n", nrc); + } + + browser.Detach(); + + // Tell the thread ref we are not using it anymore. + if (parameters && parameters->offsetF8) + parameters->offsetF8->Release(); + + return hResult; +} + +static DWORD WINAPI BrowserThreadProc(LPVOID lpThreadParameter) +{ + IEThreadParamBlock * parameters = (IEThreadParamBlock *) lpThreadParameter; + + OleInitialize(NULL); + ExplorerMessageLoop(parameters); + + /* Destroying the parameters releases the thread reference */ + SHDestroyIETHREADPARAM(parameters); + + OleUninitialize(); + + return 0; +} + /************************************************************************* * SHCreateIETHREADPARAM [BROWSEUI.123] */ Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/shellbr… ============================================================================== --- trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Fri Nov 4 23:56:02 2016 @@ -309,7 +309,7 @@ CShellBrowser(); ~CShellBrowser(); - HRESULT Initialize(LPITEMIDLIST pidl, long b, long c, long d); + HRESULT Initialize(LPITEMIDLIST pidl, DWORD dwFlags); public: HRESULT BrowseToPIDL(LPCITEMIDLIST pidl, long flags); HRESULT BrowseToPath(IShellFolder *newShellFolder, LPCITEMIDLIST absolutePIDL, @@ -706,7 +706,7 @@ DSA_Destroy(menuDsa); } -HRESULT CShellBrowser::Initialize(LPITEMIDLIST pidl, long b, long c, long d) +HRESULT CShellBrowser::Initialize(LPITEMIDLIST pidl, DWORD dwFlags) { CComPtr<IPersistStreamInit> persistStreamInit; HRESULT hResult; @@ -3697,72 +3697,7 @@ return 0; } -static HRESULT ExplorerMessageLoop(IEThreadParamBlock * parameters) -{ - CComPtr<CShellBrowser> theCabinet; - HRESULT hResult; - MSG Msg; - BOOL Ret; - - // Tell the thread ref we are using it. - if (parameters && parameters->offsetF8) - parameters->offsetF8->AddRef(); - - ATLTRY(theCabinet = new CComObject<CShellBrowser>); - if (theCabinet == NULL) - { - return E_OUTOFMEMORY; - } - - hResult = theCabinet->Initialize(parameters->directoryPIDL, 0, 0, 0); - if (FAILED_UNEXPECTEDLY(hResult)) - return E_OUTOFMEMORY; - - while ((Ret = GetMessage(&Msg, NULL, 0, 0)) != 0) - { - if (Ret == -1) - { - // Error: continue or exit? - break; - } - - if (Msg.message == WM_QUIT) - break; - - if (theCabinet->v_MayTranslateAccelerator(&Msg) != S_OK) - { - TranslateMessage(&Msg); - DispatchMessage(&Msg); - } - } - - int nrc = theCabinet->Release(); - if (nrc > 0) - { - DbgPrint("WARNING: There are %d references to the CShellBrowser active or leaked.\n", nrc); - } - - theCabinet.Detach(); - - // Tell the thread ref we are not using it anymore. - if (parameters && parameters->offsetF8) - parameters->offsetF8->Release(); - - return hResult; -} - -DWORD WINAPI BrowserThreadProc(LPVOID lpThreadParameter) -{ - HRESULT hr; - IEThreadParamBlock * parameters = (IEThreadParamBlock *) lpThreadParameter; - - OleInitialize(NULL); - - ATLTRY(hr = ExplorerMessageLoop(parameters)); - - OleUninitialize(); - - SHDestroyIETHREADPARAM(parameters); - - return hr; -} +HRESULT CShellBrowser_CreateInstance(LPITEMIDLIST pidl, DWORD dwFlags, REFIID riid, void **ppv) +{ + return ShellObjectCreatorInit<CShellBrowser>(pidl, dwFlags, riid, ppv); +}

1 0

[gadamopoulos] 73128: [SHELL32] - Implement comparing child items in CompareIDs method of our IShellFolder immplementation in shell32 as this is the expected behaviour according to tests and docume...
by gadamopoulos＠svn.reactos.org 04 Nov '16

04 Nov '16

Author: gadamopoulos Date: Fri Nov 4 23:11:29 2016 New Revision: 73128 URL: http://svn.reactos.org/svn/reactos?rev=73128&view=rev Log: [SHELL32] - Implement comparing child items in CompareIDs method of our IShellFolder immplementation in shell32 as this is the expected behaviour according to tests and documentation. - This was removed after each folder got its own implementation (we used a single one from wine that did handle it). May fix CORE-12106. Modified: trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp trunk/reactos/dll/win32/shell32/shfldr.h trunk/reactos/dll/win32/shell32/shlfolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp [iso-8859-1] Fri Nov 4 23:11:29 2016 @@ -358,6 +358,8 @@ HRESULT WINAPI CDrivesFolder::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2) { + HRESULT hres; + if (!pidl1 || !pidl2) { ERR("Got null pidl pointer (%Ix %p %p)!\n", lParam, pidl1, pidl2); @@ -365,7 +367,7 @@ } if (_ILIsSpecialFolder(pidl1) || _ILIsSpecialFolder(pidl2)) - m_regFolder->CompareIDs(lParam, pidl1, pidl2); + return m_regFolder->CompareIDs(lParam, pidl1, pidl2); if (!_ILIsDrive(pidl1) || !_ILIsDrive(pidl2) || LOWORD(lParam) >= MYCOMPUTERSHELLVIEWCOLUMNS) return E_INVALIDARG; @@ -379,10 +381,12 @@ case 0: /* name */ { result = stricmp(pszDrive1, pszDrive2); - return MAKE_COMPARE_HRESULT(result); + hres = MAKE_COMPARE_HRESULT(result); + break; } case 1: /* Type */ { + /* We want to return immediately because SHELL32_CompareDetails also compares children. */ return SHELL32_CompareDetails(this, lParam, pidl1, pidl2); } case 2: /* Size */ @@ -406,10 +410,17 @@ else /* Size available */ Diff.QuadPart = Drive1Available.QuadPart - Drive2Available.QuadPart; - return MAKE_COMPARE_HRESULT(Diff.QuadPart); - } - } - return E_INVALIDARG; + hres = MAKE_COMPARE_HRESULT(Diff.QuadPart); + break; + } + default: + return E_INVALIDARG; + } + + if (HRESULT_CODE(hres) == 0) + return SHELL32_CompareChildren(this, lParam, pidl1, pidl2); + + return hres; } /************************************************************************** Modified: trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] Fri Nov 4 23:11:29 2016 @@ -344,6 +344,10 @@ case 4: /* Attributes */ return SHELL32_CompareDetails(this, lParam, pidl1, pidl2); } + + if (result == 0) + return SHELL32_CompareChildren(this, lParam, pidl1, pidl2); + return MAKE_COMPARE_HRESULT(result); } Modified: trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp [iso-8859-1] Fri Nov 4 23:11:29 2016 @@ -282,21 +282,24 @@ return E_INVALIDARG; } - BOOL bIsGuidFolder1 = _ILIsSpecialFolder(pidl1); - BOOL bIsGuidFolder2 = _ILIsSpecialFolder(pidl2); - - if (!bIsGuidFolder1 && !bIsGuidFolder2) + GUID const *clsid1 = _ILGetGUIDPointer (pidl1); + GUID const *clsid2 = _ILGetGUIDPointer (pidl2); + + if (!clsid1 && !clsid2) { ERR("Got no guid pidl!\n"); return E_INVALIDARG; } - else if (bIsGuidFolder1 && bIsGuidFolder2) - { + else if (clsid1 && clsid2) + { + if (memcmp(clsid1, clsid2, sizeof(GUID)) == 0) + return SHELL32_CompareChildren(this, lParam, pidl1, pidl2); + return SHELL32_CompareDetails(this, lParam, pidl1, pidl2); } /* Guid folders come first compared to everything else */ - return MAKE_COMPARE_HRESULT(bIsGuidFolder1 ? -1 : 1); + return MAKE_COMPARE_HRESULT(clsid1 ? -1 : 1); } HRESULT WINAPI CRegFolder::CreateViewObject(HWND hwndOwner, REFIID riid, LPVOID *ppvOut) Modified: trunk/reactos/dll/win32/shell32/shfldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr.h… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr.h [iso-8859-1] Fri Nov 4 23:11:29 2016 @@ -53,6 +53,8 @@ HRESULT SHELL32_CompareDetails(IShellFolder2* isf, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2); +HRESULT SHELL32_CompareChildren(IShellFolder2* psf, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2); + HRESULT SHELL32_CoCreateInitSF (LPCITEMIDLIST pidlRoot, LPCWSTR pathRoot, LPCITEMIDLIST pidlChild, const GUID* clsid, int csidl, REFIID riid, LPVOID *ppvOut); Modified: trunk/reactos/dll/win32/shell32/shlfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfolde… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] Fri Nov 4 23:11:29 2016 @@ -435,6 +435,29 @@ return S_OK; } +HRESULT SHELL32_CompareChildren(IShellFolder2* psf, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) +{ + PUIDLIST_RELATIVE nextpidl1 = ILGetNext (pidl1); + PUIDLIST_RELATIVE nextpidl2 = ILGetNext (pidl2); + + bool isEmpty1 = _ILIsDesktop(nextpidl1); + bool isEmpty2 = _ILIsDesktop(nextpidl2); + if (isEmpty1 || isEmpty2) + return MAKE_COMPARE_HRESULT(isEmpty2 - isEmpty1); + + PITEMID_CHILD firstpidl = ILCloneFirst (pidl1); + if (!firstpidl) + return E_OUTOFMEMORY; + + CComPtr<IShellFolder> psf2; + HRESULT hr = psf->BindToObject(firstpidl, 0, IID_PPV_ARG(IShellFolder, &psf2)); + ILFree(firstpidl); + if (FAILED(hr)) + return MAKE_COMPARE_HRESULT(0); + + return psf2->CompareIDs(lParam, nextpidl1, nextpidl2); +} + HRESULT SHELL32_CompareDetails(IShellFolder2* isf, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) { SHELLDETAILS sd; @@ -458,6 +481,8 @@ return MAKE_COMPARE_HRESULT(1); int ret = wcsicmp(wszItem1, wszItem2); + if (ret == 0) + return SHELL32_CompareChildren(isf, lParam, pidl1, pidl2); return MAKE_COMPARE_HRESULT(ret); }

1 0

[janderwald] 73127: [SDK] - fix build - thanks learn_more
by janderwald＠svn.reactos.org 04 Nov '16

04 Nov '16

Author: janderwald Date: Fri Nov 4 18:38:07 2016 New Revision: 73127 URL: http://svn.reactos.org/svn/reactos?rev=73127&view=rev Log: [SDK] - fix build - thanks learn_more Modified: trunk/reactos/sdk/include/psdk/ks.h Modified: trunk/reactos/sdk/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/ks.h?rev=… ============================================================================== --- trunk/reactos/sdk/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/ks.h [iso-8859-1] Fri Nov 4 18:38:07 2016 @@ -4220,7 +4220,7 @@ _In_ PDRIVER_OBJECT DriverObject, _In_ ULONG MajorFunction); -__checkReturn +_Check_return_ _IRQL_requires_max_(PASSIVE_LEVEL) KSDDKAPI NTSTATUS @@ -4256,7 +4256,7 @@ _In_ ULONG OutUsed, _In_ BOOLEAN Eject); -__checkReturn +_Check_return_ _IRQL_requires_max_(DISPATCH_LEVEL) KSDDKAPI NTSTATUS

1 0

[janderwald] 73126: [SDK] - add newline
by janderwald＠svn.reactos.org 04 Nov '16

04 Nov '16

Author: janderwald Date: Fri Nov 4 18:14:40 2016 New Revision: 73126 URL: http://svn.reactos.org/svn/reactos?rev=73126&view=rev Log: [SDK] - add newline Modified: trunk/reactos/sdk/include/psdk/ks.h Modified: trunk/reactos/sdk/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/ks.h?rev=… ============================================================================== --- trunk/reactos/sdk/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/ks.h [iso-8859-1] Fri Nov 4 18:14:40 2016 @@ -4219,6 +4219,7 @@ KsSetMajorFunctionHandler( _In_ PDRIVER_OBJECT DriverObject, _In_ ULONG MajorFunction); + __checkReturn _IRQL_requires_max_(PASSIVE_LEVEL) KSDDKAPI

1 0

[janderwald] 73125: [SDK] - add prototypes
by janderwald＠svn.reactos.org 04 Nov '16

04 Nov '16

Author: janderwald Date: Fri Nov 4 18:12:00 2016 New Revision: 73125 URL: http://svn.reactos.org/svn/reactos?rev=73125&view=rev Log: [SDK] - add prototypes Modified: trunk/reactos/sdk/include/psdk/ks.h Modified: trunk/reactos/sdk/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/ks.h?rev=… ============================================================================== --- trunk/reactos/sdk/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/ks.h [iso-8859-1] Fri Nov 4 18:12:00 2016 @@ -3851,6 +3851,35 @@ _In_ PKSPIN Pin, _In_ KSSTREAM_POINTER_STATE State); +_IRQL_requires_max_(DISPATCH_LEVEL) +KSDDKAPI +NTSTATUS +NTAPI +KsStreamPointerSetStatusCode( + _In_ PKSSTREAM_POINTER StreamPointer, + _In_ NTSTATUS Status +); + +_IRQL_requires_max_(DISPATCH_LEVEL) +KSDDKAPI +void +NTAPI +KsStreamPointerDelete( + _In_ PKSSTREAM_POINTER StreamPointer +); + +_IRQL_requires_max_(DISPATCH_LEVEL) +KSDDKAPI +NTSTATUS +NTAPI +KsStreamPointerClone( + _In_ PKSSTREAM_POINTER StreamPointer, + _In_opt_ PFNKSSTREAMPOINTER CancelCallback, + _In_ ULONG ContextSize, + _Out_ PKSSTREAM_POINTER* CloneStreamPointer +); + + /* Does this belong here? */ _IRQL_requires_max_(PASSIVE_LEVEL) @@ -4190,7 +4219,7 @@ KsSetMajorFunctionHandler( _In_ PDRIVER_OBJECT DriverObject, _In_ ULONG MajorFunction); - +__checkReturn _IRQL_requires_max_(PASSIVE_LEVEL) KSDDKAPI NTSTATUS @@ -4225,6 +4254,14 @@ _In_ ULONG InUsed, _In_ ULONG OutUsed, _In_ BOOLEAN Eject); + +__checkReturn +_IRQL_requires_max_(DISPATCH_LEVEL) +KSDDKAPI +NTSTATUS +NTAPI +KsStreamPointerAdvance( + _In_ PKSSTREAM_POINTER StreamPointer); _IRQL_requires_max_(DISPATCH_LEVEL) KSDDKAPI

1 0

[janderwald] 73124: [USBAUDIO] - fix buffer calculation for usb headsets - usb headsets now partially work with usbaudio in win2k3
by janderwald＠svn.reactos.org 04 Nov '16

04 Nov '16

Author: janderwald Date: Fri Nov 4 18:07:44 2016 New Revision: 73124 URL: http://svn.reactos.org/svn/reactos?rev=73124&view=rev Log: [USBAUDIO] - fix buffer calculation for usb headsets - usb headsets now partially work with usbaudio in win2k3 Modified: trunk/reactos/drivers/usb/usbaudio/pin.c trunk/reactos/drivers/usb/usbaudio/usbaudio.h Modified: trunk/reactos/drivers/usb/usbaudio/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbaudio/pin.c… ============================================================================== --- trunk/reactos/drivers/usb/usbaudio/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbaudio/pin.c [iso-8859-1] Fri Nov 4 18:07:44 2016 @@ -874,6 +874,7 @@ IoSetCompletionRoutine(Irp, UsbAudioRenderComplete, Pin, TRUE, TRUE, TRUE); /* calculate packet count */ + /* FIXME support various sample rates */ WaveFormatEx = (PKSDATAFORMAT_WAVEFORMATEX)Pin->ConnectionFormat; TotalPacketSize = WaveFormatEx->WaveFormatEx.nAvgBytesPerSec / 1000; ASSERT(TotalPacketSize <= PinContext->DeviceExtension->InterfaceInfo->Pipes[0].MaximumPacketSize); @@ -882,8 +883,6 @@ PacketCount = CloneStreamPointer->OffsetIn.Remaining / TotalPacketSize; ASSERT(PacketCount < 255); - - //DPRINT1("PinRenderProcess Irp %p TotalPacketSize %lu MaximumPacketSize %lu PacketCount %lu Count %lu Data %p\n", Irp, TotalPacketSize, PinContext->DeviceExtension->InterfaceInfo->Pipes[0].MaximumPacketSize, PacketCount, CloneStreamPointer->OffsetIn.Count, CloneStreamPointer->OffsetIn.Data); Urb = (PURB)AllocFunction(GET_ISO_URB_SIZE(PacketCount)); ASSERT(Urb); @@ -893,8 +892,8 @@ Urb->UrbIsochronousTransfer.Hdr.Length = GET_ISO_URB_SIZE(PacketCount); Urb->UrbIsochronousTransfer.PipeHandle = PinContext->DeviceExtension->InterfaceInfo->Pipes[0].PipeHandle; Urb->UrbIsochronousTransfer.TransferFlags = USBD_TRANSFER_DIRECTION_OUT | USBD_START_ISO_TRANSFER_ASAP; - Urb->UrbIsochronousTransfer.TransferBufferLength = CloneStreamPointer->OffsetIn.Remaining; - Urb->UrbIsochronousTransfer.TransferBuffer = CloneStreamPointer->OffsetIn.Data; + Urb->UrbIsochronousTransfer.TransferBufferLength = PacketCount * TotalPacketSize; + Urb->UrbIsochronousTransfer.TransferBuffer = CloneStreamPointer->StreamHeader->Data; Urb->UrbIsochronousTransfer.NumberOfPackets = PacketCount; Urb->UrbIsochronousTransfer.StartFrame = 0; Modified: trunk/reactos/drivers/usb/usbaudio/usbaudio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbaudio/usbau… ============================================================================== --- trunk/reactos/drivers/usb/usbaudio/usbaudio.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbaudio/usbaudio.h [iso-8859-1] Fri Nov 4 18:07:44 2016 @@ -205,6 +205,7 @@ PKSWORKER CaptureWorker; /* capture worker */ WORK_QUEUE_ITEM StarvationWorkItem; /* work item */ PKSWORKER StarvationWorker; /* capture worker */ + ULONG BufferOffset; }PIN_CONTEXT, *PPIN_CONTEXT; /* filter.c */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs