wine-commits March 2013

wine-commits@winehq.org

2 participants
531 discussions

Michael Stefaniuc : dplayx: Fix DllGetClassObject().
by Alexandre Julliard 29 Mar '13

29 Mar '13

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 29 Mar '13

29 Mar '13

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

Michael Stefaniuc : dplayx: Get rid of LPCLASSFACTORY and use a better name for the methods.
by Alexandre Julliard 29 Mar '13

29 Mar '13

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

Jactry Zeng : msvcrt: Added _wcsncoll and _wcsncoll_l implementation.
by Alexandre Julliard 29 Mar '13

29 Mar '13

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

C.W. Betts : winemac: Implement getting and setting screen saver state on OS X.
by Alexandre Julliard 29 Mar '13

29 Mar '13

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: Track drawn surface region to reduce black flicker for new or resized windows .
by Alexandre Julliard 29 Mar '13

29 Mar '13

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

Ken Thomases : winemac: Draw surface region rects separately instead of clipping one big draw.
by Alexandre Julliard 29 Mar '13

29 Mar '13

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

Ken Thomases : winemac: Invalidate window shadow on every draw for transparent windows.
by Alexandre Julliard 29 Mar '13

29 Mar '13

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: Add proper locking in macdrv_surface_set_region().
by Alexandre Julliard 29 Mar '13

29 Mar '13

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

Aric Stewart : imm32/tests: Show behavior with VK_PROCESSKEY in relation to PeekMessage.
by Alexandre Julliard 28 Mar '13

28 Mar '13

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2013