Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 40738: - Add the ws2_32 library from Alex's old network branch which is a _huge_ improvement over our current, incorrect lib. - I've made various changes and tweaks to get it building with gcc, however it doesn't yet build with out build environment as out headers are severely lacking. It's also reliant on other winsock libs which will come in future commits along with the header rewrite.
by gedmurphy＠svn.reactos.org 29 Apr '09

29 Apr '09

Author: gedmurphy Date: Wed Apr 29 22:49:47 2009 New Revision: 40738 URL: http://svn.reactos.org/svn/reactos?rev=40738&view=rev Log: - Add the ws2_32 library from Alex's old network branch which is a _huge_ improvement over our current, incorrect lib. - I've made various changes and tweaks to get it building with gcc, however it doesn't yet build with out build environment as out headers are severely lacking. It's also reliant on other winsock libs which will come in future commits along with the header rewrite. Added: trunk/reactos/dll/win32/ws2_32_new/ (with props) trunk/reactos/dll/win32/ws2_32_new/inc/ (with props) trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h (with props) trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32p.h (with props) trunk/reactos/dll/win32/ws2_32_new/src/ (with props) trunk/reactos/dll/win32/ws2_32_new/src/addrconv.c (with props) trunk/reactos/dll/win32/ws2_32_new/src/addrinfo.c (with props) trunk/reactos/dll/win32/ws2_32_new/src/async.c (with props) trunk/reactos/dll/win32/ws2_32_new/src/bhook.c (with props) trunk/reactos/dll/win32/ws2_32_new/src/dcatalog.c (with props) trunk/reactos/dll/win32/ws2_32_new/src/dcatitem.c (with props) trunk/reactos/dll/win32/ws2_32_new/src/dllmain.c (with props) trunk/reactos/dll/win32/ws2_32_new/src/dprocess.c (with props) trunk/reactos/dll/win32/ws2_32_new/src/dprovide.c (with props) trunk/reactos/dll/win32/ws2_32_new/src/dsocket.c (with props) trunk/reactos/dll/win32/ws2_32_new/src/dthread.c (with props) trunk/reactos/dll/win32/ws2_32_new/src/dupsock.c (with props) trunk/reactos/dll/win32/ws2_32_new/src/enumprot.c (with props) trunk/reactos/dll/win32/ws2_32_new/src/event.c (with props) trunk/reactos/dll/win32/ws2_32_new/src/getproto.c (with props) trunk/reactos/dll/win32/ws2_32_new/src/getxbyxx.c (with props) trunk/reactos/dll/win32/ws2_32_new/src/ioctl.c (with props) trunk/reactos/dll/win32/ws2_32_new/src/nscatalo.c (with props) trunk/reactos/dll/win32/ws2_32_new/src/nscatent.c (with props) trunk/reactos/dll/win32/ws2_32_new/src/nspinstl.c (with props) trunk/reactos/dll/win32/ws2_32_new/src/nsprovid.c (with props) trunk/reactos/dll/win32/ws2_32_new/src/nsquery.c (with props) trunk/reactos/dll/win32/ws2_32_new/src/qos.c (with props) trunk/reactos/dll/win32/ws2_32_new/src/qshelpr.c (with props) trunk/reactos/dll/win32/ws2_32_new/src/rasdial.c (with props) trunk/reactos/dll/win32/ws2_32_new/src/recv.c (with props) trunk/reactos/dll/win32/ws2_32_new/src/rnr.c (with props) trunk/reactos/dll/win32/ws2_32_new/src/scihlpr.c (with props) trunk/reactos/dll/win32/ws2_32_new/src/select.c (with props) trunk/reactos/dll/win32/ws2_32_new/src/send.c (with props) trunk/reactos/dll/win32/ws2_32_new/src/sockctrl.c (with props) trunk/reactos/dll/win32/ws2_32_new/src/socklife.c (with props) trunk/reactos/dll/win32/ws2_32_new/src/spinstal.c (with props) trunk/reactos/dll/win32/ws2_32_new/src/sputil.c (with props) trunk/reactos/dll/win32/ws2_32_new/src/startup.c (with props) trunk/reactos/dll/win32/ws2_32_new/src/wsautil.c (with props) trunk/reactos/dll/win32/ws2_32_new/ws2_32.def (with props) trunk/reactos/dll/win32/ws2_32_new/ws2_32.rbuild (with props) trunk/reactos/dll/win32/ws2_32_new/ws2_32.rc (with props) [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/inc/w… Added: trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/inc/w… Added: trunk/reactos/dll/win32/ws2_32_new/src/addrconv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/a… Added: trunk/reactos/dll/win32/ws2_32_new/src/addrinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/a… Added: trunk/reactos/dll/win32/ws2_32_new/src/async.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/a… Added: trunk/reactos/dll/win32/ws2_32_new/src/bhook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/b… Added: trunk/reactos/dll/win32/ws2_32_new/src/dcatalog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/d… Added: trunk/reactos/dll/win32/ws2_32_new/src/dcatitem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/d… Added: trunk/reactos/dll/win32/ws2_32_new/src/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/d… Added: trunk/reactos/dll/win32/ws2_32_new/src/dprocess.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/d… Added: trunk/reactos/dll/win32/ws2_32_new/src/dprovide.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/d… Added: trunk/reactos/dll/win32/ws2_32_new/src/dsocket.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/d… Added: trunk/reactos/dll/win32/ws2_32_new/src/dthread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/d… Added: trunk/reactos/dll/win32/ws2_32_new/src/dupsock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/d… Added: trunk/reactos/dll/win32/ws2_32_new/src/enumprot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/e… Added: trunk/reactos/dll/win32/ws2_32_new/src/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/e… Added: trunk/reactos/dll/win32/ws2_32_new/src/getproto.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/g… Added: trunk/reactos/dll/win32/ws2_32_new/src/getxbyxx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/g… Added: trunk/reactos/dll/win32/ws2_32_new/src/ioctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/i… Added: trunk/reactos/dll/win32/ws2_32_new/src/nscatalo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/n… Added: trunk/reactos/dll/win32/ws2_32_new/src/nscatent.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/n… Added: trunk/reactos/dll/win32/ws2_32_new/src/nspinstl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/n… Added: trunk/reactos/dll/win32/ws2_32_new/src/nsprovid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/n… Added: trunk/reactos/dll/win32/ws2_32_new/src/nsquery.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/n… Added: trunk/reactos/dll/win32/ws2_32_new/src/qos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/q… Added: trunk/reactos/dll/win32/ws2_32_new/src/qshelpr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/q… Added: trunk/reactos/dll/win32/ws2_32_new/src/rasdial.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/r… Added: trunk/reactos/dll/win32/ws2_32_new/src/recv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/r… Added: trunk/reactos/dll/win32/ws2_32_new/src/rnr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/r… Added: trunk/reactos/dll/win32/ws2_32_new/src/scihlpr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/s… Added: trunk/reactos/dll/win32/ws2_32_new/src/select.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/s… Added: trunk/reactos/dll/win32/ws2_32_new/src/send.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/s… Added: trunk/reactos/dll/win32/ws2_32_new/src/sockctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/s… Added: trunk/reactos/dll/win32/ws2_32_new/src/socklife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/s… Added: trunk/reactos/dll/win32/ws2_32_new/src/spinstal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/s… Added: trunk/reactos/dll/win32/ws2_32_new/src/sputil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/s… Added: trunk/reactos/dll/win32/ws2_32_new/src/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/s… Added: trunk/reactos/dll/win32/ws2_32_new/src/wsautil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/w… Added: trunk/reactos/dll/win32/ws2_32_new/ws2_32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/ws2_3… Added: trunk/reactos/dll/win32/ws2_32_new/ws2_32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/ws2_3… Added: trunk/reactos/dll/win32/ws2_32_new/ws2_32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/ws2_3…

1 0

[tkreuzer] 40737: spaces -> tabs in rbuild file
by tkreuzer＠svn.reactos.org 29 Apr '09

29 Apr '09

Author: tkreuzer Date: Wed Apr 29 22:13:42 2009 New Revision: 40737 URL: http://svn.reactos.org/svn/reactos?rev=40737&view=rev Log: spaces -> tabs in rbuild file Modified: trunk/reactos/dll/cpl/intl/intl.rbuild Modified: trunk/reactos/dll/cpl/intl/intl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.rbuild?r… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/intl.rbuild [iso-8859-1] Wed Apr 29 22:13:42 2009 @@ -1,25 +1,25 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="intl" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_INTL}" installbase="system32" installname="intl.cpl" unicode="yes" crt="msvcrt"> - <importlibrary definition="intl.spec" /> - <include base="intl">.</include> - <library>kernel32</library> - <library>user32</library> - <library>comctl32</library> - <library>advapi32</library> - <library>setupapi</library> - <library>shell32</library> - <file>currency.c</file> - <file>date.c</file> - <file>generalp.c</file> - <file>intl.c</file> - <file>inplocale.c</file> - <file>numbers.c</file> - <file>time.c</file> - <file>misc.c</file> + <importlibrary definition="intl.spec" /> + <include base="intl">.</include> + <library>kernel32</library> + <library>user32</library> + <library>comctl32</library> + <library>advapi32</library> + <library>setupapi</library> + <library>shell32</library> + <file>currency.c</file> + <file>date.c</file> + <file>generalp.c</file> + <file>intl.c</file> + <file>inplocale.c</file> + <file>numbers.c</file> + <file>time.c</file> + <file>misc.c</file> <file>kblayouts.c</file> - <file>languages.c</file> - <file>advanced.c</file> - <file>sort.c</file> - <file>intl.rc</file> + <file>languages.c</file> + <file>advanced.c</file> + <file>sort.c</file> + <file>intl.rc</file> </module>

1 0

[cwittich] 40735: sync mshtml and shdocvw with wine 1.1.20
by cwittich＠svn.reactos.org 29 Apr '09

29 Apr '09

Author: cwittich Date: Wed Apr 29 21:16:20 2009 New Revision: 40735 URL: http://svn.reactos.org/svn/reactos?rev=40735&view=rev Log: sync mshtml and shdocvw with wine 1.1.20 Added: trunk/reactos/dll/win32/shdocvw/taskbarlist.c (with props) trunk/reactos/include/psdk/shdispid.h (with props) Modified: trunk/reactos/dll/win32/mshtml/De.rc trunk/reactos/dll/win32/mshtml/En.rc trunk/reactos/dll/win32/mshtml/Fr.rc trunk/reactos/dll/win32/mshtml/Ko.rc trunk/reactos/dll/win32/mshtml/Lt.rc trunk/reactos/dll/win32/mshtml/Nl.rc trunk/reactos/dll/win32/mshtml/Ro.rc trunk/reactos/dll/win32/mshtml/dispex.c trunk/reactos/dll/win32/mshtml/htmlcomment.c trunk/reactos/dll/win32/mshtml/htmlcurstyle.c trunk/reactos/dll/win32/mshtml/htmldoc.c trunk/reactos/dll/win32/mshtml/htmlelem.c trunk/reactos/dll/win32/mshtml/htmlelem2.c trunk/reactos/dll/win32/mshtml/htmlelemcol.c trunk/reactos/dll/win32/mshtml/htmlevent.c trunk/reactos/dll/win32/mshtml/htmlimg.c trunk/reactos/dll/win32/mshtml/htmlinput.c trunk/reactos/dll/win32/mshtml/htmlnode.c trunk/reactos/dll/win32/mshtml/htmlselect.c trunk/reactos/dll/win32/mshtml/htmlstyle.c trunk/reactos/dll/win32/mshtml/htmlstyle.h trunk/reactos/dll/win32/mshtml/htmlstyle2.c trunk/reactos/dll/win32/mshtml/htmlstylesheet.c trunk/reactos/dll/win32/mshtml/htmltable.c trunk/reactos/dll/win32/mshtml/htmltablerow.c trunk/reactos/dll/win32/mshtml/htmltextarea.c trunk/reactos/dll/win32/mshtml/htmltextcont.c trunk/reactos/dll/win32/mshtml/htmltextnode.c trunk/reactos/dll/win32/mshtml/htmlwindow.c trunk/reactos/dll/win32/mshtml/install.c trunk/reactos/dll/win32/mshtml/mshtml_private.h trunk/reactos/dll/win32/mshtml/omnavigator.c trunk/reactos/dll/win32/mshtml/persist.c trunk/reactos/dll/win32/mshtml/protocol.c trunk/reactos/dll/win32/mshtml/resource.h trunk/reactos/dll/win32/mshtml/txtrange.c trunk/reactos/dll/win32/shdocvw/factory.c trunk/reactos/dll/win32/shdocvw/ie.c trunk/reactos/dll/win32/shdocvw/shdocvw.h trunk/reactos/dll/win32/shdocvw/shdocvw.inf trunk/reactos/dll/win32/shdocvw/shdocvw.rbuild trunk/reactos/dll/win32/shdocvw/webbrowser.c trunk/reactos/include/psdk/mshtml.idl trunk/reactos/include/psdk/shldisp.idl trunk/reactos/include/psdk/shobjidl.idl trunk/reactos/lib/sdk/uuid/uuid.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/mshtml/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/De.rc?rev… Modified: trunk/reactos/dll/win32/mshtml/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/En.rc?rev… Modified: trunk/reactos/dll/win32/mshtml/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Fr.rc?rev… Modified: trunk/reactos/dll/win32/mshtml/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Ko.rc?rev… Modified: trunk/reactos/dll/win32/mshtml/Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Lt.rc?rev… Modified: trunk/reactos/dll/win32/mshtml/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Nl.rc?rev… Modified: trunk/reactos/dll/win32/mshtml/Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Ro.rc?rev… Modified: trunk/reactos/dll/win32/mshtml/dispex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/dispex.c?… Modified: trunk/reactos/dll/win32/mshtml/htmlcomment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlcomme… Modified: trunk/reactos/dll/win32/mshtml/htmlcurstyle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlcurst… Modified: trunk/reactos/dll/win32/mshtml/htmldoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmldoc.c… Modified: trunk/reactos/dll/win32/mshtml/htmlelem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlelem.… Modified: trunk/reactos/dll/win32/mshtml/htmlelem2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlelem2… Modified: trunk/reactos/dll/win32/mshtml/htmlelemcol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlelemc… Modified: trunk/reactos/dll/win32/mshtml/htmlevent.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlevent… Modified: trunk/reactos/dll/win32/mshtml/htmlimg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlimg.c… Modified: trunk/reactos/dll/win32/mshtml/htmlinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlinput… Modified: trunk/reactos/dll/win32/mshtml/htmlnode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlnode.… Modified: trunk/reactos/dll/win32/mshtml/htmlselect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlselec… Modified: trunk/reactos/dll/win32/mshtml/htmlstyle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlstyle… Modified: trunk/reactos/dll/win32/mshtml/htmlstyle.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlstyle… Modified: trunk/reactos/dll/win32/mshtml/htmlstyle2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlstyle… Modified: trunk/reactos/dll/win32/mshtml/htmlstylesheet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlstyle… Modified: trunk/reactos/dll/win32/mshtml/htmltable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmltable… Modified: trunk/reactos/dll/win32/mshtml/htmltablerow.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmltable… Modified: trunk/reactos/dll/win32/mshtml/htmltextarea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmltexta… Modified: trunk/reactos/dll/win32/mshtml/htmltextcont.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmltextc… Modified: trunk/reactos/dll/win32/mshtml/htmltextnode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmltextn… Modified: trunk/reactos/dll/win32/mshtml/htmlwindow.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlwindo… Modified: trunk/reactos/dll/win32/mshtml/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/install.c… Modified: trunk/reactos/dll/win32/mshtml/mshtml_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/mshtml_pr… Modified: trunk/reactos/dll/win32/mshtml/omnavigator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/omnavigat… Modified: trunk/reactos/dll/win32/mshtml/persist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/persist.c… Modified: trunk/reactos/dll/win32/mshtml/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/protocol.… Modified: trunk/reactos/dll/win32/mshtml/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/resource.… Modified: trunk/reactos/dll/win32/mshtml/txtrange.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/txtrange.… Modified: trunk/reactos/dll/win32/shdocvw/factory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/factory.… Modified: trunk/reactos/dll/win32/shdocvw/ie.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/ie.c?rev… Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw.… Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw.… Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw.… Added: trunk/reactos/dll/win32/shdocvw/taskbarlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/taskbarl… Modified: trunk/reactos/dll/win32/shdocvw/webbrowser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/webbrows… Modified: trunk/reactos/include/psdk/mshtml.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mshtml.idl?re… Added: trunk/reactos/include/psdk/shdispid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shdispid.h?re… Modified: trunk/reactos/include/psdk/shldisp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shldisp.idl?r… Modified: trunk/reactos/include/psdk/shobjidl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shobjidl.idl?… Modified: trunk/reactos/lib/sdk/uuid/uuid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/uuid/uuid.c?rev=40…

1 0

[cwittich] 40733: sync shell32_winetest with wine 1.1.20
by cwittich＠svn.reactos.org 29 Apr '09

29 Apr '09

Author: cwittich Date: Wed Apr 29 19:11:22 2009 New Revision: 40733 URL: http://svn.reactos.org/svn/reactos?rev=40733&view=rev Log: sync shell32_winetest with wine 1.1.20 Added: trunk/rostests/winetests/shell32/appbar.c (with props) trunk/rostests/winetests/shell32/autocomplete.c (with props) trunk/rostests/winetests/shell32/rsrc.rc (with props) trunk/rostests/winetests/shell32/shfldr_special.c (with props) Modified: trunk/rostests/winetests/shell32/generated.c trunk/rostests/winetests/shell32/shell32.rbuild trunk/rostests/winetests/shell32/shelllink.c trunk/rostests/winetests/shell32/shellpath.c trunk/rostests/winetests/shell32/shlexec.c trunk/rostests/winetests/shell32/shlfileop.c trunk/rostests/winetests/shell32/shlfolder.c trunk/rostests/winetests/shell32/string.c trunk/rostests/winetests/shell32/systray.c trunk/rostests/winetests/shell32/testlist.c [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/rostests/winetests/shell32/appbar.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/appbar.… Added: trunk/rostests/winetests/shell32/autocomplete.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/autocom… Modified: trunk/rostests/winetests/shell32/generated.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/generat… Added: trunk/rostests/winetests/shell32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/rsrc.rc… Modified: trunk/rostests/winetests/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shell32… Modified: trunk/rostests/winetests/shell32/shelllink.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shellli… Modified: trunk/rostests/winetests/shell32/shellpath.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shellpa… Added: trunk/rostests/winetests/shell32/shfldr_special.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shfldr_… Modified: trunk/rostests/winetests/shell32/shlexec.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlexec… Modified: trunk/rostests/winetests/shell32/shlfileop.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlfile… Modified: trunk/rostests/winetests/shell32/shlfolder.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlfold… Modified: trunk/rostests/winetests/shell32/string.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/string.… Modified: trunk/rostests/winetests/shell32/systray.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/systray… Modified: trunk/rostests/winetests/shell32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/testlis…

1 0

[cwittich] 40732: sync shlwapi_winetest with wine 1.1.20
by cwittich＠svn.reactos.org 29 Apr '09

29 Apr '09

Author: cwittich Date: Wed Apr 29 18:59:03 2009 New Revision: 40732 URL: http://svn.reactos.org/svn/reactos?rev=40732&view=rev Log: sync shlwapi_winetest with wine 1.1.20 Modified: trunk/rostests/winetests/shlwapi/ordinal.c trunk/rostests/winetests/shlwapi/path.c trunk/rostests/winetests/shlwapi/shreg.c trunk/rostests/winetests/shlwapi/string.c Modified: trunk/rostests/winetests/shlwapi/ordinal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/ordinal… ============================================================================== --- trunk/rostests/winetests/shlwapi/ordinal.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shlwapi/ordinal.c [iso-8859-1] Wed Apr 29 18:59:03 2009 @@ -380,7 +380,9 @@ } psd = pGetShellSecurityDescriptor(NULL, 2); - ok(psd==NULL, "GetShellSecurityDescriptor should fail\n"); + ok(psd==NULL || + broken(psd==INVALID_HANDLE_VALUE), /* IE5 */ + "GetShellSecurityDescriptor should fail\n"); psd = pGetShellSecurityDescriptor(rgsup, 0); ok(psd==NULL, "GetShellSecurityDescriptor should fail\n"); @@ -390,6 +392,11 @@ { /* The previous calls to GetShellSecurityDescriptor don't set the last error */ win_skip("GetShellSecurityDescriptor is not implemented\n"); + return; + } + if (psd==INVALID_HANDLE_VALUE) + { + win_skip("GetShellSecurityDescriptor is broken on IE5\n"); return; } ok(psd!=NULL, "GetShellSecurityDescriptor failed\n"); @@ -464,7 +471,7 @@ HRESULT hres; if(!pSHPackDispParams) - skip("SHPackSidpParams not available\n"); + win_skip("SHPackSidpParams not available\n"); memset(&params, 0xc0, sizeof(params)); memset(vars, 0xc0, sizeof(vars)); @@ -475,7 +482,7 @@ ok(params.rgdispidNamedArgs == NULL, "params.rgdispidNamedArgs = %p\n", params.rgdispidNamedArgs); ok(params.rgvarg == vars, "params.rgvarg = %p\n", params.rgvarg); ok(V_VT(vars) == VT_I4, "V_VT(var) = %d\n", V_VT(vars)); - ok(V_DISPATCH(vars) == (void*)0xdeadbeef, "failed\n"); + ok(V_I4(vars) == 0xdeadbeef, "failed %x\n", V_I4(vars)); memset(&params, 0xc0, sizeof(params)); hres = pSHPackDispParams(&params, NULL, 0, 0); Modified: trunk/rostests/winetests/shlwapi/path.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/path.c?… ============================================================================== --- trunk/rostests/winetests/shlwapi/path.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shlwapi/path.c [iso-8859-1] Wed Apr 29 18:59:03 2009 @@ -392,8 +392,12 @@ /* Some NULL */ wszString2[0] = 'a'; wszString = pPathCombineW(wszString2, NULL, NULL); - ok (wszString == NULL, "Expected a NULL return\n"); - ok (wszString2[0] == 0, "Destination string not empty\n"); + ok (wszString == NULL || + broken(wszString[0] == 'a'), /* Win95 and some W2K */ + "Expected a NULL return\n"); + ok (wszString2[0] == 0 || + broken(wszString2[0] == 'a'), /* Win95 and some W2K */ + "Destination string not empty\n"); HeapFree(GetProcessHeap(), 0, wszString2); @@ -406,7 +410,9 @@ wszString = pPathCombineW(wbuf, wstr1, wstr2); ok(wszString == NULL, "Expected a NULL return\n"); - ok(wbuf[0] == 0, "Buffer contains data\n"); + ok(wbuf[0] == 0 || + broken(wbuf[0] == 0xbfbf), /* Win95 and some W2K */ + "Buffer contains data\n"); /* PathCombineW can be used in place */ wstr1[3] = 0; @@ -465,7 +471,9 @@ lstrcpyA(dest, "control"); str = PathCombineA(dest, "", ""); ok(str == dest, "Expected str == dest, got %p\n", str); - ok(!lstrcmp(str, "\\"), "Expected \\, got %s\n", str); + ok(!lstrcmp(str, "\\") || + broken(!lstrcmp(str, "control")), /* Win95 and some W2K */ + "Expected \\, got %s\n", str); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); /* try NULL directory */ @@ -481,15 +489,23 @@ lstrcpyA(dest, "control"); str = PathCombineA(dest, NULL, ""); ok(str == dest, "Expected str == dest, got %p\n", str); - ok(!lstrcmp(str, "\\"), "Expected \\, got %s\n", str); - ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); + ok(!lstrcmp(str, "\\") || + broken(!lstrcmp(str, "one\\two\\three")), /* Win95 and some W2K */ + "Expected \\, got %s\n", str); + ok(GetLastError() == 0xdeadbeef || + broken(GetLastError() == ERROR_INVALID_PARAMETER), /* Win95 */ + "Expected 0xdeadbeef, got %d\n", GetLastError()); /* try NULL directory and file part */ SetLastError(0xdeadbeef); lstrcpyA(dest, "control"); str = PathCombineA(dest, NULL, NULL); - ok(str == NULL, "Expected str == NULL, got %p\n", str); - ok(lstrlenA(dest) == 0, "Expected 0 length, got %i\n", lstrlenA(dest)); + ok(str == NULL || + broken(str != NULL), /* Win95 and some W2K */ + "Expected str == NULL, got %p\n", str); + ok(lstrlenA(dest) == 0 || + broken(!lstrcmp(dest, "control")), /* Win95 and some W2K */ + "Expected 0 length, got %i\n", lstrlenA(dest)); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); /* try directory without backslash */ @@ -577,7 +593,9 @@ lstrcpyA(dest, "control"); str = PathCombineA(dest, "C:\\", too_long); ok(str == NULL, "Expected str == NULL, got %p\n", str); - ok(lstrlenA(dest) == 0, "Expected 0 length, got %i\n", lstrlenA(dest)); + ok(lstrlenA(dest) == 0 || + broken(!lstrcmp(dest, "control")), /* Win95 and some W2K */ + "Expected 0 length, got %i\n", lstrlenA(dest)); todo_wine ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); /* try a directory longer than MAX_PATH */ @@ -585,7 +603,9 @@ lstrcpyA(dest, "control"); str = PathCombineA(dest, too_long, "one\\two\\three"); ok(str == NULL, "Expected str == NULL, got %p\n", str); - ok(lstrlenA(dest) == 0, "Expected 0 length, got %i\n", lstrlenA(dest)); + ok(lstrlenA(dest) == 0 || + broken(!lstrcmp(dest, "control")), /* Win95 and some W2K */ + "Expected 0 length, got %i\n", lstrlenA(dest)); todo_wine ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); memset(one, 'b', HALF_LEN); @@ -598,7 +618,9 @@ lstrcpyA(dest, "control"); str = PathCombineA(dest, one, two); ok(str == NULL, "Expected str == NULL, got %p\n", str); - ok(lstrlenA(dest) == 0, "Expected 0 length, got %i\n", lstrlenA(dest)); + ok(lstrlenA(dest) == 0 || + broken(!lstrcmp(dest, "control")), /* Win95 and some W2K */ + "Expected 0 length, got %i\n", lstrlenA(dest)); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); } @@ -764,7 +786,9 @@ res = PathAppendA(too_long, "two\\three"); ok(!res, "Expected failure\n"); todo_wine ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); - ok(lstrlen(too_long) == 0, "Expected length of too_long to be zero, got %i\n", lstrlen(too_long)); + ok(lstrlen(too_long) == 0 || + broken(lstrlen(too_long) == (LONG_LEN - 1)), /* Win95 and some W2K */ + "Expected length of too_long to be zero, got %i\n", lstrlen(too_long)); /* pszMore is too long */ lstrcpy(path, "C:\\one"); @@ -774,7 +798,9 @@ res = PathAppendA(path, too_long); ok(!res, "Expected failure\n"); todo_wine ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); - ok(lstrlen(path) == 0, "Expected length of path to be zero, got %i\n", lstrlen(path)); + ok(lstrlen(path) == 0 || + broken(!lstrcmp(path, "C:\\one")), /* Win95 and some W2K */ + "Expected length of path to be zero, got %i\n", lstrlen(path)); /* both params combined are too long */ memset(one, 'a', HALF_LEN); @@ -784,7 +810,9 @@ SetLastError(0xdeadbeef); res = PathAppendA(one, two); ok(!res, "Expected failure\n"); - ok(lstrlen(one) == 0, "Expected length of one to be zero, got %i\n", lstrlen(one)); + ok(lstrlen(one) == 0 || + broken(lstrlen(one) == (HALF_LEN - 1)), /* Win95 and some W2K */ + "Expected length of one to be zero, got %i\n", lstrlen(one)); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); } @@ -810,7 +838,9 @@ res = PathCanonicalizeA(dest, ""); ok(res, "Expected success\n"); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); - ok(!lstrcmp(dest, "\\"), "Expected \\, got %s\n", dest); + ok(!lstrcmp(dest, "\\") || + broken(!lstrcmp(dest, "test")), /* Win95 and some W2K */ + "Expected \\, got %s\n", dest); /* try a NULL dest */ SetLastError(0xdeadbeef); @@ -903,7 +933,9 @@ lstrcpy(dest, "test"); SetLastError(0xdeadbeef); res = PathCanonicalizeA(dest, too_long); - ok(!res, "Expected failure\n"); + ok(!res || + broken(res), /* Win95, some W2K and XP-SP1 */ + "Expected failure\n"); todo_wine { ok(GetLastError() == 0xdeadbeef || GetLastError() == ERROR_FILENAME_EXCED_RANGE /* Vista */, Modified: trunk/rostests/winetests/shlwapi/shreg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/shreg.c… ============================================================================== --- trunk/rostests/winetests/shlwapi/shreg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shlwapi/shreg.c [iso-8859-1] Wed Apr 29 18:59:03 2009 @@ -122,8 +122,12 @@ dwType = -1; dwRet = SHGetValueA(HKEY_CURRENT_USER, REG_TEST_KEY, "Test1", &dwType, buf, &dwSize); ok( ERROR_SUCCESS == dwRet, "SHGetValueA failed, ret=%u\n", dwRet); - ok( 0 == strcmp(sExpTestpath1, buf), "Comparing of (%s) with (%s) failed\n", buf, sExpTestpath1); - ok( REG_SZ == dwType, "Expected REG_SZ, got (%u)\n", dwType); + ok( 0 == strcmp(sExpTestpath1, buf) || + broken(0 == strcmp(sTestpath1, buf)), /* IE4.x */ + "Comparing of (%s) with (%s) failed\n", buf, sExpTestpath1); + ok( REG_SZ == dwType || + broken(REG_EXPAND_SZ == dwType), /* IE4.x */ + "Expected REG_SZ, got (%u)\n", dwType); strcpy(buf, sEmptyBuffer); dwSize = MAX_PATH; @@ -196,7 +200,9 @@ dwSize = 6; dwRet = SHQueryValueExA( hKey, "Test3", NULL, NULL, NULL, &dwSize); ok( ERROR_SUCCESS == dwRet, "%s failed, ret=%u\n", sTestedFunction, dwRet); - ok( dwSize >= nUsedBuffer2, "Buffer size (%u) should be >= (%u)\n", dwSize, nUsedBuffer2); + ok( dwSize >= nUsedBuffer2 || + broken(dwSize == (strlen(sTestpath2) + 1)), /* < IE4.x */ + "Buffer size (%u) should be >= (%u)\n", dwSize, nUsedBuffer2); /* * Case 1 string shrinks during expanding @@ -208,7 +214,9 @@ ok( ERROR_MORE_DATA == dwRet, "Expected ERROR_MORE_DATA, got (%u)\n", dwRet); ok( 0 == strcmp(sEmptyBuffer, buf) , "Comparing (%s) with (%s) failed\n", buf, sEmptyBuffer); ok( dwSize == nUsedBuffer1, "Buffer sizes (%u) and (%u) are not equal\n", dwSize, nUsedBuffer1); - ok( REG_SZ == dwType , "Expected REG_SZ, got (%u)\n", dwType); + ok( REG_SZ == dwType || + broken(REG_EXPAND_SZ == dwType), /* < IE6 */ + "Expected REG_SZ, got (%u)\n", dwType); /* * string grows during expanding @@ -220,8 +228,12 @@ dwRet = SHQueryValueExA( hKey, "Test3", NULL, &dwType, buf, &dwSize); ok( ERROR_MORE_DATA == dwRet, "Expected ERROR_MORE_DATA, got (%u)\n", dwRet); ok( 0 == strcmp(sEmptyBuffer, buf) , "Comparing (%s) with (%s) failed\n", buf, sEmptyBuffer); - ok( dwSize >= nUsedBuffer2, "Buffer size (%u) should be >= (%u)\n", dwSize, nUsedBuffer2); - ok( REG_SZ == dwType , "Expected REG_SZ, got (%u)\n", dwType); + ok( dwSize >= nUsedBuffer2 || + broken(dwSize == (strlen(sTestpath2) + 1)), /* < IE6 */ + "Buffer size (%u) should be >= (%u)\n", dwSize, nUsedBuffer2); + ok( REG_SZ == dwType || + broken(REG_EXPAND_SZ == dwType), /* < IE6 */ + "Expected REG_SZ, got (%u)\n", dwType); /* * string grows during expanding @@ -233,7 +245,10 @@ dwSize = strlen(sEnvvar2) - 2; dwType = -1; dwRet = SHQueryValueExA( hKey, "Test3", NULL, &dwType, buf, &dwSize); - ok( ERROR_MORE_DATA == dwRet, "Expected ERROR_MORE_DATA, got (%u)\n", dwRet); + ok( ERROR_MORE_DATA == dwRet || + broken(ERROR_ENVVAR_NOT_FOUND == dwRet) || /* IE5.5 */ + broken(ERROR_SUCCESS == dwRet), /* < IE5.5*/ + "Expected ERROR_MORE_DATA, got (%u)\n", dwRet); todo_wine { @@ -241,7 +256,9 @@ "Expected empty or unexpanded string (win98), got (%s)\n", buf); } - ok( dwSize >= nUsedBuffer2, "Buffer size (%u) should be >= (%u)\n", dwSize, nUsedBuffer2); + ok( dwSize >= nUsedBuffer2 || + broken(dwSize == (strlen("") + 1)), /* < IE 5.5 */ + "Buffer size (%u) should be >= (%u)\n", dwSize, nUsedBuffer2); ok( REG_SZ == dwType , "Expected REG_SZ, got (%u)\n", dwType); /* @@ -254,15 +271,22 @@ dwSize = nExpLen2 - 4; dwType = -1; dwRet = SHQueryValueExA( hKey, "Test3", NULL, &dwType, buf, &dwSize); - ok( ERROR_MORE_DATA == dwRet, "Expected ERROR_MORE_DATA, got (%u)\n", dwRet); + ok( ERROR_MORE_DATA == dwRet || + broken(ERROR_ENVVAR_NOT_FOUND == dwRet) || /* IE5.5 */ + broken(ERROR_SUCCESS == dwRet), /* < IE5.5 */ + "Expected ERROR_MORE_DATA, got (%u)\n", dwRet); todo_wine { - ok( (0 == strcmp("", buf)) || (0 == strcmp(sEnvvar2, buf)), - "Expected empty or first part of the string \"%s\", got \"%s\"\n", sEnvvar2, buf); + ok( (0 == strcmp("", buf)) || (0 == strcmp(sEnvvar2, buf)) || + broken(0 == strcmp(sTestpath2, buf)), /* IE 5.5 */ + "Expected empty or first part of the string \"%s\", got \"%s\"\n", sEnvvar2, buf); } - ok( dwSize >= nUsedBuffer2, "Buffer size (%u) should be >= (%u)\n", dwSize, nUsedBuffer2); + ok( dwSize >= nUsedBuffer2 || + broken(dwSize == (strlen(sEnvvar2) + 1)) || /* IE4.01 SP1 (W98) and IE5 (W98SE) */ + broken(dwSize == (strlen("") + 1)), /* IE4.01 (NT4) and IE5.x (W2K) */ + "Buffer size (%u) should be >= (%u)\n", dwSize, nUsedBuffer2); ok( REG_SZ == dwType , "Expected REG_SZ, got (%u)\n", dwType); /* @@ -273,7 +297,9 @@ dwType = -1; dwRet = SHQueryValueExA( hKey, "Test3", NULL, &dwType, NULL, &dwSize); ok( ERROR_SUCCESS == dwRet, "%s failed, ret=%u\n", sTestedFunction, dwRet); - ok( dwSize >= nUsedBuffer2, "Buffer size (%u) should be >= (%u)\n", dwSize, nUsedBuffer2); + ok( dwSize >= nUsedBuffer2 || + broken(dwSize == (strlen(sTestpath2) + 1)), /* IE4.01 SP1 (Win98) */ + "Buffer size (%u) should be >= (%u)\n", dwSize, nUsedBuffer2); ok( REG_SZ == dwType , "Expected REG_SZ, got (%u)\n", dwType); RegCloseKey(hKey); Modified: trunk/rostests/winetests/shlwapi/string.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/string.… ============================================================================== --- trunk/rostests/winetests/shlwapi/string.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shlwapi/string.c [iso-8859-1] Wed Apr 29 18:59:03 2009 @@ -504,7 +504,7 @@ if (!pStrFormatByteSize64A) { - skip("StrFormatByteSize64A() is not available. Tests skipped\n"); + win_skip("StrFormatByteSize64A() is not available\n"); return; } @@ -528,7 +528,7 @@ if (!pStrFormatKBSizeW) { - skip("StrFormatKBSizeW() is not available. Tests skipped\n"); + win_skip("StrFormatKBSizeW() is not available\n"); return; } @@ -550,7 +550,7 @@ if (!pStrFormatKBSizeA) { - skip("StrFormatKBSizeA() is not available. Tests skipped\n"); + win_skip("StrFormatKBSizeA() is not available\n"); return; } @@ -596,7 +596,7 @@ ok(!pStrIsIntlEqualA(TRUE, str1, str2, 5), "StrIsIntlEqualA(TRUE,...) isn't case-sensitive\n"); } else - skip("StrIsIntlEqualA() is not available. Tests skipped\n"); + win_skip("StrIsIntlEqualA() is not available\n"); if (pIntlStrEqWorkerA) { @@ -604,7 +604,7 @@ ok(!pIntlStrEqWorkerA(TRUE, str1, str2, 5), "pIntlStrEqWorkerA(TRUE,...) isn't case-sensitive\n"); } else - skip("IntlStrEqWorkerA() is not available. Tests skipped\n"); + win_skip("IntlStrEqWorkerA() is not available\n"); } static void test_StrCmpW(void) @@ -623,7 +623,7 @@ ok(!pStrIsIntlEqualW(TRUE, str1, str2, 5), "StrIsIntlEqualW(TRUE,...) isn't case-sensitive\n"); } else - skip("StrIsIntlEqualW() is not available. Tests skipped\n"); + win_skip("StrIsIntlEqualW() is not available\n"); if (pIntlStrEqWorkerW) { @@ -631,7 +631,7 @@ ok(!pIntlStrEqWorkerW(TRUE, str1, str2, 5), "IntlStrEqWorkerW(TRUE,...) isn't case-sensitive\n"); } else - skip("IntlStrEqWorkerW() is not available. Tests skipped\n"); + win_skip("IntlStrEqWorkerW() is not available\n"); } static WCHAR *CoDupStrW(const char* src) @@ -652,7 +652,7 @@ if (!pStrRetToBSTR) { - skip("StrRetToBSTR() is not available. Tests skipped\n"); + win_skip("StrRetToBSTR() is not available\n"); return; } @@ -690,7 +690,7 @@ if (!pStrCpyNXA) { - skip("StrCpyNXA() is not available. Tests skipped\n"); + win_skip("StrCpyNXA() is not available\n"); return; } @@ -711,7 +711,7 @@ if (!pStrCpyNXW) { - skip("StrCpyNXW() is not available. Tests skipped\n"); + win_skip("StrCpyNXW() is not available\n"); return; } @@ -768,7 +768,7 @@ if (!pSHAnsiToAnsi) { - skip("SHAnsiToAnsi() is not available. Tests skipped\n"); + win_skip("SHAnsiToAnsi() is not available\n"); return; } @@ -789,7 +789,7 @@ if (!pSHUnicodeToUnicode) { - skip("SHUnicodeToUnicode() is not available. Tests skipped\n"); + win_skip("SHUnicodeToUnicode() is not available\n"); return; } @@ -829,7 +829,7 @@ expect_eq(buf[100], '\xbf', CHAR, "%x"); } else - skip("StrCatBuffA() is not available. Tests skipped\n"); + win_skip("StrCatBuffA() is not available\n"); memset(wbuf, 0xbf, sizeof(wbuf)); expect_eq(StrCpyNW(wbuf, wstr1, 10), wbuf, PWCHAR, "%p"); @@ -843,7 +843,7 @@ expect_eq(wbuf[100], (WCHAR)0xbfbf, WCHAR, "%x"); } else - skip("StrCatBuffW() is not available. Tests skipped\n"); + win_skip("StrCatBuffW() is not available\n"); if (pStrRetToBufW) { @@ -855,7 +855,7 @@ expect_eq(wbuf[10], (WCHAR)0xbfbf, WCHAR, "%x"); } else - skip("StrRetToBufW() is not available. Tests skipped\n"); + win_skip("StrRetToBufW() is not available\n"); if (pStrRetToBufA) { @@ -867,7 +867,7 @@ expect_eq(buf[10], (CHAR)0xbf, CHAR, "%x"); } else - skip("StrRetToBufA() is not available. Tests skipped\n"); + win_skip("StrRetToBufA() is not available\n"); if (pwnsprintfA) { @@ -878,7 +878,7 @@ expect_eq(buf[10], (CHAR)0xbf, CHAR, "%x"); } else - skip("wnsprintfA() is not available. Tests skipped\n"); + win_skip("wnsprintfA() is not available\n"); if (pwnsprintfW) { @@ -889,7 +889,7 @@ expect_eq(wbuf[10], (WCHAR)0xbfbf, WCHAR, "%x"); } else - skip("wnsprintfW() is not available. Tests skipped\n"); + win_skip("wnsprintfW() is not available\n"); } START_TEST(string)

1 0

[gedmurphy] 40731: - Add a temporary manifest to servman which contains support for comctl32 v6 and more importantly, support for UAC elevation in NT6+ This will be required for any app which needs to run with elevated privs. As we've previously stated, rbuild needs to generate the manifest hence this is only temporary. We therefore need a UAC tag adding to rbuild so the generated manifest can contain support for UAC elevation for any apps which require it. If anyone wishes to add this support t
by gedmurphy＠svn.reactos.org 29 Apr '09

29 Apr '09

Author: gedmurphy Date: Wed Apr 29 16:09:40 2009 New Revision: 40731 URL: http://svn.reactos.org/svn/reactos?rev=40731&view=rev Log: - Add a temporary manifest to servman which contains support for comctl32 v6 and more importantly, support for UAC elevation in NT6+ This will be required for any app which needs to run with elevated privs. As we've previously stated, rbuild needs to generate the manifest hence this is only temporary. We therefore need a UAC tag adding to rbuild so the generated manifest can contain support for UAC elevation for any apps which require it. If anyone wishes to add this support to rbuild, feel free to do so. Added: trunk/reactos/base/applications/mscutils/servman/manifest.xml (with props) Modified: trunk/reactos/base/applications/mscutils/servman/servman.rc Added: trunk/reactos/base/applications/mscutils/servman/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/manifest.xml (added) +++ trunk/reactos/base/applications/mscutils/servman/manifest.xml [iso-8859-1] Wed Apr 29 16:09:40 2009 @@ -1,0 +1,20 @@ +<?xml version='1.0' encoding='UTF-8' standalone='yes'?> +<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'> + <dependency> + <dependentAssembly> + <assemblyIdentity type='win32' + name='Microsoft.Windows.Common-Controls' + version='6.0.0.0' + processorArchitecture='X86' + publicKeyToken='6595b64144ccf1df' + language='*' /> + </dependentAssembly> + </dependency> + <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> + <security> + <requestedPrivileges> + <requestedExecutionLevel level='highestAvailable' uiAccess='false' /> + </requestedPrivileges> + </security> + </trustInfo> +</assembly> Propchange: trunk/reactos/base/applications/mscutils/servman/manifest.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mscutils/servman/servman.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/servman.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/servman.rc [iso-8859-1] Wed Apr 29 16:09:40 2009 @@ -8,6 +8,8 @@ #define REACTOS_STR_ORIGINAL_FILENAME "servman.exe\0" #include <reactos/version.rc> +1 24 DISCARDABLE "manifest.xml" + #include "rsrc.rc"

1 0

[gedmurphy] 40730: Fix the build and a fix mem leak. We should consider setting msvc to /W4.
by gedmurphy＠svn.reactos.org 29 Apr '09

29 Apr '09

Author: gedmurphy Date: Wed Apr 29 14:18:41 2009 New Revision: 40730 URL: http://svn.reactos.org/svn/reactos?rev=40730&view=rev Log: Fix the build and a fix mem leak. We should consider setting msvc to /W4. Modified: trunk/reactos/base/applications/mscutils/servman/control.c trunk/reactos/base/applications/mscutils/servman/stop.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 29 14:18:41 2009 @@ -16,7 +16,7 @@ { SC_HANDLE hSCManager; SC_HANDLE hSc; - SERVICE_STATUS_PROCESS ServiceStatus; + SERVICE_STATUS_PROCESS ServiceStatus = {0}; SERVICE_STATUS Status; DWORD BytesNeeded = 0; BOOL bRet = FALSE; 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 29 14:18:41 2009 @@ -197,8 +197,6 @@ DoInitDependsDialog(PSTOP_INFO pStopInfo, HWND hDlg) { - SC_HANDLE hSCManager; - SC_HANDLE hService; LPENUM_SERVICE_STATUS lpDependencies; DWORD dwCount; LPTSTR lpPartialStr, lpStr; @@ -277,6 +275,10 @@ 0, (LPARAM)lpEnumServiceStatus->lpDisplayName); } + + HeapFree(ProcessHeap, + 0, + lpDependencies); } } @@ -340,7 +342,6 @@ STOP_INFO stopInfo; SC_HANDLE hSCManager; SC_HANDLE hService; - BOOL bHasDepends; BOOL bRet = FALSE; if (pInfo)

1 0

[mkupfer] 40729: - continue "marletting" - use marlett font for scrollbar control - TODO: scrollbar size grip with marlett
by mkupfer＠svn.reactos.org 29 Apr '09

29 Apr '09

Author: mkupfer Date: Wed Apr 29 13:55:05 2009 New Revision: 40729 URL: http://svn.reactos.org/svn/reactos?rev=40729&view=rev Log: - continue "marletting" - use marlett font for scrollbar control - TODO: scrollbar size grip with marlett Modified: trunk/reactos/dll/win32/user32/windows/draw.c Modified: trunk/reactos/dll/win32/user32/windows/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] Wed Apr 29 13:55:05 2009 @@ -880,59 +880,43 @@ static BOOL UITOOLS95_DrawFrameScroll(HDC dc, LPRECT r, UINT uFlags) { + int colorIdx = uFlags & DFCS_INACTIVE ? COLOR_BTNSHADOW : COLOR_BTNTEXT; + LOGFONT lf; + HFONT hFont, hOldFont; + COLORREF clrsave; + RECT myr; + INT bkmode; + TCHAR Symbol; + // for scrollgripsize POINT Line[4]; - RECT myr; int SmallDiam = UITOOLS_MakeSquareRect(r, &myr) - 2; int i; HBRUSH hbsave, hb, hb2; HPEN hpsave, hp, hp2; int tri = 290*SmallDiam/1000 - 1; int d46, d93; - - /* - * This fixes a problem with really tiny "scroll" buttons. In particular - * with the updown control. - * Making sure that the arrow is as least 3 pixels wide (or high). - */ - if (tri == 0) - tri = 1; - + // end scrollgripsize switch(uFlags & 0xff) { case DFCS_SCROLLCOMBOBOX: case DFCS_SCROLLDOWN: - Line[2].x = myr.left + 470*SmallDiam/1000 + 2; - Line[2].y = myr.top + 687*SmallDiam/1000 + 1; - Line[0].x = Line[2].x - tri; - Line[1].x = Line[2].x + tri; - Line[0].y = Line[1].y = Line[2].y - tri; - break; - - case DFCS_SCROLLUP: - Line[2].x = myr.left + 470*SmallDiam/1000 + 2; - Line[2].y = myr.bottom - (687*SmallDiam/1000 + 1); - Line[0].x = Line[2].x - tri; - Line[1].x = Line[2].x + tri; - Line[0].y = Line[1].y = Line[2].y + tri; - break; - - case DFCS_SCROLLLEFT: - Line[2].x = myr.right - (687*SmallDiam/1000 + 1); - Line[2].y = myr.top + 470*SmallDiam/1000 + 2; - Line[0].y = Line[2].y - tri; - Line[1].y = Line[2].y + tri; - Line[0].x = Line[1].x = Line[2].x + tri; - break; - - case DFCS_SCROLLRIGHT: - Line[2].x = myr.left + 687*SmallDiam/1000 + 1; - Line[2].y = myr.top + 470*SmallDiam/1000 + 2; - Line[0].y = Line[2].y - tri; - Line[1].y = Line[2].y + tri; - Line[0].x = Line[1].x = Line[2].x - tri; - break; - - case DFCS_SCROLLSIZEGRIP: + Symbol = '6'; + break; + + case DFCS_SCROLLUP: + Symbol = '5'; + break; + + case DFCS_SCROLLLEFT: + Symbol = '3'; + break; + + case DFCS_SCROLLRIGHT: + Symbol = '4'; + break; + + case DFCS_SCROLLSIZEGRIP: + // FIXME: needs to use marlett too, copied for compatibility only /* This one breaks the flow... */ IntDrawRectEdge(dc, r, EDGE_BUMP, BF_MIDDLE | ((uFlags&(DFCS_MONO|DFCS_FLAT)) ? BF_MONO : 0)); hpsave = (HPEN)SelectObject(dc, GetStockObject(NULL_PEN)); @@ -1005,42 +989,50 @@ SelectObject(dc, hpsave); SelectObject(dc, hbsave); return TRUE; - - default: + case DFCS_SCROLLSIZEGRIPRIGHT: + return FALSE; // unimplemented yet + default: return FALSE; } - - /* Here do the real scroll-bar controls end up */ - if( ! (uFlags & (0xff00 & ~DFCS_ADJUSTRECT)) ) - /* UITOOLS95_DFC_ButtonPush always uses BF_SOFT which we don't */ - /* want for the normal scroll-arrow button. */ - IntDrawRectEdge( dc, r, EDGE_RAISED, (uFlags&DFCS_ADJUSTRECT) | BF_MIDDLE | BF_RECT); + if(uFlags & DFCS_PUSHED) + IntDrawRectEdge(dc,r,EDGE_SUNKEN, BF_RECT | BF_MIDDLE | BF_SOFT); else - UITOOLS95_DFC_ButtonPush(dc, r, (uFlags & 0xff00) ); - + IntDrawRectEdge(dc,r,BDR_RAISEDINNER | BDR_RAISEDOUTER, BF_RECT | + BF_SOFT | BF_MIDDLE); + ZeroMemory(&lf, sizeof(LOGFONT)); + UITOOLS_MakeSquareRect(r, &myr); + myr.left += 1; + myr.top += 1; + myr.right -= 1; + myr.bottom -= 1; + if(uFlags & DFCS_PUSHED) + OffsetRect(&myr,1,1); + lf.lfHeight = myr.bottom - myr.top; + lf.lfWidth = 0; + lf.lfWeight = FW_NORMAL; + lf.lfCharSet = DEFAULT_CHARSET; + lstrcpy(lf.lfFaceName, TEXT("Marlett")); + hFont = CreateFontIndirect(&lf); + /* save font and text color */ + hOldFont = SelectObject(dc, hFont); + clrsave = GetTextColor(dc); + bkmode = GetBkMode(dc); + /* set color and drawing mode */ + SetBkMode(dc, TRANSPARENT); if(uFlags & DFCS_INACTIVE) { - hbsave = (HBRUSH)SelectObject(dc, GetSysColorBrush(COLOR_BTNHIGHLIGHT)); - hpsave = (HPEN)SelectObject(dc, GetSysColorPen(COLOR_BTNHIGHLIGHT)); - Polygon(dc, Line, 3); - SelectObject(dc, hpsave); - SelectObject(dc, hbsave); - } - - if( (uFlags & DFCS_INACTIVE) || !(uFlags & DFCS_PUSHED) ) - for(i = 0; i < 3; i++) - { - Line[i].x--; - Line[i].y--; - } - - i = uFlags & DFCS_INACTIVE ? COLOR_BTNSHADOW : COLOR_BTNTEXT; - hbsave = (HBRUSH)SelectObject(dc, GetSysColorBrush(i)); - hpsave = (HPEN)SelectObject(dc, GetSysColorPen(i)); - Polygon(dc, Line, 3); - SelectObject(dc, hpsave); - SelectObject(dc, hbsave); - + /* draw shadow */ + SetTextColor(dc, GetSysColor(COLOR_BTNHIGHLIGHT)); + TextOut(dc, myr.left + 1, myr.top + 1, &Symbol, 1); + } + SetTextColor(dc, GetSysColor(colorIdx)); + /* draw selected symbol */ + TextOut(dc, myr.left, myr.top, &Symbol, 1); + /* restore previous settings */ + SetTextColor(dc, clrsave); + SelectObject(dc, hOldFont); + SetBkMode(dc, bkmode); + DeleteObject(hFont); return TRUE; } @@ -1054,6 +1046,10 @@ case DFCS_MENUARROW: Symbol = '8'; break; + + case DFCS_MENUARROWRIGHT: + Symbol = 'w'; // FIXME: needs to confirm + break; case DFCS_MENUBULLET: Symbol = 'h';

1 0

[gedmurphy] 40728: - Add the list of dependencies to the listbox so we know what else will be stopping - Restructure the stop code
by gedmurphy＠svn.reactos.org 29 Apr '09

29 Apr '09

Author: gedmurphy Date: Wed Apr 29 13:53:10 2009 New Revision: 40728 URL: http://svn.reactos.org/svn/reactos?rev=40728&view=rev Log: - Add the list of dependencies to the listbox so we know what else will be stopping - Restructure the stop code Modified: trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc trunk/reactos/base/applications/mscutils/servman/resource.h trunk/reactos/base/applications/mscutils/servman/start.c trunk/reactos/base/applications/mscutils/servman/stop.c Modified: trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc [iso-8859-1] Wed Apr 29 13:53:10 2009 @@ -154,7 +154,7 @@ BEGIN ICON IDI_WARNING, IDC_STATIC, 10, 8, 24, 22 LTEXT "", IDC_STOP_DEPENDS, 40, 8, 170, 25 - EDITTEXT IDC_DEL_DESC, 15, 40, 210, 60, WS_CHILD | WS_VISIBLE | WS_EX_STATICEDGE | ES_MULTILINE | ES_READONLY + LISTBOX IDC_STOP_DEPENDS_LB, 15, 40, 210, 70, WS_CHILD | WS_VISIBLE | WS_EX_STATICEDGE | LBS_NOSEL LTEXT "Do you want to stop these services?",IDC_STATIC, 15, 110, 150, 10 DEFPUSHBUTTON "Yes", IDOK, 60, 129, 54, 14 PUSHBUTTON "No", IDCANCEL, 120, 129, 54, 14 Modified: trunk/reactos/base/applications/mscutils/servman/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/resource.h [iso-8859-1] Wed Apr 29 13:53:10 2009 @@ -178,4 +178,5 @@ /* stop dependencies */ #define IDD_DLG_DEPEND_STOP 12000 #define IDC_STOP_DEPENDS 12001 -#define IDS_STOP_DEPENDS 12001 +#define IDS_STOP_DEPENDS 12002 +#define IDC_STOP_DEPENDS_LB 12003 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 29 13:53:10 2009 @@ -23,22 +23,22 @@ DWORD dwMaxWait; BOOL bRet = FALSE; - hSCManager = OpenSCManagerW(NULL, - NULL, - SC_MANAGER_ALL_ACCESS); + hSCManager = OpenSCManager(NULL, + NULL, + SC_MANAGER_ALL_ACCESS); if (!hSCManager) { return FALSE; } - hService = OpenServiceW(hSCManager, - Info->pCurrentService->lpServiceName, - SERVICE_START | SERVICE_QUERY_STATUS); + hService = OpenService(hSCManager, + Info->pCurrentService->lpServiceName, + SERVICE_START | SERVICE_QUERY_STATUS); if (hService) { - bRet = StartServiceW(hService, - 0, - NULL); + bRet = StartService(hService, + 0, + NULL); if (!bRet && GetLastError() == ERROR_SERVICE_ALREADY_RUNNING) { bRet = TRUE; 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 29 13:53:10 2009 @@ -9,8 +9,16 @@ #include "precomp.h" +typedef struct _STOP_INFO +{ + PMAIN_WND_INFO pInfo; + SC_HANDLE hSCManager; + SC_HANDLE hMainService; +} STOP_INFO, *PSTOP_INFO; + + static BOOL -StopService(PMAIN_WND_INFO pInfo, +StopService(PSTOP_INFO pStopInfo, SC_HANDLE hService) { SERVICE_STATUS_PROCESS ServiceStatus; @@ -23,8 +31,8 @@ dwStartTime = GetTickCount(); dwTimeout = 30000; // 30 secs - hProgDlg = CreateProgressDialog(pInfo->hMainWnd, - pInfo->pCurrentService->lpServiceName, + hProgDlg = CreateProgressDialog(pStopInfo->pInfo->hMainWnd, + pStopInfo->pInfo->pCurrentService->lpServiceName, IDS_PROGRESS_INFO_STOP); if (hProgDlg) { @@ -67,8 +75,7 @@ } static LPENUM_SERVICE_STATUS -GetDependentServices(PMAIN_WND_INFO pInfo, - SC_HANDLE hService, +GetDependentServices(SC_HANDLE hService, LPDWORD lpdwCount) { LPENUM_SERVICE_STATUS lpDependencies; @@ -88,7 +95,7 @@ else { if (GetLastError() != ERROR_MORE_DATA) - return NULL; // Unexpected error + return NULL; /* Unexpected error */ lpDependencies = (LPENUM_SERVICE_STATUS)HeapAlloc(GetProcessHeap(), 0, @@ -120,8 +127,7 @@ } static BOOL -StopDependentServices(PMAIN_WND_INFO pInfo, - SC_HANDLE hSCManager, +StopDependentServices(PSTOP_INFO pStopInfo, SC_HANDLE hService) { LPENUM_SERVICE_STATUS lpDependencies; @@ -129,7 +135,7 @@ DWORD dwCount; BOOL bRet = FALSE; - lpDependencies = GetDependentServices(pInfo, hService, &dwCount); + lpDependencies = GetDependentServices(hService, &dwCount); if (lpDependencies) { LPENUM_SERVICE_STATUS lpEnumServiceStatus; @@ -139,12 +145,12 @@ { lpEnumServiceStatus = &lpDependencies[i]; - hDepService = OpenService(hSCManager, + hDepService = OpenService(pStopInfo->hSCManager, lpEnumServiceStatus->lpServiceName, SERVICE_STOP | SERVICE_QUERY_STATUS); if (hDepService) { - bRet = StopService(pInfo, hDepService); + bRet = StopService(pStopInfo, hDepService); CloseServiceHandle(hDepService); @@ -165,57 +171,46 @@ } static BOOL -HasDependentServices(PMAIN_WND_INFO pInfo) +HasDependentServices(SC_HANDLE hService) +{ + DWORD dwBytesNeeded, dwCount; + BOOL bRet = FALSE; + + if (hService) + { + if (!EnumDependentServices(hService, + SERVICE_ACTIVE, + NULL, + 0, + &dwBytesNeeded, + &dwCount)) + { + if (GetLastError() == ERROR_MORE_DATA) + bRet = TRUE; + } + } + + return bRet; +} + +static BOOL +DoInitDependsDialog(PSTOP_INFO pStopInfo, + HWND hDlg) { SC_HANDLE hSCManager; SC_HANDLE hService; - DWORD dwBytesNeeded, dwCount; - BOOL bRet = FALSE; - - hSCManager = OpenSCManagerW(NULL, - NULL, - SC_MANAGER_ALL_ACCESS); - if (hSCManager) - { - hService = OpenServiceW(hSCManager, - pInfo->pCurrentService->lpServiceName, - SERVICE_ENUMERATE_DEPENDENTS); - if (hService) - { - if (!EnumDependentServices(hService, - SERVICE_ACTIVE, - NULL, - 0, - &dwBytesNeeded, - &dwCount)) - { - if (GetLastError() == ERROR_MORE_DATA) - bRet = TRUE; - } - - CloseServiceHandle(hService); - } - - CloseServiceHandle(hSCManager); - } - - return bRet; -} - -static BOOL -DoInitDependsDialog(PMAIN_WND_INFO pInfo, - HWND hDlg) -{ + LPENUM_SERVICE_STATUS lpDependencies; + DWORD dwCount; LPTSTR lpPartialStr, lpStr; DWORD fullLen; HICON hIcon = NULL; BOOL bRet = FALSE; - if (pInfo) + if (pStopInfo) { SetWindowLongPtr(hDlg, GWLP_USERDATA, - (LONG_PTR)pInfo); + (LONG_PTR)pStopInfo); hIcon = (HICON)LoadImage(hInstance, MAKEINTRESOURCE(IDI_SM_ICON), @@ -232,18 +227,19 @@ DestroyIcon(hIcon); } + /* Add the label */ if (AllocAndLoadString(&lpPartialStr, hInstance, IDS_STOP_DEPENDS)) { - fullLen = _tcslen(lpPartialStr) + _tcslen(pInfo->pCurrentService->lpDisplayName) + 1; + fullLen = _tcslen(lpPartialStr) + _tcslen(pStopInfo->pInfo->pCurrentService->lpDisplayName) + 1; lpStr = HeapAlloc(ProcessHeap, 0, fullLen * sizeof(TCHAR)); if (lpStr) { - _sntprintf(lpStr, fullLen, lpPartialStr, pInfo->pCurrentService->lpDisplayName); + _sntprintf(lpStr, fullLen, lpPartialStr, pStopInfo->pInfo->pCurrentService->lpDisplayName); SendDlgItemMessage(hDlg, IDC_STOP_DEPENDS, @@ -262,6 +258,26 @@ 0, lpPartialStr); } + + /* Get the list of dependencies */ + lpDependencies = GetDependentServices(pStopInfo->hMainService, &dwCount); + if (lpDependencies) + { + LPENUM_SERVICE_STATUS lpEnumServiceStatus; + DWORD i; + + for (i = 0; i < dwCount; i++) + { + lpEnumServiceStatus = &lpDependencies[i]; + + /* Add the service to the listbox */ + SendDlgItemMessage(hDlg, + IDC_STOP_DEPENDS_LB, + LB_ADDSTRING, + 0, + (LPARAM)lpEnumServiceStatus->lpDisplayName); + } + } } return bRet; @@ -270,17 +286,16 @@ INT_PTR CALLBACK StopDependsDialogProc(HWND hDlg, - UINT message, - WPARAM wParam, - LPARAM lParam) -{ - PMAIN_WND_INFO pInfo = NULL; - + UINT message, + WPARAM wParam, + LPARAM lParam) +{ + PSTOP_INFO pStopInfo = NULL; /* Get the window context */ - pInfo = (PMAIN_WND_INFO)GetWindowLongPtr(hDlg, + pStopInfo = (PSTOP_INFO)GetWindowLongPtr(hDlg, GWLP_USERDATA); - if (pInfo == NULL && message != WM_INITDIALOG) + if (pStopInfo == NULL && message != WM_INITDIALOG) { return FALSE; } @@ -291,10 +306,10 @@ { BOOL bRet = FALSE; - pInfo = (PMAIN_WND_INFO)lParam; - if (pInfo != NULL) - { - bRet = DoInitDependsDialog(pInfo, hDlg); + pStopInfo = (PSTOP_INFO)lParam; + if (pStopInfo != NULL) + { + bRet = DoInitDependsDialog(pStopInfo, hDlg); } return bRet; @@ -322,47 +337,55 @@ BOOL DoStop(PMAIN_WND_INFO pInfo) { - SC_HANDLE hSCManager = NULL; + STOP_INFO stopInfo; + SC_HANDLE hSCManager; SC_HANDLE hService; BOOL bHasDepends; BOOL bRet = FALSE; - bHasDepends = HasDependentServices(pInfo); - if (bHasDepends) - { - INT ret = DialogBoxParam(hInstance, - MAKEINTRESOURCE(IDD_DLG_DEPEND_STOP), - pInfo->hMainWnd, - StopDependsDialogProc, - (LPARAM)pInfo); - if (ret != IDOK) - return FALSE; - } - - hSCManager = OpenSCManager(NULL, - NULL, - SC_MANAGER_ALL_ACCESS); - if (hSCManager) - { - hService = OpenService(hSCManager, - pInfo->pCurrentService->lpServiceName, - SERVICE_STOP | SERVICE_QUERY_STATUS | SERVICE_ENUMERATE_DEPENDENTS); - if (hService) - { - if (bHasDepends) - { - StopDependentServices(pInfo, - hSCManager, - hService); - } - - bRet = StopService(pInfo, hService); - - CloseServiceHandle(hService); - } - - CloseServiceHandle(hSCManager); - } - - return bRet; -} + if (pInfo) + { + stopInfo.pInfo = pInfo; + + hSCManager = OpenSCManager(NULL, + NULL, + SC_MANAGER_ALL_ACCESS); + if (hSCManager) + { + hService = OpenService(hSCManager, + pInfo->pCurrentService->lpServiceName, + SERVICE_STOP | SERVICE_QUERY_STATUS | SERVICE_ENUMERATE_DEPENDENTS); + if (hService) + { + stopInfo.hSCManager = hSCManager; + stopInfo.hMainService = hService; + + if (HasDependentServices(hService)) + { + INT ret = DialogBoxParam(hInstance, + MAKEINTRESOURCE(IDD_DLG_DEPEND_STOP), + pInfo->hMainWnd, + StopDependsDialogProc, + (LPARAM)&stopInfo); + if (ret == IDOK) + { + if (StopDependentServices(&stopInfo, hService)) + { + bRet = StopService(&stopInfo, hService); + } + } + } + else + { + bRet = StopService(&stopInfo, hService); + } + + CloseServiceHandle(hService); + } + + CloseServiceHandle(hSCManager); + } + } + + return bRet; +}

1 0

[fireball] 40727: - Debug pool allocator: Add support for paged pool debugging.
by fireball＠svn.reactos.org 29 Apr '09

29 Apr '09

Author: fireball Date: Wed Apr 29 13:48:31 2009 New Revision: 40727 URL: http://svn.reactos.org/svn/reactos?rev=40727&view=rev Log: - Debug pool allocator: Add support for paged pool debugging. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/dbgpool.c trunk/reactos/ntoskrnl/mm/pool.c Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Wed Apr 29 13:48:31 2009 @@ -574,7 +574,7 @@ VOID NTAPI -ExpFreeDebugPool(PVOID Block); +ExpFreeDebugPool(PVOID Block, BOOLEAN PagedPool); VOID NTAPI Modified: trunk/reactos/ntoskrnl/mm/dbgpool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/dbgpool.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/dbgpool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/dbgpool.c [iso-8859-1] Wed Apr 29 13:48:31 2009 @@ -91,7 +91,7 @@ VOID NTAPI -ExpFreeDebugPool(PVOID Block) +ExpFreeDebugPool(PVOID Block, BOOLEAN PagedPool) { PEI_WHOLE_PAGE_HEADER Header; PVOID ProtectedPage; @@ -111,7 +111,10 @@ MmSetPageProtect(NULL, ProtectedPage, PAGE_READWRITE); /* Free storage */ - ExFreeNonPagedPool(Header->ActualAddress); + if (PagedPool) + ExFreePagedPool(Header->ActualAddress); + else + ExFreeNonPagedPool(Header->ActualAddress); } /* EOF */ Modified: trunk/reactos/ntoskrnl/mm/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pool.c?rev=407… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pool.c [iso-8859-1] Wed Apr 29 13:48:31 2009 @@ -58,7 +58,12 @@ { if (KeGetCurrentIrql() > APC_LEVEL) KeBugCheckEx(BAD_POOL_CALLER, 0x08, KeGetCurrentIrql(), PoolType, Tag); - Block = ExAllocatePagedPoolWithTag(PoolType, NumberOfBytes, Tag); +#ifdef DEBUG_PPOOL + if (ExpIsPoolTagDebuggable(Tag)) + Block = ExpAllocateDebugPool(PoolType, NumberOfBytes, Tag, Caller, TRUE); + else +#endif + Block = ExAllocatePagedPoolWithTag(PoolType, NumberOfBytes, Tag); } else { @@ -277,7 +282,12 @@ (ULONG_PTR)Block); /* Free from paged pool */ - ExFreePagedPool(Block); +#ifdef DEBUG_PPOOL + if (ExpIsPoolTagDebuggable(Tag)) + ExpFreeDebugPool(Block, TRUE); + else +#endif + ExFreePagedPool(Block); } /* Check for non-paged pool */ @@ -303,7 +313,7 @@ /* Free from non-paged pool */ #ifdef DEBUG_NPOOL if (ExpIsPoolTagDebuggable(Tag)) - ExpFreeDebugPool(Block); + ExpFreeDebugPool(Block, FALSE); else #endif ExFreeNonPagedPool(Block);

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