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

Alexandre Julliard : kernel32/tests: Silence some noisy traces.
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: wine Branch: master Commit: c7eacd9e838fec7268220e02f7538d242e8fe0f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7eacd9e838fec7268220e02f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 17 10:58:46 2014 +0200 kernel32/tests: Silence some noisy traces. --- dlls/kernel32/tests/locale.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 597de37..b4d8beb 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3056,7 +3056,6 @@ static void test_EnumDateFormatsA(void) BOOL ret; LCID lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); - trace("EnumDateFormatsA 0\n"); date_fmt_buf[0] = 0; SetLastError(0xdeadbeef); ret = EnumDateFormatsA(enum_datetime_procA, lcid, 0); @@ -3067,7 +3066,7 @@ static void test_EnumDateFormatsA(void) else { ok(ret, "EnumDateFormatsA(0) error %d\n", GetLastError()); - trace("%s\n", date_fmt_buf); + trace("EnumDateFormatsA(0): %s\n", date_fmt_buf); /* test the 1st enumerated format */ if ((p = strchr(date_fmt_buf, '\n'))) *p = 0; ret = GetLocaleInfoA(lcid, LOCALE_SSHORTDATE, buf, sizeof(buf)); @@ -3075,7 +3074,6 @@ static void test_EnumDateFormatsA(void) ok(!lstrcmpA(date_fmt_buf, buf), "expected \"%s\" got \"%s\"\n", date_fmt_buf, buf); } - trace("EnumDateFormatsA LOCALE_USE_CP_ACP\n"); date_fmt_buf[0] = 0; SetLastError(0xdeadbeef); ret = EnumDateFormatsA(enum_datetime_procA, lcid, LOCALE_USE_CP_ACP); @@ -3086,7 +3084,7 @@ static void test_EnumDateFormatsA(void) else { ok(ret, "EnumDateFormatsA(LOCALE_USE_CP_ACP) error %d\n", GetLastError()); - trace("%s\n", date_fmt_buf); + trace("EnumDateFormatsA(LOCALE_USE_CP_ACP): %s\n", date_fmt_buf); /* test the 1st enumerated format */ if ((p = strchr(date_fmt_buf, '\n'))) *p = 0; ret = GetLocaleInfoA(lcid, LOCALE_SSHORTDATE, buf, sizeof(buf)); @@ -3094,29 +3092,26 @@ static void test_EnumDateFormatsA(void) ok(!lstrcmpA(date_fmt_buf, buf), "expected \"%s\" got \"%s\"\n", date_fmt_buf, buf); } - trace("EnumDateFormatsA DATE_SHORTDATE\n"); date_fmt_buf[0] = 0; ret = EnumDateFormatsA(enum_datetime_procA, lcid, DATE_SHORTDATE); ok(ret, "EnumDateFormatsA(DATE_SHORTDATE) error %d\n", GetLastError()); - trace("%s\n", date_fmt_buf); + trace("EnumDateFormatsA(DATE_SHORTDATE): %s\n", date_fmt_buf); /* test the 1st enumerated format */ if ((p = strchr(date_fmt_buf, '\n'))) *p = 0; ret = GetLocaleInfoA(lcid, LOCALE_SSHORTDATE, buf, sizeof(buf)); ok(ret, "GetLocaleInfoA(LOCALE_SSHORTDATE) error %d\n", GetLastError()); ok(!lstrcmpA(date_fmt_buf, buf), "expected \"%s\" got \"%s\"\n", date_fmt_buf, buf); - trace("EnumDateFormatsA DATE_LONGDATE\n"); date_fmt_buf[0] = 0; ret = EnumDateFormatsA(enum_datetime_procA, lcid, DATE_LONGDATE); ok(ret, "EnumDateFormatsA(DATE_LONGDATE) error %d\n", GetLastError()); - trace("%s\n", date_fmt_buf); + trace("EnumDateFormatsA(DATE_LONGDATE): %s\n", date_fmt_buf); /* test the 1st enumerated format */ if ((p = strchr(date_fmt_buf, '\n'))) *p = 0; ret = GetLocaleInfoA(lcid, LOCALE_SLONGDATE, buf, sizeof(buf)); ok(ret, "GetLocaleInfoA(LOCALE_SLONGDATE) error %d\n", GetLastError()); ok(!lstrcmpA(date_fmt_buf, buf), "expected \"%s\" got \"%s\"\n", date_fmt_buf, buf); - trace("EnumDateFormatsA DATE_YEARMONTH\n"); date_fmt_buf[0] = 0; SetLastError(0xdeadbeef); ret = EnumDateFormatsA(enum_datetime_procA, lcid, DATE_YEARMONTH); @@ -3126,7 +3121,7 @@ static void test_EnumDateFormatsA(void) return; } ok(ret, "EnumDateFormatsA(DATE_YEARMONTH) error %d\n", GetLastError()); - trace("%s\n", date_fmt_buf); + trace("EnumDateFormatsA(DATE_YEARMONTH): %s\n", date_fmt_buf); /* test the 1st enumerated format */ if ((p = strchr(date_fmt_buf, '\n'))) *p = 0; ret = GetLocaleInfoA(lcid, LOCALE_SYEARMONTH, buf, sizeof(buf)); @@ -3141,22 +3136,20 @@ static void test_EnumTimeFormatsA(void) BOOL ret; LCID lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); - trace("EnumTimeFormatsA 0\n"); date_fmt_buf[0] = 0; ret = EnumTimeFormatsA(enum_datetime_procA, lcid, 0); ok(ret, "EnumTimeFormatsA(0) error %d\n", GetLastError()); - trace("%s\n", date_fmt_buf); + trace("EnumTimeFormatsA(0): %s\n", date_fmt_buf); /* test the 1st enumerated format */ if ((p = strchr(date_fmt_buf, '\n'))) *p = 0; ret = GetLocaleInfoA(lcid, LOCALE_STIMEFORMAT, buf, sizeof(buf)); ok(ret, "GetLocaleInfoA(LOCALE_STIMEFORMAT) error %d\n", GetLastError()); ok(!lstrcmpA(date_fmt_buf, buf), "expected \"%s\" got \"%s\"\n", date_fmt_buf, buf); - trace("EnumTimeFormatsA LOCALE_USE_CP_ACP\n"); date_fmt_buf[0] = 0; ret = EnumTimeFormatsA(enum_datetime_procA, lcid, LOCALE_USE_CP_ACP); ok(ret, "EnumTimeFormatsA(LOCALE_USE_CP_ACP) error %d\n", GetLastError()); - trace("%s\n", date_fmt_buf); + trace("EnumTimeFormatsA(LOCALE_USE_CP_ACP): %s\n", date_fmt_buf); /* test the 1st enumerated format */ if ((p = strchr(date_fmt_buf, '\n'))) *p = 0; ret = GetLocaleInfoA(lcid, LOCALE_STIMEFORMAT, buf, sizeof(buf));

1 0

Sebastian Lackner : msvcr110: Fix typo in exported symbol _set_SSE2_enable.
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: wine Branch: master Commit: 25b069c4d84a09a5d17b92d8ff28db6f5be2d377 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25b069c4d84a09a5d17b92d8f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Jun 17 00:21:35 2014 +0200 msvcr110: Fix typo in exported symbol _set_SSE2_enable. --- dlls/msvcr110/msvcr110.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 4f89b24..d6e5efe 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1623,7 +1623,7 @@ @ cdecl _searchenv_s(str str ptr long) MSVCRT__searchenv_s @ stdcall -arch=i386 _seh_longjmp_unwind4(ptr) @ stdcall -arch=i386 _seh_longjmp_unwind(ptr) -@ cdecl -arch=i386 __set_SSE2_enable(long) MSVCRT__set_SSE2_enable +@ cdecl -arch=i386 _set_SSE2_enable(long) MSVCRT__set_SSE2_enable @ cdecl _set_abort_behavior(long long) MSVCRT__set_abort_behavior @ cdecl _set_controlfp(long long) @ cdecl _set_doserrno(long)

1 0

Austin English : kernel32: Add DECLSPEC_HOTPATCH to SetFilePointer.
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: wine Branch: master Commit: bdc0099eb4e3e45761246d251d8ae741e0fe0eff URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdc0099eb4e3e45761246d251… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Jun 15 13:43:54 2014 -0700 kernel32: Add DECLSPEC_HOTPATCH to SetFilePointer. --- dlls/kernel32/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 9bcd9e9..412659b 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1039,7 +1039,7 @@ BOOL WINAPI SetFileInformationByHandle( HANDLE file, FILE_INFO_BY_HANDLE_CLASS c /*********************************************************************** * SetFilePointer (KERNEL32.@) */ -DWORD WINAPI SetFilePointer( HANDLE hFile, LONG distance, LONG *highword, DWORD method ) +DWORD WINAPI DECLSPEC_HOTPATCH SetFilePointer( HANDLE hFile, LONG distance, LONG *highword, DWORD method ) { LARGE_INTEGER dist, newpos;

1 0

Austin English : user32: Add a stub for SetGestureConfig.
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: wine Branch: master Commit: 82392e78b73c2cc4d08be8b35a9d224b4bc3e79f URL: http://source.winehq.org/git/wine.git/?a=commit;h=82392e78b73c2cc4d08be8b35… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Jun 15 13:34:49 2014 -0700 user32: Add a stub for SetGestureConfig. --- dlls/user32/misc.c | 10 ++++++++++ dlls/user32/user32.spec | 1 + include/winuser.h | 7 +++++++ 3 files changed, 18 insertions(+) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 15dd75a..2e6cc35 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -684,3 +684,13 @@ HPOWERNOTIFY WINAPI RegisterPowerSettingNotification(HANDLE recipient, const GUI FIXME("(%p,%s,%x): stub\n", recipient, debugstr_guid(guid), flags); return NULL; } + +/********************************************************************** + * SetGestureConfig [USER32.@] + */ +BOOL WINAPI SetGestureConfig( HWND hwnd, DWORD reserved, UINT id, PGESTURECONFIG config, UINT size ) +{ + FIXME("(%p %08x %u %p %u): stub\n", hwnd, reserved, id, config, size); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 1425dac..da02c58 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -631,6 +631,7 @@ @ stdcall SetDoubleClickTime(long) @ stdcall SetFocus(long) @ stdcall SetForegroundWindow(long) +@ stdcall SetGestureConfig(ptr long long ptr long) @ stdcall SetInternalWindowPos(long long ptr ptr) @ stdcall SetKeyboardState(ptr) @ stdcall SetLastErrorEx(long long) diff --git a/include/winuser.h b/include/winuser.h index 8cda284..303f5d3 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -628,6 +628,12 @@ typedef struct tagRID_DEVICE_INFO { #define RIDEV_EXMODE(mode) ((mode) & RIDEV_EXMODEMASK) +typedef struct tagGESTURECONFIG { + DWORD dwID; + DWORD dwWant; + DWORD dwBlock; +} GESTURECONFIG, *PGESTURECONFIG; + #define GIDC_ARRIVAL 1 #define GIDC_REMOVAL 2 @@ -3916,6 +3922,7 @@ WINUSERAPI BOOL WINAPI SetDlgItemTextW(HWND,INT,LPCWSTR); WINUSERAPI BOOL WINAPI SetDoubleClickTime(UINT); WINUSERAPI HWND WINAPI SetFocus(HWND); WINUSERAPI BOOL WINAPI SetForegroundWindow(HWND); +WINUSERAPI BOOL WINAPI SetGestureConfig(HWND,DWORD,UINT,PGESTURECONFIG,UINT); WINUSERAPI void WINAPI SetInternalWindowPos(HWND,UINT,LPRECT,LPPOINT); WINUSERAPI BOOL WINAPI SetKeyboardState(LPBYTE); WINUSERAPI VOID WINAPI SetLastErrorEx(DWORD,DWORD);

1 0

Michael Stefaniuc : dmusic: Increment the refcount when a IReferenceClock pointer is returned.
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: wine Branch: master Commit: 5e1783b59ad4dd0bfa1f80d2b35ce840d6c5bf08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e1783b59ad4dd0bfa1f80d2b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 16 23:22:54 2014 +0200 dmusic: Increment the refcount when a IReferenceClock pointer is returned. --- dlls/dmusic/dmusic.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 28be851..09a7f53 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -210,8 +210,10 @@ static HRESULT WINAPI IDirectMusic8Impl_GetMasterClock(LPDIRECTMUSIC8 iface, LPG if (guid_clock) *guid_clock = This->pMasterClock->pClockInfo.guidClock; - if (reference_clock) - *reference_clock = (IReferenceClock*)This->pMasterClock; + if (reference_clock) { + *reference_clock = &This->pMasterClock->IReferenceClock_iface; + IReferenceClock_AddRef(*reference_clock); + } return S_OK; }

1 0

Sebastian Lackner : kernel32: Raise DBG_PRINTEXCEPTION_C exception in OutputDebugStringA.
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: wine Branch: master Commit: 1b3d67aaceaa58cbe0dfc32d4b1cb0f4e17eaf23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b3d67aaceaa58cbe0dfc32d4… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Jun 14 09:39:24 2014 +0200 kernel32: Raise DBG_PRINTEXCEPTION_C exception in OutputDebugStringA. --- dlls/kernel32/debugger.c | 21 +++++++++++++++++++++ dlls/ntdll/tests/exception.c | 41 +++++++++++++++++++++++++++++++++++++++++ include/ntstatus.h | 1 + include/winnt.h | 1 + 4 files changed, 64 insertions(+) diff --git a/dlls/kernel32/debugger.c b/dlls/kernel32/debugger.c index 5300fb5..34ef30a 100644 --- a/dlls/kernel32/debugger.c +++ b/dlls/kernel32/debugger.c @@ -28,6 +28,7 @@ #include "wine/server.h" #include "kernel_private.h" #include "wine/debug.h" +#include "wine/exception.h" WINE_DEFAULT_DEBUG_CHANNEL(debugstr); @@ -227,6 +228,11 @@ BOOL WINAPI DebugActiveProcessStop( DWORD pid ) return ret; } +static LONG WINAPI debug_exception_handler( EXCEPTION_POINTERS *eptr ) +{ + EXCEPTION_RECORD *rec = eptr->ExceptionRecord; + return (rec->ExceptionCode == DBG_PRINTEXCEPTION_C) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH; +} /*********************************************************************** * OutputDebugStringA (KERNEL32.@) @@ -248,7 +254,22 @@ void WINAPI OutputDebugStringA( LPCSTR str ) if (!str) str = ""; + /* raise fake exception to make copy protections happy */ + __TRY + { + ULONG_PTR args[2]; + args[0] = strlen(str) + 1; + args[1] = (ULONG_PTR)str; + RaiseException( DBG_PRINTEXCEPTION_C, 0, 2, args ); + } + __EXCEPT(debug_exception_handler) + { + } + __ENDTRY + /* send string to attached debugger */ + /* FIXME should only send to debugger if exception is not caught by user-mode application */ + SERVER_START_REQ( output_debug_string ) { req->string = wine_server_client_ptr( str ); diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 8a80928..05bc15c 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1572,6 +1572,45 @@ static void test_dynamic_unwind(void) #endif /* __x86_64__ */ +static DWORD outputdebugstring_exceptions; + +static LONG CALLBACK outputdebugstring_vectored_handler(EXCEPTION_POINTERS *ExceptionInfo) +{ + PEXCEPTION_RECORD rec = ExceptionInfo->ExceptionRecord; + trace("vect. handler %08x addr:%p\n", rec->ExceptionCode, rec->ExceptionAddress); + + ok(rec->ExceptionCode == DBG_PRINTEXCEPTION_C, "ExceptionCode is %08x instead of %08x\n", + rec->ExceptionCode, DBG_PRINTEXCEPTION_C); + ok(rec->NumberParameters == 2, "ExceptionParameters is %d instead of 2\n", rec->NumberParameters); + ok(rec->ExceptionInformation[0] == 12, "ExceptionInformation[0] = %d instead of 12\n", (DWORD)rec->ExceptionInformation[0]); + ok(!strcmp((char *)rec->ExceptionInformation[1], "Hello World"), + "ExceptionInformation[1] = '%s' instead of 'Hello World'\n", (char *)rec->ExceptionInformation[1]); + + outputdebugstring_exceptions++; + return EXCEPTION_CONTINUE_SEARCH; +} + +static void test_outputdebugstring(void) +{ + PVOID vectored_handler; + + if (!pRtlAddVectoredExceptionHandler || !pRtlRemoveVectoredExceptionHandler) + { + skip("RtlAddVectoredExceptionHandler or RtlRemoveVectoredExceptionHandler not found\n"); + return; + } + + vectored_handler = pRtlAddVectoredExceptionHandler(TRUE, &outputdebugstring_vectored_handler); + ok(vectored_handler != 0, "RtlAddVectoredExceptionHandler failed\n"); + + outputdebugstring_exceptions = 0; + OutputDebugStringA("Hello World"); + ok(outputdebugstring_exceptions == 1, "OutputDebugStringA generated %d exceptions, expected one\n", + outputdebugstring_exceptions); + + pRtlRemoveVectoredExceptionHandler(vectored_handler); +} + START_TEST(exception) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -1675,5 +1714,7 @@ START_TEST(exception) #endif + test_outputdebugstring(); + VirtualFree(code_mem, 0, MEM_FREE); } diff --git a/include/ntstatus.h b/include/ntstatus.h index 1eaae2d..9a7ca7a 100644 --- a/include/ntstatus.h +++ b/include/ntstatus.h @@ -1211,6 +1211,7 @@ #define DBG_TERMINATE_THREAD ((NTSTATUS) 0x40010003) #define DBG_TERMINATE_PROCESS ((NTSTATUS) 0x40010004) #define DBG_CONTROL_C ((NTSTATUS) 0x40010005) +#define DBG_PRINTEXCEPTION_C ((NTSTATUS) 0x40010006) #define DBG_CONTROL_BREAK ((NTSTATUS) 0x40010008) #define DBG_COMMAND_EXCEPTION ((NTSTATUS) 0x40010009) #define DBG_EXCEPTION_NOT_HANDLED ((NTSTATUS) 0x80010001) diff --git a/include/winnt.h b/include/winnt.h index 280cba0..e9e330d 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -622,6 +622,7 @@ typedef DWORD FLONG; #define DBG_TERMINATE_THREAD ((DWORD) 0x40010003) #define DBG_TERMINATE_PROCESS ((DWORD) 0x40010004) #define DBG_CONTROL_C ((DWORD) 0x40010005) +#define DBG_PRINTEXCEPTION_C ((DWORD) 0x40010006) #define DBG_CONTROL_BREAK ((DWORD) 0x40010008) #define DBG_COMMAND_EXCEPTION ((DWORD) 0x40010009) #define DBG_EXCEPTION_NOT_HANDLED ((DWORD) 0x80010001)

1 0

Sebastian Lackner : user32: Avoid race-condition when unloading module while hook is still active.
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: wine Branch: master Commit: e9fbcc8360e9dcdc51add3efb9d0581c63a6cd09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9fbcc8360e9dcdc51add3efb… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jun 13 20:35:41 2014 +0200 user32: Avoid race-condition when unloading module while hook is still active. Based on a patch by Sam Revitch. --- dlls/user32/hook.c | 16 ++++++++++++---- dlls/user32/message.c | 5 ++++- dlls/user32/user_private.h | 2 +- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index 633704b..2f6b42c 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -359,11 +359,13 @@ static LRESULT call_hook_proc( HOOKPROC proc, INT id, INT code, WPARAM wparam, L * * Retrieve the hook procedure real value for a module-relative proc */ -void *get_hook_proc( void *proc, const WCHAR *module ) +void *get_hook_proc( void *proc, const WCHAR *module, HMODULE *free_module ) { HMODULE mod; - if (!(mod = GetModuleHandleW(module))) + GetModuleHandleExW( 0, module, &mod ); + *free_module = mod; + if (!mod) { TRACE( "loading %s\n", debugstr_w(module) ); /* FIXME: the library will never be freed */ @@ -411,12 +413,13 @@ static LRESULT call_hook( struct hook_info *info, INT code, WPARAM wparam, LPARA } else if (info->proc) { + HMODULE free_module = 0; TRACE( "calling hook %p %s code %x wp %lx lp %lx module %s\n", info->proc, hook_names[info->id-WH_MINHOOK], code, wparam, lparam, debugstr_w(info->module) ); if (!info->module[0] || - (info->proc = get_hook_proc( info->proc, info->module )) != NULL) + (info->proc = get_hook_proc( info->proc, info->module, &free_module )) != NULL) { struct user_thread_info *thread_info = get_user_thread_info(); HHOOK prev = thread_info->hook; @@ -428,6 +431,8 @@ static LRESULT call_hook( struct hook_info *info, INT code, WPARAM wparam, LPARA info->prev_unicode, info->next_unicode ); thread_info->hook = prev; thread_info->hook_unicode = prev_unicode; + + if (free_module) FreeLibrary(free_module); } } @@ -897,10 +902,11 @@ void WINAPI NotifyWinEvent(DWORD event, HWND hwnd, LONG object_id, LONG child_id WINEVENTPROC proc = info.proc; if (proc) { + HMODULE free_module = 0; TRACE( "calling WH_WINEVENT hook %p event %x hwnd %p %x %x module %s\n", proc, event, hwnd, object_id, child_id, debugstr_w(info.module) ); - if (!info.module[0] || (proc = get_hook_proc( proc, info.module )) != NULL) + if (!info.module[0] || (proc = get_hook_proc( proc, info.module, &free_module )) != NULL) { if (TRACE_ON(relay)) DPRINTF( "%04x:Call winevent hook proc %p (hhook=%p,event=%x,hwnd=%p,object_id=%x,child_id=%x,tid=%04x,time=%x)\n", @@ -914,6 +920,8 @@ void WINAPI NotifyWinEvent(DWORD event, HWND hwnd, LONG object_id, LONG child_id DPRINTF( "%04x:Ret winevent hook proc %p (hhook=%p,event=%x,hwnd=%p,object_id=%x,child_id=%x,tid=%04x,time=%x)\n", GetCurrentThreadId(), proc, info.handle, event, hwnd, object_id, child_id, GetCurrentThreadId(), GetCurrentTime()); + + if (free_module) FreeLibrary(free_module); } } else diff --git a/dlls/user32/message.c b/dlls/user32/message.c index be5d995..3167a2f 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2815,6 +2815,7 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags if (size >= sizeof(msg_data->winevent)) { WINEVENTPROC hook_proc; + HMODULE free_module = 0; hook_proc = wine_server_get_ptr( msg_data->winevent.hook_proc ); size -= sizeof(msg_data->winevent); @@ -2825,7 +2826,7 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags size = min( size, (MAX_PATH - 1) * sizeof(WCHAR) ); memcpy( module, &msg_data->winevent + 1, size ); module[size / sizeof(WCHAR)] = 0; - if (!(hook_proc = get_hook_proc( hook_proc, module ))) + if (!(hook_proc = get_hook_proc( hook_proc, module, &free_module ))) { ERR( "invalid winevent hook module name %s\n", debugstr_w(module) ); continue; @@ -2847,6 +2848,8 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags GetCurrentThreadId(), hook_proc, msg_data->winevent.hook, info.msg.message, info.msg.hwnd, info.msg.wParam, info.msg.lParam, msg_data->winevent.tid, info.msg.time); + + if (free_module) FreeLibrary(free_module); } continue; case MSG_HOOK_LL: diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 2bb869a..adf3f7d 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -225,7 +225,7 @@ extern void move_window_bits( HWND hwnd, struct window_surface *old_surface, struct window_surface *new_surface, const RECT *visible_rect, const RECT *old_visible_rect, const RECT *client_rect, const RECT *valid_rects ) DECLSPEC_HIDDEN; -extern void *get_hook_proc( void *proc, const WCHAR *module ) DECLSPEC_HIDDEN; +extern void *get_hook_proc( void *proc, const WCHAR *module, HMODULE *free_module ) DECLSPEC_HIDDEN; extern RECT get_virtual_screen_rect(void) DECLSPEC_HIDDEN; extern LRESULT call_current_hook( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN; extern DWORD get_input_codepage( void ) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_CreateLinearGradientBrush().
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: wine Branch: master Commit: 8583fc4a6c45e5170d803a93d53a7ab1705f58dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8583fc4a6c45e5170d803a93d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 16 13:13:22 2014 +0200 d2d1: Implement d2d_d3d_render_target_CreateLinearGradientBrush(). --- dlls/d2d1/brush.c | 164 ++++++++++++++++++++++++++++++++++++++++++++- dlls/d2d1/d2d1_private.h | 3 + dlls/d2d1/render_target.c | 14 +++- 3 files changed, 177 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index a7e6118..d8b769b 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -126,6 +126,13 @@ void d2d_gradient_init(struct d2d_gradient *gradient, ID2D1RenderTarget *render_ gradient->refcount = 1; } +static void d2d_brush_init(struct d2d_brush *brush, ID2D1RenderTarget *render_target, + const D2D1_BRUSH_PROPERTIES *desc, const struct ID2D1BrushVtbl *vtbl) +{ + brush->ID2D1Brush_iface.lpVtbl = vtbl; + brush->refcount = 1; +} + static inline struct d2d_brush *impl_from_ID2D1SolidColorBrush(ID2D1SolidColorBrush *iface) { return CONTAINING_RECORD(iface, struct d2d_brush, ID2D1Brush_iface); @@ -248,6 +255,159 @@ void d2d_solid_color_brush_init(struct d2d_brush *brush, ID2D1RenderTarget *rend { FIXME("Ignoring brush properties.\n"); - brush->ID2D1Brush_iface.lpVtbl = (ID2D1BrushVtbl *)&d2d_solid_color_brush_vtbl; - brush->refcount = 1; + d2d_brush_init(brush, render_target, desc, (ID2D1BrushVtbl *)&d2d_solid_color_brush_vtbl); +} + +static inline struct d2d_brush *impl_from_ID2D1LinearGradientBrush(ID2D1LinearGradientBrush *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_brush, ID2D1Brush_iface); +} + +static HRESULT STDMETHODCALLTYPE d2d_linear_gradient_brush_QueryInterface(ID2D1LinearGradientBrush *iface, + REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_ID2D1LinearGradientBrush) + || IsEqualGUID(iid, &IID_ID2D1Brush) + || IsEqualGUID(iid, &IID_ID2D1Resource) + || IsEqualGUID(iid, &IID_IUnknown)) + { + ID2D1LinearGradientBrush_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d2d_linear_gradient_brush_AddRef(ID2D1LinearGradientBrush *iface) +{ + struct d2d_brush *brush = impl_from_ID2D1LinearGradientBrush(iface); + ULONG refcount = InterlockedIncrement(&brush->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d2d_linear_gradient_brush_Release(ID2D1LinearGradientBrush *iface) +{ + struct d2d_brush *brush = impl_from_ID2D1LinearGradientBrush(iface); + ULONG refcount = InterlockedDecrement(&brush->refcount); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); + + if (!refcount) + HeapFree(GetProcessHeap(), 0, brush); + + return refcount; +} + +static void STDMETHODCALLTYPE d2d_linear_gradient_brush_GetFactory(ID2D1LinearGradientBrush *iface, + ID2D1Factory **factory) +{ + FIXME("iface %p, factory %p stub!\n", iface, factory); + + *factory = NULL; +} + +static void STDMETHODCALLTYPE d2d_linear_gradient_brush_SetOpacity(ID2D1LinearGradientBrush *iface, float opacity) +{ + FIXME("iface %p, opacity %.8e stub!\n", iface, opacity); +} + +static void STDMETHODCALLTYPE d2d_linear_gradient_brush_SetTransform(ID2D1LinearGradientBrush *iface, + const D2D1_MATRIX_3X2_F *transform) +{ + FIXME("iface %p, transform %p stub!\n", iface, transform); +} + +static float STDMETHODCALLTYPE d2d_linear_gradient_brush_GetOpacity(ID2D1LinearGradientBrush *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0.0f; +} + +static void STDMETHODCALLTYPE d2d_linear_gradient_brush_GetTransform(ID2D1LinearGradientBrush *iface, + D2D1_MATRIX_3X2_F *transform) +{ + static const D2D1_MATRIX_3X2_F identity = + { + 1.0f, 0.0f, + 0.0f, 1.0f, + 0.0f, 0.0f, + }; + + FIXME("iface %p, transform %p stub!\n", iface, transform); + + *transform = identity; +} + +static void STDMETHODCALLTYPE d2d_linear_gradient_brush_SetStartPoint(ID2D1LinearGradientBrush *iface, + D2D1_POINT_2F start_point) +{ + FIXME("iface %p, start_point {%.8e, %.8e} stub!\n", iface, start_point.x, start_point.y); +} + +static void STDMETHODCALLTYPE d2d_linear_gradient_brush_SetEndPoint(ID2D1LinearGradientBrush *iface, + D2D1_POINT_2F end_point) +{ + FIXME("iface %p, end_point {%.8e, %.8e} stub!\n", iface, end_point.x, end_point.y); +} + +static D2D1_POINT_2F STDMETHODCALLTYPE d2d_linear_gradient_brush_GetStartPoint(ID2D1LinearGradientBrush *iface) +{ + static const D2D1_POINT_2F point = {0.0f, 0.0f}; + + FIXME("iface %p stub!\n", iface); + + return point; +} + +static D2D1_POINT_2F STDMETHODCALLTYPE d2d_linear_gradient_brush_GetEndPoint(ID2D1LinearGradientBrush *iface) +{ + static const D2D1_POINT_2F point = {0.0f, 0.0f}; + + FIXME("iface %p stub!\n", iface); + + return point; +} + +static void STDMETHODCALLTYPE d2d_linear_gradient_brush_GetGradientStopCollection(ID2D1LinearGradientBrush *iface, + ID2D1GradientStopCollection **gradient) +{ + FIXME("iface %p, gradient %p stub!\n", iface, gradient); + + *gradient = NULL; +} + +static const struct ID2D1LinearGradientBrushVtbl d2d_linear_gradient_brush_vtbl = +{ + d2d_linear_gradient_brush_QueryInterface, + d2d_linear_gradient_brush_AddRef, + d2d_linear_gradient_brush_Release, + d2d_linear_gradient_brush_GetFactory, + d2d_linear_gradient_brush_SetOpacity, + d2d_linear_gradient_brush_SetTransform, + d2d_linear_gradient_brush_GetOpacity, + d2d_linear_gradient_brush_GetTransform, + d2d_linear_gradient_brush_SetStartPoint, + d2d_linear_gradient_brush_SetEndPoint, + d2d_linear_gradient_brush_GetStartPoint, + d2d_linear_gradient_brush_GetEndPoint, + d2d_linear_gradient_brush_GetGradientStopCollection, +}; + +void d2d_linear_gradient_brush_init(struct d2d_brush *brush, ID2D1RenderTarget *render_target, + const D2D1_LINEAR_GRADIENT_BRUSH_PROPERTIES *gradient_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, + ID2D1GradientStopCollection *gradient) +{ + FIXME("Ignoring brush properties.\n"); + + d2d_brush_init(brush, render_target, brush_desc, (ID2D1BrushVtbl *)&d2d_solid_color_brush_vtbl); } diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 4d32856..2bcb594 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -51,5 +51,8 @@ struct d2d_brush void d2d_solid_color_brush_init(struct d2d_brush *brush, ID2D1RenderTarget *render_target, const D2D1_COLOR_F *color, const D2D1_BRUSH_PROPERTIES *desc) DECLSPEC_HIDDEN; +void d2d_linear_gradient_brush_init(struct d2d_brush *brush, ID2D1RenderTarget *render_target, + const D2D1_LINEAR_GRADIENT_BRUSH_PROPERTIES *gradient_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, + ID2D1GradientStopCollection *gradient) DECLSPEC_HIDDEN; #endif /* __WINE_D2D1_PRIVATE_H */ diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index abf2fd8..34ed063 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -156,10 +156,20 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateLinearGradientBrush const D2D1_LINEAR_GRADIENT_BRUSH_PROPERTIES *gradient_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, ID2D1GradientStopCollection *gradient, ID2D1LinearGradientBrush **brush) { - FIXME("iface %p, gradient_brush_desc %p, brush_desc %p, gradient %p, brush %p stub!\n", + struct d2d_brush *object; + + TRACE("iface %p, gradient_brush_desc %p, brush_desc %p, gradient %p, brush %p.\n", iface, gradient_brush_desc, brush_desc, gradient, brush); - return E_NOTIMPL; + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + d2d_linear_gradient_brush_init(object, iface, gradient_brush_desc, brush_desc, gradient); + + TRACE("Created brush %p.\n", object); + *brush = (ID2D1LinearGradientBrush *)&object->ID2D1Brush_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateRadialGradientBrush(ID2D1RenderTarget *iface,

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_CreateGradientStopCollection().
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: wine Branch: master Commit: 22a20e4016794784a65f9878d3bad064b5ac60cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=22a20e4016794784a65f9878d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 16 13:13:21 2014 +0200 d2d1: Implement d2d_d3d_render_target_CreateGradientStopCollection(). --- dlls/d2d1/brush.c | 103 +++++++++++++++++++++++++++++++++++++++++++++ dlls/d2d1/d2d1_private.h | 10 +++++ dlls/d2d1/render_target.c | 14 +++++- 3 files changed, 125 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 21fac12..a7e6118 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -23,6 +23,109 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); +static inline struct d2d_gradient *impl_from_ID2D1GradientStopCollection(ID2D1GradientStopCollection *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_gradient, ID2D1GradientStopCollection_iface); +} + +static HRESULT STDMETHODCALLTYPE d2d_gradient_QueryInterface(ID2D1GradientStopCollection *iface, + REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_ID2D1GradientStopCollection) + || IsEqualGUID(iid, &IID_ID2D1Resource) + || IsEqualGUID(iid, &IID_IUnknown)) + { + ID2D1GradientStopCollection_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d2d_gradient_AddRef(ID2D1GradientStopCollection *iface) +{ + struct d2d_gradient *gradient = impl_from_ID2D1GradientStopCollection(iface); + ULONG refcount = InterlockedIncrement(&gradient->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d2d_gradient_Release(ID2D1GradientStopCollection *iface) +{ + struct d2d_gradient *gradient = impl_from_ID2D1GradientStopCollection(iface); + ULONG refcount = InterlockedDecrement(&gradient->refcount); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); + + if (!refcount) + HeapFree(GetProcessHeap(), 0, gradient); + + return refcount; +} + +static void STDMETHODCALLTYPE d2d_gradient_GetFactory(ID2D1GradientStopCollection *iface, ID2D1Factory **factory) +{ + FIXME("iface %p, factory %p stub!\n", iface, factory); + + *factory = NULL; +} + +static UINT32 STDMETHODCALLTYPE d2d_gradient_GetGradientStopCount(ID2D1GradientStopCollection *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0; +} + +static void STDMETHODCALLTYPE d2d_gradient_GetGradientStops(ID2D1GradientStopCollection *iface, + D2D1_GRADIENT_STOP *stops, UINT32 stop_count) +{ + FIXME("iface %p, stops %p, stop_count %u stub!\n", iface, stops, stop_count); +} + +static D2D1_GAMMA STDMETHODCALLTYPE d2d_gradient_GetColorInterpolationGamma(ID2D1GradientStopCollection *iface) +{ + FIXME("iface %p stub!\n", iface); + + return D2D1_GAMMA_1_0; +} + +static D2D1_EXTEND_MODE STDMETHODCALLTYPE d2d_gradient_GetExtendMode(ID2D1GradientStopCollection *iface) +{ + FIXME("iface %p stub!\n", iface); + + return D2D1_EXTEND_MODE_CLAMP; +} + +static const struct ID2D1GradientStopCollectionVtbl d2d_gradient_vtbl = +{ + d2d_gradient_QueryInterface, + d2d_gradient_AddRef, + d2d_gradient_Release, + d2d_gradient_GetFactory, + d2d_gradient_GetGradientStopCount, + d2d_gradient_GetGradientStops, + d2d_gradient_GetColorInterpolationGamma, + d2d_gradient_GetExtendMode, +}; + +void d2d_gradient_init(struct d2d_gradient *gradient, ID2D1RenderTarget *render_target, + const D2D1_GRADIENT_STOP *stops, UINT32 stop_count, D2D1_GAMMA gamma, D2D1_EXTEND_MODE extend_mode) +{ + FIXME("Ignoring gradient properties.\n"); + + gradient->ID2D1GradientStopCollection_iface.lpVtbl = &d2d_gradient_vtbl; + gradient->refcount = 1; +} + static inline struct d2d_brush *impl_from_ID2D1SolidColorBrush(ID2D1SolidColorBrush *iface) { return CONTAINING_RECORD(iface, struct d2d_brush, ID2D1Brush_iface); diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 9e91728..4d32856 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -33,6 +33,16 @@ struct d2d_d3d_render_target void d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, ID2D1Factory *factory, IDXGISurface *surface, const D2D1_RENDER_TARGET_PROPERTIES *desc) DECLSPEC_HIDDEN; +struct d2d_gradient +{ + ID2D1GradientStopCollection ID2D1GradientStopCollection_iface; + LONG refcount; +}; + +void d2d_gradient_init(struct d2d_gradient *gradient, ID2D1RenderTarget *render_target, + const D2D1_GRADIENT_STOP *stops, UINT32 stop_count, D2D1_GAMMA gamma, + D2D1_EXTEND_MODE extend_mode) DECLSPEC_HIDDEN; + struct d2d_brush { ID2D1Brush ID2D1Brush_iface; diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index e8c56a0..abf2fd8 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -136,10 +136,20 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateGradientStopCollect const D2D1_GRADIENT_STOP *stops, UINT32 stop_count, D2D1_GAMMA gamma, D2D1_EXTEND_MODE extend_mode, ID2D1GradientStopCollection **gradient) { - FIXME("iface %p, stops %p, stop_count %u, gamma %#x, extend_mode %#x, gradient %p stub!\n", + struct d2d_gradient *object; + + TRACE("iface %p, stops %p, stop_count %u, gamma %#x, extend_mode %#x, gradient %p.\n", iface, stops, stop_count, gamma, extend_mode, gradient); - return E_NOTIMPL; + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + d2d_gradient_init(object, iface, stops, stop_count, gamma, extend_mode); + + TRACE("Created gradient %p.\n", object); + *gradient = &object->ID2D1GradientStopCollection_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateLinearGradientBrush(ID2D1RenderTarget *iface,

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_CreateSolidColorBrush().
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: wine Branch: master Commit: cfde833140bab044b68652efddbaf24a16736803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfde833140bab044b68652efd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 16 13:13:20 2014 +0200 d2d1: Implement d2d_d3d_render_target_CreateSolidColorBrush(). --- dlls/d2d1/Makefile.in | 1 + dlls/d2d1/brush.c | 150 +++++++++++++++++++++++++++++++++++++++++++++ dlls/d2d1/d2d1_private.h | 9 +++ dlls/d2d1/render_target.c | 14 ++++- 4 files changed, 172 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/Makefile.in b/dlls/d2d1/Makefile.in index 4e106ad..ed451ef 100644 --- a/dlls/d2d1/Makefile.in +++ b/dlls/d2d1/Makefile.in @@ -3,6 +3,7 @@ IMPORTLIB = d2d1 IMPORTS = uuid C_SRCS = \ + brush.c \ factory.c \ render_target.c diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c new file mode 100644 index 0000000..21fac12 --- /dev/null +++ b/dlls/d2d1/brush.c @@ -0,0 +1,150 @@ +/* + * Copyright 2014 Henri Verbeet for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" + +#include "d2d1_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d2d); + +static inline struct d2d_brush *impl_from_ID2D1SolidColorBrush(ID2D1SolidColorBrush *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_brush, ID2D1Brush_iface); +} + +static HRESULT STDMETHODCALLTYPE d2d_solid_color_brush_QueryInterface(ID2D1SolidColorBrush *iface, + REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_ID2D1SolidColorBrush) + || IsEqualGUID(iid, &IID_ID2D1Brush) + || IsEqualGUID(iid, &IID_ID2D1Resource) + || IsEqualGUID(iid, &IID_IUnknown)) + { + ID2D1SolidColorBrush_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d2d_solid_color_brush_AddRef(ID2D1SolidColorBrush *iface) +{ + struct d2d_brush *brush = impl_from_ID2D1SolidColorBrush(iface); + ULONG refcount = InterlockedIncrement(&brush->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d2d_solid_color_brush_Release(ID2D1SolidColorBrush *iface) +{ + struct d2d_brush *brush = impl_from_ID2D1SolidColorBrush(iface); + ULONG refcount = InterlockedDecrement(&brush->refcount); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); + + if (!refcount) + HeapFree(GetProcessHeap(), 0, brush); + + return refcount; +} + +static void STDMETHODCALLTYPE d2d_solid_color_brush_GetFactory(ID2D1SolidColorBrush *iface, ID2D1Factory **factory) +{ + FIXME("iface %p, factory %p stub!\n", iface, factory); + + *factory = NULL; +} + +static void STDMETHODCALLTYPE d2d_solid_color_brush_SetOpacity(ID2D1SolidColorBrush *iface, float opacity) +{ + FIXME("iface %p, opacity %.8e stub!\n", iface, opacity); +} + +static void STDMETHODCALLTYPE d2d_solid_color_brush_SetTransform(ID2D1SolidColorBrush *iface, + const D2D1_MATRIX_3X2_F *transform) +{ + FIXME("iface %p, transform %p stub!\n", iface, transform); +} + +static float STDMETHODCALLTYPE d2d_solid_color_brush_GetOpacity(ID2D1SolidColorBrush *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0.0f; +} + +static void STDMETHODCALLTYPE d2d_solid_color_brush_GetTransform(ID2D1SolidColorBrush *iface, + D2D1_MATRIX_3X2_F *transform) +{ + static const D2D1_MATRIX_3X2_F identity = + { + 1.0f, 0.0f, + 0.0f, 1.0f, + 0.0f, 0.0f, + }; + + FIXME("iface %p, transform %p stub!\n", iface, transform); + + *transform = identity; +} + +static void STDMETHODCALLTYPE d2d_solid_color_brush_SetColor(ID2D1SolidColorBrush *iface, const D2D1_COLOR_F *color) +{ + FIXME("iface %p, color %p stub!\n", iface, color); +} + +static D2D1_COLOR_F STDMETHODCALLTYPE d2d_solid_color_brush_GetColor(ID2D1SolidColorBrush *iface) +{ + static const D2D1_COLOR_F black = {0.0f, 0.0f, 0.0f, 1.0f}; + + FIXME("iface %p stub!\n", iface); + + return black; +} + +static const struct ID2D1SolidColorBrushVtbl d2d_solid_color_brush_vtbl = +{ + d2d_solid_color_brush_QueryInterface, + d2d_solid_color_brush_AddRef, + d2d_solid_color_brush_Release, + d2d_solid_color_brush_GetFactory, + d2d_solid_color_brush_SetOpacity, + d2d_solid_color_brush_SetTransform, + d2d_solid_color_brush_GetOpacity, + d2d_solid_color_brush_GetTransform, + d2d_solid_color_brush_SetColor, + d2d_solid_color_brush_GetColor, +}; + +void d2d_solid_color_brush_init(struct d2d_brush *brush, ID2D1RenderTarget *render_target, + const D2D1_COLOR_F *color, const D2D1_BRUSH_PROPERTIES *desc) +{ + FIXME("Ignoring brush properties.\n"); + + brush->ID2D1Brush_iface.lpVtbl = (ID2D1BrushVtbl *)&d2d_solid_color_brush_vtbl; + brush->refcount = 1; +} diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 5609db6..9e91728 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -33,4 +33,13 @@ struct d2d_d3d_render_target void d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, ID2D1Factory *factory, IDXGISurface *surface, const D2D1_RENDER_TARGET_PROPERTIES *desc) DECLSPEC_HIDDEN; +struct d2d_brush +{ + ID2D1Brush ID2D1Brush_iface; + LONG refcount; +}; + +void d2d_solid_color_brush_init(struct d2d_brush *brush, ID2D1RenderTarget *render_target, + const D2D1_COLOR_F *color, const D2D1_BRUSH_PROPERTIES *desc) DECLSPEC_HIDDEN; + #endif /* __WINE_D2D1_PRIVATE_H */ diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index be9c1b6..e8c56a0 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -117,9 +117,19 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateBitmapBrush(ID2D1Re static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateSolidColorBrush(ID2D1RenderTarget *iface, const D2D1_COLOR_F *color, const D2D1_BRUSH_PROPERTIES *desc, ID2D1SolidColorBrush **brush) { - FIXME("iface %p, color %p, desc %p, brush %p stub!\n", iface, color, desc, brush); + struct d2d_brush *object; - return E_NOTIMPL; + TRACE("iface %p, color %p, desc %p, brush %p.\n", iface, color, desc, brush); + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + d2d_solid_color_brush_init(object, iface, color, desc); + + TRACE("Created brush %p.\n", object); + *brush = (ID2D1SolidColorBrush *)&object->ID2D1Brush_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateGradientStopCollection(ID2D1RenderTarget *iface,

1 0

Alex Henrie : riched20: Consider adjacent runs when computing EN_LINK range.
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: wine Branch: master Commit: 6b947701a763ba7fe141ffa2a080d4c04cd6a15a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b947701a763ba7fe141ffa2a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jun 15 23:15:43 2014 -0600 riched20: Consider adjacent runs when computing EN_LINK range. --- dlls/riched20/editor.c | 21 +++++++++++++++- dlls/riched20/tests/editor.c | 57 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 0127616..2af2582 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3093,6 +3093,8 @@ static void ME_LinkNotify(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM if (cursor.pRun->member.run.style->fmt.dwMask & CFM_LINK && cursor.pRun->member.run.style->fmt.dwEffects & CFE_LINK) { /* The clicked run has CFE_LINK set */ + ME_DisplayItem *di; + info.nmhdr.hwndFrom = NULL; info.nmhdr.idFrom = 0; info.nmhdr.code = EN_LINK; @@ -3100,8 +3102,25 @@ static void ME_LinkNotify(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM info.wParam = wParam; info.lParam = lParam; cursor.nOffset = 0; + + /* find the first contiguous run with CFE_LINK set */ info.chrg.cpMin = ME_GetCursorOfs(&cursor); - info.chrg.cpMax = info.chrg.cpMin + cursor.pRun->member.run.len; + for (di = cursor.pRun->prev; + di && di->type == diRun && (di->member.run.style->fmt.dwMask & CFM_LINK) && (di->member.run.style->fmt.dwEffects & CFE_LINK); + di = di->prev) + { + info.chrg.cpMin -= di->member.run.len; + } + + /* find the last contiguous run with CFE_LINK set */ + info.chrg.cpMax = ME_GetCursorOfs(&cursor) + cursor.pRun->member.run.len; + for (di = cursor.pRun->next; + di && di->type == diRun && (di->member.run.style->fmt.dwMask & CFM_LINK) && (di->member.run.style->fmt.dwEffects & CFE_LINK); + di = di->next) + { + info.chrg.cpMax += di->member.run.len; + } + ITextHost_TxNotify(editor->texthost, info.nmhdr.code, &info); } } diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 2a85357..5421614 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5937,6 +5937,62 @@ static void test_WM_NOTIFY(void) DestroyWindow(parent); } +static int cpMin_EN_LINK = -1; +static int cpMax_EN_LINK = -1; + +static LRESULT WINAPI EN_LINK_ParentMsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + ENLINK* enlink = (ENLINK*)lParam; + if(message == WM_NOTIFY && enlink->nmhdr.code == EN_LINK) + { + cpMin_EN_LINK = enlink->chrg.cpMin; + cpMax_EN_LINK = enlink->chrg.cpMax; + } + return DefWindowProcA(hwnd, message, wParam, lParam); +} + +static void test_EN_LINK(void) +{ + HWND parent; + WNDCLASSA cls; + HWND hwndRichedit_EN_LINK; + CHARFORMAT2A cf2; + + /* register class to capture WM_NOTIFY */ + cls.style = 0; + cls.lpfnWndProc = EN_LINK_ParentMsgCheckProcA; + 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 = "EN_LINK_ParentClass"; + if(!RegisterClassA(&cls)) assert(0); + + parent = CreateWindowA(cls.lpszClassName, NULL, WS_POPUP|WS_VISIBLE, + 0, 0, 200, 60, NULL, NULL, NULL, NULL); + ok(parent != 0, "Failed to create parent window\n"); + + hwndRichedit_EN_LINK = new_richedit(parent); + ok(hwndRichedit_EN_LINK != 0, "Failed to create edit window\n"); + + SendMessageA(hwndRichedit_EN_LINK, EM_SETEVENTMASK, 0, ENM_LINK); + + cf2.cbSize = sizeof(CHARFORMAT2A); + cf2.dwMask = CFM_LINK; + cf2.dwEffects = CFE_LINK; + SendMessageA(hwndRichedit_EN_LINK, EM_SETCHARFORMAT, 0, (LPARAM)&cf2); + /* mixing letters and numbers causes runs to be split */ + SendMessageA(hwndRichedit_EN_LINK, WM_SETTEXT, 0, (LPARAM)"link text with at least 2 runs"); + SendMessageA(hwndRichedit_EN_LINK, WM_LBUTTONDOWN, 0, MAKELPARAM(5, 5)); + ok(cpMin_EN_LINK == 0 && cpMax_EN_LINK == 31, "Expected link range [0,31) got [%i,%i)\n", cpMin_EN_LINK, cpMax_EN_LINK); + + DestroyWindow(hwndRichedit_EN_LINK); + DestroyWindow(parent); +} + static void test_undo_coalescing(void) { HWND hwnd; @@ -7565,6 +7621,7 @@ START_TEST( editor ) test_EM_REPLACESEL(1); test_EM_REPLACESEL(0); test_WM_NOTIFY(); + test_EN_LINK(); test_EM_AUTOURLDETECT(); test_eventMask(); test_undo_coalescing();

1 0

Bruno Jesus : winhttp: Use a helper to receive data and take care of EINTR.
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: wine Branch: master Commit: 53f8d78e575b20cacdcfccc304388e12c2f94fe3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53f8d78e575b20cacdcfccc30… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Jun 15 21:16:41 2014 -0300 winhttp: Use a helper to receive data and take care of EINTR. --- dlls/winhttp/net.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index c7ff035..b77c706 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -150,6 +150,17 @@ static int sock_send(int fd, const void *msg, size_t len, int flags) return ret; } +static int sock_recv(int fd, void *msg, size_t len, int flags) +{ + int ret; + do + { + ret = recv(fd, msg, len, flags); + } + while(ret == -1 && errno == EINTR); + return ret; +} + static DWORD netconn_verify_cert( PCCERT_CONTEXT cert, WCHAR *server, DWORD security_flags ) { HCERTSTORE store = cert->hCertStore; @@ -453,7 +464,7 @@ BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname ) read_buf_size += 1024; } - size = recv(conn->socket, read_buf+in_bufs[0].cbBuffer, read_buf_size-in_bufs[0].cbBuffer, 0); + size = sock_recv(conn->socket, read_buf+in_bufs[0].cbBuffer, read_buf_size-in_bufs[0].cbBuffer, 0); if(size < 1) { WARN("recv error\n"); status = ERROR_WINHTTP_SECURE_CHANNEL_ERROR; @@ -591,7 +602,7 @@ static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, SIZE_T * heap_free(conn->extra_buf); conn->extra_buf = NULL; }else { - buf_len = recv(conn->socket, conn->ssl_buf+conn->extra_len, ssl_buf_size-conn->extra_len, 0); + buf_len = sock_recv(conn->socket, conn->ssl_buf+conn->extra_len, ssl_buf_size-conn->extra_len, 0); if(buf_len < 0) { WARN("recv failed\n"); return FALSE; @@ -623,7 +634,7 @@ static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, SIZE_T * case SEC_E_INCOMPLETE_MESSAGE: assert(buf_len < ssl_buf_size); - size = recv(conn->socket, conn->ssl_buf+buf_len, ssl_buf_size-buf_len, 0); + size = sock_recv(conn->socket, conn->ssl_buf+buf_len, ssl_buf_size-buf_len, 0); if(size < 1) return FALSE; @@ -716,7 +727,7 @@ BOOL netconn_recv( netconn_t *conn, void *buf, size_t len, int flags, int *recvd *recvd = size; return TRUE; } - if ((*recvd = recv( conn->socket, buf, len, flags )) == -1) + if ((*recvd = sock_recv( conn->socket, buf, len, flags )) == -1) { set_last_error( sock_get_error( errno ) ); return FALSE;

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: wine Branch: master Commit: c229428a1489d557de11676e63548547944e7fd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c229428a1489d557de11676e6… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Mon Jun 16 21:18:49 2014 +0300 po: Update Lithuanian translation. --- po/lt.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index ed100dc..77da542 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-05-16 08:19+0300\n" +"PO-Revision-Date: 2014-06-16 21:18+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -6593,10 +6593,8 @@ msgid "This network connection does not exist.\n" msgstr "Šis tinklo ryšys neegzistuoja.\n" #: winerror.mc:3746 -#, fuzzy -#| msgid "Connection refused.\n" msgid "Connection reset by peer.\n" -msgstr "Sujungimas nepriimtas.\n" +msgstr "Sujungimas nutrauktas kito serverio.\n" #: localspl.rc:31 localui.rc:31 winspool.rc:30 msgid "Local Port"

1 0

Marcus Meissner : winealsa/wineoss/winecoreaudio: Calculate frequency in 64bit (Coverity).
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: wine Branch: master Commit: eddf841ab3846b65acfe18dcba3b337a13f19f30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eddf841ab3846b65acfe18dcb… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Jun 17 08:30:42 2014 +0200 winealsa/wineoss/winecoreaudio: Calculate frequency in 64bit (Coverity). --- dlls/winealsa.drv/mmdevdrv.c | 2 +- dlls/winecoreaudio.drv/mmdevdrv.c | 2 +- dlls/wineoss.drv/mmdevdrv.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 5e40d6e..7d41110 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -2823,7 +2823,7 @@ static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) TRACE("(%p)->(%p)\n", This, freq); if(This->share == AUDCLNT_SHAREMODE_SHARED) - *freq = This->fmt->nSamplesPerSec * This->fmt->nBlockAlign; + *freq = (UINT64)This->fmt->nSamplesPerSec * This->fmt->nBlockAlign; else *freq = This->fmt->nSamplesPerSec; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 6603075..81816ca 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -2421,7 +2421,7 @@ static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) TRACE("(%p)->(%p)\n", This, freq); if(This->share == AUDCLNT_SHAREMODE_SHARED) - *freq = This->fmt->nSamplesPerSec * This->fmt->nBlockAlign; + *freq = (UINT64)This->fmt->nSamplesPerSec * This->fmt->nBlockAlign; else *freq = This->fmt->nSamplesPerSec; diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index dd45fba..1e0e116 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -2146,7 +2146,7 @@ static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) TRACE("(%p)->(%p)\n", This, freq); if(This->share == AUDCLNT_SHAREMODE_SHARED) - *freq = This->fmt->nSamplesPerSec * This->fmt->nBlockAlign; + *freq = (UINT64)This->fmt->nSamplesPerSec * This->fmt->nBlockAlign; else *freq = This->fmt->nSamplesPerSec;

1 0

Marcus Meissner : mscms: Removed duplicate return ret (Coverity).
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: wine Branch: master Commit: 7ce613c3c2fe1d79e1f91ac3ac3a60bf14017a88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ce613c3c2fe1d79e1f91ac3a… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Jun 17 08:24:56 2014 +0200 mscms: Removed duplicate return ret (Coverity). --- dlls/mscms/profile.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index 6759a96..d6ee715 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -355,8 +355,6 @@ BOOL WINAPI GetColorProfileElement( HPROFILE handle, TAGTYPE type, DWORD offset, ret = get_tag_data( profile, type, offset, buffer, size ); *ref = cmsTagLinkedTo( profile->cmsprofile, type ) != 0; release_profile( profile ); - return ret; - #endif /* HAVE_LCMS2 */ return ret; } @@ -1233,8 +1231,6 @@ BOOL WINAPI SetColorProfileElement( HPROFILE handle, TAGTYPE type, DWORD offset, } ret = set_tag_data( profile, type, offset, buffer, size ); release_profile( profile ); - return ret; - #endif /* HAVE_LCMS2 */ return ret; }

1 0

Marcus Meissner : oleaut32: Avoid buffer overread (Coverity).
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: wine Branch: master Commit: d3d54dfd3c5918c3ce1b892809c968114ab9dc90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3d54dfd3c5918c3ce1b89280… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Jun 17 07:43:25 2014 +0200 oleaut32: Avoid buffer overread (Coverity). --- dlls/oleaut32/variant.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index a52c607..addc5a0 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -84,7 +84,7 @@ const char *debugstr_vt(VARTYPE vt) if(vt & ~VT_TYPEMASK) return wine_dbg_sprintf("%s%s", debugstr_vt(vt&VT_TYPEMASK), variant_flags[vt>>12]); - if(vt <= sizeof(variant_types)/sizeof(*variant_types)) + if(vt < sizeof(variant_types)/sizeof(*variant_types)) return variant_types[vt]; if(vt == VT_BSTR_BLOB)

1 0

Francois Gouget : ole32: Fix StorageImpl_LockRegionSync() to actually wait between locking attempts.
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: wine Branch: master Commit: 809b6aeab2c6cfa4ec2a24137f316353fd28f37d URL: http://source.winehq.org/git/wine.git/?a=commit;h=809b6aeab2c6cfa4ec2a24137… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jun 16 18:23:41 2014 +0200 ole32: Fix StorageImpl_LockRegionSync() to actually wait between locking attempts. --- dlls/ole32/storage32.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 757138d..f425d87 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2874,6 +2874,7 @@ static HRESULT StorageImpl_LockRegionSync(StorageImpl *This, ULARGE_INTEGER offs ULARGE_INTEGER cb, DWORD dwLockType) { HRESULT hr; + int delay = 0; /* if it's a FileLockBytesImpl use LockFileEx in blocking mode */ if (SUCCEEDED(FileLockBytesImpl_LockRegionSync(This->lockBytes, offset, cb))) @@ -2882,8 +2883,6 @@ static HRESULT StorageImpl_LockRegionSync(StorageImpl *This, ULARGE_INTEGER offs /* otherwise we have to fake it based on an async lock */ do { - int delay=0; - hr = ILockBytes_LockRegion(This->lockBytes, offset, cb, dwLockType); if (hr == STG_E_ACCESSDENIED)

1 0

Bruno Jesus : winhttp: Use a helper to send data and take care of EINTR.
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: wine Branch: master Commit: 6db935a6f45391c82437c0892a077b30338f5e52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6db935a6f45391c82437c0892… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Jun 15 21:16:25 2014 -0300 winhttp: Use a helper to send data and take care of EINTR. --- dlls/winhttp/net.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index b751bf0..c7ff035 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -139,6 +139,17 @@ static int sock_get_error( int err ) return err; } +static int sock_send(int fd, const void *msg, size_t len, int flags) +{ + int ret; + do + { + ret = send(fd, msg, len, flags); + } + while(ret == -1 && errno == EINTR); + return ret; +} + static DWORD netconn_verify_cert( PCCERT_CONTEXT cert, WCHAR *server, DWORD security_flags ) { HCERTSTORE store = cert->hCertStore; @@ -403,7 +414,7 @@ BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname ) TRACE("sending %u bytes\n", out_buf.cbBuffer); - size = send(conn->socket, out_buf.pvBuffer, out_buf.cbBuffer, 0); + size = sock_send(conn->socket, out_buf.pvBuffer, out_buf.cbBuffer, 0); if(size != out_buf.cbBuffer) { ERR("send failed\n"); res = ERROR_WINHTTP_SECURE_CHANNEL_ERROR; @@ -524,7 +535,7 @@ static BOOL send_ssl_chunk(netconn_t *conn, const void *msg, size_t size) return FALSE; } - if(send(conn->socket, conn->ssl_buf, bufs[0].cbBuffer+bufs[1].cbBuffer+bufs[2].cbBuffer, 0) < 1) { + if(sock_send(conn->socket, conn->ssl_buf, bufs[0].cbBuffer+bufs[1].cbBuffer+bufs[2].cbBuffer, 0) < 1) { WARN("send failed\n"); return FALSE; } @@ -554,7 +565,7 @@ BOOL netconn_send( netconn_t *conn, const void *msg, size_t len, int *sent ) return TRUE; } - if ((*sent = send( conn->socket, msg, len, 0 )) == -1) + if ((*sent = sock_send( conn->socket, msg, len, 0 )) == -1) { set_last_error( sock_get_error( errno ) ); return FALSE;

1 0

Sebastian Lackner : kernel32: Update VirtualAddress of resource section in write_raw_resources.
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: wine Branch: master Commit: 270d66efc74c11d86ea1c62d289c825a225b1f37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=270d66efc74c11d86ea1c62d2… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jun 15 23:38:38 2014 +0200 kernel32: Update VirtualAddress of resource section in write_raw_resources. --- dlls/kernel32/resource.c | 1 + dlls/kernel32/tests/resource.c | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index e829f28..ecd599f 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -1554,6 +1554,7 @@ static BOOL write_raw_resources( QUEUEDUPDATES *updates ) sec->SizeOfRawData = section_size; sec->Misc.VirtualSize = virtual_section_size; nt->OptionalHeader.SizeOfImage += rva_delta; + nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress = sec->VirtualAddress; nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].Size = res_size.total_size; nt->OptionalHeader.SizeOfInitializedData = get_init_data_size( write_map->base, mapping_size ); } diff --git a/dlls/kernel32/tests/resource.c b/dlls/kernel32/tests/resource.c index f94fed6..43551fa 100644 --- a/dlls/kernel32/tests/resource.c +++ b/dlls/kernel32/tests/resource.c @@ -394,6 +394,7 @@ static void check_exe( const sec_verify *verify ) int i; IMAGE_DOS_HEADER *dos; IMAGE_NT_HEADERS *nt; + IMAGE_OPTIONAL_HEADER *opt; IMAGE_SECTION_HEADER *sec; IMAGE_RESOURCE_DIRECTORY *dir; HANDLE file, mapping; @@ -415,6 +416,7 @@ static void check_exe( const sec_verify *verify ) goto end; nt = (void*) ((BYTE*) dos + dos->e_lfanew); + opt = &nt->OptionalHeader; sec = (void*) &nt[1]; for(i = 0; i < max_sections; i++) @@ -444,6 +446,10 @@ static void check_exe( const sec_verify *verify ) verify->NumberOfNamedEntries, dir->NumberOfNamedEntries); ok( dir->NumberOfIdEntries == verify->NumberOfIdEntries, "NumberOfIdEntries should be %d instead of %d\n", verify->NumberOfIdEntries, dir->NumberOfIdEntries); + + ok(opt->DataDirectory[IMAGE_FILE_RESOURCE_DIRECTORY].VirtualAddress == sec[verify->rsrc_section].VirtualAddress, + "VirtualAddress in optional header should be %d instead of %d\n", + sec[verify->rsrc_section].VirtualAddress, opt->DataDirectory[IMAGE_FILE_RESOURCE_DIRECTORY].VirtualAddress); } end:

1 0

Francois Gouget : testbot/lib: Add a utility function to atomically create a new directory.
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: tools Branch: master Commit: 50f0f9de34bf23fcb256ad32dcf3abbdcf097bec URL: http://source.winehq.org/git/tools.git/?a=commit;h=50f0f9de34bf23fcb256ad32… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 16 16:11:25 2014 +0200 testbot/lib: Add a utility function to atomically create a new directory. It ensures there are no race conditions with other processes and simplifies the calling code. --- testbot/bin/Engine.pl | 14 ++------------ testbot/lib/WineTestBot/Utils.pm | 17 ++++++++++++++++- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 29dc919..75a8851 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -412,12 +412,7 @@ sub HandleWinePatchMLSubmission() my $FullMessageFileName = "$DataDir/staging/$1"; # Create a work directory - my $WorkDir = "$DataDir/staging/" . GenerateRandomString(32) . "_work"; - while (-e $WorkDir) - { - $WorkDir = "$DataDir/staging/" . GenerateRandomString(32) . "_work"; - } - mkdir $WorkDir; + my $WorkDir = CreateNewDir("$DataDir/staging", "_work"); # Process the patch my $Parser = new MIME::Parser; @@ -489,12 +484,7 @@ sub HandleWinePatchWebSubmission() foreach my $WebPatchId (sort { $a <=> $b } @WebPatchIds) { # Create a working dir - my $WorkDir = "$DataDir/staging/" . GenerateRandomString(32) . "_work"; - while (-e $WorkDir) - { - $WorkDir = "$DataDir/staging/" . GenerateRandomString(32) . "_work"; - } - mkdir $WorkDir; + my $WorkDir = CreateNewDir("$DataDir/staging", "_work"); # Process the patch my $Parser = new MIME::Parser; diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index 1cea5d7..743e5ee 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -33,7 +33,8 @@ use vars qw (@ISA @EXPORT); require Exporter; @ISA = qw(Exporter); @EXPORT = qw(&MakeSecureURL &SecureConnection &GenerateRandomString - &OpenNewFile &CreateNewFile &CreateNewLink &BuildEMailRecipient); + &OpenNewFile &CreateNewFile &CreateNewLink &CreateNewDir + &BuildEMailRecipient); sub MakeSecureURL($) { @@ -105,6 +106,20 @@ sub CreateNewLink($$$) } } +sub CreateNewDir($$) +{ + my ($Dir, $Suffix) = @_; + + while (1) + { + my $Path = "$Dir/" . GenerateRandomString(32) . $Suffix; + return $Path if (mkdir $Path); + + # This is not an error that will be fixed by trying a different path + return undef if (!$!{EEXIST}); + } +} + sub DateTimeToString($) { my ($Time) = @_;

1 0

Francois Gouget : testbot/lib: Add a utility function to atomically create a new hardlink.
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: tools Branch: master Commit: d6106d599f6ca314d4f4f8775987079ba9f262f0 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d6106d599f6ca314d4f4f877… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 16 16:11:12 2014 +0200 testbot/lib: Add a utility function to atomically create a new hardlink. It ensures there are no race conditions with other processes and simplifies the calling code. --- testbot/lib/WineTestBot/Patches.pm | 11 ++++------- testbot/lib/WineTestBot/Utils.pm | 16 +++++++++++++++- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index bb7ea3f..98cc6c2 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -33,6 +33,8 @@ linked to this patch through a WineTestBot::PendingPatch object. =cut use Encode qw/decode/; +use File::Basename; + use WineTestBot::Config; use WineTestBot::PendingPatchSets; use WineTestBot::Jobs; @@ -206,13 +208,8 @@ sub Submit my $Steps = $NewJob->Steps; my $NewStep = $Steps->Add(); # Create a link to the patch file in the staging dir - my $FileNameRandomPart = GenerateRandomString(32); - while (-e ("$DataDir/staging/${FileNameRandomPart}_patch.diff")) - { - $FileNameRandomPart = GenerateRandomString(32); - } - link $PatchFileName, "$DataDir/staging/${FileNameRandomPart}_patch.diff"; - $NewStep->FileName($FileNameRandomPart . "_patch.diff"); + my $StagingFileName = CreateNewLink($PatchFileName, "$DataDir/staging", "_patch.diff"); + $NewStep->FileName(basename($StagingFileName)); my @Keys = keys %{$Targets{$BaseName}}; $NewStep->FileType($Targets{$BaseName}{$Keys[0]}); $NewStep->InStaging(1); diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index f05c7dc..1cea5d7 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -33,7 +33,7 @@ use vars qw (@ISA @EXPORT); require Exporter; @ISA = qw(Exporter); @EXPORT = qw(&MakeSecureURL &SecureConnection &GenerateRandomString - &OpenNewFile &CreateNewFile &BuildEMailRecipient); + &OpenNewFile &CreateNewFile &CreateNewLink &BuildEMailRecipient); sub MakeSecureURL($) { @@ -91,6 +91,20 @@ sub CreateNewFile($$) return $FileName; } +sub CreateNewLink($$$) +{ + my ($OldFileName, $Dir, $Suffix) = @_; + + while (1) + { + my $Link = "$Dir/" . GenerateRandomString(32) . $Suffix; + return $Link if (link $OldFileName, $Link); + + # This is not an error that will be fixed by trying a different path + return undef if (!$!{EEXIST}); + } +} + sub DateTimeToString($) { my ($Time) = @_;

1 0

Francois Gouget : testbot/lib: Improve the Collection methods argument handling.
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: tools Branch: master Commit: 96e7f4369df0d967b5c6f0af09dffeb8dc149e9f URL: http://source.winehq.org/git/tools.git/?a=commit;h=96e7f4369df0d967b5c6f0af… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 16 12:18:28 2014 +0200 testbot/lib: Improve the Collection methods argument handling. This standardizes the way we handle the arguments. Make it so one can readily see the list of arguments the method takes without having to hunt down the implementation of all its ancestors. Because these are methods the added prototypes have no effect whatsoever as far as Perl is concerned. However they do document which arguments are optional. --- testbot/lib/ObjectModel/Collection.pm | 131 ++++++++++++++++++--------------- testbot/lib/ObjectModel/Item.pm | 92 +++++++++++------------ 2 files changed, 114 insertions(+), 109 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=96e7f4369df0d967b5c6…

1 0

Francois Gouget : testbot/lib: Add utility functions to atomically create new files.
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: tools Branch: master Commit: e803a3fa8270cb2eff0f2be5844ee263d66b62db URL: http://source.winehq.org/git/tools.git/?a=commit;h=e803a3fa8270cb2eff0f2be5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 16 16:10:48 2014 +0200 testbot/lib: Add utility functions to atomically create new files. These ensure there are no race conditions with other processes. They also simplify the calling code. --- testbot/bin/CheckForWinetestUpdate.pl | 36 ++++++++++++--------------- testbot/bin/WinePatchesMLSubmit.pl | 14 ++++++----- testbot/lib/WineTestBot/PendingPatchSets.pm | 27 ++++++-------------- testbot/lib/WineTestBot/Utils.pm | 28 ++++++++++++++++++++- testbot/web/Submit.pl | 17 ++++++------- 5 files changed, 65 insertions(+), 57 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 17b75d0..3bedd88 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -38,6 +38,7 @@ sub BEGIN } use Fcntl; +use File::Basename; use File::Compare; use File::Copy; use LWP::UserAgent; @@ -65,17 +66,20 @@ sub AddJob($$$) my ($BaseJob, $LatestBaseName, $Bits) = @_; # Create a copy in staging so it can then be moved into the job directory - my $FileNameRandomPart = GenerateRandomString(32); - while (-e "$DataDir/staging/${FileNameRandomPart}_$LatestBaseName") + my ($fh, $StagingFileName) = OpenNewFile("$DataDir/staging", "_$LatestBaseName"); + if (!$fh) { - $FileNameRandomPart = GenerateRandomString(32); + LogMsg "Could not create the staging file: $!\n"; + return 0; } - my $StagingFileName = "$DataDir/staging/${FileNameRandomPart}_$LatestBaseName"; - if (!copy("$DataDir/latest/$LatestBaseName", $StagingFileName)) + if (!copy("$DataDir/latest/$LatestBaseName", $fh)) { LogMsg "Could not copy '$DataDir/latest/$LatestBaseName' to '$StagingFileName': $!\n"; + close($fh); + unlink($StagingFileName); return 0; } + close($fh); # First create a new job my $Jobs = CreateJobs(); @@ -91,7 +95,7 @@ sub AddJob($$$) my $NewStep = $Steps->Add(); my $BitsSuffix = ($Bits == 64 ? "64" : ""); $NewStep->Type("suite"); - $NewStep->FileName("${FileNameRandomPart}_$LatestBaseName"); + $NewStep->FileName(basename($StagingFileName)); $NewStep->FileType($Bits == 64 ? "exe64" : "exe32"); $NewStep->InStaging(1); @@ -219,24 +223,16 @@ if ($Response->code != RC_OK) # put it in the jobs directory tree. umask 002; mkdir "$DataDir/staging"; -my $FileNameRandomPart = GenerateRandomString(32); -while (-e "$DataDir/staging/${FileNameRandomPart}_winetest${BitsSuffix}-latest.exe") +my ($fh, $StagingFileName) = OpenNewFile("$DataDir/staging", "_$LatestBaseName"); +if (!$fh) { - $FileNameRandomPart = GenerateRandomString(32); + LogMsg "Could not create staging file: $!\n"; + exit 1; } -my $StagingFileName = "$DataDir/staging/${FileNameRandomPart}_winetest${BitsSuffix}-latest.exe"; +print $fh $Response->decoded_content(); +close($fh); my $NewFile = 1; -if (open(my $fh, ">", $StagingFileName)) -{ - print $fh $Response->decoded_content(); - close($fh); -} -else -{ - LogMsg "Could not create staging file '$StagingFileName': $!\n"; - exit 1; -} if (-r $LatestFileName) { $NewFile = compare($StagingFileName, $LatestFileName) != 0; diff --git a/testbot/bin/WinePatchesMLSubmit.pl b/testbot/bin/WinePatchesMLSubmit.pl index e904bbc..359e4c0 100755 --- a/testbot/bin/WinePatchesMLSubmit.pl +++ b/testbot/bin/WinePatchesMLSubmit.pl @@ -44,17 +44,19 @@ use WineTestBot::Engine::Notify; use WineTestBot::Log; # Store the message in the staging dir -my $FileName = GenerateRandomString(32) . "_wine-patches"; -while (-e ("$DataDir/staging/$FileName")) +my ($fh, $FileName) = OpenNewFile("$DataDir/staging", "_wine-patches"); +if (!$fh) { - $FileName = GenerateRandomString(32); + LogMsg "Could not create a staging file: $!\n"; + exit 1; } -if (!copy(\*STDIN, "$DataDir/staging/$FileName")) +if (!copy(\*STDIN, $fh)) { - LogMsg "Unable to copy the email to '$FileName': $!\n"; + LogMsg "Could not copy the email to '$FileName': $!\n"; + close($fh); exit 1; } - +close($fh); # Notify the Engine of the new message my $ErrMessage = WinePatchMLSubmission(); diff --git a/testbot/lib/WineTestBot/PendingPatchSets.pm b/testbot/lib/WineTestBot/PendingPatchSets.pm index 4f908b5..7a837db 100644 --- a/testbot/lib/WineTestBot/PendingPatchSets.pm +++ b/testbot/lib/WineTestBot/PendingPatchSets.pm @@ -107,34 +107,21 @@ sub SubmitSubset my $self = shift; my ($MaxPart, $FinalPatch) = @_; - my $CombinedFileName = "$DataDir/staging/" . GenerateRandomString(32) . - "_patch"; - while (-e $CombinedFileName) - { - $CombinedFileName = "$DataDir/staging/" . GenerateRandomString(32) . - "_patch"; - } - - if (! open(COMBINED, ">$CombinedFileName")) - { - return "Can't create combined patch file"; - } + my ($CombinedFile, $CombinedFileName) = OpenNewFile("$DataDir/staging", "_patch"); + return "Could not create a combined patch file: $!" if (!$CombinedFile); my $Parts = $self->Parts; for (my $PartNo = 1; $PartNo <= $MaxPart; $PartNo++) { my $Part = $Parts->GetItem($PartNo); - if (defined($Part)) + if (defined $Part and + open(my $PartFile, "<" , "$DataDir/patches/" . $Part->Patch->Id)) { - if (open(PART, "<$DataDir/patches/" . $Part->Patch->Id)) - { - print COMBINED <PART>; - close(PART); - } + map { print $CombinedFile $_; } <$PartFile>; + close($PartFile); } } - - close(COMBINED); + close($CombinedFile); my $ErrMessage = $FinalPatch->Submit($CombinedFileName, 1); unlink($CombinedFileName); diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index 1084abd..f05c7dc 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -24,6 +24,8 @@ WineTestBot::Utils - Utility functions =cut +use Fcntl; + use WineTestBot::Config; use vars qw (@ISA @EXPORT); @@ -31,7 +33,7 @@ use vars qw (@ISA @EXPORT); require Exporter; @ISA = qw(Exporter); @EXPORT = qw(&MakeSecureURL &SecureConnection &GenerateRandomString - &BuildEMailRecipient); + &OpenNewFile &CreateNewFile &BuildEMailRecipient); sub MakeSecureURL($) { @@ -65,6 +67,30 @@ sub GenerateRandomString($) return substr($RandomString, 0, $Len); } +sub OpenNewFile($$) +{ + my ($Dir, $Suffix) = @_; + + while (1) + { + my $fh; + my $FileName = "$Dir/" . GenerateRandomString(32) . $Suffix; + return ($fh, $FileName) if (sysopen($fh, $FileName, O_CREAT | O_EXCL | O_WRONLY)); + + # This is not an error that will be fixed by trying a different filename + return (undef, undef) if (!$!{EEXIST}); + } +} + +sub CreateNewFile($$) +{ + my ($Dir, $Suffix) = @_; + + my ($fh, $FileName) = OpenNewFile($Dir, $Suffix); + close($fh) if ($fh); + return $FileName; +} + sub DateTimeToString($) { my ($Time) = @_; diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index c760446..823be4b 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -792,20 +792,17 @@ sub OnSubmit($) # it so it does not get overwritten if the user submits another one before # the Engine gets around to doing so. my $BaseName = $self->GetParam("FileName"); - my $FileNameRandomPart = GenerateRandomString(32); - while (-e "$DataDir/staging/${FileNameRandomPart}_$BaseName") - { - $FileNameRandomPart = GenerateRandomString(32); - } - my $StagingFileName = "${FileNameRandomPart}_$BaseName"; + my $StagingFileName = CreateNewFile("$DataDir/staging", "_$BaseName"); my $TmpStagingFullPath = $self->GetTmpStagingFullPath($BaseName); - if (!rename($TmpStagingFullPath, "$DataDir/staging/$StagingFileName")) + if ($StagingFileName and !rename($TmpStagingFullPath, $StagingFileName)) { - # Use the existing staging file and hope for the best. - $self->{ErrMessage} = "Could not rename '$TmpStagingFullPath' to '$DataDir/staging/$StagingFileName': $!"; - $StagingFileName = basename($TmpStagingFullPath); + $self->{ErrMessage} = "Could not rename '$TmpStagingFullPath' to '$StagingFileName': $!\n"; + unlink($StagingFileName); + $StagingFileName = undef; } + # If needed fall back to the existing staging file and hope for the best. + $StagingFileName = basename($StagingFileName || $TmpStagingFullPath); # See also Patches::Submit() in lib/WineTestBot/Patches.pm

1 0

Francois Gouget : testbot/WineRunTask: Standardize handling of WineRunTask 's arguments and add prototypes.
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: tools Branch: master Commit: 12189400e6a39e8cef0dd21443a51b7fabdd9bb8 URL: http://source.winehq.org/git/tools.git/?a=commit;h=12189400e6a39e8cef0dd214… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 16 12:18:19 2014 +0200 testbot/WineRunTask: Standardize handling of WineRunTask's arguments and add prototypes. The prototypes let Perl detect when the wrong number of parameters is passed to these functions. The prototypes also document which arguments are optional. --- testbot/bin/WineRunTask.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 2413a76..86073e6 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -88,7 +88,7 @@ sub FatalError($$$$$) exit 1; } -sub TakeScreenshot +sub TakeScreenshot($$) { my ($VM, $FullScreenshotFileName) = @_; @@ -111,9 +111,9 @@ sub TakeScreenshot } } -sub CountFailures +sub CountFailures($) { - my $ReportFileName = $_[0]; + my ($ReportFileName) = @_; if (! open REPORTFILE, "<$ReportFileName") {

1 0

Akihiro Sagawa : winmm: Memory file buffer is available even if we just allocate memory.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: c4629e5af549e7e30a8573b00d9e420f86e33e47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4629e5af549e7e30a8573b00… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Jun 16 22:48:23 2014 +0900 winmm: Memory file buffer is available even if we just allocate memory. --- dlls/winmm/mmio.c | 5 +---- dlls/winmm/tests/mmio.c | 20 ++++---------------- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index c8f3745..8521b87 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -574,7 +574,7 @@ static MMRESULT MMIO_SetBuffer(WINE_MMIO* wm, void* pchBuffer, LONG cchBuffer, wm->info.pchEndRead = wm->info.pchBuffer; wm->info.pchEndWrite = wm->info.pchBuffer + cchBuffer; wm->info.lBufOffset = wm->info.lDiskOffset; - wm->bBufferLoaded = FALSE; + wm->bBufferLoaded = (wm->info.fccIOProc == FOURCC_MEM); return MMSYSERR_NOERROR; } @@ -660,9 +660,6 @@ static HMMIO MMIO_Open(LPSTR szFileName, MMIOINFO* refmminfo, DWORD dwOpenFlags, goto error1; } - if (wm->info.fccIOProc == FOURCC_MEM && !(wm->info.dwFlags & MMIO_ALLOCBUF)) - wm->bBufferLoaded = TRUE; - /* see mmioDosIOProc for that one */ memcpy( wm->info.adwInfo, refmminfo->adwInfo, sizeof(wm->info.adwInfo) ); diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index 0853b8f..71efc5d 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -347,10 +347,7 @@ static void test_mmioOpen(char *fname) ok(mmio.lDiskOffset == 0, "expected 0, got %d\n", mmio.lDiskOffset); ret = mmioSeek(hmmio, 0, SEEK_CUR); - if (fname) - ok(ret == 0, "expected 0, got %d\n", ret); - else - todo_wine ok(ret == 0, "expected 0, got %d\n", ret); + ok(ret == 0, "expected 0, got %d\n", ret); mmioClose(hmmio, 0); @@ -408,10 +405,7 @@ static void test_mmioOpen(char *fname) ok(mmio.lDiskOffset == 0, "expected 0, got %d\n", mmio.lDiskOffset); ret = mmioSeek(hmmio, 0, SEEK_CUR); - if (fname) - ok(ret == 0, "expected 0, got %d\n", ret); - else - todo_wine ok(ret == 0, "expected 0, got %d\n", ret); + ok(ret == 0, "expected 0, got %d\n", ret); mmioClose(hmmio, 0); @@ -440,10 +434,7 @@ static void test_mmioOpen(char *fname) ok(mmio.lDiskOffset == 0, "expected 0, got %d\n", mmio.lDiskOffset); ret = mmioSeek(hmmio, 0, SEEK_CUR); - if (fname) - ok(ret == 0, "expected 0, got %d\n", ret); - else - todo_wine ok(ret == 0, "expected 0, got %d\n", ret); + ok(ret == 0, "expected 0, got %d\n", ret); mmioClose(hmmio, 0); @@ -607,10 +598,7 @@ static void test_mmioSetBuffer(char *fname) ok(mmio.lDiskOffset == 0, "expected 0, got %d\n", mmio.lDiskOffset); ret = mmioSeek(hmmio, 0, SEEK_CUR); - if (fname) - ok(ret == 0, "expected 0, got %d\n", ret); - else - todo_wine ok(ret == 0, "expected 0, got %d\n", ret); + ok(ret == 0, "expected 0, got %d\n", ret); mmioClose(hmmio, 0); }

1 0

Akihiro Sagawa : winmm/tests: Activate some mmioSeek tests with todo_wine keyword.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: 09a1f81cb4edfda01fdbc2367d37adfd902f7983 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09a1f81cb4edfda01fdbc2367… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Jun 16 22:48:21 2014 +0900 winmm/tests: Activate some mmioSeek tests with todo_wine keyword. --- dlls/winmm/tests/mmio.c | 59 ++++++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 31 deletions(-) diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index 05e8952..0853b8f 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -314,10 +314,11 @@ static void test_mmioOpen(char *fname) ok(mmio.lBufOffset == 0, "expected 0, got %d\n", mmio.lBufOffset); ok(mmio.lDiskOffset == 0, "expected 0, got %d\n", mmio.lDiskOffset); -#if 0 /* remove once passes under Wine */ ret = mmioSeek(hmmio, 0, SEEK_CUR); - ok(ret == 0, "expected 0, got %d\n", ret); -#endif + if (fname) + ok(ret == 0, "expected 0, got %d\n", ret); + else + todo_wine ok(ret == 0, "expected 0, got %d\n", ret); mmioClose(hmmio, 0); @@ -345,10 +346,11 @@ static void test_mmioOpen(char *fname) ok(mmio.lBufOffset == 0, "expected 0, got %d\n", mmio.lBufOffset); ok(mmio.lDiskOffset == 0, "expected 0, got %d\n", mmio.lDiskOffset); -#if 0 /* remove once passes under Wine */ ret = mmioSeek(hmmio, 0, SEEK_CUR); - ok(ret == 0, "expected 0, got %d\n", ret); -#endif + if (fname) + ok(ret == 0, "expected 0, got %d\n", ret); + else + todo_wine ok(ret == 0, "expected 0, got %d\n", ret); mmioClose(hmmio, 0); @@ -405,10 +407,11 @@ static void test_mmioOpen(char *fname) ok(mmio.lBufOffset == 0, "expected 0, got %d\n", mmio.lBufOffset); ok(mmio.lDiskOffset == 0, "expected 0, got %d\n", mmio.lDiskOffset); -#if 0 /* remove once passes under Wine */ ret = mmioSeek(hmmio, 0, SEEK_CUR); - ok(ret == 0, "expected 0, got %d\n", ret); -#endif + if (fname) + ok(ret == 0, "expected 0, got %d\n", ret); + else + todo_wine ok(ret == 0, "expected 0, got %d\n", ret); mmioClose(hmmio, 0); @@ -436,10 +439,11 @@ static void test_mmioOpen(char *fname) ok(mmio.lBufOffset == 0, "expected 0, got %d\n", mmio.lBufOffset); ok(mmio.lDiskOffset == 0, "expected 0, got %d\n", mmio.lDiskOffset); -#if 0 /* remove once passes under Wine */ ret = mmioSeek(hmmio, 0, SEEK_CUR); - ok(ret == 0, "expected 0, got %d\n", ret); -#endif + if (fname) + ok(ret == 0, "expected 0, got %d\n", ret); + else + todo_wine ok(ret == 0, "expected 0, got %d\n", ret); mmioClose(hmmio, 0); @@ -532,15 +536,14 @@ static void test_mmioSetBuffer(char *fname) ok(mmio.pchNext == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchNext); ok(mmio.pchEndRead == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchEndRead); ok(mmio.pchEndWrite == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchEndWrite); -#if 0 /* remove once passes under Wine */ ok(mmio.lBufOffset == 0, "expected 0, got %d\n", mmio.lBufOffset); ok(mmio.lDiskOffset == 0, "expected 0, got %d\n", mmio.lDiskOffset); -#endif -#if 0 /* remove once passes under Wine */ ret = mmioSeek(hmmio, 0, SEEK_CUR); - ok(ret == 0, "expected 0, got %d\n", ret); -#endif + if (fname) + ok(ret == 0, "expected 0, got %d\n", ret); + else + todo_wine ok(ret == 0, "expected 0, got %d\n", ret); ret = mmioSetBuffer(hmmio, NULL, 0, MMIO_ALLOCBUF); ok(ret == MMSYSERR_NOERROR, "mmioSetBuffer error %u\n", ret); @@ -556,15 +559,14 @@ static void test_mmioSetBuffer(char *fname) ok(mmio.pchNext == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchNext); ok(mmio.pchEndRead == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchEndRead); ok(mmio.pchEndWrite == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchEndWrite); -#if 0 /* remove once passes under Wine */ ok(mmio.lBufOffset == 0, "expected 0, got %d\n", mmio.lBufOffset); ok(mmio.lDiskOffset == 0, "expected 0, got %d\n", mmio.lDiskOffset); -#endif -#if 0 /* remove once passes under Wine */ ret = mmioSeek(hmmio, 0, SEEK_CUR); - ok(ret == 0, "expected 0, got %d\n", ret); -#endif + if (fname) + ok(ret == 0, "expected 0, got %d\n", ret); + else + todo_wine ok(ret == 0, "expected 0, got %d\n", ret); ret = mmioSetBuffer(hmmio, buf, 0, MMIO_ALLOCBUF); ok(ret == MMSYSERR_NOERROR, "mmioSetBuffer error %u\n", ret); @@ -580,15 +582,11 @@ static void test_mmioSetBuffer(char *fname) ok(mmio.pchNext == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchNext); ok(mmio.pchEndRead == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchEndRead); ok(mmio.pchEndWrite == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchEndWrite); -#if 0 /* remove once passes under Wine */ ok(mmio.lBufOffset == 0, "expected 0, got %d\n", mmio.lBufOffset); ok(mmio.lDiskOffset == 0, "expected 0, got %d\n", mmio.lDiskOffset); -#endif -#if 0 /* remove once passes under Wine */ ret = mmioSeek(hmmio, 0, SEEK_CUR); ok(ret == 0, "expected 0, got %d\n", ret); -#endif ret = mmioSetBuffer(hmmio, NULL, 256, MMIO_WRITE|MMIO_ALLOCBUF); ok(ret == MMSYSERR_NOERROR, "mmioSetBuffer error %u\n", ret); @@ -605,15 +603,14 @@ static void test_mmioSetBuffer(char *fname) ok(mmio.pchNext == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchNext); ok(mmio.pchEndRead == mmio.pchBuffer, "expected %p, got %p\n", buf, mmio.pchEndRead); ok(mmio.pchEndWrite == mmio.pchBuffer + mmio.cchBuffer, "expected %p + %d, got %p\n", mmio.pchBuffer, mmio.cchBuffer, mmio.pchEndWrite); -#if 0 /* remove once passes under Wine */ ok(mmio.lBufOffset == 0, "expected 0, got %d\n", mmio.lBufOffset); ok(mmio.lDiskOffset == 0, "expected 0, got %d\n", mmio.lDiskOffset); -#endif -#if 0 /* remove once passes under Wine */ ret = mmioSeek(hmmio, 0, SEEK_CUR); - ok(ret == 0, "expected 0, got %d\n", ret); -#endif + if (fname) + ok(ret == 0, "expected 0, got %d\n", ret); + else + todo_wine ok(ret == 0, "expected 0, got %d\n", ret); mmioClose(hmmio, 0); }

1 0

Shuai Meng : vbscript: Implemented CSng.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: d8135b8243e72a6a1d5db3aac742fe20996baf1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8135b8243e72a6a1d5db3aac… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Fri Jun 13 22:30:29 2014 +0800 vbscript: Implemented CSng. --- dlls/vbscript/global.c | 19 +++++++++++++++-- dlls/vbscript/tests/api.vbs | 48 +++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/tests/run.c | 2 ++ 3 files changed, 67 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 294004b..5160374 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -514,8 +514,23 @@ static HRESULT Global_CDbl(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI static HRESULT Global_CSng(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + + TRACE("%s\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + V_VT(&v) = VT_EMPTY; + hres = VariantChangeType(&v, arg, 0, VT_R4); + if(FAILED(hres)) + return hres; + + if(!res) + return DISP_E_BADVARTYPE; + + *res = v; + return S_OK; } static HRESULT Global_CStr(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 2aad761..2cf9bb7 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -797,4 +797,52 @@ MyObject.myval = 1.5 Call ok(CInt(MyObject) = 2, "CInt(MyObject) = " & CInt(MyObject)) Call ok(getVT(CInt(MyObject)) = "VT_I2", "getVT(CInt(MyObject)) = " & getVT(CInt(MyObject))) +Sub testCSngError(strings, error_num1, error_num2) + on error resume next + Dim x + + Call Err.clear() + x = CSng(strings) + Call ok(Err.number = error_num1, "Err.number = " & Err.number) + + Call Err.clear() + Call CSng(strings) + Call ok(Err.number = error_num2, "Err.number = " & Err.number) +End Sub + +Call ok(CSng(Empty) = 0, "CSng(Empty) = " & CSng(Empty)) +Call ok(getVT(CSng(Empty)) = "VT_R4", "getVT(CSng(Empty)) = " & getVT(CSng(Empty))) +Call ok(CSng(CByte(0)) = 0, "CSng(CByte(0)) = " & CSng(CByte(0))) +Call ok(getVT(CSng(CCur(0))) = "VT_R4", "getVT(CSng(CCur(0))) = " & getVT(CSng(CCur(0)))) +Call ok(CSng(CCur(0)) = 0, "CSng(CCur(0)) = " & CSng(CCur(0))) +Call ok(getVT(CSng(CCur(0))) = "VT_R4", "getVT(CSng(CCur(0))) = " & getVT(CSng(CCur(0)))) +Call ok(CSng(0) = 0, "CSng(0) = " & CSng(0)) +Call ok(getVT(CSng(0)) = "VT_R4", "getVT(CSng(0)) = " & getVT(CSng(0))) +Call ok(CSng(32768) = 32768, "CSng(32768) = " & CSng(32768)) +Call ok(getVT(CSng(32768)) = "VT_R4", "getVT(CSng(32768)) = " & getVT(CSng(32768))) +Call ok(CSng(0.001 * 0.001) = 0.000001, "CSng(0.001 * 0.001) = " & CSng(0.001 * 0.001)) +Call ok(getVT(CSng(0.001 * 0.001)) = "VT_R4", "getVT(CSng(0.001 * 0.001)) = " & getVT(CSng(0.001 * 0.001))) +Call ok(CSng("-1") = -1, "CSng(""-1"") = " & CSng("-1")) +Call ok(getVT(CSng("-1")) = "VT_R4", "getVT(CSng(""-1"")) = " & getVT(CSng("-1"))) +If isEnglishLang Then + Call ok(CSng("-0.5") = -0.5, "CSng(""-0.5"") = " & CSng("-0.5")) + Call ok(getVT(CSng("-0.5")) = "VT_R4", "getVT(CSng(""-0.5"")) = " & getVT(CSng("-0.5"))) +End If +Call testCSngError("", 13, 13) +Call testCSngError("TRUE", 13, 13) +Call testCSngError("FALSE", 13, 13) +Call testCSngError("#TRue#", 13, 13) +Call testCSngError("#fAlSE#", 13, 13) +Call testCSngError(1, 0, 458) +Call ok(CSng(True) = -1, "CSng(True) = " & CSng(True)) +Call ok(getVT(CSng(True)) = "VT_R4", "getVT(CSng(True)) = " & getVT(CSng(True))) +Call ok(CSng(False) = 0, "CSng(False) = " & CSng(False)) +Call ok(getVT(CSng(False)) = "VT_R4", "getVT(CSng(False)) = " & getVT(CSng(False))) +MyObject.myval = 0.1 +Call ok(CSng(MyObject) = 0.1, "CSng(MyObject) = " & CSng(MyObject)) +Call ok(getVT(CSng(MyObject)) = "VT_R4", "getVT(CSng(MyObject)) = " & getVT(CSng(MyObject))) +MyObject.myval = 0 +Call ok(CSng(MyObject) = 0, "CSng(MyObject) = " & CSng(MyObject)) +Call ok(getVT(CSng(MyObject)) = "VT_R4", "getVT(CSng(MyObject)) = " & getVT(CSng(MyObject))) + Call reportSuccess() diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 0188c12..56361bf 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -167,6 +167,8 @@ static const char *vt2a(VARIANT *v) return "VT_I2"; case VT_I4: return "VT_I4"; + case VT_R4: + return "VT_R4"; case VT_R8: return "VT_R8"; case VT_CY:

1 0

Matteo Bruni : d3d9/tests: Test GetData behavior with various size values.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: 71628208454d193e9d86713bdf8ddd58c156fc3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=71628208454d193e9d86713bd… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jun 13 15:08:50 2014 +0200 d3d9/tests: Test GetData behavior with various size values. --- dlls/d3d9/tests/device.c | 137 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 110 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=71628208454d193e9d867…

1 0

Bruno Jesus : ws2_32: Don't call WS_EnterSingleProtocol[A|W] on unsupported protocols (valgrind).
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: 6f47a9d9d83ff53d486cf3c163feb7df7f4bfcd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f47a9d9d83ff53d486cf3c16… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Jun 15 18:54:54 2014 -0300 ws2_32: Don't call WS_EnterSingleProtocol[A|W] on unsupported protocols (valgrind). --- dlls/ws2_32/socket.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index e31f396..10857dc 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1822,6 +1822,7 @@ static INT WS_EnumProtocols( BOOL unicode, const INT *protocols, LPWSAPROTOCOL_I for (i = items = 0; protocols[i]; i++) { + if (!supported_protocol(protocols[i])) continue; if (unicode) { if (WS_EnterSingleProtocolW( protocols[i], &info.w[items] ))

1 0

Vincent Povirk : windowscodecs: Support InterlaceOption in PNG encoder.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: 3ccaad8b41fe9514b95aa7610a1b33bb745b3c7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ccaad8b41fe9514b95aa7610… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 28 15:04:00 2014 -0500 windowscodecs: Support InterlaceOption in PNG encoder. --- dlls/windowscodecs/pngformat.c | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index bd5cd3d..6950c07 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -41,6 +41,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); +static const WCHAR wszPngInterlaceOption[] = {'I','n','t','e','r','l','a','c','e','O','p','t','i','o','n',0}; + static HRESULT read_png_chunk(IStream *stream, BYTE *type, BYTE **data, ULONG *data_size) { BYTE header[8]; @@ -1060,6 +1062,7 @@ typedef struct PngEncoder { BOOL frame_committed; BOOL committed; CRITICAL_SECTION lock; + BOOL interlace; } PngEncoder; static inline PngEncoder *impl_from_IWICBitmapEncoder(IWICBitmapEncoder *iface) @@ -1111,8 +1114,32 @@ static HRESULT WINAPI PngFrameEncode_Initialize(IWICBitmapFrameEncode *iface, IPropertyBag2 *pIEncoderOptions) { PngEncoder *This = impl_from_IWICBitmapFrameEncode(iface); + BOOL interlace; + PROPBAG2 opts[1]= {{0}}; + VARIANT opt_values[1]; + HRESULT opt_hres[1]; + HRESULT hr; + TRACE("(%p,%p)\n", iface, pIEncoderOptions); + opts[0].pstrName = (LPOLESTR)wszPngInterlaceOption; + opts[0].vt = VT_BOOL; + + if (pIEncoderOptions) + { + hr = IPropertyBag2_Read(pIEncoderOptions, 1, opts, NULL, opt_values, opt_hres); + + if (FAILED(hr)) + return hr; + } + else + memset(opt_values, sizeof(opt_values), 0); + + if (V_VT(&opt_values[0]) == VT_EMPTY) + interlace = FALSE; + else + interlace = (V_BOOL(&opt_values[0]) != 0); + EnterCriticalSection(&This->lock); if (This->frame_initialized) @@ -1121,6 +1148,8 @@ static HRESULT WINAPI PngFrameEncode_Initialize(IWICBitmapFrameEncode *iface, return WINCODEC_ERR_WRONGSTATE; } + This->interlace = interlace; + This->frame_initialized = TRUE; LeaveCriticalSection(&This->lock); @@ -1259,7 +1288,8 @@ static HRESULT WINAPI PngFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, if (!This->info_written) { ppng_set_IHDR(This->png_ptr, This->info_ptr, This->width, This->height, - This->format->bit_depth, This->format->color_type, PNG_INTERLACE_NONE, + This->format->bit_depth, This->format->color_type, + This->interlace ? PNG_INTERLACE_ADAM7 : PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); if (This->xres != 0.0 && This->yres != 0.0) @@ -1548,6 +1578,8 @@ static HRESULT WINAPI PngEncoder_CreateNewFrame(IWICBitmapEncoder *iface, { PngEncoder *This = impl_from_IWICBitmapEncoder(iface); HRESULT hr; + PROPBAG2 opts[1]= {{0}}; + TRACE("(%p,%p,%p)\n", iface, ppIFrameEncode, ppIEncoderOptions); EnterCriticalSection(&This->lock); @@ -1564,7 +1596,11 @@ static HRESULT WINAPI PngEncoder_CreateNewFrame(IWICBitmapEncoder *iface, return WINCODEC_ERR_NOTINITIALIZED; } - hr = CreatePropertyBag2(NULL, 0, ppIEncoderOptions); + opts[0].pstrName = (LPOLESTR)wszPngInterlaceOption; + opts[0].vt = VT_BOOL; + opts[0].dwType = PROPBAG2_TYPE_DATA; + + hr = CreatePropertyBag2(opts, 1, ppIEncoderOptions); if (FAILED(hr)) { LeaveCriticalSection(&This->lock);

1 0

Akihiro Sagawa : winmm: Fix SEEK_END handling for memory files.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: 8d9a7247c385753559989ae68755c1402824f80c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d9a7247c385753559989ae68… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Jun 16 22:48:28 2014 +0900 winmm: Fix SEEK_END handling for memory files. --- dlls/winmm/mmio.c | 2 +- dlls/winmm/tests/mmio.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index ec282c2..c61c99c 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -896,7 +896,7 @@ LONG WINAPI mmioSeek(HMMIO hmmio, LONG lOffset, INT iOrigin) /* some memory mapped buffers are defined with -1 as a size */ if ((wm->info.cchBuffer > 0) && ((offset < wm->info.lBufOffset) || - (offset >= wm->info.lBufOffset + wm->info.cchBuffer) || + (offset > wm->info.lBufOffset + wm->info.cchBuffer) || (offset > wm->dwFileSize && wm->info.fccIOProc != FOURCC_MEM) || !wm->bBufferLoaded)) { diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index be91b41..5e440b8 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -695,7 +695,16 @@ static void test_mmioSeek(void) if (hmmio != NULL) { /* seek to the end */ end = mmioSeek(hmmio, 0, SEEK_END); - todo_wine ok(end == size, "expected %d, got %d\n", size, end); + ok(end == size, "expected %d, got %d\n", size, end); + + /* test MMIOINFO values */ + res = mmioGetInfo(hmmio, &mmio, 0); + ok(res == MMSYSERR_NOERROR, "expected 0, got %d\n", res); + ok(mmio.pchNext == mmio.pchBuffer + mmio.cchBuffer, "expected %p + %d, got %p\n", mmio.pchBuffer, mmio.cchBuffer, mmio.pchNext); + ok(mmio.pchEndRead == mmio.pchBuffer + mmio.cchBuffer, "expected %p + %d, got %p\n", mmio.pchBuffer, mmio.cchBuffer, mmio.pchEndRead); + ok(mmio.pchEndWrite == mmio.pchBuffer + mmio.cchBuffer, "expected %p + %d, got %p\n", mmio.pchBuffer, mmio.cchBuffer, mmio.pchEndWrite); + ok(mmio.lBufOffset == 0, "expected %d, got %d\n", 0, mmio.lBufOffset); + ok(mmio.lDiskOffset == 0, "expected %d, got %d\n", 0, mmio.lDiskOffset); /* seek backward from the end */ pos = mmioSeek(hmmio, offset, SEEK_END);

1 0

Akihiro Sagawa : winmm: Update lBufOffset after seeking file directly.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: 71b8a56c8413e570ecd382dab3da6b4f8a597d6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=71b8a56c8413e570ecd382dab… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Jun 16 22:48:26 2014 +0900 winmm: Update lBufOffset after seeking file directly. --- dlls/winmm/mmio.c | 8 ++++++-- dlls/winmm/tests/mmio.c | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index c0e9498..ec282c2 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -871,8 +871,12 @@ LONG WINAPI mmioSeek(HMMIO hmmio, LONG lOffset, INT iOrigin) return MMSYSERR_INVALHANDLE; /* not buffered, direct seek on file */ - if (!wm->info.pchBuffer && wm->info.fccIOProc != FOURCC_MEM) - return send_message(wm->ioProc, &wm->info, MMIOM_SEEK, lOffset, iOrigin, FALSE); + if (!wm->info.pchBuffer && wm->info.fccIOProc != FOURCC_MEM) { + LRESULT ret = send_message(wm->ioProc, &wm->info, MMIOM_SEEK, lOffset, iOrigin, FALSE); + if (ret != -1) + wm->info.lBufOffset = wm->info.lDiskOffset; + return ret; + } switch (iOrigin) { case SEEK_SET: diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index e92700f..be91b41 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -725,7 +725,7 @@ static void test_mmioSeek(void) ok(mmio.pchNext == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchNext); ok(mmio.pchEndRead == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchEndRead); ok(mmio.pchEndWrite == mmio.pchBuffer + mmio.cchBuffer, "expected %p + %d, got %p\n", mmio.pchBuffer, mmio.cchBuffer, mmio.pchEndWrite); - todo_wine ok(mmio.lBufOffset == size, "expected %d, got %d\n", size, mmio.lBufOffset); + ok(mmio.lBufOffset == size, "expected %d, got %d\n", size, mmio.lBufOffset); ok(mmio.lDiskOffset == size, "expected %d, got %d\n", size, mmio.lDiskOffset); /* seek backward from the end */

1 0

Akihiro Sagawa : winmm: Avoid direct seeking for memory files.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: f7ddc1eb957c96bb25bba0887e262ed15f0b8747 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7ddc1eb957c96bb25bba0887… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Jun 16 22:48:24 2014 +0900 winmm: Avoid direct seeking for memory files. --- dlls/winmm/mmio.c | 2 +- dlls/winmm/tests/mmio.c | 15 +++------------ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 8521b87..c0e9498 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -871,7 +871,7 @@ LONG WINAPI mmioSeek(HMMIO hmmio, LONG lOffset, INT iOrigin) return MMSYSERR_INVALHANDLE; /* not buffered, direct seek on file */ - if (!wm->info.pchBuffer) + if (!wm->info.pchBuffer && wm->info.fccIOProc != FOURCC_MEM) return send_message(wm->ioProc, &wm->info, MMIOM_SEEK, lOffset, iOrigin, FALSE); switch (iOrigin) { diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index 71efc5d..e92700f 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -315,10 +315,7 @@ static void test_mmioOpen(char *fname) ok(mmio.lDiskOffset == 0, "expected 0, got %d\n", mmio.lDiskOffset); ret = mmioSeek(hmmio, 0, SEEK_CUR); - if (fname) - ok(ret == 0, "expected 0, got %d\n", ret); - else - todo_wine ok(ret == 0, "expected 0, got %d\n", ret); + ok(ret == 0, "expected 0, got %d\n", ret); mmioClose(hmmio, 0); @@ -531,10 +528,7 @@ static void test_mmioSetBuffer(char *fname) ok(mmio.lDiskOffset == 0, "expected 0, got %d\n", mmio.lDiskOffset); ret = mmioSeek(hmmio, 0, SEEK_CUR); - if (fname) - ok(ret == 0, "expected 0, got %d\n", ret); - else - todo_wine ok(ret == 0, "expected 0, got %d\n", ret); + ok(ret == 0, "expected 0, got %d\n", ret); ret = mmioSetBuffer(hmmio, NULL, 0, MMIO_ALLOCBUF); ok(ret == MMSYSERR_NOERROR, "mmioSetBuffer error %u\n", ret); @@ -554,10 +548,7 @@ static void test_mmioSetBuffer(char *fname) ok(mmio.lDiskOffset == 0, "expected 0, got %d\n", mmio.lDiskOffset); ret = mmioSeek(hmmio, 0, SEEK_CUR); - if (fname) - ok(ret == 0, "expected 0, got %d\n", ret); - else - todo_wine ok(ret == 0, "expected 0, got %d\n", ret); + ok(ret == 0, "expected 0, got %d\n", ret); ret = mmioSetBuffer(hmmio, buf, 0, MMIO_ALLOCBUF); ok(ret == MMSYSERR_NOERROR, "mmioSetBuffer error %u\n", ret);

1 0

Henri Verbeet : ddraw/tests: Properly declare matrices.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: 9031adfd5c5b246bc89b1d8f7895c5595fdd05d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9031adfd5c5b246bc89b1d8f7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 16 13:13:24 2014 +0200 ddraw/tests: Properly declare matrices. --- dlls/ddraw/tests/d3d.c | 37 ++++++++++++++------------ dlls/ddraw/tests/visual.c | 63 ++++++++++++++++++++++++--------------------- 2 files changed, 54 insertions(+), 46 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index be87e63..209555a 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -2807,27 +2807,32 @@ static void SetMaterialTest(void) static void ComputeSphereVisibility(void) { - D3DMATRIX proj, view, world; + D3DMATRIX proj = + { + 1.810660f, 0.000000f, 0.000000f, 0.000000f, + 0.000000f, 2.414213f, 0.000000f, 0.000000f, + 0.000000f, 0.000000f, 1.020408f, 1.000000f, + 0.000000f, 0.000000f, -0.102041f, 0.000000f, + }; + D3DMATRIX view = + { + 1.000000f, 0.000000f, 0.000000f, 0.000000f, + 0.000000f, 0.768221f, -0.640185f, 0.000000f, + -0.000000f, 0.640185f, 0.768221f, 0.000000f, + -14.852037f, 9.857489f, 11.600972f, 1.000000f, + }; + D3DMATRIX world = + { + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, + }; D3DVALUE radius[3]; D3DVECTOR center[3]; DWORD result[3]; HRESULT rc; - world._11=1.0; world._12=0.0; world._13=0.0; world._14=0.0; - world._21=0.0; world._22=1.0; world._23=0.0; world._24=0.0; - world._31=0.0; world._32=0.0; world._33=1.0; world._34=0.0; - world._41=0.0; world._42=0.0; world._43=0.0; world._44=1.0; - - view._11=1.000000; view._12=0.000000; view._13=0.000000; view._14=0.000000; - view._21=0.000000; view._22=0.768221; view._23=-0.640185; view._24=0.000000; - view._31=-0.000000; view._32=0.640185; view._33=0.768221; view._34=0.000000; - view._41=-14.852037; view._42=9.857489; view._43=11.600972; view._44=1.000000; - - proj._11=1.810660; proj._12=0.000000; proj._13=0.00000; proj._14=0.000000; - proj._21=0.000000; proj._22=2.414213; proj._23=0.000000, proj._24=0.000000; - proj._31=0.000000; proj._32=0.000000; proj._33=1.020408, proj._34=1.000000; - proj._41=0.000000; proj._42=0.000000; proj._43=-0.102041; proj._44=0.000000; - IDirect3DDevice7_SetTransform(lpD3DDevice, D3DTRANSFORMSTATE_WORLD, &world); IDirect3DDevice7_SetTransform(lpD3DDevice, D3DTRANSFORMSTATE_VIEW , &view); IDirect3DDevice7_SetTransform(lpD3DDevice, D3DTRANSFORMSTATE_PROJECTION, &proj); diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 109c24c..7aaf7cd 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -290,11 +290,13 @@ static void lighting_test(IDirect3DDevice7 *device) DWORD nfvf = D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_NORMAL; DWORD color; - float mat[16] = { 1.0f, 0.0f, 0.0f, 0.0f, - 0.0f, 1.0f, 0.0f, 0.0f, - 0.0f, 0.0f, 1.0f, 0.0f, - 0.0f, 0.0f, 0.0f, 1.0f }; - + D3DMATRIX mat = + { + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, + }; struct vertex unlitquad[] = { {-1.0f, -1.0f, 0.1f, 0xffff0000}, @@ -329,11 +331,11 @@ static void lighting_test(IDirect3DDevice7 *device) ok(hr == D3D_OK, "IDirect3DDevice7_Clear failed with %08x\n", hr); /* Setup some states that may cause issues */ - hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_WORLD, (D3DMATRIX *) mat); + hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_WORLD, &mat); ok(hr == D3D_OK, "IDirect3DDevice7_SetTransform returned %08x\n", hr); - hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_VIEW, (D3DMATRIX *)mat); + hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_VIEW, &mat); ok(hr == D3D_OK, "IDirect3DDevice7_SetTransform returned %08x\n", hr); - hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_PROJECTION, (D3DMATRIX *) mat); + hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_PROJECTION, &mat); ok(hr == D3D_OK, "IDirect3DDevice7_SetTransform returned %08x\n", hr); hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_CLIPPING, FALSE); ok(hr == D3D_OK, "IDirect3DDevice7_SetRenderState returned %08x\n", hr); @@ -491,36 +493,34 @@ static void fog_test(IDirect3DDevice7 *device) {320, 480, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 }, }; WORD Indices[] = {0, 1, 2, 2, 3, 0}; - - float ident_mat[16] = + D3DMATRIX ident_mat = { 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, - 0.0f, 0.0f, 0.0f, 1.0f + 0.0f, 0.0f, 0.0f, 1.0f, }; - float world_mat1[16] = + D3DMATRIX world_mat1 = { 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, - 0.0f, 0.0f, -0.5f, 1.0f + 0.0f, 0.0f, -0.5f, 1.0f, }; - float world_mat2[16] = + D3DMATRIX world_mat2 = { 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, - 0.0f, 0.0f, 1.0f, 1.0f + 0.0f, 0.0f, 1.0f, 1.0f, }; - float proj_mat[16] = + D3DMATRIX proj_mat = { 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, - 0.0f, 0.0f, -1.0f, 1.0f + 0.0f, 0.0f, -1.0f, 1.0f, }; - struct sVertex far_quad1[] = { {-1.0f, -1.0f, 0.5f, 0xffff0000, 0xff000000}, @@ -625,7 +625,7 @@ static void fog_test(IDirect3DDevice7 *device) if (caps.dpcTriCaps.dwRasterCaps & D3DPRASTERCAPS_FOGTABLE) { /* A simple fog + non-identity world matrix test */ - hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_WORLD, (D3DMATRIX *)world_mat1); + hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_WORLD, &world_mat1); ok(hr == D3D_OK, "IDirect3DDevice7_SetTransform returned %#08x\n", hr); hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGTABLEMODE, D3DFOG_LINEAR); @@ -660,9 +660,9 @@ static void fog_test(IDirect3DDevice7 *device) ok(color_match(color, 0x0000ff00, 1), "Fogged out quad has color %08x\n", color); /* Test fog behavior with an orthogonal (but not identity) projection matrix */ - hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_WORLD, (D3DMATRIX *)world_mat2); + hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_WORLD, &world_mat2); ok(hr == D3D_OK, "SetTransform returned %#08x\n", hr); - hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_PROJECTION, (D3DMATRIX *)proj_mat); + hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_PROJECTION, &proj_mat); ok(hr == D3D_OK, "SetTransform returned %#08x\n", hr); hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff00ff, 0.0, 0); @@ -691,9 +691,9 @@ static void fog_test(IDirect3DDevice7 *device) color = getPixelColor(device, 160, 120); ok(color_match(color, 0x0000ff00, 1), "Fogged out quad has color %08x\n", color); - hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_WORLD, (D3DMATRIX *)ident_mat); + hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_WORLD, &ident_mat); ok(hr == D3D_OK, "SetTransform returned %#08x\n", hr); - hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_PROJECTION, (D3DMATRIX *)ident_mat); + hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_PROJECTION, &ident_mat); ok(hr == D3D_OK, "SetTransform returned %#08x\n", hr); } else @@ -2230,10 +2230,13 @@ static void D3D3_ViewportClearTest(void) D3DVIEWPORT2 vp_data; DWORD color, red, green, blue; D3DRECT rect; - float mat[16] = { 1.0f, 0.0f, 0.0f, 0.0f, - 0.0f, 1.0f, 0.0f, 0.0f, - 0.0f, 0.0f, 1.0f, 0.0f, - 0.0f, 0.0f, 0.0f, 1.0f }; + D3DMATRIX mat = + { + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, + }; struct vertex quad[] = { {-1.0f, -1.0f, 0.1f, 0xffffffff}, @@ -2335,11 +2338,11 @@ static void D3D3_ViewportClearTest(void) hr = IDirect3DDevice3_BeginScene(Direct3DDevice3); ok(hr == D3D_OK, "IDirect3DDevice3_BeginScene failed with %08x\n", hr); - hr = IDirect3DDevice3_SetTransform(Direct3DDevice3, D3DTRANSFORMSTATE_WORLD, (D3DMATRIX *) mat); + hr = IDirect3DDevice3_SetTransform(Direct3DDevice3, D3DTRANSFORMSTATE_WORLD, &mat); ok(hr == D3D_OK, "IDirect3DDevice3_SetTransform returned %08x\n", hr); - hr = IDirect3DDevice3_SetTransform(Direct3DDevice3, D3DTRANSFORMSTATE_VIEW, (D3DMATRIX *)mat); + hr = IDirect3DDevice3_SetTransform(Direct3DDevice3, D3DTRANSFORMSTATE_VIEW, &mat); ok(hr == D3D_OK, "IDirect3DDevice3_SetTransform returned %08x\n", hr); - hr = IDirect3DDevice3_SetTransform(Direct3DDevice3, D3DTRANSFORMSTATE_PROJECTION, (D3DMATRIX *) mat); + hr = IDirect3DDevice3_SetTransform(Direct3DDevice3, D3DTRANSFORMSTATE_PROJECTION, &mat); ok(hr == D3D_OK, "IDirect3DDevice3_SetTransform returned %08x\n", hr); hr = IDirect3DDevice3_SetRenderState(Direct3DDevice3, D3DRENDERSTATE_CLIPPING, FALSE); ok(hr == D3D_OK, "IDirect3DDevice3_SetRenderState returned %08x\n", hr);

1 0

Henri Verbeet : ddraw/tests: Get rid of some unused assignments.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: b9bfcf2c2a7ff439e8e30e590eeafc9997e17273 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9bfcf2c2a7ff439e8e30e590… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 16 13:13:23 2014 +0200 ddraw/tests: Get rid of some unused assignments. --- dlls/ddraw/tests/ddraw1.c | 14 ++++++-------- dlls/ddraw/tests/ddraw2.c | 18 ++++++++---------- dlls/ddraw/tests/ddraw4.c | 16 +++++++--------- dlls/ddraw/tests/ddraw7.c | 18 ++++++++---------- 4 files changed, 29 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b9bfcf2c2a7ff439e8e30…

1 0

Matteo Bruni : wined3d: Validate and handle query size parameter.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: b42fe709d6db16a7f13f708e5a5c9a5d802cabad URL: http://source.winehq.org/git/wine.git/?a=commit;h=b42fe709d6db16a7f13f708e5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jun 13 15:08:51 2014 +0200 wined3d: Validate and handle query size parameter. --- dlls/d3d9/query.c | 5 +++- dlls/d3d9/tests/device.c | 10 +++---- dlls/wined3d/query.c | 73 +++++++++++++++++++++++++--------------------- 3 files changed, 48 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b42fe709d6db16a7f13f7…

1 0

Nikolay Sivov : kernel32: Added a message for WSAECONNRESET.
by Alexandre Julliard June 16, 2014

June 16, 2014

1 0

Bruno Jesus : ws2_32/tests: Wait for thread test before returning ( valgrind).
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: e3998e39886cbdca012af937b9efe081b83c18a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3998e39886cbdca012af937b… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jun 14 14:47:30 2014 -0300 ws2_32/tests: Wait for thread test before returning (valgrind). --- dlls/ws2_32/tests/sock.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index fb5ee1d..8a9cbba 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5454,6 +5454,7 @@ static void test_WSARecv(void) send(src, "test message", sizeof("test message"), 0); thread = CreateThread(NULL, 0, recv_thread, &dest, 0, &id); + WaitForSingleObject(thread, 3000); CloseHandle(thread); end:

1 0

Zhenbo Li : mshtml: Added IHTMLTableCell::cellIndex method implementation.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: 05f65a9341dedfec77963ed3d59d9a4dfc4edb74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05f65a9341dedfec77963ed3d… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Fri Jun 13 07:29:21 2014 +0800 mshtml: Added IHTMLTableCell::cellIndex method implementation. --- dlls/mshtml/htmltablecell.c | 12 ++++++++++-- dlls/mshtml/tests/dom.c | 26 ++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmltablecell.c b/dlls/mshtml/htmltablecell.c index 7b8d2fc..e023e31 100644 --- a/dlls/mshtml/htmltablecell.c +++ b/dlls/mshtml/htmltablecell.c @@ -268,8 +268,16 @@ static HRESULT WINAPI HTMLTableCell_get_height(IHTMLTableCell *iface, VARIANT *p static HRESULT WINAPI HTMLTableCell_get_cellIndex(IHTMLTableCell *iface, LONG *p) { HTMLTableCell *This = impl_from_IHTMLTableCell(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + nsres = nsIDOMHTMLTableCellElement_GetCellIndex(This->nscell, p); + if (NS_FAILED(nsres)) { + ERR("Get CellIndex failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static const IHTMLTableCellVtbl HTMLTableCellVtbl = { diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 4eb02fc..941e87b 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5852,6 +5852,25 @@ static void test_tr_elem(IHTMLElement *elem) IHTMLTableRow_Release(row); } +static void test_td_elem(IHTMLElement *elem) +{ + IHTMLTableCell *cell; + HRESULT hres; + LONG lval; + + hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLTableCell, (void**)&cell); + ok(hres == S_OK, "Could not get IHTMLTableRow iface: %08x\n", hres); + if(FAILED(hres)) + return; + + lval = 0xdeadbeef; + hres = IHTMLTableCell_get_cellIndex(cell, &lval); + ok(hres == S_OK, "get cellIndex failed: %08x\n", hres); + ok(lval == 1, "Expected 1, got %d\n", lval); + + IHTMLTableCell_Release(cell); +} + static void test_label_elem(IHTMLElement *elem) { IHTMLLabelElement *label; @@ -6813,6 +6832,13 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } + elem = get_doc_elem_by_id(doc, "td2"); + ok(elem != NULL, "elem == NULL\n"); + if(elem) { + test_td_elem(elem); + IHTMLElement_Release(elem); + } + elem = get_doc_elem_by_id(doc, "row2"); ok(elem != NULL, "elem == NULL\n"); if(elem) {

1 0

Nikolay Sivov : windowscodecs/tests: Fixed some leaks on error path ( Valgrind).
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: 7e3ab90187a0e7ccf1bfb0604695a91fb781cb96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e3ab90187a0e7ccf1bfb0604… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 15 00:21:53 2014 +0400 windowscodecs/tests: Fixed some leaks on error path (Valgrind). --- dlls/windowscodecs/tests/metadata.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 7f35c42..e42b474 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -845,7 +845,13 @@ static void test_create_reader(void) stream, &reader); todo_wine ok(hr == S_OK, "CreateMetadataReaderFromContainer failed, hr=%x\n", hr); - if (FAILED(hr)) return; + /* NOTE: removed once Wine is fixed */ + if (FAILED(hr)) + { + IStream_Release(stream); + IWICComponentFactory_Release(factory); + return; + } if (SUCCEEDED(hr)) {

1 0

Nikolay Sivov : dsound/tests: Accept another error code.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: d7894955349faac8bdeab3bdf96770ac3ceecc86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7894955349faac8bdeab3bdf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 15 11:48:20 2014 +0400 dsound/tests: Accept another error code. --- dlls/dsound/tests/dsound8.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index b96cded..64b9f62 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -790,7 +790,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) wfxe.Format.cbSize = sizeof(wfxe) - sizeof(wfx) + 1; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); - ok(((rc==DSERR_CONTROLUNAVAIL || rc==DSERR_INVALIDCALL /* 2003 */) && !secondary) + ok(((rc==DSERR_CONTROLUNAVAIL || rc==DSERR_INVALIDCALL /* 2003 */ || rc==DSERR_INVALIDPARAM) && !secondary) || rc==DS_OK /* driver dependent? */, "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", rc, secondary); @@ -814,7 +814,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) wfxe.Format.cbSize = sizeof(wfxe); rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); - ok((rc==DSERR_CONTROLUNAVAIL || rc==DSERR_INVALIDCALL || rc==E_INVALIDARG) && !secondary, + ok((rc==DSERR_CONTROLUNAVAIL || rc==DSERR_INVALIDCALL || rc==DSERR_INVALIDPARAM) && !secondary, "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", rc, secondary); if (secondary) @@ -836,7 +836,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) wfxe.Format.cbSize = sizeof(wfxe) + 1; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); - ok(((rc==DSERR_CONTROLUNAVAIL || rc==DSERR_INVALIDCALL /* 2003 */) && !secondary) + ok(((rc==DSERR_CONTROLUNAVAIL || rc==DSERR_INVALIDCALL /* 2003 */ || rc==DSERR_INVALIDPARAM) && !secondary) || rc==DS_OK /* driver dependent? */, "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", rc, secondary);

1 0

Nikolay Sivov : wmp: Implement get_versionInfo().
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: 99449fc8d41c852aa60da710570e956578665783 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99449fc8d41c852aa60da7105… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 14 09:11:29 2014 +0400 wmp: Implement get_versionInfo(). --- dlls/wmp/Makefile.in | 2 +- dlls/wmp/player.c | 13 ++++++++++--- dlls/wmp/rsrc.rc | 2 ++ dlls/wmp/tests/Makefile.in | 2 +- dlls/wmp/tests/oleobj.c | 14 ++++++++++++++ 5 files changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/wmp/Makefile.in b/dlls/wmp/Makefile.in index a82cc36..71ca0e5 100644 --- a/dlls/wmp/Makefile.in +++ b/dlls/wmp/Makefile.in @@ -1,5 +1,5 @@ MODULE = wmp.dll -IMPORTS = user32 gdi32 +IMPORTS = user32 gdi32 oleaut32 C_SRCS = \ oleobj.c \ diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index e8c349b..4c11c88 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -159,11 +159,18 @@ static HRESULT WINAPI WMPPlayer4_get_playlistCollection(IWMPPlayer4 *iface, IWMP return E_NOTIMPL; } -static HRESULT WINAPI WMPPlayer4_get_versionInfo(IWMPPlayer4 *iface, BSTR *pbstrVersionInfo) +static HRESULT WINAPI WMPPlayer4_get_versionInfo(IWMPPlayer4 *iface, BSTR *version) { + static const WCHAR versionW[] = {'1','2','.','0','.','7','6','0','1','.','1','6','9','8','2',0}; WindowsMediaPlayer *This = impl_from_IWMPPlayer4(iface); - FIXME("(%p)->(%p)\n", This, pbstrVersionInfo); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, version); + + if (!version) + return E_POINTER; + + *version = SysAllocString(versionW); + return *version ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI WMPPlayer4_launchURL(IWMPPlayer4 *iface, BSTR url) diff --git a/dlls/wmp/rsrc.rc b/dlls/wmp/rsrc.rc index ced1a64..3585d12 100644 --- a/dlls/wmp/rsrc.rc +++ b/dlls/wmp/rsrc.rc @@ -23,6 +23,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* @makedep: wmp.rgs */ 2 WINE_REGISTRY wmp.rgs +/* NOTE: when changing version value, update a string returned by + get_versionInfo() as well */ #define WINE_FILEDESCRIPTION_STR "Wine Media Player" #define WINE_FILENAME_STR "wmp.dll" #define WINE_FILEVERSION 12,0,7601,16982 diff --git a/dlls/wmp/tests/Makefile.in b/dlls/wmp/tests/Makefile.in index 52da0d7..465b878 100644 --- a/dlls/wmp/tests/Makefile.in +++ b/dlls/wmp/tests/Makefile.in @@ -1,4 +1,4 @@ TESTDLL = wmp.dll -IMPORTS = ole32 user32 +IMPORTS = ole32 oleaut32 user32 C_SRCS = oleobj.c diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index 31087f5..875fc77 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -864,12 +864,14 @@ static void test_wmp(void) IOleInPlaceObject *ipobj; IPersistStreamInit *psi; IOleObject *oleobj; + IWMPCore *wmpcore; DWORD misc_status; RECT pos = {0,0,100,100}; HWND hwnd; GUID guid; LONG ref; HRESULT hres; + BSTR str; hres = CoCreateInstance(&CLSID_WindowsMediaPlayer, NULL, CLSCTX_INPROC_SERVER, &IID_IOleObject, (void**)&oleobj); if(hres == REGDB_E_CLASSNOTREG) { @@ -878,6 +880,18 @@ static void test_wmp(void) } ok(hres == S_OK, "Coult not create CLSID_WindowsMediaPlayer instance: %08x\n", hres); + hres = IOleObject_QueryInterface(oleobj, &IID_IWMPCore, (void**)&wmpcore); + ok(hres == S_OK, "got 0x%08x\n", hres); + + hres = IWMPCore_get_versionInfo(wmpcore, NULL); + ok(hres == E_POINTER, "got 0x%08x\n", hres); + + hres = IWMPCore_get_versionInfo(wmpcore, &str); + ok(hres == S_OK, "got 0x%08x\n", hres); + SysFreeString(str); + + IWMPCore_Release(wmpcore); + hres = IOleObject_QueryInterface(oleobj, &IID_IProvideClassInfo2, (void**)&class_info); ok(hres == S_OK, "Could not get IProvideClassInfo2 iface: %08x\n", hres);

1 0

Nikolay Sivov : d3dx9: Trace out parameters as pointers (Valgrind).
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: 9475dc58d169efc2a546d37226144b2dabc5a3ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=9475dc58d169efc2a546d3722… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 14 09:33:46 2014 +0400 d3dx9: Trace out parameters as pointers (Valgrind). --- dlls/d3dx9_36/font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index d2bc4bc..014fa95 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -147,8 +147,8 @@ static HDC WINAPI ID3DXFontImpl_GetDC(ID3DXFont *iface) static HRESULT WINAPI ID3DXFontImpl_GetGlyphData(ID3DXFont *iface, UINT glyph, IDirect3DTexture9 **texture, RECT *blackbox, POINT *cellinc) { - FIXME("iface %p, glyph %#x, texture %p, blackbox %s, cellinc %s stub!\n", - iface, glyph, texture, wine_dbgstr_rect(blackbox), wine_dbgstr_point(cellinc)); + FIXME("iface %p, glyph %#x, texture %p, blackbox %p, cellinc %p stub!\n", + iface, glyph, texture, blackbox, cellinc); return E_NOTIMPL; }

1 0

Nikolay Sivov : dwrite: Recognize more Unicode ranges in script analyzer.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: b5184df5df0fb10e9fab94d747aac0815b81c8d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5184df5df0fb10e9fab94d74… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 15 22:38:14 2014 +0400 dwrite: Recognize more Unicode ranges in script analyzer. --- dlls/dwrite/analyzer.c | 43 ++++++++++++++++++++++++++++++++ dlls/dwrite/tests/analyzer.c | 56 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 97 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 5c692d1..2b7056e 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -41,6 +41,7 @@ enum scriptcode { Script_Devanagari = 18, Script_Ethiopic = 19, Script_Georgian = 20, + Script_Glagolitic = 22, Script_Greek = 23, Script_Gujarati = 24, Script_Gurmukhi = 25, @@ -70,6 +71,7 @@ enum scriptcode { Script_Thaana = 70, Script_Thai = 71, Script_Tibetan = 72, + Script_Tifinagh = 73, Script_Symbol = 77, Script_Unknown = (UINT16)-1 }; @@ -204,6 +206,47 @@ static const struct script_range script_ranges[] = { { Script_Devanagari, 0x1cd0, 0x1cff }, /* Phonetic Extensions: U+1D00–U+1DBF */ { Script_Latin, 0x1d00, 0x1dbf }, + /* Combining Diacritical Marks Supplement: U+1DC0–U+1DFF */ + { Script_Symbol, 0x1dc0, 0x1dff }, + /* Latin Extended Additional: U+1E00–U+1EFF */ + { Script_Latin, 0x1e00, 0x1eff }, + /* Greek Extended: U+1F00–U+1F00 */ + { Script_Greek, 0x1f00, 0x1fff }, + /* General Punctuation: U+2000–U+206f */ + /* Superscripts and Subscripts: U+2070–U+209f */ + /* Currency Symbols: U+20A0–U+20CF */ + /* Combining Diacritical Marks for Symbols: U+20D0–U+20FF */ + /* Letterlike Symbols: U+2100–U+214F */ + /* Number Forms: U+2150–U+218F */ + /* Arrows: U+2190–U+21FF */ + /* Mathematical Operators: U+2200–U+22FF */ + /* Miscellaneous Technical: U+2300–U+23FF */ + /* Control Pictures: U+2400–U+243F */ + /* Optical Character Recognition: U+2440–U+245F */ + /* Enclosed Alphanumerics: U+2460–U+24FF */ + /* Box Drawing: U+2500–U+25FF */ + /* Block Elements: U+2580–U+259F */ + /* Geometric Shapes: U+25A0–U+25FF */ + /* Miscellaneous Symbols: U+2600–U+26FF */ + /* Dingbats: U+2700–U+27BF */ + /* Miscellaneous Mathematical Symbols-A: U+27C0–U+27EF */ + /* Supplemental Arrows-A: U+27F0–U+27FF */ + /* Braille Patterns: U+2800–U+28FF */ + /* Supplemental Arrows-B: U+2900–U+297F */ + /* Miscellaneous Mathematical Symbols-B: U+2980–U+29FF */ + /* Supplemental Mathematical Operators: U+2A00–U+2AFF */ + /* Miscellaneous Symbols and Arrows: U+2B00–U+2BFF */ + { Script_Symbol, 0x2000, 0x2bff }, + /* Glagolitic: U+2C00–U+2C5F */ + { Script_Glagolitic, 0x2c00, 0x2c5f }, + /* Latin Extended-C: U+2C60–U+2C7F */ + { Script_Latin, 0x2c60, 0x2c7f }, + /* Coptic: U+2C80–U+2CFF */ + { Script_Coptic, 0x2c80, 0x2cff }, + /* Georgian Supplement: U+2D00–U+2D2F */ + { Script_Georgian, 0x2d00, 0x2d2f }, + /* Tifinagh: U+2D30–U+2D7F */ + { Script_Tifinagh, 0x2d30, 0x2d7f }, /* unsupported range */ { Script_Unknown } }; diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 7ff6e56..e504a22 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -621,8 +621,8 @@ static struct sa_test sa_tests[] = { }, { /* Georgian */ - {0x10a0,0x10d0,0x10da,0x10f1,0x10fb,'.',0}, 1, - { { 0, 6, DWRITE_SCRIPT_SHAPES_DEFAULT }} + {0x10a0,0x10d0,0x10da,0x10f1,0x10fb,0x2d00,'.',0}, 1, + { { 0, 7, DWRITE_SCRIPT_SHAPES_DEFAULT }} }, { /* Hangul */ @@ -724,6 +724,58 @@ static struct sa_test sa_tests[] = { {0x1d00,0x1d40,0x1d70,0}, 1, { { 0, 3, DWRITE_SCRIPT_SHAPES_DEFAULT }} }, + { + /* Combining diacritical marks */ + {0x1dc0,0x300,0x1ddf,0}, 1, + { { 0, 3, DWRITE_SCRIPT_SHAPES_DEFAULT }} + }, + { + /* Latin Extended Additional, Extended-C */ + {0x1e00,0x1d00,0x2c60,0}, 1, + { { 0, 3, DWRITE_SCRIPT_SHAPES_DEFAULT }} + }, + { + /* Greek Extended */ + {0x3f0,0x1f00,0}, 1, + { { 0, 2, DWRITE_SCRIPT_SHAPES_DEFAULT }} + }, + { + /* General Punctuation */ + {0x1dc0,0x2000,0}, 1, + { { 0, 2, DWRITE_SCRIPT_SHAPES_DEFAULT }} + }, + { + /* Superscripts and Subscripts */ + {0x2070,0x2086,0x2000,0}, 1, + { { 0, 3, DWRITE_SCRIPT_SHAPES_DEFAULT }} + }, + { + /* Currency, Combining Diacritical Marks for Symbols. Letterlike Symbols.. */ + {0x20a0,0x20b8,0x2000,0x20d0,0x2100,0x2150,0x2190,0x2200,0x2300,0x2400,0x2440,0x2460,0x2500,0x2580,0x25a0,0x2600, + 0x2700,0x27c0,0x27f0,0x2900,0x2980,0x2a00,0x2b00,0}, 1, + { { 0, 23, DWRITE_SCRIPT_SHAPES_DEFAULT }} + }, + { + /* Braille */ + {0x2800,0x2070,0x2000,0}, 1, + { { 0, 3, DWRITE_SCRIPT_SHAPES_DEFAULT }} + }, + { + /* Glagolitic */ + {0x2c00,0x2c12,0}, 1, + { { 0, 2, DWRITE_SCRIPT_SHAPES_DEFAULT }} + }, + { + /* Coptic */ + {0x2c80,0x3e2,0x1f00,0}, 2, + { { 0, 2, DWRITE_SCRIPT_SHAPES_DEFAULT }, + { 2, 1, DWRITE_SCRIPT_SHAPES_DEFAULT } } + }, + { + /* Tifinagh */ + {0x2d30,0x2d4a,0}, 1, + { { 0, 2, DWRITE_SCRIPT_SHAPES_DEFAULT }} + }, /* keep this as end marker */ { {0} } };

1 0

Nikolay Sivov : msxml3/tests: Accept Stat() method called on test stream.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: 45b90272589bb71e5bd1fce24a250886866c89ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=45b90272589bb71e5bd1fce24… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 15 12:35:37 2014 +0400 msxml3/tests: Accept Stat() method called on test stream. --- dlls/msxml3/tests/saxreader.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 6c6a1b8..882e855 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -1989,7 +1989,6 @@ static HRESULT WINAPI istream_UnlockRegion(IStream *iface, ULARGE_INTEGER libOff static HRESULT WINAPI istream_Stat(IStream *iface, STATSTG *pstatstg, DWORD grfStatFlag) { - ok(0, "unexpected call\n"); return E_NOTIMPL; }

1 0

Nikolay Sivov : xmllite/writer: Maintain a stack of written elements to write end tags.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: af46bab5947e826816280e5f95e94e2faabf1147 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af46bab5947e826816280e5f9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 14 22:46:09 2014 +0400 xmllite/writer: Maintain a stack of written elements to write end tags. Xmllite helps in a way that user doesn't have to specify closing tag name (like it has to in case of MXWriter). So when closing current level element qname is used for a closing tag; later this stack will also hold namespace definitions that element is carrying to check if nested element uses defined prefix. --- dlls/xmllite/tests/writer.c | 50 ++++++++++++++-- dlls/xmllite/writer.c | 139 +++++++++++++++++++++++++++++++++++-------- 2 files changed, 161 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=af46bab5947e826816280…

1 0

Nikolay Sivov : msctf/tests: Fix crash when ITfInputProcessorProfileMgr is not supported.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: d3980cdcf26c040cd8feccb8931e8a699248919a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3980cdcf26c040cd8feccb89… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 15 11:56:20 2014 +0400 msctf/tests: Fix crash when ITfInputProcessorProfileMgr is not supported. --- dlls/msctf/tests/inputprocessor.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 8a052b3..dfa8731 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -2193,6 +2193,11 @@ static void test_profile_mgr(void) HRESULT hres; hres = ITfInputProcessorProfiles_QueryInterface(g_ipp, &IID_ITfInputProcessorProfileMgr, (void**)&ipp_mgr); + if (hres != S_OK) + { + win_skip("ITfInputProcessorProfileMgr is not supported.\n"); + return; + } ok(hres == S_OK, "Could not get ITfInputProcessorProfileMgr iface: %08x\n", hres); hres = ITfInputProcessorProfileMgr_EnumProfiles(ipp_mgr, 0, &enum_profiles);

1 0

Nikolay Sivov : shell32: Release cached desktop folder on process detach.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: d3a034e3482637ad28dc2d36eba27d2c94b8a6ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3a034e3482637ad28dc2d36e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 14 23:56:45 2014 +0400 shell32: Release cached desktop folder on process detach. --- dlls/shell32/shell32_main.c | 1 + dlls/shell32/shell32_main.h | 1 + dlls/shell32/shfldr_desktop.c | 12 ++++++++++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 091c6e1..679ebec 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -1281,6 +1281,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) if (fImpLoad) break; SIC_Destroy(); FreeChangeNotifications(); + release_desktop_folder(); release_typelib(); break; } diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index e7765eb..954f1e4 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -230,5 +230,6 @@ BOOL AddToEnumList(IEnumIDListImpl *list, LPITEMIDLIST pidl) DECLSPEC_HIDDEN; BOOL CreateFolderEnumList(IEnumIDListImpl *list, LPCWSTR lpszPath, DWORD dwFlags) DECLSPEC_HIDDEN; void release_typelib(void) DECLSPEC_HIDDEN; +void release_desktop_folder(void) DECLSPEC_HIDDEN; #endif diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index 2910106..695e558 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -57,7 +57,6 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell); /* Undocumented functions from shdocvw */ extern HRESULT WINAPI IEParseDisplayNameWithBCW(DWORD codepage, LPCWSTR lpszDisplayName, LPBC pbc, LPITEMIDLIST *ppidl); - /*********************************************************************** * Desktopfolder implementation */ @@ -75,6 +74,8 @@ typedef struct { BOOL fAcceptFmt; /* flag for pending Drop */ } IDesktopFolderImpl; +static IDesktopFolderImpl *cached_sf; + static inline IDesktopFolderImpl *impl_from_IShellFolder2(IShellFolder2 *iface) { return CONTAINING_RECORD(iface, IDesktopFolderImpl, IShellFolder2_iface); @@ -934,13 +935,20 @@ static const IPersistFolder2Vtbl vt_IPersistFolder2 = ISF_Desktop_IPersistFolder2_fnGetCurFolder }; +void release_desktop_folder(void) +{ + if (!cached_sf) return; + SHFree(cached_sf->pidlRoot); + SHFree(cached_sf->sPathTarget); + LocalFree(cached_sf); +} + /************************************************************************** * ISF_Desktop_Constructor */ HRESULT WINAPI ISF_Desktop_Constructor ( IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) { - static IDesktopFolderImpl *cached_sf; WCHAR szMyPath[MAX_PATH]; TRACE ("unkOut=%p %s\n", pUnkOuter, shdebugstr_guid (riid));

1 0

Nikolay Sivov : quartz/tests: Fix couple of test failures running with limited user.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: 1f92df77a83df58404dc93e6a25e9f382712ad7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f92df77a83df58404dc93e6a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 14 14:51:50 2014 +0400 quartz/tests: Fix couple of test failures running with limited user. --- dlls/quartz/tests/filtermapper.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/tests/filtermapper.c b/dlls/quartz/tests/filtermapper.c index a67df1d..d21509d 100644 --- a/dlls/quartz/tests/filtermapper.c +++ b/dlls/quartz/tests/filtermapper.c @@ -87,7 +87,7 @@ static void test_fm2_enummatchingfilters(void) CLSID clsidFilter1; CLSID clsidFilter2; IEnumMoniker *pEnum = NULL; - BOOL found; + BOOL found, registered = TRUE; ZeroMemory(&rgf2, sizeof(rgf2)); @@ -121,7 +121,10 @@ static void test_fm2_enummatchingfilters(void) hr = IFilterMapper2_RegisterFilter(pMapper, &clsidFilter1, wszFilterName1, NULL, &CLSID_LegacyAmFilterCategory, NULL, &rgf2); if (hr == E_ACCESSDENIED) + { + registered = FALSE; skip("Not authorized to register filters\n"); + } else { ok(hr == S_OK, "IFilterMapper2_RegisterFilter failed with %x\n", hr); @@ -192,13 +195,16 @@ static void test_fm2_enummatchingfilters(void) ok(!found, "EnumMatchingFilters should not return the test filter 2\n"); } - hr = IFilterMapper2_UnregisterFilter(pMapper, &CLSID_LegacyAmFilterCategory, NULL, - &clsidFilter1); - ok(SUCCEEDED(hr), "IFilterMapper2_UnregisterFilter failed with %x\n", hr); + if (registered) + { + hr = IFilterMapper2_UnregisterFilter(pMapper, &CLSID_LegacyAmFilterCategory, NULL, + &clsidFilter1); + ok(SUCCEEDED(hr), "IFilterMapper2_UnregisterFilter failed with %x\n", hr); - hr = IFilterMapper2_UnregisterFilter(pMapper, &CLSID_LegacyAmFilterCategory, NULL, - &clsidFilter2); - ok(SUCCEEDED(hr), "IFilterMapper2_UnregisterFilter failed with %x\n", hr); + hr = IFilterMapper2_UnregisterFilter(pMapper, &CLSID_LegacyAmFilterCategory, NULL, + &clsidFilter2); + ok(SUCCEEDED(hr), "IFilterMapper2_UnregisterFilter failed with %x\n", hr); + } out:

1 0

Nikolay Sivov : d3drm/tests: Release frame instance (Valgrind).
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: 023e885156d9c0e1e5da4b5aeef97e99de708b77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=023e885156d9c0e1e5da4b5ae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 14 09:25:46 2014 +0400 d3drm/tests: Release frame instance (Valgrind). --- dlls/d3drm/tests/d3drm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 9990d2c..ee01b91 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1560,6 +1560,7 @@ static void test_frame_transform(void) ok(hr == D3DRM_OK, "IDirect3DRMFrame_GetTransform returned hr = %x\n", hr); ok(!memcmp(matrix, identity, sizeof(D3DRMMATRIX4D)), "Returned matrix is not identity\n"); + IDirect3DRMFrame_Release(frame); IDirect3DRM_Release(d3drm); }

1 0