Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 50702: [MSHTML] Fix compilation of nsiface.idl with midl. Only pointers to interfaces are allowed in typedefs. Also define nsISupports to IUnknown, because thats what it is and nothing e...
by tkreuzer＠svn.reactos.org 15 Feb '11

15 Feb '11

Author: tkreuzer Date: Tue Feb 15 13:29:05 2011 New Revision: 50702 URL: http://svn.reactos.org/svn/reactos?rev=50702&view=rev Log: [MSHTML] Fix compilation of nsiface.idl with midl. Only pointers to interfaces are allowed in typedefs. Also define nsISupports to IUnknown, because thats what it is and nothing else is allowed. Please someone pass this to wine. Modified: branches/cmake-bringup/dll/win32/mshtml/nsiface.idl Modified: branches/cmake-bringup/dll/win32/mshtml/nsiface.idl URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mshtml/… ============================================================================== --- branches/cmake-bringup/dll/win32/mshtml/nsiface.idl [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mshtml/nsiface.idl [iso-8859-1] Tue Feb 15 13:29:05 2011 @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* +/* * NOTE: * This file is not a typical idl file. Interfaces in this file are XPCOM * interfaces (NOT MSCOM!), but we generate the header file with WIDL @@ -27,6 +27,7 @@ cpp_quote("#define GECKO_VERSION_STRING \"Wine Gecko \" GECKO_VERSION") import "wtypes.idl"; +import "unknwn.idl"; cpp_quote("#ifdef WINE_NO_UNICODE_MACROS") cpp_quote("#undef GetForm") @@ -93,60 +94,50 @@ interface IMoniker; -[ - object, - uuid(00000000-0000-0000-c000-000000000046), - local -] -interface nsISupports -{ - nsresult QueryInterface(nsIIDRef riid, nsQIResult result); - nsrefcnt AddRef(); - nsrefcnt Release(); -} +#define nsISupports IUnknown /* Currently we don't need a full declaration of these interfaces */ -typedef nsISupports nsISHistory; -typedef nsISupports nsIWidget; -typedef nsISupports nsIHttpHeaderVisitor; -typedef nsISupports nsIDOMBarProp; -typedef nsISupports nsIPrompt; -typedef nsISupports nsIAuthPrompt; -typedef nsISupports nsIDOMNamedNodeMap; -typedef nsISupports nsIDOMAttr; -typedef nsISupports nsIDOMDocumentType; -typedef nsISupports nsIDOMDOMImplementation; -typedef nsISupports nsIDOMCDATASection; -typedef nsISupports nsIDOMProcessingInstruction; -typedef nsISupports nsIDOMEntityReference; -typedef nsISupports nsIWebProgressListener; -typedef nsISupports nsIDOMCSSValue; -typedef nsISupports nsIPrintSession; -typedef nsISupports nsIControllerCommandTable; -typedef nsISupports nsIPrincipal; -typedef nsISupports nsIAtom; -typedef nsISupports nsISupportsArray; -typedef nsISupports nsIContentFilter; -typedef nsISupports nsIDOMMediaList; -typedef nsISupports nsIDOMHTMLTableCaptionElement; -typedef nsISupports nsIDOMHTMLTableSectionElement; -typedef nsISupports nsIDOMClientRectList; -typedef nsISupports nsIDOMLocation; -typedef nsISupports nsIDocument; -typedef nsISupports nsIContent; -typedef nsISupports nsINode; -typedef nsISupports nsIStyleSheet; -typedef nsISupports nsIStyleRule; -typedef nsISupports nsIVariant; -typedef nsISupports nsIDOMUserDataHandler; -typedef nsISupports nsIDocShellLoadInfo; -typedef nsISupports nsISHEntry; -typedef nsISupports nsIPresShell; -typedef nsISupports nsIContentViewer; -typedef nsISupports nsIDocumentCharsetInfo; -typedef nsISupports nsILayoutHistoryState; -typedef nsISupports nsISecureBrowserUI; -typedef nsISupports nsIDOMStorage; +typedef nsISupports *pnsISHistory; +typedef nsISupports *pnsIWidget; +typedef nsISupports *pnsIHttpHeaderVisitor; +typedef nsISupports *pnsIDOMBarProp; +typedef nsISupports *pnsIPrompt; +typedef nsISupports *pnsIAuthPrompt; +typedef nsISupports *pnsIDOMNamedNodeMap; +typedef nsISupports *pnsIDOMAttr; +typedef nsISupports *pnsIDOMDocumentType; +typedef nsISupports *pnsIDOMDOMImplementation; +typedef nsISupports *pnsIDOMCDATASection; +typedef nsISupports *pnsIDOMProcessingInstruction; +typedef nsISupports *pnsIDOMEntityReference; +typedef nsISupports *pnsIWebProgressListener; +typedef nsISupports *pnsIDOMCSSValue; +typedef nsISupports *pnsIPrintSession; +typedef nsISupports *pnsIControllerCommandTable; +typedef nsISupports *pnsIPrincipal; +typedef nsISupports *pnsIAtom; +typedef nsISupports *pnsISupportsArray; +typedef nsISupports *pnsIContentFilter; +typedef nsISupports *pnsIDOMMediaList; +typedef nsISupports *pnsIDOMHTMLTableCaptionElement; +typedef nsISupports *pnsIDOMHTMLTableSectionElement; +typedef nsISupports *pnsIDOMClientRectList; +typedef nsISupports *pnsIDOMLocation; +typedef nsISupports *pnsIDocument; +typedef nsISupports *pnsIContent; +typedef nsISupports *pnsINode; +typedef nsISupports *pnsIStyleSheet; +typedef nsISupports *pnsIStyleRule; +typedef nsISupports *pnsIVariant; +typedef nsISupports *pnsIDOMUserDataHandler; +typedef nsISupports *pnsIDocShellLoadInfo; +typedef nsISupports *pnsISHEntry; +typedef nsISupports *pnsIPresShell; +typedef nsISupports *pnsIContentViewer; +typedef nsISupports *pnsIDocumentCharsetInfo; +typedef nsISupports *pnsILayoutHistoryState; +typedef nsISupports *pnsISecureBrowserUI; +typedef nsISupports *pnsIDOMStorage; [ object, @@ -283,7 +274,7 @@ nsresult Close(); nsresult Available(PRUint32 *_retval); nsresult Read(char *aBuf, PRUint32 aCount, PRUint32 *_retval); - nsresult ReadSegments(nsresult (*aWriter)(nsIInputStream *aInStream, + nsresult ReadSegments(nsresult (*aWriter)(nsIInputStream *aInStream, void *aClosure, const char *aFromSegment, PRUint32 aToOffset, PRUint32 aCount, PRUint32 *aWriteCount), void *aClosure, PRUint32 aCount, PRUint32 *_retval); @@ -391,7 +382,7 @@ uuid(1a637020-1482-11d3-9333-00104ba0fd40), local /* FROZEN */ -] +] interface nsIStreamListener : nsIRequestObserver { nsresult OnDataAvailable(nsIRequest *aRequest, nsISupports *aContext, @@ -458,7 +449,7 @@ nsresult SetReferrer(nsIURI *aReferrer); nsresult GetRequestHeader(const nsACString *aHeader, nsACString *_retval); nsresult SetRequestHeader(const nsACString *aHeader, const nsACString *aValue, PRBool aMerge); - nsresult VisitRequestHeaders(nsIHttpHeaderVisitor *aVisitor); + nsresult VisitRequestHeaders(pnsIHttpHeaderVisitor aVisitor); nsresult GetAllowPipelining(PRBool *aAllowPipelining); nsresult SetAllowPipelining(PRBool aAllowPipelining); nsresult GetRedirectionLimit(PRUint32 *aRedirectionLimit); @@ -468,7 +459,7 @@ nsresult GetRequestSucceeded(PRBool *aRequestSucceeded); nsresult GetResponseHeader(const nsACString *header, nsACString *_retval); nsresult SetResponseHeader(const nsACString *header, const nsACString *value, PRBool merge); - nsresult VisitResponseHeaders(nsIHttpHeaderVisitor *aVisitor); + nsresult VisitResponseHeaders(pnsIHttpHeaderVisitor aVisitor); nsresult IsNoStoreResponse(PRBool *_retval); nsresult IsNoCacheResponse(PRBool *_retval); } @@ -530,7 +521,7 @@ nsresult GetCssText(nsAString *aCssText); nsresult SetCssText(const nsAString *aCssText); nsresult GetPropertyValue(const nsAString *propertyName, nsAString *_retval); - nsresult GetPropertyCSSValue(const nsAString *propertyName, nsIDOMCSSValue **_retval); + nsresult GetPropertyCSSValue(const nsAString *propertyName, pnsIDOMCSSValue *_retval); nsresult RemoveProperty(const nsAString *propertyName, nsAString *_retval); nsresult GetPropertyPriority(const nsAString *propertyName, nsAString *_retval); nsresult SetProperty(const nsAString *propertyName, const nsAString *value, @@ -567,7 +558,7 @@ nsresult GetParentStyleSheet(nsIDOMStyleSheet **aParentStyleSheet); nsresult GetHref(nsAString *aHref); nsresult GetTitle(nsAString *aTitle); - nsresult GetMedia(nsIDOMMediaList **aMedia); + nsresult GetMedia(pnsIDOMMediaList *aMedia); } [ @@ -635,8 +626,8 @@ nsresult LookupNamespaceURI(const nsAString *prefix, nsAString _retval); nsresult IsEqualNode(nsIDOMNode *arg, PRBool *_retval); nsresult GetFeature(const nsAString *feature, const nsAString *version, nsISupports **_retval); - nsresult SetUserData(const nsAString *key, nsIVariant *data, nsIDOMUserDataHandler *handler, nsIVariant **_retval); - nsresult GetUserData(const nsAString *key, nsIVariant **_retval); + nsresult SetUserData(const nsAString *key, pnsIVariant data, pnsIDOMUserDataHandler handler, pnsIVariant *_retval); + nsresult GetUserData(const nsAString *key, pnsIVariant *_retval); } [ @@ -672,7 +663,7 @@ nsresult GetLastChild(nsIDOMNode **aLastChild); nsresult GetPreviousSibling(nsIDOMNode **aPreviousSibling); nsresult GetNextSibling(nsIDOMNode **aNextSibling); - nsresult GetAttributes(nsIDOMNamedNodeMap **aAttributes); + nsresult GetAttributes(pnsIDOMNamedNodeMap *aAttributes); nsresult GetOwnerDocument(nsIDOMDocument **aOwnerDocument); nsresult InsertBefore(nsIDOMNode *newChild, nsIDOMNode *refChild, nsIDOMNode **_retval); nsresult ReplaceChild(nsIDOMNode *newChild, nsIDOMNode *oldChild, nsIDOMNode **_retval); @@ -701,9 +692,9 @@ nsresult GetAttribute(const nsAString *name, nsAString *_retval); nsresult SetAttribute(const nsAString *name, const nsAString *value); nsresult RemoveAttribute(const nsAString *name); - nsresult GetAttributeNode(const nsAString *name, nsIDOMAttr **_retval); - nsresult SetAttributeNode(nsIDOMAttr *newAttr, nsIDOMAttr **_retval); - nsresult RemoveAttributeNode(nsIDOMAttr *oldAttr, nsIDOMAttr **_retval); + nsresult GetAttributeNode(const nsAString *name, pnsIDOMAttr *_retval); + nsresult SetAttributeNode(pnsIDOMAttr newAttr, pnsIDOMAttr *_retval); + nsresult RemoveAttributeNode(pnsIDOMAttr oldAttr, pnsIDOMAttr *_retval); nsresult GetElementsByTagName(const nsAString *name, nsIDOMNodeList **_retval); nsresult GetAttributeNS(const nsAString *namespaceURI, const nsAString *localName, nsAString *_retval); @@ -711,8 +702,8 @@ const nsAString *value); nsresult RemoveAttributeNS(const nsAString *namespaceURI, const nsAString *localName); nsresult GetAttributeNodeNS(const nsAString *namespaceURI, const nsAString *localName, - nsIDOMAttr **_retval); - nsresult SetAttributeNodeNS(nsIDOMAttr *newAttr, nsIDOMAttr **_retval); + pnsIDOMAttr *_retval); + nsresult SetAttributeNodeNS(pnsIDOMAttr newAttr, pnsIDOMAttr *_retval); nsresult GetElementsByTagNameNS(const nsAString *namespaceURI, const nsAString *localName, nsIDOMNodeList **_retval); nsresult HasAttribute(const nsAString *name, PRBool *_retval); @@ -756,7 +747,7 @@ interface nsIDOMNSElement : nsISupports { nsresult GetElementsByClassName(const nsAString *classes, nsIDOMNodeList **_retval); - nsresult GetClientRects(nsIDOMClientRectList **_retval); + nsresult GetClientRects(pnsIDOMClientRectList *_retval); nsresult GetBoundingClientRect(nsIDOMClientRect **_retval); nsresult GetScrollTop(PRInt32 *aScrollTop); nsresult SetScrollTop(PRInt32 aScrollTop); @@ -918,24 +909,24 @@ ] interface nsIDOMDocument : nsIDOMNode { - nsresult GetDoctype(nsIDOMDocumentType **aDoctype); - nsresult GetImplementation(nsIDOMDOMImplementation **aImplementation); + nsresult GetDoctype(pnsIDOMDocumentType *aDoctype); + nsresult GetImplementation(pnsIDOMDOMImplementation *aImplementation); nsresult GetDocumentElement(nsIDOMElement **aDocumentElement); nsresult CreateElement(const nsAString *tagName, nsIDOMElement **_retval); nsresult CreateDocumentFragment(nsIDOMDocumentFragment **_retval); nsresult CreateTextNode(const nsAString *data, nsIDOMText **_retval); nsresult CreateComment(const nsAString *data, nsIDOMComment **_retval); - nsresult CreateCDATASection(const nsAString *data, nsIDOMCDATASection **_retval); + nsresult CreateCDATASection(const nsAString *data, pnsIDOMCDATASection *_retval); nsresult CreateProcessingInstruction(const nsAString *target, const nsAString *data, - nsIDOMProcessingInstruction **_retval); - nsresult CreateAttribute(const nsAString *name, nsIDOMAttr **_retval); - nsresult CreateEntityReference(const nsAString *name, nsIDOMEntityReference **_retval); + pnsIDOMProcessingInstruction *_retval); + nsresult CreateAttribute(const nsAString *name, pnsIDOMAttr *_retval); + nsresult CreateEntityReference(const nsAString *name, pnsIDOMEntityReference *_retval); nsresult GetElementsByTagName(const nsAString *tagname, nsIDOMNodeList **_retval); nsresult ImportNode(nsIDOMNode *importedNode, PRBool deep, nsIDOMNode **_retval); nsresult CreateElementNS(const nsAString *namespaceURI, const nsAString *qualifiedName, nsIDOMElement **_retval); nsresult CreateAttributeNS(const nsAString *namespaceURI, const nsAString *qualifiedName, - nsIDOMAttr **_retval); + pnsIDOMAttr *_retval); nsresult GetElementsByTagNameNS(const nsAString *namespaceURI, const nsAString *localName, nsIDOMNodeList **_retval); nsresult GetElementById(const nsAString *elementId, nsIDOMElement **_retval); @@ -952,7 +943,7 @@ nsresult GetCharacterSet(nsAString *aCharacterSet); nsresult GetDir(nsAString *aDir); nsresult SetDir(const nsAString *aDir); - nsresult GetLocation(nsIDOMLocation **aLocation); + nsresult GetLocation(pnsIDOMLocation *aLocation); nsresult GetTitle(nsAString *aTitle); nsresult SetTitle(const nsAString *aTitle); nsresult GetContentType(nsAString *aContentType); @@ -1197,7 +1188,7 @@ nsresult GetDocument(nsIDOMDocument **aDocument); nsresult GetParent(nsIDOMWindow **aParent); nsresult GetTop(nsIDOMWindow **aTop); - nsresult GetScrollbars(nsIDOMBarProp **aScrollbars); + nsresult GetScrollbars(pnsIDOMBarProp *aScrollbars); nsresult GetFrames(nsIDOMWindowCollection **aFrames); nsresult GetName(nsAString *aName); nsresult SetName(const nsAString *aName); @@ -1515,12 +1506,12 @@ ] interface nsIDOMHTMLTableElement : nsIDOMHTMLElement { - nsresult GetCaption(nsIDOMHTMLTableCaptionElement **aCaption); - nsresult SetCaption(nsIDOMHTMLTableCaptionElement *aCaption); - nsresult GetTHead(nsIDOMHTMLTableSectionElement **aTHead); - nsresult SetTHead(nsIDOMHTMLTableSectionElement *aTHead); - nsresult GetTFoot(nsIDOMHTMLTableSectionElement **aTFoot); - nsresult SetTFoot(nsIDOMHTMLTableSectionElement *aTFoot); + nsresult GetCaption(pnsIDOMHTMLTableCaptionElement *aCaption); + nsresult SetCaption(pnsIDOMHTMLTableCaptionElement aCaption); + nsresult GetTHead(pnsIDOMHTMLTableSectionElement *aTHead); + nsresult SetTHead(pnsIDOMHTMLTableSectionElement aTHead); + nsresult GetTFoot(pnsIDOMHTMLTableSectionElement *aTFoot); + nsresult SetTFoot(pnsIDOMHTMLTableSectionElement aTFoot); nsresult GetRows(nsIDOMHTMLCollection **aRows); nsresult GetTBodies(nsIDOMHTMLCollection **aTBodies); nsresult GetAlign(nsAString *aAlign); @@ -1707,7 +1698,7 @@ ] interface nsIBaseWindow : nsISupports { - nsresult InitWindow(nativeWindow parentNativeWindow, nsIWidget *parentWidget, PRInt32 x, + nsresult InitWindow(nativeWindow parentNativeWindow, pnsIWidget parentWidget, PRInt32 x, PRInt32 y, PRInt32 cx, PRInt32 cy); nsresult Create(); nsresult Destroy(); @@ -1718,8 +1709,8 @@ nsresult SetPositionAndSize(PRInt32 x, PRInt32 y, PRInt32 cx, PRInt32 cy, PRBool fRepaint); nsresult GetPositionAndSize(PRInt32 *x, PRInt32 *y, PRInt32 *cx, PRInt32 *cy); nsresult Repaint(PRBool force); - nsresult GetParentWidget(nsIWidget **aParentWidget); - nsresult SetParentWidget(nsIWidget *aParentWidget); + nsresult GetParentWidget(pnsIWidget *aParentWidget); + nsresult SetParentWidget(pnsIWidget aParentWidget); nsresult GetParentNativeWindow(nativeWindow *aParentNativeWindow); nsresult SetParentNativeWindow(nativeWindow aParentNativeWindow); nsresult GetVisibility(PRBool *aVisibility); @@ -1728,7 +1719,7 @@ nsresult SetEnabled(PRBool aEnabled); nsresult GetBlurSuppression(PRBool *aBlurSuppression); nsresult SetBlurSuppression(PRBool aBlurSuppression); - nsresult GetMainWidget(nsIWidget **aMainWidget); + nsresult GetMainWidget(pnsIWidget *aMainWidget); nsresult SetFocus(); nsresult GetTitle(PRUnichar **aTitle); nsresult SetTitle(const PRUnichar *aTitle); @@ -1757,8 +1748,8 @@ nsresult GetDocument(nsIDOMDocument **aDocument); nsresult GetCurrentURI(nsIURI **aCurrentURI); nsresult GetReferringURI(nsIURI **aReferringURI); - nsresult GetSessionHistory(nsISHistory **aSessionHistory); - nsresult SetSessionHistory(nsISHistory *aSessionHistory); + nsresult GetSessionHistory(pnsISHistory *aSessionHistory); + nsresult SetSessionHistory(pnsISHistory aSessionHistory); } [ @@ -1769,8 +1760,8 @@ ] interface nsIWebProgress : nsISupports { - nsresult AddProgressListener(nsIWebProgressListener *aListener, PRUint32 aNotifyMask); - nsresult RemoveProgressListener(nsIWebProgressListener *aListener); + nsresult AddProgressListener(pnsIWebProgressListener aListener, PRUint32 aNotifyMask); + nsresult RemoveProgressListener(pnsIWebProgressListener aListener); nsresult GetDOMWindow(nsIDOMWindow **aDOMWindow); nsresult GetIsLoadingDocument(PRBool *aIsLoadingDocument); } @@ -1791,8 +1782,8 @@ nsresult GetEffectivePageSize(double *aWidth, double *aHeight); nsresult Clone(nsIPrintSettings **_retval); nsresult Assign(nsIPrintSettings *aPS); - nsresult GetPrintSession(nsIPrintSession **aPrintSession); - nsresult SetPrintSession(nsIPrintSession *aPrintSession); + nsresult GetPrintSession(pnsIPrintSession *aPrintSession); + nsresult SetPrintSession(pnsIPrintSession aPrintSession); nsresult GetStartPageRange(PRInt32 *aStartPageRange); nsresult SetStartPageRange(PRInt32 aStartPageRange); nsresult GetEndPageRange(PRInt32 *aEndPageRange); @@ -1930,9 +1921,9 @@ nsresult GetIsIFrameSelected(PRBool *aIsIFrameSelected); nsresult GetIsRangeSelection(PRBool *aIsRangeSelection); nsresult GetPrintPreviewNumPages(PRInt32 *aPrintPreviewNumPages); - nsresult Print(nsIPrintSettings *aThePrintSettings, nsIWebProgressListener *aWPListener); + nsresult Print(nsIPrintSettings *aThePrintSettings, pnsIWebProgressListener aWPListener); nsresult PrintPreview(nsIPrintSettings *aThePrintSettings, nsIDOMWindow *aChildDOMWin, - nsIWebProgressListener *aWPListener); + pnsIWebProgressListener aWPListener); nsresult PrintPreviewNavigate(PRInt16 aNavType, PRInt32 aPageNum); nsresult Cancel(); nsresult EnumerateDocumentNames(PRUint32 *aCount, PRUnichar ***aResult); @@ -2430,8 +2421,8 @@ nsresult RegisterNotification(nsIObserver *aObserver); nsresult UnregisterNotification(nsIObserver *aObserver); nsresult GetWindowEnumerator(nsISimpleEnumerator **_retval); - nsresult GetNewPrompter(nsIDOMWindow *aParent, nsIPrompt **_retval); - nsresult GetNewAuthPrompter(nsIDOMWindow *aParent, nsIAuthPrompt **_retval); + nsresult GetNewPrompter(nsIDOMWindow *aParent, pnsIPrompt *_retval); + nsresult GetNewAuthPrompter(nsIDOMWindow *aParent, pnsIAuthPrompt *_retval); nsresult SetWindowCreator(nsIWindowCreator *creator); nsresult GetChromeForWindow(nsIDOMWindow *aWindow, nsIWebBrowserChrome **_retval); nsresult GetWindowByName(const PRUnichar *aTargetName, nsIDOMWindow *aCurrentWindow, @@ -2515,7 +2506,7 @@ ] interface nsIControllerContext : nsISupports { - nsresult Init(nsIControllerCommandTable *aCommandTable); + nsresult Init(pnsIControllerCommandTable aCommandTable); nsresult SetCommandContext(nsISupports *aCommandContext); } @@ -2544,13 +2535,13 @@ nsresult Init(PRUint32 flags, PRUint32 aWrapColumn, const char* aCharSet, PRBool aIsCopying, PRBool aIsWholeDocument); nsresult AppendText(nsIDOMText *aText, PRInt32 aStartOffset, PRInt32 aEndOffset, nsAString *aStr); - nsresult AppendCDATASection(nsIDOMCDATASection *aCDATASection, PRInt32 aStartOffset, + nsresult AppendCDATASection(pnsIDOMCDATASection aCDATASection, PRInt32 aStartOffset, PRInt32 aEndOffset, nsAString *aStr); - nsresult AppendProcessingInstruction(nsIDOMProcessingInstruction* aPI, PRInt32 aStartOffset, + nsresult AppendProcessingInstruction(pnsIDOMProcessingInstruction aPI, PRInt32 aStartOffset, PRInt32 aEndOffset, nsAString *aStr); nsresult AppendComment(nsIDOMComment *aComment, PRInt32 aStartOffset, PRInt32 aEndOffset, nsAString *aStr); - nsresult AppendDoctype(nsIDOMDocumentType *aDoctype, nsAString *aStr); + nsresult AppendDoctype(pnsIDOMDocumentType aDoctype, nsAString *aStr); nsresult AppendElementStart(nsIDOMElement *aElement, nsIDOMElement *aOriginalElement, nsAString *aStr); nsresult AppendElementEnd(nsIDOMElement *aElement, nsAString *aStr); @@ -2601,7 +2592,7 @@ nsresult CanRedo([out] PRBool *isEnabled, [out] PRBool *canRedo); nsresult BeginTransaction(); nsresult EndTransaction(); - nsresult BeginPlaceHolderTransaction([in] nsIAtom *name); + nsresult BeginPlaceHolderTransaction([in] pnsIAtom name); nsresult EndPlaceHolderTransaction(); nsresult ShouldTxnSetSelection([out] PRBool *_retval); nsresult SetShouldTxnSetSelection([in] PRBool should); @@ -2654,15 +2645,15 @@ ] interface nsIHTMLEditor : nsISupports { - nsresult AddDefaultProperty([in] nsIAtom *aProperty, [in] nsAString *aAttribute, [in] nsAString *aValue); - nsresult RemoveDefaultProperty([in] nsIAtom *aProperty, [in] nsAString *aAttribute, [in] nsAString *aValue); + nsresult AddDefaultProperty([in] pnsIAtom aProperty, [in] nsAString *aAttribute, [in] nsAString *aValue); + nsresult RemoveDefaultProperty([in] pnsIAtom aProperty, [in] nsAString *aAttribute, [in] nsAString *aValue); nsresult RemoveAllDefaultProperties(); - nsresult SetCSSInlineProperty([in] nsIAtom *aProperty, [in] nsAString *aAttribute, [in] nsAString *aValue); - nsresult SetInlineProperty([in] nsIAtom *aProperty, [in] nsAString *aAttribute, [in] nsAString *aValue); - nsresult GetInlineProperty([in] nsIAtom *aProperty, [in] nsAString *aAttribute, [in] nsAString *aValue, [out] PRBool *aFirst, [out] PRBool *aAny, [out] PRBool *aAll); - nsresult GetInlinePropertyWithAttrValue([in] nsIAtom *aProperty, [in] nsAString *aAttribute, [in] nsAString *aValue, [out] PRBool *aFirst, [out] PRBool *aAny, [out] PRBool *aAll, [out] nsAString *_retval); + nsresult SetCSSInlineProperty([in] pnsIAtom aProperty, [in] nsAString *aAttribute, [in] nsAString *aValue); + nsresult SetInlineProperty([in] pnsIAtom aProperty, [in] nsAString *aAttribute, [in] nsAString *aValue); + nsresult GetInlineProperty([in] pnsIAtom aProperty, [in] nsAString *aAttribute, [in] nsAString *aValue, [out] PRBool *aFirst, [out] PRBool *aAny, [out] PRBool *aAll); + nsresult GetInlinePropertyWithAttrValue([in] pnsIAtom aProperty, [in] nsAString *aAttribute, [in] nsAString *aValue, [out] PRBool *aFirst, [out] PRBool *aAny, [out] PRBool *aAll, [out] nsAString *_retval); nsresult RemoveAllInlineProperties(); - nsresult RemoveInlineProperty([in] nsIAtom *aProperty, [in] nsAString *aAttribute); + nsresult RemoveInlineProperty([in] pnsIAtom aProperty, [in] nsAString *aAttribute); nsresult IncreaseFontSize(); nsresult DecreaseFontSize(); nsresult CanDrag([in] nsIDOMEvent *aEvent, [out] PRBool *_retval); @@ -2701,11 +2692,11 @@ nsresult SetBackgroundColor([in] nsAString *aColor); nsresult SetBodyAttribute([in] nsAString *aAttr, [in] nsAString *aValue); nsresult IgnoreSpuriousDragEvent([in] PRBool aIgnoreSpuriousDragEvent); - nsresult GetLinkedObjects([out] nsISupportsArray **_retval); + nsresult GetLinkedObjects([out] pnsISupportsArray *_retval); nsresult GetIsCSSEnabled([out] PRBool *_retval); nsresult SetIsCSSEnabled([in] PRBool prb); - nsresult AddInsertionListener([in] nsIContentFilter *inFilter); - nsresult RemoveInsertionListener([in] nsIContentFilter *inFilter); + nsresult AddInsertionListener([in] pnsIContentFilter inFilter); + nsresult RemoveInsertionListener([in] pnsIContentFilter inFilter); nsresult CreateAnonymousElement([in] nsAString *aTag, [in] nsIDOMNode *aParentNode, [in] nsAString *aAnonClass, [in] PRBool aIsCreatedHidden, [out] nsIDOMElement **_retval); nsresult GetSelectionContainer([out] nsIDOMElement **_retval); nsresult CheckSelectionStateForAnonymousButtons([in] nsISelection *aSelection); @@ -2722,24 +2713,24 @@ ] interface nsIDocShell : nsISupports { - nsresult LoadURI(nsIURI *uri, nsIDocShellLoadInfo *loadInfo, PRUint32 aLoadFlags, PRBool firstParty); + nsresult LoadURI(nsIURI *uri, pnsIDocShellLoadInfo loadInfo, PRUint32 aLoadFlags, PRBool firstParty); nsresult LoadStream(nsIInputStream *aStream, nsIURI *aURI, const nsACString *aContentType, - const nsACString *aContentCharset, nsIDocShellLoadInfo *aLoadInfo); + const nsACString *aContentCharset, pnsIDocShellLoadInfo aLoadInfo); nsresult InternalLoad(nsIURI *aURI, nsIURI *aReferrer, nsISupports *aOwner, PRUint32 aFlags, const PRUnichar *aWindowTarget, const char *aTypeHint, nsIInputStream *aPostDataStream, nsIInputStream *aHeadersStream, PRUint32 aLoadFlags, - nsISHEntry *aSHEntry, PRBool firstParty, nsIDocShell **aDocShell, nsIRequest **aRequest); - nsresult CreateLoadInfo(nsIDocShellLoadInfo **loadInfo); + pnsISHEntry aSHEntry, PRBool firstParty, nsIDocShell **aDocShell, nsIRequest **aRequest); + nsresult CreateLoadInfo(pnsIDocShellLoadInfo *loadInfo); nsresult PrepareForNewContentModel(); nsresult SetCurrentURI(nsIURI *aURI); nsresult FirePageHideNotification(PRBool isUnload); nsresult GetPresContext(void /*nsPresContext*/ **aPresContext); - nsresult GetPresShell(nsIPresShell **aPresShell); - nsresult GetEldestPresShell(nsIPresShell **aEldestPresShell); - nsresult GetContentViewer(nsIContentViewer **aContentViewer); + nsresult GetPresShell(pnsIPresShell *aPresShell); + nsresult GetEldestPresShell(pnsIPresShell *aEldestPresShell); + nsresult GetContentViewer(pnsIContentViewer *aContentViewer); nsresult GetChromeEventHandler(nsIDOMEventTarget **aChromeEventHandler); nsresult SetChromeEventHandler(nsIDOMEventTarget *aChromeEventHandler); - nsresult GetDocumentCharsetInfo(nsIDocumentCharsetInfo **aDocumentCharsetInfo); - nsresult SetDocumentCharsetInfo(nsIDocumentCharsetInfo *aDocumentCharsetInfo); + nsresult GetDocumentCharsetInfo(pnsIDocumentCharsetInfo *aDocumentCharsetInfo); + nsresult SetDocumentCharsetInfo(pnsIDocumentCharsetInfo aDocumentCharsetInfo); nsresult GetAllowPlugins(PRBool *aAllowPlugins); nsresult SetAllowPlugins(PRBool aAllowPlugins); nsresult GetAllowJavascript(PRBool *aAllowJavascript); @@ -2769,14 +2760,14 @@ nsresult SetLoadType(PRUint32 aLoadType); nsresult IsBeingDestroyed(PRBool *_retval); nsresult GetIsExecutingOnLoadHandler(PRBool *aIsExecutingOnLoadHandler); - nsresult GetLayoutHistoryState(nsILayoutHistoryState **aLayoutHistoryState); - nsresult SetLayoutHistoryState(nsILayoutHistoryState *aLayoutHistoryState); + nsresult GetLayoutHistoryState(pnsILayoutHistoryState *aLayoutHistoryState); + nsresult SetLayoutHistoryState(pnsILayoutHistoryState aLayoutHistoryState); nsresult GetShouldSaveLayoutState(PRBool *aShouldSaveLayoutState); - nsresult GetSecurityUI(nsISecureBrowserUI **aSecurityUI); - nsresult SetSecurityUI(nsISecureBrowserUI *aSecurityUI); + nsresult GetSecurityUI(pnsISecureBrowserUI *aSecurityUI); + nsresult SetSecurityUI(pnsISecureBrowserUI aSecurityUI); nsresult SuspendRefreshURIs(); nsresult ResumeRefreshURIs(); - nsresult BeginRestore(nsIContentViewer *viewer, PRBool top); + nsresult BeginRestore(pnsIContentViewer viewer, PRBool top); nsresult FinishRestore(); nsresult GetRestoringDocument(PRBool *aRestoringDocument); nsresult GetUseErrorPages(PRBool *aUseErrorPages); @@ -2784,9 +2775,9 @@ nsresult GetPreviousTransIndex(PRInt32 *aPreviousTransIndex); nsresult GetLoadedTransIndex(PRInt32 *aLoadedTransIndex); nsresult HistoryPurged(PRInt32 numEntries); - nsresult GetSessionStorageForURI(nsIURI *uri, nsIDOMStorage **_retval); - nsresult GetSessionStorageForPrincipal(nsIPrincipal *principal, PRBool create, nsIDOMStorage **_retval); - nsresult AddSessionStorage(nsIPrincipal *principal, nsIDOMStorage *storage); + nsresult GetSessionStorageForURI(nsIURI *uri, pnsIDOMStorage *_retval); + nsresult GetSessionStorageForPrincipal(pnsIPrincipal principal, PRBool create, pnsIDOMStorage *_retval); + nsresult AddSessionStorage(pnsIPrincipal principal, pnsIDOMStorage storage); nsresult GetCurrentDocumentChannel(nsIChannel **aCurrentDocumentChannel); nsresult SetChildOffset(PRUint32 offset); nsresult GetIsInUnload(PRBool *aIsInUnload); @@ -2804,21 +2795,21 @@ ] interface nsIMutationObserver : nsISupports { - void CharacterDataWillChange(nsIDocument *aDocument, nsIContent *aContent, + void CharacterDataWillChange(pnsIDocument aDocument, pnsIContent aContent, void /*CharacterDataChangeInfo*/ *aInfo); - void CharacterDataChanged(nsIDocument *aDocument, nsIContent *aContent, + void CharacterDataChanged(pnsIDocument aDocument, pnsIContent aContent, void /*CharacterDataChangeInfo*/ *aInfo); - void AttributeWillChange(nsIDocument *aDocument, nsIContent * aContent, PRInt32 aNameSpaceID, - nsIAtom *aAttribute, PRInt32 aModType); - void AttributeChanged(nsIDocument *aDocument, nsIContent *aContent, PRInt32 aNameSpaceID, - nsIAtom *aAttribute, PRInt32 aModType, PRUint32 aStateMask); - void ContentAppended(nsIDocument *aDocument, nsIContent *aContainer, PRInt32 aNewIndexInContainer); - void ContentInserted(nsIDocument *aDocument, nsIContent *aContainer, nsIContent *aChild, + void AttributeWillChange(pnsIDocument aDocument, pnsIContent aContent, PRInt32 aNameSpaceID, + pnsIAtom aAttribute, PRInt32 aModType); + void AttributeChanged(pnsIDocument aDocument, pnsIContent aContent, PRInt32 aNameSpaceID, + pnsIAtom aAttribute, PRInt32 aModType, PRUint32 aStateMask); + void ContentAppended(pnsIDocument aDocument, pnsIContent aContainer, PRInt32 aNewIndexInContainer); + void ContentInserted(pnsIDocument aDocument, pnsIContent aContainer, pnsIContent aChild, PRInt32 aIndexInContainer); - void ContentRemoved(nsIDocument *aDocument, nsIContent *aContainer, nsIContent *aChild, + void ContentRemoved(pnsIDocument aDocument, pnsIContent aContainer, pnsIContent aChild, PRInt32 aIndexInContainer); - void NodeWillBeDestroyed(const nsINode *aNode); - void ParentChainChanged(nsIContent *aContent); + void NodeWillBeDestroyed(const pnsINode aNode); + void ParentChainChanged(pnsIContent aContent); } [ @@ -2831,20 +2822,20 @@ { typedef int nsUpdateType; - void BeginUpdate(nsIDocument *aDocument, nsUpdateType aUpdateType); - void EndUpdate(nsIDocument *aDocument, nsUpdateType aUpdateType); - void BeginLoad(nsIDocument *aDocument); - void EndLoad(nsIDocument *aDocument); - void ContentStatesChanged(nsIDocument *aDocument, nsIContent *aContent1, nsIContent *aContent2, + void BeginUpdate(pnsIDocument aDocument, nsUpdateType aUpdateType); + void EndUpdate(pnsIDocument aDocument, nsUpdateType aUpdateType); + void BeginLoad(pnsIDocument aDocument); + void EndLoad(pnsIDocument aDocument); + void ContentStatesChanged(pnsIDocument aDocument, pnsIContent aContent1, pnsIContent aContent2, PRInt32 aStateMask); - void StyleSheetAdded(nsIDocument *aDocument, nsIStyleSheet *aStyleSheet, PRBool aDocumentSheet); - void StyleSheetRemoved(nsIDocument *aDocument, nsIStyleSheet *aStyleSheet, PRBool aDocumentSheet); - void StyleSheetApplicableStateChanged(nsIDocument *aDocument, nsIStyleSheet *aStyleSheet, + void StyleSheetAdded(pnsIDocument aDocument, pnsIStyleSheet aStyleSheet, PRBool aDocumentSheet); + void StyleSheetRemoved(pnsIDocument aDocument, pnsIStyleSheet aStyleSheet, PRBool aDocumentSheet); + void StyleSheetApplicableStateChanged(pnsIDocument aDocument, pnsIStyleSheet aStyleSheet, PRBool aApplicable); - void StyleRuleChanged(nsIDocument *aDocument, nsIStyleSheet *aStyleSheet, nsIStyleRule *aOldStyleRule, - nsIStyleRule *aNewStyleRule); - void StyleRuleAdded(nsIDocument *aDocument, nsIStyleSheet *aStyleSheet, nsIStyleRule *aStyleRule); - void StyleRuleRemoved(nsIDocument *aDocument, nsIStyleSheet *aStyleSheet, nsIStyleRule *aStyleRule); - void BindToDocument(nsIDocument *aDocument, nsIContent *aContent); - void DoneAddingChildren(nsIContent *aContent, PRBool aHaveNotified); -} + void StyleRuleChanged(pnsIDocument aDocument, pnsIStyleSheet aStyleSheet, pnsIStyleRule aOldStyleRule, + pnsIStyleRule aNewStyleRule); + void StyleRuleAdded(pnsIDocument aDocument, pnsIStyleSheet aStyleSheet, pnsIStyleRule aStyleRule); + void StyleRuleRemoved(pnsIDocument aDocument, pnsIStyleSheet aStyleSheet, pnsIStyleRule aStyleRule); + void BindToDocument(pnsIDocument aDocument, pnsIContent aContent); + void DoneAddingChildren(pnsIContent aContent, PRBool aHaveNotified); +}

1 0

[spetreolle] 50701: [CMAKE] Fix msvc usetup build.
by spetreolle＠svn.reactos.org 15 Feb '11

15 Feb '11

Author: spetreolle Date: Tue Feb 15 13:01:44 2011 New Revision: 50701 URL: http://svn.reactos.org/svn/reactos?rev=50701&view=rev Log: [CMAKE] Fix msvc usetup build. Modified: branches/cmake-bringup/base/setup/usetup/CMakeLists.txt Modified: branches/cmake-bringup/base/setup/usetup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/usetup… ============================================================================== --- branches/cmake-bringup/base/setup/usetup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/setup/usetup/CMakeLists.txt [iso-8859-1] Tue Feb 15 13:01:44 2011 @@ -38,6 +38,10 @@ vfatlib mingw_common) +if(MSVC) + target_link_libraries(usetup msvcsup) +endif() + set_module_type(usetup nativecui) add_importlibs(usetup kernel32 ntdll) add_minicd_target(usetup reactos/system32 smss.exe)

1 0

[tkreuzer] 50700: [CMAKE] fix msvc build of mswsock
by tkreuzer＠svn.reactos.org 15 Feb '11

15 Feb '11

Author: tkreuzer Date: Tue Feb 15 12:54:50 2011 New Revision: 50700 URL: http://svn.reactos.org/svn/reactos?rev=50700&view=rev Log: [CMAKE] fix msvc build of mswsock Modified: branches/cmake-bringup/dll/win32/mswsock/CMakeLists.txt branches/cmake-bringup/dll/win32/wsock32/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/mswsock/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mswsock… ============================================================================== --- branches/cmake-bringup/dll/win32/mswsock/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mswsock/CMakeLists.txt [iso-8859-1] Tue Feb 15 12:54:50 2011 @@ -17,3 +17,4 @@ set_module_type(mswsock win32dll) add_importlibs(mswsock ws2_32 msvcrt kernel32) add_cab_target(mswsock 1) +add_importlib_target(mswsock.spec) Modified: branches/cmake-bringup/dll/win32/wsock32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wsock32… ============================================================================== --- branches/cmake-bringup/dll/win32/wsock32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wsock32/CMakeLists.txt [iso-8859-1] Tue Feb 15 12:54:50 2011 @@ -6,5 +6,5 @@ set_module_type(wsock32 win32dll) -add_importlibs(wsock32 ws2_32 msvcrt kernel32 ntdll) +add_importlibs(wsock32 mswsock ws2_32 msvcrt kernel32 ntdll) add_cab_target(wsock32 1)

1 0

[tkreuzer] 50699: [CMAKE] Fix MSVC build of ntdllsys
by tkreuzer＠svn.reactos.org 15 Feb '11

15 Feb '11

Author: tkreuzer Date: Tue Feb 15 12:46:08 2011 New Revision: 50699 URL: http://svn.reactos.org/svn/reactos?rev=50699&view=rev Log: [CMAKE] Fix MSVC build of ntdllsys Modified: branches/cmake-bringup/ntoskrnl/CMakeLists.txt Modified: branches/cmake-bringup/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/CMakeLis… ============================================================================== --- branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] Tue Feb 15 12:46:08 2011 @@ -441,7 +441,7 @@ libcntpr wdmguid ioevent) - + add_importlibs(ntoskrnl hal kdcom bootvid) add_pch(ntoskrnl ${CMAKE_CURRENT_SOURCE_DIR}/include/ntoskrnl.h ${SOURCE}) @@ -452,3 +452,4 @@ add_importlib_target(ntoskrnl.spec) add_library(ntdllsys ntdll.S) +set_target_properties(ntdllsys PROPERTIES LINKER_LANGUAGE C)

1 0

[fireball] 50698: [RTL/DPH] - Implement more support functions: coalescing a node into the list of available nodes, finding a best fitting node for a given size, growing available virtual memory am...
by fireball＠svn.reactos.org 15 Feb '11

15 Feb '11

Author: fireball Date: Tue Feb 15 11:53:16 2011 New Revision: 50698 URL: http://svn.reactos.org/svn/reactos?rev=50698&view=rev Log: [RTL/DPH] - Implement more support functions: coalescing a node into the list of available nodes, finding a best fitting node for a given size, growing available virtual memory amount. Modified: trunk/reactos/lib/rtl/heappage.c Modified: trunk/reactos/lib/rtl/heappage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heappage.c?rev=506… ============================================================================== --- trunk/reactos/lib/rtl/heappage.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heappage.c [iso-8859-1] Tue Feb 15 11:53:16 2011 @@ -7,6 +7,7 @@ /* Useful references: http://msdn.microsoft.com/en-us/library/ms220938(VS.80).aspx + http://blogs.msdn.com/b/jiangyue/archive/2010/03/16/windows-heap-overrun-mo… */ /* INCLUDES *****************************************************************/ @@ -125,6 +126,7 @@ #define DPH_RESERVE_SIZE 0x100000 #define DPH_POOL_SIZE 0x4000 +#define DPH_FREE_LIST_MINIMUM 8 /* RtlpDphBreakOptions */ #define DPH_BREAK_ON_RESERVE_FAIL 0x01 @@ -149,6 +151,9 @@ #define POINTER_ADD_BIAS(ptr) ((ULONG_PTR)(ptr) & 1) /* FUNCTIONS ******************************************************************/ + +BOOLEAN NTAPI +RtlpDphGrowVirtual(PDPH_HEAP_ROOT DphRoot, SIZE_T Size); NTSTATUS NTAPI RtlpSecMemFreeVirtualMemory(HANDLE Process, PVOID *Base, PSIZE_T Size, ULONG Type) @@ -361,6 +366,75 @@ RtlpDphCoalesceNodeIntoAvailable(PDPH_HEAP_ROOT DphRoot, PDPH_HEAP_BLOCK Node) { + PDPH_HEAP_BLOCK NodeEntry, PrevNode = NULL, NextNode; + PLIST_ENTRY AvailListHead; + PLIST_ENTRY CurEntry; + + /* Update heap counters */ + DphRoot->nAvailableAllocationBytesCommitted += Node->nVirtualBlockSize; + DphRoot->nAvailableAllocations++; + + /* Find where to put this node according to its virtual address */ + AvailListHead = &DphRoot->AvailableAllocationHead; + CurEntry = AvailListHead->Flink; + + while (CurEntry != AvailListHead) + { + NodeEntry = CONTAINING_RECORD(CurEntry, DPH_HEAP_BLOCK, AvailableEntry); + + if (NodeEntry->pVirtualBlock >= Node->pVirtualBlock) + { + PrevNode = NodeEntry; + break; + } + CurEntry = CurEntry->Flink; + } + + /* Did we find a node to insert our one after? */ + if (!PrevNode) + { + /* No, just add to the head of the list then */ + InsertHeadList(AvailListHead, &Node->AvailableEntry); + } + else + { + /* Check the previous node and merge if possible */ + if (PrevNode->pVirtualBlock + PrevNode->nVirtualBlockSize == Node->pVirtualBlock) + { + /* They are adjacent - merge! */ + PrevNode->nVirtualBlockSize += Node->nVirtualBlockSize; + RtlpDphReturnNodeToUnusedList(DphRoot, Node); + DphRoot->nAvailableAllocations--; + + Node = PrevNode; + } + else + { + /* Insert after PrevNode */ + InsertTailList(&PrevNode->AvailableEntry, &Node->AvailableEntry); + } + } + + /* Now check the next entry after our one */ + if (Node->AvailableEntry.Flink != AvailListHead) + { + NextNode = CONTAINING_RECORD(Node->AvailableEntry.Flink, DPH_HEAP_BLOCK, AvailableEntry);; + /* Node is not at the tail of the list, check if it's adjacent */ + if (Node->pVirtualBlock + Node->nVirtualBlockSize == NextNode->pVirtualBlock) + { + /* They are adjacent - merge! */ + Node->nVirtualBlockSize += NextNode->nVirtualBlockSize; + Node->pNextAlloc = NextNode->pNextAlloc; + RtlpDphReturnNodeToUnusedList(DphRoot, NextNode); + DphRoot->nAvailableAllocations--; + } + } +} + +VOID NTAPI +RtlpDphCoalesceFreeIntoAvailable(PDPH_HEAP_ROOT DphRoot, + ULONG Size) +{ UNIMPLEMENTED; } @@ -408,12 +482,90 @@ } PDPH_HEAP_BLOCK NTAPI +RtlpDphSearchAvailableMemoryListForBestFit(PDPH_HEAP_ROOT DphRoot, + SIZE_T Size) +{ + PLIST_ENTRY CurEntry; + PDPH_HEAP_BLOCK Node; + + CurEntry = DphRoot->AvailableAllocationHead.Flink; + + while (TRUE) + { + /* If we reached end of the list - return right away */ + if (CurEntry == &DphRoot->AvailableAllocationHead) return NULL; + + /* Get the current available node */ + Node = CONTAINING_RECORD(CurEntry, DPH_HEAP_BLOCK, AvailableEntry); + + /* Check its size */ + if (Node->nVirtualBlockSize >= Size) break; + + /* Move to the next available entry */ + CurEntry = CurEntry->Flink; + } + + /* Make sure Adjacency list pointers are biased */ + ASSERT(IS_BIASED_POINTER(Node->AdjacencyEntry.Flink)); + ASSERT(IS_BIASED_POINTER(Node->AdjacencyEntry.Blink)); + + return Node; +} + +PDPH_HEAP_BLOCK NTAPI RtlpDphFindAvailableMemory(PDPH_HEAP_ROOT DphRoot, SIZE_T Size, - PDPH_HEAP_BLOCK *Prev) -{ - UNIMPLEMENTED; - return NULL; + BOOLEAN Grow) +{ + PDPH_HEAP_BLOCK Node; + ULONG NewSize; + + /* Find an available best fitting node */ + Node = RtlpDphSearchAvailableMemoryListForBestFit(DphRoot, Size); + + /* If that didn't work, try to search a smaller one in the loop */ + while (!Node) + { + /* Break if the free list becomes too small */ + if (DphRoot->nFreeAllocations <= DPH_FREE_LIST_MINIMUM) break; + + /* Calculate a new free list size */ + NewSize = DphRoot->nFreeAllocations >> 1; + if (NewSize < DPH_FREE_LIST_MINIMUM) NewSize = DPH_FREE_LIST_MINIMUM; + + /* Coalesce free into available */ + RtlpDphCoalesceFreeIntoAvailable(DphRoot, NewSize); + + /* Try to find an available best fitting node again */ + Node = RtlpDphSearchAvailableMemoryListForBestFit(DphRoot, Size); + } + + /* If Node is NULL, then we could fix the situation only by + growing the available VM size */ + if (!Node && Grow) + { + /* Grow VM size, if it fails - return failure directly */ + if (!RtlpDphGrowVirtual(DphRoot, Size)) return NULL; + + /* Try to find an available best fitting node again */ + Node = RtlpDphSearchAvailableMemoryListForBestFit(DphRoot, Size); + + if (!Node) + { + /* Do the last attempt: coalesce all free into available (if Size fits there) */ + if (DphRoot->nFreeAllocationBytesCommitted + DphRoot->nAvailableAllocationBytesCommitted >= Size) + { + /* Coalesce free into available */ + RtlpDphCoalesceFreeIntoAvailable(DphRoot, 0); + + /* Try to find an available best fitting node again */ + Node = RtlpDphSearchAvailableMemoryListForBestFit(DphRoot, Size); + } + } + } + + /* Return node we found */ + return Node; } PDPH_HEAP_BLOCK NTAPI @@ -434,13 +586,13 @@ } /* There is a need to make free space */ - Node = RtlpDphFindAvailableMemory(DphRoot, DPH_POOL_SIZE, NULL); + Node = RtlpDphFindAvailableMemory(DphRoot, DPH_POOL_SIZE, FALSE); if (!DphRoot->pUnusedNodeListHead && !Node) { /* Retry with a smaller request */ Size = PAGE_SIZE; - Node = RtlpDphFindAvailableMemory(DphRoot, PAGE_SIZE, NULL); + Node = RtlpDphFindAvailableMemory(DphRoot, PAGE_SIZE, FALSE); } if (!DphRoot->pUnusedNodeListHead) @@ -499,6 +651,56 @@ } return RtlpDphTakeNodeFromUnusedList(DphRoot); +} + +BOOLEAN NTAPI +RtlpDphGrowVirtual(PDPH_HEAP_ROOT DphRoot, + SIZE_T Size) +{ + PDPH_HEAP_BLOCK Node, AvailableNode; + PVOID Base; + SIZE_T VirtualSize; + NTSTATUS Status; + + /* Start with allocating a couple of nodes */ + Node = RtlpDphAllocateNode(DphRoot); + if (!Node) return FALSE; + + AvailableNode = RtlpDphAllocateNode(DphRoot); + if (!AvailableNode) + { + /* Free the allocated node and return failure */ + RtlpDphReturnNodeToUnusedList(DphRoot, Node); + return FALSE; + } + + /* Calculate size of VM to allocate by rounding it up */ + VirtualSize = (Size + 0xFFFF) & 0xFFFF0000; + if (VirtualSize < DPH_RESERVE_SIZE) + VirtualSize = DPH_RESERVE_SIZE; + + /* Allocate the virtual memory */ + Status = RtlpDphAllocateVm(&Base, VirtualSize, MEM_RESERVE, PAGE_NOACCESS); + if (!NT_SUCCESS(Status)) + { + /* Free the allocated node and return failure */ + RtlpDphReturnNodeToUnusedList(DphRoot, Node); + RtlpDphReturnNodeToUnusedList(DphRoot, AvailableNode); + return FALSE; + } + + /* Set up our two nodes describing this VM */ + Node->pVirtualBlock = Base; + Node->nVirtualBlockSize = VirtualSize; + AvailableNode->pVirtualBlock = Base; + AvailableNode->nVirtualBlockSize = VirtualSize; + + /* Add them to virtual and available lists respectively */ + RtlpDphPlaceOnVirtualList(DphRoot, Node); + RtlpDphCoalesceNodeIntoAvailable(DphRoot, AvailableNode); + + /* Return success */ + return TRUE; } RTL_GENERIC_COMPARE_RESULTS

1 0

[spetreolle] 50697: [CMAKE] Fix msvc ext2 build. Fix soundblaster includes.
by spetreolle＠svn.reactos.org 14 Feb '11

14 Feb '11

Author: spetreolle Date: Mon Feb 14 20:56:12 2011 New Revision: 50697 URL: http://svn.reactos.org/svn/reactos?rev=50697&view=rev Log: [CMAKE] Fix msvc ext2 build. Fix soundblaster includes. Modified: branches/cmake-bringup/drivers/filesystems/ext2/CMakeLists.txt branches/cmake-bringup/lib/drivers/sound/soundblaster/CMakeLists.txt Modified: branches/cmake-bringup/drivers/filesystems/ext2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesyste… ============================================================================== --- branches/cmake-bringup/drivers/filesystems/ext2/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/filesystems/ext2/CMakeLists.txt [iso-8859-1] Mon Feb 14 20:56:12 2011 @@ -23,6 +23,8 @@ add_library(ext2fs SHARED ${SOURCE}) +target_link_libraries(ext2fs ${PSEH_LIB}) + set_module_type(ext2fs kernelmodedriver) add_importlibs(ext2fs ntoskrnl hal) Modified: branches/cmake-bringup/lib/drivers/sound/soundblaster/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound… ============================================================================== --- branches/cmake-bringup/lib/drivers/sound/soundblaster/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/drivers/sound/soundblaster/CMakeLists.txt [iso-8859-1] Mon Feb 14 20:56:12 2011 @@ -3,7 +3,7 @@ -D__NTDRIVER__ -DKERNEL) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) list(APPEND SOURCE dsp_io.c

1 0

[tkreuzer] 50696: [ASM] Add ljmp16 .fill and .space macros
by tkreuzer＠svn.reactos.org 14 Feb '11

14 Feb '11

Author: tkreuzer Date: Mon Feb 14 20:12:12 2011 New Revision: 50696 URL: http://svn.reactos.org/svn/reactos?rev=50696&view=rev Log: [ASM] Add ljmp16 .fill and .space macros Modified: branches/cmake-bringup/include/asm/asm.inc Modified: branches/cmake-bringup/include/asm/asm.inc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/asm/asm.i… ============================================================================== --- branches/cmake-bringup/include/asm/asm.inc [iso-8859-1] (original) +++ branches/cmake-bringup/include/asm/asm.inc [iso-8859-1] Mon Feb 14 20:12:12 2011 @@ -11,10 +11,12 @@ /* Allow ".name" identifiers */ OPTION DOTNAME +#ifdef _M_IX86 .686P .XMM .MODEL FLAT ASSUME CS:NOTHING, DS:NOTHING, ES:NOTHING, FS:NOTHING, GS:NOTHING +#endif /* Hex numbers need to be in 01ABh format */ #define HEX(x) 0##x##h @@ -68,11 +70,11 @@ .code16 MACRO ASSUME nothing - .text SEGMENT use16 + .text16 SEGMENT use16 ENDM .endcode16 MACRO - .text ENDS + .text16 ENDS ENDM .bss MACRO @@ -111,12 +113,33 @@ ORG value ENDM -.fill MACRO repeat, size, value -// FIXME +.fill MACRO count, size, value + REPEAT count + if (size == 1) + DB value + elseif (size == 2) + DW value + elseif (size == 4) + DD value + else + endif + ENDM +ENDM + +.space MACRO count + DB 0 DUP (count) ENDM ljmp MACRO segment, offset -// FIXME + DB 0EAh + DD offset + DW segment +ENDM + +ljmp16 MACRO segment, offset + DB 0EAh + DW offset + DW segment ENDM UNIMPLEMENTED MACRO name @@ -177,6 +200,10 @@ #define ENDR .endr .macro ljmp segment, offset + jmp far ptr \segment:\offset +.endm + +.macro ljmp16 segment, offset jmp far ptr \segment:\offset .endm

1 0

[tkreuzer] 50695: [WIN32K] - Remove gexloTrivial, it was never used - Remove EXLATEOBJ_vInitTrivial and move the code into EXLATEOBJ_vInitialize - Properly set XO_TABLE - Set ppalDstDc in EXLATEOBJ...
by tkreuzer＠svn.reactos.org 14 Feb '11

14 Feb '11

Author: tkreuzer Date: Mon Feb 14 17:23:58 2011 New Revision: 50695 URL: http://svn.reactos.org/svn/reactos?rev=50695&view=rev Log: [WIN32K] - Remove gexloTrivial, it was never used - Remove EXLATEOBJ_vInitTrivial and move the code into EXLATEOBJ_vInitialize - Properly set XO_TABLE - Set ppalDstDc in EXLATEOBJ_vInitXlateFromDCs Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] Mon Feb 14 17:23:58 2011 @@ -17,8 +17,6 @@ /** Globals *******************************************************************/ ULONG giUniqueXlate = 0; -EXLATEOBJ gexloTrivial; -XLATEOBJ* gpxloTrivial = &gexloTrivial.xlo; const BYTE gajXlate5to8[32] = { 0, 8, 16, 25, 33, 41, 49, 58, 66, 74, 82, 90, 99,107,115,123, @@ -328,23 +326,6 @@ /** Private Functions *********************************************************/ - -VOID -NTAPI -EXLATEOBJ_vInitTrivial(PEXLATEOBJ pexlo) -{ - pexlo->xlo.iUniq = InterlockedIncrement((LONG*)&giUniqueXlate); - pexlo->xlo.flXlate = XO_TRIVIAL; - pexlo->xlo.iSrcType = PAL_RGB; - pexlo->xlo.iDstType = PAL_RGB; - pexlo->xlo.cEntries = 0; - pexlo->xlo.pulXlate = pexlo->aulXlate; - pexlo->pfnXlate = EXLATEOBJ_iXlateTrivial; - pexlo->ppalSrc = &gpalRGB; - pexlo->ppalDst = &gpalRGB; - pexlo->ppalDstDc = &gpalRGB; - pexlo->hColorTransform = NULL; -} VOID NTAPI @@ -359,22 +340,24 @@ ULONG cEntries; ULONG i, ulColor; - EXLATEOBJ_vInitTrivial(pexlo); - - if (!ppalSrc || !ppalDst) - { - return; - } - + if (!ppalSrc) ppalSrc = &gpalRGB; + if (!ppalDst) ppalDst = &gpalRGB; + + pexlo->xlo.iUniq = InterlockedIncrement((LONG*)&giUniqueXlate); + pexlo->xlo.cEntries = 0; + pexlo->xlo.flXlate = 0; + pexlo->xlo.pulXlate = pexlo->aulXlate; + pexlo->pfnXlate = EXLATEOBJ_iXlateTrivial; + pexlo->hColorTransform = NULL; pexlo->ppalSrc = ppalSrc; pexlo->ppalDst = ppalDst; pexlo->xlo.iSrcType = ppalSrc->flFlags; pexlo->xlo.iDstType = ppalDst->flFlags; - - if (ppalDst == ppalSrc || - ((ppalDst->flFlags == PAL_RGB || ppalDst->flFlags == PAL_BGR) && - ppalDst->flFlags == ppalSrc->flFlags)) - { + pexlo->ppalDstDc = &gpalRGB; + + if (ppalDst == ppalSrc) + { + pexlo->xlo.flXlate |= XO_TRIVIAL; return; } @@ -460,12 +443,14 @@ return; } } + + pexlo->pfnXlate = EXLATEOBJ_iXlateTable; pexlo->xlo.cEntries = cEntries; - - pexlo->pfnXlate = EXLATEOBJ_iXlateTable; + pexlo->xlo.flXlate |= XO_TABLE; + if (ppalDst->flFlags & PAL_INDEXED) { - pexlo->xlo.flXlate |= XO_TABLE; + ULONG cDiff = 0; for (i = 0; i < cEntries; i++) { @@ -476,11 +461,11 @@ pexlo->xlo.pulXlate[i] = PALETTE_ulGetNearestPaletteIndex(ppalDst, ulColor); - if (pexlo->xlo.pulXlate[i] != i) - pexlo->xlo.flXlate &= ~XO_TRIVIAL; + if (pexlo->xlo.pulXlate[i] != i) cDiff++; } - if (pexlo->xlo.flXlate & XO_TRIVIAL) + /* Check if we have only trivial mappings */ + if (cDiff == 0) { if (pexlo->xlo.pulXlate != pexlo->aulXlate) { @@ -489,6 +474,7 @@ } pexlo->pfnXlate = EXLATEOBJ_iXlateTrivial; pexlo->xlo.flXlate = XO_TRIVIAL; + pexlo->xlo.cEntries = 0; return; } } @@ -619,6 +605,8 @@ pdcSrc->pdcattr->crBackgroundClr, pdcDst->pdcattr->crBackgroundClr, pdcDst->pdcattr->crForegroundClr); + + pexlo->ppalDstDc = pdcDst->dclevel.ppal; } VOID @@ -637,7 +625,6 @@ NTAPI InitXlateImpl(VOID) { - EXLATEOBJ_vInitTrivial(&gexloTrivial); return STATUS_SUCCESS; }

1 0

[tkreuzer] 50694: [WIN32K] Fix initialization of XLATEOBJ, when source and dest format are equal. Patch by Thomas Faber (thfabba at gmx de) See issue #5828 for more details.
by tkreuzer＠svn.reactos.org 14 Feb '11

14 Feb '11

Author: tkreuzer Date: Mon Feb 14 16:04:01 2011 New Revision: 50694 URL: http://svn.reactos.org/svn/reactos?rev=50694&view=rev Log: [WIN32K] Fix initialization of XLATEOBJ, when source and dest format are equal. Patch by Thomas Faber (thfabba at gmx de) See issue #5828 for more details. Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] Mon Feb 14 16:04:01 2011 @@ -361,9 +361,7 @@ EXLATEOBJ_vInitTrivial(pexlo); - if (ppalDst == ppalSrc || !ppalSrc || !ppalDst || - ((ppalDst->flFlags == PAL_RGB || ppalDst->flFlags == PAL_BGR) && - ppalDst->flFlags == ppalSrc->flFlags)) + if (!ppalSrc || !ppalDst) { return; } @@ -372,6 +370,13 @@ pexlo->ppalDst = ppalDst; pexlo->xlo.iSrcType = ppalSrc->flFlags; pexlo->xlo.iDstType = ppalDst->flFlags; + + if (ppalDst == ppalSrc || + ((ppalDst->flFlags == PAL_RGB || ppalDst->flFlags == PAL_BGR) && + ppalDst->flFlags == ppalSrc->flFlags)) + { + return; + } /* Chack if both of the pallettes are indexed */ if (!(ppalSrc->flFlags & PAL_INDEXED) || !(ppalDst->flFlags & PAL_INDEXED)) @@ -607,13 +612,6 @@ psurfDst = pdcDst->dclevel.pSurface; psurfSrc = pdcSrc->dclevel.pSurface; - /* Check for trivial color translation */ - if (psurfDst == psurfSrc) - { - EXLATEOBJ_vInitTrivial(pexlo); - return; - } - /* Normal initialisation. No surface means DEFAULT_BITMAP */ EXLATEOBJ_vInitialize(pexlo, psurfSrc ? psurfSrc->ppal : &gpalMono,

1 0

[tkreuzer] 50693: [MSVCRT] _CxxThrowException is stdcall, not cdecl. Someone please forward this to wine
by tkreuzer＠svn.reactos.org 14 Feb '11

14 Feb '11

Author: tkreuzer Date: Mon Feb 14 14:28:07 2011 New Revision: 50693 URL: http://svn.reactos.org/svn/reactos?rev=50693&view=rev Log: [MSVCRT] _CxxThrowException is stdcall, not cdecl. Someone please forward this to wine Modified: branches/cmake-bringup/dll/win32/msvcrt/msvcrt.spec branches/cmake-bringup/dll/win32/msvcrt20/msvcrt20.spec branches/cmake-bringup/dll/win32/msvcrt40/msvcrt40.spec branches/cmake-bringup/lib/sdk/crt/except/cppexcept.c branches/cmake-bringup/lib/sdk/crt/include/internal/wine/cppexcept.h Modified: branches/cmake-bringup/dll/win32/msvcrt/msvcrt.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt/… ============================================================================== --- branches/cmake-bringup/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] Mon Feb 14 14:28:07 2011 @@ -99,7 +99,7 @@ # stub _CrtSetReportHook # stub _CrtSetReportHook2 # stub _CrtSetReportMode -@ cdecl _CxxThrowException(long long) +@ stdcall _CxxThrowException(long long) @ cdecl -i386 -norelay _EH_prolog() @ cdecl _Getdays() @ cdecl _Getmonths() Modified: branches/cmake-bringup/dll/win32/msvcrt20/msvcrt20.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt2… ============================================================================== --- branches/cmake-bringup/dll/win32/msvcrt20/msvcrt20.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msvcrt20/msvcrt20.spec [iso-8859-1] Mon Feb 14 14:28:07 2011 @@ -453,7 +453,7 @@ @ cdecl -arch=i386 _CIsqrt() msvcrt._CIsqrt @ cdecl -arch=i386 _CItan() msvcrt._CItan @ cdecl -arch=i386 _CItanh() msvcrt._CItanh -@ cdecl _CxxThrowException(long long) msvcrt._CxxThrowException +@ stdcall _CxxThrowException(long long) msvcrt._CxxThrowException @ extern _HUGE msvcrt._HUGE @ cdecl _XcptFilter(long ptr) msvcrt._XcptFilter @ cdecl -i386 __CxxFrameHandler(ptr ptr ptr ptr) msvcrt.__CxxFrameHandler Modified: branches/cmake-bringup/dll/win32/msvcrt40/msvcrt40.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt4… ============================================================================== --- branches/cmake-bringup/dll/win32/msvcrt40/msvcrt40.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msvcrt40/msvcrt40.spec [iso-8859-1] Mon Feb 14 14:28:07 2011 @@ -497,7 +497,7 @@ @ cdecl -arch=i386 _CIsqrt() msvcrt._CIsqrt @ cdecl -arch=i386 _CItan() msvcrt._CItan @ cdecl -arch=i386 _CItanh() msvcrt._CItanh -@ cdecl _CxxThrowException(long long) msvcrt._CxxThrowException +@ stdcall _CxxThrowException(long long) msvcrt._CxxThrowException @ cdecl -i386 _EH_prolog() msvcrt._EH_prolog @ extern _HUGE msvcrt._HUGE @ cdecl _XcptFilter(long ptr) msvcrt._XcptFilter Modified: branches/cmake-bringup/lib/sdk/crt/except/cppexcept.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/excep… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/except/cppexcept.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/except/cppexcept.c [iso-8859-1] Mon Feb 14 14:28:07 2011 @@ -490,7 +490,7 @@ /********************************************************************* * _CxxThrowException (MSVCRT.@) */ -void CDECL _CxxThrowException( exception *object, const cxx_exception_type *type ) +void WINAPI _CxxThrowException( exception *object, const cxx_exception_type *type ) { ULONG_PTR args[3]; Modified: branches/cmake-bringup/lib/sdk/crt/include/internal/wine/cppexcept.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/inclu… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/include/internal/wine/cppexcept.h [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/include/internal/wine/cppexcept.h [iso-8859-1] Mon Feb 14 14:28:07 2011 @@ -150,7 +150,7 @@ const cxx_type_info_table *type_info_table; /* list of types for this exception object */ } cxx_exception_type; -void CDECL _CxxThrowException(exception*,const cxx_exception_type*); +void WINAPI _CxxThrowException(exception*,const cxx_exception_type*); int CDECL _XcptFilter(NTSTATUS, PEXCEPTION_POINTERS); int CDECL __CppXcptFilter(NTSTATUS, PEXCEPTION_POINTERS);

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