May 2014 - Wine-Commits - list.winehq.org

Bruno Jesus : ws2_32: Avoid memory allocation for simple sends.
by Alexandre Julliard May 20, 2014

May 20, 2014

Module: wine Branch: master Commit: 752219396d62b1f9613beef200b21e0ce8470e8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=752219396d62b1f9613beef20… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon May 19 18:16:21 2014 -0300 ws2_32: Avoid memory allocation for simple sends. --- dlls/ws2_32/socket.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 88d3deb..04c715e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4517,10 +4517,9 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine ) { unsigned int i, options; - int n, fd, err; - struct ws2_async *wsa = NULL; + int n, fd, err, overlapped; + struct ws2_async *wsa = NULL, localwsa; int totalLength = 0; - ULONG_PTR cvalue = (lpOverlapped && ((ULONG_PTR)lpOverlapped->hEvent & 1) == 0) ? (ULONG_PTR)lpOverlapped : 0; DWORD bytes_sent; BOOL is_blocking; @@ -4538,11 +4537,19 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, err = WSAEFAULT; goto error; } - if (!(wsa = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET(struct ws2_async, iovec[dwBufferCount]) ))) + + overlapped = (lpOverlapped || lpCompletionRoutine) && + !(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)); + if (overlapped || dwBufferCount > 1) { - err = WSAEFAULT; - goto error; + if (!(wsa = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET(struct ws2_async, iovec[dwBufferCount]) ))) + { + err = WSAEFAULT; + goto error; + } } + else + wsa = &localwsa; wsa->hSocket = SOCKET2HANDLE(s); wsa->addr = (struct WS_sockaddr *)to; @@ -4566,10 +4573,10 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, goto error; } - if ((lpOverlapped || lpCompletionRoutine) && - !(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT))) + if (overlapped) { IO_STATUS_BLOCK *iosb = lpOverlapped ? (IO_STATUS_BLOCK *)lpOverlapped : &wsa->local_iosb; + ULONG_PTR cvalue = (lpOverlapped && ((ULONG_PTR)lpOverlapped->hEvent & 1) == 0) ? (ULONG_PTR)lpOverlapped : 0; wsa->user_overlapped = lpOverlapped; wsa->completion_func = lpCompletionRoutine; @@ -4677,13 +4684,13 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, TRACE(" -> %i bytes\n", bytes_sent); if (lpNumberOfBytesSent) *lpNumberOfBytesSent = bytes_sent; - HeapFree( GetProcessHeap(), 0, wsa ); + if (wsa != &localwsa) HeapFree( GetProcessHeap(), 0, wsa ); release_sock_fd( s, fd ); WSASetLastError(0); return 0; error: - HeapFree( GetProcessHeap(), 0, wsa ); + if (wsa != &localwsa) HeapFree( GetProcessHeap(), 0, wsa ); release_sock_fd( s, fd ); WARN(" -> ERROR %d\n", err); WSASetLastError(err);

1 0

Henri Verbeet : d2d1: Implement D2D1CreateFactory().
by Alexandre Julliard May 20, 2014

May 20, 2014

Module: wine Branch: master Commit: 089832e6d5450b86fea87e043ba0bebf763bac6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=089832e6d5450b86fea87e043… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 20 07:38:43 2014 +0200 d2d1: Implement D2D1CreateFactory(). --- dlls/d2d1/Makefile.in | 3 +- dlls/d2d1/factory.c | 248 +++++++++++++++++++++++++++++++++ dlls/uuid/Makefile.in | 1 + dlls/{d2d1/d2d1_main.c => uuid/d2d.c} | 19 +-- 4 files changed, 253 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=089832e6d5450b86fea87…

1 0

Andrew Eikum : user32: Remove unused internal menu messages.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: d7f827254e7eebf1dfd505d5c41701e22e3a2fb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7f827254e7eebf1dfd505d5c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 16 10:50:13 2014 -0500 user32: Remove unused internal menu messages. --- dlls/user32/menu.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index ab3f73b..0aa7744 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -62,11 +62,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(menu); WINE_DECLARE_DEBUG_CHANNEL(accel); -/* internal popup menu window messages */ - -#define MM_SETMENUHANDLE (WM_USER + 0) -#define MM_GETMENUHANDLE (WM_USER + 1) - /* Menu item structure */ typedef struct { /* ----------- MENUITEMINFO Stuff ----------- */ @@ -127,8 +122,6 @@ typedef struct POINT pt; } MTRACKER; -#define MENU_MAGIC 0x554d /* 'MU' */ - #define ITEM_PREV -1 #define ITEM_NEXT 1 @@ -3567,11 +3560,6 @@ LRESULT WINAPI PopupMenuWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM SetWindowLongPtrW( hwnd, 0, 0 ); break; - case MM_SETMENUHANDLE: - SetWindowLongPtrW( hwnd, 0, wParam ); - break; - - case MM_GETMENUHANDLE: case MN_GETHMENU: return GetWindowLongPtrW( hwnd, 0 );

1 0

Piotr Caban : vbscript: Support multibyte characters in Global_Chr.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: 193de805a1e0ed291d721ad13a5c8cd8494aac4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=193de805a1e0ed291d721ad13… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 19 16:44:02 2014 +0200 vbscript: Support multibyte characters in Global_Chr. --- dlls/vbscript/global.c | 26 ++++++++++++++++++++++---- dlls/vbscript/tests/api.vbs | 14 ++++++++++++-- 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 484158f..7c44661 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1129,9 +1129,15 @@ static HRESULT Global_Asc(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA return E_NOTIMPL; } +/* The function supports only single-byte and double-byte character sets. It + * ignores language specified by IActiveScriptSite::GetLCID. The argument needs + * to be in range of short or unsigned short. */ static HRESULT Global_Chr(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - int c; + int cp, c, len = 0; + CPINFO cpi; + WCHAR ch; + char buf[2]; HRESULT hres; TRACE("%s\n", debugstr_variant(arg)); @@ -1140,14 +1146,26 @@ static HRESULT Global_Chr(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA if(FAILED(hres)) return hres; - if(c < 0 || c >= 0x100) { + cp = GetACP(); + if(!GetCPInfo(cp, &cpi)) + cpi.MaxCharSize = 1; + + if((c!=(short)c && c!=(unsigned short)c) || + (unsigned short)c>=(cpi.MaxCharSize>1 ? 0x10000 : 0x100)) { WARN("invalid arg %d\n", c); return MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); } - if(res) { - WCHAR ch = c; + if(c>>8) + buf[len++] = c>>8; + if(!len || IsDBCSLeadByteEx(cp, buf[0])) + buf[len++] = c; + if(!MultiByteToWideChar(0, 0, buf, len, &ch, 1)) { + WARN("invalid arg %d, cp %d\n", c, cp); + return E_FAIL; + } + if(res) { V_VT(res) = VT_BSTR; V_BSTR(res) = SysAllocStringLen(&ch, 1); if(!V_BSTR(res)) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 8197d6d..d7af8e9 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -140,12 +140,22 @@ Call ok(Chr(119.5) = "x", "Chr(119.5) = " & Chr(119.5)) sub testChrError on error resume next + if isEnglishLang then + call Err.clear() + call Chr(-1) + call ok(Err.number = 5, "Err.number = " & Err.number) + + call Err.clear() + call Chr(256) + call ok(Err.number = 5, "Err.number = " & Err.number) + end if + call Err.clear() - call Chr(-1) + call Chr(65536) call ok(Err.number = 5, "Err.number = " & Err.number) call Err.clear() - call Chr(256) + call Chr(-32769) call ok(Err.number = 5, "Err.number = " & Err.number) end sub

1 0

Vincent Povirk : user32/tests: Add test for SendMessage race condition.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: abea10fa93351f6d3b4e5e0938b84059a429dfe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abea10fa93351f6d3b4e5e093… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 14 13:15:51 2014 -0500 user32/tests: Add test for SendMessage race condition. --- dlls/user32/tests/win.c | 165 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 165 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index aba9359..a858f6b 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7533,6 +7533,170 @@ static void test_window_without_child_style(void) DestroyWindow(hwnd); } + +struct smresult_thread_data +{ + HWND main_hwnd; + HWND thread_hwnd; + HANDLE thread_started; + HANDLE thread_got_wm_app; + HANDLE main_in_wm_app_1; + HANDLE thread_replied; +}; + + +static LRESULT WINAPI smresult_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_APP: + { + struct smresult_thread_data *data = (struct smresult_thread_data*)lparam; + + ok(hwnd == data->thread_hwnd, "unexpected hwnd %p\n", hwnd); + + SendNotifyMessageA(data->main_hwnd, WM_APP+1, 0, lparam); + + /* Don't return until the main thread is processing our sent message. */ + ok(WaitForSingleObject(data->main_in_wm_app_1, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + + /* Break the PeekMessage loop so we can notify the main thread after we return. */ + SetEvent(data->thread_got_wm_app); + + return 0x240408ea; + } + case WM_APP+1: + { + struct smresult_thread_data *data = (struct smresult_thread_data*)lparam; + LRESULT res; + + ok(hwnd == data->main_hwnd, "unexpected hwnd %p\n", hwnd); + + /* Ask the thread to reply to our WM_APP message. */ + SetEvent(data->main_in_wm_app_1); + + /* Wait until the thread has sent a reply. */ + ok(WaitForSingleObject(data->thread_replied, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + + /* Send another message while we have a reply queued for the current one. */ + res = SendMessageA(data->thread_hwnd, WM_APP+2, 0, lparam); + todo_wine ok(res == 0x449b0190, "unexpected result %lx\n", res); + + return 0; + } + case WM_APP+2: + { + struct smresult_thread_data *data = (struct smresult_thread_data*)lparam; + + ok(hwnd == data->thread_hwnd, "unexpected hwnd %p\n", hwnd); + + /* Don't return until we know the main thread is processing sent messages. */ + SendMessageA(data->main_hwnd, WM_NULL, 0, 0); + + return 0x449b0190; + } + case WM_CLOSE: + PostQuitMessage(0); + break; + } + return DefWindowProcA(hwnd, msg, wparam, lparam); +} + +static DWORD WINAPI smresult_thread_proc(void *param) +{ + MSG msg; + struct smresult_thread_data *data = param; + + data->thread_hwnd = CreateWindowExA(0, "SmresultClass", "window caption text", WS_OVERLAPPEDWINDOW, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok(data->thread_hwnd != 0, "Failed to create overlapped window\n"); + + SetEvent(data->thread_started); + + /* Loop until we've processed WM_APP. */ + while (WaitForSingleObject(data->thread_got_wm_app, 0) != WAIT_OBJECT_0) + { + if (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); + DispatchMessageA(&msg); + } + else + { + MsgWaitForMultipleObjects(1, &data->thread_got_wm_app, FALSE, INFINITE, QS_SENDMESSAGE); + } + } + + /* Notify the main thread that we replied to its WM_APP message. */ + SetEvent(data->thread_replied); + + while (GetMessageA(&msg, 0, 0, 0)) + { + TranslateMessage(&msg); + DispatchMessageA(&msg); + } + + return 0; +} + +static void test_smresult(void) +{ + WNDCLASSA cls; + HANDLE hThread; + DWORD tid; + struct smresult_thread_data data; + BOOL ret; + LRESULT res; + + cls.style = CS_DBLCLKS; + cls.lpfnWndProc = smresult_wndproc; + cls.cbClsExtra = 0; + cls.cbWndExtra = 0; + cls.hInstance = GetModuleHandleA(0); + cls.hIcon = 0; + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpszMenuName = NULL; + cls.lpszClassName = "SmresultClass"; + + ret = RegisterClassA(&cls); + ok(ret, "RegisterClassA failed\n"); + + data.thread_started = CreateEventA(NULL, TRUE, FALSE, NULL); + ok(data.thread_started != NULL, "CreateEventA failed\n"); + + data.thread_got_wm_app = CreateEventA(NULL, TRUE, FALSE, NULL); + ok(data.thread_got_wm_app != NULL, "CreateEventA failed\n"); + + data.main_in_wm_app_1 = CreateEventA(NULL, TRUE, FALSE, NULL); + ok(data.main_in_wm_app_1 != NULL, "CreateEventA failed\n"); + + data.thread_replied = CreateEventA(NULL, TRUE, FALSE, NULL); + ok(data.thread_replied != NULL, "CreateEventA failed\n"); + + data.main_hwnd = CreateWindowExA(0, "SmresultClass", "window caption text", WS_OVERLAPPEDWINDOW, + 100, 100, 200, 200, 0, 0, 0, NULL); + + hThread = CreateThread(NULL, 0, smresult_thread_proc, &data, 0, &tid); + ok(hThread != NULL, "CreateThread failed, error %d\n", GetLastError()); + + ok(WaitForSingleObject(data.thread_started, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + + res = SendMessageA(data.thread_hwnd, WM_APP, 0, (LPARAM)&data); + ok(res == 0x240408ea, "unexpected result %lx\n", res); + + SendMessageA(data.thread_hwnd, WM_CLOSE, 0, 0); + + DestroyWindow(data.main_hwnd); + + ok(WaitForSingleObject(hThread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + + CloseHandle(data.thread_started); + CloseHandle(data.thread_got_wm_app); + CloseHandle(data.main_in_wm_app_1); + CloseHandle(data.thread_replied); +} + START_TEST(win) { HMODULE user32 = GetModuleHandleA( "user32.dll" ); @@ -7664,6 +7828,7 @@ START_TEST(win) test_map_points(); test_update_region(); test_window_without_child_style(); + test_smresult(); /* add the tests above this line */ if (hhook) UnhookWindowsHookEx(hhook);

1 0

Piotr Caban : msvcrt: Fix __libm_sse2_sqrt_precise implementation.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: 153965b627e2ea7a101b5fc1aa46a85478d0dbbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=153965b627e2ea7a101b5fc1a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 19 18:49:02 2014 +0200 msvcrt: Fix __libm_sse2_sqrt_precise implementation. --- dlls/msvcrt/math.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 2c5a8f3..3a1aa1d 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2191,9 +2191,9 @@ void __cdecl __libm_sse2_tanf(void) void __cdecl __libm_sse2_sqrt_precise(void) { double d; - __asm__ __volatile__( "movd %%xmm0,%0" : "=m" (d) ); + __asm__ __volatile__( "movq %%xmm0,%0" : "=m" (d) ); d = sqrt( d ); - __asm__ __volatile__( "movd %0,%%xmm0" : : "m" (d) ); + __asm__ __volatile__( "movq %0,%%xmm0" : : "m" (d) ); } #endif /* __i386__ */

1 0

Andrew Eikum : mmdevapi: Clock rate should be in bytes for shared mode.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: 0e84a59d8946a362ad0d017c0d23d7cf62a0fc63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e84a59d8946a362ad0d017c0… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 19 08:59:26 2014 -0500 mmdevapi: Clock rate should be in bytes for shared mode. --- dlls/mmdevapi/tests/render.c | 2 +- dlls/winealsa.drv/mmdevdrv.c | 10 ++++++++-- dlls/winecoreaudio.drv/mmdevdrv.c | 8 +++++++- dlls/wineoss.drv/mmdevdrv.c | 8 +++++++- 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 3cadcee..91ed029 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -955,7 +955,7 @@ static void test_clock(int share) trace("Clock Frequency %u\n", (UINT)freq); /* MSDN says it's arbitrary units, but shared mode is unlikely to change */ - if (share) todo_wine + if (share) ok(freq == pwfx->nSamplesPerSec * pwfx->nBlockAlign, "Clock Frequency %u\n", (UINT)freq); else diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 30531a8..5e40d6e 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -2822,7 +2822,10 @@ static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) TRACE("(%p)->(%p)\n", This, freq); - *freq = This->fmt->nSamplesPerSec; + if(This->share == AUDCLNT_SHAREMODE_SHARED) + *freq = This->fmt->nSamplesPerSec * This->fmt->nBlockAlign; + else + *freq = This->fmt->nSamplesPerSec; return S_OK; } @@ -2879,7 +2882,10 @@ static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, TRACE("frames written: %u, held: %u, avail: %ld, delay: %ld state %d, pos: %u\n", (UINT32)(written_frames%1000000000), held_frames, avail_frames, delay_frames, alsa_state, (UINT32)(position%1000000000)); - *pos = position; + if(This->share == AUDCLNT_SHAREMODE_SHARED) + *pos = position * This->fmt->nBlockAlign; + else + *pos = position; if(qpctime){ LARGE_INTEGER stamp, freq; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index c181713..6603075 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -2420,7 +2420,10 @@ static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) TRACE("(%p)->(%p)\n", This, freq); - *freq = This->fmt->nSamplesPerSec; + if(This->share == AUDCLNT_SHAREMODE_SHARED) + *freq = This->fmt->nSamplesPerSec * This->fmt->nBlockAlign; + else + *freq = This->fmt->nSamplesPerSec; return S_OK; } @@ -2435,6 +2438,9 @@ static HRESULT AudioClock_GetPosition_nolock(ACImpl *This, else *pos = This->inbuf_frames + This->written_frames; + if(This->share == AUDCLNT_SHAREMODE_SHARED) + *pos *= This->fmt->nBlockAlign; + if(qpctime){ LARGE_INTEGER stamp, freq; QueryPerformanceCounter(&stamp); diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index e11e6dc..dd45fba 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -2145,7 +2145,10 @@ static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) TRACE("(%p)->(%p)\n", This, freq); - *freq = This->fmt->nSamplesPerSec; + if(This->share == AUDCLNT_SHAREMODE_SHARED) + *freq = This->fmt->nSamplesPerSec * This->fmt->nBlockAlign; + else + *freq = This->fmt->nSamplesPerSec; return S_OK; } @@ -2195,6 +2198,9 @@ static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, This->last_pos_frames = *pos; + if(This->share == AUDCLNT_SHAREMODE_SHARED) + *pos *= This->fmt->nBlockAlign; + LeaveCriticalSection(&This->lock); if(qpctime){

1 0

Zhenbo Li : mshtml: Added IHTMLLinkElement::media property.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: e6f816c99b9f1aa2438a001ff4d52706a2eb354e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6f816c99b9f1aa2438a001ff… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Mon May 19 21:45:05 2014 +0800 mshtml: Added IHTMLLinkElement::media property. --- dlls/mshtml/htmllink.c | 28 ++++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 20 ++++++++++++++++++++ 2 files changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmllink.c b/dlls/mshtml/htmllink.c index 79f0ca9..b5ae29a 100644 --- a/dlls/mshtml/htmllink.c +++ b/dlls/mshtml/htmllink.c @@ -286,15 +286,35 @@ static HRESULT WINAPI HTMLLinkElement_get_disabled(IHTMLLinkElement *iface, VARI static HRESULT WINAPI HTMLLinkElement_put_media(IHTMLLinkElement *iface, BSTR v) { HTMLLinkElement *This = impl_from_IHTMLLinkElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsresult nsres; + nsAString str; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_InitDepend(&str, v); + + nsres = nsIDOMHTMLLinkElement_SetMedia(This->nslink, &str); + nsAString_Finish(&str); + + if(NS_FAILED(nsres)) { + ERR("Set Media(%s) failed: %08x\n", debugstr_w(v), nsres); + return E_FAIL; + } + return S_OK; } static HRESULT WINAPI HTMLLinkElement_get_media(IHTMLLinkElement *iface, BSTR *p) { HTMLLinkElement *This = impl_from_IHTMLLinkElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsresult nsres; + nsAString str; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&str, NULL); + nsres = nsIDOMHTMLLinkElement_GetMedia(This->nslink, &str); + + return return_nsstr(nsres, &str, p); } static const IHTMLLinkElementVtbl HTMLLinkElementVtbl = { diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 0d6c3ac..cb1e7be 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3812,6 +3812,25 @@ static void _test_meta_httpequiv(unsigned line, IUnknown *unk, const char *exval IHTMLMetaElement_Release(meta); } +#define test_link_media(a,b) _test_link_media(__LINE__,a,b) +static void _test_link_media(unsigned line, IHTMLElement *elem, const char *exval) +{ + IHTMLLinkElement *link = _get_link_iface(line, (IUnknown*)elem); + HRESULT hres; + BSTR str; + + str = a2bstr(exval); + hres = IHTMLLinkElement_put_media(link, str); + ok_(__FILE__,line)(hres == S_OK, "put_media(%s) failed: %08x\n", exval, hres); + SysFreeString(str); + + hres = IHTMLLinkElement_get_media(link, &str); + ok_(__FILE__,line)(hres == S_OK, "get_media failed: %08x\n", hres); + ok_(__FILE__,line)(!strcmp_wa(str, exval), "got %s, expected %s\n", wine_dbgstr_w(str), exval); + SysFreeString(str); + IHTMLLinkElement_Release(link); +} + #define test_link_disabled(a,b) _test_link_disabled(__LINE__,a,b) static void _test_link_disabled(unsigned line, IHTMLElement *elem, VARIANT_BOOL v) { @@ -7182,6 +7201,7 @@ static void test_elems2(IHTMLDocument2 *doc) test_link_rel(elem, "stylesheet"); test_link_type(elem, "text/css"); test_link_href(elem, "about:blank"); + test_link_media(elem, "all"); link_put_disabled(elem, VARIANT_TRUE); link_put_rel(elem, "prev"); link_put_type(elem, "text/plain");

1 0

Zhenbo Li : mshtml: Added nsIDOMHTMLTableCellElement declaration.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: efc6a564cdd6b0af6f7c63094d1a2f6d45dafa71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efc6a564cdd6b0af6f7c63094… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Sat May 17 21:39:55 2014 +0800 mshtml: Added nsIDOMHTMLTableCellElement declaration. --- dlls/mshtml/htmltablecell.c | 10 ++++++++++ dlls/mshtml/nsiface.idl | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/dlls/mshtml/htmltablecell.c b/dlls/mshtml/htmltablecell.c index 7bfcf99..7b8d2fc 100644 --- a/dlls/mshtml/htmltablecell.c +++ b/dlls/mshtml/htmltablecell.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -35,6 +36,8 @@ typedef struct { HTMLElement element; IHTMLTableCell IHTMLTableCell_iface; + + nsIDOMHTMLTableCellElement *nscell; } HTMLTableCell; static inline HTMLTableCell *impl_from_IHTMLTableCell(IHTMLTableCell *iface) @@ -362,6 +365,7 @@ static dispex_static_data_t HTMLTableCell_dispex = { HRESULT HTMLTableCell_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, HTMLElement **elem) { HTMLTableCell *ret; + nsresult nsres; ret = heap_alloc_zero(sizeof(*ret)); if(!ret) @@ -372,6 +376,12 @@ HRESULT HTMLTableCell_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, H HTMLElement_Init(&ret->element, doc, nselem, &HTMLTableCell_dispex); + nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLTableCellElement, (void**)&ret->nscell); + + /* Share nscell reference with nsnode */ + assert(nsres == NS_OK && (nsIDOMNode*)ret->nscell == ret->element.node.nsnode); + nsIDOMNode_Release(ret->element.node.nsnode); + *elem = &ret->element; return S_OK; } diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 9182c19..89a9740 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -2072,6 +2072,44 @@ interface nsIDOMHTMLTableRowElement : nsIDOMHTMLElement [ object, + uuid(1fb22137-c231-4eae-9ca4-557bb0852d89), + local +] +interface nsIDOMHTMLTableCellElement : nsIDOMHTMLElement +{ + nsresult GetCellIndex(int32_t *aCellIndex); + nsresult GetAbbr(nsAString *aAbbr); + nsresult SetAbbr(const nsAString *aAbbr); + nsresult GetAlign(nsAString *aAlign); + nsresult SetAlign(const nsAString *aAlign); + nsresult GetAxis(nsAString *aAxis); + nsresult SetAxis(const nsAString *aAxis); + nsresult GetBgColor(nsAString *aBgColor); + nsresult SetBgColor(const nsAString *aBgColor); + nsresult GetCh(nsAString *aCh); + nsresult SetCh(const nsAString *aCh); + nsresult GetChOff(nsAString *aChOff); + nsresult SetChOff(const nsAString *aChOff); + nsresult GetColSpan(int32_t *aColSpan); + nsresult SetColSpan(int32_t aColSpan); + nsresult GetHeaders(nsAString *aHeaders); + nsresult SetHeaders(const nsAString *aHeaders); + nsresult GetHeight(nsAString *aHeight); + nsresult SetHeight(const nsAString *aHeight); + nsresult GetNoWrap(bool *aNoWrap); + nsresult SetNoWrap(bool aNoWrap); + nsresult GetRowSpan(int32_t *aRowSpan); + nsresult SetRowSpan(int32_t aRowSpan); + nsresult GetScope(nsAString *aScope); + nsresult SetScope(const nsAString *aScope); + nsresult GetVAlign(nsAString *aVAlign); + nsresult SetVAlign(const nsAString *aVAlign); + nsresult GetWidth(nsAString *aWidth); + nsresult SetWidth(const nsAString *aWidth); +} + +[ + object, uuid(21ffbe98-51f5-499e-8d6f-612ae798c1e1), local ]

1 0

Alexandre Julliard : vbscript: Avoid using bool keyword.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: 534394dfa24449640c6d492d3d26826d7412c797 URL: http://source.winehq.org/git/wine.git/?a=commit;h=534394dfa24449640c6d492d3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 19 11:38:33 2014 +0200 vbscript: Avoid using bool keyword. --- dlls/vbscript/parser.y | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index c5d1c59..681a0c9 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -100,7 +100,7 @@ static const WCHAR propertyW[] = {'p','r','o','p','e','r','t','y',0}; case_clausule_t *case_clausule; unsigned uint; LONG lng; - BOOL bool; + BOOL boolean; double dbl; } @@ -129,7 +129,7 @@ static const WCHAR propertyW[] = {'p','r','o','p','e','r','t','y',0}; %type <expression> ConstExpression NumericLiteralExpression %type <member> MemberExpression %type <expression> Arguments_opt ArgumentList_opt Step_opt ExpressionList -%type <bool> OptionExplicit_opt DoType +%type <boolean> OptionExplicit_opt DoType %type <arg_decl> ArgumentsDecl_opt ArgumentDeclList ArgumentDecl %type <func_decl> FunctionDecl PropertyDecl %type <elseif> ElseIfs_opt ElseIfs ElseIf

1 0