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

Hans Leidekker : wininet: Fix build on Mac OS X 10.5.8.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: 654bef8f37e9049554a5cbe3bf335b599fd31a22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=654bef8f37e9049554a5cbe3b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 19 11:13:25 2014 +0200 wininet: Fix build on Mac OS X 10.5.8. --- dlls/wininet/internet.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 8ea2803..4389c98 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2400,7 +2400,8 @@ BOOL WINAPI InternetReadFileExW(HINTERNET hFile, LPINTERNET_BUFFERSW lpBuffer, static BOOL get_proxy_autoconfig_url( char *buf, DWORD buflen ) { -#ifdef HAVE_CORESERVICES_CORESERVICES_H +#if defined(MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 + CFDictionaryRef settings = CFNetworkCopySystemProxySettings(); const void *ref; BOOL ret = FALSE;

1 0

Nikolay Sivov : scrrun: Return disk space as VT_I4 if it fits.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: 9d95788f121d58c7cde90da8e5debb0bd8ad8b9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d95788f121d58c7cde90da8e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 17 20:55:58 2014 +0400 scrrun: Return disk space as VT_I4 if it fits. --- dlls/scrrun/filesystem.c | 27 +++++++++++++++++++++------ dlls/scrrun/tests/filesystem.c | 14 ++++++++++---- 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index f5afb91..9412491 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -888,6 +888,24 @@ static HRESULT WINAPI drive_get_RootFolder(IDrive *iface, IFolder **folder) return E_NOTIMPL; } +static HRESULT variant_from_largeint(const ULARGE_INTEGER *src, VARIANT *v) +{ + HRESULT hr = S_OK; + + if (src->HighPart) + { + V_VT(v) = VT_R8; + hr = VarR8FromUI8(src->QuadPart, &V_R8(v)); + } + else + { + V_VT(v) = VT_I4; + V_I4(v) = src->LowPart; + } + + return hr; +} + static HRESULT WINAPI drive_get_AvailableSpace(IDrive *iface, VARIANT *v) { struct drive *This = impl_from_IDrive(iface); @@ -901,8 +919,7 @@ static HRESULT WINAPI drive_get_AvailableSpace(IDrive *iface, VARIANT *v) if (!GetDiskFreeSpaceExW(This->root, &avail, NULL, NULL)) return E_FAIL; - V_VT(v) = VT_R8; - return VarR8FromUI8(avail.QuadPart, &V_R8(v)); + return variant_from_largeint(&avail, v); } static HRESULT WINAPI drive_get_FreeSpace(IDrive *iface, VARIANT *v) @@ -918,8 +935,7 @@ static HRESULT WINAPI drive_get_FreeSpace(IDrive *iface, VARIANT *v) if (!GetDiskFreeSpaceExW(This->root, &freespace, NULL, NULL)) return E_FAIL; - V_VT(v) = VT_R8; - return VarR8FromUI8(freespace.QuadPart, &V_R8(v)); + return variant_from_largeint(&freespace, v); } static HRESULT WINAPI drive_get_TotalSize(IDrive *iface, VARIANT *v) @@ -935,8 +951,7 @@ static HRESULT WINAPI drive_get_TotalSize(IDrive *iface, VARIANT *v) if (!GetDiskFreeSpaceExW(This->root, NULL, &total, NULL)) return E_FAIL; - V_VT(v) = VT_R8; - return VarR8FromUI8(total.QuadPart, &V_R8(v)); + return variant_from_largeint(&total, v); } static HRESULT WINAPI drive_get_VolumeName(IDrive *iface, BSTR *name) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 531b732..61cadb9 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1294,14 +1294,20 @@ static void test_DriveCollection(void) V_VT(&size) = VT_EMPTY; hr = IDrive_get_AvailableSpace(drive, &size); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(V_VT(&size) == VT_R8, "got %d\n", V_VT(&size)); - ok(V_R8(&size) > 0, "got %f\n", V_R8(&size)); + ok(V_VT(&size) == VT_R8 || V_VT(&size) == VT_I4, "got %d\n", V_VT(&size)); + if (V_VT(&size) == VT_R8) + ok(V_R8(&size) > 0, "got %f\n", V_R8(&size)); + else + ok(V_I4(&size) > 0, "got %d\n", V_I4(&size)); V_VT(&size) = VT_EMPTY; hr = IDrive_get_FreeSpace(drive, &size); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(V_VT(&size) == VT_R8, "got %d\n", V_VT(&size)); - ok(V_R8(&size) > 0, "got %f\n", V_R8(&size)); + ok(V_VT(&size) == VT_R8 || V_VT(&size) == VT_I4, "got %d\n", V_VT(&size)); + if (V_VT(&size) == VT_R8) + ok(V_R8(&size) > 0, "got %f\n", V_R8(&size)); + else + ok(V_I4(&size) > 0, "got %d\n", V_I4(&size)); } VariantClear(&var); }

1 0

Bruno Jesus : ws2_32: Take care of EINTR inside the helpers.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: 25bc6de842dcc9870d2f1df721d30e73ddee478f URL: http://source.winehq.org/git/wine.git/?a=commit;h=25bc6de842dcc9870d2f1df72… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat May 17 17:42:11 2014 -0300 ws2_32: Take care of EINTR inside the helpers. --- dlls/ws2_32/socket.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 5499753..88d3deb 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1921,8 +1921,11 @@ static int WS2_recv( int fd, struct ws2_async *wsa ) hdr.msg_flags = 0; #endif - if ( (n = recvmsg(fd, &hdr, wsa->flags)) == -1 ) - return -1; + while ((n = recvmsg(fd, &hdr, wsa->flags)) == -1) + { + if (errno != EINTR) + return -1; + } #ifdef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS if (wsa->control) @@ -1981,7 +1984,7 @@ static NTSTATUS WS2_async_recv( void* user, IO_STATUS_BLOCK* iosb, NTSTATUS stat } else { - if (errno == EINTR || errno == EAGAIN) + if (errno == EAGAIN) { status = STATUS_PENDING; _enable_event( wsa->hSocket, FD_READ, 0, 0 ); @@ -2172,17 +2175,19 @@ static int WS2_send( int fd, struct ws2_async *wsa ) hdr.msg_flags = 0; #endif - ret = sendmsg(fd, &hdr, wsa->flags); - if (ret >= 0) + while ((ret = sendmsg(fd, &hdr, wsa->flags)) == -1) { - n = ret; - while (wsa->first_iovec < wsa->n_iovecs && wsa->iovec[wsa->first_iovec].iov_len <= n) - n -= wsa->iovec[wsa->first_iovec++].iov_len; - if (wsa->first_iovec < wsa->n_iovecs) - { - wsa->iovec[wsa->first_iovec].iov_base = (char*)wsa->iovec[wsa->first_iovec].iov_base + n; - wsa->iovec[wsa->first_iovec].iov_len -= n; - } + if (errno != EINTR) + return -1; + } + + n = ret; + while (wsa->first_iovec < wsa->n_iovecs && wsa->iovec[wsa->first_iovec].iov_len <= n) + n -= wsa->iovec[wsa->first_iovec++].iov_len; + if (wsa->first_iovec < wsa->n_iovecs) + { + wsa->iovec[wsa->first_iovec].iov_base = (char*)wsa->iovec[wsa->first_iovec].iov_base + n; + wsa->iovec[wsa->first_iovec].iov_len -= n; } return ret; } @@ -2222,7 +2227,7 @@ static NTSTATUS WS2_async_send(void* user, IO_STATUS_BLOCK* iosb, NTSTATUS statu iosb->Information += result; } - else if (errno == EINTR || errno == EAGAIN) + else if (errno == EAGAIN) { status = STATUS_PENDING; } @@ -4554,11 +4559,7 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, totalLength += lpBuffers[i].len; } - for (;;) - { - n = WS2_send( fd, wsa ); - if (n != -1 || errno != EINTR) break; - } + n = WS2_send( fd, wsa ); if (n == -1 && errno != EAGAIN) { err = wsaErrno(); @@ -4651,7 +4652,7 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, } n = WS2_send( fd, wsa ); - if (n == -1 && errno != EAGAIN && errno != EINTR) + if (n == -1 && errno != EAGAIN) { err = wsaErrno(); goto error; @@ -6570,7 +6571,6 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, n = WS2_recv( fd, wsa ); if (n == -1) { - if (errno == EINTR) continue; if (errno != EAGAIN) { int loc_errno = errno;

1 0

Hans Leidekker : winhttp: Fix build on Mac OS X 10.5.8.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: 9a25a59dc25bca6060d3be89e5bfc57d117924de URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a25a59dc25bca6060d3be89e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 19 11:13:32 2014 +0200 winhttp: Fix build on Mac OS X 10.5.8. --- dlls/winhttp/session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index f2ed72b..56e776d 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1297,7 +1297,7 @@ static WCHAR *build_wpad_url( const char *hostname, const struct addrinfo *ai ) static BOOL get_system_proxy_autoconfig_url( char *buf, DWORD buflen ) { -#ifdef HAVE_CORESERVICES_CORESERVICES_H +#if defined(MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 CFDictionaryRef settings = CFNetworkCopySystemProxySettings(); const void *ref; BOOL ret = FALSE;

1 0

Daniel Beitler : msi: Prevent call to memset with a null pointer in get_tablecolumns function.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: deb274226783ab886bdb44876944e156757efe2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=deb274226783ab886bdb44876… Author: Daniel Beitler <dan(a)dablabs.com> Date: Sun May 18 13:27:42 2014 -0400 msi: Prevent call to memset with a null pointer in get_tablecolumns function. --- dlls/msi/table.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 8012369..9ed9421 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -671,7 +671,7 @@ static UINT get_tablecolumns( MSIDATABASE *db, LPCWSTR szTableName, MSICOLUMNINF /* Note: _Columns table doesn't have non-persistent data */ /* if maxcount is non-zero, assume it's exactly right for this table */ - memset( colinfo, 0, maxcount * sizeof(*colinfo) ); + if (colinfo) memset( colinfo, 0, maxcount * sizeof(*colinfo) ); count = table->row_count; for (i = 0; i < count; i++) { @@ -684,7 +684,7 @@ static UINT get_tablecolumns( MSIDATABASE *db, LPCWSTR szTableName, MSICOLUMNINF /* check the column number is in range */ if (col < 1 || col > maxcount) { - ERR("column %d out of range\n", col); + ERR("column %d out of range (maxcount: %d)\n", col, maxcount); continue; } /* check if this column was already set */

1 0

Piotr Caban : vbscript: Parse doubles with bigger precision in parse_numeric_literal.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: 7c7ccc0ef510af4a27144f28e96be63fbebb586e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c7ccc0ef510af4a27144f28e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 16 17:22:37 2014 +0200 vbscript: Parse doubles with bigger precision in parse_numeric_literal. --- dlls/vbscript/lex.c | 43 ++++++++++++++++++++++++++++++++---------- dlls/vbscript/tests/lang.vbs | 1 + 2 files changed, 34 insertions(+), 10 deletions(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 65d2334..dc5a9fe 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + #include <assert.h> #include "vbscript.h" @@ -258,28 +261,48 @@ static int parse_string_literal(parser_ctx_t *ctx, const WCHAR **ret) static int parse_numeric_literal(parser_ctx_t *ctx, void **ret) { - double n = 0; + LONGLONG d = 0, hlp; + int exp = 0; if(*ctx->ptr == '0' && !('0' <= ctx->ptr[1] && ctx->ptr[1] <= '9') && ctx->ptr[1] != '.') return *ctx->ptr++; - do { - n = n*10 + *ctx->ptr++ - '0'; - }while('0' <= *ctx->ptr && *ctx->ptr <= '9'); + while(ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) { + hlp = d*10 + *(ctx->ptr++) - '0'; + if(d>MAXLONGLONG/10 || hlp<0) { + exp++; + break; + } + else + d = hlp; + } + while(ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) { + exp++; + ctx->ptr++; + } if(*ctx->ptr != '.') { - if((LONG)n == n) { - LONG l = n; + if(!exp && (LONG)d == d) { + LONG l = d; *(LONG*)ret = l; return (short)l == l ? tShort : tLong; } }else { - double e = 1.0; - while('0' <= *++ctx->ptr && *ctx->ptr <= '9') - n += (e /= 10.0)*(*ctx->ptr-'0'); + ctx->ptr++; + + while(ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) { + hlp = d*10 + *(ctx->ptr++) - '0'; + if(d>MAXLONGLONG/10 || hlp<0) + break; + + d = hlp; + exp--; + } + while(ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) + ctx->ptr++; } - *(double*)ret = n; + *(double*)ret = exp>=0 ? d*pow(10, exp) : d/pow(10, -exp); return tDouble; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index c24ffa6..530c5dd 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -187,6 +187,7 @@ Call ok(2*3 = 6, "2*3 = " & (2*3)) Call ok(3/2 = 1.5, "3/2 = " & (3/2)) Call ok(5\4/2 = 2, "5\4/2 = " & (5\2/1)) Call ok(12/3\2 = 2, "12/3\2 = " & (12/3\2)) +Call ok(5/1000000 = 0.000005, "5/1000000 = " & (5/1000000)) Call ok(2^3 = 8, "2^3 = " & (2^3)) Call ok(2^3^2 = 64, "2^3^2 = " & (2^3^2))

1 0

Andrew Eikum : mmdevapi: Make buffer size divisible by number of periods.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: b634666e130b93461076d1cded32d98752a67187 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b634666e130b93461076d1cde… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 19 08:59:23 2014 -0500 mmdevapi: Make buffer size divisible by number of periods. --- dlls/mmdevapi/tests/render.c | 2 +- dlls/winealsa.drv/mmdevdrv.c | 2 ++ dlls/winecoreaudio.drv/mmdevdrv.c | 2 ++ dlls/wineoss.drv/mmdevdrv.c | 2 ++ 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 078eab7..3cadcee 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -935,7 +935,7 @@ static void test_clock(int share) if (share) ok(gbsize == bufsize, "BufferSize %u at rate %u\n", gbsize, pwfx->nSamplesPerSec); - else todo_wine + else ok(gbsize == parts * fragment || gbsize == MulDiv(bufsize, 1, 1024) * 1024, "BufferSize %u misfits fragment size %u at rate %u\n", gbsize, fragment, pwfx->nSamplesPerSec); diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 3cfad3a..30531a8 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1416,6 +1416,8 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, * ALSA period 220 vs. 221 frames in mmdevapi and * buffer 883 vs. 2205 frames in mmdevapi! */ This->bufsize_frames = MulDiv(duration, fmt->nSamplesPerSec, 10000000); + if(mode == AUDCLNT_SHAREMODE_EXCLUSIVE) + This->bufsize_frames -= This->bufsize_frames % This->mmdev_period_frames; This->hidden_frames = This->alsa_period_frames + This->mmdev_period_frames + MulDiv(fmt->nSamplesPerSec, EXTRA_SAFE_RT, 10000000); diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 5e32229..c181713 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1235,6 +1235,8 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, This->period_frames = MulDiv(period, This->fmt->nSamplesPerSec, 10000000); This->bufsize_frames = MulDiv(duration, fmt->nSamplesPerSec, 10000000); + if(mode == AUDCLNT_SHAREMODE_EXCLUSIVE) + This->bufsize_frames -= This->bufsize_frames % This->period_frames; if(This->dataflow == eCapture){ int i, nbuffs = (This->bufsize_frames / This->period_frames) + 1; diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index eab4723..e11e6dc 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1099,6 +1099,8 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, This->period_frames = MulDiv(fmt->nSamplesPerSec, period, 10000000); This->bufsize_frames = MulDiv(duration, fmt->nSamplesPerSec, 10000000); + if(mode == AUDCLNT_SHAREMODE_EXCLUSIVE) + This->bufsize_frames -= This->bufsize_frames % This->period_frames; This->local_buffer = HeapAlloc(GetProcessHeap(), 0, This->bufsize_frames * fmt->nBlockAlign); if(!This->local_buffer){

1 0

Zhenbo Li : mshtml: Added IHTMLTableRow::deleteCell method implementation.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: bff346836022eee669b6849c1c3298bfe70d3521 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bff346836022eee669b6849c1… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Sun May 18 16:24:23 2014 +0800 mshtml: Added IHTMLTableRow::deleteCell method implementation. --- dlls/mshtml/htmltablerow.c | 11 +++++++++-- dlls/mshtml/tests/dom.c | 42 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmltablerow.c b/dlls/mshtml/htmltablerow.c index 331d6c9..731b403 100644 --- a/dlls/mshtml/htmltablerow.c +++ b/dlls/mshtml/htmltablerow.c @@ -315,8 +315,15 @@ static HRESULT WINAPI HTMLTableRow_insertCell(IHTMLTableRow *iface, LONG index, static HRESULT WINAPI HTMLTableRow_deleteCell(IHTMLTableRow *iface, LONG index) { HTMLTableRow *This = impl_from_IHTMLTableRow(iface); - FIXME("(%p)->(%d)\n", This, index); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)->(%d)\n", This, index); + nsres = nsIDOMHTMLTableRowElement_DeleteCell(This->nsrow, index); + if(NS_FAILED(nsres)) { + ERR("Delete Cell failed: %08x\n", nsres); + return E_FAIL; + } + return S_OK; } static const IHTMLTableRowVtbl HTMLTableRowVtbl = { diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 8af98dd..0d6c3ac 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -56,7 +56,7 @@ static const char elem_test_str[] = "<button id=\"btnid\"></button>" "<select id=\"s\"><option id=\"x\" value=\"val1\">opt1</option><option id=\"y\">opt2</option></select>" "<textarea id=\"X\">text text</textarea>" - "<table id=\"tbl\"><tbody><tr></tr><tr id=\"row2\"><td>td1 text</td><td>td2 text</td></tr></tbody></table>" + "<table id=\"tbl\"><tbody><tr></tr><tr id=\"row2\"><td id=\"td1\">td1 text</td><td id=\"td2\">td2 text</td></tr></tbody></table>" "<script id=\"sc\" type=\"text/javascript\">\n</script>" "<test /><object id=\"objid\" name=\"objname\" vspace=100></object><embed />" "<img id=\"imgid\" name=\"WineImg\"/>" @@ -5679,6 +5679,44 @@ static void test_button_elem(IHTMLElement *elem) set_button_name(elem, "button name"); } +#define test_tr_possess(e,r,l,i) _test_tr_possess(__LINE__,e,r,l,i) +static void _test_tr_possess(unsigned line, IHTMLElement *elem, + IHTMLTableRow *row, LONG len, const char *id) +{ + IHTMLElementCollection *col; + IDispatch *disp; + HRESULT hres; + LONG lval; + VARIANT var; + + hres = IHTMLTableRow_get_cells(row, &col); + ok_(__FILE__, line)(hres == S_OK, "get_cells failed: %08x\n", hres); + ok_(__FILE__, line)(col != NULL, "get_cells returned NULL\n"); + + hres = IHTMLElementCollection_get_length(col, &lval); + ok_(__FILE__, line)(hres == S_OK, "get length failed: %08x\n", hres); + ok_(__FILE__, line)(lval == len, "expected len = %d, got %d\n", len, lval); + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = a2bstr(id); + hres = IHTMLElementCollection_tags(col, var, &disp); + ok_(__FILE__, line)(hres == S_OK, "search by tags(%s) failed: %08x\n", id, hres); + ok_(__FILE__, line)(disp != NULL, "disp == NULL\n"); + + VariantClear(&var); + IDispatch_Release(disp); + IHTMLElementCollection_Release(col); +} + +static void test_tr_modify(IHTMLElement *elem, IHTMLTableRow *row) +{ + HRESULT hres; + + hres = IHTMLTableRow_deleteCell(row, 0); + ok(hres == S_OK, "deleteCell failed: %08x\n", hres); + test_tr_possess(elem, row, 1, "td2"); +} + static void test_tr_elem(IHTMLElement *elem) { IHTMLElementCollection *col; @@ -5771,6 +5809,8 @@ static void test_tr_elem(IHTMLElement *elem) ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); VariantClear(&vDefaultbg); + test_tr_modify(elem, row); + IHTMLTableRow_Release(row); }

1 0

Piotr Caban : msvcrt: Add _mbscpy_s implementation.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: 9f17544bc9109a992a7b4bdbb5477d210f508a71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f17544bc9109a992a7b4bdbb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 19 11:43:05 2014 +0200 msvcrt: Add _mbscpy_s implementation. --- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/mbcs.c | 17 +++++++++++++++++ dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt/tests/string.c | 39 +++++++++++++++++++++++++++++++++++++++ 7 files changed, 66 insertions(+), 10 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 4d577e7..581ff17 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1101,8 +1101,8 @@ @ stub _mbscmp_l @ cdecl _mbscoll(str str) @ cdecl _mbscoll_l(str str ptr) -@ stub _mbscpy_s -@ stub _mbscpy_s_l +@ cdecl _mbscpy_s(ptr long str) +@ cdecl _mbscpy_s_l(ptr long str ptr) @ cdecl _mbscspn(str str) @ stub _mbscspn_l @ cdecl _mbsdec(ptr ptr) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index b2141d6..9973aa0 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1459,8 +1459,8 @@ @ stub _mbscmp_l @ cdecl _mbscoll(str str) @ cdecl _mbscoll_l(str str ptr) -@ stub _mbscpy_s -@ stub _mbscpy_s_l +@ cdecl _mbscpy_s(ptr long str) +@ cdecl _mbscpy_s_l(ptr long str ptr) @ cdecl _mbscspn(str str) @ stub _mbscspn_l @ cdecl _mbsdec(ptr ptr) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index b510e76..c76465b 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -773,8 +773,8 @@ @ stub _mbscmp_l @ cdecl _mbscoll(str str) @ cdecl _mbscoll_l(str str ptr) -@ stub _mbscpy_s -@ stub _mbscpy_s_l +@ cdecl _mbscpy_s(ptr long str) +@ cdecl _mbscpy_s_l(ptr long str ptr) @ cdecl _mbscspn(str str) @ stub _mbscspn_l @ cdecl _mbsdec(ptr ptr) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 345afe9..622b9f4 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -751,8 +751,8 @@ @ stub _mbscmp_l @ cdecl _mbscoll(str str) @ cdecl _mbscoll_l(str str ptr) -@ stub _mbscpy_s -@ stub _mbscpy_s_l +@ cdecl _mbscpy_s(ptr long str) +@ cdecl _mbscpy_s_l(ptr long str ptr) @ cdecl _mbscspn(str str) @ stub _mbscspn_l @ cdecl _mbsdec(ptr ptr) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 3f4590e..d2c12d3 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -712,6 +712,23 @@ int CDECL _mbsnbcpy_s(unsigned char* dst, MSVCRT_size_t size, const unsigned cha } /********************************************************************* + * _mbscpy_s_l(MSVCRT.@) + */ +int CDECL _mbscpy_s_l(unsigned char *dst, MSVCRT_size_t size, + const unsigned char *src, MSVCRT__locale_t locale) +{ + return _mbsnbcpy_s_l(dst, size, src, -1, locale); +} + +/********************************************************************* + * _mbscpy_s(MSVCRT.@) + */ +int CDECL _mbscpy_s(unsigned char *dst, MSVCRT_size_t size, const unsigned char *src) +{ + return _mbscpy_s_l(dst, size, src, NULL); +} + +/********************************************************************* * _mbsnbcpy(MSVCRT.@) * REMARKS * Like strncpy this function doesn't enforce the string to be diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 086bd82..cd7a39b 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -722,8 +722,8 @@ @ cdecl _mbscoll(str str) @ cdecl _mbscoll_l(str str ptr) @ cdecl _mbscpy(ptr str) -# stub _mbscpy_s(ptr long str) -# stub _mbscpy_s_l(ptr long str ptr) +@ cdecl _mbscpy_s(ptr long str) +@ cdecl _mbscpy_s_l(ptr long str ptr) @ cdecl _mbscspn(str str) # stub _mbscspn_l(str str ptr) @ cdecl _mbsdec(ptr ptr) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 11b5f44..822c952 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -60,6 +60,7 @@ static int (__cdecl *pstrcpy_s)(char *dst, size_t len, const char *src); static int (__cdecl *pstrcat_s)(char *dst, size_t len, const char *src); static int (__cdecl *p_mbsnbcat_s)(unsigned char *dst, size_t size, const unsigned char *src, size_t count); static int (__cdecl *p_mbsnbcpy_s)(unsigned char * dst, size_t size, const unsigned char * src, size_t count); +static int (__cdecl *p__mbscpy_s)(unsigned char*, size_t, const unsigned char*); static int (__cdecl *p_wcscpy_s)(wchar_t *wcDest, size_t size, const wchar_t *wcSrc); static int (__cdecl *p_wcsncpy_s)(wchar_t *wcDest, size_t size, const wchar_t *wcSrc, size_t count); static int (__cdecl *p_wcsncat_s)(wchar_t *dst, size_t elem, const wchar_t *src, size_t count); @@ -774,6 +775,42 @@ static void test__mbsnbcpy_s(void) dest[0], dest[1], dest[2], dest[3], dest[4], dest[5], dest[6], dest[7]); } +static void test__mbscpy_s(void) +{ + const unsigned char src[] = "source string"; + unsigned char dest[16]; + int ret; + + if(!p__mbscpy_s) + { + win_skip("_mbscpy_s not found\n"); + return; + } + + ret = p__mbscpy_s(NULL, 0, src); + ok(ret == EINVAL, "got %d\n", ret); + ret = p__mbscpy_s(NULL, sizeof(dest), src); + ok(ret == EINVAL, "got %d\n", ret); + ret = p__mbscpy_s(dest, 0, src); + ok(ret == EINVAL, "got %d\n", ret); + dest[0] = 'x'; + ret = p__mbscpy_s(dest, sizeof(dest), NULL); + ok(ret == EINVAL, "got %d\n", ret); + ok(!dest[0], "dest buffer was not modified on invalid argument\n"); + + memset(dest, 'X', sizeof(dest)); + ret = p__mbscpy_s(dest, sizeof(dest), src); + ok(!ret, "got %d\n", ret); + ok(!memcmp(dest, src, sizeof(src)), "dest = %s\n", dest); + ok(dest[sizeof(src)] == 'X', "unused part of buffer was modified\n"); + + memset(dest, 'X', sizeof(dest)); + ret = p__mbscpy_s(dest, 4, src); + ok(ret == ERANGE, "got %d\n", ret); + ok(!dest[0], "incorrect dest buffer (%d)\n", dest[0]); + ok(dest[1] == src[1], "incorrect dest buffer (%d)\n", dest[1]); +} + static void test_wcscpy_s(void) { static const WCHAR szLongText[] = { 'T','h','i','s','A','L','o','n','g','s','t','r','i','n','g',0 }; @@ -2632,6 +2669,7 @@ START_TEST(string) pstrcat_s = (void *)GetProcAddress( hMsvcrt,"strcat_s" ); p_mbsnbcat_s = (void *)GetProcAddress( hMsvcrt,"_mbsnbcat_s" ); p_mbsnbcpy_s = (void *)GetProcAddress( hMsvcrt,"_mbsnbcpy_s" ); + p__mbscpy_s = (void *)GetProcAddress( hMsvcrt,"_mbscpy_s" ); p_wcscpy_s = (void *)GetProcAddress( hMsvcrt,"wcscpy_s" ); p_wcsncpy_s = (void *)GetProcAddress( hMsvcrt,"wcsncpy_s" ); p_wcsncat_s = (void *)GetProcAddress( hMsvcrt,"wcsncat_s" ); @@ -2679,6 +2717,7 @@ START_TEST(string) test_memmove_s(); test_strcat_s(); test__mbsnbcpy_s(); + test__mbscpy_s(); test_mbcjisjms(); test_mbcjmsjis(); test_mbbtombc();

1 0

Piotr Caban : msvcrt: Add _mbsnbcpy_s_l implementation.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: aebe1c69f9a7e41fbc005365737a00aaa238a332 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aebe1c69f9a7e41fbc0053657… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 19 11:42:58 2014 +0200 msvcrt: Add _mbsnbcpy_s_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 15 ++++++++++++--- dlls/msvcrt/msvcrt.spec | 2 +- 6 files changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 07d50fc..4d577e7 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1132,7 +1132,7 @@ @ cdecl _mbsnbcpy(ptr str long) @ stub _mbsnbcpy_l @ cdecl _mbsnbcpy_s(ptr long str long) -@ stub _mbsnbcpy_s_l +@ cdecl _mbsnbcpy_s_l(ptr long str long ptr) @ cdecl _mbsnbicmp(str str long) @ stub _mbsnbicmp_l @ cdecl _mbsnbicoll(str str long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index e6576e0..b2141d6 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1490,7 +1490,7 @@ @ cdecl _mbsnbcpy(ptr str long) @ stub _mbsnbcpy_l @ cdecl _mbsnbcpy_s(ptr long str long) -@ stub _mbsnbcpy_s_l +@ cdecl _mbsnbcpy_s_l(ptr long str long ptr) @ cdecl _mbsnbicmp(str str long) @ stub _mbsnbicmp_l @ cdecl _mbsnbicoll(str str long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 9c7f85b..b510e76 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -804,7 +804,7 @@ @ cdecl _mbsnbcpy(ptr str long) @ stub _mbsnbcpy_l @ cdecl _mbsnbcpy_s(ptr long str long) -@ stub _mbsnbcpy_s_l +@ cdecl _mbsnbcpy_s_l(ptr long str long ptr) @ cdecl _mbsnbicmp(str str long) @ stub _mbsnbicmp_l @ cdecl _mbsnbicoll(str str long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index e86541c..345afe9 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -782,7 +782,7 @@ @ cdecl _mbsnbcpy(ptr str long) @ stub _mbsnbcpy_l @ cdecl _mbsnbcpy_s(ptr long str long) -@ stub _mbsnbcpy_s_l +@ cdecl _mbsnbcpy_s_l(ptr long str long ptr) @ cdecl _mbsnbicmp(str str long) @ stub _mbsnbicmp_l @ cdecl _mbsnbicoll(str str long) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index dd14abd..3f4590e 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -638,12 +638,13 @@ unsigned char* CDECL _mbsncpy(unsigned char* dst, const unsigned char* src, MSVC } /********************************************************************* - * _mbsnbcpy_s(MSVCRT.@) + * _mbsnbcpy_s_l(MSVCRT.@) * REMARKS * Unlike _mbsnbcpy this function does not pad the rest of the dest * string with 0 */ -int CDECL _mbsnbcpy_s(unsigned char* dst, MSVCRT_size_t size, const unsigned char* src, MSVCRT_size_t n) +int CDECL _mbsnbcpy_s_l(unsigned char* dst, MSVCRT_size_t size, + const unsigned char* src, MSVCRT_size_t n, MSVCRT__locale_t locale) { MSVCRT_size_t pos = 0; @@ -657,7 +658,7 @@ int CDECL _mbsnbcpy_s(unsigned char* dst, MSVCRT_size_t size, const unsigned cha if(!n) return 0; - if(get_mbcinfo()->ismbcodepage) + if((locale ? locale->mbcinfo : get_mbcinfo())->ismbcodepage) { int is_lead = 0; while (*src && n) @@ -703,6 +704,14 @@ int CDECL _mbsnbcpy_s(unsigned char* dst, MSVCRT_size_t size, const unsigned cha } /********************************************************************* + * _mbsnbcpy_s(MSVCRT.@) + */ +int CDECL _mbsnbcpy_s(unsigned char* dst, MSVCRT_size_t size, const unsigned char* src, MSVCRT_size_t n) +{ + return _mbsnbcpy_s_l(dst, size, src, n, NULL); +} + +/********************************************************************* * _mbsnbcpy(MSVCRT.@) * REMARKS * Like strncpy this function doesn't enforce the string to be diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index a7d1a97..086bd82 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -755,7 +755,7 @@ @ cdecl _mbsnbcpy(ptr str long) # stub _mbsnbcpy_l(ptr str long ptr) @ cdecl _mbsnbcpy_s(ptr long str long) -# stub _mbsnbcpy_s_l(ptr long str long ptr) +@ cdecl _mbsnbcpy_s_l(ptr long str long ptr) @ cdecl _mbsnbicmp(str str long) # stub _mbsnbicmp_l(str str long ptr) @ cdecl _mbsnbicoll(str str long)

1 0

Henri Verbeet : wined3d: Increase the SM4 instruction length mask size.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: 0fe183c2993dae7364c20f65c46aae0f23366ec2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fe183c2993dae7364c20f65c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 19 08:21:03 2014 +0200 wined3d: Increase the SM4 instruction length mask size. --- dlls/wined3d/shader_sm4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 1159d6e..9a6131f 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -27,7 +27,7 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); #define WINED3D_SM4_INSTRUCTION_MODIFIER (1 << 31) #define WINED3D_SM4_INSTRUCTION_LENGTH_SHIFT 24 -#define WINED3D_SM4_INSTRUCTION_LENGTH_MASK (0xf << WINED3D_SM4_INSTRUCTION_LENGTH_SHIFT) +#define WINED3D_SM4_INSTRUCTION_LENGTH_MASK (0x1f << WINED3D_SM4_INSTRUCTION_LENGTH_SHIFT) #define WINED3D_SM4_PRIMITIVE_TYPE_SHIFT 11 #define WINED3D_SM4_PRIMITIVE_TYPE_MASK (0x7 << WINED3D_SM4_PRIMITIVE_TYPE_SHIFT)

1 0

Henri Verbeet : d2d1: Add the ID2D1Factory interface.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: a96135aeaeddb47debce4b5051e3de3e6fe4e0d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a96135aeaeddb47debce4b505… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 19 08:21:02 2014 +0200 d2d1: Add the ID2D1Factory interface. --- include/d2d1.idl | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index b76e51f..a6d0d36 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -34,6 +34,7 @@ interface IDWriteRenderingParams; interface IDWriteTextFormat; interface IDWriteTextLayout; interface IWICBitmapSource; +interface IWICBitmap; typedef struct DWRITE_GLYPH_RUN DWRITE_GLYPH_RUN; @@ -279,6 +280,14 @@ typedef enum D2D1_DC_INITIALIZE_MODE D2D1_DC_INITIALIZE_MODE_FORCE_DWORD = 0xffffffff, } D2D1_DC_INITIALIZE_MODE; +typedef enum D2D1_PRESENT_OPTIONS +{ + D2D1_PRESENT_OPTIONS_NONE = 0x00000000, + D2D1_PRESENT_OPTIONS_RETAIN_CONTENTS = 0x00000001, + D2D1_PRESENT_OPTIONS_IMMEDIATELY = 0x00000002, + D2D1_PRESENT_OPTIONS_FORCE_DWORD = 0xffffffff, +} D2D1_PRESENT_OPTIONS; + typedef struct D2D1_BEZIER_SEGMENT { D2D1_POINT_2F point1; @@ -397,6 +406,24 @@ typedef struct D2D1_RENDER_TARGET_PROPERTIES D2D1_FEATURE_LEVEL minLevel; } D2D1_RENDER_TARGET_PROPERTIES; +typedef struct D2D1_STROKE_STYLE_PROPERTIES +{ + D2D1_CAP_STYLE startCap; + D2D1_CAP_STYLE endCap; + D2D1_CAP_STYLE dashCap; + D2D1_LINE_JOIN lineJoin; + float miterLimit; + D2D1_DASH_STYLE dashStyle; + float dashOffset; +} D2D1_STROKE_STYLE_PROPERTIES; + +typedef struct D2D1_HWND_RENDER_TARGET_PROPERTIES +{ + HWND hwnd; + D2D1_SIZE_U pixelSize; + D2D1_PRESENT_OPTIONS presentOptions; +} D2D1_HWND_RENDER_TARGET_PROPERTIES; + [ local, object, @@ -1149,5 +1176,75 @@ interface ID2D1GdiInteropRenderTarget : IUnknown ); } +[ + local, + object, + uuid(06152247-6f50-465a-9245-118bfd3b6007) +] +interface ID2D1Factory : IUnknown +{ + HRESULT ReloadSystemMetrics(); + void GetDesktopDpi( + [out] float *dpi_x, + [out] float *dpi_y + ); + HRESULT CreateRectangleGeometry( + [in] const D2D1_RECT_F *rect, + [out] ID2D1RectangleGeometry **geometry + ); + HRESULT CreateRoundedRectangleGeometry( + [in] const D2D1_ROUNDED_RECT *rect, + [out] ID2D1RoundedRectangleGeometry **geometry + ); + HRESULT CreateEllipseGeometry( + [in] const D2D1_ELLIPSE *ellipse, + [out] ID2D1EllipseGeometry **geometry + ); + HRESULT CreateGeometryGroup( + [in] D2D1_FILL_MODE fill_mode, + [in, size_is(geometry_count)] ID2D1Geometry *geometry, + [in] UINT32 geometry_count, + [out] ID2D1GeometryGroup **group + ); + HRESULT CreateTransformedGeometry( + [in] ID2D1Geometry *src_geometry, + [in] const D2D1_MATRIX_3X2_F *transform, + [out] ID2D1TransformedGeometry **transformed_geometry + ); + HRESULT CreatePathGeometry( + [out] ID2D1PathGeometry *geometry + ); + HRESULT CreateStrokeStyle( + [in] const D2D1_STROKE_STYLE_PROPERTIES *desc, + [in, size_is(dash_count)] const float *dashes, + [in] UINT32 dash_count, + [out] ID2D1StrokeStyle **stroke_style + ); + HRESULT CreateDrawingStateBlock( + [in] const D2D1_DRAWING_STATE_DESCRIPTION *desc, + [in] IDWriteRenderingParams *text_rendering_params, + [out] ID2D1DrawingStateBlock **state_block + ); + HRESULT CreateWicBitmapRenderTarget( + [in] IWICBitmap *target, + [in] const D2D1_RENDER_TARGET_PROPERTIES *desc, + [out] ID2D1RenderTarget **render_target + ); + HRESULT CreateHwndRenderTarget( + [in] const D2D1_RENDER_TARGET_PROPERTIES *desc, + [in] const D2D1_HWND_RENDER_TARGET_PROPERTIES *hwnd_rt_desc, + [out] ID2D1HwndRenderTarget **render_target + ); + HRESULT CreateDxgiSurfaceRenderTarget( + [in] IDXGISurface *surface, + [in] const D2D1_RENDER_TARGET_PROPERTIES *desc, + [out] ID2D1RenderTarget **render_target + ); + HRESULT CreateDCRenderTarget( + [in] const D2D1_RENDER_TARGET_PROPERTIES *desc, + [out] ID2D1DCRenderTarget **render_target + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Henri Verbeet : d2d1: Add the ID2D1GdiInteropRenderTarget interface.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: bfcce57b9b9ed59fc648a8996fb1047e9b99af10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfcce57b9b9ed59fc648a8996… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 19 08:21:01 2014 +0200 d2d1: Add the ID2D1GdiInteropRenderTarget interface. --- include/d2d1.idl | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 2c9db1a..b76e51f 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -272,6 +272,13 @@ typedef enum D2D1_WINDOW_STATE D2D1_WINDOW_STATE_FORCE_DWORD = 0xffffffff, } D2D1_WINDOW_STATE; +typedef enum D2D1_DC_INITIALIZE_MODE +{ + D2D1_DC_INITIALIZE_MODE_COPY = 0, + D2D1_DC_INITIALIZE_MODE_CLEAR = 1, + D2D1_DC_INITIALIZE_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_DC_INITIALIZE_MODE; + typedef struct D2D1_BEZIER_SEGMENT { D2D1_POINT_2F point1; @@ -1126,5 +1133,21 @@ interface ID2D1DCRenderTarget : ID2D1RenderTarget ); } +[ + local, + object, + uuid(e0db51c3-6f77-4bae-b3d5-e47509b35838) +] +interface ID2D1GdiInteropRenderTarget : IUnknown +{ + HRESULT GetDC( + [in] D2D1_DC_INITIALIZE_MODE mode, + [out] HDC *dc + ); + HRESULT ReleaseDC( + [in] const RECT *update + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Henri Verbeet : d2d1: Add the ID2D1DCRenderTarget interface.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: 60de2d686cac484d1784b14872c7a86f762a0fa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60de2d686cac484d1784b1487… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 19 08:21:00 2014 +0200 d2d1: Add the ID2D1DCRenderTarget interface. --- include/d2d1.idl | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 899c1d7..2c9db1a 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -1113,5 +1113,18 @@ interface ID2D1HwndRenderTarget : ID2D1RenderTarget HWND GetHwnd(); } +[ + local, + object, + uuid(1c51bc64-de61-46fd-9899-63a5d8f03950) +] +interface ID2D1DCRenderTarget : ID2D1RenderTarget +{ + HRESULT BindDC( + [in] const HDC dc, + [in] const RECT rect + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Nikolay Sivov : scrrun: Implement Count() property for file collection.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: 108c27313bc1c5d4c95f1ddc5d7d8ee57a79071c URL: http://source.winehq.org/git/wine.git/?a=commit;h=108c27313bc1c5d4c95f1ddc5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 17 15:15:42 2014 +0400 scrrun: Implement Count() property for file collection. --- dlls/scrrun/filesystem.c | 28 ++++++++++++++++++++++++++-- dlls/scrrun/tests/filesystem.c | 4 ---- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index aead0d2..f5afb91 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -1831,8 +1831,32 @@ static HRESULT WINAPI filecoll_get__NewEnum(IFileCollection *iface, IUnknown **p static HRESULT WINAPI filecoll_get_Count(IFileCollection *iface, LONG *count) { struct filecollection *This = impl_from_IFileCollection(iface); - FIXME("(%p)->(%p)\n", This, count); - return E_NOTIMPL; + static const WCHAR allW[] = {'\\','*',0}; + WIN32_FIND_DATAW data; + WCHAR pathW[MAX_PATH]; + HANDLE handle; + + TRACE("(%p)->(%p)\n", This, count); + + if(!count) + return E_POINTER; + + *count = 0; + + strcpyW(pathW, This->path); + strcatW(pathW, allW); + handle = FindFirstFileW(pathW, &data); + if (handle == INVALID_HANDLE_VALUE) + return HRESULT_FROM_WIN32(GetLastError()); + + do + { + if (is_file_data(&data)) + *count += 1; + } while (FindNextFileW(handle, &data)); + FindClose(handle); + + return S_OK; } static const IFileCollectionVtbl filecollectionvtbl = { diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index c004eaf..531b732 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1084,9 +1084,7 @@ static void test_FileCollection(void) count = 0; hr = IFileCollection_get_Count(files, &count); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine ok(count == 2, "got %d\n", count); lstrcpyW(pathW, buffW); @@ -1097,9 +1095,7 @@ todo_wine /* every time property is requested it scans directory */ count = 0; hr = IFileCollection_get_Count(files, &count); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine ok(count == 3, "got %d\n", count); hr = IFileCollection_get__NewEnum(files, NULL);

1 0