April 2008 - Wine-commits - list.winehq.org

Alexandre Julliard : ws2_32/tests: Fix the gethostname prototype.
by Alexandre Julliard 30 Apr '08

30 Apr '08

Module: wine Branch: master Commit: 4c4544910e14a5b3a2d2a7bc4578367a31127368 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c4544910e14a5b3a2d2a7bc4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 29 20:17:50 2008 +0200 ws2_32/tests: Fix the gethostname prototype. --- dlls/ws2_32/tests/sock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 3c314d4..939bdaa 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1768,7 +1768,7 @@ static void test_dns(void) /* Our winsock headers don't define gethostname because it conflicts with the * definition in unistd.h. Define it here to get rid of the warning. */ -int gethostname(char *name, int namelen); +int WINAPI gethostname(char *name, int namelen); static void test_gethostbyname_hack(void) {

1 0

Alexandre Julliard : gdiplus: Fix the GdipFillRectangles spec entries.
by Alexandre Julliard 30 Apr '08

30 Apr '08

Module: wine Branch: master Commit: 0d1959972e7252719b20f28bc808da616df3877a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d1959972e7252719b20f28bc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 29 20:17:59 2008 +0200 gdiplus: Fix the GdipFillRectangles spec entries. --- dlls/gdiplus/gdiplus.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 8e8e94f..4549c4b 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -228,8 +228,8 @@ @ stdcall GdipFillPolygonI(ptr ptr ptr long long) @ stdcall GdipFillRectangle(ptr ptr long long long long) @ stdcall GdipFillRectangleI(ptr ptr long long long long) -@ stdcall GdipFillRectangles(ptr ptr long) -@ stdcall GdipFillRectanglesI(ptr ptr long) +@ stdcall GdipFillRectangles(ptr ptr ptr long) +@ stdcall GdipFillRectanglesI(ptr ptr ptr long) @ stub GdipFillRegion @ stdcall GdipFindFirstImageItem(ptr ptr) @ stub GdipFindNextImageItem

1 0

Alexandre Julliard : msvcrt: Rename a few functions to avoid conflicts with Windows headers.
by Alexandre Julliard 30 Apr '08

30 Apr '08

Module: wine Branch: master Commit: b43fd312870b76a6b4e0136c4926228b3e3823a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b43fd312870b76a6b4e0136c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 29 20:18:19 2008 +0200 msvcrt: Rename a few functions to avoid conflicts with Windows headers. --- dlls/msvcrt/file.c | 42 +++++++++++++++++++++--------------------- dlls/msvcrt/msvcrt.spec | 10 +++++----- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 866d28d..f85afd3 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -803,7 +803,7 @@ void msvcrt_free_io(void) /********************************************************************* * _lseeki64 (MSVCRT.@) */ -__int64 CDECL _lseeki64(int fd, __int64 offset, int whence) +__int64 CDECL MSVCRT__lseeki64(int fd, __int64 offset, int whence) { HANDLE hand = msvcrt_fdtoh(fd); LARGE_INTEGER ofs, ret; @@ -840,9 +840,9 @@ __int64 CDECL _lseeki64(int fd, __int64 offset, int whence) /********************************************************************* * _lseek (MSVCRT.@) */ -LONG CDECL _lseek(int fd, LONG offset, int whence) +LONG CDECL MSVCRT__lseek(int fd, LONG offset, int whence) { - return _lseeki64(fd, offset, whence); + return MSVCRT__lseeki64(fd, offset, whence); } /********************************************************************* @@ -850,7 +850,7 @@ LONG CDECL _lseek(int fd, LONG offset, int whence) * * This is untested; the underlying LockFile doesn't work yet. */ -int CDECL _locking(int fd, int mode, LONG nbytes) +int CDECL MSVCRT__locking(int fd, int mode, LONG nbytes) { BOOL ret; DWORD cur_locn; @@ -920,7 +920,7 @@ int CDECL MSVCRT_fseek(MSVCRT_FILE* file, long offset, int whence) } /* Clear end of file flag */ file->_flag &= ~MSVCRT__IOEOF; - return (_lseek(file->_file,offset,whence) == -1)?-1:0; + return (MSVCRT__lseek(file->_file,offset,whence) == -1)?-1:0; } /********************************************************************* @@ -940,10 +940,10 @@ int CDECL _chsize(int fd, long size) if (handle != INVALID_HANDLE_VALUE) { /* save the current file pointer */ - cur = _lseek(fd, 0, SEEK_CUR); + cur = MSVCRT__lseek(fd, 0, SEEK_CUR); if (cur >= 0) { - pos = _lseek(fd, size, SEEK_SET); + pos = MSVCRT__lseek(fd, size, SEEK_SET); if (pos >= 0) { ret = SetEndOfFile(handle); @@ -951,7 +951,7 @@ int CDECL _chsize(int fd, long size) } /* restore the file pointer */ - _lseek(fd, cur, SEEK_SET); + MSVCRT__lseek(fd, cur, SEEK_SET); } } @@ -1079,16 +1079,16 @@ MSVCRT_FILE* CDECL MSVCRT__wfdopen(int fd, const MSVCRT_wchar_t *mode) /********************************************************************* * _filelength (MSVCRT.@) */ -LONG CDECL _filelength(int fd) +LONG CDECL MSVCRT__filelength(int fd) { - LONG curPos = _lseek(fd, 0, SEEK_CUR); + LONG curPos = MSVCRT__lseek(fd, 0, SEEK_CUR); if (curPos != -1) { - LONG endPos = _lseek(fd, 0, SEEK_END); + LONG endPos = MSVCRT__lseek(fd, 0, SEEK_END); if (endPos != -1) { if (endPos != curPos) - _lseek(fd, curPos, SEEK_SET); + MSVCRT__lseek(fd, curPos, SEEK_SET); return endPos; } } @@ -1098,16 +1098,16 @@ LONG CDECL _filelength(int fd) /********************************************************************* * _filelengthi64 (MSVCRT.@) */ -__int64 CDECL _filelengthi64(int fd) +__int64 CDECL MSVCRT__filelengthi64(int fd) { - __int64 curPos = _lseeki64(fd, 0, SEEK_CUR); + __int64 curPos = MSVCRT__lseeki64(fd, 0, SEEK_CUR); if (curPos != -1) { - __int64 endPos = _lseeki64(fd, 0, SEEK_END); + __int64 endPos = MSVCRT__lseeki64(fd, 0, SEEK_END); if (endPos != -1) { if (endPos != curPos) - _lseeki64(fd, curPos, SEEK_SET); + MSVCRT__lseeki64(fd, curPos, SEEK_SET); return endPos; } } @@ -1941,7 +1941,7 @@ int CDECL MSVCRT__wstat(const MSVCRT_wchar_t* path, struct MSVCRT__stat * buf) */ long CDECL _tell(int fd) { - return _lseek(fd, 0, SEEK_CUR); + return MSVCRT__lseek(fd, 0, SEEK_CUR); } /********************************************************************* @@ -1949,7 +1949,7 @@ long CDECL _tell(int fd) */ __int64 CDECL _telli64(int fd) { - return _lseeki64(fd, 0, SEEK_CUR); + return MSVCRT__lseeki64(fd, 0, SEEK_CUR); } /********************************************************************* @@ -2055,7 +2055,7 @@ int CDECL MSVCRT__write(int fd, const void* buf, unsigned int count) /* If appending, go to EOF */ if (MSVCRT_fdesc[fd].wxflag & WX_APPEND) - _lseek(fd, 0, FILE_END); + MSVCRT__lseek(fd, 0, FILE_END); if (!(MSVCRT_fdesc[fd].wxflag & WX_TEXT)) { @@ -2711,7 +2711,7 @@ int CDECL MSVCRT_fsetpos(MSVCRT_FILE* file, MSVCRT_fpos_t *pos) file->_flag &= ~(MSVCRT__IOREAD|MSVCRT__IOWRT); } - return (_lseeki64(file->_file,*pos,SEEK_SET) == -1) ? -1 : 0; + return (MSVCRT__lseeki64(file->_file,*pos,SEEK_SET) == -1) ? -1 : 0; } /********************************************************************* @@ -2741,7 +2741,7 @@ int CDECL MSVCRT_fgetpos(MSVCRT_FILE* file, MSVCRT_fpos_t *pos) /* This code has been lifted form the MSVCRT_ftell function */ int off=0; - *pos = _lseeki64(file->_file,0,SEEK_CUR); + *pos = MSVCRT__lseeki64(file->_file,0,SEEK_CUR); if (*pos == -1) return -1; diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 8f8ccf4..c92733d 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -233,8 +233,8 @@ @ cdecl _fgetwchar() @ cdecl _filbuf(ptr) MSVCRT__filbuf # extern _fileinfo -@ cdecl _filelength(long) -@ cdecl -ret64 _filelengthi64(long) +@ cdecl _filelength(long) MSVCRT__filelength +@ cdecl -ret64 _filelengthi64(long) MSVCRT__filelengthi64 @ cdecl _fileno(ptr) MSVCRT__fileno @ cdecl _findclose(long) MSVCRT__findclose @ cdecl _findfirst(str ptr) MSVCRT__findfirst @@ -334,14 +334,14 @@ @ cdecl _loaddll(str) @ cdecl -i386 _local_unwind2(ptr long) @ cdecl _lock(long) -@ cdecl _locking(long long long) +@ cdecl _locking(long long long) MSVCRT__locking @ cdecl _logb( double ) @ cdecl -i386 _longjmpex(ptr long) MSVCRT_longjmp @ cdecl _lrotl(long long) @ cdecl _lrotr(long long) @ cdecl _lsearch(ptr ptr long long ptr) -@ cdecl _lseek(long long long) -@ cdecl -ret64 _lseeki64(long double long) +@ cdecl _lseek(long long long) MSVCRT__lseek +@ cdecl -ret64 _lseeki64(long double long) MSVCRT__lseeki64 @ cdecl _ltoa(long ptr long) ntdll._ltoa @ cdecl _ltow(long ptr long) ntdll._ltow @ cdecl _makepath(ptr str str str str)

1 0

Alexandre Julliard : Include wine/port.h everywhere we use exceptions.
by Alexandre Julliard 30 Apr '08

30 Apr '08

Module: wine Branch: master Commit: ef07d83405b8344fb8ebd1dbf9317d79d7528cbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef07d83405b8344fb8ebd1dbf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 29 20:18:49 2008 +0200 Include wine/port.h everywhere we use exceptions. --- dlls/advapi32/service.c | 3 +++ dlls/crypt32/msg.c | 4 ++++ dlls/crypt32/serialize.c | 4 ++++ dlls/msi/custom.c | 3 +++ dlls/ole32/moniker.c | 3 +++ dlls/oleaut32/tmarshal.c | 1 + dlls/rpcrt4/cstub.c | 3 +++ dlls/wintrust/asn.c | 4 ++++ programs/winedbg/tgt_minidump.c | 1 + 9 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index f9115c2..a1407dd 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -20,6 +20,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + #include <stdarg.h> #include <string.h> #include <time.h> diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 0972436..1bb8767 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -15,6 +15,10 @@ * 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 "config.h" +#include "wine/port.h" + #include <stdarg.h> #include "windef.h" #include "winbase.h" diff --git a/dlls/crypt32/serialize.c b/dlls/crypt32/serialize.c index 5017c3f..5f9911f 100644 --- a/dlls/crypt32/serialize.c +++ b/dlls/crypt32/serialize.c @@ -15,6 +15,10 @@ * 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 "config.h" +#include "wine/port.h" + #include <stdarg.h> #include "windef.h" #include "winbase.h" diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 316fe5a..71864d5 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + #define COBJMACROS #include <stdarg.h> diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index 68ea4d1..374b5c8 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -21,6 +21,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + #include <stdarg.h> #include <string.h> diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 80d435e..97500bf 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -22,6 +22,7 @@ */ #include "config.h" +#include "wine/port.h" #include <assert.h> #include <stdlib.h> diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c index 83a5fb2..c790ad5 100644 --- a/dlls/rpcrt4/cstub.c +++ b/dlls/rpcrt4/cstub.c @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + #include <stdarg.h> #define COBJMACROS diff --git a/dlls/wintrust/asn.c b/dlls/wintrust/asn.c index af7a266..2b0bde1 100644 --- a/dlls/wintrust/asn.c +++ b/dlls/wintrust/asn.c @@ -17,6 +17,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ + +#include "config.h" +#include "wine/port.h" + #include <stdarg.h> #include <stdio.h> #include <assert.h> diff --git a/programs/winedbg/tgt_minidump.c b/programs/winedbg/tgt_minidump.c index db0daf6..87f34a2 100644 --- a/programs/winedbg/tgt_minidump.c +++ b/programs/winedbg/tgt_minidump.c @@ -22,6 +22,7 @@ #define NONAMELESSSTRUCT #include "config.h" +#include "wine/port.h" #include <stdlib.h> #include <stdio.h>

1 0

Alexander Nicolaysen Sørnes : Allow users to disable the Xinha HTML editor
by Chris Morgan 30 Apr '08

30 Apr '08

Module: appdb Branch: master Commit: caf65e386963c13707107a3b6566653eda3b56f1 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=caf65e386963c13707107a3b… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Apr 22 21:03:08 2008 +0200 Allow users to disable the Xinha HTML editor --- include/util.php | 16 ++++++++++++++++ tables/prefs_list.sql | 1 + 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/include/util.php b/include/util.php index ba13386..5f4ce4d 100644 --- a/include/util.php +++ b/include/util.php @@ -628,6 +628,22 @@ function HtmlAreaLoaderScript($aTextareas) { static $outputIndex = 0; + /* Check if the user wants to display the HTML editor (always, for supported browsers or never) */ + switch($_SESSION['current']->getPref('htmleditor', 'for supported browsers')) + { + case 'never': + return; + case 'for supported browsers': + if(strstr($_SERVER['HTTP_USER_AGENT'], 'Opera') || + strstr($_SERVER['HTTP_USER_AGENT'], 'Konqueror')) + { + return; + } + break; + case 'always': + break; + } + echo ' <script type="text/javascript">'; // You must set _editor_url to the URL (including trailing slash) where diff --git a/tables/prefs_list.sql b/tables/prefs_list.sql index 4246912..1952a03 100644 --- a/tables/prefs_list.sql +++ b/tables/prefs_list.sql @@ -22,3 +22,4 @@ INSERT INTO prefs_list VALUES (0, 'query:mode', 'view', 'view|edit', 'Default AP INSERT INTO prefs_list VALUES (0, 'query:hide_header', 'no', 'yes|no', 'Hide apidb header in query results'); INSERT INTO prefs_list VALUES (0, 'query:hide_sidebar', 'no', 'yes|no', 'Hide apidb sidebar in query results'); INSERT INTO prefs_list VALUES (0, 'send_email', 'yes', 'yes|no', 'Send email notifications'); +INSERT INTO prefs_list VALUES (0, 'htmleditor', 'for supported browsers', 'always|for supported browsers|never', 'Display a graphical HTML editor in certain text fields');

1 0

Zachary Goldberg : WWN 346
by Jeremy Newman 29 Apr '08

29 Apr '08

Module: website Branch: master Commit: ae025725ece963f27b5d8ec7e555d93e0677ddb0 URL: http://source.winehq.org/git/website.git/?a=commit;h=ae025725ece963f27b5d8e… Author: Zachary Goldberg <zgs(a)seas.upenn.edu> Date: Mon Apr 28 20:40:54 2008 -0400 WWN 346 --- news/2008042801.xml | 7 + wwn/wn20080428_346.xml | 3569 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 3576 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=ae025725ece963f27b…

1 0

Alistair Leslie-Hughes : msxml3: Implement IXMLDOMComment insertData.
by Alexandre Julliard 29 Apr '08

29 Apr '08

Module: wine Branch: master Commit: ad1f05f9618699dea5c07917458618f72a3308e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad1f05f9618699dea5c079174… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Apr 29 21:12:24 2008 +1000 msxml3: Implement IXMLDOMComment insertData. --- dlls/msxml3/comment.c | 65 ++++++++++++++++++++++++++++++++++++++++++- dlls/msxml3/tests/domdoc.c | 41 +++++++++++++++++++++++++++ 2 files changed, 104 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index eb273b4..9a45be6 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -634,8 +634,69 @@ static HRESULT WINAPI domcomment_insertData( IXMLDOMComment *iface, long offset, BSTR p) { - FIXME("\n"); - return E_NOTIMPL; + domcomment *This = impl_from_IXMLDOMComment( iface ); + xmlnode *pDOMNode = impl_from_IXMLDOMNode( This->node ); + xmlChar *pXmlContent; + BSTR sNewString; + HRESULT hr = S_FALSE; + long nLength = 0, nLengthP = 0; + xmlChar *str = NULL; + + TRACE("%p\n", This); + + /* If have a NULL or empty string, don't do anything. */ + if(SysStringLen(p) == 0) + return S_OK; + + if(offset < 0) + { + return E_INVALIDARG; + } + + pXmlContent = xmlNodeGetContent(pDOMNode->node); + if(pXmlContent) + { + BSTR sContent = bstr_from_xmlChar( pXmlContent ); + nLength = SysStringLen(sContent); + nLengthP = SysStringLen(p); + + if(nLength < offset) + { + SysFreeString(sContent); + xmlFree(pXmlContent); + + return E_INVALIDARG; + } + + sNewString = SysAllocStringLen(NULL, nLength + nLengthP + 1); + if(sNewString) + { + if(offset > 0) + memcpy(sNewString, sContent, offset * sizeof(WCHAR)); + + memcpy(&sNewString[offset], p, nLengthP * sizeof(WCHAR)); + + if(offset+nLengthP < nLength) + memcpy(&sNewString[offset+nLengthP], &sContent[offset], (nLength-offset) * sizeof(WCHAR)); + + sNewString[nLengthP + nLength] = 0; + + str = xmlChar_from_wchar((WCHAR*)sNewString); + if(str) + { + xmlNodeSetContent(pDOMNode->node, str); + hr = S_OK; + } + + SysFreeString(sNewString); + } + + SysFreeString(sContent); + + xmlFree(pXmlContent); + } + + return hr; } static HRESULT WINAPI domcomment_deleteData( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 072ed2f..d30dfc5 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -2339,6 +2339,47 @@ static void test_xmlTypes(void) ok( !lstrcmpW( str, _bstr_("This &is a ; test <>\\Append") ), "incorrect get_text string\n"); SysFreeString(str); + /* test insertData */ + str = SysAllocStringLen(NULL, 0); + hr = IXMLDOMComment_insertData(pComment, -1, str); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMComment_insertData(pComment, -1, NULL); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMComment_insertData(pComment, 1000, str); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMComment_insertData(pComment, 1000, NULL); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMComment_insertData(pComment, 0, NULL); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMComment_insertData(pComment, 0, str); + ok(hr == S_OK, "ret %08x\n", hr ); + SysFreeString(str); + + hr = IXMLDOMComment_insertData(pComment, -1, _bstr_("Inserting")); + ok(hr == E_INVALIDARG, "ret %08x\n", hr ); + + hr = IXMLDOMComment_insertData(pComment, 1000, _bstr_("Inserting")); + ok(hr == E_INVALIDARG, "ret %08x\n", hr ); + + hr = IXMLDOMComment_insertData(pComment, 0, _bstr_("Begin ")); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMComment_insertData(pComment, 17, _bstr_("Middle")); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMComment_insertData(pComment, 39, _bstr_(" End")); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMComment_get_text(pComment, &str); + ok(hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( str, _bstr_("Begin This &is a Middle; test <>\\Append End") ), "incorrect get_text string\n"); + SysFreeString(str); + IXMLDOMComment_Release(pComment); }

1 0

Alistair Leslie-Hughes : msxml3: Implement IObjectSafety for IXMLDOMDocument2.
by Alexandre Julliard 29 Apr '08

29 Apr '08

Module: wine Branch: master Commit: f4a797e90be559dce8e46b5804bf15348fc39299 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4a797e90be559dce8e46b580… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Apr 29 20:52:00 2008 +1000 msxml3: Implement IObjectSafety for IXMLDOMDocument2. --- dlls/msxml3/domdoc.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 72 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 7ce17bd..9f84c75 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -35,6 +35,7 @@ #include "winreg.h" #include "shlwapi.h" #include "ocidl.h" +#include "objsafe.h" #include "wine/debug.h" @@ -171,6 +172,7 @@ typedef struct _domdoc const struct IXMLDOMDocument2Vtbl *lpVtbl; const struct IPersistStreamVtbl *lpvtblIPersistStream; const struct IObjectWithSiteVtbl *lpvtblIObjectWithSite; + const struct IObjectSafetyVtbl *lpvtblIObjectSafety; LONG ref; VARIANT_BOOL async; VARIANT_BOOL validating; @@ -187,6 +189,10 @@ typedef struct _domdoc /* IObjectWithSite*/ IUnknown *site; + + /* IObjectSafety */ + DWORD safeopt; + } domdoc; LONG xmldoc_add_ref(xmlDocPtr doc) @@ -229,6 +235,12 @@ static inline domdoc *impl_from_IObjectWithSite(IObjectWithSite *iface) return (domdoc *)((char*)iface - FIELD_OFFSET(domdoc, lpvtblIObjectWithSite)); } +static inline domdoc *impl_from_IObjectSafety(IObjectSafety *iface) +{ + return (domdoc *)((char*)iface - FIELD_OFFSET(domdoc, lpvtblIObjectSafety)); +} + + /************************************************************************ * xmldoc implementation of IPersistStream. */ @@ -2019,6 +2031,64 @@ static const IObjectWithSiteVtbl domdocObjectSite = xmldoc_GetSite, }; +static HRESULT WINAPI xmldoc_Safety_QueryInterface(IObjectSafety *iface, REFIID riid, void **ppv) +{ + domdoc *This = impl_from_IObjectSafety(iface); + return IXMLDocument_QueryInterface( (IXMLDocument *)This, riid, ppv ); +} + +static ULONG WINAPI xmldoc_Safety_AddRef(IObjectSafety *iface) +{ + domdoc *This = impl_from_IObjectSafety(iface); + return IXMLDocument_AddRef((IXMLDocument *)This); +} + +static ULONG WINAPI xmldoc_Safety_Release(IObjectSafety *iface) +{ + domdoc *This = impl_from_IObjectSafety(iface); + return IXMLDocument_Release((IXMLDocument *)This); +} + +#define SUPPORTED_OPTIONS (INTERFACESAFE_FOR_UNTRUSTED_CALLER|INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_SECURITY_MANAGER) + +static HRESULT WINAPI xmldoc_Safety_GetInterfaceSafetyOptions(IObjectSafety *iface, REFIID riid, + DWORD *pdwSupportedOptions, DWORD *pdwEnabledOptions) +{ + domdoc *This = impl_from_IObjectSafety(iface); + + TRACE("(%p)->(%s %p %p)\n", This, debugstr_guid(riid), pdwSupportedOptions, pdwEnabledOptions); + + if(!pdwSupportedOptions || !pdwEnabledOptions) + return E_POINTER; + + *pdwSupportedOptions = SUPPORTED_OPTIONS; + *pdwEnabledOptions = This->safeopt; + + return S_OK; +} + +static HRESULT WINAPI xmldoc_Safety_SetInterfaceSafetyOptions(IObjectSafety *iface, REFIID riid, + DWORD dwOptionSetMask, DWORD dwEnabledOptions) +{ + domdoc *This = impl_from_IObjectSafety(iface); + + TRACE("(%p)->(%s %x %x)\n", This, debugstr_guid(riid), dwOptionSetMask, dwEnabledOptions); + + if(dwOptionSetMask & ~SUPPORTED_OPTIONS) + return E_FAIL; + + This->safeopt = dwEnabledOptions & dwEnabledOptions; + return S_OK; +} + +static const IObjectSafetyVtbl domdocObjectSafetyVtbl = { + xmldoc_Safety_QueryInterface, + xmldoc_Safety_AddRef, + xmldoc_Safety_Release, + xmldoc_Safety_GetInterfaceSafetyOptions, + xmldoc_Safety_SetInterfaceSafetyOptions +}; + HRESULT DOMDocument_create(IUnknown *pUnkOuter, LPVOID *ppObj) { domdoc *doc; @@ -2034,6 +2104,7 @@ HRESULT DOMDocument_create(IUnknown *pUnkOuter, LPVOID *ppObj) doc->lpVtbl = &domdoc_vtbl; doc->lpvtblIPersistStream = &xmldoc_IPersistStream_VTable; doc->lpvtblIObjectWithSite = &domdocObjectSite; + doc->lpvtblIObjectSafety = &domdocObjectSafetyVtbl; doc->ref = 1; doc->async = 0; doc->validating = 0; @@ -2044,6 +2115,7 @@ HRESULT DOMDocument_create(IUnknown *pUnkOuter, LPVOID *ppObj) doc->schema = NULL; doc->stream = NULL; doc->site = NULL; + doc->safeopt = 0; xmldoc = xmlNewDoc(NULL); if(!xmldoc)

1 0

Alexandre Julliard : winex11: Fix debug trace using the removed opengl channel.
by Alexandre Julliard 29 Apr '08

29 Apr '08

Module: wine Branch: master Commit: bfb4ec0f3ada57bce611337404206da2c072a131 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfb4ec0f3ada57bce61133740… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 29 15:25:36 2008 +0200 winex11: Fix debug trace using the removed opengl channel. --- dlls/winex11.drv/opengl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 23896a2..de3d137 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -3643,7 +3643,7 @@ BOOL X11DRV_wglUseFontBitmapsW(X11DRV_PDEVICE *physDev, DWORD first, DWORD count */ BOOL X11DRV_wglSetPixelFormatWINE(X11DRV_PDEVICE *physDev, int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd) { - ERR_(opengl)("No OpenGL support compiled in.\n"); + ERR("No OpenGL support compiled in.\n"); return FALSE; }

1 0

Alex Villacís Lasso : richedit: Private movement of cursors in text insertion should not cause WM_NOTIFY to be sent .
by Alexandre Julliard 29 Apr '08

29 Apr '08

Module: wine Branch: master Commit: 829940458f11bc74f4fefca5cb200ad9abd17951 URL: http://source.winehq.org/git/wine.git/?a=commit;h=829940458f11bc74f4fefca5c… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Sun Apr 27 15:47:26 2008 -0500 richedit: Private movement of cursors in text insertion should not cause WM_NOTIFY to be sent. As text is inserted, the cursor is moved to the end, and then back to offset 0. A reordering of operations prevents a WM_NOTIFY from being sent on cursor being moved to the end, and another by being moved back to the beginning. If the cursor was not at offset 0, then exactly one WM_NOTIFY must be sent, for the movement from previous position to the beginning. With tests to prove this change and the previous one (modify flag should be off on WM_SETTEXT-caused WM_NOTIFY). --- dlls/riched20/editor.c | 2 +- dlls/riched20/tests/editor.c | 79 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 79 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index b153fc1..392a60a 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2436,10 +2436,10 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, } else TRACE("WM_SETTEXT - NULL\n"); + ME_SetSelection(editor, 0, 0); editor->nModifyStep = 0; ME_CommitUndo(editor); ME_EmptyUndoStack(editor); - ME_SetSelection(editor, 0, 0); ME_UpdateRepaint(editor); return 1; } diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 05db7f8..891c713 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -3125,6 +3125,83 @@ static void test_eventMask(void) } +static int received_WM_NOTIFY = 0; +static int modify_at_WM_NOTIFY = 0; +static HWND hwndRichedit_WM_NOTIFY; + +static LRESULT WINAPI WM_NOTIFY_ParentMsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + if(message == WM_NOTIFY) + { + received_WM_NOTIFY = 1; + modify_at_WM_NOTIFY = SendMessage(hwndRichedit_WM_NOTIFY, EM_GETMODIFY, 0, 0); + } + return DefWindowProcA(hwnd, message, wParam, lParam); +} + +static void test_WM_NOTIFY(void) +{ + HWND parent; + WNDCLASSA cls; + CHARFORMAT2 cf2; + + /* register class to capture WM_NOTIFY */ + cls.style = 0; + cls.lpfnWndProc = WM_NOTIFY_ParentMsgCheckProcA; + cls.cbClsExtra = 0; + cls.cbWndExtra = 0; + cls.hInstance = GetModuleHandleA(0); + cls.hIcon = 0; + cls.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpszMenuName = NULL; + cls.lpszClassName = "WM_NOTIFY_ParentClass"; + if(!RegisterClassA(&cls)) assert(0); + + parent = CreateWindow(cls.lpszClassName, NULL, WS_POPUP|WS_VISIBLE, + 0, 0, 200, 60, NULL, NULL, NULL, NULL); + ok (parent != 0, "Failed to create parent window\n"); + + hwndRichedit_WM_NOTIFY = new_richedit(parent); + ok(hwndRichedit_WM_NOTIFY != 0, "Failed to create edit window\n"); + + SendMessage(hwndRichedit_WM_NOTIFY, EM_SETEVENTMASK, 0, ENM_SELCHANGE); + + /* Notifications for selection change should only be sent when selection + actually changes. EM_SETCHARFORMAT is one message that calls + ME_CommitUndo, which should check whether message should be sent */ + received_WM_NOTIFY = 0; + cf2.cbSize = sizeof(CHARFORMAT2); + SendMessage(hwndRichedit_WM_NOTIFY, EM_GETCHARFORMAT, (WPARAM) SCF_DEFAULT, + (LPARAM) &cf2); + cf2.dwMask = CFM_ITALIC | cf2.dwMask; + cf2.dwEffects = CFE_ITALIC ^ cf2.dwEffects; + SendMessage(hwndRichedit_WM_NOTIFY, EM_SETCHARFORMAT, 0, (LPARAM) &cf2); + ok(received_WM_NOTIFY == 0, "Unexpected WM_NOTIFY was sent!\n"); + + /* WM_SETTEXT should NOT cause a WM_NOTIFY to be sent when selection is + already at 0. */ + received_WM_NOTIFY = 0; + modify_at_WM_NOTIFY = 0; + SendMessage(hwndRichedit_WM_NOTIFY, WM_SETTEXT, 0, (LPARAM)"sometext"); + ok(received_WM_NOTIFY == 0, "Unexpected WM_NOTIFY was sent!\n"); + ok(modify_at_WM_NOTIFY == 0, "WM_NOTIFY callback saw text flagged as modified!\n"); + + received_WM_NOTIFY = 0; + modify_at_WM_NOTIFY = 0; + SendMessage(hwndRichedit_WM_NOTIFY, EM_SETSEL, 4, 4); + ok(received_WM_NOTIFY == 1, "Expected WM_NOTIFY was NOT sent!\n"); + + received_WM_NOTIFY = 0; + modify_at_WM_NOTIFY = 0; + SendMessage(hwndRichedit_WM_NOTIFY, WM_SETTEXT, 0, (LPARAM)"sometext"); + ok(received_WM_NOTIFY == 1, "Expected WM_NOTIFY was NOT sent!\n"); + ok(modify_at_WM_NOTIFY == 0, "WM_NOTIFY callback saw text flagged as modified!\n"); + + DestroyWindow(hwndRichedit_WM_NOTIFY); + DestroyWindow(parent); +} + START_TEST( editor ) { MSG msg; @@ -3134,7 +3211,6 @@ START_TEST( editor ) * RICHED20.DLL, so the linker doesn't actually link to it. */ hmoduleRichEdit = LoadLibrary("RICHED20.DLL"); ok(hmoduleRichEdit != NULL, "error: %d\n", (int) GetLastError()); - test_WM_CHAR(); test_EM_FINDTEXT(); test_EM_GETLINE(); @@ -3168,6 +3244,7 @@ START_TEST( editor ) test_EM_GETTEXTLENGTHEX(); test_EM_REPLACESEL(1); test_EM_REPLACESEL(0); + test_WM_NOTIFY(); test_eventMask(); /* Set the environment variable WINETEST_RICHED20 to keep windows

1 0