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

Nikolay Sivov : scrrun/tests: Fix tests to depend on current codepage.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: 2b628405cd2edaf771399abb8ed34f5891608900 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b628405cd2edaf771399abb8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 17 14:42:05 2014 +0400 scrrun/tests: Fix tests to depend on current codepage. --- dlls/scrrun/tests/filesystem.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 409cf4b..c004eaf 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -41,6 +41,7 @@ static inline ULONG get_refcount(IUnknown *iface) } static const WCHAR crlfW[] = {'\r','\n',0}; +static const char utf16bom[] = {0xff,0xfe,0}; #define GET_REFCOUNT(iface) \ get_refcount((IUnknown*)iface) @@ -1317,8 +1318,7 @@ static void test_CreateTextFile(void) { static const WCHAR scrrunW[] = {'s','c','r','r','u','n','\\',0}; static const WCHAR testfileW[] = {'t','e','s','t','.','t','x','t',0}; - static const WCHAR bomAW[] = {0xff,0xfe,0}; - WCHAR pathW[MAX_PATH], dirW[MAX_PATH]; + WCHAR pathW[MAX_PATH], dirW[MAX_PATH], buffW[10]; ITextStream *stream; BSTR nameW, str; HANDLE file; @@ -1365,11 +1365,16 @@ static void test_CreateTextFile(void) ok(hr == S_OK, "got 0x%08x\n", hr); ITextStream_Release(stream); + /* File was created in Unicode mode, it contains 0xfffe BOM. Opening it in non-Unicode mode + treats BOM like a valuable data with appropriate CP_ACP -> WCHAR conversion. */ + buffW[0] = 0; + MultiByteToWideChar(CP_ACP, 0, utf16bom, -1, buffW, sizeof(buffW)/sizeof(WCHAR)); + hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateFalse, &stream); ok(hr == S_OK, "got 0x%08x\n", hr); hr = ITextStream_ReadAll(stream, &str); ok(hr == S_FALSE || broken(hr == S_OK) /* win2k */, "got 0x%08x\n", hr); - ok(!lstrcmpW(str, bomAW), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, buffW), "got %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(buffW)); SysFreeString(str); ITextStream_Release(stream); @@ -1506,7 +1511,9 @@ static void test_ReadAll(void) str = NULL; hr = ITextStream_ReadAll(stream, &str); ok(hr == S_FALSE || broken(hr == S_OK) /* win2k */, "got 0x%08x\n", hr); - ok(str[0] == 0x00ff && str[1] == 0x00fe, "got %s, %d\n", wine_dbgstr_w(str), SysStringLen(str)); + buffW[0] = 0; + MultiByteToWideChar(CP_ACP, 0, utf16bom, -1, buffW, sizeof(buffW)/sizeof(WCHAR)); + ok(str[0] == buffW[0] && str[1] == buffW[1], "got %s, %d\n", wine_dbgstr_w(str), SysStringLen(str)); SysFreeString(str); ITextStream_Release(stream); @@ -1653,7 +1660,11 @@ static void test_Read(void) str = NULL; hr = ITextStream_Read(stream, 2, &str); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(str[0] == 0x00ff && str[1] == 0x00fe, "got %s, %d\n", wine_dbgstr_w(str), SysStringLen(str)); + + buffW[0] = 0; + MultiByteToWideChar(CP_ACP, 0, utf16bom, -1, buffW, sizeof(buffW)/sizeof(WCHAR)); + + ok(!lstrcmpW(str, buffW), "got %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(buffW)); ok(SysStringLen(str) == 2, "got %d\n", SysStringLen(str)); SysFreeString(str); ITextStream_Release(stream);

1 0

Zhenbo Li : mshtml: Added IHTMLLocation::assign method implementation.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: 8d275952875efa268c4034103d6f4e1b9254e8c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d275952875efa268c4034103… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Fri May 16 21:47:41 2014 +0800 mshtml: Added IHTMLLocation::assign method implementation. --- dlls/mshtml/htmllocation.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index 0c50609..6411eb7 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -575,8 +575,8 @@ static HRESULT WINAPI HTMLLocation_replace(IHTMLLocation *iface, BSTR bstr) static HRESULT WINAPI HTMLLocation_assign(IHTMLLocation *iface, BSTR bstr) { HTMLLocation *This = impl_from_IHTMLLocation(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(bstr)); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_w(bstr)); + return IHTMLLocation_put_href(iface, bstr); } static HRESULT WINAPI HTMLLocation_toString(IHTMLLocation *iface, BSTR *String)

1 0

Hans Leidekker : wbemprox: Handle NULL out parameter to object methods.
by Alexandre Julliard May 19, 2014

May 19, 2014

Module: wine Branch: master Commit: 464c884542e95399caeaca3204ad4c3289c57ff1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=464c884542e95399caeaca320… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 19 12:30:46 2014 +0200 wbemprox: Handle NULL out parameter to object methods. --- dlls/wbemprox/process.c | 35 ++++++++++------ dlls/wbemprox/reg.c | 105 +++++++++++++++++++++++++++++++---------------- dlls/wbemprox/service.c | 104 +++++++++++++++++++++++++++++++--------------- 3 files changed, 164 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=464c884542e95399caeac…

1 0

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

May 19, 2014

Module: wine Branch: master Commit: d76e60501059a29fd632a7b321da459400c8f10c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d76e60501059a29fd632a7b32… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 19 08:20:59 2014 +0200 d2d1: Add the ID2D1HwndRenderTarget interface. --- include/d2d1.idl | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 722f65f..899c1d7 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -265,6 +265,13 @@ typedef enum D2D1_FEATURE_LEVEL D2D1_FEATURE_LEVEL_FORCE_DWORD = 0xffffffff, } D2D1_FEATURE_LEVEL; +typedef enum D2D1_WINDOW_STATE +{ + D2D1_WINDOW_STATE_NONE = 0x0000000, + D2D1_WINDOW_STATE_OCCLUDED = 0x0000001, + D2D1_WINDOW_STATE_FORCE_DWORD = 0xffffffff, +} D2D1_WINDOW_STATE; + typedef struct D2D1_BEZIER_SEGMENT { D2D1_POINT_2F point1; @@ -1092,5 +1099,19 @@ interface ID2D1BitmapRenderTarget : ID2D1RenderTarget ); } +[ + local, + object, + uuid(2cd90698-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1HwndRenderTarget : ID2D1RenderTarget +{ + D2D1_WINDOW_STATE CheckWindowState(); + HRESULT Resize( + [in] const D2D1_SIZE_U size + ); + HWND GetHwnd(); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Andrey Gusev : Ukrainian translation for release 1.7.19
by Jeremy Newman May 19, 2014

May 19, 2014

Module: website Branch: master Commit: daeef820ee11bd4f89dc5f88282db10bd20bccce URL: http://source.winehq.org/git/website.git/?a=commit;h=daeef820ee11bd4f89dc5f… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat May 17 00:35:21 2014 +0300 Ukrainian translation for release 1.7.19 --- news/uk/2014051601.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/uk/2014051601.xml b/news/uk/2014051601.xml new file mode 100644 index 0000000..52616e9 --- /dev/null +++ b/news/uk/2014051601.xml @@ -0,0 +1,17 @@ +<news> +<date>16 травня 2014</date> +<title>Випущено Wine 1.7.19</title> +<body> +<p> Розробницький реліз Wine 1.7.19 наразі доступний.</p> +<p> <a href="{$root}/announce/1.7.19">Що нового</a> в цьому релізі: +<ul> + <li>Додана нова DLL бібліотека JSProxy для автоматичного налаштування проксі.</li> + <li>Покращена підтримка OLE Accessible Object.</li> + <li>Покращення для запису XML.</li> + <li>Виправлення різних проблем з пам'яттю знайдених за допомогою Valgrind.</li> + <li>Додано початкові заголовки для підтримки Direct2D.</li> + <li>Виправлення різних помилок.</li> +</ul> +<p>Вихідний код <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.19.tar.bz2">вже доступний</a>. +Готові пакунки в процесі створення і в найближчий час будуть доступні у відповідних <a href="{$root}/download">місцях</a>. +</p></body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.19
by Jeremy Newman May 19, 2014

May 19, 2014

Module: website Branch: master Commit: 76aaaf217c73961cbe21d504d8f04ccc6ea67077 URL: http://source.winehq.org/git/website.git/?a=commit;h=76aaaf217c73961cbe21d5… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat May 17 07:44:53 2014 +0200 Polish translation for release 1.7.19 --- news/pl/2014051601.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/pl/2014051601.xml b/news/pl/2014051601.xml new file mode 100644 index 0000000..0a9709b --- /dev/null +++ b/news/pl/2014051601.xml @@ -0,0 +1,17 @@ +<news> +<date>Maj 16, 2014</date> +<title>Wydano Wine 1.7.19</title> +<body> +<p> Wydanie rozwojowe Wine 1.7.19 jest już dostępne.</p> +<p> <a href="{$root}/announce/1.7.19">Co nowego</a> w tym wydaniu: +<ul> + <li>Nowa biblioteka DLL JSProxy do samoczynnego ustawiania pośrednika.</li> + <li>Większa obsługa Obiektów Dostępu OLE.</li> + <li>Ulepszenia w programie piszącym XML.</li> + <li>Poprawki różnych wycieków do pamięci znalezione przy pomocy Valgrind.</li> + <li>Wstępne nagłówki do obsługi Direct2D.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +<p>Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.19.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</p></body></news>

1 0

Julian Rüger : German translation for release 1.7.19
by Jeremy Newman May 19, 2014

May 19, 2014

Module: website Branch: master Commit: 67544bb8a84a2b53667092b9649f6abce0355c8b URL: http://source.winehq.org/git/website.git/?a=commit;h=67544bb8a84a2b53667092… Author: Julian Rüger <jr98(a)gmx.net> Date: Sat May 17 17:39:51 2014 +0200 German translation for release 1.7.19 --- news/de/2014051601.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2014051601.xml b/news/de/2014051601.xml new file mode 100644 index 0000000..58ae6e5 --- /dev/null +++ b/news/de/2014051601.xml @@ -0,0 +1,17 @@ +<news> +<date>16. Mai 2014</date> +<title>Wine 1.7.19 freigegeben</title> +<body> +<p> Die Entwicklungsversion 1.7.19 von Wine ist jetzt verfügbar.</p> +<p> <a href="{$root}/announce/1.7.19">Neuerungen (en)</a> in dieser Version:</p> +<ul> + <li>Neue DLL JSProxy für automatische Proxy-Konfiguration.</li> + <li>OLE Accessible Object Unterstützung weiter ausgebaut.</li> + <li>Verbesserungen am XML writer.</li> + <li>Fehlerkorrekturen für verschiedene Speicherprobleme, die mit Valgrind gefunden wurden.</li> + <li>Anfänge der Header für Direct2D-Unterstützung.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +<p>Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.19.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</p></body></news>

1 0

Frédéric Delanoy : French translation for release 1.7.19
by Jeremy Newman May 19, 2014

May 19, 2014

Module: website Branch: master Commit: 2251e68252229bf477b6a79decdbb023ad6583b6 URL: http://source.winehq.org/git/website.git/?a=commit;h=2251e68252229bf477b6a7… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri May 16 21:48:24 2014 +0200 French translation for release 1.7.19 --- news/fr/2014051601.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/fr/2014051601.xml b/news/fr/2014051601.xml new file mode 100644 index 0000000..4c8ad2f --- /dev/null +++ b/news/fr/2014051601.xml @@ -0,0 +1,16 @@ +<news> +<date>16 mai 2014</date> +<title>Sortie de Wine 1.7.19</title> +<body> +<p> La version de développement 1.7.19 de Wine est disponible.</p> +<p> <a href="{$root}/announce/1.7.19">Nouveautés</a> de cette version : +<ul> + <li>Nouvelle DLL JSProxy pour une configuration automatique des serveurs mandataires.</li> + <li>Meilleurs prise en charge de l'API OLE Accessible Object.</li> + <li>Améliorations dans le rédacteur XML.</li> + <li>Correctifs pour divers problèmes mémoire détectés par Valgrind.</li> + <li>Fichiers d'en-tête initiaux pour la prise en charge de Direct2D.</li> + <li>Diverses corrections de bugs.</li> +</ul></p> +<p><p>Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.19.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</p></body></news>

1 0

Alexandre Julliard : Wine release 1.7.19
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: website Branch: master Commit: d5791fde1177363568a886e55e6a64882074e762 URL: http://source.winehq.org/git/website.git/?a=commit;h=d5791fde1177363568a886… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 16 21:15:53 2014 +0200 Wine release 1.7.19 --- news/en/2014051601.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2014051601.xml b/news/en/2014051601.xml new file mode 100644 index 0000000..94a5190 --- /dev/null +++ b/news/en/2014051601.xml @@ -0,0 +1,17 @@ +<news> +<date>May 16, 2014</date> +<title>Wine 1.7.19 Released</title> +<body> +<p> The Wine development release 1.7.19 is now available.</p> +<p> <a href="{$root}/announce/1.7.19">What's new</a> in this release: +<ul> + <li>New JSProxy DLL for automatic proxy configuration.</li> + <li>More OLE Accessible Object support.</li> + <li>Improvements to the XML writer.</li> + <li>Fixes for various memory issues found by Valgrind.</li> + <li>Initial headers for Direct2D support.</li> + <li>Various bug fixes.</li> +</ul> +<p>The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.19.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</p></body></news>

1 0

Tag wine-1.7.19 : Alexandre Julliard : Release 1.7.19
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: refs/tags/wine-1.7.19 Tag: 1098c57e53df5416544991e25cadcb8b01ab1a64 URL: http://source.winehq.org/git/wine.git/?a=tag;h=1098c57e53df5416544991e25cad… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 16 21:06:49 2014 +0200 Release 1.7.19

1 0

Alexandre Julliard : Release 1.7.19.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: 613c104562b1ee03a902484f93a8da30e89302d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=613c104562b1ee03a902484f9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 16 21:06:48 2014 +0200 Release 1.7.19. --- ANNOUNCE | 718 +++++++++++++++++++++++++++++++++---------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 396 insertions(+), 344 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=613c104562b1ee03a9024…

1 0

Piotr Caban : oleacc: Add IID_IAccessible, IID_IAccessibleHandler and LIBID_Accessibility exports.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: 76302af67e4d7222c8cc18d3b3a308aebebe704e URL: http://source.winehq.org/git/wine.git/?a=commit;h=76302af67e4d7222c8cc18d3b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 16 16:36:56 2014 +0200 oleacc: Add IID_IAccessible, IID_IAccessibleHandler and LIBID_Accessibility exports. --- dlls/oleacc/oleacc.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/oleacc/oleacc.spec b/dlls/oleacc/oleacc.spec index caeb6d3..9f3a9a0 100644 --- a/dlls/oleacc/oleacc.spec +++ b/dlls/oleacc/oleacc.spec @@ -14,9 +14,9 @@ @ stdcall GetRoleTextW(long ptr long) @ stdcall GetStateTextA(long ptr long) @ stdcall GetStateTextW(long ptr long) -@ stub IID_IAccessible -@ stub IID_IAccessibleHandler -@ stub LIBID_Accessibility +@ extern IID_IAccessible +@ extern IID_IAccessibleHandler +@ extern LIBID_Accessibility @ stdcall LresultFromObject(ptr long ptr) @ stdcall ObjectFromLresult(long ptr long ptr) @ stdcall WindowFromAccessibleObject(ptr ptr)

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: 8fcb8ea16c4902fdbfe1f9f9acf4e887fb411424 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fcb8ea16c4902fdbfe1f9f9a… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri May 16 16:46:44 2014 +0300 po: Update Finnish translation. --- po/fi.po | 106 +++++++++++++++++++------------------------------------------- 1 file changed, 32 insertions(+), 74 deletions(-) diff --git a/po/fi.po b/po/fi.po index ab30652..8fc4bbb 100644 --- a/po/fi.po +++ b/po/fi.po @@ -7113,206 +7113,164 @@ msgid "outline button" msgstr "rungon painike" #: oleacc.rc:97 -#, fuzzy -#| msgid "Normal" msgctxt "object state" msgid "normal" -msgstr "Normaali" +msgstr "normaali" #: oleacc.rc:98 -#, fuzzy -#| msgid "Unavailable" msgctxt "object state" msgid "unavailable" -msgstr "Ei käytettävissä" +msgstr "ei käytettävissä" #: oleacc.rc:99 -#, fuzzy -#| msgid "Select" msgctxt "object state" msgid "selected" -msgstr "Valitse" +msgstr "valittu" #: oleacc.rc:100 -#, fuzzy -#| msgid "Paused" msgctxt "object state" msgid "focused" -msgstr "Pysäytetty" +msgstr "kohdistettu" #: oleacc.rc:101 -#, fuzzy -#| msgid "&Compressed" msgctxt "object state" msgid "pressed" -msgstr "Paka&ttu" +msgstr "painettu" #: oleacc.rc:102 msgctxt "object state" msgid "checked" -msgstr "" +msgstr "valittu" #: oleacc.rc:103 -#, fuzzy -#| msgid "Mixed" msgctxt "object state" msgid "mixed" -msgstr "Sekamuotoinen" +msgstr "osittainen" #: oleacc.rc:104 -#, fuzzy -#| msgid "&Read Only" msgctxt "object state" msgid "read only" -msgstr "&Vain luku" +msgstr "vain luku" #: oleacc.rc:105 -#, fuzzy -#| msgid "Hot Tracked Item" msgctxt "object state" msgid "hot tracked" -msgstr "Aktiivinen elementti" +msgstr "osoitettu" #: oleacc.rc:106 -#, fuzzy -#| msgid "Defaults" msgctxt "object state" msgid "default" -msgstr "Oletukset" +msgstr "oletus" #: oleacc.rc:107 msgctxt "object state" msgid "expanded" -msgstr "" +msgstr "laajennettu" #: oleacc.rc:108 msgctxt "object state" msgid "collapsed" -msgstr "" +msgstr "kutistettu" #: oleacc.rc:109 msgctxt "object state" msgid "busy" -msgstr "" +msgstr "varattu" #: oleacc.rc:110 msgctxt "object state" msgid "floating" -msgstr "" +msgstr "kelluva" #: oleacc.rc:111 msgctxt "object state" msgid "marqueed" -msgstr "" +msgstr "vierivä" #: oleacc.rc:112 -#, fuzzy -#| msgid "animation" msgctxt "object state" msgid "animated" -msgstr "animaatio" +msgstr "animoitu" #: oleacc.rc:113 msgctxt "object state" msgid "invisible" -msgstr "" +msgstr "näkymätön" #: oleacc.rc:114 msgctxt "object state" msgid "offscreen" -msgstr "" +msgstr "poissa ruudulta" #: oleacc.rc:115 -#, fuzzy -#| msgid "&enable" msgctxt "object state" msgid "sizeable" -msgstr "&käytä" +msgstr "koko muutettava" #: oleacc.rc:116 -#, fuzzy -#| msgid "&enable" msgctxt "object state" msgid "moveable" -msgstr "&käytä" +msgstr "siirrettävä" #: oleacc.rc:117 msgctxt "object state" msgid "self voicing" -msgstr "" +msgstr "itse puhuva" #: oleacc.rc:118 -#, fuzzy -#| msgid "Paused" msgctxt "object state" msgid "focusable" -msgstr "Pysäytetty" +msgstr "kohdistettava" #: oleacc.rc:119 -#, fuzzy -#| msgid "table" msgctxt "object state" msgid "selectable" -msgstr "taulukko" +msgstr "valittava" #: oleacc.rc:120 -#, fuzzy -#| msgid "link" msgctxt "object state" msgid "linked" -msgstr "linkki" +msgstr "linkitetty" #: oleacc.rc:121 msgctxt "object state" msgid "traversed" -msgstr "" +msgstr "käyty" #: oleacc.rc:122 -#, fuzzy -#| msgid "table" msgctxt "object state" msgid "multi selectable" -msgstr "taulukko" +msgstr "monivalittava" #: oleacc.rc:123 -#, fuzzy -#| msgid "Please select a file." msgctxt "object state" msgid "extended selectable" -msgstr "Valitse tiedosto." +msgstr "laajentaen valittava" #: oleacc.rc:124 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert low" -msgstr "hälytys" +msgstr "vähäinen hälytys" #: oleacc.rc:125 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert medium" -msgstr "hälytys" +msgstr "keskitason hälytys" #: oleacc.rc:126 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert high" -msgstr "hälytys" +msgstr "tärkeä hälytys" #: oleacc.rc:127 -#, fuzzy -#| msgid "Write protected.\n" msgctxt "object state" msgid "protected" -msgstr "Kirjoitussuojattu.\n" +msgstr "suojattu" #: oleacc.rc:128 msgctxt "object state" msgid "has popup" -msgstr "" +msgstr "sisältää ponnahdusvalikon tai -ikkunan" #: oleaut32.rc:30 oleview.rc:147 msgid "True"

1 0

Henri Verbeet : d2d1: Add the ID2D1BitmapRenderTarget interface.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: 7e5bcb0b0b6745bb58b4864764e7b142713c2763 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e5bcb0b0b6745bb58b486476… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 16 09:59:23 2014 +0200 d2d1: Add the ID2D1BitmapRenderTarget interface. --- include/d2d1.idl | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 436f9cc..722f65f 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -1080,5 +1080,17 @@ interface ID2D1RenderTarget : ID2D1Resource ); } +[ + local, + object, + uuid(2cd90695-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1BitmapRenderTarget : ID2D1RenderTarget +{ + HRESULT GetBitmap( + [out] ID2D1Bitmap **bitmap + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Piotr Caban : oleacc: Prepare CreateStdAccessibleObject to support class specific accessibility objects.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: e73bbd0c810332f0eef93bd3d44149a82115edfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e73bbd0c810332f0eef93bd3d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 16 16:37:03 2014 +0200 oleacc: Prepare CreateStdAccessibleObject to support class specific accessibility objects. --- dlls/oleacc/main.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 97 insertions(+), 3 deletions(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index 9d5320e..c7a622b 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -24,6 +24,7 @@ #include "windef.h" #include "winbase.h" #include "ole2.h" +#include "commctrl.h" #include "initguid.h" #include "oleacc_private.h" @@ -36,6 +37,54 @@ WINE_DEFAULT_DEBUG_CHANNEL(oleacc); static const WCHAR lresult_atom_prefix[] = {'w','i','n','e','_','o','l','e','a','c','c',':'}; +static const WCHAR menuW[] = {'#','3','2','7','6','8',0}; +static const WCHAR desktopW[] = {'#','3','2','7','6','9',0}; +static const WCHAR dialogW[] = {'#','3','2','7','7','0',0}; +static const WCHAR winswitchW[] = {'#','3','2','7','7','1',0}; +static const WCHAR mdi_clientW[] = {'M','D','I','C','l','i','e','n','t',0}; +static const WCHAR richeditW[] = {'R','I','C','H','E','D','I','T',0}; +static const WCHAR richedit20aW[] = {'R','i','c','h','E','d','i','t','2','0','A',0}; +static const WCHAR richedit20wW[] = {'R','i','c','h','E','d','i','t','2','0','W',0}; + +typedef HRESULT (WINAPI *accessible_create)(HWND, const IID*, void**); + +static struct { + const WCHAR *name; + DWORD idx; + accessible_create create_client; + accessible_create create_window; +} builtin_classes[] = { + {WC_LISTBOXW, 0x10000, NULL, NULL}, + {menuW, 0x10001, NULL, NULL}, + {WC_BUTTONW, 0x10002, NULL, NULL}, + {WC_STATICW, 0x10003, NULL, NULL}, + {WC_EDITW, 0x10004, NULL, NULL}, + {WC_COMBOBOXW, 0x10005, NULL, NULL}, + {dialogW, 0x10006, NULL, NULL}, + {winswitchW, 0x10007, NULL, NULL}, + {mdi_clientW, 0x10008, NULL, NULL}, + {desktopW, 0x10009, NULL, NULL}, + {WC_SCROLLBARW, 0x1000a, NULL, NULL}, + {STATUSCLASSNAMEW, 0x1000b, NULL, NULL}, + {TOOLBARCLASSNAMEW, 0x1000c, NULL, NULL}, + {PROGRESS_CLASSW, 0x1000d, NULL, NULL}, + {ANIMATE_CLASSW, 0x1000e, NULL, NULL}, + {WC_TABCONTROLW, 0x1000f, NULL, NULL}, + {HOTKEY_CLASSW, 0x10010, NULL, NULL}, + {WC_HEADERW, 0x10011, NULL, NULL}, + {TRACKBAR_CLASSW, 0x10012, NULL, NULL}, + {WC_LISTVIEWW, 0x10013, NULL, NULL}, + {UPDOWN_CLASSW, 0x10016, NULL, NULL}, + {TOOLTIPS_CLASSW, 0x10018, NULL, NULL}, + {WC_TREEVIEWW, 0x10019, NULL, NULL}, + {MONTHCAL_CLASSW, 0, NULL, NULL}, + {DATETIMEPICK_CLASSW, 0, NULL, NULL}, + {WC_IPADDRESSW, 0, NULL, NULL}, + {richeditW, 0x1001c, NULL, NULL}, + {richedit20aW, 0, NULL, NULL}, + {richedit20wW, 0, NULL, NULL}, +}; + static HINSTANCE oleacc_handle = 0; const char *debugstr_variant(const VARIANT *v) @@ -81,20 +130,65 @@ int convert_child_id(VARIANT *v) } } +static accessible_create get_builtin_accessible_obj(HWND hwnd, LONG objid) +{ + WCHAR class_name[64]; + int i, idx; + + if(!RealGetWindowClassW(hwnd, class_name, sizeof(class_name)/sizeof(WCHAR))) + return NULL; + TRACE("got window class: %s\n", debugstr_w(class_name)); + + for(i=0; i<sizeof(builtin_classes)/sizeof(builtin_classes[0]); i++) { + if(!strcmpiW(class_name, builtin_classes[i].name)) { + accessible_create ret; + + ret = (objid==OBJID_CLIENT ? + builtin_classes[i].create_client : + builtin_classes[i].create_window); + if(!ret) + FIXME("unhandled window class: %s\n", debugstr_w(class_name)); + return ret; + } + } + + idx = SendMessageW(hwnd, WM_GETOBJECT, 0, OBJID_QUERYCLASSNAMEIDX); + if(idx) { + for(i=0; i<sizeof(builtin_classes)/sizeof(builtin_classes[0]); i++) { + if(idx == builtin_classes[i].idx) { + accessible_create ret; + + ret = (objid==OBJID_CLIENT ? + builtin_classes[i].create_client : + builtin_classes[i].create_window); + if(!ret) + FIXME("unhandled class name idx: %x\n", idx); + return ret; + } + } + + WARN("unhandled class name idx: %x\n", idx); + } + + return NULL; +} + HRESULT WINAPI CreateStdAccessibleObject( HWND hwnd, LONG idObject, REFIID riidInterface, void** ppvObject ) { - WCHAR class_name[64]; + accessible_create create; TRACE("%p %d %s %p\n", hwnd, idObject, debugstr_guid( riidInterface ), ppvObject ); - if(GetClassNameW(hwnd, class_name, sizeof(class_name)/sizeof(WCHAR))) - FIXME("unhandled window class: %s\n", debugstr_w(class_name)); switch(idObject) { case OBJID_CLIENT: + create = get_builtin_accessible_obj(hwnd, idObject); + if(create) return create(hwnd, riidInterface, ppvObject); return create_client_object(hwnd, riidInterface, ppvObject); case OBJID_WINDOW: + create = get_builtin_accessible_obj(hwnd, idObject); + if(create) return create(hwnd, riidInterface, ppvObject); return create_window_object(hwnd, riidInterface, ppvObject); default: FIXME("unhandled object id: %d\n", idObject);

1 0

Henri Verbeet : d2d1: Add the ID2D1RenderTarget interface.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: c68a8f3415e05f823693343e254514cbb312988d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c68a8f3415e05f823693343e2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 16 12:45:55 2014 +0200 d2d1: Add the ID2D1RenderTarget interface. --- include/d2d1.idl | 351 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 351 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c68a8f3415e05f8236933…

1 0

Henri Verbeet : d2d1: Add the ID2D1Mesh interface.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: ff4131128500fb3849c461e6fa1b2322593796f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff4131128500fb3849c461e6f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 16 09:59:21 2014 +0200 d2d1: Add the ID2D1Mesh interface. --- include/d2d1.idl | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index b8d8531..eb44bd6 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -717,5 +717,17 @@ interface ID2D1Layer : ID2D1Resource D2D1_SIZE_F GetSize(); } +[ + local, + object, + uuid(2cd906c2-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1Mesh : ID2D1Resource +{ + HRESULT Open( + [out] ID2D1TessellationSink **sink + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: 4a06f84b9f6108ef5bc1a2fbb69f0332fdcbebb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a06f84b9f6108ef5bc1a2fbb… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri May 16 08:21:22 2014 +0300 po: Update Lithuanian translation. --- po/lt.po | 110 +++++++++++++++++++------------------------------------------- 1 file changed, 34 insertions(+), 76 deletions(-) diff --git a/po/lt.po b/po/lt.po index e142410..a3a2e51 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2014-04-03 21:16+0300\n" +"PO-Revision-Date: 2014-05-16 08:19+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -7124,206 +7124,164 @@ msgid "outline button" msgstr "plano mygtukas" #: oleacc.rc:97 -#, fuzzy -#| msgid "Normal" msgctxt "object state" msgid "normal" -msgstr "&Normalus" +msgstr "normalus" #: oleacc.rc:98 -#, fuzzy -#| msgid "Unavailable" msgctxt "object state" msgid "unavailable" -msgstr "Nepasiekiamas" +msgstr "nepasiekiamas" #: oleacc.rc:99 -#, fuzzy -#| msgid "Select" msgctxt "object state" msgid "selected" -msgstr "Iš&rinkti" +msgstr "pasirinktas" #: oleacc.rc:100 -#, fuzzy -#| msgid "Paused" msgctxt "object state" msgid "focused" -msgstr "Pristabdyta" +msgstr "židinyje" #: oleacc.rc:101 -#, fuzzy -#| msgid "&Compressed" msgctxt "object state" msgid "pressed" -msgstr "Su&glaudintas" +msgstr "paspaustas" #: oleacc.rc:102 msgctxt "object state" msgid "checked" -msgstr "" +msgstr "pažymėtas" #: oleacc.rc:103 -#, fuzzy -#| msgid "Mixed" msgctxt "object state" msgid "mixed" -msgstr "Maišytas" +msgstr "mišrus" #: oleacc.rc:104 -#, fuzzy -#| msgid "&Read Only" msgctxt "object state" msgid "read only" -msgstr "&Tik skaitymui" +msgstr "tik skaitymui" #: oleacc.rc:105 -#, fuzzy -#| msgid "Hot Tracked Item" msgctxt "object state" msgid "hot tracked" -msgstr "Pažymėtas elementas" +msgstr "sekamas" #: oleacc.rc:106 -#, fuzzy -#| msgid "Defaults" msgctxt "object state" msgid "default" -msgstr "Numatytosios reikšmės" +msgstr "numatytasis" #: oleacc.rc:107 msgctxt "object state" msgid "expanded" -msgstr "" +msgstr "išplėstas" #: oleacc.rc:108 msgctxt "object state" msgid "collapsed" -msgstr "" +msgstr "sutrauktas" #: oleacc.rc:109 msgctxt "object state" msgid "busy" -msgstr "" +msgstr "užimtas" #: oleacc.rc:110 msgctxt "object state" msgid "floating" -msgstr "" +msgstr "slankus" #: oleacc.rc:111 msgctxt "object state" msgid "marqueed" -msgstr "" +msgstr "grupėje" #: oleacc.rc:112 -#, fuzzy -#| msgid "animation" msgctxt "object state" msgid "animated" -msgstr "animacija" +msgstr "animuotas" #: oleacc.rc:113 msgctxt "object state" msgid "invisible" -msgstr "" +msgstr "nematomas" #: oleacc.rc:114 msgctxt "object state" msgid "offscreen" -msgstr "" +msgstr "ne ekrane" #: oleacc.rc:115 -#, fuzzy -#| msgid "&enable" msgctxt "object state" msgid "sizeable" -msgstr "įjun&gti" +msgstr "didinamas" #: oleacc.rc:116 -#, fuzzy -#| msgid "&enable" msgctxt "object state" msgid "moveable" -msgstr "įjun&gti" +msgstr "perkeliamas" #: oleacc.rc:117 msgctxt "object state" msgid "self voicing" -msgstr "" +msgstr "save įgarsina" #: oleacc.rc:118 -#, fuzzy -#| msgid "Paused" msgctxt "object state" msgid "focusable" -msgstr "Pristabdyta" +msgstr "fokusuojamas" #: oleacc.rc:119 -#, fuzzy -#| msgid "table" msgctxt "object state" msgid "selectable" -msgstr "lentelė" +msgstr "pasirenkamas" #: oleacc.rc:120 -#, fuzzy -#| msgid "link" msgctxt "object state" msgid "linked" -msgstr "nuoroda" +msgstr "susietas" #: oleacc.rc:121 msgctxt "object state" msgid "traversed" -msgstr "" +msgstr "pereitas" #: oleacc.rc:122 -#, fuzzy -#| msgid "table" msgctxt "object state" msgid "multi selectable" -msgstr "lentelė" +msgstr "pasirenkama daug" #: oleacc.rc:123 -#, fuzzy -#| msgid "Please select a file." msgctxt "object state" msgid "extended selectable" -msgstr "Išrinkite failą." +msgstr "pasirenkama išplėstai" #: oleacc.rc:124 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert low" -msgstr "įspėjimas" +msgstr "žemas įspėjimas" #: oleacc.rc:125 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert medium" -msgstr "įspėjimas" +msgstr "vidutinis įspėjimas" #: oleacc.rc:126 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert high" -msgstr "įspėjimas" +msgstr "aukštas įspėjimas" #: oleacc.rc:127 -#, fuzzy -#| msgid "Write protected.\n" msgctxt "object state" msgid "protected" -msgstr "Apsaugotas nuo rašymo.\n" +msgstr "apsaugotas" #: oleacc.rc:128 msgctxt "object state" msgid "has popup" -msgstr "" +msgstr "turi iškylantį langą" #: oleaut32.rc:30 oleview.rc:147 msgid "True" @@ -13435,7 +13393,7 @@ msgstr "Valdiklių alternatyvus fonas" #: winecfg.rc:120 msgid "Hot Tracked Item" -msgstr "Pažymėtas elementas" +msgstr "Sekamas elementas" #: winecfg.rc:121 msgid "Active Title Bar Gradient"

1 0

Nikolay Sivov : ntdll: Implement non-blocking mode for LdrLockLoaderLock() .
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: 97e2af1f73b6985bd9c91fce18d0de1a1d95dc85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97e2af1f73b6985bd9c91fce1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 16 09:03:27 2014 +0400 ntdll: Implement non-blocking mode for LdrLockLoaderLock(). --- dlls/ntdll/loader.c | 26 +++++++++++++++++----- dlls/ntdll/tests/rtl.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index d458a31..6471290 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1337,17 +1337,33 @@ NTSTATUS WINAPI LdrFindEntryForAddress(const void* addr, PLDR_MODULE* pmod) /****************************************************************** * LdrLockLoaderLock (NTDLL.@) * - * Note: flags are not implemented. + * Note: some flags are not implemented. * Flag 0x01 is used to raise exceptions on errors. - * Flag 0x02 is used to avoid waiting on the section (does RtlTryEnterCriticalSection instead). */ NTSTATUS WINAPI LdrLockLoaderLock( ULONG flags, ULONG *result, ULONG *magic ) { - if (flags) FIXME( "flags %x not supported\n", flags ); + if (flags & ~0x2) FIXME( "flags %x not supported\n", flags ); - if (result) *result = 1; + if (result) *result = 0; + if (magic) *magic = 0; + if (flags & ~0x3) return STATUS_INVALID_PARAMETER_1; + if (!result && (flags & 0x2)) return STATUS_INVALID_PARAMETER_2; if (!magic) return STATUS_INVALID_PARAMETER_3; - RtlEnterCriticalSection( &loader_section ); + + if (flags & 0x2) + { + if (!RtlTryEnterCriticalSection( &loader_section )) + { + *result = 2; + return STATUS_SUCCESS; + } + *result = 1; + } + else + { + RtlEnterCriticalSection( &loader_section ); + if (result) *result = 1; + } *magic = GetCurrentThreadId(); return STATUS_SUCCESS; } diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 6eb6de3..72cee05 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -90,6 +90,8 @@ static CHAR * (WINAPI *pRtlIpv4AddressToStringA)(const IN_ADDR *, LPSTR); static NTSTATUS (WINAPI *pRtlIpv4AddressToStringExA)(const IN_ADDR *, USHORT, LPSTR, PULONG); static NTSTATUS (WINAPI *pRtlIpv4StringToAddressA)(PCSTR, BOOLEAN, PCSTR *, IN_ADDR *); static NTSTATUS (WINAPI *pLdrAddRefDll)(ULONG, HMODULE); +static NTSTATUS (WINAPI *pLdrLockLoaderLock)(ULONG, ULONG*, ULONG*); +static NTSTATUS (WINAPI *pLdrUnlockLoaderLock)(ULONG, ULONG); static HMODULE hkernel32 = 0; static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); @@ -135,6 +137,8 @@ static void InitFunctionPtrs(void) pRtlIpv4AddressToStringExA = (void *)GetProcAddress(hntdll, "RtlIpv4AddressToStringExA"); pRtlIpv4StringToAddressA = (void *)GetProcAddress(hntdll, "RtlIpv4StringToAddressA"); pLdrAddRefDll = (void *)GetProcAddress(hntdll, "LdrAddRefDll"); + pLdrLockLoaderLock = (void *)GetProcAddress(hntdll, "LdrLockLoaderLock"); + pLdrUnlockLoaderLock = (void *)GetProcAddress(hntdll, "LdrUnlockLoaderLock"); } hkernel32 = LoadLibraryA("kernel32.dll"); ok(hkernel32 != 0, "LoadLibrary failed\n"); @@ -1543,6 +1547,57 @@ static void test_LdrAddRefDll(void) ok(mod2 != NULL, "got %p\n", mod2); } +static void test_LdrLockLoaderLock(void) +{ + ULONG result, magic; + NTSTATUS status; + + if (!pLdrLockLoaderLock) + { + win_skip("LdrLockLoaderLock() is not available\n"); + return; + } + + /* invalid flags */ + result = 10; + magic = 0xdeadbeef; + status = pLdrLockLoaderLock(0x10, &result, &magic); + ok(status == STATUS_INVALID_PARAMETER_1, "got 0x%08x\n", status); + ok(result == 0, "got %d\n", result); + ok(magic == 0, "got 0x%08x\n", magic); + + magic = 0xdeadbeef; + status = pLdrLockLoaderLock(0x10, NULL, &magic); + ok(status == STATUS_INVALID_PARAMETER_1, "got 0x%08x\n", status); + ok(magic == 0, "got 0x%08x\n", magic); + + result = 10; + status = pLdrLockLoaderLock(0x10, &result, NULL); + ok(status == STATUS_INVALID_PARAMETER_1, "got 0x%08x\n", status); + ok(result == 0, "got %d\n", result); + + /* non-blocking mode, result is null */ + magic = 0xdeadbeef; + status = pLdrLockLoaderLock(0x2, NULL, &magic); + ok(status == STATUS_INVALID_PARAMETER_2, "got 0x%08x\n", status); + ok(magic == 0, "got 0x%08x\n", magic); + + /* magic pointer is null */ + result = 10; + status = pLdrLockLoaderLock(0, &result, NULL); + ok(status == STATUS_INVALID_PARAMETER_3, "got 0x%08x\n", status); + ok(result == 0, "got %d\n", result); + + /* lock in non-blocking mode */ + result = 0; + magic = 0; + status = pLdrLockLoaderLock(0x2, &result, &magic); + ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); + ok(result == 1, "got %d\n", result); + ok(magic != 0, "got 0x%08x\n", magic); + pLdrUnlockLoaderLock(0, magic); +} + START_TEST(rtl) { InitFunctionPtrs(); @@ -1568,4 +1623,5 @@ START_TEST(rtl) test_RtlIpv4AddressToStringEx(); test_RtlIpv4StringToAddress(); test_LdrAddRefDll(); + test_LdrLockLoaderLock(); }

1 0

Alexandre Julliard : wnaspi32: Remove unnecessary DllMain implementation on non-Linux.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: 9222e4e0ea83e782f9b6e33134fe00b3cd518fe5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9222e4e0ea83e782f9b6e3313… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 16 11:34:51 2014 +0200 wnaspi32: Remove unnecessary DllMain implementation on non-Linux. --- dlls/wnaspi32/winaspi32.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/wnaspi32/winaspi32.c b/dlls/wnaspi32/winaspi32.c index 68bda01..0ce72aa 100644 --- a/dlls/wnaspi32/winaspi32.c +++ b/dlls/wnaspi32/winaspi32.c @@ -63,12 +63,9 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION ASPI_CritSection = { &critsect_debug, -1, 0, 0, 0, 0 }; -#endif /* defined(linux) */ - BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID fImpLoad) { -#ifdef linux switch( fdwReason ) { case DLL_PROCESS_ATTACH: @@ -80,13 +77,10 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID fImpLoad) DeleteCriticalSection( &ASPI_CritSection ); break; } -#endif /* defined(linux) */ return TRUE; } -#ifdef linux - static int ASPI_OpenDevice(SRB_ExecSCSICmd *prb) {

1 0

Alexandre Julliard : d2d1: Remove unnecessary DllMain implementation.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: ddfaafc16d59771dcc4d3ad472448fcc774177b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddfaafc16d59771dcc4d3ad47… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 16 11:33:40 2014 +0200 d2d1: Remove unnecessary DllMain implementation. --- dlls/d2d1/d2d1_main.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/d2d1/d2d1_main.c b/dlls/d2d1/d2d1_main.c index 9a389a2..f438de9 100644 --- a/dlls/d2d1/d2d1_main.c +++ b/dlls/d2d1/d2d1_main.c @@ -26,18 +26,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) -{ - switch (reason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(inst); - break; - } - - return TRUE; -} - HRESULT WINAPI D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory) {

1 0

Henri Verbeet : d2d1: Add the ID2D1RadialGradientBrush interface.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: 7d30886296ef74e9e998effd872482b1d1874d40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d30886296ef74e9e998effd8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 16 09:59:19 2014 +0200 d2d1: Add the ID2D1RadialGradientBrush interface. --- include/d2d1.idl | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 3a7901f..c96b67e 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -679,5 +679,33 @@ interface ID2D1LinearGradientBrush : ID2D1Brush ); } +[ + local, + object, + uuid(2cd906ac-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1RadialGradientBrush : ID2D1Brush +{ + void SetCenter( + [in] D2D1_POINT_2F center + ); + void SetGradientOriginOffset( + [in] D2D1_POINT_2F offset + ); + void SetRadiusX( + [in] float radius + ); + void SetRadiusY( + [in] float radius + ); + D2D1_POINT_2F GetCenter(); + D2D1_POINT_2F GetGradientOriginOffset(); + float GetRadiusX(); + float GetRadiusY(); + void GetGradientStopCollection( + [out] ID2D1GradientStopCollection **gradient + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Alexandre Julliard : bcrypt: Remove unnecessary DllMain implementation.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: cf40121ed67c65e83999bc04a1e86aae724c5fbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf40121ed67c65e83999bc04a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 16 11:33:29 2014 +0200 bcrypt: Remove unnecessary DllMain implementation. --- dlls/bcrypt/bcrypt_main.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index fcad58c..ee203a6 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -31,20 +31,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(bcrypt); -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) -{ - TRACE("fdwReason %u\n", fdwReason); - - switch(fdwReason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hInstDLL); - break; - } - - return TRUE; -} - NTSTATUS WINAPI BCryptEnumAlgorithms(ULONG dwAlgOperations, ULONG *pAlgCount, BCRYPT_ALGORITHM_IDENTIFIER **ppAlgList, ULONG dwFlags) {

1 0

Michael Stefaniuc : dmusic: Move a struct to the .c file it is used.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: 176b7aa8423ada08261d26ca6343ce6687984c2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=176b7aa8423ada08261d26ca6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu May 15 23:55:43 2014 +0200 dmusic: Move a struct to the .c file it is used. --- dlls/dmusic/collection.c | 25 ++++++++++++++++++++++--- dlls/dmusic/dmusic_private.h | 25 ------------------------- 2 files changed, 22 insertions(+), 28 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index 90a7918..acbc2a5 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -23,6 +23,28 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmusic); WINE_DECLARE_DEBUG_CHANNEL(dmfile); +/***************************************************************************** + * IDirectMusicCollectionImpl implementation + */ +typedef struct IDirectMusicCollectionImpl { + IDirectMusicCollection IDirectMusicCollection_iface; + IDirectMusicObject IDirectMusicObject_iface; + IPersistStream IPersistStream_iface; + LONG ref; + /* IDirectMusicCollectionImpl fields */ + IStream *pStm; /* stream from which we load collection and later instruments */ + LARGE_INTEGER liCollectionPosition; /* offset in a stream where collection was loaded from */ + LARGE_INTEGER liWavePoolTablePosition; /* offset in a stream where wave pool table can be found */ + DMUS_OBJECTDESC *pDesc; + CHAR *szCopyright; /* FIXME: should probably placed somewhere else */ + DLSHEADER *pHeader; + /* pool table */ + POOLTABLE *pPoolTable; + POOLCUE *pPoolCues; + /* instruments */ + struct list Instruments; +} IDirectMusicCollectionImpl; + static inline IDirectMusicCollectionImpl *impl_from_IDirectMusicCollection(IDirectMusicCollection *iface) { return CONTAINING_RECORD(iface, IDirectMusicCollectionImpl, IDirectMusicCollection_iface); @@ -38,9 +60,6 @@ static inline IDirectMusicCollectionImpl *impl_from_IPersistStream(IPersistStrea return CONTAINING_RECORD(iface, IDirectMusicCollectionImpl, IPersistStream_iface); } -/***************************************************************************** - * IDirectMusicCollectionImpl implementation - */ /* IDirectMusicCollectionImpl IUnknown part: */ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_QueryInterface(LPDIRECTMUSICCOLLECTION iface, REFIID riid, LPVOID *ret_iface) { diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index badc2df..6a87bee 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -51,7 +51,6 @@ typedef struct IDirectMusicDownloadedInstrumentImpl IDirectMusicDownloadedInstru typedef struct IDirectMusicDownloadImpl IDirectMusicDownloadImpl; typedef struct IReferenceClockImpl IReferenceClockImpl; -typedef struct IDirectMusicCollectionImpl IDirectMusicCollectionImpl; typedef struct IDirectMusicInstrumentImpl IDirectMusicInstrumentImpl; typedef struct SynthPortImpl SynthPortImpl; @@ -210,30 +209,6 @@ typedef struct _DMUS_PRIVATE_POOLCUE { } DMUS_PRIVATE_POOLCUE, *LPDMUS_PRIVATE_POOLCUE; /***************************************************************************** - * IDirectMusicCollectionImpl implementation structure - */ -struct IDirectMusicCollectionImpl { - /* IUnknown fields */ - IDirectMusicCollection IDirectMusicCollection_iface; - IDirectMusicObject IDirectMusicObject_iface; - IPersistStream IPersistStream_iface; - LONG ref; - - /* IDirectMusicCollectionImpl fields */ - IStream *pStm; /* stream from which we load collection and later instruments */ - LARGE_INTEGER liCollectionPosition; /* offset in a stream where collection was loaded from */ - LARGE_INTEGER liWavePoolTablePosition; /* offset in a stream where wave pool table can be found */ - LPDMUS_OBJECTDESC pDesc; - CHAR* szCopyright; /* FIXME: should probably placed somewhere else */ - LPDLSHEADER pHeader; - /* pool table */ - LPPOOLTABLE pPoolTable; - LPPOOLCUE pPoolCues; - /* instruments */ - struct list Instruments; -}; - -/***************************************************************************** * IDirectMusicInstrumentImpl implementation structure */ struct IDirectMusicInstrumentImpl {

1 0

Alexandre Julliard : sane.ds: Remove unnecessary DllMain implementation when SANE is missing.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: 3f6c6dbbb3d44fe72388b03bd49a0daad6463f9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f6c6dbbb3d44fe72388b03bd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 16 11:34:37 2014 +0200 sane.ds: Remove unnecessary DllMain implementation when SANE is missing. --- dlls/sane.ds/sane_main.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/sane.ds/sane_main.c b/dlls/sane.ds/sane_main.c index c01baeb..7484ca5 100644 --- a/dlls/sane.ds/sane_main.c +++ b/dlls/sane.ds/sane_main.c @@ -30,10 +30,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(twain); -HINSTANCE SANE_instance; - #ifdef SONAME_LIBSANE +HINSTANCE SANE_instance; + static void *libsane_handle; static void close_libsane(void *h) @@ -79,8 +79,6 @@ static void *open_libsane(void) return h; } -#endif /* SONAME_LIBSANE */ - BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); @@ -88,7 +86,6 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { case DLL_PROCESS_ATTACH: { -#ifdef SONAME_LIBSANE SANE_Int version_code; libsane_handle = open_libsane(); @@ -96,28 +93,25 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return FALSE; psane_init (&version_code, NULL); -#endif SANE_instance = hinstDLL; DisableThreadLibraryCalls(hinstDLL); break; } case DLL_PROCESS_DETACH: if (lpvReserved) break; -#ifdef SONAME_LIBSANE TRACE("calling sane_exit()\n"); psane_exit (); close_libsane(libsane_handle); -#endif break; } return TRUE; } -#ifdef SONAME_LIBSANE static TW_UINT16 SANE_GetIdentity( pTW_IDENTITY, pTW_IDENTITY); static TW_UINT16 SANE_OpenDS( pTW_IDENTITY, pTW_IDENTITY); -#endif + +#endif /* SONAME_LIBSANE */ static TW_UINT16 SANE_SourceControlHandler ( pTW_IDENTITY pOrigin,

1 0