March 2013 - Wine-Commits - list.winehq.org

Alexandre Julliard : Wine release 1.5.27
by Alexandre Julliard March 29, 2013

March 29, 2013

Module: website Branch: master Commit: 51afc12a8d3b82507924348047007721faae5e35 URL: http://source.winehq.org/git/website.git/?a=commit;h=51afc12a8d3b8250792434… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 29 19:30:03 2013 +0100 Wine release 1.5.27 --- news/en/2013032901.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/en/2013032901.xml b/news/en/2013032901.xml new file mode 100644 index 0000000..22b2116 --- /dev/null +++ b/news/en/2013032901.xml @@ -0,0 +1,15 @@ +<news> +<date>March 29, 2013</date> +<title>Wine 1.5.27 Released</title> +<body> + The Wine development release 1.5.27 is now available. + <a href="{$root}/announce/1.5.27">What's new</a> in this release: +<ul> + <li>System tray support in the Mac driver.</li> + <li>Various C runtime improvements.</li> + <li>Large icons for built-in applications.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.27.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

Tag wine-1.5.27 : Alexandre Julliard : Release 1.5.27
by Alexandre Julliard March 29, 2013

March 29, 2013

Module: wine Branch: refs/tags/wine-1.5.27 Tag: d240f530219eb848719fe83bd33ebb5679a33b95 URL: http://source.winehq.org/git/wine.git/?a=tag;h=d240f530219eb848719fe83bd33e… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 29 19:19:16 2013 +0100 Release 1.5.27

1 0

Alexandre Julliard : Release 1.5.27.
by Alexandre Julliard March 29, 2013

March 29, 2013

Module: wine Branch: master Commit: e1a42bba54734dfcab59e22852405ad1030335e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1a42bba54734dfcab59e2285… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 29 19:19:16 2013 +0100 Release 1.5.27. --- ANNOUNCE | 629 ++++++++++++++++++++++++++----------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 275 insertions(+), 374 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e1a42bba54734dfcab59e…

1 0

Michael Stefaniuc : dplayx: Get rid of the useless IDirectPlay{2, 3} vtables .
by Alexandre Julliard March 29, 2013

March 29, 2013

Module: wine Branch: master Commit: 338c726682c75cf9ba953d7a8d64c4c0399cb8f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=338c726682c75cf9ba953d7a8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 16:58:51 2013 +0100 dplayx: Get rid of the useless IDirectPlay{2,3} vtables. --- dlls/dplayx/dplay.c | 257 ++------------------------------------------------- 1 files changed, 8 insertions(+), 249 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=338c726682c75cf9ba953…

1 0

Michael Stefaniuc : dplayx: Get rid of the unused DirectPlay3Data / DirectPlay4Data fields.
by Alexandre Julliard March 29, 2013

March 29, 2013

Module: wine Branch: master Commit: 0e7b1a46d521345eec57a2aa5a2a2bad3f0a80f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e7b1a46d521345eec57a2aa5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 16:38:52 2013 +0100 dplayx: Get rid of the unused DirectPlay3Data / DirectPlay4Data fields. --- dlls/dplayx/dplay.c | 56 +------------------------------------------- dlls/dplayx/dplay_global.h | 13 +--------- 2 files changed, 2 insertions(+), 67 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 62a76f1..0ddde38 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -391,52 +391,6 @@ static BOOL DP_DestroyDirectPlay2( LPVOID lpDP ) return TRUE; } -static BOOL DP_CreateDirectPlay3( LPVOID lpDP ) -{ - IDirectPlay3AImpl *This = lpDP; - - This->dp3 = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( *(This->dp3) ) ); - if ( This->dp3 == NULL ) - { - return FALSE; - } - - return TRUE; -} - -static BOOL DP_DestroyDirectPlay3( LPVOID lpDP ) -{ - IDirectPlay3AImpl *This = lpDP; - - /* Delete the contents */ - HeapFree( GetProcessHeap(), 0, This->dp3 ); - - return TRUE; -} - -static BOOL DP_CreateDirectPlay4( LPVOID lpDP ) -{ - IDirectPlay4AImpl *This = lpDP; - - This->dp4 = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( *(This->dp4) ) ); - if ( This->dp4 == NULL ) - { - return FALSE; - } - - return TRUE; -} - -static BOOL DP_DestroyDirectPlay4( LPVOID lpDP ) -{ - IDirectPlay3AImpl *This = lpDP; - - /* Delete the contents */ - HeapFree( GetProcessHeap(), 0, This->dp4 ); - - return TRUE; -} - /* Create a new interface */ HRESULT DP_CreateInterface @@ -492,11 +446,7 @@ HRESULT DP_CreateInterface } /* Initialize it */ - if ( DP_CreateIUnknown( *ppvObj ) && - DP_CreateDirectPlay2( *ppvObj ) && - DP_CreateDirectPlay3( *ppvObj ) && - DP_CreateDirectPlay4( *ppvObj ) - ) + if ( DP_CreateIUnknown( *ppvObj ) && DP_CreateDirectPlay2( *ppvObj ) ) { IDirectPlayX_AddRef( (LPDIRECTPLAY2A)*ppvObj ); @@ -504,8 +454,6 @@ HRESULT DP_CreateInterface } /* Initialize failed, destroy it */ - DP_DestroyDirectPlay4( *ppvObj ); - DP_DestroyDirectPlay3( *ppvObj ); DP_DestroyDirectPlay2( *ppvObj ); DP_DestroyIUnknown( *ppvObj ); @@ -614,8 +562,6 @@ static ULONG WINAPI DP_Release { /* If we're destroying the object, this must be the last ref of the last interface */ - DP_DestroyDirectPlay4( This ); - DP_DestroyDirectPlay3( This ); DP_DestroyDirectPlay2( This ); DP_DestroyIUnknown( This ); } diff --git a/dlls/dplayx/dplay_global.h b/dlls/dplayx/dplay_global.h index 273f09e..7578e04 100644 --- a/dlls/dplayx/dplay_global.h +++ b/dlls/dplayx/dplay_global.h @@ -196,21 +196,10 @@ typedef struct tagDirectPlay2Data DPQ_HEAD( tagDP_MSG_REPLY_STRUCT_LIST ) repliesExpected; } DirectPlay2Data; -typedef struct tagDirectPlay3Data -{ - BOOL dummy; -} DirectPlay3Data; -typedef struct tagDirectPlay4Data -{ - BOOL dummy; -} DirectPlay4Data; - #define DP_IMPL_FIELDS \ LONG ulInterfaceRef; \ DirectPlayIUnknownData* unk; \ - DirectPlay2Data* dp2; \ - DirectPlay3Data* dp3; \ - DirectPlay4Data* dp4; + DirectPlay2Data* dp2; struct IDirectPlay2Impl {

1 0

Michael Stefaniuc : dplayx: Have the decency to support IUnknown in DirectPlay.
by Alexandre Julliard March 29, 2013

March 29, 2013

Module: wine Branch: master Commit: caf9d42e0d8888809075896cee0f4a42f93f0a16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=caf9d42e0d8888809075896ce… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 16:34:45 2013 +0100 dplayx: Have the decency to support IUnknown in DirectPlay. --- dlls/dplayx/dplay.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 29212bc..62a76f1 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -457,7 +457,7 @@ HRESULT DP_CreateInterface IDirectPlay2Impl *This = *ppvObj; This->lpVtbl = &directPlay2WVT; } - else if( IsEqualGUID( &IID_IDirectPlay2A, riid ) ) + else if( IsEqualGUID( &IID_IUnknown, riid ) || IsEqualGUID( &IID_IDirectPlay2A, riid ) ) { IDirectPlay2AImpl *This = *ppvObj; This->lpVtbl = &directPlay2AVT; @@ -541,7 +541,7 @@ static HRESULT WINAPI DP_QueryInterface IDirectPlay2Impl *This = *ppvObj; This->lpVtbl = &directPlay2WVT; } - else if( IsEqualGUID( &IID_IDirectPlay2A, riid ) ) + else if( IsEqualGUID( &IID_IUnknown, riid ) || IsEqualGUID( &IID_IDirectPlay2A, riid ) ) { IDirectPlay2AImpl *This = *ppvObj; This->lpVtbl = &directPlay2AVT;

1 0

Michael Stefaniuc : dplayx: Fix DllGetClassObject().
by Alexandre Julliard March 29, 2013

March 29, 2013

Module: wine Branch: master Commit: 99c726dd86b8fd08e1416f8e747f4430ef8abdf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99c726dd86b8fd08e1416f8e7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 16:34:04 2013 +0100 dplayx: Fix DllGetClassObject(). --- dlls/dplayx/dpclassfactory.c | 40 +++++++++++++++------------------------- 1 files changed, 15 insertions(+), 25 deletions(-) diff --git a/dlls/dplayx/dpclassfactory.c b/dlls/dplayx/dpclassfactory.c index 537fe6b..2502e1e 100644 --- a/dlls/dplayx/dpclassfactory.c +++ b/dlls/dplayx/dpclassfactory.c @@ -36,13 +36,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(dplay); -/******************************************************************************* - * DirectPlayLobby ClassFactory - */ - typedef struct { IClassFactory IClassFactory_iface; + HRESULT (*createinstance)(REFIID riid, void **ppv); } IClassFactoryImpl; static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) @@ -78,22 +75,16 @@ static ULONG WINAPI IClassFactoryImpl_Release(IClassFactory *iface) } static HRESULT WINAPI IClassFactoryImpl_CreateInstance(IClassFactory *iface, IUnknown *pOuter, - REFIID riid, void **ppobj) + REFIID riid, void **ppv) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); + IClassFactoryImpl *This = impl_from_IClassFactory(iface); - TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj); + TRACE("(%p)->(%p,%s,%p)\n", iface, pOuter, debugstr_guid(riid), ppv); - if ( DPL_CreateInterface( riid, ppobj ) == S_OK ) - { - return S_OK; - } - else if ( DP_CreateInterface( riid, ppobj ) == S_OK ) - { - return S_OK; - } + if (pOuter) + return CLASS_E_NOAGGREGATION; - return E_NOINTERFACE; + return This->createinstance(riid, ppv); } static HRESULT WINAPI IClassFactoryImpl_LockServer(IClassFactory *iface, BOOL dolock) @@ -102,7 +93,7 @@ static HRESULT WINAPI IClassFactoryImpl_LockServer(IClassFactory *iface, BOOL do return S_OK; } -static const IClassFactoryVtbl DP_and_DPL_Vtbl = { +static const IClassFactoryVtbl cf_vt = { IClassFactoryImpl_QueryInterface, IClassFactoryImpl_AddRef, IClassFactoryImpl_Release, @@ -110,7 +101,8 @@ static const IClassFactoryVtbl DP_and_DPL_Vtbl = { IClassFactoryImpl_LockServer }; -static IClassFactoryImpl DP_and_DPL_CF = {{&DP_and_DPL_Vtbl}}; +static IClassFactoryImpl dplay_cf = {{&cf_vt}, DP_CreateInterface}; +static IClassFactoryImpl dplaylobby_cf = {{&cf_vt}, DPL_CreateInterface}; /******************************************************************************* @@ -134,14 +126,12 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { TRACE("(%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); - if ( IsEqualCLSID( riid, &IID_IClassFactory ) ) - { - *ppv = &DP_and_DPL_CF; - IClassFactory_AddRef( (IClassFactory*)*ppv ); + if (IsEqualCLSID(&CLSID_DirectPlay, rclsid)) + return IClassFactory_QueryInterface(&dplay_cf.IClassFactory_iface, riid, ppv); - return S_OK; - } + if (IsEqualCLSID(&CLSID_DirectPlayLobby, rclsid)) + return IClassFactory_QueryInterface(&dplaylobby_cf.IClassFactory_iface, riid, ppv); - ERR("(%s,%s,%p): no interface found.\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + FIXME("(%s,%s,%p): no class found.\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); return CLASS_E_CLASSNOTAVAILABLE; }

1 0

Michael Stefaniuc : dplayx: Fix QueryInterface, AddRef and Release methods for IClassFactory.
by Alexandre Julliard March 29, 2013

March 29, 2013

Module: wine Branch: master Commit: a9c715fd740862d898312ac9b8f28dc7866de8f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9c715fd740862d898312ac9b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 16:33:25 2013 +0100 dplayx: Fix QueryInterface, AddRef and Release methods for IClassFactory. --- dlls/dplayx/dpclassfactory.c | 31 ++++++++++++++++--------------- 1 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/dplayx/dpclassfactory.c b/dlls/dplayx/dpclassfactory.c index a933e90..537fe6b 100644 --- a/dlls/dplayx/dpclassfactory.c +++ b/dlls/dplayx/dpclassfactory.c @@ -42,9 +42,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dplay); typedef struct { - /* IUnknown fields */ IClassFactory IClassFactory_iface; - LONG ref; } IClassFactoryImpl; static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) @@ -53,26 +51,30 @@ static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) } static HRESULT WINAPI IClassFactoryImpl_QueryInterface(IClassFactory *iface, REFIID riid, - void **ppobj) + void **ppv) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); + TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); - FIXME("(%p)->(%s,%p),stub!\n",This,debugstr_guid(riid),ppobj); + if (IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IClassFactory, riid)) + { + *ppv = iface; + IClassFactory_AddRef(iface); + return S_OK; + } - return E_NOINTERFACE; + *ppv = NULL; + WARN("no interface for %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; } static ULONG WINAPI IClassFactoryImpl_AddRef(IClassFactory *iface) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); - return InterlockedIncrement(&This->ref); + return 2; /* non-heap based object */ } static ULONG WINAPI IClassFactoryImpl_Release(IClassFactory *iface) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); - /* static class (reference starts @ 1), won't ever be freed */ - return InterlockedDecrement(&This->ref); + return 1; /* non-heap based object */ } static HRESULT WINAPI IClassFactoryImpl_CreateInstance(IClassFactory *iface, IUnknown *pOuter, @@ -96,9 +98,8 @@ static HRESULT WINAPI IClassFactoryImpl_CreateInstance(IClassFactory *iface, IUn static HRESULT WINAPI IClassFactoryImpl_LockServer(IClassFactory *iface, BOOL dolock) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); - FIXME("(%p)->(%d),stub!\n",This,dolock); - return S_OK; + FIXME("(%p)->(%d),stub!\n", iface, dolock); + return S_OK; } static const IClassFactoryVtbl DP_and_DPL_Vtbl = { @@ -109,7 +110,7 @@ static const IClassFactoryVtbl DP_and_DPL_Vtbl = { IClassFactoryImpl_LockServer }; -static IClassFactoryImpl DP_and_DPL_CF = {{&DP_and_DPL_Vtbl}, 1 }; +static IClassFactoryImpl DP_and_DPL_CF = {{&DP_and_DPL_Vtbl}}; /*******************************************************************************

1 0

Jactry Zeng : msvcrt: Added _wcsncoll and _wcsncoll_l implementation.
by Alexandre Julliard March 29, 2013

March 29, 2013

Module: wine Branch: master Commit: 2f425fb8326f9ccda96bd5b9dc604f911d23b56d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f425fb8326f9ccda96bd5b9d… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Fri Mar 29 17:12:53 2013 +0800 msvcrt: Added _wcsncoll and _wcsncoll_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt/wcs.c | 24 ++++++++++++++++++++++++ 6 files changed, 30 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index af00082..6476571 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1491,7 +1491,7 @@ @ cdecl _wcslwr_s(wstr long) msvcrt._wcslwr_s @ stub _wcslwr_s_l @ cdecl _wcsncoll(wstr wstr long) msvcrt._wcsncoll -@ stub _wcsncoll_l +@ cdecl _wcsncoll_l(wstr wstr long ptr) msvcrt._wcsncoll_l @ cdecl _wcsnicmp(wstr wstr long) msvcrt._wcsnicmp @ stub _wcsnicmp_l @ cdecl _wcsnicoll(wstr wstr long) msvcrt._wcsnicoll diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index a80cc6e..c8c99f1 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1854,7 +1854,7 @@ @ cdecl _wcslwr_s(wstr long) msvcrt._wcslwr_s @ stub _wcslwr_s_l @ cdecl _wcsncoll(wstr wstr long) msvcrt._wcsncoll -@ stub _wcsncoll_l +@ cdecl _wcsncoll_l(wstr wstr long ptr) msvcrt._wcsncoll_l @ cdecl _wcsnicmp(wstr wstr long) msvcrt._wcsnicmp @ stub _wcsnicmp_l @ cdecl _wcsnicoll(wstr wstr long) msvcrt._wcsnicoll diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index d8f361f..cd83405 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1151,7 +1151,7 @@ @ cdecl _wcslwr_s(wstr long) msvcrt._wcslwr_s @ stub _wcslwr_s_l @ cdecl _wcsncoll(wstr wstr long) msvcrt._wcsncoll -@ stub _wcsncoll_l +@ cdecl _wcsncoll_l(wstr wstr long ptr) msvcrt._wcsncoll_l @ cdecl _wcsnicmp(wstr wstr long) msvcrt._wcsnicmp @ stub _wcsnicmp_l @ cdecl _wcsnicoll(wstr wstr long) msvcrt._wcsnicoll diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 7916839..6d19a3d 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1145,7 +1145,7 @@ @ cdecl _wcslwr_s(wstr long) msvcrt._wcslwr_s @ stub _wcslwr_s_l @ cdecl _wcsncoll(wstr wstr long) msvcrt._wcsncoll -@ stub _wcsncoll_l +@ cdecl _wcsncoll_l(wstr wstr long ptr) msvcrt._wcsncoll_l @ cdecl _wcsnicmp(wstr wstr long) msvcrt._wcsnicmp @ stub _wcsnicmp_l @ cdecl _wcsnicoll(wstr wstr long) msvcrt._wcsnicoll diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index edef615..89d9028 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1109,8 +1109,8 @@ # stub _wcslwr_l(wstr ptr) @ cdecl _wcslwr_s(wstr long) MSVCRT__wcslwr_s # stub _wcslwr_s_l(wstr long ptr) -@ stub _wcsncoll(wstr wstr long) -# stub _wcsncoll_l(wstr wstr long ptr) +@ cdecl _wcsncoll(wstr wstr long) MSVCRT__wcsncoll +@ cdecl _wcsncoll_l(wstr wstr long ptr) MSVCRT__wcsncoll_l @ cdecl _wcsnicmp(wstr wstr long) ntdll._wcsnicmp # stub _wcsnicmp_l(wstr wstr long ptr) @ cdecl _wcsnicoll(wstr wstr long) MSVCRT__wcsnicoll diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index eb268dc..511a814 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -199,6 +199,30 @@ int CDECL MSVCRT__wcslwr_s( MSVCRT_wchar_t* str, MSVCRT_size_t n ) } /********************************************************************* + * _wcsncoll_l (MSVCRT.@) + */ +int CDECL MSVCRT__wcsncoll_l(const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str2, + MSVCRT_size_t count, MSVCRT__locale_t locale) +{ + MSVCRT_pthreadlocinfo locinfo; + + if(!locale) + locinfo = get_locinfo(); + else + locinfo = locale->locinfo; + + return CompareStringW(locinfo->lc_handle[MSVCRT_LC_COLLATE], 0, str1, count, str2, count)-CSTR_EQUAL; +} + +/********************************************************************* + * _wcsncoll (MSVCRT.@) + */ +int CDECL MSVCRT__wcsncoll(const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str2, MSVCRT_size_t count) +{ + return MSVCRT__wcsncoll_l(str1, str2, count, NULL); +} + +/********************************************************************* * _wcstod_l (MSVCRT.@) */ double CDECL MSVCRT__wcstod_l(const MSVCRT_wchar_t* str, MSVCRT_wchar_t** end,

1 0

Ken Thomases : winemac: Add proper locking in macdrv_surface_set_region().
by Alexandre Julliard March 29, 2013

March 29, 2013

Module: wine Branch: master Commit: 7ab76484c44c687e7c95c2680cd6895648fbabfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ab76484c44c687e7c95c2680… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Mar 28 23:33:56 2013 -0500 winemac: Add proper locking in macdrv_surface_set_region(). --- dlls/winemac.drv/surface.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/surface.c b/dlls/winemac.drv/surface.c index 748562f..29fc7f8 100644 --- a/dlls/winemac.drv/surface.c +++ b/dlls/winemac.drv/surface.c @@ -124,6 +124,8 @@ static void macdrv_surface_set_region(struct window_surface *window_surface, HRG TRACE("updating surface %p with %p\n", surface, region); + window_surface->funcs->lock(window_surface); + HeapFree(GetProcessHeap(), 0, surface->region_data); surface->region_data = NULL; @@ -133,6 +135,8 @@ static void macdrv_surface_set_region(struct window_surface *window_surface, HRG if (rc != ERROR) surface->region_data = get_region_data(region, 0); } + + window_surface->funcs->unlock(window_surface); } /***********************************************************************

1 0