wine-commits August 2015

wine-commits@winehq.org

2 participants
503 discussions

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

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

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 : 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

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

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

Jacek Caban : windows.foundation.idl: Added new file.
by Alexandre Julliard 03 Aug '15

03 Aug '15

Module: wine Branch: master Commit: e3c6777edda76f319e5c465faf6c20bb91ed9f17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3c6777edda76f319e5c465fa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 3 14:38:40 2015 +0200 windows.foundation.idl: Added new file. --- include/Makefile.in | 1 + include/windows.foundation.idl | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 2431895..6317510 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -132,6 +132,7 @@ PUBLIC_IDL_H_SRCS = \ wia_xp.idl \ wincodec.idl \ wincodecsdk.idl \ + windows.foundation.idl \ wine/itss.idl \ wine/svcctl.idl \ winsxs.idl \ diff --git a/include/windows.foundation.idl b/include/windows.foundation.idl new file mode 100644 index 0000000..f926202 --- /dev/null +++ b/include/windows.foundation.idl @@ -0,0 +1,39 @@ +/* + * Copyright 2015 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt +#endif + +import "inspectable.idl"; +/* import "asyncinfo.idl"; */ +/* import "eventtoken.idl"; */ +/* import "ivectorchangedeventargs.idl"; */ + +namespace Windows { + namespace Foundation { + [ + version(0x06030000), + uuid(96369f54-8eb6-48f0-abce-c1b211e627c3) + ] + interface IStringable : IInspectable + { + HRESULT ToString([out, retval] HSTRING *value); + } + } +}

1 0

Jacek Caban : widl: Added widl-specific winrt pragma.
by Alexandre Julliard 03 Aug '15

03 Aug '15

Module: wine Branch: master Commit: a9503166fe3c64051cd9b4f18f1331e01102afc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9503166fe3c64051cd9b4f18… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 3 14:38:27 2015 +0200 widl: Added widl-specific winrt pragma. --- tools/widl/parser.l | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index b4f2af5..c95277c 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -147,6 +147,15 @@ UUID *parse_uuid(const char *u) input_name = xstrdup(fname); } <PP_PRAGMA>midl_echo[^\n]* yyless(9); yy_pop_state(); return tCPPQUOTE; +<PP_PRAGMA>winrt[^\n]* { + if(import_stack_ptr) { + if(!winrt_mode) + error_loc("winrt IDL file imported in non-winrt mode\n"); + }else { + winrt_mode = TRUE; + } + yy_pop_state(); + } <PP_PRAGMA>[^\n]* parser_lval.str = xstrdup(yytext); yy_pop_state(); return aPRAGMA; <INITIAL,ATTR>\" yy_push_state(QUOTE); cbufidx = 0; <QUOTE>\" {

1 0

Andrey Gusev : po: Update Ukrainian translation.
by Alexandre Julliard 03 Aug '15

03 Aug '15

Module: wine Branch: master Commit: 2076df9df3197cdd843511d84ebb26d6ceedb4a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2076df9df3197cdd843511d84… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Aug 3 15:18:31 2015 +0300 po: Update Ukrainian translation. --- po/uk.po | 38 +++++++++++--------------------------- 1 file changed, 11 insertions(+), 27 deletions(-) diff --git a/po/uk.po b/po/uk.po index 2fc3da2..f72fc95 100644 --- a/po/uk.po +++ b/po/uk.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-05-28 15:57+0200\n" +"PO-Revision-Date: 2015-08-03 15:12+0200\n" "Last-Translator: Andrey Gusev <andrey.goosev(a)gmail.com>\n" "Language-Team: Ukrainian\n" "Language: uk\n" @@ -7532,10 +7532,8 @@ msgid "Add Control" msgstr "Додати елемент управління" #: oledlg.rc:34 -#, fuzzy -#| msgid "&Font..." msgid "&Convert..." -msgstr "&Шрифт..." +msgstr "&Конвертувати..." #: oledlg.rc:33 oleview.rc:40 msgid "&Object" @@ -9290,24 +9288,20 @@ msgstr "" "достатньо вільного простору та що комп'ютер ще підключений до мережі." #: winmm.rc:136 -#, fuzzy -#| msgid "Wine Mono Installer" msgid "Wine Sound Mapper" -msgstr "Встановлювач Wine Mono" +msgstr "Wine Sound Mapper" #: winmm.rc:137 -#, fuzzy -#| msgid "column" msgid "Volume" -msgstr "стовпчик" +msgstr "Гучність" #: winmm.rc:138 msgid "Master Volume" -msgstr "" +msgstr "Основна гучність" #: winmm.rc:139 msgid "Mute" -msgstr "" +msgstr "Приглушити" #: winspool.rc:37 msgid "Print to File" @@ -13594,16 +13588,12 @@ msgid "Command history" msgstr "Історія команд" #: wineconsole.rc:69 -#, fuzzy -#| msgid "Buffer zone" msgid "&Buffer size:" -msgstr "Зона буфера" +msgstr "&Розмір буфера:" #: wineconsole.rc:72 -#, fuzzy -#| msgid "&Remove doubles" msgid "&Remove duplicates" -msgstr "Видаляти &повтори" +msgstr "&Видаляти повтори" #: wineconsole.rc:74 msgid "Popup menu" @@ -13618,22 +13608,16 @@ msgid "S&hift" msgstr "" #: wineconsole.rc:78 -#, fuzzy -#| msgid "&Close console" msgid "Console" -msgstr "&Закрити консоль" +msgstr "Консоль" #: wineconsole.rc:79 -#, fuzzy -#| msgid "Quick edit" msgid "&Quick Edit mode" -msgstr "Швидке редагування" +msgstr "&Швидке редагування" #: wineconsole.rc:80 -#, fuzzy -#| msgid "&Expert mode" msgid "&Insert mode" -msgstr "&Режим експерта" +msgstr "&Режим вставки" #: wineconsole.rc:88 msgid "&Font"

1 0

Hans Leidekker : winhttp: Always clear last error on success.
by Alexandre Julliard 03 Aug '15

03 Aug '15

Module: wine Branch: master Commit: 1def0982f16b1030de0b39c41dfe0496b27845da URL: http://source.winehq.org/git/wine.git/?a=commit;h=1def0982f16b1030de0b39c41… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Aug 3 11:27:31 2015 +0200 winhttp: Always clear last error on success. --- dlls/winhttp/request.c | 9 +++ dlls/winhttp/session.c | 29 ++++++++- dlls/winhttp/tests/notification.c | 47 +++++++++++--- dlls/winhttp/tests/url.c | 9 ++- dlls/winhttp/tests/winhttp.c | 131 ++++++++++++++++++++++++++++++++------ dlls/winhttp/url.c | 2 + 6 files changed, 194 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1def0982f16b1030de0b3…

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 August 2015