March 2006 - wine-commits

Stefan Dösinger : wined3d: Add d3d7 and d3d8/ 9 cap flags to wined3d_types.h.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 033769f94dd4ff21f1dd87008a32df0f9696fa32 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=033769f94dd4ff21f1dd870… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Mar 5 21:07:10 2006 +0100 wined3d: Add d3d7 and d3d8/9 cap flags to wined3d_types.h. --- dlls/wined3d/directx.c | 88 +++++++++++++++++++------------------- include/wine/wined3d_types.h | 97 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 141 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=033769f94dd4ff21f1d…

1 0

Jason Green : wined3d: Add a few more WINED3DFMT formats to be recognized.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 6d30800db6e8f8376a37c289567cd6cfb22c7cca URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6d30800db6e8f8376a37c28… Author: Jason Green <jave27(a)gmail.com> Date: Sun Mar 5 21:26:19 2006 -0500 wined3d: Add a few more WINED3DFMT formats to be recognized. --- dlls/wined3d/utils.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 53a9533..af2ede2 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -86,6 +86,10 @@ const char* debug_d3dformat(WINED3DFORMA FMT_TO_STR(WINED3DFMT_R16F); FMT_TO_STR(WINED3DFMT_G16R16F); FMT_TO_STR(WINED3DFMT_A16B16G16R16F); + FMT_TO_STR(WINED3DFMT_R32F); + FMT_TO_STR(WINED3DFMT_G32R32F); + FMT_TO_STR(WINED3DFMT_A32B32G32R32F); + FMT_TO_STR(WINED3DFMT_CxV8U8); #undef FMT_TO_STR default: FIXME("Unrecognized %u D3DFORMAT!\n", fmt);

1 0

Jacek Caban : shdocvw: Beginning ShowContextMenu implementation.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 7a3a554c9b4aa3a894864a7c3f3eef6bac053eb6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7a3a554c9b4aa3a894864a7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 5 22:28:37 2006 +0100 shdocvw: Beginning ShowContextMenu implementation. --- dlls/shdocvw/dochost.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index ffe1fda..07c9522 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -281,7 +281,18 @@ static HRESULT WINAPI DocHostUIHandler_S DWORD dwID, POINT *ppt, IUnknown *pcmdtReserved, IDispatch *pdispReserved) { WebBrowser *This = DOCHOSTUI_THIS(iface); - FIXME("(%p)->(%ld %p %p %p)\n", This, dwID, ppt, pcmdtReserved, pdispReserved); + HRESULT hres; + + TRACE("(%p)->(%ld %p %p %p)\n", This, dwID, ppt, pcmdtReserved, pdispReserved); + + if(This->hostui) { + hres = IDocHostUIHandler_ShowContextMenu(This->hostui, dwID, ppt, pcmdtReserved, + pdispReserved); + if(hres == S_OK) + return S_OK; + } + + FIXME("default action not implemented\n"); return E_NOTIMPL; }

1 0

Jacek Caban : mshtml: Added get_documentElement implementation.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 6ef5f9556215ac4b3426028cc7156eaa133d20ef URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6ef5f9556215ac4b3426028… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 5 20:41:18 2006 +0100 mshtml: Added get_documentElement implementation. --- dlls/mshtml/htmldoc3.c | 31 +++++++++++++++++++++++++++---- dlls/mshtml/nsiface.idl | 39 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 65 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c index bc74509..9c12693 100644 --- a/dlls/mshtml/htmldoc3.c +++ b/dlls/mshtml/htmldoc3.c @@ -112,11 +112,34 @@ static HRESULT WINAPI HTMLDocument3_crea return E_NOTIMPL; } -static HRESULT WINAPI HTMLDocument3_documentElement(IHTMLDocument3 *iface, IHTMLElement **p) +static HRESULT WINAPI HTMLDocument3_get_documentElement(IHTMLDocument3 *iface, IHTMLElement **p) { HTMLDocument *This = HTMLDOC3_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMDocument *nsdoc; + HTMLDOMNode *node; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->nscontainer) { + *p = NULL; + return S_OK; + } + + nsres = nsIWebNavigation_GetDocument(This->nscontainer->navigation, &nsdoc); + if(NS_FAILED(nsres)) + ERR("GetDocument failed: %08lx\n", nsres); + + if(nsdoc) { + node = get_node(This, (nsIDOMNode*)nsdoc); + nsIDOMDocument_Release(nsdoc); + + IHTMLDOMNode_QueryInterface(HTMLDOMNODE(node), &IID_IHTMLElement, (void**)p); + }else { + *p = NULL; + } + + return S_OK; } static HRESULT WINAPI HTMLDocument3_uniqueID(IHTMLDocument3 *iface, BSTR *p) @@ -402,7 +425,7 @@ static const IHTMLDocument3Vtbl HTMLDocu HTMLDocument3_releaseCapture, HTMLDocument3_recalc, HTMLDocument3_createTextNode, - HTMLDocument3_documentElement, + HTMLDocument3_get_documentElement, HTMLDocument3_uniqueID, HTMLDocument3_attachEvent, HTMLDocument3_detachEvent, diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index fabe6bb..7aa4acd 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -55,6 +55,7 @@ typedef nsStringContainer nsAString; interface nsIWebBrowserChrome; interface nsILoadGroup; interface nsIDOMNode; +interface nsIDOMDocument; [ object, @@ -69,7 +70,6 @@ interface nsISupports /* Currently we don't need a full declaration of these interfaces */ typedef nsISupports nsIWeakReference; -typedef nsISupports nsIDOMDocument; typedef nsISupports nsISHistory; typedef nsISupports nsISimpleEnumerator; typedef nsISupports nsIWidget; @@ -86,6 +86,14 @@ typedef nsISupports nsIPrompt; typedef nsISupports nsIAuthPrompt; typedef nsISupports nsIDOMNamedNodeMap; typedef nsISupports nsIDOMAttr; +typedef nsISupports nsIDOMDocumentType; +typedef nsISupports nsIDOMDOMImplementation; +typedef nsISupports nsIDOMDocumentFragment; +typedef nsISupports nsIDOMText; +typedef nsISupports nsIDOMComment; +typedef nsISupports nsIDOMCDATASection; +typedef nsISupports nsIDOMProcessingInstruction; +typedef nsISupports nsIDOMEntityReference; [ object, @@ -394,6 +402,35 @@ interface nsIDOMHTMLElement : nsIDOMElem [ object, + uuid(a6cf9075-15b3-11d2-932e-00805f8add32) +] +interface nsIDOMDocument : nsIDOMNode +{ + nsresult GetDoctype(nsIDOMDocumentType **aDoctype); + nsresult GetImplementation(nsIDOMDOMImplementation **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 CreateProcessingInstruction(const nsAString *target, const nsAString *data, + nsIDOMProcessingInstruction **_retval); + nsresult CreateAttribute(const nsAString *name, nsIDOMAttr **_retval); + nsresult CreateEntityReference(const nsAString *name, nsIDOMEntityReference **_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); + nsresult GetElementsByTagNameNS(const nsAString *namespaceURI, const nsAString *localName, + nsIDOMNodeList **_retval); + nsresult GetElementById(const nsAString *elementId, nsIDOMElement **_retval); +} + +[ + object, uuid(a6cf906b-15b3-11d2-932e-00805f8add32) ] interface nsIDOMWindow : nsISupports

1 0

Jacek Caban : mshtml: Added IHTMLElement implementation.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 874fd57841f8d9670c50429b8b28d6b3627b0bb3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=874fd57841f8d9670c50429… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 5 20:39:59 2006 +0100 mshtml: Added IHTMLElement implementation. --- dlls/mshtml/Makefile.in | 1 dlls/mshtml/htmlelem.c | 875 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/htmlnode.c | 2 dlls/mshtml/mshtml_private.h | 14 + dlls/mshtml/nsiface.idl | 51 ++ 5 files changed, 940 insertions(+), 3 deletions(-) create mode 100644 dlls/mshtml/htmlelem.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=874fd57841f8d9670c5…

1 0

Jacek Caban : mshtml: Added more interfaces to mshtml.idl.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: ee1e7e503fb641b4bb21c2561111ca081f7e1475 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ee1e7e503fb641b4bb21c25… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 5 20:52:19 2006 +0100 mshtml: Added more interfaces to mshtml.idl. --- include/mshtmdid.h | 129 ++++++++ include/mshtml.idl | 802 +++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 879 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=ee1e7e503fb641b4bb2…

1 0

Jacek Caban : mshtml: Added IHTMLDOMNode implementation.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 54036bf6efa06337f5d8649037246f6a75ec652d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=54036bf6efa06337f5d8649… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 5 20:38:30 2006 +0100 mshtml: Added IHTMLDOMNode implementation. --- dlls/mshtml/Makefile.in | 1 dlls/mshtml/htmldoc.c | 2 dlls/mshtml/htmlnode.c | 364 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 34 ++++ dlls/mshtml/nsiface.idl | 46 +++++ 5 files changed, 445 insertions(+), 2 deletions(-) create mode 100644 dlls/mshtml/htmlnode.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=54036bf6efa06337f5d…

1 0

Vitaly Budovski : wined3d: Added OpenGL 2.0 function definitions.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 3832eb7de4c6a6a6fc8c2f401d1b8e49116e4b75 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3832eb7de4c6a6a6fc8c2f4… Author: Vitaly Budovski <vbudovsk(a)cs.rmit.edu.au> Date: Sun Mar 5 19:21:28 2006 +1100 wined3d: Added OpenGL 2.0 function definitions. --- dlls/wined3d/device.c | 16 +-- dlls/wined3d/directx.c | 6 + include/wine/wined3d_gl.h | 278 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 289 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=3832eb7de4c6a6a6fc8…

1 0

Robert Shearman : wcmd: Improve command line processing.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 7f515f31121f3a8e782a6233d8291f19097e3eb9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7f515f31121f3a8e782a623… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sun Mar 5 13:36:03 2006 +0000 wcmd: Improve command line processing. Make the command line processing more robust by continuing to process command line options if an unknown one is detected and remove the skipping of argv[0], which is no longer necessary. This fixes the parsing when argv[0] isn't set to the program name. --- programs/wcmd/wcmdmain.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/programs/wcmd/wcmdmain.c b/programs/wcmd/wcmdmain.c index a0fc4ec..644ebc1 100644 --- a/programs/wcmd/wcmdmain.c +++ b/programs/wcmd/wcmdmain.c @@ -57,7 +57,6 @@ int main (int argc, char *argv[]) HANDLE h; int opt_c, opt_k, opt_q; - argv++; opt_c=opt_k=opt_q=0; while (*argv!=NULL) { @@ -74,8 +73,6 @@ int main (int argc, char *argv[]) } else if (lstrcmpi(*argv,"/t")==0 || lstrcmpi(*argv,"/x")==0 || lstrcmpi(*argv,"/y")==0) { /* Ignored for compatibility with Windows */ - } else { - break; } argv++; }

1 0

Robert Shearman : oleaut: Implement VarBstrFromDisp.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: b3a8a3d5591a12ccffed9220d733988e56e504ce URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b3a8a3d5591a12ccffed922… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sun Mar 5 13:37:47 2006 +0000 oleaut: Implement VarBstrFromDisp. --- dlls/oleaut32/oleaut32.spec | 2 +- dlls/oleaut32/vartype.c | 54 ++++++++++++++++++++++++++++++------------- 2 files changed, 39 insertions(+), 17 deletions(-) diff --git a/dlls/oleaut32/oleaut32.spec b/dlls/oleaut32/oleaut32.spec index 9da60ec..ad110c7 100644 --- a/dlls/oleaut32/oleaut32.spec +++ b/dlls/oleaut32/oleaut32.spec @@ -111,7 +111,7 @@ 112 stdcall VarBstrFromR8(double long long ptr) 113 stdcall VarBstrFromCy(double long long ptr) 114 stdcall VarBstrFromDate(double long long ptr) -115 stub VarBstrFromDisp +115 stdcall VarBstrFromDisp(ptr long long ptr) 116 stdcall VarBstrFromBool(long long long ptr) 117 stdcall VarFormatPercent(ptr long long long long long ptr) 118 stdcall VarBoolFromUI1(long ptr) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 1214752..5c5ec0c 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -110,7 +110,8 @@ static HRESULT VARIANT_NumberFromBstr(OL } /* Coerce VT_DISPATCH to another type */ -static HRESULT VARIANT_FromDisp(IDispatch* pdispIn, LCID lcid, void* pOut, VARTYPE vt) +static HRESULT VARIANT_FromDisp(IDispatch* pdispIn, LCID lcid, void* pOut, + VARTYPE vt, DWORD dwFlags) { static const DISPPARAMS emptyParams = { NULL, NULL, 0, 0 }; VARIANTARG srcVar, dstVar; @@ -127,7 +128,7 @@ static HRESULT VARIANT_FromDisp(IDispatc { /* Convert the property to the requested type */ V_VT(&dstVar) = VT_EMPTY; - hRet = VariantChangeTypeEx(&dstVar, &srcVar, lcid, 0, vt); + hRet = VariantChangeTypeEx(&dstVar, &srcVar, lcid, dwFlags, vt); VariantClear(&srcVar); if (SUCCEEDED(hRet)) @@ -448,7 +449,7 @@ HRESULT WINAPI VarI1FromStr(OLECHAR* str */ HRESULT WINAPI VarI1FromDisp(IDispatch* pdispIn, LCID lcid, signed char* pcOut) { - return VARIANT_FromDisp(pdispIn, lcid, pcOut, VT_I1); + return VARIANT_FromDisp(pdispIn, lcid, pcOut, VT_I1, 0); } /************************************************************************ @@ -741,7 +742,7 @@ HRESULT WINAPI VarUI1FromStr(OLECHAR* st */ HRESULT WINAPI VarUI1FromDisp(IDispatch* pdispIn, LCID lcid, BYTE* pbOut) { - return VARIANT_FromDisp(pdispIn, lcid, pbOut, VT_UI1); + return VARIANT_FromDisp(pdispIn, lcid, pbOut, VT_UI1, 0); } /************************************************************************ @@ -1042,7 +1043,7 @@ HRESULT WINAPI VarI2FromStr(OLECHAR* str */ HRESULT WINAPI VarI2FromDisp(IDispatch* pdispIn, LCID lcid, SHORT* psOut) { - return VARIANT_FromDisp(pdispIn, lcid, psOut, VT_I2); + return VARIANT_FromDisp(pdispIn, lcid, psOut, VT_I2, 0); } /************************************************************************ @@ -1356,7 +1357,7 @@ HRESULT WINAPI VarUI2FromStr(OLECHAR* st */ HRESULT WINAPI VarUI2FromDisp(IDispatch* pdispIn, LCID lcid, USHORT* pusOut) { - return VARIANT_FromDisp(pdispIn, lcid, pusOut, VT_UI2); + return VARIANT_FromDisp(pdispIn, lcid, pusOut, VT_UI2, 0); } /************************************************************************ @@ -1632,7 +1633,7 @@ HRESULT WINAPI VarI4FromStr(OLECHAR* str */ HRESULT WINAPI VarI4FromDisp(IDispatch* pdispIn, LCID lcid, LONG *piOut) { - return VARIANT_FromDisp(pdispIn, lcid, piOut, VT_I4); + return VARIANT_FromDisp(pdispIn, lcid, piOut, VT_I4, 0); } /************************************************************************ @@ -1941,7 +1942,7 @@ HRESULT WINAPI VarUI4FromStr(OLECHAR* st */ HRESULT WINAPI VarUI4FromDisp(IDispatch* pdispIn, LCID lcid, ULONG *pulOut) { - return VARIANT_FromDisp(pdispIn, lcid, pulOut, VT_UI4); + return VARIANT_FromDisp(pdispIn, lcid, pulOut, VT_UI4, 0); } /************************************************************************ @@ -2248,7 +2249,7 @@ HRESULT WINAPI VarI8FromStr(OLECHAR* str */ HRESULT WINAPI VarI8FromDisp(IDispatch* pdispIn, LCID lcid, LONG64* pi64Out) { - return VARIANT_FromDisp(pdispIn, lcid, pi64Out, VT_I8); + return VARIANT_FromDisp(pdispIn, lcid, pi64Out, VT_I8, 0); } /************************************************************************ @@ -2576,7 +2577,7 @@ HRESULT WINAPI VarUI8FromStr(OLECHAR* st */ HRESULT WINAPI VarUI8FromDisp(IDispatch* pdispIn, LCID lcid, ULONG64* pui64Out) { - return VARIANT_FromDisp(pdispIn, lcid, pui64Out, VT_UI8); + return VARIANT_FromDisp(pdispIn, lcid, pui64Out, VT_UI8, 0); } /************************************************************************ @@ -2851,7 +2852,7 @@ HRESULT WINAPI VarR4FromStr(OLECHAR* str */ HRESULT WINAPI VarR4FromDisp(IDispatch* pdispIn, LCID lcid, float *pFltOut) { - return VARIANT_FromDisp(pdispIn, lcid, pFltOut, VT_R4); + return VARIANT_FromDisp(pdispIn, lcid, pFltOut, VT_R4, 0); } /************************************************************************ @@ -3172,7 +3173,7 @@ HRESULT WINAPI VarR8FromStr(OLECHAR* str */ HRESULT WINAPI VarR8FromDisp(IDispatch* pdispIn, LCID lcid, double *pDblOut) { - return VARIANT_FromDisp(pdispIn, lcid, pDblOut, VT_R8); + return VARIANT_FromDisp(pdispIn, lcid, pDblOut, VT_R8, 0); } /************************************************************************ @@ -3594,7 +3595,7 @@ HRESULT WINAPI VarCyFromStr(OLECHAR* str */ HRESULT WINAPI VarCyFromDisp(IDispatch* pdispIn, LCID lcid, CY* pCyOut) { - return VARIANT_FromDisp(pdispIn, lcid, pCyOut, VT_CY); + return VARIANT_FromDisp(pdispIn, lcid, pCyOut, VT_CY, 0); } /************************************************************************ @@ -4265,7 +4266,7 @@ HRESULT WINAPI VarDecFromStr(OLECHAR* st */ HRESULT WINAPI VarDecFromDisp(IDispatch* pdispIn, LCID lcid, DECIMAL* pDecOut) { - return VARIANT_FromDisp(pdispIn, lcid, pDecOut, VT_DECIMAL); + return VARIANT_FromDisp(pdispIn, lcid, pDecOut, VT_DECIMAL, 0); } /************************************************************************ @@ -5806,7 +5807,7 @@ VarBoolFromStr_CheckLocalised: */ HRESULT WINAPI VarBoolFromDisp(IDispatch* pdispIn, LCID lcid, VARIANT_BOOL *pBoolOut) { - return VARIANT_FromDisp(pdispIn, lcid, pBoolOut, VT_BOOL); + return VARIANT_FromDisp(pdispIn, lcid, pBoolOut, VT_BOOL, 0); } /************************************************************************ @@ -6544,6 +6545,27 @@ HRESULT WINAPI VarBstrFromUI8(ULONG64 ul return VARIANT_BstrFromUInt(ullIn, lcid, dwFlags, pbstrOut); } +/************************************************************************ + * VarBstrFromDisp (OLEAUT32.115) + * + * Convert a VT_DISPATCH to a BSTR. + * + * PARAMS + * pdispIn [I] Source + * lcid [I] LCID for conversion + * dwFlags [I] Flags controlling the conversion (VAR_ flags from "oleauto.h") + * pbstrOut [O] Destination + * + * RETURNS + * Success: S_OK. + * Failure: E_INVALIDARG, if the source value is invalid + * DISP_E_TYPEMISMATCH, if the type cannot be converted + */ +HRESULT WINAPI VarBstrFromDisp(IDispatch* pdispIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut) +{ + return VARIANT_FromDisp(pdispIn, lcid, pbstrOut, VT_BSTR, dwFlags); +} + /********************************************************************** * VarBstrCat (OLEAUT32.313) * @@ -6727,7 +6749,7 @@ HRESULT WINAPI VarDateFromR8(double dblI */ HRESULT WINAPI VarDateFromDisp(IDispatch* pdispIn, LCID lcid, DATE* pdateOut) { - return VARIANT_FromDisp(pdispIn, lcid, pdateOut, VT_DATE); + return VARIANT_FromDisp(pdispIn, lcid, pdateOut, VT_DATE, 0); } /******************************************************************************

1 0

Robert Shearman : oleaut: Fix VarFormat for VT_NULL variants.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 93acfeb7f0d4c332c62765888f323524c0eb87db URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=93acfeb7f0d4c332c627658… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sun Mar 5 13:36:56 2006 +0000 oleaut: Fix VarFormat for VT_NULL variants. --- dlls/oleaut32/tests/vartest.c | 2 -- dlls/oleaut32/varformat.c | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 2da6371..2d60b86 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1785,10 +1785,8 @@ static void test_VarFormat(void) /* VT_NULL */ V_VT(&in) = VT_NULL; hres = pVarFormat(&in,NULL,fd,fw,0,&out); - todo_wine { ok(hres == S_OK, "VarFormat failed with 0x%08lx\n", hres); ok(out == NULL, "expected NULL formatted string\n"); - } /* Invalid args */ hres = pVarFormat(&in,NULL,fd,fw,flags,NULL); diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index 29bf3a7..f0d3b09 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -2007,6 +2007,9 @@ HRESULT WINAPI VarFormatFromTokens(LPVAR if (!pVarIn || !rgbTok) return E_INVALIDARG; + if (V_VT(pVarIn) == VT_NULL) + return S_OK; + if (*rgbTok == FMT_TO_STRING || header->type == FMT_TYPE_GENERAL) { /* According to MSDN, general format acts somewhat like the 'Str'

1 0

Robert Shearman : ole: Implement IRpcChannelBuffer:: GetDestCtx on the client side.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 7406cc210bd27015629d781bacb63c91bacd5872 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7406cc210bd27015629d781… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sun Mar 5 13:37:34 2006 +0000 ole: Implement IRpcChannelBuffer::GetDestCtx on the client side. --- dlls/ole32/compobj_private.h | 4 +++- dlls/ole32/marshal.c | 5 ++++- dlls/ole32/rpc.c | 26 ++++++++++++++++++++++---- 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 8aeb0e0..66a7c1c 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -201,7 +201,9 @@ HRESULT marshal_object(APARTMENT *apt, S struct dispatch_params; void RPC_StartRemoting(struct apartment *apt); -HRESULT RPC_CreateClientChannel(const OXID *oxid, const IPID *ipid, IRpcChannelBuffer **pipebuf); +HRESULT RPC_CreateClientChannel(const OXID *oxid, const IPID *ipid, + DWORD dest_context, void *dest_context_data, + IRpcChannelBuffer **chan); HRESULT RPC_CreateServerChannel(IRpcChannelBuffer **chan); void RPC_ExecuteCall(struct dispatch_params *params); HRESULT RPC_RegisterInterface(REFIID riid); diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 95ff257..684d93d 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -1094,7 +1094,10 @@ static HRESULT unmarshal_object(const ST if (hr == E_NOINTERFACE) { IRpcChannelBuffer *chanbuf; - hr = RPC_CreateClientChannel(&stdobjref->oxid, &stdobjref->ipid, &chanbuf); + hr = RPC_CreateClientChannel(&stdobjref->oxid, &stdobjref->ipid, + proxy_manager->dest_context, + proxy_manager->dest_context_data, + &chanbuf); if (hr == S_OK) hr = proxy_manager_create_ifproxy(proxy_manager, stdobjref, riid, chanbuf, &ifproxy); diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 806c323..3c5f3ea 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -100,6 +100,8 @@ typedef struct RPC_BINDING_HANDLE bind; /* handle to the remote server */ OXID oxid; /* apartment in which the channel is valid */ + DWORD dest_context; /* returned from GetDestCtx */ + LPVOID dest_context_data; /* returned from GetDestCtx */ } ClientRpcChannelBuffer; struct dispatch_params @@ -379,7 +381,19 @@ static HRESULT WINAPI ClientRpcChannelBu return HRESULT_FROM_WIN32(status); } -static HRESULT WINAPI RpcChannelBuffer_GetDestCtx(LPRPCCHANNELBUFFER iface, DWORD* pdwDestContext, void** ppvDestContext) +static HRESULT WINAPI ClientRpcChannelBuffer_GetDestCtx(LPRPCCHANNELBUFFER iface, DWORD* pdwDestContext, void** ppvDestContext) +{ + ClientRpcChannelBuffer *This = (ClientRpcChannelBuffer *)iface; + + TRACE("(%p,%p)\n", pdwDestContext, ppvDestContext); + + *pdwDestContext = This->dest_context; + *ppvDestContext = This->dest_context_data; + + return S_OK; +} + +static HRESULT WINAPI ServerRpcChannelBuffer_GetDestCtx(LPRPCCHANNELBUFFER iface, DWORD* pdwDestContext, void** ppvDestContext) { FIXME("(%p,%p), stub!\n", pdwDestContext, ppvDestContext); return E_FAIL; @@ -400,7 +414,7 @@ static const IRpcChannelBufferVtbl Clien ClientRpcChannelBuffer_GetBuffer, ClientRpcChannelBuffer_SendReceive, ClientRpcChannelBuffer_FreeBuffer, - RpcChannelBuffer_GetDestCtx, + ClientRpcChannelBuffer_GetDestCtx, RpcChannelBuffer_IsConnected }; @@ -412,12 +426,14 @@ static const IRpcChannelBufferVtbl Serve ServerRpcChannelBuffer_GetBuffer, ServerRpcChannelBuffer_SendReceive, ServerRpcChannelBuffer_FreeBuffer, - RpcChannelBuffer_GetDestCtx, + ServerRpcChannelBuffer_GetDestCtx, RpcChannelBuffer_IsConnected }; /* returns a channel buffer for proxies */ -HRESULT RPC_CreateClientChannel(const OXID *oxid, const IPID *ipid, IRpcChannelBuffer **chan) +HRESULT RPC_CreateClientChannel(const OXID *oxid, const IPID *ipid, + DWORD dest_context, void *dest_context_data, + IRpcChannelBuffer **chan) { ClientRpcChannelBuffer *This; WCHAR endpoint[200]; @@ -470,6 +486,8 @@ HRESULT RPC_CreateClientChannel(const OX This->super.refs = 1; This->bind = bind; apartment_getoxid(COM_CurrentApt(), &This->oxid); + This->dest_context = dest_context; + This->dest_context_data = dest_context_data; *chan = (IRpcChannelBuffer*)This;

1 0

Robert Shearman : ole: Store the destination context and the destination context data in
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 92a1f52b4d8dea527abc0b037b50a10a70237cc8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=92a1f52b4d8dea527abc0b0… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sun Mar 5 13:37:22 2006 +0000 ole: Store the destination context and the destination context data in the proxy manager when unmarshaling. --- dlls/ole32/compobj_private.h | 2 + dlls/ole32/marshal.c | 83 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 81 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index caa84de..8aeb0e0 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -127,6 +127,8 @@ struct proxy_manager ULONG sorflags; /* STDOBJREF flags (RO) */ IRemUnknown *remunk; /* proxy to IRemUnknown used for lifecycle management (CS cs) */ HANDLE remoting_mutex; /* mutex used for synchronizing access to IRemUnknown */ + MSHCTX dest_context; /* context used for activating optimisations (LOCK) */ + void *dest_context_data; /* reserved context value (LOCK) */ }; /* this needs to become a COM object that implements IRemUnknown */ diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 8f952f9..95ff257 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -56,7 +56,9 @@ extern const CLSID CLSID_DfMarshal; * when the proxy disconnects or is destroyed */ #define SORFP_NOLIFETIMEMGMT SORF_OXRES1 -static HRESULT unmarshal_object(const STDOBJREF *stdobjref, APARTMENT *apt, REFIID riid, void **object); +static HRESULT unmarshal_object(const STDOBJREF *stdobjref, APARTMENT *apt, + MSHCTX dest_context, void *dest_context_data, + REFIID riid, void **object); /* Marshalling just passes a unique identifier to the remote client, * that makes it possible to find the passed interface again. @@ -300,6 +302,8 @@ static HRESULT WINAPI ClientIdentity_Que HRESULT hrobj = qiresults[i].hResult; if (hrobj == S_OK) hrobj = unmarshal_object(&qiresults[i].std, This->parent, + This->dest_context, + This->dest_context_data, pMQIs[index].pIID, (void **)&pMQIs[index].pItf); @@ -586,6 +590,11 @@ static HRESULT proxy_manager_construct( /* we create the IRemUnknown proxy on demand */ This->remunk = NULL; + /* initialise these values to the weakest values and they will be + * overwritten in proxy_manager_set_context */ + This->dest_context = MSHCTX_INPROC; + This->dest_context_data = NULL; + EnterCriticalSection(&apt->cs); /* FIXME: we are dependent on the ordering in here to make sure a proxy's * IRemUnknown proxy doesn't get destroyed before the regual proxy does @@ -602,6 +611,63 @@ static HRESULT proxy_manager_construct( return S_OK; } +static inline void proxy_manager_set_context(struct proxy_manager *This, MSHCTX dest_context, void *dest_context_data) +{ + MSHCTX old_dest_context = This->dest_context; + MSHCTX new_dest_context; + + do + { + new_dest_context = old_dest_context; + /* "stronger" values overwrite "weaker" values. stronger values are + * ones that disable more optimisations */ + switch (old_dest_context) + { + case MSHCTX_INPROC: + new_dest_context = dest_context; + break; + case MSHCTX_CROSSCTX: + switch (dest_context) + { + case MSHCTX_INPROC: + break; + default: + new_dest_context = dest_context; + } + break; + case MSHCTX_LOCAL: + switch (dest_context) + { + case MSHCTX_INPROC: + case MSHCTX_CROSSCTX: + break; + default: + new_dest_context = dest_context; + } + break; + case MSHCTX_NOSHAREDMEM: + switch (dest_context) + { + case MSHCTX_DIFFERENTMACHINE: + new_dest_context = dest_context; + break; + default: + break; + } + break; + default: + break; + } + + if (old_dest_context == new_dest_context) break; + + old_dest_context = InterlockedCompareExchange((PLONG)&This->dest_context, new_dest_context, old_dest_context); + } while (new_dest_context != old_dest_context); + + if (dest_context_data) + InterlockedExchangePointer(&This->dest_context_data, dest_context_data); +} + static HRESULT proxy_manager_query_local_interface(struct proxy_manager * This, REFIID riid, void ** ppv) { HRESULT hr; @@ -799,7 +865,9 @@ static HRESULT proxy_manager_get_remunkn memcpy(&stdobjref.ipid.Data4, &stdobjref.oxid, sizeof(OXID)); /* do the unmarshal */ - hr = unmarshal_object(&stdobjref, This->parent, &IID_IRemUnknown, (void**)&This->remunk); + hr = unmarshal_object(&stdobjref, This->parent, This->dest_context, + This->dest_context_data, &IID_IRemUnknown, + (void**)&This->remunk); if (hr == S_OK) *remunk = This->remunk; } @@ -990,7 +1058,9 @@ StdMarshalImpl_MarshalInterface( /* helper for StdMarshalImpl_UnmarshalInterface - does the unmarshaling with * no questions asked about the rules surrounding same-apartment unmarshals * and table marshaling */ -static HRESULT unmarshal_object(const STDOBJREF *stdobjref, APARTMENT *apt, REFIID riid, void **object) +static HRESULT unmarshal_object(const STDOBJREF *stdobjref, APARTMENT *apt, + MSHCTX dest_context, void *dest_context_data, + REFIID riid, void **object) { struct proxy_manager *proxy_manager = NULL; HRESULT hr = S_OK; @@ -1017,6 +1087,9 @@ static HRESULT unmarshal_object(const ST if (hr == S_OK) { struct ifproxy * ifproxy; + + proxy_manager_set_context(proxy_manager, dest_context, dest_context_data); + hr = proxy_manager_find_ifproxy(proxy_manager, riid, &ifproxy); if (hr == E_NOINTERFACE) { @@ -1043,6 +1116,7 @@ static HRESULT unmarshal_object(const ST static HRESULT WINAPI StdMarshalImpl_UnmarshalInterface(LPMARSHAL iface, IStream *pStm, REFIID riid, void **ppv) { + StdMarshalImpl *This = (StdMarshalImpl *)iface; struct stub_manager *stubmgr; STDOBJREF stdobjref; ULONG res; @@ -1112,7 +1186,8 @@ StdMarshalImpl_UnmarshalInterface(LPMARS wine_dbgstr_longlong(stdobjref.oxid)); if (hres == S_OK) - hres = unmarshal_object(&stdobjref, apt, riid, ppv); + hres = unmarshal_object(&stdobjref, apt, This->dwDestContext, + This->pvDestContext, riid, ppv); if (hres) WARN("Failed with error 0x%08lx\n", hres); else TRACE("Successfully created proxy %p\n", *ppv);

1 0

Robert Shearman : include: Add more definitions and types to olectl.h.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 47d7bd7ae11a8e4682e328866bf9a754cbb1b5ef URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=47d7bd7ae11a8e4682e3288… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sun Mar 5 13:38:01 2006 +0000 include: Add more definitions and types to olectl.h. --- include/olectl.h | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 76 insertions(+), 4 deletions(-) diff --git a/include/olectl.h b/include/olectl.h index 37a9b9a..1231ad6 100644 --- a/include/olectl.h +++ b/include/olectl.h @@ -42,6 +42,9 @@ DEFINE_GUID(CLSID_StdFont, DEFINE_GUID(CLSID_StdPicture, 0x0be35204,0x8f91,0x11ce,0x9d,0xe3,0x00,0xaa,0x00,0x4b,0xb8,0x51); +DEFINE_GUID(IID_IPropertyFrame, + 0xb196b28a,0xbab4,0x101a,0xb6,0x9c,0x00,0xaa,0x00,0x34,0x1d,0x07); + DEFINE_GUID(CLSID_CFontPropPage, 0x0be35200,0x8f91,0x11ce,0x9d,0xe3,0x00,0xaa,0x00,0x4b,0xb8,0x51); DEFINE_GUID(CLSID_CColorPropPage, @@ -70,6 +73,30 @@ DEFINE_GUID(GUID_XSIZE, DEFINE_GUID(GUID_YSIZE, 0x66504309,0xBE0F,0x101A,0x8B,0xBB,0x00,0xAA,0x00,0x30,0x0C,0xAB); +#ifndef __CGUID_H__ +DEFINE_GUID(GUID_TRISTATE, + 0x6650430a,0xbe0f,0x101a,0x8b,0xbb,0x00,0xaa,0x00,0x30,0x0c,0xab); +#endif + +DEFINE_GUID(GUID_OPTIONVALUEEXCLUSIVE, + 0x6650430b,0xbe0f,0x101a,0x8b,0xbb,0x00,0xaa,0x00,0x30,0x0c,0xab); +DEFINE_GUID(GUID_CHECKVALUEEXCLUSIVE, + 0x6650430c,0xbe0f,0x101a,0x8b,0xbb,0x00,0xaa,0x00,0x30,0x0c,0xab); +DEFINE_GUID(GUID_FONTNAME, + 0x6650430d,0xbe0f,0x101a,0x8b,0xbb,0x00,0xaa,0x00,0x30,0x0c,0xab); +DEFINE_GUID(GUID_FONTSIZE, + 0x6650430e,0xbe0f,0x101a,0x8b,0xbb,0x00,0xaa,0x00,0x30,0x0c,0xab); +DEFINE_GUID(GUID_FONTBOLD, + 0x6650430f,0xbe0f,0x101a,0x8b,0xbb,0x00,0xaa,0x00,0x30,0x0c,0xab); +DEFINE_GUID(GUID_FONTITALIC, + 0x66504310,0xbe0f,0x101a,0x8b,0xbb,0x00,0xaa,0x00,0x30,0x0c,0xab); +DEFINE_GUID(GUID_FONTUNDERSCORE, + 0x66504311,0xbe0f,0x101a,0x8b,0xbb,0x00,0xaa,0x00,0x30,0x0c,0xab); +DEFINE_GUID(GUID_FONTSTRIKETHROUGH, + 0x66504312,0xbe0f,0x101a,0x8b,0xbb,0x00,0xaa,0x00,0x30,0x0c,0xab); +DEFINE_GUID(GUID_HANDLE, + 0x66504313,0xbe0f,0x101a,0x8b,0xbb,0x00,0xaa,0x00,0x30,0x0c,0xab); + typedef struct tagOCPFIPARAMS { ULONG cbStructSize; @@ -150,6 +177,12 @@ typedef VARIANT_BOOL OLE_OPTEXCLUSIVE; typedef VARIANT_BOOL OLE_CANCELBOOL; typedef VARIANT_BOOL OLE_ENABLEDEFAULTBOOL; +/* flags for OleLoadPictureEx and OleLoadPictureFileEx */ +#define LP_DEFAULT 0x0 +#define LP_MONOCHROME 0x1 +#define LP_VGACOLOR 0x2 +#define LP_COLOR 0x4 + HCURSOR WINAPI OleIconToCursor( HINSTANCE hinstExe, HICON hicon); HRESULT WINAPI OleCreatePropertyFrameIndirect( LPOCPFIPARAMS lpParams); @@ -167,6 +200,13 @@ HRESULT WINAPI OleLoadPictureEx( LPSTREA REFIID riid, DWORD xSizeDesired, DWORD ySizeDesired, DWORD dwFlags, LPVOID *lplpvObj ); +HRESULT WINAPI OleLoadPictureFile( VARIANT varFilename, IDispatch **ppdispPicture ); + +HRESULT WINAPI OleLoadPictureFileEx( VARIANT varFilename, DWORD xSizeDesired, + DWORD ySizeDesired, DWORD dwFlags, IDispatch **ppdispPicture ); + +HRESULT WINAPI OleSavePictureFile( IDispatch *pdispPicture, BSTR bstrFilename ); + HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller, DWORD dwReserved, OLE_COLOR clrReserved, REFIID riid, LPVOID *ppvRet ); @@ -265,12 +305,31 @@ HRESULT WINAPI OleTranslateColor( OLE_CO #define CTL_E_SEARCHTEXTNOTFOUND STD_CTL_SCODE(744) #define CTL_E_REPLACEMENTSTOOLONG STD_CTL_SCODE(746) +#define CUSTOM_CTL_SCODE(n) MAKE_SCODE(SEVERITY_ERROR, FACILITY_CONTROL, n) +#define CTL_E_CUSTOM_FIRST CUSTOM_CTL_SCODE(600) + #define VT_COLOR VT_I4 +#define VT_XPOS_PIXELS VT_I4 +#define VT_YPOS_PIXELS VT_I4 +#define VT_XSIZE_PIXELS VT_I4 +#define VT_YSIZE_PIXELS VT_I4 +#define VT_XPOS_HIMETRIC VT_I4 +#define VT_YPOS_HIMETRIC VT_I4 +#define VT_XSIZE_HIMETRIC VT_I4 +#define VT_YSIZE_HIMETRIC VT_I4 +#define VT_TRISTATE VT_I2 +#define VT_OPTEXCLUSIVE VT_BOOL #define VT_FONT VT_DISPATCH -#define VT_STREAMED_PROPSET 73 /* [P] Stream contains a property set */ -#define VT_STORED_PROPSET 74 /* [P] Storage contains a property set */ -#define VT_BLOB_PROPSET 75 /* [P] Blob contains a property set */ -#define VT_VERBOSE_ENUM 76 /* [P] Enum value with text string */ +#define VT_PICTURE VT_DISPATCH + +#define VT_STREAMED_PROPSET 73 +#define VT_STORED_PROPSET 74 +#define VT_BLOB_PROPSET 75 +#define VT_VERBOSE_ENUM 76 + +#ifndef OLEIVERB_PROPERTIES +#define OLEIVERB_PROPERTIES (-7L) +#endif #define PERPROP_E_FIRST MAKE_SCODE(SEVERITY_ERROR, FACILITY_ITF, 0x0200) #define PERPROP_E_LAST MAKE_SCODE(SEVERITY_ERROR, FACILITY_ITF, 0x020F) @@ -316,6 +375,9 @@ HRESULT WINAPI OleTranslateColor( OLE_CO #define DISPID_REFRESH (-550) #define DISPID_DOCLICK (-551) #define DISPID_ABOUTBOX (-552) +#define DISPID_ADDITEM (-553) +#define DISPID_CLEAR (-554) +#define DISPID_REMOVEITEM (-555) #define DISPID_CLICK (-600) #define DISPID_DBLCLICK (-601) @@ -327,6 +389,10 @@ HRESULT WINAPI OleTranslateColor( OLE_CO #define DISPID_MOUSEUP (-607) #define DISPID_ERROREVENT (-608) #define DISPID_READYSTATECHANGE (-609) +#define DISPID_CLICK_VALUE (-610) +#define DISPID_RIGHTTOLEFT (-611) +#define DISPID_TOPTOBOTTOM (-612) +#define DISPID_THIS (-613) #define DISPID_AMBIENT_BACKCOLOR (-701) #define DISPID_AMBIENT_DISPLAYNAME (-702) @@ -344,9 +410,15 @@ HRESULT WINAPI OleTranslateColor( OLE_CO #define DISPID_AMBIENT_SUPPORTSMNEMONICS (-714) #define DISPID_AMBIENT_AUTOCLIP (-715) #define DISPID_AMBIENT_APPEARANCE (-716) + +#define DISPID_AMBIENT_CODEPAGE (-725) #define DISPID_AMBIENT_PALETTE (-726) +#define DISPID_AMBIENT_CHARSET (-727) #define DISPID_AMBIENT_TRANSFERPRIORITY (-728) +#define DISPID_AMBIENT_RIGHTTOLEFT (-732) +#define DISPID_AMBIENT_TOPTOBOTTOM (-733) + #define DISPID_Name (-800) #define DISPID_Delete (-801) #define DISPID_Object (-802)

1 0

Robert Shearman : oleaut: Add some more VarFormat tests and fix the VarMod decimal test.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: e5b2c146657c9e0f1b2489feb9da8b0bcdc17858 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e5b2c146657c9e0f1b2489f… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sun Mar 5 13:36:39 2006 +0000 oleaut: Add some more VarFormat tests and fix the VarMod decimal test. --- dlls/oleaut32/tests/vartest.c | 31 ++++++++++++++++++++++++++++++- 1 files changed, 30 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 65c5cfd..2da6371 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1731,6 +1731,9 @@ static void test_VarFormat(void) VARFMT(VT_I4,V_I4,1,"000###",S_OK,"000001"); VARFMT(VT_I4,V_I4,1,"#00##00#0",S_OK,"00000001"); VARFMT(VT_I4,V_I4,1,"1#####0000",S_OK,"10001"); + todo_wine { + VARFMT(VT_I4,V_I4,100000,"#,###,###,###",S_OK,"100,000"); + } VARFMT(VT_R8,V_R8,1.23456789,"0#.0#0#0#0#0",S_OK,"01.234567890"); VARFMT(VT_R8,V_R8,1.2,"0#.0#0#0#0#0",S_OK,"01.200000000"); VARFMT(VT_R8,V_R8,9.87654321,"#0.#0#0#0#0#",S_OK,"9.87654321"); @@ -1779,6 +1782,14 @@ static void test_VarFormat(void) pVarFormat(&in,NULL,fd,fw,flags,&out); /* Would crash if out is cleared */ out = NULL; + /* VT_NULL */ + V_VT(&in) = VT_NULL; + hres = pVarFormat(&in,NULL,fd,fw,0,&out); + todo_wine { + ok(hres == S_OK, "VarFormat failed with 0x%08lx\n", hres); + ok(out == NULL, "expected NULL formatted string\n"); + } + /* Invalid args */ hres = pVarFormat(&in,NULL,fd,fw,flags,NULL); ok(hres == E_INVALIDARG, "Null out: expected E_INVALIDARG, got 0x%08lx\n", hres); @@ -2450,6 +2461,25 @@ static void test_VarMod(void) ok(hres == S_OK && V_VT(&vDst) == VT_I4 && V_I4(&vDst) == 0, "VarMod: expected 0x%lx,%d,%d, got 0x%lX,%d,%ld\n", S_OK, VT_I4, 0, hres, V_VT(&vDst), V_I4(&vDst)); + /* some decimals */ + todo_wine { + V_VT(&v1) = VT_DECIMAL; + V_VT(&v2) = VT_DECIMAL; + VarDecFromI4(100, &V_DECIMAL(&v1)); + VarDecFromI4(10, &V_DECIMAL(&v2)); + hres = pVarMod(&v1,&v2,&vDst); + ok(hres == S_OK && V_VT(&vDst) == VT_I4 && V_I4(&vDst) == 0, + "VarMod: expected 0x%lx,%d,%d, got 0x%lX,%d,%ld\n", S_OK, VT_I4, 0, hres, V_VT(&vDst), V_I4(&vDst)); + + V_VT(&v1) = VT_I4; + V_VT(&v2) = VT_DECIMAL; + V_I4(&v1) = 100; + VarDecFromI4(10, &V_DECIMAL(&v2)); + hres = pVarMod(&v1,&v2,&vDst); + ok(hres == S_OK && V_VT(&vDst) == VT_I4 && V_I4(&vDst) == 0, + "VarMod: expected 0x%lx,%d,%d, got 0x%lX,%d,%ld\n", S_OK, VT_I4, 0, hres, V_VT(&vDst), V_I4(&vDst)); + } + VARMOD2(UINT,I4,100,10,I4,0,S_OK); /* test that an error results in the type of the result changing but not its value */ @@ -2473,7 +2503,6 @@ static void test_VarMod(void) VARMOD2(ERROR,I4,100,10,EMPTY,0,DISP_E_TYPEMISMATCH); VARMOD2(VARIANT,I4,100,10,EMPTY,0,DISP_E_TYPEMISMATCH); VARMOD2(UNKNOWN,I4,100,10,EMPTY,0,DISP_E_TYPEMISMATCH); - VARMOD2(DECIMAL,I4,100,10,EMPTY,0,DISP_E_OVERFLOW); VARMOD2(VOID,I4,100,10,EMPTY,0,DISP_E_BADVARTYPE); VARMOD2(HRESULT,I4,100,10,EMPTY,0,DISP_E_BADVARTYPE); VARMOD2(PTR,I4,100,10,EMPTY,0,DISP_E_BADVARTYPE);

1 0

Robert Shearman : oleaut: Split OLEPictureImpl_Load.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 08764dde8abf964ce99780a56b72622774086fe1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=08764dde8abf964ce99780a… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sun Mar 5 13:34:31 2006 +0000 oleaut: Split OLEPictureImpl_Load. Split OLEPictureImpl_Load into separate functions for the different file types. --- dlls/oleaut32/olepicture.c | 305 +++++++++++++++++++++++--------------------- 1 files changed, 162 insertions(+), 143 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=08764dde8abf964ce99…

1 0

lostwages/news 2006030301.xml
by WineHQ 06 Mar '06

06 Mar '06

ChangeSet ID: 23400 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2006/03/05 23:39:14 Modified files: news : 2006030301.xml Log message: Fix malformed xml in news article. Patch: http://cvs.winehq.org/patch.py?id=23400 Old revision New revision Changes Path 1.1 1.2 +1 -2 lostwages/news/2006030301.xml Index: lostwages/news/2006030301.xml diff -u -p lostwages/news/2006030301.xml:1.1 lostwages/news/2006030301.xml:1.2 --- lostwages/news/2006030301.xml:1.1 6 Mar 2006 5:39:14 -0000 +++ lostwages/news/2006030301.xml 6 Mar 2006 5:39:14 -0000 @@ -6,7 +6,6 @@ Wine 0.9.9 was released yesterday. Quite a few major additions appeared in this release, including: <ul> - <li> <li> Many new features and improvements in Richedit.</li> <li> More Web browser support.</li> <li> Recursive directory change notifications.</li> @@ -14,7 +13,7 @@ in this release, including: <li> Direct3D 8 and 9 now use the same code.</li> <li> Many debugger improvements.</li> <li> Systray is now handled by the explorer process.</li> -</ul> +</ul></p> <p> Binary packages are in the process of being built, but the source is <a href="http://prdownloads.sourceforge.net/wine/wine-0.9.9.tar.bz2">available

1 0

lostwages/ news/2006030501.xml wwn/wn20060305_ ...
by WineHQ 06 Mar '06

06 Mar '06

ChangeSet ID: 23399 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2006/03/05 23:23:34 Added files: news : 2006030501.xml wwn : wn20060305_307.xml Log message: WWN #307 Patch: http://cvs.winehq.org/patch.py?id=23399 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/news/2006030501.xml Added 1.1 +0 -0 lostwages/wwn/wn20060305_307.xml

1 0

Mike McCormack : winecfg: Fix a typo (LVM_ -> TVM_).
by Alexandre Julliard 04 Mar '06

04 Mar '06

Module: wine Branch: refs/heads/master Commit: e06b046f59f4144319e5fa59fd5c7c1cfb41e184 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e06b046f59f4144319e5fa5… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun Mar 5 00:58:44 2006 +0900 winecfg: Fix a typo (LVM_ -> TVM_). --- programs/winecfg/audio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index 490e05a..b677c2a 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -205,7 +205,7 @@ static void initAudioDeviceTree(HWND hDl hBitMap = LoadBitmap(GetModuleHandle(NULL), MAKEINTRESOURCE(IDB_CHECKBOX)); ImageList_Add(hImageList, hBitMap, NULL); DeleteObject(hBitMap); - SendMessageW( tree, LVM_SETIMAGELIST, TVSIL_STATE, (LPARAM)hImageList ); + SendMessageW( tree, TVM_SETIMAGELIST, TVSIL_STATE, (LPARAM)hImageList ); /* root item */ insert.hParent = TVI_ROOT;

1 0

Vitaly Budovski : wined3d: Implemented WINED3DRS_DEPTHBIAS.
by Alexandre Julliard 04 Mar '06

04 Mar '06

Module: wine Branch: refs/heads/master Commit: e5bad779d6c27db11bd3eab6d893935b7cd103d5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e5bad779d6c27db11bd3eab… Author: Vitaly Budovski <vbudovsk(a)cs.rmit.edu.au> Date: Wed Mar 1 23:37:58 2006 +1100 wined3d: Implemented WINED3DRS_DEPTHBIAS. --- dlls/wined3d/device.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f7210f0..800c630 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3866,7 +3866,24 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen case WINED3DRS_COLORWRITEENABLE3 : case WINED3DRS_BLENDFACTOR : case WINED3DRS_SRGBWRITEENABLE : + { + FIXME("(%p)->(%d,%ld) not handled yet\n", This, State, Value); + break; + } case WINED3DRS_DEPTHBIAS : + { + if(Value) { + tmpvalue.d = Value; + glEnable(GL_POLYGON_OFFSET_FILL); + checkGLcall("glEnable(GL_POLYGON_OFFSET_FILL)"); + glPolygonOffset(*((float*)&This->stateBlock->renderState[WINED3DRS_SLOPESCALEDEPTHBIAS]), tmpvalue.f); + checkGLcall("glPolygonOffset(...)"); + } else { + glDisable(GL_POLYGON_OFFSET_FILL); + checkGLcall("glDisable(GL_POLYGON_OFFSET_FILL)"); + } + break; + } case WINED3DRS_WRAP8 : case WINED3DRS_WRAP9 : case WINED3DRS_WRAP10 :

1 0

Vitaly Budovski : wined3d: Added two sided stencil support to WINED3DRS_STENCILFUNC.
by Alexandre Julliard 04 Mar '06

04 Mar '06

Module: wine Branch: refs/heads/master Commit: 196eaa674cf924145f903c27906a7d88c20c98f8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=196eaa674cf924145f903c2… Author: Vitaly Budovski <vbudovsk(a)cs.rmit.edu.au> Date: Sat Mar 4 17:53:50 2006 +1100 wined3d: Added two sided stencil support to WINED3DRS_STENCILFUNC. --- dlls/wined3d/device.c | 66 +++++++++++++++++++++++++++++++++---------------- 1 files changed, 44 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 047b2b9..f7210f0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3144,31 +3144,53 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen } break; - case WINED3DRS_STENCILFUNC : - { - int glParm = GL_ALWAYS; - int ref = This->stateBlock->renderState[WINED3DRS_STENCILREF]; - GLuint mask = This->stateBlock->renderState[WINED3DRS_STENCILMASK]; + case WINED3DRS_STENCILFUNC : + { + GLint func; + GLint ref = This->stateBlock->renderState[WINED3DRS_STENCILREF]; + GLuint mask = This->stateBlock->renderState[WINED3DRS_STENCILMASK]; - switch ((D3DCMPFUNC) Value) { - case D3DCMP_NEVER: glParm=GL_NEVER; break; - case D3DCMP_LESS: glParm=GL_LESS; break; - case D3DCMP_EQUAL: glParm=GL_EQUAL; break; - case D3DCMP_LESSEQUAL: glParm=GL_LEQUAL; break; - case D3DCMP_GREATER: glParm=GL_GREATER; break; - case D3DCMP_NOTEQUAL: glParm=GL_NOTEQUAL; break; - case D3DCMP_GREATEREQUAL: glParm=GL_GEQUAL; break; - case D3DCMP_ALWAYS: glParm=GL_ALWAYS; break; - default: - FIXME("Unrecognized/Unhandled D3DCMPFUNC value %ld\n", Value); - } - TRACE("glStencilFunc with Parm=%x, ref=%d, mask=%x\n", glParm, ref, mask); - This->stencilfunc = glParm; - glStencilFunc(glParm, ref, mask); - checkGLcall("glStencilFunc"); + func = GL_ALWAYS; + switch ((D3DCMPFUNC)Value) { + case D3DCMP_NEVER: func = GL_NEVER; break; + case D3DCMP_LESS: func = GL_LESS; break; + case D3DCMP_EQUAL: func = GL_EQUAL; break; + case D3DCMP_LESSEQUAL: func = GL_LEQUAL; break; + case D3DCMP_GREATER: func = GL_GREATER; break; + case D3DCMP_NOTEQUAL: func = GL_NOTEQUAL; break; + case D3DCMP_GREATEREQUAL: func = GL_GEQUAL; break; + case D3DCMP_ALWAYS: func = GL_ALWAYS; break; + default: + FIXME("Unrecognized/Unhandled D3DCMPFUNC value %ld\n", Value); + } + This->stencilfunc = func; + if(!This->stateBlock->renderState[WINED3DRS_TWOSIDEDSTENCILMODE]) { + if(GL_EXTCALL(glStencilFuncSeparate)) { + GL_EXTCALL(glStencilFuncSeparate(GL_FRONT, func, ref, mask)); + checkGLcall("glStencilFuncSeparate(GL_FRONT,...)"); + } + else if(GL_EXTCALL(glActiveStencilFaceEXT)) { + glEnable(GL_STENCIL_TEST_TWO_SIDE_EXT); + checkGLcall("glEnable(GL_STENCIL_TEST_TWO_SIDE_EXT)"); + GL_EXTCALL(glActiveStencilFaceEXT(GL_FRONT)); + checkGLcall("glActiveStencilFaceEXT(GL_FRONT)"); + glStencilFunc(func, ref, mask); + checkGLcall("glStencilFunc(...)"); + } + else if(GL_EXTCALL(glStencilFuncSeparateATI)) { + GL_EXTCALL(glStencilFuncSeparateATI(GL_FRONT, func, ref, mask)); + checkGLcall("glStencilFuncSeparateATI(GL_FRONT,...)"); + } else { + TRACE("Separate stencil function not supported on this version of opengl"); + glStencilFunc(func, ref, mask); + checkGLcall("glStencilFunc(...)"); + } + } else { + glStencilFunc(func, ref, mask); + checkGLcall("glStencilFunc(...)"); } break; - + } case WINED3DRS_STENCILREF : { int glParm = This->stencilfunc;

1 0

Vitaly Budovski : wined3d: Added two sided stencil support to WINED3DRS_STENCILFAIL,
by Alexandre Julliard 04 Mar '06

04 Mar '06

Module: wine Branch: refs/heads/master Commit: f2f59cae61c7017e22c6121c5a74d93ffb7eb46c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f2f59cae61c7017e22c6121… Author: Vitaly Budovski <vbudovsk(a)cs.rmit.edu.au> Date: Sat Mar 4 17:52:24 2006 +1100 wined3d: Added two sided stencil support to WINED3DRS_STENCILFAIL, WINED3DRS_STENCILZFAIL and WINED3DRS_STENCILPASS. --- dlls/wined3d/device.c | 93 ++++++++++++++++++++++++------------------------- 1 files changed, 46 insertions(+), 47 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 894a70a..047b2b9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3195,57 +3195,56 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen break; case WINED3DRS_STENCILFAIL : - { - GLenum fail ; - GLint zpass ; - GLint zfail ; - - fail = StencilOp(Value); - glGetIntegerv(GL_STENCIL_PASS_DEPTH_PASS, &zpass); - checkGLcall("glGetIntegerv(GL_STENCIL_PASS_DEPTH_PASS, &zpass);"); - glGetIntegerv(GL_STENCIL_PASS_DEPTH_FAIL, &zfail); - checkGLcall("glGetIntegerv(GL_STENCIL_PASS_DEPTH_FAIL, &zfail);"); - - TRACE("StencilOp fail=%x, zfail=%x, zpass=%x\n", fail, zfail, zpass); - glStencilOp(fail, zfail, zpass); - checkGLcall("glStencilOp(fail, zfail, zpass);"); - } - break; case WINED3DRS_STENCILZFAIL : - { - GLint fail ; - GLint zpass ; - GLenum zfail ; - - glGetIntegerv(GL_STENCIL_FAIL, &fail); - checkGLcall("glGetIntegerv(GL_STENCIL_FAIL, &fail);"); - glGetIntegerv(GL_STENCIL_PASS_DEPTH_PASS, &zpass); - checkGLcall("glGetIntegerv(GL_STENCIL_PASS_DEPTH_PASS, &zpass);"); - zfail = StencilOp(Value); - - TRACE("StencilOp fail=%x, zfail=%x, zpass=%x\n", fail, zfail, zpass); - glStencilOp(fail, zfail, zpass); - checkGLcall("glStencilOp(fail, zfail, zpass);"); - } - break; case WINED3DRS_STENCILPASS : - { - GLint fail ; - GLenum zpass ; - GLint zfail ; - - glGetIntegerv(GL_STENCIL_FAIL, &fail); - checkGLcall("glGetIntegerv(GL_STENCIL_FAIL, &fail);"); - zpass = StencilOp(Value); - glGetIntegerv(GL_STENCIL_PASS_DEPTH_FAIL, &zfail); - checkGLcall("glGetIntegerv(GL_STENCIL_PASS_DEPTH_FAIL, &zfail);"); - - TRACE("StencilOp fail=%x, zfail=%x, zpass=%x\n", fail, zfail, zpass); - glStencilOp(fail, zfail, zpass); - checkGLcall("glStencilOp(fail, zfail, zpass);"); + { + GLint stencilFail; + GLint depthFail; + GLint stencilPass; + + GLint action = StencilOp(Value); + + glGetIntegerv(GL_STENCIL_FAIL, &stencilFail); + glGetIntegerv(GL_STENCIL_PASS_DEPTH_FAIL, &depthFail); + glGetIntegerv(GL_STENCIL_PASS_DEPTH_PASS, &stencilPass); + + if(WINED3DRS_STENCILFAIL == State) { + stencilFail = action; + } + else if(WINED3DRS_STENCILZFAIL == State) { + depthFail = action; + } + else if(WINED3DRS_STENCILPASS == State) { + stencilPass = action; } - break; + if(!This->stateBlock->renderState[WINED3DRS_TWOSIDEDSTENCILMODE]) { + if(GL_EXTCALL(glStencilOpSeparate)) { + GL_EXTCALL(glStencilOpSeparate(GL_FRONT, stencilFail, depthFail, stencilPass)); + checkGLcall("glStencilOpSeparate(GL_FRONT,...)"); + } + else if(GL_EXTCALL(glActiveStencilFaceEXT)) { + glEnable(GL_STENCIL_TEST_TWO_SIDE_EXT); + checkGLcall("glEnable(GL_STENCIL_TEST_TWO_SIDE_EXT)"); + GL_EXTCALL(glActiveStencilFaceEXT(GL_FRONT)); + checkGLcall("glActiveStencilFaceEXT(GL_FRONT)"); + glStencilOp(stencilFail, depthFail, stencilPass); + checkGLcall("glStencilOp(...)"); + } + else if(GL_EXTCALL(glStencilOpSeparateATI)) { + GL_EXTCALL(glStencilOpSeparateATI(GL_FRONT, stencilFail, depthFail, stencilPass)); + checkGLcall("glStencilOpSeparateATI(GL_FRONT,...)"); + } else { + TRACE("Separate stencil operation not supported on this version of opengl"); + glStencilOp(stencilFail, depthFail, stencilPass); + checkGLcall("glStencilOp(...)"); + } + } else { + glStencilOp(stencilFail, depthFail, stencilPass); + checkGLcall("glStencilOp(...)"); + } + break; + } case WINED3DRS_STENCILWRITEMASK : { glStencilMask(Value);

1 0

Vitaly Budovski : wined3d: Implemented fallback for separate stencil function in WINED3DRS_CCW_STENCILFUNC .
by Alexandre Julliard 04 Mar '06

04 Mar '06

Module: wine Branch: refs/heads/master Commit: 6bf561b7ba1b1ae9ae22a1056c554ad8bce7f8bc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6bf561b7ba1b1ae9ae22a10… Author: Vitaly Budovski <vbudovsk(a)cs.rmit.edu.au> Date: Sat Mar 4 17:50:55 2006 +1100 wined3d: Implemented fallback for separate stencil function in WINED3DRS_CCW_STENCILFUNC. --- dlls/wined3d/device.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 174f975..894a70a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3817,8 +3817,23 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen if(GL_EXTCALL(glStencilFuncSeparate)) { GL_EXTCALL(glStencilFuncSeparate(GL_BACK, func, ref, mask)); checkGLcall("glStencilFuncSeparate(GL_BACK,...)"); - } else - WARN("Unsupported in local OpenGL implementation: glStencilFuncSeparate\n"); + } + else if(GL_EXTCALL(glActiveStencilFaceEXT)) { + glEnable(GL_STENCIL_TEST_TWO_SIDE_EXT); + checkGLcall("glEnable(GL_STENCIL_TEST_TWO_SIDE_EXT)"); + GL_EXTCALL(glActiveStencilFaceEXT(GL_BACK)); + checkGLcall("glActiveStencilFaceEXT(GL_BACK)"); + glStencilFunc(func, ref, mask); + checkGLcall("glStencilFunc(...)"); + } + else if(GL_EXTCALL(glStencilFuncSeparateATI)) { + GL_EXTCALL(glStencilFuncSeparateATI(GL_BACK, func, ref, mask)); + checkGLcall("glStencilFuncSeparateATI(GL_BACK,...)"); + } else { + TRACE("Separate stencil function not supported on this version of opengl"); + glStencilFunc(func, ref, mask); + checkGLcall("glStencilFunc(...)"); + } } else { glStencilFunc(func, ref, mask); checkGLcall("glStencilFunc(...)");

1 0

Vitaly Budovski : wined3d: Implemented fallback for separate stencil operation in WINED3DRS_CCW_STENCIL* .
by Alexandre Julliard 04 Mar '06

04 Mar '06

Module: wine Branch: refs/heads/master Commit: 7b55a0cff1773c9b2c887570fa44623b771ad67f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7b55a0cff1773c9b2c88757… Author: Vitaly Budovski <vbudovsk(a)cs.rmit.edu.au> Date: Sat Mar 4 17:49:05 2006 +1100 wined3d: Implemented fallback for separate stencil operation in WINED3DRS_CCW_STENCIL*. --- dlls/wined3d/device.c | 22 ++++++++++++++++++---- include/wine/wined3d_gl.h | 21 +++++++++++++++++++++ 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d27776c..174f975 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3752,9 +3752,9 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen GLint action = StencilOp(Value); - glGetIntegerv(GL_STENCIL_FAIL, &stencilFail); - glGetIntegerv(GL_STENCIL_PASS_DEPTH_FAIL, &depthFail); - glGetIntegerv(GL_STENCIL_PASS_DEPTH_PASS, &stencilPass); + glGetIntegerv(GL_STENCIL_BACK_FAIL, &stencilFail); + glGetIntegerv(GL_STENCIL_BACK_PASS_DEPTH_FAIL, &depthFail); + glGetIntegerv(GL_STENCIL_BACK_PASS_DEPTH_PASS, &stencilPass); if(WINED3DRS_CCW_STENCILFAIL == State) { stencilFail = action; @@ -3770,8 +3770,22 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen if(GL_EXTCALL(glStencilOpSeparate)) { GL_EXTCALL(glStencilOpSeparate(GL_BACK, stencilFail, depthFail, stencilPass)); checkGLcall("glStencilOpSeparate(GL_BACK,...)"); + } + else if(GL_EXTCALL(glActiveStencilFaceEXT)) { + glEnable(GL_STENCIL_TEST_TWO_SIDE_EXT); + checkGLcall("glEnable(GL_STENCIL_TEST_TWO_SIDE_EXT)"); + GL_EXTCALL(glActiveStencilFaceEXT(GL_BACK)); + checkGLcall("glActiveStencilFaceEXT(GL_BACK)"); + glStencilOp(stencilFail, depthFail, stencilPass); + checkGLcall("glStencilOp(...)"); + } + else if(GL_EXTCALL(glStencilOpSeparateATI)) { + GL_EXTCALL(glStencilOpSeparateATI(GL_BACK, stencilFail, depthFail, stencilPass)); + checkGLcall("glStencilOpSeparateATI(GL_BACK,...)"); } else { - WARN("Unsupported in local OpenGL implementation: glStencilOpSeparate\n"); + TRACE("Separate stencil operation not supported on this version of opengl"); + glStencilOp(stencilFail, depthFail, stencilPass); + checkGLcall("glStencilOp(...)"); } } else { glStencilOp(stencilFail, depthFail, stencilPass); diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index fa391ba..c4cd565 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -803,6 +803,23 @@ typedef void (APIENTRY * PGLFNBEGINOCCLU typedef void (APIENTRY * PGLFNENDOCCLUSIONQUERYNVPROC) (void); typedef void (APIENTRY * PGLFNGETOCCLUSIONQUERYIVNVPROC) (GLuint id, GLenum pname, GLint *params); typedef void (APIENTRY * PGLFNGETOCCLUSIONQUERYUIVNVPROC) (GLuint id, GLenum pname, GLuint *params); +/* GL_EXT_stencil_two_side */ +#ifndef GL_EXT_stencil_two_side +#define GL_EXT_stencil_two_side 1 +#define GL_STENCIL_TEST_TWO_SIDE_EXT 0x8910 +#define GL_ACTIVE_STENCIL_FACE_EXT 0x8911 +#endif +typedef void (APIENTRY * PGLFNACTIVESTENCILFACEEXTPROC) (GLenum face); +/* GL_ATI_separate_stencil */ +#ifndef GL_ATI_separate_stencil +#define GL_ATI_separate_stencil 1 +#define GL_STENCIL_BACK_FUNC_ATI 0x8800 +#define GL_STENCIL_BACK_FAIL_ATI 0x8801 +#define GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI 0x8802 +#define GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI 0x8803 +#endif +typedef void (APIENTRY * PGLFNSTENCILOPSEPARATEATIPROC) (GLenum, GLenum, GLenum, GLenum); +typedef void (APIENTRY * PGLFNSTENCILFUNCSEPARATEATIPROC) (GLenum, GLenum, GLint, GLuint); /* OpenGL 2.0 */ typedef void (APIENTRY * PGLFNSTENCILOPSEPARATEPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass); typedef void (APIENTRY * PGLFNSTENCILFUNCSEPARATEPROC) (GLenum face, GLenum func, GLint ref, GLuint mask); @@ -1034,6 +1051,10 @@ typedef enum _GL_SupportedExt { USE_GL_FUNC(PGLFNVERTEXATTRIBPOINTERARBPROC, glVertexAttribPointerARB); \ USE_GL_FUNC(PGLFNENABLEVERTEXATTRIBARRAYARBPROC, glEnableVertexAttribArrayARB); \ USE_GL_FUNC(PGLFNDISABLEVERTEXATTRIBARRAYARBPROC, glDisableVertexAttribArrayARB); \ + /* GL_EXT_stencil_two_side */ \ + USE_GL_FUNC(PGLFNACTIVESTENCILFACEEXTPROC, glActiveStencilFaceEXT); \ + USE_GL_FUNC(PGLFNSTENCILOPSEPARATEATIPROC, glStencilOpSeparateATI); \ + USE_GL_FUNC(PGLFNSTENCILFUNCSEPARATEATIPROC, glStencilFuncSeparateATI); \ /* OpenGL 2.0 */ \ USE_GL_FUNC(PGLFNSTENCILOPSEPARATEPROC, glStencilOpSeparate); \ USE_GL_FUNC(PGLFNSTENCILFUNCSEPARATEPROC, glStencilFuncSeparate); \

1 0

Detlef Riekenberg : wined3d: Fix cut&paste typo.
by Alexandre Julliard 04 Mar '06

04 Mar '06

Module: wine Branch: refs/heads/master Commit: 858be437c5b1cc642ba841f4c3431870fb3ec712 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=858be437c5b1cc642ba841f… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Mar 3 22:40:22 2006 +0100 wined3d: Fix cut&paste typo. --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7d8e4f2..d27776c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3802,7 +3802,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen if(!This->stateBlock->renderState[WINED3DRS_TWOSIDEDSTENCILMODE]) { if(GL_EXTCALL(glStencilFuncSeparate)) { GL_EXTCALL(glStencilFuncSeparate(GL_BACK, func, ref, mask)); - checkGLcall("glStencilOpSeparate(GL_BACK,...)"); + checkGLcall("glStencilFuncSeparate(GL_BACK,...)"); } else WARN("Unsupported in local OpenGL implementation: glStencilFuncSeparate\n"); } else {

1 0

Stefan Dösinger : wined3d: Add D3D7 texture stage types.
by Alexandre Julliard 04 Mar '06

04 Mar '06

Module: wine Branch: refs/heads/master Commit: a15280972bb706a8ac6f92102e63e734de71bca9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a15280972bb706a8ac6f921… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Fri Mar 3 13:39:48 2006 +0100 wined3d: Add D3D7 texture stage types. --- include/wine/wined3d_types.h | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index 65433f3..8735037 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -386,6 +386,16 @@ typedef enum _WINED3DTEXTURESTAGESTATETY WINED3DTSS_BUMPENVMAT10 = 9, WINED3DTSS_BUMPENVMAT11 = 10, WINED3DTSS_TEXCOORDINDEX = 11, + WINED3DTSS_ADDRESS = 12, + WINED3DTSS_ADDRESSU = 13, + WINED3DTSS_ADDRESSV = 14, + WINED3DTSS_BORDERCOLOR = 15, + WINED3DTSS_MAGFILTER = 16, + WINED3DTSS_MINFILTER = 17, + WINED3DTSS_MIPFILTER = 18, + WINED3DTSS_MIPMAPLODBIAS = 19, + WINED3DTSS_MAXMIPLEVEL = 20, + WINED3DTSS_MAXANISOTROPY = 21, WINED3DTSS_BUMPENVLSCALE = 22, WINED3DTSS_BUMPENVLOFFSET = 23, WINED3DTSS_TEXTURETRANSFORMFLAGS = 24,

1 0

Stefan Dösinger : wined3d: Add D3D7 render states.
by Alexandre Julliard 04 Mar '06

04 Mar '06

Module: wine Branch: refs/heads/master Commit: ecaf7729069819d47fe89abe5a032ebf516ace38 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ecaf7729069819d47fe89ab… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Fri Mar 3 13:25:22 2006 +0100 wined3d: Add D3D7 render states. --- include/wine/wined3d_types.h | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index f6ea234..65433f3 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -202,15 +202,27 @@ typedef enum _WINED3DFORMAT { typedef enum _WINED3DRENDERSTATETYPE { + WINED3DRS_TEXTUREHANDLE = 1, + WINED3DRS_ANTIALIAS = 2, + WINED3DRS_TEXTUREADDRESS = 3, + WINED3DRS_TEXTUREPERSPECTIVE = 4, + WINED3DRS_WRAPU = 5, + WINED3DRS_WRAPV = 6, WINED3DRS_ZENABLE = 7, WINED3DRS_FILLMODE = 8, WINED3DRS_SHADEMODE = 9, WINED3DRS_LINEPATTERN = 10, + WINED3DRS_MONOENABLE = 11, + WINED3DRS_ROP2 = 12, + WINED3DRS_PLANEMASK = 13, WINED3DRS_ZWRITEENABLE = 14, WINED3DRS_ALPHATESTENABLE = 15, WINED3DRS_LASTPIXEL = 16, + WINED3DRS_TEXTUREMAG = 17, + WINED3DRS_TEXTUREMIN = 18, WINED3DRS_SRCBLEND = 19, WINED3DRS_DESTBLEND = 20, + WINED3DRS_TEXTUREMAPBLEND = 21, WINED3DRS_CULLMODE = 22, WINED3DRS_ZFUNC = 23, WINED3DRS_ALPHAREF = 24, @@ -220,14 +232,26 @@ typedef enum _WINED3DRENDERSTATETYPE { WINED3DRS_FOGENABLE = 28, WINED3DRS_SPECULARENABLE = 29, WINED3DRS_ZVISIBLE = 30, + WINED3DRS_SUBPIXEL = 31, + WINED3DRS_SUBPIXELX = 32, + WINED3DRS_STIPPLEDALPHA = 33, WINED3DRS_FOGCOLOR = 34, WINED3DRS_FOGTABLEMODE = 35, WINED3DRS_FOGSTART = 36, WINED3DRS_FOGEND = 37, WINED3DRS_FOGDENSITY = 38, + WINED3DRS_STIPPLEENABLE = 39, WINED3DRS_EDGEANTIALIAS = 40, + WINED3DRS_COLORKEYENABLE = 41, + WINED3DRS_BORDERCOLOR = 43, + WINED3DRS_TEXTUREADDRESSU = 44, + WINED3DRS_TEXTUREADDRESSV = 45, + WINED3DRS_MIPMAPLODBIAS = 46, WINED3DRS_ZBIAS = 47, WINED3DRS_RANGEFOGENABLE = 48, + WINED3DRS_ANISOTROPY = 49, + WINED3DRS_FLUSHBATCH = 50, + WINED3DRS_TRANSLUCENTSORTINDEPENDENT = 51, WINED3DRS_STENCILENABLE = 52, WINED3DRS_STENCILFAIL = 53, WINED3DRS_STENCILZFAIL = 54, @@ -247,11 +271,13 @@ typedef enum _WINED3DRENDERSTATETYPE { WINED3DRS_WRAP7 = 135, WINED3DRS_CLIPPING = 136, WINED3DRS_LIGHTING = 137, + WINED3DRS_EXTENTS = 138, WINED3DRS_AMBIENT = 139, WINED3DRS_FOGVERTEXMODE = 140, WINED3DRS_COLORVERTEX = 141, WINED3DRS_LOCALVIEWER = 142, WINED3DRS_NORMALIZENORMALS = 143, + WINED3DRS_COLORKEYBLENDENABLE = 144, WINED3DRS_DIFFUSEMATERIALSOURCE = 145, WINED3DRS_SPECULARMATERIALSOURCE = 146, WINED3DRS_AMBIENTMATERIALSOURCE = 147,

1 0

Dmitry Timoshkov : winebrowser: Use CP_UNIXCP when translating URL passed on command line
by Alexandre Julliard 04 Mar '06

04 Mar '06

Module: wine Branch: refs/heads/master Commit: 182a66c0db3a9fa45c032f82f45ff155e3120ff5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=182a66c0db3a9fa45c032f8… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sat Mar 4 18:16:26 2006 +0800 winebrowser: Use CP_UNIXCP when translating URL passed on command line to unicode. --- programs/winebrowser/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index 094468f..f5ecfc8 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -199,7 +199,7 @@ int main(int argc, char *argv[]) char *unixpath; WCHAR unixpathW[MAX_PATH]; - MultiByteToWideChar( CP_ACP, 0, url, -1, unixpathW, MAX_PATH ); + MultiByteToWideChar( CP_UNIXCP, 0, url, -1, unixpathW, MAX_PATH ); if ((unixpath = wine_get_unix_file_name_ptr( unixpathW ))) { struct stat dummy;

1 0

Byeong-Sik Jeon : user32: Fix the default height for CJK fonts.
by Alexandre Julliard 04 Mar '06

04 Mar '06

Module: wine Branch: refs/heads/master Commit: bd82e82993841fbe9e25e743ce8ef0a768381ad4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bd82e82993841fbe9e25e74… Author: Byeong-Sik Jeon <wjsqudtlr(a)gmail.com> Date: Sat Mar 4 17:13:32 2006 +0900 user32: Fix the default height for CJK fonts. --- dlls/user/sysparams.c | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/user/sysparams.c b/dlls/user/sysparams.c index d678f43..769edd7 100644 --- a/dlls/user/sysparams.c +++ b/dlls/user/sysparams.c @@ -1021,6 +1021,7 @@ static void load_nonclient_metrics(void) { HKEY hkey; NONCLIENTMETRICSW ncm; + INT r; if (RegOpenKeyExW (HKEY_CURRENT_USER, METRICS_REGKEY, 0, KEY_QUERY_VALUE, &hkey) != ERROR_SUCCESS) hkey = 0; @@ -1061,7 +1062,9 @@ static void load_nonclient_metrics(void) SystemParametersInfoW( SPI_GETICONTITLELOGFONT, 0, &ncm.lfMenuFont, 0 ); GetProfileStringW( Desktop, MenuFont, ncm.lfCaptionFont.lfFaceName, ncm.lfMenuFont.lfFaceName, LF_FACESIZE ); - ncm.lfMenuFont.lfHeight = -GetProfileIntW( Desktop, MenuFontSize, 11 ); + r = GetProfileIntW( Desktop, MenuFontSize, 0 ); + if (r) + ncm.lfMenuFont.lfHeight = -r; ncm.lfMenuFont.lfWeight = FW_NORMAL; } @@ -1071,7 +1074,9 @@ static void load_nonclient_metrics(void) SystemParametersInfoW( SPI_GETICONTITLELOGFONT, 0, &ncm.lfStatusFont, 0 ); GetProfileStringW( Desktop, StatusFont, ncm.lfCaptionFont.lfFaceName, ncm.lfStatusFont.lfFaceName, LF_FACESIZE ); - ncm.lfStatusFont.lfHeight = -GetProfileIntW( Desktop, StatusFontSize, 11 ); + r = GetProfileIntW( Desktop, StatusFontSize, 0 ); + if (r) + ncm.lfStatusFont.lfHeight = -r; ncm.lfStatusFont.lfWeight = FW_NORMAL; } @@ -1081,7 +1086,9 @@ static void load_nonclient_metrics(void) SystemParametersInfoW( SPI_GETICONTITLELOGFONT, 0, &ncm.lfMessageFont, 0 ); GetProfileStringW( Desktop, MessageFont, ncm.lfCaptionFont.lfFaceName, ncm.lfMessageFont.lfFaceName, LF_FACESIZE ); - ncm.lfMessageFont.lfHeight = -GetProfileIntW( Desktop, MessageFontSize, 11 ); + r = GetProfileIntW( Desktop, MessageFontSize, 0 ); + if (r) + ncm.lfMessageFont.lfHeight = -r; ncm.lfMessageFont.lfWeight = FW_NORMAL; } @@ -1414,6 +1421,8 @@ BOOL WINAPI SystemParametersInfoW( UINT if (!reg_get_logfont( SPI_SETICONTITLELOGFONT_REGKEY, SPI_SETICONTITLELOGFONT_VALNAME, &icon_metrics.lfFont )) { + INT r; + /* * The 'default GDI fonts' seems to be returned. * If a returned font is not a correct font in your environment, @@ -1425,7 +1434,13 @@ BOOL WINAPI SystemParametersInfoW( UINT lfDefault.lfFaceName, icon_metrics.lfFont.lfFaceName, LF_FACESIZE ); - icon_metrics.lfFont.lfHeight = -GetProfileIntW( Desktop, IconTitleSize, 11 ); + + r = GetProfileIntW( Desktop, IconTitleSize, 0 ); + if (r) + icon_metrics.lfFont.lfHeight = -r; + else + icon_metrics.lfFont.lfHeight = lfDefault.lfHeight; + icon_metrics.lfFont.lfWidth = 0; icon_metrics.lfFont.lfEscapement = icon_metrics.lfFont.lfOrientation = 0; icon_metrics.lfFont.lfWeight = FW_NORMAL;

1 0

Mike McCormack : avifil32: Eliminate some gcc 4. 1 warnings caused by windowsx.h macros.
by Alexandre Julliard 04 Mar '06

04 Mar '06

Module: wine Branch: refs/heads/master Commit: 73bc4e6752cef032406f3cf08a55cc097bc0cb23 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=73bc4e6752cef032406f3cf… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sat Mar 4 14:13:05 2006 +0900 avifil32: Eliminate some gcc 4.1 warnings caused by windowsx.h macros. --- dlls/avifil32/acmstream.c | 41 ++++++++++++++++++++++++++--------------- 1 files changed, 26 insertions(+), 15 deletions(-) diff --git a/dlls/avifil32/acmstream.c b/dlls/avifil32/acmstream.c index 0dc068f..6ffe416 100644 --- a/dlls/avifil32/acmstream.c +++ b/dlls/avifil32/acmstream.c @@ -26,7 +26,6 @@ #include "winuser.h" #include "winnls.h" #include "winerror.h" -#include "windowsx.h" #include "mmsystem.h" #include "vfw.h" #include "msacm.h" @@ -177,20 +176,24 @@ static ULONG WINAPI ACMStream_fnRelease( This->has = NULL; } if (This->acmStreamHdr.pbSrc != NULL) { - GlobalFreePtr(This->acmStreamHdr.pbSrc); + GlobalUnlock(GlobalHandle(This->acmStreamHdr.pbSrc)); + GlobalFree(GlobalHandle(This->acmStreamHdr.pbSrc)); This->acmStreamHdr.pbSrc = NULL; } if (This->acmStreamHdr.pbDst != NULL) { - GlobalFreePtr(This->acmStreamHdr.pbDst); + GlobalUnlock(GlobalHandle(This->acmStreamHdr.pbDst)); + GlobalFree(GlobalHandle(This->acmStreamHdr.pbDst)); This->acmStreamHdr.pbDst = NULL; } if (This->lpInFormat != NULL) { - GlobalFreePtr(This->lpInFormat); + GlobalUnlock(GlobalHandle(This->lpInFormat)); + GlobalFree(GlobalHandle(This->lpInFormat)); This->lpInFormat = NULL; This->cbInFormat = 0; } if (This->lpOutFormat != NULL) { - GlobalFreePtr(This->lpOutFormat); + GlobalUnlock(GlobalHandle(This->lpOutFormat)); + GlobalFree(GlobalHandle(This->lpOutFormat)); This->lpOutFormat = NULL; This->cbOutFormat = 0; } @@ -250,7 +253,7 @@ static HRESULT WINAPI ACMStream_fnCreate else This->cbOutFormat = sizeof(PCMWAVEFORMAT); - This->lpOutFormat = (LPWAVEFORMATEX)GlobalAllocPtr(GHND, This->cbOutFormat); + This->lpOutFormat = GlobalLock(GlobalAlloc(GHND, This->cbOutFormat)); if (This->lpOutFormat == NULL) return AVIERR_MEMORY; @@ -383,7 +386,7 @@ static HRESULT WINAPI ACMStream_fnSetFor if ((This->sInfo.dwCaps & AVIFILECAPS_CANWRITE) == 0) return AVIERR_READONLY; - This->lpInFormat = (LPWAVEFORMATEX)GlobalAllocPtr(GMEM_MOVEABLE, formatsize); + This->lpInFormat = GlobalLock(GlobalAlloc(GMEM_MOVEABLE, formatsize)); if (This->lpInFormat == NULL) return AVIERR_MEMORY; This->cbInFormat = formatsize; @@ -463,7 +466,8 @@ static HRESULT WINAPI ACMStream_fnRead(I /* Need to free destination buffer used for writing? */ if (This->acmStreamHdr.pbDst != NULL) { - GlobalFreePtr(This->acmStreamHdr.pbDst); + GlobalUnlock(GlobalHandle(This->acmStreamHdr.pbDst)); + GlobalFree(GlobalHandle(This->acmStreamHdr.pbDst)); This->acmStreamHdr.pbDst = NULL; This->acmStreamHdr.dwDstUser = 0; } @@ -472,10 +476,13 @@ static HRESULT WINAPI ACMStream_fnRead(I if (This->acmStreamHdr.pbSrc == NULL || This->acmStreamHdr.dwSrcUser < size) { if (This->acmStreamHdr.pbSrc == NULL) - This->acmStreamHdr.pbSrc = GlobalAllocPtr(GMEM_MOVEABLE, size); + This->acmStreamHdr.pbSrc = GlobalLock(GlobalAlloc(GMEM_MOVEABLE, size)); else - This->acmStreamHdr.pbSrc = GlobalReAllocPtr(This->acmStreamHdr.pbSrc, + { + GlobalUnlock(GlobalHandle(This->acmStreamHdr.pbSrc)); + This->acmStreamHdr.pbDst = GlobalReAlloc(GlobalHandle(This->acmStreamHdr.pbSrc), size, GMEM_MOVEABLE); + } if (This->acmStreamHdr.pbSrc == NULL) return AVIERR_MEMORY; This->acmStreamHdr.dwSrcUser = size; @@ -567,7 +574,8 @@ static HRESULT WINAPI ACMStream_fnWrite( /* Need to free source buffer used for reading? */ if (This->acmStreamHdr.pbSrc != NULL) { - GlobalFreePtr(This->acmStreamHdr.pbSrc); + GlobalUnlock(GlobalHandle(This->acmStreamHdr.pbSrc)); + GlobalFree(GlobalHandle(This->acmStreamHdr.pbSrc)); This->acmStreamHdr.pbSrc = NULL; This->acmStreamHdr.dwSrcUser = 0; } @@ -576,10 +584,13 @@ static HRESULT WINAPI ACMStream_fnWrite( if (This->acmStreamHdr.pbDst == NULL || This->acmStreamHdr.dwDstUser < size) { if (This->acmStreamHdr.pbDst == NULL) - This->acmStreamHdr.pbDst = GlobalAllocPtr(GMEM_MOVEABLE, size); + This->acmStreamHdr.pbDst = GlobalLock(GlobalAlloc(GMEM_MOVEABLE, size)); else - This->acmStreamHdr.pbDst = GlobalReAllocPtr(This->acmStreamHdr.pbDst, + { + GlobalUnlock(GlobalHandle(This->acmStreamHdr.pbDst)); + This->acmStreamHdr.pbDst = GlobalReAlloc(GlobalHandle(This->acmStreamHdr.pbDst), size, GMEM_MOVEABLE); + } if (This->acmStreamHdr.pbDst == NULL) return AVIERR_MEMORY; This->acmStreamHdr.dwDstUser = size; @@ -703,7 +714,7 @@ static HRESULT AVIFILE_OpenCompressor(IA hr = AVIStreamFormatSize(This->pStream, This->sInfo.dwStart, &This->cbInFormat); if (FAILED(hr)) return hr; - This->lpInFormat = (LPWAVEFORMATEX)GlobalAllocPtr(GMEM_MOVEABLE, This->cbInFormat); + This->lpInFormat = GlobalLock(GlobalAlloc(GMEM_MOVEABLE, This->cbInFormat)); if (This->lpInFormat == NULL) return AVIERR_MEMORY; @@ -715,7 +726,7 @@ static HRESULT AVIFILE_OpenCompressor(IA if (This->lpOutFormat == NULL) { /* we must decode to default format */ This->cbOutFormat = sizeof(PCMWAVEFORMAT); - This->lpOutFormat = (LPWAVEFORMATEX)GlobalAllocPtr(GHND, This->cbOutFormat); + This->lpOutFormat = GlobalLock(GlobalAlloc(GHND, This->cbOutFormat)); if (This->lpOutFormat == NULL) return AVIERR_MEMORY;

1 0

Juan Lang : crypt32: Move serialization functions to serialize.c.
by Alexandre Julliard 04 Mar '06

04 Mar '06

Module: wine Branch: refs/heads/master Commit: c3a125179d98329c35c1027e603fd6c3fd4a8be6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c3a125179d98329c35c1027… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Fri Mar 3 10:48:52 2006 -0800 crypt32: Move serialization functions to serialize.c. --- dlls/crypt32/Makefile.in | 1 dlls/crypt32/crypt32_private.h | 14 + dlls/crypt32/serialize.c | 515 ++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/store.c | 434 ---------------------------------- 4 files changed, 530 insertions(+), 434 deletions(-) create mode 100644 dlls/crypt32/serialize.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=c3a125179d98329c35c…

1 0

Christian Gmeiner : mlang: Implement DllCanUnloadNow.
by Alexandre Julliard 04 Mar '06

04 Mar '06

Module: wine Branch: refs/heads/master Commit: ad4af1264fff1c949578a5fdd65a2e7bfa6544e1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ad4af1264fff1c949578a5f… Author: Christian Gmeiner <christian.gmeiner(a)students.fh-vorarlberg.ac.at> Date: Fri Mar 3 10:04:08 2006 +0100 mlang: Implement DllCanUnloadNow. --- dlls/mlang/mlang.c | 28 ++++++++++++++++++++++++---- 1 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index f2f759c..e339b02 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -453,6 +453,21 @@ static const struct mlang_data static void fill_cp_info(const struct mlang_data *ml_data, UINT index, MIMECPINFO *mime_cp_info); +static LONG dll_count; + +/* + * Dll lifetime tracking declaration + */ +static void LockModule(void) +{ + InterlockedIncrement(&dll_count); +} + +static void UnlockModule(void) +{ + InterlockedDecrement(&dll_count); +} + BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { switch(fdwReason) { @@ -735,8 +750,11 @@ static HRESULT WINAPI MLANGCF_CreateInst static HRESULT WINAPI MLANGCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; - FIXME("(%p)->(%d),stub!\n",This,dolock); + if (dolock) + LockModule(); + else + UnlockModule(); + return S_OK; } @@ -2281,6 +2299,9 @@ static HRESULT MultiLanguage_create(IUnk mlang->ref = 1; *ppObj = (LPVOID) mlang; TRACE("returning %p\n", mlang); + + LockModule(); + return S_OK; } @@ -2288,8 +2309,7 @@ static HRESULT MultiLanguage_create(IUnk HRESULT WINAPI DllCanUnloadNow(void) { - FIXME("\n"); - return S_FALSE; + return dll_count == 0 ? S_OK : S_FALSE; } HRESULT WINAPI GetGlobalFontLinkObject(void)

1 0

lostwages/include winehq.conf
by Jeremy Newman 03 Mar '06

03 Mar '06

ChangeSet ID: 23384 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/03/03 12:47:58 Modified files: include : winehq.conf Log message: update snapsot date to 0.9.9 Patch: http://cvs.winehq.org/patch.py?id=23384 Old revision New revision Changes Path 1.32 1.33 +1 -1 lostwages/include/winehq.conf Index: lostwages/include/winehq.conf diff -u -p lostwages/include/winehq.conf:1.32 lostwages/include/winehq.conf:1.33 --- lostwages/include/winehq.conf:1.32 3 Mar 2006 18:47:58 -0000 +++ lostwages/include/winehq.conf 3 Mar 2006 18:47:58 -0000 @@ -29,7 +29,7 @@ news_xml_path: news wwn_xml_path: wwn # Snapshot Date -snapshot_date: 0.9.8 +snapshot_date: 0.9.9 # Current RH Packages Snapshot Date snapshot_date_rh: 0.9.2

1 0

lostwages/news 2006030301.xml
by Jeremy Newman 03 Mar '06

03 Mar '06

ChangeSet ID: 23383 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/03/03 12:47:13 Added files: news : 2006030301.xml Log message: news about 0.9.9 Patch: http://cvs.winehq.org/patch.py?id=23383 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/news/2006030301.xml Index: lostwages/news/2006030301.xml diff -u -p /dev/null lostwages/news/2006030301.xml:1.1 --- /dev/null 3 Mar 2006 18:47:13 -0000 +++ lostwages/news/2006030301.xml 3 Mar 2006 18:47:13 -0000 @@ -0,0 +1,27 @@ +<news> + <date>March 3, 2006</date> + <title>Wine 0.9.9 Released</title> + <body> +<p> +Wine 0.9.9 was released yesterday. Quite a few major additions appeared +in this release, including: +<ul> + <li> + <li> Many new features and improvements in Richedit.</li> + <li> More Web browser support.</li> + <li> Recursive directory change notifications.</li> + <li> Wine installation is now fully relocatable.</li> + <li> Direct3D 8 and 9 now use the same code.</li> + <li> Many debugger improvements.</li> + <li> Systray is now handled by the explorer process.</li> +</ul> +<p> + Binary packages are in the process of being built, but the source is + <a href="http://prdownloads.sourceforge.net/wine/wine-0.9.9.tar.bz2">available + now</a>. You can find out more about this release in the + <a href="?announce=1.113">announcement</a>. Check out our + <a href="/site/download">download page</a> for packages for your favorite + distribution. +</p> + </body> +</news>

1 0

lostwages/templates/en/wineconf survey06.templ ...
by Jeremy Newman 03 Mar '06

03 Mar '06

ChangeSet ID: 23382 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/03/03 10:44:36 Added files: templates/en/wineconf: survey06.template survey06_done.template survey06_form.template Log message: adding survey for 2006 WineConf Patch: http://cvs.winehq.org/patch.py?id=23382 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/templates/en/wineconf/survey06.template Added 1.1 +0 -0 lostwages/templates/en/wineconf/survey06_done.template Added 1.1 +0 -0 lostwages/templates/en/wineconf/survey06_form.template Index: lostwages/templates/en/wineconf/survey06.template diff -u -p /dev/null lostwages/templates/en/wineconf/survey06.template:1.1 --- /dev/null 3 Mar 2006 16:44:36 -0000 +++ lostwages/templates/en/wineconf/survey06.template 3 Mar 2006 16:44:36 -0000 @@ -0,0 +1,11 @@ + + +<table width="100%"><tr><td><img src="{$root}/images/wineconf/wc06_logo.jpg" width="300" height="152" alt="-LOGO-"></td> +<td align="right"><center><FONT size="+2"><b>Date: Undecided<br /> +Place: Undecided</b></font></center></td></tr></table> + +<hr /> + + + +<p> </p> Index: lostwages/templates/en/wineconf/survey06_done.template diff -u -p /dev/null lostwages/templates/en/wineconf/survey06_done.template:1.1 --- /dev/null 3 Mar 2006 16:44:36 -0000 +++ lostwages/templates/en/wineconf/survey06_done.template 3 Mar 2006 16:44:36 -0000 @@ -0,0 +1,5 @@ +<h3>Thanks!</h3> + +<p>Your answers will help us decide where and when WineConf 2006 will happen.</p> + +<p> </p> Index: lostwages/templates/en/wineconf/survey06_form.template diff -u -p /dev/null lostwages/templates/en/wineconf/survey06_form.template:1.1 --- /dev/null 3 Mar 2006 16:44:36 -0000 +++ lostwages/templates/en/wineconf/survey06_form.template 3 Mar 2006 16:44:36 -0000 @@ -0,0 +1,63 @@ +{$error} + +<p>We'd like your input as we plan Wineconf this year.</p> + +<p>Please only answer this if you are planning to come +(or would come if the answers you give here are +respected).</p> + +<form name="survey06" action="{$self}" method="post"> + +<table cellpadding="5"> + +<tr valign="top"> + <th>Name:</th> + <td><input type="text" name="q[name]" size="40" value="{$name}" /></td> +</tr> + +<tr valign="top"> + <th>Email:</th> + <td><input type="text" name="q[email]" size="40" value="{$email}" /></td> +</tr> + +<tr valign="top"> + <th>Day of Week:</th> + <td> + <input type="radio" name="q[day]" value="weekdays" />Weekdays<br /> + <input type="radio" name="q[day]" value="fri-sat" />Friday - Saturday<br /> + <input type="radio" name="q[day]" value="sat-sun" />Saturday - Sunday<br /> + </td> +</tr> + +<tr valign="top"> + <th>Date:</th> + <td> + <input type="checkbox" name="q[date][]" value="05-13-2006" />May 13th, 2006<br /> + <input type="checkbox" name="q[date][]" value="07-29-2006" />July 29th, 2006<br /> + <input type="checkbox" name="q[date][]" value="09-16-2006" />September 16th, 2006<br /> + <span class="small">(check all dates you can make)</span> + </td> +</tr> + +<tr valign="top"> + <th>Location:</th> + <td> + <input type="radio" name="q[place]" value="UK" />United Kingdom<br /> + <input type="radio" name="q[place]" value="DE" />Try to see if Stuttgart would have us again<br /> + <input type="radio" name="q[place]" value="MN" />Go back to St. Paul when it's warm<br /> + <input type="radio" name="q[place]" value="OTHER" /> Other (put in comments) + </td> +</tr> + +<tr valign="top"> + <th>Comments:</th> + <td><textarea name="q[comment]" rows="5" cols="40">{$comment}</textarea></td> +</tr> + +</table> + +<p><input type="submit" name="submit" value=" Submit Survey " class="button" /></p> + +<input type="hidden" name="fields" value="name|email|day|date|place|comment" /> + +</form>

1 0

lostwages/include/plugins register.php
by Jeremy Newman 03 Mar '06

03 Mar '06

ChangeSet ID: 23381 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/03/03 10:41:46 Modified files: include/plugins: register.php Log message: added support for checkbox answers (array) Patch: http://cvs.winehq.org/patch.py?id=23381 Old revision New revision Changes Path 1.3 1.4 +8 -1 lostwages/include/plugins/register.php Index: lostwages/include/plugins/register.php diff -u -p lostwages/include/plugins/register.php:1.3 lostwages/include/plugins/register.php:1.4 --- lostwages/include/plugins/register.php:1.3 3 Mar 2006 16:41:46 -0000 +++ lostwages/include/plugins/register.php 3 Mar 2006 16:41:46 -0000 @@ -43,7 +43,14 @@ else if ($_POST['submit']) $fh = fopen($db_file, 'a'); foreach ($fields as $field) { - fwrite($fh, preg_replace("/[\t\r\n]+/", " ", stripslashes($_POST['q'][$field]))); + if (is_array($_POST['q'][$field])) + { + fwrite($fh, preg_replace("/[\t\r\n]+/", " ", join(", ", $_POST['q'][$field]))); + } + else + { + fwrite($fh, preg_replace("/[\t\r\n]+/", " ", stripslashes($_POST['q'][$field]))); + } fwrite($fh, "\t"); } fwrite($fh, "\n");

1 0

lostwages/images/wineconf wc06_logo.jpg
by Jeremy Newman 03 Mar '06

03 Mar '06

ChangeSet ID: 23380 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/03/03 10:32:04 Added files: images/wineconf: wc06_logo.jpg Log message: adding logo for 2006 Patch: http://cvs.winehq.org/patch.py?id=23380 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/images/wineconf/wc06_logo.jpg

1 0

lostwages/templates/en/wineconf rsvp_form.template
by Jeremy Newman 03 Mar '06

03 Mar '06

ChangeSet ID: 23379 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/03/03 10:31:36 Modified files: templates/en/wineconf: rsvp_form.template Log message: update for changes to plugin (field names) Patch: http://cvs.winehq.org/patch.py?id=23379 Old revision New revision Changes Path 1.1 1.2 +2 -0 lostwages/templates/en/wineconf/rsvp_form.template Index: lostwages/templates/en/wineconf/rsvp_form.template diff -u -p lostwages/templates/en/wineconf/rsvp_form.template:1.1 lostwages/templates/en/wineconf/rsvp_form.template:1.2 --- lostwages/templates/en/wineconf/rsvp_form.template:1.1 3 Mar 2006 16:31:36 -0000 +++ lostwages/templates/en/wineconf/rsvp_form.template 3 Mar 2006 16:31:36 -0000 @@ -25,4 +25,6 @@ <p><input type="submit" name="submit" value=" Submit RSVP " class="button" /></p> +<input type="hidden" name="fields" value="name|email|comment" /> + </form>

1 0

lostwages/include/plugins register.php
by Jeremy Newman 03 Mar '06

03 Mar '06

ChangeSet ID: 23378 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/03/03 10:31:12 Modified files: include/plugins: register.php Log message: get the field names from the form Patch: http://cvs.winehq.org/patch.py?id=23378 Old revision New revision Changes Path 1.2 1.3 +8 -5 lostwages/include/plugins/register.php Index: lostwages/include/plugins/register.php diff -u -p lostwages/include/plugins/register.php:1.2 lostwages/include/plugins/register.php:1.3 --- lostwages/include/plugins/register.php:1.2 3 Mar 2006 16:31:12 -0000 +++ lostwages/include/plugins/register.php 3 Mar 2006 16:31:12 -0000 @@ -21,6 +21,9 @@ if (isset($_GET['done'])) } else if ($_POST['submit']) { + // fields + $fields = preg_split('/\|/', $_POST['fields']); + // check vars if (!$_POST['q']['name'] or !$_POST['q']['email'] or !preg_match("/\@/", $_POST['q']['email'])) { @@ -38,11 +41,11 @@ else if ($_POST['submit']) if (file_exists($db_file)) { $fh = fopen($db_file, 'a'); - fwrite($fh, preg_replace("/[\t\r\n]+/", " ", stripslashes($_POST['q']['name']))); - fwrite($fh, "\t"); - fwrite($fh, preg_replace("/[\t\r\n]+/", " ", stripslashes($_POST['q']['email']))); - fwrite($fh, "\t"); - fwrite($fh, preg_replace("/[\t\r\n]+/", " ", stripslashes($_POST['q']['comment']))); + foreach ($fields as $field) + { + fwrite($fh, preg_replace("/[\t\r\n]+/", " ", stripslashes($_POST['q'][$field]))); + fwrite($fh, "\t"); + } fwrite($fh, "\n"); fclose($fh);

1 0

Huw Davies : gdi: Better support for 1bpp dib sections.
by Alexandre Julliard 03 Mar '06

03 Mar '06

Module: wine Branch: refs/heads/master Commit: b55746ab62739fc1e4c0d4a15484e0e8337bab75 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b55746ab62739fc1e4c0d4a… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 2 12:13:28 2006 +0000 gdi: Better support for 1bpp dib sections. --- dlls/gdi/tests/bitmap.c | 216 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/x11drv/dib.c | 52 +++++++++-- dlls/x11drv/palette.c | 28 +++++- dlls/x11drv/x11drv.h | 3 - 4 files changed, 281 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=b55746ab62739fc1e4c…

1 0

Mike McCormack : regedit: Fix some gcc 4. 1 warnings caused by casts in macros.
by Alexandre Julliard 03 Mar '06

03 Mar '06

Module: wine Branch: refs/heads/master Commit: d8bc6879be40cbce91f5aa3ffd729a7308bbf6fa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d8bc6879be40cbce91f5aa3… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Mar 3 12:28:43 2006 +0900 regedit: Fix some gcc 4.1 warnings caused by casts in macros. --- programs/regedit/childwnd.c | 2 +- programs/regedit/framewnd.c | 6 +++--- programs/regedit/listview.c | 15 +++++++-------- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index f6f0042..bc312ba 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -320,7 +320,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, item.mask = TVIF_HANDLE | TVIF_TEXT; item.hItem = TreeView_GetSelection(pChildWnd->hTreeWnd); item.pszText = dispInfo->item.pszText; - TreeView_SetItem(pChildWnd->hTreeWnd, &item); + SendMessage( pChildWnd->hTreeWnd, TVM_SETITEMW, 0, (LPARAM)&item ); } return res; } diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 241286c..fbe9646 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -640,8 +640,8 @@ static BOOL _CmdWndProc(HWND hWnd, UINT DWORD ksize = KEY_MAX_LEN, vsize = sizeof(valuebuf), type = 0; if (RegEnumValue(hKey, LOWORD(wParam) - ID_FAVORITE_FIRST, namebuf, &ksize, NULL, &type, valuebuf, &vsize) == ERROR_SUCCESS) { - TreeView_SelectItem(g_pChildWnd->hTreeWnd, - FindPathInTree(g_pChildWnd->hTreeWnd, (TCHAR *)valuebuf)); + SendMessage( g_pChildWnd->hTreeWnd, TVM_SELECTITEM, TVGN_CARET, + (LPARAM) FindPathInTree(g_pChildWnd->hTreeWnd, (TCHAR *)valuebuf) ); } RegCloseKey(hKey); } @@ -693,7 +693,7 @@ static BOOL _CmdWndProc(HWND hWnd, UINT hItem = FindNext(g_pChildWnd->hTreeWnd, hItem, searchString, searchMask, &row); SetCursor(hcursorOld); if (hItem) { - TreeView_SelectItem(g_pChildWnd->hTreeWnd, hItem); + SendMessage( g_pChildWnd->hTreeWnd, TVM_SELECTITEM, TVGN_CARET, (LPARAM) hItem ); InvalidateRect(g_pChildWnd->hTreeWnd, NULL, TRUE); UpdateWindow(g_pChildWnd->hTreeWnd); if (row != -1) { diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index 5cc8002..2e06508 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -19,7 +19,6 @@ */ #include <windows.h> -#include <windowsx.h> #include <commctrl.h> #include <stdlib.h> #include <tchar.h> @@ -218,7 +217,7 @@ static BOOL InitListViewImageList(HWND h IMAGE_ICON, cx, cy, LR_DEFAULTCOLOR); Image_Binary = ImageList_AddIcon(himl, hicon); - ListView_SetImageList(hWndListView, himl, LVSIL_SMALL); + SendMessage( hWndListView, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM) himl ); /* fail if some of the icons failed to load */ if (ImageList_GetImageCount(himl) < 2) @@ -373,7 +372,7 @@ static LRESULT CALLBACK ListWndProc(HWND g_invertSort = FALSE; } - ListView_SortItems(hWnd, CompareFunc, hWnd); + SendMessage(hWnd, LVM_SORTITEMS, (WPARAM)hWnd, (LPARAM)CompareFunc); break; case LVN_ENDLABELEDIT: { LPNMLVDISPINFO dispInfo = (LPNMLVDISPINFO)lParam; @@ -453,12 +452,12 @@ HWND CreateListView(HWND hwndParent, int 0, 0, rcClient.right, rcClient.bottom, hwndParent, (HMENU)id, hInst, NULL); if (!hwndLV) return NULL; - ListView_SetExtendedListViewStyle(hwndLV, LVS_EX_FULLROWSELECT); + SendMessage(hwndLV, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_FULLROWSELECT); /* Initialize the image list */ if (!InitListViewImageList(hwndLV)) goto fail; if (!CreateListColumns(hwndLV)) goto fail; - g_orgListWndProc = SubclassWindow(hwndLV, ListWndProc); + g_orgListWndProc = (WNDPROC) SetWindowLongPtr(hwndLV, GWLP_WNDPROC, (LPARAM)ListWndProc); return hwndLV; fail: DestroyWindow(hwndLV); @@ -490,12 +489,12 @@ BOOL RefreshListView(HWND hwndLV, HKEY h for (i = 0; i < count; i++) { item.mask = LVIF_PARAM; item.iItem = i; - ListView_GetItem(hwndLV, &item); + SendMessage( hwndLV, LVM_GETITEM, 0, (LPARAM)&item ); free(((LINE_INFO*)item.lParam)->name); HeapFree(GetProcessHeap(), 0, (void*)item.lParam); } g_columnToSort = ~0UL; - ListView_DeleteAllItems(hwndLV); + SendMessage( hwndLV, LVM_DELETEALLITEMS, 0, 0L ); /* get size information and resize the buffers if necessary */ errCode = RegQueryInfoKey(hKey, NULL, NULL, NULL, NULL, &max_sub_key_len, NULL, @@ -524,7 +523,7 @@ BOOL RefreshListView(HWND hwndLV, HKEY h bSelected = TRUE; AddEntryToList(hwndLV, valName[0] ? valName : NULL, valType, valBuf, valSize, bSelected); } - ListView_SortItems(hwndLV, CompareFunc, hwndLV); + SendMessage(hwndLV, LVM_SORTITEMS, (WPARAM)hwndLV, (LPARAM)CompareFunc); g_currentRootKey = hKeyRoot; if (keyPath != g_currentPath) {

1 0

Mike McCormack : winecfg: Eliminate some gcc 4. 1 warnings caused by casts in macros.
by Alexandre Julliard 03 Mar '06

03 Mar '06

Module: wine Branch: refs/heads/master Commit: abfc9b8c272a1367f2d41494abdb0fd7b7d512a4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=abfc9b8c272a1367f2d4149… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Mar 3 12:32:00 2006 +0900 winecfg: Eliminate some gcc 4.1 warnings caused by casts in macros. --- programs/winecfg/audio.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index 07a4baf..490e05a 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -205,7 +205,7 @@ static void initAudioDeviceTree(HWND hDl hBitMap = LoadBitmap(GetModuleHandle(NULL), MAKEINTRESOURCE(IDB_CHECKBOX)); ImageList_Add(hImageList, hBitMap, NULL); DeleteObject(hBitMap); - TreeView_SetImageList(tree, hImageList, TVSIL_STATE); + SendMessageW( tree, LVM_SETIMAGELIST, TVSIL_STATE, (LPARAM)hImageList ); /* root item */ insert.hParent = TVI_ROOT; @@ -702,14 +702,14 @@ AudioDlgProc (HWND hDlg, UINT uMsg, WPAR ht.pt.x = GET_X_LPARAM(dwPos); ht.pt.y = GET_Y_LPARAM(dwPos); MapWindowPoints(HWND_DESKTOP, tree, &ht.pt, 1); - TreeView_HitTest(tree, &ht); + SendMessageW( tree, TVM_HITTEST, 0, (LPARAM)&ht ); if (TVHT_ONITEMSTATEICON & ht.flags) { TVITEM tvItem; int index; ZeroMemory(&tvItem, sizeof(tvItem)); tvItem.hItem = ht.hItem; - TreeView_GetItem(tree, &tvItem); + SendMessageW( tree, TVM_GETITEMW, 0, (LPARAM) &tvItem ); index = TreeView_GetItemState(tree, ht.hItem, TVIS_STATEIMAGEMASK); if (index == INDEXTOSTATEIMAGEMASK(1)) @@ -739,7 +739,7 @@ AudioDlgProc (HWND hDlg, UINT uMsg, WPAR pt.y = GET_Y_LPARAM(dwPos); ht.pt = pt; MapWindowPoints(HWND_DESKTOP, tree, &ht.pt, 1); - TreeView_HitTest(tree, &ht); + SendMessageW( tree, TVM_HITTEST, 0, (LPARAM)&ht ); if (TVHT_ONITEMLABEL & ht.flags) { TVITEM tvItem;

1 0

Mike McCormack : shell32: Fix some gcc 4. 1 warnings caused by casts in macros.
by Alexandre Julliard 03 Mar '06

03 Mar '06

Module: wine Branch: refs/heads/master Commit: 959edd5cc491e29e1d451d18e439389e52ec944a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=959edd5cc491e29e1d451d1… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Mar 3 12:28:14 2006 +0900 shell32: Fix some gcc 4.1 warnings caused by casts in macros. --- dlls/shell32/brsfolder.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index aba8e23..6d5afe1 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -108,7 +108,7 @@ static void InitializeTreeView( browse_i Shell_GetImageList(NULL, &hImageList); if (hImageList) - TreeView_SetImageList( info->hwndTreeView, hImageList, 0 ); + SendMessageW( info->hwndTreeView, TVM_SETIMAGELIST, 0, (LPARAM)hImageList ); /* We want to call InsertTreeViewItem down the code, in order to insert * the root item of the treeview. Due to InsertTreeViewItem's signature, @@ -166,10 +166,10 @@ static void InitializeTreeView( browse_i return; } - TreeView_DeleteAllItems( info->hwndTreeView ); + SendMessageW( info->hwndTreeView, TVM_DELETEITEM, 0, (LPARAM)TVI_ROOT ); item = InsertTreeViewItem( info, lpsfParent, pidlChild, pidlParent, pEnumChildren, TVI_ROOT ); - TreeView_Expand( info->hwndTreeView, item, TVE_EXPAND ); + SendMessageW( info->hwndTreeView, TVM_EXPAND, TVE_EXPAND, (LPARAM)item ); IShellFolder_Release(lpsfRoot); IShellFolder_Release(lpsfParent); @@ -440,7 +440,8 @@ static LRESULT BrsFolder_Treeview_Expand /* My Computer is already sorted and trying to do a simple text * sort will only mess things up */ if (!_ILIsMyComputer(lptvid->lpi)) - TreeView_SortChildren(info->hwndTreeView, pnmtv->itemNew.hItem, FALSE); + SendMessageW( info->hwndTreeView, TVM_SORTCHILDREN, + FALSE, (LPARAM)pnmtv->itemNew.hItem ); return 0; }

1 0

Mike McCormack : msrle32: Fix some gcc 4. 1 warnings caused by casts in windowsx.h macros.
by Alexandre Julliard 03 Mar '06

03 Mar '06

Module: wine Branch: refs/heads/master Commit: 29c3a54339f2041169cf3831b6829b3dad4bd3da URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=29c3a54339f2041169cf383… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Mar 3 12:26:36 2006 +0900 msrle32: Fix some gcc 4.1 warnings caused by casts in windowsx.h macros. --- dlls/msrle32/msrle32.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index 3fb6c62..6f44048 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -27,7 +27,6 @@ #include "winnls.h" #include "winuser.h" -#include "windowsx.h" #include "wine/debug.h" @@ -1387,10 +1386,10 @@ static LRESULT CompressBegin(CodecInfo * CompressEnd(pi); size = WIDTHBYTES(lpbiOut->biWidth * 16) / 2 * lpbiOut->biHeight; - pi->pPrevFrame = (LPWORD)GlobalAllocPtr(GPTR, size * sizeof(WORD)); + pi->pPrevFrame = GlobalLock(GlobalAlloc(GPTR, size * sizeof(WORD))); if (pi->pPrevFrame == NULL) return ICERR_MEMORY; - pi->pCurFrame = (LPWORD)GlobalAllocPtr(GPTR, size * sizeof(WORD)); + pi->pCurFrame = GlobalLock(GlobalAlloc(GPTR, size * sizeof(WORD))); if (pi->pCurFrame == NULL) { CompressEnd(pi); return ICERR_MEMORY; @@ -1534,9 +1533,15 @@ static LRESULT CompressEnd(CodecInfo *pi if (pi != NULL) { if (pi->pPrevFrame != NULL) - GlobalFreePtr(pi->pPrevFrame); + { + GlobalUnlock(GlobalHandle(pi->pPrevFrame)); + GlobalFree(GlobalHandle(pi->pPrevFrame)); + } if (pi->pCurFrame != NULL) - GlobalFreePtr(pi->pCurFrame); + { + GlobalUnlock(GlobalHandle(pi->pCurFrame)); + GlobalFree(GlobalHandle(pi->pCurFrame)); + } pi->pPrevFrame = NULL; pi->pCurFrame = NULL; pi->nPrevFrame = -1;

1 0

Mike McCormack : hhctrl.ocx: Fix a gcc 4. 1 warning caused by a cast in a macro.
by Alexandre Julliard 03 Mar '06

03 Mar '06

Module: wine Branch: refs/heads/master Commit: 1006cfc8dff4677c6c96792cc30bd88e63a5ed73 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1006cfc8dff4677c6c96792… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Mar 3 12:26:00 2006 +0900 hhctrl.ocx: Fix a gcc 4.1 warning caused by a cast in a macro. --- dlls/hhctrl.ocx/help.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index b60e83d..aa3d61f 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -492,7 +492,7 @@ static void NP_CreateTab(HINSTANCE hInst tie.mask = TCIF_TEXT; tie.pszText = tabText; - TabCtrl_InsertItemW(hwndTabCtrl, dwIndex, &tie); + SendMessageW( hwndTabCtrl, TCM_INSERTITEMW, dwIndex, (LPARAM)&tie ); HeapFree(GetProcessHeap(), 0, tabText); }

1 0

Mike McCormack : comctl32: Fix some gcc 4.1 warnings caused by windowsx. h macros.
by Alexandre Julliard 03 Mar '06

03 Mar '06

Module: wine Branch: refs/heads/master Commit: 2dfe50aa3f91888fd1ac14731229e475a3545248 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2dfe50aa3f91888fd1ac147… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Mar 3 12:25:36 2006 +0900 comctl32: Fix some gcc 4.1 warnings caused by windowsx.h macros. --- dlls/comctl32/listview.c | 12 ++++++------ dlls/comctl32/pager.c | 11 +++++------ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index f51b34d..9210e8d 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -5819,7 +5819,7 @@ static INT LISTVIEW_GetNextItem(LISTVIEW } lvFindInfo.flags = LVFI_NEARESTXY; lvFindInfo.vkDirection = VK_UP; - ListView_GetItemPosition(infoPtr->hwndSelf, nItem, &lvFindInfo.pt); + SendMessageW( infoPtr->hwndSelf, LVM_GETITEMPOSITION, nItem, (LPARAM)&lvFindInfo.pt ); while ((nItem = ListView_FindItemW(infoPtr->hwndSelf, nItem, &lvFindInfo)) != -1) { if ((ListView_GetItemState(infoPtr->hwndSelf, nItem, uMask) & uMask) == uMask) @@ -5854,7 +5854,7 @@ static INT LISTVIEW_GetNextItem(LISTVIEW } lvFindInfo.flags = LVFI_NEARESTXY; lvFindInfo.vkDirection = VK_DOWN; - ListView_GetItemPosition(infoPtr->hwndSelf, nItem, &lvFindInfo.pt); + SendMessageW( infoPtr->hwndSelf, LVM_GETITEMPOSITION, nItem, (LPARAM)&lvFindInfo.pt ); while ((nItem = ListView_FindItemW(infoPtr->hwndSelf, nItem, &lvFindInfo)) != -1) { if ((LISTVIEW_GetItemState(infoPtr, nItem, uMask) & uMask) == uMask) @@ -5890,7 +5890,7 @@ static INT LISTVIEW_GetNextItem(LISTVIEW } lvFindInfo.flags = LVFI_NEARESTXY; lvFindInfo.vkDirection = VK_LEFT; - ListView_GetItemPosition(infoPtr->hwndSelf, nItem, &lvFindInfo.pt); + SendMessageW( infoPtr->hwndSelf, LVM_GETITEMPOSITION, nItem, (LPARAM)&lvFindInfo.pt ); while ((nItem = ListView_FindItemW(infoPtr->hwndSelf, nItem, &lvFindInfo)) != -1) { if ((ListView_GetItemState(infoPtr->hwndSelf, nItem, uMask) & uMask) == uMask) @@ -5926,7 +5926,7 @@ static INT LISTVIEW_GetNextItem(LISTVIEW } lvFindInfo.flags = LVFI_NEARESTXY; lvFindInfo.vkDirection = VK_RIGHT; - ListView_GetItemPosition(infoPtr->hwndSelf, nItem, &lvFindInfo.pt); + SendMessageW( infoPtr->hwndSelf, LVM_GETITEMPOSITION, nItem, (LPARAM)&lvFindInfo.pt ); while ((nItem = ListView_FindItemW(infoPtr->hwndSelf, nItem, &lvFindInfo)) != -1) { if ((LISTVIEW_GetItemState(infoPtr, nItem, uMask) & uMask) == uMask) @@ -8907,7 +8907,7 @@ static void LISTVIEW_UpdateSize(LISTVIEW hl.prc = &infoPtr->rcList; hl.pwpos = &wp; - Header_Layout(infoPtr->hwndHeader, &hl); + SendMessageW( infoPtr->hwndHeader, HDM_LAYOUT, 0, (LPARAM)&hl ); SetWindowPos(wp.hwnd, wp.hwndInsertAfter, wp.x, wp.y, wp.cx, wp.cy, wp.flags); @@ -8985,7 +8985,7 @@ static INT LISTVIEW_StyleChanged(LISTVIE hl.prc = &infoPtr->rcList; hl.pwpos = &wp; - Header_Layout(infoPtr->hwndHeader, &hl); + SendMessageW( infoPtr->hwndHeader, HDM_LAYOUT, 0, (LPARAM)&hl ); SetWindowPos(infoPtr->hwndHeader, infoPtr->hwndSelf, wp.x, wp.y, wp.cx, wp.cy, wp.flags); } diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index cd25159..15e0e09 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -59,7 +59,6 @@ #include "wingdi.h" #include "winuser.h" #include "winnls.h" -#include "windowsx.h" #include "commctrl.h" #include "comctl32.h" #include "wine/debug.h" @@ -1315,7 +1314,7 @@ PAGER_WindowProc (HWND hwnd, UINT uMsg, return PAGER_Destroy (infoPtr); case WM_SIZE: - return PAGER_Size (infoPtr, (INT)wParam, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)); + return PAGER_Size (infoPtr, (INT)wParam, (short)LOWORD(lParam), (short)HIWORD(lParam)); case WM_NCPAINT: return PAGER_NCPaint (infoPtr, (HRGN)wParam); @@ -1330,18 +1329,18 @@ PAGER_WindowProc (HWND hwnd, UINT uMsg, return PAGER_NCCalcSize (infoPtr, wParam, (LPRECT)lParam); case WM_NCHITTEST: - return PAGER_NCHitTest (infoPtr, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)); + return PAGER_NCHitTest (infoPtr, (short)LOWORD(lParam), (short)HIWORD(lParam)); case WM_MOUSEMOVE: if (infoPtr->bForward && infoPtr->hwndChild) PostMessageW(infoPtr->hwndChild, WM_MOUSEMOVE, wParam, lParam); - return PAGER_MouseMove (infoPtr, (INT)wParam, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)); + return PAGER_MouseMove (infoPtr, (INT)wParam, (short)LOWORD(lParam), (short)HIWORD(lParam)); case WM_LBUTTONDOWN: - return PAGER_LButtonDown (infoPtr, (INT)wParam, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)); + return PAGER_LButtonDown (infoPtr, (INT)wParam, (short)LOWORD(lParam), (short)HIWORD(lParam)); case WM_LBUTTONUP: - return PAGER_LButtonUp (infoPtr, (INT)wParam, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)); + return PAGER_LButtonUp (infoPtr, (INT)wParam, (short)LOWORD(lParam), (short)HIWORD(lParam)); case WM_ERASEBKGND: return PAGER_EraseBackground (infoPtr, (HDC)wParam);

1 0

Juan Lang : crypt32: Implement CertDuplicateStore.
by Alexandre Julliard 03 Mar '06

03 Mar '06

Module: wine Branch: refs/heads/master Commit: 8949d29de2c31ce4839d3ae4d9588b2fb0320406 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8949d29de2c31ce4839d3ae… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Thu Mar 2 06:55:45 2006 -0800 crypt32: Implement CertDuplicateStore. --- dlls/crypt32/crypt32.spec | 2 +- dlls/crypt32/store.c | 10 ++++++++++ include/wincrypt.h | 2 ++ 3 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index abeff35..7d40394 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -26,7 +26,7 @@ @ stub CertDuplicateCRLContext @ stub CertDuplicateCTLContext @ stdcall CertDuplicateCertificateContext(ptr) -@ stub CertDuplicateStore +@ stdcall CertDuplicateStore(ptr) @ stub CertEnumCRLContextProperties @ stdcall CertEnumCRLsInStore(ptr ptr) @ stub CertEnumCTLContextProperties diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 47e595c..b8a3d0f 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -2626,6 +2626,16 @@ PCCTL_CONTEXT WINAPI CertEnumCTLsInStore return NULL; } +HCERTSTORE WINAPI CertDuplicateStore(HCERTSTORE hCertStore) +{ + WINECRYPT_CERTSTORE *hcs = (WINECRYPT_CERTSTORE *)hCertStore; + + TRACE("(%p)\n", hCertStore); + + if (hcs && hcs->dwMagic == WINE_CRYPTCERTSTORE_MAGIC) + InterlockedIncrement(&hcs->ref); + return hCertStore; +} BOOL WINAPI CertCloseStore(HCERTSTORE hCertStore, DWORD dwFlags) { diff --git a/include/wincrypt.h b/include/wincrypt.h index 678f466..9784223 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -2605,6 +2605,8 @@ BOOL WINAPI CertSetStoreProperty(HCERTST BOOL WINAPI CertControlStore(HCERTSTORE hCertStore, DWORD dwFlags, DWORD dwCtrlType, void const *pvCtrlPara); +HCERTSTORE WINAPI CertDuplicateStore(HCERTSTORE hCertStore); + BOOL WINAPI CertCloseStore( HCERTSTORE hCertStore, DWORD dwFlags ); BOOL WINAPI CertFreeCertificateContext( PCCERT_CONTEXT pCertContext );

1 0

Francois Gouget : d3d: Fix Validate(Pixel|Vertex)Shader() prototypes.
by Alexandre Julliard 03 Mar '06

03 Mar '06

Module: wine Branch: refs/heads/master Commit: 339a4dbd5bc7383bce9aad1898f6c951e6d5f722 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=339a4dbd5bc7383bce9aad1… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 2 19:40:33 2006 +0100 d3d: Fix Validate(Pixel|Vertex)Shader() prototypes. Fix Validate(Pixel|Vertex)Shader() prototypes so they match the spec file. Fix the stub message so it is more standard and use consistent parameter names. --- dlls/d3d8/d3d8_main.c | 8 ++++---- dlls/d3d9/d3d9_main.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index be37d41..67120ec 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -75,9 +75,9 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, * PARAMS * toto result? */ -BOOL WINAPI ValidateVertexShader(LPVOID pFunction, int foo, int bar, void *fee, int rab) +BOOL WINAPI ValidateVertexShader(LPVOID pFunction, int param1, int param2, LPVOID toto) { - FIXME("(void): stub: %p %d %d %p %d\n", pFunction, foo, bar, fee, rab); + FIXME("(%p %d %d %p): stub\n", pFunction, param1, param2, toto); return TRUE; } @@ -87,8 +87,8 @@ BOOL WINAPI ValidateVertexShader(LPVOID * PARAMS * toto result? */ -BOOL WINAPI ValidatePixelShader(LPVOID pFunction, int foo, int bar, void *fee, int rab) +BOOL WINAPI ValidatePixelShader(LPVOID pFunction, int param1, int param2, LPVOID toto) { - FIXME("(void): stub: %p %d %d %p %d\n", pFunction, foo, bar, fee, rab); + FIXME("(%p %d %d %p): stub\n", pFunction, param1, param2, toto); return TRUE; } diff --git a/dlls/d3d9/d3d9_main.c b/dlls/d3d9/d3d9_main.c index e249a32..b2b758e 100644 --- a/dlls/d3d9/d3d9_main.c +++ b/dlls/d3d9/d3d9_main.c @@ -78,7 +78,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, */ BOOL WINAPI ValidateVertexShader(LPVOID pFunction, int param1, int param2, LPVOID toto) { - FIXME("(void): stub: %p %d %d %p\n", pFunction, param1, param2, toto); + FIXME("(%p %d %d %p): stub\n", pFunction, param1, param2, toto); return TRUE; } @@ -90,6 +90,6 @@ BOOL WINAPI ValidateVertexShader(LPVOID */ BOOL WINAPI ValidatePixelShader(LPVOID pFunction, int param1, int param2, LPVOID toto) { - FIXME("(void): stub: %p %d %d %p\n", pFunction, param1, param2, toto); + FIXME("(%p %d %d %p): stub\n", pFunction, param1, param2, toto); return TRUE; }

1 0

Francois Gouget : kernel: Protect sys/resource.h include.
by Alexandre Julliard 03 Mar '06

03 Mar '06

Module: wine Branch: refs/heads/master Commit: 2f29c779d48b027773a57ff383cbc29d6bb81ccf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2f29c779d48b027773a57ff… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 2 19:37:37 2006 +0100 kernel: Protect sys/resource.h include. --- dlls/kernel/heap.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/kernel/heap.c b/dlls/kernel/heap.c index 3df7bbc..59a5e9f 100644 --- a/dlls/kernel/heap.c +++ b/dlls/kernel/heap.c @@ -44,7 +44,9 @@ /* FIXME: Unfortunately swapctl can't be used with largefile.... */ # undef _FILE_OFFSET_BITS # define _FILE_OFFSET_BITS 32 -# include <sys/resource.h> +# ifdef HAVE_SYS_RESOURCE_H +# include <sys/resource.h> +# endif # ifdef HAVE_SYS_STAT_H # include <sys/stat.h> # endif

1 0

Tag wine-0.9.9 : Alexandre Julliard : Release 0.9.9
by Alexandre Julliard 02 Mar '06

02 Mar '06

Module: wine Branch: refs/tags/wine-0.9.9 Tag: af1714c70a8e138c4200c7840bdc4913c97b7767 URL: http://source.winehq.org/git/?p=wine.git;a=tag;h=af1714c70a8e138c4200c7840b… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 2 18:16:28 2006 +0100 Release 0.9.9

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2006