wine-commits April 2008

wine-commits@winehq.org

4 participants
1278 discussions

Austin English : Spelling fixes.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 313a85f1630d2fc2f69815a6cf43e42e0c4829f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=313a85f1630d2fc2f69815a6c… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Apr 10 21:17:14 2008 -0500 Spelling fixes. --- dlls/opengl32/tests/opengl.c | 4 ++-- dlls/quartz/control.c | 2 +- dlls/quartz/filesource.c | 2 +- dlls/quartz/mpegsplit.c | 2 +- dlls/quartz/videorenderer.c | 2 +- dlls/riched20/paint.c | 4 ++-- dlls/riched20/style.c | 2 +- dlls/riched20/tests/editor.c | 4 ++-- dlls/riched20/undo.c | 4 ++-- dlls/rpcrt4/ndr_marshall.c | 2 +- dlls/rpcrt4/ndr_stubless.c | 4 ++-- dlls/rpcrt4/ndr_stubless.h | 2 +- dlls/rpcrt4/rpcrt4_main.c | 2 +- dlls/rpcrt4/rpcss_np_client.h | 2 +- dlls/rpcrt4/tests/ndr_marshall.c | 2 +- dlls/rsaenh/mpi.c | 8 ++++---- dlls/rsaenh/rc2.c | 2 +- dlls/sane.ds/capability.c | 4 ++-- dlls/sane.ds/sane_i.h | 2 +- 19 files changed, 28 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=313a85f1630d2fc2f6981…

1 0

Tony Wasserka : d3dx9: Add d3dx9tex.h.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: d9e98ea3d0cfe3889afaa848e6dc7173993ff925 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9e98ea3d0cfe3889afaa848e… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Tue Apr 15 15:30:03 2008 +0200 d3dx9: Add d3dx9tex.h. --- include/Makefile.in | 1 + include/d3dx9.h | 1 + include/d3dx9tex.h | 697 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 699 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d9e98ea3d0cfe3889afaa…

1 0

Alistair Leslie-Hughes : msxml3: Implement transformNode.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 880bacb5f10dcbb55cc1bd94b7bf5705510ea5f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=880bacb5f10dcbb55cc1bd94b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Mar 26 19:52:36 2008 +1100 msxml3: Implement transformNode. --- dlls/msxml3/main.c | 10 ++++++ dlls/msxml3/node.c | 66 ++++++++++++++++++++++++++++++++++++++- dlls/msxml3/tests/domdoc.c | 75 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 150 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 7f03948..7296690 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -35,6 +35,10 @@ #include "msxml_private.h" +#ifdef HAVE_LIBXSLT +#include <libxslt/xslt.h> +#endif + WINE_DEFAULT_DEBUG_CHANNEL(msxml); static HINSTANCE hInstance; @@ -171,10 +175,16 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) #ifdef HAVE_LIBXML2 xmlInitParser(); #endif +#ifdef HAVE_LIBXSLT + xsltInit(); +#endif hInstance = hInstDLL; DisableThreadLibraryCalls(hInstDLL); break; case DLL_PROCESS_DETACH: +#ifdef HAVE_LIBXSLT + xsltCleanupGlobals(); +#endif #ifdef HAVE_LIBXML2 xmlCleanupParser(); process_detach(); diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index ee4e1b2..7506460 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -33,6 +33,17 @@ #include "msxml_private.h" +#ifdef HAVE_LIBXSLT +# ifdef HAVE_LIBXSLT_PATTERN_H +# include <libxslt/pattern.h> +# endif +# ifdef HAVE_LIBXSLT_TRANSFORM_H +# include <libxslt/transform.h> +# endif +# include <libxslt/xsltutils.h> +# include <libxslt/xsltInternals.h> +#endif + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msxml); @@ -1030,8 +1041,61 @@ static HRESULT WINAPI xmlnode_transformNode( IXMLDOMNode* styleSheet, BSTR* xmlString) { - FIXME("\n"); +#ifdef HAVE_LIBXSLT + xmlnode *This = impl_from_IXMLDOMNode( iface ); + xmlnode *pStyleSheet = NULL; + xsltStylesheetPtr xsltSS = NULL; + xmlDocPtr result = NULL; + IXMLDOMNode *ssNew; + + TRACE("%p %p %p\n", This, styleSheet, xmlString); + + if(!styleSheet || !xmlString) + return E_INVALIDARG; + + *xmlString = NULL; + + if(IXMLDOMNode_QueryInterface(styleSheet, &IID_IXMLDOMNode, (LPVOID)&ssNew) == S_OK) + { + pStyleSheet = impl_from_IXMLDOMNode( ssNew ); + + xsltSS = xsltParseStylesheetDoc( pStyleSheet->node->doc); + if(xsltSS) + { + result = xsltApplyStylesheet(xsltSS, This->node->doc, NULL); + if(result) + { + xmlBufferPtr pXmlBuf; + int nSize; + + pXmlBuf = xmlBufferCreate(); + if(pXmlBuf) + { + nSize = xmlNodeDump(pXmlBuf, NULL, (xmlNodePtr)result, 0, 0); + if(nSize > 0) + { + const xmlChar *pContent; + + pContent = xmlBufferContent(pXmlBuf); + *xmlString = bstr_from_xmlChar(pContent); + + xmlBufferFree(pXmlBuf); + } + } + } + } + + IXMLDOMNode_Release(ssNew); + } + + if(*xmlString == NULL) + *xmlString = SysAllocStringLen(NULL, 0); + + return S_OK; +#else + FIXME("libxslt headers were not found at compile time\n"); return E_NOTIMPL; +#endif } static HRESULT WINAPI xmlnode_selectNodes( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 9c6eb66..32d3b93 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -119,6 +119,35 @@ static const CHAR szExampleXML[] = " </elem>\n" "</root>\n"; +static const CHAR szTransformXML[] = +"<?xml version=\"1.0\"?>\n" +"<greeting>\n" +"Hello World\n" +"</greeting>"; + +static const CHAR szTransformSSXML[] = +"<xsl:stylesheet xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\" version=\"1.0\">\n" +" <xsl:output method=\"html\"/>\n" +" <xsl:template match=\"/\">\n" +" <xsl:apply-templates select=\"greeting\"/>\n" +" </xsl:template>\n" +" <xsl:template match=\"greeting\">\n" +" <html>\n" +" <body>\n" +" <h1>\n" +" <xsl:value-of select=\".\"/>\n" +" </h1>\n" +" </body>\n" +" </html>\n" +" </xsl:template>\n" +"</xsl:stylesheet>"; + +static const CHAR szTransformOutput[] = +"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n" +"<html><body><h1>\n" +"Hello World\n" +"</h1></body></html>\n"; + static const WCHAR szNonExistentFile[] = { 'c', ':', '\\', 'N', 'o', 'n', 'e', 'x', 'i', 's', 't', 'e', 'n', 't', '.', 'x', 'm', 'l', 0 }; @@ -3130,6 +3159,51 @@ static void test_DocumentSaveToDocument(void) IXMLDOMDocument_Release(doc); } +static void test_testTransforms(void) +{ + IXMLDOMDocument *doc = NULL; + IXMLDOMDocument *docSS = NULL; + IXMLDOMNode *pNode; + VARIANT_BOOL bSucc; + + HRESULT hr; + + hr = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (LPVOID*)&doc ); + if( hr != S_OK ) + return; + + hr = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (LPVOID*)&docSS ); + if( hr != S_OK ) + { + IXMLDOMDocument_Release(doc); + return; + } + + hr = IXMLDOMDocument_loadXML(doc, _bstr_(szTransformXML), &bSucc); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMDocument_loadXML(docSS, _bstr_(szTransformSSXML), &bSucc); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMDocument_QueryInterface(docSS, &IID_IXMLDOMNode, (LPVOID*)&pNode ); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + BSTR bOut; + + hr = IXMLDOMDocument_transformNode(doc, pNode, &bOut); + ok(hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( bOut, _bstr_(szTransformOutput) ), "Stylesheet output not correct\n"); + + IXMLDOMNode_Release(pNode); + } + + IXMLDOMDocument_Release(docSS); + IXMLDOMDocument_Release(doc); + + free_bstrs(); +} + START_TEST(domdoc) { HRESULT r; @@ -3152,6 +3226,7 @@ START_TEST(domdoc) test_xmlTypes(); test_nodeTypeTests(); test_DocumentSaveToDocument(); + test_testTransforms(); CoUninitialize(); }

1 0

Louis Lenders : urlmon: Add stub for CoInternetSetFeatureEnabled.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: dd66542011c3a4376638bf4a9efb05fdfa346b85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd66542011c3a4376638bf4a9… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sun Apr 13 20:42:32 2008 +0000 urlmon: Add stub for CoInternetSetFeatureEnabled. --- dlls/urlmon/internet.c | 9 +++++++++ dlls/urlmon/urlmon.spec | 1 + include/urlmon.idl | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/internet.c b/dlls/urlmon/internet.c index b8168ab..8bde7b4 100644 --- a/dlls/urlmon/internet.c +++ b/dlls/urlmon/internet.c @@ -298,3 +298,12 @@ HRESULT WINAPI CoInternetQueryInfo(LPCWSTR pwzUrl, QUERYOPTION QueryOption, return S_OK; } + +/*********************************************************************** + * CoInternetSetFeatureEnabled (URLMON.@) + */ +HRESULT WINAPI CoInternetSetFeatureEnabled(INTERNETFEATURELIST feature, DWORD flags, BOOL enable) +{ + FIXME("%d, 0x%08x, %x, stub\n", feature, flags, enable); + return E_NOTIMPL; +} diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index 1fa2f94..0f3c9c2 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -19,6 +19,7 @@ @ stdcall CoInternetGetSession(long ptr long) @ stdcall CoInternetParseUrl(wstr long long wstr long ptr long) @ stdcall CoInternetQueryInfo(ptr long long ptr long ptr long) +@ stdcall CoInternetSetFeatureEnabled(long long long) @ stub CompareSecurityIds @ stub CopyBindInfo @ stdcall CopyStgMedium(ptr ptr) diff --git a/include/urlmon.idl b/include/urlmon.idl index c77971f..9e03543 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -1325,6 +1325,43 @@ interface ISoftDistExt : IUnknown [in] LPCODEBASEHOLD lpcbh); } +typedef enum _tagINTERNETFEATURELIST +{ + FEATURE_OBJECT_CACHING, + FEATURE_ZONE_ELEVATION, + FEATURE_MIME_HANDLING, + FEATURE_MIME_SNIFFING, + FEATURE_WINDOW_RESTRICTIONS, + FEATURE_WEBOC_POPUPMANAGEMENT, + FEATURE_BEHAVIORS, + FEATURE_DISABLE_MK_PROTOCOL, + FEATURE_LOCALMACHINE_LOCKDOWN, + FEATURE_SECURITYBAND, + FEATURE_RESTRICT_ACTIVEXINSTALL, + FEATURE_VALIDATE_NAVIGATE_URL, + FEATURE_RESTRICT_FILEDOWNLOAD, + FEATURE_ADDON_MANAGEMENT, + FEATURE_PROTOCOL_LOCKDOWN, + FEATURE_HTTP_USERNAME_PASSWORD_DISABLE, + FEATURE_SAFE_BINDTOOBJECT, + FEATURE_UNC_SAVEDFILECHECK, + FEATURE_GET_URL_DOM_FILEPATH_UNENCODED, + FEATURE_TABBED_BROWSING, + FEATURE_SSLUX, + FEATURE_DISABLE_NAVIGATION_SOUNDS, + FEATURE_DISABLE_LEGACY_COMPRESSION, + FEATURE_FORCE_ADDR_AND_STATUS, + FEATURE_XMLHTTP, + FEATURE_DISABLE_TELNET_PROTOCOL, + FEATURE_FEEDS, + FEATURE_BLOCK_INPUT_PROMPTS, + FEATURE_DOMSTORAGE, + FEATURE_XDOMAINREQUEST, + FEATURE_DATAURI, + FEATURE_AJAX_CONNECTIONSERVICES, + FEATURE_ENTRY_COUNT +} INTERNETFEATURELIST; + cpp_quote("DEFINE_GUID(CLSID_InternetSecurityManager, 0x7b8a2d94, 0x0ac9, 0x11d1, 0x89, 0x6c, 0x00, 0xc0, 0x4f, 0xB6, 0xbf, 0xc4);") cpp_quote("DEFINE_GUID(CLSID_InternetZoneManager, 0x7B8A2D95, 0x0AC9, 0x11D1, 0x89, 0x6C, 0x00, 0xC0, 0x4F, 0xB6, 0xBF, 0xC4);") cpp_quote("DEFINE_GUID(IID_IAsyncMoniker, 0x79EAC9D3, 0xBAF9, 0x11CE, 0x8C, 0x82, 0x00, 0xAA, 0x00, 0x4B, 0xA9, 0x0B);") @@ -1391,6 +1428,7 @@ cpp_quote("HRESULT WINAPI CoInternetCompareUrl(LPCWSTR,LPCWSTR,DWORD);") cpp_quote("HRESULT WINAPI CoInternetCreateZoneManager(IServiceProvider*, IInternetZoneManager**, DWORD);") cpp_quote("HRESULT WINAPI CoInternetParseUrl(LPCWSTR,PARSEACTION,DWORD,LPWSTR,DWORD,DWORD*,DWORD);") cpp_quote("HRESULT WINAPI CoInternetQueryInfo(LPCWSTR,QUERYOPTION,DWORD,LPVOID,DWORD,DWORD*,DWORD);") +cpp_quote("HRESULT WINAPI CoInternetSetFeatureEnabled(INTERNETFEATURELIST,DWORD,BOOL);") cpp_quote("HRESULT WINAPI CreateFormatEnumerator(UINT,FORMATETC*,IEnumFORMATETC**);") cpp_quote("HRESULT WINAPI GetSoftwareUpdateInfo( LPCWSTR szDistUnit, LPSOFTDISTINFO psdi);") cpp_quote("HRESULT WINAPI FaultInIEFeature(HWND,uCLSSPEC*,QUERYCONTEXT*,DWORD);")

1 0

Michael Hoffman : powrprof: Implement IsPwrHibernateAllowed.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 95fa6fbb57807ccec5a9a20c40517cf864590936 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95fa6fbb57807ccec5a9a20c4… Author: Michael Hoffman <blackdragon1157(a)gmail.com> Date: Wed Apr 16 17:59:01 2008 -0400 powrprof: Implement IsPwrHibernateAllowed. --- dlls/powrprof/powrprof.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/powrprof/powrprof.c b/dlls/powrprof/powrprof.c index 7d3b86e..c51434f 100644 --- a/dlls/powrprof/powrprof.c +++ b/dlls/powrprof/powrprof.c @@ -207,11 +207,9 @@ BOOLEAN WINAPI IsAdminOverrideActive(PADMINISTRATOR_POWER_POLICY p) BOOLEAN WINAPI IsPwrHibernateAllowed(VOID) { - /* FIXME: See note #2 */ SYSTEM_POWER_CAPABILITIES PowerCaps; - FIXME("() stub!\n"); NtPowerInformation(SystemPowerCapabilities, NULL, 0, &PowerCaps, sizeof(PowerCaps)); - return FALSE; + return PowerCaps.SystemS4 && PowerCaps.HiberFilePresent; } BOOLEAN WINAPI IsPwrShutdownAllowed(VOID)

1 0

Michael Hoffman : powrprof: Implement IsPwrShutdownAllowed.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: c189b5f9e2e5b146ca8ec25deba04a4aa2a2a52d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c189b5f9e2e5b146ca8ec25de… Author: Michael Hoffman <blackdragon1157(a)gmail.com> Date: Wed Apr 16 17:59:52 2008 -0400 powrprof: Implement IsPwrShutdownAllowed. --- dlls/powrprof/powrprof.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/powrprof/powrprof.c b/dlls/powrprof/powrprof.c index 58a7919..7d3b86e 100644 --- a/dlls/powrprof/powrprof.c +++ b/dlls/powrprof/powrprof.c @@ -216,11 +216,9 @@ BOOLEAN WINAPI IsPwrHibernateAllowed(VOID) BOOLEAN WINAPI IsPwrShutdownAllowed(VOID) { - /* FIXME: See note #2 */ SYSTEM_POWER_CAPABILITIES PowerCaps; - FIXME("() stub!\n"); NtPowerInformation(SystemPowerCapabilities, NULL, 0, &PowerCaps, sizeof(PowerCaps)); - return FALSE; + return PowerCaps.SystemS5; } BOOLEAN WINAPI IsPwrSuspendAllowed(VOID)

1 0

Michael Hoffman : powrprof: Implement IsPwrSuspendAllowed.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 1cfaa915709e14373cd303e7dfccea2fba97ac83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cfaa915709e14373cd303e7d… Author: Michael Hoffman <blackdragon1157(a)gmail.com> Date: Wed Apr 16 18:00:33 2008 -0400 powrprof: Implement IsPwrSuspendAllowed. --- dlls/powrprof/powrprof.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/powrprof/powrprof.c b/dlls/powrprof/powrprof.c index e17acc9..58a7919 100644 --- a/dlls/powrprof/powrprof.c +++ b/dlls/powrprof/powrprof.c @@ -225,11 +225,9 @@ BOOLEAN WINAPI IsPwrShutdownAllowed(VOID) BOOLEAN WINAPI IsPwrSuspendAllowed(VOID) { - /* FIXME: See note #2 */ SYSTEM_POWER_CAPABILITIES PowerCaps; - FIXME("() stub!\n"); NtPowerInformation(SystemPowerCapabilities, NULL, 0, &PowerCaps, sizeof(PowerCaps)); - return FALSE; + return PowerCaps.SystemS1 && PowerCaps.SystemS2 && PowerCaps.SystemS3; } BOOLEAN WINAPI ReadGlobalPwrPolicy(PGLOBAL_POWER_POLICY pGlobalPowerPolicy)

1 0

Jacek Caban : mshtml: Move get_typeinfo to dispex.c.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: be59368dd1176becfd582d0d959e16b23430b97d URL: http://source.winehq.org/git/wine.git/?a=commit;h=be59368dd1176becfd582d0d9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 17 02:32:18 2008 +0200 mshtml: Move get_typeinfo to dispex.c. --- dlls/mshtml/dispex.c | 55 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/main.c | 52 +-------------------------------------- dlls/mshtml/mshtml_private.h | 15 ++++++----- 3 files changed, 64 insertions(+), 58 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index f665c8f..6596f76 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -31,6 +31,61 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); +static ITypeLib *typelib; +static ITypeInfo *typeinfos[LAST_tid]; + +static REFIID tid_ids[] = { + &IID_IHTMLWindow2, +}; + +HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) +{ + HRESULT hres; + + if(!typelib) { + ITypeLib *tl; + + hres = LoadRegTypeLib(&LIBID_MSHTML, 4, 0, LOCALE_SYSTEM_DEFAULT, &tl); + if(FAILED(hres)) { + ERR("LoadRegTypeLib failed: %08x\n", hres); + return hres; + } + + if(InterlockedCompareExchangePointer((void**)&typelib, tl, NULL)) + ITypeLib_Release(tl); + } + + if(!typeinfos[tid]) { + ITypeInfo *typeinfo; + + hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &typeinfo); + if(FAILED(hres)) { + ERR("GetTypeInfoOfGuid failed: %08x\n", hres); + return hres; + } + + if(InterlockedCompareExchangePointer((void**)(typeinfos+tid), typeinfo, NULL)) + ITypeInfo_Release(typeinfo); + } + + *typeinfo = typeinfos[tid]; + return S_OK; +} + +void release_typelib(void) +{ + unsigned i; + + if(!typelib) + return; + + for(i=0; i < sizeof(typeinfos)/sizeof(*typeinfos); i++) + if(typeinfos[i]) + ITypeInfo_Release(typeinfos[i]); + + ITypeLib_Release(typelib); +} + #define DISPATCHEX_THIS(iface) DEFINE_THIS(DispatchEx, IDispatchEx, iface) static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 0389833..1c52c5a 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -49,47 +49,6 @@ DWORD mshtml_tls = 0; static HINSTANCE shdoclc = NULL; -static ITypeLib *typelib; -static ITypeInfo *typeinfos[LAST_tid]; - -static REFIID tid_ids[] = { - &IID_IHTMLWindow2 -}; - -HRESULT get_typeinfo(enum tid_t tid, ITypeInfo **typeinfo) -{ - HRESULT hres; - - if(!typelib) { - ITypeLib *tl; - - hres = LoadRegTypeLib(&LIBID_MSHTML, 4, 0, LOCALE_SYSTEM_DEFAULT, &tl); - if(FAILED(hres)) { - ERR("LoadRegTypeLib failed: %08x\n", hres); - return hres; - } - - if(InterlockedCompareExchangePointer((void**)&typelib, tl, NULL)) - ITypeLib_Release(tl); - } - - if(!typeinfos[tid]) { - ITypeInfo *typeinfo; - - hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &typeinfo); - if(FAILED(hres)) { - ERR("GetTypeInfoOfGuid failed: %08x\n", hres); - return hres; - } - - if(InterlockedCompareExchangePointer((void**)(typeinfos+tid), typeinfo, NULL)) - ITypeInfo_Release(typeinfo); - } - - *typeinfo = typeinfos[tid]; - return S_OK; -} - static void thread_detach(void) { thread_data_t *thread_data; @@ -107,16 +66,7 @@ static void thread_detach(void) static void process_detach(void) { close_gecko(); - - if(typelib) { - unsigned i; - - for(i=0; i < sizeof(typeinfos)/sizeof(*typeinfos); i++) - if(typeinfos[i]) - ITypeInfo_Release(typeinfos[i]); - - ITypeLib_Release(typelib); - } + release_typelib(); if(shdoclc) FreeLibrary(shdoclc); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 1bd4bb1..67e27a4 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -57,6 +57,12 @@ typedef struct ConnectionPoint ConnectionPoint; typedef struct BSCallback BSCallback; typedef struct nsChannelBSC nsChannelBSC; +/* NOTE: make sure to keep in sync with dispex.c */ +typedef enum { + IHTMLWindow2_tid, + LAST_tid +} tid_t; + typedef struct { const IDispatchExVtbl *lpIDispatchExVtbl; @@ -524,13 +530,8 @@ HWND get_thread_hwnd(void); void push_task(task_t*); void remove_doc_tasks(const HTMLDocument*); -/* typelibs */ -enum tid_t { - IHTMLWindow2_tid, - LAST_tid -}; - -HRESULT get_typeinfo(enum tid_t, ITypeInfo**); +HRESULT get_typeinfo(tid_t,ITypeInfo**); +void release_typelib(void); DEFINE_GUID(CLSID_AboutProtocol, 0x3050F406, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); DEFINE_GUID(CLSID_JSProtocol, 0x3050F3B2, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B);

1 0

Jacek Caban : mshtml: Added generic IDispatchEx implementation and use it in OnNavigator.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: ed6a8acca71a37060234168aa5c755787d5dce2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed6a8acca71a37060234168aa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 17 02:31:43 2008 +0200 mshtml: Added generic IDispatchEx implementation and use it in OnNavigator. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/dispex.c | 176 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 11 +++ dlls/mshtml/omnavigator.c | 6 ++ 4 files changed, 194 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index a19428a..97ae6f1 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -10,6 +10,7 @@ EXTRADEFS = -DCOM_NO_WINDOWS_H C_SRCS = \ conpoint.c \ + dispex.c \ editor.c \ hlink.c \ htmlanchor.c \ diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c new file mode 100644 index 0000000..f665c8f --- /dev/null +++ b/dlls/mshtml/dispex.c @@ -0,0 +1,176 @@ +/* + * Copyright 2008 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" + +#include "wine/debug.h" + +#include "mshtml_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mshtml); + +#define DISPATCHEX_THIS(iface) DEFINE_THIS(DispatchEx, IDispatchEx, iface) + +static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) +{ + DispatchEx *This = DISPATCHEX_THIS(iface); + + return IUnknown_QueryInterface(This->outer, riid, ppv); +} + +static ULONG WINAPI DispatchEx_AddRef(IDispatchEx *iface) +{ + DispatchEx *This = DISPATCHEX_THIS(iface); + + return IUnknown_AddRef(This->outer); +} + +static ULONG WINAPI DispatchEx_Release(IDispatchEx *iface) +{ + DispatchEx *This = DISPATCHEX_THIS(iface); + + return IUnknown_Release(This->outer); +} + +static HRESULT WINAPI DispatchEx_GetTypeInfoCount(IDispatchEx *iface, UINT *pctinfo) +{ + DispatchEx *This = DISPATCHEX_THIS(iface); + + TRACE("(%p)->(%p)\n", This, pctinfo); + + *pctinfo = 1; + return S_OK; +} + +static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + DispatchEx *This = DISPATCHEX_THIS(iface); + FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI DispatchEx_GetIDsOfNames(IDispatchEx *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + DispatchEx *This = DISPATCHEX_THIS(iface); + FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, + lcid, rgDispId); + return E_NOTIMPL; +} + +static HRESULT WINAPI DispatchEx_Invoke(IDispatchEx *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + DispatchEx *This = DISPATCHEX_THIS(iface); + FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + return E_NOTIMPL; +} + +static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) +{ + DispatchEx *This = DISPATCHEX_THIS(iface); + FIXME("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid); + return E_NOTIMPL; +} + +static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + DispatchEx *This = DISPATCHEX_THIS(iface); + FIXME("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); + return E_NOTIMPL; +} + +static HRESULT WINAPI DispatchEx_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex) +{ + DispatchEx *This = DISPATCHEX_THIS(iface); + FIXME("(%p)->(%s %x)\n", This, debugstr_w(bstrName), grfdex); + return E_NOTIMPL; +} + +static HRESULT WINAPI DispatchEx_DeleteMemberByDispID(IDispatchEx *iface, DISPID id) +{ + DispatchEx *This = DISPATCHEX_THIS(iface); + FIXME("(%p)->(%x)\n", This, id); + return E_NOTIMPL; +} + +static HRESULT WINAPI DispatchEx_GetMemberProperties(IDispatchEx *iface, DISPID id, DWORD grfdexFetch, DWORD *pgrfdex) +{ + DispatchEx *This = DISPATCHEX_THIS(iface); + FIXME("(%p)->(%x %x %p)\n", This, id, grfdexFetch, pgrfdex); + return E_NOTIMPL; +} + +static HRESULT WINAPI DispatchEx_GetMemberName(IDispatchEx *iface, DISPID id, BSTR *pbstrName) +{ + DispatchEx *This = DISPATCHEX_THIS(iface); + FIXME("(%p)->(%x %p)\n", This, id, pbstrName); + return E_NOTIMPL; +} + +static HRESULT WINAPI DispatchEx_GetNextDispID(IDispatchEx *iface, DWORD grfdex, DISPID id, DISPID *pid) +{ + DispatchEx *This = DISPATCHEX_THIS(iface); + FIXME("(%p)->(%x %x %p)\n", This, grfdex, id, pid); + return E_NOTIMPL; +} + +static HRESULT WINAPI DispatchEx_GetNameSpaceParent(IDispatchEx *iface, IUnknown **ppunk) +{ + DispatchEx *This = DISPATCHEX_THIS(iface); + FIXME("(%p)->(%p)\n", This, ppunk); + return E_NOTIMPL; +} + +#undef DISPATCHEX_THIS + +static IDispatchExVtbl DispatchExVtbl = { + DispatchEx_QueryInterface, + DispatchEx_AddRef, + DispatchEx_Release, + DispatchEx_GetTypeInfoCount, + DispatchEx_GetTypeInfo, + DispatchEx_GetIDsOfNames, + DispatchEx_Invoke, + DispatchEx_GetDispID, + DispatchEx_InvokeEx, + DispatchEx_DeleteMemberByName, + DispatchEx_DeleteMemberByDispID, + DispatchEx_GetMemberProperties, + DispatchEx_GetMemberName, + DispatchEx_GetNextDispID, + DispatchEx_GetNameSpaceParent +}; + +void init_dispex(DispatchEx *dispex, IUnknown *outer) +{ + dispex->lpIDispatchExVtbl = &DispatchExVtbl; + dispex->outer = outer; +} diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 6682370..1bd4bb1 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -21,6 +21,7 @@ #include "mshtml.h" #include "mshtmhst.h" #include "hlink.h" +#include "dispex.h" #include "wine/list.h" #include "wine/unicode.h" @@ -57,6 +58,14 @@ typedef struct BSCallback BSCallback; typedef struct nsChannelBSC nsChannelBSC; typedef struct { + const IDispatchExVtbl *lpIDispatchExVtbl; + + IUnknown *outer; +} DispatchEx; + +void init_dispex(DispatchEx*,IUnknown*); + +typedef struct { const IHTMLWindow2Vtbl *lpHTMLWindow2Vtbl; LONG ref; @@ -334,6 +343,8 @@ typedef struct { #define HTMLOPTFACTORY(x) ((IHTMLOptionElementFactory*) &(x)->lpHTMLOptionElementFactoryVtbl) #define HTMLLOCATION(x) ((IHTMLLocation*) &(x)->lpHTMLLocationVtbl) +#define DISPATCHEX(x) ((IDispatchEx*) &(x)->lpIDispatchExVtbl) + #define DEFINE_THIS2(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,ifc))) #define DEFINE_THIS(cls,ifc,iface) DEFINE_THIS2(cls,lp ## ifc ## Vtbl,iface) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index d1bcdca..1a1e7e8 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -32,6 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { + DispatchEx dispex; const IOmNavigatorVtbl *lpIOmNavigatorVtbl; LONG ref; @@ -53,6 +54,9 @@ static HRESULT WINAPI OmNavigator_QueryInterface(IOmNavigator *iface, REFIID rii }else if(IsEqualGUID(&IID_IDispatch, riid)) { TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); *ppv = OMNAVIGATOR(This); + }else if(IsEqualGUID(&IID_IDispatchEx, riid)) { + TRACE("(%p)->(IID_IDispatchEx %p)\n", This, ppv); + *ppv = DISPATCHEX(&This->dispex); }else if(IsEqualGUID(&IID_IOmNavigator, riid)) { TRACE("(%p)->(IID_IOmNavigator %p)\n", This, ppv); *ppv = OMNAVIGATOR(This); @@ -305,5 +309,7 @@ IOmNavigator *OmNavigator_Create(void) ret->lpIOmNavigatorVtbl = &OmNavigatorVtbl; ret->ref = 1; + init_dispex(&ret->dispex, (IUnknown*)OMNAVIGATOR(ret)); + return OMNAVIGATOR(ret); }

1 0

Jacek Caban : mshtml: Added IActiveScriptDebug32 stub implementation.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: d0d8dc2811b495914b1c1b6eb45b62ae26b2e5ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0d8dc2811b495914b1c1b6eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 17 02:31:00 2008 +0200 mshtml: Added IActiveScriptDebug32 stub implementation. --- dlls/mshtml/script.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 71 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 412a3ec..6a6442e 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -27,6 +27,7 @@ #include "winuser.h" #include "ole2.h" #include "activscp.h" +#include "activdbg.h" #include "objsafe.h" #include "wine/debug.h" @@ -44,6 +45,7 @@ typedef struct { const IActiveScriptSiteVtbl *lpIActiveScriptSiteVtbl; const IActiveScriptSiteInterruptPollVtbl *lpIActiveScriptSiteInterruptPollVtbl; const IActiveScriptSiteWindowVtbl *lpIActiveScriptSiteWindowVtbl; + const IActiveScriptSiteDebug32Vtbl *lpIActiveScriptSiteDebug32Vtbl; LONG ref; @@ -61,6 +63,7 @@ typedef struct { #define ACTSCPSITE(x) ((IActiveScriptSite*) &(x)->lpIActiveScriptSiteVtbl) #define ACTSCPPOLL(x) ((IActiveScriptSiteInterruptPoll*) &(x)->lpIActiveScriptSiteInterruptPollVtbl) #define ACTSCPWIN(x) ((IActiveScriptSiteWindow*) &(x)->lpIActiveScriptSiteWindowVtbl) +#define ACTSCPDBG32(x) ((IActiveScriptSiteDebug32*) &(x)->lpIActiveScriptSiteDebug32Vtbl) static BOOL init_script_engine(ScriptHost *script_host) { @@ -205,6 +208,9 @@ static HRESULT WINAPI ActiveScriptSite_QueryInterface(IActiveScriptSite *iface, }else if(IsEqualGUID(&IID_IActiveScriptSiteWindow, riid)) { TRACE("(%p)->(IID_IActiveScriptSiteWindow %p)\n", This, ppv); *ppv = ACTSCPWIN(This); + }else if(IsEqualGUID(&IID_IActiveScriptSiteDebug32, riid)) { + TRACE("(%p)->(IID_IActiveScriptSiteDebug32 %p)\n", This, ppv); + *ppv = ACTSCPDBG32(This); }else { FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); return E_NOINTERFACE; @@ -426,6 +432,70 @@ static const IActiveScriptSiteWindowVtbl ActiveScriptSiteWindowVtbl = { ActiveScriptSiteWindow_EnableModeless }; +#define ACTSCPDBG32_THIS(iface) DEFINE_THIS(ScriptHost, IActiveScriptSiteDebug32, iface) + +static HRESULT WINAPI ActiveScriptSiteDebug32_QueryInterface(IActiveScriptSiteDebug32 *iface, + REFIID riid, void **ppv) +{ + ScriptHost *This = ACTSCPDBG32_THIS(iface); + return IActiveScriptSite_QueryInterface(ACTSCPSITE(This), riid, ppv); +} + +static ULONG WINAPI ActiveScriptSiteDebug32_AddRef(IActiveScriptSiteDebug32 *iface) +{ + ScriptHost *This = ACTSCPDBG32_THIS(iface); + return IActiveScriptSite_AddRef(ACTSCPSITE(This)); +} + +static ULONG WINAPI ActiveScriptSiteDebug32_Release(IActiveScriptSiteDebug32 *iface) +{ + ScriptHost *This = ACTSCPDBG32_THIS(iface); + return IActiveScriptSite_Release(ACTSCPSITE(This)); +} + +static HRESULT WINAPI ActiveScriptSiteDebug32_GetDocumentContextFromPosition(IActiveScriptSiteDebug32 *iface, + DWORD dwSourceContext, ULONG uCharacterOffset, ULONG uNumChars, IDebugDocumentContext **ppsc) +{ + ScriptHost *This = ACTSCPDBG32_THIS(iface); + FIXME("(%p)->(%x %u %u %p)\n", This, dwSourceContext, uCharacterOffset, uNumChars, ppsc); + return E_NOTIMPL; +} + +static HRESULT WINAPI ActiveScriptSiteDebug32_GetApplication(IActiveScriptSiteDebug32 *iface, IDebugApplication32 **ppda) +{ + ScriptHost *This = ACTSCPDBG32_THIS(iface); + FIXME("(%p)->(%p)\n", This, ppda); + return E_NOTIMPL; +} + +static HRESULT WINAPI ActiveScriptSiteDebug32_GetRootApplicationNode(IActiveScriptSiteDebug32 *iface, + IDebugApplicationNode **ppdanRoot) +{ + ScriptHost *This = ACTSCPDBG32_THIS(iface); + FIXME("(%p)->(%p)\n", This, ppdanRoot); + return E_NOTIMPL; +} + +static HRESULT WINAPI ActiveScriptSiteDebug32_OnScriptErrorDebug(IActiveScriptSiteDebug32 *iface, + IActiveScriptErrorDebug *pErrorDebug, BOOL *pfEnterDebugger, BOOL *pfCallOnScriptErrorWhenContinuing) +{ + ScriptHost *This = ACTSCPDBG32_THIS(iface); + FIXME("(%p)->(%p %p %p)\n", This, pErrorDebug, pfEnterDebugger, pfCallOnScriptErrorWhenContinuing); + return E_NOTIMPL; +} + +#undef ACTSCPDBG32_THIS + +static const IActiveScriptSiteDebug32Vtbl ActiveScriptSiteDebug32Vtbl = { + ActiveScriptSiteDebug32_QueryInterface, + ActiveScriptSiteDebug32_AddRef, + ActiveScriptSiteDebug32_Release, + ActiveScriptSiteDebug32_GetDocumentContextFromPosition, + ActiveScriptSiteDebug32_GetApplication, + ActiveScriptSiteDebug32_GetRootApplicationNode, + ActiveScriptSiteDebug32_OnScriptErrorDebug +}; + static ScriptHost *create_script_host(HTMLDocument *doc, GUID *guid) { ScriptHost *ret; @@ -435,6 +505,7 @@ static ScriptHost *create_script_host(HTMLDocument *doc, GUID *guid) ret->lpIActiveScriptSiteVtbl = &ActiveScriptSiteVtbl; ret->lpIActiveScriptSiteInterruptPollVtbl = &ActiveScriptSiteInterruptPollVtbl; ret->lpIActiveScriptSiteWindowVtbl = &ActiveScriptSiteWindowVtbl; + ret->lpIActiveScriptSiteDebug32Vtbl = &ActiveScriptSiteDebug32Vtbl; ret->ref = 1; ret->doc = doc; ret->script_state = SCRIPTSTATE_UNINITIALIZED;

1 0

Jacek Caban : mshtml: Make sure to null terminate buffer in parse_extern_script.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: b2c80e6b186079200875a936f853fffeb6967206 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2c80e6b186079200875a936f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 17 02:30:40 2008 +0200 mshtml: Make sure to null terminate buffer in parse_extern_script. --- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/navigate.c | 3 ++- dlls/mshtml/script.c | 8 ++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 2976fa8..6682370 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -411,7 +411,7 @@ void set_document_bscallback(HTMLDocument*,nsChannelBSC*); void set_current_mon(HTMLDocument*,IMoniker*); HRESULT start_binding(HTMLDocument*,BSCallback*,IBindCtx*); -HRESULT bind_mon_to_buffer(HTMLDocument*,IMoniker*,void**); +HRESULT bind_mon_to_buffer(HTMLDocument*,IMoniker*,void**,DWORD*); nsChannelBSC *create_channelbsc(IMoniker*); HRESULT channelbsc_load_stream(nsChannelBSC*,IStream*); diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 9ed1dea..78ae19d 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -807,7 +807,7 @@ static BufferBSC *create_bufferbsc(IMoniker *mon) return ret; } -HRESULT bind_mon_to_buffer(HTMLDocument *doc, IMoniker *mon, void **buf) +HRESULT bind_mon_to_buffer(HTMLDocument *doc, IMoniker *mon, void **buf, DWORD *size) { BufferBSC *bsc = create_bufferbsc(mon); HRESULT hres; @@ -820,6 +820,7 @@ HRESULT bind_mon_to_buffer(HTMLDocument *doc, IMoniker *mon, void **buf) if(SUCCEEDED(hres)) { *buf = bsc->buf; bsc->buf = NULL; + *size = bsc->bsc.readed; bsc->size = 0; } } diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 15a939c..412a3ec 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -477,6 +477,7 @@ static void parse_extern_script(ScriptHost *script_host, LPCWSTR src) IMoniker *mon; char *buf; WCHAR *text; + DWORD len, size=0; HRESULT hres; static const WCHAR wine_schemaW[] = {'w','i','n','e',':'}; @@ -488,13 +489,16 @@ static void parse_extern_script(ScriptHost *script_host, LPCWSTR src) if(FAILED(hres)) return; - hres = bind_mon_to_buffer(script_host->doc, mon, (void**)&buf); + hres = bind_mon_to_buffer(script_host->doc, mon, (void**)&buf, &size); IMoniker_Release(mon); if(FAILED(hres)) return; - text = heap_strdupAtoW(buf); + len = MultiByteToWideChar(CP_ACP, 0, buf, size, NULL, 0); + text = heap_alloc((len+1)*sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, buf, size, text, len); heap_free(buf); + text[len] = 0; parse_text(script_host, text);

1 0

Maarten Lankhorst : quartz: Obtain the duration using the index in avisplitter.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: ebaadba498a9e8d546768f0714faa3e93f3a2e57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebaadba498a9e8d546768f071… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 16 18:23:50 2008 -0700 quartz: Obtain the duration using the index in avisplitter. --- dlls/quartz/avisplit.c | 180 ++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 153 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ebaadba498a9e8d546768…

1 0

Maarten Lankhorst : quartz: Store the stream index in the avi stream for files that have them.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 162581711375fec58cc595ab75646235d31ee099 URL: http://source.winehq.org/git/wine.git/?a=commit;h=162581711375fec58cc595ab7… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 16 14:29:09 2008 -0700 quartz: Store the stream index in the avi stream for files that have them. --- dlls/quartz/avisplit.c | 51 +++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 46 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index 24f487c..19fc69d 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -360,12 +360,13 @@ static HRESULT AVISplitter_QueryAccept(LPVOID iface, const AM_MEDIA_TYPE * pmt) return S_FALSE; } -static HRESULT AVISplitter_ProcessIndex(AVISplitterImpl *This, LONGLONG qwOffset, DWORD cb) +static HRESULT AVISplitter_ProcessIndex(AVISplitterImpl *This, AVISTDINDEX **index, LONGLONG qwOffset, DWORD cb) { AVISTDINDEX *pIndex; int x; long rest; + *index = NULL; if (cb < sizeof(AVISTDINDEX)) { FIXME("size %u too small\n", cb); @@ -410,7 +411,7 @@ static HRESULT AVISplitter_ProcessIndex(AVISplitterImpl *This, LONGLONG qwOffset TRACE("Frame is a keyframe: %s\n", keyframe ? "yes" : "no"); } - CoTaskMemFree(pIndex); + *index = pIndex; return S_OK; } @@ -482,11 +483,15 @@ static HRESULT AVISplitter_ProcessStreamList(AVISplitterImpl * This, const BYTE static const WCHAR wszStreamTemplate[] = {'S','t','r','e','a','m',' ','%','0','2','d',0}; StreamData *stream; + AVISUPERINDEX *superindex = NULL; + AVISTDINDEX **stdindex = NULL; + DWORD nstdindex = 0; + props.cbAlign = 1; props.cbPrefix = 0; props.cbBuffer = 0x20000; props.cBuffers = 2; - + ZeroMemory(&amt, sizeof(amt)); piOutput.dir = PINDIR_OUTPUT; piOutput.pFilter = (IBaseFilter *)This; @@ -598,6 +603,12 @@ static HRESULT AVISplitter_ProcessStreamList(AVISplitterImpl * This, const BYTE break; } + if (nstdindex > 0) + { + ERR("Stream %d got more then 1 superindex?\n", This->Parser.cStreams); + break; + } + TRACE("wLongsPerEntry: %hd\n", pIndex->wLongsPerEntry); TRACE("bIndexSubType: %hd\n", pIndex->bIndexSubType); TRACE("bIndexType: %hd\n", pIndex->bIndexType); @@ -618,13 +629,24 @@ static HRESULT AVISplitter_ProcessStreamList(AVISplitterImpl * This, const BYTE FIXME("Invalid index chunk encountered\n"); break; } + + superindex = CoTaskMemAlloc(pIndex->cb + sizeof(RIFFCHUNK)); + if (!superindex) + { + WARN("Out of memory\n"); + break; + } + memcpy(superindex, pIndex, pIndex->cb + sizeof(RIFFCHUNK)); + for (x = 0; x < pIndex->nEntriesInUse; ++x) { TRACE("qwOffset: %x%08x\n", (DWORD)(pIndex->aIndex[x].qwOffset >> 32), (DWORD)pIndex->aIndex[x].qwOffset); TRACE("dwSize: %u\n", pIndex->aIndex[x].dwSize); - AVISplitter_ProcessIndex(This, pIndex->aIndex[x].qwOffset, pIndex->aIndex[x].dwSize); - TRACE("dwDuration: %u (unreliable)\n", pIndex->aIndex[x].dwDuration); + + ++nstdindex; + stdindex = CoTaskMemRealloc(stdindex, sizeof(*stdindex) * nstdindex); + AVISplitter_ProcessIndex(This, &stdindex[nstdindex-1], pIndex->aIndex[x].qwOffset, pIndex->aIndex[x].dwSize); } break; } @@ -644,10 +666,14 @@ static HRESULT AVISplitter_ProcessStreamList(AVISplitterImpl * This, const BYTE TRACE("dwSampleSize = %x\n", dwSampleSize); TRACE("dwLength = %x\n", dwLength); This->streams = CoTaskMemRealloc(This->streams, sizeof(StreamData) * (This->Parser.cStreams+1)); + stream = This->streams + This->Parser.cStreams; stream->fSamplesPerSec = fSamplesPerSec; stream->dwSampleSize = dwSampleSize; stream->dwLength = dwLength; /* TODO: Use this for mediaseeking */ + stream->superindex = superindex; + stream->entries = nstdindex; + stream->stdindex = stdindex; hr = Parser_AddPin(&(This->Parser), &piOutput, &props, &amt); CoTaskMemFree(amt.pbFormat); @@ -862,11 +888,26 @@ static HRESULT AVISplitter_Cleanup(LPVOID iface) static HRESULT AVISplitter_Disconnect(LPVOID iface) { AVISplitterImpl *This = iface; + int x; /* TODO: Remove other memory that's allocated during connect */ CoTaskMemFree(This->oldindex); This->oldindex = NULL; + for (x = 0; x < This->Parser.cStreams; ++x) + { + int i; + + StreamData *stream = &This->streams[x]; + + for (i = 0; i < stream->entries; ++i) + CoTaskMemFree(stream->stdindex[i]); + + CoTaskMemFree(stream->stdindex); + CoTaskMemFree(stream->superindex); + } + CoTaskMemFree(This->streams); + return S_OK; }

1 0

Maarten Lankhorst : quartz: Check for discontinuities in the directsound renderer.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: a0e8b97ffe470718a27dca98c674a3b61c16c213 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0e8b97ffe470718a27dca98c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 16 14:27:06 2008 -0700 quartz: Check for discontinuities in the directsound renderer. --- dlls/quartz/dsoundrender.c | 37 +++++++++++++++++++++++++++++++------ 1 files changed, 31 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index a199e5f..50892c0 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -56,7 +56,7 @@ typedef struct DSoundRenderImpl LONG refCount; CRITICAL_SECTION csFilter; FILTER_STATE state; - REFERENCE_TIME rtStreamStart; + REFERENCE_TIME rtStreamStart, rtLastStop; IReferenceClock * pClock; FILTER_INFO filterInfo; @@ -79,21 +79,38 @@ typedef struct DSoundRenderImpl long pan; } DSoundRenderImpl; +/* Seeking is not needed for a renderer, rely on newsegment for the appropiate changes */ static HRESULT sound_mod_stop(IBaseFilter *iface) { - FIXME("(%p) stub\n", iface); + TRACE("(%p)\n", iface); return S_OK; } static HRESULT sound_mod_start(IBaseFilter *iface) { - FIXME("(%p) stub\n", iface); + TRACE("(%p)\n", iface); + return S_OK; } static HRESULT sound_mod_rate(IBaseFilter *iface) { - FIXME("(%p) stub\n", iface); + DSoundRenderImpl *This = (DSoundRenderImpl *)iface; + + WAVEFORMATEX *format = (WAVEFORMATEX*)This->pInputPin->pin.mtCurrent.pbFormat; + DWORD freq = format->nSamplesPerSec; + double rate = This->mediaSeeking.dRate; + + freq = (DWORD)((double)freq * rate); + + TRACE("(%p)\n", iface); + + if (freq > DSBFREQUENCY_MAX) + return VFW_E_UNSUPPORTED_AUDIO; + + if (freq < DSBFREQUENCY_MIN) + return VFW_E_UNSUPPORTED_AUDIO; + return S_OK; } @@ -224,23 +241,30 @@ static HRESULT DSoundRender_Sample(LPVOID iface, IMediaSample * pSample) TRACE("%p %p\n", iface, pSample); + /* Slightly incorrect, Pause completes when a frame is received so we should signal + * pause completion here, but for sound receiving a single frame doesn't make sense + */ if (This->state == State_Paused) return S_FALSE; if (This->state == State_Stopped) - return VFW_E_WRONG_STATE; + return S_FALSE; hr = IMediaSample_GetPointer(pSample, &pbSrcStream); if (FAILED(hr)) { ERR("Cannot get pointer to sample data (%x)\n", hr); - return hr; + return hr; } hr = IMediaSample_GetTime(pSample, &tStart, &tStop); if (FAILED(hr)) ERR("Cannot get sample time (%x)\n", hr); + if (This->rtLastStop != tStart && (IMediaSample_IsDiscontinuity(pSample) == S_FALSE)) + FIXME("Unexpected discontinuity: Last: %lld, tStart: %lld\n", This->rtLastStop, tStart); + This->rtLastStop = tStop; + cbSrcStream = IMediaSample_GetActualDataLength(pSample); TRACE("Sample data ptr = %p, size = %ld\n", pbSrcStream, cbSrcStream); @@ -673,6 +697,7 @@ static HRESULT WINAPI DSoundRender_InputPin_ReceiveConnection(IPin * iface, IPin EnterCriticalSection(This->pin.pCritSec); { DSImpl = (DSoundRenderImpl*)This->pin.pinInfo.pFilter; + DSImpl->rtLastStop = -1; if (This->pin.pConnectedTo) hr = VFW_E_ALREADY_CONNECTED;

1 0

Maarten Lankhorst : quartz: Make sure at least 1 sample is processed before returning.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 97b9e9c3add01235817b172b19626718fc2a02e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97b9e9c3add01235817b172b1… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 16 14:26:15 2008 -0700 quartz: Make sure at least 1 sample is processed before returning. --- dlls/quartz/pin.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 71f33ec..0c333f7 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -1382,7 +1382,11 @@ static void CALLBACK PullPin_Thread_Process(ULONG_PTR iface) TRACE("Start\n"); - while (This->rtCurrent < This->rtStop && hr == S_OK && !This->stop_playback) + if (This->rtCurrent >= This->rtStop) + { + FIXME("Send an EndOfStream?\n"); + } + else do { /* FIXME: to improve performance by quite a bit this should be changed * so that one sample is processed while one sample is fetched. However, @@ -1427,7 +1431,7 @@ static void CALLBACK PullPin_Thread_Process(ULONG_PTR iface) if (pSample) IMediaSample_Release(pSample); - } + } while (This->rtCurrent < This->rtStop && hr == S_OK && !This->stop_playback); CoUninitialize(); EnterCriticalSection(This->pin.pCritSec);

1 0

Maarten Lankhorst : quartz: Reject samples in transform filter only when stopped.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 405e21d5589c5563f9e0ab00b3ed1c9a4a498faf URL: http://source.winehq.org/git/wine.git/?a=commit;h=405e21d5589c5563f9e0ab00b… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 16 14:25:03 2008 -0700 quartz: Reject samples in transform filter only when stopped. Use S_FALSE for saying sample is rejected. --- dlls/quartz/transform.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/transform.c b/dlls/quartz/transform.c index 936d96d..b090e5b 100644 --- a/dlls/quartz/transform.c +++ b/dlls/quartz/transform.c @@ -54,11 +54,8 @@ static HRESULT TransformFilter_Sample(LPVOID iface, IMediaSample * pSample) TRACE("%p %p\n", iface, pSample); - if (This->state == State_Paused) - return S_FALSE; - if (This->state == State_Stopped) - return VFW_E_WRONG_STATE; + return S_FALSE; return This->pFuncsTable->pfnProcessSampleData(This, pSample); }

1 0

Maarten Lankhorst : quartz: Reject samples in video renderer when stopped.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 3dc8384aa9e7525877c68d742ecddb8169a20779 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dc8384aa9e7525877c68d742… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 16 14:24:34 2008 -0700 quartz: Reject samples in video renderer when stopped. When stopped video renderer no longer updates, so don't even try. --- dlls/quartz/videorenderer.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index f0a73d7..4c06c44 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -357,8 +357,11 @@ static HRESULT VideoRenderer_Sample(LPVOID iface, IMediaSample * pSample) REFERENCE_TIME tStart, tStop; HRESULT hr; + if (This->state == State_Stopped) + return S_FALSE; + TRACE("%p %p\n", iface, pSample); - + hr = IMediaSample_GetPointer(pSample, &pbSrcStream); if (FAILED(hr)) {

1 0

Maarten Lankhorst : quartz: Fix IMediaSample2 SetPreroll and SetSyncPoint.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 382a61391f30d0fd86e97a0a5d3b6c14d7a942cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=382a61391f30d0fd86e97a0a5… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 16 14:24:16 2008 -0700 quartz: Fix IMediaSample2 SetPreroll and SetSyncPoint. --- dlls/quartz/memallocator.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index 6b68cf5..b473b57 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -586,7 +586,10 @@ static HRESULT WINAPI StdMediaSample2_SetSyncPoint(IMediaSample2 * iface, BOOL b TRACE("(%s)\n", bIsSyncPoint ? "TRUE" : "FALSE"); - This->props.dwSampleFlags = (This->props.dwSampleFlags & ~AM_SAMPLE_SPLICEPOINT) | bIsSyncPoint ? AM_SAMPLE_SPLICEPOINT : 0; + if (bIsSyncPoint) + This->props.dwSampleFlags |= AM_SAMPLE_SPLICEPOINT; + else + This->props.dwSampleFlags &= ~AM_SAMPLE_SPLICEPOINT; return S_OK; } @@ -606,7 +609,10 @@ static HRESULT WINAPI StdMediaSample2_SetPreroll(IMediaSample2 * iface, BOOL bIs TRACE("(%s)\n", bIsPreroll ? "TRUE" : "FALSE"); - This->props.dwSampleFlags = (This->props.dwSampleFlags & ~AM_SAMPLE_PREROLL) | bIsPreroll ? AM_SAMPLE_PREROLL : 0; + if (bIsPreroll) + This->props.dwSampleFlags &= ~AM_SAMPLE_PREROLL; + else + This->props.dwSampleFlags |= AM_SAMPLE_PREROLL; return S_OK; }

1 0

Maarten Lankhorst : quartz: Fix discontinuities in wave parser.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: cbb0ff37fa63eefcf1d86ccdf894c9accc4b93b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbb0ff37fa63eefcf1d86ccdf… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 16 13:39:10 2008 -0700 quartz: Fix discontinuities in wave parser. --- dlls/quartz/waveparser.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index 544fa4c..5aef9ef 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -167,10 +167,8 @@ static HRESULT WAVEParser_Sample(LPVOID iface, IMediaSample * pSample) { REFERENCE_TIME tAviStart, tAviStop, tOffset; - /* FIXME: hack */ - if (pOutputPin->dwSamplesProcessed == 0) { - IMediaSample_SetDiscontinuity(This->pCurrentSample, TRUE); - } + IMediaSample_SetDiscontinuity(This->pCurrentSample, pOutputPin->dwSamplesProcessed == 0); + IMediaSample_SetSyncPoint(This->pCurrentSample, TRUE); pOutputPin->dwSamplesProcessed++; @@ -195,8 +193,7 @@ static HRESULT WAVEParser_Sample(LPVOID iface, IMediaSample * pSample) if (hr == S_FALSE) { /* Break out */ - offset_src += chunk_remaining_bytes; - This->Parser.pInputPin->rtCurrent -= BYTES_FROM_MEDIATIME(cbSrcStream - offset_src); + This->Parser.pInputPin->rtCurrent -= MEDIATIME_FROM_BYTES(cbSrcStream - offset_src - chunk_remaining_bytes); hr = S_OK; break; } @@ -297,6 +294,7 @@ static HRESULT WAVEParserImpl_seek(IBaseFilter *iface) } pPin->rtStart = pPin->rtCurrent = bytepos; + ((Parser_OutputPin *)This->Parser.ppPins[1])->dwSamplesProcessed = 0; LeaveCriticalSection(&This->Parser.csFilter); TRACE("Done flushing\n");

1 0

Andrew Talbot : dplayx: Remove unused variables.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 3d8f5c15904b808cf9fb71b9280fd2e76793ee08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d8f5c15904b808cf9fb71b92… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Apr 16 22:09:26 2008 +0100 dplayx: Remove unused variables. --- dlls/dplayx/dplay.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 5be4c5d..7b18010 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -3396,13 +3396,12 @@ static void DP_CopySessionDesc( LPDPSESSIONDESC2 lpSessionDest, static HRESULT WINAPI DP_IF_AddGroupToGroup ( IDirectPlay3Impl* This, DPID idParentGroup, DPID idGroup ) { - lpGroupData lpGParentData; lpGroupData lpGData; lpGroupList lpNewGList; TRACE( "(%p)->(0x%08x,0x%08x)\n", This, idParentGroup, idGroup ); - if( ( lpGParentData = DP_FindAnyGroup( (IDirectPlay2AImpl*)This, idParentGroup ) ) == NULL ) + if( DP_FindAnyGroup( (IDirectPlay2AImpl*)This, idParentGroup ) == NULL ) { return DPERR_INVALIDGROUP; } @@ -4487,8 +4486,6 @@ static HRESULT WINAPI DP_SendEx LPVOID lpData, DWORD dwDataSize, DWORD dwPriority, DWORD dwTimeout, LPVOID lpContext, LPDWORD lpdwMsgID, BOOL bAnsi ) { - lpPlayerList lpPList; - lpGroupData lpGData; BOOL bValidDestination = FALSE; FIXME( "(%p)->(0x%08x,0x%08x,0x%08x,%p,0x%08x,0x%08x,0x%08x,%p,%p,%u)" @@ -4508,7 +4505,7 @@ static HRESULT WINAPI DP_SendEx */ if( idFrom != DPID_UNKNOWN ) { - if( ( lpPList = DP_FindPlayer( This, idFrom ) ) == NULL ) + if( DP_FindPlayer( This, idFrom ) == NULL ) { WARN( "INFO: Invalid from player 0x%08x\n", idFrom ); return DPERR_INVALIDPLAYER; @@ -4551,7 +4548,7 @@ static HRESULT WINAPI DP_SendEx } if( ( !bValidDestination ) && - ( ( lpGData = DP_FindAnyGroup( This, idTo ) ) != NULL ) + ( DP_FindAnyGroup( This, idTo ) != NULL ) ) { bValidDestination = TRUE;

1 0

Andrew Talbot : dsound: Remove unused variable.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 13e405c149a147ae35f8637c49ca2d70de6b6cba URL: http://source.winehq.org/git/wine.git/?a=commit;h=13e405c149a147ae35f8637c4… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Apr 16 22:09:30 2008 +0100 dsound: Remove unused variable. --- dlls/dsound/mixer.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index fd2f671..3d3741b 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -324,7 +324,7 @@ static inline DWORD DSOUND_BufPtrDiff(DWORD buflen, DWORD ptr1, DWORD ptr2) void DSOUND_MixToTemporary(const IDirectSoundBufferImpl *dsb, DWORD writepos, DWORD len, BOOL inmixer) { INT i, size; - BYTE *ibp, *obp, *ibp_begin, *obp_begin; + BYTE *ibp, *obp, *obp_begin; INT iAdvance = dsb->pwfx->nBlockAlign; INT oAdvance = dsb->device->pwfx->nBlockAlign; DWORD freqAcc, target_writepos = 0, overshot, maxlen; @@ -340,7 +340,6 @@ void DSOUND_MixToTemporary(const IDirectSoundBufferImpl *dsb, DWORD writepos, DW maxlen = DSOUND_secpos_to_bufpos(dsb, len, 0, NULL); ibp = dsb->buffer->memory + writepos; - ibp_begin = dsb->buffer->memory; if (!inmixer) obp_begin = dsb->tmp_buffer; else if (dsb->device->tmp_buffer_len < maxlen || !dsb->device->tmp_buffer)

1 0

Andrew Talbot : comdlg32: Remove unused variable.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 5d707bc2719c1f08338d2c3905306b6ca014e8a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d707bc2719c1f08338d2c390… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Apr 16 22:09:22 2008 +0100 comdlg32: Remove unused variable. --- dlls/comdlg32/filedlg31.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comdlg32/filedlg31.c b/dlls/comdlg32/filedlg31.c index 10238de..c8fcf7e 100644 --- a/dlls/comdlg32/filedlg31.c +++ b/dlls/comdlg32/filedlg31.c @@ -143,10 +143,10 @@ static LPCWSTR FD31_GetFileType(LPCWSTR cfptr, LPCWSTR fptr, const WORD index) */ static BOOL FD31_ScanDir(const OPENFILENAMEW *ofn, HWND hWnd, LPCWSTR newPath) { - WCHAR buffer[BUFFILE]; - HWND hdlg, hdlgDir; - LRESULT lRet = TRUE; - HCURSOR hCursorWait, oldCursor; + WCHAR buffer[BUFFILE]; + HWND hdlg; + LRESULT lRet = TRUE; + HCURSOR hCursorWait, oldCursor; TRACE("Trying to change to %s\n", debugstr_w(newPath)); if ( newPath[0] && !SetCurrentDirectoryW( newPath )) @@ -180,7 +180,7 @@ static BOOL FD31_ScanDir(const OPENFILENAMEW *ofn, HWND hWnd, LPCWSTR newPath) /* list of directories */ strcpyW(buffer, FILE_star); - if ((hdlgDir = GetDlgItem(hWnd, lst2)) != 0) { + if (GetDlgItem(hWnd, lst2) != 0) { lRet = DlgDirListW(hWnd, buffer, lst2, stc1, DDL_EXCLUSIVE | DDL_DIRECTORY); } SetCursor(oldCursor);

1 0

Marcus Meissner : winex11: Move code behind error return.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 0926fff545a7e7363de217df708a21979c05e500 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0926fff545a7e7363de217df7… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Apr 16 19:54:31 2008 +0100 winex11: Move code behind error return. --- dlls/winex11.drv/dib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index 3d7bebf..f23592c 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -4040,12 +4040,12 @@ INT X11DRV_GetDIBits( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, UINT startscan, if (!(obj_size = GetObjectW( hbitmap, sizeof(dib), &dib ))) return 0; bitmap_type = DIB_GetBitmapInfo( (BITMAPINFOHEADER*)info, &width, &tempHeight, &descr.infoBpp, &descr.compression); - descr.lines = tempHeight; if (bitmap_type == -1) { ERR("Invalid bitmap\n"); return 0; } + descr.lines = tempHeight; core_header = (bitmap_type == 0); colorPtr = (LPBYTE) info + (WORD) info->bmiHeader.biSize;

1 0

Marcus Meissner : wined3d: Handle out of array bounds state.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 8d8b7ffbc79332f7748f8749d7bf30696253d0b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d8b7ffbc79332f7748f8749d… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Apr 16 22:54:28 2008 +0200 wined3d: Handle out of array bounds state. --- dlls/wined3d/basetexture.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 000c2f2..1f14a20 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -435,16 +435,17 @@ void WINAPI IWineD3DBaseTextureImpl_ApplyStateChanges(IWineD3DBaseTexture *iface state = samplerStates[WINED3DSAMP_MAGFILTER]; if (state < WINED3DTEXF_NONE || state > WINED3DTEXF_ANISOTROPIC) { FIXME("Unrecognized or unsupported MAGFILTER* value %d\n", state); + } else { + glValue = (*This->baseTexture.magLookup)[state - WINED3DTEXF_NONE]; + TRACE("ValueMAG=%d setting MAGFILTER to %x\n", state, glValue); + glTexParameteri(textureDimensions, GL_TEXTURE_MAG_FILTER, glValue); + /* We need to reset the Anisotropic filtering state when we change the mag filter to WINED3DTEXF_ANISOTROPIC (this seems a bit weird, check the documentation to see how it should be switched off. */ + if (GL_SUPPORT(EXT_TEXTURE_FILTER_ANISOTROPIC) && WINED3DTEXF_ANISOTROPIC == state && + textureDimensions != GL_TEXTURE_RECTANGLE_ARB) { + glTexParameteri(textureDimensions, GL_TEXTURE_MAX_ANISOTROPY_EXT, samplerStates[WINED3DSAMP_MAXANISOTROPY]); + } + This->baseTexture.states[WINED3DTEXSTA_MAGFILTER] = state; } - glValue = (*This->baseTexture.magLookup)[state - WINED3DTEXF_NONE]; - TRACE("ValueMAG=%d setting MAGFILTER to %x\n", state, glValue); - glTexParameteri(textureDimensions, GL_TEXTURE_MAG_FILTER, glValue); - /* We need to reset the Anisotropic filtering state when we change the mag filter to WINED3DTEXF_ANISOTROPIC (this seems a bit weird, check the documentation to see how it should be switched off. */ - if (GL_SUPPORT(EXT_TEXTURE_FILTER_ANISOTROPIC) && WINED3DTEXF_ANISOTROPIC == state && - textureDimensions != GL_TEXTURE_RECTANGLE_ARB) { - glTexParameteri(textureDimensions, GL_TEXTURE_MAX_ANISOTROPY_EXT, samplerStates[WINED3DSAMP_MAXANISOTROPY]); - } - This->baseTexture.states[WINED3DTEXSTA_MAGFILTER] = state; } if(textureDimensions != GL_TEXTURE_RECTANGLE_ARB &&

1 0

James Hawkins : kernel32: Remove an invalid trace and comment.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: cd2f10a6d01f720b6019c2d9172df7a54e754e60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd2f10a6d01f720b6019c2d91… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Apr 16 15:38:46 2008 -0500 kernel32: Remove an invalid trace and comment. --- dlls/kernel32/tests/environ.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c index c7737d0..e6dd1fc 100644 --- a/dlls/kernel32/tests/environ.c +++ b/dlls/kernel32/tests/environ.c @@ -242,12 +242,11 @@ static void test_ExpandEnvironmentStringsA(void) /* Try to get the required buffer size 'the natural way' */ strcpy(buf, "%EnvVar%"); ret_size = ExpandEnvironmentStringsA(buf, NULL, 0); - /* v5.1.2600.2945 (XP SP2) returns len + 2 here! */ - ok(ret_size == strlen(value)+1 || ret_size == strlen(value)+2 || ret_size == 0 /* Win95 */, - "ExpandEnvironmentStrings returned %d instead of %d\n", - ret_size, lstrlenA(value)+1); - if (ret_size == strlen(value)+2) - trace("ExpandEnvironmentStrings is buggy: it returned len + 2\n"); + ok(ret_size == strlen(value)+1 || /* win98 */ + ret_size == strlen(value)+2 || /* win2k, XP, win2k3 */ + ret_size == 0 /* Win95 */, + "ExpandEnvironmentStrings returned %d instead of %d, %d or %d\n", + ret_size, lstrlenA(value)+1, lstrlenA(value)+2, 0); /* Again, side-stepping the Win95 bug */ ret_size = ExpandEnvironmentStringsA(buf, buf1, 0);

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
52
Older →

Jump to page:

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 April 2008