https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9393fc320e3fcc89efa1c0...
commit 9393fc320e3fcc89efa1c03c695d6f96885d88f6 Author: Hermès Bélusca-Maïto hermes.belusca-maito@reactos.org AuthorDate: Mon Sep 13 03:33:14 2021 +0200 Commit: Hermès Bélusca-Maïto hermes.belusca-maito@reactos.org CommitDate: Mon Sep 13 03:52:22 2021 +0200
[FORMATTING] Remove trailing whitespace. Addendum to 34593d93.
Excluded: 3rd-party code (incl. wine) and most of the win32ss. --- .gitmessage | 10 +- .gitpod.Dockerfile | 2 +- COPYING.ARM | 10 +- base/applications/calc/convert.c | 2 +- base/applications/calc/fun_ieee.c | 6 +- base/applications/calc/whatsnew.txt | 2 +- base/applications/calc/winmain.c | 4 +- base/applications/charmap/charmap.c | 4 +- base/applications/charmap/map.c | 14 +- base/applications/charmap/precomp.h | 2 +- base/applications/charmap_new/GridView.cpp | 3 +- base/applications/charmap_new/MainWindow.cpp | 4 +- base/applications/cmdutils/at/at.c | 4 +- base/applications/cmdutils/fc/text.h | 3 +- base/applications/cmdutils/more/more.c | 4 +- base/applications/cmdutils/tasklist/tasklist.c | 4 +- base/applications/cmdutils/tree/tree.c | 6 +- base/applications/cmdutils/whoami/whoami.c | 2 +- base/applications/dxdiag/ddtest.c | 4 +- base/applications/dxdiag/display.c | 4 +- base/applications/dxdiag/dxdiag.c | 16 +- base/applications/dxdiag/network.c | 4 +- base/applications/dxdiag/sound.c | 4 +- base/applications/dxdiag/system.c | 4 +- base/applications/findstr/findstr.c | 18 +- base/applications/games/solitaire/ReadMe.txt | 2 +- base/applications/games/solitaire/solgame.cpp | 6 +- base/applications/games/solitaire/solitaire.cpp | 4 +- base/applications/games/spider/spigame.cpp | 22 +- base/applications/mplay32/mplay32.c | 2 +- base/applications/msconfig/freeldrpage.c | 4 +- base/applications/msconfig/msconfig.c | 12 +- base/applications/msconfig/toolspage.c | 4 +- .../msconfig_new/comctl32ex/listview.c | 2 +- .../msconfig_new/comctl32ex/treeview.c | 2 +- base/applications/msconfig_new/systempage.cpp | 6 +- base/applications/msconfig_new/utils.c | 2 +- base/applications/mspaint/help/tools.html | 22 +- base/applications/mspaint/registry.cpp | 2 +- base/applications/mspaint/winproc.cpp | 6 +- base/applications/network/ipconfig/ipconfig.c | 4 +- base/applications/network/net/net.h | 2 +- base/applications/network/nslookup/utility.c | 2 +- base/applications/notepad/main.c | 2 +- base/applications/rapps/appview.cpp | 6 +- base/applications/rapps/asyncinet.cpp | 6 +- base/applications/rapps/available.cpp | 4 +- base/applications/rapps/cabinet.cpp | 34 +- base/applications/rapps/gui.cpp | 10 +- base/applications/rapps/include/asyncinet.h | 2 +- base/applications/rapps/include/available.h | 2 +- base/applications/rapps/installed.cpp | 1 - base/applications/rapps/settingsdlg.cpp | 20 +- base/applications/rapps/winmain.cpp | 4 +- base/applications/regedit/childwnd.c | 8 +- base/applications/regedit/treeview.c | 12 +- base/applications/sc/depend.c | 2 +- base/applications/sc/name.c | 2 +- base/applications/screensavers/3dtext/3dtext.c | 2 +- base/applications/screensavers/logon/logon.c | 28 +- base/applications/sdbinst/sdbinst.c | 18 +- base/applications/shutdown/gui.c | 2 +- base/applications/shutdown/shutdown.c | 10 +- base/applications/sndrec32/audio_membuffer.cpp | 22 +- base/applications/sndrec32/audio_resampler_acm.cpp | 4 +- base/applications/sndrec32/audio_wavein.cpp | 14 +- base/applications/sndrec32/audio_wavein.hpp | 4 +- base/applications/sndrec32/audio_waveout.cpp | 22 +- base/applications/sndrec32/audio_waveout.hpp | 4 +- base/applications/sndvol32/misc.c | 4 +- base/applications/sndvol32/sndvol32.c | 8 +- base/applications/taskmgr/applpage.c | 2 +- base/applications/taskmgr/procpage.c | 4 +- base/applications/taskmgr/taskmgr.c | 6 +- base/applications/utilman/umandlg/umandlg.c | 2 +- base/applications/wordpad/wordpad.c | 2 +- base/services/audiosrv/audiosrv.txt | 14 +- base/services/audiosrv/pnp_list_manager.c | 4 +- base/services/dhcpcsvc/CMakeLists.txt | 2 +- base/services/dhcpcsvc/dhcp/adapter.c | 8 +- base/services/dhcpcsvc/dhcp/api.c | 2 +- base/services/dhcpcsvc/dhcpcsvc.c | 2 +- base/services/dnsrslvr/cache.c | 4 +- base/services/rpcss/CMakeLists.txt | 2 +- base/services/shsvcs/thmserver.c | 10 +- base/services/svchost/security.cxx | 2 +- base/services/tcpsvcs/echo.c | 2 +- base/services/tcpsvcs/qotd.c | 2 +- base/services/umpnpmgr/rpcserver.c | 2 +- base/services/wlansvc/rpcserver.c | 10 +- base/services/wuauserv/wuauserv.c | 2 +- base/setup/usetup/lang/eu-ES.h | 2 +- base/setup/usetup/usetup.c | 4 +- base/shell/cmd/batch.h | 2 +- base/shell/cmd/ctty.c | 2 +- base/shell/cmd/readme2.txt | 40 +- base/shell/cmd/ren.txt | 8 +- base/shell/explorer/notifyiconscust.cpp | 2 +- base/shell/explorer/precomp.h | 6 +- base/shell/explorer/resource.h | 2 +- base/shell/explorer/settings.cpp | 2 +- base/shell/explorer/startctxmnu.cpp | 2 +- base/shell/explorer/syspager.cpp | 10 +- base/shell/explorer/taskband.cpp | 4 +- base/shell/explorer/trayclock.cpp | 2 +- base/shell/explorer/trayprop.cpp | 16 +- base/shell/rshell/CQuickLaunchBand.cpp | 74 +- base/shell/rshell/CQuickLaunchBand.h | 30 +- base/shell/rshell/misc.cpp | 2 +- base/system/diskpart/list.c | 2 +- base/system/smss/smsessn.c | 2 +- base/system/userinit/livecd.c | 4 +- base/system/winlogon/sas.c | 4 +- base/system/winlogon/winlogon.h | 2 +- boot/armllb/boot.s | 4 +- boot/armllb/crtsupp.c | 2 +- boot/armllb/envir.c | 40 +- boot/armllb/fw.c | 8 +- boot/armllb/hw/keyboard.c | 24 +- boot/armllb/hw/matrix.c | 6 +- boot/armllb/hw/omap3-beagle/hwinfo.c | 16 +- boot/armllb/hw/omap3-beagle/hwuart.c | 6 +- boot/armllb/hw/omap3-zoom2/hwinfo.c | 4 +- boot/armllb/hw/omap3-zoom2/hwinit.c | 14 +- boot/armllb/hw/omap3-zoom2/hwlcd.c | 10 +- boot/armllb/hw/omap3-zoom2/hwsynkp.c | 12 +- boot/armllb/hw/omap3-zoom2/hwtwl40x.c | 4 +- boot/armllb/hw/omap3-zoom2/hwuart.c | 2 +- boot/armllb/hw/serial.c | 4 +- boot/armllb/hw/time.c | 6 +- boot/armllb/hw/versatile/hwclcd.c | 6 +- boot/armllb/hw/versatile/hwinfo.c | 12 +- boot/armllb/hw/versatile/hwinit.c | 14 +- boot/armllb/hw/versatile/hwkmi.c | 12 +- boot/armllb/hw/versatile/hwuart.c | 16 +- boot/armllb/hw/video.c | 16 +- boot/armllb/inc/fw.h | 2 +- boot/armllb/inc/hw.h | 6 +- boot/armllb/inc/video.h | 2 +- boot/armllb/main.c | 4 +- boot/armllb/os/loader.c | 38 +- boot/bootdata/bootcdregtest/testboot.bat.sample | 6 +- boot/bootdata/bootcdregtest/unattend.inf | 4 +- boot/bootdata/hivesft.inf | 2 +- boot/environ/app/bootmgr/bootmgr.c | 10 +- boot/environ/app/bootmgr/efiemu.c | 16 +- boot/environ/app/rosload/rosload.c | 2 +- boot/environ/app/rosload/roslogo.c | 19380 +++++++++---------- boot/environ/include/bl.h | 6 +- boot/environ/lib/arch/i386/transfer.s | 2 +- boot/environ/lib/bootlib.c | 2 +- boot/environ/lib/firmware/efi/firmware.c | 10 +- boot/environ/lib/io/device.c | 4 +- boot/environ/lib/io/display/display.c | 2 +- boot/environ/lib/io/display/efi/textcons.c | 8 +- boot/environ/lib/io/display/guicons.c | 4 +- boot/environ/lib/io/display/textcons.c | 2 +- boot/environ/lib/io/etfs.c | 6 +- boot/environ/lib/io/file.c | 2 +- boot/environ/lib/misc/bcd.c | 16 +- boot/environ/lib/misc/bootreg.c | 2 +- boot/environ/lib/misc/font.c | 6 +- boot/environ/lib/misc/image.c | 12 +- boot/environ/lib/misc/resource.c | 8 +- boot/environ/lib/misc/util.c | 2 +- boot/environ/lib/mm/descriptor.c | 22 +- boot/environ/lib/mm/i386/mmx86.c | 10 +- boot/environ/lib/mm/mm.c | 8 +- boot/environ/lib/mm/pagealloc.c | 16 +- boot/environ/lib/mm/stub/mm.c | 4 +- boot/freeldr/bootsect/btrfs.S | 2 +- boot/freeldr/bootsect/ofwboot.s | 286 +- boot/freeldr/freeldr/arch/i386/xbox/machxbox.c | 2 +- boot/freeldr/freeldr/lib/fs/fat.c | 4 +- boot/freeldr/freeldr/lib/fs/fs.c | 2 +- dll/appcompat/apphelp/apphelp.c | 8 +- dll/appcompat/apphelp/sdbfileattr.c | 4 +- dll/appcompat/apphelp/sdbread.c | 2 +- dll/appcompat/apphelp/sdbstringtable.h | 4 +- dll/appcompat/apphelp/sdbwrite.c | 6 +- dll/cpl/appwiz/removestartmenuitems.c | 4 +- dll/cpl/desk/appearance.c | 6 +- dll/cpl/desk/appearance.h | 20 +- dll/cpl/desk/theme.c | 8 +- dll/cpl/inetcpl/resources/Icon_Licence/Tango.txt | 4 +- dll/cpl/input/settings_page.c | 6 +- dll/cpl/mmsys/mmsys.h | 2 +- dll/cpl/openglcfg/general.c | 6 +- dll/cpl/powercfg/powershemes.c | 12 +- dll/cpl/sysdm/general.c | 2 +- dll/cpl/sysdm/userprofile.c | 16 +- dll/cpl/timedate/clock.c | 4 +- dll/cpl/timedate/internettime.c | 2 +- dll/cpl/timedate/monthcal.c | 4 +- dll/cpl/usrmgr/groupprops.c | 2 +- dll/cpl/usrmgr/userprops.c | 10 +- dll/directx/bdaplgin/bdaplgin.cpp | 8 +- dll/directx/bdaplgin/classfactory.cpp | 6 +- dll/directx/bdaplgin/devicecontrol.cpp | 2 +- dll/directx/bdaplgin/pincontrol.cpp | 2 +- dll/directx/d3d9/adapter.c | 6 +- dll/directx/d3d9/d3d9_callbacks.c | 2 +- dll/directx/d3d9/d3d9_caps.c | 14 +- dll/directx/d3d9/d3d9_create.c | 4 +- dll/directx/d3d9/d3d9_cursor.c | 2 +- dll/directx/d3d9/d3d9_device.c | 4 +- dll/directx/d3d9/d3d9_device.h | 2 +- dll/directx/d3d9/d3d9_helpers.c | 4 +- dll/directx/d3d9/d3d9_mipmap.c | 4 +- dll/directx/d3d9/d3d9_puredevice.h | 216 +- dll/directx/d3d9/d3d9_swapchain.c | 4 +- dll/directx/d3d9/d3d9_texture.c | 2 +- dll/directx/d3d9/format.c | 4 +- dll/directx/ddraw/CMakeLists.txt | 2 +- dll/directx/ddraw/Surface/surface_main.c | 4 +- dll/directx/ddraw/ddraw_structures.txt | 10 +- dll/directx/dsound_new/capture.c | 4 +- dll/directx/dsound_new/classfactory.c | 6 +- dll/directx/dsound_new/devicelist.c | 4 +- dll/directx/dsound_new/directsound.c | 4 +- dll/directx/dsound_new/dsound.c | 8 +- dll/directx/dsound_new/precomp.h | 10 +- dll/directx/dsound_new/primary.c | 12 +- dll/directx/dsound_new/secondary.c | 6 +- dll/directx/ksproxy/allocator.cpp | 4 +- dll/directx/ksproxy/classfactory.cpp | 6 +- dll/directx/ksproxy/cvpconfig.cpp | 4 +- dll/directx/ksproxy/cvpvbiconfig.cpp | 4 +- dll/directx/ksproxy/datatype.cpp | 2 +- dll/directx/ksproxy/input_pin.cpp | 6 +- dll/directx/ksproxy/ksproxy.cpp | 8 +- dll/directx/ksproxy/mediasample.cpp | 4 +- dll/directx/ksproxy/precomp.h | 4 +- dll/directx/ksproxy/proxy.cpp | 4 +- dll/directx/ksproxy/qualityforward.cpp | 2 +- dll/directx/ksuser/ksuser.c | 26 +- dll/directx/msdvbnp/classfactory.cpp | 6 +- dll/directx/msdvbnp/msdvbnp.cpp | 4 +- dll/directx/msdvbnp/networkprovider.cpp | 2 +- dll/directx/msdvbnp/scanningtuner.cpp | 2 +- dll/directx/msvidctl/classfactory.cpp | 6 +- dll/directx/msvidctl/msvidctl.cpp | 8 +- dll/directx/wine/readme.txt | 27 +- dll/directx/wine/wined3d/roshacks.txt | 2 +- dll/keyboard/kbdbga/kbdbga.c | 28 +- dll/keyboard/kbdbgm/kbdbgm.c | 28 +- dll/keyboard/kbdbgt/kbdbgt.c | 30 +- dll/keyboard/kbdheb/kbdheb.c | 2 +- dll/keyboard/kbdko/kbdko.c | 4 +- dll/keyboard/kbdpl/kbdpl.c | 2 +- dll/keyboard/kbdsk/kbdsk.c | 2 +- dll/keyboard/kbdsk1/kbdsk1.c | 2 +- dll/nls/normaliz/CMakeLists.txt | 2 +- dll/ntdll/dbg/dbgui.c | 2 +- dll/ntdll/dispatch/amd64/dispatch.S | 2 +- dll/ntdll/include/ntdllp.h | 2 +- dll/ntdll/ldr/ldrutils.c | 2 +- dll/ntdll/ldr/verifier.c | 2 +- dll/ntdll/rtl/libsupp.c | 2 +- dll/opengl/mesa/CMakeLists.txt | 2 +- dll/opengl/opengl32/glfuncs.h | 2 +- dll/opengl/opengl32/icd.h | 6 +- dll/opengl/opengl32/icdload.c | 34 +- dll/opengl/opengl32/opengl32.h | 8 +- dll/opengl/opengl32/opengl32.spec | 642 +- dll/opengl/opengl32/swimpl.c | 48 +- dll/opengl/opengl32/wgl.c | 144 +- dll/shellext/fontext/CEnumFonts.cpp | 2 +- dll/shellext/netshell/README | 20 +- dll/shellext/netshell/lanconnectui.cpp | 4 +- dll/shellext/netshell/lanconnectui.h | 2 +- dll/shellext/netshell/lanstatusui.cpp | 8 +- dll/shellext/netshell/shfldr_netconnect.cpp | 12 +- dll/shellext/ntobjshex/foldercommon.h | 12 +- dll/shellext/ntobjshex/ntobjenum.h | 2 +- dll/shellext/ntobjshex/ntobjfolder.cpp | 4 +- dll/shellext/ntobjshex/regfolder.cpp | 2 +- dll/shellext/stobject/hotplug.cpp | 2 +- dll/shellext/stobject/power.cpp | 10 +- dll/shellext/zipfldr/CEnumZipContents.cpp | 2 +- dll/shellext/zipfldr/CZipExtract.cpp | 2 +- dll/shellext/zipfldr/CZipFolder.hpp | 2 +- dll/win32/advapi32/misc/hwprofiles.c | 6 +- dll/win32/advapi32/sec/sec.c | 2 +- dll/win32/avicap32/avicap32.c | 2 +- dll/win32/browseui/CProgressDialog.cpp | 16 +- dll/win32/browseui/addresseditbox.cpp | 14 +- dll/win32/browseui/basebarsite.cpp | 12 +- dll/win32/browseui/browseui.cpp | 2 +- dll/win32/browseui/desktopipc.cpp | 8 +- dll/win32/browseui/explorerband.cpp | 8 +- dll/win32/browseui/explorerband.h | 2 +- dll/win32/browseui/internettoolbar.cpp | 16 +- dll/win32/browseui/shellbars/CBandSite.cpp | 2 +- dll/win32/browseui/shellbars/CBandSiteMenu.cpp | 6 +- dll/win32/browseui/shellbars/CISFBand.cpp | 154 +- dll/win32/browseui/shellbars/CISFBand.h | 42 +- dll/win32/browseui/shellbrowser.cpp | 14 +- dll/win32/browseui/shellfind/CFindFolder.cpp | 2 +- dll/win32/browseui/toolsband.cpp | 6 +- dll/win32/browseui/travellog.cpp | 4 +- dll/win32/cards/COPYING | 18 +- dll/win32/dbghelp/rosstubs.c | 6 +- dll/win32/devmgr/api.cpp | 2 +- dll/win32/devmgr/devmgmt/ClassNode.cpp | 2 +- dll/win32/devmgr/devmgmt/DeviceNode.cpp | 2 +- dll/win32/devmgr/devmgmt/DeviceNode.h | 2 +- dll/win32/devmgr/devmgmt/DeviceView.cpp | 22 +- dll/win32/devmgr/devmgmt/MainWindow.cpp | 8 +- dll/win32/devmgr/devmgmt/RootNode.cpp | 4 +- dll/win32/devmgr/properties/hwpage.cpp | 2 +- dll/win32/fltlib/fltlib.c | 2 +- dll/win32/fltlib/stubs.c | 2 +- dll/win32/getuname/getuname.c | 2 +- dll/win32/inetmib1/CMakeLists.txt | 2 +- dll/win32/iphlpapi/address.c | 4 +- dll/win32/iphlpapi/ipstats_reactos.c | 2 +- dll/win32/iphlpapi/registry.c | 30 +- dll/win32/iphlpapi/resinfo_reactos.c | 2 +- dll/win32/kernel32/client/console/console.c | 12 +- dll/win32/kernel32/client/debugger.c | 4 +- dll/win32/kernel32/client/dllmain.c | 2 +- dll/win32/kernel32/client/file/cnotify.c | 2 +- dll/win32/kernel32/client/file/create.c | 2 +- dll/win32/kernel32/client/file/deviceio.c | 2 +- dll/win32/kernel32/client/file/dir.c | 4 +- dll/win32/kernel32/client/file/filename.c | 20 +- dll/win32/kernel32/client/file/mntpoint.c | 4 +- dll/win32/kernel32/client/file/move.c | 2 +- dll/win32/kernel32/client/file/volume.c | 4 +- dll/win32/kernel32/client/i386/thread.S | 6 +- dll/win32/kernel32/client/perfcnt.c | 4 +- dll/win32/kernel32/client/resntfy.c | 4 +- dll/win32/kernel32/client/synch.c | 4 +- dll/win32/kernel32/client/sysinfo.c | 8 +- dll/win32/kernel32/client/vdm.c | 2 +- dll/win32/kernel32/kernel32_vista/vista.c | 6 +- dll/win32/kernel32/wine/actctx.c | 2 +- dll/win32/kernel32/winnls/string/japanese.c | 2 +- dll/win32/lpk/ros_lpk.h | 6 +- dll/win32/lpk/stub.c | 4 +- dll/win32/mmdrv/auxil.c | 18 +- dll/win32/mmdrv/midi.c | 94 +- dll/win32/mmdrv/utils.c | 46 +- dll/win32/modemui/modemui.c | 4 +- dll/win32/msafd/include/helpers.h | 28 +- dll/win32/msafd/misc/dllmain.c | 2 +- dll/win32/msgina/gui.c | 14 +- dll/win32/msgina/msgina.c | 4 +- dll/win32/msgina/resource.h | 2 +- dll/win32/msgina/shutdown.c | 36 +- dll/win32/msports/classinst.c | 2 +- dll/win32/mstask/stubs.c | 8 +- dll/win32/mswsock/nsplookup.c | 2 +- dll/win32/mswsock/stubs.c | 2 +- dll/win32/netcfgx/classfactory.c | 6 +- dll/win32/netcfgx/netcfg_iface.c | 4 +- dll/win32/netcfgx/res/Icon_Licence/Tango.txt | 2 +- dll/win32/netcfgx/resource.h | 2 +- dll/win32/netcfgx/tcpipconf_notify.c | 38 +- dll/win32/newdev/stubs.c | 2 +- dll/win32/ntlanman/ntlanman.spec | 2 +- dll/win32/powrprof/powrprof.c | 10 +- dll/win32/profmap/profmap.c | 4 +- dll/win32/psapi/psapi.c | 2 +- dll/win32/samsrv/security.c | 24 +- dll/win32/schannel/schannel_mbedtls_lazyload.h | 4 +- dll/win32/setupapi/CMakeLists.txt | 2 +- dll/win32/setupapi/devclass.c | 4 +- dll/win32/setupapi/res/Icon_Licence/Tango.txt | 4 +- dll/win32/shell32/CDefView.cpp | 44 +- dll/win32/shell32/CDefViewBckgrndMenu.cpp | 12 +- dll/win32/shell32/CDefaultContextMenu.cpp | 2 +- dll/win32/shell32/CFolderOptions.h | 2 +- dll/win32/shell32/CIDLDataObj.cpp | 4 +- dll/win32/shell32/CQueryAssociations.cpp | 46 +- dll/win32/shell32/CQueryAssociations.h | 6 +- dll/win32/shell32/dialogs/dialogs.cpp | 8 +- dll/win32/shell32/dialogs/drive.cpp | 2 +- dll/win32/shell32/dialogs/drvdefext.cpp | 8 +- dll/win32/shell32/dialogs/filedefext.cpp | 6 +- dll/win32/shell32/dialogs/filedefext.h | 2 +- dll/win32/shell32/dialogs/general.cpp | 8 +- dll/win32/shell32/droptargets/CFSDropTarget.cpp | 26 +- dll/win32/shell32/droptargets/CFSDropTarget.h | 2 +- dll/win32/shell32/droptargets/CexeDropHandler.cpp | 4 +- dll/win32/shell32/folders/CAdminToolsFolder.cpp | 6 +- dll/win32/shell32/folders/CControlPanelFolder.cpp | 18 +- dll/win32/shell32/folders/CDesktopFolder.cpp | 8 +- dll/win32/shell32/folders/CDrivesFolder.cpp | 10 +- dll/win32/shell32/folders/CFSFolder.cpp | 24 +- dll/win32/shell32/folders/CFSFolder.h | 2 +- dll/win32/shell32/folders/CFontsFolder.cpp | 4 +- dll/win32/shell32/folders/CRegFolder.cpp | 4 +- dll/win32/shell32/iconcache.cpp | 46 +- dll/win32/shell32/res/avis/Licence/Tango.txt | 3 +- dll/win32/shell32/res/icons/Icon_Licence/Tango.txt | 2 +- dll/win32/shell32/res/rgs/openwithmenu.rgs | 2 +- dll/win32/shell32/shellmenu/CMenuBand.cpp | 6 +- dll/win32/shell32/shellmenu/CMenuDeskBar.cpp | 8 +- dll/win32/shell32/shellmenu/CMenuFocusManager.cpp | 6 +- dll/win32/shell32/shellmenu/CMenuSite.h | 2 +- dll/win32/shell32/shellmenu/CMenuToolbars.cpp | 12 +- dll/win32/shell32/shellmenu/CMenuToolbars.h | 2 +- dll/win32/shell32/shellmenu/CMergedFolder.cpp | 12 +- dll/win32/shell32/shfldr.h | 2 +- dll/win32/shell32/shlexec.cpp | 4 +- dll/win32/shell32/shlfileop.cpp | 26 +- dll/win32/shell32/shlfolder.cpp | 8 +- dll/win32/shimgvw/shimgvw.c | 2 +- dll/win32/streamci/streamci.c | 8 +- dll/win32/syssetup/wizard.c | 2 +- dll/win32/uxtheme/themehooks.c | 54 +- dll/win32/uxtheme/uxthemep.h | 10 +- dll/win32/wdmaud.drv/mmixer.c | 30 +- dll/win32/winsta/misc.c | 4 +- dll/win32/winsta/server.c | 4 +- dll/win32/winsta/ws.c | 4 +- dll/win32/wlanapi/main.c | 14 +- dll/win32/wlanapi/profile.c | 14 +- dll/win32/ws2help/apc.c | 4 +- dll/win32/ws2help/context.c | 10 +- dll/win32/ws2help/dllmain.c | 10 +- dll/win32/ws2help/handle.c | 22 +- dll/win32/ws2help/notify.c | 2 +- dll/win32/wshtcpip/iflist.c | 50 +- drivers/filesystems/fastfat/vfat005.1st | 2 +- drivers/filesystems/fastfat/vfat_fr.txt | 6 +- drivers/input/sermouse/sermouse.txt | 14 +- drivers/storage/ide/atapi/license.txt | 2 +- drivers/wdm/audio/backpln/portcls/private.hpp | 10 +- hal/halx86/pic/pic.c | 2 +- media/doc/DdCreateDirectDrawObject.txt | 26 +- media/doc/DdDeleteDirectDrawObject.txt | 10 +- media/doc/HACKING | 54 +- media/doc/INTERNALS | 12 +- media/doc/LPC.txt | 4 +- media/doc/apc | 12 +- media/doc/irp cancel boilerplate.c | 76 +- media/doc/news1 | 2 +- media/doc/news2 | 6 +- media/doc/notes | 38 +- media/doc/todo | 8 +- media/doc/winsta and desktops.txt | 36 +- media/drivers/etc/networks | 2 +- media/drivers/etc/services | 1112 +- media/inf/defltsv.inf | 2 +- media/inf/defltwk.inf | 2 +- media/inf/nettcpip.inf | 30 +- media/inf/shortcuts.inf | 24 +- media/inf/syssetup.inf.tpl | 2 +- media/sdb/CMakeLists.txt | 2 +- media/vgafonts/CMakeLists.txt | 2 +- .../devutils/btrfstools/btrfs_structures.py | 14 +- .../devutils/vgafontedit/fileformats.txt | 13 +- .../applications/fraginator/DriveVolume.cpp | 2 +- modules/rosapps/applications/fraginator/Mutex.h | 6 +- modules/rosapps/applications/notevil/readme.txt | 2 +- .../screensavers/butterflies/butterflies.c | 2 +- .../applications/screensavers/circles/circles.c | 8 +- .../applications/screensavers/mazescr/maze.c | 4 +- .../applications/screensavers/ssstars/settings.c | 6 +- .../applications/screensavers/ssstars/ssstars.c | 2 +- .../applications/sysutils/fontsub/fontsub.cpp | 6 +- .../applications/sysutils/fontsub/resource.h | 4 +- modules/rosapps/applications/sysutils/man/man.cmd | 14 +- .../applications/sysutils/man/man/2/chkdsk.man | 2 +- .../applications/sysutils/man/man/2/chklib.man | 2 +- .../applications/sysutils/man/man/2/format.man | 6 +- .../applications/sysutils/man/man/2/man.man | 8 +- .../applications/sysutils/man/man/2/ping.man | 6 +- .../applications/sysutils/man/man/3/taskmgr.man | 6 +- .../rosapps/applications/sysutils/man/man/man.1 | 14 +- .../applications/sysutils/systeminfo/systeminfo.c | 8 +- modules/rosapps/applications/winfile/winefile.c | 2 +- modules/rosapps/drivers/vcdrom/vcdrom.c | 14 +- modules/rosapps/readme.txt | 4 +- modules/rosapps/templates/mdi/childwnd.c | 2 +- .../rosapps/templates/skel_service/ServiceMain.c | 2 +- modules/rosapps/templates/skel_service/log.c | 4 +- modules/rostests/apitests/advapi32/svchlp.c | 4 +- modules/rostests/apitests/apphelp/data.c | 4 +- modules/rostests/apitests/atl/CImage.cpp | 2 +- modules/rostests/apitests/comctl32/button.c | 34 +- modules/rostests/apitests/crt/__rt_div.c | 8 +- modules/rostests/apitests/crt/_vsnprintf.c | 2 +- modules/rostests/apitests/crt/dll_startup.h | 2 +- modules/rostests/apitests/dbghelp/rsym.c | 2 +- modules/rostests/apitests/dnsapi/DnsQuery.c | 4 +- .../rostests/apitests/gdi32/CreateFontIndirect.c | 4 +- modules/rostests/apitests/gdi32/DPtoLP.c | 2 +- .../rostests/apitests/gdi32/GetFontResourceInfoW.c | 2 +- modules/rostests/apitests/gdi32/LPtoDP.c | 2 +- modules/rostests/apitests/gdi32/Rectangle.c | 30 +- modules/rostests/apitests/gdi32/SetLayout.c | 2 +- modules/rostests/apitests/gdi32/StretchBlt.c | 12 +- modules/rostests/apitests/include/msgtrace.c | 12 +- modules/rostests/apitests/iphlpapi/icmp.c | 4 +- modules/rostests/apitests/kernel32/DefaultActCtx.c | 46 +- .../apitests/kernel32/FindActCtxSectionStringW.c | 42 +- modules/rostests/apitests/kernel32/GetDriveType.c | 2 +- modules/rostests/apitests/kernel32/TunnelCache.c | 6 +- .../apitests/kernel32/WideCharToMultiByte.c | 4 +- .../rostests/apitests/kernel32/deptest.manifest | 4 +- modules/rostests/apitests/kernel32/lstrcpynW.c | 6 +- .../kernel32/redirptest/redir2dep.manifest | 4 +- modules/rostests/apitests/localspl/tests.c | 2 +- .../rostests/apitests/ntdll/NtFreeVirtualMemory.c | 36 +- modules/rostests/apitests/ntdll/NtLoadUnloadKey.c | 2 +- .../rostests/apitests/ntdll/NtOpenThreadToken.c | 2 +- .../apitests/ntdll/NtQuerySystemInformation.c | 2 +- .../rostests/apitests/ntdll/RtlCopyMappedMemory.c | 2 +- .../rostests/apitests/ntdll/RtlQueryTimeZoneInfo.c | 6 +- modules/rostests/apitests/ntdll/probelib.c | 2 +- modules/rostests/apitests/ole32/initializespy.cpp | 2 +- modules/rostests/apitests/ole32/testlist.c | 2 +- .../rostests/apitests/opengl32/sw_pixelformat.c | 16 +- modules/rostests/apitests/opengl32/testlist.c | 2 +- modules/rostests/apitests/shell32/CFSFolder.cpp | 16 +- .../rostests/apitests/shell32/CShellDesktop.cpp | 2 +- modules/rostests/apitests/shell32/CShellLink.cpp | 2 +- .../apitests/shell32/CUserNotification.cpp | 2 +- .../rostests/apitests/shell32/Control_RunDLLW.cpp | 4 +- modules/rostests/apitests/shell32/PathResolve.cpp | 4 +- .../apitests/shell32/SHParseDisplayName.cpp | 8 +- .../rostests/apitests/shell32/ShellExecuteEx.cpp | 2 +- .../rostests/apitests/shell32/ShellExecuteW.cpp | 4 +- modules/rostests/apitests/shell32/menu.cpp | 32 +- modules/rostests/apitests/spoolss/PackStrings.c | 2 +- .../rostests/apitests/user32/AttachThreadInput.c | 48 +- .../apitests/user32/CreateIconFromResourceEx.c | 34 +- modules/rostests/apitests/user32/DeferWindowPos.c | 10 +- .../rostests/apitests/user32/DestroyCursorIcon.c | 16 +- modules/rostests/apitests/user32/DrawIconEx.c | 16 +- modules/rostests/apitests/user32/GetIconInfo.c | 12 +- modules/rostests/apitests/user32/GetKeyState.c | 36 +- .../rostests/apitests/user32/InitializeLpkHooks.c | 2 +- modules/rostests/apitests/user32/LoadImage.c | 10 +- .../apitests/user32/LookupIconIdFromDirectoryEx.c | 18 +- modules/rostests/apitests/user32/RegisterClassEx.c | 18 +- modules/rostests/apitests/user32/SetActiveWindow.c | 2 +- .../apitests/user32/SystemParametersInfo.c | 2 +- modules/rostests/apitests/user32/TrackMouseEvent.c | 12 +- .../apitests/uxtheme/DrawThemeParentBackground.c | 6 +- .../apitests/uxtheme/SetThemeAppProperties.c | 12 +- modules/rostests/apitests/win32nt/w32knapi.c | 2 +- .../rostests/apitests/win32u/win32u_2k3sp2/main.c | 6 +- .../rostests/apitests/win32u/win32u_vista/main.c | 6 +- .../apitests/win32u/win32u_xpsp2/CMakeLists.txt | 2 +- modules/rostests/apitests/winhttp/WinHttpOpen.c | 2 +- modules/rostests/apitests/wininet/InternetOpen.c | 2 +- modules/rostests/apitests/winprint/main.c | 2 +- .../rostests/apitests/winspool/IsValidDevmode.c | 2 +- modules/rostests/apitests/wlanapi/wlanapi.c | 22 +- modules/rostests/apitests/ws2_32/WSAAsync.c | 4 +- modules/rostests/apitests/ws2_32/WSAIoctl.c | 24 +- modules/rostests/apitests/ws2_32/close.c | 2 +- modules/rostests/apitests/ws2_32/helpers.c | 4 +- modules/rostests/apitests/ws2_32/nonblocking.c | 2 +- modules/rostests/dibtests/bltrop/bltrop.c | 6 +- modules/rostests/dibtests/vbltest/vbltest.c | 8 +- .../win32kdxtest/NtGdiDdQueryDirectDrawObject.c | 14 +- modules/rostests/dxtest/win32kdxtest/dump.c | 212 +- modules/rostests/dxtest/win32kdxtest/main.c | 4 +- .../fltmgr/fltmgr_register/fltmgr_register.c | 6 +- modules/rostests/kmtests/hal/HalSystemInfo.c | 2 +- .../rostests/kmtests/ntos_cc/CcPinMappedData_drv.c | 2 +- modules/rostests/kmtests/ntos_ex/ExSequencedList.c | 2 +- modules/rostests/kmtests/ntos_ex/ExSingleList.c | 6 +- modules/rostests/kmtests/ntos_ex/ExXList.h | 4 +- modules/rostests/kmtests/ntos_fsrtl/FsRtlTunnel.c | 8 +- .../kmtests/ntos_mm/MmMapLockedPagesSpecifyCache.h | 2 +- .../rostests/kmtests/ntos_se/SeQueryInfoToken.c | 8 +- modules/rostests/kmtests/rtl/RtlMemory.c | 2 +- modules/rostests/kmtests/rtl/RtlStrSafe.c | 2 +- modules/rostests/regtests/crt/iofuncs.c | 10 +- modules/rostests/regtests/gdi/xlate.c | 10 +- modules/rostests/testdata/old/ReadMe.txt | 16 +- modules/rostests/tests/README.txt | 2 +- modules/rostests/tests/mmixer_test/test.c | 2 +- modules/rostests/tests/parttest/parttest.c | 2 +- .../rostests/tests/spec2def/testdata/06-stubs.asm | 2 +- .../rostests/tests/spec2def/testdata/07-stubs.asm | 2 +- .../win32/DriverLoading/Application/main.c | 2 +- .../win32/DriverLoading/Application/undoc.c | 2 +- .../win32/comctl32/buttonvistest/buttonvistest.cpp | 14 +- .../kernel32/notificationtest/notificationtest.c | 104 +- modules/rostests/win32/user32/biditext/biditext.c | 4 +- modules/rostests/win32/user32/psmtest/psmtest.c | 4 +- modules/wallpapers/ReadMe.txt | 2 +- modules/wallpapers/Silhouette/README.md | 2 +- modules/wallpapers/wallpapers.txt | 4 +- ntoskrnl/include/internal/i386/callconv.s | 8 +- ntoskrnl/include/internal/se.h | 4 +- ntoskrnl/se/access.c | 104 +- ntoskrnl/se/accesschk.c | 138 +- ntoskrnl/se/acl.c | 84 +- ntoskrnl/se/audit.c | 480 +- ntoskrnl/se/priv.c | 112 +- ntoskrnl/se/sd.c | 136 +- ntoskrnl/se/semgr.c | 48 +- ntoskrnl/se/sid.c | 40 +- ntoskrnl/se/sqos.c | 14 +- ntoskrnl/se/srm.c | 20 +- ntoskrnl/se/token.c | 258 +- sdk/include/c++/limits | 34 +- sdk/include/psdk/common.ver | 30 +- sdk/include/reactos/idl/dnsrslvr.idl | 2 +- sdk/include/reactos/idl/srvsvc.idl | 2 +- sdk/include/reactos/idl/winspool.idl | 2 +- sdk/include/reactos/idl/wlansvc.idl | 6 +- sdk/lib/cpprt/arm/cpprt.s | 2 +- sdk/lib/crt/conio/conio.cmake | 2 +- sdk/lib/crt/direct/direct.cmake | 2 +- sdk/lib/crt/except/i386/chkesp.s | 6 +- sdk/lib/crt/math/i386/alldvrm_asm.s | 16 +- sdk/lib/crt/math/i386/allmul_asm.s | 14 +- sdk/lib/crt/math/i386/allrem_asm.s | 16 +- sdk/lib/crt/math/i386/allshl_asm.s | 14 +- sdk/lib/crt/math/i386/allshr_asm.s | 16 +- sdk/lib/crt/math/i386/atan_asm.s | 16 +- sdk/lib/crt/math/i386/aulldiv_asm.s | 14 +- sdk/lib/crt/math/i386/aulldvrm_asm.s | 16 +- sdk/lib/crt/math/i386/aullrem_asm.s | 16 +- sdk/lib/crt/math/i386/aullshr_asm.s | 16 +- sdk/lib/crt/math/i386/ceil_asm.s | 14 +- sdk/lib/crt/math/i386/cos_asm.s | 14 +- sdk/lib/crt/math/i386/exp_asm.s | 2 +- sdk/lib/crt/math/i386/fabs_asm.s | 16 +- sdk/lib/crt/math/i386/floor_asm.s | 16 +- sdk/lib/crt/math/i386/fmod_asm.s | 2 +- sdk/lib/crt/math/i386/fmodf_asm.s | 2 +- sdk/lib/crt/math/i386/ftol2_asm.s | 4 +- sdk/lib/crt/math/i386/ftol_asm.s | 26 +- sdk/lib/crt/math/i386/log10_asm.s | 4 +- sdk/lib/crt/math/i386/log_asm.s | 16 +- sdk/lib/crt/math/i386/sin_asm.s | 14 +- sdk/lib/crt/math/i386/sqrt_asm.s | 16 +- sdk/lib/crt/math/i386/tan_asm.s | 16 +- sdk/lib/crt/mem/i386/memset_asm.s | 2 +- sdk/lib/crt/msvcrtex.cmake | 2 +- sdk/lib/tdilib/CMakeLists.txt | 2 +- sdk/tools/create_nls/unicode.org/ReactOS/ReadMe | 8 +- sdk/tools/kbdtool/test.klc | 2 +- sdk/tools/rgenstat/web/rapistatus.js | 6 +- subsystems/mvdm/config/AUTOEXEC.NT | 2 +- subsystems/mvdm/ntvdm/bios/bios32/bios32.c | 2 +- subsystems/mvdm/ntvdm/bios/bios32/vbe.c | 2 +- subsystems/mvdm/ntvdm/clock.c | 2 +- subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c | 2 +- subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c | 4 +- subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c | 2 +- subsystems/mvdm/ntvdm/hardware/video/svga.c | 2 +- win32ss/drivers/displays/framebufacc/screen.c | 4 +- win32ss/drivers/displays/framebufacc/surface.c | 12 +- win32ss/drivers/displays/vga/main/enable.c | 4 +- win32ss/drivers/displays/vga/objects/bitblt.c | 4 +- win32ss/drivers/displays/vga/objects/copybits.c | 4 +- win32ss/drivers/displays/vga/objects/lineto.c | 2 +- win32ss/drivers/displays/vga/vgavideo/vgavideo.c | 6 +- win32ss/drivers/font/ftfd/enable.c | 2 +- win32ss/drivers/videoprt/child.c | 4 +- win32ss/drivers/videoprt/dma.c | 4 +- win32ss/drivers/videoprt/resource.c | 68 +- win32ss/gdi/dib/dib16bpp.c | 6 +- win32ss/gdi/dib/dib24bpp.c | 4 +- win32ss/gdi/dib/dib32bpp.c | 6 +- win32ss/gdi/dib/dib4bpp.c | 8 +- win32ss/gdi/dib/dib8bpp.c | 12 +- win32ss/gdi/dib/floodfill.c | 32 +- win32ss/gdi/dib/i386/dib24bpp_hline.s | 2 +- win32ss/gdi/dib/i386/dib32bpp_colorfill.s | 2 +- win32ss/gdi/dib/i386/dib32bpp_hline.s | 10 +- win32ss/gdi/eng/debug.c | 2 +- win32ss/gdi/eng/floatobj.h | 4 +- win32ss/gdi/eng/stretchblt.c | 4 +- win32ss/gdi/gdi32/CMakeLists.txt | 2 +- win32ss/gdi/gdi32/include/gdi32p.h | 2 +- win32ss/gdi/gdi32/misc/misc.c | 88 +- win32ss/gdi/gdi32/objects/font.c | 2 +- win32ss/gdi/gdi32/objects/utils.c | 8 +- win32ss/gdi/ntgdi/bitblt.c | 4 +- win32ss/gdi/ntgdi/dibobj.c | 2 +- win32ss/gdi/ntgdi/freetype.c | 12 +- win32ss/gdi/ntgdi/intgdi.h | 2 +- win32ss/gdi/ntgdi/text.c | 2 +- win32ss/include/ntuser.h | 6 +- win32ss/printing/base/winspool/printers.c | 2 +- win32ss/printing/processors/winprint/raw.c | 2 +- win32ss/printing/providers/localspl/jobs.c | 2 +- win32ss/printing/providers/localspl/printers.c | 2 +- .../printing/providers/localspl/printprocessors.c | 2 +- win32ss/user/ntuser/console.c | 2 +- win32ss/user/ntuser/csr.c | 6 +- win32ss/user/ntuser/csr.h | 2 +- win32ss/user/ntuser/guicheck.c | 2 +- win32ss/user/ntuser/sysparams.c | 2 +- win32ss/user/user32/include/user_x.h | 14 +- win32ss/user/winsrv/consrv/condrv/graphics.c | 2 +- win32ss/user/winsrv/consrv/shutdown.c | 4 +- win32ss/user/winsrv/usersrv/shutdown.c | 2 +- 701 files changed, 14680 insertions(+), 14688 deletions(-)
diff --git a/.gitmessage b/.gitmessage index 75664741dee..3dc13d23c44 100644 --- a/.gitmessage +++ b/.gitmessage @@ -4,9 +4,9 @@ # [MODULE] A short but descriptive summary (#pr-num) # # A comprehensible description of WHY you did this work. Do not limit -# yourself here. -# The width of the description is arbitary, but it is a good idea to -# wrap the text by 72 chars. +# yourself here. +# The width of the description is arbitary, but it is a good idea to +# wrap the text by 72 chars. # # CORE-XXXX CIDXXXXX # ---------------------- @@ -17,6 +17,6 @@ # * Description of a commit should explain WHY a change was made. # * JIRA, Coverity ID references should be placed at the bottom row. # * There must be a newline between summary, description and bug IDs. -# * GitHub Pull Request ID should be referenced in the summary in -# parens. If the resulting summary is longer than 70 chars it may +# * GitHub Pull Request ID should be referenced in the summary in +# parens. If the resulting summary is longer than 70 chars it may # be placed last in the ID row to prevent hard wrapping on GitHub. diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index 5e090eb7cdf..1fda5743294 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -1,5 +1,5 @@ FROM gitpod/workspace-full-vnc - + USER gitpod
# Install custom tools, runtime, etc. using apt-get diff --git a/COPYING.ARM b/COPYING.ARM index 90d23b3263b..10be3e134fc 100644 --- a/COPYING.ARM +++ b/COPYING.ARM @@ -1,12 +1,12 @@ -Copyright 2008 ReactOS Portable Systems Group. All rights reserved. +Copyright 2008 ReactOS Portable Systems Group. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted provided -that the following conditions are met: +that the following conditions are met: 1. Redistributions of source code must retain the above copyright notice, this list of conditions and - the following disclaimer. + the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions - and the following disclaimer in the documentation and/or other materials provided with the - distribution. + and the following disclaimer in the documentation and/or other materials provided with the + distribution.
THIS SOFTWARE IS PROVIDED BY THE REACTOS PORTABLE SYSTEMS GROUP ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND diff --git a/base/applications/calc/convert.c b/base/applications/calc/convert.c index 79ee4471faf..5e6c5de1d8e 100644 --- a/base/applications/calc/convert.c +++ b/base/applications/calc/convert.c @@ -512,7 +512,7 @@ static const conv_t conv_VOLUME[] = { 1 chang = 20 tamlung 1 tamlung = 4 baht 1 baht = 4 saloung -1 saloung = +1 saloung =
1 chang = 6/5 kg = 1200 g 1 tamlung = 1/20 chang = 60 g diff --git a/base/applications/calc/fun_ieee.c b/base/applications/calc/fun_ieee.c index 3e8ba68de8e..6db63fd2b61 100644 --- a/base/applications/calc/fun_ieee.c +++ b/base/applications/calc/fun_ieee.c @@ -55,7 +55,7 @@ double acosh(double x) { // must be x>=1, if not return Nan (Not a Number) if(!(x>=1.0)) return sqrt(-1.0); - + // return only the positive result (as sqrt does). return log(x+sqrt(x*x-1.0)); } @@ -64,7 +64,7 @@ double atanh(double x) { // must be x>-1, x<1, if not return Nan (Not a Number) if(!(x>-1.0 && x<1.0)) return sqrt(-1.0); - + return log((1.0+x)/(1.0-x))/2.0; }
@@ -372,7 +372,7 @@ static __int64 cbrti(__int64 x) {
s = 60; y = 0; - while(s >= 0) { + while(s >= 0) { y = 2*y; b = (3*y*(y + 1) + 1) << s; s = s - 3; diff --git a/base/applications/calc/whatsnew.txt b/base/applications/calc/whatsnew.txt index 387b802f753..855fb2d80d1 100644 --- a/base/applications/calc/whatsnew.txt +++ b/base/applications/calc/whatsnew.txt @@ -133,7 +133,7 @@ * "DOT" function can be used for starting a number (integer part will be zero). * Added repeat function. * If the number is greater than maximum resolution, it will be displayed with exponential notation. -* Removed mouse and keyboard focuses from displayed buttons. +* Removed mouse and keyboard focuses from displayed buttons. * Added normal and small icons.
1.00 (20070323) diff --git a/base/applications/calc/winmain.c b/base/applications/calc/winmain.c index 6bf11a3c246..519bf60990e 100644 --- a/base/applications/calc/winmain.c +++ b/base/applications/calc/winmain.c @@ -852,7 +852,7 @@ static void update_memory_flag(HWND hWnd, BOOL mem_flag)
static void update_n_stats_items(HWND hWnd, TCHAR *buffer) { - unsigned int n = SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_GETCOUNT, 0, 0); + unsigned int n = SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_GETCOUNT, 0, 0);
_stprintf(buffer, _T("n=%u"), n); SetDlgItemText(hWnd, IDC_TEXT_NITEMS, buffer); @@ -1211,7 +1211,7 @@ static void handle_context_menu(HWND hWnd, WPARAM wp, LPARAM lp) #else (void)idm; #endif -} +}
static void run_canc(calc_number_t *c) { diff --git a/base/applications/charmap/charmap.c b/base/applications/charmap/charmap.c index 90008a812a1..13ce8e2f1bc 100644 --- a/base/applications/charmap/charmap.c +++ b/base/applications/charmap/charmap.c @@ -47,7 +47,7 @@ FillCharacterSetComboList(HWND hwndCombo) if (GetCPInfoExW(codePages[i], 0, &cpInfo)) { trimmedName = wcschr(cpInfo.CodePageName, L'('); - if (!trimmedName) + if (!trimmedName) trimmedName = cpInfo.CodePageName;
SendMessageW(hwndCombo, @@ -678,7 +678,7 @@ wWinMain(HINSTANCE hInst, MSG Msg;
hInstance = hInst; - + /* Mirroring code for the titlebar */ switch (GetUserDefaultUILanguage()) { diff --git a/base/applications/charmap/map.c b/base/applications/charmap/map.c index 334980b3f61..a351f74be37 100644 --- a/base/applications/charmap/map.c +++ b/base/applications/charmap/map.c @@ -276,7 +276,7 @@ SetFont(PMAP infoPtr, NULL, TRUE);
- if (infoPtr->pActiveCell) + if (infoPtr->pActiveCell) infoPtr->pActiveCell->bActive = FALSE; infoPtr->pActiveCell = &infoPtr->Cells[0][0]; infoPtr->pActiveCell->bActive = TRUE; @@ -357,7 +357,7 @@ OnClick(PMAP infoPtr, * Find the cell the mouse pointer is over. * Since each cell is the same size, this can be done quickly using CellSize. * Clamp to XCELLS - 1 and YCELLS - 1 because the map can sometimes be slightly - * larger than infoPtr.CellSize * XCELLS , due to the map size being a non integer + * larger than infoPtr.CellSize * XCELLS , due to the map size being a non integer * multiple of infoPtr.CellSize . */ x = min(XCELLS - 1, ptx / max(1, infoPtr->CellSize.cx)); @@ -367,7 +367,7 @@ OnClick(PMAP infoPtr, i = XCELLS * infoPtr->iYStart + y * XCELLS + x; if (i >= infoPtr->NumValidGlyphs) { - if (infoPtr->pActiveCell) + if (infoPtr->pActiveCell) infoPtr->pActiveCell->bActive = FALSE; infoPtr->pActiveCell = NULL; return; @@ -507,11 +507,11 @@ OnVScroll(PMAP infoPtr, /* Invalidate the rect around the active cell since a new cell will become active */ if (infoPtr->pActiveCell && infoPtr->pActiveCell->bActive) { - InvalidateRect(infoPtr->hMapWnd, - &infoPtr->pActiveCell->CellExt, + InvalidateRect(infoPtr->hMapWnd, + &infoPtr->pActiveCell->CellExt, TRUE); } - + GetClientRect(infoPtr->hMapWnd, &rect); rect.top += 2; rect.bottom -= 2; @@ -630,7 +630,7 @@ MapWndProc(HWND hwnd,
case WM_LBUTTONDBLCLK: { - if (!infoPtr->pActiveCell) + if (!infoPtr->pActiveCell) break;
NotifyParentOfSelection(infoPtr, diff --git a/base/applications/charmap/precomp.h b/base/applications/charmap/precomp.h index 5899180bb43..d8573d5b09e 100644 --- a/base/applications/charmap/precomp.h +++ b/base/applications/charmap/precomp.h @@ -26,7 +26,7 @@ #define FM_SETCHARMAP (WM_USER + 5)
// the code pages to display in the advanced 'character set' combobox -static const UINT codePages[] = { +static const UINT codePages[] = { 864, 775, 863, 855, 737, 856, 862, 861, 852, 869, 850, 858, 865, 860, 866, 857, 437, // OEM code pages 1256, 1257, 1250, 1251, 1253, 1255, 932, 949, 1252, 936, 874, 950, 1254, 1258 // ANSI code pages }; diff --git a/base/applications/charmap_new/GridView.cpp b/base/applications/charmap_new/GridView.cpp index 639b3224e3a..f7005d2170d 100644 --- a/base/applications/charmap_new/GridView.cpp +++ b/base/applications/charmap_new/GridView.cpp @@ -155,7 +155,7 @@ CGridView::UpdateCellCoordinates( ) { // Go through all the cells and calculate - // their coordinates within the grid + // their coordinates within the grid for (int y = 0; y < m_yNumCells; y++) for (int x = 0; x < m_xNumCells; x++) { @@ -262,7 +262,6 @@ VOID CGridView::OnVScroll(_In_ INT Value, _In_ INT Pos) { - INT PrevScrollPosition = m_ScrollPosition;
switch (Value) diff --git a/base/applications/charmap_new/MainWindow.cpp b/base/applications/charmap_new/MainWindow.cpp index 0981a1ef17b..3ed8182320f 100644 --- a/base/applications/charmap_new/MainWindow.cpp +++ b/base/applications/charmap_new/MainWindow.cpp @@ -99,7 +99,7 @@ CCharMapWindow::Run(void) { MSG Msg;
- // Pump the message queue + // Pump the message queue while (GetMessageW(&Msg, NULL, 0, 0) != 0) { TranslateMessage(&Msg); @@ -195,7 +195,7 @@ CCharMapWindow::OnCreate(_In_ HWND hDlg) } }
- // Add all the fonts to the + // Add all the fonts to the list if (!CreateFontComboBox()) return FALSE;
diff --git a/base/applications/cmdutils/at/at.c b/base/applications/cmdutils/at/at.c index 22d362207ba..82298db3765 100644 --- a/base/applications/cmdutils/at/at.c +++ b/base/applications/cmdutils/at/at.c @@ -398,7 +398,7 @@ GetTimeAsJobTime(VOID)
GetLocalTime(&Time);
- JobTime = (DWORD_PTR)Time.wHour * 3600000 + + JobTime = (DWORD_PTR)Time.wHour * 3600000 + (DWORD_PTR)Time.wMinute * 60000;
return JobTime; @@ -698,7 +698,7 @@ AddJob( ULONG ulJobId = 0; NET_API_STATUS Status;
- InfoBuffer.JobTime = (DWORD_PTR)ulJobHour * 3600000 + + InfoBuffer.JobTime = (DWORD_PTR)ulJobHour * 3600000 + (DWORD_PTR)ulJobMinute * 60000; InfoBuffer.DaysOfMonth = ulDaysOfMonth; InfoBuffer.DaysOfWeek = ucDaysOfWeek; diff --git a/base/applications/cmdutils/fc/text.h b/base/applications/cmdutils/fc/text.h index 7a5d7382c59..3feb9f79b13 100644 --- a/base/applications/cmdutils/fc/text.h +++ b/base/applications/cmdutils/fc/text.h @@ -4,6 +4,7 @@ * PURPOSE: Comparing text files * COPYRIGHT: Copyright 2021 Katayama Hirofumi MZ (katayama.hirofumi.mz@gmail.com) */ + #include "fc.h"
#define IS_SPACE(ch) ((ch) == TEXT(' ') || (ch) == TEXT('\t')) @@ -510,7 +511,7 @@ Resync(FILECOMPARE *pFC, struct list **pptr0, struct list **pptr1) return FCRET_DIFFERENT; }
-static FCRET +static FCRET Finalize(FILECOMPARE* pFC, struct list *ptr0, struct list* ptr1, BOOL fDifferent) { if (!ptr0 && !ptr1) diff --git a/base/applications/cmdutils/more/more.c b/base/applications/cmdutils/more/more.c index afe20b9e803..df9f18b814a 100644 --- a/base/applications/cmdutils/more/more.c +++ b/base/applications/cmdutils/more/more.c @@ -552,7 +552,7 @@ IsDataUnicode( IS_TEXT_UNICODE_REVERSE_MASK | IS_TEXT_UNICODE_UNICODE_MASK) & ~IS_TEXT_UNKNOWN_FLAGS_MASK; INT Results; - + IsTextUnicode(Buffer, BufferSize, &Tests); Results = Tests;
@@ -1083,7 +1083,7 @@ int wmain(int argc, WCHAR* argv[]) continue;
GetFullPathNameW(argv[i], ARRAYSIZE(szFullPath), szFullPath, NULL); - hFile = CreateFileW(szFullPath, + hFile = CreateFileW(szFullPath, GENERIC_READ, FILE_SHARE_READ, NULL, diff --git a/base/applications/cmdutils/tasklist/tasklist.c b/base/applications/cmdutils/tasklist/tasklist.c index 4248e7204f1..5ecb5cc4bb5 100644 --- a/base/applications/cmdutils/tasklist/tasklist.c +++ b/base/applications/cmdutils/tasklist/tasklist.c @@ -49,7 +49,7 @@ VOID PrintResString(HINSTANCE hInstance, UINT uID, UINT MaxWidth, BOOL bAlignLef { if (!hInstance) return; - + WCHAR StringBuffer[RES_STR_MAXLEN]; LoadStringW(hInstance, uID, StringBuffer, _countof(StringBuffer)); PrintString(StringBuffer, MaxWidth, bAlignLeft); @@ -96,7 +96,7 @@ BOOL PrintMemory(SIZE_T MemorySizeByte, UINT MaxWidth, HINSTANCE hInstance) *pNumberStr = L'0' + (MemorySize / Mod); MemorySize %= Mod; pNumberStr++; - + if (i != 1 && i % 3 == 1) { *pNumberStr = L','; diff --git a/base/applications/cmdutils/tree/tree.c b/base/applications/cmdutils/tree/tree.c index 7c066243b39..a8012c7451e 100644 --- a/base/applications/cmdutils/tree/tree.c +++ b/base/applications/cmdutils/tree/tree.c @@ -28,7 +28,7 @@ BOOL bUseAscii = FALSE; /** * @name: HasSubFolder * -* @param strPath +* @param strPath * Must specify folder name * * @return @@ -207,7 +207,7 @@ static VOID DrawTree(PCWSTR strPath,
/** * @name: GetDirectoryStructure - * + * * @param strPath * Must specify folder name * @@ -240,7 +240,7 @@ GetDirectoryStructure(PWSTR strPath, UINT width, PCWSTR prevLine) wcscat(tmp, strPath); wcscat(tmp, L"\*.*"); hFind = FindFirstFileW(tmp, &FindFileData); - //err = GetLastError(); + //err = GetLastError(); }
if (hFind == INVALID_HANDLE_VALUE) diff --git a/base/applications/cmdutils/whoami/whoami.c b/base/applications/cmdutils/whoami/whoami.c index 8d8f7e14a4e..d5a24b8256c 100644 --- a/base/applications/cmdutils/whoami/whoami.c +++ b/base/applications/cmdutils/whoami/whoami.c @@ -367,7 +367,7 @@ void WhoamiPrintTable(WhoamiTable *pTable) WhoamiFree(pTable->Content[i * pTable->Cols + j]);
WhoamiFree(pTable); - + if (PrintFormat != csv) HeapFree(GetProcessHeap(), 0, ColLength); } diff --git a/base/applications/dxdiag/ddtest.c b/base/applications/dxdiag/ddtest.c index ea112a78d9a..7b63805b738 100644 --- a/base/applications/dxdiag/ddtest.c +++ b/base/applications/dxdiag/ddtest.c @@ -14,7 +14,7 @@ BOOL DDOffscreenBufferTest(HWND hWnd, BOOL Fullscreen); VOID DDRedrawFrame(LPDIRECTDRAWSURFACE lpDDSurface); VOID DDUpdateFrame(LPDIRECTDRAWSURFACE lpDDPrimarySurface ,LPDIRECTDRAWSURFACE lpDDBackBuffer, BOOL Fullscreen, INT *posX, INT *posY, INT *gainX, INT *gainY, RECT *rectDD);
-#define TEST_DURATION 10000 +#define TEST_DURATION 10000 #define DD_TEST_WIDTH 640 #define DD_TEST_HEIGHT 480 #define DD_TEST_STEP 5 @@ -295,7 +295,7 @@ BOOL DDOffscreenBufferTest(HWND hWnd, BOOL Fullscreen){ { if (msg.message == WM_TIMER) { - if(msg.wParam == TimerID) + if(msg.wParam == TimerID) { break; } diff --git a/base/applications/dxdiag/display.c b/base/applications/dxdiag/display.c index 779772f4052..eae055589f4 100644 --- a/base/applications/dxdiag/display.c +++ b/base/applications/dxdiag/display.c @@ -188,7 +188,7 @@ DisplayPageSetDeviceDetails(HWND * hDlgCtrls, LPCGUID classGUID, LPGUID * device SendMessageW(hDlgCtrls[1], WM_SETTEXT, 0, (LPARAM)szText);
/* FIXME - * we currently enumerate only the first adapter + * we currently enumerate only the first adapter */ EnumerateDrivers(&hDlgCtrls[2], hInfo, &InfoData); break; @@ -367,7 +367,7 @@ DisplayPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { RECT rect; PDXDIAG_CONTEXT pContext = (PDXDIAG_CONTEXT)GetWindowLongPtr(hDlg, DWLP_USER); - switch (message) + switch (message) { case WM_INITDIALOG: { diff --git a/base/applications/dxdiag/dxdiag.c b/base/applications/dxdiag/dxdiag.c index 096b276da8c..eaeace91e1f 100644 --- a/base/applications/dxdiag/dxdiag.c +++ b/base/applications/dxdiag/dxdiag.c @@ -18,7 +18,7 @@ HWND hTabCtrlWnd; // http://www.catch22.net/software/winspy // Copyright (c) 2002 by J Brown // - + // // Copied from uxtheme.h // If you have this new header, then delete these and @@ -29,7 +29,7 @@ HWND hTabCtrlWnd; #define ETDT_USETABTEXTURE 0x00000004 #define ETDT_ENABLETAB (ETDT_ENABLE | ETDT_USETABTEXTURE)
-// +// typedef HRESULT (WINAPI * ETDTProc) (HWND, DWORD);
// @@ -44,7 +44,7 @@ BOOL EnableDialogTheme(HWND hwnd)
if(hUXTheme) { - fnEnableThemeDialogTexture = + fnEnableThemeDialogTexture = (ETDTProc)GetProcAddress(hUXTheme, "EnableThemeDialogTexture");
if(fnEnableThemeDialogTexture) @@ -249,9 +249,9 @@ DxDiagWndProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lParam) CurSel++;
/* enable/disable next button */ - EnableWindow(GetDlgItem(hwndDlg, IDC_BUTTON_NEXT), + EnableWindow(GetDlgItem(hwndDlg, IDC_BUTTON_NEXT), (CurSel != TabCtrl_GetItemCount(hTabCtrlWnd) - 1)); - + /* switch to next tab */ SendMessageW(hTabCtrlWnd, TCM_SETCURSEL, CurSel, 0L);
@@ -280,7 +280,7 @@ DxDiagWndProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lParam) INT CurSel = TabCtrl_GetCurSel(hTabCtrlWnd);
/* enable/disable next button */ - EnableWindow(GetDlgItem(hwndDlg, IDC_BUTTON_NEXT), + EnableWindow(GetDlgItem(hwndDlg, IDC_BUTTON_NEXT), (CurSel != TabCtrl_GetItemCount(hTabCtrlWnd) - 1));
TabCtrl_OnSelChange(pContext); @@ -310,8 +310,8 @@ int APIENTRY wWinMain(HINSTANCE hInstance, InitCommonControlsEx(&InitControls);
hInst = hInstance; - + DialogBox(hInst, MAKEINTRESOURCE(IDD_MAIN_DIALOG), NULL, DxDiagWndProc); - + return 0; } diff --git a/base/applications/dxdiag/network.c b/base/applications/dxdiag/network.c index 7122b7b6beb..440ebe30619 100644 --- a/base/applications/dxdiag/network.c +++ b/base/applications/dxdiag/network.c @@ -43,7 +43,7 @@ static DIRECTPLAY_GUID DirectPlay8SP[] = } };
-static DIRECTPLAY_GUID DirectPlaySP[] = +static DIRECTPLAY_GUID DirectPlaySP[] = { { L"{36E95EE0-8577-11cf-960C-0080C7534E82}", @@ -232,7 +232,7 @@ EnumerateServiceProviders(HKEY hKey, HWND hDlgCtrl, DIRECTPLAY_GUID * PreDefProv Item.iItem = ListView_GetItemCount(hDlgCtrl);
/* FIXME - * on Windows Vista we need to use RegLoadMUIString which is not available for older systems + * on Windows Vista we need to use RegLoadMUIString which is not available for older systems */ if (!GetRegValue(hKey, szName, L"Friendly Name", REG_SZ, szResult, sizeof(szResult))) if (!GetRegValue(hKey, szName, L"DescriptionW", REG_SZ, szResult, sizeof(szResult))) diff --git a/base/applications/dxdiag/sound.c b/base/applications/dxdiag/sound.c index ff5cc487dc3..d3540c505e0 100644 --- a/base/applications/dxdiag/sound.c +++ b/base/applications/dxdiag/sound.c @@ -167,7 +167,7 @@ SetDeviceDetails(HWND hwndDlg, LPCGUID classGUID, LPCWSTR lpcstrDescription) SendDlgItemMessageW(hwndDlg, IDC_STATIC_ADAPTER_PROVIDER, WM_SETTEXT, 0, (LPARAM)szText);
/* FIXME - * we currently enumerate only the first adapter + * we currently enumerate only the first adapter */ hDlgCtrls[0] = GetDlgItem(hwndDlg, IDC_STATIC_DSOUND_DRIVER); hDlgCtrls[1] = GetDlgItem(hwndDlg, IDC_STATIC_DSOUND_VERSION); @@ -282,7 +282,7 @@ void InitializeDirectSoundPage(PDXDIAG_CONTEXT pContext) INT_PTR CALLBACK SoundPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { - switch (message) + switch (message) { case WM_INITDIALOG: { diff --git a/base/applications/dxdiag/system.c b/base/applications/dxdiag/system.c index 7359d0ca30f..da51c2a3ee7 100644 --- a/base/applications/dxdiag/system.c +++ b/base/applications/dxdiag/system.c @@ -40,7 +40,7 @@ GetRegValue(HKEY hBaseKey, LPWSTR SubKey, LPWSTR ValueName, DWORD Type, LPWSTR R }
-static +static BOOL GetDirectXVersion(WCHAR * szBuffer) { @@ -109,7 +109,7 @@ VOID GetSystemCPU(WCHAR *szBuffer) the program is not running in WOW64. */ fnIsWow64Process = (ISWOW64PROC)GetProcAddress( GetModuleHandleW(L"kernel32"), "IsWow64Process"); - + if (fnIsWow64Process != NULL) fnIsWow64Process(GetCurrentProcess(), &isWow64);
diff --git a/base/applications/findstr/findstr.c b/base/applications/findstr/findstr.c index 0e726351bb2..bec50d53300 100644 --- a/base/applications/findstr/findstr.c +++ b/base/applications/findstr/findstr.c @@ -168,7 +168,7 @@ main (int argc, char **argv) case 'B': /* Matches pattern if at the beginning of a line */ at_start = 1; break; - + //case 'c': //case 'C': /* Literal? */ // literal_search = 1; @@ -178,7 +178,7 @@ main (int argc, char **argv) case 'E': /* matches pattern if at end of line */ at_end = 1; break; - + case 'i': case 'I': /* Ignore */ ignore_case = 1; @@ -187,22 +187,22 @@ main (int argc, char **argv) case 'm': case 'M': /* only filename */ only_fname = 1; - break; - + break; + case 'n': case 'N': /* Number */ number_output = 1; break; - + case 'r': case 'R': /* search strings as regular expressions */ reg_express = 1; - break; + break;
case 's': case 'S': /* search files in child directory too*/ sub_dirs = 1; - break; + break;
case 'v': case 'V': /* Not with */ @@ -212,8 +212,8 @@ main (int argc, char **argv) case 'x': case 'X': /* exact match */ exact_match = 1; - break; - + break; + default: usage (); exit (2); /* syntax error .. return error 2 */ diff --git a/base/applications/games/solitaire/ReadMe.txt b/base/applications/games/solitaire/ReadMe.txt index a6cb706ac94..c4f60d8b42d 100644 --- a/base/applications/games/solitaire/ReadMe.txt +++ b/base/applications/games/solitaire/ReadMe.txt @@ -1,7 +1,7 @@ Solitaire for ReactOS
/***************************************** -A complete working example of the CardLib +A complete working example of the CardLib card-game library.
Freeware diff --git a/base/applications/games/solitaire/solgame.cpp b/base/applications/games/solitaire/solgame.cpp index 19219b8f9f4..9d72c4b90ea 100644 --- a/base/applications/games/solitaire/solgame.cpp +++ b/base/applications/games/solitaire/solgame.cpp @@ -26,12 +26,12 @@ void NewGame(void) lScore = lScore - 52; else lScore = -52; - + if (dwOptions & OPTION_THREE_CARDS) dwWasteTreshold = 2; else dwWasteTreshold = 0; - + } else { @@ -262,7 +262,7 @@ bool CARDLIBPROC SuitStackDropProc(CardRegion &stackobj, CardStack &dragcards) { lScore = lScore + 10; } - + UpdateStatusBar(); } } diff --git a/base/applications/games/solitaire/solitaire.cpp b/base/applications/games/solitaire/solitaire.cpp index 529f6ba56e9..3fd6a256cd3 100644 --- a/base/applications/games/solitaire/solitaire.cpp +++ b/base/applications/games/solitaire/solitaire.cpp @@ -341,7 +341,7 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar else EnableWindow(hCtrl, FALSE); return TRUE; - + case IDOK: dwOptions &= ~OPTION_THREE_CARDS; if (IsDlgButtonChecked(hDlg, IDC_OPT_DRAWTHREE) == BST_CHECKED) @@ -623,7 +623,7 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
// For now, the Help dialog item is disabled because of lacking of HTML Help support EnableMenuItem(GetMenu(hwnd), IDM_HELP_CONTENTS, MF_BYCOMMAND | MF_GRAYED); - + hwndStatus = CreateStatusWindow(WS_CHILD | WS_VISIBLE | CCS_BOTTOM | SBARS_SIZEGRIP, _T("Ready"), hwnd, 0);
//SendMessage(hwndStatus, SB_SIMPLE, (WPARAM)TRUE, 0); diff --git a/base/applications/games/spider/spigame.cpp b/base/applications/games/spider/spigame.cpp index c01dcd4f26e..73a4f6b3e3a 100644 --- a/base/applications/games/spider/spigame.cpp +++ b/base/applications/games/spider/spigame.cpp @@ -29,7 +29,7 @@ CardStack CreatePlayDeck() { CardStack newStack; int i, colors = 1, num = 0; - + switch (dwDifficulty) { case IDC_DIF_ONECOLOR: @@ -55,7 +55,7 @@ void NewGame(void) { int i, j; /* First four stack with five, all other with 4 */ - int covCards = 5; + int covCards = 5; CardStack fakeDeck, temp;
SpiderWnd.EmptyStacks(); @@ -65,14 +65,14 @@ void NewGame(void) deck.Shuffle(); fakeDeck.NewDeck(); fakeDeck.Shuffle(); - + /* Reset progress value */ cardsFinished = 0;
/* Deal to each stack */ for (i = 0; i < NUM_STACKS; i++) { - temp.Clear(); + temp.Clear(); if (i == NUM_SMALLER_STACKS) { covCards--; @@ -85,7 +85,7 @@ void NewGame(void) pStack[i]->SetCardStack(temp); } /* Deal five fake cards to the deck */ - pDeck->SetCardStack(fakeDeck.Pop(5)); + pDeck->SetCardStack(fakeDeck.Pop(5));
SpiderWnd.Redraw(); fGameStarted = false; @@ -103,7 +103,7 @@ bool stackLookingGood(const CardStack &mystack, int numChecks) if (mystack[i].Suit() != mystack[i + 1].Suit()) { return false; - } + } } return true; } @@ -172,8 +172,8 @@ bool CARDLIBPROC StackDragProc(CardRegion &stackobj, int numDragCards)
stackobj.GetFaceDirection(&numfacedown); numcards = stackobj.NumCards(); - - /* Only cards facing up */ + + /* Only cards facing up */ if (numDragCards <= numcards - numfacedown) { const CardStack &mystack = stackobj.GetCardStack(); @@ -228,7 +228,7 @@ bool CARDLIBPROC StackDropProc(CardRegion &stackobj, CardStack &dragcards) { return false; } - + /* If stack is empty, everything can be dropped */ if (stackobj.NumCards() != 0) { @@ -245,12 +245,12 @@ bool CARDLIBPROC StackDropProc(CardRegion &stackobj, CardStack &dragcards) faceup = stackobj.NumCards() - facedown;
if (faceup + dragcards.NumCards() >= NUM_ONECOLOR_CARDS) - { + { int i, max = NUM_ONECOLOR_CARDS - dragcards.NumCards() - 1;
/* Dragged cards have been checked to be in order, check stack cards */ if (mystack[0].Suit() == dragcard.Suit() && - stackLookingGood(mystack, max)) + stackLookingGood(mystack, max)) { CardStack s = stackobj.GetCardStack(); CardStack f; diff --git a/base/applications/mplay32/mplay32.c b/base/applications/mplay32/mplay32.c index adb0babe581..8fafeaaaba0 100644 --- a/base/applications/mplay32/mplay32.c +++ b/base/applications/mplay32/mplay32.c @@ -1472,7 +1472,7 @@ _tWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPTSTR lpCmdLine, INT nCmdShow) HANDLE hAccel;
hInstance = hInst; - + switch (GetUserDefaultUILanguage()) { case MAKELANGID(LANG_HEBREW, SUBLANG_DEFAULT): diff --git a/base/applications/msconfig/freeldrpage.c b/base/applications/msconfig/freeldrpage.c index 41f4e11be73..77761890ea7 100644 --- a/base/applications/msconfig/freeldrpage.c +++ b/base/applications/msconfig/freeldrpage.c @@ -53,11 +53,11 @@ LoadBootIni(WCHAR *szDrive, HWND hDlg) hr = StringCbCatW(szBuffer, sizeof(szBuffer), L"boot.ini"); if (FAILED(hr)) return FALSE; - + file = _wfopen(szBuffer, L"rt"); if (!file) return FALSE; - } + }
hDlgCtrl = GetDlgItem(hDlg, IDC_LIST_BOX);
diff --git a/base/applications/msconfig/msconfig.c b/base/applications/msconfig/msconfig.c index 3cbe4c5d81b..f17afafdb6b 100644 --- a/base/applications/msconfig/msconfig.c +++ b/base/applications/msconfig/msconfig.c @@ -31,7 +31,7 @@ void MsConfig_OnTabWndSelChange(void); // http://www.catch22.net/software/winspy // Copyright (c) 2002 by J Brown // - + // // Copied from uxtheme.h // If you have this new header, then delete these and @@ -42,7 +42,7 @@ void MsConfig_OnTabWndSelChange(void); #define ETDT_USETABTEXTURE 0x00000004 #define ETDT_ENABLETAB (ETDT_ENABLE | ETDT_USETABTEXTURE)
-// +// typedef HRESULT (WINAPI * ETDTProc) (HWND, DWORD);
// @@ -57,7 +57,7 @@ BOOL EnableDialogTheme(HWND hwnd)
if(hUXTheme) { - fnEnableThemeDialogTexture = + fnEnableThemeDialogTexture = (ETDTProc)GetProcAddress(hUXTheme, "EnableThemeDialogTexture");
if(fnEnableThemeDialogTexture) @@ -259,7 +259,7 @@ MsConfigWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
case WM_COMMAND:
- if (LOWORD(wParam) == IDOK) + if (LOWORD(wParam) == IDOK) { //MsConfig_OnSaveChanges(); } @@ -327,9 +327,9 @@ int APIENTRY _tWinMain(HINSTANCE hInstance, InitCommonControlsEx(&InitControls);
hInst = hInstance; - + DialogBox(hInst, (LPCTSTR)IDD_MSCONFIG_DIALOG, NULL, MsConfigWndProc); - + return 0; }
diff --git a/base/applications/msconfig/toolspage.c b/base/applications/msconfig/toolspage.c index 8cd0ea8d48b..23ec011d0c0 100644 --- a/base/applications/msconfig/toolspage.c +++ b/base/applications/msconfig/toolspage.c @@ -105,7 +105,7 @@ ToolsPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { if (SHGetSpecialFolderPath(NULL, szTemp, ListItems_Locations[ListView_GetSelectionMark(hToolsListCtrl)], FALSE)) Ptr = PathAddBackslash(szTemp); - + if (!Ptr) Ptr = szTemp;
@@ -157,7 +157,7 @@ ToolsPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { if (SHGetSpecialFolderPath(NULL, szTemp, ListItems_Locations[ListView_GetSelectionMark(hToolsListCtrl)], FALSE)) Ptr = PathAddBackslash(szTemp); - + if (!Ptr) Ptr = szTemp;
diff --git a/base/applications/msconfig_new/comctl32ex/listview.c b/base/applications/msconfig_new/comctl32ex/listview.c index 9e5f533998e..d348a8eabd6 100644 --- a/base/applications/msconfig_new/comctl32ex/listview.c +++ b/base/applications/msconfig_new/comctl32ex/listview.c @@ -34,7 +34,7 @@ SortListView(LPARAM lItemParam1, ListView_GetItemText(pSort->hList, iItem1, pSort->nClickedColumn, strItem1, MAX_VALUE_NAME); ListView_GetItemText(pSort->hList, iItem2, pSort->nClickedColumn, strItem2, MAX_VALUE_NAME);
- // StrCmpLogicalW helps in comparing numbers intelligently, 10 is greater that 2, other + // StrCmpLogicalW helps in comparing numbers intelligently, 10 is greater that 2, other // wise string comparison will always return 2 is greater that 10... return ( pSort->bSortAsc ? StrCmpLogicalW(strItem1, strItem2) : StrCmpLogicalW(strItem2, strItem1) ); } diff --git a/base/applications/msconfig_new/comctl32ex/treeview.c b/base/applications/msconfig_new/comctl32ex/treeview.c index 3d1681cacab..ed3a07cf7b9 100644 --- a/base/applications/msconfig_new/comctl32ex/treeview.c +++ b/base/applications/msconfig_new/comctl32ex/treeview.c @@ -170,7 +170,7 @@ HTREEITEM Tree_Item_Copy(HWND hTree, HTREEITEM hSourceItem, HTREEITEM hParent, H tvis.itemex.pszText = label; tvis.itemex.cchTextMax = MAX_VALUE_NAME; TreeView_GetItem(hTree, &tvis.itemex); - + // 2- Now, copy to destination. tvis.hParent = hParent; tvis.hInsertAfter = hInsertAfter; diff --git a/base/applications/msconfig_new/systempage.cpp b/base/applications/msconfig_new/systempage.cpp index 232a3788464..fb9483dc3fe 100644 --- a/base/applications/msconfig_new/systempage.cpp +++ b/base/applications/msconfig_new/systempage.cpp @@ -262,7 +262,7 @@ LoadIniFile(HWND hTree, LPCWSTR lpszIniFile) lpsz1 = szLine; while (*lpsz1 == L' ' || *lpsz1 == L'\r' || *lpsz1 == L'\n') ++lpsz1; - + /* Skip empty lines */ if (!*lpsz1) continue; @@ -808,7 +808,7 @@ CommonWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) MessageBox(hDlg, _T("Help not implemented yet!"), _T("Help"), MB_ICONINFORMATION | MB_OK); return TRUE; } - + case PSN_KILLACTIVE: // Is going to lose activation. { // Changes are always valid of course. @@ -868,7 +868,7 @@ INT_PTR CALLBACK SystemPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { static LPCWSTR lpszIniFile = NULL; - + if (message == WM_INITDIALOG) lpszIniFile = (LPCWSTR)((LPPROPSHEETPAGE)lParam)->lParam;
diff --git a/base/applications/msconfig_new/utils.c b/base/applications/msconfig_new/utils.c index 3715fcf0da3..fc797ffe96d 100644 --- a/base/applications/msconfig_new/utils.c +++ b/base/applications/msconfig_new/utils.c @@ -268,7 +268,7 @@ BOOL IsWindowsOS(VOID) { bIsWindowsOS = TRUE; } - + return bIsWindowsOS; }
diff --git a/base/applications/mspaint/help/tools.html b/base/applications/mspaint/help/tools.html index fbb2441f04e..c65eb17fbe6 100644 --- a/base/applications/mspaint/help/tools.html +++ b/base/applications/mspaint/help/tools.html @@ -15,11 +15,11 @@ td { background-color:#f0f0f0; font-size:12px; padding:5px; border-width:1px; bo
<h1>Werkzeuge in Paint</h1> <p> -<b>Paint f�r ReactOS</b> stellt ihnen zum Bearbeiten ihrer Bilder zahlreiche <i>Werkzeuge</i> zur Verf�gung. Um eines der +<b>Paint f�r ReactOS</b> stellt ihnen zum Bearbeiten ihrer Bilder zahlreiche <i>Werkzeuge</i> zur Verf�gung. Um eines der
-Werkzeuge auszuw�hlen, klicken Sie bitte auf das entsprechende Symbol im <i>Werkzeugkasten</i>, der sich �blicherweise +Werkzeuge auszuw�hlen, klicken Sie bitte auf das entsprechende Symbol im <i>Werkzeugkasten</i>, der sich �blicherweise
-auf der linken Seite des Fensters befindet. Es folgt eine Auflistung der Ihnen zur Verf�gung stehenden +auf der linken Seite des Fensters befindet. Es folgt eine Auflistung der Ihnen zur Verf�gung stehenden
Werkzeuge mit jeweils einer kurzen Beschreibung. </p> @@ -29,27 +29,27 @@ Werkzeuge mit jeweils einer kurzen Beschreibung. <th>Beschreibung</th></tr>
<tr><td align="center"><img src="freesel.png" alt=""></td> -<td>Die <i>freie Auswahl</i> erm�glicht es Ihnen, einen beliebigen Bereich des Bildes auszuw�hlen. Dr�cken Sie +<td>Die <i>freie Auswahl</i> erm�glicht es Ihnen, einen beliebigen Bereich des Bildes auszuw�hlen. Dr�cken Sie
-dazu im Bild die linke Maustaste und umfahren Sie mit der gedr�ckten Maustaste den Bereich, den Sie ausw�hlen +dazu im Bild die linke Maustaste und umfahren Sie mit der gedr�ckten Maustaste den Bereich, den Sie ausw�hlen
-m�chten. Wenn Sie die Maustaste nun loslassen wird der Bereich automatisch in eine geschlossene Auswahl +m�chten. Wenn Sie die Maustaste nun loslassen wird der Bereich automatisch in eine geschlossene Auswahl
umgewandelt.</td></tr>
<tr><td align="center"><img src="rectsel.png" alt=""></td> -<td>Die <i>rechteckige Auswahl</i> erm�glicht es Ihnen, im Bild einen beliebigen rechteckigen Bereich +<td>Die <i>rechteckige Auswahl</i> erm�glicht es Ihnen, im Bild einen beliebigen rechteckigen Bereich
-auszuw�hlen. Dr�cken Sie dazu im Bild die linke Maustaste und ziehen Sie die Maus zur diagonal +auszuw�hlen. Dr�cken Sie dazu im Bild die linke Maustaste und ziehen Sie die Maus zur diagonal
-gegen�berliegenden Seite des gew�nschten Rechtecks. Wenn Sie die Maustaste loslassen, erscheint sie soeben +gegen�berliegenden Seite des gew�nschten Rechtecks. Wenn Sie die Maustaste loslassen, erscheint sie soeben
erstellte Auswahl.</td></tr>
<tr><td align="center"><img src="rubber.png" alt=""></td> -<td>Der <i>Radierer</i> erlaubt es Ihnen, mit der Hintergrundfarbe zu Malen, um Teile des Bildes zu l�schen. +<td>Der <i>Radierer</i> erlaubt es Ihnen, mit der Hintergrundfarbe zu Malen, um Teile des Bildes zu l�schen.
-M�chten Sie das gesamte Bild l�schen, verwenden Sie bitte den Men�eintrag <i>Bild l�schen</i> im Men� +M�chten Sie das gesamte Bild l�schen, verwenden Sie bitte den Men�eintrag <i>Bild l�schen</i> im Men�
<i>Bild</i>.*</td></tr>
diff --git a/base/applications/mspaint/registry.cpp b/base/applications/mspaint/registry.cpp index 70361132c0a..1bc47e93a6c 100644 --- a/base/applications/mspaint/registry.cpp +++ b/base/applications/mspaint/registry.cpp @@ -62,7 +62,7 @@ void RegistrySettings::LoadPresets() ThumbYPos = 200; UnitSetting = 0; const WINDOWPLACEMENT DefaultWindowPlacement = { - sizeof(WINDOWPLACEMENT), + sizeof(WINDOWPLACEMENT), 0, SW_SHOWNORMAL, {0, 0}, diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 928c21b9e59..686f2eec5d0 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -104,8 +104,8 @@ void CMainWindow::saveImage(BOOL overwrite)
void CMainWindow::InsertSelectionFromHBITMAP(HBITMAP bitmap, HWND window) { - int width = GetDIBWidth(bitmap); - int height = GetDIBHeight(bitmap); + int width = GetDIBWidth(bitmap); + int height = GetDIBHeight(bitmap); int curWidth = imageModel.GetWidth(); int curHeight = imageModel.GetHeight();
@@ -129,7 +129,7 @@ void CMainWindow::InsertSelectionFromHBITMAP(HBITMAP bitmap, HWND window) shouldEnlarge = FALSE; break; case IDCANCEL: - return; + return; } }
diff --git a/base/applications/network/ipconfig/ipconfig.c b/base/applications/network/ipconfig/ipconfig.c index 8f3e4b3e5db..d386f7d1eac 100644 --- a/base/applications/network/ipconfig/ipconfig.c +++ b/base/applications/network/ipconfig/ipconfig.c @@ -133,7 +133,7 @@ int LoadStringAndOem(HINSTANCE hInst, return 0; }
- res = LoadString(hInst, uID, szTmp, byteSize); + res = LoadString(hInst, uID, szTmp, byteSize); CharToOem(szTmp, szNode); HeapFree(ProcessHeap, 0, szTmp); return res; @@ -300,7 +300,7 @@ LPTSTR GetConnectionType(LPTSTR lpClass)
if (ConTypeTmp == NULL) return NULL; - + ConType = (LPTSTR)HeapAlloc(ProcessHeap, 0, dwDataSize); diff --git a/base/applications/network/net/net.h b/base/applications/network/net/net.h index 96f1d24b60d..5e88ddf6823 100644 --- a/base/applications/network/net/net.h +++ b/base/applications/network/net/net.h @@ -1,6 +1,6 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS net command + * PROJECT: ReactOS net command * PROGRAMMERS: Magnus Olsen (greatlord@reactos.org) */
diff --git a/base/applications/network/nslookup/utility.c b/base/applications/network/nslookup/utility.c index 15090768aa7..2c9c9eb905d 100644 --- a/base/applications/network/nslookup/utility.c +++ b/base/applications/network/nslookup/utility.c @@ -839,7 +839,7 @@ PCHAR ClassIDtoClassName( USHORT ClassID )
case CLASS_ANY: return ClassAny; - + default: return "Unknown"; } diff --git a/base/applications/notepad/main.c b/base/applications/notepad/main.c index b31d0c0fcb3..3fed529fb3e 100644 --- a/base/applications/notepad/main.c +++ b/base/applications/notepad/main.c @@ -308,7 +308,7 @@ static VOID NOTEPAD_InitMenuPopup(HMENU menu, LPARAM index) }
LRESULT CALLBACK EDIT_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) -{ +{ switch (msg) { case WM_KEYDOWN: diff --git a/base/applications/rapps/appview.cpp b/base/applications/rapps/appview.cpp index aa908ffcf2c..c15c3ab1172 100644 --- a/base/applications/rapps/appview.cpp +++ b/base/applications/rapps/appview.cpp @@ -220,14 +220,14 @@ HWND CComboBox::Create(HWND hwndParent) NULL);
SendMessageW(WM_SETFONT, (WPARAM)GetStockObject(DEFAULT_GUI_FONT), 0); - + for (int i = 0; i < (int)_countof(m_TypeStringID); i++) { ATL::CStringW szBuf; szBuf.LoadStringW(m_TypeStringID[i]); SendMessageW(CB_ADDSTRING, 0, (LPARAM)(LPCWSTR)szBuf); } - + SendMessageW(CB_SETCURSEL, m_DefaultSelectType, 0); // select the first item
return m_hWnd; @@ -1639,7 +1639,7 @@ BOOL CApplicationView::ProcessWindowMessage(HWND hwnd, UINT message, WPARAM wPar return FALSE; }
-BOOL CApplicationView::CreateToolbar() +BOOL CApplicationView::CreateToolbar() { m_Toolbar = new CMainToolbar(); m_Toolbar->m_VerticalAlignment = UiAlign_LeftTop; diff --git a/base/applications/rapps/asyncinet.cpp b/base/applications/rapps/asyncinet.cpp index 665d5dede52..08be4839c77 100644 --- a/base/applications/rapps/asyncinet.cpp +++ b/base/applications/rapps/asyncinet.cpp @@ -140,7 +140,7 @@ BOOL AsyncInetCancel(pASYNCINET AsyncInet) // mark as cancelled (this will send return TRUE; } } - + return FALSE; }
@@ -172,7 +172,7 @@ BOOL AsyncInetAcquire(pASYNCINET AsyncInet) // try to increase refcnt by 1. if r bResult = TRUE; } // otherwise (AsyncInet->bCleanUp == TRUE) - // AsyncInetAcquire will return FALSE. + // AsyncInetAcquire will return FALSE. // In this case, any thread should no longer use this AsyncInet
LeaveCriticalSection(&(AsyncInet->CriticalSection)); @@ -194,7 +194,7 @@ VOID AsyncInetRelease(pASYNCINET AsyncInet) // try to decrease refcnt by 1 { bCleanUp = TRUE; } - + LeaveCriticalSection(&(AsyncInet->CriticalSection));
if (bCleanUp) diff --git a/base/applications/rapps/available.cpp b/base/applications/rapps/available.cpp index 01f8fe5facf..e148a2df4ba 100644 --- a/base/applications/rapps/available.cpp +++ b/base/applications/rapps/available.cpp @@ -426,8 +426,8 @@ BOOL CAvailableApps::UpdateAppsDB()
DownloadApplicationsDB(SettingsInfo.bUseSource ? SettingsInfo.szSourceURL : APPLICATION_DATABASE_URL, !SettingsInfo.bUseSource); - - if (!ExtractFilesFromCab(m_Strings.szCabName, + + if (!ExtractFilesFromCab(m_Strings.szCabName, m_Strings.szCabDir, m_Strings.szAppsPath)) { diff --git a/base/applications/rapps/cabinet.cpp b/base/applications/rapps/cabinet.cpp index 8b4d8a19be5..1d7bb691a19 100644 --- a/base/applications/rapps/cabinet.cpp +++ b/base/applications/rapps/cabinet.cpp @@ -2,7 +2,7 @@ * PROJECT: ReactOS Applications Manager * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Cabinet extraction using FDI API - * COPYRIGHT: Copyright 2018 Alexander Shaposhnikov (sanchaez@reactos.org) + * COPYRIGHT: Copyright 2018 Alexander Shaposhnikov (sanchaez@reactos.org) */ #include "rapps.h" #include <debug.h> @@ -12,7 +12,7 @@
/* * HACK: treat any input strings as Unicode (UTF-8) - * cabinet.dll lacks any sort of a Unicode API, but FCI/FDI + * cabinet.dll lacks any sort of a Unicode API, but FCI/FDI * provide an ability to use user-defined callbacks for any file or memory * operations. This flexibility and the magic power of C/C++ casting allows * us to treat input as we please. @@ -66,7 +66,7 @@ inline BOOL MultiByteToWide(const CStringA& szSource, NULL); if (!sz) return FALSE; - + // do the actual conversion sz = MultiByteToWideChar(CP_UTF8, 0, @@ -215,7 +215,7 @@ FNFDINOTIFY(fnNotify) WideToMultiByte(szNewFileName, szFilePathUTF8, CP_UTF8);
// Open the file - iResult = fnFileOpen((LPSTR) szFilePathUTF8.GetString(), + iResult = fnFileOpen((LPSTR) szFilePathUTF8.GetString(), _O_WRONLY | _O_CREAT, 0); } @@ -254,14 +254,14 @@ FNFDINOTIFY(fnNotify)
/* cabinet.dll FDI function pointers */
-typedef HFDI(*fnFDICreate)(PFNALLOC, - PFNFREE, - PFNOPEN, - PFNREAD, +typedef HFDI(*fnFDICreate)(PFNALLOC, + PFNFREE, + PFNOPEN, + PFNREAD, PFNWRITE, - PFNCLOSE, - PFNSEEK, - int, + PFNCLOSE, + PFNSEEK, + int, PERF);
typedef BOOL(*fnFDICopy)(HFDI, @@ -274,12 +274,12 @@ typedef BOOL(*fnFDICopy)(HFDI,
typedef BOOL(*fnFDIDestroy)(HFDI);
-/* - * Extraction function +/* + * Extraction function * TODO: require only a full path to the cab as an argument */ -BOOL ExtractFilesFromCab(const ATL::CStringW& szCabName, - const ATL::CStringW& szCabDir, +BOOL ExtractFilesFromCab(const ATL::CStringW& szCabName, + const ATL::CStringW& szCabDir, const ATL::CStringW& szOutputDir) { HINSTANCE hCabinetDll; @@ -291,7 +291,7 @@ BOOL ExtractFilesFromCab(const ATL::CStringW& szCabName, fnFDIDestroy pfnFDIDestroy; BOOL bResult;
- // Load cabinet.dll and extract needed functions + // Load cabinet.dll and extract needed functions hCabinetDll = LoadLibraryW(L"cabinet.dll");
if (!hCabinetDll) @@ -328,7 +328,7 @@ BOOL ExtractFilesFromCab(const ATL::CStringW& szCabName,
// Create output dir bResult = CreateDirectoryW(szOutputDir, NULL); - + if (bResult || GetLastError() == ERROR_ALREADY_EXISTS) { // Convert wide strings to UTF-8 diff --git a/base/applications/rapps/gui.cpp b/base/applications/rapps/gui.cpp index ed0689aac2a..f0616c08aff 100644 --- a/base/applications/rapps/gui.cpp +++ b/base/applications/rapps/gui.cpp @@ -280,7 +280,7 @@ BOOL CMainWindow::RemoveSelectedAppFromRegistry() CInstalledApplicationInfo *InstalledApp = (CInstalledApplicationInfo *)m_ApplicationView->GetFocusedItemData(); if (!InstalledApp) return FALSE; - + LSTATUS Result = InstalledApp->RemoveFromRegistry(); if (Result != ERROR_SUCCESS) { @@ -488,7 +488,7 @@ BOOL CMainWindow::ProcessWindowMessage(HWND hwnd, UINT Msg, WPARAM wParam, LPARA if (wParam == SEARCH_TIMER_ID) { ::KillTimer(hwnd, SEARCH_TIMER_ID); - + UpdateApplicationsList(-1); } break; @@ -688,7 +688,7 @@ VOID CMainWindow::UpdateApplicationsList(INT EnumType) // set the display type of application-view. this will remove all the item in application-view too. m_ApplicationView->SetDisplayAppType(AppViewTypeInstalledApps);
- // enum installed softwares + // enum installed softwares m_InstalledApps.Enum(EnumType, s_EnumInstalledAppProc, this); } else if (IsAvailableEnum(EnumType)) @@ -696,7 +696,7 @@ VOID CMainWindow::UpdateApplicationsList(INT EnumType) // set the display type of application-view. this will remove all the item in application-view too. m_ApplicationView->SetDisplayAppType(AppViewTypeAvailableApps);
- // enum available softwares + // enum available softwares m_AvailableApps.Enum(EnumType, s_EnumAvailableAppProc, this); } m_ApplicationView->SetRedraw(TRUE); @@ -832,7 +832,7 @@ void CMainWindow::HandleTabOrder(int direction) m_TreeView->AppendTabOrderWindow(direction, TabOrderHwndList); m_ApplicationView->AppendTabOrderWindow(direction, TabOrderHwndList);
- + if (TabOrderHwndList.GetSize() == 0) { // in case the list is empty diff --git a/base/applications/rapps/include/asyncinet.h b/base/applications/rapps/include/asyncinet.h index 02781fd76de..6b7bdce417d 100644 --- a/base/applications/rapps/include/asyncinet.h +++ b/base/applications/rapps/include/asyncinet.h @@ -12,7 +12,7 @@ enum ASYNC_EVENT ASYNCINET_CANCELLED, // wParam and lParam are not used. // when receiving this, AsyncInet will be free soon and should not used anymore
- ASYNCINET_ERROR // wParam is not used. lParam specify the error code (if there is one). + ASYNCINET_ERROR // wParam is not used. lParam specify the error code (if there is one). // when receiving this, AsyncInet will be free soon and should not used anymore };
diff --git a/base/applications/rapps/include/available.h b/base/applications/rapps/include/available.h index 51e32c05230..c478a898b82 100644 --- a/base/applications/rapps/include/available.h +++ b/base/applications/rapps/include/available.h @@ -54,7 +54,7 @@ public: ATL::CSimpleArray<LCID> m_LanguageLCIDs; ATL::CSimpleArrayATL::CStringW m_szScrnshotLocation; ATL::CStringW m_szIconLocation; - ATL::CStringW m_szPkgName; // software's package name. + ATL::CStringW m_szPkgName; // software's package name.
ULONG m_SizeBytes;
diff --git a/base/applications/rapps/installed.cpp b/base/applications/rapps/installed.cpp index 6561ab38ee9..eaec4429480 100644 --- a/base/applications/rapps/installed.cpp +++ b/base/applications/rapps/installed.cpp @@ -320,7 +320,6 @@ BOOL CInstalledApps::Enum(INT EnumType, APPENUMPROC lpEnumProc, PVOID param) szKeyName.ReleaseBuffer(); RegCloseKey(hKey); } -
return TRUE; } diff --git a/base/applications/rapps/settingsdlg.cpp b/base/applications/rapps/settingsdlg.cpp index 50f69faf55e..8fda86e9ca4 100644 --- a/base/applications/rapps/settingsdlg.cpp +++ b/base/applications/rapps/settingsdlg.cpp @@ -54,13 +54,13 @@ BOOL IsUrlValid(const WCHAR * Url) URL_COMPONENTSW UrlComponmentInfo = { 0 }; UrlComponmentInfo.dwStructSize = sizeof(UrlComponmentInfo); UrlComponmentInfo.dwSchemeLength = 1; - + BOOL bSuccess = InternetCrackUrlW(Url, wcslen(Url), 0, &UrlComponmentInfo); if(!bSuccess) { return FALSE; } - + switch(UrlComponmentInfo.nScheme) { case INTERNET_SCHEME_HTTP: @@ -69,7 +69,7 @@ BOOL IsUrlValid(const WCHAR * Url) case INTERNET_SCHEME_FILE: // supported return TRUE; - + default: return FALSE; } @@ -104,9 +104,9 @@ namespace EnableWindow(GetDlgItem(hDlg, IDC_PROXY_SERVER), FALSE); EnableWindow(GetDlgItem(hDlg, IDC_NO_PROXY_FOR), FALSE); } - + CheckRadioButton(hDlg, IDC_SOURCE_DEFAULT, IDC_USE_SOURCE, Info->bUseSource ? IDC_USE_SOURCE : IDC_SOURCE_DEFAULT); - + EnableWindow(GetDlgItem(hDlg, IDC_SOURCE_URL), Info->bUseSource);
SetWindowTextW(GetDlgItem(hDlg, IDC_SOURCE_URL), Info->szSourceURL); @@ -153,12 +153,12 @@ namespace NewSettingsInfo.bUseSource = FALSE; EnableWindow(GetDlgItem(hDlg, IDC_SOURCE_URL), NewSettingsInfo.bUseSource); break; - + case IDC_USE_SOURCE: NewSettingsInfo.bUseSource = TRUE; EnableWindow(GetDlgItem(hDlg, IDC_SOURCE_URL), NewSettingsInfo.bUseSource); break; - + case IDC_PROXY_DEFAULT: NewSettingsInfo.Proxy = 0; EnableWindow(GetDlgItem(hDlg, IDC_PROXY_SERVER), FALSE); @@ -241,13 +241,13 @@ namespace break; } } - - + + if(NewSettingsInfo.bUseSource && !IsUrlValid(szSource.GetString())) { ATL::CStringW szMsgText; szMsgText.LoadStringW(IDS_URL_INVALID); - + MessageBoxW(hDlg, szMsgText.GetString(), NULL, 0); SetFocus(GetDlgItem(hDlg, IDC_SOURCE_URL)); break; diff --git a/base/applications/rapps/winmain.cpp b/base/applications/rapps/winmain.cpp index c8604ca6c9e..894bbb43f9c 100644 --- a/base/applications/rapps/winmain.cpp +++ b/base/applications/rapps/winmain.cpp @@ -61,7 +61,7 @@ VOID InitializeGDIPlus(BOOL bInitialize) INT WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, INT nShowCmd) { BOOL bIsFirstLaunch; - + InitializeAtlModule(hInstance, TRUE); InitializeGDIPlus(TRUE);
@@ -83,7 +83,7 @@ INT WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi
// parse cmd-line and perform the corresponding operation BOOL bSuccess = ParseCmdAndExecute(GetCommandLineW(), bIsFirstLaunch, SW_SHOWNORMAL); - + InitializeGDIPlus(FALSE); InitializeAtlModule(GetModuleHandle(NULL), FALSE);
diff --git a/base/applications/regedit/childwnd.c b/base/applications/regedit/childwnd.c index a10f11ea96d..977d8cea9d7 100644 --- a/base/applications/regedit/childwnd.c +++ b/base/applications/regedit/childwnd.c @@ -262,7 +262,7 @@ UpdateAddress(HTREEITEM hItem, HKEY hRootKey, LPCWSTR pszPath) swprintf(fullPath, L"%s%s%s", rootName, keyPath[0]==L'\'?L"":L"\", keyPath); else fullPath = wcscpy(fullPath, rootName); - + SendMessageW(hStatusBar, SB_SETTEXTW, 0, (LPARAM)fullPath); SendMessageW(g_pChildWnd->hAddressBarWnd, WM_SETTEXT, 0, (LPARAM)fullPath); HeapFree(GetProcessHeap(), 0, fullPath); @@ -477,14 +477,14 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
case WM_NOTIFY: if (g_pChildWnd == NULL) break; - + if (((LPNMHDR)lParam)->idFrom == TREE_WINDOW) { if (!TreeWndNotifyProc(g_pChildWnd->hListWnd, wParam, lParam, &Result)) { goto def; } - + return Result; } else @@ -502,7 +502,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa { goto def; } - } + } break;
case WM_CONTEXTMENU: diff --git a/base/applications/regedit/treeview.c b/base/applications/regedit/treeview.c index b7b45635b74..bcd37af8358 100644 --- a/base/applications/regedit/treeview.c +++ b/base/applications/regedit/treeview.c @@ -626,16 +626,16 @@ done: }
BOOL TreeWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result) -{ +{ UNREFERENCED_PARAMETER(wParam); *Result = TRUE; - + switch (((LPNMHDR)lParam)->code) { case TVN_ITEMEXPANDING: *Result = !OnTreeExpanding(g_pChildWnd->hTreeWnd, (NMTREEVIEW*)lParam); return TRUE; - case TVN_SELCHANGED: + case TVN_SELCHANGED: { NMTREEVIEW* pnmtv = (NMTREEVIEW*)lParam; /* Get the parent of the current item */ @@ -655,7 +655,7 @@ BOOL TreeWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result) EnableMenuItem(hMenuFrame , ID_EDIT_DELETE, MF_BYCOMMAND | MF_GRAYED); EnableMenuItem(hMenuFrame , ID_EDIT_RENAME, MF_BYCOMMAND | MF_GRAYED); EnableMenuItem(hPopupMenus, ID_TREE_DELETE, MF_BYCOMMAND | MF_GRAYED); - EnableMenuItem(hPopupMenus, ID_TREE_RENAME, MF_BYCOMMAND | MF_GRAYED); + EnableMenuItem(hPopupMenus, ID_TREE_RENAME, MF_BYCOMMAND | MF_GRAYED); } else { @@ -686,7 +686,7 @@ BOOL TreeWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result) return TRUE; } case TVN_ENDLABELEDIT: - { + { LPCWSTR keyPath; HKEY hRootKey; HKEY hKey = NULL; @@ -747,7 +747,7 @@ HWND CreateTreeView(HWND hwndParent, LPWSTR pHostName, HMENU id) 0, 0, rcClient.right, rcClient.bottom, hwndParent, id, hInst, NULL); if (!hwndTV) return NULL; - + /* Initialize the image list, and add items to the control. */ if (!InitTreeViewImageLists(hwndTV) || !InitTreeViewItems(hwndTV, pHostName)) { diff --git a/base/applications/sc/depend.c b/base/applications/sc/depend.c index 67035332cbd..2fee665d346 100644 --- a/base/applications/sc/depend.c +++ b/base/applications/sc/depend.c @@ -2,7 +2,7 @@ * PROJECT: ReactOS Services * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/sc/depend.c - * PURPOSE: + * PURPOSE: * COPYRIGHT: Copyright 2016 Eric Kohl * */ diff --git a/base/applications/sc/name.c b/base/applications/sc/name.c index f662cde38fd..9839350d896 100644 --- a/base/applications/sc/name.c +++ b/base/applications/sc/name.c @@ -2,7 +2,7 @@ * PROJECT: ReactOS Services * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/sc/name.c - * PURPOSE: + * PURPOSE: * COPYRIGHT: Copyright 2016 Eric Kohl * */ diff --git a/base/applications/screensavers/3dtext/3dtext.c b/base/applications/screensavers/3dtext/3dtext.c index a64e3252ecf..c1f908ca37a 100644 --- a/base/applications/screensavers/3dtext/3dtext.c +++ b/base/applications/screensavers/3dtext/3dtext.c @@ -181,7 +181,7 @@ GLvoid InitGL(GLsizei Width, GLsizei Height) }
// Handles Window Resizing -GLvoid ReSizeGLScene(GLsizei Width, GLsizei Height) +GLvoid ReSizeGLScene(GLsizei Width, GLsizei Height) { // Is Window Too Small (Divide By Zero Error) if (Height == 0) diff --git a/base/applications/screensavers/logon/logon.c b/base/applications/screensavers/logon/logon.c index e83941dc93e..20e66f2fb70 100644 --- a/base/applications/screensavers/logon/logon.c +++ b/base/applications/screensavers/logon/logon.c @@ -84,8 +84,8 @@ ScreenSaverProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) } case WM_PAINT: { - BITMAP bm; /* Bitmap structure as seen in bmWidth & bmHeight */ - PAINTSTRUCT ps; + BITMAP bm; /* Bitmap structure as seen in bmWidth & bmHeight */ + PAINTSTRUCT ps; HDC hdc; HDC hdcMem; HBITMAP hbmOld; @@ -93,9 +93,9 @@ ScreenSaverProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) // Obtain window coordinates. GetClientRect (hWnd, &rect);
- hdc = BeginPaint(hWnd, &ps); - hdcMem = CreateCompatibleDC(hdc); - hbmOld = SelectObject(hdcMem, bitmap); + hdc = BeginPaint(hWnd, &ps); + hdcMem = CreateCompatibleDC(hdc); + hbmOld = SelectObject(hdcMem, bitmap);
GetObject(bitmap, sizeof(bm), &bm);
@@ -118,19 +118,19 @@ ScreenSaverProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) else { BitBlt( - hdc, + hdc, RANDOM (0, rect.right - bm.bmWidth), RANDOM (0, rect.bottom - bm.bmHeight), - bm.bmWidth, - bm.bmHeight, - hdcMem, - 0, - 0, - SRCCOPY); + bm.bmWidth, + bm.bmHeight, + hdcMem, + 0, + 0, + SRCCOPY); }
- SelectObject(hdcMem, hbmOld); - DeleteDC(hdcMem); + SelectObject(hdcMem, hbmOld); + DeleteDC(hdcMem);
EndPaint(hWnd, &ps); break; diff --git a/base/applications/sdbinst/sdbinst.c b/base/applications/sdbinst/sdbinst.c index 01626080c72..f6ca0f616e0 100644 --- a/base/applications/sdbinst/sdbinst.c +++ b/base/applications/sdbinst/sdbinst.c @@ -122,7 +122,7 @@ AddUninstallKey( goto end; } } - + // Full path to sdbinst.exe hres = StringCchCatW(sdbinstPath, MAX_PATH, L"System32\sdbinst.exe"); if (FAILED(hres)) @@ -172,7 +172,7 @@ AddUninstallKey( goto end; }
- // Uninstall full string + // Uninstall full string hres = StringCchPrintfW(uninstString, MAX_PATH, L"%ls -u "%ls"", sdbinstPath, sdbInstalledPath); if (FAILED(hres)) { @@ -244,7 +244,7 @@ ProcessLayers( TAGID prevTagLayer = 0;
TAGID tagLayer = SdbFindFirstTag(pdb, tagDb, TAG_LAYER); - + // Add all layers to registry (AppCompatFlags) while (tagLayer && (tagLayer != prevTagLayer)) { @@ -430,7 +430,7 @@ SdbInstall( }
// Get database GUID - if (!GetSdbGuid(pdb, tagDb, &dbGuid)) + if (!GetSdbGuid(pdb, tagDb, &dbGuid)) { wprintf(L"GetSdbGuid error\n"); goto end; @@ -452,7 +452,7 @@ SdbInstall( wprintf(L"Can't get tag name\n"); goto end; } - + LPWSTR dbName = SdbGetStringTagPtr(pdb, tagDbName); wprintf(L"Database name %ls\n", dbName);
@@ -709,7 +709,7 @@ SdbUninstallByGuid( }
res = SdbUninstall(dbPath); - + end: if (hKey) { @@ -732,7 +732,7 @@ SdbUninstallByName( LSTATUS status; HKEY hKey = NULL; HKEY subKey = NULL; - DWORD index = 0; + DWORD index = 0; WCHAR keyName[MAX_PATH]; DWORD keyNameLen = ARRAYSIZE(keyName); DWORD keyValSize; @@ -790,7 +790,7 @@ SdbUninstallByName(
++index; keyNameLen = ARRAYSIZE(keyName); - status = RegEnumKeyExW(hKey, index, keyName, &keyNameLen, NULL, NULL, NULL, NULL); + status = RegEnumKeyExW(hKey, index, keyName, &keyNameLen, NULL, NULL, NULL, NULL); }
RegCloseKey(hKey); @@ -831,7 +831,7 @@ int _tmain(int argc, LPWSTR argv[]) ShowHelp(); }
- for (int i = 1; i < argc; ++i) + for (int i = 1; i < argc; ++i) { if (argv[i][0] != L'-') { diff --git a/base/applications/shutdown/gui.c b/base/applications/shutdown/gui.c index 0c1a0e9c257..57bc60e5dbc 100644 --- a/base/applications/shutdown/gui.c +++ b/base/applications/shutdown/gui.c @@ -34,7 +34,7 @@ INT_PTR CALLBACK ShutdownGuiProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpar default: return FALSE; } - + return TRUE; }
diff --git a/base/applications/shutdown/shutdown.c b/base/applications/shutdown/shutdown.c index f4c403d1ae7..382de2a7cc3 100644 --- a/base/applications/shutdown/shutdown.c +++ b/base/applications/shutdown/shutdown.c @@ -122,7 +122,7 @@ ParseArguments(struct CommandLineOptions* pOpts, int argc, WCHAR *argv[]) if (index+1 >= argc) return ERROR_INVALID_DATA; pOpts->shutdown_delay = _wtoi(argv[index+1]); - if (pOpts->shutdown_delay > 0) + if (pOpts->shutdown_delay > 0) pOpts->force = TRUE; index++; break; @@ -232,7 +232,7 @@ int wmain(int argc, WCHAR *argv[])
/* * If the user wants to hibernate the computer. Assume - * that the user wants to wake the computer up from + * that the user wants to wake the computer up from * hibernation and it should not force it on the system. */ if (opts.hibernate) @@ -240,13 +240,13 @@ int wmain(int argc, WCHAR *argv[]) if (IsPwrHibernateAllowed()) { EnablePrivilege(SE_SHUTDOWN_NAME, TRUE); - + /* The shutdown utility cannot hibernate remote systems */ if (opts.remote_system != NULL) { return EXIT_FAILURE; } - + if (!SetSuspendState(TRUE, FALSE, FALSE)) { ConResPuts(StdErr, IDS_ERROR_HIBERNATE); @@ -350,7 +350,7 @@ int wmain(int argc, WCHAR *argv[]) ConResPuts(StdErr, IDS_ERROR_RESTART); else ConResPuts(StdErr, IDS_ERROR_SHUTDOWN); - + DisplayError(GetLastError()); return EXIT_FAILURE; } diff --git a/base/applications/sndrec32/audio_membuffer.cpp b/base/applications/sndrec32/audio_membuffer.cpp index 67d0e6790b3..ccdfc7f6685 100644 --- a/base/applications/sndrec32/audio_membuffer.cpp +++ b/base/applications/sndrec32/audio_membuffer.cpp @@ -12,7 +12,7 @@ _AUDIO_NAMESPACE_START_
/* Protected Functions */
-void +void audio_membuffer::alloc_mem_(unsigned int bytes) { /* Some checking */ @@ -79,7 +79,7 @@ audio_membuffer::resize_mem_(unsigned int new_size) buffer_resized(new_size); }
-void +void audio_membuffer::truncate_(void) { /* If `buf_size' is already = to the `bytes_received' of audio data, @@ -113,7 +113,7 @@ audio_membuffer::clear(void) bytes_received = 0; }
-void +void audio_membuffer::reset(void) { /* Frees memory and reset to initial state */ @@ -122,37 +122,37 @@ audio_membuffer::reset(void) alloc_mem_(init_size); }
-void +void audio_membuffer::alloc_bytes(unsigned int bytes) { alloc_mem_(bytes); }
-void +void audio_membuffer::alloc_seconds(unsigned int secs) { alloc_mem_(aud_info.byte_rate() * secs); }
-void +void audio_membuffer::alloc_seconds(float secs) { alloc_mem_((unsigned int)((float)aud_info.byte_rate() * secs)); }
-void +void audio_membuffer::resize_bytes(unsigned int bytes) { resize_mem_(bytes); }
-void +void audio_membuffer::resize_seconds(unsigned int secs) { resize_mem_(aud_info.byte_rate() * secs); }
-void +void audio_membuffer::resize_seconds(float secs) { resize_mem_((unsigned int)((float)aud_info.byte_rate() * secs)); @@ -160,7 +160,7 @@ audio_membuffer::resize_seconds(float secs)
/* Inherited Functions */
-void +void audio_membuffer::audio_receive(unsigned char *data, unsigned int size) { /* If there isn't a buffer, allocs memory for it of size*2, and copies audio data arrival */ @@ -196,7 +196,7 @@ audio_membuffer::audio_receive(unsigned char *data, unsigned int size) audio_arrival(aud_info.samples_in_bytes(size)); }
-unsigned int +unsigned int audio_membuffer::read(BYTE *out_buf, unsigned int bytes) { /* Some checking */ diff --git a/base/applications/sndrec32/audio_resampler_acm.cpp b/base/applications/sndrec32/audio_resampler_acm.cpp index ddca7db15a8..d92c2753b24 100644 --- a/base/applications/sndrec32/audio_resampler_acm.cpp +++ b/base/applications/sndrec32/audio_resampler_acm.cpp @@ -25,7 +25,7 @@ audio_resampler_acm::init_(void) wformat_src.cbSize = sizeof(WAVEFORMATEX); wformat_dst.cbSize = sizeof(WAVEFORMATEX);
- /* Setting WAVEFORMATEX structure parameters + /* Setting WAVEFORMATEX structure parameters according to `audio_format' in/out classes */
wformat_src.wFormatTag = WAVE_FORMAT_PCM; @@ -189,7 +189,7 @@ audio_resampler_acm::close(void) /* ACM sream successfully closed */ }
-void +void audio_resampler_acm::audio_receive(unsigned char *data, unsigned int size) { MMRESULT err; diff --git a/base/applications/sndrec32/audio_wavein.cpp b/base/applications/sndrec32/audio_wavein.cpp index 839f6738185..99f0fa8a8fb 100644 --- a/base/applications/sndrec32/audio_wavein.cpp +++ b/base/applications/sndrec32/audio_wavein.cpp @@ -50,7 +50,7 @@ audio_wavein::alloc_buffers_mem_(unsigned int buffs, float secs) mb_size = tot_size; }
-void +void audio_wavein::free_buffers_mem_(void) { /* Frees memory */ @@ -65,7 +65,7 @@ audio_wavein::free_buffers_mem_(void) wave_headers = 0; }
-void +void audio_wavein::init_headers_(void) { /* If there is no memory for memory or headers, simply return */ @@ -85,7 +85,7 @@ audio_wavein::init_headers_(void) } }
-void +void audio_wavein::prep_headers_(void) { MMRESULT err; @@ -108,7 +108,7 @@ audio_wavein::prep_headers_(void) MessageBox(0, TEXT("waveInPrepareHeader Error."), 0, 0); }
-void +void audio_wavein::unprep_headers_(void) { MMRESULT err; @@ -131,7 +131,7 @@ audio_wavein::unprep_headers_(void) MessageBox(0, TEXT("waveInUnPrepareHeader Error."), 0, 0); }
-void +void audio_wavein::add_buffers_to_driver_(void) { MMRESULT err; @@ -155,7 +155,7 @@ audio_wavein::add_buffers_to_driver_(void) }
void -audio_wavein::close(void) +audio_wavein::close(void) { /* If wavein object is already in the status NOTREADY, nothing to do */ if (status == WAVEIN_NOTREADY) @@ -340,7 +340,7 @@ audio_wavein::stop_recording(void) status = WAVEIN_STOP; }
-DWORD WINAPI +DWORD WINAPI audio_wavein::recording_procedure(LPVOID arg) { MSG msg; diff --git a/base/applications/sndrec32/audio_wavein.hpp b/base/applications/sndrec32/audio_wavein.hpp index 44832d8651e..b31477fc8c6 100644 --- a/base/applications/sndrec32/audio_wavein.hpp +++ b/base/applications/sndrec32/audio_wavein.hpp @@ -123,7 +123,7 @@ class audio_wavein return;
/* Set seconds length for each buffer */ - buf_secs = bsecs; + buf_secs = bsecs; }
unsigned int total_buffers(void) const @@ -181,7 +181,7 @@ class audio_wavein svalue = (unsigned int)abs(*((short *)(main_buffer + aud_info.bytes_in_samples(nsamp)))); else if (aud_info.bits() == 8) svalue = (unsigned int)((ptrdiff_t) *(main_buffer + aud_info.bytes_in_samples(nsamp))); - else + else svalue = 0;
return svalue; diff --git a/base/applications/sndrec32/audio_waveout.cpp b/base/applications/sndrec32/audio_waveout.cpp index 0814e85d4cd..dfbf5f7f52d 100644 --- a/base/applications/sndrec32/audio_waveout.cpp +++ b/base/applications/sndrec32/audio_waveout.cpp @@ -22,7 +22,7 @@ audio_waveout::init_(void) status = WAVEOUT_NOTREADY; }
-void +void audio_waveout::alloc_buffers_mem_(unsigned int buffs, float secs) { unsigned int onebuf_size = 0, tot_size = 0; @@ -35,7 +35,7 @@ audio_waveout::alloc_buffers_mem_(unsigned int buffs, float secs) delete[] wave_headers;
/* Calcs size of the buffers */ - onebuf_size = (unsigned int)((float)aud_info.byte_rate() * secs); + onebuf_size = (unsigned int)((float)aud_info.byte_rate() * secs); tot_size = onebuf_size * buffs; /* Allocs memory for the audio buffers */ main_buffer = new BYTE[tot_size]; @@ -48,7 +48,7 @@ audio_waveout::alloc_buffers_mem_(unsigned int buffs, float secs) mb_size = tot_size; }
-void +void audio_waveout::init_headers_(void) { /* If there is no memory for memory or headers, simply return */ @@ -80,7 +80,7 @@ audio_waveout::init_headers_(void) } }
-void +void audio_waveout::prep_headers_(void) { MMRESULT err; @@ -105,7 +105,7 @@ audio_waveout::prep_headers_(void) } }
-void +void audio_waveout::unprep_headers_(void) { MMRESULT err; @@ -130,7 +130,7 @@ audio_waveout::unprep_headers_(void) } }
-void +void audio_waveout::free_buffers_mem_(void) { /* Frees memory */ @@ -144,7 +144,7 @@ audio_waveout::free_buffers_mem_(void) wave_headers = 0; }
-void +void audio_waveout::open(void) { MMRESULT err; @@ -214,7 +214,7 @@ audio_waveout::open(void) status = WAVEOUT_READY; }
-void +void audio_waveout::play(void) { MMRESULT err; @@ -268,7 +268,7 @@ audio_waveout::play(void) } }
-void +void audio_waveout::pause(void) { MMRESULT err; @@ -288,7 +288,7 @@ audio_waveout::pause(void) } }
-void +void audio_waveout::stop(void) { MMRESULT err; @@ -344,7 +344,7 @@ audio_waveout::close(void) free_buffers_mem_(); }
-DWORD WINAPI +DWORD WINAPI audio_waveout::playing_procedure(LPVOID arg) { MSG msg; diff --git a/base/applications/sndrec32/audio_waveout.hpp b/base/applications/sndrec32/audio_waveout.hpp index cf3fd06b402..f95c10969c1 100644 --- a/base/applications/sndrec32/audio_waveout.hpp +++ b/base/applications/sndrec32/audio_waveout.hpp @@ -117,7 +117,7 @@ class audio_waveout return (unsigned int)65535; else if (aud_info.bits() == 8) return (unsigned int)255; - else + else return 0; }
@@ -134,7 +134,7 @@ class audio_waveout svalue = (unsigned int)abs(*((short *)(main_buffer + aud_info.bytes_in_samples(nsamp)))); else if (aud_info.bits() == 8) svalue = (unsigned int)((ptrdiff_t) *(main_buffer + aud_info.bytes_in_samples(nsamp))); - else + else svalue = 0;
return svalue; diff --git a/base/applications/sndvol32/misc.c b/base/applications/sndvol32/misc.c index 86bbbe67927..c11a9a439c5 100644 --- a/base/applications/sndvol32/misc.c +++ b/base/applications/sndvol32/misc.c @@ -209,7 +209,7 @@ LoadXYCoordWnd(IN PPREFERENCES_CONTEXT PrefContext)
/* Cache the Y coordinate point */ PrefContext->MixerWindow->WndPosY = dwData; - + RegCloseKey(hKey); return TRUE; } @@ -222,7 +222,7 @@ SaveXYCoordWnd(IN HWND hWnd, LONG lResult; TCHAR DeviceMixerSettings[256]; WINDOWPLACEMENT wp; - + /* Get the placement coordinate data from the window */ wp.length = sizeof(WINDOWPLACEMENT); GetWindowPlacement(hWnd, &wp); diff --git a/base/applications/sndvol32/sndvol32.c b/base/applications/sndvol32/sndvol32.c index e39fceb46b5..426f5a9cb25 100644 --- a/base/applications/sndvol32/sndvol32.c +++ b/base/applications/sndvol32/sndvol32.c @@ -340,7 +340,7 @@ UpdatePrefDlgControls(PPREFERENCES_CONTEXT Context, } }
-static +static VOID WriteLineSettings(PPREFERENCES_CONTEXT Context, HWND hwndDlg) { @@ -576,11 +576,11 @@ DlgPreferencesProc(HWND hwndDlg, IDCANCEL); break; } - + case WM_SYSCOLORCHANGE: { HWND hwndControls; - + /* Forward WM_SYSCOLORCHANGE */ hwndControls = GetDlgItem(hwndDlg, IDC_CONTROLS); SendMessage(hwndControls, WM_SYSCOLORCHANGE, 0, 0); @@ -1342,7 +1342,7 @@ CreateApplicationWindow( hWnd = CreateWindowEx(WS_EX_WINDOWEDGE | WS_EX_CONTROLPARENT, SZ_APP_CLASS, lpAppTitle, - WS_DLGFRAME | WS_CAPTION | WS_MINIMIZEBOX | WS_SYSMENU | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_VISIBLE, + WS_DLGFRAME | WS_CAPTION | WS_MINIMIZEBOX | WS_SYSMENU | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_VISIBLE, 0, 0, 300, 315, NULL, LoadMenu(hAppInstance, diff --git a/base/applications/taskmgr/applpage.c b/base/applications/taskmgr/applpage.c index 81ae85be379..cf4c063f434 100644 --- a/base/applications/taskmgr/applpage.c +++ b/base/applications/taskmgr/applpage.c @@ -486,7 +486,7 @@ void AddOrUpdateHwnd(HWND hWnd, WCHAR *szTitle, HICON hIcon, BOOL bHung) }
/* Select first item if any */ - if ((ListView_GetNextItem(hApplicationPageListCtrl, -1, LVNI_FOCUSED | LVNI_SELECTED) == -1) && + if ((ListView_GetNextItem(hApplicationPageListCtrl, -1, LVNI_FOCUSED | LVNI_SELECTED) == -1) && (ListView_GetItemCount(hApplicationPageListCtrl) > 0) && !bApplicationPageSelectionMade) { ListView_SetItemState(hApplicationPageListCtrl, 0, LVIS_FOCUSED | LVIS_SELECTED, LVIS_FOCUSED | LVIS_SELECTED); diff --git a/base/applications/taskmgr/procpage.c b/base/applications/taskmgr/procpage.c index 28e14a9eb54..692c1bd66e5 100644 --- a/base/applications/taskmgr/procpage.c +++ b/base/applications/taskmgr/procpage.c @@ -478,7 +478,7 @@ void UpdateProcesses() SendMessage(hProcessPageListCtrl, WM_SETREDRAW, TRUE, 0);
/* Select first item if any */ - if ((ListView_GetNextItem(hProcessPageListCtrl, -1, LVNI_FOCUSED | LVNI_SELECTED) == -1) && + if ((ListView_GetNextItem(hProcessPageListCtrl, -1, LVNI_FOCUSED | LVNI_SELECTED) == -1) && (ListView_GetItemCount(hProcessPageListCtrl) > 0) && !bProcessPageSelectionMade) { ListView_SetItemState(hProcessPageListCtrl, 0, LVIS_FOCUSED | LVIS_SELECTED, LVIS_FOCUSED | LVIS_SELECTED); @@ -492,7 +492,7 @@ void UpdateProcesses() */ }
-BOOL ProcessRunning(ULONG ProcessId) +BOOL ProcessRunning(ULONG ProcessId) { HANDLE hProcess; DWORD exitCode; diff --git a/base/applications/taskmgr/taskmgr.c b/base/applications/taskmgr/taskmgr.c index 113d3c24332..1708c12b734 100644 --- a/base/applications/taskmgr/taskmgr.c +++ b/base/applications/taskmgr/taskmgr.c @@ -56,7 +56,7 @@ TASKMANAGER_SETTINGS TaskManagerSettings; // http://www.catch22.net/software/winspy // Copyright (c) 2002 by J Brown // - + // // Copied from uxtheme.h // If you have this new header, then delete these and @@ -67,7 +67,7 @@ TASKMANAGER_SETTINGS TaskManagerSettings; #define ETDT_USETABTEXTURE 0x00000004 #define ETDT_ENABLETAB (ETDT_ENABLE | ETDT_USETABTEXTURE)
-// +// typedef HRESULT (WINAPI * ETDTProc) (HWND, DWORD);
// @@ -82,7 +82,7 @@ BOOL EnableDialogTheme(HWND hwnd)
if(hUXTheme) { - fnEnableThemeDialogTexture = + fnEnableThemeDialogTexture = (ETDTProc)GetProcAddress(hUXTheme, "EnableThemeDialogTexture");
if(fnEnableThemeDialogTexture) diff --git a/base/applications/utilman/umandlg/umandlg.c b/base/applications/utilman/umandlg/umandlg.c index f2c7e2e06e8..3d301f229b4 100644 --- a/base/applications/utilman/umandlg/umandlg.c +++ b/base/applications/utilman/umandlg/umandlg.c @@ -145,7 +145,7 @@ BOOL DlgInitHandler(IN HWND hDlg)
/* Refresh the list */ ListBoxRefreshContents(); - + /* Create a timer, we'll use it to control the state of our items in the listbox */ Globals.iTimer = SetTimer(hDlg, 0, 400, NULL);
diff --git a/base/applications/wordpad/wordpad.c b/base/applications/wordpad/wordpad.c index 6e87e3268d4..1c0b820308a 100644 --- a/base/applications/wordpad/wordpad.c +++ b/base/applications/wordpad/wordpad.c @@ -2662,7 +2662,7 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdPar 'T','A','B','L','E','\0'};
InitCommonControlsEx(&classes); - + switch (GetUserDefaultUILanguage()) { case MAKELANGID(LANG_HEBREW, SUBLANG_DEFAULT): diff --git a/base/services/audiosrv/audiosrv.txt b/base/services/audiosrv/audiosrv.txt index 37c9d24d24b..6305f84aa8a 100644 --- a/base/services/audiosrv/audiosrv.txt +++ b/base/services/audiosrv/audiosrv.txt @@ -16,23 +16,23 @@ Global\AudioDeviceList This file appears to contain a list of devices that WinMM accesses and subsequently passes to wdmaud.drv
-It is not necessary to duplicate the exact structure of this mapped +It is not necessary to duplicate the exact structure of this mapped file, since it appears to only be used internally by Windows components.
-The ROS Audio Service (AudioSrv) is intended to be able to run -alongside the Windows Audio Service on XP/Vista, so it should be +The ROS Audio Service (AudioSrv) is intended to be able to run +alongside the Windows Audio Service on XP/Vista, so it should be possible to test in a "known working environment" ;)
It will create a mutex, to: 1) Allow synchronization when accessing the device list 2) Provide a simple method of identifying if AudioSrv is running
-(It might be worth using an event to notify WinMM when things are +(It might be worth using an event to notify WinMM when things are happening?)
-The intention is to make AudioSrv receive PnP notifications for -relevant audio devices, and also let AudioSrv in Windows do this. Then -it should be possible to create a small application that imitates +The intention is to make AudioSrv receive PnP notifications for +relevant audio devices, and also let AudioSrv in Windows do this. Then +it should be possible to create a small application that imitates WinMM's actions :)
diff --git a/base/services/audiosrv/pnp_list_manager.c b/base/services/audiosrv/pnp_list_manager.c index 46d09eb0376..0854d69eb4a 100644 --- a/base/services/audiosrv/pnp_list_manager.c +++ b/base/services/audiosrv/pnp_list_manager.c @@ -73,9 +73,9 @@ AppendAudioDeviceToList(PnP_AudioDevice* device) if (audio_device_list->size + device_info_size > audio_device_list->max_size) { /*printf("max_size would be exceeded! Failing...\n");*/ - + UnlockAudioDeviceList(); - + return FALSE; }
diff --git a/base/services/dhcpcsvc/CMakeLists.txt b/base/services/dhcpcsvc/CMakeLists.txt index 604d21564b5..add998f0f5a 100644 --- a/base/services/dhcpcsvc/CMakeLists.txt +++ b/base/services/dhcpcsvc/CMakeLists.txt @@ -3,7 +3,7 @@ add_definitions(-Dtzset=_tzset) include_directories(include) spec2def(dhcpcsvc.dll dhcpcsvc.spec ADD_IMPORTLIB)
-list(APPEND SOURCE +list(APPEND SOURCE dhcp/adapter.c dhcp/alloc.c dhcp/api.c diff --git a/base/services/dhcpcsvc/dhcp/adapter.c b/base/services/dhcpcsvc/dhcp/adapter.c index 65f620360b8..ef839dc1b7d 100644 --- a/base/services/dhcpcsvc/dhcp/adapter.c +++ b/base/services/dhcpcsvc/dhcp/adapter.c @@ -172,7 +172,7 @@ BOOL PrepareAdapterForService( PDHCP_ADAPTER Adapter ) { { /* DHCP enabled by default */ DhcpEnabled = 1; - } + }
if( !DhcpEnabled ) { /* Non-automatic case */ @@ -222,7 +222,7 @@ IsReconnectHackNeeded(PDHCP_ADAPTER Adapter, const MIB_IFROW* IfEntry) if (Adapter->DhclientInfo.client->state != S_BOUND && Adapter->DhclientInfo.client->state != S_STATIC) return FALSE; - + ApiUnlock();
Orig = AdapterInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(IP_ADAPTER_INFO)); @@ -397,7 +397,7 @@ DWORD WINAPI AdapterDiscoveryThread(LPVOID Context) { socket( AF_INET, SOCK_DGRAM, IPPROTO_UDP );
if (DhcpSocket != INVALID_SOCKET) { - + /* Allow broadcast on this socket */ Broadcast = 1; setsockopt(DhcpSocket, @@ -405,7 +405,7 @@ DWORD WINAPI AdapterDiscoveryThread(LPVOID Context) { SO_BROADCAST, (const char *)&Broadcast, sizeof(Broadcast)); - + Adapter->ListenAddr.sin_family = AF_INET; Adapter->ListenAddr.sin_port = htons(LOCAL_PORT); Adapter->BindStatus = diff --git a/base/services/dhcpcsvc/dhcp/api.c b/base/services/dhcpcsvc/dhcp/api.c index 28d19cacba7..0a2141275ac 100644 --- a/base/services/dhcpcsvc/dhcp/api.c +++ b/base/services/dhcpcsvc/dhcp/api.c @@ -185,7 +185,7 @@ DWORD DSStaticRefreshParams( PipeSendFunc Send, HANDLE CommPipe, COMM_DHCP_REQ * DeleteIpForwardEntry( &Adapter->RouterMib ); Adapter->RouterMib.dwForwardNextHop = 0; } - + Adapter->DhclientState.state = S_STATIC; proto = find_protocol_by_adapter( &Adapter->DhclientInfo ); if (proto) diff --git a/base/services/dhcpcsvc/dhcpcsvc.c b/base/services/dhcpcsvc/dhcpcsvc.c index 819af629a79..c9c9025ebc6 100644 --- a/base/services/dhcpcsvc/dhcpcsvc.c +++ b/base/services/dhcpcsvc/dhcpcsvc.c @@ -51,7 +51,7 @@ DhcpCApiInitialize(LPDWORD Version) }
/* Change the pipe into message mode */ - PipeMode = PIPE_READMODE_MESSAGE; + PipeMode = PIPE_READMODE_MESSAGE; if (!SetNamedPipeHandleState(PipeHandle, &PipeMode, NULL, NULL)) { /* Mode change failed */ diff --git a/base/services/dnsrslvr/cache.c b/base/services/dnsrslvr/cache.c index c3be82ccde5..9504d303208 100644 --- a/base/services/dnsrslvr/cache.c +++ b/base/services/dnsrslvr/cache.c @@ -49,7 +49,7 @@ DnsIntCacheFree(VOID) DeleteCriticalSection(&DnsCache.Lock); DnsCacheInitialized = FALSE; } - + VOID DnsIntCacheRemoveEntryItem(PRESOLVER_CACHE_ENTRY CacheEntry) { @@ -57,7 +57,7 @@ DnsIntCacheRemoveEntryItem(PRESOLVER_CACHE_ENTRY CacheEntry)
/* Remove the entry from the list */ RemoveEntryList(&CacheEntry->CacheLink); - + /* Free record */ DnsRecordListFree(CacheEntry->Record, DnsFreeRecordList);
diff --git a/base/services/rpcss/CMakeLists.txt b/base/services/rpcss/CMakeLists.txt index a0dd14487df..347356773c3 100644 --- a/base/services/rpcss/CMakeLists.txt +++ b/base/services/rpcss/CMakeLists.txt @@ -2,7 +2,7 @@ add_rpc_files(server ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine/epm.idl ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine/irot.idl) - +
list(APPEND SOURCE epmp.c diff --git a/base/services/shsvcs/thmserver.c b/base/services/shsvcs/thmserver.c index a374079f9f8..de5bc8befd0 100644 --- a/base/services/shsvcs/thmserver.c +++ b/base/services/shsvcs/thmserver.c @@ -6,9 +6,9 @@ * PROGRAMMER: Giannis Adamopoulos */
-/* - * NOTE: - * ThemeWaitForServiceReady and ThemeWatchForStart are called from msgina +/* + * NOTE: + * ThemeWaitForServiceReady and ThemeWatchForStart are called from msgina * so all the functions in this file run in the context of winlogon */
@@ -32,7 +32,7 @@ BOOL WINAPI ThemeWatchForStart(VOID);
/* FUNCTIONS *****************************************************************/
-static +static HANDLE GetThemeServiceProcessHandle(VOID) { @@ -162,7 +162,7 @@ ThemeWaitForServiceReady(DWORD dwTimeout) break; }
- if (GetTickCount() - start_time > dwTimeout) + if (GetTickCount() - start_time > dwTimeout) { break; } diff --git a/base/services/svchost/security.cxx b/base/services/svchost/security.cxx index 451d6c2929a..ca895cd7ffb 100644 --- a/base/services/svchost/security.cxx +++ b/base/services/svchost/security.cxx @@ -69,7 +69,7 @@ DwInitializeSdFromThreadToken ( /* Allocate an SD large enough to hold the SIDs for the above */ dwAlignLength = ALIGN_UP(dwUserLength, ULONG); pSd = (PISECURITY_DESCRIPTOR)MemAlloc(0, - dwAlignLength + + dwAlignLength + dwGroupLength + sizeof(*pSd)); if (pSd == NULL) return ERROR_OUTOFMEMORY; diff --git a/base/services/tcpsvcs/echo.c b/base/services/tcpsvcs/echo.c index 262ffcfddb5..7f273c6622b 100644 --- a/base/services/tcpsvcs/echo.c +++ b/base/services/tcpsvcs/echo.c @@ -20,7 +20,7 @@ EchoIncomingPackets(SOCKET sock) INT readBytes; INT retVal;
- do + do { readBytes = recv(sock, readBuffer, RECV_BUF, 0); if (readBytes > 0) diff --git a/base/services/tcpsvcs/qotd.c b/base/services/tcpsvcs/qotd.c index 55c31969479..904c4f039e6 100644 --- a/base/services/tcpsvcs/qotd.c +++ b/base/services/tcpsvcs/qotd.c @@ -59,7 +59,7 @@ RetrieveQuote(SOCKET sock) { DWORD dwSize = GetFileSize(hFile, NULL); lpQuotes = (LPSTR)HeapAlloc(GetProcessHeap(), 0, dwSize + 1); - if (!lpQuotes) + if (!lpQuotes) { CloseHandle(hFile); return FALSE; diff --git a/base/services/umpnpmgr/rpcserver.c b/base/services/umpnpmgr/rpcserver.c index 70597946e70..95f69db2470 100644 --- a/base/services/umpnpmgr/rpcserver.c +++ b/base/services/umpnpmgr/rpcserver.c @@ -3229,7 +3229,7 @@ PNP_GetDeviceStatus( 0); if (ret != CR_SUCCESS) ulCapabilities = 0; - + if (ulCapabilities & CM_DEVCAP_REMOVABLE) *pulStatus |= DN_REMOVABLE;
diff --git a/base/services/wlansvc/rpcserver.c b/base/services/wlansvc/rpcserver.c index 010b4b47f63..d730a58cde1 100644 --- a/base/services/wlansvc/rpcserver.c +++ b/base/services/wlansvc/rpcserver.c @@ -19,7 +19,7 @@ DWORD WINAPI RpcThreadRoutine(LPVOID lpParameter) RPC_STATUS Status;
InitializeListHead(&WlanSvcHandleListHead); - + Status = RpcServerUseProtseqEpW(L"ncalrpc", 20, L"wlansvc", NULL); if (Status != RPC_S_OK) { @@ -81,13 +81,13 @@ DWORD _RpcOpenHandle(
if (dwClientVersion > 2) dwClientVersion = 2; - + if (dwClientVersion < 1) dwClientVersion = 1; - + lpWlanSvcHandle->dwClientVersion = dwClientVersion; *pdwNegotiatedVersion = dwClientVersion; - + InsertTailList(&WlanSvcHandleListHead, &lpWlanSvcHandle->WlanSvcHandleListEntry); *phClientHandle = lpWlanSvcHandle;
@@ -264,7 +264,7 @@ DWORD _RpcScan( { return ERROR_INVALID_HANDLE; } - + /* DWORD dwBytesReturned; HANDLE hDevice; diff --git a/base/services/wuauserv/wuauserv.c b/base/services/wuauserv/wuauserv.c index 6ebc0809ec1..5ef0d287778 100644 --- a/base/services/wuauserv/wuauserv.c +++ b/base/services/wuauserv/wuauserv.c @@ -94,7 +94,7 @@ ServiceMain(DWORD argc, LPTSTR *argv) UNREFERENCED_PARAMETER(argv);
DPRINT("WU ServiceMain() called\n"); - + ServiceStatusHandle = RegisterServiceCtrlHandlerExW(ServiceName, ServiceControlHandler, NULL); diff --git a/base/setup/usetup/lang/eu-ES.h b/base/setup/usetup/lang/eu-ES.h index 4777c606c2c..14ab64b8bc7 100644 --- a/base/setup/usetup/lang/eu-ES.h +++ b/base/setup/usetup/lang/eu-ES.h @@ -535,7 +535,7 @@ static MUI_ENTRY euESRepairPageEntries[] = { 6, 12, - "Zuzentzaile funtzioak ez daude artean ezarrita.", + "Zuzentzaile funtzioak ez daude artean ezarrita.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 16a520cbd84..4668dde86d0 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -3970,7 +3970,7 @@ BootLoaderPage(PINPUT_RECORD Ir) CONSOLE_NormalTextXY(8, Line, 60, 1);
Line = 15; - + CONSOLE_InvertTextXY(8, Line, 60, 1); } else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && @@ -4099,7 +4099,7 @@ BootLoaderFloppyPage(PINPUT_RECORD Ir) * Calls InstallVBRToPartition() if VBR installation is chosen. * Otherwise both InstallVBRToPartition() and InstallMbrBootCodeToDisk() * are called if both MBR and VBR installation is chosen. - * + * * RETURNS * Number of the next page. */ diff --git a/base/shell/cmd/batch.h b/base/shell/cmd/batch.h index 982965c794a..82f59ad5fc4 100644 --- a/base/shell/cmd/batch.h +++ b/base/shell/cmd/batch.h @@ -29,7 +29,7 @@ typedef struct _BATCH_CONTEXT char *mem; /* batchfile content in memory */ DWORD memsize; /* size of batchfile */ DWORD mempos; /* current position to read from */ - BOOL memfree; /* true if it need to be freed when exitbatch is called */ + BOOL memfree; /* true if it need to be freed when exitbatch is called */ TCHAR BatchFilePath[MAX_PATH]; LPTSTR params; LPTSTR raw_params; /* Holds the raw params given by the input */ diff --git a/base/shell/cmd/ctty.c b/base/shell/cmd/ctty.c index c095ab373e0..d282900cfc2 100644 --- a/base/shell/cmd/ctty.c +++ b/base/shell/cmd/ctty.c @@ -74,7 +74,7 @@ CheckTerminalDeviceType(IN LPCTSTR pszName) } else if ( _wcsnicmp(DeviceName, DosLPTDevice, 3) == 0 || - _wcsnicmp(DeviceName, DosCOMDevice, 3) == 0 || + _wcsnicmp(DeviceName, DosCOMDevice, 3) == 0 || _wcsnicmp(DeviceName, DosPRNDevice, 3) == 0 || _wcsnicmp(DeviceName, DosAUXDevice, 3) == 0 || _wcsnicmp(DeviceName, DosNULDevice, 3) == 0 ) diff --git a/base/shell/cmd/readme2.txt b/base/shell/cmd/readme2.txt index 2de2a692ddc..f9a20b57c94 100644 --- a/base/shell/cmd/readme2.txt +++ b/base/shell/cmd/readme2.txt @@ -1,32 +1,32 @@ General Overview of How Things Work ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -First it comes into _main in cmd.c(1811). The command line params are taking in and if it is unicode it uses CommandLineToArgvW. -This can cause a problem on older machines and that is why we have our own custom _CommandLineToArgvW to help this along. -We pull in the launch directory as the initial dir and set that in _tchdir. We make a handle to the default console out using CreateFile. +First it comes into _main in cmd.c(1811). The command line params are taking in and if it is unicode it uses CommandLineToArgvW. +This can cause a problem on older machines and that is why we have our own custom _CommandLineToArgvW to help this along. +We pull in the launch directory as the initial dir and set that in _tchdir. We make a handle to the default console out using CreateFile.
-Then we call Initialize(). Here we need to load ntdll.dll if it isn't loaded (windows 9x machines). -We also setup some global vars like default io handles and nErrorLevel and set %prompt% to $P$G. +Then we call Initialize(). Here we need to load ntdll.dll if it isn't loaded (windows 9x machines). +We also setup some global vars like default io handles and nErrorLevel and set %prompt% to $P$G. This is where all command lines switches given to cmd on startup are done.
-From here main calls ProcessInput(). This is where cmd loops for getting input and doing the commands. -First it checks to see if there is a batch file(note: there is a global struct "bc" which is NULL when not processing a batch file) -and if there is it will pull a new line from that file. If not, then it will wait for input. -Currently there is some stuff for set /a in there, which might stay there or see if we can find a better spot. - -Once there is input taken in from the command line it is sent into ParseCommandLine(). -In here we fist check for aliases and convert if need be. -Then we look for redirections using GetRedirection() which will remove any redirection symbols. -and pass back info about where to redirect. -from this info it will do some switching around with the handles for where things go and send them as need be. -personally i dont like this code and i tried to change it before but failed. +From here main calls ProcessInput(). This is where cmd loops for getting input and doing the commands. +First it checks to see if there is a batch file(note: there is a global struct "bc" which is NULL when not processing a batch file) +and if there is it will pull a new line from that file. If not, then it will wait for input. +Currently there is some stuff for set /a in there, which might stay there or see if we can find a better spot. + +Once there is input taken in from the command line it is sent into ParseCommandLine(). +In here we fist check for aliases and convert if need be. +Then we look for redirections using GetRedirection() which will remove any redirection symbols. +and pass back info about where to redirect. +from this info it will do some switching around with the handles for where things go and send them as need be. +personally i dont like this code and i tried to change it before but failed. it is confusing to me and i dont understand why a lot of it is there but apparently it is needed.
-It sends the new string without any redirection info into DoCommand(). In this function we just look to see what should be done. -There is one of 2 things that could happen. -1) we fnd the matching command and send it off to that commands little section. +It sends the new string without any redirection info into DoCommand(). In this function we just look to see what should be done. +There is one of 2 things that could happen. +1) we fnd the matching command and send it off to that commands little section. 2) we dont find it so we send it to Execute() and see if it is a file that we can do something.
-Execute will try to launch the file using createprocess and falls back on shellexecute. +Execute will try to launch the file using createprocess and falls back on shellexecute. It calls a function called SearchForExecutable() to find the full path name and looks in all the correct locations like PATH, current folder, windows folder. If it cant find it, just fails and prints out a message.
diff --git a/base/shell/cmd/ren.txt b/base/shell/cmd/ren.txt index ed2bfa2d166..a32fb92061f 100644 --- a/base/shell/cmd/ren.txt +++ b/base/shell/cmd/ren.txt @@ -1,6 +1,6 @@ Made by Vicmarcal 23/11/08
-THIS FILE HELPS TO EXPLAIN HOW REN IS NOW IMPLEMENTED. +THIS FILE HELPS TO EXPLAIN HOW REN IS NOW IMPLEMENTED. **************************************************************** (Please change or add latest modifications) **************************************************************** @@ -14,7 +14,7 @@ ren c:\ie\hello.txt c:\ie\hi.txt rename command will change the name of hello.txt->hi.txt. We have to be sure that both paths(c:\ie\ ) be the same.Since rename cant move files within Directories (MSDN).
WAY #2:Semi Path Way: -ren c:\ie\hello.txt hi.txt +ren c:\ie\hello.txt hi.txt
This is a special feature,since this does the same as Way #1 but without telling the Destiny path.So this feature must be implemented also.
@@ -35,7 +35,7 @@ So it changes the name of hello.txt in the current directory. Explaining code:
-srcPattern: here is stored Source Argument (C:\ie\hello.txt) +srcPattern: here is stored Source Argument (C:\ie\hello.txt) srcPath: here is stored Source Path(C:\ie) srcFILE: here is stored FILE name(hello.txt)
@@ -43,7 +43,7 @@ dstPattern: here is stored Destiny Argument (C:\ie\hi.txt) dstPath: here is stored Destiny Path(C:\i) dstFILE: here is stored FILE re-name(hi.txt)
-1)We begin retrieving arguments from command line and fulfilling dstPattern and srcPattern +1)We begin retrieving arguments from command line and fulfilling dstPattern and srcPattern
2)If srcPattern contains "" then: diff --git a/base/shell/explorer/notifyiconscust.cpp b/base/shell/explorer/notifyiconscust.cpp index b7adccb35ab..18e2d665da0 100644 --- a/base/shell/explorer/notifyiconscust.cpp +++ b/base/shell/explorer/notifyiconscust.cpp @@ -25,7 +25,7 @@ INT_PTR CALLBACK CustomizeNotifyIconsProc(HWND hwnd, UINT Message, WPARAM wParam switch(Message) { case WM_INITDIALOG: - + return TRUE; case WM_COMMAND: switch(LOWORD(wParam)) diff --git a/base/shell/explorer/precomp.h b/base/shell/explorer/precomp.h index 1db8538dce8..86c5b80a284 100644 --- a/base/shell/explorer/precomp.h +++ b/base/shell/explorer/precomp.h @@ -68,7 +68,7 @@ extern BOOL bExplorerIsShell; * explorer.c */
-static inline +static inline LONG SetWindowStyle(IN HWND hWnd, IN LONG dwStyleMask, @@ -312,14 +312,14 @@ CreateStartMenu(IN ITrayWindow *Tray, /* * startmnucust.cpp */ -VOID +VOID ShowCustomizeClassic(HINSTANCE, HWND);
/* * startmnusite.cpp */
-HRESULT +HRESULT CStartMenuSite_CreateInstance(IN OUT ITrayWindow *Tray, const IID & riid, PVOID * ppv);
/* diff --git a/base/shell/explorer/resource.h b/base/shell/explorer/resource.h index 2e748252fdc..5265eb15618 100644 --- a/base/shell/explorer/resource.h +++ b/base/shell/explorer/resource.h @@ -134,7 +134,7 @@
/* Customize Notifications Dialog */ #define IDC_TASKBARPROP_NOTIREST 1402 -#define IDC_NOTIFICATION_LIST 1005 +#define IDC_NOTIFICATION_LIST 1005 #define IDC_NOTIFICATION_BEHAVIOUR 1006
/* Customize classic start menu dialog */ diff --git a/base/shell/explorer/settings.cpp b/base/shell/explorer/settings.cpp index f47e165d7df..c47993d1d7a 100644 --- a/base/shell/explorer/settings.cpp +++ b/base/shell/explorer/settings.cpp @@ -43,7 +43,7 @@ BOOL TaskbarSettings::Load() cbSize = sizeof(dwValue); dwRet = SHGetValueW(hkExplorer, L"Advanced", L"TaskbarSizeMove", NULL, &dwValue, &cbSize); bLock = (dwRet == ERROR_SUCCESS) ? (dwValue == 0) : TRUE; - + dwRet = SHGetValueW(hkExplorer, L"Advanced", L"ShowSeconds", NULL, &dwValue, &cbSize); bShowSeconds = (dwRet == ERROR_SUCCESS) ? (dwValue != 0) : FALSE;
diff --git a/base/shell/explorer/startctxmnu.cpp b/base/shell/explorer/startctxmnu.cpp index 4c3d7caf172..a404cb4ba1f 100644 --- a/base/shell/explorer/startctxmnu.cpp +++ b/base/shell/explorer/startctxmnu.cpp @@ -212,7 +212,7 @@ public: return S_OK; }
- virtual HRESULT STDMETHODCALLTYPE + virtual HRESULT STDMETHODCALLTYPE GetCommandString(UINT_PTR idCmd, UINT uType, UINT *pwReserved, diff --git a/base/shell/explorer/syspager.cpp b/base/shell/explorer/syspager.cpp index a71d3cf280a..b28e742cef4 100644 --- a/base/shell/explorer/syspager.cpp +++ b/base/shell/explorer/syspager.cpp @@ -369,7 +369,7 @@ bool CIconWatcher::AddIconToWatcher(_In_ CONST NOTIFYICONDATA *iconData) bool CIconWatcher::RemoveIconFromWatcher(_In_ CONST NOTIFYICONDATA *iconData) { EnterCriticalSection(&m_ListLock); - + IconWatcherData *Icon; Icon = GetListEntry(iconData, NULL, true);
@@ -717,7 +717,7 @@ BOOL CNotifyToolbar::AddButton(_In_ CONST NOTIFYICONDATA *iconData) InternalIconData * notifyItem; WCHAR text[] = L"";
- TRACE("Adding icon %d from hWnd %08x flags%s%s state%s%s", + TRACE("Adding icon %d from hWnd %08x flags%s%s state%s%s", iconData->uID, iconData->hWnd, (iconData->uFlags & NIF_ICON) ? " ICON" : "", (iconData->uFlags & NIF_STATE) ? " STATE" : "", @@ -1243,7 +1243,7 @@ void CNotifyToolbar::Initialize(HWND hWndParent, CBalloonQueue * queue)
SetWindowTheme(m_hWnd, L"TrayNotify", NULL);
- m_ImageList = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_COLOR32 | ILC_MASK, 0, 1000); + m_ImageList = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_COLOR32 | ILC_MASK, 0, 1000); SetImageList(m_ImageList);
TBMETRICS tbm = {sizeof(tbm)}; @@ -1292,7 +1292,7 @@ LRESULT CSysPagerWnd::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bH HWND hWndTop = GetAncestor(m_hWnd, GA_ROOT);
m_Balloons.Create(hWndTop, TTS_NOPREFIX | TTS_BALLOON | TTS_CLOSE); - + TOOLINFOW ti = { 0 }; ti.cbSize = TTTOOLINFOW_V1_SIZE; ti.uFlags = TTF_TRACK | TTF_IDISHWND; @@ -1380,7 +1380,7 @@ BOOL CSysPagerWnd::NotifyIcon(DWORD dwMessage, _In_ CONST NOTIFYICONDATA *iconDa void CSysPagerWnd::GetSize(IN BOOL IsHorizontal, IN PSIZE size) { /* Get the ideal height or width */ -#if 0 +#if 0 /* Unfortunately this doens't work correctly in ros */ Toolbar.GetIdealSize(!IsHorizontal, size);
diff --git a/base/shell/explorer/taskband.cpp b/base/shell/explorer/taskband.cpp index d1c6ecd73c0..7d8d2d213ce 100644 --- a/base/shell/explorer/taskband.cpp +++ b/base/shell/explorer/taskband.cpp @@ -86,7 +86,7 @@ public: virtual HRESULT STDMETHODCALLTYPE ResizeBorderDW( LPCRECT prcBorder, IUnknown *punkToolbarSite, - BOOL fReserved) + BOOL fReserved) { /* No need to implement this method */ return E_NOTIMPL; @@ -174,7 +174,7 @@ public: }
/*****************************************************************************/ - + virtual HRESULT STDMETHODCALLTYPE SetClient( IN IUnknown *punkClient) { diff --git a/base/shell/explorer/trayclock.cpp b/base/shell/explorer/trayclock.cpp index cc289ddc0e2..5286aad774e 100644 --- a/base/shell/explorer/trayclock.cpp +++ b/base/shell/explorer/trayclock.cpp @@ -195,7 +195,7 @@ LRESULT CTrayClockWnd::OnThemeChanged() } else { - /* We don't need to set a font here, our parent will use + /* We don't need to set a font here, our parent will use * WM_SETFONT to set the right one when themes are not enabled. */ textColor = RGB(0, 0, 0); } diff --git a/base/shell/explorer/trayprop.cpp b/base/shell/explorer/trayprop.cpp index 00ac0b37677..52ceb863ced 100644 --- a/base/shell/explorer/trayprop.cpp +++ b/base/shell/explorer/trayprop.cpp @@ -46,7 +46,7 @@ static void SetBitmap(HWND hwnd, HBITMAP* hbmp, UINT uImageId)
class CTaskBarSettingsPage : public CPropertyPageImpl<CTaskBarSettingsPage> { -private: +private: HBITMAP m_hbmpTaskbar; HBITMAP m_hbmpTray; HWND m_hwndTaskbar; @@ -85,7 +85,7 @@ private: uImageId = IDB_TASKBARPROP_NOLOCK_NOGROUP_QL; else if (!bLock && bGroup && bShowQL) uImageId = IDB_TASKBARPROP_NOLOCK_GROUP_QL; - else + else ASSERT(FALSE);
SetBitmap(hwndTaskbarBitmap, &m_hbmpTaskbar, uImageId); @@ -107,7 +107,7 @@ private: uImageId = IDB_SYSTRAYPROP_SHOW_CLOCK; else if (!bHideInactive && !bShowClock) uImageId = IDB_SYSTRAYPROP_SHOW_NOCLOCK; - else + else ASSERT(FALSE);
SetBitmap(hwndTrayBitmap, &m_hbmpTray, uImageId); @@ -129,7 +129,7 @@ public: m_hwndTaskbar(hwnd) { } - + ~CTaskBarSettingsPage() { if (m_hbmpTaskbar) @@ -188,7 +188,7 @@ public:
class CStartMenuSettingsPage : public CPropertyPageImpl<CStartMenuSettingsPage> { -private: +private: HBITMAP m_hbmpStartBitmap;
void UpdateDialog() @@ -253,7 +253,7 @@ public: // fix me: start menu style (classic/modern) should be read somewhere from the registry. CheckDlgButton(IDC_TASKBARPROP_STARTMENUCLASSIC, BST_CHECKED); // HACK: This has to be read from registry!!!!!!! UpdateDialog(); - + return TRUE; }
@@ -295,9 +295,9 @@ DisplayTrayProperties(IN HWND hwndOwner, IN HWND hwndTaskbar) CTaskBarSettingsPage tbSettingsPage(hwndTaskbar); CStartMenuSettingsPage smSettingsPage; CStringW caption; - + caption.LoadStringW(IDS_TASKBAR_STARTMENU_PROP_CAPTION); - + hpsp[0] = tbSettingsPage.Create(); hpsp[1] = smSettingsPage.Create();
diff --git a/base/shell/rshell/CQuickLaunchBand.cpp b/base/shell/rshell/CQuickLaunchBand.cpp index c4a25224d59..f5ae43ef7a5 100644 --- a/base/shell/rshell/CQuickLaunchBand.cpp +++ b/base/shell/rshell/CQuickLaunchBand.cpp @@ -47,7 +47,7 @@ const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0, 0x79, 0 if (SUCCEEDED(hr)) { CATID catid = CATID_DeskBand; - hr = pcr->RegisterClassImplCategories(CLSID_QuickLaunchBand, 1, &catid); + hr = pcr->RegisterClassImplCategories(CLSID_QuickLaunchBand, 1, &catid); } return hr; } @@ -59,7 +59,7 @@ const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0, 0x79, 0 if (SUCCEEDED(hr)) { CATID catid = CATID_DeskBand; - hr = pcr->UnRegisterClassImplCategories(CLSID_QuickLaunchBand, 1, &catid); + hr = pcr->UnRegisterClassImplCategories(CLSID_QuickLaunchBand, 1, &catid); } return hr; } @@ -82,16 +82,16 @@ const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0, 0x79, 0 LPITEMIDLIST PidlBrowse(HWND hwnd, int nCSIDL) { CComHeapPtr<ITEMIDLIST> pidlRoot; - + WCHAR path[MAX_PATH];
if (nCSIDL) { SHGetSpecialFolderLocation(hwnd, nCSIDL, &pidlRoot); - } + }
BROWSEINFO bi = { hwnd, pidlRoot, path, L"Choose a folder", 0, NULL, 0, 0 }; - LPITEMIDLIST pidlSelected = SHBrowseForFolder(&bi); + LPITEMIDLIST pidlSelected = SHBrowseForFolder(&bi);
return pidlSelected; } @@ -132,24 +132,24 @@ const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0, 0x79, 0 if (pidl == NULL) return E_FAIL; pISFB->InitializeSFB(pISF, pidl); - + return hr; }
// IObjectWithSite STDMETHODIMP CQuickLaunchBand::SetSite(IUnknown *pUnkSite) - { + { // Internal CISFBand Calls CComPtr<IObjectWithSite> pIOWS; HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IObjectWithSite, &pIOWS)); if (FAILED(hr)) - return hr; + return hr;
return pIOWS->SetSite(pUnkSite); }
STDMETHODIMP CQuickLaunchBand::GetSite(IN REFIID riid, OUT VOID **ppvSite) - { + { CComPtr<IObjectWithSite> pIOWS; HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IObjectWithSite, &pIOWS)); if (FAILED(hr)) @@ -165,7 +165,7 @@ const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0, 0x79, 0 // Internal CISFBand Calls CComPtr<IDeskBand> pIDB; HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); - if (FAILED(hr)) + if (FAILED(hr)) return hr;
return pIDB->GetWindow(phwnd); @@ -183,53 +183,53 @@ const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0, 0x79, 0 }
STDMETHODIMP CQuickLaunchBand::ShowDW(IN BOOL bShow) - { + { // Internal CISFBand Calls CComPtr<IDeskBand> pIDB; HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); if (FAILED(hr)) return hr;
- return pIDB->ShowDW(bShow); + return pIDB->ShowDW(bShow); }
STDMETHODIMP CQuickLaunchBand::CloseDW(IN DWORD dwReserved) - { + { // Internal CISFBand Calls CComPtr<IDeskBand> pIDB; HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); - if (FAILED(hr)) + if (FAILED(hr)) return hr;
return pIDB->CloseDW(dwReserved); }
- STDMETHODIMP CQuickLaunchBand::ResizeBorderDW(LPCRECT prcBorder, IUnknown *punkToolbarSite, BOOL fReserved) - { + STDMETHODIMP CQuickLaunchBand::ResizeBorderDW(LPCRECT prcBorder, IUnknown *punkToolbarSite, BOOL fReserved) + { // Internal CISFBand Calls CComPtr<IDeskBand> pIDB; HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); - if (FAILED(hr)) + if (FAILED(hr)) return hr;
return pIDB->ResizeBorderDW(prcBorder, punkToolbarSite, fReserved); }
STDMETHODIMP CQuickLaunchBand::GetBandInfo(IN DWORD dwBandID, IN DWORD dwViewMode, IN OUT DESKBANDINFO *pdbi) - { + { // Internal CISFBand Calls CComPtr<IDeskBand> pIDB; HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB)); - if (FAILED(hr)) + if (FAILED(hr)) return hr;
return pIDB->GetBandInfo(dwBandID, dwViewMode, pdbi); - } - + } + /*****************************************************************************/ // IPersistStream STDMETHODIMP CQuickLaunchBand::GetClassID(OUT CLSID *pClassID) - { + { // Internal CISFBand Calls CComPtr<IPersistStream> pIPS; HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); @@ -240,7 +240,7 @@ const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0, 0x79, 0 }
STDMETHODIMP CQuickLaunchBand::IsDirty() - { + { // Internal CISFBand Calls CComPtr<IPersistStream> pIPS; HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); @@ -261,7 +261,7 @@ const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0, 0x79, 0 }
STDMETHODIMP CQuickLaunchBand::Save(IN IStream *pStm, IN BOOL fClearDirty) - { + { // Internal CISFBand Calls CComPtr<IPersistStream> pIPS; HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS)); @@ -280,7 +280,7 @@ const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0, 0x79, 0
return pIPS->GetSizeMax(pcbSize); } - +
/*****************************************************************************/ // IWinEventHandler @@ -290,50 +290,50 @@ const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0, 0x79, 0 }
STDMETHODIMP CQuickLaunchBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) - { + { // Internal CISFBand Calls CComPtr<IWinEventHandler> pWEH; HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IWinEventHandler, &pWEH)); - if (FAILED(hr)) + if (FAILED(hr)) return hr;
return pWEH->OnWinEvent(hWnd, uMsg, wParam, lParam, theResult); }
STDMETHODIMP CQuickLaunchBand::IsWindowOwner(HWND hWnd) - { + { // Internal CISFBand Calls CComPtr<IWinEventHandler> pWEH; HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IWinEventHandler, &pWEH)); - if (FAILED(hr)) + if (FAILED(hr)) return hr;
return pWEH->IsWindowOwner(hWnd); } - + /*****************************************************************************/ // *** IOleCommandTarget methods *** STDMETHODIMP CQuickLaunchBand::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText) - { + { // Internal CISFBand Calls CComPtr<IOleCommandTarget> pOCT; HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &pOCT)); - if (FAILED(hr)) + if (FAILED(hr)) return hr;
return pOCT->QueryStatus(pguidCmdGroup, cCmds, prgCmds, pCmdText); }
STDMETHODIMP CQuickLaunchBand::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) - { + { // Internal CISFBand Calls CComPtr<IOleCommandTarget> pOCT; HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &pOCT)); - if (FAILED(hr)) + if (FAILED(hr)) return hr;
return pOCT->Exec(pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut); - } + }
/*****************************************************************************/ // *** IContextMenu *** @@ -342,7 +342,7 @@ const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0, 0x79, 0 // Internal CISFBand Calls CComPtr<IContextMenu> pICM; HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IContextMenu, &pICM)); - if (FAILED(hr)) + if (FAILED(hr)) return hr;
return pICM->GetCommandString(idCmd, uFlags, pwReserved, pszName, cchMax); @@ -353,7 +353,7 @@ const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0, 0x79, 0 // Internal CISFBand Calls CComPtr<IContextMenu> pICM; HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IContextMenu, &pICM)); - if (FAILED(hr)) + if (FAILED(hr)) return hr;
return pICM->InvokeCommand(pici); diff --git a/base/shell/rshell/CQuickLaunchBand.h b/base/shell/rshell/CQuickLaunchBand.h index 2889e6ef1f5..168a455bfa1 100644 --- a/base/shell/rshell/CQuickLaunchBand.h +++ b/base/shell/rshell/CQuickLaunchBand.h @@ -18,14 +18,14 @@ class CQuickLaunchBand : public CComCoClass<CQuickLaunchBand, &CLSID_QuickLaunchBand>, public CComObjectRootEx<CComMultiThreadModelNoCS>, public IObjectWithSite, - public IDeskBand, + public IDeskBand, public IPersistStream, public IWinEventHandler, public IOleCommandTarget, public IContextMenu { HWND m_hWndBro; - CComPtr<IUnknown> m_punkISFB; + CComPtr<IUnknown> m_punkISFB;
public:
@@ -46,36 +46,36 @@ class CQuickLaunchBand : virtual STDMETHODIMP SetSite( IN IUnknown *pUnkSite ); - + // IDeskBand
virtual STDMETHODIMP GetWindow( OUT HWND *phwnd - ); + );
virtual STDMETHODIMP ContextSensitiveHelp( IN BOOL fEnterMode - ); + );
virtual STDMETHODIMP ShowDW( IN BOOL bShow - ); + );
virtual STDMETHODIMP CloseDW( IN DWORD dwReserved - ); + );
virtual STDMETHODIMP ResizeBorderDW( LPCRECT prcBorder, IUnknown *punkToolbarSite, BOOL fReserved - ); + );
virtual STDMETHODIMP GetBandInfo( IN DWORD dwBandID, IN DWORD dwViewMode, IN OUT DESKBANDINFO *pdbi - ); + );
// IPersistStream
@@ -98,17 +98,17 @@ class CQuickLaunchBand : IN BOOL fClearDirty );
-// IWinEventHandler +// IWinEventHandler
virtual STDMETHODIMP ContainsWindow( IN HWND hWnd );
virtual STDMETHODIMP OnWinEvent( - HWND hWnd, - UINT uMsg, - WPARAM wParam, - LPARAM lParam, + HWND hWnd, + UINT uMsg, + WPARAM wParam, + LPARAM lParam, LRESULT *theResult );
@@ -169,5 +169,5 @@ class CQuickLaunchBand : COM_INTERFACE_ENTRY_IID(IID_IWinEventHandler, IWinEventHandler) COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu) - END_COM_MAP() + END_COM_MAP() }; \ No newline at end of file diff --git a/base/shell/rshell/misc.cpp b/base/shell/rshell/misc.cpp index ce1eb7a98b6..d17619bf076 100644 --- a/base/shell/rshell/misc.cpp +++ b/base/shell/rshell/misc.cpp @@ -232,7 +232,7 @@ public:
if (IsEqualCLSID(m_Clsid, CLSID_StartMenu)) return RSHELL_CStartMenu_CreateInstance(riid, ppvObject); - + if (IsEqualCLSID(m_Clsid, CLSID_MenuDeskBar)) return RSHELL_CMenuDeskBar_CreateInstance(riid, ppvObject);
diff --git a/base/system/diskpart/list.c b/base/system/diskpart/list.c index 1557a398bb1..5b3d6438969 100644 --- a/base/system/diskpart/list.c +++ b/base/system/diskpart/list.c @@ -43,7 +43,7 @@ ListDisk(VOID) { DiskEntry = CONTAINING_RECORD(Entry, DISKENTRY, ListEntry);
- DiskSize = DiskEntry->SectorCount.QuadPart * + DiskSize = DiskEntry->SectorCount.QuadPart * (ULONGLONG)DiskEntry->BytesPerSector;
if (DiskSize >= 10737418240) /* 10 GB */ diff --git a/base/system/smss/smsessn.c b/base/system/smss/smsessn.c index 077fa9e56c9..8b3aed81e78 100644 --- a/base/system/smss/smsessn.c +++ b/base/system/smss/smsessn.c @@ -55,7 +55,7 @@ SmpCheckDuplicateMuSessionId(IN ULONG MuSessionId) FoundDuplicate = TRUE; break; } - + /* Keep going */ NextEntry = NextEntry->Flink; } diff --git a/base/system/userinit/livecd.c b/base/system/userinit/livecd.c index 216579f427b..637715a7f5b 100644 --- a/base/system/userinit/livecd.c +++ b/base/system/userinit/livecd.c @@ -95,9 +95,9 @@ InitLogo(PIMGINFO pImgInfo, HWND hwndDlg)
Cleanup: if (hMask != NULL) DeleteObject(hMask); - if (hLogo != NULL) DeleteObject(hLogo); + if (hLogo != NULL) DeleteObject(hLogo); if (hDCMask != NULL) DeleteDC(hDCMask); - if (hDCLogo != NULL) DeleteDC(hDCLogo); + if (hDCLogo != NULL) DeleteDC(hDCLogo); if (hDC != NULL) ReleaseDC(hwndDlg, hDC); }
diff --git a/base/system/winlogon/sas.c b/base/system/winlogon/sas.c index 02e9844a74c..b77054caba6 100644 --- a/base/system/winlogon/sas.c +++ b/base/system/winlogon/sas.c @@ -1047,9 +1047,9 @@ HandleShutdown( BOOLEAN Old;
// SwitchDesktop(Session->WinlogonDesktop); - + /* If the system is rebooting, show the appropriate string */ - if (wlxAction == WLX_SAS_ACTION_SHUTDOWN_REBOOT) + if (wlxAction == WLX_SAS_ACTION_SHUTDOWN_REBOOT) DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_REACTOSISRESTARTING); else DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_REACTOSISSHUTTINGDOWN); diff --git a/base/system/winlogon/winlogon.h b/base/system/winlogon/winlogon.h index 20231e35515..07f803a20d8 100644 --- a/base/system/winlogon/winlogon.h +++ b/base/system/winlogon/winlogon.h @@ -133,7 +133,7 @@ typedef struct _GINAINSTANCE * about the Winlogon states is a little too simple. * * The real picture should look more like this: - * + * * STATE_INIT * Initial state. Required for session initialization. After initialization, * the state will automatically change to STATE_LOGGED_OFF. diff --git a/boot/armllb/boot.s b/boot/armllb/boot.s index 899013f4dc9..1209f52a445 100644 --- a/boot/armllb/boot.s +++ b/boot/armllb/boot.s @@ -12,7 +12,7 @@
NESTED_ENTRY _start PROLOG_END _start - + #ifdef _BEAGLE_ // This is only used for TI BootROM on Beagle/Emulator for now /* * On Beagle, the boot is directly from TI BootROM that reads NAND flash. @@ -53,7 +53,7 @@ .byte 2 // ARM .byte 2 // Kernel .byte 0 // No compression - .ascii "ReactOS ARM Low-Level Bootloader" + .ascii "ReactOS ARM Low-Level Bootloader" #endif
/* Load C entrypoint and setup LLB stack */ diff --git a/boot/armllb/crtsupp.c b/boot/armllb/crtsupp.c index f535a1777c0..933d4b3ee66 100644 --- a/boot/armllb/crtsupp.c +++ b/boot/armllb/crtsupp.c @@ -50,7 +50,7 @@ DbgPrint(const char *fmt, ...) va_start(args, fmt); i = vsprintf(Buffer, fmt, args); va_end(args); - + for (j = 0; j < i; j++) LlbSerialPutChar(Buffer[j]); return 0; } diff --git a/boot/armllb/envir.c b/boot/armllb/envir.c index 0b1c451c11b..6d5db3a2f37 100644 --- a/boot/armllb/envir.c +++ b/boot/armllb/envir.c @@ -16,13 +16,13 @@ ULONG LlbEnvRamDiskSize = 0; ULONG LlbEnvHwRevision; CHAR LlbEnvCmdLine[256]; CHAR LlbValueData[32]; - + VOID NTAPI LlbEnvParseArguments(IN PATAG Arguments) { PATAG Atag; - + /* Parse the ATAGs */ Atag = Arguments; while (Atag->Hdr.Size) @@ -31,59 +31,59 @@ LlbEnvParseArguments(IN PATAG Arguments) switch (Atag->Hdr.Tag) { case ATAG_CORE: - + /* Save page size */ LlbEnvHwPageSize = Atag->u.Core.PageSize; break; - + case ATAG_REVISION:
/* Save page size */ LlbEnvHwRevision = Atag->u.Revision.Rev; break; - + case ATAG_MEM: - + /* Save RAM start and size */ if (!LlbEnvHwMemStart) LlbEnvHwMemStart = Atag->u.Mem.Start; LlbEnvHwMemSize += Atag->u.Mem.Size; break; - + case ATAG_INITRD2: - + /* Save RAMDISK start and size */ LlbEnvRamDiskStart = Atag->u.InitRd2.Start; LlbEnvRamDiskSize = Atag->u.InitRd2.Size; - + #ifdef _BEAGLE_ /* Make sure it's 16MB-aligned */ - LlbEnvRamDiskSize = (LlbEnvRamDiskSize + (16 * 1024 * 1024) - 1) + LlbEnvRamDiskSize = (LlbEnvRamDiskSize + (16 * 1024 * 1024) - 1) &~ ((16 * 1024 * 1024) - 1); - + /* The RAMDISK actually starts 16MB later */ LlbEnvRamDiskStart += 16 * 1024 * 1024; LlbEnvRamDiskSize -= 16 * 1024 * 1024; #endif break; - + case ATAG_CMDLINE: - + /* Save command line */ strncpy(LlbEnvCmdLine, Atag->u.CmdLine.CmdLine, Atag->Hdr.Size * sizeof(ULONG)); break; - + /* Nothing left to handle */ case ATAG_NONE: default: break; } - + /* Next tag */ Atag = (PATAG)((PULONG)Atag + Atag->Hdr.Size); } - + /* For debugging */ DbgPrint("[BOOTROM] Board Revision: %lx PageSize: %dKB RAM: %dMB CMDLINE: %s\n" "[RAMDISK] Base: %lx Size: %dMB\n", @@ -115,7 +115,7 @@ LlbEnvGetRamDiskInformation(IN PULONG Base, *Size = 0; return FALSE; } - + /* Return ramdisk information */ *Base = LlbEnvRamDiskStart; *Size = LlbEnvRamDiskSize; @@ -128,7 +128,7 @@ LlbEnvRead(IN PCHAR ValueName) { PCHAR ValuePointer; ULONG Length = 0; - + /* Search for the value name */ ValuePointer = strstr(LlbEnvCmdLine, ValueName); if (ValuePointer) @@ -145,11 +145,11 @@ LlbEnvRead(IN PCHAR ValueName) /* Stop before the string ends */ Length = strlen(ValuePointer); } - + /* Copy it */ strncpy(LlbValueData, ValuePointer, Length); } - + /* Terminate the data */ LlbValueData[Length] = ANSI_NULL;
diff --git a/boot/armllb/fw.c b/boot/armllb/fw.c index 8831d95a655..13c97acfb0f 100644 --- a/boot/armllb/fw.c +++ b/boot/armllb/fw.c @@ -72,7 +72,7 @@ LlbFwVideoGetDisplaySize(OUT PULONG Width, /* Query static settings */ *Width = LlbHwGetScreenWidth() / 8; *Height = LlbHwGetScreenHeight() / 16; - + /* Depth is always 16 bpp */ *Depth = 16; } @@ -92,7 +92,7 @@ LlbFwVideoPutChar(IN INT c, { ULONG Color, BackColor; PUSHORT Buffer; - + /* Convert EGA index to color used by hardware */ Color = LlbHwVideoCreateColor(ColorPalette[Attr & 0xF][0], ColorPalette[Attr & 0xF][1], @@ -100,10 +100,10 @@ LlbFwVideoPutChar(IN INT c, BackColor = LlbHwVideoCreateColor(ColorPalette[Attr >> 4][0], ColorPalette[Attr >> 4][1], ColorPalette[Attr >> 4][2]); - + /* Compute buffer address */ Buffer = (PUSHORT)LlbHwGetFrameBuffer() + (LlbHwGetScreenWidth() * (Y * 16)) + (X * 8); - + /* Draw it */ LlbVideoDrawChar(c, Buffer, Color, BackColor); } diff --git a/boot/armllb/hw/keyboard.c b/boot/armllb/hw/keyboard.c index 06d2c6706dd..18c07a66a91 100644 --- a/boot/armllb/hw/keyboard.c +++ b/boot/armllb/hw/keyboard.c @@ -100,7 +100,7 @@ CHAR LlbHwScanCodeToAsciiTable[58][2] = { 0,0 } , { ' ',' ' } , }; - + /* EXTENDED KEY TABLE *********************************************************/
UCHAR LlbHwExtendedScanCodeTable[128] = @@ -143,14 +143,14 @@ UCHAR LlbHwExtendedScanCodeTable[128] = /* FUNCTIONS ******************************************************************/
USHORT LlbKbdLastScanCode; - + UCHAR NTAPI LlbKbdTranslateScanCode(IN USHORT ScanCode, IN PUCHAR KeyCode) { ULONG LastScanCode; - + /* Check for extended scan codes */ if ((ScanCode == 0xE0) || (ScanCode == 0xE1)) { @@ -166,7 +166,7 @@ LlbKbdTranslateScanCode(IN USHORT ScanCode, LlbKbdLastScanCode = 0; return 0; } - + /* Only act on the break, not the make */ if (ScanCode > 0x80) return 0;
@@ -183,10 +183,10 @@ LlbKbdTranslateScanCode(IN USHORT ScanCode, { /* E0 extended codes */ case 0xE0: - + /* Skip bogus codes */ if ((ScanCode == 0x2A) || (ScanCode == 0x36)) return 0; - + /* Lookup the code for it */ if (!LlbHwExtendedScanCodeTable[ScanCode]) return 0; *KeyCode = LlbHwExtendedScanCodeTable[ScanCode]; @@ -194,7 +194,7 @@ LlbKbdTranslateScanCode(IN USHORT ScanCode,
/* E1 extended codes */ case 0xE1: - + /* Only recognize one (the SYSREQ/PAUSE sequence) */ if (ScanCode != 0x1D) return 0; LlbKbdLastScanCode = 0x100; @@ -202,7 +202,7 @@ LlbKbdTranslateScanCode(IN USHORT ScanCode,
/* PAUSE sequence */ case 0x100: - + /* Make sure it's the one */ if (ScanCode != 0x45) return 0; *KeyCode = E1_PAUSE; @@ -219,22 +219,22 @@ LlbKbdTranslateScanCode(IN USHORT ScanCode, /* Translation success */ return 1; } - + CHAR NTAPI LlbKeyboardGetChar(VOID) { UCHAR ScanCode, KeyCode; - + do { /* Read the scan code and convert it to a virtual key code */ ScanCode = LlbHwKbdRead(); } while (!LlbKbdTranslateScanCode(ScanCode, &KeyCode)); - + /* Is this ASCII? */ if (KeyCode > 96) return ScanCode; - + /* Return the ASCII character */ return LlbHwScanCodeToAsciiTable[KeyCode][0]; } diff --git a/boot/armllb/hw/matrix.c b/boot/armllb/hw/matrix.c index c1275c2e719..e151cd7acb7 100644 --- a/boot/armllb/hw/matrix.c +++ b/boot/armllb/hw/matrix.c @@ -23,18 +23,18 @@ UCHAR KeyMatrix[8][8] = };
/* FUNCTIONS ******************************************************************/ - + CHAR NTAPI LlbKeypadGetChar(VOID) { UCHAR ScanCode; UCHAR Col, Row; - + ScanCode = LlbHwKbdRead(); Col = ScanCode >> 4; Row = ScanCode & 0xF; - + /* Return the ASCII character */ return KeyMatrix[Col][Row]; } diff --git a/boot/armllb/hw/omap3-beagle/hwinfo.c b/boot/armllb/hw/omap3-beagle/hwinfo.c index 8a7d5b54187..be5cef95f40 100644 --- a/boot/armllb/hw/omap3-beagle/hwinfo.c +++ b/boot/armllb/hw/omap3-beagle/hwinfo.c @@ -34,7 +34,7 @@ NTAPI LlbHwGetSerialUart(VOID) { return 3; -} +}
VOID NTAPI @@ -70,7 +70,7 @@ LlbHwGetScreenHeight(VOID) { return 720; } - + PVOID NTAPI LlbHwGetFrameBuffer(VOID) @@ -102,28 +102,28 @@ LlbHwBuildMemoryMap(IN PBIOS_MEMORY_MAP MemoryMap) { PBIOS_MEMORY_MAP MapEntry; ULONG Base, Size, FsBase, FsSize; - + /* Parse hardware memory map */ MapEntry = LlbHwOmap3MemoryMap; while (MapEntry->Length) { /* Add this entry */ LlbAllocateMemoryEntry(MapEntry->Type, MapEntry->BaseAddress, MapEntry->Length); - + /* Move to the next one */ MapEntry++; } - + /* Query memory and RAMDISK information */ LlbEnvGetMemoryInformation(&Base, &Size); LlbEnvGetRamDiskInformation(&FsBase, &FsSize); - + /* Add-in the size of the ramdisk */ Base = FsBase + FsSize; - + /* Subtract size of ramdisk and anything else before it */ Size -= Base; - + /* Allocate an entry for it */ LlbAllocateMemoryEntry(BiosMemoryUsable, Base, Size); } diff --git a/boot/armllb/hw/omap3-beagle/hwuart.c b/boot/armllb/hw/omap3-beagle/hwuart.c index 7f8669cf05a..83efc809296 100644 --- a/boot/armllb/hw/omap3-beagle/hwuart.c +++ b/boot/armllb/hw/omap3-beagle/hwuart.c @@ -41,13 +41,13 @@ LlbHwGetUartBase(IN ULONG Port) } else if (Port == 2) { - return 0x4806C000; + return 0x4806C000; } else if (Port == 3) { - return 0x49020000; + return 0x49020000; } - + return 0; }
diff --git a/boot/armllb/hw/omap3-zoom2/hwinfo.c b/boot/armllb/hw/omap3-zoom2/hwinfo.c index f88a746308d..30543aa4db9 100644 --- a/boot/armllb/hw/omap3-zoom2/hwinfo.c +++ b/boot/armllb/hw/omap3-zoom2/hwinfo.c @@ -38,14 +38,14 @@ NTAPI LlbHwGetSerialUart(VOID) { return 0; -} +}
ULONG LlbHwRtcRead(VOID) { /* Issue the GET_TIME request on the RTC control register */ LlbHwOmap3TwlWrite1(0x4B, 0x29, 0x41); - + /* Read the BCD registers and convert them */ LlbTime.Second = BCD_INT(LlbHwOmap3TwlRead1(0x4B, 0x1C)); LlbTime.Minute = BCD_INT(LlbHwOmap3TwlRead1(0x4B, 0x1D)); diff --git a/boot/armllb/hw/omap3-zoom2/hwinit.c b/boot/armllb/hw/omap3-zoom2/hwinit.c index 37749a68879..4b98f8eb462 100644 --- a/boot/armllb/hw/omap3-zoom2/hwinit.c +++ b/boot/armllb/hw/omap3-zoom2/hwinit.c @@ -61,18 +61,18 @@ LlbHwBuildMemoryMap(IN PBIOS_MEMORY_MAP MemoryMap) { PBIOS_MEMORY_MAP MapEntry; ULONG Base, Size, FsBase, FsSize; - + /* Parse hardware memory map */ MapEntry = LlbHwOmap3MemoryMap; while (MapEntry->Length) { /* Add this entry */ LlbAllocateMemoryEntry(MapEntry->Type, MapEntry->BaseAddress, MapEntry->Length); - + /* Move to the next one */ MapEntry++; } - + /* Query memory and RAMDISK information */ LlbEnvGetMemoryInformation(&Base, &Size); LlbEnvGetRamDiskInformation(&FsBase, &FsSize); @@ -80,10 +80,10 @@ LlbHwBuildMemoryMap(IN PBIOS_MEMORY_MAP MemoryMap) #ifdef _BEAGLE_ /* Add-in the size of the ramdisk */ Base = FsBase + FsSize; - + /* Subtract size of ramdisk and anything else before it */ Size -= Base; - + /* Allocate an entry for it */ LlbAllocateMemoryEntry(BiosMemoryUsable, Base, Size); #endif @@ -95,10 +95,10 @@ LlbHwInitialize(VOID) { /* Setup the UART (NS16550) */ LlbHwOmap3UartInitialize(); - + /* Setup the NEC WVGA LCD Panel and the Display Controller */ LlbHwOmap3LcdInitialize(); - + /* Setup the keyboard */ LlbHwOmap3SynKpdInitialize(); } diff --git a/boot/armllb/hw/omap3-zoom2/hwlcd.c b/boot/armllb/hw/omap3-zoom2/hwlcd.c index 4b7dae217aa..6dcd3a8e441 100644 --- a/boot/armllb/hw/omap3-zoom2/hwlcd.c +++ b/boot/armllb/hw/omap3-zoom2/hwlcd.c @@ -34,7 +34,7 @@ LlbHwOmap3LcdInitialize(VOID) /* Now turn on the functional and interface clocks in the CORE domain */ WRITE_REGISTER_ULONG(0x48004a00, 0x03fffe29); /* Functional clocks */ WRITE_REGISTER_ULONG(0x48004a10, 0x3ffffffb); /* Interface clocks */ - + /* The HS I2C interface is now on, configure it */ WRITE_REGISTER_USHORT(0x48070024, 0x0); /* Disable I2c */ WRITE_REGISTER_USHORT(0x48070030, 0x17); /* Configure clock divider */ @@ -44,7 +44,7 @@ LlbHwOmap3LcdInitialize(VOID) WRITE_REGISTER_USHORT(0x4807000c, 0x636f); /* Select wakeup bits */ WRITE_REGISTER_USHORT(0x48070014, 0x4343); /* Disable DMA */ WRITE_REGISTER_USHORT(0x48070024, 0x8000); /* Enable I2C */ - + /* * Set the VPLL2 to cover all device groups instead of just P3. * This essentially enables the VRRTC to power up the LCD panel. @@ -59,7 +59,7 @@ LlbHwOmap3LcdInitialize(VOID)
/* Set GPIO pin 7 signal on the TWL4030 ON. This powers the LCD backlight */ LlbHwOmap3TwlWrite1(0x49, 0xA4, 0x80); - + /* Now go on the McSPI interface and program it on for the channel */ WRITE_REGISTER_ULONG(0x48098010, 0x15); WRITE_REGISTER_ULONG(0x48098020, 0x1); @@ -77,7 +77,7 @@ LlbHwOmap3LcdInitialize(VOID)
/* Reset the Display Controller (DISPC) */ WRITE_REGISTER_ULONG(0x48050410, 0x00000005); // DISPC_SYSCONFIG - + /* Set the frame buffer address */ WRITE_REGISTER_ULONG(0x48050480, 0x800A0000); // DISPC_GFX_BA0
@@ -102,7 +102,7 @@ LlbHwGetScreenWidth(VOID) { return 800; } - + ULONG NTAPI LlbHwGetScreenHeight(VOID) diff --git a/boot/armllb/hw/omap3-zoom2/hwsynkp.c b/boot/armllb/hw/omap3-zoom2/hwsynkp.c index 9f0104af4e9..43b2f0ab02a 100644 --- a/boot/armllb/hw/omap3-zoom2/hwsynkp.c +++ b/boot/armllb/hw/omap3-zoom2/hwsynkp.c @@ -19,13 +19,13 @@ LlbHwOmap3SynKpdInitialize(VOID)
/* Set GPIO pin 8 signal on the TWL4030 ON. This powers the keypad backlight */ LlbHwOmap3TwlWrite1(0x49, 0xA4, 0xC0); - + /* Set PENDDIS and COR on the the keypad interrupt controller */ LlbHwOmap3TwlWrite1(0x4A, 0xE9, 0x06);
/* Only falling edge detection for key pressed */ LlbHwOmap3TwlWrite1(0x4A, 0xE8, 0x01); - + /* Unmask key-pressed events */ LlbHwOmap3TwlWrite1(0x4A, 0xE4, 0x0E);
@@ -46,10 +46,10 @@ LlbHwKbdReady(VOID)
Value = LlbHwOmap3TwlRead1(0x4A, 0xE3); if (!Value) return FALSE; - + LastState ^= 1; if (!LastState) return FALSE; - + /* Return whether or not an interrupt is pending */ return TRUE; } @@ -59,7 +59,7 @@ NTAPI LlbHwKbdRead(VOID) { UCHAR ActiveCol = 0, ActiveRow = 0, col, coldata, row; - + for (col = 0; col < 8; col++) { coldata = LlbHwOmap3TwlRead1(0x4A, 0xDB + col); @@ -76,7 +76,7 @@ LlbHwKbdRead(VOID) } } } - + return ((ActiveCol << 4) | ActiveRow); }
diff --git a/boot/armllb/hw/omap3-zoom2/hwtwl40x.c b/boot/armllb/hw/omap3-zoom2/hwtwl40x.c index 8dbc0c4679f..8a28b0a58f7 100644 --- a/boot/armllb/hw/omap3-zoom2/hwtwl40x.c +++ b/boot/armllb/hw/omap3-zoom2/hwtwl40x.c @@ -16,7 +16,7 @@ LlbHwOmap3TwlRead1(IN UCHAR ChipAddress, IN UCHAR RegisterAddress) { volatile int i = 1000; - + /* Select the register */ LlbHwOmap3TwlWrite(ChipAddress, RegisterAddress, 0, NULL);
@@ -43,7 +43,7 @@ LlbHwOmap3TwlWrite(IN UCHAR ChipAddress, /* Enable master transmit mode */ WRITE_REGISTER_USHORT(0x48070024, 0x8601); WRITE_REGISTER_USHORT(0x4807001c, RegisterAddress); - + /* Loop each byte */ for (j = 0; j < Length; j++) { diff --git a/boot/armllb/hw/omap3-zoom2/hwuart.c b/boot/armllb/hw/omap3-zoom2/hwuart.c index 52143dd1f4e..8ba0d268922 100644 --- a/boot/armllb/hw/omap3-zoom2/hwuart.c +++ b/boot/armllb/hw/omap3-zoom2/hwuart.c @@ -55,7 +55,7 @@ LlbHwGetUartBase(IN ULONG Port) { return 0x10000000; } - + return 0; }
diff --git a/boot/armllb/hw/serial.c b/boot/armllb/hw/serial.c index 7bb09cf744d..b6730a9913d 100644 --- a/boot/armllb/hw/serial.c +++ b/boot/armllb/hw/serial.c @@ -14,10 +14,10 @@ LlbSerialPutChar(IN CHAR c) { /* Properly support new-lines */ if (c == '\n') LlbSerialPutChar('\r'); - + /* Wait for ready */ while (!LlbHwUartTxReady()); - + /* Send character */ LlbHwUartSendChar(c); } diff --git a/boot/armllb/hw/time.c b/boot/armllb/hw/time.c index ed78ea4607b..a3df7794559 100644 --- a/boot/armllb/hw/time.c +++ b/boot/armllb/hw/time.c @@ -48,7 +48,7 @@ LlbConvertRtcTime(IN ULONG RtcTime,
/* Get the year, based on days since 1970 */ Year = 1970 + Days / 365; - + /* Account for leap years which changed the number of days/year */ Days -= (Year - 1970) * 365 + LEAPS_THRU_END_OF(Year - 1) - LEAPS_THRU_END_OF(1970 - 1); if (Days < 0) @@ -64,8 +64,8 @@ LlbConvertRtcTime(IN ULONG RtcTime, /* How many days in this month? */ DaysLeft = Days - LlbDayOfMonth(Month, Year); if (DaysLeft < 0) break; - - /* How many days left total? */ + + /* How many days left total? */ Days = DaysLeft; }
diff --git a/boot/armllb/hw/versatile/hwclcd.c b/boot/armllb/hw/versatile/hwclcd.c index 3131880338f..e633e43fe3a 100644 --- a/boot/armllb/hw/versatile/hwclcd.c +++ b/boot/armllb/hw/versatile/hwclcd.c @@ -31,11 +31,11 @@ LlbHwVersaClcdInitialize(VOID) /* Set framebuffer address */ WRITE_REGISTER_ULONG(PL110_LCDUPBASE, (ULONG)LlbHwGetFrameBuffer()); WRITE_REGISTER_ULONG(PL110_LCDLPBASE, (ULONG)LlbHwGetFrameBuffer()); - + /* Initialize timings to 720x400 */ WRITE_REGISTER_ULONG(PL110_LCDTIMING0, LCDTIMING0_PPL(LlbHwGetScreenWidth())); WRITE_REGISTER_ULONG(PL110_LCDTIMING1, LCDTIMING1_LPP(LlbHwGetScreenHeight())); - + /* Enable the TFT/LCD Display */ WRITE_REGISTER_ULONG(PL110_LCDCONTROL, LCDCONTROL_LCDEN | @@ -50,7 +50,7 @@ LlbHwGetScreenWidth(VOID) { return 720; } - + ULONG NTAPI LlbHwGetScreenHeight(VOID) diff --git a/boot/armllb/hw/versatile/hwinfo.c b/boot/armllb/hw/versatile/hwinfo.c index c1dd350f884..1bcdf1d9066 100644 --- a/boot/armllb/hw/versatile/hwinfo.c +++ b/boot/armllb/hw/versatile/hwinfo.c @@ -74,28 +74,28 @@ LlbHwBuildMemoryMap(IN PBIOS_MEMORY_MAP MemoryMap) { PBIOS_MEMORY_MAP MapEntry; ULONG Base, Size, FsBase, FsSize; - + /* Parse hardware memory map */ MapEntry = LlbHwVersaMemoryMap; while (MapEntry->Length) { /* Add this entry */ LlbAllocateMemoryEntry(MapEntry->Type, MapEntry->BaseAddress, MapEntry->Length); - + /* Move to the next one */ MapEntry++; } - + /* Query memory and RAMDISK information */ LlbEnvGetMemoryInformation(&Base, &Size); LlbEnvGetRamDiskInformation(&FsBase, &FsSize); - + /* Add-in the size of the ramdisk */ Base = FsBase + FsSize; - + /* Subtract size of ramdisk and anything else before it */ Size -= Base; - + /* Allocate an entry for it */ LlbAllocateMemoryEntry(BiosMemoryUsable, Base, Size); } diff --git a/boot/armllb/hw/versatile/hwinit.c b/boot/armllb/hw/versatile/hwinit.c index 20e38512dce..1c2831c9542 100644 --- a/boot/armllb/hw/versatile/hwinit.c +++ b/boot/armllb/hw/versatile/hwinit.c @@ -14,10 +14,10 @@ LlbHwInitialize(VOID) { /* Setup the CLCD (PL110) */ LlbHwVersaClcdInitialize(); - + /* Setup the UART (PL011) */ LlbHwVersaUartInitialize(); - + /* Setup the KMI (PL050) */ LlbHwVersaKmiInitialize(); } @@ -32,20 +32,20 @@ LlbHwLoadOsLoaderFromRam(VOID) ULONG Base, RootFs, Size; PCHAR Offset; CHAR CommandLine[64]; - + /* On versatile we load the RAMDISK with initrd */ LlbEnvGetRamDiskInformation(&RootFs, &Size); - + /* The OS Loader is at 0x20000, always */ Base = 0x20000; - + /* Read image offset */ Offset = LlbEnvRead("rdoffset"); - + /* Set parameters for the OS loader */ sprintf(CommandLine, "rdbase=0x%x rdsize=0x%x rdoffset=%s", RootFs, Size, Offset); LlbSetCommandLine(CommandLine); - + /* Return the OS loader base address */ return (POSLOADER_INIT)Base; } diff --git a/boot/armllb/hw/versatile/hwkmi.c b/boot/armllb/hw/versatile/hwkmi.c index 8e08023f551..93469cdf63a 100644 --- a/boot/armllb/hw/versatile/hwkmi.c +++ b/boot/armllb/hw/versatile/hwkmi.c @@ -64,13 +64,13 @@ NTAPI LlbHwVersaKmiSendAndWait(IN ULONG Value) { volatile int i = 1000; - + /* Send the value */ LlbHwKbdSend(Value); - + /* Wait a bit */ while (--i); - + /* Now make sure we received an ACK */ if (LlbHwKbdRead() != PS2_I_ACK) DbgPrint("PS/2 FAILURE!\n"); } @@ -80,7 +80,7 @@ NTAPI LlbHwVersaKmiInitialize(VOID) { UCHAR Divisor; - + /* Setup divisor and enable KMI */ Divisor = (LlbHwGetPClk() / 8000000) - 1; WRITE_REGISTER_UCHAR(PL050_KMICLKDIV, Divisor); @@ -104,13 +104,13 @@ LlbHwKbdSend(IN ULONG Value) { ULONG Status;
- /* Wait for ready signal */ + /* Wait for ready signal */ do { /* Read TX buffer state */ Status = READ_REGISTER_UCHAR(PL050_KMISTAT); } while (!(Status & KMISTAT_TXEMPTY)); - + /* Send value */ WRITE_REGISTER_UCHAR(PL050_KMIDATA, Value); } diff --git a/boot/armllb/hw/versatile/hwuart.c b/boot/armllb/hw/versatile/hwuart.c index a3ae386957c..580855491b6 100644 --- a/boot/armllb/hw/versatile/hwuart.c +++ b/boot/armllb/hw/versatile/hwuart.c @@ -53,26 +53,26 @@ LlbHwVersaUartInitialize(VOID) /* Query peripheral rate, hardcore baudrate */ ClockRate = LlbHwGetPClk(); Baudrate = 115200; - + /* Calculate baudrate clock divider and remainder */ Divider = ClockRate / (16 * Baudrate); Remainder = ClockRate % (16 * Baudrate); - + /* Calculate the fractional part */ Fraction = (8 * Remainder / Baudrate) >> 1; Fraction += (8 * Remainder / Baudrate) & 1; - + /* Disable interrupts */ WRITE_REGISTER_ULONG(UART_PL011_CR, 0); - + /* Set the baud rate to 115200 bps */ WRITE_REGISTER_ULONG(UART_PL011_IBRD, Divider); WRITE_REGISTER_ULONG(UART_PL011_FBRD, Fraction); - + /* Set 8 bits for data, 1 stop bit, no parity, FIFO enabled */ WRITE_REGISTER_ULONG(UART_PL011_LCRH, UART_PL011_LCRH_WLEN_8 | UART_PL011_LCRH_FEN); - + /* Clear and enable FIFO */ WRITE_REGISTER_ULONG(UART_PL011_CR, UART_PL011_CR_UARTEN | @@ -106,9 +106,9 @@ LlbHwGetUartBase(IN ULONG Port) } else if (Port == 1) { - return 0x101F2000; + return 0x101F2000; } - + return 0; }
diff --git a/boot/armllb/hw/video.c b/boot/armllb/hw/video.c index 2ee37eb9527..5430e144ea9 100644 --- a/boot/armllb/hw/video.c +++ b/boot/armllb/hw/video.c @@ -299,7 +299,7 @@ LlbVideoDrawChar(IN UCHAR c, Buffer[x] = (Line & 1) ? Color : BackColor; Line >>= 1; } - + /* Next line */ Buffer += ScreenWidth; } @@ -312,11 +312,11 @@ LlbVideoClearScreen(IN BOOLEAN OsLoader) ULONG ScreenSize, p; ULONG BackColor; PUSHORT VideoBuffer; - + /* Get frame buffer and reset cursor position */ VideoBuffer = LlbHwGetFrameBuffer(); ScreenCursor = 0; - + /* Backcolor on this machine */ ... 46943 lines suppressed ...
-
Hermès Bélusca-Maïto