August 2015 - Wine-commits - list.winehq.org

Alex Henrie : mshtml: Stub out HTMLAreaElement.
by Alexandre Julliard 05 Aug '15

05 Aug '15

Module: wine Branch: master Commit: f36d761650fd9ab2cfbc6f1b13952a8498ddf70f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f36d761650fd9ab2cfbc6f1b1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 4 08:59:39 2015 -0600 mshtml: Stub out HTMLAreaElement. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/htmlarea.c | 446 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/htmlelem.c | 2 + dlls/mshtml/mshtml_private.h | 3 + dlls/mshtml/nsiface.idl | 38 ++++ 5 files changed, 490 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f36d761650fd9ab2cfbc6…

1 0

Philippe Groarke : wine.inf: Add UTC Time Zone.
by Alexandre Julliard 05 Aug '15

05 Aug '15

Module: wine Branch: master Commit: 07e4d4bd044ac3c9f46526b210205216d8bfeb45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07e4d4bd044ac3c9f46526b21… Author: Philippe Groarke <philippe.groarke(a)gmail.com> Date: Mon Aug 3 21:05:25 2015 -0400 wine.inf: Add UTC Time Zone. --- loader/wine.inf.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 29b0c83..2025d9e 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3079,6 +3079,10 @@ HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Display",,"America HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Dlt",,"US Mountain Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Std",,"US Mountain Standard Time" HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"TZI",1,a4,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\UTC,"Display",,"Etc/UTC" +HKLM,%CurrentVersionNT%\Time Zones\UTC,"Dlt",,"Coordinated Universal Time" +HKLM,%CurrentVersionNT%\Time Zones\UTC,"Std",,"Coordinated Universal Time" +HKLM,%CurrentVersionNT%\Time Zones\UTC,"TZI",1,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Display",,"America/Caracas" HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Dlt",,"Venezuela Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Std",,"Venezuela Standard Time"

1 0

Michael Stefaniuc : qcap: Basic COM cleanup for IPin iface of VfwCapture.
by Alexandre Julliard 05 Aug '15

05 Aug '15

Module: wine Branch: master Commit: 22848359737ad9c37519a78d43ba87e0e169b5b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22848359737ad9c37519a78d4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Aug 3 23:24:18 2015 +0200 qcap: Basic COM cleanup for IPin iface of VfwCapture. --- dlls/qcap/vfwcapture.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index f9530a0..c34ab28 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -670,9 +670,14 @@ static const IKsPropertySetVtbl KSP_VTable = KSP_QuerySupported }; -static HRESULT WINAPI VfwPin_GetMediaType(BasePin *iface, int iPosition, AM_MEDIA_TYPE *pmt) +static inline VfwPinImpl *impl_from_BasePin(BasePin *pin) { - VfwPinImpl *This = (VfwPinImpl *)iface; + return CONTAINING_RECORD(pin, VfwPinImpl, pin.pin); +} + +static HRESULT WINAPI VfwPin_GetMediaType(BasePin *pin, int iPosition, AM_MEDIA_TYPE *pmt) +{ + VfwPinImpl *This = impl_from_BasePin(pin); AM_MEDIA_TYPE *vfw_pmt; HRESULT hr; @@ -748,9 +753,14 @@ VfwPin_Construct( IBaseFilter * pBaseFilter, LPCRITICAL_SECTION pCritSec, return hr; } +static inline VfwPinImpl *impl_from_IPin(IPin *iface) +{ + return CONTAINING_RECORD(iface, VfwPinImpl, pin.pin.IPin_iface); +} + static HRESULT WINAPI VfwPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) { - VfwPinImpl *This = (VfwPinImpl *)iface; + VfwPinImpl *This = impl_from_IPin(iface); TRACE("%s %p\n", debugstr_guid(riid), ppv); @@ -775,7 +785,7 @@ static HRESULT WINAPI VfwPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * static ULONG WINAPI VfwPin_Release(IPin * iface) { - VfwPinImpl *This = (VfwPinImpl *)iface; + VfwPinImpl *This = impl_from_IPin(iface); ULONG refCount = InterlockedDecrement(&This->pin.pin.refCount); TRACE("() -> new refcount: %u\n", refCount); @@ -791,10 +801,10 @@ VfwPin_Release(IPin * iface) static HRESULT WINAPI VfwPin_EnumMediaTypes(IPin * iface, IEnumMediaTypes ** ppEnum) { + VfwPinImpl *This = impl_from_IPin(iface); AM_MEDIA_TYPE *pmt; HRESULT hr; - VfwPinImpl *This = (VfwPinImpl *)iface; hr = qcap_driver_get_format(This->parent->driver_info, &pmt); if (SUCCEEDED(hr)) { hr = BasePinImpl_EnumMediaTypes(iface, ppEnum);

1 0

Michael Stefaniuc : qcap: COM cleanup for the IKsPropertySet iface.
by Alexandre Julliard 05 Aug '15

05 Aug '15

Module: wine Branch: master Commit: 487472b3f67ceeacca336cc899f7c29cd38d3336 URL: http://source.winehq.org/git/wine.git/?a=commit;h=487472b3f67ceeacca336cc89… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Aug 3 23:28:41 2015 +0200 qcap: COM cleanup for the IKsPropertySet iface. --- dlls/qcap/vfwcapture.c | 42 ++++++++++++++++-------------------------- 1 file changed, 16 insertions(+), 26 deletions(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index c34ab28..372e2ee 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -44,9 +44,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(qcap); -#define ICOM_THIS_MULTI(impl,field,iface) \ - impl* const This=(impl*)((char*)(iface) - offsetof(impl,field)) - static const IBaseFilterVtbl VfwCapture_Vtbl; static const IAMStreamConfigVtbl IAMStreamConfig_VTable; static const IAMVideoProcAmpVtbl IAMVideoProcAmp_VTable; @@ -103,8 +100,8 @@ static inline VfwCapture *impl_from_IPersistPropertyBag(IPersistPropertyBag *ifa typedef struct VfwPinImpl { BaseOutputPin pin; + IKsPropertySet IKsPropertySet_iface; VfwCapture *parent; - const IKsPropertySetVtbl * KSP_VT; } VfwPinImpl; @@ -585,37 +582,30 @@ static const IPersistPropertyBagVtbl IPersistPropertyBag_VTable = }; /* IKsPropertySet interface */ -static HRESULT WINAPI -KSP_QueryInterface( IKsPropertySet * iface, REFIID riid, LPVOID * ppv ) +static inline VfwPinImpl *impl_from_IKsPropertySet(IKsPropertySet *iface) { - if (IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IKsPropertySet)) - { - *ppv = iface; - IKsPropertySet_AddRef( iface ); - return S_OK; - } + return CONTAINING_RECORD(iface, VfwPinImpl, IKsPropertySet_iface); +} - FIXME("No interface for iid %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; +static HRESULT WINAPI KSP_QueryInterface(IKsPropertySet * iface, REFIID riid, void **ret_iface) +{ + VfwPinImpl *This = impl_from_IKsPropertySet(iface); + + return IPin_QueryInterface(&This->pin.pin.IPin_iface, riid, ret_iface); } static ULONG WINAPI KSP_AddRef(IKsPropertySet * iface) { - ICOM_THIS_MULTI(VfwPinImpl, KSP_VT, iface); + VfwPinImpl *This = impl_from_IKsPropertySet(iface); - TRACE("%p --> Forwarding to VfwPin (%p)\n", iface, This); - - return IUnknown_AddRef((IUnknown *)This); + return IPin_AddRef(&This->pin.pin.IPin_iface); } static ULONG WINAPI KSP_Release(IKsPropertySet * iface) { - ICOM_THIS_MULTI(VfwPinImpl, KSP_VT, iface); - - TRACE("%p --> Forwarding to VfwPin (%p)\n", iface, This); + VfwPinImpl *This = impl_from_IKsPropertySet(iface); - return IUnknown_Release((IUnknown *)This); + return IPin_Release(&This->pin.pin.IPin_iface); } static HRESULT WINAPI @@ -660,7 +650,7 @@ KSP_QuerySupported( IKsPropertySet * iface, REFGUID guidPropSet, return E_NOTIMPL; } -static const IKsPropertySetVtbl KSP_VTable = +static const IKsPropertySetVtbl IKsPropertySet_VTable = { KSP_QueryInterface, KSP_AddRef, @@ -746,7 +736,7 @@ VfwPin_Construct( IBaseFilter * pBaseFilter, LPCRITICAL_SECTION pCritSec, if (SUCCEEDED(hr)) { VfwPinImpl *pPinImpl = (VfwPinImpl*)*ppPin; - pPinImpl->KSP_VT = &KSP_VTable; + pPinImpl->IKsPropertySet_iface.lpVtbl = &IKsPropertySet_VTable; ObjectRefCount(TRUE); } @@ -768,7 +758,7 @@ static HRESULT WINAPI VfwPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IPin)) *ppv = This; else if (IsEqualIID(riid, &IID_IKsPropertySet)) - *ppv = &(This->KSP_VT); + *ppv = &This->IKsPropertySet_iface; else if (IsEqualIID(riid, &IID_IAMStreamConfig)) return IUnknown_QueryInterface((IUnknown *)This->parent, riid, ppv);

1 0

Sebastian Lackner : ntdll: Lookup DynamicDST based on current year, instead of year of daylight date.
by Alexandre Julliard 05 Aug '15

05 Aug '15

Module: wine Branch: master Commit: 3977ebafc068cf0115df4d6fc22f1d2823e04a13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3977ebafc068cf0115df4d6fc… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Aug 4 02:05:05 2015 +0200 ntdll: Lookup DynamicDST based on current year, instead of year of daylight date. When there are no further time changes, the function find_dst_change() will return (year_end + 1). This patch ensures that we don't lookup the wrong DynamicDST entry in such a case. --- dlls/ntdll/time.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 850d78f..96ffcfa 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -584,7 +584,7 @@ static BOOL reg_query_value(HKEY hkey, LPCWSTR name, DWORD type, void *data, DWO return TRUE; } -static void find_reg_tz_info(RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi) +static void find_reg_tz_info(RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi, int year) { static const WCHAR Time_ZonesW[] = { 'M','a','c','h','i','n','e','\\', 'S','o','f','t','w','a','r','e','\\', @@ -600,7 +600,7 @@ static void find_reg_tz_info(RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi) UNICODE_STRING nameW, nameDynamicW; WCHAR buf[128], yearW[16]; - sprintfW(yearW, fmtW, tzi->DaylightDate.wYear); + sprintfW(yearW, fmtW, year); attrDynamic.Length = sizeof(attrDynamic); attrDynamic.RootDirectory = 0; /* will be replaced later */ @@ -856,7 +856,7 @@ static int init_tz_info(RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi) tzi->StandardBias); } - find_reg_tz_info(tzi); + find_reg_tz_info(tzi, current_year + 1900); cached_tzi = *tzi; RtlLeaveCriticalSection( &TIME_tz_section );

1 0

Sebastian Lackner : wine.inf: Add timezone information for Chile.
by Alexandre Julliard 05 Aug '15

05 Aug '15

Module: wine Branch: master Commit: 6cc3d8a7074df3a907af6cb414d0419f30eaa93f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cc3d8a7074df3a907af6cb41… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Aug 4 02:05:13 2015 +0200 wine.inf: Add timezone information for Chile. --- loader/wine.inf.in | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 315ef29..9214acd 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2708,6 +2708,11 @@ HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico),"Display",,"Am HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico),"Dlt",,"Central Daylight Time (Mexico)" HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico),"Std",,"Central Standard Time (Mexico)" HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico),"TZI",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Chile Standard Time,"Display",,"Chile/Continental" +HKLM,%CurrentVersionNT%\Time Zones\Chile Standard Time,"Dlt",,"Chile Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Chile Standard Time,"Std",,"Chile Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Chile Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Chile Standard Time\Dynamic DST,"2015",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,df,07,04,00,00,00,1a,00,01,00,00,00,00,00,00,00,e0,07,01,00,05,00,01,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\China Standard Time,"Display",,"Asia/Shanghai" HKLM,%CurrentVersionNT%\Time Zones\China Standard Time,"Dlt",,"China Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\China Standard Time,"Std",,"China Standard Time" @@ -2733,6 +2738,11 @@ HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2 HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2026",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,ea,07,02,00,00,00,16,00,00,00,00,00,00,00,00,00,ea,07,0a,00,00,00,12,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2034",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,f2,07,02,00,00,00,1a,00,00,00,00,00,00,00,00,00,f2,07,0a,00,00,00,0f,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2037",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,f5,07,02,00,00,00,16,00,00,00,00,00,00,00,00,00,f5,07,0a,00,00,00,12,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time,"Display",,"Chile/EasterIsland" +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time,"Dlt",,"Easter Island Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time,"Std",,"Easter Island Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time,"TZI",1,2c,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"2015",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,df,07,04,00,06,00,19,00,17,00,00,00,00,00,00,00,e0,07,01,00,05,00,01,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time,"Display",,"America/New_York" HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time,"Dlt",,"Eastern Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time,"Std",,"Eastern Standard Time"

1 0

Sebastian Lackner : wine.inf: Update timezone information for Morocco Standard Time.
by Alexandre Julliard 05 Aug '15

05 Aug '15

Module: wine Branch: master Commit: 74e6f56a010ddb0aecd7374aae044dd04e2d5dae URL: http://source.winehq.org/git/wine.git/?a=commit;h=74e6f56a010ddb0aecd7374aa… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Aug 4 02:05:22 2015 +0200 wine.inf: Update timezone information for Morocco Standard Time. The timezone information for Morocco was updated recently. --- loader/wine.inf.in | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 9214acd..29b0c83 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2936,14 +2936,13 @@ HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time,"Display",,"Africa/Casa HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time,"Dlt",,"Morocco Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time,"Std",,"Morocco Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time,"TZI",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2015",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,df,07,0a,00,00,00,19,00,03,00,00,00,00,00,00,00,df,07,07,00,06,00,12,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2016",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,e0,07,0a,00,00,00,1e,00,03,00,00,00,00,00,00,00,e0,07,07,00,06,00,09,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2022",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,e6,07,0a,00,00,00,1e,00,03,00,00,00,00,00,00,00,e6,07,05,00,06,00,07,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2023",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,e7,07,0a,00,00,00,1d,00,03,00,00,00,00,00,00,00,e7,07,04,00,06,00,16,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2024",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,e8,07,0a,00,00,00,1b,00,03,00,00,00,00,00,00,00,e8,07,04,00,06,00,0d,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2025",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,e9,07,0a,00,00,00,1a,00,03,00,00,00,00,00,00,00,e9,07,04,00,06,00,05,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2035",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,f3,07,0a,00,06,00,1b,00,03,00,00,00,00,00,00,00,f3,07,03,00,00,00,19,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2036",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,f4,07,0a,00,06,00,12,00,03,00,00,00,00,00,00,00,f4,07,03,00,00,00,1e,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2015",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,df,07,0a,00,00,00,19,00,03,00,00,00,00,00,00,00,df,07,07,00,00,00,13,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2016",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,e0,07,0a,00,00,00,1e,00,03,00,00,00,00,00,00,00,e0,07,07,00,00,00,0a,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2022",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,e6,07,0a,00,00,00,1e,00,03,00,00,00,00,00,00,00,e6,07,05,00,00,00,08,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2023",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,e7,07,0a,00,00,00,1d,00,03,00,00,00,00,00,00,00,e7,07,04,00,00,00,17,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2024",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,e8,07,0a,00,00,00,1b,00,03,00,00,00,00,00,00,00,e8,07,04,00,00,00,0e,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2025",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,e9,07,0a,00,00,00,1a,00,03,00,00,00,00,00,00,00,e9,07,04,00,00,00,06,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2036",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,f4,07,0a,00,00,00,13,00,03,00,00,00,00,00,00,00,f4,07,03,00,00,00,1e,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time,"Display",,"America/Denver" HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time,"Dlt",,"Mountain Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time,"Std",,"Mountain Standard Time"

1 0

Henri Verbeet : d2d1: Implement d2d_bitmap_GetFactory().
by Alexandre Julliard 05 Aug '15

05 Aug '15

Module: wine Branch: master Commit: da47b214cdcb2237d71e43a9a3758a335b6ba648 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da47b214cdcb2237d71e43a9a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 4 08:53:25 2015 +0200 d2d1: Implement d2d_bitmap_GetFactory(). --- dlls/d2d1/bitmap.c | 8 ++++++-- dlls/d2d1/d2d1_private.h | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 00359cb..2627501 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -67,6 +67,7 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_Release(ID2D1Bitmap *iface) if (!refcount) { ID3D10ShaderResourceView_Release(bitmap->view); + ID2D1Factory_Release(bitmap->factory); HeapFree(GetProcessHeap(), 0, bitmap); } @@ -75,9 +76,11 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_Release(ID2D1Bitmap *iface) static void STDMETHODCALLTYPE d2d_bitmap_GetFactory(ID2D1Bitmap *iface, ID2D1Factory **factory) { - FIXME("iface %p, factory %p stub!\n", iface, factory); + struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap(iface); + + TRACE("iface %p, factory %p.\n", iface, factory); - *factory = NULL; + ID2D1Factory_AddRef(*factory = bitmap->factory); } static D2D1_SIZE_F * STDMETHODCALLTYPE d2d_bitmap_GetSize(ID2D1Bitmap *iface, D2D1_SIZE_F *size) @@ -212,6 +215,7 @@ HRESULT d2d_bitmap_init(struct d2d_bitmap *bitmap, struct d2d_d3d_render_target bitmap->ID2D1Bitmap_iface.lpVtbl = &d2d_bitmap_vtbl; bitmap->refcount = 1; + ID2D1Factory_AddRef(bitmap->factory = render_target->factory); texture_desc.Width = size.width; texture_desc.Height = size.height; diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 3f2ac3e..d3c0117 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -188,6 +188,7 @@ struct d2d_bitmap ID2D1Bitmap ID2D1Bitmap_iface; LONG refcount; + ID2D1Factory *factory; ID3D10ShaderResourceView *view; D2D1_SIZE_U pixel_size; D2D1_PIXEL_FORMAT format;

1 0

Henri Verbeet : d2d1: Use the same device for all WIC render targets from the same factory.
by Alexandre Julliard 05 Aug '15

05 Aug '15

Module: wine Branch: master Commit: f0bf9e81fa8cc215f8e9c1d93134ac836deb056d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0bf9e81fa8cc215f8e9c1d93… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 4 08:53:26 2015 +0200 d2d1: Use the same device for all WIC render targets from the same factory. --- dlls/d2d1/d2d1_private.h | 2 +- dlls/d2d1/factory.c | 16 +++++++++++++++- dlls/d2d1/wic_render_target.c | 16 ++-------------- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index d3c0117..08e0b3f 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -105,7 +105,7 @@ struct d2d_wic_render_target }; HRESULT d2d_wic_render_target_init(struct d2d_wic_render_target *render_target, ID2D1Factory *factory, - IWICBitmap *bitmap, const D2D1_RENDER_TARGET_PROPERTIES *desc) DECLSPEC_HIDDEN; + ID3D10Device1 *device, IWICBitmap *bitmap, const D2D1_RENDER_TARGET_PROPERTIES *desc) DECLSPEC_HIDDEN; struct d2d_gradient { diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 91534ce..0d15548 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -28,6 +28,8 @@ struct d2d_factory { ID2D1Factory ID2D1Factory_iface; LONG refcount; + + ID3D10Device1 *wic_device; }; static inline struct d2d_factory *impl_from_ID2D1Factory(ID2D1Factory *iface) @@ -71,7 +73,11 @@ static ULONG STDMETHODCALLTYPE d2d_factory_Release(ID2D1Factory *iface) TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) + { + if (factory->wic_device) + ID3D10Device1_Release(factory->wic_device); HeapFree(GetProcessHeap(), 0, factory); + } return refcount; } @@ -210,6 +216,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDrawingStateBlock(ID2D1Factor static HRESULT STDMETHODCALLTYPE d2d_factory_CreateWicBitmapRenderTarget(ID2D1Factory *iface, IWICBitmap *target, const D2D1_RENDER_TARGET_PROPERTIES *desc, ID2D1RenderTarget **render_target) { + struct d2d_factory *factory = impl_from_ID2D1Factory(iface); struct d2d_wic_render_target *object; HRESULT hr; @@ -218,7 +225,14 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateWicBitmapRenderTarget(ID2D1Fa if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d2d_wic_render_target_init(object, iface, target, desc))) + if (!factory->wic_device && FAILED(hr = D3D10CreateDevice1(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, + D3D10_CREATE_DEVICE_BGRA_SUPPORT, D3D10_FEATURE_LEVEL_10_0, D3D10_1_SDK_VERSION, &factory->wic_device))) + { + WARN("Failed to create device, hr %#x.\n", hr); + return hr; + } + + if (FAILED(hr = d2d_wic_render_target_init(object, iface, factory->wic_device, target, desc))) { WARN("Failed to initialize render target, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); diff --git a/dlls/d2d1/wic_render_target.c b/dlls/d2d1/wic_render_target.c index a2ad73a..973303c 100644 --- a/dlls/d2d1/wic_render_target.c +++ b/dlls/d2d1/wic_render_target.c @@ -782,11 +782,10 @@ static const struct ID2D1RenderTargetVtbl d2d_wic_render_target_vtbl = }; HRESULT d2d_wic_render_target_init(struct d2d_wic_render_target *render_target, ID2D1Factory *factory, - IWICBitmap *bitmap, const D2D1_RENDER_TARGET_PROPERTIES *desc) + ID3D10Device1 *device, IWICBitmap *bitmap, const D2D1_RENDER_TARGET_PROPERTIES *desc) { D3D10_TEXTURE2D_DESC texture_desc; ID3D10Texture2D *texture; - ID3D10Device1 *device; HRESULT hr; FIXME("Ignoring render target properties.\n"); @@ -846,17 +845,9 @@ HRESULT d2d_wic_render_target_init(struct d2d_wic_render_target *render_target, texture_desc.CPUAccessFlags = 0; texture_desc.MiscFlags = 0; - if (FAILED(hr = D3D10CreateDevice1(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, - D3D10_CREATE_DEVICE_BGRA_SUPPORT, D3D10_FEATURE_LEVEL_10_0, D3D10_1_SDK_VERSION, &device))) - { - WARN("Failed to create device, hr %#x.\n", hr); - return hr; - } - if (FAILED(hr = ID3D10Device1_CreateTexture2D(device, &texture_desc, NULL, &texture))) { WARN("Failed to create texture, hr %#x.\n", hr); - ID3D10Device1_Release(device); return hr; } @@ -865,7 +856,6 @@ HRESULT d2d_wic_render_target_init(struct d2d_wic_render_target *render_target, if (FAILED(hr)) { WARN("Failed to get DXGI surface interface, hr %#x.\n", hr); - ID3D10Device1_Release(device); return hr; } @@ -873,9 +863,7 @@ HRESULT d2d_wic_render_target_init(struct d2d_wic_render_target *render_target, texture_desc.BindFlags = 0; texture_desc.CPUAccessFlags = D3D10_CPU_ACCESS_READ; - hr = ID3D10Device1_CreateTexture2D(device, &texture_desc, NULL, &render_target->readback_texture); - ID3D10Device1_Release(device); - if (FAILED(hr)) + if (FAILED(hr = ID3D10Device1_CreateTexture2D(device, &texture_desc, NULL, &render_target->readback_texture))) { WARN("Failed to create readback texture, hr %#x.\n", hr); IDXGISurface_Release(render_target->dxgi_surface);

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_CreateSharedBitmap() .
by Alexandre Julliard 05 Aug '15

05 Aug '15

Module: wine Branch: master Commit: cd59e3db6cd9867dc2f4833323dfb44a22d04ffa URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd59e3db6cd9867dc2f483332… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 4 08:53:27 2015 +0200 d2d1: Implement d2d_d3d_render_target_CreateSharedBitmap(). --- dlls/d2d1/bitmap.c | 108 +++++++++++++++++++++--------- dlls/d2d1/d2d1_private.h | 4 +- dlls/d2d1/render_target.c | 25 +++++-- dlls/d2d1/tests/Makefile.in | 2 +- dlls/d2d1/tests/d2d1.c | 155 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 259 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cd59e3db6cd9867dc2f48…

1 0