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> +<p> The Wine development release 1.5.27 is now available.</p> +<p> <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></p> +<p><p>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>. +</p></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

Michael Stefaniuc : dplayx/tests: Add DirectPlay COM tests.
by Alexandre Julliard March 29, 2013

March 29, 2013

Module: wine Branch: master Commit: d09d061157fc749ad10a794ef8d6e46d3605e339 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d09d061157fc749ad10a794ef… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 16:37:52 2013 +0100 dplayx/tests: Add DirectPlay COM tests. --- dlls/dplayx/tests/dplayx.c | 86 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 84 insertions(+), 2 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 2fea137..c8ec54d 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS #include "wine/test.h" #include <stdio.h> #define INITGUID @@ -6364,17 +6365,98 @@ static void test_host_migration(void) } +static void test_COM(void) +{ + IDirectPlay2A *dp2A; + IDirectPlay2 *dp2; + IDirectPlay3A *dp3A; + IDirectPlay3 *dp3; + IDirectPlay4A *dp4A; + IDirectPlay4 *dp4 = (IDirectPlay4*)0xdeadbeef; + IUnknown *unk; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_DirectPlay, (IUnknown*)&dp4, CLSCTX_INPROC_SERVER, &IID_IUnknown, + (void**)&dp4); + ok(hr == CLASS_E_NOAGGREGATION, + "DirectPlay create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + ok(!dp4, "dp4 = %p\n", dp4); + + /* Invalid RIID */ + hr = CoCreateInstance(&CLSID_DirectPlay, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectPlayLobby, + (void**)&dp4); + ok(hr == E_NOINTERFACE, "DirectPlay create failed: %08x, expected E_NOINTERFACE\n", hr); + + /* Different refcount for all DirectPlay Interfaces */ + hr = CoCreateInstance(&CLSID_DirectPlay, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectPlay4, + (void**)&dp4); + ok(hr == S_OK, "DirectPlay create failed: %08x, expected S_OK\n", hr); + refcount = IDirectPlayX_AddRef(dp4); + todo_wine ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IDirectPlayX_QueryInterface(dp4, &IID_IDirectPlay2A, (void**)&dp2A); + ok(hr == S_OK, "QueryInterface for IID_IDirectPlay2A failed: %08x\n", hr); + refcount = IDirectPlay2_AddRef(dp2A); + todo_wine ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + IDirectPlay2_Release(dp2A); + + hr = IDirectPlayX_QueryInterface(dp4, &IID_IDirectPlay2, (void**)&dp2); + ok(hr == S_OK, "QueryInterface for IID_IDirectPlay2 failed: %08x\n", hr); + refcount = IDirectPlay2_AddRef(dp2); + todo_wine ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + IDirectPlay2_Release(dp2); + + hr = IDirectPlayX_QueryInterface(dp4, &IID_IDirectPlay3A, (void**)&dp3A); + ok(hr == S_OK, "QueryInterface for IID_IDirectPlay3A failed: %08x\n", hr); + refcount = IDirectPlay3_AddRef(dp3A); + todo_wine ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + IDirectPlay3_Release(dp3A); + + hr = IDirectPlayX_QueryInterface(dp4, &IID_IDirectPlay3, (void**)&dp3); + ok(hr == S_OK, "QueryInterface for IID_IDirectPlay3 failed: %08x\n", hr); + refcount = IDirectPlay3_AddRef(dp3); + todo_wine ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + IDirectPlay3_Release(dp3); + + hr = IDirectPlayX_QueryInterface(dp4, &IID_IDirectPlay4A, (void**)&dp4A); + ok(hr == S_OK, "QueryInterface for IID_IDirectPlay4A failed: %08x\n", hr); + refcount = IDirectPlayX_AddRef(dp4A); + todo_wine ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + IDirectPlayX_Release(dp4A); + + hr = IDirectPlayX_QueryInterface(dp4, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + todo_wine ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + refcount = IUnknown_Release(unk); + todo_wine ok(refcount == 1, "refcount == %u, expected 1\n", refcount); + + IUnknown_Release(unk); + IDirectPlayX_Release(dp4A); + IDirectPlay3_Release(dp3); + IDirectPlay3_Release(dp3A); + IDirectPlay2_Release(dp2); + IDirectPlay2_Release(dp2A); + IDirectPlayX_Release(dp4); + refcount = IDirectPlayX_Release(dp4); + todo_wine ok(refcount == 0, "refcount == %u, expected 0\n", refcount); +} + START_TEST(dplayx) { + CoInitialize( NULL ); + + test_COM(); + if (!winetest_interactive) { skip("Run in interactive mode to run dplayx tests.\n"); return; } - CoInitialize( NULL ); - trace("Running in interactive mode, tests will take a while\n"); test_DirectPlayCreate();

1 0

Ken Thomases : winemac: Draw surface region rects separately instead of clipping one big draw.
by Alexandre Julliard March 29, 2013

March 29, 2013

Module: wine Branch: master Commit: 0e8b30502341ee9483d5f4cbc5878ae4a4787e1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e8b30502341ee9483d5f4cbc… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Mar 28 23:34:03 2013 -0500 winemac: Draw surface region rects separately instead of clipping one big draw. --- dlls/winemac.drv/cocoa_window.m | 66 ++++++++++++++++++++------------------ 1 files changed, 35 insertions(+), 31 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 48ca593..279f81f 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -186,51 +186,55 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) if (window.surface && window.surface_mutex && !pthread_mutex_lock(window.surface_mutex)) { + CGRect bounds; const CGRect* rects; int count; - if (!get_surface_region_rects(window.surface, &rects, &count) || count) + if (!get_surface_region_rects(window.surface, &rects, &count)) { - CGRect imageRect; - CGImageRef image; + bounds = NSRectToCGRect([self bounds]); + rects = &bounds; + count = 1; + } - imageRect = NSRectToCGRect(rect); - image = create_surface_image(window.surface, &imageRect, FALSE); + if (count) + { + CGContextRef context; + int i; - if (image) - { - CGContextRef context; + [window.shape addClip]; - if (rects && count) - { - NSBezierPath* surfaceClip = [NSBezierPath bezierPath]; - int i; - for (i = 0; i < count; i++) - [surfaceClip appendBezierPathWithRect:NSRectFromCGRect(rects[i])]; - [surfaceClip addClip]; - } + context = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort]; + CGContextSetBlendMode(context, kCGBlendModeCopy); - [window.shape addClip]; + for (i = 0; i < count; i++) + { + CGRect imageRect; + CGImageRef image; + + imageRect = CGRectIntersection(rects[i], NSRectToCGRect(rect)); + image = create_surface_image(window.surface, &imageRect, FALSE); - if (window.colorKeyed) + if (image) { - CGImageRef maskedImage; - CGFloat components[] = { window.colorKeyRed - 0.5, window.colorKeyRed + 0.5, - window.colorKeyGreen - 0.5, window.colorKeyGreen + 0.5, - window.colorKeyBlue - 0.5, window.colorKeyBlue + 0.5 }; - maskedImage = CGImageCreateWithMaskingColors(image, components); - if (maskedImage) + if (window.colorKeyed) { - CGImageRelease(image); - image = maskedImage; + CGImageRef maskedImage; + CGFloat components[] = { window.colorKeyRed - 0.5, window.colorKeyRed + 0.5, + window.colorKeyGreen - 0.5, window.colorKeyGreen + 0.5, + window.colorKeyBlue - 0.5, window.colorKeyBlue + 0.5 }; + maskedImage = CGImageCreateWithMaskingColors(image, components); + if (maskedImage) + { + CGImageRelease(image); + image = maskedImage; + } } - } - context = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort]; - CGContextSetBlendMode(context, kCGBlendModeCopy); - CGContextDrawImage(context, imageRect, image); + CGContextDrawImage(context, imageRect, image); - CGImageRelease(image); + CGImageRelease(image); + } } }

1 0

Michael Stefaniuc : dplayx: Remove the duplicated IDirectPlayXImpl structs.
by Alexandre Julliard March 29, 2013

March 29, 2013

Module: wine Branch: master Commit: 82b51258eae9ab4dc1e6e2e2d5b7c61980d12037 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82b51258eae9ab4dc1e6e2e2d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 16:39:26 2013 +0100 dplayx: Remove the duplicated IDirectPlayXImpl structs. --- dlls/dplayx/dplay.c | 29 +++++------------------------ dlls/dplayx/dplay_global.h | 44 +++++++++++++------------------------------- 2 files changed, 18 insertions(+), 55 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 0ddde38..c7ab380 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -396,46 +396,26 @@ static BOOL DP_DestroyDirectPlay2( LPVOID lpDP ) HRESULT DP_CreateInterface ( REFIID riid, LPVOID* ppvObj ) { - TRACE( " for %s\n", debugstr_guid( riid ) ); + IDirectPlayImpl *This; - *ppvObj = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof( IDirectPlay2Impl ) ); + TRACE( " for %s\n", debugstr_guid( riid ) ); - if( *ppvObj == NULL ) - { + This = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( IDirectPlayImpl ) ); + if( !This ) return DPERR_OUTOFMEMORY; - } if( IsEqualGUID( &IID_IDirectPlay2, riid ) ) - { - IDirectPlay2Impl *This = *ppvObj; This->lpVtbl = &directPlay2WVT; - } else if( IsEqualGUID( &IID_IUnknown, riid ) || IsEqualGUID( &IID_IDirectPlay2A, riid ) ) - { - IDirectPlay2AImpl *This = *ppvObj; This->lpVtbl = &directPlay2AVT; - } else if( IsEqualGUID( &IID_IDirectPlay3, riid ) ) - { - IDirectPlay3Impl *This = *ppvObj; This->lpVtbl = &directPlay3WVT; - } else if( IsEqualGUID( &IID_IDirectPlay3A, riid ) ) - { - IDirectPlay3AImpl *This = *ppvObj; This->lpVtbl = &directPlay3AVT; - } else if( IsEqualGUID( &IID_IDirectPlay4, riid ) ) - { - IDirectPlay4Impl *This = *ppvObj; This->lpVtbl = &directPlay4WVT; - } else if( IsEqualGUID( &IID_IDirectPlay4A, riid ) ) - { - IDirectPlay4AImpl *This = *ppvObj; This->lpVtbl = &directPlay4AVT; - } else { /* Unsupported interface */ @@ -446,6 +426,7 @@ HRESULT DP_CreateInterface } /* Initialize it */ + *ppvObj = This; if ( DP_CreateIUnknown( *ppvObj ) && DP_CreateDirectPlay2( *ppvObj ) ) { IDirectPlayX_AddRef( (LPDIRECTPLAY2A)*ppvObj ); diff --git a/dlls/dplayx/dplay_global.h b/dlls/dplayx/dplay_global.h index 7578e04..94b8f9a 100644 --- a/dlls/dplayx/dplay_global.h +++ b/dlls/dplayx/dplay_global.h @@ -31,16 +31,6 @@ extern HRESULT DPL_EnumAddress( LPDPENUMADDRESSCALLBACK lpEnumAddressCallback, LPCVOID lpAddress, DWORD dwAddressSize, LPVOID lpContext ) DECLSPEC_HIDDEN; -/***************************************************************************** - * Predeclare the interface implementation structures - */ -typedef struct IDirectPlay2Impl IDirectPlay2AImpl; -typedef struct IDirectPlay2Impl IDirectPlay2Impl; -typedef struct IDirectPlay3Impl IDirectPlay3AImpl; -typedef struct IDirectPlay3Impl IDirectPlay3Impl; -typedef struct IDirectPlay4Impl IDirectPlay4AImpl; -typedef struct IDirectPlay4Impl IDirectPlay4Impl; - typedef struct tagDirectPlayIUnknownData { LONG ulObjRef; @@ -196,28 +186,20 @@ typedef struct tagDirectPlay2Data DPQ_HEAD( tagDP_MSG_REPLY_STRUCT_LIST ) repliesExpected; } DirectPlay2Data; -#define DP_IMPL_FIELDS \ - LONG ulInterfaceRef; \ - DirectPlayIUnknownData* unk; \ - DirectPlay2Data* dp2; - -struct IDirectPlay2Impl -{ - const IDirectPlay2Vtbl *lpVtbl; - DP_IMPL_FIELDS -}; - -struct IDirectPlay3Impl +typedef struct IDirectPlayImpl { - const IDirectPlay3Vtbl *lpVtbl; - DP_IMPL_FIELDS -}; - -struct IDirectPlay4Impl -{ - const IDirectPlay4Vtbl *lpVtbl; - DP_IMPL_FIELDS -}; + const void *lpVtbl; + LONG ulInterfaceRef; + DirectPlayIUnknownData *unk; + DirectPlay2Data *dp2; +} IDirectPlayImpl; + +typedef struct IDirectPlayImpl IDirectPlay2Impl; +typedef struct IDirectPlayImpl IDirectPlay2AImpl; +typedef struct IDirectPlayImpl IDirectPlay3Impl; +typedef struct IDirectPlayImpl IDirectPlay3AImpl; +typedef struct IDirectPlayImpl IDirectPlay4Impl; +typedef struct IDirectPlayImpl IDirectPlay4AImpl; HRESULT DP_HandleMessage( IDirectPlay2Impl* This, LPCVOID lpMessageBody, DWORD dwMessageBodySize, LPCVOID lpMessageHeader,

1 0

Michael Stefaniuc : dplayx/tests: Get rid of the LPDIRECTPLAY type usage.
by Alexandre Julliard March 29, 2013

March 29, 2013

Module: wine Branch: master Commit: 7eaafd0141ad3309e6601bc4905835345b2db2ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=7eaafd0141ad3309e6601bc49… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 16:36:52 2013 +0100 dplayx/tests: Get rid of the LPDIRECTPLAY type usage. --- dlls/dplayx/tests/dplayx.c | 70 ++++++++++++++++++++----------------------- 1 files changed, 33 insertions(+), 37 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index e507c50..2fea137 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -63,7 +63,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); typedef struct tagCallbackData { - LPDIRECTPLAY4 pDP; + IDirectPlay4 *pDP; UINT dwCounter1, dwCounter2; DWORD dwFlags; char szTrace1[1024], szTrace2[1024]; @@ -581,10 +581,8 @@ static char dpid2char(DPID* dpid, DWORD dpidSize, DPID idPlayer) return '?'; } -static void check_messages( LPDIRECTPLAY4 pDP, - DPID *dpid, - DWORD dpidSize, - lpCallbackData callbackData ) +static void check_messages( IDirectPlay4 *pDP, DPID *dpid, DWORD dpidSize, + lpCallbackData callbackData ) { /* Retrieves all messages from the queue of pDP, performing tests * to check if we are receiving what we expect. @@ -647,9 +645,7 @@ static void check_messages( LPDIRECTPLAY4 pDP, HeapFree( GetProcessHeap(), 0, lpData ); } -static void init_TCPIP_provider( LPDIRECTPLAY4 pDP, - LPCSTR strIPAddressString, - WORD port ) +static void init_TCPIP_provider( IDirectPlay4 *pDP, LPCSTR strIPAddressString, WORD port ) { DPCOMPOUNDADDRESSELEMENT addressElements[3]; @@ -732,7 +728,7 @@ static BOOL CALLBACK EnumSessions_cb_join( LPCDPSESSIONDESC2 lpThisSD, static void test_DirectPlayCreate(void) { - LPDIRECTPLAY pDP; + IDirectPlay *pDP; HRESULT hr; /* TODO: Check how it behaves with pUnk!=NULL */ @@ -833,7 +829,7 @@ static BOOL CALLBACK EnumConnections_cb( LPCGUID lpguidSP, static void test_EnumConnections(void) { - LPDIRECTPLAY4 pDP; + IDirectPlay4 *pDP; CallbackData callbackData; HRESULT hr; @@ -936,7 +932,7 @@ static BOOL CALLBACK EnumConnections_cb2( LPCGUID lpguidSP, static void test_InitializeConnection(void) { - LPDIRECTPLAY4 pDP; + IDirectPlay4 *pDP; HRESULT hr; hr = CoCreateInstance( &CLSID_DirectPlay, NULL, CLSCTX_ALL, @@ -955,7 +951,7 @@ static void test_InitializeConnection(void) static void test_GetCaps(void) { - LPDIRECTPLAY4 pDP; + IDirectPlay4 *pDP; DPCAPS dpcaps; DWORD dwFlags; HRESULT hr; @@ -1068,7 +1064,7 @@ static BOOL CALLBACK EnumSessions_cb2( LPCDPSESSIONDESC2 lpThisSD, static void test_Open(void) { - LPDIRECTPLAY4 pDP, pDP_server; + IDirectPlay4 *pDP, *pDP_server; DPSESSIONDESC2 dpsd, dpsd_server; HRESULT hr; @@ -1228,10 +1224,10 @@ static BOOL CALLBACK EnumSessions_cb( LPCDPSESSIONDESC2 lpThisSD, return TRUE; } -static LPDIRECTPLAY4 create_session(DPSESSIONDESC2 *lpdpsd) +static IDirectPlay4 *create_session(DPSESSIONDESC2 *lpdpsd) { - LPDIRECTPLAY4 pDP; + IDirectPlay4 *pDP; DPNAME name; DPID dpid; HRESULT hr; @@ -1266,7 +1262,7 @@ static void test_EnumSessions(void) #define N_SESSIONS 6 - LPDIRECTPLAY4 pDP, pDPserver[N_SESSIONS]; + IDirectPlay4 *pDP, *pDPserver[N_SESSIONS]; DPSESSIONDESC2 dpsd, dpsd_server[N_SESSIONS]; CallbackData callbackData; HRESULT hr; @@ -1636,7 +1632,7 @@ static void test_EnumSessions(void) static void test_SessionDesc(void) { - LPDIRECTPLAY4 pDP[2]; + IDirectPlay4 *pDP[2]; DPSESSIONDESC2 dpsd; LPDPSESSIONDESC2 lpData[2]; LPVOID lpDataMsg; @@ -1814,7 +1810,7 @@ static void test_SessionDesc(void) static void test_CreatePlayer(void) { - LPDIRECTPLAY4 pDP[2]; + IDirectPlay4 *pDP[2]; DPSESSIONDESC2 dpsd; DPNAME name; DPID dpid; @@ -1987,7 +1983,7 @@ static void test_CreatePlayer(void) static void test_GetPlayerCaps(void) { - LPDIRECTPLAY4 pDP[2]; + IDirectPlay4 *pDP[2]; DPSESSIONDESC2 dpsd; DPID dpid[2]; HRESULT hr; @@ -2149,7 +2145,7 @@ static void test_GetPlayerCaps(void) static void test_PlayerData(void) { - LPDIRECTPLAY4 pDP; + IDirectPlay4 *pDP; DPSESSIONDESC2 dpsd; DPID dpid; HRESULT hr; @@ -2415,7 +2411,7 @@ static void test_PlayerData(void) static void test_PlayerName(void) { - LPDIRECTPLAY4 pDP[2]; + IDirectPlay4 *pDP[2]; DPSESSIONDESC2 dpsd; DPID dpid[2]; HRESULT hr; @@ -2695,7 +2691,7 @@ static BOOL CALLBACK EnumSessions_cb_join_secure( LPCDPSESSIONDESC2 lpThisSD, static void test_GetPlayerAccount(void) { - LPDIRECTPLAY4 pDP[2]; + IDirectPlay4 *pDP[2]; DPSESSIONDESC2 dpsd; DPID dpid[2]; HRESULT hr; @@ -2879,7 +2875,7 @@ static BOOL CALLBACK EnumAddress_cb( REFGUID guidDataType, static void test_GetPlayerAddress(void) { - LPDIRECTPLAY4 pDP[2]; + IDirectPlay4 *pDP[2]; LPDIRECTPLAYLOBBY3 pDPL; DPSESSIONDESC2 dpsd; DPID dpid[2]; @@ -3017,7 +3013,7 @@ static void test_GetPlayerAddress(void) static void test_GetPlayerFlags(void) { - LPDIRECTPLAY4 pDP[2]; + IDirectPlay4 *pDP[2]; DPSESSIONDESC2 dpsd; DPID dpid[4]; HRESULT hr; @@ -3125,7 +3121,7 @@ static void test_GetPlayerFlags(void) static void test_CreateGroup(void) { - LPDIRECTPLAY4 pDP; + IDirectPlay4 *pDP; DPSESSIONDESC2 dpsd; DPID idFrom, idTo, dpid, idGroup, idGroupParent; DPNAME groupName; @@ -3434,7 +3430,7 @@ static void test_CreateGroup(void) static void test_GroupOwner(void) { - LPDIRECTPLAY4 pDP[2]; + IDirectPlay4 *pDP[2]; DPSESSIONDESC2 dpsd; DPID dpid[2], idGroup, idOwner; HRESULT hr; @@ -3602,7 +3598,7 @@ static BOOL CALLBACK EnumSessions_cb_EnumPlayers( LPCDPSESSIONDESC2 lpThisSD, static void test_EnumPlayers(void) { - LPDIRECTPLAY4 pDP[3]; + IDirectPlay4 *pDP[3]; DPSESSIONDESC2 dpsd[3]; DPID dpid[5+2]; /* 5 players, 2 groups */ CallbackData callbackData; @@ -3925,7 +3921,7 @@ static BOOL CALLBACK EnumSessions_cb_EnumGroups( LPCDPSESSIONDESC2 lpThisSD, static void test_EnumGroups(void) { - LPDIRECTPLAY4 pDP[3]; + IDirectPlay4 *pDP[3]; DPSESSIONDESC2 dpsd[3]; DPID dpid[5]; CallbackData callbackData; @@ -4152,7 +4148,7 @@ static void test_EnumGroups(void) static void test_EnumGroupsInGroup(void) { - LPDIRECTPLAY4 pDP[2]; + IDirectPlay4 *pDP[2]; DPSESSIONDESC2 dpsd[2]; DPID dpid[6]; CallbackData callbackData; @@ -4387,7 +4383,7 @@ static void test_EnumGroupsInGroup(void) static void test_groups_p2p(void) { - LPDIRECTPLAY4 pDP[2]; + IDirectPlay4 *pDP[2]; DPSESSIONDESC2 dpsd; DPID idPlayer[6], idGroup[3]; HRESULT hr; @@ -4622,7 +4618,7 @@ static void test_groups_p2p(void) static void test_groups_cs(void) { - LPDIRECTPLAY4 pDP[2]; + IDirectPlay4 *pDP[2]; DPSESSIONDESC2 dpsd; DPID idPlayer[6], idGroup[3]; CallbackData callbackData; @@ -4859,7 +4855,7 @@ static void test_groups_cs(void) static void test_Send(void) { - LPDIRECTPLAY4 pDP[2]; + IDirectPlay4 *pDP[2]; DPSESSIONDESC2 dpsd; DPID dpid[4], idFrom, idTo; CallbackData callbackData; @@ -5194,7 +5190,7 @@ static void test_Send(void) static void test_Receive(void) { - LPDIRECTPLAY4 pDP; + IDirectPlay4 *pDP; DPSESSIONDESC2 dpsd; DPID dpid[4], idFrom, idTo; HRESULT hr; @@ -5479,7 +5475,7 @@ static void test_Receive(void) static void test_GetMessageCount(void) { - LPDIRECTPLAY4 pDP[2]; + IDirectPlay4 *pDP[2]; DPSESSIONDESC2 dpsd; DPID dpid[4]; HRESULT hr; @@ -5702,7 +5698,7 @@ static void test_GetMessageCount(void) static void test_GetMessageQueue(void) { - LPDIRECTPLAY4 pDP[2]; + IDirectPlay4 *pDP[2]; DPSESSIONDESC2 dpsd; DPID dpid[4]; CallbackData callbackData; @@ -6011,7 +6007,7 @@ static void test_GetMessageQueue(void) static void test_remote_data_replication(void) { - LPDIRECTPLAY4 pDP[2]; + IDirectPlay4 *pDP[2]; DPSESSIONDESC2 dpsd; DPID dpid[2], idFrom, idTo; CallbackData callbackData; @@ -6239,7 +6235,7 @@ static void test_remote_data_replication(void) static void test_host_migration(void) { - LPDIRECTPLAY4 pDP[2]; + IDirectPlay4 *pDP[2]; DPSESSIONDESC2 dpsd; DPID dpid[2], idFrom, idTo; HRESULT hr;

1 0

Michael Stefaniuc : dplayx/tests: Remove superfluous void pointer casts.
by Alexandre Julliard March 29, 2013

March 29, 2013

Module: wine Branch: master Commit: c1907b5ff9c61aa161c130b5190a2b56a40b9220 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1907b5ff9c61aa161c130b51… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 16:35:29 2013 +0100 dplayx/tests: Remove superfluous void pointer casts. --- dlls/dplayx/tests/dplayx.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index a1da9e4..e507c50 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -706,7 +706,7 @@ static BOOL CALLBACK EnumSessions_cb_join( LPCDPSESSIONDESC2 lpThisSD, DWORD dwFlags, LPVOID lpContext ) { - LPDIRECTPLAY4 pDP = (LPDIRECTPLAY4) lpContext; + IDirectPlay4 *pDP = lpContext; DPSESSIONDESC2 dpsd; HRESULT hr; @@ -766,7 +766,7 @@ static BOOL CALLBACK EnumAddress_cb2( REFGUID guidDataType, LPCVOID lpData, LPVOID lpContext ) { - lpCallbackData callbackData = (lpCallbackData) lpContext; + lpCallbackData callbackData = lpContext; static REFGUID types[] = { &DPAID_TotalSize, &DPAID_ServiceProvider, @@ -801,7 +801,7 @@ static BOOL CALLBACK EnumConnections_cb( LPCGUID lpguidSP, LPVOID lpContext ) { - lpCallbackData callbackData = (lpCallbackData) lpContext; + lpCallbackData callbackData = lpContext; LPDIRECTPLAYLOBBY pDPL; HRESULT hr; @@ -910,7 +910,7 @@ static BOOL CALLBACK EnumConnections_cb2( LPCGUID lpguidSP, DWORD dwFlags, LPVOID lpContext ) { - LPDIRECTPLAY4 pDP = (LPDIRECTPLAY4) lpContext; + IDirectPlay4 *pDP = lpContext; HRESULT hr; /* Incorrect parameters */ @@ -1028,7 +1028,7 @@ static BOOL CALLBACK EnumSessions_cb2( LPCDPSESSIONDESC2 lpThisSD, DWORD dwFlags, LPVOID lpContext ) { - LPDIRECTPLAY4 pDP = (LPDIRECTPLAY4) lpContext; + IDirectPlay4 *pDP = lpContext; DPSESSIONDESC2 dpsd; HRESULT hr; @@ -1201,7 +1201,7 @@ static BOOL CALLBACK EnumSessions_cb( LPCDPSESSIONDESC2 lpThisSD, DWORD dwFlags, LPVOID lpContext ) { - lpCallbackData callbackData = (lpCallbackData) lpContext; + lpCallbackData callbackData = lpContext; callbackData->dwCounter1++; if ( dwFlags & DPESC_TIMEDOUT ) @@ -2664,7 +2664,7 @@ static BOOL CALLBACK EnumSessions_cb_join_secure( LPCDPSESSIONDESC2 lpThisSD, DWORD dwFlags, LPVOID lpContext ) { - LPDIRECTPLAY4 pDP = (LPDIRECTPLAY4) lpContext; + IDirectPlay4 *pDP = lpContext; DPSESSIONDESC2 dpsd; DPCREDENTIALS dpCredentials; HRESULT hr; @@ -2841,7 +2841,7 @@ static BOOL CALLBACK EnumAddress_cb( REFGUID guidDataType, LPCVOID lpData, LPVOID lpContext ) { - lpCallbackData callbackData = (lpCallbackData) lpContext; + lpCallbackData callbackData = lpContext; static REFGUID types[] = { &DPAID_TotalSize, &DPAID_ServiceProvider, &DPAID_INet, @@ -3515,7 +3515,7 @@ static BOOL CALLBACK EnumPlayers_cb( DPID dpId, DWORD dwFlags, LPVOID lpContext ) { - lpCallbackData callbackData = (lpCallbackData) lpContext; + lpCallbackData callbackData = lpContext; char playerIndex = dpid2char( callbackData->dpid, callbackData->dpidSize, dpId ); @@ -3551,7 +3551,7 @@ static BOOL CALLBACK EnumSessions_cb_EnumPlayers( LPCDPSESSIONDESC2 lpThisSD, DWORD dwFlags, LPVOID lpContext ) { - lpCallbackData callbackData = (lpCallbackData) lpContext; + lpCallbackData callbackData = lpContext; HRESULT hr; if (dwFlags & DPESC_TIMEDOUT) @@ -3846,7 +3846,7 @@ static BOOL CALLBACK EnumGroups_cb( DPID dpId, DWORD dwFlags, LPVOID lpContext ) { - lpCallbackData callbackData = (lpCallbackData) lpContext; + lpCallbackData callbackData = lpContext; char playerIndex = dpid2char( callbackData->dpid, callbackData->dpidSize, dpId ); @@ -3874,7 +3874,7 @@ static BOOL CALLBACK EnumSessions_cb_EnumGroups( LPCDPSESSIONDESC2 lpThisSD, DWORD dwFlags, LPVOID lpContext ) { - lpCallbackData callbackData = (lpCallbackData) lpContext; + lpCallbackData callbackData = lpContext; HRESULT hr; if (dwFlags & DPESC_TIMEDOUT)

1 0

Michael Stefaniuc : dplayx: Get rid of LPCLASSFACTORY and use a better name for the methods.
by Alexandre Julliard March 29, 2013

March 29, 2013

Module: wine Branch: master Commit: fa4950c38a5670dc40356edf2d5b0784481c4bdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa4950c38a5670dc40356edf2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 16:32:57 2013 +0100 dplayx: Get rid of LPCLASSFACTORY and use a better name for the methods. --- dlls/dplayx/dpclassfactory.c | 31 +++++++++++++++++-------------- 1 files changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/dplayx/dpclassfactory.c b/dlls/dplayx/dpclassfactory.c index c0842b0..a933e90 100644 --- a/dlls/dplayx/dpclassfactory.c +++ b/dlls/dplayx/dpclassfactory.c @@ -52,8 +52,9 @@ static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); } -static HRESULT WINAPI -DP_and_DPL_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { +static HRESULT WINAPI IClassFactoryImpl_QueryInterface(IClassFactory *iface, REFIID riid, + void **ppobj) +{ IClassFactoryImpl *This = impl_from_IClassFactory(iface); FIXME("(%p)->(%s,%p),stub!\n",This,debugstr_guid(riid),ppobj); @@ -61,21 +62,22 @@ DP_and_DPL_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { return E_NOINTERFACE; } -static ULONG WINAPI -DP_and_DPL_AddRef(LPCLASSFACTORY iface) { +static ULONG WINAPI IClassFactoryImpl_AddRef(IClassFactory *iface) +{ IClassFactoryImpl *This = impl_from_IClassFactory(iface); return InterlockedIncrement(&This->ref); } -static ULONG WINAPI DP_and_DPL_Release(LPCLASSFACTORY iface) { +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); } -static HRESULT WINAPI DP_and_DPL_CreateInstance( - LPCLASSFACTORY iface,LPUNKNOWN pOuter,REFIID riid,LPVOID *ppobj -) { +static HRESULT WINAPI IClassFactoryImpl_CreateInstance(IClassFactory *iface, IUnknown *pOuter, + REFIID riid, void **ppobj) +{ IClassFactoryImpl *This = impl_from_IClassFactory(iface); TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj); @@ -92,18 +94,19 @@ static HRESULT WINAPI DP_and_DPL_CreateInstance( return E_NOINTERFACE; } -static HRESULT WINAPI DP_and_DPL_LockServer(LPCLASSFACTORY iface,BOOL dolock) { +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; } static const IClassFactoryVtbl DP_and_DPL_Vtbl = { - DP_and_DPL_QueryInterface, - DP_and_DPL_AddRef, - DP_and_DPL_Release, - DP_and_DPL_CreateInstance, - DP_and_DPL_LockServer + IClassFactoryImpl_QueryInterface, + IClassFactoryImpl_AddRef, + IClassFactoryImpl_Release, + IClassFactoryImpl_CreateInstance, + IClassFactoryImpl_LockServer }; static IClassFactoryImpl DP_and_DPL_CF = {{&DP_and_DPL_Vtbl}, 1 };

1 0

C.W. Betts : winemac: Implement getting and setting screen saver state on OS X.
by Alexandre Julliard March 29, 2013

March 29, 2013

Module: wine Branch: master Commit: 95daa45dbcbca59a4eedc9d34966ebc309b6c330 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95daa45dbcbca59a4eedc9d34… Author: C.W. Betts <computers57(a)hotmail.com> Date: Mon Jan 28 12:32:21 2013 -0700 winemac: Implement getting and setting screen saver state on OS X. --- dlls/winemac.drv/Makefile.in | 2 +- dlls/winemac.drv/macdrv_main.c | 72 +++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/winemac.drv.spec | 1 + 3 files changed, 74 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/Makefile.in b/dlls/winemac.drv/Makefile.in index 6bbac42..3e196e7 100644 --- a/dlls/winemac.drv/Makefile.in +++ b/dlls/winemac.drv/Makefile.in @@ -1,7 +1,7 @@ MODULE = winemac.drv IMPORTS = uuid user32 gdi32 advapi32 DELAYIMPORTS = ole32 shell32 -EXTRALIBS = -framework AppKit -framework Carbon -framework Security -framework OpenGL +EXTRALIBS = -framework AppKit -framework Carbon -framework Security -framework OpenGL -framework IOKit C_SRCS = \ clipboard.c \ diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index a801109..353b4ca 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -22,12 +22,20 @@ #include "config.h" #include <Security/AuthSession.h> +#include <IOKit/pwr_mgt/IOPMLib.h> #include "macdrv.h" +#include "winuser.h" #include "wine/server.h" WINE_DEFAULT_DEBUG_CHANNEL(macdrv); +#ifndef kIOPMAssertionTypePreventUserIdleDisplaySleep +#define kIOPMAssertionTypePreventUserIdleDisplaySleep CFSTR("PreventUserIdleDisplaySleep") +#endif +#ifndef kCFCoreFoundationVersionNumber10_7 +#define kCFCoreFoundationVersionNumber10_7 635.00 +#endif DWORD thread_data_tls_index = TLS_OUT_OF_INDEXES; @@ -206,3 +214,67 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) } return ret; } + +/*********************************************************************** + * SystemParametersInfo (MACDRV.@) + */ +BOOL CDECL macdrv_SystemParametersInfo( UINT action, UINT int_param, void *ptr_param, UINT flags ) +{ + switch (action) + { + case SPI_GETSCREENSAVEACTIVE: + if (ptr_param) + { + CFDictionaryRef assertionStates; + IOReturn status = IOPMCopyAssertionsStatus(&assertionStates); + if (status == kIOReturnSuccess) + { + CFNumberRef count = CFDictionaryGetValue(assertionStates, kIOPMAssertionTypeNoDisplaySleep); + CFNumberRef count2 = CFDictionaryGetValue(assertionStates, kIOPMAssertionTypePreventUserIdleDisplaySleep); + long longCount = 0, longCount2 = 0; + + if (count) + CFNumberGetValue(count, kCFNumberLongType, &longCount); + if (count2) + CFNumberGetValue(count2, kCFNumberLongType, &longCount2); + + *(BOOL *)ptr_param = !longCount && !longCount2; + CFRelease(assertionStates); + } + else + { + WARN("Could not determine screen saver state, error code %d\n", status); + *(BOOL *)ptr_param = TRUE; + } + return TRUE; + } + break; + + case SPI_SETSCREENSAVEACTIVE: + { + static IOPMAssertionID powerAssertion = kIOPMNullAssertionID; + if (int_param) + { + if (powerAssertion != kIOPMNullAssertionID) + { + IOPMAssertionRelease(powerAssertion); + powerAssertion = kIOPMNullAssertionID; + } + } + else if (powerAssertion == kIOPMNullAssertionID) + { + CFStringRef assertName; + /*Are we running Lion or later?*/ + if (kCFCoreFoundationVersionNumber >= kCFCoreFoundationVersionNumber10_7) + assertName = kIOPMAssertionTypePreventUserIdleDisplaySleep; + else + assertName = kIOPMAssertionTypeNoDisplaySleep; + IOPMAssertionCreateWithName( assertName, kIOPMAssertionLevelOn, + CFSTR("Wine Process requesting no screen saver"), + &powerAssertion); + } + } + break; + } + return FALSE; +} diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index 9eb416a..460d0ed 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -46,6 +46,7 @@ @ cdecl WindowMessage(long long long long) macdrv_WindowMessage @ cdecl WindowPosChanged(long long long ptr ptr ptr ptr ptr) macdrv_WindowPosChanged @ cdecl WindowPosChanging(long long long ptr ptr ptr ptr) macdrv_WindowPosChanging +@ cdecl SystemParametersInfo(long long ptr long) macdrv_SystemParametersInfo # System tray @ cdecl wine_notify_icon(long ptr)

1 0

Ken Thomases : winemac: Invalidate window shadow on every draw for transparent windows.
by Alexandre Julliard March 29, 2013

March 29, 2013

Module: wine Branch: master Commit: f7406e74ae9f15c476e5735ec1539daf8abf2ee8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7406e74ae9f15c476e5735ec… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Mar 28 23:33:59 2013 -0500 winemac: Invalidate window shadow on every draw for transparent windows. --- dlls/winemac.drv/cocoa_window.m | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index a2087da..48ca593 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -231,18 +231,20 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) CGContextDrawImage(context, imageRect, image); CGImageRelease(image); - - if (window.shapeChangedSinceLastDraw || window.colorKeyed || - window.usePerPixelAlpha) - { - window.shapeChangedSinceLastDraw = FALSE; - [window invalidateShadow]; - } } } pthread_mutex_unlock(window.surface_mutex); } + + // If the window may be transparent, then we have to invalidate the + // shadow every time we draw. Also, if this is the first time we've + // drawn since changing from transparent to opaque. + if (![window isOpaque] || window.shapeChangedSinceLastDraw) + { + window.shapeChangedSinceLastDraw = FALSE; + [window invalidateShadow]; + } } /* By default, NSView will swallow right-clicks in an attempt to support contextual

1 0

Ken Thomases : winemac: Track drawn surface region to reduce black flicker for new or resized windows .
by Alexandre Julliard March 29, 2013

March 29, 2013

Module: wine Branch: master Commit: a767ee99fa59a15980847bc9af980a860919f114 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a767ee99fa59a15980847bc9a… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Mar 28 23:34:06 2013 -0500 winemac: Track drawn surface region to reduce black flicker for new or resized windows. --- dlls/winemac.drv/cocoa_window.m | 10 +---- dlls/winemac.drv/macdrv.h | 3 +- dlls/winemac.drv/macdrv_cocoa.h | 2 +- dlls/winemac.drv/surface.c | 84 +++++++++++++++++++++++++++++++------- dlls/winemac.drv/window.c | 4 +- 5 files changed, 74 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a767ee99fa59a15980847…

1 0

Aric Stewart : imm32/tests: Show behavior with VK_PROCESSKEY in relation to PeekMessage.
by Alexandre Julliard March 28, 2013

March 28, 2013

Module: wine Branch: master Commit: 83e233c97da8d3338abe5686bb69559b8d2c78db URL: http://source.winehq.org/git/wine.git/?a=commit;h=83e233c97da8d3338abe5686b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Mar 28 12:34:28 2013 -0500 imm32/tests: Show behavior with VK_PROCESSKEY in relation to PeekMessage. --- dlls/imm32/tests/imm32.c | 137 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 136 insertions(+), 1 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 5aff7f7..8e6dab8 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -29,6 +29,7 @@ static BOOL (WINAPI *pImmAssociateContextEx)(HWND,HIMC,DWORD); static BOOL (WINAPI *pImmIsUIMessageA)(HWND,UINT,WPARAM,LPARAM); +static UINT (WINAPI *pSendInput) (UINT, INPUT*, size_t); /* * msgspy - record and analyse message traces sent to a certain window @@ -46,6 +47,19 @@ static struct _msg_spy { unsigned int i_msg; } msg_spy; +typedef struct +{ + DWORD type; + union + { + MOUSEINPUT mi; + KEYBDINPUT ki; + HARDWAREINPUT hi; + } u; +} TEST_INPUT; + +static UINT (WINAPI *pSendInput) (UINT, INPUT*, size_t); + static LRESULT CALLBACK get_msg_filter(int nCode, WPARAM wParam, LPARAM lParam) { if (HC_ACTION == nCode) { @@ -169,11 +183,13 @@ static LRESULT WINAPI wndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) static BOOL init(void) { WNDCLASSEX wc; HIMC imc; - HMODULE hmod; + HMODULE hmod,huser; hmod = GetModuleHandleA("imm32.dll"); + huser = GetModuleHandleA("user32"); pImmAssociateContextEx = (void*)GetProcAddress(hmod, "ImmAssociateContextEx"); pImmIsUIMessageA = (void*)GetProcAddress(hmod, "ImmIsUIMessageA"); + pSendInput = (void*)GetProcAddress(huser, "SendInput"); wc.cbSize = sizeof(WNDCLASSEX); wc.style = 0; @@ -701,6 +717,122 @@ static void test_ImmMessages(void) DestroyWindow(hwnd); } +static LRESULT CALLBACK processkey_wnd_proc( HWND hWnd, UINT msg, WPARAM wParam, + LPARAM lParam ) +{ + return DefWindowProcW(hWnd, msg, wParam, lParam); +} + +static void test_ime_processkey(void) +{ + WCHAR classNameW[] = {'P','r','o','c','e','s','s', 'K','e','y','T','e','s','t','C','l','a','s','s',0}; + WCHAR windowNameW[] = {'P','r','o','c','e','s','s', 'K','e','y',0}; + + MSG msg; + WNDCLASSW wclass; + HANDLE hInstance = GetModuleHandleW(NULL); + TEST_INPUT inputs[2]; + HIMC imc; + INT rc; + HWND hWndTest; + + wclass.lpszClassName = classNameW; + wclass.style = CS_HREDRAW | CS_VREDRAW; + wclass.lpfnWndProc = processkey_wnd_proc; + wclass.hInstance = hInstance; + wclass.hIcon = LoadIcon(0, IDI_APPLICATION); + wclass.hCursor = LoadCursor( NULL, IDC_ARROW); + wclass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); + wclass.lpszMenuName = 0; + wclass.cbClsExtra = 0; + wclass.cbWndExtra = 0; + if(!RegisterClassW(&wclass)){ + win_skip("Failed to register window.\n"); + return; + } + + /* create the test window that will receive the keystrokes */ + hWndTest = CreateWindowW(wclass.lpszClassName, windowNameW, + WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, 0, 100, 100, + NULL, NULL, hInstance, NULL); + + ShowWindow(hWndTest, SW_SHOW); + SetWindowPos(hWndTest, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); + SetForegroundWindow(hWndTest); + UpdateWindow(hWndTest); + + imc = ImmGetContext(hWndTest); + if (!imc) + { + win_skip("IME not supported\n"); + DestroyWindow(hWndTest); + return; + } + + rc = ImmSetOpenStatus(imc, TRUE); + if (rc != TRUE) + { + win_skip("Unable to open IME\n"); + ImmReleaseContext(hWndTest, imc); + DestroyWindow(hWndTest); + return; + } + + /* flush pending messages */ + while (PeekMessageW(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageW(&msg); + + SetFocus(hWndTest); + + /* init input data that never changes */ + inputs[1].type = inputs[0].type = INPUT_KEYBOARD; + inputs[1].u.ki.dwExtraInfo = inputs[0].u.ki.dwExtraInfo = 0; + inputs[1].u.ki.time = inputs[0].u.ki.time = 0; + + /* Pressing a key */ + inputs[0].u.ki.wVk = 0x41; + inputs[0].u.ki.wScan = 0x1e; + inputs[0].u.ki.dwFlags = 0x0; + + pSendInput(1, (INPUT*)inputs, sizeof(INPUT)); + + while(PeekMessageW(&msg, hWndTest, 0, 0, PM_NOREMOVE)) { + if(msg.message != WM_KEYDOWN) + PeekMessageW(&msg, hWndTest, 0, 0, PM_REMOVE); + else + { + ok(msg.wParam != VK_PROCESSKEY,"Incorrect ProcessKey Found\n"); + PeekMessageW(&msg, hWndTest, 0, 0, PM_REMOVE); + if(msg.wParam == VK_PROCESSKEY) + trace("ProcessKey was correctly found\n"); + } + TranslateMessage(&msg); + DispatchMessageW(&msg); + } + + inputs[0].u.ki.wVk = 0x41; + inputs[0].u.ki.wScan = 0x1e; + inputs[0].u.ki.dwFlags = KEYEVENTF_KEYUP; + + pSendInput(1, (INPUT*)inputs, sizeof(INPUT)); + + while(PeekMessageW(&msg, hWndTest, 0, 0, PM_NOREMOVE)) { + if(msg.message != WM_KEYUP) + PeekMessageW(&msg, hWndTest, 0, 0, PM_REMOVE); + else + { + ok(msg.wParam != VK_PROCESSKEY,"Incorrect ProcessKey Found\n"); + PeekMessageW(&msg, hWndTest, 0, 0, PM_REMOVE); + ok(msg.wParam != VK_PROCESSKEY,"ProcessKey should still not be Found\n"); + } + TranslateMessage(&msg); + DispatchMessageW(&msg); + } + + ImmReleaseContext(hWndTest, imc); + ImmSetOpenStatus(imc, FALSE); + DestroyWindow(hWndTest); +} + START_TEST(imm32) { if (init()) { @@ -719,6 +851,9 @@ START_TEST(imm32) { msg_spy_init(NULL); test_ImmMessages(); msg_spy_cleanup(); + if (pSendInput) + test_ime_processkey(); + else win_skip("SendInput is not available\n"); } cleanup(); }

1 0

Ken Thomases : winemac: Synthesize 8- and 16-bpp display modes if the system doesn't provide any.
by Alexandre Julliard March 28, 2013

March 28, 2013

Module: wine Branch: master Commit: 5c8d6a0b93d44366500710355f1455a61a578cb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c8d6a0b93d44366500710355… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 27 12:05:35 2013 -0500 winemac: Synthesize 8- and 16-bpp display modes if the system doesn't provide any. macdrv_ChangeDisplaySettingsEx() ignores the requested bpp, anyway, so we can report any values we think programs will want. --- dlls/winemac.drv/display.c | 87 ++++++++++++++++++++++++++++++++++---------- 1 files changed, 67 insertions(+), 20 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 85c903d..9ed02f8 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -33,6 +33,7 @@ BOOL CDECL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, LPDEVMODEW static CFArrayRef modes; +static BOOL modes_has_8bpp, modes_has_16bpp; static int default_mode_bpp; static CRITICAL_SECTION modes_section; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -469,6 +470,8 @@ BOOL CDECL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, struct macdrv_display *displays = NULL; int num_displays; CGDisplayModeRef display_mode; + int display_mode_bpp; + BOOL synthesized = FALSE; double rotation; uint32_t io_flags; @@ -494,42 +497,84 @@ BOOL CDECL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, { TRACE("mode %d (current) -- getting current mode\n", mode); display_mode = CGDisplayCopyDisplayMode(displays[0].displayID); + display_mode_bpp = display_mode_bits_per_pixel(display_mode); } else { + DWORD count, i; + EnterCriticalSection(&modes_section); if (mode == 0 || !modes) { if (modes) CFRelease(modes); modes = CGDisplayCopyAllDisplayModes(displays[0].displayID, NULL); + modes_has_8bpp = modes_has_16bpp = FALSE; + + if (modes) + { + count = CFArrayGetCount(modes); + for (i = 0; i < count && !(modes_has_8bpp && modes_has_16bpp); i++) + { + CGDisplayModeRef mode = (CGDisplayModeRef)CFArrayGetValueAtIndex(modes, i); + int bpp = display_mode_bits_per_pixel(mode); + if (bpp == 8) + modes_has_8bpp = TRUE; + else if (bpp == 16) + modes_has_16bpp = TRUE; + } + } } display_mode = NULL; if (modes) { - if (flags & EDS_RAWMODE) - { - if (mode < CFArrayGetCount(modes)) - display_mode = (CGDisplayModeRef)CFRetain(CFArrayGetValueAtIndex(modes, mode)); - } - else + int default_bpp = get_default_bpp(); + DWORD seen_modes = 0; + + count = CFArrayGetCount(modes); + for (i = 0; i < count; i++) { - DWORD count, i, safe_modes = 0; - count = CFArrayGetCount(modes); - for (i = 0; i < count; i++) + CGDisplayModeRef candidate = (CGDisplayModeRef)CFArrayGetValueAtIndex(modes, i); + + io_flags = CGDisplayModeGetIOFlags(candidate); + if (!(flags & EDS_RAWMODE) && + (!(io_flags & kDisplayModeValidFlag) || !(io_flags & kDisplayModeSafeFlag))) + continue; + + seen_modes++; + if (seen_modes > mode) + { + display_mode = (CGDisplayModeRef)CFRetain(candidate); + display_mode_bpp = display_mode_bits_per_pixel(display_mode); + break; + } + + /* We only synthesize modes from those having the default bpp. */ + if (display_mode_bits_per_pixel(candidate) != default_bpp) + continue; + + if (!modes_has_8bpp) + { + seen_modes++; + if (seen_modes > mode) + { + display_mode = (CGDisplayModeRef)CFRetain(candidate); + display_mode_bpp = 8; + synthesized = TRUE; + break; + } + } + + if (!modes_has_16bpp) { - CGDisplayModeRef candidate = (CGDisplayModeRef)CFArrayGetValueAtIndex(modes, i); - io_flags = CGDisplayModeGetIOFlags(candidate); - if ((io_flags & kDisplayModeValidFlag) && - (io_flags & kDisplayModeSafeFlag)) + seen_modes++; + if (seen_modes > mode) { - safe_modes++; - if (safe_modes > mode) - { - display_mode = (CGDisplayModeRef)CFRetain(candidate); - break; - } + display_mode = (CGDisplayModeRef)CFRetain(candidate); + display_mode_bpp = 16; + synthesized = TRUE; + break; } } } @@ -557,7 +602,7 @@ BOOL CDECL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, devmode->dmDisplayFixedOutput = DMDFO_CENTER; devmode->dmFields |= DM_DISPLAYFIXEDOUTPUT; - devmode->dmBitsPerPel = display_mode_bits_per_pixel(display_mode); + devmode->dmBitsPerPel = display_mode_bpp; if (devmode->dmBitsPerPel) devmode->dmFields |= DM_BITSPERPEL; @@ -587,6 +632,8 @@ BOOL CDECL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, TRACE(" stretched"); if (devmode->dmDisplayFlags & DM_INTERLACED) TRACE(" interlaced"); + if (synthesized) + TRACE(" (synthesized)"); TRACE("\n"); return TRUE;

1 0

Hans Leidekker : urlmon: Fix handling of mailto URIs in CoInternetCombineUrlEx.
by Alexandre Julliard March 28, 2013

March 28, 2013

Module: wine Branch: master Commit: 9eb140db70b83e1ce5e1b2b701ce299d657f72d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eb140db70b83e1ce5e1b2b70… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 27 13:37:06 2013 +0100 urlmon: Fix handling of mailto URIs in CoInternetCombineUrlEx. --- dlls/urlmon/tests/uri.c | 115 ++++++++++++++++++++++++++++++++++++++++++++--- dlls/urlmon/uri.c | 13 ++++- 2 files changed, 119 insertions(+), 9 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index e5faa81..ba31583 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -4521,7 +4521,57 @@ static const uri_properties uri_tests[] = { {URL_SCHEME_UNKNOWN,S_OK}, {URLZONE_INVALID,E_NOTIMPL} } - } + }, + { "mailto://", Uri_CREATE_NO_CANONICALIZE, S_OK, FALSE, + { + {"mailto:",S_OK}, + {"",S_FALSE}, + {"mailto:",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"mailto://",S_OK,FALSE,"mailto:"}, + {"mailto",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_MAILTO,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, + { "mailto://a(a)b.com", Uri_CREATE_NO_CANONICALIZE, S_OK, FALSE, + { + {"mailto:a(a)b.com",S_OK}, + {"",S_FALSE}, + {"mailto:a(a)b.com",S_OK}, + {"",S_FALSE}, + {".com",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"a(a)b.com",S_OK}, + {"a(a)b.com",S_OK}, + {"",S_FALSE}, + {"mailto://a(a)b.com",S_OK,FALSE,"mailto:a(a)b.com"}, + {"mailto",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_MAILTO,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + } }; typedef struct _invalid_uri { @@ -7005,8 +7055,61 @@ static const uri_combine_test uri_combine_tests[] = { {URL_SCHEME_FILE,S_OK}, {URLZONE_INVALID,E_NOTIMPL} } + }, + { "http://winehq.org",0, + "mailto://",Uri_CREATE_NO_CANONICALIZE, + 0,S_OK,FALSE, + { + {"mailto:",S_OK}, + {"",S_FALSE}, + {"mailto:",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"mailto://",S_OK,FALSE,"mailto:"}, + {"mailto",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_MAILTO,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, + { "http://winehq.org",0, + "mailto://a(a)b.com",Uri_CREATE_NO_CANONICALIZE, + 0,S_OK,FALSE, + { + {"mailto:a(a)b.com",S_OK}, + {"",S_FALSE}, + {"mailto:a(a)b.com",S_OK}, + {"",S_FALSE}, + {".com",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"a(a)b.com",S_OK}, + {"a(a)b.com",S_OK}, + {"",S_FALSE}, + {"mailto://a(a)b.com",S_OK,FALSE,"mailto:a(a)b.com"}, + {"mailto",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_MAILTO,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } } - }; typedef struct _uri_parse_test { @@ -10317,7 +10420,7 @@ static void test_CoInternetCombineIUri(void) { todo_wine { ok(!strcmp_aw(prop.value, received) || broken(prop.broken_value && !strcmp_aw(prop.broken_value, received)), - "Error: Expected %s but got %s instead on uri_combine_tests[%d].str_props[%d].\n", + "Error: Expected \"%s\" but got %s instead on uri_combine_tests[%d].str_props[%d].\n", prop.value, wine_dbgstr_w(received), i, j); } } else { @@ -10326,7 +10429,7 @@ static void test_CoInternetCombineIUri(void) { hr, prop.expected, i, j); ok(!strcmp_aw(prop.value, received) || broken(prop.broken_value && !strcmp_aw(prop.broken_value, received)), - "Error: Expected %s but got %s instead on uri_combine_tests[%d].str_props[%d].\n", + "Error: Expected \"%s\" but got %s instead on uri_combine_tests[%d].str_props[%d].\n", prop.value, wine_dbgstr_w(received), i, j); } SysFreeString(received); @@ -10634,7 +10737,7 @@ static void test_CoInternetCombineUrlEx(void) { todo_wine { ok(!strcmp_aw(value, received) || broken(prop.broken_value && !strcmp_aw(prop.broken_value, received)), - "Error: Expected %s but got %s instead on uri_combine_tests[%d].str_props[%d].\n", + "Error: Expected \"%s\" but got %s instead on uri_combine_tests[%d].str_props[%d].\n", value, wine_dbgstr_w(received), i, j); } } else { @@ -10643,7 +10746,7 @@ static void test_CoInternetCombineUrlEx(void) { hr, prop.expected, i, j); ok(!strcmp_aw(value, received) || broken(prop.broken_value && !strcmp_aw(prop.broken_value, received)), - "Error: Expected %s but got %s instead on uri_combine_tests[%d].str_props[%d].\n", + "Error: Expected \"%s\" but got %s instead on uri_combine_tests[%d].str_props[%d].\n", value, wine_dbgstr_w(received), i, j); } SysFreeString(received); diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 0f6ee31..724d60f 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -422,7 +422,7 @@ static inline BOOL is_hierarchical_uri(const WCHAR **ptr, const parse_data *data else if(is_hierarchical_scheme(data->scheme_type) && (*ptr)[0] == '\\' && (*ptr)[1] == '\\') { *ptr += 2; return TRUE; - } else if(check_hierarchical(ptr)) + } else if(data->scheme_type != URL_SCHEME_MAILTO && check_hierarchical(ptr)) return TRUE; *ptr = start; @@ -1917,8 +1917,15 @@ static BOOL parse_path_hierarchical(const WCHAR **ptr, parse_data *data, DWORD f static BOOL parse_path_opaque(const WCHAR **ptr, parse_data *data, DWORD flags) { const BOOL known_scheme = data->scheme_type != URL_SCHEME_UNKNOWN; const BOOL is_file = data->scheme_type == URL_SCHEME_FILE; + const BOOL is_mailto = data->scheme_type == URL_SCHEME_MAILTO; - data->path = *ptr; + if (is_mailto && (*ptr)[0] == '/' && (*ptr)[1] == '/') + { + if ((*ptr)[2]) data->path = *ptr + 2; + else data->path = NULL; + } + else + data->path = *ptr; while(!is_path_delim(**ptr)) { if(**ptr == '%' && known_scheme) { @@ -1938,7 +1945,7 @@ static BOOL parse_path_opaque(const WCHAR **ptr, parse_data *data, DWORD flags) ++(*ptr); } - data->path_len = *ptr - data->path; + if (data->path) data->path_len = *ptr - data->path; TRACE("(%p %p %x): Parsed opaque URI path %s len=%d\n", ptr, data, flags, debugstr_wn(data->path, data->path_len), data->path_len); return TRUE;

1 0

Aric Stewart : user32: ImmProcessKey is only called on WM_KEYDOWN and if the message is being removed .
by Alexandre Julliard March 28, 2013

March 28, 2013

Module: wine Branch: master Commit: 6e4cbd5787c6241a406b6ae1ddacf1527ad1efc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e4cbd5787c6241a406b6ae1d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Mar 27 14:42:43 2013 -0500 user32: ImmProcessKey is only called on WM_KEYDOWN and if the message is being removed. --- dlls/user32/message.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index b0bf176..09a4cb3 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2453,8 +2453,8 @@ static BOOL process_keyboard_message( MSG *msg, UINT hw_id, HWND hwnd_filter, } accept_hardware_message( hw_id, remove, 0 ); - if ( msg->message == WM_KEYDOWN || msg->message == WM_KEYUP ) - if ( ImmProcessKey(msg->hwnd, GetKeyboardLayout(0), msg->wParam, msg->lParam, 0) ) + if ( remove && msg->message == WM_KEYDOWN ) + if (ImmProcessKey(msg->hwnd, GetKeyboardLayout(0), msg->wParam, msg->lParam, 0) ) msg->wParam = VK_PROCESSKEY; return TRUE;

1 0

Huw Davies : user32: Keep the combo listbox within the monitor's work area.
by Alexandre Julliard March 28, 2013

March 28, 2013

Module: wine Branch: master Commit: b4b99697f99cebec0f92042075d62f27b235d35c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4b99697f99cebec0f9204207… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 28 16:03:30 2013 +0000 user32: Keep the combo listbox within the monitor's work area. --- dlls/user32/combo.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 346b346..2aa4424 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -1043,18 +1043,24 @@ static void CBDropDown( LPHEADCOMBO lphc ) } } + r.left = rect.left; + r.top = rect.bottom; + r.right = r.left + lphc->droppedRect.right - lphc->droppedRect.left; + r.bottom = r.top + nDroppedHeight; + /*If height of dropped rectangle gets beyond a screen size it should go up, otherwise down.*/ monitor = MonitorFromRect( &rect, MONITOR_DEFAULTTOPRIMARY ); mon_info.cbSize = sizeof(mon_info); GetMonitorInfoW( monitor, &mon_info ); - if( (rect.bottom + nDroppedHeight) >= mon_info.rcWork.bottom ) - rect.bottom = rect.top - nDroppedHeight; + if (r.bottom > mon_info.rcWork.bottom) + { + r.top = max( rect.top - nDroppedHeight, mon_info.rcWork.top ); + r.bottom = min( r.top + nDroppedHeight, mon_info.rcWork.bottom ); + } - SetWindowPos( lphc->hWndLBox, HWND_TOP, rect.left, rect.bottom, - lphc->droppedRect.right - lphc->droppedRect.left, - nDroppedHeight, - SWP_NOACTIVATE | SWP_SHOWWINDOW); + SetWindowPos( lphc->hWndLBox, HWND_TOP, r.left, r.top, r.right - r.left, r.bottom - r.top, + SWP_NOACTIVATE | SWP_SHOWWINDOW ); if( !(lphc->wState & CBF_NOREDRAW) )

1 0

Piotr Caban : kernel32: Fixed copy-paste error in IdnToUnicode.
by Alexandre Julliard March 28, 2013

March 28, 2013

Module: wine Branch: master Commit: 46919f21544fce02e3a90ecfcc0f2f3e79972932 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46919f21544fce02e3a90ecfc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 28 16:10:44 2013 +0100 kernel32: Fixed copy-paste error in IdnToUnicode. --- dlls/kernel32/locale.c | 6 +++--- dlls/kernel32/tests/locale.c | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 57daab1..04fb6e8 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -4480,8 +4480,8 @@ INT WINAPI IdnToUnicode(DWORD dwFlags, LPCWSTR lpASCIICharStr, INT cchASCIIChar, return 0; } - if((dwFlags&IDN_USE_STD3_ASCII_RULES) && (lpUnicodeCharStr[label_start]=='-' || - lpUnicodeCharStr[label_end-1]=='-')) { + if((dwFlags&IDN_USE_STD3_ASCII_RULES) && (lpASCIICharStr[label_start]=='-' || + lpASCIICharStr[label_end-1]=='-')) { SetLastError(ERROR_INVALID_NAME); return 0; } @@ -4494,7 +4494,7 @@ INT WINAPI IdnToUnicode(DWORD dwFlags, LPCWSTR lpASCIICharStr, INT cchASCIIChar, tolowerW(lpASCIICharStr[label_start])!='x' || tolowerW(lpASCIICharStr[label_start+1])!='n' || lpASCIICharStr[label_start+2]!='-' || lpASCIICharStr[label_start+3]!='-') { - if(label_end < cchUnicodeChar) + if(label_end < cchASCIIChar) label_end++; if(!lpUnicodeCharStr) { diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index e9c83b8..f1c66e2 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3386,6 +3386,10 @@ static void test_IdnToUnicode(void) for (i=0; i<sizeof(test_data)/sizeof(*test_data); i++) { + ret = pIdnToUnicode(test_data[i].flags, test_data[i].in, + test_data[i].in_len, NULL, 0); + ok(ret == test_data[i].ret, "%d) ret = %d\n", i, ret); + SetLastError(0xdeadbeef); ret = pIdnToUnicode(test_data[i].flags, test_data[i].in, test_data[i].in_len, buf, sizeof(buf));

1 0

Jacek Caban : jscript: Use helpers to access string buffer in some String functions.
by Alexandre Julliard March 28, 2013

March 28, 2013

Module: wine Branch: master Commit: 03395f2d2e916b2a27e098982aa9e6df926f4699 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03395f2d2e916b2a27e098982… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 28 11:02:25 2013 +0100 jscript: Use helpers to access string buffer in some String functions. --- dlls/jscript/string.c | 62 +++++++++++++++++++++++++++++++----------------- 1 files changed, 40 insertions(+), 22 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 64d0f1e..39e6788 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -90,6 +90,22 @@ static HRESULT get_string_val(script_ctx_t *ctx, vdisp_t *jsthis, jsstr_t **val) return to_string(ctx, jsval_disp(jsthis->u.disp), val); } +static HRESULT get_string_flat_val(script_ctx_t *ctx, vdisp_t *jsthis, jsstr_t **jsval, const WCHAR **val) +{ + HRESULT hres; + + hres = get_string_val(ctx, jsthis, jsval); + if(FAILED(hres)) + return hres; + + *val = jsstr_flatten(*jsval); + if(*val) + return S_OK; + + jsstr_release(*jsval); + return E_OUTOFMEMORY; +} + static HRESULT String_length(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { @@ -442,28 +458,29 @@ static HRESULT String_fontsize(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u static HRESULT String_indexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - jsstr_t *search_str, *str; + jsstr_t *search_jsstr, *jsstr; + const WCHAR *search_str, *str; int length, pos = 0; INT ret = -1; HRESULT hres; TRACE("\n"); - hres = get_string_val(ctx, jsthis, &str); + hres = get_string_flat_val(ctx, jsthis, &jsstr, &str); if(FAILED(hres)) return hres; - length = jsstr_length(str); + length = jsstr_length(jsstr); if(!argc) { if(r) *r = jsval_number(-1); - jsstr_release(str); + jsstr_release(jsstr); return S_OK; } - hres = to_string(ctx, argv[0], &search_str); + hres = to_flat_string(ctx, argv[0], &search_jsstr, &search_str); if(FAILED(hres)) { - jsstr_release(str); + jsstr_release(jsstr); return hres; } @@ -478,15 +495,15 @@ static HRESULT String_indexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un if(SUCCEEDED(hres)) { const WCHAR *ptr; - ptr = strstrW(str->str+pos, search_str->str); + ptr = strstrW(str+pos, search_str); if(ptr) - ret = ptr - str->str; + ret = ptr - str; else ret = -1; } - jsstr_release(search_str); - jsstr_release(str); + jsstr_release(search_jsstr); + jsstr_release(jsstr); if(FAILED(hres)) return hres; @@ -507,31 +524,32 @@ static HRESULT String_lastIndexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags jsval_t *r) { unsigned pos = 0, search_len, length; - jsstr_t *search_str, *str; + jsstr_t *search_jsstr, *jsstr; + const WCHAR *search_str, *str; INT ret = -1; HRESULT hres; TRACE("\n"); - hres = get_string_val(ctx, jsthis, &str); + hres = get_string_flat_val(ctx, jsthis, &jsstr, &str); if(FAILED(hres)) return hres; if(!argc) { if(r) *r = jsval_number(-1); - jsstr_release(str); + jsstr_release(jsstr); return S_OK; } - hres = to_string(ctx, argv[0], &search_str); + hres = to_flat_string(ctx, argv[0], &search_jsstr, &search_str); if(FAILED(hres)) { - jsstr_release(str); + jsstr_release(jsstr); return hres; } - search_len = jsstr_length(search_str); - length = jsstr_length(str); + search_len = jsstr_length(search_jsstr); + length = jsstr_length(jsstr); if(argc >= 2) { double d; @@ -546,16 +564,16 @@ static HRESULT String_lastIndexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags if(SUCCEEDED(hres) && length >= search_len) { const WCHAR *ptr; - for(ptr = str->str+min(pos, length-search_len); ptr >= str->str; ptr--) { - if(!memcmp(ptr, search_str->str, search_len*sizeof(WCHAR))) { - ret = ptr-str->str; + for(ptr = str+min(pos, length-search_len); ptr >= str; ptr--) { + if(!memcmp(ptr, search_str, search_len*sizeof(WCHAR))) { + ret = ptr-str; break; } } } - jsstr_release(search_str); - jsstr_release(str); + jsstr_release(search_jsstr); + jsstr_release(jsstr); if(FAILED(hres)) return hres;

1 0

Jacek Caban : urlmon: Delay processing notifications from Read during MIME verification.
by Alexandre Julliard March 28, 2013

March 28, 2013

Module: wine Branch: master Commit: 506b369c73da984e3da0974665c8a58041784353 URL: http://source.winehq.org/git/wine.git/?a=commit;h=506b369c73da984e3da097466… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 27 14:12:44 2013 +0100 urlmon: Delay processing notifications from Read during MIME verification. --- dlls/urlmon/bindprot.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 8deccda..33d6a64 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -897,8 +897,12 @@ static HRESULT WINAPI ProtocolSinkHandler_ReportData(IInternetProtocolSink *ifac do { read = 0; + if(is_apartment_thread(This)) + This->continue_call++; hres = IInternetProtocol_Read(This->protocol, buf, sizeof(buf)-This->buf_size, &read); + if(is_apartment_thread(This)) + This->continue_call--; if(FAILED(hres) && hres != E_PENDING) return hres;

1 0

Jacek Caban : secur32: Take schannel backend capabilities into account when configuring enabled protocols .
by Alexandre Julliard March 28, 2013

March 28, 2013

Module: wine Branch: master Commit: fe474e3b6a05dddae2c69fbe35100895dd38ae9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe474e3b6a05dddae2c69fbe3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 28 12:05:59 2013 +0100 secur32: Take schannel backend capabilities into account when configuring enabled protocols. --- dlls/secur32/schannel.c | 2 +- dlls/secur32/schannel_gnutls.c | 6 ++++++ dlls/secur32/schannel_macosx.c | 5 +++++ dlls/secur32/secur32_priv.h | 1 + 4 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 9a83a76..df75b67 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -237,7 +237,7 @@ static void read_config(void) RegCloseKey(protocols_key); - config_enabled_protocols = enabled; + config_enabled_protocols = enabled & schan_imp_enabled_protocols(); config_default_disabled_protocols = default_disabled; config_read = TRUE; diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 8975b2d..b460505 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -106,6 +106,12 @@ static ssize_t schan_push_adapter(gnutls_transport_ptr_t transport, return buff_len; } +DWORD schan_imp_enabled_protocols(void) +{ + /* NOTE: No support for SSL 2.0 */ + return SP_PROT_SSL3_CLIENT | SP_PROT_TLS1_0_CLIENT | SP_PROT_TLS1_1_CLIENT | SP_PROT_TLS1_2_CLIENT; +} + BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cred) { gnutls_session_t *s = (gnutls_session_t*)session; diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index 2acb6ca..c562a98 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -630,6 +630,11 @@ static OSStatus schan_push_adapter(SSLConnectionRef transport, const void *buff, return ret; } +DWORD schan_imp_enabled_protocols(void) +{ + /* NOTE: No support for TLS 1.1 and TLS 1.2 */ + return SP_PROT_SSL2_CLIENT | SP_PROT_SSL3_CLIENT | SP_PROT_TLS1_0_CLIENT; +} BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cred) { diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 5b2ac89..dc08429 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -260,6 +260,7 @@ extern SECURITY_STATUS schan_imp_recv(schan_imp_session session, void *buffer, SIZE_T *length) DECLSPEC_HIDDEN; extern BOOL schan_imp_allocate_certificate_credentials(schan_credentials*) DECLSPEC_HIDDEN; extern void schan_imp_free_certificate_credentials(schan_credentials*) DECLSPEC_HIDDEN; +extern DWORD schan_imp_enabled_protocols(void) DECLSPEC_HIDDEN; extern BOOL schan_imp_init(void) DECLSPEC_HIDDEN; extern void schan_imp_deinit(void) DECLSPEC_HIDDEN;

1 0

Jacek Caban : jscript: Added jsstr_extract helper and use it in String. charCodeAt implementation.
by Alexandre Julliard March 28, 2013

March 28, 2013

Module: wine Branch: master Commit: 618b88ef30b0d5b955e1f3c65f6da0896aafac6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=618b88ef30b0d5b955e1f3c65… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 28 11:01:52 2013 +0100 jscript: Added jsstr_extract helper and use it in String.charCodeAt implementation. --- dlls/jscript/jsstr.h | 13 ++++++++++++- dlls/jscript/string.c | 7 +++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/jsstr.h b/dlls/jscript/jsstr.h index 09893fa..28742ac 100644 --- a/dlls/jscript/jsstr.h +++ b/dlls/jscript/jsstr.h @@ -65,6 +65,11 @@ static inline BOOL jsstr_eq(jsstr_t *str1, jsstr_t *str2) return len == jsstr_length(str2) && !memcmp(str1->str, str2->str, len*sizeof(WCHAR)); } +static inline void jsstr_extract(jsstr_t *str, unsigned off, unsigned len, WCHAR *buf) +{ + memcpy(buf, str->str+off, len*sizeof(WCHAR)); +} + static inline unsigned jsstr_flush(jsstr_t *str, WCHAR *buf) { unsigned len = jsstr_length(str); @@ -74,7 +79,13 @@ static inline unsigned jsstr_flush(jsstr_t *str, WCHAR *buf) static inline jsstr_t *jsstr_substr(jsstr_t *str, unsigned off, unsigned len) { - return jsstr_alloc_len(str->str+off, len); + jsstr_t *ret; + WCHAR *ptr; + + ptr = jsstr_alloc_buf(len, &ret); + if(ptr) + jsstr_extract(str, off, len, ptr); + return ret; } int jsstr_cmp(jsstr_t*,jsstr_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 7672fb7..64d0f1e 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -347,8 +347,11 @@ static HRESULT String_charCodeAt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, idx = d; } - if(r) - *r = jsval_number(str->str[idx]); + if(r) { + WCHAR c; + jsstr_extract(str, idx, 1, &c); + *r = jsval_number(c); + } jsstr_release(str); return S_OK;

1 0

Jacek Caban : libwine: Added tid debug channel support on native Windows builds.
by Alexandre Julliard March 28, 2013

March 28, 2013

Module: wine Branch: master Commit: e422a22ed92937da4e0f37311877da8d626bfa02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e422a22ed92937da4e0f37311… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 27 17:08:16 2013 +0100 libwine: Added tid debug channel support on native Windows builds. --- libs/wine/debug.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/libs/wine/debug.c b/libs/wine/debug.c index a38abf4..548ef22 100644 --- a/libs/wine/debug.c +++ b/libs/wine/debug.c @@ -33,6 +33,10 @@ #include "wine/debug.h" #include "wine/library.h" +#if defined(__MINGW32__) || defined(_MSC_VER) +WINE_DECLARE_DEBUG_CHANNEL(tid); +#endif + static const char * const debug_classes[] = { "fixme", "err", "warn", "trace" }; #define MAX_DEBUG_OPTIONS 256 @@ -402,6 +406,10 @@ static int default_dbg_vlog( enum __wine_debug_class cls, struct __wine_debug_ch { int ret = 0; +#if defined(__MINGW32__) || defined(_MSC_VER) + if (TRACE_ON(tid)) + ret += wine_dbg_printf( "%04x:", GetCurrentThreadId() ); +#endif if (cls < sizeof(debug_classes)/sizeof(debug_classes[0])) ret += wine_dbg_printf( "%s:%s:%s ", debug_classes[cls], channel->name, func ); if (format)

1 0

Hans Leidekker : mshtml: Don' t append slashes to opaque protocol identifiers.
by Alexandre Julliard March 28, 2013

March 28, 2013

Module: wine Branch: master Commit: e15a923a0aff0bddcb31828400ad7ee7b601ee14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e15a923a0aff0bddcb3182840… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 27 17:13:46 2013 +0100 mshtml: Don't append slashes to opaque protocol identifiers. --- dlls/mshtml/editor.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index dbb2d93..0a58d1f 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -1016,17 +1016,17 @@ static HRESULT query_edit_status(HTMLDocument *This, OLECMD *cmd) static INT_PTR CALLBACK hyperlink_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { static const WCHAR wszOther[] = {'(','o','t','h','e','r',')',0}; + static const WCHAR wszFile[] = {'f','i','l','e',':',0}; + static const WCHAR wszFtp[] = {'f','t','p',':',0}; + static const WCHAR wszHttp[] = {'h','t','t','p',':',0}; + static const WCHAR wszHttps[] = {'h','t','t','p','s',':',0}; + static const WCHAR wszMailto[] = {'m','a','i','l','t','o',':',0}; + static const WCHAR wszNews[] = {'n','e','w','s',':',0}; switch (msg) { case WM_INITDIALOG: { - static const WCHAR wszFile[] = {'f','i','l','e',':',0}; - static const WCHAR wszFtp[] = {'f','t','p',':',0}; - static const WCHAR wszHttp[] = {'h','t','t','p',':',0}; - static const WCHAR wszHttps[] = {'h','t','t','p','s',':',0}; - static const WCHAR wszMailto[] = {'m','a','i','l','t','o',':',0}; - static const WCHAR wszNews[] = {'n','e','w','s',':',0}; INT def_idx; HWND hwndCB = GetDlgItem(hwnd, IDC_TYPE); HWND hwndURL = GetDlgItem(hwnd, IDC_URL); @@ -1102,8 +1102,9 @@ static INT_PTR CALLBACK hyperlink_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LP /* add new protocol */ if (*type != '\0') { - memcpy(url, type, strlenW(type) * sizeof(WCHAR)); - memcpy(url + strlenW(type), wszSlashSlash, sizeof(wszSlashSlash)); + memcpy(url, type, (strlenW(type) + 1) * sizeof(WCHAR)); + if (strcmpW(type, wszMailto) && strcmpW(type, wszNews)) + memcpy(url + strlenW(type), wszSlashSlash, sizeof(wszSlashSlash)); } SetWindowTextW(hwndURL, url);

1 0

Piotr Caban : msvcrt: Move fread_s function to msvcrt.
by Alexandre Julliard March 28, 2013

March 28, 2013

Module: wine Branch: master Commit: 280f8237b579a5a1140b96585ccbe0bf4f0bc474 URL: http://source.winehq.org/git/wine.git/?a=commit;h=280f8237b579a5a1140b96585… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 28 12:57:14 2013 +0100 msvcrt: Move fread_s function to msvcrt. --- dlls/msvcr100/msvcr100.c | 53 ------------------------------------------- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 51 +++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.h | 5 ++++ dlls/msvcrt/msvcrt.spec | 1 + 8 files changed, 61 insertions(+), 57 deletions(-) diff --git a/dlls/msvcr100/msvcr100.c b/dlls/msvcr100/msvcr100.c index 3a0a205..2735d17 100644 --- a/dlls/msvcr100/msvcr100.c +++ b/dlls/msvcr100/msvcr100.c @@ -448,59 +448,6 @@ unsigned __int64 CDECL _byteswap_uint64(unsigned __int64 i) } /********************************************************************* - * fread_s (MSVCR100.@) - */ -size_t CDECL fread_s(void *buf, size_t buf_size, size_t elem_size, size_t count, FILE *stream) -{ - size_t bytes_left, buf_pos; - - TRACE("(%p %lu %lu %lu %p\n", buf, (unsigned long)buf_size, - (unsigned long)elem_size, (unsigned long)count, stream); - - - if(!CHECK_PMT(stream != NULL)) { - if(buf && buf_size) - memset(buf, 0, buf_size); - return 0; - } - if(!elem_size || !count) return 0; - if(!CHECK_PMT(buf != NULL)) return 0; - if(!CHECK_PMT(SIZE_MAX/count >= elem_size)) return 0; - - bytes_left = elem_size*count; - buf_pos = 0; - while(bytes_left) { - if(stream->_cnt > 0) { - size_t size = bytes_left<stream->_cnt ? bytes_left : stream->_cnt; - - if(!CHECK_PMT_ERR(size <= buf_size-buf_pos, ERANGE)) { - memset(buf, 0, buf_size); - return 0; - } - - fread((char*)buf+buf_pos, 1, size, stream); - buf_pos += size; - bytes_left -= size; - }else { - int c = _filbuf(stream); - - if(c == EOF) - break; - - if(!CHECK_PMT_ERR(buf_size-buf_pos > 0, ERANGE)) { - memset(buf, 0, buf_size); - return 0; - } - - ((char*)buf)[buf_pos++] = c; - bytes_left--; - } - } - - return buf_pos/elem_size; -} - -/********************************************************************* * _sprintf_p (MSVCR100.@) */ int CDECL _sprintf_p(char *buffer, size_t length, const char *format, ...) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index efba85a..af00082 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1670,7 +1670,7 @@ @ cdecl fputwc(long ptr) msvcrt.fputwc @ cdecl fputws(wstr ptr) msvcrt.fputws @ cdecl fread(ptr long long ptr) msvcrt.fread -@ cdecl fread_s(ptr long long long ptr) +@ cdecl fread_s(ptr long long long ptr) msvcrt.fread_s @ cdecl free(ptr) msvcrt.free @ cdecl freopen(str str ptr) msvcrt.freopen @ cdecl freopen_s(ptr str str ptr) msvcrt.freopen_s diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 3718eae..a80cc6e 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2033,7 +2033,7 @@ @ cdecl fputwc(long ptr) msvcrt.fputwc @ cdecl fputws(wstr ptr) msvcrt.fputws @ cdecl fread(ptr long long ptr) msvcrt.fread -@ cdecl fread_s(ptr long long long ptr) msvcr100.fread_s +@ cdecl fread_s(ptr long long long ptr) msvcrt.fread_s @ cdecl free(ptr) msvcrt.free @ cdecl freopen(str str ptr) msvcrt.freopen @ cdecl freopen_s(ptr str str ptr) msvcrt.freopen_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 0d6b8f8..d8f361f 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1323,7 +1323,7 @@ @ cdecl fputwc(long ptr) msvcrt.fputwc @ cdecl fputws(wstr ptr) msvcrt.fputws @ cdecl fread(ptr long long ptr) msvcrt.fread -@ cdecl fread_s(ptr long long long ptr) msvcr100.fread_s +@ cdecl fread_s(ptr long long long ptr) msvcrt.fread_s @ cdecl free(ptr) msvcrt.free @ cdecl freopen(str str ptr) msvcrt.freopen @ cdecl freopen_s(ptr str str ptr) msvcrt.freopen_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 158c9f5..7916839 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1324,7 +1324,7 @@ @ cdecl fputwc(long ptr) msvcrt.fputwc @ cdecl fputws(wstr ptr) msvcrt.fputws @ cdecl fread(ptr long long ptr) msvcrt.fread -@ cdecl fread_s(ptr long long long ptr) msvcr100.fread_s +@ cdecl fread_s(ptr long long long ptr) msvcrt.fread_s @ cdecl free(ptr) msvcrt.free @ cdecl freopen(str str ptr) msvcrt.freopen @ cdecl freopen_s(ptr str str ptr) msvcrt.freopen_s diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 28dd132..c8863b3 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3686,6 +3686,57 @@ MSVCRT_size_t CDECL MSVCRT_fread(void *ptr, MSVCRT_size_t size, MSVCRT_size_t nm return read / size; } + +/* fread_s - not exported in native msvcrt */ +MSVCRT_size_t CDECL fread_s(void *buf, MSVCRT_size_t buf_size, MSVCRT_size_t elem_size, + MSVCRT_size_t count, MSVCRT_FILE *stream) +{ + size_t bytes_left, buf_pos; + + TRACE("(%p %lu %lu %lu %p\n", buf, buf_size, elem_size, count, stream); + + if(!MSVCRT_CHECK_PMT(stream != NULL)) { + if(buf && buf_size) + memset(buf, 0, buf_size); + return 0; + } + if(!elem_size || !count) return 0; + if(!MSVCRT_CHECK_PMT(buf != NULL)) return 0; + if(!MSVCRT_CHECK_PMT(MSVCRT_SIZE_MAX/count >= elem_size)) return 0; + + bytes_left = elem_size*count; + buf_pos = 0; + while(bytes_left) { + if(stream->_cnt > 0) { + size_t size = bytes_left<stream->_cnt ? bytes_left : stream->_cnt; + + if(!MSVCRT_CHECK_PMT_ERR(size <= buf_size-buf_pos, MSVCRT_ERANGE)) { + memset(buf, 0, buf_size); + return 0; + } + + MSVCRT_fread((char*)buf+buf_pos, 1, size, stream); + buf_pos += size; + bytes_left -= size; + }else { + int c = MSVCRT__filbuf(stream); + + if(c == EOF) + break; + + if(!MSVCRT_CHECK_PMT_ERR(buf_size-buf_pos > 0, MSVCRT_ERANGE)) { + memset(buf, 0, buf_size); + return 0; + } + + ((char*)buf)[buf_pos++] = c; + bytes_left--; + } + } + + return buf_pos/elem_size; +} + /********************************************************************* * _wfreopen (MSVCRT.@) * diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 69ad7a7..c688dea 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -48,6 +48,11 @@ #define MSVCRT_I64_MIN (-MSVCRT_I64_MAX-1) #define MSVCRT_UI64_MAX (((unsigned __int64)0xffffffff << 32) | 0xffffffff) #define MSVCRT_MB_LEN_MAX 2 +#ifdef _WIN64 +#define MSVCRT_SIZE_MAX MSVCRT_UI64_MAX +#else +#define MSVCRT_SIZE_MAX MSVCRT_ULONG_MAX +#endif #define MSVCRT__MAX_DRIVE 3 #define MSVCRT__MAX_DIR 256 diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index a569ea2..edef615 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1530,3 +1530,4 @@ @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output @ cdecl _set_printf_count_output(long) MSVCRT__set_printf_count_output @ cdecl _getptd() +@ cdecl fread_s(ptr long long long ptr)

1 0

Piotr Caban : msvcrt: Update spec file with functions added in newer version of the dll.
by Alexandre Julliard March 28, 2013

March 28, 2013

Module: wine Branch: master Commit: 12b8c9671e8fd66519f3c17f98e55ea1a1257ff1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12b8c9671e8fd66519f3c17f9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 28 12:56:38 2013 +0100 msvcrt: Update spec file with functions added in newer version of the dll. --- dlls/msvcrt/locale.c | 12 +++++++++--- dlls/msvcrt/msvcrt.spec | 8 ++++---- dlls/msvcrt/wcs.c | 2 +- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 7fa4882..520c8fe 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -702,7 +702,9 @@ void free_mbcinfo(MSVCRT_pthreadmbcinfo mbcinfo) MSVCRT_free(mbcinfo); } -/* _get_current_locale - not exported in native msvcrt */ +/********************************************************************* + * _get_current_locale (MSVCRT.@) + */ MSVCRT__locale_t CDECL MSVCRT__get_current_locale(void) { MSVCRT__locale_t loc = MSVCRT_malloc(sizeof(MSVCRT__locale_tstruct)); @@ -716,7 +718,9 @@ MSVCRT__locale_t CDECL MSVCRT__get_current_locale(void) return loc; } -/* _free_locale - not exported in native msvcrt */ +/********************************************************************* + * _free_locale (MSVCRT.@) + */ void CDECL MSVCRT__free_locale(MSVCRT__locale_t locale) { if (!locale) @@ -727,7 +731,9 @@ void CDECL MSVCRT__free_locale(MSVCRT__locale_t locale) MSVCRT_free(locale); } -/* _create_locale - not exported in native msvcrt */ +/********************************************************************* + * _create_locale (MSVCRT.@) + */ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) { static const DWORD time_data[] = { diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index dc87b8e..a569ea2 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -376,6 +376,7 @@ @ cdecl _cputs(str) @ cdecl _cputws(wstr) @ cdecl _creat(str long) MSVCRT__creat +@ cdecl _create_locale(long str) MSVCRT__create_locale # stub _crtAssertBusy # stub _crtBreakAlloc # stub _crtDbgFlag @@ -464,6 +465,7 @@ @ cdecl _fputchar(long) MSVCRT__fputchar @ cdecl _fputwchar(long) MSVCRT__fputwchar # stub _free_dbg(ptr long) +@ cdecl _free_locale(ptr) MSVCRT__free_locale # stub _freea(ptr) # stub _freea_s @ varargs _fscanf_l(ptr str ptr) MSVCRT__fscanf_l @@ -496,6 +498,7 @@ @ varargs _fwscanf_s_l(ptr wstr ptr) MSVCRT__fwscanf_s_l @ cdecl _gcvt(double long str) @ cdecl _gcvt_s(ptr long double long) +@ cdecl _get_current_locale() MSVCRT__get_current_locale @ cdecl _get_doserrno(ptr) # stub _get_environ(ptr) @ cdecl _get_errno(ptr) @@ -1117,6 +1120,7 @@ @ cdecl _wcsrev(wstr) MSVCRT__wcsrev @ cdecl _wcsset(wstr long) MSVCRT__wcsset # stub _wcsset_s(wstr long) +@ cdecl _wcstod_l(wstr ptr) MSVCRT__wcstod_l @ cdecl -ret64 _wcstoi64(wstr ptr long) MSVCRT__wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l # stub _wcstol_l(wstr ptr long ptr) @@ -1515,17 +1519,13 @@ @ cdecl ___mb_cur_max_l_func(ptr) @ cdecl -arch=i386 __control87_2(long long ptr ptr) @ cdecl _configthreadlocale(long) -@ cdecl _create_locale(long str) MSVCRT__create_locale -@ cdecl _get_current_locale() MSVCRT__get_current_locale @ cdecl _dupenv_s(ptr ptr str) -@ cdecl _free_locale(ptr) MSVCRT__free_locale @ cdecl _get_invalid_parameter_handler() @ cdecl _set_abort_behavior(long long) MSVCRT__set_abort_behavior @ cdecl _set_invalid_parameter_handler(ptr) @ cdecl _set_purecall_handler(ptr) @ cdecl _set_security_error_handler(ptr) @ cdecl -arch=i386 _statusfp2(ptr ptr) -@ cdecl _wcstod_l(wstr ptr) MSVCRT__wcstod_l @ cdecl _wdupenv_s(ptr ptr wstr) @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output @ cdecl _set_printf_count_output(long) MSVCRT__set_printf_count_output diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 7408bec..eb268dc 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -199,7 +199,7 @@ int CDECL MSVCRT__wcslwr_s( MSVCRT_wchar_t* str, MSVCRT_size_t n ) } /********************************************************************* - * _wcstod_l - not exported in native msvcrt + * _wcstod_l (MSVCRT.@) */ double CDECL MSVCRT__wcstod_l(const MSVCRT_wchar_t* str, MSVCRT_wchar_t** end, MSVCRT__locale_t locale)

1 0

Huw Davies : user32: Invalidate the listbox in LB_SETCOUNT.
by Alexandre Julliard March 28, 2013

March 28, 2013

Module: wine Branch: master Commit: 698c7f0f3f8fa1d0ed33c629fa9e93279085d39d URL: http://source.winehq.org/git/wine.git/?a=commit;h=698c7f0f3f8fa1d0ed33c629f… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 28 10:21:22 2013 +0000 user32: Invalidate the listbox in LB_SETCOUNT. --- dlls/user32/listbox.c | 2 + dlls/user32/tests/listbox.c | 78 ++++++++++++++++++++++++++++++++++-------- 2 files changed, 65 insertions(+), 15 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 0f4a8be..64691e4 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -1767,6 +1767,8 @@ static LRESULT LISTBOX_SetCount( LB_DESCR *descr, INT count ) if ((ret = LISTBOX_RemoveItem( descr, (descr->nb_items - 1) )) < 0) return ret; } + + InvalidateRect( descr->self, NULL, TRUE ); return LB_OKAY; } diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index ef4a35b..5d96f5c 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -274,30 +274,42 @@ static LRESULT WINAPI main_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARA return DefWindowProc(hwnd, msg, wparam, lparam); } -static void test_ownerdraw(void) +static HWND create_parent( void ) { WNDCLASS cls; - HWND parent, hLB; - INT ret; - RECT rc; + HWND parent; + static ATOM class; - cls.style = 0; - cls.lpfnWndProc = main_window_proc; - cls.cbClsExtra = 0; - cls.cbWndExtra = 0; - cls.hInstance = GetModuleHandle(0); - cls.hIcon = 0; - cls.hCursor = LoadCursor(0, IDC_ARROW); - cls.hbrBackground = GetStockObject(WHITE_BRUSH); - cls.lpszMenuName = NULL; - cls.lpszClassName = "main_window_class"; - ok (RegisterClass(&cls), "RegisterClass failed\n"); + if (!class) + { + cls.style = 0; + cls.lpfnWndProc = main_window_proc; + cls.cbClsExtra = 0; + cls.cbWndExtra = 0; + cls.hInstance = GetModuleHandle(0); + cls.hIcon = 0; + cls.hCursor = LoadCursor(0, IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpszMenuName = NULL; + cls.lpszClassName = "main_window_class"; + class = RegisterClass( &cls ); + } parent = CreateWindowEx(0, "main_window_class", NULL, WS_POPUP | WS_VISIBLE, 100, 100, 400, 400, GetDesktopWindow(), 0, GetModuleHandle(0), NULL); + return parent; +} + +static void test_ownerdraw(void) +{ + HWND parent, hLB; + INT ret; + RECT rc; + + parent = create_parent(); assert(parent); hLB = create_listbox(LBS_OWNERDRAWFIXED | WS_CHILD | WS_VISIBLE, parent); @@ -1498,6 +1510,41 @@ static void test_listbox_dlgdir(void) DestroyWindow(hWnd); } +static void test_set_count( void ) +{ + HWND parent, listbox; + LONG ret; + RECT r; + + parent = create_parent(); + listbox = create_listbox( LBS_OWNERDRAWFIXED | LBS_NODATA | WS_CHILD | WS_VISIBLE, parent ); + + UpdateWindow( listbox ); + GetUpdateRect( listbox, &r, TRUE ); + ok( IsRectEmpty( &r ), "got non-empty rect\n"); + + ret = SendMessage( listbox, LB_SETCOUNT, 100, 0 ); + ok( ret == 0, "got %d\n", ret ); + ret = SendMessage( listbox, LB_GETCOUNT, 0, 0 ); + ok( ret == 100, "got %d\n", ret ); + + GetUpdateRect( listbox, &r, TRUE ); + ok( !IsRectEmpty( &r ), "got empty rect\n"); + + ValidateRect( listbox, NULL ); + GetUpdateRect( listbox, &r, TRUE ); + ok( IsRectEmpty( &r ), "got non-empty rect\n"); + + ret = SendMessage( listbox, LB_SETCOUNT, 99, 0 ); + ok( ret == 0, "got %d\n", ret ); + + GetUpdateRect( listbox, &r, TRUE ); + ok( !IsRectEmpty( &r ), "got empty rect\n"); + + DestroyWindow( listbox ); + DestroyWindow( parent ); +} + START_TEST(listbox) { const struct listbox_test SS = @@ -1576,4 +1623,5 @@ START_TEST(listbox) test_listbox_item_data(); test_listbox_LB_DIR(); test_listbox_dlgdir(); + test_set_count(); }

1 0

Alexandre Julliard : user32: Constify pointers that point to read-only file data.
by Alexandre Julliard March 28, 2013

March 28, 2013

Module: wine Branch: master Commit: 5bfc411ae79a6025298c4c8ddff6fb177fc4231a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bfc411ae79a6025298c4c8dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 28 13:13:43 2013 +0100 user32: Constify pointers that point to read-only file data. --- dlls/user32/cursoricon.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index fa1ba24..93aa0c6 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -292,7 +292,7 @@ ULONG_PTR set_icon_param( HICON handle, ULONG_PTR param ) * [RETURN] ptr - pointer to mapped file * [RETURN] filesize - pointer size of file to be stored if not NULL */ -static void *map_fileW( LPCWSTR name, LPDWORD filesize ) +static const void *map_fileW( LPCWSTR name, LPDWORD filesize ) { HANDLE hFile, hMapping; LPVOID ptr = NULL; @@ -1091,7 +1091,7 @@ static void riff_find_chunk( DWORD chunk_id, DWORD chunk_type, const riff_chunk_ * |- ... * \- CHUNK:icon */ -static HCURSOR CURSORICON_CreateIconFromANI( const LPBYTE bits, DWORD bits_size, INT width, INT height, +static HCURSOR CURSORICON_CreateIconFromANI( const BYTE *bits, DWORD bits_size, INT width, INT height, INT depth, BOOL is_icon, UINT loadflags ) { struct animated_cursoricon_object *ani_icon_data; @@ -1287,7 +1287,7 @@ HICON WINAPI CreateIconFromResourceEx( LPBYTE bits, UINT cbSize, UINT cFlag ) { POINT hotspot; - BITMAPINFO *bmi; + const BITMAPINFO *bmi; TRACE_(cursor)("%p (%u bytes), ver %08x, %ix%i %s %s\n", bits, cbSize, dwVersion, width, height, @@ -1314,10 +1314,10 @@ HICON WINAPI CreateIconFromResourceEx( LPBYTE bits, UINT cbSize, } else /* get the hotspot */ { - SHORT *pt = (SHORT *)bits; + const SHORT *pt = (const SHORT *)bits; hotspot.x = pt[0]; hotspot.y = pt[1]; - bmi = (BITMAPINFO *)(pt + 2); + bmi = (const BITMAPINFO *)(pt + 2); cbSize -= 2 * sizeof(*pt); } @@ -1343,7 +1343,7 @@ static HICON CURSORICON_LoadFromFile( LPCWSTR filename, const CURSORICONFILEDIR *dir; DWORD filesize = 0; HICON hIcon = 0; - LPBYTE bits; + const BYTE *bits; POINT hotspot; TRACE("loading %s\n", debugstr_w( filename )); @@ -1379,7 +1379,7 @@ static HICON CURSORICON_LoadFromFile( LPCWSTR filename, hotspot.x = entry->xHotspot; hotspot.y = entry->yHotspot; - hIcon = create_icon_from_bmi( (BITMAPINFO *)&bits[entry->dwDIBOffset], filesize - entry->dwDIBOffset, + hIcon = create_icon_from_bmi( (const BITMAPINFO *)&bits[entry->dwDIBOffset], filesize - entry->dwDIBOffset, NULL, NULL, NULL, hotspot, !fCursor, width, height, loadflags ); end: TRACE("loaded %s -> %p\n", debugstr_w( filename ), hIcon ); @@ -1402,7 +1402,7 @@ static HICON CURSORICON_Load(HINSTANCE hInstance, LPCWSTR name, DWORD size; const CURSORICONDIR *dir; const CURSORICONDIRENTRY *dirEntry; - LPBYTE bits; + const BYTE *bits; WORD wResId; POINT hotspot; @@ -1477,13 +1477,13 @@ static HICON CURSORICON_Load(HINSTANCE hInstance, LPCWSTR name, } else /* get the hotspot */ { - SHORT *pt = (SHORT *)bits; + const SHORT *pt = (const SHORT *)bits; hotspot.x = pt[0]; hotspot.y = pt[1]; bits += 2 * sizeof(SHORT); size -= 2 * sizeof(SHORT); } - hIcon = create_icon_from_bmi( (BITMAPINFO *)bits, size, hInstance, name, hRsrc, + hIcon = create_icon_from_bmi( (const BITMAPINFO *)bits, size, hInstance, name, hRsrc, hotspot, !fCursor, width, height, loadflags ); FreeResource( handle ); return hIcon; @@ -2480,7 +2480,7 @@ static HBITMAP BITMAP_Load( HINSTANCE instance, LPCWSTR name, HBITMAP hbitmap = 0, orig_bm; HRSRC hRsrc; HGLOBAL handle; - char *ptr = NULL; + const char *ptr = NULL; BITMAPINFO *info, *fix_info = NULL, *scaled_info = NULL; int size; BYTE pix;

1 0

Alexandre Julliard : user32: Add size checks when creating an icon from bitmap info.
by Alexandre Julliard March 28, 2013

March 28, 2013

Module: wine Branch: master Commit: 267109d6f1be4852b0167b7ed8a082031721f943 URL: http://source.winehq.org/git/wine.git/?a=commit;h=267109d6f1be4852b0167b7ed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 28 13:07:06 2013 +0100 user32: Add size checks when creating an icon from bitmap info. --- dlls/user32/cursoricon.c | 77 ++++++++++++++++++++++++++++++++-------------- 1 files changed, 54 insertions(+), 23 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index df11f56..fa1ba24 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -796,11 +796,11 @@ done: * * Create an icon from its BITMAPINFO. */ -static HICON create_icon_from_bmi( BITMAPINFO *bmi, HMODULE module, LPCWSTR resname, HRSRC rsrc, - POINT hotspot, BOOL bIcon, INT width, INT height, UINT cFlag ) +static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE module, LPCWSTR resname, + HRSRC rsrc, POINT hotspot, BOOL bIcon, INT width, INT height, + UINT cFlag ) { - unsigned int size = bitmap_info_size( bmi, DIB_RGB_COLORS ); - BOOL monochrome = is_dib_monochrome( bmi ); + DWORD size, color_size, mask_size; HBITMAP color = 0, mask = 0, alpha = 0; const void *color_bits, *mask_bits; BITMAPINFO *bmi_copy; @@ -811,14 +811,35 @@ static HICON create_icon_from_bmi( BITMAPINFO *bmi, HMODULE module, LPCWSTR resn /* Check bitmap header */ + if (maxsize < sizeof(BITMAPCOREHEADER)) + { + WARN( "invalid size %u\n", maxsize ); + return 0; + } + if (maxsize < bmi->bmiHeader.biSize) + { + WARN( "invalid header size %u\n", bmi->bmiHeader.biSize ); + return 0; + } if ( (bmi->bmiHeader.biSize != sizeof(BITMAPCOREHEADER)) && (bmi->bmiHeader.biSize != sizeof(BITMAPINFOHEADER) || (bmi->bmiHeader.biCompression != BI_RGB && bmi->bmiHeader.biCompression != BI_BITFIELDS)) ) { - WARN_(cursor)("\tinvalid resource bitmap header.\n"); - return 0; + WARN( "invalid bitmap header %u\n", bmi->bmiHeader.biSize ); + return 0; + } + + size = bitmap_info_size( bmi, DIB_RGB_COLORS ); + color_size = get_dib_image_size( bmi->bmiHeader.biWidth, bmi->bmiHeader.biHeight / 2, + bmi->bmiHeader.biBitCount ); + mask_size = get_dib_image_size( bmi->bmiHeader.biWidth, bmi->bmiHeader.biHeight / 2, 1 ); + if (size > maxsize || color_size > maxsize - size) + { + WARN( "truncated file %u < %u+%u+%u\n", maxsize, size, color_size, mask_size ); + return 0; } + if (mask_size > maxsize - size - color_size) mask_size = 0; /* no mask */ if (cFlag & LR_DEFAULTSIZE) { @@ -856,11 +877,10 @@ static HICON create_icon_from_bmi( BITMAPINFO *bmi, HMODULE module, LPCWSTR resn bmi_copy->bmiHeader.biHeight /= 2; color_bits = (const char*)bmi + size; - mask_bits = (const char*)color_bits + - get_dib_image_size( bmi->bmiHeader.biWidth, bmi_copy->bmiHeader.biHeight, bmi->bmiHeader.biBitCount ); + mask_bits = (const char*)color_bits + color_size; alpha = 0; - if (monochrome) + if (is_dib_monochrome( bmi )) { if (!(mask = CreateBitmap( width, height * 2, 1, 1, NULL ))) goto done; color = 0; @@ -908,10 +928,13 @@ static HICON create_icon_from_bmi( BITMAPINFO *bmi, HMODULE module, LPCWSTR resn } } - SelectObject( hdc, mask ); - StretchDIBits( hdc, 0, 0, width, height, - 0, 0, bmi_copy->bmiHeader.biWidth, bmi_copy->bmiHeader.biHeight, - mask_bits, bmi_copy, DIB_RGB_COLORS, SRCCOPY ); + if (mask_size) + { + SelectObject( hdc, mask ); + StretchDIBits( hdc, 0, 0, width, height, + 0, 0, bmi_copy->bmiHeader.biWidth, bmi_copy->bmiHeader.biHeight, + mask_bits, bmi_copy, DIB_RGB_COLORS, SRCCOPY ); + } ret = TRUE; done: @@ -1170,7 +1193,6 @@ static HCURSOR CURSORICON_CreateIconFromANI( const LPBYTE bits, DWORD bits_size, bits + bits_size - icon_data, width, height, depth, loadflags ); - bmi = (const BITMAPINFO *) (icon_data + entry->dwDIBOffset); info->hotspot.x = entry->xHotspot; info->hotspot.y = entry->yHotspot; if (!header.width || !header.height) @@ -1184,9 +1206,16 @@ static HCURSOR CURSORICON_CreateIconFromANI( const LPBYTE bits, DWORD bits_size, frameHeight = header.height; } - /* Grab a frame from the animation */ - frames[i] = create_icon_from_bmi( (BITMAPINFO *)bmi, NULL, NULL, NULL, info->hotspot, - is_icon, frameWidth, frameHeight, loadflags ); + frames[i] = NULL; + if (entry->dwDIBOffset < bits + bits_size - icon_data) + { + bmi = (const BITMAPINFO *) (icon_data + entry->dwDIBOffset); + /* Grab a frame from the animation */ + frames[i] = create_icon_from_bmi( bmi, bits + bits_size - (const BYTE *)bmi, + NULL, NULL, NULL, info->hotspot, + is_icon, frameWidth, frameHeight, loadflags ); + } + if (!frames[i]) { FIXME_(cursor)("failed to convert animated cursor frame.\n"); @@ -1250,8 +1279,7 @@ static HCURSOR CURSORICON_CreateIconFromANI( const LPBYTE bits, DWORD bits_size, /********************************************************************** * CreateIconFromResourceEx (USER32.@) * - * FIXME: Convert to mono when cFlag is LR_MONOCHROME. Do something - * with cbSize parameter as well. + * FIXME: Convert to mono when cFlag is LR_MONOCHROME. */ HICON WINAPI CreateIconFromResourceEx( LPBYTE bits, UINT cbSize, BOOL bIcon, DWORD dwVersion, @@ -1290,9 +1318,10 @@ HICON WINAPI CreateIconFromResourceEx( LPBYTE bits, UINT cbSize, hotspot.x = pt[0]; hotspot.y = pt[1]; bmi = (BITMAPINFO *)(pt + 2); + cbSize -= 2 * sizeof(*pt); } - return create_icon_from_bmi( bmi, NULL, NULL, NULL, hotspot, bIcon, width, height, cFlag ); + return create_icon_from_bmi( bmi, cbSize, NULL, NULL, NULL, hotspot, bIcon, width, height, cFlag ); } @@ -1350,8 +1379,8 @@ static HICON CURSORICON_LoadFromFile( LPCWSTR filename, hotspot.x = entry->xHotspot; hotspot.y = entry->yHotspot; - hIcon = create_icon_from_bmi( (BITMAPINFO *)&bits[entry->dwDIBOffset], NULL, NULL, NULL, - hotspot, !fCursor, width, height, loadflags ); + hIcon = create_icon_from_bmi( (BITMAPINFO *)&bits[entry->dwDIBOffset], filesize - entry->dwDIBOffset, + NULL, NULL, NULL, hotspot, !fCursor, width, height, loadflags ); end: TRACE("loaded %s -> %p\n", debugstr_w( filename ), hIcon ); UnmapViewOfFile( bits ); @@ -1438,6 +1467,7 @@ static HICON CURSORICON_Load(HINSTANCE hInstance, LPCWSTR name, } if (!(handle = LoadResource( hInstance, hRsrc ))) return 0; + size = SizeofResource( hInstance, hRsrc ); bits = LockResource( handle ); if (!fCursor) @@ -1451,8 +1481,9 @@ static HICON CURSORICON_Load(HINSTANCE hInstance, LPCWSTR name, hotspot.x = pt[0]; hotspot.y = pt[1]; bits += 2 * sizeof(SHORT); + size -= 2 * sizeof(SHORT); } - hIcon = create_icon_from_bmi( (BITMAPINFO *)bits, hInstance, name, hRsrc, + hIcon = create_icon_from_bmi( (BITMAPINFO *)bits, size, hInstance, name, hRsrc, hotspot, !fCursor, width, height, loadflags ); FreeResource( handle ); return hIcon;

1 0

Dmitry Timoshkov : ole32: Fix an apartment reference count leak on error path.
by Alexandre Julliard March 28, 2013

March 28, 2013

Module: wine Branch: master Commit: 41d3085522f795d8e7c78d1463ce79790b4f36f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41d3085522f795d8e7c78d146… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 28 18:46:22 2013 +0900 ole32: Fix an apartment reference count leak on error path. --- dlls/ole32/marshal.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index a8df28c..ddaaa53 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -1437,6 +1437,7 @@ StdMarshalImpl_ReleaseMarshalData(LPMARSHAL iface, IStream *pStm) if (!(stubmgr = get_stub_manager(apt, stdobjref.oid))) { + apartment_release(apt); ERR("could not map object ID to stub manager, oxid=%s, oid=%s\n", wine_dbgstr_longlong(stdobjref.oxid), wine_dbgstr_longlong(stdobjref.oid)); return RPC_E_INVALID_OBJREF;

1 0

Ken Thomases : winemac: Don't override -[NSOpenGLContext clearDrawable], just use our own method.
by Alexandre Julliard March 28, 2013

March 28, 2013

Module: wine Branch: master Commit: 4fba2995b633559c9baf4ad881c2d09e8028c964 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fba2995b633559c9baf4ad88… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 27 12:05:41 2013 -0500 winemac: Don't override -[NSOpenGLContext clearDrawable], just use our own method. --- dlls/winemac.drv/cocoa_opengl.m | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index 1368c73..b678cae 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -45,7 +45,7 @@ context attached). So, we finesse things by first setting the context's view to a different view (the content view of an off-screen window) and then letting the original implementation proceed. */ - - (void) clearDrawable + - (void) clearDrawableLeavingSurfaceOnScreen { static NSWindow* dummyWindow; static dispatch_once_t once; @@ -60,7 +60,7 @@ }); [self setView:[dummyWindow contentView]]; - [super clearDrawable]; + [self clearDrawable]; } @end @@ -99,7 +99,7 @@ void macdrv_dispose_opengl_context(macdrv_opengl_context c) macdrv_remove_view_opengl_context((macdrv_view)[context view], c); if ([context latentView]) macdrv_remove_view_opengl_context((macdrv_view)[context latentView], c); - [context clearDrawable]; + [context clearDrawableLeavingSurfaceOnScreen]; [context release]; [pool release]; @@ -143,7 +143,7 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v) else { [WineOpenGLContext clearCurrentContext]; - [context clearDrawable]; + [context clearDrawableLeavingSurfaceOnScreen]; } } else

1 0

Francois Gouget : testbot: When canceling a job, update its status and reschedule immediately.
by Alexandre Julliard March 28, 2013

March 28, 2013

Module: tools Branch: master Commit: 2d5f4a1df2739b7386bf0fafed7cac3559b139f8 URL: http://source.winehq.org/git/tools.git/?a=commit;h=2d5f4a1df2739b7386bf0faf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 28 14:43:23 2013 +0100 testbot: When canceling a job, update its status and reschedule immediately. This is possible now that Job::Cancel() updates the task and VM status when it kills a child process. Also note that Job::Restart() was synchronous already. --- testbot/bin/Engine.pl | 15 +++++---------- testbot/lib/WineTestBot/Jobs.pm | 3 ++- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 5fcce05..670945a 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -344,16 +344,11 @@ sub HandleJobCancel return "0$ErrMessage"; } - # Wait a couple of seconds before rescheduling so the child processes have - # the time to die. - AddEvent("JobCancel$JobKey", 2, 0, sub { - $Job->UpdateStatus(); - $ErrMessage = ScheduleJobs(); - if (defined($ErrMessage)) - { - LogMsg "Scheduling problem in HandleJobCancel: $ErrMessage\n"; - } - }); + $ErrMessage = ScheduleJobs(); + if (defined($ErrMessage)) + { + LogMsg "Scheduling problem in HandleJobCancel: $ErrMessage\n"; + } return "1OK"; } diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index ab82c07..8176015 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -218,7 +218,8 @@ sub Cancel } } } - # Let the higher layers handle updating the overall job status + # Let UpdateStatus() handle updating the overall job status + $self->UpdateStatus(); return undef; }

1 0

Francois Gouget : testbot: Add a 'canceled' status for jobs, steps and tasks.
by Alexandre Julliard March 28, 2013

March 28, 2013

Module: tools Branch: master Commit: ebc2c0c0728013a8d46a749d0badccfcfca511e0 URL: http://source.winehq.org/git/tools.git/?a=commit;h=ebc2c0c0728013a8d46a749d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 28 14:43:19 2013 +0100 testbot: Add a 'canceled' status for jobs, steps and tasks. This makes it possible to report a job as canceled rather than failed (failed indicates either a WineTestBot error or a bad patch). --- testbot/ddl/update23.sql | 10 ++++++++++ testbot/ddl/winetestbot.sql | 6 +++--- testbot/lib/WineTestBot/Jobs.pm | 30 ++++++++++++++++++++---------- testbot/lib/WineTestBot/Steps.pm | 4 ++-- testbot/lib/WineTestBot/Tasks.pm | 2 +- testbot/web/JobDetails.pl | 8 ++++++-- testbot/web/WineTestBot.css | 1 + testbot/web/index.pl | 6 ++++-- 8 files changed, 47 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=ebc2c0c0728013a8d46a…

1 0

Francois Gouget : testbot/web: Refresh the JobDetails page normally after canceling or restarting a job.
by Alexandre Julliard March 28, 2013

March 28, 2013

Module: tools Branch: master Commit: 938ba099ac2a888271cfab4d60dd4df3244723fd URL: http://source.winehq.org/git/tools.git/?a=commit;h=938ba099ac2a888271cfab4d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 28 14:43:28 2013 +0100 testbot/web: Refresh the JobDetails page normally after canceling or restarting a job. This is possible now that Job::Cancel() updates the job status synchronously. --- testbot/web/JobDetails.pl | 27 ++++----------------------- 1 files changed, 4 insertions(+), 23 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 429a87c..944d178 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -167,7 +167,8 @@ sub OnCancel return !1; } - return 1; + $self->Redirect("/JobDetails.pl?Key=" . $self->{JobId}); + exit; } sub OnRestart @@ -188,7 +189,8 @@ sub OnRestart return !1; } - return 1; + $self->Redirect("/JobDetails.pl?Key=" . $self->{JobId}); + exit; } sub OnAction @@ -238,27 +240,6 @@ sub GenerateBody { my $self = shift; - if ($self->{ActionPerformed}) - { - print "<h1>" . $self->GetTitle() . "</h1>\n"; - print "<div class='Content'>\n"; - my $Action = $self->GetParam("Action"); - if ($Action eq "Cancel job") - { - print "<p>Job will be canceled.</p>\n"; - } - elsif ($Action eq "Restart job") - { - print "<p>Job will be restarted.</p>\n"; - } - else - { - print "<p>Unknown action $Action.</p>\n"; - } - print "</div>\n"; - return; - } - $self->SUPER::GenerateBody(@_); print "<div class='Content'>\n";

1 0

Jacek Caban : mshtml: Added IHTMLButtonElement::disabled tests.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 873efd464279905c68d04d81afe869d592ea79cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=873efd464279905c68d04d81a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 27 13:12:51 2013 +0100 mshtml: Added IHTMLButtonElement::disabled tests. --- dlls/mshtml/tests/dom.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 54bb68c..5bd0ff1 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5392,6 +5392,34 @@ static void _set_button_name(unsigned line, IHTMLElement *elem, const char *name _test_button_name(line, elem, name); } +#define test_button_get_disabled(i,b) _test_button_get_disabled(__LINE__,i,b) +static void _test_button_get_disabled(unsigned line, IHTMLElement *elem, VARIANT_BOOL exb) +{ + IHTMLButtonElement *button = _get_button_iface(line, (IUnknown*)elem); + VARIANT_BOOL disabled = 100; + HRESULT hres; + + hres = IHTMLButtonElement_get_disabled(button, &disabled); + ok_(__FILE__,line) (hres == S_OK, "get_disabled failed: %08x\n", hres); + ok_(__FILE__,line) (disabled == exb, "disabled=%x, expected %x\n", disabled, exb); + IHTMLButtonElement_Release(button); + + _test_elem3_get_disabled(line, (IUnknown*)elem, exb); +} + +#define test_button_set_disabled(i,b) _test_button_set_disabled(__LINE__,i,b) +static void _test_button_set_disabled(unsigned line, IHTMLElement *elem, VARIANT_BOOL b) +{ + IHTMLButtonElement *button = _get_button_iface(line, (IUnknown*)elem); + HRESULT hres; + + hres = IHTMLButtonElement_put_disabled(button, b); + ok_(__FILE__,line) (hres == S_OK, "put_disabled failed: %08x\n", hres); + IHTMLButtonElement_Release(button); + + _test_button_get_disabled(line, elem, b); +} + static void test_button_elem(IHTMLElement *elem) { test_button_name(elem, NULL); @@ -6151,6 +6179,10 @@ static void test_elems(IHTMLDocument2 *doc) ok(elem != NULL, "elem == NULL\n"); if(elem) { test_button_elem(elem); + test_button_get_disabled(elem, VARIANT_FALSE); + test_button_set_disabled(elem, VARIANT_TRUE); + test_elem3_set_disabled((IUnknown*)elem, VARIANT_FALSE); + test_button_get_disabled(elem, VARIANT_FALSE); IHTMLElement_Release(elem); }

1 0

Jacek Caban : mshtml: Added IHTMLButtonElement::disabled implementation.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: add03f99d8ae8464898efcbd074bbf8e1b192bb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=add03f99d8ae8464898efcbd0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 27 13:12:39 2013 +0100 mshtml: Added IHTMLButtonElement::disabled implementation. --- dlls/mshtml/htmlinput.c | 44 ++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 40 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index d6bd394..4d304b2 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1552,15 +1552,35 @@ static HRESULT WINAPI HTMLButtonElement_get_status(IHTMLButtonElement *iface, VA static HRESULT WINAPI HTMLButtonElement_put_disabled(IHTMLButtonElement *iface, VARIANT_BOOL v) { HTMLButtonElement *This = impl_from_IHTMLButtonElement(iface); - FIXME("(%p)->(%x)\n", This, v); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)->(%x)\n", This, v); + + nsres = nsIDOMHTMLButtonElement_SetDisabled(This->nsbutton, !!v); + if(NS_FAILED(nsres)) { + ERR("SetDisabled failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLButtonElement_get_disabled(IHTMLButtonElement *iface, VARIANT_BOOL *p) { HTMLButtonElement *This = impl_from_IHTMLButtonElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + cpp_bool disabled; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMHTMLButtonElement_GetDisabled(This->nsbutton, &disabled); + if(NS_FAILED(nsres)) { + ERR("GetDisabled failed: %08x\n", nsres); + return E_FAIL; + } + + *p = disabled ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI HTMLButtonElement_get_form(IHTMLButtonElement *iface, IHTMLFormElement **p) @@ -1623,6 +1643,18 @@ static HRESULT HTMLButtonElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) return S_OK; } +static HRESULT HTMLButtonElementImpl_put_disabled(HTMLDOMNode *iface, VARIANT_BOOL v) +{ + HTMLButtonElement *This = button_from_HTMLDOMNode(iface); + return IHTMLButtonElement_put_disabled(&This->IHTMLButtonElement_iface, v); +} + +static HRESULT HTMLButtonElementImpl_get_disabled(HTMLDOMNode *iface, VARIANT_BOOL *p) +{ + HTMLButtonElement *This = button_from_HTMLDOMNode(iface); + return IHTMLButtonElement_get_disabled(&This->IHTMLButtonElement_iface, p); +} + static const NodeImplVtbl HTMLButtonElementImplVtbl = { HTMLButtonElement_QI, HTMLElement_destructor, @@ -1630,6 +1662,10 @@ static const NodeImplVtbl HTMLButtonElementImplVtbl = { HTMLElement_clone, HTMLElement_handle_event, HTMLElement_get_attr_col, + NULL, + NULL, + HTMLButtonElementImpl_put_disabled, + HTMLButtonElementImpl_get_disabled }; static const tid_t HTMLButtonElement_iface_tids[] = {

1 0

Piotr Caban : msvcrt: Don't forward _getpid to kernel32.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: db58873868c7286b5bdeca7e5b30938d49a6ca1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=db58873868c7286b5bdeca7e5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 16:13:43 2013 +0100 msvcrt: Don't forward _getpid to kernel32. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/process.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 1236b58..dc87b8e 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -526,7 +526,7 @@ @ cdecl _getdrives() kernel32.GetLogicalDrives @ cdecl _getmaxstdio() MSVCRT__getmaxstdio @ cdecl _getmbcp() -@ cdecl _getpid() kernel32.GetCurrentProcessId +@ cdecl _getpid() _getpid @ stub _getsystime(ptr) @ cdecl _getw(ptr) MSVCRT__getw # stub _getwch() diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c index cc64c2d..872edf8 100644 --- a/dlls/msvcrt/process.c +++ b/dlls/msvcrt/process.c @@ -1317,3 +1317,11 @@ void * CDECL _getdllprocaddr(MSVCRT_intptr_t dll, const char *name, int ordinal) if (HIWORD(ordinal)) return NULL; return GetProcAddress( (HMODULE)dll, (LPCSTR)(ULONG_PTR)ordinal ); } + +/********************************************************************* + * _getpid (MSVCRT.@) + */ +int CDECL _getpid(void) +{ + return GetCurrentProcessId(); +}

1 0

Piotr Caban : msvcrt: Added _wcstoul_l implementation.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 8f9b0abf729f610310f3fd0308386554a2b57297 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f9b0abf729f610310f3fd030… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 16:13:21 2013 +0100 msvcrt: Added _wcstoul_l implementation. --- dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt/wcs.c | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index c992f7f..1236b58 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1124,7 +1124,7 @@ @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) MSVCRT__wcstombs_s_l @ cdecl -ret64 _wcstoui64(wstr ptr long) MSVCRT__wcstoui64 @ cdecl -ret64 _wcstoui64_l(wstr ptr long ptr) MSVCRT__wcstoui64_l -# stub _wcstoul_l(wstr ptr long ptr) +@ cdecl _wcstoul_l(wstr ptr long ptr) MSVCRT__wcstoul_l @ cdecl _wcsupr(wstr) ntdll._wcsupr # stub _wcsupr_l(wstr ptr) @ cdecl _wcsupr_s(wstr long) MSVCRT__wcsupr_s @@ -1501,7 +1501,7 @@ @ cdecl wcstol(wstr ptr long) ntdll.wcstol @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s -@ cdecl wcstoul(wstr ptr long) ntdll.wcstoul +@ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul @ stub wcsxfrm(ptr wstr long) @ cdecl wctob(long) MSVCRT_wctob @ cdecl wctomb(ptr long) MSVCRT_wctomb diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 6e7c479..7408bec 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1586,6 +1586,29 @@ unsigned __int64 CDECL MSVCRT__wcstoui64(const MSVCRT_wchar_t *nptr, return MSVCRT__wcstoui64_l(nptr, endptr, base, NULL); } +/********************************************************************* + * _wcstoul_l (MSVCRT.@) + */ +MSVCRT_ulong __cdecl MSVCRT__wcstoul_l(const MSVCRT_wchar_t *s, + MSVCRT_wchar_t **end, int base, MSVCRT__locale_t locale) +{ + __int64 ret = MSVCRT__wcstoui64_l(s, end, base, locale); + + if(ret > MSVCRT_ULONG_MAX) { + ret = MSVCRT_ULONG_MAX; + *MSVCRT__errno() = MSVCRT_ERANGE; + } + return ret; +} + +/********************************************************************* + * wcstoul (MSVCRT.@) + */ +MSVCRT_ulong __cdecl MSVCRT_wcstoul(const MSVCRT_wchar_t *s, MSVCRT_wchar_t **end, int base) +{ + return MSVCRT__wcstoul_l(s, end, base, NULL); +} + /****************************************************************** * wcsnlen (MSVCRT.@) */

1 0

Piotr Caban : msvcrt: Don't forward towupper and towlower to ntdll.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 975801cceb9492a08743af1d8c6de332fc56d250 URL: http://source.winehq.org/git/wine.git/?a=commit;h=975801cceb9492a08743af1d8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 16:12:52 2013 +0100 msvcrt: Don't forward towupper and towlower to ntdll. --- dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt/wcs.c | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 278932e..c81f628 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1453,8 +1453,8 @@ # stub tmpnam_s(ptr long) @ cdecl tolower(long) MSVCRT_tolower @ cdecl toupper(long) MSVCRT_toupper -@ cdecl towlower(long) ntdll.towlower -@ cdecl towupper(long) ntdll.towupper +@ cdecl towlower(long) MSVCRT_towlower +@ cdecl towupper(long) MSVCRT_towupper @ cdecl ungetc(long ptr) MSVCRT_ungetc @ cdecl ungetwc(long ptr) MSVCRT_ungetwc # stub utime diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index b0a52d7..1968a2a 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1592,9 +1592,25 @@ int CDECL MSVCRT__towupper_l(MSVCRT_wint_t c, MSVCRT__locale_t locale) } /********************************************************************* + * towupper (MSVCRT.@) + */ +int CDECL MSVCRT_towupper(MSVCRT_wint_t c) +{ + return MSVCRT__towupper_l(c, NULL); +} + +/********************************************************************* * _towlower_l (MSVCRT.@) */ int CDECL MSVCRT__towlower_l(MSVCRT_wint_t c, MSVCRT__locale_t locale) { return tolowerW(c); } + +/********************************************************************* + * towlower (MSVCRT.@) + */ +int CDECL MSVCRT_towlower(MSVCRT_wint_t c) +{ + return MSVCRT__towlower_l(c, NULL); +}

1 0

Piotr Caban : msvcrt: Don't forward strchr to ntdll.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: bf237452effdd4f10e657596af38ec207cc0964a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf237452effdd4f10e657596a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 16:12:09 2013 +0100 msvcrt: Don't forward strchr to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index be94008..6b11ba4 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1411,7 +1411,7 @@ @ varargs sscanf_s(str str) MSVCRT_sscanf_s @ cdecl strcat(str str) ntdll.strcat @ cdecl strcat_s(str long str) MSVCRT_strcat_s -@ cdecl strchr(str long) ntdll.strchr +@ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) ntdll.strcmp @ cdecl strcoll(str str) MSVCRT_strcoll @ cdecl strcpy(ptr str) ntdll.strcpy diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index f7c2118..6d56cc0 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1575,6 +1575,14 @@ void* __cdecl MSVCRT_memset(void *dst, int c, MSVCRT_size_t n) } /********************************************************************* + * strchr (MSVCRT.@) + */ +char* __cdecl MSVCRT_strchr(const char *str, int c) +{ + return strchr(str, c); +} + +/********************************************************************* * _strnicmp_l (MSVCRT.@) */ int __cdecl MSVCRT__strnicmp_l(const char *s1, const char *s2,

1 0

Piotr Caban : msvcrt: Don't forward wcsncpy to ntdll.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 9e322594576ea23825c4e255e3e9f5c39c62e71a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e322594576ea23825c4e255e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 16:13:08 2013 +0100 msvcrt: Don't forward wcsncpy to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index c81f628..c992f7f 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1486,7 +1486,7 @@ @ cdecl wcsncat(wstr wstr long) ntdll.wcsncat @ cdecl wcsncat_s(wstr long wstr long) MSVCRT_wcsncat_s @ cdecl wcsncmp(wstr wstr long) ntdll.wcsncmp -@ cdecl wcsncpy(ptr wstr long) ntdll.wcsncpy +@ cdecl wcsncpy(ptr wstr long) MSVCRT_wcsncpy @ cdecl wcsncpy_s(ptr long wstr long) MSVCRT_wcsncpy_s @ cdecl wcsnlen(wstr long) MSVCRT_wcsnlen @ cdecl wcspbrk(wstr wstr) MSVCRT_wcspbrk diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 1968a2a..6e7c479 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1247,6 +1247,21 @@ INT CDECL MSVCRT_wcscpy_s( MSVCRT_wchar_t* wcDest, MSVCRT_size_t numElement, con } /****************************************************************** + * wcsncpy (MSVCRT.@) + */ +MSVCRT_wchar_t* __cdecl MSVCRT_wcsncpy( MSVCRT_wchar_t* s1, + const MSVCRT_wchar_t *s2, MSVCRT_size_t n ) +{ + MSVCRT_size_t i; + + for(i=0; i<n; i++) + if(!(s1[i] = s2[i])) break; + for(; i<n; i++) + s1[i] = 0; + return s1; +} + +/****************************************************************** * wcsncpy_s (MSVCRT.@) */ INT CDECL MSVCRT_wcsncpy_s( MSVCRT_wchar_t* wcDest, MSVCRT_size_t numElement, const MSVCRT_wchar_t *wcSrc,

1 0

Piotr Caban : msvcr90: Don't forward set_se_translator to msvcrt.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 39fa807b5374b56704095993561caa7d34d86721 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39fa807b5374b567040959935… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 16:15:01 2013 +0100 msvcr90: Don't forward set_se_translator to msvcrt. --- dlls/msvcr90/msvcr90.c | 17 +++++++++++++++++ dlls/msvcr90/msvcr90.spec | 4 ++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c index 9b3d8c7..dc97160 100644 --- a/dlls/msvcr90/msvcr90.c +++ b/dlls/msvcr90/msvcr90.c @@ -24,8 +24,11 @@ #include "windef.h" #include "winbase.h" +typedef void (__cdecl *MSVCRT__se_translator_function)(unsigned int code, struct _EXCEPTION_POINTERS *info); + static void* (__cdecl *MSVCRT_operator_new)(size_t); static void (__cdecl *MSVCRT_operator_delete)(void*); +static MSVCRT__se_translator_function (__cdecl *MSVCRT__set_se_translator)(MSVCRT__se_translator_function); static void init_cxx_funcs(void) { @@ -35,11 +38,15 @@ static void init_cxx_funcs(void) { MSVCRT_operator_new = (void*)GetProcAddress(hmod, "??2(a)YAPEAX_K@Z"); MSVCRT_operator_delete = (void*)GetProcAddress(hmod, "??3(a)YAXPEAX@Z"); + MSVCRT__set_se_translator = (void*)GetProcAddress(hmod, + "?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z"); } else { MSVCRT_operator_new = (void*)GetProcAddress(hmod, "??2(a)YAPAXI@Z"); MSVCRT_operator_delete = (void*)GetProcAddress(hmod, "??3(a)YAXPAX@Z"); + MSVCRT__set_se_translator = (void*)GetProcAddress(hmod, + "?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z"); } } @@ -99,3 +106,13 @@ void CDECL MSVCR90_operator_delete(void *ptr) { return MSVCRT_operator_delete(ptr); } + +/********************************************************************* + * ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z (MSVCR90.@) + * + * Naver LINE expects that this function is implemented inside msvcr90 + */ +MSVCRT__se_translator_function CDECL MSVCR90__set_se_translator(MSVCRT__se_translator_function func) +{ + return MSVCRT__set_se_translator(func); +} diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index c555c6e..158c9f5 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -97,8 +97,8 @@ @ cdecl ?_set_new_mode@@YAHH(a)Z(long) msvcrt.?_set_new_mode@@YAHH(a)Z @ stub -arch=win32 ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZH(a)Z # void (__cdecl*__cdecl _set_se_translator(int))(unsigned int,struct _EXCEPTION_POINTERS *) @ stub -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZH(a)Z # void (__cdecl*__cdecl _set_se_translator(int))(unsigned int,struct _EXCEPTION_POINTERS * __ptr64) -@ cdecl -arch=win32 ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z -@ cdecl -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z +@ cdecl -arch=win32 ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z(ptr) MSVCR90__set_se_translator +@ cdecl -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z(ptr) MSVCR90__set_se_translator @ cdecl -arch=win32 ?_sopen@@YAHPBDHHH(a)Z(str long long long) msvcrt._sopen @ cdecl -arch=win64 ?_sopen@@YAHPEBDHHH(a)Z(str long long long) msvcrt._sopen @ stub -arch=win32 ?_type_info_dtor_internal_method(a)type_info@@QAEXXZ # public: void __thiscall type_info::_type_info_dtor_internal_method(void)

1 0

Piotr Caban : msvcr90: Don't forward new and delete to msvcrt.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 1d02768f9453f0ef7010488a68828b873bfc2fab URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d02768f9453f0ef7010488a6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 16:14:47 2013 +0100 msvcr90: Don't forward new and delete to msvcrt. --- dlls/msvcr90/msvcr90.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/msvcr90/msvcr90.spec | 12 ++++++------ 2 files changed, 46 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c index de6d86e..9b3d8c7 100644 --- a/dlls/msvcr90/msvcr90.c +++ b/dlls/msvcr90/msvcr90.c @@ -24,6 +24,25 @@ #include "windef.h" #include "winbase.h" +static void* (__cdecl *MSVCRT_operator_new)(size_t); +static void (__cdecl *MSVCRT_operator_delete)(void*); + +static void init_cxx_funcs(void) +{ + HMODULE hmod = GetModuleHandleA("msvcrt.dll"); + + if (sizeof(void *) > sizeof(int)) /* 64-bit has different names */ + { + MSVCRT_operator_new = (void*)GetProcAddress(hmod, "??2(a)YAPEAX_K@Z"); + MSVCRT_operator_delete = (void*)GetProcAddress(hmod, "??3(a)YAXPEAX@Z"); + } + else + { + MSVCRT_operator_new = (void*)GetProcAddress(hmod, "??2(a)YAPAXI@Z"); + MSVCRT_operator_delete = (void*)GetProcAddress(hmod, "??3(a)YAXPAX@Z"); + } +} + /********************************************************************* * DllMain (MSVCR90.@) */ @@ -33,6 +52,7 @@ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hdll); + init_cxx_funcs(); _set_printf_count_output(0); } return TRUE; @@ -59,3 +79,23 @@ void * CDECL MSVCR90_encode_pointer(void * ptr) { return EncodePointer(ptr); } + +/********************************************************************* + * ??2(a)YAPAXI@Z (MSVCR90.@) + * + * Naver LINE expects that this function is implemented inside msvcr90 + */ +void* CDECL MSVCR90_operator_new(size_t size) +{ + return MSVCRT_operator_new(size); +} + +/********************************************************************* + * ??3(a)YAXPAX@Z (MSVCR90.@) + * + * Naver LINE expects that this function is implemented inside msvcr90 + */ +void CDECL MSVCR90_operator_delete(void *ptr) +{ + return MSVCRT_operator_delete(ptr); +} diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 0aa1ed4..c555c6e 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -30,12 +30,12 @@ @ cdecl -arch=win64 ??1exception(a)std@@UEAA(a)XZ(ptr) msvcrt.??1exception@@UEAA(a)XZ @ thiscall -arch=i386 ??1type_info@@UAE(a)XZ(ptr) msvcrt.??1type_info@@UAE(a)XZ @ cdecl -arch=win64 ??1type_info@@UEAA(a)XZ(ptr) msvcrt.??1type_info@@UEAA(a)XZ -@ cdecl -arch=win32 ??2(a)YAPAXI@Z(long) msvcrt.??2(a)YAPAXI@Z -@ cdecl -arch=win64 ??2(a)YAPEAX_K@Z(long) msvcrt.??2(a)YAPEAX_K@Z +@ cdecl -arch=win32 ??2(a)YAPAXI@Z(long) MSVCR90_operator_new +@ cdecl -arch=win64 ??2(a)YAPEAX_K@Z(long) MSVCR90_operator_new @ cdecl -arch=win32 ??2(a)YAPAXIHPBDH@Z(long long str long) msvcrt.??2(a)YAPAXIHPBDH@Z @ cdecl -arch=win64 ??2(a)YAPEAX_KHPEBDH@Z(long long str long) msvcrt.??2(a)YAPEAX_KHPEBDH@Z -@ cdecl -arch=win32 ??3(a)YAXPAX@Z(ptr) msvcrt.??3(a)YAXPAX@Z -@ cdecl -arch=win64 ??3(a)YAXPEAX@Z(ptr) msvcrt.??3(a)YAXPEAX@Z +@ cdecl -arch=win32 ??3(a)YAXPAX@Z(ptr) MSVCR90_operator_delete +@ cdecl -arch=win64 ??3(a)YAXPEAX@Z(ptr) MSVCR90_operator_delete @ thiscall -arch=i386 ??4__non_rtti_object(a)std@@QAEAAV01(a)ABV01@@Z(ptr ptr) msvcrt.??4__non_rtti_object@@QAEAAV0(a)ABV0@@Z @ cdecl -arch=win64 ??4__non_rtti_object(a)std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) msvcrt.??4__non_rtti_object@@QEAAAEAV0(a)AEBV0@@Z @ thiscall -arch=i386 ??4bad_cast(a)std@@QAEAAV01(a)ABV01@@Z(ptr ptr) msvcrt.??4bad_cast@@QAEAAV0(a)ABV0@@Z @@ -61,8 +61,8 @@ @ cdecl -arch=win64 ??_U(a)YAPEAX_K@Z(long) msvcrt.??_U(a)YAPEAX_K@Z @ cdecl -arch=win32 ??_U(a)YAPAXIHPBDH@Z(long long str long) msvcrt.??_U(a)YAPAXIHPBDH@Z @ cdecl -arch=win64 ??_U(a)YAPEAX_KHPEBDH@Z(long long str long) msvcrt.??_U(a)YAPEAX_KHPEBDH@Z -@ cdecl -arch=win32 ??_V(a)YAXPAX@Z(ptr) msvcrt.??_V(a)YAXPAX@Z -@ cdecl -arch=win64 ??_V(a)YAXPEAX@Z(ptr) msvcrt.??_V(a)YAXPEAX@Z +@ cdecl -arch=win32 ??_V(a)YAXPAX@Z(ptr) MSVCR90_operator_delete +@ cdecl -arch=win64 ??_V(a)YAXPEAX@Z(ptr) MSVCR90_operator_delete @ stub -arch=win32 ?_Name_base(a)type_info@@CAPBDPBV1(a)PAU__type_info_node@@@Z # private: static char const * __cdecl type_info::_Name_base(class type_info const *,struct __type_info_node *) @ stub -arch=win64 ?_Name_base(a)type_info@@CAPEBDPEBV1(a)PEAU__type_info_node@@@Z # private: static char const * __ptr64 __cdecl type_info::_Name_base(class type_info const * __ptr64,struct __type_info_node * __ptr64) @ stub -arch=win32 ?_Name_base_internal(a)type_info@@CAPBDPBV1(a)PAU__type_info_node@@@Z # private: static char const * __cdecl type_info::_Name_base_internal(class type_info const *,struct __type_info_node *)

1 0