Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 70191: [MSHTML] Sync with Wine Staging 1.7.55. [APPWIZ][BOOTDATA] Update gecko package to 2.40. CORE-10536
by akhaldi＠svn.reactos.org 28 Nov '15

28 Nov '15

Author: akhaldi Date: Sat Nov 28 21:10:43 2015 New Revision: 70191 URL: http://svn.reactos.org/svn/reactos?rev=70191&view=rev Log: [MSHTML] Sync with Wine Staging 1.7.55. [APPWIZ][BOOTDATA] Update gecko package to 2.40. CORE-10536 Added: trunk/reactos/dll/win32/mshtml/htmlarea.c (with props) trunk/reactos/dll/win32/mshtml/xmlhttprequest.c (with props) Modified: trunk/reactos/boot/bootdata/packages/reactos.dff.in trunk/reactos/dll/cpl/appwiz/addons.c trunk/reactos/dll/win32/mshtml/CMakeLists.txt trunk/reactos/dll/win32/mshtml/binding.h trunk/reactos/dll/win32/mshtml/editor.c trunk/reactos/dll/win32/mshtml/guid.c trunk/reactos/dll/win32/mshtml/htmlanchor.c trunk/reactos/dll/win32/mshtml/htmlattr.c trunk/reactos/dll/win32/mshtml/htmlbody.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/htmlelemcol.c trunk/reactos/dll/win32/mshtml/htmlembed.c trunk/reactos/dll/win32/mshtml/htmlevent.c trunk/reactos/dll/win32/mshtml/htmlevent.h trunk/reactos/dll/win32/mshtml/htmlform.c trunk/reactos/dll/win32/mshtml/htmlframe.c trunk/reactos/dll/win32/mshtml/htmlframebase.c trunk/reactos/dll/win32/mshtml/htmlgeneric.c trunk/reactos/dll/win32/mshtml/htmlhead.c trunk/reactos/dll/win32/mshtml/htmliframe.c trunk/reactos/dll/win32/mshtml/htmlimg.c trunk/reactos/dll/win32/mshtml/htmlinput.c trunk/reactos/dll/win32/mshtml/htmllink.c trunk/reactos/dll/win32/mshtml/htmllocation.c trunk/reactos/dll/win32/mshtml/htmlmeta.c trunk/reactos/dll/win32/mshtml/htmlnode.c trunk/reactos/dll/win32/mshtml/htmlobject.c trunk/reactos/dll/win32/mshtml/htmloption.c trunk/reactos/dll/win32/mshtml/htmlscript.c trunk/reactos/dll/win32/mshtml/htmlselect.c trunk/reactos/dll/win32/mshtml/htmlstyle.c trunk/reactos/dll/win32/mshtml/htmlstyle3.c trunk/reactos/dll/win32/mshtml/htmlstyleelem.c trunk/reactos/dll/win32/mshtml/htmltable.c trunk/reactos/dll/win32/mshtml/htmltablecell.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/main.c trunk/reactos/dll/win32/mshtml/mshtml_private.h trunk/reactos/dll/win32/mshtml/navigate.c trunk/reactos/dll/win32/mshtml/nsembed.c trunk/reactos/dll/win32/mshtml/nsiface.idl trunk/reactos/dll/win32/mshtml/nsio.c trunk/reactos/dll/win32/mshtml/olecmd.c trunk/reactos/dll/win32/mshtml/omnavigator.c trunk/reactos/dll/win32/mshtml/persist.c trunk/reactos/dll/win32/mshtml/pluginhost.c trunk/reactos/dll/win32/mshtml/pluginhost.h trunk/reactos/dll/win32/mshtml/protocol.c trunk/reactos/dll/win32/mshtml/script.c trunk/reactos/dll/win32/mshtml/selection.c trunk/reactos/dll/win32/mshtml/service.c trunk/reactos/dll/win32/mshtml/txtrange.c trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/boot/bootdata/packages/reactos.dff.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… Modified: trunk/reactos/dll/cpl/appwiz/addons.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/addons.c?re… Modified: trunk/reactos/dll/win32/mshtml/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/CMakeList… Modified: trunk/reactos/dll/win32/mshtml/binding.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/binding.h… Modified: trunk/reactos/dll/win32/mshtml/editor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/editor.c?… Modified: trunk/reactos/dll/win32/mshtml/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/guid.c?re… Modified: trunk/reactos/dll/win32/mshtml/htmlanchor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlancho… Added: trunk/reactos/dll/win32/mshtml/htmlarea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlarea.… Modified: trunk/reactos/dll/win32/mshtml/htmlattr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlattr.… Modified: trunk/reactos/dll/win32/mshtml/htmlbody.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlbody.… 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/htmlelemcol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlelemc… Modified: trunk/reactos/dll/win32/mshtml/htmlembed.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlembed… 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/htmlevent.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlevent… Modified: trunk/reactos/dll/win32/mshtml/htmlform.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlform.… Modified: trunk/reactos/dll/win32/mshtml/htmlframe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlframe… Modified: trunk/reactos/dll/win32/mshtml/htmlframebase.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlframe… Modified: trunk/reactos/dll/win32/mshtml/htmlgeneric.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlgener… Modified: trunk/reactos/dll/win32/mshtml/htmlhead.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlhead.… Modified: trunk/reactos/dll/win32/mshtml/htmliframe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlifram… 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/htmllink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmllink.… Modified: trunk/reactos/dll/win32/mshtml/htmllocation.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmllocat… Modified: trunk/reactos/dll/win32/mshtml/htmlmeta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlmeta.… 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/htmlobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlobjec… Modified: trunk/reactos/dll/win32/mshtml/htmloption.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmloptio… Modified: trunk/reactos/dll/win32/mshtml/htmlscript.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlscrip… 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/htmlstyle3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlstyle… Modified: trunk/reactos/dll/win32/mshtml/htmlstyleelem.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/htmltablecell.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/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/main.c?re… 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/navigate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/navigate.… Modified: trunk/reactos/dll/win32/mshtml/nsembed.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/nsembed.c… Modified: trunk/reactos/dll/win32/mshtml/nsiface.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/nsiface.i… Modified: trunk/reactos/dll/win32/mshtml/nsio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/nsio.c?re… Modified: trunk/reactos/dll/win32/mshtml/olecmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/olecmd.c?… 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/pluginhost.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/pluginhos… Modified: trunk/reactos/dll/win32/mshtml/pluginhost.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/pluginhos… 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/script.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/script.c?… Modified: trunk/reactos/dll/win32/mshtml/selection.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/selection… Modified: trunk/reactos/dll/win32/mshtml/service.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/service.c… Modified: trunk/reactos/dll/win32/mshtml/txtrange.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/txtrange.… Added: trunk/reactos/dll/win32/mshtml/xmlhttprequest.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/xmlhttpre… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

[akhaldi] 70190: [PSDK] Update mshtmdid.h and mshtml.idl. CORE-10536
by akhaldi＠svn.reactos.org 28 Nov '15

28 Nov '15

Author: akhaldi Date: Sat Nov 28 18:53:53 2015 New Revision: 70190 URL: http://svn.reactos.org/svn/reactos?rev=70190&view=rev Log: [PSDK] Update mshtmdid.h and mshtml.idl. CORE-10536 Modified: trunk/reactos/include/psdk/mshtmdid.h trunk/reactos/include/psdk/mshtml.idl Modified: trunk/reactos/include/psdk/mshtmdid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mshtmdid.h?re… ============================================================================== --- trunk/reactos/include/psdk/mshtmdid.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mshtmdid.h [iso-8859-1] Sat Nov 28 18:53:53 2015 @@ -1759,6 +1759,10 @@ #define DISPID_IHTMLSELECTIONOBJECT_CLEAR (DISPID_SELECTOBJ+3) #define DISPID_IHTMLSELECTIONOBJECT_TYPE (DISPID_SELECTOBJ+4) +/* IHTMLSelectionObject2 */ +#define DISPID_IHTMLSELECTIONOBJECT2_CREATERANGECOLLECTION DISPID_SELECTOBJ+5 +#define DISPID_IHTMLSELECTIONOBJECT2_TYPEDETAIL DISPID_SELECTOBJ+6 + /* IHTMLSelection */ #define DISPID_IHTMLSELECTION_ANCHORNODE DISPID_HTMLSELECTION+1 #define DISPID_IHTMLSELECTION_ANCHOROFFSET DISPID_HTMLSELECTION+2 @@ -2481,6 +2485,31 @@ #define DISPID_IHTMLANCHORELEMENT3_IE8_SHAPE DISPID_IE8_ANCHOR+1 #define DISPID_IHTMLANCHORELEMENT3_IE8_COORDS DISPID_IE8_ANCHOR+2 #define DISPID_IHTMLANCHORELEMENT3_IE8_HREF DISPID_IE8_ANCHOR+3 + +/* IHTMLAreaElement */ +#define DISPID_IHTMLAREAELEMENT_SHAPE DISPID_AREA+1 +#define DISPID_IHTMLAREAELEMENT_COORDS DISPID_AREA+2 +#define DISPID_IHTMLAREAELEMENT_HREF DISPID_VALUE +#define DISPID_IHTMLAREAELEMENT_TARGET DISPID_AREA+4 +#define DISPID_IHTMLAREAELEMENT_ALT DISPID_AREA+5 +#define DISPID_IHTMLAREAELEMENT_NOHREF DISPID_AREA+6 +#define DISPID_IHTMLAREAELEMENT_HOST DISPID_AREA+7 +#define DISPID_IHTMLAREAELEMENT_HOSTNAME DISPID_AREA+8 +#define DISPID_IHTMLAREAELEMENT_PATHNAME DISPID_AREA+9 +#define DISPID_IHTMLAREAELEMENT_PORT DISPID_AREA+10 +#define DISPID_IHTMLAREAELEMENT_PROTOCOL DISPID_AREA+11 +#define DISPID_IHTMLAREAELEMENT_SEARCH DISPID_AREA+12 +#define DISPID_IHTMLAREAELEMENT_HASH DISPID_AREA+13 +#define DISPID_IHTMLAREAELEMENT_ONBLUR DISPID_EVPROP_ONBLUR +#define DISPID_IHTMLAREAELEMENT_ONFOCUS DISPID_EVPROP_ONFOCUS +#define DISPID_IHTMLAREAELEMENT_TABINDEX STDPROPID_XOBJ_TABINDEX +#define DISPID_IHTMLAREAELEMENT_FOCUS DISPID_SITE+0 +#define DISPID_IHTMLAREAELEMENT_BLUR DISPID_SITE+2 + +/* IHTMLAreaElement2 */ +#define DISPID_IHTMLAREAELEMENT2_IE8_SHAPE DISPID_IE8_AREA+1 +#define DISPID_IHTMLAREAELEMENT2_IE8_COORDS DISPID_IE8_AREA+2 +#define DISPID_IHTMLAREAELEMENT2_IE8_HREF DISPID_IE8_AREA+3 /* IHTMLLabelElement */ #define DISPID_IHTMLLABELELEMENT_HTMLFOR DISPID_LABEL Modified: trunk/reactos/include/psdk/mshtml.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mshtml.idl?re… ============================================================================== --- trunk/reactos/include/psdk/mshtml.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mshtml.idl [iso-8859-1] Sat Nov 28 18:53:53 2015 @@ -9158,6 +9158,233 @@ } /***************************************************************************** + * IHTMLAreaElement interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f265-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLAreaElement : IDispatch +{ + [propput, id(DISPID_IHTMLAREAELEMENT_SHAPE)] + HRESULT shape([in] BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT_SHAPE)] + HRESULT shape([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLAREAELEMENT_COORDS)] + HRESULT coords([in] BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT_COORDS)] + HRESULT coords([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLAREAELEMENT_HREF)] + HRESULT href([in] BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT_HREF)] + HRESULT href([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLAREAELEMENT_TARGET)] + HRESULT target([in] BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT_TARGET)] + HRESULT target([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLAREAELEMENT_ALT)] + HRESULT alt([in] BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT_ALT)] + HRESULT alt([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLAREAELEMENT_NOHREF)] + HRESULT noHref([in] VARIANT_BOOL v); + + [propget, id(DISPID_IHTMLAREAELEMENT_NOHREF)] + HRESULT noHref([retval, out] VARIANT_BOOL *p); + + [propput, id(DISPID_IHTMLAREAELEMENT_HOST)] + HRESULT host([in] BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT_HOST)] + HRESULT host([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLAREAELEMENT_HOSTNAME)] + HRESULT hostname([in] BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT_HOSTNAME)] + HRESULT hostname([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLAREAELEMENT_PATHNAME)] + HRESULT pathname([in] BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT_PATHNAME)] + HRESULT pathname([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLAREAELEMENT_PORT)] + HRESULT port([in] BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT_PORT)] + HRESULT port([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLAREAELEMENT_PROTOCOL)] + HRESULT protocol([in] BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT_PROTOCOL)] + HRESULT protocol([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLAREAELEMENT_SEARCH)] + HRESULT search([in] BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT_SEARCH)] + HRESULT search([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLAREAELEMENT_HASH)] + HRESULT hash([in] BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT_HASH)] + HRESULT hash([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLAREAELEMENT_ONBLUR), displaybind, bindable] + HRESULT onblur([in] VARIANT v); + + [propget, id(DISPID_IHTMLAREAELEMENT_ONBLUR), displaybind, bindable] + HRESULT onblur([retval, out] VARIANT *p); + + [propput, id(DISPID_IHTMLAREAELEMENT_ONFOCUS), displaybind, bindable] + HRESULT onfocus([in] VARIANT v); + + [propget, id(DISPID_IHTMLAREAELEMENT_ONFOCUS), displaybind, bindable] + HRESULT onfocus([retval, out] VARIANT *p); + + [propput, id(DISPID_IHTMLAREAELEMENT_TABINDEX), displaybind, bindable] + HRESULT tabIndex([in] short v); + + [propget, id(DISPID_IHTMLAREAELEMENT_TABINDEX), displaybind, bindable] + HRESULT tabIndex([retval, out] short *p); + + [id(DISPID_IHTMLAREAELEMENT_FOCUS)] + HRESULT focus(); + + [id(DISPID_IHTMLAREAELEMENT_BLUR)] + HRESULT blur(); +} + +/***************************************************************************** + * DispHTMLAreaElement dispinterface + */ +[ + hidden, + uuid(3050f503-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispHTMLAreaElement +{ +properties: +methods: + WINE_HTMLDATAELEMENT_DISPINTERFACE_DECL; + + [propget, id(DISPID_IHTMLDOMCONSTRUCTOR_CONSTRUCTOR), hidden] + IDispatch* constructor(); + + [propput, id(DISPID_IHTMLAREAELEMENT_SHAPE)] + void shape(BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT_SHAPE)] + BSTR shape(); + + [propput, id(DISPID_IHTMLAREAELEMENT_COORDS)] + void coords(BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT_COORDS)] + BSTR coords(); + + [propput, id(DISPID_IHTMLAREAELEMENT_HREF)] + void href(BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT_HREF)] + BSTR href(); + + [propput, id(DISPID_IHTMLAREAELEMENT_TARGET)] + void target(BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT_TARGET)] + BSTR target(); + + [propput, id(DISPID_IHTMLAREAELEMENT_ALT)] + void alt(BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT_ALT)] + BSTR alt(); + + [propput, id(DISPID_IHTMLAREAELEMENT_NOHREF)] + void noHref(VARIANT_BOOL v); + + [propget, id(DISPID_IHTMLAREAELEMENT_NOHREF)] + VARIANT_BOOL noHref(); + + [propput, id(DISPID_IHTMLAREAELEMENT_HOST)] + void host(BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT_HOST)] + BSTR host(); + + [propput, id(DISPID_IHTMLAREAELEMENT_HOSTNAME)] + void hostname(BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT_HOSTNAME)] + BSTR hostname(); + + [propput, id(DISPID_IHTMLAREAELEMENT_PATHNAME)] + void pathname(BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT_PATHNAME)] + BSTR pathname(); + + [propput, id(DISPID_IHTMLAREAELEMENT_PORT)] + void port(BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT_PORT)] + BSTR port(); + + [propput, id(DISPID_IHTMLAREAELEMENT_PROTOCOL)] + void protocol(BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT_PROTOCOL)] + BSTR protocol(); + + [propput, id(DISPID_IHTMLAREAELEMENT_SEARCH)] + void search(BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT_SEARCH)] + BSTR search(); + + [propput, id(DISPID_IHTMLAREAELEMENT_HASH)] + void hash(BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT_HASH)] + BSTR hash(); + + [propput, id(DISPID_IHTMLAREAELEMENT2_IE8_SHAPE)] + void ie8_shape(BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT2_IE8_SHAPE)] + BSTR ie8_shape(); + + [propput, id(DISPID_IHTMLAREAELEMENT2_IE8_COORDS)] + void ie8_coords(BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT2_IE8_COORDS)] + BSTR ie8_coords(); + + [propput, id(DISPID_IHTMLAREAELEMENT2_IE8_HREF)] + void ie8_href(BSTR v); + + [propget, id(DISPID_IHTMLAREAELEMENT2_IE8_HREF)] + BSTR ie8_href(); +}; + +/***************************************************************************** * IHTMLLabelElement interface */ [ @@ -9496,6 +9723,24 @@ [propget, id(DISPID_IHTMLSELECTIONOBJECT_TYPE)] HRESULT type([retval, out] BSTR *p); +} + +/***************************************************************************** + * IHTMLSelectionObject2 interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f7ec-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLSelectionObject2 : IDispatch +{ + [id(DISPID_IHTMLSELECTIONOBJECT2_CREATERANGECOLLECTION)] + HRESULT createRangeCollection([out, retval] IDispatch **rangeCollection); + + [propget, id(DISPID_IHTMLSELECTIONOBJECT2_TYPEDETAIL)] + HRESULT typeDetail([out, retval] BSTR *p); } /*****************************************************************************

1 0

[akhaldi] 70189: [USER32] Sync mdi.c with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 28 Nov '15

28 Nov '15

Author: akhaldi Date: Sat Nov 28 18:51:17 2015 New Revision: 70189 URL: http://svn.reactos.org/svn/reactos?rev=70189&view=rev Log: [USER32] Sync mdi.c with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/win32ss/user/user32/windows/mdi.c 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] Sat Nov 28 18:51:17 2015 @@ -314,7 +314,7 @@ reactos/win32ss/user/user32/windows/cursoricon # Forked from Wine-1.2-rc7 reactos/win32ss/user/user32/windows/defwnd.c # Forked reactos/win32ss/user/user32/windows/draw.c # Forked at Wine-20020904 (uitools.c) - reactos/win32ss/user/user32/windows/mdi.c # Synced to Wine-1_1_40 + reactos/win32ss/user/user32/windows/mdi.c # Synced to WineStaging-1.7.55 reactos/win32ss/user/user32/windows/menu.c # Forked reactos/win32ss/user/user32/windows/messagebox.c # Forked reactos/win32ss/user/user32/windows/rect.c # Forked (uitools.c) @@ -328,7 +328,7 @@ reactos/dll/win32/schannel/secur32_wine.c # partial sync to wine-1.7.17 (secur32/secur32.c) secur32 - - reactos/dll/win32/secur32/sspi.c # Partially synced to wine-1.7.55 (secur32.c) + reactos/dll/win32/secur32/sspi.c # Partially synced to WineStaging-1.7.55 (secur32.c) reactos/dll/win32/secur32/thunks.c # Synced to WineStaging-1.7.37 reactos/dll/win32/secur32/wrapper.c # Synced to WineStaging-1.7.37 Modified: trunk/reactos/win32ss/user/user32/windows/mdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/mdi.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/mdi.c [iso-8859-1] Sat Nov 28 18:51:17 2015 @@ -28,7 +28,7 @@ * * When we have more than 9 opened windows, a "More Windows..." * option appears in the "Windows" menu. Each child window has - * a WND* associated with it, accesible via the children list of + * a WND* associated with it, accessible via the children list of * the parent window. This WND* has a wIDmenu member, which reflects * the position of the child in the window list. For example, with * 9 child windows, we could have the following pattern: @@ -263,7 +263,7 @@ /********************************************************************** * MDI_GetWindow * - * returns "activateable" child different from the current or zero + * returns "activatable" child different from the current or zero */ static HWND MDI_GetWindow(MDICLIENTINFO *clientInfo, HWND hWnd, BOOL bNext, DWORD dwStyleMask ) @@ -339,7 +339,7 @@ MDICLIENTINFO *ci; HWND hwndFrame = GetParent(hwnd); - TRACE("%p %p %p\n", hwnd, hmenuFrame, hmenuWindow); + TRACE("%p, frame menu %p, window menu %p\n", hwnd, hmenuFrame, hmenuWindow); if (hmenuFrame && !IsMenu(hmenuFrame)) { @@ -684,7 +684,7 @@ * SetFocus won't work. It appears that Windows sends WM_SETFOCUS * manually in this case. */ - if (SetFocus( client ) == client) + if (SetFocus(client) == client) SendMessageW( client, WM_SETFOCUS, (WPARAM)client, 0 ); } @@ -925,7 +925,8 @@ if (!hIcon) hIcon = (HICON)GetClassLongPtrW(hChild, GCLP_HICON); if (!hIcon) - hIcon = LoadImageW(0, (LPWSTR)IDI_WINLOGO, IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR); + hIcon = LoadImageW(0, (LPWSTR)IDI_WINLOGO, IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR); if (hIcon) { HDC hMemDC; @@ -957,7 +958,7 @@ { TRACE("not inserted\n"); DestroyMenu(hSysPopup); - return FALSE; + return FALSE; } EnableMenuItem(hSysPopup, SC_SIZE, MF_BYCOMMAND | MF_GRAYED); @@ -983,15 +984,15 @@ TRACE("frame %p,child %p\n",frame, hChild); - if( !menu ) return FALSE; + if (!menu) return FALSE; /* if there is no system buttons then nothing to do */ nItems = GetMenuItemCount(menu) - 1; - iId = GetMenuItemID(menu,nItems) ; - if( !(iId == SC_RESTORE || iId == SC_CLOSE) ) + iId = GetMenuItemID(menu, nItems); + if ( !(iId == SC_RESTORE || iId == SC_CLOSE) ) { ERR("no system buttons then nothing to do\n"); - return FALSE; + return FALSE; } /* @@ -1115,7 +1116,7 @@ TRACE("%p %04x (%s) %08lx %08lx\n", hwnd, message, SPY_GetMsgName(message, hwnd), wParam, lParam); - if (!(ci = get_client_info(hwnd))) + if (!(ci = get_client_info( hwnd ))) { if (message == WM_NCCREATE) { @@ -1126,9 +1127,9 @@ ci->hBmpClose = 0; NtUserSetWindowFNID( hwnd, FNID_MDICLIENT); // wine uses WIN_ISMDICLIENT #else - WND *wndPtr = WIN_GetPtr( hwnd ); - wndPtr->flags |= WIN_ISMDICLIENT; - WIN_ReleasePtr( wndPtr ); + WND *wndPtr = WIN_GetPtr( hwnd ); + wndPtr->flags |= WIN_ISMDICLIENT; + WIN_ReleasePtr( wndPtr ); #endif } return unicode ? DefWindowProcW( hwnd, message, wParam, lParam ) : @@ -1145,14 +1146,14 @@ LPCLIENTCREATESTRUCT ccs = (LPCLIENTCREATESTRUCT)cs->lpCreateParams; ci->hWindowMenu = ccs->hWindowMenu; - ci->idFirstChild = ccs->idFirstChild; - ci->hwndChildMaximized = 0; + ci->idFirstChild = ccs->idFirstChild; + ci->hwndChildMaximized = 0; ci->child = NULL; ci->nActiveChildren = 0; ci->nTotalCreated = 0; ci->frameTitle = NULL; ci->mdiFlags = 0; - ci->hFrameMenu = GetMenu(cs->hwndParent); + ci->hFrameMenu = GetMenu(cs->hwndParent); if (!ci->hBmpClose) ci->hBmpClose = CreateMDIMenuBitmap(); @@ -1189,7 +1190,7 @@ case WM_MDIACTIVATE: { if( ci->hwndActiveChild != (HWND)wParam ) - SetWindowPos((HWND)wParam, 0,0,0,0,0, SWP_NOSIZE | SWP_NOMOVE); + SetWindowPos((HWND)wParam, 0,0,0,0,0, SWP_NOSIZE | SWP_NOMOVE); return 0; } @@ -1520,6 +1521,7 @@ MDICLIENTINFO *ci = get_client_info( client ); TRACE("%p %04x (%s) %08lx %08lx\n", hwnd, message, SPY_GetMsgName(message, hwnd), wParam, lParam); + hwnd = WIN_GetFullHandle( hwnd ); if (!ci) return DefWindowProcA( hwnd, message, wParam, lParam ); @@ -1529,6 +1531,7 @@ DefWindowProcA(hwnd, message, wParam, lParam); if( ci->hwndChildMaximized == hwnd ) MDI_UpdateFrameText( GetParent(client), client, TRUE, NULL ); + MDI_RefreshMenu( ci ); return 1; /* success. FIXME: check text length */ case WM_GETMINMAXINFO: @@ -1569,6 +1572,7 @@ DefWindowProcW(hwnd, message, wParam, lParam); if( ci->hwndChildMaximized == hwnd ) MDI_UpdateFrameText( GetParent(client), client, TRUE, NULL ); + MDI_RefreshMenu( ci ); return 1; /* success. FIXME: check text length */ case WM_GETMINMAXINFO: @@ -1592,7 +1596,7 @@ return 0; case WM_SYSCOMMAND: - switch( wParam & 0xfff0) + switch (wParam & 0xfff0) { case SC_MOVE: if( ci->hwndChildMaximized == hwnd ) @@ -1602,7 +1606,7 @@ case SC_MINIMIZE: break; case SC_MAXIMIZE: - if (ci->hwndChildMaximized == hwnd ) + if (ci->hwndChildMaximized == hwnd) return SendMessageW( GetParent(client), message, wParam, lParam); break; case SC_NEXTWINDOW: @@ -1626,7 +1630,7 @@ /* do not change */ TRACE("current active %p, maximized %p\n", ci->hwndActiveChild, ci->hwndChildMaximized); - if( ci->hwndChildMaximized == hwnd && wParam != SIZE_MAXIMIZED) + if( ci->hwndChildMaximized == hwnd && wParam != SIZE_MAXIMIZED ) { HWND frame; @@ -2001,8 +2005,9 @@ return 0; } + /*********************************************************************** - * CascadeChildWindows (USER32.@) + * CascadeChildWindows (USER32.@) */ WORD WINAPI CascadeChildWindows( HWND parent, UINT flags ) { @@ -2025,8 +2030,9 @@ return 0; } + /*********************************************************************** - * TileChildWindows (USER32.@) + * TileChildWindows (USER32.@) */ WORD WINAPI TileChildWindows( HWND parent, UINT flags ) {

1 0

[akhaldi] 70188: [SECUR32] Partially sync sspi.c with Wine Staging 1.7.55. We don't need secext.c anymore. CORE-10536
by akhaldi＠svn.reactos.org 28 Nov '15

28 Nov '15

Author: akhaldi Date: Sat Nov 28 18:49:34 2015 New Revision: 70188 URL: http://svn.reactos.org/svn/reactos?rev=70188&view=rev Log: [SECUR32] Partially sync sspi.c with Wine Staging 1.7.55. We don't need secext.c anymore. CORE-10536 Removed: trunk/reactos/dll/win32/secur32/secext.c Modified: trunk/reactos/dll/win32/secur32/CMakeLists.txt trunk/reactos/dll/win32/secur32/sspi.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/secur32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/secur32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/secur32/CMakeLists.txt [iso-8859-1] Sat Nov 28 18:49:34 2015 @@ -6,7 +6,6 @@ list(APPEND SOURCE dllmain.c lsalpc.c - secext.c sspi.c stubs.c thunks.c Removed: trunk/reactos/dll/win32/secur32/secext.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/secext.c… ============================================================================== --- trunk/reactos/dll/win32/secur32/secext.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/secur32/secext.c (removed) @@ -1,291 +0,0 @@ -/* - * Copyright (C) 2004 Juan Lang - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "precomp.h" - -#include <winnls.h> -#include <lsass/lsass.h> - -#define NDEBUG -#include <debug.h> - -#define UNLEN 256 - -/*********************************************************************** - * GetComputerObjectNameA (SECUR32.@) Wine 1.1.14 - * - * Get the local computer's name using the format specified. - * - * PARAMS - * NameFormat [I] The format for the name. - * lpNameBuffer [O] Pointer to buffer to receive the name. - * nSize [I/O] Size in characters of buffer. - * - * RETURNS - * TRUE If the name was written to lpNameBuffer. - * FALSE If the name couldn't be written. - * - * NOTES - * If lpNameBuffer is NULL, then the size of the buffer needed to hold the - * name will be returned in *nSize. - * - * nSize returns the number of characters written when lpNameBuffer is not - * NULL or the size of the buffer needed to hold the name when the buffer - * is too short or lpNameBuffer is NULL. - * - * It the buffer is too short, ERROR_INSUFFICIENT_BUFFER error will be set. - */ -BOOLEAN WINAPI GetComputerObjectNameA( - EXTENDED_NAME_FORMAT NameFormat, LPSTR lpNameBuffer, PULONG nSize) -{ - BOOLEAN rc; - LPWSTR bufferW = NULL; - ULONG sizeW = *nSize; - DPRINT("(%d %p %p)\n", NameFormat, lpNameBuffer, nSize); - if (lpNameBuffer) { - bufferW = HeapAlloc(GetProcessHeap(), 0, sizeW * sizeof(WCHAR)); - if (bufferW == NULL) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - } - rc = GetComputerObjectNameW(NameFormat, bufferW, &sizeW); - if (rc && bufferW) { - ULONG len = WideCharToMultiByte(CP_ACP, 0, bufferW, -1, NULL, 0, NULL, NULL); - WideCharToMultiByte(CP_ACP, 0, bufferW, -1, lpNameBuffer, *nSize, NULL, NULL); - *nSize = len; - } - else - *nSize = sizeW; - HeapFree(GetProcessHeap(), 0, bufferW); - return rc; -} - -/*********************************************************************** - * GetComputerObjectNameW (SECUR32.@) Wine 1.1.14 - */ -BOOLEAN WINAPI GetComputerObjectNameW( - EXTENDED_NAME_FORMAT NameFormat, LPWSTR lpNameBuffer, PULONG nSize) -{ - LSA_HANDLE policyHandle; - LSA_OBJECT_ATTRIBUTES objectAttributes; - PPOLICY_DNS_DOMAIN_INFO domainInfo; - NTSTATUS ntStatus; - BOOLEAN status; - DPRINT("(%d %p %p)\n", NameFormat, lpNameBuffer, nSize); - - if (NameFormat == NameUnknown) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - ZeroMemory(&objectAttributes, sizeof(objectAttributes)); - objectAttributes.Length = sizeof(objectAttributes); - - ntStatus = LsaOpenPolicy(NULL, &objectAttributes, - POLICY_VIEW_LOCAL_INFORMATION, - &policyHandle); - if (ntStatus != STATUS_SUCCESS) - { - SetLastError(LsaNtStatusToWinError(ntStatus)); - DPRINT1("LsaOpenPolicy failed with NT status %u\n", GetLastError()); - return FALSE; - } - - ntStatus = LsaQueryInformationPolicy(policyHandle, - PolicyDnsDomainInformation, - (PVOID *)&domainInfo); - if (ntStatus != STATUS_SUCCESS) - { - SetLastError(LsaNtStatusToWinError(ntStatus)); - DPRINT1("LsaQueryInformationPolicy failed with NT status %u\n", - GetLastError()); - LsaClose(policyHandle); - return FALSE; - } - - if (domainInfo->Sid) - { - switch (NameFormat) - { - case NameSamCompatible: - { - WCHAR name[MAX_COMPUTERNAME_LENGTH + 1]; - DWORD size = sizeof(name)/sizeof(name[0]); - if (GetComputerNameW(name, &size)) - { - DWORD len = domainInfo->Name.Length + size + 3; - if (lpNameBuffer) - { - if (*nSize < len) - { - *nSize = len; - SetLastError(ERROR_INSUFFICIENT_BUFFER); - status = FALSE; - } - else - { - WCHAR bs[] = { '\\', 0 }; - WCHAR ds[] = { '$', 0 }; - lstrcpyW(lpNameBuffer, domainInfo->Name.Buffer); - lstrcatW(lpNameBuffer, bs); - lstrcatW(lpNameBuffer, name); - lstrcatW(lpNameBuffer, ds); - status = TRUE; - } - } - else /* just requesting length required */ - { - *nSize = len; - status = TRUE; - } - } - else - { - SetLastError(ERROR_INTERNAL_ERROR); - status = FALSE; - } - } - break; - case NameFullyQualifiedDN: - case NameDisplay: - case NameUniqueId: - case NameCanonical: - case NameUserPrincipal: - case NameCanonicalEx: - case NameServicePrincipal: - case NameDnsDomain: - DPRINT1("NameFormat %d not implemented\n", NameFormat); - SetLastError(ERROR_CANT_ACCESS_DOMAIN_INFO); - status = FALSE; - break; - default: - SetLastError(ERROR_INVALID_PARAMETER); - status = FALSE; - } - } - else - { - SetLastError(ERROR_CANT_ACCESS_DOMAIN_INFO); - status = FALSE; - } - - LsaFreeMemory(domainInfo); - LsaClose(policyHandle); - - return status; -} - - -BOOLEAN WINAPI GetUserNameExA( - EXTENDED_NAME_FORMAT NameFormat, LPSTR lpNameBuffer, PULONG nSize) -{ - BOOLEAN rc; - LPWSTR bufferW = NULL; - ULONG sizeW = *nSize; - DPRINT("(%d %p %p)\n", NameFormat, lpNameBuffer, nSize); - if (lpNameBuffer) { - bufferW = HeapAlloc(GetProcessHeap(), 0, sizeW * sizeof(WCHAR)); - if (bufferW == NULL) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - } - rc = GetUserNameExW(NameFormat, bufferW, &sizeW); - if (rc) { - ULONG len = WideCharToMultiByte(CP_ACP, 0, bufferW, -1, NULL, 0, NULL, NULL); - if (len <= *nSize) - { - WideCharToMultiByte(CP_ACP, 0, bufferW, -1, lpNameBuffer, *nSize, NULL, NULL); - *nSize = len - 1; - } - else - { - *nSize = len; - rc = FALSE; - SetLastError(ERROR_MORE_DATA); - } - } - else - *nSize = sizeW; - HeapFree(GetProcessHeap(), 0, bufferW); - return rc; -} - - -BOOLEAN WINAPI GetUserNameExW( - EXTENDED_NAME_FORMAT NameFormat, LPWSTR lpNameBuffer, PULONG nSize) -{ - BOOLEAN status; - WCHAR samname[UNLEN + 1 + MAX_COMPUTERNAME_LENGTH + 1]; - LPWSTR out; - DWORD len; - DPRINT("(%d %p %p)\n", NameFormat, lpNameBuffer, nSize); - - switch (NameFormat) - { - case NameSamCompatible: - { - /* This assumes the current user is always a local account */ - len = MAX_COMPUTERNAME_LENGTH + 1; - if (GetComputerNameW(samname, &len)) - { - out = samname + lstrlenW(samname); - *out++ = '\\'; - len = UNLEN + 1; - if (GetUserNameW(out, &len)) - { - status = (lstrlenW(samname) < *nSize); - if (status) - { - lstrcpyW(lpNameBuffer, samname); - *nSize = lstrlenW(samname); - } - else - { - SetLastError(ERROR_MORE_DATA); - *nSize = lstrlenW(samname) + 1; - } - } - else - status = FALSE; - } - else - status = FALSE; - } - break; - case NameUnknown: - case NameFullyQualifiedDN: - case NameDisplay: - case NameUniqueId: - case NameCanonical: - case NameUserPrincipal: - case NameCanonicalEx: - case NameServicePrincipal: - case NameDnsDomain: - SetLastError(ERROR_NONE_MAPPED); - status = FALSE; - break; - default: - SetLastError(ERROR_INVALID_PARAMETER); - status = FALSE; - } - - return status; -} Modified: trunk/reactos/dll/win32/secur32/sspi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/sspi.c?r… ============================================================================== --- trunk/reactos/dll/win32/secur32/sspi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/secur32/sspi.c [iso-8859-1] Sat Nov 28 18:49:34 2015 @@ -20,9 +20,12 @@ #include "precomp.h" #include <assert.h> +#include <lsass/lsass.h> #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(secur32); + +#define UNLEN 256 typedef struct _SecurePackageTable { @@ -51,8 +54,7 @@ static SecurePackageTable *packageTable = NULL; static SecureProviderTable *providerTable = NULL; -static SecurityFunctionTableA securityFunctionTableA = -{ +static SecurityFunctionTableA securityFunctionTableA = { SECURITY_SUPPORT_PROVIDER_INTERFACE_VERSION, EnumerateSecurityPackagesA, QueryCredentialsAttributesA, @@ -83,8 +85,7 @@ NULL }; -static SecurityFunctionTableW securityFunctionTableW = -{ +static SecurityFunctionTableW securityFunctionTableW = { SECURITY_SUPPORT_PROVIDER_INTERFACE_VERSION, EnumerateSecurityPackagesW, QueryCredentialsAttributesW, @@ -116,282 +117,75 @@ }; /*********************************************************************** - * EnumerateSecurityPackagesW (SECUR32.@) + * InitSecurityInterfaceA (SECUR32.@) */ -SECURITY_STATUS WINAPI EnumerateSecurityPackagesW(PULONG pcPackages, - PSecPkgInfoW *ppPackageInfo) -{ - SECURITY_STATUS ret = SEC_E_OK; - - TRACE("(%p, %p)\n", pcPackages, ppPackageInfo); - -#ifdef __REACTOS__ - if (!packageTable) - SECUR32_initializeProviders(); -#endif - - /* windows just crashes if pcPackages or ppPackageInfo is NULL, so will I */ - *pcPackages = 0; - EnterCriticalSection(&cs); - if (packageTable) - { - SecurePackage *package; - size_t bytesNeeded; - - bytesNeeded = packageTable->numPackages * sizeof(SecPkgInfoW); - LIST_FOR_EACH_ENTRY(package, &packageTable->table, SecurePackage, entry) - { - if (package->infoW.Name) - bytesNeeded += (lstrlenW(package->infoW.Name) + 1) * sizeof(WCHAR); - if (package->infoW.Comment) - bytesNeeded += (lstrlenW(package->infoW.Comment) + 1) * sizeof(WCHAR); - } - if (bytesNeeded) - { - *ppPackageInfo = HeapAlloc(GetProcessHeap(), 0, bytesNeeded); - if (*ppPackageInfo) - { - ULONG i = 0; - PWSTR nextString; - - *pcPackages = packageTable->numPackages; - nextString = (PWSTR)((PBYTE)*ppPackageInfo + - packageTable->numPackages * sizeof(SecPkgInfoW)); - LIST_FOR_EACH_ENTRY(package, &packageTable->table, SecurePackage, entry) - { - PSecPkgInfoW pkgInfo = *ppPackageInfo + i++; - - *pkgInfo = package->infoW; - if (package->infoW.Name) - { - TRACE("Name[%d] = %S\n", i - 1, package->infoW.Name); - pkgInfo->Name = nextString; - lstrcpyW(nextString, package->infoW.Name); - nextString += lstrlenW(nextString) + 1; - } - else - pkgInfo->Name = NULL; - if (package->infoW.Comment) - { - TRACE("Comment[%d] = %S\n", i - 1, package->infoW.Comment); - pkgInfo->Comment = nextString; - lstrcpyW(nextString, package->infoW.Comment); - nextString += lstrlenW(nextString) + 1; - } - else - pkgInfo->Comment = NULL; - } - } - else - ret = SEC_E_INSUFFICIENT_MEMORY; - } - } - LeaveCriticalSection(&cs); - TRACE("<-- 0x%08x\n", ret); - return ret; -} - -/* Converts info (which is assumed to be an array of cPackages SecPkgInfoW - * structures) into an array of SecPkgInfoA structures, which it returns. +PSecurityFunctionTableA WINAPI InitSecurityInterfaceA(void) +{ + TRACE("InitSecurityInterfaceA() called\n"); + return &securityFunctionTableA; +} + +/*********************************************************************** + * InitSecurityInterfaceW (SECUR32.@) */ -static PSecPkgInfoA thunk_PSecPkgInfoWToA(ULONG cPackages, - const SecPkgInfoW *info) -{ - PSecPkgInfoA ret; - - if (info) - { - size_t bytesNeeded = cPackages * sizeof(SecPkgInfoA); - ULONG i; - - for (i = 0; i < cPackages; i++) - { - if (info[i].Name) - bytesNeeded += WideCharToMultiByte(CP_ACP, 0, info[i].Name, - -1, NULL, 0, NULL, NULL); - if (info[i].Comment) - bytesNeeded += WideCharToMultiByte(CP_ACP, 0, info[i].Comment, - -1, NULL, 0, NULL, NULL); - } - ret = HeapAlloc(GetProcessHeap(), 0, bytesNeeded); +PSecurityFunctionTableW WINAPI InitSecurityInterfaceW(void) +{ + TRACE("InitSecurityInterfaceW() called\n"); + return &securityFunctionTableW; +} + +static PWSTR SECUR32_strdupW(PCWSTR str) +{ + PWSTR ret; + + if (str) + { + ret = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(str) + 1) * sizeof(WCHAR)); if (ret) - { - PSTR nextString; - - nextString = (PSTR)((PBYTE)ret + cPackages * sizeof(SecPkgInfoA)); - for (i = 0; i < cPackages; i++) - { - PSecPkgInfoA pkgInfo = ret + i; - int bytes; - - memcpy(pkgInfo, &info[i], sizeof(SecPkgInfoA)); - if (info[i].Name) - { - pkgInfo->Name = nextString; - /* just repeat back to WideCharToMultiByte how many bytes - * it requires, since we asked it earlier - */ - bytes = WideCharToMultiByte(CP_ACP, 0, info[i].Name, -1, - NULL, 0, NULL, NULL); - WideCharToMultiByte(CP_ACP, 0, info[i].Name, -1, - pkgInfo->Name, bytes, NULL, NULL); - nextString += lstrlenA(nextString) + 1; - } - else - pkgInfo->Name = NULL; - if (info[i].Comment) - { - pkgInfo->Comment = nextString; - /* just repeat back to WideCharToMultiByte how many bytes - * it requires, since we asked it earlier - */ - bytes = WideCharToMultiByte(CP_ACP, 0, info[i].Comment, -1, - NULL, 0, NULL, NULL); - WideCharToMultiByte(CP_ACP, 0, info[i].Comment, -1, - pkgInfo->Comment, bytes, NULL, NULL); - nextString += lstrlenA(nextString) + 1; - } - else - pkgInfo->Comment = NULL; - } - } + lstrcpyW(ret, str); } else ret = NULL; return ret; } -/*********************************************************************** - * EnumerateSecurityPackagesA (SECUR32.@) - */ -SECURITY_STATUS WINAPI EnumerateSecurityPackagesA(PULONG pcPackages, - PSecPkgInfoA *ppPackageInfo) -{ - SECURITY_STATUS ret; - PSecPkgInfoW info; - - ret = EnumerateSecurityPackagesW(pcPackages, &info); - if (ret == SEC_E_OK && *pcPackages && info) - { - *ppPackageInfo = thunk_PSecPkgInfoWToA(*pcPackages, info); - if (*pcPackages && !*ppPackageInfo) - { - *pcPackages = 0; - ret = SEC_E_INSUFFICIENT_MEMORY; - } - FreeContextBuffer(info); - } - return ret; -} - -SECURITY_STATUS -WINAPI -FreeContextBuffer ( - PVOID pvoid - ) -{ - HeapFree(GetProcessHeap(), 0, pvoid); - return SEC_E_OK; -} - -PSecurityFunctionTableW -WINAPI -InitSecurityInterfaceW(VOID) -{ - TRACE("InitSecurityInterfaceW() called\n"); - return &securityFunctionTableW; -} - -PSecurityFunctionTableA -WINAPI -InitSecurityInterfaceA(VOID) -{ - TRACE("InitSecurityInterfaceA() called\n"); - return &securityFunctionTableA; -} - -BOOLEAN -WINAPI -TranslateNameA( - LPCSTR lpAccountName, - EXTENDED_NAME_FORMAT AccountNameFormat, - EXTENDED_NAME_FORMAT DesiredNameFormat, - LPSTR lpTranslatedName, - PULONG nSize -) -{ - UNIMPLEMENTED; - return FALSE; -} - -BOOLEAN -WINAPI -TranslateNameW( - LPCWSTR lpAccountName, - EXTENDED_NAME_FORMAT AccountNameFormat, - EXTENDED_NAME_FORMAT DesiredNameFormat, - LPWSTR lpTranslatedName, - PULONG nSize -) -{ - UNIMPLEMENTED; - return FALSE; -} - -/*** PRIVATE FUNCTIONS ***************************************************************************/ - -static PWSTR SECUR32_strdupW(PCWSTR str) +PWSTR SECUR32_AllocWideFromMultiByte(PCSTR str) { PWSTR ret; if (str) { - ret = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(str) + 1) * sizeof(WCHAR)); - if (ret) - lstrcpyW(ret, str); + int charsNeeded = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + + if (charsNeeded) + { + ret = HeapAlloc(GetProcessHeap(), 0, charsNeeded * sizeof(WCHAR)); + if (ret) + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, charsNeeded); + } + else + ret = NULL; } else ret = NULL; return ret; } -PWSTR SECUR32_AllocWideFromMultiByte(PCSTR str) -{ - PWSTR ret; +PSTR SECUR32_AllocMultiByteFromWide(PCWSTR str) +{ + PSTR ret; if (str) { - int charsNeeded = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - - if (charsNeeded) - { - ret = HeapAlloc(GetProcessHeap(), 0, charsNeeded * sizeof(WCHAR)); - if (ret) - MultiByteToWideChar(CP_ACP, 0, str, -1, ret, charsNeeded); - } - else - ret = NULL; - } - else - ret = NULL; - return ret; -} - -PSTR SECUR32_AllocMultiByteFromWide(PCWSTR str) -{ - PSTR ret; - - if (str) - { int charsNeeded = WideCharToMultiByte(CP_ACP, 0, str, -1, NULL, 0, - NULL, NULL); + NULL, NULL); if (charsNeeded) { ret = HeapAlloc(GetProcessHeap(), 0, charsNeeded); if (ret) WideCharToMultiByte(CP_ACP, 0, str, -1, ret, charsNeeded, - NULL, NULL); + NULL, NULL); } else ret = NULL; @@ -607,7 +401,7 @@ ret->moduleName = SECUR32_strdupW(moduleName); ret->loaded = FALSE; } - + LeaveCriticalSection(&cs); return ret; } @@ -635,7 +429,7 @@ packageTable->numPackages = 0; list_init(&packageTable->table); } - + for (i = 0; i < toAdd; i++) { SecurePackage *package = HeapAlloc(GetProcessHeap(), 0, sizeof(SecurePackage)); @@ -667,8 +461,8 @@ (INIT_SECURITY_INTERFACE_A)GetProcAddress(lib, SECURITY_ENTRYPOINT_ANSIA); - TRACE("loaded %S, InitSecurityInterfaceA is %p, InitSecurityInterfaceW is %p\n", - moduleName, pInitSecurityInterfaceA, + TRACE("loaded %s, InitSecurityInterfaceA is %p, InitSecurityInterfaceW is %p\n", + debugstr_w(moduleName), pInitSecurityInterfaceA, pInitSecurityInterfaceW); if (pInitSecurityInterfaceW || pInitSecurityInterfaceA) { @@ -688,14 +482,14 @@ if (fnTableW != &securityFunctionTableW) ret = fnTableW->EnumerateSecurityPackagesW(&toAdd, &infoW); else - TRACE("%S has built-in providers, skip adding\n", moduleName); + TRACE("%s has built-in providers, skip adding\n", debugstr_w(moduleName)); } else if (fnTableA && fnTableA->EnumerateSecurityPackagesA) { if (fnTableA != &securityFunctionTableA) ret = fnTableA->EnumerateSecurityPackagesA(&toAdd, &infoA); else - TRACE("%S has built-in providers, skip adding\n", moduleName); + TRACE("%s has built-in providers, skip adding\n", debugstr_w(moduleName)); } if (ret == SEC_E_OK && toAdd > 0 && (infoW || infoA)) { @@ -713,7 +507,7 @@ FreeLibrary(lib); } else - WARN("failed to load %S\n", moduleName); + WARN("failed to load %s\n", debugstr_w(moduleName)); } static const WCHAR securityProvidersKeyW[] = { @@ -782,24 +576,24 @@ LIST_FOR_EACH_ENTRY(ret, &packageTable->table, SecurePackage, entry) { matched = !lstrcmpiW(ret->infoW.Name, packageName); - if (matched) - break; - } - - if (!matched) - return NULL; - - if (ret->provider && !ret->provider->loaded) + if (matched) + break; + } + + if (!matched) + return NULL; + + if (ret->provider && !ret->provider->loaded) { ret->provider->lib = LoadLibraryW(ret->provider->moduleName); if (ret->provider->lib) { INIT_SECURITY_INTERFACE_W pInitSecurityInterfaceW = - (INIT_SECURITY_INTERFACE_W) GetProcAddress(ret->provider->lib, - SECURITY_ENTRYPOINT_ANSIW); + (INIT_SECURITY_INTERFACE_W)GetProcAddress(ret->provider->lib, + SECURITY_ENTRYPOINT_ANSIW); INIT_SECURITY_INTERFACE_A pInitSecurityInterfaceA = - (INIT_SECURITY_INTERFACE_A) GetProcAddress(ret->provider->lib, - SECURITY_ENTRYPOINT_ANSIA); + (INIT_SECURITY_INTERFACE_A)GetProcAddress(ret->provider->lib, + SECURITY_ENTRYPOINT_ANSIA); PSecurityFunctionTableA fnTableA = NULL; PSecurityFunctionTableW fnTableW = NULL; @@ -837,3 +631,464 @@ ret = NULL; return ret; } + +/*********************************************************************** + * FreeContextBuffer (SECUR32.@) + * + * Doh--if pv was allocated by a crypto package, this may not be correct. + * The sample ssp seems to use LocalAlloc/LocalFee, but there doesn't seem to + * be any guarantee, nor is there an alloc function in secur32. + */ +SECURITY_STATUS WINAPI FreeContextBuffer(PVOID pv) +{ + HeapFree(GetProcessHeap(), 0, pv); + + return SEC_E_OK; +} + +/*********************************************************************** + * EnumerateSecurityPackagesW (SECUR32.@) + */ +SECURITY_STATUS WINAPI EnumerateSecurityPackagesW(PULONG pcPackages, + PSecPkgInfoW *ppPackageInfo) +{ + SECURITY_STATUS ret = SEC_E_OK; + + TRACE("(%p, %p)\n", pcPackages, ppPackageInfo); + +#ifdef __REACTOS__ + if (!packageTable) + SECUR32_initializeProviders(); +#endif + + /* windows just crashes if pcPackages or ppPackageInfo is NULL, so will I */ + *pcPackages = 0; + EnterCriticalSection(&cs); + if (packageTable) + { + SecurePackage *package; + size_t bytesNeeded; + + bytesNeeded = packageTable->numPackages * sizeof(SecPkgInfoW); + LIST_FOR_EACH_ENTRY(package, &packageTable->table, SecurePackage, entry) + { + if (package->infoW.Name) + bytesNeeded += (lstrlenW(package->infoW.Name) + 1) * sizeof(WCHAR); + if (package->infoW.Comment) + bytesNeeded += (lstrlenW(package->infoW.Comment) + 1) * sizeof(WCHAR); + } + if (bytesNeeded) + { + *ppPackageInfo = HeapAlloc(GetProcessHeap(), 0, bytesNeeded); + if (*ppPackageInfo) + { + ULONG i = 0; + PWSTR nextString; + + *pcPackages = packageTable->numPackages; + nextString = (PWSTR)((PBYTE)*ppPackageInfo + + packageTable->numPackages * sizeof(SecPkgInfoW)); + LIST_FOR_EACH_ENTRY(package, &packageTable->table, SecurePackage, entry) + { + PSecPkgInfoW pkgInfo = *ppPackageInfo + i++; + + *pkgInfo = package->infoW; + if (package->infoW.Name) + { + TRACE("Name[%d] = %s\n", i - 1, debugstr_w(package->infoW.Name)); + pkgInfo->Name = nextString; + lstrcpyW(nextString, package->infoW.Name); + nextString += lstrlenW(nextString) + 1; + } + else + pkgInfo->Name = NULL; + if (package->infoW.Comment) + { + TRACE("Comment[%d] = %s\n", i - 1, debugstr_w(package->infoW.Comment)); + pkgInfo->Comment = nextString; + lstrcpyW(nextString, package->infoW.Comment); + nextString += lstrlenW(nextString) + 1; + } + else + pkgInfo->Comment = NULL; + } + } + else + ret = SEC_E_INSUFFICIENT_MEMORY; + } + } + LeaveCriticalSection(&cs); + TRACE("<-- 0x%08x\n", ret); + return ret; +} + +/* Converts info (which is assumed to be an array of cPackages SecPkgInfoW + * structures) into an array of SecPkgInfoA structures, which it returns. + */ +static PSecPkgInfoA thunk_PSecPkgInfoWToA(ULONG cPackages, + const SecPkgInfoW *info) +{ + PSecPkgInfoA ret; + + if (info) + { + size_t bytesNeeded = cPackages * sizeof(SecPkgInfoA); + ULONG i; + + for (i = 0; i < cPackages; i++) + { + if (info[i].Name) + bytesNeeded += WideCharToMultiByte(CP_ACP, 0, info[i].Name, + -1, NULL, 0, NULL, NULL); + if (info[i].Comment) + bytesNeeded += WideCharToMultiByte(CP_ACP, 0, info[i].Comment, + -1, NULL, 0, NULL, NULL); + } + ret = HeapAlloc(GetProcessHeap(), 0, bytesNeeded); + if (ret) + { + PSTR nextString; + + nextString = (PSTR)((PBYTE)ret + cPackages * sizeof(SecPkgInfoA)); + for (i = 0; i < cPackages; i++) + { + PSecPkgInfoA pkgInfo = ret + i; + int bytes; + + memcpy(pkgInfo, &info[i], sizeof(SecPkgInfoA)); + if (info[i].Name) + { + pkgInfo->Name = nextString; + /* just repeat back to WideCharToMultiByte how many bytes + * it requires, since we asked it earlier + */ + bytes = WideCharToMultiByte(CP_ACP, 0, info[i].Name, -1, + NULL, 0, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, info[i].Name, -1, + pkgInfo->Name, bytes, NULL, NULL); + nextString += lstrlenA(nextString) + 1; + } + else + pkgInfo->Name = NULL; + if (info[i].Comment) + { + pkgInfo->Comment = nextString; + /* just repeat back to WideCharToMultiByte how many bytes + * it requires, since we asked it earlier + */ + bytes = WideCharToMultiByte(CP_ACP, 0, info[i].Comment, -1, + NULL, 0, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, info[i].Comment, -1, + pkgInfo->Comment, bytes, NULL, NULL); + nextString += lstrlenA(nextString) + 1; + } + else + pkgInfo->Comment = NULL; + } + } + } + else + ret = NULL; + return ret; +} + +/*********************************************************************** + * EnumerateSecurityPackagesA (SECUR32.@) + */ +SECURITY_STATUS WINAPI EnumerateSecurityPackagesA(PULONG pcPackages, + PSecPkgInfoA *ppPackageInfo) +{ + SECURITY_STATUS ret; + PSecPkgInfoW info; + + ret = EnumerateSecurityPackagesW(pcPackages, &info); + if (ret == SEC_E_OK && *pcPackages && info) + { + *ppPackageInfo = thunk_PSecPkgInfoWToA(*pcPackages, info); + if (*pcPackages && !*ppPackageInfo) + { + *pcPackages = 0; + ret = SEC_E_INSUFFICIENT_MEMORY; + } + FreeContextBuffer(info); + } + return ret; +} + +/*********************************************************************** + * GetComputerObjectNameA (SECUR32.@) + * + * Get the local computer's name using the format specified. + * + * PARAMS + * NameFormat [I] The format for the name. + * lpNameBuffer [O] Pointer to buffer to receive the name. + * nSize [I/O] Size in characters of buffer. + * + * RETURNS + * TRUE If the name was written to lpNameBuffer. + * FALSE If the name couldn't be written. + * + * NOTES + * If lpNameBuffer is NULL, then the size of the buffer needed to hold the + * name will be returned in *nSize. + * + * nSize returns the number of characters written when lpNameBuffer is not + * NULL or the size of the buffer needed to hold the name when the buffer + * is too short or lpNameBuffer is NULL. + * + * It the buffer is too short, ERROR_INSUFFICIENT_BUFFER error will be set. + */ +BOOLEAN WINAPI GetComputerObjectNameA( + EXTENDED_NAME_FORMAT NameFormat, LPSTR lpNameBuffer, PULONG nSize) +{ + BOOLEAN rc; + LPWSTR bufferW = NULL; + ULONG sizeW = *nSize; + TRACE("(%d %p %p)\n", NameFormat, lpNameBuffer, nSize); + if (lpNameBuffer) { + bufferW = HeapAlloc(GetProcessHeap(), 0, sizeW * sizeof(WCHAR)); + if (bufferW == NULL) { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + } + rc = GetComputerObjectNameW(NameFormat, bufferW, &sizeW); + if (rc && bufferW) { + ULONG len = WideCharToMultiByte(CP_ACP, 0, bufferW, -1, NULL, 0, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, bufferW, -1, lpNameBuffer, *nSize, NULL, NULL); + *nSize = len; + } + else + *nSize = sizeW; + HeapFree(GetProcessHeap(), 0, bufferW); + return rc; +} + +/*********************************************************************** + * GetComputerObjectNameW (SECUR32.@) + */ +BOOLEAN WINAPI GetComputerObjectNameW( + EXTENDED_NAME_FORMAT NameFormat, LPWSTR lpNameBuffer, PULONG nSize) +{ + LSA_HANDLE policyHandle; + LSA_OBJECT_ATTRIBUTES objectAttributes; + PPOLICY_DNS_DOMAIN_INFO domainInfo; + NTSTATUS ntStatus; + BOOLEAN status; + TRACE("(%d %p %p)\n", NameFormat, lpNameBuffer, nSize); + + if (NameFormat == NameUnknown) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + ZeroMemory(&objectAttributes, sizeof(objectAttributes)); + objectAttributes.Length = sizeof(objectAttributes); + + ntStatus = LsaOpenPolicy(NULL, &objectAttributes, + POLICY_VIEW_LOCAL_INFORMATION, + &policyHandle); + if (ntStatus != STATUS_SUCCESS) + { + SetLastError(LsaNtStatusToWinError(ntStatus)); + WARN("LsaOpenPolicy failed with NT status %u\n", GetLastError()); + return FALSE; + } + + ntStatus = LsaQueryInformationPolicy(policyHandle, + PolicyDnsDomainInformation, + (PVOID *)&domainInfo); + if (ntStatus != STATUS_SUCCESS) + { + SetLastError(LsaNtStatusToWinError(ntStatus)); + WARN("LsaQueryInformationPolicy failed with NT status %u\n", + GetLastError()); + LsaClose(policyHandle); + return FALSE; + } + + if (domainInfo->Sid) + { + switch (NameFormat) + { + case NameSamCompatible: + { + WCHAR name[MAX_COMPUTERNAME_LENGTH + 1]; + DWORD size = sizeof(name)/sizeof(name[0]); + if (GetComputerNameW(name, &size)) + { + DWORD len = domainInfo->Name.Length + size + 3; + if (lpNameBuffer) + { + if (*nSize < len) + { + *nSize = len; + SetLastError(ERROR_INSUFFICIENT_BUFFER); + status = FALSE; + } + else + { + WCHAR bs[] = { '\\', 0 }; + WCHAR ds[] = { '$', 0 }; + lstrcpyW(lpNameBuffer, domainInfo->Name.Buffer); + lstrcatW(lpNameBuffer, bs); + lstrcatW(lpNameBuffer, name); + lstrcatW(lpNameBuffer, ds); + status = TRUE; + } + } + else /* just requesting length required */ + { + *nSize = len; + status = TRUE; + } + } + else + { + SetLastError(ERROR_INTERNAL_ERROR); + status = FALSE; + } + } + break; + case NameFullyQualifiedDN: + case NameDisplay: + case NameUniqueId: + case NameCanonical: + case NameUserPrincipal: + case NameCanonicalEx: + case NameServicePrincipal: + case NameDnsDomain: + FIXME("NameFormat %d not implemented\n", NameFormat); + SetLastError(ERROR_CANT_ACCESS_DOMAIN_INFO); + status = FALSE; + break; + default: + SetLastError(ERROR_INVALID_PARAMETER); + status = FALSE; + } + } + else + { + SetLastError(ERROR_CANT_ACCESS_DOMAIN_INFO); + status = FALSE; + } + + LsaFreeMemory(domainInfo); + LsaClose(policyHandle); + + return status; +} + +/*********************************************************************** + * GetUserNameExA (SECUR32.@) + */ +BOOLEAN WINAPI GetUserNameExA( + EXTENDED_NAME_FORMAT NameFormat, LPSTR lpNameBuffer, PULONG nSize) +{ + BOOLEAN rc; + LPWSTR bufferW = NULL; + ULONG sizeW = *nSize; + TRACE("(%d %p %p)\n", NameFormat, lpNameBuffer, nSize); + if (lpNameBuffer) { + bufferW = HeapAlloc(GetProcessHeap(), 0, sizeW * sizeof(WCHAR)); + if (bufferW == NULL) { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + } + rc = GetUserNameExW(NameFormat, bufferW, &sizeW); + if (rc) { + ULONG len = WideCharToMultiByte(CP_ACP, 0, bufferW, -1, NULL, 0, NULL, NULL); + if (len <= *nSize) + { + WideCharToMultiByte(CP_ACP, 0, bufferW, -1, lpNameBuffer, *nSize, NULL, NULL); + *nSize = len - 1; + } + else + { + *nSize = len; + rc = FALSE; + SetLastError(ERROR_MORE_DATA); + } + } + else + *nSize = sizeW; + HeapFree(GetProcessHeap(), 0, bufferW); + return rc; +} + +BOOLEAN WINAPI GetUserNameExW( + EXTENDED_NAME_FORMAT NameFormat, LPWSTR lpNameBuffer, PULONG nSize) +{ + TRACE("(%d %p %p)\n", NameFormat, lpNameBuffer, nSize); + + switch (NameFormat) + { + case NameSamCompatible: + { + WCHAR samname[UNLEN + 1 + MAX_COMPUTERNAME_LENGTH + 1]; + LPWSTR out; + DWORD len; + + /* This assumes the current user is always a local account */ + len = MAX_COMPUTERNAME_LENGTH + 1; + if (GetComputerNameW(samname, &len)) + { + out = samname + lstrlenW(samname); + *out++ = '\\'; + len = UNLEN + 1; + if (GetUserNameW(out, &len)) + { + if (lstrlenW(samname) < *nSize) + { + lstrcpyW(lpNameBuffer, samname); + *nSize = lstrlenW(samname); + return TRUE; + } + + SetLastError(ERROR_MORE_DATA); + *nSize = lstrlenW(samname) + 1; + } + } + return FALSE; + } + + case NameUnknown: + case NameFullyQualifiedDN: + case NameDisplay: + case NameUniqueId: + case NameCanonical: + case NameUserPrincipal: + case NameCanonicalEx: + case NameServicePrincipal: + case NameDnsDomain: + SetLastError(ERROR_NONE_MAPPED); + return FALSE; + + default: + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } +} + +BOOLEAN WINAPI TranslateNameA( + LPCSTR lpAccountName, EXTENDED_NAME_FORMAT AccountNameFormat, + EXTENDED_NAME_FORMAT DesiredNameFormat, LPSTR lpTranslatedName, + PULONG nSize) +{ + FIXME("%p %d %d %p %p\n", lpAccountName, AccountNameFormat, + DesiredNameFormat, lpTranslatedName, nSize); + return FALSE; +} + +BOOLEAN WINAPI TranslateNameW( + LPCWSTR lpAccountName, EXTENDED_NAME_FORMAT AccountNameFormat, + EXTENDED_NAME_FORMAT DesiredNameFormat, LPWSTR lpTranslatedName, + PULONG nSize) +{ + FIXME("%p %d %d %p %p\n", lpAccountName, AccountNameFormat, + DesiredNameFormat, lpTranslatedName, nSize); + return FALSE; +} 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] Sat Nov 28 18:49:34 2015 @@ -328,7 +328,7 @@ reactos/dll/win32/schannel/secur32_wine.c # partial sync to wine-1.7.17 (secur32/secur32.c) secur32 - - reactos/dll/win32/secur32/sspi.c # partial sync to wine-1.7.17 (secur32.c) + reactos/dll/win32/secur32/sspi.c # Partially synced to wine-1.7.55 (secur32.c) reactos/dll/win32/secur32/thunks.c # Synced to WineStaging-1.7.37 reactos/dll/win32/secur32/wrapper.c # Synced to WineStaging-1.7.37

1 0

[tkreuzer] 70187: [WIN32K] Use the actual DC attribute, not the embedded one, when checking iGraphicsMode in GreExtTextOutW. CORE-4657 #resolve
by tkreuzer＠svn.reactos.org 28 Nov '15

28 Nov '15

Author: tkreuzer Date: Sat Nov 28 17:43:30 2015 New Revision: 70187 URL: http://svn.reactos.org/svn/reactos?rev=70187&view=rev Log: [WIN32K] Use the actual DC attribute, not the embedded one, when checking iGraphicsMode in GreExtTextOutW. CORE-4657 #resolve Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Sat Nov 28 17:43:30 2015 @@ -3526,7 +3526,7 @@ goto fail; } - if (dc->dcattr.iGraphicsMode == GM_ADVANCED) + if (dc->pdcattr->iGraphicsMode == GM_ADVANCED) { pmxWorldToDevice = DC_pmxWorldToDevice(dc); FtSetCoordinateTransform(face, pmxWorldToDevice);

1 0

[akhaldi] 70186: [WINMINE] Apply Wine commit 3966aff by Jared Smudde: Load main icon in the about window. CORE-10536
by akhaldi＠svn.reactos.org 28 Nov '15

28 Nov '15

Author: akhaldi Date: Sat Nov 28 17:37:30 2015 New Revision: 70186 URL: http://svn.reactos.org/svn/reactos?rev=70186&view=rev Log: [WINMINE] Apply Wine commit 3966aff by Jared Smudde: Load main icon in the about window. CORE-10536 Modified: trunk/reactos/base/applications/games/winmine/main.c Modified: trunk/reactos/base/applications/games/winmine/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/main.c [iso-8859-1] Sat Nov 28 17:37:30 2015 @@ -994,7 +994,7 @@ LoadStringW( board.hInst, IDS_APPNAME, appname, sizeof(appname)/sizeof(WCHAR) ); LoadStringW( board.hInst, IDS_ABOUT, other, sizeof(other)/sizeof(WCHAR) ); ShellAboutW( hWnd, appname, other, - LoadImageA( board.hInst, "WINEMINE", IMAGE_ICON, 48, 48, LR_SHARED )); + LoadImageW(board.hInst, MAKEINTRESOURCEW(IDI_WINEMINE), IMAGE_ICON, 48, 48, LR_SHARED)); return 0; } default:

1 0

[akhaldi] 70185: [CRT] Sync undname.c with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 28 Nov '15

28 Nov '15

Author: akhaldi Date: Sat Nov 28 16:33:35 2015 New Revision: 70185 URL: http://svn.reactos.org/svn/reactos?rev=70185&view=rev Log: [CRT] Sync undname.c with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/lib/sdk/crt/wine/undname.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/lib/sdk/crt/wine/undname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/wine/undname.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/wine/undname.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/wine/undname.c [iso-8859-1] Sat Nov 28 16:33:35 2015 @@ -34,7 +34,7 @@ */ /* How data types modifiers are stored: - * M (in the following definitions) is defined for + * M (in the following definitions) is defined for * 'A', 'B', 'C' and 'D' as follows * {<A>}: "" * {<B>}: "const " @@ -48,7 +48,7 @@ * in data fields: * same as for arguments and also the following * ?<M>x {<M>}x - * + * */ struct array @@ -110,7 +110,7 @@ sym->avail_in_first = 0; ptr = (char*)sym->alloc_list + sizeof(void*); } - else + else { if (len > sym->avail_in_first) { @@ -188,7 +188,7 @@ a->elts[a->num] = und_alloc(sym, len + 1); assert(a->elts[a->num]); memcpy(a->elts[a->num], ptr, len); - a->elts[a->num][len] = '\0'; + a->elts[a->num][len] = '\0'; if (++a->num >= a->max) a->max = a->num; { int i; @@ -217,18 +217,18 @@ assert(cref); if (cref->start + idx >= cref->max) { - WARN("Out of bounds: %p %d + %d >= %d\n", + WARN("Out of bounds: %p %d + %d >= %d\n", cref, cref->start, idx, cref->max); return NULL; } - TRACE("Returning %p[%d] => %s\n", + TRACE("Returning %p[%d] => %s\n", cref, idx, cref->elts[cref->start + idx]); return cref->elts[cref->start + idx]; } /****************************************************************** * str_printf - * Helper for printf type of command (only %s and %c are implemented) + * Helper for printf type of command (only %s and %c are implemented) * while dynamically allocating the buffer */ static char* str_printf(struct parsed_symbol* sym, const char* format, ...) @@ -341,7 +341,7 @@ * Parses a list of function/method arguments, creates a string corresponding * to the arguments' list. */ -static char* get_args(struct parsed_symbol* sym, struct array* pmt_ref, BOOL z_term, +static char* get_args(struct parsed_symbol* sym, struct array* pmt_ref, BOOL z_term, char open_char, char close_char) { @@ -376,8 +376,8 @@ */ if (z_term && *sym->current++ != 'Z') return NULL; - if (arg_collect.num == 0 || - (arg_collect.num == 1 && !strcmp(arg_collect.elts[0], "void"))) + if (arg_collect.num == 0 || + (arg_collect.num == 1 && !strcmp(arg_collect.elts[0], "void"))) return str_printf(sym, "%cvoid%c", open_char, close_char); for (i = 1; i < arg_collect.num; i++) { @@ -386,12 +386,12 @@ last = args_str ? args_str : arg_collect.elts[0]; if (close_char == '>' && last[strlen(last) - 1] == '>') - args_str = str_printf(sym, "%c%s%s %c", + args_str = str_printf(sym, "%c%s%s %c", open_char, arg_collect.elts[0], args_str, close_char); else - args_str = str_printf(sym, "%c%s%s%c", + args_str = str_printf(sym, "%c%s%s%c", open_char, arg_collect.elts[0], args_str, close_char); - + return args_str; } @@ -730,7 +730,7 @@ static const char* get_simple_type(char c) { const char* type_string; - + switch (c) { case 'C': type_string = "signed char"; break; @@ -759,7 +759,7 @@ static const char* get_extended_type(char c) { const char* type_string; - + switch (c) { case 'D': type_string = "__int8"; break; @@ -794,7 +794,7 @@ assert(ct); ct->left = ct->right = NULL; - + switch (dt = *sym->current++) { case '_': @@ -819,7 +819,7 @@ if (!(struct_name = get_class_name(sym))) goto done; - if (!(sym->flags & UNDNAME_NO_COMPLEX_TYPE)) + if (!(sym->flags & UNDNAME_NO_COMPLEX_TYPE)) { switch (dt) { @@ -867,7 +867,7 @@ unsigned mark = sym->stack.num; if (!get_calling_convention(*sym->current++, - &call_conv, &exported, + &call_conv, &exported, sym->flags & ~UNDNAME_NO_ALLOCATION_LANGUAGE) || !demangle_datatype(sym, &sub_ct, pmt_ref, FALSE)) goto done; @@ -876,7 +876,7 @@ if (!args) goto done; sym->stack.num = mark; - ct->left = str_printf(sym, "%s%s (%s*", + ct->left = str_printf(sym, "%s%s (%s*", sub_ct.left, sub_ct.right, call_conv); ct->right = str_printf(sym, ")%s", args); } @@ -972,7 +972,7 @@ return FALSE; } done: - + return ct->left != NULL; } @@ -1009,7 +1009,7 @@ case '0': access = "private: "; break; case '1': access = "protected: "; break; case '2': access = "public: "; break; - } + } } if (!(sym->flags & UNDNAME_NO_MEMBER_TYPE)) @@ -1059,8 +1059,8 @@ if (sym->flags & UNDNAME_NAME_ONLY) ct.left = ct.right = modifier = NULL; sym->result = str_printf(sym, "%s%s%s%s%s%s%s%s", access, - member_type, ct.left, - modifier && ct.left ? " " : NULL, modifier, + member_type, ct.left, + modifier && ct.left ? " " : NULL, modifier, modifier || ct.left ? " " : NULL, name, ct.right); ret = TRUE; done: @@ -1530,7 +1530,7 @@ TRACE("(%p,%s,%d,%p,%p,%p,%x)\n", buffer, mangled, buflen, memget, memfree, unknown, flags); - + /* The flags details is not documented by MS. However, it looks exactly * like the UNDNAME_ manifest constants from imagehlp.h and dbghelp.h * So, we copied those (on top of the file) 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] Sat Nov 28 16:33:35 2015 @@ -289,7 +289,7 @@ reactos/lib/sdk/crt/string/strtoul.c # Synced to WineStaging-1.7.37 reactos/lib/sdk/crt/strings/wcs.c # Synced at 20080611 reactos/lib/sdk/crt/wine/heap.c # Synced at 20080529 - reactos/lib/sdk/crt/wine/undname.c # Synced at 20081130 + reactos/lib/sdk/crt/wine/undname.c # Synced to WineStaging-1.7.55 reactos/lib/sdk/crt/thread/thread.c # Synced at 20080604 User32 -

1 0

[akhaldi] 70184: [USER32] Sync spy.c with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 28 Nov '15

28 Nov '15

Author: akhaldi Date: Sat Nov 28 16:29:14 2015 New Revision: 70184 URL: http://svn.reactos.org/svn/reactos?rev=70184&view=rev Log: [USER32] Sync spy.c with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/win32ss/user/user32/windows/spy.c 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] Sat Nov 28 16:29:14 2015 @@ -318,7 +318,7 @@ reactos/win32ss/user/user32/windows/menu.c # Forked reactos/win32ss/user/user32/windows/messagebox.c # Forked reactos/win32ss/user/user32/windows/rect.c # Forked (uitools.c) - reactos/win32ss/user/user32/windows/spy.c # Synced to WineStaging-1.7.37 + reactos/win32ss/user/user32/windows/spy.c # Synced to WineStaging-1.7.55 reactos/win32ss/user/user32/windows/text.c # Forked (lstr.c) reactos/win32ss/user/user32/windows/winpos.c # Forked Modified: trunk/reactos/win32ss/user/user32/windows/spy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/spy.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/spy.c [iso-8859-1] Sat Nov 28 16:29:14 2015 @@ -1555,8 +1555,9 @@ USM(TB_MAPACCELERATORW ,0), USM(TB_GETSTRINGW ,0), USM(TB_GETSTRINGA ,0), - USM(TB_UNKWN45D ,8), + USM(TB_SETBOUNDINGSIZE ,8), USM(TB_SETHOTITEM2 ,0), + USM(TB_HASACCELERATOR ,0), USM(TB_SETLISTGAP ,0), USM(TB_GETIMAGELISTCOUNT ,0), USM(TB_GETIDEALSIZE ,8), @@ -2099,7 +2100,7 @@ { INT index; if (offset < 0 && offset % 2 == 0 && ((index = -(offset + 8) / 2) < - sizeof(ClassLongOffsetNames) / sizeof(*ClassLongOffsetNames))) + sizeof(ClassLongOffsetNames) / sizeof(*ClassLongOffsetNames))) { return ClassLongOffsetNames[index]; } @@ -2516,10 +2517,10 @@ TRACE("NMHDR hwndFrom=%p idFrom=0x%08lx code=0x%08x\n", pnmh->hwndFrom, pnmh->idFrom, pnmh->code); } + break; default: if (sp_e->data_len > 0) SPY_DumpMem ("MSG lParam", (UINT *)sp_e->lParam, sp_e->data_len); - break; } }

1 0

[akhaldi] 70183: [USER32] Sync exticon.c with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 28 Nov '15

28 Nov '15

Author: akhaldi Date: Sat Nov 28 16:27:34 2015 New Revision: 70183 URL: http://svn.reactos.org/svn/reactos?rev=70183&view=rev Log: [USER32] Sync exticon.c with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/win32ss/user/user32/misc/exticon.c 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] Sat Nov 28 16:27:34 2015 @@ -306,7 +306,7 @@ reactos/win32ss/user/user32/misc/dde.c # Synced to WineStaging-1.7.55 (dde_misc.c) reactos/win32ss/user/user32/misc/ddeclient.c # Synced to WineStaging-1.7.55 reactos/win32ss/user/user32/misc/ddeserver.c # Synced to WineStaging-1.7.55 - reactos/win32ss/user/user32/misc/exticon.c # Synced to Wine-1_1_22 + reactos/win32ss/user/user32/misc/exticon.c # Synced to WineStaging-1.7.55 reactos/win32ss/user/user32/misc/resources.c # Partially synced to WineStaging-1.7.55 reactos/win32ss/user/user32/misc/winhelp.c # Last sync date unknown reactos/win32ss/user/user32/misc/wsprintf.c # Synced to Wine-1_1_23 Modified: trunk/reactos/win32ss/user/user32/misc/exticon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/e… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/exticon.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/exticon.c [iso-8859-1] Sat Nov 28 16:27:34 2015 @@ -231,7 +231,7 @@ LPBYTE pData; DWORD sig; HANDLE hFile; - UINT16 iconDirCount = 0, iconCount = 0; + UINT16 iconDirCount = 0,iconCount = 0; LPBYTE peimage; HANDLE fmapping; DWORD fsizeh,fsizel; @@ -256,13 +256,13 @@ CloseHandle(hFile); if (!fmapping) { - WARN("CreateFileMapping error %ld\n", GetLastError() ); + WARN("CreateFileMapping error %ld\n", GetLastError() ); return 0xFFFFFFFF; } if (!(peimage = MapViewOfFile(fmapping, FILE_MAP_READ, 0, 0, 0))) { - WARN("MapViewOfFile error %ld\n", GetLastError() ); + WARN("MapViewOfFile error %ld\n", GetLastError() ); CloseHandle(fmapping); return 0xFFFFFFFF; } @@ -617,8 +617,10 @@ UINT ret; INT len = MultiByteToWideChar(CP_ACP, 0, lpstrFile, -1, NULL, 0); LPWSTR lpwstrFile = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); +#ifdef __REACTOS__ if (lpwstrFile == NULL) return 0; +#endif MultiByteToWideChar(CP_ACP, 0, lpstrFile, -1, lpwstrFile, len); ret = PrivateExtractIconsW(lpwstrFile, nIndex, sizeX, sizeY, phicon, piconid, nIcons, flags); @@ -696,8 +698,10 @@ UINT ret; INT len = MultiByteToWideChar(CP_ACP, 0, lpstrFile, -1, NULL, 0); LPWSTR lpwstrFile = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); +#ifdef __REACTOS__ if (lpwstrFile == NULL) return 0; +#endif TRACE("%s %d %p %p %d\n", lpstrFile, nIndex, phIconLarge, phIconSmall, nIcons);

1 0

[akhaldi] 70182: [PSDK] Add missing TB_HASACCELERATOR.
by akhaldi＠svn.reactos.org 28 Nov '15

28 Nov '15

Author: akhaldi Date: Sat Nov 28 16:25:17 2015 New Revision: 70182 URL: http://svn.reactos.org/svn/reactos?rev=70182&view=rev Log: [PSDK] Add missing TB_HASACCELERATOR. Modified: trunk/reactos/include/psdk/commctrl.h Modified: trunk/reactos/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/commctrl.h?re… ============================================================================== --- trunk/reactos/include/psdk/commctrl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/commctrl.h [iso-8859-1] Sat Nov 28 16:25:17 2015 @@ -1246,6 +1246,7 @@ #define TB_GETSTRING __MINGW_NAME_AW(TB_GETSTRING) #define TB_SETHOTITEM2 (WM_USER+94) +#define TB_HASACCELERATOR (WM_USER+95) #define TB_SETLISTGAP (WM_USER+96) #define TB_GETIMAGELISTCOUNT (WM_USER+98) #define TB_GETIDEALSIZE (WM_USER+99)

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