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

André Hentschel : Wine 1.5.10 freigegeben
by Jeremy Newman 31 Jul '12

31 Jul '12

Module: website Branch: master Commit: 746cf68ad916156b57a91d6b42e556cd4e4ab572 URL: http://source.winehq.org/git/website.git/?a=commit;h=746cf68ad916156b57a91d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jul 31 21:43:00 2012 +0200 Wine 1.5.10 freigegeben --- news/de/2012073101.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/de/2012073101.xml b/news/de/2012073101.xml new file mode 100644 index 0000000..551ca99 --- /dev/null +++ b/news/de/2012073101.xml @@ -0,0 +1,16 @@ +<news> +<date>31. Juli 2012</date> +<title>Wine 1.5.10 freigegeben</title> +<body> + Die Entwicklungsversion 1.5.10 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.5.10">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Neue Version der Gecko Engine, basierend auf Firefox 14.</li> + <li>Unterstützung für OpenGL in der DIB Engine mit libOSMesa.</li> + <li>Off-screen Rendering nun Standard in Direct3D.</li> + <li>Ein wenig mehr WMI Infrastruktur.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.10.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 1.5.10
by Alexandre Julliard 31 Jul '12

31 Jul '12

Module: website Branch: master Commit: 8cc845da2af2edd27bcf2c9397c2c8ba706da837 URL: http://source.winehq.org/git/website.git/?a=commit;h=8cc845da2af2edd27bcf2c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 31 21:17:50 2012 +0200 Wine release 1.5.10 --- news/en/2012073101.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/en/2012073101.xml b/news/en/2012073101.xml new file mode 100644 index 0000000..d9f944c --- /dev/null +++ b/news/en/2012073101.xml @@ -0,0 +1,16 @@ +<news> +<date>July 31, 2012</date> +<title>Wine 1.5.10 Released</title> +<body> + The Wine development release 1.5.10 is now available. + <a href="{$root}/announce/1.5.10">What's new</a> in this release: +<ul> + <li>New version of the Gecko engine based on Firefox 14.</li> + <li>Support for OpenGL in the DIB engine using libOSMesa.</li> + <li>Off-screen rendering is now the default in Direct3D.</li> + <li>Some more WMI infrastructure.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.10.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.5.10.
by Alexandre Julliard 31 Jul '12

31 Jul '12

Module: wine Branch: master Commit: 9177c088306723d10475839c2fcf56fd30e1b611 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9177c088306723d10475839c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 31 21:08:12 2012 +0200 Release 1.5.10. --- ANNOUNCE | 813 ++++++++++++++++++++++++++++++++----------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 438 insertions(+), 395 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9177c088306723d104758…

1 0

Tag wine-1.5.10 : Alexandre Julliard : Release 1.5.10
by Alexandre Julliard 31 Jul '12

31 Jul '12

Module: wine Branch: refs/tags/wine-1.5.10 Tag: 584c1cb0f4b312a4ee3c34fc0cadf8c4ec00e47a URL: http://source.winehq.org/git/wine.git/?a=tag;h=584c1cb0f4b312a4ee3c34fc0cad… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 31 21:08:12 2012 +0200 Release 1.5.10

1 0

Detlef Riekenberg : advapi32/tests: Simple tests for TokenIntegrityLevel.
by Alexandre Julliard 31 Jul '12

31 Jul '12

Module: wine Branch: master Commit: 92bcd0bf10b7c643680762d8855803268a9271de URL: http://source.winehq.org/git/wine.git/?a=commit;h=92bcd0bf10b7c643680762d88… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Jul 31 00:09:02 2012 +0200 advapi32/tests: Simple tests for TokenIntegrityLevel. --- dlls/advapi32/tests/security.c | 62 ++++++++++++++++++++++++++++++++++++--- 1 files changed, 57 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 28e43ec..291c99d 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -167,6 +167,8 @@ static void init(void) pSetSecurityDescriptorControl = (void *)GetProcAddress(hmod, "SetSecurityDescriptorControl"); pGetSecurityInfo = (void *)GetProcAddress(hmod, "GetSecurityInfo"); pCreateRestrictedToken = (void *)GetProcAddress(hmod, "CreateRestrictedToken"); + pConvertSidToStringSidA = (void *)GetProcAddress(hmod, "ConvertSidToStringSidA"); + pConvertStringSidToSidA = (void *)GetProcAddress(hmod, "ConvertStringSidToSidA"); myARGC = winetest_get_mainargs( &myARGV ); } @@ -211,12 +213,11 @@ static void test_sid(void) BOOL r; LPSTR str = NULL; - pConvertSidToStringSidA = (void *)GetProcAddress( hmod, "ConvertSidToStringSidA" ); - if( !pConvertSidToStringSidA ) - return; - pConvertStringSidToSidA = (void *)GetProcAddress( hmod, "ConvertStringSidToSidA" ); - if( !pConvertStringSidToSidA ) + if( !pConvertSidToStringSidA || !pConvertStringSidToSidA ) + { + win_skip("ConvertSidToStringSidA or ConvertStringSidToSidA not available\n"); return; + } r = pConvertStringSidToSidA( NULL, NULL ); ok( !r, "expected failure with NULL parameters\n" ); @@ -4274,6 +4275,56 @@ static void test_kernel_objects_security(void) CloseHandle(token); } +static void test_TokenIntegrityLevel(void) +{ + TOKEN_MANDATORY_LABEL *tml; + BYTE buffer[64]; /* using max. 28 byte in win7 x64 */ + HANDLE token; + DWORD size; + DWORD res; + char *sidname = NULL; + static SID medium_level = {SID_REVISION, 1, {SECURITY_MANDATORY_LABEL_AUTHORITY}, + {SECURITY_MANDATORY_HIGH_RID}}; + static SID high_level = {SID_REVISION, 1, {SECURITY_MANDATORY_LABEL_AUTHORITY}, + {SECURITY_MANDATORY_MEDIUM_RID}}; + + SetLastError(0xdeadbeef); + res = OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token); + ok(res, "got %d with %d (expected TRUE)\n", res, GetLastError()); + + SetLastError(0xdeadbeef); + res = GetTokenInformation(token, TokenIntegrityLevel, buffer, sizeof(buffer), &size); + + /* not supported before Vista */ + if (!res && (GetLastError() == ERROR_INVALID_PARAMETER)) + { + win_skip("TokenIntegrityLevel not supported\n"); + CloseHandle(token); + return; + } + + ok(res, "got %u with %u (expected TRUE)\n", res, GetLastError()); + if (!res) + { + CloseHandle(token); + return; + } + + tml = (TOKEN_MANDATORY_LABEL*) buffer; + ok(tml->Label.Attributes == (SE_GROUP_INTEGRITY | SE_GROUP_INTEGRITY_ENABLED), + "got 0x%x (expected 0x%x)\n", tml->Label.Attributes, (SE_GROUP_INTEGRITY | SE_GROUP_INTEGRITY_ENABLED)); + + SetLastError(0xdeadbeef); + res = pConvertSidToStringSidA(tml->Label.Sid, &sidname); + ok(res, "got %u and %u\n", res, GetLastError()); + + ok(EqualSid(tml->Label.Sid, &medium_level) || EqualSid(tml->Label.Sid, &high_level), + "got %s (expected 'S-1-16-8192' or 'S-1-16-12288')\n", sidname); + + LocalFree(sidname); + CloseHandle(token); +} + START_TEST(security) { init(); @@ -4311,4 +4362,5 @@ START_TEST(security) test_GetUserNameA(); test_GetUserNameW(); test_CreateRestrictedToken(); + test_TokenIntegrityLevel(); }

1 0

Dmitry Timoshkov : include/winnt.h: MSC compiler doesn' t support __asm keyword in x86_64 mode.
by Alexandre Julliard 31 Jul '12

31 Jul '12

Module: wine Branch: master Commit: 9d9496058fea447a30956695e93a795c556e8daa URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d9496058fea447a30956695e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 31 12:38:24 2012 +0900 include/winnt.h: MSC compiler doesn't support __asm keyword in x86_64 mode. --- include/winnt.h | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index c19eb47..2f78820 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2221,14 +2221,6 @@ static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) __asm__(".byte 0x65\n\tmovq (0x30),%0" : "=r" (teb)); return teb; } -#elif defined(__x86_64__) && defined (_MSC_VER) -static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) -{ - struct _TEB *teb; - __asm mov rax, gs:[0x30]; - __asm mov teb, rax; - return teb; -} #else extern struct _TEB * WINAPI NtCurrentTeb(void); #endif

1 0

Dmitry Timoshkov : include/winbase.h: MSC compiler implements interlocked* APIs as intrinsics in x86_64 mode.
by Alexandre Julliard 31 Jul '12

31 Jul '12

Module: wine Branch: master Commit: 61c0dcdb8b9b64ec3b405acb884f5dc1def4c73e URL: http://source.winehq.org/git/wine.git/?a=commit;h=61c0dcdb8b9b64ec3b405acb8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 31 12:38:32 2012 +0900 include/winbase.h: MSC compiler implements interlocked* APIs as intrinsics in x86_64 mode. --- include/winbase.h | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 52 insertions(+), 0 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index bc765f1..619120e 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2435,6 +2435,10 @@ WINBASEAPI LONGLONG WINAPI InterlockedCompareExchange64(LONGLONG volatile*,LONGL #else /* __i386__ */ +#if defined(__x86_64__) && defined(_MSC_VER) +#pragma intrinsic(_InterlockedCompareExchange) +#endif + static FORCEINLINE LONG WINAPI InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare ) { #if defined(__x86_64__) && defined(__GNUC__) @@ -2442,12 +2446,18 @@ static FORCEINLINE LONG WINAPI InterlockedCompareExchange( LONG volatile *dest, __asm__ __volatile__( "lock; cmpxchgl %2,(%1)" : "=a" (ret) : "r" (dest), "r" (xchg), "0" (compare) : "memory" ); return ret; +#elif defined(__x86_64__) && defined(_MSC_VER) + return _InterlockedCompareExchange( dest, xchg, compare ); #else extern int interlocked_cmpxchg( int *dest, int xchg, int compare ); return interlocked_cmpxchg( (int *)dest, xchg, compare ); #endif } +#if defined(__x86_64__) && defined(_MSC_VER) +#pragma intrinsic(_InterlockedCompareExchangePointer) +#endif + static FORCEINLINE PVOID WINAPI InterlockedCompareExchangePointer( PVOID volatile *dest, PVOID xchg, PVOID compare ) { #if defined(__x86_64__) && defined(__GNUC__) @@ -2455,12 +2465,18 @@ static FORCEINLINE PVOID WINAPI InterlockedCompareExchangePointer( PVOID volatil __asm__ __volatile__( "lock; cmpxchgq %2,(%1)" : "=a" (ret) : "r" (dest), "r" (xchg), "0" (compare) : "memory" ); return ret; +#elif defined(__x86_64__) && defined(_MSC_VER) + return _InterlockedCompareExchangePointer( dest, xchg, compare ); #else extern void *interlocked_cmpxchg_ptr( void **dest, void *xchg, void *compare ); return interlocked_cmpxchg_ptr( (void **)dest, xchg, compare ); #endif } +#if defined(__x86_64__) && defined(_MSC_VER) +#pragma intrinsic(_InterlockedCompareExchange64) +#endif + static FORCEINLINE LONGLONG WINAPI InterlockedCompareExchange64( LONGLONG volatile *dest, LONGLONG xchg, LONGLONG compare ) { #if defined(__x86_64__) && defined(__GNUC__) @@ -2468,12 +2484,18 @@ static FORCEINLINE LONGLONG WINAPI InterlockedCompareExchange64( LONGLONG volati __asm__ __volatile__( "lock; cmpxchgq %2,(%1)" : "=a" (ret) : "r" (dest), "r" (xchg), "0" (compare) : "memory" ); return ret; +#elif defined(__x86_64__) && defined(_MSC_VER) + return _InterlockedCompareExchange64( dest, xchg, compare ); #else extern __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compare ); return interlocked_cmpxchg64( (__int64 *)dest, xchg, compare ); #endif } +#if defined(__x86_64__) && defined(_MSC_VER) +#pragma intrinsic(_InterlockedExchange) +#endif + static FORCEINLINE LONG WINAPI InterlockedExchange( LONG volatile *dest, LONG val ) { #if defined(__x86_64__) && defined(__GNUC__) @@ -2481,12 +2503,18 @@ static FORCEINLINE LONG WINAPI InterlockedExchange( LONG volatile *dest, LONG va __asm__ __volatile__( "lock; xchgl %0,(%1)" : "=r" (ret) :"r" (dest), "0" (val) : "memory" ); return ret; +#elif defined(__x86_64__) && defined(_MSC_VER) + return _InterlockedExchange( dest, val ); #else extern int interlocked_xchg( int *dest, int val ); return interlocked_xchg( (int *)dest, val ); #endif } +#if defined(__x86_64__) && defined(_MSC_VER) +#pragma intrinsic(_InterlockedExchangePointer) +#endif + static FORCEINLINE PVOID WINAPI InterlockedExchangePointer( PVOID volatile *dest, PVOID val ) { #if defined(__x86_64__) && defined(__GNUC__) @@ -2494,12 +2522,18 @@ static FORCEINLINE PVOID WINAPI InterlockedExchangePointer( PVOID volatile *dest __asm__ __volatile__( "lock; xchgq %0,(%1)" : "=r" (ret) :"r" (dest), "0" (val) : "memory" ); return ret; +#elif defined(__x86_64__) && defined(_MSC_VER) + return _InterlockedExchangePointer( dest, val ); #else extern void *interlocked_xchg_ptr( void **dest, void *val ); return interlocked_xchg_ptr( (void **)dest, val ); #endif } +#if defined(__x86_64__) && defined(_MSC_VER) +#pragma intrinsic(_InterlockedExchangeAdd) +#endif + static FORCEINLINE LONG WINAPI InterlockedExchangeAdd( LONG volatile *dest, LONG incr ) { #if defined(__x86_64__) && defined(__GNUC__) @@ -2507,20 +2541,38 @@ static FORCEINLINE LONG WINAPI InterlockedExchangeAdd( LONG volatile *dest, LONG __asm__ __volatile__( "lock; xaddl %0,(%1)" : "=r" (ret) : "r" (dest), "0" (incr) : "memory" ); return ret; +#elif defined(__x86_64__) && defined(_MSC_VER) + return _InterlockedExchangeAdd( dest, incr ); #else extern int interlocked_xchg_add( int *dest, int incr ); return interlocked_xchg_add( (int *)dest, incr ); #endif } +#if defined(__x86_64__) && defined(_MSC_VER) +#pragma intrinsic(_InterlockedIncrement) +#endif + static FORCEINLINE LONG WINAPI InterlockedIncrement( LONG volatile *dest ) { +#if defined(__x86_64__) && defined(_MSC_VER) + return _InterlockedIncrement( dest ); +#else return InterlockedExchangeAdd( dest, 1 ) + 1; +#endif } +#if defined(__x86_64__) && defined(_MSC_VER) +#pragma intrinsic(_InterlockedDecrement) +#endif + static FORCEINLINE LONG WINAPI InterlockedDecrement( LONG volatile *dest ) { +#if defined(__x86_64__) && defined(_MSC_VER) + return _InterlockedDecrement( dest ); +#else return InterlockedExchangeAdd( dest, -1 ) - 1; +#endif } #endif /* __i386__ */

1 0

Dmitry Timoshkov : windowscodecs: Fix memory leak in error case.
by Alexandre Julliard 31 Jul '12

31 Jul '12

Module: wine Branch: master Commit: 127b502ce7e041b52e7da1baa424123367a4fb1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=127b502ce7e041b52e7da1baa… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 31 16:17:42 2012 +0900 windowscodecs: Fix memory leak in error case. --- dlls/windowscodecs/palette.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index 7d50d83..f033012 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -476,7 +476,11 @@ static HRESULT WINAPI PaletteImpl_InitializeFromPalette(IWICPalette *iface, colors = HeapAlloc(GetProcessHeap(), 0, sizeof(WICColor) * count); if (!colors) return E_OUTOFMEMORY; hr = IWICPalette_GetColors(source, count, colors, &count); - if (hr != S_OK) return hr; + if (hr != S_OK) + { + HeapFree(GetProcessHeap(), 0, colors); + return hr; + } } EnterCriticalSection(&This->lock);

1 0

Jacek Caban : guiddef.h: Use static const IID instance for __uuidof.
by Alexandre Julliard 31 Jul '12

31 Jul '12

Module: wine Branch: master Commit: e6ad25fffe1b7567048f948676dd1197fa6fc49d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6ad25fffe1b7567048f94867… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 31 10:37:03 2012 +0200 guiddef.h: Use static const IID instance for __uuidof. --- include/guiddef.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/include/guiddef.h b/include/guiddef.h index 26b1ad7..b7de1b1 100644 --- a/include/guiddef.h +++ b/include/guiddef.h @@ -40,7 +40,8 @@ extern "C++" { #define __CRT_UUID_DECL(type,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \ extern "C++" { \ template<> inline const GUID &__wine_uuidof<type>() { \ - return (const IID){l,w1,w2, {b1,b2,b3,b4,b5,b6,b7,b8}}; \ + static const IID __uuid_inst = {l,w1,w2, {b1,b2,b3,b4,b5,b6,b7,b8}}; \ + return __uuid_inst; \ } \ template<> inline const GUID &__wine_uuidof<type*>() { \ return __wine_uuidof<type>(); \

1 0

Michael Stefaniuc : winmm: Avoid TRUE FALSE conditional expressions.
by Alexandre Julliard 31 Jul '12

31 Jul '12

Module: wine Branch: master Commit: d94eaa3b20a8bfe5eb3a6a6d56f07c05d67796b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d94eaa3b20a8bfe5eb3a6a6d5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 31 10:58:15 2012 +0200 winmm: Avoid TRUE FALSE conditional expressions. --- dlls/winmm/mmio.c | 2 +- dlls/winmm/playsound.c | 2 +- dlls/winmm/tests/wave.c | 2 +- dlls/winmm/waveform.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index e77d641..7f35480 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -481,7 +481,7 @@ static BOOL MMIO_Destroy(LPWINE_MMIO wm) wm = NULL; } LeaveCriticalSection(&WINMM_cs); - return wm ? FALSE : TRUE; + return !wm; } /**************************************************************** diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index e5b820b..0d32274 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -525,7 +525,7 @@ static BOOL MULTIMEDIA_PlaySound(const void* pszSound, HMODULE hmod, DWORD fdwSo if (fdwSound & SND_ASYNC) { HANDLE handle; - wps->bLoop = (fdwSound & SND_LOOP) ? TRUE : FALSE; + wps->bLoop = (fdwSound & SND_LOOP) != 0; if ((handle = CreateThread(NULL, 0, proc_PlaySound, wps, 0, NULL)) != 0) { SetThreadPriority(handle, THREAD_PRIORITY_TIME_CRITICAL); CloseHandle(handle); diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 111dd1c..28b4145 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -605,7 +605,7 @@ static void wave_out_test_deviceOut(int device, double duration, WORD nChannels = pwfx->nChannels; WORD wBitsPerSample = pwfx->wBitsPerSample; DWORD nSamplesPerSec = pwfx->nSamplesPerSec; - BOOL has_volume = pcaps->dwSupport & WAVECAPS_VOLUME ? TRUE : FALSE; + BOOL has_volume = (pcaps->dwSupport & WAVECAPS_VOLUME) != 0; double paused = 0.0; DWORD_PTR callback = 0; DWORD_PTR callback_instance = 0; diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 602eb06..73f7a04 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -1778,7 +1778,7 @@ static LRESULT WINMM_Reset(HWAVE hwave) IAudioClient_Reset(device->client); cb_info = device->cb_info; - is_out = device->render ? TRUE : FALSE; + is_out = device->render != NULL; LeaveCriticalSection(&device->lock);

1 0