wine-commits June 2010

wine-commits@winehq.org

3 participants
663 discussions

Andrew Eikum : include: Add new SHCNRF flags.
by Alexandre Julliard 29 Jun '10

29 Jun '10

Module: wine Branch: master Commit: 5f884d19c69b8a857083c013e5aecf6031d7bf70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f884d19c69b8a857083c013e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jun 28 10:06:51 2010 -0500 include: Add new SHCNRF flags. --- include/shlobj.h | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/include/shlobj.h b/include/shlobj.h index dbf8518..5f125c1 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -1297,11 +1297,17 @@ typedef struct _SHChangeNotifyEntry #define SHCNF_PRINTERW 0x0006 #define SHCNF_TYPE 0x00FF #define SHCNF_FLUSH 0x1000 -#define SHCNF_FLUSHNOWAIT 0x2000 +#define SHCNF_FLUSHNOWAIT 0x3000 +#define SHCNF_NOTIFYRECURSIVE 0x10000 #define SHCNF_PATH WINELIB_NAME_AW(SHCNF_PATH) #define SHCNF_PRINTER WINELIB_NAME_AW(SHCNF_PRINTER) +#define SHCNRF_InterruptLevel 0x0001 +#define SHCNRF_ShellLevel 0x0002 +#define SHCNRF_RecursiveInterrupt 0x1000 +#define SHCNRF_NewDelivery 0x8000 + void WINAPI SHChangeNotify(LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID dwItem2); typedef enum {

1 0

Andrew Eikum : shell32: UNIX paths should be parsed by unixfs.
by Alexandre Julliard 29 Jun '10

29 Jun '10

Module: wine Branch: master Commit: a77fb7f5508c268fbc82c30da1774d97586ccb67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a77fb7f5508c268fbc82c30da… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jun 28 12:06:27 2010 -0500 shell32: UNIX paths should be parsed by unixfs. Some tests show that trying to create a PIDL from a path starting with '/' fails in Windows, so this change shouldn't cause a conflict with the shell namespace. --- dlls/shell32/shfldr_desktop.c | 37 ++++++++++++++++++++++++++----------- 1 files changed, 26 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index 46a725f..e3798a6 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -213,21 +213,36 @@ static HRESULT WINAPI ISF_Desktop_fnParseDisplayName (IShellFolder2 * iface, if (*lpszDisplayName) { - WCHAR szPath[MAX_PATH]; - LPWSTR pathPtr; - - /* build a complete path to create a simple pidl */ - lstrcpynW(szPath, This->sPathTarget, MAX_PATH); - pathPtr = PathAddBackslashW(szPath); - if (pathPtr) + if (*lpszDisplayName == '/') { - lstrcpynW(pathPtr, lpszDisplayName, MAX_PATH - (pathPtr - szPath)); - hr = _ILCreateFromPathW(szPath, &pidlTemp); + /* UNIX paths should be parsed by unixfs */ + IShellFolder *unixFS; + hr = UnixFolder_Constructor(NULL, &IID_IShellFolder, (LPVOID*)&unixFS); + if (SUCCEEDED(hr)) + { + hr = IShellFolder_ParseDisplayName(unixFS, NULL, NULL, + lpszDisplayName, NULL, &pidlTemp, NULL); + IShellFolder_Release(unixFS); + } } else { - /* should never reach here, but for completeness */ - hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + /* build a complete path to create a simple pidl */ + WCHAR szPath[MAX_PATH]; + LPWSTR pathPtr; + + lstrcpynW(szPath, This->sPathTarget, MAX_PATH); + pathPtr = PathAddBackslashW(szPath); + if (pathPtr) + { + lstrcpynW(pathPtr, lpszDisplayName, MAX_PATH - (pathPtr - szPath)); + hr = _ILCreateFromPathW(szPath, &pidlTemp); + } + else + { + /* should never reach here, but for completeness */ + hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + } } } else

1 0

Andrew Eikum : shell32: Use ParseURL to detect URLs.
by Alexandre Julliard 29 Jun '10

29 Jun '10

Module: wine Branch: master Commit: da31fc06a44b38d441a8310724989ea35d512e9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=da31fc06a44b38d441a831072… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jun 28 12:06:24 2010 -0500 shell32: Use ParseURL to detect URLs. --- dlls/shell32/shfldr_desktop.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index 30aea3b..46a725f 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -152,6 +152,7 @@ static HRESULT WINAPI ISF_Desktop_fnParseDisplayName (IShellFolder2 * iface, WCHAR szElement[MAX_PATH]; LPCWSTR szNext = NULL; LPITEMIDLIST pidlTemp = NULL; + PARSEDURLW urldata; HRESULT hr = S_OK; CLSID clsid; @@ -167,6 +168,8 @@ static HRESULT WINAPI ISF_Desktop_fnParseDisplayName (IShellFolder2 * iface, if (pchEaten) *pchEaten = 0; /* strange but like the original */ + urldata.cbSize = sizeof(urldata); + if (lpszDisplayName[0] == ':' && lpszDisplayName[1] == ':') { szNext = GetNextElementW (lpszDisplayName, szElement, MAX_PATH); @@ -193,13 +196,8 @@ static HRESULT WINAPI ISF_Desktop_fnParseDisplayName (IShellFolder2 * iface, *ppidl = pidlTemp; return S_OK; } - else if (strchrW(lpszDisplayName,':')) + else if (SUCCEEDED(ParseURLW(lpszDisplayName, &urldata))) { - PARSEDURLW urldata; - - urldata.cbSize = sizeof(urldata); - ParseURLW(lpszDisplayName,&urldata); - if (urldata.nScheme == URL_SCHEME_SHELL) /* handle shell: urls */ { TRACE ("-- shell url: %s\n", debugstr_w(urldata.pszSuffix));

1 0

Marko Nikolic : advapi32/tests: Replaced function lstrlen with strlen in condition check.
by Alexandre Julliard 29 Jun '10

29 Jun '10

Module: wine Branch: master Commit: ff08a6866820221ba134239c957465ce458a182c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff08a6866820221ba134239c9… Author: Marko Nikolic <grkoma(a)gmail.com> Date: Mon Jun 28 22:36:10 2010 +0200 advapi32/tests: Replaced function lstrlen with strlen in condition check. --- dlls/advapi32/tests/security.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 2b14ae5..1f1b697 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2807,7 +2807,7 @@ static void test_ConvertSecurityDescriptorToString(void) * don't replicate this feature so we only test len >= strlen+1. */ #define CHECK_RESULT_AND_FREE(exp_str) \ ok(strcmp(string, (exp_str)) == 0, "String mismatch (expected \"%s\", got \"%s\")\n", (exp_str), string); \ - ok(len >= (lstrlen(exp_str) + 1), "Length mismatch (expected %d, got %d)\n", lstrlen(exp_str) + 1, len); \ + ok(len >= (strlen(exp_str) + 1), "Length mismatch (expected %d, got %d)\n", lstrlen(exp_str) + 1, len); \ LocalFree(string); #define CHECK_ONE_OF_AND_FREE(exp_str1, exp_str2) \

1 0

André Hentschel : urlmon: Partially implement HlinkSimpleNavigateToString.
by Alexandre Julliard 29 Jun '10

29 Jun '10

Module: wine Branch: master Commit: 855912cda5f62b791a14969a22d4a335d13dbacb URL: http://source.winehq.org/git/wine.git/?a=commit;h=855912cda5f62b791a14969a2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 28 21:16:51 2010 +0200 urlmon: Partially implement HlinkSimpleNavigateToString. --- dlls/urlmon/Makefile.in | 2 +- dlls/urlmon/umon.c | 24 +++++++++++++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/Makefile.in b/dlls/urlmon/Makefile.in index 91277a5..71567ec 100644 --- a/dlls/urlmon/Makefile.in +++ b/dlls/urlmon/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = urlmon.dll IMPORTLIB = urlmon -IMPORTS = uuid ole32 oleaut32 rpcrt4 shlwapi wininet user32 advapi32 kernel32 ntdll +IMPORTS = uuid ole32 oleaut32 shell32 rpcrt4 shlwapi wininet user32 advapi32 kernel32 ntdll EXTRADEFS = -D_URLMON_ -DENTRY_PREFIX=URLMON_ -DPROXY_DELEGATION -DREGISTER_PROXY_DLL \ -DPROXY_CLSID_IS="{0x79EAC9F1,0xBAF9,0x11CE,{0x8C,0x82,0x00,0xAA,0x00,0x4B,0xA9,0x0B}}" diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index 7ce22cc..9a54e11 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -24,6 +24,8 @@ #include "winreg.h" #include "shlwapi.h" +#include "hlink.h" +#include "shellapi.h" #include "wine/debug.h" @@ -742,7 +744,27 @@ HRESULT WINAPI HlinkSimpleNavigateToString( LPCWSTR szTarget, LPCWSTR szLocation, LPCWSTR szTargetFrameName, IUnknown *pUnk, IBindCtx *pbc, IBindStatusCallback *pbsc, DWORD grfHLNF, DWORD dwReserved) { - FIXME("%s\n", debugstr_w( szTarget ) ); + FIXME("%s %s %s %p %p %p %u %u partial stub\n", debugstr_w( szTarget ), debugstr_w( szLocation ), + debugstr_w( szTargetFrameName ), pUnk, pbc, pbsc, grfHLNF, dwReserved); + + /* undocumented: 0 means HLNF_OPENINNEWWINDOW*/ + if (!grfHLNF) grfHLNF = HLNF_OPENINNEWWINDOW; + + if (grfHLNF == HLNF_OPENINNEWWINDOW) + { + SHELLEXECUTEINFOW sei; + static const WCHAR openW[] = { 'o', 'p', 'e', 'n', 0 }; + + memset(&sei, 0, sizeof(sei)); + sei.cbSize = sizeof(sei); + sei.lpVerb = openW; + sei.nShow = SW_SHOWNORMAL; + sei.fMask = SEE_MASK_FLAG_NO_UI | SEE_MASK_NO_CONSOLE; + sei.lpFile = szTarget; + + if (ShellExecuteExW(&sei)) return S_OK; + } + return E_NOTIMPL; }

1 0

Nikolay Sivov : msxml3: Use proper pointer types for IPersistStreamInit methods.
by Alexandre Julliard 29 Jun '10

29 Jun '10

Module: wine Branch: master Commit: 4edfeefa646fff67588f971d9ee9c6e4b43cd036 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4edfeefa646fff67588f971d9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 28 21:34:00 2010 +0400 msxml3: Use proper pointer types for IPersistStreamInit methods. --- dlls/msxml3/domdoc.c | 54 ++++++++++++++++++++++++------------------------- 1 files changed, 26 insertions(+), 28 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index eb98c29..0007503 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -317,30 +317,30 @@ static inline domdoc *impl_from_ISupportErrorInfo(ISupportErrorInfo *iface) } /************************************************************************ - * xmldoc implementation of IPersistStream. + * domdoc implementation of IPersistStream. */ -static HRESULT WINAPI xmldoc_IPersistStreamInit_QueryInterface( - IPersistStreamInit *iface, REFIID riid, LPVOID *ppvObj) +static HRESULT WINAPI domdoc_IPersistStreamInit_QueryInterface( + IPersistStreamInit *iface, REFIID riid, void **ppvObj) { domdoc *this = impl_from_IPersistStreamInit(iface); - return IXMLDocument_QueryInterface((IXMLDocument *)this, riid, ppvObj); + return IXMLDOMDocument2_QueryInterface((IXMLDOMDocument2 *)this, riid, ppvObj); } -static ULONG WINAPI xmldoc_IPersistStreamInit_AddRef( +static ULONG WINAPI domdoc_IPersistStreamInit_AddRef( IPersistStreamInit *iface) { domdoc *this = impl_from_IPersistStreamInit(iface); - return IXMLDocument_AddRef((IXMLDocument *)this); + return IXMLDOMDocument2_AddRef((IXMLDOMDocument2 *)this); } -static ULONG WINAPI xmldoc_IPersistStreamInit_Release( +static ULONG WINAPI domdoc_IPersistStreamInit_Release( IPersistStreamInit *iface) { domdoc *this = impl_from_IPersistStreamInit(iface); - return IXMLDocument_Release((IXMLDocument *)this); + return IXMLDOMDocument2_Release((IXMLDOMDocument2 *)this); } -static HRESULT WINAPI xmldoc_IPersistStreamInit_GetClassID( +static HRESULT WINAPI domdoc_IPersistStreamInit_GetClassID( IPersistStreamInit *iface, CLSID *classid) { TRACE("(%p,%p): stub!\n", iface, classid); @@ -353,17 +353,15 @@ static HRESULT WINAPI xmldoc_IPersistStreamInit_GetClassID( return S_OK; } -static HRESULT WINAPI xmldoc_IPersistStreamInit_IsDirty( +static HRESULT WINAPI domdoc_IPersistStreamInit_IsDirty( IPersistStreamInit *iface) { domdoc *This = impl_from_IPersistStreamInit(iface); - FIXME("(%p): stub!\n", This); - return S_FALSE; } -static HRESULT WINAPI xmldoc_IPersistStreamInit_Load( +static HRESULT WINAPI domdoc_IPersistStreamInit_Load( IPersistStreamInit *iface, LPSTREAM pStm) { domdoc *This = impl_from_IPersistStreamInit(iface); @@ -416,7 +414,7 @@ static HRESULT WINAPI xmldoc_IPersistStreamInit_Load( return attach_xmldoc( &This->node, xmldoc ); } -static HRESULT WINAPI xmldoc_IPersistStreamInit_Save( +static HRESULT WINAPI domdoc_IPersistStreamInit_Save( IPersistStreamInit *iface, LPSTREAM pStm, BOOL fClearDirty) { domdoc *This = impl_from_IPersistStreamInit(iface); @@ -441,7 +439,7 @@ static HRESULT WINAPI xmldoc_IPersistStreamInit_Save( return hr; } -static HRESULT WINAPI xmldoc_IPersistStreamInit_GetSizeMax( +static HRESULT WINAPI domdoc_IPersistStreamInit_GetSizeMax( IPersistStreamInit *iface, ULARGE_INTEGER *pcbSize) { domdoc *This = impl_from_IPersistStreamInit(iface); @@ -449,7 +447,7 @@ static HRESULT WINAPI xmldoc_IPersistStreamInit_GetSizeMax( return E_NOTIMPL; } -static HRESULT WINAPI xmldoc_IPersistStreamInit_InitNew( +static HRESULT WINAPI domdoc_IPersistStreamInit_InitNew( IPersistStreamInit *iface) { domdoc *This = impl_from_IPersistStreamInit(iface); @@ -459,15 +457,15 @@ static HRESULT WINAPI xmldoc_IPersistStreamInit_InitNew( static const IPersistStreamInitVtbl xmldoc_IPersistStreamInit_VTable = { - xmldoc_IPersistStreamInit_QueryInterface, - xmldoc_IPersistStreamInit_AddRef, - xmldoc_IPersistStreamInit_Release, - xmldoc_IPersistStreamInit_GetClassID, - xmldoc_IPersistStreamInit_IsDirty, - xmldoc_IPersistStreamInit_Load, - xmldoc_IPersistStreamInit_Save, - xmldoc_IPersistStreamInit_GetSizeMax, - xmldoc_IPersistStreamInit_InitNew + domdoc_IPersistStreamInit_QueryInterface, + domdoc_IPersistStreamInit_AddRef, + domdoc_IPersistStreamInit_Release, + domdoc_IPersistStreamInit_GetClassID, + domdoc_IPersistStreamInit_IsDirty, + domdoc_IPersistStreamInit_Load, + domdoc_IPersistStreamInit_Save, + domdoc_IPersistStreamInit_GetSizeMax, + domdoc_IPersistStreamInit_InitNew }; /* ISupportErrorInfo interface */ @@ -476,21 +474,21 @@ static HRESULT WINAPI support_error_QueryInterface( REFIID riid, void** ppvObj ) { domdoc *This = impl_from_ISupportErrorInfo(iface); - return IXMLDocument_QueryInterface((IXMLDocument *)This, riid, ppvObj); + return IXMLDOMDocument2_QueryInterface((IXMLDOMDocument2 *)This, riid, ppvObj); } static ULONG WINAPI support_error_AddRef( ISupportErrorInfo *iface ) { domdoc *This = impl_from_ISupportErrorInfo(iface); - return IXMLDocument_AddRef((IXMLDocument *)This); + return IXMLDOMDocument2_AddRef((IXMLDOMDocument2 *)This); } static ULONG WINAPI support_error_Release( ISupportErrorInfo *iface ) { domdoc *This = impl_from_ISupportErrorInfo(iface); - return IXMLDocument_Release((IXMLDocument *)This); + return IXMLDOMDocument2_Release((IXMLDOMDocument2 *)This); } static HRESULT WINAPI support_error_InterfaceSupportsErrorInfo(

1 0

Nikolay Sivov : msxml3: Add support for IPersistStreamInit for IXMLDOMDocument.
by Alexandre Julliard 29 Jun '10

29 Jun '10

Module: wine Branch: master Commit: 6a07cfeb525bed26cc92b5530f678b707a5b48e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a07cfeb525bed26cc92b5530… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 28 21:16:43 2010 +0400 msxml3: Add support for IPersistStreamInit for IXMLDOMDocument. --- dlls/msxml3/domdoc.c | 88 ++++++++++++++++++++++++------------------- dlls/msxml3/tests/domdoc.c | 22 +++++++++++ 2 files changed, 71 insertions(+), 39 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index cec59e8..eb98c29 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -66,7 +66,7 @@ typedef struct _domdoc { xmlnode node; const struct IXMLDOMDocument2Vtbl *lpVtbl; - const struct IPersistStreamVtbl *lpvtblIPersistStream; + const struct IPersistStreamInitVtbl *lpvtblIPersistStreamInit; const struct IObjectWithSiteVtbl *lpvtblIObjectWithSite; const struct IObjectSafetyVtbl *lpvtblIObjectSafety; const struct ISupportErrorInfoVtbl *lpvtblISupportErrorInfo; @@ -296,9 +296,9 @@ static inline xmlDocPtr get_doc( domdoc *This ) return (xmlDocPtr)This->node.node; } -static inline domdoc *impl_from_IPersistStream(IPersistStream *iface) +static inline domdoc *impl_from_IPersistStreamInit(IPersistStreamInit *iface) { - return (domdoc *)((char*)iface - FIELD_OFFSET(domdoc, lpvtblIPersistStream)); + return (domdoc *)((char*)iface - FIELD_OFFSET(domdoc, lpvtblIPersistStreamInit)); } static inline domdoc *impl_from_IObjectWithSite(IObjectWithSite *iface) @@ -319,29 +319,29 @@ static inline domdoc *impl_from_ISupportErrorInfo(ISupportErrorInfo *iface) /************************************************************************ * xmldoc implementation of IPersistStream. */ -static HRESULT WINAPI xmldoc_IPersistStream_QueryInterface( - IPersistStream *iface, REFIID riid, LPVOID *ppvObj) +static HRESULT WINAPI xmldoc_IPersistStreamInit_QueryInterface( + IPersistStreamInit *iface, REFIID riid, LPVOID *ppvObj) { - domdoc *this = impl_from_IPersistStream(iface); + domdoc *this = impl_from_IPersistStreamInit(iface); return IXMLDocument_QueryInterface((IXMLDocument *)this, riid, ppvObj); } -static ULONG WINAPI xmldoc_IPersistStream_AddRef( - IPersistStream *iface) +static ULONG WINAPI xmldoc_IPersistStreamInit_AddRef( + IPersistStreamInit *iface) { - domdoc *this = impl_from_IPersistStream(iface); + domdoc *this = impl_from_IPersistStreamInit(iface); return IXMLDocument_AddRef((IXMLDocument *)this); } -static ULONG WINAPI xmldoc_IPersistStream_Release( - IPersistStream *iface) +static ULONG WINAPI xmldoc_IPersistStreamInit_Release( + IPersistStreamInit *iface) { - domdoc *this = impl_from_IPersistStream(iface); + domdoc *this = impl_from_IPersistStreamInit(iface); return IXMLDocument_Release((IXMLDocument *)this); } -static HRESULT WINAPI xmldoc_IPersistStream_GetClassID( - IPersistStream *iface, CLSID *classid) +static HRESULT WINAPI xmldoc_IPersistStreamInit_GetClassID( + IPersistStreamInit *iface, CLSID *classid) { TRACE("(%p,%p): stub!\n", iface, classid); @@ -353,20 +353,20 @@ static HRESULT WINAPI xmldoc_IPersistStream_GetClassID( return S_OK; } -static HRESULT WINAPI xmldoc_IPersistStream_IsDirty( - IPersistStream *iface) +static HRESULT WINAPI xmldoc_IPersistStreamInit_IsDirty( + IPersistStreamInit *iface) { - domdoc *This = impl_from_IPersistStream(iface); + domdoc *This = impl_from_IPersistStreamInit(iface); FIXME("(%p): stub!\n", This); return S_FALSE; } -static HRESULT WINAPI xmldoc_IPersistStream_Load( - IPersistStream *iface, LPSTREAM pStm) +static HRESULT WINAPI xmldoc_IPersistStreamInit_Load( + IPersistStreamInit *iface, LPSTREAM pStm) { - domdoc *This = impl_from_IPersistStream(iface); + domdoc *This = impl_from_IPersistStreamInit(iface); HRESULT hr; HGLOBAL hglobal; DWORD read, written, len; @@ -416,10 +416,10 @@ static HRESULT WINAPI xmldoc_IPersistStream_Load( return attach_xmldoc( &This->node, xmldoc ); } -static HRESULT WINAPI xmldoc_IPersistStream_Save( - IPersistStream *iface, LPSTREAM pStm, BOOL fClearDirty) +static HRESULT WINAPI xmldoc_IPersistStreamInit_Save( + IPersistStreamInit *iface, LPSTREAM pStm, BOOL fClearDirty) { - domdoc *This = impl_from_IPersistStream(iface); + domdoc *This = impl_from_IPersistStreamInit(iface); HRESULT hr; BSTR xmlString; @@ -441,24 +441,33 @@ static HRESULT WINAPI xmldoc_IPersistStream_Save( return hr; } -static HRESULT WINAPI xmldoc_IPersistStream_GetSizeMax( - IPersistStream *iface, ULARGE_INTEGER *pcbSize) +static HRESULT WINAPI xmldoc_IPersistStreamInit_GetSizeMax( + IPersistStreamInit *iface, ULARGE_INTEGER *pcbSize) { - domdoc *This = impl_from_IPersistStream(iface); + domdoc *This = impl_from_IPersistStreamInit(iface); TRACE("(%p)->(%p): stub!\n", This, pcbSize); return E_NOTIMPL; } -static const IPersistStreamVtbl xmldoc_IPersistStream_VTable = +static HRESULT WINAPI xmldoc_IPersistStreamInit_InitNew( + IPersistStreamInit *iface) { - xmldoc_IPersistStream_QueryInterface, - xmldoc_IPersistStream_AddRef, - xmldoc_IPersistStream_Release, - xmldoc_IPersistStream_GetClassID, - xmldoc_IPersistStream_IsDirty, - xmldoc_IPersistStream_Load, - xmldoc_IPersistStream_Save, - xmldoc_IPersistStream_GetSizeMax, + domdoc *This = impl_from_IPersistStreamInit(iface); + TRACE("(%p)\n", This); + return S_OK; +} + +static const IPersistStreamInitVtbl xmldoc_IPersistStreamInit_VTable = +{ + xmldoc_IPersistStreamInit_QueryInterface, + xmldoc_IPersistStreamInit_AddRef, + xmldoc_IPersistStreamInit_Release, + xmldoc_IPersistStreamInit_GetClassID, + xmldoc_IPersistStreamInit_IsDirty, + xmldoc_IPersistStreamInit_Load, + xmldoc_IPersistStreamInit_Save, + xmldoc_IPersistStreamInit_GetSizeMax, + xmldoc_IPersistStreamInit_InitNew }; /* ISupportErrorInfo interface */ @@ -520,9 +529,10 @@ static HRESULT WINAPI domdoc_QueryInterface( IXMLDOMDocument2 *iface, REFIID rii { *ppvObject = IXMLDOMNode_from_impl(&This->node); } - else if (IsEqualGUID(&IID_IPersistStream, riid)) + else if (IsEqualGUID(&IID_IPersistStream, riid) || + IsEqualGUID(&IID_IPersistStreamInit, riid)) { - *ppvObject = &(This->lpvtblIPersistStream); + *ppvObject = &(This->lpvtblIPersistStreamInit); } else if (IsEqualGUID(&IID_IObjectWithSite, riid)) { @@ -1575,7 +1585,7 @@ static HRESULT WINAPI domdoc_load( hr = IUnknown_QueryInterface(iface, &IID_IPersistStream, (void**)&pDocStream); if(hr == S_OK) { - hr = xmldoc_IPersistStream_Load(pDocStream, pStream); + hr = IPersistStream_Load(pDocStream, pStream); IStream_Release(pStream); if(hr == S_OK) { @@ -2337,7 +2347,7 @@ HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument2 **docu return E_OUTOFMEMORY; doc->lpVtbl = &domdoc_vtbl; - doc->lpvtblIPersistStream = &xmldoc_IPersistStream_VTable; + doc->lpvtblIPersistStreamInit = &xmldoc_IPersistStreamInit_VTable; doc->lpvtblIObjectWithSite = &domdocObjectSite; doc->lpvtblIObjectSafety = &domdocObjectSafetyVtbl; doc->lpvtblISupportErrorInfo = &support_error_vtbl; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index cde4c81..21e8178 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1242,6 +1242,27 @@ if (0) free_bstrs(); } +static void test_persiststreaminit(void) +{ + IXMLDOMDocument *doc; + IPersistStreamInit *streaminit; + HRESULT hr; + + hr = CoCreateInstance( &CLSID_DOMDocument, NULL, + CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (void**)&doc ); + ok( hr == S_OK, "failed with 0x%08x\n", hr ); + if( hr != S_OK ) + return; + + hr = IXMLDOMDocument_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&streaminit); + ok( hr == S_OK, "failed with 0x%08x\n", hr ); + + hr = IPersistStreamInit_InitNew(streaminit); + ok( hr == S_OK, "failed with 0x%08x\n", hr ); + + IXMLDOMDocument_Release(doc); +} + static void test_domnode( void ) { HRESULT r; @@ -5597,6 +5618,7 @@ START_TEST(domdoc) IXMLDOMDocument_Release(doc); test_domdoc(); + test_persiststreaminit(); test_domnode(); test_refs(); test_create();

1 0

Alexandre Julliard : winex11: Set the user time property on top-level windows.
by Alexandre Julliard 29 Jun '10

29 Jun '10

Module: wine Branch: master Commit: f2f508856ba9f3e5439f7123efd70ccc7599fc3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2f508856ba9f3e5439f7123e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 29 11:08:51 2010 +0200 winex11: Set the user time property on top-level windows. Helps convince some broken window managers to put new windows on top of the z-order. --- dlls/winex11.drv/event.c | 4 +++- dlls/winex11.drv/keyboard.c | 2 ++ dlls/winex11.drv/mouse.c | 1 + dlls/winex11.drv/window.c | 32 ++++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 3 +++ dlls/winex11.drv/x11drv_main.c | 2 ++ 6 files changed, 43 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 0e8d60c..8fc955a 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -503,11 +503,14 @@ static void set_focus( Display *display, HWND hwnd, Time time ) static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) { Atom protocol = (Atom)event->data.l[0]; + Time event_time = (Time)event->data.l[1]; if (!protocol) return; if (protocol == x11drv_atom(WM_DELETE_WINDOW)) { + update_user_time( event_time ); + if (hwnd == GetDesktopWindow()) { /* The desktop window does not have a close button that we can @@ -559,7 +562,6 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) } else if (protocol == x11drv_atom(WM_TAKE_FOCUS)) { - Time event_time = (Time)event->data.l[1]; HWND last_focus = x11drv_thread_data()->last_focus; TRACE( "got take focus msg for %p, enabled=%d, visible=%d (style %08x), focus=%p, active=%p, fg=%p, last=%p\n", diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 893796f..d9da4d2 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1376,6 +1376,8 @@ void X11DRV_KeyEvent( HWND hwnd, XEvent *xev ) TRACE_(key)("type %d, window %lx, state 0x%04x, keycode %u\n", event->type, event->window, event->state, event->keycode); + if (event->type == KeyPress) update_user_time( event->time ); + wine_tsx11_lock(); /* Clients should pass only KeyPress events to XmbLookupString */ if (xic && event->type == KeyPress) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index e8c84dc..cf988c9 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -921,6 +921,7 @@ void X11DRV_ButtonPress( HWND hwnd, XEvent *xev ) break; } + update_user_time( event->time ); update_mouse_state( hwnd, event->window, event->x, event->y, event->state, &pt ); X11DRV_send_mouse_input( hwnd, button_down_flags[buttonNum] | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE, diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 7bdf4e1..eb6432e 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -74,6 +74,10 @@ XContext winContext = 0; /* X context to associate a struct x11drv_win_data to an hwnd */ static XContext win_data_context; +/* time of last user event and window where it's stored */ +static Time last_user_time; +static Window user_time_window; + static const char whole_window_prop[] = "__wine_x11_whole_window"; static const char client_window_prop[]= "__wine_x11_client_window"; static const char icon_window_prop[] = "__wine_x11_icon_window"; @@ -104,6 +108,8 @@ static void remove_startup_notification(Display *display, Window window) return; SetEnvironmentVariableA("DESKTOP_STARTUP_ID", NULL); + if ((src = strstr( id, "_TIME" ))) update_user_time( atol( src + 5 )); + pos = snprintf(message, sizeof(message), "remove: ID="); message[pos++] = '"'; for (i = 0; id[i] && pos < sizeof(message) - 2; i++) @@ -1100,6 +1106,11 @@ static void set_initial_wm_hints( Display *display, struct x11drv_win_data *data XChangeProperty( display, data->whole_window, x11drv_atom(XdndAware), XA_ATOM, 32, PropModeReplace, (unsigned char*)&dndVersion, 1 ); + update_user_time( 0 ); /* make sure that the user time window exists */ + if (user_time_window) + XChangeProperty( display, data->whole_window, x11drv_atom(_NET_WM_USER_TIME_WINDOW), + XA_WINDOW, 32, PropModeReplace, (unsigned char *)&user_time_window, 1 ); + data->wm_hints = XAllocWMHints(); wine_tsx11_unlock(); @@ -1219,6 +1230,27 @@ static void set_wm_hints( Display *display, struct x11drv_win_data *data ) /*********************************************************************** + * update_user_time + */ +void update_user_time( Time time ) +{ + wine_tsx11_lock(); + if (!user_time_window) + { + user_time_window = XCreateWindow( gdi_display, root_window, -1, -1, 1, 1, 0, 0, InputOnly, + DefaultVisual(gdi_display,DefaultScreen(gdi_display)), 0, NULL ); + TRACE( "user time window %lx\n", user_time_window ); + } + if (time && (!last_user_time || (long)(time - last_user_time) > 0)) + { + last_user_time = time; + XChangeProperty( gdi_display, user_time_window, x11drv_atom(_NET_WM_USER_TIME), + XA_CARDINAL, 32, PropModeReplace, (unsigned char *)&time, 1 ); + } + wine_tsx11_unlock(); +} + +/*********************************************************************** * update_net_wm_states */ void update_net_wm_states( Display *display, struct x11drv_win_data *data ) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 944669e..1cd610d 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -649,6 +649,8 @@ enum x11drv_atoms XATOM__NET_WM_STATE_MAXIMIZED_VERT, XATOM__NET_WM_STATE_SKIP_PAGER, XATOM__NET_WM_STATE_SKIP_TASKBAR, + XATOM__NET_WM_USER_TIME, + XATOM__NET_WM_USER_TIME_WINDOW, XATOM__NET_WM_WINDOW_OPACITY, XATOM__NET_WM_WINDOW_TYPE, XATOM__NET_WM_WINDOW_TYPE_DIALOG, @@ -770,6 +772,7 @@ extern Drawable create_glxpixmap( Display *display, XVisualInfo *vis, Pixmap par extern void flush_gl_drawable( X11DRV_PDEVICE *physDev ); extern void wait_for_withdrawn_state( Display *display, struct x11drv_win_data *data, BOOL set ); +extern void update_user_time( Time time ); extern void update_net_wm_states( Display *display, struct x11drv_win_data *data ); extern void make_window_embedded( Display *display, struct x11drv_win_data *data ); diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 3a1fa3f..b07061c 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -150,6 +150,8 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = "_NET_WM_STATE_MAXIMIZED_VERT", "_NET_WM_STATE_SKIP_PAGER", "_NET_WM_STATE_SKIP_TASKBAR", + "_NET_WM_USER_TIME", + "_NET_WM_USER_TIME_WINDOW", "_NET_WM_WINDOW_OPACITY", "_NET_WM_WINDOW_TYPE", "_NET_WM_WINDOW_TYPE_DIALOG",

1 0

Austin English : ntdll: Add stub for NtSystemDebugControl.
by Alexandre Julliard 29 Jun '10

29 Jun '10

Module: wine Branch: master Commit: 5bd468179b80a53a777024310d624afab9bcfd34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bd468179b80a53a777024310… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jun 28 21:27:11 2010 -0500 ntdll: Add stub for NtSystemDebugControl. --- dlls/ntdll/nt.c | 12 ++++++++++++ dlls/ntdll/ntdll.spec | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index e7700a1..a2b1023 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1945,3 +1945,15 @@ NTSTATUS WINAPI NtAccessCheckAndAuditAlarm(PUNICODE_STRING SubsystemName, HANDLE return STATUS_NOT_IMPLEMENTED; } + +/****************************************************************************** + * NtSystemDebugControl (NTDLL.@) + * ZwSystemDebugControl (NTDLL.@) + */ +NTSTATUS WINAPI NtSystemDebugControl(SYSDBG_COMMAND command, PVOID inbuffer, ULONG inbuflength, PVOID outbuffer, + ULONG outbuflength, PULONG retlength) +{ + FIXME("(%d, %p, %d, %p, %d, %p), stub\n", command, inbuffer, inbuflength, outbuffer, outbuflength, retlength); + + return STATUS_NOT_IMPLEMENTED; +} diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 37e0cca..8441b41 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -353,7 +353,7 @@ @ stub NtStopProfile # @ stub NtSuspendProcess @ stdcall NtSuspendThread(long ptr) -@ stub NtSystemDebugControl +@ stdcall NtSystemDebugControl(long ptr long ptr long ptr) @ stdcall NtTerminateJobObject(long long) @ stdcall NtTerminateProcess(long long) @ stdcall NtTerminateThread(long long) @@ -1209,7 +1209,7 @@ @ stub ZwStopProfile # @ stub ZwSuspendProcess @ stdcall ZwSuspendThread(long ptr) NtSuspendThread -@ stub ZwSystemDebugControl +@ stdcall ZwSystemDebugControl(long ptr long ptr long ptr) NtSystemDebugControl @ stdcall ZwTerminateJobObject(long long) NtTerminateJobObject @ stdcall ZwTerminateProcess(long long) NtTerminateProcess @ stdcall ZwTerminateThread(long long) NtTerminateThread

1 0

Austin English : kernel32: Add stub for QueryMemoryResourceNotification.
by Alexandre Julliard 29 Jun '10

29 Jun '10

Module: wine Branch: master Commit: 5dca2545f20ca1f1f0487a0f4b861178eaf2cffa URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dca2545f20ca1f1f0487a0f4… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jun 28 15:28:59 2010 -0500 kernel32: Add stub for QueryMemoryResourceNotification. --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/sync.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index dbcb179..843e97c 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -873,7 +873,7 @@ @ stdcall QueryFullProcessImageNameA(ptr long ptr ptr) @ stdcall QueryFullProcessImageNameW(ptr long ptr ptr) @ stdcall QueryInformationJobObject(long long ptr long ptr) -# @ stub QueryMemoryResourceNotification +@ stdcall QueryMemoryResourceNotification(ptr ptr) @ stub QueryNumberOfEventLogRecords @ stub QueryOldestEventLogRecord @ stdcall QueryPerformanceCounter(ptr) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 0ba2ad1..eac08c8 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -2186,6 +2186,15 @@ HANDLE WINAPI CreateMemoryResourceNotification(MEMORY_RESOURCE_NOTIFICATION_TYPE return NULL; } +/*********************************************************************** + * QueryMemoryResourceNotification (KERNEL32.@) + */ +BOOL WINAPI QueryMemoryResourceNotification(HANDLE rnh, PBOOL rs) +{ + FIXME("(%p, %p) stub\n", rnh, rs); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} #ifdef __i386__

1 0

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 June 2010