July 2014 - Wine-commits - list.winehq.org

Damjan Jovanovic : winex11.drv: Fix a GlobalLock() reference leak.
by Alexandre Julliard 18 Jul '14

18 Jul '14

Module: wine Branch: master Commit: 04d8b325bf266a53ddf19c2fc4df05dd6b3c189d URL: http://source.winehq.org/git/wine.git/?a=commit;h=04d8b325bf266a53ddf19c2fc… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Jul 17 21:08:02 2014 +0200 winex11.drv: Fix a GlobalLock() reference leak. --- dlls/winex11.drv/xdnd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 3390dad..abaf4b4 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -569,6 +569,7 @@ static void X11DRV_XDND_SendDropFiles(HWND hwnd) lpDrop->pt.x = XDNDxy.x; lpDrop->pt.y = XDNDxy.y; memcpy(lpDrop, GlobalLock(current->contents), GlobalSize(current->contents)); + GlobalUnlock(current->contents); TRACE("Sending WM_DROPFILES: hWnd(0x%p) %p(%s)\n", hwnd, ((char*)lpDrop) + lpDrop->pFiles, debugstr_w((WCHAR*)(((char*)lpDrop) + lpDrop->pFiles))); GlobalUnlock(dropHandle);

1 0

Damjan Jovanovic : winex11.drv: Don't memcpy() over the DROPFILES point just after setting it.
by Alexandre Julliard 18 Jul '14

18 Jul '14

Module: wine Branch: master Commit: f2f8d187e4a1164122b61a90e7753a6d29dfaeab URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2f8d187e4a1164122b61a90e… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Jul 17 21:08:12 2014 +0200 winex11.drv: Don't memcpy() over the DROPFILES point just after setting it. --- dlls/winex11.drv/xdnd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index abaf4b4..26df943 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -566,10 +566,10 @@ static void X11DRV_XDND_SendDropFiles(HWND hwnd) if (dropHandle) { DROPFILES *lpDrop = GlobalLock(dropHandle); - lpDrop->pt.x = XDNDxy.x; - lpDrop->pt.y = XDNDxy.y; memcpy(lpDrop, GlobalLock(current->contents), GlobalSize(current->contents)); GlobalUnlock(current->contents); + lpDrop->pt.x = XDNDxy.x; + lpDrop->pt.y = XDNDxy.y; TRACE("Sending WM_DROPFILES: hWnd(0x%p) %p(%s)\n", hwnd, ((char*)lpDrop) + lpDrop->pFiles, debugstr_w((WCHAR*)(((char*)lpDrop) + lpDrop->pFiles))); GlobalUnlock(dropHandle);

1 0

Damjan Jovanovic : winex11.drv: Translate the WM_DROPFILES point into client coordinates whenever possible.
by Alexandre Julliard 18 Jul '14

18 Jul '14

Module: wine Branch: master Commit: 846a8f6c8dcf7ad0bc72437d7ea79cc9e00c8ab7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=846a8f6c8dcf7ad0bc72437d7… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Jul 17 21:08:24 2014 +0200 winex11.drv: Translate the WM_DROPFILES point into client coordinates whenever possible. --- dlls/winex11.drv/xdnd.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 26df943..6618edd 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -570,10 +570,11 @@ static void X11DRV_XDND_SendDropFiles(HWND hwnd) GlobalUnlock(current->contents); lpDrop->pt.x = XDNDxy.x; lpDrop->pt.y = XDNDxy.y; - TRACE("Sending WM_DROPFILES: hWnd(0x%p) %p(%s)\n", hwnd, - ((char*)lpDrop) + lpDrop->pFiles, debugstr_w((WCHAR*)(((char*)lpDrop) + lpDrop->pFiles))); + lpDrop->fNC = !ScreenToClient(hwnd, &lpDrop->pt); + TRACE("Sending WM_DROPFILES: hWnd=0x%p, fNC=%d, x=%d, y=%d, files=%p(%s)\n", hwnd, + lpDrop->fNC, lpDrop->pt.x, lpDrop->pt.y, ((char*)lpDrop) + lpDrop->pFiles, + debugstr_w((WCHAR*)(((char*)lpDrop) + lpDrop->pFiles))); GlobalUnlock(dropHandle); - if (!PostMessageW(hwnd, WM_DROPFILES, (WPARAM)dropHandle, 0)) GlobalFree(dropHandle); }

1 0

Damjan Jovanovic : winex11.drv: Allow the clipboard to copy files to other X11 apps.
by Alexandre Julliard 18 Jul '14

18 Jul '14

Module: wine Branch: master Commit: c60d6c46bf195a0e094fd598c4129f55592e7203 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c60d6c46bf195a0e094fd598c… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Jul 17 20:14:35 2014 +0200 winex11.drv: Allow the clipboard to copy files to other X11 apps. --- dlls/winex11.drv/clipboard.c | 93 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 91 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 727a2a4..b2705b4 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -163,6 +163,8 @@ static HANDLE X11DRV_CLIPBOARD_ExportEnhMetaFile(Display *display, Window reques Atom rprop, LPWINE_CLIPDATA lpdata, LPDWORD lpBytes); static HANDLE X11DRV_CLIPBOARD_ExportTextHtml(Display *display, Window requestor, Atom aTarget, Atom rprop, LPWINE_CLIPDATA lpdata, LPDWORD lpBytes); +static HANDLE X11DRV_CLIPBOARD_ExportHDROP(Display *display, Window requestor, Atom aTarget, + Atom rprop, LPWINE_CLIPDATA lpdata, LPDWORD lpBytes); static WINE_CLIPFORMAT *X11DRV_CLIPBOARD_InsertClipboardFormat(UINT id, Atom prop); static BOOL X11DRV_CLIPBOARD_RenderSynthesizedText(Display *display, UINT wFormatID); static void X11DRV_CLIPBOARD_FreeData(LPWINE_CLIPDATA lpData); @@ -207,8 +209,7 @@ static const struct /* If UTF8_STRING is not available, attempt COMPOUND_TEXT */ { CF_UNICODETEXT, XATOM_COMPOUND_TEXT, X11DRV_CLIPBOARD_ImportCompoundText, X11DRV_CLIPBOARD_ExportString }, { CF_ENHMETAFILE, XATOM_WCF_ENHMETAFILE, X11DRV_CLIPBOARD_ImportEnhMetaFile, X11DRV_CLIPBOARD_ExportEnhMetaFile }, - { CF_HDROP, XATOM_WCF_HDROP, X11DRV_CLIPBOARD_ImportClipboardData, X11DRV_CLIPBOARD_ExportClipboardData }, - { CF_HDROP, XATOM_text_uri_list, X11DRV_CLIPBOARD_ImportTextUriList, X11DRV_CLIPBOARD_ExportClipboardData }, + { CF_HDROP, XATOM_text_uri_list, X11DRV_CLIPBOARD_ImportTextUriList, X11DRV_CLIPBOARD_ExportHDROP }, { CF_LOCALE, XATOM_WCF_LOCALE, X11DRV_CLIPBOARD_ImportClipboardData, X11DRV_CLIPBOARD_ExportClipboardData }, { CF_DIBV5, XATOM_WCF_DIBV5, X11DRV_CLIPBOARD_ImportClipboardData, X11DRV_CLIPBOARD_ExportClipboardData }, { CF_OWNERDISPLAY, XATOM_WCF_OWNERDISPLAY, X11DRV_CLIPBOARD_ImportClipboardData, X11DRV_CLIPBOARD_ExportClipboardData }, @@ -2179,6 +2180,94 @@ end: /************************************************************************** + * X11DRV_CLIPBOARD_ExportHDROP + * + * Export CF_HDROP format to text/uri-list. + */ +static HANDLE X11DRV_CLIPBOARD_ExportHDROP(Display *display, Window requestor, Atom aTarget, + Atom rprop, LPWINE_CLIPDATA lpdata, LPDWORD lpBytes) +{ + HDROP hDrop; + UINT i; + UINT numFiles; + HGLOBAL hClipData = NULL; + char *textUriList = NULL; + UINT textUriListSize = 32; + UINT next = 0; + + *lpBytes = 0; + + if (!X11DRV_CLIPBOARD_RenderFormat(display, lpdata)) + { + ERR("Failed to export %04x format\n", lpdata->wFormatID); + return 0; + } + hClipData = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, textUriListSize); + if (hClipData == NULL) + return 0; + hDrop = (HDROP) lpdata->hData; + numFiles = DragQueryFileW(hDrop, 0xFFFFFFFF, NULL, 0); + for (i = 0; i < numFiles; i++) + { + UINT dosFilenameSize; + WCHAR *dosFilename = NULL; + char *unixFilename = NULL; + UINT uriSize; + UINT u; + + dosFilenameSize = 1 + DragQueryFileW(hDrop, i, NULL, 0); + dosFilename = HeapAlloc(GetProcessHeap(), 0, dosFilenameSize*sizeof(WCHAR)); + if (dosFilename == NULL) goto failed; + DragQueryFileW(hDrop, i, dosFilename, dosFilenameSize); + unixFilename = wine_get_unix_file_name(dosFilename); + HeapFree(GetProcessHeap(), 0, dosFilename); + if (unixFilename == NULL) goto failed; + uriSize = 8 + /* file:/// */ + 3 * (lstrlenA(unixFilename) - 1) + /* "%xy" per char except first '/' */ + 2; /* \r\n */ + if ((next + uriSize) > textUriListSize) + { + UINT biggerSize = max( 2 * textUriListSize, next + uriSize ); + HGLOBAL bigger = GlobalReAlloc(hClipData, biggerSize, 0); + if (bigger) + { + hClipData = bigger; + textUriListSize = biggerSize; + } + else + { + HeapFree(GetProcessHeap(), 0, unixFilename); + goto failed; + } + } + textUriList = GlobalLock(hClipData); + lstrcpyA(&textUriList[next], "file:///"); + next += 8; + /* URL encode everything - unnecessary, but easier/lighter than linking in shlwapi, and can't hurt */ + for (u = 1; unixFilename[u]; u++) + { + static const char hex_table[] = "0123456789abcdef"; + textUriList[next++] = '%'; + textUriList[next++] = hex_table[unixFilename[u] >> 4]; + textUriList[next++] = hex_table[unixFilename[u] & 0xf]; + } + textUriList[next++] = '\r'; + textUriList[next++] = '\n'; + GlobalUnlock(hClipData); + HeapFree(GetProcessHeap(), 0, unixFilename); + } + + *lpBytes = next; + return hClipData; + +failed: + GlobalFree(hClipData); + *lpBytes = 0; + return 0; +} + + +/************************************************************************** * X11DRV_CLIPBOARD_QueryTargets */ static BOOL X11DRV_CLIPBOARD_QueryTargets(Display *display, Window w, Atom selection,

1 0

Henri Verbeet : wined3d: Fix a couple of renderer strings in select_card_nvidia_binary().
by Alexandre Julliard 18 Jul '14

18 Jul '14

Module: wine Branch: master Commit: 8c19371b628a861028f3dbfa0b8a3a53677efd04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c19371b628a861028f3dbfa0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 18 10:37:53 2014 +0200 wined3d: Fix a couple of renderer strings in select_card_nvidia_binary(). --- dlls/wined3d/directx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d6bb3836..5ed392d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1743,9 +1743,9 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl {"GTX 260", CARD_NVIDIA_GEFORCE_GTX260}, /* Geforce 200 - midend */ {"GT 240", CARD_NVIDIA_GEFORCE_GT240}, /* Geforce 200 - midend */ {"GT 220", CARD_NVIDIA_GEFORCE_GT220}, /* Geforce 200 - lowend */ - {"Geforce 310", CARD_NVIDIA_GEFORCE_210}, /* Geforce 200 - lowend */ - {"Geforce 305", CARD_NVIDIA_GEFORCE_210}, /* Geforce 200 - lowend */ - {"Geforce 210", CARD_NVIDIA_GEFORCE_210}, /* Geforce 200 - lowend */ + {"GeForce 310", CARD_NVIDIA_GEFORCE_210}, /* Geforce 200 - lowend */ + {"GeForce 305", CARD_NVIDIA_GEFORCE_210}, /* Geforce 200 - lowend */ + {"GeForce 210", CARD_NVIDIA_GEFORCE_210}, /* Geforce 200 - lowend */ {"G 210", CARD_NVIDIA_GEFORCE_210}, /* Geforce 200 - lowend */ {"GTS 250", CARD_NVIDIA_GEFORCE_9800GT}, /* Geforce 9 - highend / Geforce 200 - midend */ {"GTS 150", CARD_NVIDIA_GEFORCE_9800GT}, /* Geforce 9 - highend / Geforce 200 - midend */

1 0

Henri Verbeet : wined3d: Use the previous "dirty" status to set WINED3D_BUFFER_NOSYNC in wined3d_buffer_map().
by Alexandre Julliard 18 Jul '14

18 Jul '14

Module: wine Branch: master Commit: 01251f3d3cb9c5f7b8cb006f91eb242f4f32bf4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=01251f3d3cb9c5f7b8cb006f9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 18 10:37:54 2014 +0200 wined3d: Use the previous "dirty" status to set WINED3D_BUFFER_NOSYNC in wined3d_buffer_map(). This (presumably) fixes a regression introduced by commit c1032e977bb9f850e3aea28dd79e3d7c2244cd6c. --- dlls/wined3d/buffer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index fa9ff92..d5dbc87 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -939,6 +939,7 @@ struct wined3d_resource * CDECL wined3d_buffer_get_resource(struct wined3d_buffe HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UINT size, BYTE **data, DWORD flags) { + BOOL dirty = buffer_is_dirty(buffer); LONG count; BYTE *base; @@ -1034,7 +1035,7 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN if (!(flags & WINED3D_MAP_NOOVERWRITE)) buffer->flags &= ~WINED3D_BUFFER_NOSYNC; - else if (!buffer_is_dirty(buffer)) + else if (!dirty) buffer->flags |= WINED3D_BUFFER_NOSYNC; }

1 0

Henri Verbeet : wined3d: Track synchronized buffer maps.
by Alexandre Julliard 18 Jul '14

18 Jul '14

Module: wine Branch: master Commit: bc019fcbbd7f0014280a292bc58ef618cfbe34c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc019fcbbd7f0014280a292bc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 18 10:37:55 2014 +0200 wined3d: Track synchronized buffer maps. Instead of trying to infer unsynchronized ones. --- dlls/wined3d/buffer.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index d5dbc87..4d3e32a 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -34,7 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); #define WINED3D_BUFFER_DOUBLEBUFFER 0x04 /* Keep both a buffer object and a system memory copy for this buffer. */ #define WINED3D_BUFFER_FLUSH 0x08 /* Manual unmap flushing. */ #define WINED3D_BUFFER_DISCARD 0x10 /* A DISCARD lock has occurred since the last preload. */ -#define WINED3D_BUFFER_NOSYNC 0x20 /* All locks since the last preload had NOOVERWRITE set. */ +#define WINED3D_BUFFER_SYNC 0x20 /* There has been at least one synchronized map since the last preload. */ #define WINED3D_BUFFER_APPLESYNC 0x40 /* Using sync as in GL_APPLE_flush_buffer_range. */ #define VB_MAXDECLCHANGES 100 /* After that number of decl changes we stop converting */ @@ -662,7 +662,7 @@ static void buffer_direct_upload(struct wined3d_buffer *This, const struct wined mapflags = GL_MAP_WRITE_BIT | GL_MAP_FLUSH_EXPLICIT_BIT; if (flags & WINED3D_BUFFER_DISCARD) mapflags |= GL_MAP_INVALIDATE_BUFFER_BIT; - if (flags & WINED3D_BUFFER_NOSYNC) + else if (!(flags & WINED3D_BUFFER_SYNC)) mapflags |= GL_MAP_UNSYNCHRONIZED_BIT; map = GL_EXTCALL(glMapBufferRange(This->buffer_type_hint, 0, This->resource.size, mapflags)); @@ -675,7 +675,7 @@ static void buffer_direct_upload(struct wined3d_buffer *This, const struct wined DWORD syncflags = 0; if (flags & WINED3D_BUFFER_DISCARD) syncflags |= WINED3D_MAP_DISCARD; - if (flags & WINED3D_BUFFER_NOSYNC) + else if (!(flags & WINED3D_BUFFER_SYNC)) syncflags |= WINED3D_MAP_NOOVERWRITE; buffer_sync_apple(This, syncflags, gl_info); } @@ -713,14 +713,14 @@ static void buffer_direct_upload(struct wined3d_buffer *This, const struct wined void buffer_mark_used(struct wined3d_buffer *buffer) { - buffer->flags &= ~(WINED3D_BUFFER_NOSYNC | WINED3D_BUFFER_DISCARD); + buffer->flags &= ~(WINED3D_BUFFER_SYNC | WINED3D_BUFFER_DISCARD); } /* Context activation is done by the caller. */ void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_state *state) { - DWORD flags = buffer->flags & (WINED3D_BUFFER_NOSYNC | WINED3D_BUFFER_DISCARD); + DWORD flags = buffer->flags & (WINED3D_BUFFER_SYNC | WINED3D_BUFFER_DISCARD); struct wined3d_device *device = buffer->resource.device; UINT start = 0, end = 0, len = 0, vertices; const struct wined3d_gl_info *gl_info; @@ -939,7 +939,6 @@ struct wined3d_resource * CDECL wined3d_buffer_get_resource(struct wined3d_buffe HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UINT size, BYTE **data, DWORD flags) { - BOOL dirty = buffer_is_dirty(buffer); LONG count; BYTE *base; @@ -1032,11 +1031,8 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN if (flags & WINED3D_MAP_DISCARD) buffer->flags |= WINED3D_BUFFER_DISCARD; - - if (!(flags & WINED3D_MAP_NOOVERWRITE)) - buffer->flags &= ~WINED3D_BUFFER_NOSYNC; - else if (!dirty) - buffer->flags |= WINED3D_BUFFER_NOSYNC; + else if (!(flags & WINED3D_MAP_NOOVERWRITE)) + buffer->flags |= WINED3D_BUFFER_SYNC; } base = buffer->map_ptr ? buffer->map_ptr : buffer->resource.heap_memory;

1 0

Alexandre Julliard : ntdll: Use a custom signal restorer for Android.
by Alexandre Julliard 17 Jul '14

17 Jul '14

Module: wine Branch: master Commit: 1b1ea639cd66c8c3ea690afc5a346651364d36b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b1ea639cd66c8c3ea690afc5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 17 14:51:12 2014 +0200 ntdll: Use a custom signal restorer for Android. Bionic doesn't provide one, even when vdso has been unmapped by the preloader. --- dlls/ntdll/signal_i386.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 5f8b8fd..7b4bc72 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -135,6 +135,12 @@ typedef struct ucontext #define FPU_sig(context) ((FLOATING_SAVE_AREA*)((context)->uc_mcontext.fpstate)) #define FPUX_sig(context) (FPU_sig(context) && !((context)->uc_mcontext.fpstate->status >> 16) ? (XMM_SAVE_AREA32 *)(FPU_sig(context) + 1) : NULL) +/* custom signal restorer since we may have unmapped the one in vdso, and bionic doesn't check for that */ +void rt_sigreturn(void); +__ASM_GLOBAL_FUNC( rt_sigreturn, + "movl $173,%eax\n\t" /* NR_rt_sigreturn */ + "int $0x80" ); + #elif defined (__linux__) typedef ucontext_t SIGCONTEXT; @@ -2327,7 +2333,10 @@ void signal_init_process(void) #ifdef SA_ONSTACK sig_act.sa_flags |= SA_ONSTACK; #endif - +#ifdef __ANDROID__ + sig_act.sa_flags |= SA_RESTORER; + sig_act.sa_restorer = rt_sigreturn; +#endif sig_act.sa_sigaction = int_handler; if (sigaction( SIGINT, &sig_act, NULL ) == -1) goto error; sig_act.sa_sigaction = fpe_handler;

1 0

Zhenbo Li : mshtml: Added IHTMLFormElement::reset method implementation.
by Alexandre Julliard 17 Jul '14

17 Jul '14

Module: wine Branch: master Commit: d734935a2c8e1fba97b4848ba9939bfb7064efd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d734935a2c8e1fba97b4848ba… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Thu Jul 17 23:48:36 2014 +0800 mshtml: Added IHTMLFormElement::reset method implementation. --- dlls/mshtml/htmlform.c | 12 ++++++++++-- dlls/mshtml/tests/dom.c | 12 ++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index 6cbf1f6..86af350 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -436,8 +436,16 @@ static HRESULT WINAPI HTMLFormElement_submit(IHTMLFormElement *iface) static HRESULT WINAPI HTMLFormElement_reset(IHTMLFormElement *iface) { HTMLFormElement *This = impl_from_IHTMLFormElement(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)->()\n", This); + nsres = nsIDOMHTMLFormElement_Reset(This->nsform); + if (NS_FAILED(nsres)) { + ERR("Reset failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLFormElement_put_length(IHTMLFormElement *iface, LONG v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 532bbfb..487c25c 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3764,6 +3764,17 @@ static void _test_form_elements(unsigned line, IUnknown *unk) IHTMLFormElement_Release(form); } +#define test_form_reset(a) _test_form_reset(__LINE__,a) +static void _test_form_reset(unsigned line, IUnknown *unk) +{ + IHTMLFormElement *form = _get_form_iface(line, unk); + HRESULT hres; + + hres = IHTMLFormElement_reset(form); + ok_(__FILE__,line)(hres == S_OK, "reset failed: %08x\n", hres); + + IHTMLFormElement_Release(form); +} #define test_meta_name(a,b) _test_meta_name(__LINE__,a,b) static void _test_meta_name(unsigned line, IUnknown *unk, const char *exname) { @@ -7330,6 +7341,7 @@ static void test_elems2(IHTMLDocument2 *doc) test_form_put_encoding((IUnknown*)elem, E_INVALIDARG, "image/png"); test_form_encoding((IUnknown*)elem, "multipart/form-data"); test_form_elements((IUnknown*)elem); + test_form_reset((IUnknown*)elem); IHTMLElement_Release(elem); }

1 0

Alexandre Julliard : lxr: Only markup potential filenames surrounded by spaces.
by Alexandre Julliard 17 Jul '14

17 Jul '14

Module: tools Branch: master Commit: d2264373dc9461f1962aafbaa7d37018a28a3403 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d2264373dc9461f1962aafba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 30 21:12:53 2014 +0200 lxr: Only markup potential filenames surrounded by spaces. Otherwise it considers a version name like wine-1.7 to be a filename. --- lxr/lib/LXR/Markup.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lxr/lib/LXR/Markup.pm b/lxr/lib/LXR/Markup.pm index 6c5a33c..94d0c78 100644 --- a/lxr/lib/LXR/Markup.pm +++ b/lxr/lib/LXR/Markup.pm @@ -111,7 +111,7 @@ sub markupstring { $string =~ s/(<)(.*@.*)(>)/$1<a class='offshore' href=\"mailto:$2\">$2<\/a>$3/g; # HTMLify file names, assuming file is in the directory defined by $virtp. - $string =~ s{\b([\w\-_\/]+\.\w{1,5}|README)\b} + $string =~ s{\s([\w\-_\/]+\.\w{1,5}|README)\s} {fileref($1, '', $virtp . $1);}ge; return ($string);

1 0