Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 67101: [SERVMAN] - Fix that gcc doesn't support c99 - According to Christoph, this should fix the gcc build. If not, blame him.
by gedmurphy＠svn.reactos.org 08 Apr '15

08 Apr '15

Author: gedmurphy Date: Wed Apr 8 18:31:29 2015 New Revision: 67101 URL: http://svn.reactos.org/svn/reactos?rev=67101&view=rev Log: [SERVMAN] - Fix that gcc doesn't support c99 - According to Christoph, this should fix the gcc build. If not, blame him. Modified: trunk/reactos/base/applications/mscutils/CMakeLists.txt trunk/reactos/base/applications/mscutils/servman/control.c Modified: trunk/reactos/base/applications/mscutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/CMakeLists.txt [iso-8859-1] Wed Apr 8 18:31:29 2015 @@ -1,3 +1,4 @@ add_subdirectory(devmgmt) add_subdirectory(eventvwr) +add_subdirectory(servman) Modified: trunk/reactos/base/applications/mscutils/servman/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/control.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/control.c [iso-8859-1] Wed Apr 8 18:31:29 2015 @@ -25,7 +25,7 @@ DWORD OldCheckPoint; DWORD WaitTime; DWORD MaxWait; - DWORD ReqState; + DWORD ReqState, i; BOOL Result; /* Set the state we're interested in */ @@ -91,7 +91,7 @@ else if (WaitTime > 10000) WaitTime = 10000; /* We don't wanna wait for up to 10 secs without incrementing */ - for (int i = WaitTime / 1000; i > 0; i--) + for (i = WaitTime / 1000; i > 0; i--) { Sleep(1000); if (hProgress)

1 0

[dreimer] 67100: [RAPPS] CORE-9060 #comment rapps-db-update-and-enhancement-includes-es-es-l10n-2015-03-20.patch committed + continued your ways in some more entries + made the German translation f...
by dreimer＠svn.reactos.org 08 Apr '15

08 Apr '15

Author: dreimer Date: Wed Apr 8 18:17:03 2015 New Revision: 67100 URL: http://svn.reactos.org/svn/reactos?rev=67100&view=rev Log: [RAPPS] CORE-9060 #comment rapps-db-update-and-enhancement-includes-es-es-l10n-2015-03-20.patch committed + continued your ways in some more entries + made the German translation follow it either + added some missing German translations. Added: trunk/reactos/base/applications/rapps/rapps/gimp.txt (with props) trunk/reactos/base/applications/rapps/rapps/gnucash.txt (with props) trunk/reactos/base/applications/rapps/rapps/neverball.txt (with props) Modified: trunk/reactos/base/applications/rapps/rapps/7zip.txt trunk/reactos/base/applications/rapps/rapps/abiword.txt trunk/reactos/base/applications/rapps/rapps/abiword26.txt trunk/reactos/base/applications/rapps/rapps/abyss.txt trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt trunk/reactos/base/applications/rapps/rapps/akelpad.txt trunk/reactos/base/applications/rapps/rapps/alreader.txt trunk/reactos/base/applications/rapps/rapps/audiograbber.txt trunk/reactos/base/applications/rapps/rapps/bittorrent.txt trunk/reactos/base/applications/rapps/rapps/bochs.txt trunk/reactos/base/applications/rapps/rapps/boswars.txt trunk/reactos/base/applications/rapps/rapps/boundaround.txt trunk/reactos/base/applications/rapps/rapps/christmasbound.txt trunk/reactos/base/applications/rapps/rapps/chromium.txt trunk/reactos/base/applications/rapps/rapps/cnt.txt trunk/reactos/base/applications/rapps/rapps/codeblocks.txt trunk/reactos/base/applications/rapps/rapps/codeblocks_gcc.txt trunk/reactos/base/applications/rapps/rapps/codeblocks_gcc_2.txt trunk/reactos/base/applications/rapps/rapps/comctl32ocx.txt trunk/reactos/base/applications/rapps/rapps/devcpp_tdm_gcc_x64.txt trunk/reactos/base/applications/rapps/rapps/diablo2.txt trunk/reactos/base/applications/rapps/rapps/dosblaster.txt trunk/reactos/base/applications/rapps/rapps/dosbox.txt trunk/reactos/base/applications/rapps/rapps/doublecommander.txt trunk/reactos/base/applications/rapps/rapps/dplus.txt trunk/reactos/base/applications/rapps/rapps/dvdwritenow.txt trunk/reactos/base/applications/rapps/rapps/efserch.txt trunk/reactos/base/applications/rapps/rapps/excelview.txt trunk/reactos/base/applications/rapps/rapps/fap.txt trunk/reactos/base/applications/rapps/rapps/fira.txt trunk/reactos/base/applications/rapps/rapps/firefox.txt trunk/reactos/base/applications/rapps/rapps/firefox28.txt trunk/reactos/base/applications/rapps/rapps/firefox36.txt trunk/reactos/base/applications/rapps/rapps/foxit.txt trunk/reactos/base/applications/rapps/rapps/freebasic.txt trunk/reactos/base/applications/rapps/rapps/ghostscript.txt trunk/reactos/base/applications/rapps/rapps/ghostview.txt trunk/reactos/base/applications/rapps/rapps/glidewrapzbag.txt trunk/reactos/base/applications/rapps/rapps/globulation2.txt trunk/reactos/base/applications/rapps/rapps/hover.txt trunk/reactos/base/applications/rapps/rapps/hxd.txt trunk/reactos/base/applications/rapps/rapps/indiftpd.txt trunk/reactos/base/applications/rapps/rapps/inkscape.txt trunk/reactos/base/applications/rapps/rapps/irfanview.txt trunk/reactos/base/applications/rapps/rapps/irfanviewplugins.txt trunk/reactos/base/applications/rapps/rapps/kdewin.txt trunk/reactos/base/applications/rapps/rapps/kyodai.txt trunk/reactos/base/applications/rapps/rapps/lazaruside.txt trunk/reactos/base/applications/rapps/rapps/lbreakout2.txt trunk/reactos/base/applications/rapps/rapps/lgeneral.txt trunk/reactos/base/applications/rapps/rapps/librecad.txt trunk/reactos/base/applications/rapps/rapps/libreoffice.txt trunk/reactos/base/applications/rapps/rapps/libreofficehelp.txt trunk/reactos/base/applications/rapps/rapps/lmarbles.txt trunk/reactos/base/applications/rapps/rapps/mcwin32.txt trunk/reactos/base/applications/rapps/rapps/md5summer.txt trunk/reactos/base/applications/rapps/rapps/mfc40.txt trunk/reactos/base/applications/rapps/rapps/miktex.txt trunk/reactos/base/applications/rapps/rapps/mirandaim.txt trunk/reactos/base/applications/rapps/rapps/mirc.txt trunk/reactos/base/applications/rapps/rapps/mirc6.txt trunk/reactos/base/applications/rapps/rapps/mono2.txt trunk/reactos/base/applications/rapps/rapps/mpc.txt trunk/reactos/base/applications/rapps/rapps/mpxplay.txt trunk/reactos/base/applications/rapps/rapps/msxml3.txt trunk/reactos/base/applications/rapps/rapps/net11.txt trunk/reactos/base/applications/rapps/rapps/net20.txt trunk/reactos/base/applications/rapps/rapps/net20sp2.txt trunk/reactos/base/applications/rapps/rapps/nirlauncher.txt trunk/reactos/base/applications/rapps/rapps/npp.txt trunk/reactos/base/applications/rapps/rapps/offbyone.txt trunk/reactos/base/applications/rapps/rapps/opencodecs.txt trunk/reactos/base/applications/rapps/rapps/openoffice.txt trunk/reactos/base/applications/rapps/rapps/openoffice2.4.txt trunk/reactos/base/applications/rapps/rapps/openttd.txt trunk/reactos/base/applications/rapps/rapps/opera.txt trunk/reactos/base/applications/rapps/rapps/opera9.txt trunk/reactos/base/applications/rapps/rapps/peazip.txt trunk/reactos/base/applications/rapps/rapps/pengupop.txt trunk/reactos/base/applications/rapps/rapps/photofiltre.txt trunk/reactos/base/applications/rapps/rapps/pingus.txt trunk/reactos/base/applications/rapps/rapps/pptview.txt trunk/reactos/base/applications/rapps/rapps/precisecalc.txt trunk/reactos/base/applications/rapps/rapps/pspad.txt trunk/reactos/base/applications/rapps/rapps/ptanks.txt trunk/reactos/base/applications/rapps/rapps/putty.txt trunk/reactos/base/applications/rapps/rapps/python.txt trunk/reactos/base/applications/rapps/rapps/python2.txt trunk/reactos/base/applications/rapps/rapps/qb64sdl.txt trunk/reactos/base/applications/rapps/rapps/qmmp.txt trunk/reactos/base/applications/rapps/rapps/remood.txt trunk/reactos/base/applications/rapps/rapps/reshack.txt trunk/reactos/base/applications/rapps/rapps/rfstools.txt trunk/reactos/base/applications/rapps/rapps/rocks.txt trunk/reactos/base/applications/rapps/rapps/rosbe.txt trunk/reactos/base/applications/rapps/rapps/rosbeamd64.txt trunk/reactos/base/applications/rapps/rapps/rosbearm.txt trunk/reactos/base/applications/rapps/rapps/sambatng.txt trunk/reactos/base/applications/rapps/rapps/sbforvmware.txt trunk/reactos/base/applications/rapps/rapps/scite.txt trunk/reactos/base/applications/rapps/rapps/scummvm.txt trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt trunk/reactos/base/applications/rapps/rapps/seamonkey.txt trunk/reactos/base/applications/rapps/rapps/smplayer.txt trunk/reactos/base/applications/rapps/rapps/snoopy.txt trunk/reactos/base/applications/rapps/rapps/stamina.txt trunk/reactos/base/applications/rapps/rapps/steam.txt trunk/reactos/base/applications/rapps/rapps/sumatrapdf.txt trunk/reactos/base/applications/rapps/rapps/summerbound.txt trunk/reactos/base/applications/rapps/rapps/superdxb.txt trunk/reactos/base/applications/rapps/rapps/superfinder.txt trunk/reactos/base/applications/rapps/rapps/supertux.txt trunk/reactos/base/applications/rapps/rapps/tahoma.txt trunk/reactos/base/applications/rapps/rapps/thunderbird.txt trunk/reactos/base/applications/rapps/rapps/thunderbird3.txt trunk/reactos/base/applications/rapps/rapps/tileworld.txt trunk/reactos/base/applications/rapps/rapps/totalcommander.txt trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt trunk/reactos/base/applications/rapps/rapps/ultravnc.txt trunk/reactos/base/applications/rapps/rapps/utorrent.txt trunk/reactos/base/applications/rapps/rapps/vb5run.txt trunk/reactos/base/applications/rapps/rapps/vb6run.txt trunk/reactos/base/applications/rapps/rapps/vc2005sp1run.txt trunk/reactos/base/applications/rapps/rapps/vc2008sp1run.txt trunk/reactos/base/applications/rapps/rapps/vc2010sp1run.txt trunk/reactos/base/applications/rapps/rapps/vc2012run.txt trunk/reactos/base/applications/rapps/rapps/vc2013run.txt trunk/reactos/base/applications/rapps/rapps/vc6run.txt trunk/reactos/base/applications/rapps/rapps/vlc.txt trunk/reactos/base/applications/rapps/rapps/winboard.txt trunk/reactos/base/applications/rapps/rapps/winemono.txt trunk/reactos/base/applications/rapps/rapps/wme9.txt trunk/reactos/base/applications/rapps/rapps/wordview.txt trunk/reactos/base/applications/rapps/rapps/zaz.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/rapps/rapps/7zip.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/abiword.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/abiword26.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/abyss.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/akelpad.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/alreader.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/audiograbber.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/bittorrent.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/bochs.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/boswars.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/boundaround.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/christmasbound.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/chromium.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/cnt.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/codeblocks.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/codeblocks_gcc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/codeblocks_gcc_2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/comctl32ocx.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/devcpp_tdm_gcc_x64.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/diablo2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/dosblaster.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/dosbox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/doublecommander.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/dplus.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/dvdwritenow.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/efserch.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/excelview.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/fap.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/fira.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/firefox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/firefox28.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/firefox36.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/foxit.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/freebasic.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/ghostscript.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/ghostview.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/gimp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/glidewrapzbag.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/globulation2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/gnucash.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/hover.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/hxd.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/indiftpd.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/inkscape.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/irfanview.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/irfanviewplugins.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/kdewin.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/kyodai.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/lazaruside.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/lbreakout2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/lgeneral.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/librecad.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/libreoffice.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/libreofficehelp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/lmarbles.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/mcwin32.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/md5summer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/mfc40.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/miktex.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/mirc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/mirc6.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/mono2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/mpc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/mpxplay.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/msxml3.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/net11.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/net20.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/net20sp2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/neverball.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/nirlauncher.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/npp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/offbyone.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/opencodecs.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/openoffice.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/openoffice2.4.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/openttd.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/opera.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/opera9.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/peazip.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/pengupop.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/photofiltre.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/pingus.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/pptview.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/precisecalc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/pspad.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/ptanks.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/putty.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/python.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/python2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/qb64sdl.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/qmmp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/remood.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/reshack.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/rfstools.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/rocks.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/rosbe.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/rosbeamd64.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/rosbearm.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/sambatng.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/sbforvmware.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/scite.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/scummvm.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/seamonkey.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/smplayer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/snoopy.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/stamina.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/steam.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/sumatrapdf.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/summerbound.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/superdxb.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/superfinder.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/supertux.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/tahoma.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/thunderbird.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/thunderbird3.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/tileworld.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/totalcommander.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/ultravnc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/utorrent.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/vb5run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/vb6run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/vc2005sp1run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/vc2008sp1run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/vc2010sp1run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/vc2012run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/vc2013run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/vc6run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/vlc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/winboard.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/winemono.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/wme9.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/wordview.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/zaz.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra…

1 0

[gedmurphy] 67099: [SERVMAN] - Allow params to be passed through the progress dialog - PAss the start params
by gedmurphy＠svn.reactos.org 08 Apr '15

08 Apr '15

Author: gedmurphy Date: Wed Apr 8 18:14:16 2015 New Revision: 67099 URL: http://svn.reactos.org/svn/reactos?rev=67099&view=rev Log: [SERVMAN] - Allow params to be passed through the progress dialog - PAss the start params Modified: trunk/reactos/base/applications/mscutils/servman/mainwnd.c trunk/reactos/base/applications/mscutils/servman/precomp.h trunk/reactos/base/applications/mscutils/servman/progress.c trunk/reactos/base/applications/mscutils/servman/propsheet_general.c Modified: trunk/reactos/base/applications/mscutils/servman/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/mainwnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/mainwnd.c [iso-8859-1] Wed Apr 8 18:14:16 2015 @@ -475,7 +475,8 @@ RunActionWithProgress(Info->hMainWnd, Info->pCurrentService->lpServiceName, Info->pCurrentService->lpDisplayName, - ACTION_START); + ACTION_START, + NULL); //FIXME: Add start params UpdateServiceStatus(Info->pCurrentService); ChangeListViewText(Info, Info->pCurrentService, LVSTATUS); @@ -489,7 +490,8 @@ RunActionWithProgress(Info->hMainWnd, Info->pCurrentService->lpServiceName, Info->pCurrentService->lpDisplayName, - ACTION_STOP); + ACTION_STOP, + NULL); UpdateServiceStatus(Info->pCurrentService); ChangeListViewText(Info, Info->pCurrentService, LVSTATUS); @@ -502,7 +504,8 @@ RunActionWithProgress(Info->hMainWnd, Info->pCurrentService->lpServiceName, Info->pCurrentService->lpDisplayName, - ACTION_PAUSE); + ACTION_PAUSE, + NULL); UpdateServiceStatus(Info->pCurrentService); ChangeListViewText(Info, Info->pCurrentService, LVSTATUS); @@ -514,7 +517,8 @@ RunActionWithProgress(Info->hMainWnd, Info->pCurrentService->lpServiceName, Info->pCurrentService->lpDisplayName, - ACTION_RESUME); + ACTION_RESUME, + NULL); UpdateServiceStatus(Info->pCurrentService); ChangeListViewText(Info, Info->pCurrentService, LVSTATUS); @@ -526,7 +530,8 @@ RunActionWithProgress(Info->hMainWnd, Info->pCurrentService->lpServiceName, Info->pCurrentService->lpDisplayName, - ACTION_RESTART); + ACTION_RESTART, + NULL); UpdateServiceStatus(Info->pCurrentService); ChangeListViewText(Info, Info->pCurrentService, LVSTATUS); Modified: trunk/reactos/base/applications/mscutils/servman/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/precomp.h [iso-8859-1] Wed Apr 8 18:14:16 2015 @@ -104,7 +104,7 @@ /* progress.c */ #define DEFAULT_STEP 0 -BOOL RunActionWithProgress(HWND hParent, LPWSTR ServiceName, LPWSTR DisplayName, UINT Action); +BOOL RunActionWithProgress(HWND hParent, LPWSTR ServiceName, LPWSTR DisplayName, UINT Action, PVOID Param); VOID IncrementProgressBar(HANDLE hProgress, UINT NewPos); VOID CompleteProgressBar(HANDLE hProgress); Modified: trunk/reactos/base/applications/mscutils/servman/progress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/progress.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/progress.c [iso-8859-1] Wed Apr 8 18:14:16 2015 @@ -20,6 +20,7 @@ ULONG Action; BOOL StopDepends; LPWSTR ServiceList; + PVOID Param; } PROGRESS_DATA, *PPROGRESS_DATA; @@ -75,7 +76,7 @@ /* Start the service */ if (DoStartService(ProgressData->ServiceName, ProgressData->hProgress, - NULL)) + ProgressData->Param)) { /* We're done, slide the progress bar up to the top */ CompleteProgressBar(ProgressData->hProgress); @@ -322,7 +323,8 @@ RunActionWithProgress(HWND hParent, LPWSTR ServiceName, LPWSTR DisplayName, - UINT Action) + UINT Action, + PVOID Param) { PROGRESS_DATA ProgressData; LPWSTR ServiceList; @@ -357,6 +359,7 @@ ProgressData.Action = Action; ProgressData.StopDepends = StopDepends; ProgressData.ServiceList = ServiceList; + ProgressData.Param = Param; Result = DialogBoxParamW(hInstance, MAKEINTRESOURCEW(IDD_DLG_PROGRESS), Modified: trunk/reactos/base/applications/mscutils/servman/propsheet_general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/propsheet_general.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/propsheet_general.c [iso-8859-1] Wed Apr 8 18:14:16 2015 @@ -244,26 +244,6 @@ HeapFree(ProcessHeap, 0, pServiceConfig); - } -} - -static -VOID -OnStart(HWND hwndDlg, - PSERVICEPROPSHEET dlgInfo) -{ - WCHAR szStartParams[256]; - LPWSTR lpStartParams = NULL; - - if (GetDlgItemText(hwndDlg, IDC_START_PARAM, szStartParams, 256) > 0) - lpStartParams = szStartParams; - - //if (DoStart(dlgInfo->Info, lpStartParams)) - { - UpdateServiceStatus(dlgInfo->pService); - ChangeListViewText(dlgInfo->Info, dlgInfo->pService, LVSTATUS); - SetButtonStates(dlgInfo, hwndDlg); - SetServiceStatusText(dlgInfo, hwndDlg); } } @@ -312,52 +292,64 @@ break; case IDC_START: + { + WCHAR szStartParams[256]; + LPWSTR lpStartParams = NULL; + + if (GetDlgItemText(hwndDlg, IDC_START_PARAM, szStartParams, 256) > 0) + lpStartParams = szStartParams; + RunActionWithProgress(hwndDlg, dlgInfo->pService->lpServiceName, dlgInfo->pService->lpDisplayName, - ACTION_START); + ACTION_START, + lpStartParams); UpdateServiceStatus(dlgInfo->pService); ChangeListViewText(dlgInfo->Info, dlgInfo->pService, LVSTATUS); SetButtonStates(dlgInfo, hwndDlg); SetServiceStatusText(dlgInfo, hwndDlg); - break; + break; + } case IDC_STOP: RunActionWithProgress(hwndDlg, dlgInfo->pService->lpServiceName, dlgInfo->pService->lpDisplayName, - ACTION_STOP); + ACTION_STOP, + NULL); UpdateServiceStatus(dlgInfo->pService); ChangeListViewText(dlgInfo->Info, dlgInfo->pService, LVSTATUS); SetButtonStates(dlgInfo, hwndDlg); SetServiceStatusText(dlgInfo, hwndDlg); - break; + break; case IDC_PAUSE: RunActionWithProgress(hwndDlg, dlgInfo->pService->lpServiceName, dlgInfo->pService->lpDisplayName, - ACTION_PAUSE); + ACTION_PAUSE, + NULL); UpdateServiceStatus(dlgInfo->pService); ChangeListViewText(dlgInfo->Info, dlgInfo->pService, LVSTATUS); SetButtonStates(dlgInfo, hwndDlg); SetServiceStatusText(dlgInfo, hwndDlg); - break; + break; case IDC_RESUME: RunActionWithProgress(hwndDlg, dlgInfo->pService->lpServiceName, dlgInfo->pService->lpDisplayName, - ACTION_RESUME); + ACTION_RESUME, + NULL); UpdateServiceStatus(dlgInfo->pService); ChangeListViewText(dlgInfo->Info, dlgInfo->pService, LVSTATUS); SetButtonStates(dlgInfo, hwndDlg); SetServiceStatusText(dlgInfo, hwndDlg); - break; + break; case IDC_EDIT: { @@ -370,12 +362,12 @@ SendMessage(hName, EM_SETREADONLY, FALSE, 0); SendMessage(hDesc, EM_SETREADONLY, FALSE, 0); SendMessage(hExePath, EM_SETREADONLY, FALSE, 0); + break; } - break; case IDC_START_PARAM: PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - break; + break; } break;

1 0

[akhaldi] 67098: [MBEDTLS] Import mbed TLS v1.3.10. This is WIP. Brought to you by Peter Hater and co. CORE-9065 CR-70
by akhaldi＠svn.reactos.org 08 Apr '15

08 Apr '15

Author: akhaldi Date: Wed Apr 8 17:48:22 2015 New Revision: 67098 URL: http://svn.reactos.org/svn/reactos?rev=67098&view=rev Log: [MBEDTLS] Import mbed TLS v1.3.10. This is WIP. Brought to you by Peter Hater and co. CORE-9065 CR-70 Added: trunk/reactos/dll/3rdparty/mbedtls/ (with props) trunk/reactos/dll/3rdparty/mbedtls/CMakeLists.txt (with props) trunk/reactos/dll/3rdparty/mbedtls/aes.c (with props) trunk/reactos/dll/3rdparty/mbedtls/aesni.c (with props) trunk/reactos/dll/3rdparty/mbedtls/arc4.c (with props) trunk/reactos/dll/3rdparty/mbedtls/asn1parse.c (with props) trunk/reactos/dll/3rdparty/mbedtls/asn1write.c (with props) trunk/reactos/dll/3rdparty/mbedtls/base64.c (with props) trunk/reactos/dll/3rdparty/mbedtls/bignum.c (with props) trunk/reactos/dll/3rdparty/mbedtls/blowfish.c (with props) trunk/reactos/dll/3rdparty/mbedtls/camellia.c (with props) trunk/reactos/dll/3rdparty/mbedtls/ccm.c (with props) trunk/reactos/dll/3rdparty/mbedtls/certs.c (with props) trunk/reactos/dll/3rdparty/mbedtls/cipher.c (with props) trunk/reactos/dll/3rdparty/mbedtls/cipher_wrap.c (with props) trunk/reactos/dll/3rdparty/mbedtls/ctr_drbg.c (with props) trunk/reactos/dll/3rdparty/mbedtls/debug.c (with props) trunk/reactos/dll/3rdparty/mbedtls/des.c (with props) trunk/reactos/dll/3rdparty/mbedtls/dhm.c (with props) trunk/reactos/dll/3rdparty/mbedtls/ecdh.c (with props) trunk/reactos/dll/3rdparty/mbedtls/ecdsa.c (with props) trunk/reactos/dll/3rdparty/mbedtls/ecp.c (with props) trunk/reactos/dll/3rdparty/mbedtls/ecp_curves.c (with props) trunk/reactos/dll/3rdparty/mbedtls/entropy.c (with props) trunk/reactos/dll/3rdparty/mbedtls/entropy_poll.c (with props) trunk/reactos/dll/3rdparty/mbedtls/error.c (with props) trunk/reactos/dll/3rdparty/mbedtls/gcm.c (with props) trunk/reactos/dll/3rdparty/mbedtls/havege.c (with props) trunk/reactos/dll/3rdparty/mbedtls/hmac_drbg.c (with props) trunk/reactos/dll/3rdparty/mbedtls/md.c (with props) trunk/reactos/dll/3rdparty/mbedtls/md2.c (with props) trunk/reactos/dll/3rdparty/mbedtls/md4.c (with props) trunk/reactos/dll/3rdparty/mbedtls/md5.c (with props) trunk/reactos/dll/3rdparty/mbedtls/md_wrap.c (with props) trunk/reactos/dll/3rdparty/mbedtls/memory_buffer_alloc.c (with props) trunk/reactos/dll/3rdparty/mbedtls/net.c (with props) trunk/reactos/dll/3rdparty/mbedtls/oid.c (with props) trunk/reactos/dll/3rdparty/mbedtls/padlock.c (with props) trunk/reactos/dll/3rdparty/mbedtls/pbkdf2.c (with props) trunk/reactos/dll/3rdparty/mbedtls/pem.c (with props) trunk/reactos/dll/3rdparty/mbedtls/pk.c (with props) trunk/reactos/dll/3rdparty/mbedtls/pk_wrap.c (with props) trunk/reactos/dll/3rdparty/mbedtls/pkcs11.c (with props) trunk/reactos/dll/3rdparty/mbedtls/pkcs12.c (with props) trunk/reactos/dll/3rdparty/mbedtls/pkcs5.c (with props) trunk/reactos/dll/3rdparty/mbedtls/pkparse.c (with props) trunk/reactos/dll/3rdparty/mbedtls/pkwrite.c (with props) trunk/reactos/dll/3rdparty/mbedtls/platform.c (with props) trunk/reactos/dll/3rdparty/mbedtls/ripemd160.c (with props) trunk/reactos/dll/3rdparty/mbedtls/rsa.c (with props) trunk/reactos/dll/3rdparty/mbedtls/sha1.c (with props) trunk/reactos/dll/3rdparty/mbedtls/sha256.c (with props) trunk/reactos/dll/3rdparty/mbedtls/sha512.c (with props) trunk/reactos/dll/3rdparty/mbedtls/ssl_cache.c (with props) trunk/reactos/dll/3rdparty/mbedtls/ssl_ciphersuites.c (with props) trunk/reactos/dll/3rdparty/mbedtls/ssl_cli.c (with props) trunk/reactos/dll/3rdparty/mbedtls/ssl_srv.c (with props) trunk/reactos/dll/3rdparty/mbedtls/ssl_tls.c (with props) trunk/reactos/dll/3rdparty/mbedtls/threading.c (with props) trunk/reactos/dll/3rdparty/mbedtls/timing.c (with props) trunk/reactos/dll/3rdparty/mbedtls/version.c (with props) trunk/reactos/dll/3rdparty/mbedtls/version_features.c (with props) trunk/reactos/dll/3rdparty/mbedtls/x509.c (with props) trunk/reactos/dll/3rdparty/mbedtls/x509_create.c (with props) trunk/reactos/dll/3rdparty/mbedtls/x509_crl.c (with props) trunk/reactos/dll/3rdparty/mbedtls/x509_crt.c (with props) trunk/reactos/dll/3rdparty/mbedtls/x509_csr.c (with props) trunk/reactos/dll/3rdparty/mbedtls/x509write_crt.c (with props) trunk/reactos/dll/3rdparty/mbedtls/x509write_csr.c (with props) trunk/reactos/dll/3rdparty/mbedtls/xtea.c (with props) trunk/reactos/include/reactos/libs/mbedtls/ trunk/reactos/include/reactos/libs/mbedtls/polarssl/ trunk/reactos/include/reactos/libs/mbedtls/polarssl/aes.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/aesni.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/arc4.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/asn1.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/asn1write.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/base64.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/bignum.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/blowfish.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/bn_mul.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/camellia.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/ccm.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/certs.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/check_config.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/cipher.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/cipher_wrap.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/compat-1.2.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/config.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/ctr_drbg.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/debug.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/des.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/dhm.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/ecdh.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/ecdsa.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/ecp.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/entropy.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/entropy_poll.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/error.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/gcm.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/havege.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/hmac_drbg.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/md.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/md2.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/md4.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/md5.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/md_wrap.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/memory.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/memory_buffer_alloc.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/net.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/oid.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/openssl.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/padlock.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/pbkdf2.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/pem.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/pk.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/pk_wrap.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/pkcs11.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/pkcs12.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/pkcs5.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/platform.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/ripemd160.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/rsa.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/sha1.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/sha256.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/sha512.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/ssl.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/ssl_cache.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/ssl_ciphersuites.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/threading.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/timing.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/version.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/x509.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/x509_crl.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/x509_crt.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/x509_csr.h (with props) trunk/reactos/include/reactos/libs/mbedtls/polarssl/xtea.h (with props) Modified: trunk/reactos/dll/3rdparty/CMakeLists.txt trunk/reactos/media/doc/3rd Party Files.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/3rdparty/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/CMakeLists.tx… Added: trunk/reactos/dll/3rdparty/mbedtls/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/CMake… Added: trunk/reactos/dll/3rdparty/mbedtls/aes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/aes.c… Added: trunk/reactos/dll/3rdparty/mbedtls/aesni.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/aesni… Added: trunk/reactos/dll/3rdparty/mbedtls/arc4.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/arc4.… Added: trunk/reactos/dll/3rdparty/mbedtls/asn1parse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/asn1p… Added: trunk/reactos/dll/3rdparty/mbedtls/asn1write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/asn1w… Added: trunk/reactos/dll/3rdparty/mbedtls/base64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/base6… Added: trunk/reactos/dll/3rdparty/mbedtls/bignum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/bignu… Added: trunk/reactos/dll/3rdparty/mbedtls/blowfish.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/blowf… Added: trunk/reactos/dll/3rdparty/mbedtls/camellia.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/camel… Added: trunk/reactos/dll/3rdparty/mbedtls/ccm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/ccm.c… Added: trunk/reactos/dll/3rdparty/mbedtls/certs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/certs… Added: trunk/reactos/dll/3rdparty/mbedtls/cipher.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/ciphe… Added: trunk/reactos/dll/3rdparty/mbedtls/cipher_wrap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/ciphe… Added: trunk/reactos/dll/3rdparty/mbedtls/ctr_drbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/ctr_d… Added: trunk/reactos/dll/3rdparty/mbedtls/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/debug… Added: trunk/reactos/dll/3rdparty/mbedtls/des.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/des.c… Added: trunk/reactos/dll/3rdparty/mbedtls/dhm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/dhm.c… Added: trunk/reactos/dll/3rdparty/mbedtls/ecdh.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/ecdh.… Added: trunk/reactos/dll/3rdparty/mbedtls/ecdsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/ecdsa… Added: trunk/reactos/dll/3rdparty/mbedtls/ecp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/ecp.c… Added: trunk/reactos/dll/3rdparty/mbedtls/ecp_curves.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/ecp_c… Added: trunk/reactos/dll/3rdparty/mbedtls/entropy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/entro… Added: trunk/reactos/dll/3rdparty/mbedtls/entropy_poll.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/entro… Added: trunk/reactos/dll/3rdparty/mbedtls/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/error… Added: trunk/reactos/dll/3rdparty/mbedtls/gcm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/gcm.c… Added: trunk/reactos/dll/3rdparty/mbedtls/havege.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/haveg… Added: trunk/reactos/dll/3rdparty/mbedtls/hmac_drbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/hmac_… Added: trunk/reactos/dll/3rdparty/mbedtls/md.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/md.c?… Added: trunk/reactos/dll/3rdparty/mbedtls/md2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/md2.c… Added: trunk/reactos/dll/3rdparty/mbedtls/md4.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/md4.c… Added: trunk/reactos/dll/3rdparty/mbedtls/md5.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/md5.c… Added: trunk/reactos/dll/3rdparty/mbedtls/md_wrap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/md_wr… Added: trunk/reactos/dll/3rdparty/mbedtls/memory_buffer_alloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/memor… Added: trunk/reactos/dll/3rdparty/mbedtls/net.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/net.c… Added: trunk/reactos/dll/3rdparty/mbedtls/oid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/oid.c… Added: trunk/reactos/dll/3rdparty/mbedtls/padlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/padlo… Added: trunk/reactos/dll/3rdparty/mbedtls/pbkdf2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/pbkdf… Added: trunk/reactos/dll/3rdparty/mbedtls/pem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/pem.c… Added: trunk/reactos/dll/3rdparty/mbedtls/pk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/pk.c?… Added: trunk/reactos/dll/3rdparty/mbedtls/pk_wrap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/pk_wr… Added: trunk/reactos/dll/3rdparty/mbedtls/pkcs11.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/pkcs1… Added: trunk/reactos/dll/3rdparty/mbedtls/pkcs12.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/pkcs1… Added: trunk/reactos/dll/3rdparty/mbedtls/pkcs5.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/pkcs5… Added: trunk/reactos/dll/3rdparty/mbedtls/pkparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/pkpar… Added: trunk/reactos/dll/3rdparty/mbedtls/pkwrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/pkwri… Added: trunk/reactos/dll/3rdparty/mbedtls/platform.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/platf… Added: trunk/reactos/dll/3rdparty/mbedtls/ripemd160.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/ripem… Added: trunk/reactos/dll/3rdparty/mbedtls/rsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/rsa.c… Added: trunk/reactos/dll/3rdparty/mbedtls/sha1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/sha1.… Added: trunk/reactos/dll/3rdparty/mbedtls/sha256.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/sha25… Added: trunk/reactos/dll/3rdparty/mbedtls/sha512.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/sha51… Added: trunk/reactos/dll/3rdparty/mbedtls/ssl_cache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/ssl_c… Added: trunk/reactos/dll/3rdparty/mbedtls/ssl_ciphersuites.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/ssl_c… Added: trunk/reactos/dll/3rdparty/mbedtls/ssl_cli.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/ssl_c… Added: trunk/reactos/dll/3rdparty/mbedtls/ssl_srv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/ssl_s… Added: trunk/reactos/dll/3rdparty/mbedtls/ssl_tls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/ssl_t… Added: trunk/reactos/dll/3rdparty/mbedtls/threading.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/threa… Added: trunk/reactos/dll/3rdparty/mbedtls/timing.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/timin… Added: trunk/reactos/dll/3rdparty/mbedtls/version.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/versi… Added: trunk/reactos/dll/3rdparty/mbedtls/version_features.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/versi… Added: trunk/reactos/dll/3rdparty/mbedtls/x509.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/x509.… Added: trunk/reactos/dll/3rdparty/mbedtls/x509_create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/x509_… Added: trunk/reactos/dll/3rdparty/mbedtls/x509_crl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/x509_… Added: trunk/reactos/dll/3rdparty/mbedtls/x509_crt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/x509_… Added: trunk/reactos/dll/3rdparty/mbedtls/x509_csr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/x509_… Added: trunk/reactos/dll/3rdparty/mbedtls/x509write_crt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/x509w… Added: trunk/reactos/dll/3rdparty/mbedtls/x509write_csr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/x509w… Added: trunk/reactos/dll/3rdparty/mbedtls/xtea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/xtea.… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/aes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/aesni.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/arc4.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/asn1.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/asn1write.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/base64.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/bignum.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/blowfish.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/bn_mul.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/camellia.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/ccm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/certs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/check_config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/cipher.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/cipher_wrap.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/compat-1.2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/ctr_drbg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/des.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/dhm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/ecdh.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/ecdsa.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/ecp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/entropy.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/entropy_poll.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/error.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/gcm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/havege.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/hmac_drbg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/md.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/md2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/md4.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/md5.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/md_wrap.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/memory.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/memory_buffer_alloc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/net.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/oid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/openssl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/padlock.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/pbkdf2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/pem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/pk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/pk_wrap.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/pkcs11.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/pkcs12.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/pkcs5.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/platform.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/ripemd160.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/rsa.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/sha1.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/sha256.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/sha512.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/ssl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/ssl_cache.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/ssl_ciphersuites.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/threading.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/timing.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/version.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/x509.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/x509_crl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/x509_crt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/x509_csr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Added: trunk/reactos/include/reactos/libs/mbedtls/polarssl/xtea.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/mbedt… Modified: trunk/reactos/media/doc/3rd Party Files.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/3rd%20Party%20Fi…

1 0

[gedmurphy] 67097: Briefly remove from build until I've made a few more changes
by gedmurphy＠svn.reactos.org 08 Apr '15

08 Apr '15

Author: gedmurphy Date: Wed Apr 8 17:48:20 2015 New Revision: 67097 URL: http://svn.reactos.org/svn/reactos?rev=67097&view=rev Log: Briefly remove from build until I've made a few more changes Modified: trunk/reactos/base/applications/mscutils/CMakeLists.txt Modified: trunk/reactos/base/applications/mscutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/CMakeLists.txt [iso-8859-1] Wed Apr 8 17:48:20 2015 @@ -1,4 +1,3 @@ add_subdirectory(devmgmt) add_subdirectory(eventvwr) -add_subdirectory(servman)

1 0

[dreimer] 67096: [INF] CORE-9060 #comment swyter-rapps-add-short-desktop-title-2015-03-25.patch committed, rest will come soon.
by dreimer＠svn.reactos.org 08 Apr '15

08 Apr '15

Author: dreimer Date: Wed Apr 8 17:42:14 2015 New Revision: 67096 URL: http://svn.reactos.org/svn/reactos?rev=67096&view=rev Log: [INF] CORE-9060 #comment swyter-rapps-add-short-desktop-title-2015-03-25.patch committed, rest will come soon. Modified: trunk/reactos/boot/bootdata/hivedef.inf trunk/reactos/media/inf/shortcuts.inf Modified: trunk/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivedef.inf [iso-8859-1] Wed Apr 8 17:42:14 2015 @@ -2285,7 +2285,7 @@ ; LANG_SPANISH SUBLANG_NEUTRAL -[Strings.0a] +[Strings.000A] POWERCFG_NAME_0="Equipo domÃ©stico o de oficina" POWERCFG_DESC_0="Este perfil es ideal para gran parte de los usuarios domÃ©sticos que dejan el equipo encendido todo el dÃa." POWERCFG_NAME_1="PortÃ¡til" Modified: trunk/reactos/media/inf/shortcuts.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/shortcuts.inf?re… ============================================================================== --- trunk/reactos/media/inf/shortcuts.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/shortcuts.inf [iso-8859-1] Wed Apr 8 17:42:14 2015 @@ -15,7 +15,7 @@ [DesktopShortcuts] %SystemRoot%\system32\cmd.exe, %CMD_TITLE%, %CMD_DESC%, 0 -%SystemRoot%\system32\rapps.exe, %RAPPS_TITLE%, %RAPPS_DESC%, 0 +%SystemRoot%\system32\rapps.exe, %RAPPS_TITLE_SHORT%, %RAPPS_DESC%, 0 [ProgramShortcuts] %SystemRoot%\explorer.exe, %EXPLORER_TITLE%, %EXPLORER_DESC%, 0 @@ -74,6 +74,7 @@ EXPLORER_TITLE=ReactOS Explorer EXPLORER_DESC=Launch Explorer RAPPS_TITLE=ReactOS Applications Manager +RAPPS_TITLE_SHORT=Applications Manager RAPPS_DESC=Download and install various applications SERVMAN_TITLE=Service Manager SERVMAN_DESC=Launch Service Manager @@ -134,6 +135,7 @@ EXPLORER_TITLE=ÐÐ·ÑÐ»ÐµÐ´Ð¾Ð²Ð°ÑÐµÐ»ÑÑ Ð½Ð° Ð ÐµÐ°ÐºÑÐÐ¡ EXPLORER_DESC=ÐÑÑÐºÐ°Ð½Ðµ Ð½Ð° Ð¸Ð·ÑÐ»ÐµÐ´Ð¾Ð²Ð°ÑÐµÐ»Ñ RAPPS_TITLE=Ð£Ð¿ÑÐ°Ð²Ð¸ÑÐµÐ» Ð½Ð° Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸ÑÑÐ° Ð·Ð° Ð ÐµÐ°ÐºÑÐÐ¡ +RAPPS_TITLE_SHORT=Ð£Ð¿ÑÐ°Ð²Ð¸ÑÐµÐ» Ð½Ð° Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸ÑÑÐ° RAPPS_DESC=Ð¡Ð²Ð°Ð»ÑÐ½Ðµ Ð¸ ÑÐ»Ð°Ð³Ð°Ð½Ðµ Ð½Ð° ÑÐ°Ð·Ð»Ð¸ÑÐ½Ð¸ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ SERVMAN_TITLE=Ð£Ð¿ÑÐ°Ð²Ð¸ÑÐµÐ» Ð½Ð° ÑÑÐ»ÑÐ³Ð¸ÑÐµ SERVMAN_DESC=ÐÑÑÐºÐ°Ð½Ðµ Ð½Ð° ÑÐ¿ÑÐ°Ð²Ð¸ÑÐµÐ»Ñ Ð½Ð° ÑÑÐ»ÑÐ³Ð¸ÑÐµ @@ -194,6 +196,7 @@ EXPLORER_TITLE=ReactOS PrÅ¯zkumnÃk EXPLORER_DESC=Spustit PrÅ¯zkumnÃka RAPPS_TITLE=ReactOS SprÃ¡vce aplikacÃ +RAPPS_TITLE_SHORT=SprÃ¡vce aplikacÃ RAPPS_DESC=StÃ¡hnout a nainstalovat dalÅ¡Ã aplikace SERVMAN_TITLE=SprÃ¡vce sluÅ¾eb SERVMAN_DESC=Spustit SprÃ¡vce sluÅ¾eb @@ -254,6 +257,7 @@ EXPLORER_TITLE=ReactOS Explorer EXPLORER_DESC=Starte Explorer RAPPS_TITLE=ReactOS Anwendungsmanager +RAPPS_TITLE_SHORT=Anwendungsmanager RAPPS_DESC=Herunterladen und Installieren verschiedener Anwendungen SERVMAN_TITLE=Dienste-Manager SERVMAN_DESC=Starte Dienstmanager @@ -314,6 +318,7 @@ EXPLORER_TITLE=ÎÎ¾ÎµÏÎµÏÎ½Î·ÏÎ· ÏÎ¿Ï ReactOS EXPLORER_DESC=ÎÎ¾ÎµÏÎµÏÎ½Î·ÏÎ®Ï RAPPS_TITLE=ReactOS Applications Manager +RAPPS_TITLE_SHORT=Applications Manager RAPPS_DESC=Download and install various applications SERVMAN_TITLE=Î¥ÏÎ·ÏÎµÏÎ¯ÎµÏ SERVMAN_DESC=Î¥ÏÎ·ÏÎµÏÎ¯ÎµÏ @@ -374,6 +379,7 @@ EXPLORER_TITLE=Explorador de ReactOS EXPLORER_DESC=Ejecuta una nueva ventada del explorador de archivos. RAPPS_TITLE=Administrador de aplicaciones de ReactOS +RAPPS_TITLE_SHORT=Administrador de aplicaciones RAPPS_DESC=Descarga e instala varias aplicaciones. SERVMAN_TITLE=Administrador de servicios SERVMAN_DESC=Ejecuta el administrador de servicios. @@ -434,6 +440,7 @@ EXPLORER_TITLE=ReactOS Explorer EXPLORER_DESC=Ava sirvija RAPPS_TITLE=ReactOS Applications Manager +RAPPS_TITLE_SHORT=Applications Manager RAPPS_DESC=Laadi alla ja paigalda erinevaid rakendusi SERVMAN_TITLE=Service Manager SERVMAN_DESC=Ava Teenustehaldur @@ -494,6 +501,7 @@ EXPLORER_TITLE=Explorateur ReactOS EXPLORER_DESC=Lancer Explorer RAPPS_TITLE=ReactOS Applications Manager +RAPPS_TITLE_SHORT=Applications Manager RAPPS_DESC=TÃ©lÃ©charger et installer diverses applications SERVMAN_TITLE=Gestionnaire de services SERVMAN_DESC=Lancer le gestionnaire de services @@ -554,6 +562,7 @@ EXPLORER_TITLE=ReactOS ×¡×××¨ EXPLORER_DESC=×¡×××¨ RAPPS_TITLE=×× ×× ××××©×××× ×©× ReactOS +RAPPS_TITLE_SHORT=×× ×× ××××©×××× RAPPS_DESC=×××¨× ×××ª×§× ×ª×× ×××ª SERVMAN_TITLE=×× ×× ××©××¨××ª×× SERVMAN_DESC=×× ×× ××©××¨××ª×× @@ -614,6 +623,7 @@ EXPLORER_TITLE=ReactOS Explorer EXPLORER_DESC=Launch Explorer RAPPS_TITLE=ReactOS Applications Manager +RAPPS_TITLE_SHORT=Applications Manager RAPPS_DESC=Download and install various applications SERVMAN_TITLE=Service Manager SERVMAN_DESC=Launch Service Manager @@ -674,6 +684,7 @@ EXPLORER_TITLE=ReactOS Explorer EXPLORER_DESC=Jalankan Explorer RAPPS_TITLE=ReactOS Applications Manager +RAPPS_TITLE_SHORT=Applications Manager RAPPS_DESC=Download dan instalasi berbagai aplikasi SERVMAN_TITLE=Service Manager SERVMAN_DESC=Launch Service Manager @@ -734,6 +745,7 @@ EXPLORER_TITLE=ReactOS Explorer EXPLORER_DESC=Lancia Explorer RAPPS_TITLE=ReactOS gestione applicazioni +RAPPS_TITLE_SHORT=Gestione applicazioni RAPPS_DESC=Scarica e installa varie applicazioni SERVMAN_TITLE=Service Manager SERVMAN_DESC=Lancia la Gestione dei servizi @@ -794,6 +806,7 @@ EXPLORER_TITLE=ReactOS Explorer EXPLORER_DESC=ã¨ã¯ã¹ããã¼ã©ãèµ·åãã¾ã RAPPS_TITLE=ReactOS ã¢ããªã±ã¼ã·ã§ã³ ããã¼ã¸ã£ +RAPPS_TITLE_SHORT=ã¢ããªã±ã¼ã·ã§ã³ ããã¼ã¸ã£ RAPPS_DESC=æ§ããªã¢ããªã±ã¼ã·ã§ã³ã®ãã¦ã³ãã¼ãã¨ã¤ã³ã¹ãã¼ã«ãè¡ãã¾ã SERVMAN_TITLE=ãµã¼ãã¹ ããã¼ã¸ã£ SERVMAN_DESC=ãµã¼ãã¹ ããã¼ã¸ã£ãèµ·åãã¾ã @@ -854,6 +867,7 @@ EXPLORER_TITLE=ReactOS Explorer EXPLORER_DESC=Launch Explorer RAPPS_TITLE=ReactOS Applications Manager +RAPPS_TITLE_SHORT=Applications Manager RAPPS_DESC=Download and install various applications SERVMAN_TITLE=Service Manager SERVMAN_DESC=Launch Service Manager @@ -914,6 +928,7 @@ EXPLORER_TITLE=ReactOS Explorer EXPLORER_DESC=Start Utforsker RAPPS_TITLE=ReactOS Applications Manager +RAPPS_TITLE_SHORT=Applications Manager RAPPS_DESC=Last ned og innstaller forskjellige applikasjoner SERVMAN_TITLE=Service Manager SERVMAN_DESC=Start Tjenestebehandler @@ -974,6 +989,7 @@ EXPLORER_TITLE=Eksplorator ReactOS EXPLORER_DESC=Uruchom Eksplorator RAPPS_TITLE=MenedÅ¼er aplikacji ReactOS +RAPPS_TITLE_SHORT=MenedÅ¼er aplikacji RAPPS_DESC=ÅciÄgnij i zainstaluj inne aplikacje SERVMAN_TITLE=MenedÅ¼er usÅug SERVMAN_DESC=Uruchom MenedÅ¼er usÅug @@ -1034,6 +1050,7 @@ EXPLORER_TITLE=ReactOS Explorer EXPLORER_DESC=Iniciar Explorer RAPPS_TITLE=ReactOS Applications Manager +RAPPS_TITLE_SHORT=Applications Manager RAPPS_DESC=FaÃ§a o download e instale vÃ¡rias aplicaÃ§Ãµes SERVMAN_TITLE=Service Manager SERVMAN_DESC=Iniciar Gerenciador de ServiÃ§os @@ -1094,6 +1111,7 @@ EXPLORER_TITLE=Explorator ReactOS EXPLORER_DESC=Program de explorare a fiÈierelor Ã®n ReactOS. RAPPS_TITLE=Gestionar de programe +RAPPS_TITLE_SHORT=Gestionar de programe RAPPS_DESC=Program pentru a descÄrca Èi instala diverse programe. SERVMAN_TITLE=Gestionar de servicii SERVMAN_DESC=Program pentru gestionarea serviciilor de sistem. @@ -1154,6 +1172,7 @@ EXPLORER_TITLE=ÐÑÐ¾Ð²Ð¾Ð´Ð½Ð¸Ðº ReactOS EXPLORER_DESC=ÐÑÐ¾Ð±ÑÐ°Ð¶Ð°ÐµÑ ÑÐ°Ð¹Ð»Ñ Ð¸ Ð¿Ð°Ð¿ÐºÐ¸ Ð½Ð° ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐµ. RAPPS_TITLE=ÐÐµÐ½ÐµÐ´Ð¶ÐµÑ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹ ReactOS +RAPPS_TITLE_SHORT=ÐÐµÐ½ÐµÐ´Ð¶ÐµÑ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹ RAPPS_DESC=Ð¡ÐºÐ°ÑÐ°ÑÑ Ð¸ ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ Ð´ÑÑÐ³Ð¸Ðµ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ SERVMAN_TITLE=ÐÐ¸ÑÐ¿ÐµÑÑÐµÑ ÑÐ»ÑÐ¶Ð± SERVMAN_DESC=ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ Ð´Ð¸ÑÐ¿ÐµÑÑÐµÑ ÑÐ»ÑÐ¶Ð± @@ -1214,6 +1233,7 @@ EXPLORER_TITLE=PrieskumnÃk systÃ©mu ReactOS EXPLORER_DESC=SpustiÅ¥ PrieskumnÃka RAPPS_TITLE=ManaÅ¾Ã©r aplikÃ¡ciÃ systÃ©mu ReactOS +RAPPS_TITLE_SHORT=ManaÅ¾Ã©r aplikÃ¡ciÃ systÃ©mu RAPPS_DESC=StiahnuÅ¥ a nainÅ¡talovaÅ¥ ÄalÅ¡ie aplikÃ¡cie SERVMAN_TITLE=SprÃ¡vca sluÅ¾ieb SERVMAN_DESC=SpustiÅ¥ SprÃ¡vcu sluÅ¾ieb @@ -1274,6 +1294,7 @@ EXPLORER_TITLE=ReactOS Gezgini EXPLORER_DESC=Gezgin'i baÅlat RAPPS_TITLE=ReactOS Uygulama YÃ¶neticisi +RAPPS_TITLE_SHORT=Uygulama YÃ¶neticisi RAPPS_DESC=ÃeÅitli uygulamalarÄ± indir ve kur SERVMAN_TITLE=Hizmet YÃ¶neticisi SERVMAN_DESC=Hizmet YÃ¶neticisi'ni baÅlat @@ -1334,6 +1355,7 @@ EXPLORER_TITLE=ÐÑÐ¾Ð²ÑÐ´Ð½Ð¸Ðº ReactOS EXPLORER_DESC=ÐÐ°Ð¿ÑÑÑÐ¸ÑÐ¸ ÐÑÐ¾Ð²ÑÐ´Ð½Ð¸Ðº RAPPS_TITLE=ÐÐµÐ½ÐµÐ´Ð¶ÐµÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼ ReactOS +RAPPS_TITLE_SHORT=ÐÐµÐ½ÐµÐ´Ð¶ÐµÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼ RAPPS_DESC=ÐÐ°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ Ñ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ÑÑÐ·Ð½Ð¸Ñ Ð´Ð¾Ð´Ð°ÑÐºÑÐ² SERVMAN_TITLE=ÐÐ¸ÑÐ¿ÐµÑÑÐµÑ ÑÐ»ÑÐ¶Ð± SERVMAN_DESC=ÐÐ°Ð¿ÑÑÑÐ¸ÑÐ¸ ÐÐ¸ÑÐ¿ÐµÑÑÐµÑ ÐºÐµÑÑÐ²Ð°Ð½Ð½Ñ ÑÐ»ÑÐ¶Ð±Ð°Ð¼Ð¸ @@ -1394,6 +1416,7 @@ EXPLORER_TITLE=ReactOS èµæºç®¡çå¨ EXPLORER_DESC=ReactOS èµæºç®¡çå¨ RAPPS_TITLE=ReactOS Applications Manager +RAPPS_TITLE_SHORT=Applications Manager RAPPS_DESC=ä¸è½½å¹¶å®è£å¶ä»åºç¨è½¯ä»¶ SERVMAN_TITLE=æå¡ SERVMAN_DESC=æå¡

1 0

[gedmurphy] 67095: [SERVMAN] - TCHAR -> WCHAR
by gedmurphy＠svn.reactos.org 08 Apr '15

08 Apr '15

Author: gedmurphy Date: Wed Apr 8 17:30:38 2015 New Revision: 67095 URL: http://svn.reactos.org/svn/reactos?rev=67095&view=rev Log: [SERVMAN] - TCHAR -> WCHAR Modified: trunk/reactos/base/applications/mscutils/servman/about.c trunk/reactos/base/applications/mscutils/servman/create.c trunk/reactos/base/applications/mscutils/servman/delete.c trunk/reactos/base/applications/mscutils/servman/dependencies_tv1.c trunk/reactos/base/applications/mscutils/servman/dependencies_tv2.c trunk/reactos/base/applications/mscutils/servman/export.c trunk/reactos/base/applications/mscutils/servman/listview.c trunk/reactos/base/applications/mscutils/servman/misc.c trunk/reactos/base/applications/mscutils/servman/propsheet_depends.c trunk/reactos/base/applications/mscutils/servman/propsheet_general.c trunk/reactos/base/applications/mscutils/servman/query.c trunk/reactos/base/applications/mscutils/servman/servman.c Modified: trunk/reactos/base/applications/mscutils/servman/about.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/about.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/about.c [iso-8859-1] Wed Apr 8 17:30:38 2015 @@ -22,14 +22,14 @@ IDC_LICENSE_EDIT); if (hLicenseEditWnd) { - LPTSTR lpString; + LPWSTR lpString; if (AllocAndLoadString(&lpString, hInstance, IDS_LICENSE)) { - SetWindowText(hLicenseEditWnd, - lpString); + SetWindowTextW(hLicenseEditWnd, + lpString); LocalFree(lpString); } Modified: trunk/reactos/base/applications/mscutils/servman/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/create.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/create.c [iso-8859-1] Wed Apr 8 17:30:38 2015 @@ -12,11 +12,11 @@ typedef struct _CREATE_DATA { HWND hSelf; - LPTSTR ServiceName; - LPTSTR DisplayName; - LPTSTR BinPath; - LPTSTR Description; - LPTSTR Options; + LPWSTR ServiceName; + LPWSTR DisplayName; + LPWSTR BinPath; + LPWSTR Description; + LPWSTR Options; } CREATE_DATA, *PCREATE_DATA; @@ -30,28 +30,28 @@ BOOL bRet = FALSE; /* open handle to the SCM */ - hSCManager = OpenSCManager(NULL, - NULL, - SC_MANAGER_ALL_ACCESS); + hSCManager = OpenSCManagerW(NULL, + NULL, + SC_MANAGER_ALL_ACCESS); if (hSCManager) { - hSc = CreateService(hSCManager, - Data->ServiceName, - Data->DisplayName, - SERVICE_ALL_ACCESS, - SERVICE_WIN32_OWN_PROCESS, - SERVICE_DEMAND_START, - SERVICE_ERROR_NORMAL, - Data->BinPath, - NULL, - NULL, - NULL, - NULL, - NULL); + hSc = CreateServiceW(hSCManager, + Data->ServiceName, + Data->DisplayName, + SERVICE_ALL_ACCESS, + SERVICE_WIN32_OWN_PROCESS, + SERVICE_DEMAND_START, + SERVICE_ERROR_NORMAL, + Data->BinPath, + NULL, + NULL, + NULL, + NULL, + NULL); if (hSc) { - LPTSTR lpSuccess; + LPWSTR lpSuccess; /* Set the service description as CreateService does not do this for us */ @@ -78,29 +78,29 @@ return bRet; } -static LPTSTR +static LPWSTR GetStringFromDialog(PCREATE_DATA Data, UINT id) { HWND hwnd; - LPTSTR lpString = NULL; + LPWSTR lpString = NULL; INT iLen = 0; hwnd = GetDlgItem(Data->hSelf, id); if (hwnd) { - iLen = GetWindowTextLength(hwnd); + iLen = GetWindowTextLengthW(hwnd); if (iLen) { - lpString = (LPTSTR)HeapAlloc(ProcessHeap, + lpString = (LPWSTR)HeapAlloc(ProcessHeap, 0, - (iLen + 1) * sizeof(TCHAR)); + (iLen + 1) * sizeof(WCHAR)); if (lpString) { - GetWindowText(hwnd, - lpString, - iLen + 1); + GetWindowTextW(hwnd, + lpString, + iLen + 1); } } } @@ -167,34 +167,33 @@ { HWND hHelp; HICON hIcon = NULL; - TCHAR Buf[1000]; + WCHAR Buf[1000]; switch (message) { case WM_INITDIALOG: { - hIcon = (HICON) LoadImage(hInstance, - MAKEINTRESOURCE(IDI_SM_ICON), - IMAGE_ICON, - 16, - 16, - 0); - - SendMessage(hDlg, - WM_SETICON, - ICON_SMALL, - (LPARAM)hIcon); + hIcon = (HICON) LoadImageW(hInstance, + MAKEINTRESOURCE(IDI_SM_ICON), + IMAGE_ICON, + 16, + 16, + 0); + + SendMessageW(hDlg, + WM_SETICON, + ICON_SMALL, + (LPARAM)hIcon); hHelp = GetDlgItem(hDlg, IDC_CREATE_HELP); - LoadString(hInstance, - IDS_HELP_OPTIONS, - Buf, - sizeof(Buf) / sizeof(TCHAR)); - - SetWindowText(hHelp, - Buf); + LoadStringW(hInstance, + IDS_HELP_OPTIONS, + Buf, + sizeof(Buf) / sizeof(WCHAR)); + + SetWindowTextW(hHelp, Buf); return TRUE; } Modified: trunk/reactos/base/applications/mscutils/servman/delete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/delete.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/delete.c [iso-8859-1] Wed Apr 8 17:30:38 2015 @@ -29,7 +29,7 @@ { if (DeleteService(hSc)) { - LPTSTR lpSuccess; + LPWSTR lpSuccess; /* report success to user */ if (AllocAndLoadString(&lpSuccess, @@ -74,44 +74,44 @@ { case WM_INITDIALOG: { - LPTSTR lpDescription; + LPWSTR lpDescription; Info = (PMAIN_WND_INFO)lParam; if (Info != NULL) { - SetWindowLongPtr(hDlg, - GWLP_USERDATA, - (LONG_PTR)Info); + SetWindowLongPtrW(hDlg, + GWLP_USERDATA, + (LONG_PTR)Info); - hIcon = (HICON)LoadImage(hInstance, - MAKEINTRESOURCE(IDI_SM_ICON), - IMAGE_ICON, - 16, - 16, - 0); + hIcon = (HICON)LoadImageW(hInstance, + MAKEINTRESOURCE(IDI_SM_ICON), + IMAGE_ICON, + 16, + 16, + 0); if (hIcon) { - SendMessage(hDlg, - WM_SETICON, - ICON_SMALL, - (LPARAM)hIcon); + SendMessageW(hDlg, + WM_SETICON, + ICON_SMALL, + (LPARAM)hIcon); DestroyIcon(hIcon); } - SendDlgItemMessage(hDlg, - IDC_DEL_NAME, - WM_SETTEXT, - 0, - (LPARAM)Info->pCurrentService->lpDisplayName); + SendDlgItemMessageW(hDlg, + IDC_DEL_NAME, + WM_SETTEXT, + 0, + (LPARAM)Info->pCurrentService->lpDisplayName); lpDescription = GetServiceDescription(Info->pCurrentService->lpServiceName); if (lpDescription) { - SendDlgItemMessage(hDlg, - IDC_DEL_DESC, - WM_SETTEXT, - 0, - (LPARAM)lpDescription); + SendDlgItemMessageW(hDlg, + IDC_DEL_DESC, + WM_SETTEXT, + 0, + (LPARAM)lpDescription); HeapFree(ProcessHeap, 0, lpDescription); Modified: trunk/reactos/base/applications/mscutils/servman/dependencies_tv1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/dependencies_tv1.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/dependencies_tv1.c [iso-8859-1] Wed Apr 8 17:30:38 2015 @@ -9,20 +9,20 @@ #include "precomp.h" -LPTSTR +LPWSTR TV1_GetDependants(PSERVICEPROPSHEET pDlgInfo, SC_HANDLE hService) { LPQUERY_SERVICE_CONFIG lpServiceConfig; - LPTSTR lpStr = NULL; + LPWSTR lpStr = NULL; DWORD bytesNeeded; DWORD bytes; /* Get the info for this service */ - if (!QueryServiceConfig(hService, - NULL, - 0, - &bytesNeeded) && + if (!QueryServiceConfigW(hService, + NULL, + 0, + &bytesNeeded) && GetLastError() == ERROR_INSUFFICIENT_BUFFER) { lpServiceConfig = HeapAlloc(ProcessHeap, @@ -30,10 +30,10 @@ bytesNeeded); if (lpServiceConfig) { - if (QueryServiceConfig(hService, - lpServiceConfig, - bytesNeeded, - &bytesNeeded)) + if (QueryServiceConfigW(hService, + lpServiceConfig, + bytesNeeded, + &bytesNeeded)) { /* Does this service have any dependencies? */ if (lpServiceConfig->lpDependencies && @@ -43,7 +43,7 @@ bytes = 0; /* Work out how many bytes we need to hold the list */ - while (TRUE) + for (;;) { bytes++; @@ -57,7 +57,7 @@ } /* Allocate and copy the list */ - bytes *= sizeof(TCHAR); + bytes *= sizeof(WCHAR); lpStr = HeapAlloc(ProcessHeap, 0, bytes); @@ -82,24 +82,24 @@ VOID TV1_AddDependantsToTree(PSERVICEPROPSHEET pDlgInfo, HTREEITEM hParent, - LPTSTR lpServiceName) + LPWSTR lpServiceName) { SC_HANDLE hSCManager; SC_HANDLE hService; LPQUERY_SERVICE_CONFIG lpServiceConfig; - LPTSTR lpDependants; - LPTSTR lpStr; - LPTSTR lpNoDepends; + LPWSTR lpDependants; + LPWSTR lpStr; + LPWSTR lpNoDepends; BOOL bHasChildren; - hSCManager = OpenSCManager(NULL, - NULL, - SC_MANAGER_ALL_ACCESS); + hSCManager = OpenSCManagerW(NULL, + NULL, + SC_MANAGER_ALL_ACCESS); if (hSCManager) { - hService = OpenService(hSCManager, - lpServiceName, - SERVICE_QUERY_STATUS | SERVICE_ENUMERATE_DEPENDENTS | SERVICE_QUERY_CONFIG); + hService = OpenServiceW(hSCManager, + lpServiceName, + SERVICE_QUERY_STATUS | SERVICE_ENUMERATE_DEPENDENTS | SERVICE_QUERY_CONFIG); if (hService) { /* Get a list of service dependents */ @@ -179,7 +179,7 @@ BOOL TV1_Initialize(PSERVICEPROPSHEET pDlgInfo, - LPTSTR lpServiceName) + LPWSTR lpServiceName) { BOOL bRet = FALSE; Modified: trunk/reactos/base/applications/mscutils/servman/dependencies_tv2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/dependencies_tv2.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/dependencies_tv2.c [iso-8859-1] Wed Apr 8 17:30:38 2015 @@ -120,11 +120,11 @@ VOID TV2_AddDependantsToTree(PSERVICEPROPSHEET pDlgInfo, HTREEITEM hParent, - LPTSTR lpServiceName) + LPWSTR lpServiceName) { LPENUM_SERVICE_STATUSW lpServiceStatus; - LPTSTR lpNoDepends; + LPWSTR lpNoDepends; DWORD count, i; BOOL bHasChildren; @@ -175,7 +175,7 @@ BOOL TV2_Initialize(PSERVICEPROPSHEET pDlgInfo, - LPTSTR lpServiceName) + LPWSTR lpServiceName) { BOOL bRet = FALSE; Modified: trunk/reactos/base/applications/mscutils/servman/export.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/export.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/export.c [iso-8859-1] Wed Apr 8 17:30:38 2015 @@ -9,12 +9,12 @@ #include "precomp.h" -#include <commdlg.h> -#include <cderr.h> +//#include <commdlg.h> +//#include <cderr.h> static DWORD GetTextFromListView(PMAIN_WND_INFO Info, - TCHAR Text[500], + LPWSTR Text, INT row, INT col) { @@ -26,22 +26,21 @@ item.iSubItem = col; item.pszText = Text; item.cchTextMax = 500; - NumChars = (INT)SendMessage(Info->hListView, - LVM_GETITEMTEXT, - row, - (LPARAM)&item); - + NumChars = (INT)SendMessageW(Info->hListView, + LVM_GETITEMTEXTW, + row, + (LPARAM)&item); return NumChars; } static BOOL SaveServicesToFile(PMAIN_WND_INFO Info, - LPCTSTR pszFileName) + LPCWSTR pszFileName) { HANDLE hFile; BOOL bSuccess = FALSE; - hFile = CreateFile(pszFileName, + hFile = CreateFileW(pszFileName, GENERIC_WRITE, 0, NULL, @@ -51,9 +50,9 @@ if(hFile != INVALID_HANDLE_VALUE) { - TCHAR LVText[500]; - TCHAR newl[2] = {_T('\r'), _T('\n')}; - TCHAR tab = _T('\t'); + WCHAR LVText[500]; + WCHAR newl[2] = {L'\r', L'\n'}; + WCHAR tab = L'\t'; DWORD dwTextLength, dwWritten; INT NumListedServ = 0; INT i, k; @@ -72,13 +71,13 @@ { WriteFile(hFile, LVText, - sizeof(TCHAR) * dwTextLength, + sizeof(WCHAR) * dwTextLength, &dwWritten, NULL); WriteFile(hFile, &tab, - sizeof(TCHAR), + sizeof(WCHAR), &dwWritten, NULL); } @@ -99,17 +98,18 @@ VOID ExportFile(PMAIN_WND_INFO Info) { - OPENFILENAME ofn; - TCHAR szFileName[MAX_PATH] = _T(""); + OPENFILENAMEW ofn; + WCHAR szFileName[MAX_PATH]; ZeroMemory(&ofn, sizeof(ofn)); + szFileName[0] = UNICODE_NULL; ofn.lStructSize = sizeof(OPENFILENAME); ofn.hwndOwner = Info->hMainWnd; - ofn.lpstrFilter = _T("Text (Tab Delimited)(*.txt)\0*.txt\0Text (Comma Delimited)(*.csv)\0*.csv\0"); + ofn.lpstrFilter = L"Text (Tab Delimited)(*.txt)\0*.txt\0Text (Comma Delimited)(*.csv)\0*.csv\0"; ofn.lpstrFile = szFileName; ofn.nMaxFile = MAX_PATH; - ofn.lpstrDefExt = _T("txt"); + ofn.lpstrDefExt = L"txt"; ofn.Flags = OFN_EXPLORER | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT; if(GetSaveFileName(&ofn)) @@ -119,5 +119,5 @@ } if (CommDlgExtendedError() != CDERR_GENERALCODES) - MessageBox(NULL, _T("Export to file failed"), NULL, 0); + MessageBoxW(NULL, L"Export to file failed", NULL, 0); } Modified: trunk/reactos/base/applications/mscutils/servman/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/listview.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/listview.c [iso-8859-1] Wed Apr 8 17:30:38 2015 @@ -123,13 +123,13 @@ case LVDESC: { - LPTSTR lpDescription; + LPWSTR lpDescription; lpDescription = GetServiceDescription(pService->lpServiceName); lvItem.pszText = lpDescription; SendMessage(Info->hListView, - LVM_SETITEMTEXT, + LVM_SETITEMTEXTW, lvItem.iItem, (LPARAM) &lvItem); @@ -141,14 +141,14 @@ case LVSTATUS: { - TCHAR szStatus[64]; + WCHAR szStatus[64]; if (pService->ServiceStatusProcess.dwCurrentState == SERVICE_RUNNING) { - LoadString(hInstance, - IDS_SERVICES_STARTED, - szStatus, - sizeof(szStatus) / sizeof(TCHAR)); + LoadStringW(hInstance, + IDS_SERVICES_STARTED, + szStatus, + sizeof(szStatus) / sizeof(WCHAR)); } else { @@ -156,17 +156,17 @@ } lvItem.pszText = szStatus; - SendMessage(Info->hListView, - LVM_SETITEMTEXT, - lvItem.iItem, - (LPARAM) &lvItem); + SendMessageW(Info->hListView, + LVM_SETITEMTEXT, + lvItem.iItem, + (LPARAM) &lvItem); } break; case LVSTARTUP: { - LPQUERY_SERVICE_CONFIG lpServiceConfig; - LPTSTR lpStartup = NULL; + LPQUERY_SERVICE_CONFIGW lpServiceConfig; + LPWSTR lpStartup = NULL; DWORD StringId = 0; lpServiceConfig = GetServiceConfig(pService->lpServiceName); @@ -187,10 +187,10 @@ StringId); lvItem.pszText = lpStartup; - SendMessage(Info->hListView, - LVM_SETITEMTEXT, - lvItem.iItem, - (LPARAM)&lvItem); + SendMessageW(Info->hListView, + LVM_SETITEMTEXTW, + lvItem.iItem, + (LPARAM)&lvItem); LocalFree(lpStartup); HeapFree(ProcessHeap, @@ -207,10 +207,10 @@ if (lpServiceConfig) { lvItem.pszText = lpServiceConfig->lpServiceStartName; - SendMessage(Info->hListView, - LVM_SETITEMTEXT, - lvItem.iItem, - (LPARAM)&lvItem); + SendMessageW(Info->hListView, + LVM_SETITEMTEXT, + lvItem.iItem, + (LPARAM)&lvItem); HeapFree(ProcessHeap, 0, @@ -226,7 +226,7 @@ RefreshServiceList(PMAIN_WND_INFO Info) { ENUM_SERVICE_STATUS_PROCESS *pService; - LVITEM lvItem; + LVITEMW lvItem; DWORD NumServices; DWORD Index; @@ -246,7 +246,7 @@ pService = &Info->pAllServices[Index]; /* set the display name */ - ZeroMemory(&lvItem, sizeof(LVITEM)); + ZeroMemory(&lvItem, sizeof(LVITEMW)); lvItem.mask = LVIF_TEXT | LVIF_PARAM; lvItem.pszText = pService->lpDisplayName; @@ -267,7 +267,7 @@ } /* turn redraw flag on. */ - SendMessage (Info->hListView, + SendMessageW(Info->hListView, WM_SETREDRAW, TRUE, 0); @@ -288,12 +288,12 @@ 1); if (hSmall) { - hSmIconItem = LoadImage(hInstance, - MAKEINTRESOURCE(IDI_SM_ICON), - IMAGE_ICON, - 16, - 16, - 0); + hSmIconItem = LoadImageW(hInstance, + MAKEINTRESOURCE(IDI_SM_ICON), + IMAGE_ICON, + 16, + 16, + 0); if (hSmIconItem) { ImageList_AddIcon(hSmall, @@ -313,12 +313,12 @@ 1); if (hLarge) { - hLgIconItem = LoadImage(hInstance, - MAKEINTRESOURCE(IDI_SM_ICON), - IMAGE_ICON, - 32, - 32, - 0); + hLgIconItem = LoadImageW(hInstance, + MAKEINTRESOURCE(IDI_SM_ICON), + IMAGE_ICON, + 32, + 32, + 0); if (hLgIconItem) { ImageList_AddIcon(hLarge, @@ -334,25 +334,25 @@ BOOL CreateListView(PMAIN_WND_INFO Info) { - LVCOLUMN lvc = { 0 }; - TCHAR szTemp[256]; - - Info->hListView = CreateWindowEx(WS_EX_CLIENTEDGE, - WC_LISTVIEW, - NULL, - WS_CHILD | WS_VISIBLE | LVS_REPORT | WS_BORDER | - LBS_NOTIFY | LVS_SORTASCENDING | LBS_NOREDRAW, - 0, 0, 0, 0, - Info->hMainWnd, - (HMENU) IDC_SERVLIST, - hInstance, - NULL); + LVCOLUMNW lvc = { 0 }; + WCHAR szTemp[256]; + + Info->hListView = CreateWindowExW(WS_EX_CLIENTEDGE, + WC_LISTVIEWW, + NULL, + WS_CHILD | WS_VISIBLE | LVS_REPORT | WS_BORDER | + LBS_NOTIFY | LVS_SORTASCENDING | LBS_NOREDRAW, + 0, 0, 0, 0, + Info->hMainWnd, + (HMENU) IDC_SERVLIST, + hInstance, + NULL); if (Info->hListView == NULL) { - MessageBox(Info->hMainWnd, - _T("Could not create List View."), - _T("Error"), - MB_OK | MB_ICONERROR); + MessageBoxW(Info->hMainWnd, + L"Could not create List View.", + L"Error", + MB_OK | MB_ICONERROR); return FALSE; } @@ -366,10 +366,10 @@ /* name */ lvc.iSubItem = LVNAME; lvc.cx = 150; - LoadString(hInstance, - IDS_FIRSTCOLUMN, - szTemp, - sizeof(szTemp) / sizeof(TCHAR)); + LoadStringW(hInstance, + IDS_FIRSTCOLUMN, + szTemp, + sizeof(szTemp) / sizeof(WCHAR)); lvc.pszText = szTemp; (void)ListView_InsertColumn(Info->hListView, 0, @@ -378,10 +378,10 @@ /* description */ lvc.iSubItem = LVDESC; lvc.cx = 240; - LoadString(hInstance, - IDS_SECONDCOLUMN, - szTemp, - sizeof(szTemp) / sizeof(TCHAR)); + LoadStringW(hInstance, + IDS_SECONDCOLUMN, + szTemp, + sizeof(szTemp) / sizeof(WCHAR)); lvc.pszText = szTemp; (void)ListView_InsertColumn(Info->hListView, 1, @@ -390,10 +390,10 @@ /* status */ lvc.iSubItem = LVSTATUS; lvc.cx = 55; - LoadString(hInstance, - IDS_THIRDCOLUMN, - szTemp, - sizeof(szTemp) / sizeof(TCHAR)); + LoadStringW(hInstance, + IDS_THIRDCOLUMN, + szTemp, + sizeof(szTemp) / sizeof(WCHAR)); lvc.pszText = szTemp; (void)ListView_InsertColumn(Info->hListView, 2, @@ -402,10 +402,10 @@ /* startup type */ lvc.iSubItem = LVSTARTUP; lvc.cx = 80; - LoadString(hInstance, - IDS_FOURTHCOLUMN, - szTemp, - sizeof(szTemp) / sizeof(TCHAR)); + LoadStringW(hInstance, + IDS_FOURTHCOLUMN, + szTemp, + sizeof(szTemp) / sizeof(WCHAR)); lvc.pszText = szTemp; (void)ListView_InsertColumn(Info->hListView, 3, @@ -414,10 +414,10 @@ /* logon as */ lvc.iSubItem = LVLOGONAS; lvc.cx = 100; - LoadString(hInstance, - IDS_FITHCOLUMN, - szTemp, - sizeof(szTemp) / sizeof(TCHAR)); + LoadStringW(hInstance, + IDS_FITHCOLUMN, + szTemp, + sizeof(szTemp) / sizeof(WCHAR)); lvc.pszText = szTemp; (void)ListView_InsertColumn(Info->hListView, 4, Modified: trunk/reactos/base/applications/mscutils/servman/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/misc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/misc.c [iso-8859-1] Wed Apr 8 17:30:38 2015 @@ -47,7 +47,7 @@ } INT -AllocAndLoadString(OUT LPTSTR *lpTarget, +AllocAndLoadString(OUT LPWSTR *lpTarget, IN HINSTANCE hInst, IN UINT uID) { @@ -57,12 +57,12 @@ uID); if (ln++ > 0) { - (*lpTarget) = (LPTSTR)LocalAlloc(LMEM_FIXED, - ln * sizeof(TCHAR)); + (*lpTarget) = (LPWSTR)LocalAlloc(LMEM_FIXED, + ln * sizeof(WCHAR)); if ((*lpTarget) != NULL) { INT Ret; - if (!(Ret = LoadString(hInst, uID, *lpTarget, ln))) + if (!(Ret = LoadStringW(hInst, uID, *lpTarget, ln))) { LocalFree((HLOCAL)(*lpTarget)); } @@ -75,11 +75,11 @@ DWORD LoadAndFormatString(IN HINSTANCE hInstance, IN UINT uID, - OUT LPTSTR *lpTarget, + OUT LPWSTR *lpTarget, ...) { DWORD Ret = 0; - LPTSTR lpFormat; + LPWSTR lpFormat; va_list lArgs; if (AllocAndLoadString(&lpFormat, @@ -89,13 +89,13 @@ va_start(lArgs, lpTarget); /* let's use Format to format it because it has the ability to allocate memory automatically */ - Ret = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_STRING, - lpFormat, - 0, - 0, - (LPTSTR)lpTarget, - 0, - &lArgs); + Ret = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_STRING, + lpFormat, + 0, + 0, + (LPWSTR)lpTarget, + 0, + &lArgs); va_end(lArgs); LocalFree((HLOCAL)lpFormat); @@ -112,7 +112,7 @@ ...) { BOOL Ret = FALSE; - LPTSTR lpFormat, lpStr; + LPWSTR lpFormat, lpStr; va_list lArgs; if (AllocAndLoadString(&lpFormat, @@ -122,21 +122,21 @@ va_start(lArgs, uID); /* let's use FormatMessage to format it because it has the ability to allocate memory automatically */ - Ret = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_STRING, - lpFormat, - 0, - 0, - (VOID*)&lpStr, - 0, - &lArgs); + Ret = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_STRING, + lpFormat, + 0, + 0, + (VOID*)&lpStr, + 0, + &lArgs); va_end(lArgs); if (lpStr != NULL) { - Ret = (BOOL)SendMessage(hStatusBar, - SB_SETTEXT, - (WPARAM)PartId, - (LPARAM)lpStr); + Ret = (BOOL)SendMessageW(hStatusBar, + SB_SETTEXT, + (WPARAM)PartId, + (LPARAM)lpStr); LocalFree((HLOCAL)lpStr); } @@ -153,16 +153,16 @@ IN UINT uID) { BOOL Ret = FALSE; - LPTSTR lpStr; + LPWSTR lpStr; if (AllocAndLoadString(&lpStr, hInstance, uID) > 0) { - Ret = (BOOL)SendMessage(hStatusBar, - SB_SETTEXT, - (WPARAM)PartId, - (LPARAM)lpStr); + Ret = (BOOL)SendMessageW(hStatusBar, + SB_SETTEXT, + (WPARAM)PartId, + (LPARAM)lpStr); LocalFree((HLOCAL)lpStr); } @@ -171,17 +171,17 @@ INT -GetTextFromEdit(OUT LPTSTR lpString, +GetTextFromEdit(OUT LPWSTR lpString, IN HWND hDlg, IN UINT Res) { - INT len = GetWindowTextLength(GetDlgItem(hDlg, Res)); + INT len = GetWindowTextLengthW(GetDlgItem(hDlg, Res)); if(len > 0) { - GetDlgItemText(hDlg, - Res, - lpString, - len + 1); + GetDlgItemTextW(hDlg, + Res, + lpString, + len + 1); } else lpString = NULL; @@ -191,26 +191,26 @@ VOID GetError(VOID) { - LPTSTR lpMsgBuf = NULL; - - FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | - FORMAT_MESSAGE_FROM_SYSTEM | - FORMAT_MESSAGE_IGNORE_INSERTS, - NULL, - GetLastError(), - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (VOID*)&lpMsgBuf, - 0, - NULL ); - - MessageBox(NULL, lpMsgBuf, _T("Error!"), MB_OK | MB_ICONERROR); + LPWSTR lpMsgBuf = NULL; + + FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, + GetLastError(), + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (VOID*)&lpMsgBuf, + 0, + NULL ); + + MessageBoxW(NULL, lpMsgBuf, L"Error!", MB_OK | MB_ICONERROR); LocalFree(lpMsgBuf); } -VOID DisplayString(PTCHAR Msg) -{ - MessageBox(NULL, Msg, _T("Note!"), MB_ICONEXCLAMATION|MB_OK); +VOID DisplayString(LPWSTR Msg) +{ + MessageBoxW(NULL, Msg, L"Note!", MB_ICONEXCLAMATION|MB_OK); } @@ -239,12 +239,12 @@ ret = 0; for (i = StartResource; i <= EndResource && ret != -1; i++) { - hImage = LoadImage(hInstance, - MAKEINTRESOURCE(i), - type, - Width, - Height, - LR_LOADTRANSPARENT); + hImage = LoadImageW(hInstance, + MAKEINTRESOURCEW(i), + type, + Width, + Height, + LR_LOADTRANSPARENT); if (hImage == NULL) { ImageList_Destroy(himl); Modified: trunk/reactos/base/applications/mscutils/servman/propsheet_depends.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/propsheet_depends.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/propsheet_depends.c [iso-8859-1] Wed Apr 8 17:30:38 2015 @@ -12,14 +12,14 @@ HTREEITEM AddItemToTreeView(HWND hTreeView, HTREEITEM hParent, - LPTSTR lpDisplayName, - LPTSTR lpServiceName, + LPWSTR lpDisplayName, + LPWSTR lpServiceName, ULONG ServiceType, BOOL bHasChildren) { TV_ITEM tvi; TV_INSERTSTRUCT tvins; - LPTSTR lpName; + LPWSTR lpName; DWORD dwSize; ZeroMemory(&tvi, sizeof(tvi)); @@ -27,7 +27,7 @@ tvi.mask = TVIF_TEXT | TVIF_PARAM | TVIF_SELECTEDIMAGE | TVIF_IMAGE | TVIF_CHILDREN; tvi.pszText = lpDisplayName; - tvi.cchTextMax = _tcslen(lpDisplayName); + tvi.cchTextMax = wcslen(lpDisplayName); tvi.cChildren = bHasChildren; /* Select the image for this service */ @@ -53,14 +53,14 @@ if (lpServiceName) { - dwSize = _tcslen(lpServiceName) + 1; + dwSize = wcslen(lpServiceName) + 1; /* Attach the service name */ - lpName = (LPTSTR)HeapAlloc(GetProcessHeap(), + lpName = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, - dwSize * sizeof(TCHAR)); + dwSize * sizeof(WCHAR)); if (lpName) { - StringCchCopy(lpName, dwSize, lpServiceName); + StringCchCopyW(lpName, dwSize, lpServiceName); tvi.lParam = (LPARAM)lpName; } } @@ -76,7 +76,7 @@ HTREEITEM hItem) { LPARAM lParam = 0; - TVITEM tv = {0}; + TVITEMW tv = {0}; tv.mask = TVIF_PARAM | TVIF_HANDLE; tv.hItem = hItem; @@ -94,7 +94,7 @@ HTREEITEM hItem) { HTREEITEM hChildItem; - LPTSTR lpServiceName; + LPWSTR lpServiceName; /* Does this item have any children */ hChildItem = TreeView_GetChild(hTreeView, hItem); @@ -105,7 +105,7 @@ } /* Get the string and free it */ - lpServiceName = (LPTSTR)TreeView_GetItemParam(hTreeView, hItem); + lpServiceName = (LPWSTR)TreeView_GetItemParam(hTreeView, hItem); if (lpServiceName) { HeapFree(GetProcessHeap(), @@ -229,7 +229,7 @@ if (!TreeView_GetChild(pDlgInfo->hDependsTreeView1, lpnmtv->itemNew.hItem)) { /* It's not, add the children */ - TV1_AddDependantsToTree(pDlgInfo, lpnmtv->itemNew.hItem, (LPTSTR)lpnmtv->itemNew.lParam); + TV1_AddDependantsToTree(pDlgInfo, lpnmtv->itemNew.hItem, (LPWSTR)lpnmtv->itemNew.lParam); } } else if (lpnmtv->hdr.idFrom == IDC_DEPEND_TREE2) @@ -238,7 +238,7 @@ if (!TreeView_GetChild(pDlgInfo->hDependsTreeView2, lpnmtv->itemNew.hItem)) { /* It's not, add the children */ - TV2_AddDependantsToTree(pDlgInfo, lpnmtv->itemNew.hItem, (LPTSTR)lpnmtv->itemNew.lParam); + TV2_AddDependantsToTree(pDlgInfo, lpnmtv->itemNew.hItem, (LPWSTR)lpnmtv->itemNew.lParam); } } } Modified: trunk/reactos/base/applications/mscutils/servman/propsheet_general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/propsheet_general.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/propsheet_general.c [iso-8859-1] Wed Apr 8 17:30:38 2015 @@ -59,7 +59,7 @@ SetServiceStatusText(PSERVICEPROPSHEET dlgInfo, HWND hwndDlg) { - LPTSTR lpStatus; + LPWSTR lpStatus; UINT id; if (dlgInfo->pService->ServiceStatusProcess.dwCurrentState == SERVICE_RUNNING) @@ -75,11 +75,11 @@ hInstance, id)) { - SendDlgItemMessage(hwndDlg, - IDC_SERV_STATUS, - WM_SETTEXT, - 0, - (LPARAM)lpStatus); + SendDlgItemMessageW(hwndDlg, + IDC_SERV_STATUS, + WM_SETTEXT, + 0, + (LPARAM)lpStatus); LocalFree(lpStatus); } } @@ -89,12 +89,12 @@ * values and sets it to value of the selected item */ static VOID -SetStartupType(LPTSTR lpServiceName, +SetStartupType(LPWSTR lpServiceName, HWND hwndDlg) { HWND hList; LPQUERY_SERVICE_CONFIG pServiceConfig; - LPTSTR lpBuf; + LPWSTR lpBuf; DWORD StartUp = 0; UINT i; @@ -106,10 +106,10 @@ hInstance, i)) { - SendMessage(hList, - CB_ADDSTRING, - 0, - (LPARAM)lpBuf); + SendMessageW(hList, + CB_ADDSTRING, + 0, + (LPARAM)lpBuf); LocalFree(lpBuf); } } @@ -125,10 +125,10 @@ case SERVICE_DISABLED: StartUp = 2; break; } - SendMessage(hList, - CB_SETCURSEL, - StartUp, - 0); + SendMessageW(hList, + CB_SETCURSEL, + StartUp, + 0); HeapFree(ProcessHeap, 0, @@ -145,30 +145,30 @@ HWND hwndDlg) { LPQUERY_SERVICE_CONFIG pServiceConfig; - LPTSTR lpDescription; + LPWSTR lpDescription; /* set the service name */ - SendDlgItemMessage(hwndDlg, - IDC_SERV_NAME, - WM_SETTEXT, - 0, - (LPARAM)dlgInfo->pService->lpServiceName); + SendDlgItemMessageW(hwndDlg, + IDC_SERV_NAME, + WM_SETTEXT, + 0, + (LPARAM)dlgInfo->pService->lpServiceName); /* set the display name */ - SendDlgItemMessage(hwndDlg, - IDC_DISP_NAME, - WM_SETTEXT, - 0, - (LPARAM)dlgInfo->pService->lpDisplayName); + SendDlgItemMessageW(hwndDlg, + IDC_DISP_NAME, + WM_SETTEXT, + 0, + (LPARAM)dlgInfo->pService->lpDisplayName); /* set the description */ if ((lpDescription = GetServiceDescription(dlgInfo->pService->lpServiceName))) { - SendDlgItemMessage(hwndDlg, - IDC_DESCRIPTION, - WM_SETTEXT, - 0, - (LPARAM)lpDescription); + SendDlgItemMessageW(hwndDlg, + IDC_DESCRIPTION, + WM_SETTEXT, + 0, + (LPARAM)lpDescription); HeapFree(ProcessHeap, 0, @@ -178,11 +178,11 @@ pServiceConfig = GetServiceConfig(dlgInfo->pService->lpServiceName); if (pServiceConfig) { - SendDlgItemMessage(hwndDlg, - IDC_EXEPATH, - WM_SETTEXT, - 0, - (LPARAM)pServiceConfig->lpBinaryPathName); + SendDlgItemMessageW(hwndDlg, + IDC_EXEPATH, + WM_SETTEXT, + 0, + (LPARAM)pServiceConfig->lpBinaryPathName); HeapFree(ProcessHeap, 0, pServiceConfig); @@ -258,7 +258,7 @@ if (GetDlgItemText(hwndDlg, IDC_START_PARAM, szStartParams, 256) > 0) lpStartParams = szStartParams; - if (DoStart(dlgInfo->Info, lpStartParams)) + //if (DoStart(dlgInfo->Info, lpStartParams)) { UpdateServiceStatus(dlgInfo->pService); ChangeListViewText(dlgInfo->Info, dlgInfo->pService, LVSTATUS); @@ -312,37 +312,51 @@ break; case IDC_START: - OnStart(hwndDlg, dlgInfo); + RunActionWithProgress(hwndDlg, + dlgInfo->pService->lpServiceName, + dlgInfo->pService->lpDisplayName, + ACTION_START); + + UpdateServiceStatus(dlgInfo->pService); + ChangeListViewText(dlgInfo->Info, dlgInfo->pService, LVSTATUS); + SetButtonStates(dlgInfo, hwndDlg); + SetServiceStatusText(dlgInfo, hwndDlg); break; case IDC_STOP: - if (DoStop(dlgInfo->Info)) - { - UpdateServiceStatus(dlgInfo->pService); - ChangeListViewText(dlgInfo->Info, dlgInfo->pService, LVSTATUS); - SetButtonStates(dlgInfo, hwndDlg); - SetServiceStatusText(dlgInfo, hwndDlg); - } + RunActionWithProgress(hwndDlg, + dlgInfo->pService->lpServiceName, + dlgInfo->pService->lpDisplayName, + ACTION_STOP); + + UpdateServiceStatus(dlgInfo->pService); + ChangeListViewText(dlgInfo->Info, dlgInfo->pService, LVSTATUS); + SetButtonStates(dlgInfo, hwndDlg); + SetServiceStatusText(dlgInfo, hwndDlg); break; case IDC_PAUSE: - if (DoPause(dlgInfo->Info)) - { - UpdateServiceStatus(dlgInfo->pService); - ChangeListViewText(dlgInfo->Info, dlgInfo->pService, LVSTATUS); - SetButtonStates(dlgInfo, hwndDlg); - SetServiceStatusText(dlgInfo, hwndDlg); - } + RunActionWithProgress(hwndDlg, + dlgInfo->pService->lpServiceName, + dlgInfo->pService->lpDisplayName, + ACTION_PAUSE); + + UpdateServiceStatus(dlgInfo->pService); + ChangeListViewText(dlgInfo->Info, dlgInfo->pService, LVSTATUS); + SetButtonStates(dlgInfo, hwndDlg); + SetServiceStatusText(dlgInfo, hwndDlg); break; case IDC_RESUME: - if (DoResume(dlgInfo->Info)) - { - UpdateServiceStatus(dlgInfo->pService); - ChangeListViewText(dlgInfo->Info, dlgInfo->pService, LVSTATUS); - SetButtonStates(dlgInfo, hwndDlg); - SetServiceStatusText(dlgInfo, hwndDlg); - } + RunActionWithProgress(hwndDlg, + dlgInfo->pService->lpServiceName, + dlgInfo->pService->lpDisplayName, + ACTION_RESUME); + + UpdateServiceStatus(dlgInfo->pService); + ChangeListViewText(dlgInfo->Info, dlgInfo->pService, LVSTATUS); + SetButtonStates(dlgInfo, hwndDlg); + SetServiceStatusText(dlgInfo, hwndDlg); break; case IDC_EDIT: Modified: trunk/reactos/base/applications/mscutils/servman/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/query.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/query.c [iso-8859-1] Wed Apr 8 17:30:38 2015 @@ -26,27 +26,27 @@ } LPQUERY_SERVICE_CONFIG -GetServiceConfig(LPTSTR lpServiceName) -{ - LPQUERY_SERVICE_CONFIG lpServiceConfig = NULL; +GetServiceConfig(LPWSTR lpServiceName) +{ + LPQUERY_SERVICE_CONFIGW lpServiceConfig = NULL; SC_HANDLE hSCManager; SC_HANDLE hService; DWORD dwBytesNeeded; - hSCManager = OpenSCManager(NULL, - NULL, - SC_MANAGER_ALL_ACCESS); + hSCManager = OpenSCManagerW(NULL, + NULL, + SC_MANAGER_ALL_ACCESS); if (hSCManager) { - hService = OpenService(hSCManager, - lpServiceName, - SERVICE_QUERY_STATUS | SERVICE_ENUMERATE_DEPENDENTS | SERVICE_QUERY_CONFIG); + hService = OpenServiceW(hSCManager, + lpServiceName, + SERVICE_QUERY_STATUS | SERVICE_ENUMERATE_DEPENDENTS | SERVICE_QUERY_CONFIG); if (hService) { - if (!QueryServiceConfig(hService, - NULL, - 0, - &dwBytesNeeded)) + if (!QueryServiceConfigW(hService, + NULL, + 0, + &dwBytesNeeded)) { if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) { @@ -55,7 +55,7 @@ dwBytesNeeded); if (lpServiceConfig) { - if (!QueryServiceConfig(hService, + if (!QueryServiceConfigW(hService, lpServiceConfig, dwBytesNeeded, &dwBytesNeeded)) @@ -80,38 +80,38 @@ BOOL SetServiceConfig(LPQUERY_SERVICE_CONFIG pServiceConfig, - LPTSTR lpServiceName, - LPTSTR lpPassword) + LPWSTR lpServiceName, + LPWSTR lpPassword) { SC_HANDLE hSCManager; SC_HANDLE hSc; SC_LOCK scLock; BOOL bRet = FALSE; - hSCManager = OpenSCManager(NULL, - NULL, - SC_MANAGER_LOCK); + hSCManager = OpenSCManagerW(NULL, + NULL, + SC_MANAGER_LOCK); if (hSCManager) { scLock = LockServiceDatabase(hSCManager); if (scLock) { - hSc = OpenService(hSCManager, - lpServiceName, - SERVICE_CHANGE_CONFIG); + hSc = OpenServiceW(hSCManager, + lpServiceName, + SERVICE_CHANGE_CONFIG); if (hSc) { - if (ChangeServiceConfig(hSc, - pServiceConfig->dwServiceType, - pServiceConfig->dwStartType, - pServiceConfig->dwErrorControl, - pServiceConfig->lpBinaryPathName, - pServiceConfig->lpLoadOrderGroup, - pServiceConfig->dwTagId ? &pServiceConfig->dwTagId : NULL, - pServiceConfig->lpDependencies, - pServiceConfig->lpServiceStartName, - lpPassword, - pServiceConfig->lpDisplayName)) + if (ChangeServiceConfigW(hSc, + pServiceConfig->dwServiceType, + pServiceConfig->dwStartType, + pServiceConfig->dwErrorControl, + pServiceConfig->lpBinaryPathName, + pServiceConfig->lpLoadOrderGroup, + pServiceConfig->dwTagId ? &pServiceConfig->dwTagId : NULL, + pServiceConfig->lpDependencies, + pServiceConfig->lpServiceStartName, + lpPassword, + pServiceConfig->lpDisplayName)) { bRet = TRUE; } @@ -131,35 +131,35 @@ return bRet; } -LPTSTR -GetServiceDescription(LPTSTR lpServiceName) +LPWSTR +GetServiceDescription(LPWSTR lpServiceName) { SC_HANDLE hSCManager = NULL; SC_HANDLE hSc = NULL; - SERVICE_DESCRIPTION *pServiceDescription = NULL; - LPTSTR lpDescription = NULL; + SERVICE_DESCRIPTIONW *pServiceDescription = NULL; + LPWSTR lpDescription = NULL; DWORD BytesNeeded = 0; DWORD dwSize; - hSCManager = OpenSCManager(NULL, - NULL, - SC_MANAGER_ENUMERATE_SERVICE); + hSCManager = OpenSCManagerW(NULL, + NULL, + SC_MANAGER_ENUMERATE_SERVICE); if (hSCManager == NULL) { GetError(); return NULL; } - hSc = OpenService(hSCManager, - lpServiceName, - SERVICE_QUERY_CONFIG); + hSc = OpenServiceW(hSCManager, + lpServiceName, + SERVICE_QUERY_CONFIG); if (hSc) { - if (!QueryServiceConfig2(hSc, - SERVICE_CONFIG_DESCRIPTION, - NULL, - 0, - &BytesNeeded)) + if (!QueryServiceConfig2W(hSc, + SERVICE_CONFIG_DESCRIPTION, + NULL, + 0, + &BytesNeeded)) { if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) { @@ -169,23 +169,23 @@ if (pServiceDescription == NULL) goto cleanup; - if (QueryServiceConfig2(hSc, - SERVICE_CONFIG_DESCRIPTION, - (LPBYTE)pServiceDescription, - BytesNeeded, - &BytesNeeded)) + if (QueryServiceConfig2W(hSc, + SERVICE_CONFIG_DESCRIPTION, + (LPBYTE)pServiceDescription, + BytesNeeded, + &BytesNeeded)) { if (pServiceDescription->lpDescription) { - dwSize = _tcslen(pServiceDescription->lpDescription) + 1; + dwSize = wcslen(pServiceDescription->lpDescription) + 1; lpDescription = HeapAlloc(ProcessHeap, 0, - dwSize * sizeof(TCHAR)); + dwSize * sizeof(WCHAR)); if (lpDescription) { - StringCchCopy(lpDescription, - dwSize, - pServiceDescription->lpDescription); + StringCchCopyW(lpDescription, + dwSize, + pServiceDescription->lpDescription); } } } @@ -207,8 +207,8 @@ } BOOL -SetServiceDescription(LPTSTR lpServiceName, - LPTSTR lpDescription) +SetServiceDescription(LPWSTR lpServiceName, + LPWSTR lpDescription) { SC_HANDLE hSCManager; SC_HANDLE hSc; @@ -216,24 +216,24 @@ SERVICE_DESCRIPTION ServiceDescription; BOOL bRet = FALSE; - hSCManager = OpenSCManager(NULL, - NULL, - SC_MANAGER_LOCK); + hSCManager = OpenSCManagerW(NULL, + NULL, + SC_MANAGER_LOCK); if (hSCManager) { scLock = LockServiceDatabase(hSCManager); if (scLock) { - hSc = OpenService(hSCManager, - lpServiceName, - SERVICE_CHANGE_CONFIG); + hSc = OpenServiceW(hSCManager, + lpServiceName, + SERVICE_CHANGE_CONFIG); if (hSc) { ServiceDescription.lpDescription = lpDescription; - if (ChangeServiceConfig2(hSc, - SERVICE_CONFIG_DESCRIPTION, - &ServiceDescription)) + if (ChangeServiceConfig2W(hSc, + SERVICE_CONFIG_DESCRIPTION, + &ServiceDescription)) { bRet = TRUE; } Modified: trunk/reactos/base/applications/mscutils/servman/servman.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/servman.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/servman.c [iso-8859-1] Wed Apr 8 17:30:38 2015 @@ -13,29 +13,30 @@ HINSTANCE hInstance; HANDLE ProcessHeap; +HWND g_hProgDlg; int WINAPI -_tWinMain(HINSTANCE hThisInstance, +wWinMain(HINSTANCE hThisInstance, HINSTANCE hPrevInstance, - LPTSTR lpCmdLine, + LPWSTR lpCmdLine, int nCmdShow) { - LPTSTR lpAppName; + LPWSTR lpAppName; HWND hMainWnd; MSG Msg; int Ret = 1; INITCOMMONCONTROLSEX icex; switch (GetUserDefaultUILanguage()) - { - case MAKELANGID(LANG_HEBREW, SUBLANG_DEFAULT): - SetProcessDefaultLayout(LAYOUT_RTL); - break; + { + case MAKELANGID(LANG_HEBREW, SUBLANG_DEFAULT): + SetProcessDefaultLayout(LAYOUT_RTL); + break; - default: - break; - } - + default: + break; + } + hInstance = hThisInstance; ProcessHeap = GetProcessHeap(); @@ -57,13 +58,14 @@ if (hMainWnd != NULL) { /* pump the message queue */ - while( GetMessage( &Msg, NULL, 0, 0 ) ) + while (GetMessageW( &Msg, NULL, 0, 0 ) ) { //if ( !hProgDlg || !IsWindow(hProgDlg) || !IsDialogMessage(hProgDlg, &Msg) ) - //{ + //if (!IsDialogMessage(g_hProgDlg, &Msg)) + { TranslateMessage(&Msg); - DispatchMessage(&Msg); - //} + DispatchMessageW(&Msg); + } } Ret = 0;

1 0

[gedmurphy] 67094: [SERVMAN] - Rewrite the progress dialog making it responsible for controlling services. (starting, stopping, etc). - Fixup the rest of the code to make use of running actions thr...
by gedmurphy＠svn.reactos.org 08 Apr '15

08 Apr '15

Author: gedmurphy Date: Wed Apr 8 17:28:46 2015 New Revision: 67094 URL: http://svn.reactos.org/svn/reactos?rev=67094&view=rev Log: [SERVMAN] - Rewrite the progress dialog making it responsible for controlling services. (starting, stopping, etc). - Fixup the rest of the code to make use of running actions through the progress dialog. - As a side-effect, this should fix CORE-4585 Modified: trunk/reactos/base/applications/mscutils/servman/control.c trunk/reactos/base/applications/mscutils/servman/mainwnd.c trunk/reactos/base/applications/mscutils/servman/precomp.h trunk/reactos/base/applications/mscutils/servman/progress.c trunk/reactos/base/applications/mscutils/servman/start.c trunk/reactos/base/applications/mscutils/servman/stop.c trunk/reactos/base/applications/mscutils/servman/stop_dependencies.c Modified: trunk/reactos/base/applications/mscutils/servman/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/control.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/control.c [iso-8859-1] Wed Apr 8 17:28:46 2015 @@ -3,180 +3,143 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/mscutils/servman/control.c * PURPOSE: Pauses and resumes a service - * COPYRIGHT: Copyright 2006-2010 Ged Murphy <gedmurphy(a)reactos.org> + * COPYRIGHT: Copyright 2006-2015 Ged Murphy <gedmurphy(a)reactos.org> * */ #include "precomp.h" -static BOOL -DoControl(PMAIN_WND_INFO Info, - HWND hProgress, - DWORD Control) +#define MAX_WAIT_TIME 30000 + +BOOL +DoControlService(LPWSTR ServiceName, + HWND hProgress, + DWORD Control) { SC_HANDLE hSCManager; SC_HANDLE hService; SERVICE_STATUS_PROCESS ServiceStatus = {0}; SERVICE_STATUS Status; DWORD BytesNeeded = 0; - DWORD dwStartTickCount; - DWORD dwOldCheckPoint; - DWORD dwWaitTime; - DWORD dwMaxWait; - DWORD dwReqState; - BOOL bRet = FALSE; + DWORD StartTickCount; + DWORD OldCheckPoint; + DWORD WaitTime; + DWORD MaxWait; + DWORD ReqState; + BOOL Result; /* Set the state we're interested in */ switch (Control) { case SERVICE_CONTROL_PAUSE: - dwReqState = SERVICE_PAUSED; + ReqState = SERVICE_PAUSED; break; case SERVICE_CONTROL_CONTINUE: - dwReqState = SERVICE_RUNNING; + ReqState = SERVICE_RUNNING; break; default: /* Unhandled control code */ return FALSE; } - hSCManager = OpenSCManager(NULL, - NULL, - SC_MANAGER_CONNECT); - if (hSCManager) + hSCManager = OpenSCManagerW(NULL, + NULL, + SC_MANAGER_CONNECT); + if (!hSCManager) return FALSE; + + hService = OpenServiceW(hSCManager, + ServiceName, + SERVICE_PAUSE_CONTINUE | SERVICE_INTERROGATE | SERVICE_QUERY_STATUS); + if (!hService) { - hService = OpenService(hSCManager, - Info->pCurrentService->lpServiceName, - SERVICE_PAUSE_CONTINUE | SERVICE_INTERROGATE | SERVICE_QUERY_STATUS); - if (hService) + CloseServiceHandle(hSCManager); + return FALSE; + } + + /* Send the control message to the service */ + Result = ControlService(hService, + Control, + &Status); + if (Result) + { + if (hProgress) { - if (hProgress) + /* Increment the progress bar */ + IncrementProgressBar(hProgress, DEFAULT_STEP); + } + + /* Get the service status */ + Result = QueryServiceStatusEx(hService, + SC_STATUS_PROCESS_INFO, + (LPBYTE)&ServiceStatus, + sizeof(SERVICE_STATUS_PROCESS), + &BytesNeeded); + if (Result) + { + Result = FALSE; + MaxWait = MAX_WAIT_TIME; + OldCheckPoint = ServiceStatus.dwCheckPoint; + StartTickCount = GetTickCount(); + + /* Loop until it's at the correct state */ + while (ServiceStatus.dwCurrentState != ReqState) { - /* Increment the progress bar */ - IncrementProgressBar(hProgress, DEFAULT_STEP); - } + /* Fixup the wait time */ + WaitTime = ServiceStatus.dwWaitHint / 10; - /* Send the control message to the service */ - if (ControlService(hService, - Control, - &Status)) - { - /* Get the service status */ - if (QueryServiceStatusEx(hService, - SC_STATUS_PROCESS_INFO, - (LPBYTE)&ServiceStatus, - sizeof(SERVICE_STATUS_PROCESS), - &BytesNeeded)) + if (WaitTime < 1000) WaitTime = 1000; + else if (WaitTime > 10000) WaitTime = 10000; + + /* We don't wanna wait for up to 10 secs without incrementing */ + for (int i = WaitTime / 1000; i > 0; i--) { - /* We don't want to wait for more than 30 seconds */ - dwMaxWait = 30000; - dwStartTickCount = GetTickCount(); - - /* Loop until it's at the correct state */ - while (ServiceStatus.dwCurrentState != dwReqState) + Sleep(1000); + if (hProgress) { - dwOldCheckPoint = ServiceStatus.dwCheckPoint; - dwWaitTime = ServiceStatus.dwWaitHint / 10; - - /* Get the latest status info */ - if (!QueryServiceStatusEx(hService, - SC_STATUS_PROCESS_INFO, - (LPBYTE)&ServiceStatus, - sizeof(SERVICE_STATUS_PROCESS), - &BytesNeeded)) - { - /* Something went wrong... */ - break; - } - - /* Is the service making progress? */ - if (ServiceStatus.dwCheckPoint > dwOldCheckPoint) - { - /* It is, get the latest tickcount to reset the max wait time */ - dwStartTickCount = GetTickCount(); - dwOldCheckPoint = ServiceStatus.dwCheckPoint; - IncrementProgressBar(hProgress, DEFAULT_STEP); - } - else - { - /* It's not, make sure we haven't exceeded our wait time */ - if(GetTickCount() >= dwStartTickCount + dwMaxWait) - { - /* We have, give up */ - break; - } - } - - /* Adjust the wait hint times */ - if (dwWaitTime < 200) - dwWaitTime = 200; - else if (dwWaitTime > 10000) - dwWaitTime = 10000; - - /* Wait before trying again */ - Sleep(dwWaitTime); + /* Increment the progress bar */ + IncrementProgressBar(hProgress, DEFAULT_STEP); } } - if (ServiceStatus.dwCurrentState == dwReqState) + /* Get the latest status info */ + if (!QueryServiceStatusEx(hService, + SC_STATUS_PROCESS_INFO, + (LPBYTE)&ServiceStatus, + sizeof(SERVICE_STATUS_PROCESS), + &BytesNeeded)) { - bRet = TRUE; + /* Something went wrong... */ + break; + } + + /* Is the service making progress? */ + if (ServiceStatus.dwCheckPoint > OldCheckPoint) + { + /* It is, get the latest tickcount to reset the max wait time */ + StartTickCount = GetTickCount(); + OldCheckPoint = ServiceStatus.dwCheckPoint; + IncrementProgressBar(hProgress, DEFAULT_STEP); + } + else + { + /* It's not, make sure we haven't exceeded our wait time */ + if(GetTickCount() >= StartTickCount + MaxWait) + { + /* We have, give up */ + break; + } } } - - CloseServiceHandle(hService); } - CloseServiceHandle(hSCManager); + if (ServiceStatus.dwCurrentState == ReqState) + { + Result = TRUE; + } } - return bRet; + CloseServiceHandle(hService); + CloseServiceHandle(hSCManager); + + return Result; } - -BOOL -DoPause(PMAIN_WND_INFO Info) -{ - HWND hProgress; - BOOL bRet = FALSE; - - /* Create a progress window to track the progress of the pausing service */ - hProgress = CreateProgressDialog(Info->hMainWnd, - IDS_PROGRESS_INFO_PAUSE); - if (hProgress) - { - /* Set the service name and reset the progress bag */ - InitializeProgressDialog(hProgress, Info->pCurrentService->lpServiceName); - - /* Resume the requested service */ - bRet = DoControl(Info, hProgress, SERVICE_CONTROL_PAUSE); - - /* Complete and destroy the progress bar */ - DestroyProgressDialog(hProgress, bRet); - } - - return bRet; -} - -BOOL -DoResume(PMAIN_WND_INFO Info) -{ - HWND hProgress; - BOOL bRet = FALSE; - - /* Create a progress window to track the progress of the resuming service */ - hProgress = CreateProgressDialog(Info->hMainWnd, - IDS_PROGRESS_INFO_RESUME); - if (hProgress) - { - /* Set the service name and reset the progress bag */ - InitializeProgressDialog(hProgress, Info->pCurrentService->lpServiceName); - - /* Resume the requested service */ - bRet = DoControl(Info, hProgress, SERVICE_CONTROL_CONTINUE); - - /* Complete and destroy the progress bar */ - DestroyProgressDialog(hProgress, bRet); - } - - return bRet; -} Modified: trunk/reactos/base/applications/mscutils/servman/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/mainwnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/mainwnd.c [iso-8859-1] Wed Apr 8 17:28:46 2015 @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/mscutils/servman/mainwnd.c * PURPOSE: Main window message handler - * COPYRIGHT: Copyright 2006-2007 Ged Murphy <gedmurphy(a)reactos.org> + * COPYRIGHT: Copyright 2006-20015 Ged Murphy <gedmurphy(a)reactos.org> * */ @@ -11,7 +11,7 @@ #include <windowsx.h> -static const TCHAR szMainWndClass[] = TEXT("ServManWndClass"); +static const WCHAR szMainWndClass[] = L"ServManWndClass"; BOOL bSortAscending = TRUE; @@ -126,17 +126,17 @@ VOID UpdateServiceCount(PMAIN_WND_INFO Info) { - LPTSTR lpNumServices; + LPWSTR lpNumServices; if (AllocAndLoadString(&lpNumServices, hInstance, IDS_NUM_SERVICES)) { - TCHAR szNumServices[32]; + WCHAR szNumServices[32]; INT NumListedServ = ListView_GetItemCount(Info->hListView); - _sntprintf(szNumServices, + _snwprintf(szNumServices, 31, lpNumServices, NumListedServ); @@ -257,7 +257,7 @@ Param1 = (ENUM_SERVICE_STATUS_PROCESS *)lParam2; Param2 = (ENUM_SERVICE_STATUS_PROCESS *)lParam1; } - return _tcsicmp(Param1->lpDisplayName, Param2->lpDisplayName); + return _wcsicmp(Param1->lpDisplayName, Param2->lpDisplayName); } @@ -344,24 +344,24 @@ { if (!pCreateToolbar(Info)) { - DisplayString(_T("error creating toolbar")); + DisplayString(L"error creating toolbar"); return FALSE; } if (!CreateListView(Info)) { - DisplayString(_T("error creating list view")); + DisplayString(L"error creating list view"); return FALSE; } if (!CreateStatusBar(Info)) - DisplayString(_T("error creating status bar")); + DisplayString(L"error creating status bar"); /* Create Popup Menu */ Info->hShortcutMenu = LoadMenu(hInstance, MAKEINTRESOURCE(IDR_POPUP)); - Info->bIsUserAnAdmin = IsUserAnAdmin(); + Info->bIsUserAnAdmin = TRUE;// IsUserAnAdmin(); if (Info->bIsUserAnAdmin) { HMENU hMainMenu = GetMenu(Info->hMainWnd); @@ -418,7 +418,7 @@ SendMessage(Info->hStatus, SB_SETTEXT, 1, - _T('\0')); + L'\0'); } break; @@ -457,11 +457,11 @@ } else { - TCHAR Buf[60]; + WCHAR Buf[60]; LoadString(hInstance, IDS_DELETE_STOP, Buf, - sizeof(Buf) / sizeof(TCHAR)); + sizeof(Buf) / sizeof(WCHAR)); DisplayString(Buf); } @@ -472,50 +472,73 @@ case ID_START: { - if (DoStart(Info, NULL)) - { - UpdateServiceStatus(Info->pCurrentService); - ChangeListViewText(Info, Info->pCurrentService, LVSTATUS); - SetMenuAndButtonStates(Info); - SetFocus(Info->hListView); - } + RunActionWithProgress(Info->hMainWnd, + Info->pCurrentService->lpServiceName, + Info->pCurrentService->lpDisplayName, + ACTION_START); + + UpdateServiceStatus(Info->pCurrentService); + ChangeListViewText(Info, Info->pCurrentService, LVSTATUS); + SetMenuAndButtonStates(Info); + SetFocus(Info->hListView); + } break; case ID_STOP: - if (DoStop(Info)) - { - UpdateServiceStatus(Info->pCurrentService); - ChangeListViewText(Info, Info->pCurrentService, LVSTATUS); - SetMenuAndButtonStates(Info); - SetFocus(Info->hListView); - } + RunActionWithProgress(Info->hMainWnd, + Info->pCurrentService->lpServiceName, + Info->pCurrentService->lpDisplayName, + ACTION_STOP); + + UpdateServiceStatus(Info->pCurrentService); + ChangeListViewText(Info, Info->pCurrentService, LVSTATUS); + SetMenuAndButtonStates(Info); + SetFocus(Info->hListView); + break; case ID_PAUSE: - DoPause(Info); + RunActionWithProgress(Info->hMainWnd, + Info->pCurrentService->lpServiceName, + Info->pCurrentService->lpDisplayName, + ACTION_PAUSE); + + UpdateServiceStatus(Info->pCurrentService); + ChangeListViewText(Info, Info->pCurrentService, LVSTATUS); + SetMenuAndButtonStates(Info); + SetFocus(Info->hListView); break; case ID_RESUME: - DoResume(Info); + RunActionWithProgress(Info->hMainWnd, + Info->pCurrentService->lpServiceName, + Info->pCurrentService->lpDisplayName, + ACTION_RESUME); + + UpdateServiceStatus(Info->pCurrentService); + ChangeListViewText(Info, Info->pCurrentService, LVSTATUS); + SetMenuAndButtonStates(Info); + SetFocus(Info->hListView); break; case ID_RESTART: - if (DoStop(Info)) - { - DoStart(Info, NULL); - UpdateServiceStatus(Info->pCurrentService); - ChangeListViewText(Info, Info->pCurrentService, LVSTATUS); - SetMenuAndButtonStates(Info); - SetFocus(Info->hListView); - } + RunActionWithProgress(Info->hMainWnd, + Info->pCurrentService->lpServiceName, + Info->pCurrentService->lpDisplayName, + ACTION_RESTART); + + UpdateServiceStatus(Info->pCurrentService); + ChangeListViewText(Info, Info->pCurrentService, LVSTATUS); + SetMenuAndButtonStates(Info); + SetFocus(Info->hListView); break; case ID_HELP: - MessageBox(NULL, - _T("Help is not yet implemented\n"), - _T("Note!"), - MB_OK | MB_ICONINFORMATION); + MessageBoxW(NULL, + L"Help is not yet implemented\n", + L"Note!", + MB_OK | MB_ICONINFORMATION); SetFocus(Info->hListView); break; Modified: trunk/reactos/base/applications/mscutils/servman/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/precomp.h [iso-8859-1] Wed Apr 8 17:28:46 2015 @@ -1,6 +1,7 @@ #ifndef __SERVMAN_PRECOMP_H #define __SERVMAN_PRECOMP_H +#if 0 #include <stdarg.h> #define WIN32_NO_STATUS @@ -12,10 +13,14 @@ #include <wingdi.h> #include <winsvc.h> #include <wincon.h> -#include <tchar.h> #include <shlobj.h> #include <strsafe.h> - +#else +#include <windows.h> +#include <Commctrl.h> +#include <process.h> +#include <Strsafe.h> +#endif #include "resource.h" #ifdef _MSC_VER @@ -23,17 +28,23 @@ #endif #define NO_ITEM_SELECTED -1 -#define MAX_KEY_LENGTH 256 +#define MAX_KEY_LENGTH 256 -#define LVNAME 0 -#define LVDESC 1 -#define LVSTATUS 2 -#define LVSTARTUP 3 -#define LVLOGONAS 4 +#define LVNAME 0 +#define LVDESC 1 +#define LVSTATUS 2 +#define LVSTARTUP 3 +#define LVLOGONAS 4 -#define IMAGE_UNKNOWN 0 -#define IMAGE_SERVICE 1 -#define IMAGE_DRIVER 2 +#define IMAGE_UNKNOWN 0 +#define IMAGE_SERVICE 1 +#define IMAGE_DRIVER 2 + +#define ACTION_START 1 +#define ACTION_STOP 2 +#define ACTION_PAUSE 3 +#define ACTION_RESUME 4 +#define ACTION_RESTART 5 typedef struct _MAIN_WND_INFO { @@ -86,38 +97,24 @@ VOID ListViewSelectionChanged(PMAIN_WND_INFO Info, LPNMLISTVIEW pnmv); BOOL CreateListView(PMAIN_WND_INFO Info); -/* start */ -BOOL DoStart(PMAIN_WND_INFO Info, LPWSTR lpStartParams); - -/* stop */ -typedef struct _STOP_INFO -{ - PMAIN_WND_INFO pInfo; - SC_HANDLE hSCManager; - SC_HANDLE hMainService; -} STOP_INFO, *PSTOP_INFO; - -/* control */ -BOOL Control(PMAIN_WND_INFO Info, HWND hProgress, DWORD Control); -BOOL DoStop(PMAIN_WND_INFO Info); -BOOL DoPause(PMAIN_WND_INFO Info); -BOOL DoResume(PMAIN_WND_INFO Info); +/* start / stop / control */ +BOOL DoStartService(LPWSTR ServiceName, HANDLE hProgress, LPWSTR lpStartParams); +BOOL DoStopService(LPWSTR ServiceName, HANDLE hProgress); +BOOL DoControlService(LPWSTR ServiceName, HWND hProgress, DWORD Control); /* progress.c */ #define DEFAULT_STEP 0 -HWND CreateProgressDialog(HWND hParent, UINT LabelId); -BOOL DestroyProgressDialog(HWND hProgress, BOOL bComplete); -VOID InitializeProgressDialog(HWND hProgress, LPWSTR lpServiceName); -VOID IncrementProgressBar(HWND hProgress, UINT NewPos); -VOID CompleteProgressBar(HWND hProgress); +BOOL RunActionWithProgress(HWND hParent, LPWSTR ServiceName, LPWSTR DisplayName, UINT Action); +VOID IncrementProgressBar(HANDLE hProgress, UINT NewPos); +VOID CompleteProgressBar(HANDLE hProgress); /* query.c */ ENUM_SERVICE_STATUS_PROCESS* GetSelectedService(PMAIN_WND_INFO Info); -LPQUERY_SERVICE_CONFIG GetServiceConfig(LPTSTR lpServiceName); -BOOL SetServiceConfig(LPQUERY_SERVICE_CONFIG pServiceConfig, LPTSTR lpServiceName, LPTSTR lpPassword); -LPTSTR GetServiceDescription(LPTSTR lpServiceName); -BOOL SetServiceDescription(LPTSTR lpServiceName, LPTSTR lpDescription); -LPTSTR GetExecutablePath(LPTSTR lpServiceName); +LPQUERY_SERVICE_CONFIG GetServiceConfig(LPWSTR lpServiceName); +BOOL SetServiceConfig(LPQUERY_SERVICE_CONFIG pServiceConfig, LPWSTR lpServiceName, LPWSTR lpPassword); +LPWSTR GetServiceDescription(LPWSTR lpServiceName); +BOOL SetServiceDescription(LPWSTR lpServiceName, LPWSTR lpDescription); +LPWSTR GetExecutablePath(LPWSTR lpServiceName); BOOL RefreshServiceList(PMAIN_WND_INFO Info); BOOL UpdateServiceStatus(ENUM_SERVICE_STATUS_PROCESS* pService); BOOL GetServiceList(PMAIN_WND_INFO Info, DWORD *NumServices); @@ -135,19 +132,24 @@ } SERVICEPROPSHEET, *PSERVICEPROPSHEET; -HTREEITEM AddItemToTreeView(HWND hTreeView, HTREEITEM hRoot, LPTSTR lpDisplayName, LPTSTR lpServiceName, ULONG serviceType, BOOL bHasChildren); +HTREEITEM AddItemToTreeView(HWND hTreeView, HTREEITEM hRoot, LPWSTR lpDisplayName, LPWSTR lpServiceName, ULONG serviceType, BOOL bHasChildren); /* stop_dependencies */ INT_PTR CALLBACK StopDependsDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); LPWSTR GetListOfServicesToStop(LPWSTR lpServiceName); +BOOL +CreateStopDependsDialog(HWND hParent, +LPWSTR ServiceName, +LPWSTR DisplayName, +LPWSTR ServiceList); /* tv1_dependencies */ -BOOL TV1_Initialize(PSERVICEPROPSHEET pDlgInfo, LPTSTR lpServiceName); -VOID TV1_AddDependantsToTree(PSERVICEPROPSHEET pDlgInfo, HTREEITEM hParent, LPTSTR lpServiceName); +BOOL TV1_Initialize(PSERVICEPROPSHEET pDlgInfo, LPWSTR lpServiceName); +VOID TV1_AddDependantsToTree(PSERVICEPROPSHEET pDlgInfo, HTREEITEM hParent, LPWSTR lpServiceName); /* tv2_dependencies */ -BOOL TV2_Initialize(PSERVICEPROPSHEET pDlgInfo, LPTSTR lpServiceName); -VOID TV2_AddDependantsToTree(PSERVICEPROPSHEET pDlgInfo, HTREEITEM hParent, LPTSTR lpServiceName); +BOOL TV2_Initialize(PSERVICEPROPSHEET pDlgInfo, LPWSTR lpServiceName); +VOID TV2_AddDependantsToTree(PSERVICEPROPSHEET pDlgInfo, HTREEITEM hParent, LPWSTR lpServiceName); BOOL TV2_HasDependantServices(LPWSTR lpServiceName); LPENUM_SERVICE_STATUS TV2_GetDependants(LPWSTR lpServiceName, LPDWORD lpdwCount); @@ -167,12 +169,12 @@ VOID ExportFile(PMAIN_WND_INFO Info); /* misc.c */ -INT AllocAndLoadString(OUT LPTSTR *lpTarget, +INT AllocAndLoadString(OUT LPWSTR *lpTarget, IN HINSTANCE hInst, IN UINT uID); DWORD LoadAndFormatString(IN HINSTANCE hInstance, IN UINT uID, - OUT LPTSTR *lpTarget, + OUT LPWSTR *lpTarget, ...); BOOL StatusBarLoadAndFormatString(IN HWND hStatusBar, IN INT PartId, @@ -183,11 +185,11 @@ IN INT PartId, IN HINSTANCE hInstance, IN UINT uID); -INT GetTextFromEdit(OUT LPTSTR lpString, +INT GetTextFromEdit(OUT LPWSTR lpString, IN HWND hDlg, IN UINT Res); VOID GetError(VOID); -VOID DisplayString(PTCHAR); +VOID DisplayString(PWCHAR); HIMAGELIST InitImageList(UINT StartResource, UINT EndResource, UINT Width, Modified: trunk/reactos/base/applications/mscutils/servman/progress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/progress.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/progress.c [iso-8859-1] Wed Apr 8 17:28:46 2015 @@ -3,95 +3,225 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/mscutils/servman/progress.c * PURPOSE: Progress dialog box message handler - * COPYRIGHT: Copyright 2006-2010 Ged Murphy <gedmurphy(a)reactos.org> + * COPYRIGHT: Copyright 2006-2015 Ged Murphy <gedmurphy(a)reactos.org> * */ #include "precomp.h" -#define PROGRESSRANGE 20 - -VOID -CompleteProgressBar(HWND hProgDlg) -{ - HWND hProgBar; - UINT Pos = 0; - - /* Get a handle to the progress bar */ - hProgBar = GetDlgItem(hProgDlg, - IDC_SERVCON_PROGRESS); - if (hProgBar) - { - /* Get the current position */ - Pos = SendMessageW(hProgBar, - PBM_GETPOS, - 0, - 0); - - /* Loop until we hit the max */ - while (Pos <= PROGRESSRANGE) - { - /* Increment the progress bar */ - SendMessageW(hProgBar, - PBM_DELTAPOS, - Pos, - 0); - - /* Wait for 15ms, it gives it a smooth feel */ - Sleep(15); - Pos++; - } - } -} - -VOID -IncrementProgressBar(HWND hProgDlg, - UINT NewPos) -{ - HWND hProgBar; - - /* Get a handle to the progress bar */ - hProgBar = GetDlgItem(hProgDlg, - IDC_SERVCON_PROGRESS); - if (hProgBar) - { - /* Do we want to increment the default amount? */ - if (NewPos == DEFAULT_STEP) - { - /* Yes, use the step value we set on create */ - SendMessageW(hProgBar, - PBM_STEPIT, - 0, - 0); - } - else - { - /* No, use the value passed */ - SendMessageW(hProgBar, - PBM_SETPOS, - NewPos, - 0); - } - } -} - -VOID -InitializeProgressDialog(HWND hProgDlg, - LPWSTR lpServiceName) -{ +#define PROGRESS_RANGE 20 +#define PROGRESS_STEP_MAX 15 + +typedef struct _PROGRESS_DATA +{ + HWND hDlg; + HWND hProgress; + LPWSTR ServiceName; + ULONG Action; + BOOL StopDepends; + LPWSTR ServiceList; + +} PROGRESS_DATA, *PPROGRESS_DATA; + + +static VOID +ResetProgressDialog(HWND hDlg, + LPWSTR ServiceName, + ULONG LabelId) +{ + LPWSTR lpProgStr; + + /* Load the label Id */ + if (AllocAndLoadString(&lpProgStr, + hInstance, + LabelId)) + { + /* Write it to the dialog */ + SendDlgItemMessageW(hDlg, + IDC_SERVCON_INFO, + WM_SETTEXT, + 0, + (LPARAM)lpProgStr); + + LocalFree(lpProgStr); + } + /* Write the service name to the dialog */ - SendDlgItemMessageW(hProgDlg, + SendDlgItemMessageW(hDlg, IDC_SERVCON_NAME, WM_SETTEXT, 0, - (LPARAM)lpServiceName); + (LPARAM)ServiceName); /* Set the progress bar to the start */ - SendDlgItemMessageW(hProgDlg, + SendDlgItemMessageW(hDlg, IDC_SERVCON_PROGRESS, PBM_SETPOS, 0, 0); +} + +unsigned int __stdcall ActionThread(void* Param) +{ + PPROGRESS_DATA ProgressData = (PPROGRESS_DATA)Param; + + if (ProgressData->Action == ACTION_START) + { + /* Setup the progress dialog for this action */ + ResetProgressDialog(ProgressData->hDlg, + ProgressData->ServiceName, + IDS_PROGRESS_INFO_START); + + /* Start the service */ + if (DoStartService(ProgressData->ServiceName, + ProgressData->hProgress, + NULL)) + { + /* We're done, slide the progress bar up to the top */ + CompleteProgressBar(ProgressData->hProgress); + } + } + else if (ProgressData->Action == ACTION_STOP || ProgressData->Action == ACTION_RESTART) + { + /* Check if there are and dependants to stop */ + if (ProgressData->StopDepends && ProgressData->ServiceList) + { + LPWSTR lpStr = ProgressData->ServiceList; + + /* Loop through all the services in the list */ + for (;;) + { + /* Break when we hit the double null */ + if (*lpStr == L'\0' && *(lpStr + 1) == L'\0') + break; + + /* If this isn't our first time in the loop we'll + have been left on a null char */ + if (*lpStr == L'\0') + lpStr++; + + ResetProgressDialog(ProgressData->hDlg, + lpStr, + IDS_PROGRESS_INFO_STOP); + + /* Stop the requested service */ + if (DoStopService(ProgressData->ServiceName, + ProgressData->hProgress)) + { + CompleteProgressBar(ProgressData->hProgress); + } + + /* Move onto the next string */ + while (*lpStr != L'\0') + lpStr++; + } + } + + ResetProgressDialog(ProgressData->hDlg, + ProgressData->ServiceName, + IDS_PROGRESS_INFO_STOP); + + if (DoStopService(ProgressData->ServiceName, + ProgressData->hProgress)) + { + CompleteProgressBar(ProgressData->hProgress); + } + + + /* If this was a restart, we'll need to start the service back up */ + if (ProgressData->Action == ACTION_RESTART) + { + /* Setup the progress dialog for this action */ + ResetProgressDialog(ProgressData->hDlg, + ProgressData->ServiceName, + IDS_PROGRESS_INFO_START); + + /* Start the service */ + if (DoStartService(ProgressData->ServiceName, + ProgressData->hProgress, + NULL)) + { + /* We're done, slide the progress bar up to the top */ + CompleteProgressBar(ProgressData->hProgress); + } + } + } + else if (ProgressData->Action == ACTION_PAUSE) + { + /* Setup the progress dialog for this action */ + ResetProgressDialog(ProgressData->hDlg, + ProgressData->ServiceName, + IDS_PROGRESS_INFO_PAUSE); + + /* Pause the service */ + if (DoControlService(ProgressData->ServiceName, + ProgressData->hProgress, + SERVICE_CONTROL_PAUSE)) + { + /* We're done, slide the progress bar up to the top */ + CompleteProgressBar(ProgressData->hProgress); + } + } + else if (ProgressData->Action == ACTION_RESUME) + { + /* Setup the progress dialog for this action */ + ResetProgressDialog(ProgressData->hDlg, + ProgressData->ServiceName, + IDS_PROGRESS_INFO_RESUME); + + /* resume the service */ + if (DoControlService(ProgressData->ServiceName, + ProgressData->hProgress, + SERVICE_CONTROL_CONTINUE)) + { + /* We're done, slide the progress bar up to the top */ + CompleteProgressBar(ProgressData->hProgress); + } + } + + + EndDialog(ProgressData->hDlg, IDOK); + + _endthreadex(0); + return 0; +} + +static BOOL +InitDialog(HWND hDlg, + UINT Message, + WPARAM wParam, + LPARAM lParam) +{ + PPROGRESS_DATA ProgressData = (PPROGRESS_DATA)lParam; + HANDLE hThread; + + ProgressData->hDlg = hDlg; + + /* Get a handle to the progress bar */ + ProgressData->hProgress = GetDlgItem(hDlg, + IDC_SERVCON_PROGRESS); + if (!ProgressData->hProgress) + return FALSE; + + /* Set the progress bar range */ + SendMessageW(ProgressData->hProgress, + PBM_SETRANGE, + 0, + MAKELPARAM(0, PROGRESS_RANGE)); + + /* Set the progress bar step */ + SendMessageW(ProgressData->hProgress, + PBM_SETSTEP, + (WPARAM)1, + 0); + + /* Create a thread to handle the service control */ + hThread = (HANDLE)_beginthreadex(NULL, 0, &ActionThread, ProgressData, 0, NULL); + if (!hThread) return FALSE; + + CloseHandle(hThread); + + return TRUE; } INT_PTR CALLBACK @@ -104,35 +234,21 @@ { case WM_INITDIALOG: { - HWND hProgBar; - - /* Get a handle to the progress bar */ - hProgBar = GetDlgItem(hDlg, - IDC_SERVCON_PROGRESS); - - /* Set the progress bar range */ - SendMessageW(hProgBar, - PBM_SETRANGE, - 0, - MAKELPARAM(0, PROGRESSRANGE)); - - /* Set the progress bar step */ - SendMessageW(hProgBar, - PBM_SETSTEP, - (WPARAM)1, - 0); - } - break; + return InitDialog(hDlg, + Message, + wParam, + lParam); + } case WM_COMMAND: switch(LOWORD(wParam)) { case IDOK: - DestroyWindow(hDlg); - break; + EndDialog(hDlg, wParam); + break; } - break; + break; default: return FALSE; @@ -141,64 +257,115 @@ return TRUE; } -HWND -CreateProgressDialog(HWND hParent, - UINT LabelId) -{ - HWND hProgDlg; - LPWSTR lpProgStr; - - /* open the progress dialog */ - hProgDlg = CreateDialogW(hInstance, +VOID +CompleteProgressBar(HANDLE hProgress) +{ + HWND hProgBar = (HWND)hProgress; + UINT Pos = 0; + + /* Get the current position */ + Pos = SendMessageW(hProgBar, + PBM_GETPOS, + 0, + 0); + + /* Loop until we hit the max */ + while (Pos <= PROGRESS_RANGE) + { + /* Increment the progress bar */ + SendMessageW(hProgBar, + PBM_DELTAPOS, + Pos, + 0); + + /* Wait for 15ms to give it a smooth feel */ + Sleep(15); + Pos++; + } +} + +VOID +IncrementProgressBar(HANDLE hProgress, + UINT Step) +{ + HWND hProgBar = (HWND)hProgress; + UINT Position; + + /* Don't allow the progress to reach to complete*/ + Position = SendMessageW(hProgBar, + PBM_GETPOS, + 0, + 0); + if (Position < PROGRESS_STEP_MAX) + { + /* Do we want to increment the default amount? */ + if (Step == DEFAULT_STEP) + { + /* Use the step value we set on create */ + SendMessageW(hProgBar, + PBM_STEPIT, + 0, + 0); + } + else + { + /* Use the value passed */ + SendMessageW(hProgBar, + PBM_SETPOS, + Step, + 0); + } + } +} + +BOOL +RunActionWithProgress(HWND hParent, + LPWSTR ServiceName, + LPWSTR DisplayName, + UINT Action) +{ + PROGRESS_DATA ProgressData; + LPWSTR ServiceList; + BOOL StopDepends; + INT_PTR Result; + + StopDepends = FALSE; + ServiceList = NULL; + + + /* Check if we'll be stopping the service */ + if (Action == ACTION_STOP || Action == ACTION_RESTART) + { + /* Does the service have any dependent services which need stopping first */ + ServiceList = GetListOfServicesToStop(ServiceName); + if (ServiceList) + { + /* Ask the user if they want to stop the dependants */ + StopDepends = CreateStopDependsDialog(hParent, + ServiceName, + DisplayName, + ServiceList); + + /* Exit early if the user decided not to stop the dependants */ + if (StopDepends == FALSE) + return FALSE; + } + } + + ProgressData.hDlg = NULL; + ProgressData.ServiceName = ServiceName; + ProgressData.Action = Action; + ProgressData.StopDepends = StopDepends; + ProgressData.ServiceList = ServiceList; + + Result = DialogBoxParamW(hInstance, MAKEINTRESOURCEW(IDD_DLG_PROGRESS), hParent, - ProgressDialogProc); - if (hProgDlg != NULL) - { - /* Load the label Id */ - if (AllocAndLoadString(&lpProgStr, - hInstance, - LabelId)) - { - /* Write it to the dialog */ - SendDlgItemMessageW(hProgDlg, - IDC_SERVCON_INFO, - WM_SETTEXT, - 0, - (LPARAM)lpProgStr); - - LocalFree(lpProgStr); - } - - /* Finally, show and update the progress dialog */ - ShowWindow(hProgDlg, SW_SHOWNORMAL); - UpdateWindow(hProgDlg); - - // TODO: Add a message loop for it ? - } - - return hProgDlg; -} - -BOOL -DestroyProgressDialog(HWND hwnd, - BOOL bComplete) -{ - BOOL bRet = FALSE; - - if (hwnd) - { - if (bComplete) - { - /* Complete the progress bar */ - CompleteProgressBar(hwnd); - - /* Wait, for asthetics */ - Sleep(500); - } - - bRet = DestroyWindow(hwnd); - } - - return bRet; -} + ProgressDialogProc, + (LPARAM)&ProgressData); + + if (ServiceList) + HeapFree(GetProcessHeap(), 0, ServiceList); + + return (Result == IDOK); +} Modified: trunk/reactos/base/applications/mscutils/servman/start.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/start.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/start.c [iso-8859-1] Wed Apr 8 17:28:46 2015 @@ -3,26 +3,28 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/mscutils/servman/start.c * PURPOSE: Start a service - * COPYRIGHT: Copyright 2005-2010 Ged Murphy <gedmurphy(a)reactos.org> + * COPYRIGHT: Copyright 2005-2015 Ged Murphy <gedmurphy(a)reactos.org> * */ #include "precomp.h" -static BOOL -DoStartService(PMAIN_WND_INFO Info, - HWND hProgress, +#define MAX_WAIT_TIME 30000 + +BOOL +DoStartService(LPWSTR ServiceName, + HANDLE hProgress, LPWSTR lpStartParams) { SC_HANDLE hSCManager; SC_HANDLE hService; SERVICE_STATUS_PROCESS ServiceStatus; DWORD BytesNeeded = 0; - DWORD dwStartTickCount; - DWORD dwOldCheckPoint; - DWORD dwWaitTime; - DWORD dwMaxWait; - BOOL bRet = FALSE; + DWORD StartTickCount; + DWORD OldCheckPoint; + DWORD WaitTime; + DWORD MaxWait; + BOOL Result = FALSE; BOOL bWhiteSpace = TRUE; LPWSTR lpChar; @@ -57,7 +59,7 @@ return FALSE; /* Make the service name the first argument */ - lpArgsVector[0] = Info->pCurrentService->lpServiceName; + lpArgsVector[0] = ServiceName; /* Fill the arguments vector */ dwArgsCount = 1; @@ -84,130 +86,120 @@ } } - hSCManager = OpenSCManager(NULL, - NULL, - SC_MANAGER_CONNECT); - if (hSCManager) - { - hService = OpenService(hSCManager, - Info->pCurrentService->lpServiceName, - SERVICE_START | SERVICE_QUERY_STATUS); - if (hService) - { - if (hProgress) - { - /* Increment the progress bar */ - IncrementProgressBar(hProgress, DEFAULT_STEP); - } - - /* Start the service */ - bRet = StartService(hService, - dwArgsCount, - lpArgsVector); - if (!bRet && GetLastError() == ERROR_SERVICE_ALREADY_RUNNING) - { - /* If it's already running, just return TRUE */ - bRet = TRUE; - } - else if (bRet) - { - bRet = FALSE; - - /* Get the service status to check if it's running */ - if (QueryServiceStatusEx(hService, - SC_STATUS_PROCESS_INFO, - (LPBYTE)&ServiceStatus, - sizeof(SERVICE_STATUS_PROCESS), - &BytesNeeded)) - { - /* We don't want to wait for more than 30 seconds */ - dwMaxWait = 30000; - dwStartTickCount = GetTickCount(); - - /* Loop until it's running */ - while (ServiceStatus.dwCurrentState != SERVICE_RUNNING) + hSCManager = OpenSCManagerW(NULL, + NULL, + SC_MANAGER_CONNECT); + if (!hSCManager) + { + if (lpArgsVector) + LocalFree((LPVOID)lpArgsVector); + return FALSE; + } + + hService = OpenServiceW(hSCManager, + ServiceName, + SERVICE_START | SERVICE_QUERY_STATUS); + if (!hService) + { + CloseServiceHandle(hSCManager); + if (lpArgsVector) + LocalFree((LPVOID)lpArgsVector); + return FALSE; + } + + /* Start the service */ + Result = StartServiceW(hService, + dwArgsCount, + lpArgsVector); + if (!Result && GetLastError() == ERROR_SERVICE_ALREADY_RUNNING) + { + /* If it's already running, just return TRUE */ + Result = TRUE; + } + else if (Result) + { + if (hProgress) + { + /* Increment the progress bar */ + IncrementProgressBar(hProgress, DEFAULT_STEP); + } + + /* Get the service status to check if it's running */ + Result = QueryServiceStatusEx(hService, + SC_STATUS_PROCESS_INFO, + (LPBYTE)&ServiceStatus, + sizeof(SERVICE_STATUS_PROCESS), + &BytesNeeded); + if (Result) + { + Result = FALSE; + MaxWait = MAX_WAIT_TIME; + OldCheckPoint = ServiceStatus.dwCheckPoint; + StartTickCount = GetTickCount(); + + /* Loop until it's running */ + while (ServiceStatus.dwCurrentState != SERVICE_RUNNING) + { + /* Fixup the wait time */ + WaitTime = ServiceStatus.dwWaitHint / 10; + + if (WaitTime < 1000) WaitTime = 1000; + else if (WaitTime > 10000) WaitTime = 10000; + + /* We don't wanna wait for up to 10 secs without incrementing */ + for (int i = WaitTime / 1000; i > 0; i--) + { + Sleep(1000); + if (hProgress) { - dwOldCheckPoint = ServiceStatus.dwCheckPoint; - dwWaitTime = ServiceStatus.dwWaitHint / 10; - - /* Get the latest status info */ - if (!QueryServiceStatusEx(hService, - SC_STATUS_PROCESS_INFO, - (LPBYTE)&ServiceStatus, - sizeof(SERVICE_STATUS_PROCESS), - &BytesNeeded)) - { - /* Something went wrong... */ - break; - } - - /* Is the service making progress? */ - if (ServiceStatus.dwCheckPoint > dwOldCheckPoint) - { - /* It is, get the latest tickcount to reset the max wait time */ - dwStartTickCount = GetTickCount(); - dwOldCheckPoint = ServiceStatus.dwCheckPoint; - IncrementProgressBar(hProgress, DEFAULT_STEP); - } - else - { - /* It's not, make sure we haven't exceeded our wait time */ - if (GetTickCount() >= dwStartTickCount + dwMaxWait) - { - /* We have, give up */ - break; - } - } - - /* Adjust the wait hint times */ - if (dwWaitTime < 200) - dwWaitTime = 200; - else if (dwWaitTime > 10000) - dwWaitTime = 10000; - - /* Wait before trying again */ - Sleep(dwWaitTime); + /* Increment the progress bar */ + IncrementProgressBar(hProgress, DEFAULT_STEP); } } - if (ServiceStatus.dwCurrentState == SERVICE_RUNNING) - { - bRet = TRUE; - } - } - - CloseServiceHandle(hService); - } - - CloseServiceHandle(hSCManager); - } + + /* Get the latest status info */ + if (!QueryServiceStatusEx(hService, + SC_STATUS_PROCESS_INFO, + (LPBYTE)&ServiceStatus, + sizeof(SERVICE_STATUS_PROCESS), + &BytesNeeded)) + { + /* Something went wrong... */ + break; + } + + /* Is the service making progress? */ + if (ServiceStatus.dwCheckPoint > OldCheckPoint) + { + /* It is, get the latest tickcount to reset the max wait time */ + StartTickCount = GetTickCount(); + OldCheckPoint = ServiceStatus.dwCheckPoint; + } + else + { + /* It's not, make sure we haven't exceeded our wait time */ + if (GetTickCount() >= StartTickCount + MaxWait) + { + /* We have, give up */ + break; + } + } + } + } + + if (ServiceStatus.dwCurrentState == SERVICE_RUNNING) + { + Result = TRUE; + } + } + + CloseServiceHandle(hService); + + CloseServiceHandle(hSCManager); if (lpArgsVector) LocalFree((LPVOID)lpArgsVector); - return bRet; + return Result; } - -BOOL -DoStart(PMAIN_WND_INFO Info, LPWSTR lpStartParams) -{ - HWND hProgress; - BOOL bRet = FALSE; - - /* Create a progress window to track the progress of the stopping service */ - hProgress = CreateProgressDialog(Info->hMainWnd, - IDS_PROGRESS_INFO_START); - if (hProgress) - { - /* Set the service name and reset the progress bag */ - InitializeProgressDialog(hProgress, Info->pCurrentService->lpServiceName); - - /* Start the requested service */ - bRet = DoStartService(Info, hProgress, lpStartParams); - - /* Complete and destroy the progress bar */ - DestroyProgressDialog(hProgress, bRet); - } - - return bRet; -} Modified: trunk/reactos/base/applications/mscutils/servman/stop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/stop.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/stop.c [iso-8859-1] Wed Apr 8 17:28:46 2015 @@ -3,223 +3,107 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/mscutils/servman/stop.c * PURPOSE: Stops running a service - * COPYRIGHT: Copyright 2006-2010 Ged Murphy <gedmurphy(a)reactos.org> + * COPYRIGHT: Copyright 2006-2015 Ged Murphy <gedmurphy(a)reactos.org> * */ #include "precomp.h" -static BOOL -StopService(PMAIN_WND_INFO pInfo, - LPWSTR lpServiceName, - HWND hProgress OPTIONAL) +#define MAX_WAIT_TIME 30000 + +BOOL +DoStopService(_In_z_ LPWSTR ServiceName, + _In_opt_ HANDLE hProgress) { SC_HANDLE hSCManager; SC_HANDLE hService; SERVICE_STATUS_PROCESS ServiceStatus; - DWORD dwBytesNeeded; - DWORD dwStartTime; - DWORD dwTimeout; + DWORD BytesNeeded; + DWORD StartTime; + DWORD WaitTime; + DWORD Timeout; BOOL bRet = FALSE; + + + hSCManager = OpenSCManagerW(NULL, + NULL, + SC_MANAGER_CONNECT); + if (!hSCManager) return FALSE; + + hService = OpenServiceW(hSCManager, + ServiceName, + SERVICE_STOP | SERVICE_QUERY_STATUS); + if (!hService) + { + CloseServiceHandle(hSCManager); + return FALSE; + } if (hProgress) { - /* Set the service name and reset the progress bag */ - InitializeProgressDialog(hProgress, lpServiceName); + /* Increment the progress bar */ + IncrementProgressBar(hProgress, DEFAULT_STEP); } - hSCManager = OpenSCManager(NULL, - NULL, - SC_MANAGER_CONNECT); - if (hSCManager) + /* Set the start and max wait times */ + StartTime = GetTickCount(); + Timeout = MAX_WAIT_TIME; + + /* Send the service the stop code */ + if (ControlService(hService, + SERVICE_CONTROL_STOP, + (LPSERVICE_STATUS)&ServiceStatus)) { - hService = OpenService(hSCManager, - lpServiceName, - SERVICE_STOP | SERVICE_QUERY_STATUS); - if (hService) + if (hProgress) { - if (hProgress) + /* Increment the progress bar */ + IncrementProgressBar(hProgress, DEFAULT_STEP); + } + + while (ServiceStatus.dwCurrentState != SERVICE_STOPPED) + { + /* Fixup the wait time */ + WaitTime = ServiceStatus.dwWaitHint / 10; + + if (WaitTime < 1000) WaitTime = 1000; + else if (WaitTime > 10000) WaitTime = 10000; + + /* We don't wanna wait for up to 10 secs without incrementing */ + for (int i = WaitTime / 1000; i > 0; i--) { - /* Increment the progress bar */ - IncrementProgressBar(hProgress, DEFAULT_STEP); - } - - /* Set the wait time to 30 secs */ - dwStartTime = GetTickCount(); - dwTimeout = 30000; - - /* Send the service the stop code */ - if (ControlService(hService, - SERVICE_CONTROL_STOP, - (LPSERVICE_STATUS)&ServiceStatus)) - { + Sleep(1000); if (hProgress) { /* Increment the progress bar */ IncrementProgressBar(hProgress, DEFAULT_STEP); } + } - while (ServiceStatus.dwCurrentState != SERVICE_STOPPED) + if (QueryServiceStatusEx(hService, + SC_STATUS_PROCESS_INFO, + (LPBYTE)&ServiceStatus, + sizeof(SERVICE_STATUS_PROCESS), + &BytesNeeded)) + { + /* Have we exceeded our wait time? */ + if (GetTickCount() - StartTime > Timeout) { - /* Don't sleep for more than 3 seconds */ - if (ServiceStatus.dwWaitHint > 3000) - ServiceStatus.dwWaitHint = 3000; - - Sleep(ServiceStatus.dwWaitHint); - - if (hProgress) - { - /* Increment the progress bar */ - IncrementProgressBar(hProgress, DEFAULT_STEP); - } - - if (QueryServiceStatusEx(hService, - SC_STATUS_PROCESS_INFO, - (LPBYTE)&ServiceStatus, - sizeof(SERVICE_STATUS_PROCESS), - &dwBytesNeeded)) - { - /* Have we exceeded our wait time? */ - if (GetTickCount() - dwStartTime > dwTimeout) - { - /* Yep, give up */ - break; - } - } - } - - /* If the service is stopped, return TRUE */ - if (ServiceStatus.dwCurrentState == SERVICE_STOPPED) - { - bRet = TRUE; + /* Yep, give up */ + break; } } - - CloseServiceHandle(hService); } - CloseServiceHandle(hSCManager); + /* If the service is stopped, return TRUE */ + if (ServiceStatus.dwCurrentState == SERVICE_STOPPED) + { + bRet = TRUE; + } } + + CloseServiceHandle(hService); + + CloseServiceHandle(hSCManager); return bRet; } - -static BOOL -StopDependantServices(PMAIN_WND_INFO pInfo, - LPWSTR lpServiceList, - HWND hProgress OPTIONAL) -{ - LPWSTR lpStr; - BOOL bRet = FALSE; - - lpStr = lpServiceList; - - /* Loop through all the services in the list */ - while (TRUE) - { - /* Break when we hit the double null */ - if (*lpStr == L'\0' && *(lpStr + 1) == L'\0') - break; - - /* If this isn't our first time in the loop we'll - have been left on a null char */ - if (*lpStr == L'\0') - lpStr++; - - /* Stop the requested service */ - bRet = StopService(pInfo, - lpStr, - hProgress); - - /* Complete the progress bar if we succeeded */ - if (bRet) - { - CompleteProgressBar(hProgress); - } - - /* Move onto the next string */ - while (*lpStr != L'\0') - lpStr++; - } - - return bRet; -} - -BOOL -DoStop(PMAIN_WND_INFO pInfo) -{ - HWND hProgress; - LPWSTR lpServiceList; - BOOL bRet = FALSE; - BOOL bStopMainService = TRUE; - - if (pInfo) - { - /* Does the service have any dependent services which need stopping first */ - lpServiceList = GetListOfServicesToStop(pInfo->pCurrentService->lpServiceName); - if (lpServiceList) - { - /* Tag the service list to the main wnd info */ - pInfo->pTag = (PVOID)lpServiceList; - - /* List them and ask the user if they want to stop them */ - if (DialogBoxParamW(hInstance, - MAKEINTRESOURCEW(IDD_DLG_DEPEND_STOP), - pInfo->hMainWnd, - StopDependsDialogProc, - (LPARAM)pInfo) == IDOK) - { - /* Create a progress window to track the progress of the stopping services */ - hProgress = CreateProgressDialog(pInfo->hMainWnd, - IDS_PROGRESS_INFO_STOP); - - /* Stop all the dependant services */ - StopDependantServices(pInfo, lpServiceList, hProgress); - - /* Now stop the requested one */ - bRet = StopService(pInfo, - pInfo->pCurrentService->lpServiceName, - hProgress); - - /* We've already stopped the main service, don't try to stop it again */ - bStopMainService = FALSE; - - if (hProgress) - { - /* Complete and destroy the progress bar */ - DestroyProgressDialog(hProgress, TRUE); - } - } - else - { - /* Don't stop the main service if the user selected not to */ - bStopMainService = FALSE; - } - - HeapFree(GetProcessHeap(), - 0, - lpServiceList); - } - - /* If the service has no running dependents, then we stop it here */ - if (bStopMainService) - { - /* Create a progress window to track the progress of the stopping service */ - hProgress = CreateProgressDialog(pInfo->hMainWnd, - IDS_PROGRESS_INFO_STOP); - - /* Stop the requested service */ - bRet = StopService(pInfo, - pInfo->pCurrentService->lpServiceName, - hProgress); - - if (hProgress) - { - /* Complete and destroy the progress bar */ - DestroyProgressDialog(hProgress, TRUE); - } - } - } - - return bRet; -} Modified: trunk/reactos/base/applications/mscutils/servman/stop_dependencies.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/stop_dependencies.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/stop_dependencies.c [iso-8859-1] Wed Apr 8 17:28:46 2015 @@ -3,11 +3,19 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/mscutils/servman/stop_dependencies.c * PURPOSE: Routines related to stopping dependent services - * COPYRIGHT: Copyright 2006-2010 Ged Murphy <gedmurphy(a)reactos.org> + * COPYRIGHT: Copyright 2006-2015 Ged Murphy <gedmurphy(a)reactos.org> * */ #include "precomp.h" + +typedef struct _STOP_DATA +{ + LPWSTR ServiceName; + LPWSTR DisplayName; + LPWSTR ServiceList; + +} STOP_DATA, *PSTOP_DATA; static LPWSTR AddServiceToList(LPWSTR *lpServiceList, @@ -46,7 +54,7 @@ dwCurSize = 0; /* Get the list size */ - while (TRUE) + for (;;) { /* Break when we hit the double null */ if (*ptr == L'\0' && *(ptr + 1) == L'\0') @@ -98,13 +106,6 @@ if (lpServiceStatus[i].ServiceStatus.dwCurrentState != SERVICE_STOPPED && lpServiceStatus[i].ServiceStatus.dwCurrentState != SERVICE_STOP_PENDING) { - /* Does this service have any dependents? */ - if (TV2_HasDependantServices(lpServiceStatus[i].lpServiceName)) - { - /* recall this function with the dependent */ - BuildListOfServicesToStop(lpServiceList, lpServiceStatus[i].lpServiceName); - } - /* Add the service to the list */ *lpServiceList = AddServiceToList(lpServiceList, lpServiceStatus[i].lpServiceName); @@ -143,7 +144,7 @@ lpStr = lpServiceList; /* Loop through all the services in the list */ - while (TRUE) + for (;;) { /* Break when we hit the double null */ if (*lpStr == L'\0' && *(lpStr + 1) == L'\0') @@ -174,117 +175,100 @@ } static BOOL -DoInitDependsDialog(PMAIN_WND_INFO pInfo, - HWND hDlg) -{ +InitDialog(HWND hDlg, + UINT Message, + WPARAM wParam, + LPARAM lParam) +{ + PSTOP_DATA StopData; HWND hServiceListBox; LPWSTR lpPartialStr, lpStr; DWORD fullLen; HICON hIcon = NULL; BOOL bRet = FALSE; - if (pInfo) - { - /* Tag the info to the window */ - SetWindowLongPtrW(hDlg, - GWLP_USERDATA, - (LONG_PTR)pInfo); - - /* Load the icon for the window */ - hIcon = (HICON)LoadImageW(hInstance, - MAKEINTRESOURCE(IDI_SM_ICON), - IMAGE_ICON, - GetSystemMetrics(SM_CXSMICON), - GetSystemMetrics(SM_CXSMICON), - 0); - if (hIcon) - { - /* Set it */ - SendMessageW(hDlg, - WM_SETICON, - ICON_SMALL, - (LPARAM)hIcon); - DestroyIcon(hIcon); - } - - /* Load the stop depends note */ - if (AllocAndLoadString(&lpPartialStr, - hInstance, - IDS_STOP_DEPENDS)) - { - /* Get the length required */ - fullLen = wcslen(lpPartialStr) + wcslen(pInfo->pCurrentService->lpDisplayName) + 1; - - lpStr = HeapAlloc(ProcessHeap, - 0, - fullLen * sizeof(WCHAR)); - if (lpStr) - { - /* Add the service name to the depends note */ - _snwprintf(lpStr, - fullLen, - lpPartialStr, - pInfo->pCurrentService->lpDisplayName); - - /* Add the string to the dialog */ - SendDlgItemMessageW(hDlg, - IDC_STOP_DEPENDS, - WM_SETTEXT, - 0, - (LPARAM)lpStr); - - HeapFree(ProcessHeap, - 0, - lpStr); - - bRet = TRUE; - } - - LocalFree(lpPartialStr); - } - - /* Display the list of services which need stopping */ - hServiceListBox = GetDlgItem(hDlg, - IDC_STOP_DEPENDS_LB); - if (hServiceListBox) - { - AddServiceNamesToStop(hServiceListBox, - (LPWSTR)pInfo->pTag); - } - } - + StopData = (PSTOP_DATA)lParam; + + + /* Load the icon for the window */ + hIcon = (HICON)LoadImageW(hInstance, + MAKEINTRESOURCE(IDI_SM_ICON), + IMAGE_ICON, + GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CXSMICON), + 0); + if (hIcon) + { + /* Set it */ + SendMessageW(hDlg, + WM_SETICON, + ICON_SMALL, + (LPARAM)hIcon); + DestroyIcon(hIcon); + } + + /* Load the stop depends note */ + if (AllocAndLoadString(&lpPartialStr, + hInstance, + IDS_STOP_DEPENDS)) + { + /* Get the length required */ + fullLen = wcslen(lpPartialStr) + wcslen(StopData->DisplayName) + 1; + + lpStr = HeapAlloc(ProcessHeap, + 0, + fullLen * sizeof(WCHAR)); + if (lpStr) + { + /* Add the service name to the depends note */ + _snwprintf(lpStr, + fullLen, + lpPartialStr, + StopData->DisplayName); + + /* Add the string to the dialog */ + SendDlgItemMessageW(hDlg, + IDC_STOP_DEPENDS, + WM_SETTEXT, + 0, + (LPARAM)lpStr); + + HeapFree(ProcessHeap, + 0, + lpStr); + + bRet = TRUE; + } + + LocalFree(lpPartialStr); + } + + /* Display the list of services which need stopping */ + hServiceListBox = GetDlgItem(hDlg, IDC_STOP_DEPENDS_LB); + if (hServiceListBox) + { + AddServiceNamesToStop(hServiceListBox, + (LPWSTR)StopData->ServiceList); + } + return bRet; } INT_PTR CALLBACK StopDependsDialogProc(HWND hDlg, - UINT message, + UINT Message, WPARAM wParam, LPARAM lParam) { - PMAIN_WND_INFO pInfo = NULL; - - /* Get the window context */ - pInfo = (PMAIN_WND_INFO)GetWindowLongPtrW(hDlg, - GWLP_USERDATA); - if (pInfo == NULL && message != WM_INITDIALOG) - { - return FALSE; - } - - switch (message) + + switch (Message) { case WM_INITDIALOG: { - BOOL bRet = FALSE; - - pInfo = (PMAIN_WND_INFO)lParam; - if (pInfo != NULL) - { - bRet = DoInitDependsDialog(pInfo, hDlg); - } - - return bRet; + return InitDialog(hDlg, + Message, + wParam, + lParam); } case WM_COMMAND: @@ -304,3 +288,27 @@ return FALSE; } + +BOOL +CreateStopDependsDialog(HWND hParent, + LPWSTR ServiceName, + LPWSTR DisplayName, + LPWSTR ServiceList) +{ + STOP_DATA StopData; + INT_PTR Result; + + StopData.ServiceName = ServiceName; + StopData.DisplayName = DisplayName; + StopData.ServiceList = ServiceList; + + Result = DialogBoxParamW(hInstance, + MAKEINTRESOURCEW(IDD_DLG_DEPEND_STOP), + hParent, + StopDependsDialogProc, + (LPARAM)&StopData); + if (Result == IDOK) + return TRUE; + + return FALSE; +}

1 0

[akhaldi] 67093: [MSXML3_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 08 Apr '15

08 Apr '15

Author: akhaldi Date: Wed Apr 8 17:15:53 2015 New Revision: 67093 URL: http://svn.reactos.org/svn/reactos?rev=67093&view=rev Log: [MSXML3_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/rostests/winetests/msxml3/domdoc.c trunk/rostests/winetests/msxml3/saxreader.c trunk/rostests/winetests/msxml3/schema.c Modified: trunk/rostests/winetests/msxml3/domdoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/domdoc.c… ============================================================================== --- trunk/rostests/winetests/msxml3/domdoc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msxml3/domdoc.c [iso-8859-1] Wed Apr 8 17:15:53 2015 @@ -416,11 +416,6 @@ '<','o','p','e','n','>','<','/','o','p','e','n','>','\n',0 }; static const WCHAR szComplete2[] = { - '<','?','x','m','l',' ', - 'v','e','r','s','i','o','n','=','\'','1','.','0','\'','?','>','\n', - '<','o','>','<','/','o','>','\n',0 -}; -static const WCHAR szComplete3[] = { '<','?','x','m','l',' ', 'v','e','r','s','i','o','n','=','\'','1','.','0','\'','?','>','\n', '<','a','>','<','/','a','>','\n',0 @@ -1376,7 +1371,7 @@ /* try to load something else simple and valid */ b = VARIANT_FALSE; - str = SysAllocString( szComplete3 ); + str = SysAllocString( szComplete2 ); r = IXMLDOMDocument_loadXML( doc, str, &b ); ok( r == S_OK, "loadXML failed\n"); ok( b == VARIANT_TRUE, "failed to load XML string\n"); @@ -4946,7 +4941,6 @@ doc = create_document(&IID_IXMLDOMDocument); - pNextChild = (void*)0xdeadbeef; hr = IXMLDOMDocument_get_nextSibling(doc, NULL); ok(hr == E_INVALIDARG, "ret %08x\n", hr ); @@ -8950,9 +8944,12 @@ static void test_get_doctype(void) { + static const WCHAR emailW[] = {'e','m','a','i','l',0}; IXMLDOMDocumentType *doctype; IXMLDOMDocument *doc; + VARIANT_BOOL b; HRESULT hr; + BSTR s; doc = create_document(&IID_IXMLDOMDocument); @@ -8964,6 +8961,28 @@ ok(hr == S_FALSE, "got 0x%08x\n", hr); ok(doctype == NULL, "got %p\n", doctype); + hr = IXMLDOMDocument_loadXML(doc, _bstr_(szEmailXML), &b); + ok(b == VARIANT_TRUE, "failed to load XML string\n"); + + doctype = NULL; + hr = IXMLDOMDocument_get_doctype(doc, &doctype); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(doctype != NULL, "got %p\n", doctype); + + hr = IXMLDOMDocumentType_get_name(doctype, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IXMLDOMDocumentType_get_name(doctype, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(emailW, s), "got name %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + hr = IXMLDOMDocumentType_get_nodeName(doctype, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(emailW, s), "got name %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + IXMLDOMDocumentType_Release(doctype); IXMLDOMDocument_Release(doc); } @@ -9164,6 +9183,11 @@ hr = IXMLDOMNode_get_attributes(node, &map); ok(hr == S_OK, "got %08x\n", hr); + + node2 = (void*)0xdeadbeef; + hr = IXMLDOMNamedNodeMap_getNamedItem(map, _bstr_("attr"), &node2); + ok(hr == S_FALSE, "got %08x\n", hr); + ok(node2 == NULL, "got %p\n", node2); length = -1; hr = IXMLDOMNamedNodeMap_get_length(map, &length); @@ -11099,6 +11123,7 @@ V_VT(&v) = VT_BSTR; V_BSTR(&v) = _bstr_("urn:schemas-microsoft-com:datatypes"); hr = IXMLDOMAttribute_put_nodeValue(pAttribute, v); + ok(hr == S_OK, "ret %08x\n", hr ); hr = IXMLDOMElement_setAttributeNode(root, pAttribute, NULL); ok(hr == S_OK, "ret %08x\n", hr ); Modified: trunk/rostests/winetests/msxml3/saxreader.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/saxreade… ============================================================================== --- trunk/rostests/winetests/msxml3/saxreader.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msxml3/saxreader.c [iso-8859-1] Wed Apr 8 17:15:53 2015 @@ -312,13 +312,6 @@ HeapFree(GetProcessHeap(), 0, call_seq->sequence); call_seq->sequence = NULL; call_seq->count = call_seq->size = 0; -} - -static inline void flush_sequences(struct call_sequence **seq, int n) -{ - int i; - for (i = 0; i < n; i++) - flush_sequence(seq, i); } static const char *get_event_name(CH event) @@ -2899,7 +2892,7 @@ HRESULT hr; int i; - static const REFIID riids[] = + static REFIID riids[] = { &IID_ISAXContentHandler, &IID_ISAXLexicalHandler, Modified: trunk/rostests/winetests/msxml3/schema.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/schema.c… ============================================================================== --- trunk/rostests/winetests/msxml3/schema.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msxml3/schema.c [iso-8859-1] Wed Apr 8 17:15:53 2015 @@ -1300,6 +1300,7 @@ VariantClear(&type); hr = IXMLDOMNode_get_nodeTypedValue(node, &type); + EXPECT_HR(hr, S_OK); ok(V_VT(&type) == VT_BSTR, "got variant type %i\n", V_VT(&v)); VariantClear(&type); IXMLDOMNode_Release(node);

1 0

[akhaldi] 67092: [MSXML3] Sync with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 08 Apr '15

08 Apr '15

Author: akhaldi Date: Wed Apr 8 17:15:30 2015 New Revision: 67092 URL: http://svn.reactos.org/svn/reactos?rev=67092&view=rev Log: [MSXML3] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/win32/msxml3/doctype.c trunk/reactos/dll/win32/msxml3/node.c trunk/reactos/dll/win32/msxml3/pi.c trunk/reactos/dll/win32/msxml3/xdr.c trunk/reactos/dll/win32/msxml3/xslpattern.y trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msxml3/doctype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/doctype.c… ============================================================================== --- trunk/reactos/dll/win32/msxml3/doctype.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/doctype.c [iso-8859-1] Wed Apr 8 17:15:30 2015 @@ -134,8 +134,8 @@ BSTR* p ) { domdoctype *This = impl_from_IXMLDOMDocumentType( iface ); - FIXME("(%p)->(%p): stub\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return node_get_nodeName(&This->node, p); } static HRESULT WINAPI domdoctype_get_nodeValue( @@ -468,8 +468,8 @@ BSTR *p) { domdoctype *This = impl_from_IXMLDOMDocumentType( iface ); - FIXME("(%p)->(%p): stub\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return node_get_nodeName(&This->node, p); } static HRESULT WINAPI domdoctype_get_entities( Modified: trunk/reactos/dll/win32/msxml3/node.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/node.c?re… ============================================================================== --- trunk/reactos/dll/win32/msxml3/node.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/node.c [iso-8859-1] Wed Apr 8 17:15:30 2015 @@ -458,15 +458,19 @@ xmlnode *before_node_obj = get_node_obj(before); IXMLDOMNode_Release(before); if(!before_node_obj) return E_FAIL; - - /* unlink from current parent first */ - if(node_obj->parent) - { - hr = IXMLDOMNode_removeChild(node_obj->parent, node_obj->iface, NULL); - if (hr == S_OK) xmldoc_remove_orphan(node_obj->node->doc, node_obj->node); - } - - doc = node_obj->node->doc; + } + + /* unlink from current parent first */ + if(node_obj->parent) + { + hr = IXMLDOMNode_removeChild(node_obj->parent, node_obj->iface, NULL); + if (hr == S_OK) xmldoc_remove_orphan(node_obj->node->doc, node_obj->node); + } + doc = node_obj->node->doc; + + if(before) + { + xmlnode *before_node_obj = get_node_obj(before); /* refs count including subtree */ if (doc != before_node_obj->node->doc) @@ -479,14 +483,6 @@ } else { - /* unlink from current parent first */ - if(node_obj->parent) - { - hr = IXMLDOMNode_removeChild(node_obj->parent, node_obj->iface, NULL); - if (hr == S_OK) xmldoc_remove_orphan(node_obj->node->doc, node_obj->node); - } - doc = node_obj->node->doc; - if (doc != This->node->doc) refcount = xmlnode_get_inst_cnt(node_obj); Modified: trunk/reactos/dll/win32/msxml3/pi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/pi.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/msxml3/pi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/pi.c [iso-8859-1] Wed Apr 8 17:15:30 2015 @@ -665,7 +665,9 @@ static HRESULT dom_pi_get_named_item(const xmlNodePtr node, BSTR name, IXMLDOMNode **item) { FIXME("(%p)->(%s %p): stub\n", node, debugstr_w(name), item ); - return E_NOTIMPL; + if (item) + *item = NULL; + return S_FALSE; } static HRESULT dom_pi_set_named_item(xmlNodePtr node, IXMLDOMNode *newItem, IXMLDOMNode **namedItem) Modified: trunk/reactos/dll/win32/msxml3/xdr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/xdr.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msxml3/xdr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/xdr.c [iso-8859-1] Wed Apr 8 17:15:30 2015 @@ -35,7 +35,6 @@ static const xmlChar DT_prefix[] = "dt"; static const xmlChar DT_href[] = "urn:schemas-microsoft-com:datatypes"; -static const xmlChar XDR_prefix[] = "xdr"; static const xmlChar XDR_href[] = "urn:schemas-microsoft-com:xml-data"; static const xmlChar XSD_prefix[] = "xsd"; static const xmlChar XSD_href[] = "http://www.w3.org/2001/XMLSchema"; @@ -48,7 +47,6 @@ static const xmlChar xs_AttributeType[] = "AttributeType"; static const xmlChar xs_base[] = "base"; static const xmlChar xs_choice[] = "choice"; -static const xmlChar xs_complexContent[] = "complexContent"; static const xmlChar xs_complexType[] = "complexType"; static const xmlChar xs_content[] = "content"; static const xmlChar xs_datatype[] = "datatype"; @@ -58,7 +56,6 @@ static const xmlChar xs_element[] = "element"; static const xmlChar xs_ElementType[] = "ElementType"; static const xmlChar xs_eltOnly[] = "eltOnly"; -static const xmlChar xs_empty[] = "empty"; static const xmlChar xs_enumeration[] = "enumeration"; static const xmlChar xs_extension[] = "extension"; static const xmlChar xs_group[] = "group"; @@ -72,7 +69,6 @@ static const xmlChar xs_name[] = "name"; static const xmlChar xs_namespace[] = "namespace"; static const xmlChar xs_no[] = "no"; -static const xmlChar xs_one[] = "one"; static const xmlChar xs_open[] = "open"; static const xmlChar xs_optional[] = "optional"; static const xmlChar xs_order[] = "order"; @@ -81,7 +77,6 @@ static const xmlChar xs_required[] = "required"; static const xmlChar xs_restriction[] = "restriction"; static const xmlChar xs_schema[] = "schema"; -static const xmlChar xs_Schema[] = "Schema"; static const xmlChar xs_seq[] = "seq"; static const xmlChar xs_sequence[] = "sequence"; static const xmlChar xs_simpleContent[] = "simpleContent"; @@ -96,7 +91,6 @@ static const xmlChar xs_value[] = "value"; static const xmlChar xs_values[] = "values"; static const xmlChar xs_xsd_string[] = "xsd:string"; -static const xmlChar xs_yes[] = "yes"; typedef enum _CONTENT_TYPE { Modified: trunk/reactos/dll/win32/msxml3/xslpattern.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/xslpatter… ============================================================================== --- trunk/reactos/dll/win32/msxml3/xslpattern.y [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/xslpattern.y [iso-8859-1] Wed Apr 8 17:15:30 2015 @@ -70,7 +70,7 @@ %start XSLPattern -%pure_parser +%pure-parser %parse-param {parser_param* p} %parse-param {void* scanner} %lex-param {yyscan_t* scanner} Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Apr 8 17:15:30 2015 @@ -140,7 +140,7 @@ reactos/dll/win32/msvidc32 # Synced to Wine-1.7.27 reactos/dll/win32/msxml # Synced to Wine-1.7.27 reactos/dll/win32/msxml2 # Synced to Wine-1.7.27 -reactos/dll/win32/msxml3 # Synced to Wine-1.7.27 +reactos/dll/win32/msxml3 # Synced to WineStaging-1.7.37 reactos/dll/win32/msxml4 # Synced to Wine-1.7.27 reactos/dll/win32/msxml6 # Synced to Wine-1.7.27 reactos/dll/win32/nddeapi # Synced to Wine-1.7.27

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs