August 2012 - Wine-commits - list.winehq.org

Jacek Caban : widl: Fail with error on an attempt to inherit interface from itself.
by Alexandre Julliard 29 Aug '12

29 Aug '12

Module: wine Branch: master Commit: 5cb75c525fc55fb01033e38277e10a30111fae62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cb75c525fc55fb01033e3827… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 28 21:33:57 2012 +0200 widl: Fail with error on an attempt to inherit interface from itself. --- tools/widl/parser.y | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 55b2df9..616a538 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -884,6 +884,8 @@ interfacehdr: attributes interface { $$.interface = $2; interfacedef: interfacehdr inherit '{' int_statements '}' semicolon_opt { $$ = $1.interface; + if($$ == $2) + error_loc("Interface can't inherit from itself\n"); type_interface_define($$, $2, $4); pointer_default = $1.old_pointer_default; }

1 0

Nikolay Sivov : xmllite: Store DTD processing mode in reader.
by Alexandre Julliard 29 Aug '12

29 Aug '12

Module: wine Branch: master Commit: ae0b830cf19033d33bfa8d5626c6148e3d260c9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae0b830cf19033d33bfa8d562… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 29 08:12:01 2012 +0400 xmllite: Store DTD processing mode in reader. --- dlls/xmllite/reader.c | 27 +++++++++++++++++++++++---- dlls/xmllite/tests/reader.c | 17 +++++++++++++++-- include/xmllite.idl | 17 +++++++++++++++++ 3 files changed, 55 insertions(+), 6 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 1eb462e..f4c0e94 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -44,6 +44,7 @@ typedef struct _xmlreader ISequentialStream *stream;/* stored as sequential stream, cause currently optimizations possible with IStream aren't implemented */ XmlReadState state; + DtdProcessing dtdmode; UINT line, pos; /* reader position in XML stream */ } xmlreader; @@ -104,7 +105,7 @@ static ULONG WINAPI xmlreader_Release(IXmlReader *iface) if (ref == 0) { if (This->input) IUnknown_Release(This->input); - if (This->stream) IUnknown_Release(This->stream); + if (This->stream) ISequentialStream_Release(This->stream); HeapFree(GetProcessHeap(), 0, This); } @@ -126,7 +127,7 @@ static HRESULT WINAPI xmlreader_SetInput(IXmlReader* iface, IUnknown *input) if (This->stream) { - IUnknown_Release(This->stream); + ISequentialStream_Release(This->stream); This->stream = NULL; } @@ -167,6 +168,9 @@ static HRESULT WINAPI xmlreader_GetProperty(IXmlReader* iface, UINT property, LO switch (property) { + case XmlReaderProperty_DtdProcessing: + *value = This->dtdmode; + break; case XmlReaderProperty_ReadState: *value = This->state; break; @@ -180,8 +184,22 @@ static HRESULT WINAPI xmlreader_GetProperty(IXmlReader* iface, UINT property, LO static HRESULT WINAPI xmlreader_SetProperty(IXmlReader* iface, UINT property, LONG_PTR value) { - FIXME("(%p %u %lu): stub\n", iface, property, value); - return E_NOTIMPL; + xmlreader *This = impl_from_IXmlReader(iface); + + TRACE("(%p %u %lu)\n", iface, property, value); + + switch (property) + { + case XmlReaderProperty_DtdProcessing: + if (value < 0 || value > _DtdProcessing_Last) return E_INVALIDARG; + This->dtdmode = value; + break; + default: + FIXME("Unimplemented property (%u)\n", property); + return E_NOTIMPL; + } + + return S_OK; } static HRESULT WINAPI xmlreader_Read(IXmlReader* iface, XmlNodeType *node_type) @@ -455,6 +473,7 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **pObject, IMalloc *pMalloc) reader->stream = NULL; reader->input = NULL; reader->state = XmlReadState_Closed; + reader->dtdmode = DtdProcessing_Prohibit; reader->line = reader->pos = 0; *pObject = &reader->IXmlReader_iface; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 1f1b2ec..39a7618 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -350,19 +350,32 @@ static void test_reader_create(void) HRESULT hr; IXmlReader *reader; IUnknown *input; + DtdProcessing dtd; /* crashes native */ if (0) { pCreateXmlReader(&IID_IXmlReader, NULL, NULL); - pCreateXmlReader(NULL, (LPVOID*)&reader, NULL); + pCreateXmlReader(NULL, (void**)&reader, NULL); } - hr = pCreateXmlReader(&IID_IXmlReader, (LPVOID*)&reader, NULL); + hr = pCreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); test_read_state(reader, XmlReadState_Closed, -1, FALSE); + dtd = 2; + hr = IXmlReader_GetProperty(reader, XmlReaderProperty_DtdProcessing, (LONG_PTR*)&dtd); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(dtd == DtdProcessing_Prohibit, "got %d\n", dtd); + + dtd = 2; + hr = IXmlReader_SetProperty(reader, XmlReaderProperty_DtdProcessing, dtd); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + + hr = IXmlReader_SetProperty(reader, XmlReaderProperty_DtdProcessing, -1); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + /* Null input pointer, releases previous input */ hr = IXmlReader_SetInput(reader, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); diff --git a/include/xmllite.idl b/include/xmllite.idl index d416d21..9bf406c 100644 --- a/include/xmllite.idl +++ b/include/xmllite.idl @@ -88,6 +88,23 @@ cpp_quote(" XmlReadState_EndOfFile = 3,") cpp_quote(" XmlReadState_Closed = 4") cpp_quote("} XmlReadState;") +/* conformance levels */ +cpp_quote("typedef enum XmlConformanceLevel") +cpp_quote("{") +cpp_quote(" XmlConformanceLevel_Auto = 0,") +cpp_quote(" XmlConformanceLevel_Fragment = 1,") +cpp_quote(" XmlConformanceLevel_Document = 2,") +cpp_quote(" _XmlConformanceLevel_Last = 2") +cpp_quote("} XmlConformanceLevel;") + +/* DTD processing mode */ +cpp_quote("typedef enum DtdProcessing") +cpp_quote("{") +cpp_quote(" DtdProcessing_Prohibit = 0,") +cpp_quote(" DtdProcessing_Parse = DtdProcessing_Prohibit + 1,") +cpp_quote(" _DtdProcessing_Last = DtdProcessing_Parse") +cpp_quote("} DtdProcessing;") + /* IXmlReader properties */ cpp_quote("typedef enum XmlReaderProperty") cpp_quote("{")

1 0

Alistair Leslie-Hughes : oleaut32: Add VT_BSTR to VT_UI2|VT_ARRAY test.
by Alexandre Julliard 29 Aug '12

29 Aug '12

Module: wine Branch: master Commit: 87fabd100978895327190562f88c37297c13c539 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87fabd100978895327190562f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Aug 17 10:21:25 2012 +1000 oleaut32: Add VT_BSTR to VT_UI2|VT_ARRAY test. --- dlls/oleaut32/tests/safearray.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index c484bb8..b689334 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -294,7 +294,7 @@ static void test_safearray(void) LONG indices[2]; HRESULT hres; SAFEARRAYBOUND bound, bounds[2]; - VARIANT v; + VARIANT v,d; LPVOID data; IID iid; VARTYPE vt; @@ -557,6 +557,15 @@ static void test_safearray(void) ok(V_BSTR(&v)[0] == 0x6548,"First letter are not 'He', but %x\n", V_BSTR(&v)[0]); VariantClear(&v); + VariantInit(&d); + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = SysAllocStringLen(NULL, 0); + hres = VariantChangeTypeEx(&d, &v, 0, 0, VT_UI1|VT_ARRAY); + ok(hres==S_OK, "CTE VT_BSTR -> VT_UI1|VT_ARRAY failed with %x\n",hres); + ok(V_VT(&d) == (VT_UI1|VT_ARRAY),"CTE BSTR -> VT_UI1|VT_ARRAY did not return VT_UI1|VT_ARRAY, but %d.v\n",V_VT(&v)); + VariantClear(&v); + VariantClear(&d); + /* check locking functions */ a = SafeArrayCreate(VT_I4, 1, &bound); ok(a!=NULL,"SAC should not fail\n");

1 0

Jacek Caban : mshtml: Added nsIDirectoryServiceProvider2 implementation.
by Alexandre Julliard 29 Aug '12

29 Aug '12

Module: wine Branch: master Commit: b4a228f46177d7cdde3d811e832971b1a0da7ab9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4a228f46177d7cdde3d811e8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 29 11:37:39 2012 +0200 mshtml: Added nsIDirectoryServiceProvider2 implementation. --- dlls/mshtml/nsembed.c | 35 +++++++++++++++++++++++------------ dlls/mshtml/nsiface.idl | 10 ++++++++++ 2 files changed, 33 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 9188973..35ebbc3 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -93,7 +93,7 @@ nsresult create_nsfile(const PRUnichar *path, nsIFile **ret) return nsres; } -static nsresult NSAPI nsDirectoryServiceProvider_QueryInterface(nsIDirectoryServiceProvider *iface, +static nsresult NSAPI nsDirectoryServiceProvider2_QueryInterface(nsIDirectoryServiceProvider2 *iface, nsIIDRef riid, void **result) { if(IsEqualGUID(&IID_nsISupports, riid)) { @@ -102,6 +102,9 @@ static nsresult NSAPI nsDirectoryServiceProvider_QueryInterface(nsIDirectoryServ }else if(IsEqualGUID(&IID_nsIDirectoryServiceProvider, riid)) { TRACE("(IID_nsIDirectoryServiceProvider %p)\n", result); *result = iface; + }else if(IsEqualGUID(&IID_nsIDirectoryServiceProvider2, riid)) { + TRACE("(IID_nsIDirectoryServiceProvider2 %p)\n", result); + *result = iface; }else { WARN("(%s %p)\n", debugstr_guid(riid), result); *result = NULL; @@ -112,12 +115,12 @@ static nsresult NSAPI nsDirectoryServiceProvider_QueryInterface(nsIDirectoryServ return NS_OK; } -static nsrefcnt NSAPI nsDirectoryServiceProvider_AddRef(nsIDirectoryServiceProvider *iface) +static nsrefcnt NSAPI nsDirectoryServiceProvider2_AddRef(nsIDirectoryServiceProvider2 *iface) { return 2; } -static nsrefcnt NSAPI nsDirectoryServiceProvider_Release(nsIDirectoryServiceProvider *iface) +static nsrefcnt NSAPI nsDirectoryServiceProvider2_Release(nsIDirectoryServiceProvider2 *iface) { return 1; } @@ -157,7 +160,7 @@ static nsresult create_profile_directory(void) return nsres; } -static nsresult NSAPI nsDirectoryServiceProvider_GetFile(nsIDirectoryServiceProvider *iface, +static nsresult NSAPI nsDirectoryServiceProvider2_GetFile(nsIDirectoryServiceProvider2 *iface, const char *prop, cpp_bool *persistent, nsIFile **_retval) { TRACE("(%s %p %p)\n", debugstr_a(prop), persistent, _retval); @@ -177,15 +180,23 @@ static nsresult NSAPI nsDirectoryServiceProvider_GetFile(nsIDirectoryServiceProv return NS_ERROR_FAILURE; } -static const nsIDirectoryServiceProviderVtbl nsDirectoryServiceProviderVtbl = { - nsDirectoryServiceProvider_QueryInterface, - nsDirectoryServiceProvider_AddRef, - nsDirectoryServiceProvider_Release, - nsDirectoryServiceProvider_GetFile +static nsresult NSAPI nsDirectoryServiceProvider2_GetFiles(nsIDirectoryServiceProvider2 *iface, + const char *prop, nsISimpleEnumerator **_retval) +{ + TRACE("(%s %p)\n", debugstr_a(prop), _retval); + return NS_ERROR_FAILURE; +} + +static const nsIDirectoryServiceProvider2Vtbl nsDirectoryServiceProvider2Vtbl = { + nsDirectoryServiceProvider2_QueryInterface, + nsDirectoryServiceProvider2_AddRef, + nsDirectoryServiceProvider2_Release, + nsDirectoryServiceProvider2_GetFile, + nsDirectoryServiceProvider2_GetFiles }; -static nsIDirectoryServiceProvider nsDirectoryServiceProvider = - { &nsDirectoryServiceProviderVtbl }; +static nsIDirectoryServiceProvider2 nsDirectoryServiceProvider2 = + { &nsDirectoryServiceProvider2Vtbl }; static LRESULT WINAPI nsembed_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { @@ -544,7 +555,7 @@ static BOOL init_xpcom(const PRUnichar *gre_path) return FALSE; } - nsres = NS_InitXPCOM2(&pServMgr, gre_dir, &nsDirectoryServiceProvider); + nsres = NS_InitXPCOM2(&pServMgr, gre_dir, (nsIDirectoryServiceProvider*)&nsDirectoryServiceProvider2); if(NS_FAILED(nsres)) { ERR("NS_InitXPCOM2 failed: %08x\n", nsres); FreeLibrary(xul_handle); diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 5140132..d19d5df 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -2517,6 +2517,16 @@ interface nsIDirectoryServiceProvider : nsISupports [ object, + uuid(2f977d4b-5485-11d4-87e2-0010a4e75ef2), + local +] +interface nsIDirectoryServiceProvider2 : nsIDirectoryServiceProvider +{ + nsresult GetFiles(const char *prop, nsISimpleEnumerator **_retval); +} + +[ + object, uuid(15fd6940-8ea7-11d3-93ad-00104ba0fd40), local ]

1 0

Jacek Caban : mshtml: Use nsIDirectoryServiceProvider2:: GetFiles to provide Wine-specific plugin directory.
by Alexandre Julliard 29 Aug '12

29 Aug '12

Module: wine Branch: master Commit: 4c660d6e6250103b8cb8a985a068ee5e570fff5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c660d6e6250103b8cb8a985a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 29 11:37:57 2012 +0200 mshtml: Use nsIDirectoryServiceProvider2::GetFiles to provide Wine-specific plugin directory. --- dlls/mshtml/nsembed.c | 153 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 144 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 35ebbc3..48a54b0 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -71,7 +71,7 @@ static HINSTANCE xul_handle = NULL; static nsIServiceManager *pServMgr = NULL; static nsIComponentManager *pCompMgr = NULL; static nsIMemory *nsmem = NULL; -static nsIFile *profile_directory; +static nsIFile *profile_directory, *plugin_directory; static const WCHAR wszNsContainer[] = {'N','s','C','o','n','t','a','i','n','e','r',0}; @@ -93,6 +93,112 @@ nsresult create_nsfile(const PRUnichar *path, nsIFile **ret) return nsres; } +typedef struct { + nsISimpleEnumerator nsISimpleEnumerator_iface; + LONG ref; + nsISupports *value; +} nsSingletonEnumerator; + +static inline nsSingletonEnumerator *impl_from_nsISimpleEnumerator(nsISimpleEnumerator *iface) +{ + return CONTAINING_RECORD(iface, nsSingletonEnumerator, nsISimpleEnumerator_iface); +} + +static nsresult NSAPI nsSingletonEnumerator_QueryInterface(nsISimpleEnumerator *iface, nsIIDRef riid, void **ppv) +{ + nsSingletonEnumerator *This = impl_from_nsISimpleEnumerator(iface); + + if(IsEqualGUID(&IID_nsISupports, riid)) { + TRACE("(%p)->(IID_nsISupports %p)\n", This, ppv); + *ppv = &This->nsISimpleEnumerator_iface; + }else if(IsEqualGUID(&IID_nsISimpleEnumerator, riid)) { + TRACE("(%p)->(IID_nsISimpleEnumerator %p)\n", This, ppv); + *ppv = &This->nsISimpleEnumerator_iface; + }else { + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return NS_NOINTERFACE; + } + + nsISupports_AddRef((nsISupports*)*ppv); + return NS_OK; +} + +static nsrefcnt NSAPI nsSingletonEnumerator_AddRef(nsISimpleEnumerator *iface) +{ + nsSingletonEnumerator *This = impl_from_nsISimpleEnumerator(iface); + nsrefcnt ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static nsrefcnt NSAPI nsSingletonEnumerator_Release(nsISimpleEnumerator *iface) +{ + nsSingletonEnumerator *This = impl_from_nsISimpleEnumerator(iface); + nsrefcnt ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) { + if(This->value) + nsISupports_Release(This->value); + heap_free(This); + } + + return ref; +} + +static nsresult NSAPI nsSingletonEnumerator_HasMoreElements(nsISimpleEnumerator *iface, cpp_bool *_retval) +{ + nsSingletonEnumerator *This = impl_from_nsISimpleEnumerator(iface); + + TRACE("(%p)->()\n", This); + + *_retval = This->value != NULL; + return NS_OK; +} + +static nsresult NSAPI nsSingletonEnumerator_GetNext(nsISimpleEnumerator *iface, nsISupports **_retval) +{ + nsSingletonEnumerator *This = impl_from_nsISimpleEnumerator(iface); + + TRACE("(%p)->()\n", This); + + if(!This->value) + return NS_ERROR_UNEXPECTED; + + *_retval = This->value; + This->value = NULL; + return NS_OK; +} + +static const nsISimpleEnumeratorVtbl nsSingletonEnumeratorVtbl = { + nsSingletonEnumerator_QueryInterface, + nsSingletonEnumerator_AddRef, + nsSingletonEnumerator_Release, + nsSingletonEnumerator_HasMoreElements, + nsSingletonEnumerator_GetNext +}; + +static nsISimpleEnumerator *create_singleton_enumerator(nsISupports *value) +{ + nsSingletonEnumerator *ret; + + ret = heap_alloc(sizeof(*ret)); + if(!ret) + return NULL; + + ret->nsISimpleEnumerator_iface.lpVtbl = &nsSingletonEnumeratorVtbl; + ret->ref = 1; + + if(value) + nsISupports_AddRef(value); + ret->value = value; + return &ret->nsISimpleEnumerator_iface; +} + static nsresult NSAPI nsDirectoryServiceProvider2_QueryInterface(nsIDirectoryServiceProvider2 *iface, nsIIDRef riid, void **result) { @@ -184,6 +290,38 @@ static nsresult NSAPI nsDirectoryServiceProvider2_GetFiles(nsIDirectoryServicePr const char *prop, nsISimpleEnumerator **_retval) { TRACE("(%s %p)\n", debugstr_a(prop), _retval); + + if(!strcmp(prop, "APluginsDL")) { + WCHAR plugin_path[MAX_PATH]; + nsIFile *file; + int len; + nsresult nsres; + + if(!plugin_directory) { + static const WCHAR gecko_pluginW[] = {'\\','g','e','c','k','o','\\','p','l','u','g','i','n',0}; + + len = GetSystemDirectoryW(plugin_path, (sizeof(plugin_path)-sizeof(gecko_pluginW))/sizeof(WCHAR)+1); + if(!len) + return NS_ERROR_UNEXPECTED; + + strcpyW(plugin_path+len, gecko_pluginW); + nsres = create_nsfile(plugin_path, &plugin_directory); + if(NS_FAILED(nsres)) + return nsres; + } + + nsres = nsIFile_Clone(plugin_directory, &file); + if(NS_FAILED(nsres)) + return nsres; + + *_retval = create_singleton_enumerator((nsISupports*)file); + nsIFile_Release(file); + if(!*_retval) + return NS_ERROR_OUT_OF_MEMORY; + + return NS_OK; + } + return NS_ERROR_FAILURE; } @@ -300,8 +438,6 @@ static void set_environment(LPCWSTR gre_path) static const WCHAR nspr_log_modulesW[] = {'N','S','P','R','_','L','O','G','_','M','O','D','U','L','E','S',0}; static const WCHAR debug_formatW[] = {'a','l','l',':','%','d',0}; - static const WCHAR moz_plugin_pathW[] = {'M','O','Z','_','P','L','U','G','I','N','_','P','A','T','H',0}; - static const WCHAR gecko_pluginW[] = {'\\','g','e','c','k','o','\\','p','l','u','g','i','n',0}; /* We have to modify PATH as XPCOM loads other DLLs from this directory. */ GetEnvironmentVariableW(pathW, path_env, sizeof(path_env)/sizeof(WCHAR)); @@ -321,12 +457,6 @@ static void set_environment(LPCWSTR gre_path) sprintfW(buf, debug_formatW, debug_level); SetEnvironmentVariableW(nspr_log_modulesW, buf); - - len = GetSystemDirectoryW(path_env, (sizeof(path_env)-sizeof(gecko_pluginW))/sizeof(WCHAR)+1); - if(len) { - strcpyW(path_env+len, gecko_pluginW); - SetEnvironmentVariableW(moz_plugin_pathW, path_env); - } } static BOOL load_xul(const PRUnichar *gre_path) @@ -944,6 +1074,11 @@ void close_gecko(void) profile_directory = NULL; } + if(plugin_directory) { + nsIFile_Release(plugin_directory); + plugin_directory = NULL; + } + if(pCompMgr) nsIComponentManager_Release(pCompMgr);

1 0

Alexandre Julliard : user32: ScrollWindow should not use a cached DC, unlike ScrollWindowEx.
by Alexandre Julliard 29 Aug '12

29 Aug '12

Module: wine Branch: master Commit: f71be05ba7bd7a758200c395f1c211f38e5e98f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f71be05ba7bd7a758200c395f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 29 12:22:58 2012 +0200 user32: ScrollWindow should not use a cached DC, unlike ScrollWindowEx. --- dlls/user32/painting.c | 36 +++++++++++++++++++------------- dlls/user32/tests/dce.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 15 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index dcf615d..98dfc54 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -1367,17 +1367,8 @@ INT WINAPI ExcludeUpdateRgn( HDC hdc, HWND hwnd ) } -/************************************************************************* - * ScrollWindowEx (USER32.@) - * - * Note: contrary to what the doc says, pixels that are scrolled from the - * outside of clipRect to the inside are NOT painted. - * - */ -INT WINAPI ScrollWindowEx( HWND hwnd, INT dx, INT dy, - const RECT *rect, const RECT *clipRect, - HRGN hrgnUpdate, LPRECT rcUpdate, - UINT flags ) +static INT scroll_window( HWND hwnd, INT dx, INT dy, const RECT *rect, const RECT *clipRect, + HRGN hrgnUpdate, LPRECT rcUpdate, UINT flags, BOOL is_ex ) { INT retVal = NULLREGION; BOOL bOwnRgn = TRUE; @@ -1416,11 +1407,12 @@ INT WINAPI ScrollWindowEx( HWND hwnd, INT dx, INT dy, newCaretPos.x = newCaretPos.y = 0; if( !IsRectEmpty(&cliprc) && (dx || dy)) { - DWORD dcxflags = DCX_CACHE; + DWORD dcxflags = 0; DWORD style = GetWindowLongW( hwnd, GWL_STYLE ); hwndCaret = fix_caret(hwnd, &rc, dx, dy, flags, &moveCaret, &newCaretPos); + if (is_ex) dcxflags |= DCX_CACHE; if( style & WS_CLIPSIBLINGS) dcxflags |= DCX_CLIPSIBLINGS; if( GetClassLongW( hwnd, GCL_STYLE ) & CS_PARENTDC) dcxflags |= DCX_PARENTCLIP; @@ -1523,15 +1515,29 @@ INT WINAPI ScrollWindowEx( HWND hwnd, INT dx, INT dy, /************************************************************************* + * ScrollWindowEx (USER32.@) + * + * Note: contrary to what the doc says, pixels that are scrolled from the + * outside of clipRect to the inside are NOT painted. + * + */ +INT WINAPI ScrollWindowEx( HWND hwnd, INT dx, INT dy, + const RECT *rect, const RECT *clipRect, + HRGN hrgnUpdate, LPRECT rcUpdate, + UINT flags ) +{ + return scroll_window( hwnd, dx, dy, rect, clipRect, hrgnUpdate, rcUpdate, flags, TRUE ); +} + +/************************************************************************* * ScrollWindow (USER32.@) * */ BOOL WINAPI ScrollWindow( HWND hwnd, INT dx, INT dy, const RECT *rect, const RECT *clipRect ) { - return (ERROR != ScrollWindowEx( hwnd, dx, dy, rect, clipRect, 0, NULL, - (rect ? 0 : SW_SCROLLCHILDREN) | - SW_INVALIDATE | SW_ERASE )); + return scroll_window( hwnd, dx, dy, rect, clipRect, 0, NULL, + SW_INVALIDATE | SW_ERASE | (rect ? 0 : SW_SCROLLCHILDREN), FALSE ) != ERROR; } diff --git a/dlls/user32/tests/dce.c b/dlls/user32/tests/dce.c index 9b5a89e..1aa548e 100644 --- a/dlls/user32/tests/dce.c +++ b/dlls/user32/tests/dce.c @@ -406,6 +406,56 @@ static void test_begin_paint(void) "clip box should have been reset %d,%d-%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); } +/* test ScrollWindow with window DCs */ +static void test_scroll_window(void) +{ + PAINTSTRUCT ps; + HDC hdc; + RECT clip, rect; + + /* ScrollWindow uses the window DC, ScrollWindowEx doesn't */ + + UpdateWindow( hwnd_owndc ); + SetRect( &clip, 25, 25, 50, 50 ); + ScrollWindow( hwnd_owndc, -5, -10, NULL, &clip ); + hdc = BeginPaint( hwnd_owndc, &ps ); + SetRectEmpty( &rect ); + GetClipBox( hdc, &rect ); + ok( rect.left >= 25 && rect.top >= 25 && rect.right <= 50 && rect.bottom <= 50, + "invalid clip box %d,%d-%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + EndPaint( hwnd_owndc, &ps ); + + SetViewportExtEx( hdc, 2, 3, NULL ); + SetViewportOrgEx( hdc, 30, 20, NULL ); + + ScrollWindow( hwnd_owndc, -5, -10, NULL, &clip ); + hdc = BeginPaint( hwnd_owndc, &ps ); + SetRectEmpty( &rect ); + GetClipBox( hdc, &rect ); + ok( rect.left >= 25 && rect.top >= 25 && rect.right <= 50 && rect.bottom <= 50, + "invalid clip box %d,%d-%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + EndPaint( hwnd_owndc, &ps ); + + ScrollWindowEx( hwnd_owndc, -5, -10, NULL, &clip, 0, NULL, SW_INVALIDATE | SW_ERASE ); + hdc = BeginPaint( hwnd_owndc, &ps ); + SetRectEmpty( &rect ); + GetClipBox( hdc, &rect ); + ok( rect.left >= -5 && rect.top >= 5 && rect.right <= 20 && rect.bottom <= 30, + "invalid clip box %d,%d-%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + EndPaint( hwnd_owndc, &ps ); + + SetViewportExtEx( hdc, 1, 1, NULL ); + SetViewportOrgEx( hdc, 0, 0, NULL ); + + ScrollWindowEx( hwnd_owndc, -5, -10, NULL, &clip, 0, NULL, SW_INVALIDATE | SW_ERASE ); + hdc = BeginPaint( hwnd_owndc, &ps ); + SetRectEmpty( &rect ); + GetClipBox( hdc, &rect ); + ok( rect.left >= 25 && rect.top >= 25 && rect.right <= 50 && rect.bottom <= 50, + "invalid clip box %d,%d-%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + EndPaint( hwnd_owndc, &ps ); +} + static void test_invisible_create(void) { HWND hwnd_owndc = CreateWindowA("owndc_class", NULL, WS_OVERLAPPED, @@ -559,6 +609,7 @@ START_TEST(dce) test_parameters(); test_dc_visrgn(); test_begin_paint(); + test_scroll_window(); test_invisible_create(); test_dc_layout();

1 0

Alexandre Julliard : user32: Rely on SetWindowPos to invalidate the DCEs when the window region is changed .
by Alexandre Julliard 29 Aug '12

29 Aug '12

Module: wine Branch: master Commit: 4890964e31c399c6f2354fb3fd6f5c57cb00ad29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4890964e31c399c6f2354fb3f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 29 18:08:05 2012 +0200 user32: Rely on SetWindowPos to invalidate the DCEs when the window region is changed. --- dlls/user32/winpos.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index c4b61a8..0ff4762 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -213,14 +213,12 @@ int WINAPI SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL bRedraw ) SERVER_END_REQ; } - if (ret) ret = USER_Driver->pSetWindowRgn( hwnd, hrgn, bRedraw ); - if (ret) { UINT swp_flags = SWP_NOSIZE|SWP_NOMOVE|SWP_NOZORDER|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE; if (!bRedraw) swp_flags |= SWP_NOREDRAW; SetWindowPos( hwnd, 0, 0, 0, 0, 0, swp_flags ); - invalidate_dce( hwnd, NULL ); + USER_Driver->pSetWindowRgn( hwnd, hrgn, bRedraw ); if (hrgn) DeleteObject( hrgn ); } return ret; @@ -2004,7 +2002,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, if (ret) { if (((swp_flags & SWP_AGG_NOPOSCHANGE) != SWP_AGG_NOPOSCHANGE) || - (swp_flags & (SWP_HIDEWINDOW | SWP_SHOWWINDOW | SWP_STATECHANGED))) + (swp_flags & (SWP_HIDEWINDOW | SWP_SHOWWINDOW | SWP_STATECHANGED | SWP_FRAMECHANGED))) invalidate_dce( hwnd, &old_window_rect ); USER_Driver->pWindowPosChanged( hwnd, insert_after, swp_flags, window_rect,

1 0

Alexandre Julliard : user32: Always go through set_window_pos when the WS_VISIBLE style is changed.
by Alexandre Julliard 29 Aug '12

29 Aug '12

Module: wine Branch: master Commit: d35fc4369fd9eb7e5fca78cc0d61e241de286ee0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d35fc4369fd9eb7e5fca78cc0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 29 18:08:37 2012 +0200 user32: Always go through set_window_pos when the WS_VISIBLE style is changed. --- dlls/user32/win.c | 19 ++++++++++++++++++- dlls/winex11.drv/window.c | 16 ++-------------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index cc8461a..66fc8cc 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -641,8 +641,16 @@ ULONG WIN_SetStyle( HWND hwnd, ULONG set_bits, ULONG clear_bits ) WIN_ReleasePtr( win ); if (ok) { + if ((style.styleOld ^ style.styleNew) & WS_VISIBLE) + { + RECT window_rect, client_rect; + UINT flags = style.styleNew & WS_VISIBLE ? SWP_SHOWWINDOW : 0; /* we don't hide it */ + + WIN_GetRectangles( hwnd, COORDS_PARENT, &window_rect, &client_rect ); + set_window_pos( hwnd, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | + SWP_NOZORDER | SWP_NOACTIVATE | flags, &window_rect, &client_rect, NULL ); + } USER_Driver->pSetWindowStyle( hwnd, GWL_STYLE, &style ); - if ((style.styleOld ^ style.styleNew) & WS_VISIBLE) invalidate_dce( hwnd, NULL ); } return style.styleOld; } @@ -2334,6 +2342,15 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, B { style.styleOld = retval; style.styleNew = newval; + if (offset == GWL_STYLE && ((style.styleOld ^ style.styleNew) & WS_VISIBLE)) + { + RECT window_rect, client_rect; + UINT flags = style.styleNew & WS_VISIBLE ? SWP_SHOWWINDOW : 0; /* we don't hide it */ + + WIN_GetRectangles( hwnd, COORDS_PARENT, &window_rect, &client_rect ); + set_window_pos( hwnd, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | + SWP_NOZORDER | SWP_NOACTIVATE | flags, &window_rect, &client_rect, NULL ); + } USER_Driver->pSetWindowStyle( hwnd, offset, &style ); SendMessageW( hwnd, WM_STYLECHANGED, offset, (LPARAM)&style ); } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 9070669..5840e85 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1807,22 +1807,10 @@ void CDECL X11DRV_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style ) DWORD changed; if (hwnd == GetDesktopWindow()) return; - changed = style->styleNew ^ style->styleOld; - - /* if WS_VISIBLE was set through WM_SETREDRAW, map the window if it's the first time */ - if (offset == GWL_STYLE && (changed & WS_VISIBLE) && (style->styleNew & WS_VISIBLE) && !data) - { - if (!(data = X11DRV_create_win_data( hwnd ))) return; - - if (data->whole_window && is_window_rect_mapped( &data->window_rect )) - { - Display *display = thread_display(); - set_wm_hints( display, data ); - if (!data->mapped) map_window( display, data, style->styleNew ); - } - } if (!data || !data->whole_window) return; + changed = style->styleNew ^ style->styleOld; + if (offset == GWL_STYLE && (changed & WS_DISABLED)) set_wm_hints( thread_display(), data );

1 0

Alexandre Julliard : user32: Invalidate the DCEs while still holding the window lock in SetWindowPos.
by Alexandre Julliard 29 Aug '12

29 Aug '12

Module: wine Branch: master Commit: 85fed5b1949473df5ec9f14648bf134e30b2af94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85fed5b1949473df5ec9f1464… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 29 18:13:57 2012 +0200 user32: Invalidate the DCEs while still holding the window lock in SetWindowPos. --- dlls/user32/painting.c | 19 ++++++++----------- dlls/user32/user_private.h | 3 ++- dlls/user32/winpos.c | 16 +++++++--------- 3 files changed, 17 insertions(+), 21 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 98dfc54..64f4318 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -399,40 +399,38 @@ static void make_dc_dirty( struct dce *dce ) * rectangle. In addition, pWnd->parent DCEs may need to be updated if * DCX_CLIPCHILDREN flag is set. */ -void invalidate_dce( HWND hwnd, const RECT *extra_rect ) +void invalidate_dce( WND *win, const RECT *extra_rect ) { RECT window_rect; struct dce *dce; - HWND hwndScope = GetAncestor( hwnd, GA_PARENT ); - if (!hwndScope) return; + if (!win->parent) return; - GetWindowRect( hwnd, &window_rect ); + GetWindowRect( win->obj.handle, &window_rect ); - TRACE("%p scope hwnd = %p %s (%s)\n", - hwnd, hwndScope, wine_dbgstr_rect(&window_rect), wine_dbgstr_rect(extra_rect) ); + TRACE("%p parent %p %s (%s)\n", + win->obj.handle, win->parent, wine_dbgstr_rect(&window_rect), wine_dbgstr_rect(extra_rect) ); /* walk all DCEs and fixup non-empty entries */ - USER_Lock(); LIST_FOR_EACH_ENTRY( dce, &dce_list, struct dce, entry ) { TRACE( "%p: hwnd %p dcx %08x %s %s\n", dce, dce->hwnd, dce->flags, (dce->flags & DCX_CACHE) ? "Cache" : "Owned", dce->count ? "InUse" : "" ); if (!dce->hwnd) continue; - if ((dce->hwnd == hwndScope) && !(dce->flags & DCX_CLIPCHILDREN)) + if ((dce->hwnd == win->parent) && !(dce->flags & DCX_CLIPCHILDREN)) continue; /* child window positions don't bother us */ /* if DCE window is a child of hwnd, it has to be invalidated */ - if (dce->hwnd == hwnd || IsChild( hwnd, dce->hwnd )) + if (dce->hwnd == win->obj.handle || IsChild( win->obj.handle, dce->hwnd )) { make_dc_dirty( dce ); continue; } /* otherwise check if the window rectangle intersects this DCE window */ - if (hwndScope == dce->hwnd || IsChild( hwndScope, dce->hwnd )) + if (win->parent == dce->hwnd || IsChild( win->parent, dce->hwnd )) { RECT dce_rect, tmp; GetWindowRect( dce->hwnd, &dce_rect ); @@ -441,7 +439,6 @@ void invalidate_dce( HWND hwnd, const RECT *extra_rect ) make_dc_dirty( dce ); } } - USER_Unlock(); } /*********************************************************************** diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 1a63bad..2bd8ad8 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -205,12 +205,13 @@ extern HMODULE user32_module DECLSPEC_HIDDEN; extern HBRUSH SYSCOLOR_55AABrush DECLSPEC_HIDDEN; struct dce; +struct tagWND; extern BOOL CLIPBOARD_ReleaseOwner(void) DECLSPEC_HIDDEN; extern BOOL FOCUS_MouseActivate( HWND hwnd ) DECLSPEC_HIDDEN; extern BOOL set_capture_window( HWND hwnd, UINT gui_flags, HWND *prev_ret ) DECLSPEC_HIDDEN; extern void free_dce( struct dce *dce, HWND hwnd ) DECLSPEC_HIDDEN; -extern void invalidate_dce( HWND hwnd, const RECT *rect ) DECLSPEC_HIDDEN; +extern void invalidate_dce( struct tagWND *win, const RECT *rect ) DECLSPEC_HIDDEN; extern void erase_now( HWND hwnd, UINT rdw_flags ) DECLSPEC_HIDDEN; extern void *get_hook_proc( void *proc, const WCHAR *module ) DECLSPEC_HIDDEN; extern LRESULT call_current_hook( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 0ff4762..23b0b7f 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1997,17 +1997,15 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, } } SERVER_END_REQ; - WIN_ReleasePtr( win ); - if (ret) - { - if (((swp_flags & SWP_AGG_NOPOSCHANGE) != SWP_AGG_NOPOSCHANGE) || - (swp_flags & (SWP_HIDEWINDOW | SWP_SHOWWINDOW | SWP_STATECHANGED | SWP_FRAMECHANGED))) - invalidate_dce( hwnd, &old_window_rect ); + if (ret && (((swp_flags & SWP_AGG_NOPOSCHANGE) != SWP_AGG_NOPOSCHANGE) || + (swp_flags & (SWP_HIDEWINDOW | SWP_SHOWWINDOW | SWP_STATECHANGED | SWP_FRAMECHANGED)))) + invalidate_dce( win, &old_window_rect ); - USER_Driver->pWindowPosChanged( hwnd, insert_after, swp_flags, window_rect, - client_rect, &visible_rect, valid_rects ); - } + WIN_ReleasePtr( win ); + + if (ret) USER_Driver->pWindowPosChanged( hwnd, insert_after, swp_flags, window_rect, + client_rect, &visible_rect, valid_rects ); return ret; }

1 0

Jonas Wielicki : wined3d: Fix crash in wined3d_device_reset with gdi backend for directdraw.
by Alexandre Julliard 29 Aug '12

29 Aug '12

Module: wine Branch: master Commit: a64b7918c8171ce208e82ecc2fa909ebc3626037 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a64b7918c8171ce208e82ecc2… Author: Jonas Wielicki <wine-patches(a)sotecware.net> Date: Wed Aug 29 15:09:59 2012 +0200 wined3d: Fix crash in wined3d_device_reset with gdi backend for directdraw. --- dlls/wined3d/device.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9744265..0826957 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5161,13 +5161,16 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, } stateblock_unbind_resources(device->stateBlock); - if (swapchain->back_buffers && swapchain->back_buffers[0]) - wined3d_device_set_render_target(device, 0, swapchain->back_buffers[0], FALSE); - else - wined3d_device_set_render_target(device, 0, swapchain->front_buffer, FALSE); - for (i = 1; i < device->adapter->gl_info.limits.buffers; ++i) + if (device->fb.render_targets) { - wined3d_device_set_render_target(device, i, NULL, FALSE); + if (swapchain->back_buffers && swapchain->back_buffers[0]) + wined3d_device_set_render_target(device, 0, swapchain->back_buffers[0], FALSE); + else + wined3d_device_set_render_target(device, 0, swapchain->front_buffer, FALSE); + for (i = 1; i < device->adapter->gl_info.limits.buffers; ++i) + { + wined3d_device_set_render_target(device, i, NULL, FALSE); + } } wined3d_device_set_depth_stencil(device, NULL);

1 0