June 2015 - Wine-commits - list.winehq.org

Michael Stefaniuc : dswave: Remove gratuitous IDirectMusicSegment8 from DirectSoundWave.
by Alexandre Julliard 09 Jun '15

09 Jun '15

Module: wine Branch: master Commit: da07fe99a5f2276aa727fa4c3f73d7ab92fbf57f URL: http://source.winehq.org/git/wine.git/?a=commit;h=da07fe99a5f2276aa727fa4c3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 8 21:33:09 2015 +0200 dswave: Remove gratuitous IDirectMusicSegment8 from DirectSoundWave. --- dlls/dswave/dswave.c | 226 ------------------------------------------- dlls/dswave/dswave_private.h | 1 - dlls/dswave/tests/dswave.c | 6 +- 3 files changed, 3 insertions(+), 230 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=da07fe99a5f2276aa727f…

1 0

Alexandre Julliard : user32/tests: Add tests for calling EmptyClipboard from a different thread.
by Alexandre Julliard 09 Jun '15

09 Jun '15

Module: wine Branch: master Commit: 26bae6d61309419194a8553a3b1b3eaa9b7a64aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=26bae6d61309419194a8553a3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 9 16:38:15 2015 +0900 user32/tests: Add tests for calling EmptyClipboard from a different thread. --- dlls/user32/tests/clipboard.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 25da45b..05deed6 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -34,6 +34,14 @@ static DWORD WINAPI open_clipboard_thread(LPVOID arg) return 0; } +static DWORD WINAPI empty_clipboard_thread(LPVOID arg) +{ + SetLastError( 0xdeadbeef ); + ok(!EmptyClipboard(), "EmptyClipboard succeeded\n" ); + ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "wrong error %u\n", GetLastError()); + return 0; +} + static void test_ClipboardOwner(void) { HANDLE thread; @@ -73,6 +81,11 @@ static void test_ClipboardOwner(void) dwret = WaitForSingleObject(thread, 1000); ok(dwret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", dwret); CloseHandle(thread); + thread = CreateThread(NULL, 0, empty_clipboard_thread, 0, 0, NULL); + ok(thread != NULL, "CreateThread failed with error %d\n", GetLastError()); + dwret = WaitForSingleObject(thread, 1000); + ok(dwret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", dwret); + CloseHandle(thread); ok(!CloseClipboard(), "CloseClipboard should fail if clipboard wasn't open\n"); ok(OpenClipboard(hWnd1), "OpenClipboard failed\n"); @@ -303,6 +316,7 @@ static LRESULT CALLBACK clipboard_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARA { static UINT wm_drawclipboard; static UINT wm_clipboardupdate; + static UINT wm_destroyclipboard; LRESULT ret; switch(msg) { @@ -317,6 +331,10 @@ static LRESULT CALLBACK clipboard_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARA else if (next_wnd) SendMessageA(next_wnd, msg, wp, lp); break; + case WM_DESTROYCLIPBOARD: + wm_destroyclipboard++; + ok( GetClipboardOwner() == hwnd, "WM_DESTROYCLIPBOARD owner %p\n", GetClipboardOwner() ); + break; case WM_CLIPBOARDUPDATE: wm_clipboardupdate++; break; @@ -332,6 +350,10 @@ static LRESULT CALLBACK clipboard_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARA ret = wm_clipboardupdate; wm_clipboardupdate = 0; return ret; + case WM_USER+3: + ret = wm_destroyclipboard; + wm_destroyclipboard = 0; + return ret; } return DefWindowProcA(hwnd, msg, wp, lp); @@ -393,6 +415,8 @@ static DWORD WINAPI clipboard_thread(void *param) ok( !count, "WM_DRAWCLIPBOARD received\n" ); count = SendMessageA( win, WM_USER+2, 0, 0 ); ok( !count, "WM_CLIPBOARDUPDATE received\n" ); + count = SendMessageA( win, WM_USER+3, 0, 0 ); + ok( !count, "WM_DESTROYCLIPBOARD received\n" ); r = EmptyClipboard(); ok(r, "EmptyClipboard failed: %d\n", GetLastError()); @@ -407,6 +431,8 @@ static DWORD WINAPI clipboard_thread(void *param) ok( !count, "WM_DRAWCLIPBOARD received\n" ); count = SendMessageA( win, WM_USER+2, 0, 0 ); ok( !count, "WM_CLIPBOARDUPDATE received\n" ); + count = SendMessageA( win, WM_USER+3, 0, 0 ); + ok( count, "WM_DESTROYCLIPBOARD not received\n" ); handle = SetClipboardData( CF_TEXT, create_text() ); ok(handle != 0, "SetClipboardData failed: %d\n", GetLastError()); @@ -518,6 +544,13 @@ static DWORD WINAPI clipboard_thread(void *param) count = SendMessageA( win, WM_USER+2, 0, 0 ); ok( !count, "WM_CLIPBOARDUPDATE received\n" ); + r = OpenClipboard(0); + ok(r, "OpenClipboard failed: %d\n", GetLastError()); + r = EmptyClipboard(); + ok(r, "EmptyClipboard failed: %d\n", GetLastError()); + r = CloseClipboard(); + ok(r, "CloseClipboard failed: %d\n", GetLastError()); + r = PostMessageA(win, WM_USER, 0, 0); ok(r, "PostMessage failed: %d\n", GetLastError()); return 0;

1 0

Alexandre Julliard : server: Add a request to empty the clipboard.
by Alexandre Julliard 09 Jun '15

09 Jun '15

Module: wine Branch: master Commit: 3d7aa246d5d812e93ba96f4ec78bf7c1b462102b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d7aa246d5d812e93ba96f4ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 9 16:53:30 2015 +0900 server: Add a request to empty the clipboard. --- dlls/user32/clipboard.c | 64 +++++++++--------------------------------- dlls/user32/tests/clipboard.c | 4 +-- include/wine/server_protocol.h | 18 ++++++++++-- server/clipboard.c | 36 +++++++++++++----------- server/protocol.def | 6 +++- server/request.h | 3 ++ server/trace.c | 7 +++++ 7 files changed, 65 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3d7aa246d5d812e93ba96…

1 0

Iván Matellanes : msvcirt: Add implementation of streambuf::allocate.
by Alexandre Julliard 09 Jun '15

09 Jun '15

Module: wine Branch: master Commit: 77dbfc8979ef5ed940e89557820f6dd2792158c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77dbfc8979ef5ed940e895578… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Jun 8 21:26:21 2015 +0200 msvcirt: Add implementation of streambuf::allocate. --- dlls/msvcirt/msvcirt.c | 57 ++++++++++++++++++++++++++++++++++++++++++-- dlls/msvcirt/msvcirt.h | 1 + dlls/msvcirt/msvcirt.spec | 4 ++-- dlls/msvcirt/tests/msvcirt.c | 23 +++++++++++++++++- dlls/msvcrt20/msvcrt20.spec | 4 ++-- dlls/msvcrt40/msvcrt40.spec | 4 ++-- 6 files changed, 84 insertions(+), 9 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index e0781b9..507ed11 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -29,6 +29,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcirt); +#define RESERVE_SIZE 512 + /* class streambuf */ typedef struct { const vtable_ptr *vtable; @@ -47,6 +49,7 @@ typedef struct { CRITICAL_SECTION lock; } streambuf; +void __thiscall streambuf_setb(streambuf*, char*, char*, int); streambuf* __thiscall streambuf_setbuf(streambuf*, char*, int); void __thiscall streambuf_setg(streambuf*, char*, char*, char*); void __thiscall streambuf_setp(streambuf*, char*, char*); @@ -179,10 +182,29 @@ streambuf* __thiscall streambuf_scalar_dtor(streambuf *this, unsigned int flags) /* ?doallocate(a)streambuf@@MAEHXZ */ /* ?doallocate(a)streambuf@@MEAAHXZ */ DEFINE_THISCALL_WRAPPER(streambuf_doallocate, 4) +#define call_streambuf_doallocate(this) CALL_VTBL_FUNC(this, 40, int, (streambuf*), (this)) int __thiscall streambuf_doallocate(streambuf *this) { - FIXME("(%p): stub\n", this); - return EOF; + char *reserve; + + TRACE("(%p)\n", this); + reserve = MSVCRT_operator_new(RESERVE_SIZE); + if (!reserve) + return EOF; + + streambuf_setb(this, reserve, reserve + RESERVE_SIZE, 1); + return 1; +} + +/* ?allocate(a)streambuf@@IAEHXZ */ +/* ?allocate(a)streambuf@@IEAAHXZ */ +DEFINE_THISCALL_WRAPPER(streambuf_allocate, 4) +int __thiscall streambuf_allocate(streambuf *this) +{ + TRACE("(%p)\n", this); + if (this->base != NULL || this->unbuffered) + return 0; + return call_streambuf_doallocate(this); } /* Unexported */ @@ -404,6 +426,35 @@ char * __thiscall MSVCIRT_str_sl_void(class_strstreambuf * _this) return 0; } +#ifdef __i386__ + +#define DEFINE_VTBL_WRAPPER(off) \ + __ASM_GLOBAL_FUNC(vtbl_wrapper_ ## off, \ + "popl %eax\n\t" \ + "popl %ecx\n\t" \ + "pushl %eax\n\t" \ + "movl 0(%ecx), %eax\n\t" \ + "jmp *" #off "(%eax)\n\t") + +DEFINE_VTBL_WRAPPER(0); +DEFINE_VTBL_WRAPPER(4); +DEFINE_VTBL_WRAPPER(8); +DEFINE_VTBL_WRAPPER(12); +DEFINE_VTBL_WRAPPER(16); +DEFINE_VTBL_WRAPPER(20); +DEFINE_VTBL_WRAPPER(24); +DEFINE_VTBL_WRAPPER(28); +DEFINE_VTBL_WRAPPER(32); +DEFINE_VTBL_WRAPPER(36); +DEFINE_VTBL_WRAPPER(40); +DEFINE_VTBL_WRAPPER(44); +DEFINE_VTBL_WRAPPER(48); +DEFINE_VTBL_WRAPPER(52); +DEFINE_VTBL_WRAPPER(56); + +#endif + +void* (__cdecl *MSVCRT_operator_new)(SIZE_T); void (__cdecl *MSVCRT_operator_delete)(void*); static void init_cxx_funcs(void) @@ -412,10 +463,12 @@ static void init_cxx_funcs(void) if (sizeof(void *) > sizeof(int)) /* 64-bit has different names */ { + MSVCRT_operator_new = (void*)GetProcAddress(hmod, "??2(a)YAPEAX_K@Z"); MSVCRT_operator_delete = (void*)GetProcAddress(hmod, "??3(a)YAXPEAX@Z"); } else { + MSVCRT_operator_new = (void*)GetProcAddress(hmod, "??2(a)YAPAXI@Z"); MSVCRT_operator_delete = (void*)GetProcAddress(hmod, "??3(a)YAXPAX@Z"); } } diff --git a/dlls/msvcirt/msvcirt.h b/dlls/msvcirt/msvcirt.h index bdcd7d8..5cf15de 100644 --- a/dlls/msvcirt/msvcirt.h +++ b/dlls/msvcirt/msvcirt.h @@ -23,6 +23,7 @@ typedef LONG streamoff; typedef LONG streampos; +extern void* (__cdecl *MSVCRT_operator_new)(SIZE_T); extern void (__cdecl *MSVCRT_operator_delete)(void*); void init_exception(void*); diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec index dfb2734..f987dfd 100644 --- a/dlls/msvcirt/msvcirt.spec +++ b/dlls/msvcirt/msvcirt.spec @@ -400,8 +400,8 @@ @ stub -arch=win32 ??_Gstrstream@@UAEPAXI(a)Z # virtual void * __thiscall strstream::`scalar deleting destructor'(unsigned int) @ stub -arch=win32 ??_Gstrstreambuf@@UAEPAXI(a)Z # virtual void * __thiscall strstreambuf::`scalar deleting destructor'(unsigned int) # @ extern ?adjustfield(a)ios@@2JB # static long const ios::adjustfield -@ stub -arch=win32 ?allocate(a)streambuf@@IAEHXZ # int __thiscall streambuf::allocate(void) -@ stub -arch=win64 ?allocate(a)streambuf@@IEAAHXZ +@ thiscall -arch=win32 ?allocate(a)streambuf@@IAEHXZ(ptr) streambuf_allocate +@ cdecl -arch=win64 ?allocate(a)streambuf@@IEAAHXZ(ptr) streambuf_allocate @ stub -arch=win32 ?attach(a)filebuf@@QAEPAV1(a)H@Z # class filebuf * __thiscall filebuf::attach(int) @ stub -arch=win64 ?attach(a)filebuf@@QEAAPEAV1(a)H@Z @ stub -arch=win32 ?attach(a)fstream@@QAEXH(a)Z # void __thiscall fstream::attach(int) diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 311fd97..51b75ee 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -52,6 +52,8 @@ typedef struct { static streambuf* (*__thiscall p_streambuf_reserve_ctor)(streambuf*, char*, int); static streambuf* (*__thiscall p_streambuf_ctor)(streambuf*); static void (*__thiscall p_streambuf_dtor)(streambuf*); +static int (*__thiscall p_streambuf_allocate)(streambuf*); +static int (*__thiscall p_streambuf_doallocate)(streambuf*); static void (*__thiscall p_streambuf_setb)(streambuf*, char*, char*, int); static streambuf* (*__thiscall p_streambuf_setbuf)(streambuf*, char*, int); @@ -127,12 +129,16 @@ static BOOL init(void) SET(p_streambuf_reserve_ctor, "??0streambuf@@IEAA(a)PEADH@Z"); SET(p_streambuf_ctor, "??0streambuf@@IEAA(a)XZ"); SET(p_streambuf_dtor, "??1streambuf@@UEAA(a)XZ"); + SET(p_streambuf_allocate, "?allocate(a)streambuf@@IEAAHXZ"); + SET(p_streambuf_doallocate, "?doallocate(a)streambuf@@MEAAHXZ"); SET(p_streambuf_setb, "?setb(a)streambuf@@IEAAXPEAD0H(a)Z"); SET(p_streambuf_setbuf, "?setbuf(a)streambuf@@UEAAPEAV1(a)PEADH@Z"); } else { SET(p_streambuf_reserve_ctor, "??0streambuf@@IAE(a)PADH@Z"); SET(p_streambuf_ctor, "??0streambuf@@IAE(a)XZ"); SET(p_streambuf_dtor, "??1streambuf@@UAE(a)XZ"); + SET(p_streambuf_allocate, "?allocate(a)streambuf@@IAEHXZ"); + SET(p_streambuf_doallocate, "?doallocate(a)streambuf@@MAEHXZ"); SET(p_streambuf_setb, "?setb(a)streambuf@@IAEXPAD0H(a)Z"); SET(p_streambuf_setbuf, "?setbuf(a)streambuf@@UAEPAV1(a)PADH@Z"); } @@ -145,6 +151,7 @@ static void test_streambuf(void) { streambuf sb, sb2, *psb; char reserve[16]; + int ret; memset(&sb, 0xab, sizeof(streambuf)); memset(&sb2, 0xab, sizeof(streambuf)); @@ -197,7 +204,21 @@ static void test_streambuf(void) ok(sb.base == reserve, "wrong base pointer, expected %p got %p\n", reserve, sb.base); ok(sb.ebuf == reserve+16, "wrong ebuf pointer, expected %p got %p\n", reserve+16, sb.ebuf); - sb.allocated = 0; + /* allocate */ + ret = (int) call_func1(p_streambuf_allocate, &sb); + ok(ret == 0, "wrong return value, expected 0 got %d\n", ret); + sb.base = NULL; + ret = (int) call_func1(p_streambuf_allocate, &sb); + ok(ret == 1, "wrong return value, expected 1 got %d\n", ret); + ok(sb.allocated == 1, "wrong allocate value, expected 1 got %d\n", sb.allocated); + ok(sb.ebuf - sb.base == 512 , "wrong reserve area size, expected 512 got %p-%p\n", sb.ebuf, sb.base); + + /* doallocate */ + ret = (int) call_func1(p_streambuf_doallocate, &sb2); + ok(ret == 1, "doallocate failed, got %d\n", ret); + ok(sb2.allocated == 1, "wrong allocate value, expected 1 got %d\n", sb2.allocated); + ok(sb2.ebuf - sb2.base == 512 , "wrong reserve area size, expected 512 got %p-%p\n", sb2.ebuf, sb2.base); + call_func1(p_streambuf_dtor, &sb); call_func1(p_streambuf_dtor, &sb2); } diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 3cefd74..195cdf1 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -388,8 +388,8 @@ @ cdecl -arch=win32 ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z @ cdecl -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z # @ extern ?adjustfield(a)ios@@2JB -@ stub -arch=win32 ?allocate(a)streambuf@@IAEHXZ -@ stub -arch=win64 ?allocate(a)streambuf@@IEAAHXZ +@ thiscall -arch=win32 ?allocate(a)streambuf@@IAEHXZ(ptr) msvcirt.?allocate(a)streambuf@@IAEHXZ +@ cdecl -arch=win64 ?allocate(a)streambuf@@IEAAHXZ(ptr) msvcirt.?allocate(a)streambuf@@IEAAHXZ @ stub -arch=win32 ?attach(a)filebuf@@QAEPAV1(a)H@Z @ stub -arch=win64 ?attach(a)filebuf@@QEAAPEAV1(a)H@Z @ stub -arch=win32 ?attach(a)fstream@@QAEXH(a)Z diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index 705521a..0042f17 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -451,8 +451,8 @@ @ cdecl -arch=win32 ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z @ cdecl -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z # @ extern ?adjustfield(a)ios@@2JB -@ stub -arch=win32 ?allocate(a)streambuf@@IAEHXZ -@ stub -arch=win64 ?allocate(a)streambuf@@IEAAHXZ +@ thiscall -arch=win32 ?allocate(a)streambuf@@IAEHXZ(ptr) msvcirt.?allocate(a)streambuf@@IAEHXZ +@ cdecl -arch=win64 ?allocate(a)streambuf@@IEAAHXZ(ptr) msvcirt.?allocate(a)streambuf@@IEAAHXZ @ stub -arch=win32 ?attach(a)filebuf@@QAEPAV1(a)H@Z @ stub -arch=win64 ?attach(a)filebuf@@QEAAPEAV1(a)H@Z @ stub -arch=win32 ?attach(a)fstream@@QAEXH(a)Z

1 0

Jeremy Newman : missed a section
by Jeremy Newman 08 Jun '15

08 Jun '15

Module: website Branch: master Commit: ee87d5f5aa9a2e8818044661cb22307dcee9e465 URL: http://source.winehq.org/git/website.git/?a=commit;h=ee87d5f5aa9a2e88180446… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Jun 8 13:56:03 2015 -0500 missed a section --- wwn/en/wn20150607_392.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wwn/en/wn20150607_392.xml b/wwn/en/wn20150607_392.xml index 99362fa..495e69a 100644 --- a/wwn/en/wn20150607_392.xml +++ b/wwn/en/wn20150607_392.xml @@ -158,6 +158,7 @@ Tom Wickline finally set up a <a href="https://www.facebook.com/pages/winehqorg/1634558060090404">Facebook</a> page for WineHQ! Make sure to subscribe to it to receive interesting and Wine related posts. +]]> </section> <section @@ -166,6 +167,7 @@ Make sure to subscribe to it to receive interesting and Wine related posts. archive="//www.winehq.org/pipermail/wine-devel/2015-June/107722.html" posts="14" > +<![CDATA[ Austin writes:

1 0

Jeremy Newman : add a blockquote to wwn
by Jeremy Newman 08 Jun '15

08 Jun '15

Module: website Branch: master Commit: 735c3a94ab4a5a51358aef50d824dbfee7e9bee8 URL: http://source.winehq.org/git/website.git/?a=commit;h=735c3a94ab4a5a51358aef… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Jun 8 13:51:25 2015 -0500 add a blockquote to wwn --- styles.css | 1 + 1 file changed, 1 insertion(+) diff --git a/styles.css b/styles.css index 65c948f..d9ba833 100644 --- a/styles.css +++ b/styles.css @@ -250,6 +250,7 @@ div.rbox div.content { margin: 0; background-color: #FFFFFF; } /* WWN Colors */ .wwn TABLE { margin: 0px; padding: 0px; border-spacing: 0; } .wwn TH { color: #A50D0D; border-bottom: 1px solid #A50D0D; margin: 5px 0 5px 0; padding: 5px 0 5px 0; text-align: left; } +.wwn BLOCKQUOTE { margin: 1em 1em 1em 1em; color: #A8003C; } .wwnQuote { color: #A8003C; } p.indent { padding-left: 1em; padding-right: 1em;}

1 0

Jeremy Newman : wrap all html using XML CDATA, change quote to blockquote
by Jeremy Newman 08 Jun '15

08 Jun '15

Module: website Branch: master Commit: 78222447404f704282d96633420eb2e3c92c5e71 URL: http://source.winehq.org/git/website.git/?a=commit;h=78222447404f704282d966… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Jun 8 13:51:44 2015 -0500 wrap all html using XML CDATA, change quote to blockquote --- wwn/en/wn20150607_392.xml | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/wwn/en/wn20150607_392.xml b/wwn/en/wn20150607_392.xml index 90f2772..99362fa 100644 --- a/wwn/en/wn20150607_392.xml +++ b/wwn/en/wn20150607_392.xml @@ -4,8 +4,8 @@ <author contact="http://www.dawncrow.de/wine/">André Hentschel</author> <issue num="392" date="06/07/2015" /> -<intro> This is the 392nd issue of the World Wine News publication. -Its main goal is to inform you of what's going on around Wine. Wine is an open source implementation of the Windows API on top of X and Unix. Think of it as a Windows compatibility layer. Wine does not require Microsoft Windows, as it is a completely alternative implementation consisting of 100% Microsoft-free code, but it can optionally use native system DLLs if they are available. You can find more info at <a href="http://www.winehq.org">www.winehq.org</a> </intro> +<intro><![CDATA[ This is the 392nd issue of the World Wine News publication. +Its main goal is to inform you of what's going on around Wine. Wine is an open source implementation of the Windows API on top of X and Unix. Think of it as a Windows compatibility layer. Wine does not require Microsoft Windows, as it is a completely alternative implementation consisting of 100% Microsoft-free code, but it can optionally use native system DLLs if they are available. You can find more info at <a href="http://www.winehq.org">www.winehq.org</a> ]]></intro> <stats posts="140" size="102" contrib="36" multiples="17" lastweek="11"> <person posts="6" size="8" who="austinenglish at gmail.com (Austin English)" /> @@ -27,6 +27,7 @@ Its main goal is to inform you of what's going on around Wine. Wine is an open s archive="http://wiki.winehq.org/WineConf2015" posts="1" > +<![CDATA[ Instead of visiting FOSDEM a third time we decided to do our own conference again this year. WineConf will be held in Vienna in September and we have a very interesting preliminary agenda: @@ -51,6 +52,7 @@ Possibly we'll also have: <li>Wine's desktop and system integration - Damjan Jovanovic</li> <li>Wine and Valgrind - Austin English</li> </ul> +]]> </section> <section @@ -59,6 +61,7 @@ Possibly we'll also have: archive="https://www.google-melange.com/gsoc/homepage/google/gsoc2015" posts="1" > +<![CDATA[ I haven't wrote about GSoC 2015 yet, but the Wine Project already was <a href="http://www.phoronix.com/scan.php?page=news_item&px=GSoC-2015-Interesting-Wo…">on the news</a> with it. @@ -68,7 +71,7 @@ We have four projects which are already in the coding period: Direct3DRM - Implement rendering backend for D3DRM - <a href="https://www.google-melange.com/gsoc/project/details/google/gsoc2015/jam/575…">Project</a> <a href="//www.winehq.org/pipermail/wine-devel/2015-May/107608.html">by Aaryaman Vasishta</a> -<quote> +<blockquote> Thank you for inviting me to this opportunity! I will try my best to keep it short, though it might be a bit long for some. There's a TL;DR at the end, though. :) A bit about myself. My name is Aaryaman Vasishta and I'm currently studying in my third year of Computer Engineering in Pune Institute of Computer Technology, India. My interests lie in game programming and computer graphics. My project focuses on implementing the rendering backend for the D3DRM API [1]. @@ -77,31 +80,31 @@ We have four projects which are already in the coding period: The API is quite old (it has been removed since DX 8 SDK, and the dll doesn't come included with vista onwards) but there are a few popular games that used it. Namely, Lego Rock Raiders and Steel Beasts, and applications as well, like FMS (Flying Model Simulator). So there is some merit in working on this. Implementing these functions will help accelerate further development of this API to get some long-awaited apps to run on wine (I can see quite a few threads on google of people trying to get FMS running, and a couple for LRR too, so there is some demand for it). As an added bonus, I also get to interact with wine's ddraw implementation for this one, which could potentially help ddraw's implementation via possible bug detection/fixes and implementing any ddraw functionality that d3drm requires. TL;DR: I'm implementing a main chunk of a graphics API called Direct3D Retained Mode, which is based on Direct3D Immediate Mode. The API is mostly a stub in wine and this project should help get things going. [1] - https://www.google-melange.com/gsoc/project/details/google/gsoc2015/jam/575… -</quote> +</blockquote> Implement the Visual C++ iostream library - <a href="https://www.google-melange.com/gsoc/project/details/google/gsoc2015/sulley/…">Project</a> <a href="//www.winehq.org/pipermail/wine-devel/2015-May/107619.html">by Iván Matellanes</a> -<quote> +<blockquote> I'm looking forward to contributing to Wine. My project consists on implementing part of the legacy Visual C++ iostream runtime, which was shipped with Visual Studio versions up to 6.0 and is currently a stub. I'll work on as many functions as time permits, and one of the key points is to reuse code from the modern Visual C++ runtime library that is already implemented. Some old applications and games (like MS Reader and Tron 2.0) would benefit from this, as they would run with the built-in library. A quick search on Bugzilla for 'msvcirt' shows several bugs related to unimplemented functions. -</quote> +</blockquote> Implementing functions from tr2 namespace - <a href="https://www.google-melange.com/gsoc/project/details/google/gsoc2015/yonghao…">Project</a> <a href="//www.winehq.org/pipermail/wine-devel/2015-May/107628.html">by YongHao Hu</a> -<quote> +<blockquote> My project focuses on implementing all the functions from tr2 namespace, which was included in the <filesystem> header and being proposed for standardization. Though there are many methods to implement the functions like _File_size and _Equivalent etc, the hard part is finding the most appropriate one. New applications like MSVC12[1] would benefit from this. [1]: //bugs.winehq.org/show_bug.cgi?id=35774 -</quote> +</blockquote> Improve mshtml.dll - <a href="https://www.google-melange.com/gsoc/project/details/google/gsoc2015/zhenbo/…">Project</a> <a href="//www.winehq.org/pipermail/wine-devel/2015-May/107609.html">by Zhenbo Li</a> -<quote> +<blockquote> I'm glad to working on Wine GSoC this year. My project's focus is IHMLTXMLHttpRequest. Many websites would use hacks to determine whether the browser was IE6.0 or IE 7+. As XMLHttpRequest object @@ -119,8 +122,8 @@ necessary to make wine IE more usable. [0]: http://en.wikipedia.org/wiki/XMLHttpRequest [1]: https://getfirebug.com/firebuglite [2]: https://developer.mozilla.org/en-US/docs/nsIXMLHttpRequest -</quote> - +</blockquote> +]]> </section> <section @@ -129,16 +132,18 @@ necessary to make wine IE more usable. archive="https://www.linux.com/news/featured-blogs/200-libby-clark/822789-git-succes…" posts="1" > +<![CDATA[ Alexandre Julliard was <a href="https://www.linux.com/news/featured-blogs/200-libby-clark/822789-git-succes…"> interviewed by Linux.com</a> and it's an interesting read! -<quote> +<blockquote> I can no longer imagine doing software development without it. -</quote> +</blockquote> +]]> </section> <section @@ -147,6 +152,7 @@ I can no longer imagine doing software development without it. archive="https://www.facebook.com/pages/winehqorg/1634558060090404" posts="0" > +<![CDATA[ Tom Wickline finally set up a <a href="https://www.facebook.com/pages/winehqorg/1634558060090404">Facebook</a> page for WineHQ! @@ -163,7 +169,7 @@ Make sure to subscribe to it to receive interesting and Wine related posts. Austin writes: -<quote> +<blockquote> Given SourceForge's recent activities [1] with taking over open source @@ -174,10 +180,11 @@ wine-gecko/wine-mono installers, and the wine-gecko git repository. [1] http://www.extremetech.com/computing/206687-sourceforge-accused-of-hijackin… -</quote> +</blockquote> So far there was mostly (or only) positive feedback to that suggestion and planning seems to be in progress. +]]> </section> <section @@ -186,6 +193,7 @@ So far there was mostly (or only) positive feedback to that suggestion and plann archive="//appdb.winehq.org" posts="0" > +<![CDATA[ <topic>AppDB / Bugzilla</topic> <center>Bugzilla Changes:</center> <center> @@ -762,4 +770,5 @@ will have the same experience and would provide a similar rating. </td> </tr> </table></div> +]]> </section></kc>

1 0

Jeremy Newman : encode a non tag
by Jeremy Newman 08 Jun '15

08 Jun '15

Module: website Branch: master Commit: 2e57778be1f9892f4c9283239fffc934c24d7330 URL: http://source.winehq.org/git/website.git/?a=commit;h=2e57778be1f9892f4c9283… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Jun 8 08:55:10 2015 -0500 encode a non tag --- wwn/en/wn20150607_392.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wwn/en/wn20150607_392.xml b/wwn/en/wn20150607_392.xml index e7fa396..90f2772 100644 --- a/wwn/en/wn20150607_392.xml +++ b/wwn/en/wn20150607_392.xml @@ -92,7 +92,7 @@ We have four projects which are already in the coding period: <a href="https://www.google-melange.com/gsoc/project/details/google/gsoc2015/yonghao…">Project</a> <a href="//www.winehq.org/pipermail/wine-devel/2015-May/107628.html">by YongHao Hu</a> <quote> -My project focuses on implementing all the functions from tr2 namespace, which was included in the <filesystem> header and being proposed for standardization. +My project focuses on implementing all the functions from tr2 namespace, which was included in the <filesystem> header and being proposed for standardization. Though there are many methods to implement the functions like _File_size and _Equivalent etc, the hard part is finding the most appropriate one. New applications like MSVC12[1] would benefit from this. [1]: //bugs.winehq.org/show_bug.cgi?id=35774

1 0

Nikolay Sivov : riched20: Handle range method failures in InRange ( Coverity).
by Alexandre Julliard 08 Jun '15

08 Jun '15

Module: wine Branch: master Commit: 26883637141441d88c3865b42d61f67a3668a489 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26883637141441d88c3865b42… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 7 23:41:12 2015 +0300 riched20: Handle range method failures in InRange (Coverity). --- dlls/riched20/richole.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 198061d..1cb6589 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -2006,10 +2006,11 @@ static HRESULT textrange_inrange(LONG start, LONG end, ITextRange *range, LONG * if (!ret) ret = &v; - ITextRange_GetStart(range, &from); - ITextRange_GetEnd(range, &to); - - *ret = (start >= from && end <= to) ? tomTrue : tomFalse; + if (FAILED(ITextRange_GetStart(range, &from)) || FAILED(ITextRange_GetEnd(range, &to))) { + *ret = tomFalse; + } + else + *ret = (start >= from && end <= to) ? tomTrue : tomFalse; return *ret == tomTrue ? S_OK : S_FALSE; }

1 0

Nikolay Sivov : riched20: Improve error handling in SetFont (Coverity).
by Alexandre Julliard 08 Jun '15

08 Jun '15

Module: wine Branch: master Commit: 3681a59c298fdedfe0cfc13d1fbd42fb1d9d3b51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3681a59c298fdedfe0cfc13d1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 7 23:47:37 2015 +0300 riched20: Improve error handling in SetFont (Coverity). --- dlls/riched20/richole.c | 67 +++++++++++++++++++++++++------------------------ 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 1cb6589..d39bce7 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -523,12 +523,13 @@ static inline const IRichEditOleImpl *get_range_reole(ITextRange *range) static void textrange_set_font(ITextRange *range, ITextFont *font) { CHARFORMAT2W fmt; + HRESULT hr; LONG value; BSTR str; FLOAT f; #define CHARFORMAT_SET_B_FIELD(mask, value) \ - if (value != tomUndefined) { \ + if (hr == S_OK && value != tomUndefined) { \ fmt.dwMask |= CFM_##mask; \ if (value == tomTrue) fmt.dwEffects |= CFE_##mask; \ } \ @@ -538,73 +539,73 @@ static void textrange_set_font(ITextRange *range, ITextFont *font) fmt.cbSize = sizeof(fmt); value = tomUndefined; - ITextFont_GetAllCaps(font, &value); + hr = ITextFont_GetAllCaps(font, &value); CHARFORMAT_SET_B_FIELD(ALLCAPS, value); value = tomUndefined; - ITextFont_GetBold(font, &value); + hr = ITextFont_GetBold(font, &value); CHARFORMAT_SET_B_FIELD(BOLD, value); value = tomUndefined; - ITextFont_GetEmboss(font, &value); + hr = ITextFont_GetEmboss(font, &value); CHARFORMAT_SET_B_FIELD(EMBOSS, value); value = tomUndefined; - ITextFont_GetHidden(font, &value); + hr = ITextFont_GetHidden(font, &value); CHARFORMAT_SET_B_FIELD(HIDDEN, value); value = tomUndefined; - ITextFont_GetEngrave(font, &value); + hr = ITextFont_GetEngrave(font, &value); CHARFORMAT_SET_B_FIELD(IMPRINT, value); value = tomUndefined; - ITextFont_GetItalic(font, &value); + hr = ITextFont_GetItalic(font, &value); CHARFORMAT_SET_B_FIELD(ITALIC, value); value = tomUndefined; - ITextFont_GetOutline(font, &value); + hr = ITextFont_GetOutline(font, &value); CHARFORMAT_SET_B_FIELD(OUTLINE, value); value = tomUndefined; - ITextFont_GetProtected(font, &value); + hr = ITextFont_GetProtected(font, &value); CHARFORMAT_SET_B_FIELD(PROTECTED, value); value = tomUndefined; - ITextFont_GetShadow(font, &value); + hr = ITextFont_GetShadow(font, &value); CHARFORMAT_SET_B_FIELD(SHADOW, value); value = tomUndefined; - ITextFont_GetSmallCaps(font, &value); + hr = ITextFont_GetSmallCaps(font, &value); CHARFORMAT_SET_B_FIELD(SMALLCAPS, value); value = tomUndefined; - ITextFont_GetStrikeThrough(font, &value); + hr = ITextFont_GetStrikeThrough(font, &value); CHARFORMAT_SET_B_FIELD(STRIKEOUT, value); value = tomUndefined; - ITextFont_GetSubscript(font, &value); + hr = ITextFont_GetSubscript(font, &value); CHARFORMAT_SET_B_FIELD(SUBSCRIPT, value); value = tomUndefined; - ITextFont_GetSuperscript(font, &value); + hr = ITextFont_GetSuperscript(font, &value); CHARFORMAT_SET_B_FIELD(SUPERSCRIPT, value); value = tomUndefined; - ITextFont_GetUnderline(font, &value); + hr = ITextFont_GetUnderline(font, &value); CHARFORMAT_SET_B_FIELD(UNDERLINE, value); #undef CHARFORMAT_SET_B_FIELD value = tomUndefined; - ITextFont_GetAnimation(font, &value); - if (value != tomUndefined) { + hr = ITextFont_GetAnimation(font, &value); + if (hr == S_OK && value != tomUndefined) { fmt.dwMask |= CFM_ANIMATION; fmt.bAnimation = value; } value = tomUndefined; - ITextFont_GetBackColor(font, &value); - if (value != tomUndefined) { + hr = ITextFont_GetBackColor(font, &value); + if (hr == S_OK && value != tomUndefined) { fmt.dwMask |= CFM_BACKCOLOR; if (value == tomAutoColor) fmt.dwEffects |= CFE_AUTOBACKCOLOR; @@ -613,8 +614,8 @@ static void textrange_set_font(ITextRange *range, ITextFont *font) } value = tomUndefined; - ITextFont_GetForeColor(font, &value); - if (value != tomUndefined) { + hr = ITextFont_GetForeColor(font, &value); + if (hr == S_OK && value != tomUndefined) { fmt.dwMask |= CFM_COLOR; if (value == tomAutoColor) fmt.dwEffects |= CFE_AUTOCOLOR; @@ -623,15 +624,15 @@ static void textrange_set_font(ITextRange *range, ITextFont *font) } value = tomUndefined; - ITextFont_GetKerning(font, &f); - if (f != tomUndefined) { + hr = ITextFont_GetKerning(font, &f); + if (hr == S_OK && f != tomUndefined) { fmt.dwMask |= CFM_KERNING; fmt.wKerning = points_to_twips(f); } value = tomUndefined; - ITextFont_GetLanguageID(font, &value); - if (value != tomUndefined) { + hr = ITextFont_GetLanguageID(font, &value); + if (hr == S_OK && value != tomUndefined) { fmt.dwMask |= CFM_LCID; fmt.lcid = value; } @@ -642,26 +643,26 @@ static void textrange_set_font(ITextRange *range, ITextFont *font) SysFreeString(str); } - ITextFont_GetPosition(font, &f); - if (f != tomUndefined) { + hr = ITextFont_GetPosition(font, &f); + if (hr == S_OK && f != tomUndefined) { fmt.dwMask |= CFM_OFFSET; fmt.yOffset = points_to_twips(f); } - ITextFont_GetSize(font, &f); - if (f != tomUndefined) { + hr = ITextFont_GetSize(font, &f); + if (hr == S_OK && f != tomUndefined) { fmt.dwMask |= CFM_SIZE; fmt.yHeight = points_to_twips(f); } - ITextFont_GetSpacing(font, &f); - if (f != tomUndefined) { + hr = ITextFont_GetSpacing(font, &f); + if (hr == S_OK && f != tomUndefined) { fmt.dwMask |= CFM_SPACING; fmt.sSpacing = f; } - ITextFont_GetWeight(font, &value); - if (value != tomUndefined) { + hr = ITextFont_GetWeight(font, &value); + if (hr == S_OK && value != tomUndefined) { fmt.dwMask |= CFM_WEIGHT; fmt.wWeight = value; }

1 0