wine-commits August 2016

wine-commits@winehq.org

2 participants
777 discussions

Nikolay Sivov : msdaps: Added AddRefAccessor() proxy/stub.
by Alexandre Julliard 29 Aug '16

29 Aug '16

Module: wine Branch: master Commit: 1dcf2ae5a8ccb441219bb95e9c5b49150e62e890 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dcf2ae5a8ccb441219bb95e9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 27 13:29:14 2016 +0300 msdaps: Added AddRefAccessor() proxy/stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdaps/usrmarshal.c | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 5f3be4f..43e3aae 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -645,17 +645,40 @@ HRESULT __RPC_STUB ICreateRow_CreateRow_Stub(ICreateRow* This, IUnknown *pUnkOut return hr; } -HRESULT CALLBACK IAccessor_AddRefAccessor_Proxy(IAccessor* This, HACCESSOR hAccessor, DBREFCOUNT *pcRefCount) +HRESULT CALLBACK IAccessor_AddRefAccessor_Proxy(IAccessor* This, HACCESSOR hAccessor, DBREFCOUNT *refcount) { - FIXME("(%p)->(%08lx, %p): stub\n", This, hAccessor, pcRefCount); - return E_NOTIMPL; + IErrorInfo *errorinfo; + DBREFCOUNT ref; + HRESULT hr; + + TRACE("(%p)->(%08lx, %p)\n", This, hAccessor, refcount); + + if (!refcount) + refcount = &ref; + + errorinfo = NULL; + hr = IAccessor_RemoteAddRefAccessor_Proxy(This, hAccessor, refcount, &errorinfo); + if (errorinfo) + { + SetErrorInfo(0, errorinfo); + IErrorInfo_Release(errorinfo); + } + + return hr; } HRESULT __RPC_STUB IAccessor_AddRefAccessor_Stub(IAccessor* This, HACCESSOR hAccessor, DBREFCOUNT *pcRefCount, IErrorInfo **ppErrorInfoRem) { - FIXME("(%p)->(%08lx, %p, %p): stub\n", This, hAccessor, pcRefCount, ppErrorInfoRem); - return E_NOTIMPL; + HRESULT hr; + + TRACE("(%p)->(%08lx, %p, %p)\n", This, hAccessor, pcRefCount, ppErrorInfoRem); + + hr = IAccessor_AddRefAccessor(This, hAccessor, pcRefCount); + if (FAILED(hr)) + GetErrorInfo(0, ppErrorInfoRem); + + return hr; } HRESULT CALLBACK IAccessor_CreateAccessor_Proxy(IAccessor* This, DBACCESSORFLAGS dwAccessorFlags, DBCOUNTITEM cBindings,

1 0

Jacek Caban : winemac.drv: Added ThreadDetach entry point and use it instead of DllMain.
by Alexandre Julliard 29 Aug '16

29 Aug '16

Module: wine Branch: master Commit: 8f0557940a5e21c307020850e7ec7a3f15406adf URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f0557940a5e21c307020850e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 25 14:36:54 2016 +0200 winemac.drv: Added ThreadDetach entry point and use it instead of DllMain. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/macdrv_main.c | 8 +++----- dlls/winemac.drv/winemac.drv.spec | 1 + 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 2ce78d1..3b11751 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -290,9 +290,9 @@ static BOOL process_attach(void) /*********************************************************************** - * thread_detach + * ThreadDetach (MACDRV.@) */ -static void thread_detach(void) +void CDECL macdrv_ThreadDetach(void) { struct macdrv_thread_data *data = macdrv_thread_data(); @@ -382,12 +382,10 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) switch(reason) { case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinst ); macdrv_module = hinst; ret = process_attach(); break; - case DLL_THREAD_DETACH: - thread_detach(); - break; } return ret; } diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index aed05d9..2e29722 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -42,6 +42,7 @@ @ cdecl ShowWindow(long long ptr long) macdrv_ShowWindow @ cdecl SysCommand(long long long) macdrv_SysCommand @ cdecl SystemParametersInfo(long long ptr long) macdrv_SystemParametersInfo +@ cdecl ThreadDetach() macdrv_ThreadDetach @ cdecl ToUnicodeEx(long long ptr ptr long long long) macdrv_ToUnicodeEx @ cdecl UnregisterHotKey(long long long) macdrv_UnregisterHotKey @ cdecl UpdateLayeredWindow(long ptr ptr) macdrv_UpdateLayeredWindow

1 0

Jacek Caban : user32: Introduced ThreadDetach driver entry point.
by Alexandre Julliard 29 Aug '16

29 Aug '16

Module: wine Branch: master Commit: f0e7bd248e7e2a2f2d49dde0ccc332e6b6d97306 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0e7bd248e7e2a2f2d49dde0c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 25 14:33:45 2016 +0200 user32: Introduced ThreadDetach driver entry point. The problem was diagnosed by Ken Thomases. Currently drivers use DllMain(DLL_THREAD_DETACH) to release thread data. The problem is that DLLs (like native urlmon.dll, esp. reproducible in IE8) may still do user32 calls after driver detaches thread. Loader ensures that since user32.dll was loaded before dependent DLLs, user32's DllMain will be called in the right moment. Due to lazy loading of drivers, we have no control over them. We may use a new entry point to make sure that we detach user32 and driver at the same time. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 13 +++++++++++-- dlls/user32/user_main.c | 1 + dlls/user32/user_private.h | 2 ++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 201988c..32acf28 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -155,6 +155,7 @@ static const USER_DRIVER *load_driver(void) GET_USER_FUNC(WindowPosChanging); GET_USER_FUNC(WindowPosChanged); GET_USER_FUNC(SystemParametersInfo); + GET_USER_FUNC(ThreadDetach); #undef GET_USER_FUNC } @@ -512,6 +513,10 @@ static BOOL CDECL nulldrv_SystemParametersInfo( UINT action, UINT int_param, voi return FALSE; } +static void CDECL nulldrv_ThreadDetach( void ) +{ +} + static USER_DRIVER null_driver = { /* keyboard functions */ @@ -572,7 +577,9 @@ static USER_DRIVER null_driver = nulldrv_WindowPosChanging, nulldrv_WindowPosChanged, /* system parameters */ - nulldrv_SystemParametersInfo + nulldrv_SystemParametersInfo, + /* thread management */ + nulldrv_ThreadDetach }; @@ -827,5 +834,7 @@ static USER_DRIVER lazy_load_driver = nulldrv_WindowPosChanging, nulldrv_WindowPosChanged, /* system parameters */ - nulldrv_SystemParametersInfo + nulldrv_SystemParametersInfo, + /* thread management */ + nulldrv_ThreadDetach }; diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 45aea81..74a7617 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -303,6 +303,7 @@ static void thread_detach(void) exiting_thread_id = GetCurrentThreadId(); WDML_NotifyThreadDetach(); + USER_Driver->pThreadDetach(); if (thread_info->top_window) WIN_DestroyThreadWindows( thread_info->top_window ); if (thread_info->msg_window) WIN_DestroyThreadWindows( thread_info->msg_window ); diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index e4a2ed1..efad519 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -117,6 +117,8 @@ typedef struct tagUSER_DRIVER { void (CDECL *pWindowPosChanged)(HWND,HWND,UINT,const RECT *,const RECT *,const RECT *,const RECT *,struct window_surface*); /* system parameters */ BOOL (CDECL *pSystemParametersInfo)(UINT,UINT,void*,UINT); + /* thread management */ + void (CDECL *pThreadDetach)(void); } USER_DRIVER; extern const USER_DRIVER *USER_Driver DECLSPEC_HIDDEN;

1 0

Jacek Caban : kernel32: Fixed handling LOCALE_NAME_USER_DEFAULT in GetLocaleInfoEx.
by Alexandre Julliard 29 Aug '16

29 Aug '16

Module: wine Branch: master Commit: 505406fc83b65dd1f9ebcbaabb582f0fabec1b0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=505406fc83b65dd1f9ebcbaab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 26 22:13:17 2016 +0200 kernel32: Fixed handling LOCALE_NAME_USER_DEFAULT in GetLocaleInfoEx. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 2 +- dlls/kernel32/tests/locale.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index fefa373..b04d190 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -1726,7 +1726,7 @@ INT WINAPI GetLocaleInfoEx(LPCWSTR locale, LCTYPE info, LPWSTR buffer, INT len) if (!lcid) return 0; /* special handling for neutral locale names */ - if (info == LOCALE_SNAME && strlenW(locale) == 2) + if (info == LOCALE_SNAME && locale && strlenW(locale) == 2) { if (len && len < 3) { diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 7cb7859..701f8d7 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4283,7 +4283,7 @@ static void test_IdnToUnicode(void) static void test_GetLocaleInfoEx(void) { static const WCHAR enW[] = {'e','n',0}; - WCHAR bufferW[80]; + WCHAR bufferW[80], buffer2[80]; INT ret; if (!pGetLocaleInfoEx) @@ -4354,6 +4354,12 @@ static void test_GetLocaleInfoEx(void) ok(!lstrcmpW(bufferW, ptr->name), "%s: got wrong LOCALE_SNAME %s\n", wine_dbgstr_w(ptr->name), wine_dbgstr_w(bufferW)); ptr++; } + + ret = pGetLocaleInfoEx(LOCALE_NAME_USER_DEFAULT, LOCALE_SNAME, bufferW, sizeof(bufferW)/sizeof(WCHAR)); + ok(ret && ret == lstrlenW(bufferW)+1, "got ret value %d\n", ret); + ret = GetLocaleInfoW(GetUserDefaultLCID(), LOCALE_SNAME, buffer2, sizeof(buffer2)/sizeof(WCHAR)); + ok(ret && ret == lstrlenW(buffer2)+1, "got ret value %d\n", ret); + ok(!lstrcmpW(bufferW, buffer2), "LOCALE_SNAMEs don't match %s %s\n", wine_dbgstr_w(bufferW), wine_dbgstr_w(buffer2)); } }

1 0

Vincent Povirk : gdiplus: Copy remap tables when cloning an ImageAttributes.
by Alexandre Julliard 29 Aug '16

29 Aug '16

Module: wine Branch: master Commit: d26c0ca214cdb20b103f7c1875c6ea4f2bb1f2a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d26c0ca214cdb20b103f7c187… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Aug 26 15:14:10 2016 -0500 gdiplus: Copy remap tables when cloning an ImageAttributes. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/imageattributes.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/imageattributes.c b/dlls/gdiplus/imageattributes.c index a76fe3b..2050706 100644 --- a/dlls/gdiplus/imageattributes.c +++ b/dlls/gdiplus/imageattributes.c @@ -30,18 +30,52 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); GpStatus WINGDIPAPI GdipCloneImageAttributes(GDIPCONST GpImageAttributes *imageattr, GpImageAttributes **cloneImageattr) { - GpStatus stat; + GpStatus stat = Ok; + struct color_remap_table remap_tables[ColorAdjustTypeCount] = {{0}}; + int i; TRACE("(%p, %p)\n", imageattr, cloneImageattr); if(!imageattr || !cloneImageattr) return InvalidParameter; - stat = GdipCreateImageAttributes(cloneImageattr); + for (i=0; i<ColorAdjustTypeCount; i++) + { + if (imageattr->colorremaptables[i].enabled) + { + remap_tables[i].enabled = TRUE; + remap_tables[i].mapsize = imageattr->colorremaptables[i].mapsize; + remap_tables[i].colormap = heap_alloc(sizeof(ColorMap) * remap_tables[i].mapsize); + + if (remap_tables[i].colormap) + { + memcpy(remap_tables[i].colormap, imageattr->colorremaptables[i].colormap, + sizeof(ColorMap) * remap_tables[i].mapsize); + } + else + { + stat = OutOfMemory; + break; + } + } + } + + if (stat == Ok) + stat = GdipCreateImageAttributes(cloneImageattr); if (stat == Ok) + { **cloneImageattr = *imageattr; + memcpy((*cloneImageattr)->colorremaptables, remap_tables, sizeof(remap_tables)); + } + + if (stat != Ok) + { + for (i=0; i<ColorAdjustTypeCount; i++) + heap_free(remap_tables[i].colormap); + } + return stat; }

1 0

Andrew Eikum : mmdevapi/tests: Fix failure on Vista.
by Alexandre Julliard 29 Aug '16

29 Aug '16

Module: wine Branch: master Commit: 25dbca10dcf6a67628f336dbd959ecfd1181e9e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25dbca10dcf6a67628f336dbd… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Aug 26 11:44:27 2016 -0500 mmdevapi/tests: Fix failure on Vista. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/tests/propstore.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mmdevapi/tests/propstore.c b/dlls/mmdevapi/tests/propstore.c index 6447113..02340ba 100644 --- a/dlls/mmdevapi/tests/propstore.c +++ b/dlls/mmdevapi/tests/propstore.c @@ -118,7 +118,8 @@ static void test_getat(IPropertyStore *store) if (IsEqualPropertyKey(pkey, DEVPKEY_Device_DeviceDesc)) found_desc = TRUE; } - ok(found_name, "DEVPKEY_Device_FriendlyName not found\n"); + ok(found_name || + broken(!found_name) /* vista */, "DEVPKEY_Device_FriendlyName not found\n"); ok(found_desc, "DEVPKEY_Device_DeviceDesc not found\n"); }

1 0

Nikolay Sivov : winegstreamer: Remove some casts that are not needed.
by Alexandre Julliard 29 Aug '16

29 Aug '16

Module: wine Branch: master Commit: 6dc6f7fe4d1b7f7b40500bb6055e9cc53d76dde8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dc6f7fe4d1b7f7b40500bb60… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 25 23:16:09 2016 +0300 winegstreamer: Remove some casts that are not needed. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 67 +++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index f257202..5db99c8 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -788,7 +788,7 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, GSTImpl *This) TRACE("%p %p %p\n", This, bin, pad); piOutput.dir = PINDIR_OUTPUT; - piOutput.pFilter = (IBaseFilter *)This; + piOutput.pFilter = &This->filter.IBaseFilter_iface; name = gst_pad_get_name(pad); MultiByteToWideChar(CP_UNIXCP, 0, name, -1, piOutput.achName, sizeof(piOutput.achName) / sizeof(piOutput.achName[0]) - 1); TRACE("Name: %s\n", name); @@ -1193,20 +1193,20 @@ static inline GSTOutPin *impl_from_IMediaSeeking( IMediaSeeking *iface ) static IPin* WINAPI GST_GetPin(BaseFilter *iface, int pos) { GSTImpl *This = (GSTImpl *)iface; + IPin *pin; + TRACE("%p: Asking for pos %x\n", This, pos); if (pos > This->cStreams || pos < 0) return NULL; + if (!pos) - { - IPin_AddRef((IPin*)&This->pInputPin); - return (IPin*)&This->pInputPin; - } + pin = &This->pInputPin.pin.IPin_iface; else - { - IPin_AddRef((IPin*)This->ppPins[pos - 1]); - return (IPin*)This->ppPins[pos - 1]; - } + pin = &This->ppPins[pos - 1]->pin.pin.IPin_iface; + + IPin_AddRef(pin); + return pin; } static LONG WINAPI GST_GetPinCount(BaseFilter *iface) @@ -1238,13 +1238,13 @@ IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *pUnkOuter, HRESULT *phr) mark_wine_thread(); This = CoTaskMemAlloc(sizeof(*This)); - obj = (IUnknown*)This; if (!This) { *phr = E_OUTOFMEMORY; return NULL; } + obj = (IUnknown*)&This->filter.IBaseFilter_iface; BaseFilter_Init(&This->filter, &GST_Vtbl, &CLSID_Gstreamer_Splitter, (DWORD_PTR)(__FILE__ ": GSTImpl.csFilter"), &BaseFuncTable); This->cStreams = 0; @@ -1255,7 +1255,7 @@ IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *pUnkOuter, HRESULT *phr) piInput = &This->pInputPin.pin.pinInfo; piInput->dir = PINDIR_INPUT; - piInput->pFilter = (IBaseFilter *)This; + piInput->pFilter = &This->filter.IBaseFilter_iface; lstrcpynW(piInput->achName, wcsInputPinName, sizeof(piInput->achName) / sizeof(piInput->achName[0])); This->pInputPin.pin.IPin_iface.lpVtbl = &GST_InputPin_Vtbl; This->pInputPin.pin.refCount = 1; @@ -1285,17 +1285,17 @@ static void GST_Destroy(GSTImpl *This) hr = IPin_Disconnect(connected); assert(hr == S_OK); IPin_Release(connected); - hr = IPin_Disconnect((IPin *)&This->pInputPin); + hr = IPin_Disconnect(&This->pInputPin.pin.IPin_iface); assert(hr == S_OK); } - pinref = IPin_Release((IPin *)&This->pInputPin); + pinref = IPin_Release(&This->pInputPin.pin.IPin_iface); if (pinref) { /* Valgrind could find this, if I kill it here */ ERR("pinref should be null, is %u, destroying anyway\n", pinref); assert((LONG)pinref > 0); while (pinref) - pinref = IPin_Release((IPin *)&This->pInputPin); + pinref = IPin_Release(&This->pInputPin.pin.IPin_iface); } if (This->bus) { gst_bus_set_sync_handler(This->bus, NULL, NULL, NULL); @@ -1313,14 +1313,13 @@ static HRESULT WINAPI GST_QueryInterface(IBaseFilter *iface, REFIID riid, LPVOID *ppv = NULL; - if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = This; - else if (IsEqualIID(riid, &IID_IPersist)) - *ppv = This; - else if (IsEqualIID(riid, &IID_IMediaFilter)) - *ppv = This; - else if (IsEqualIID(riid, &IID_IBaseFilter)) - *ppv = This; + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IPersist) || + IsEqualIID(riid, &IID_IMediaFilter) || + IsEqualIID(riid, &IID_IBaseFilter)) + { + *ppv = &This->filter.IBaseFilter_iface; + } if (*ppv) { IUnknown_AddRef((IUnknown *)(*ppv)); @@ -1426,7 +1425,7 @@ static HRESULT WINAPI GST_Run(IBaseFilter *iface, REFERENCE_TIME tStart) This->filter.rtStreamStart = tStart; for (i = 0; i < This->cStreams; i++) { - hr = BaseOutputPinImpl_Active((BaseOutputPin *)This->ppPins[i]); + hr = BaseOutputPinImpl_Active(&This->ppPins[i]->pin); if (SUCCEEDED(hr)) { hr_any = hr; } @@ -1518,19 +1517,19 @@ static HRESULT WINAPI GST_ChangeRate(IMediaSeeking *iface) static HRESULT WINAPI GST_Seeking_QueryInterface(IMediaSeeking *iface, REFIID riid, void **ppv) { GSTOutPin *This = impl_from_IMediaSeeking(iface); - return IUnknown_QueryInterface((IUnknown *)This, riid, ppv); + return IPin_QueryInterface(&This->pin.pin.IPin_iface, riid, ppv); } static ULONG WINAPI GST_Seeking_AddRef(IMediaSeeking *iface) { GSTOutPin *This = impl_from_IMediaSeeking(iface); - return IUnknown_AddRef((IUnknown *)This); + return IPin_AddRef(&This->pin.pin.IPin_iface); } static ULONG WINAPI GST_Seeking_Release(IMediaSeeking *iface) { GSTOutPin *This = impl_from_IMediaSeeking(iface); - return IUnknown_Release((IUnknown *)This); + return IPin_Release(&This->pin.pin.IPin_iface); } static HRESULT WINAPI GST_Seeking_GetCurrentPosition(IMediaSeeking *iface, REFERENCE_TIME *pos) @@ -1650,25 +1649,25 @@ static const IMediaSeekingVtbl GST_Seeking_Vtbl = static inline GSTOutPin *impl_from_IQualityControl( IQualityControl *iface ) { - return (GSTOutPin*)CONTAINING_RECORD(iface, GSTOutPin, IQualityControl_iface); + return CONTAINING_RECORD(iface, GSTOutPin, IQualityControl_iface); } static HRESULT WINAPI GST_QualityControl_QueryInterface(IQualityControl *iface, REFIID riid, void **ppv) { GSTOutPin *pin = impl_from_IQualityControl(iface); - return IPin_QueryInterface((IPin*)pin, riid, ppv); + return IPin_QueryInterface(&pin->pin.pin.IPin_iface, riid, ppv); } static ULONG WINAPI GST_QualityControl_AddRef(IQualityControl *iface) { GSTOutPin *pin = impl_from_IQualityControl(iface); - return IPin_AddRef((IPin*)pin); + return IPin_AddRef(&pin->pin.pin.IPin_iface); } static ULONG WINAPI GST_QualityControl_Release(IQualityControl *iface) { GSTOutPin *pin = impl_from_IQualityControl(iface); - return IPin_Release((IPin*)pin); + return IPin_Release(&pin->pin.pin.IPin_iface); } static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality qm) @@ -1889,13 +1888,13 @@ static HRESULT GST_AddPin(GSTImpl *This, const PIN_INFO *piOutput, const AM_MEDI memset((char*)pin + sizeof(pin->pin), 0, sizeof(GSTOutPin) - sizeof(pin->pin)); pin->pmt = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); CopyMediaType(pin->pmt, amt); - pin->pin.pin.pinInfo.pFilter = (LPVOID)This; + pin->pin.pin.pinInfo.pFilter = &This->filter.IBaseFilter_iface; pin->caps_event = CreateEventW(NULL, 0, 0, NULL); pin->segment = gst_segment_new(); This->cStreams++; pin->IQualityControl_iface.lpVtbl = &GSTOutPin_QualityControl_Vtbl; SourceSeeking_Init(&pin->seek, &GST_Seeking_Vtbl, GST_ChangeStop, GST_ChangeCurrent, GST_ChangeRate, &This->filter.csFilter); - BaseFilterImpl_IncrementPinVersion((BaseFilter*)This); + BaseFilterImpl_IncrementPinVersion(&This->filter); } else ERR("Failed with error %x\n", hr); return hr; @@ -1921,14 +1920,14 @@ static HRESULT GST_RemoveOutputPins(GSTImpl *This) for (i = 0; i < This->cStreams; i++) { hr = BaseOutputPinImpl_BreakConnect(&ppOldPins[i]->pin); TRACE("Disconnect: %08x\n", hr); - IPin_Release((IPin*)ppOldPins[i]); + IPin_Release(&ppOldPins[i]->pin.pin.IPin_iface); } This->cStreams = 0; This->ppPins = NULL; gst_element_set_bus(This->container, NULL); gst_object_unref(This->container); This->container = NULL; - BaseFilterImpl_IncrementPinVersion((BaseFilter*)This); + BaseFilterImpl_IncrementPinVersion(&This->filter); CoTaskMemFree(ppOldPins); return S_OK; }

1 0

Huw Davies : crypt32/tests: Win 10 accepts carriage returns within a base64 four character block.
by Alexandre Julliard 26 Aug '16

26 Aug '16

Module: wine Branch: master Commit: 30cdd1fb8cea410cb9e363b16278528669e2c19a URL: http://source.winehq.org/git/wine.git/?a=commit;h=30cdd1fb8cea410cb9e363b16… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 26 15:03:00 2016 +0100 crypt32/tests: Win 10 accepts carriage returns within a base64 four character block. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/base64.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index 335b9b7..48494b5 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -306,9 +306,6 @@ struct BadString }; static const struct BadString badStrings[] = { - { "A\r\nA\r\n=\r\n=\r\n", CRYPT_STRING_BASE64 }, - { "AA\r\n=\r\n=\r\n", CRYPT_STRING_BASE64 }, - { "AA=\r\n=\r\n", CRYPT_STRING_BASE64 }, { "-----BEGIN X509 CRL-----\r\nAA==\r\n", CRYPT_STRING_BASE64X509CRLHEADER }, }; @@ -340,7 +337,7 @@ static void testStringToBinaryA(void) ret = pCryptStringToBinaryA(badStrings[i].str, 0, badStrings[i].format, NULL, &bufLen, NULL, NULL); ok(!ret && GetLastError() == ERROR_INVALID_DATA, - "Expected ERROR_INVALID_DATA, got ret=%d le=%u\n", ret, GetLastError()); + "%d: Expected ERROR_INVALID_DATA, got ret=%d le=%u\n", i, ret, GetLastError()); } /* Good strings */ for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++)

1 0

Henri Verbeet : ddraw: Rename "wineD3DVertexDeclaration" to " wined3d_declaration".
by Alexandre Julliard 26 Aug '16

26 Aug '16

Module: wine Branch: master Commit: 6e7d370209e628c2a3707ac38f09ff7977e00592 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e7d370209e628c2a3707ac38… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 26 13:51:23 2016 +0200 ddraw: Rename "wineD3DVertexDeclaration" to "wined3d_declaration". Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/device.c | 4 ++-- dlls/ddraw/vertexbuffer.c | 9 ++++----- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index a908c11..7c2f026 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -553,7 +553,7 @@ struct d3d_vertex_buffer /*** WineD3D and ddraw links ***/ struct wined3d_buffer *wined3d_buffer; - struct wined3d_vertex_declaration *wineD3DVertexDeclaration; + struct wined3d_vertex_declaration *wined3d_declaration; struct ddraw *ddraw; /*** Storage for D3D7 specific things ***/ diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index a473682..09cc5f1 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4276,7 +4276,7 @@ static HRESULT d3d_device7_DrawPrimitiveVB(IDirect3DDevice7 *iface, D3DPRIMITIVE stride = get_flexible_vertex_size(vb_impl->fvf); wined3d_mutex_lock(); - wined3d_device_set_vertex_declaration(device->wined3d_device, vb_impl->wineD3DVertexDeclaration); + wined3d_device_set_vertex_declaration(device->wined3d_device, vb_impl->wined3d_declaration); if (FAILED(hr = wined3d_device_set_stream_source(device->wined3d_device, 0, vb_impl->wined3d_buffer, 0, stride))) { @@ -4375,7 +4375,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, wined3d_mutex_lock(); - wined3d_device_set_vertex_declaration(device->wined3d_device, vb_impl->wineD3DVertexDeclaration); + wined3d_device_set_vertex_declaration(device->wined3d_device, vb_impl->wined3d_declaration); hr = d3d_device_prepare_index_buffer(device, index_count * sizeof(WORD)); if (FAILED(hr)) diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index 9b86129..a88d5b5 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -158,7 +158,7 @@ static ULONG WINAPI d3d_vertex_buffer7_Release(IDirect3DVertexBuffer7 *iface) if (curVB == buffer->wined3d_buffer) wined3d_device_set_stream_source(buffer->ddraw->wined3d_device, 0, NULL, 0, 0); - wined3d_vertex_declaration_decref(buffer->wineD3DVertexDeclaration); + wined3d_vertex_declaration_decref(buffer->wined3d_declaration); wined3d_buffer_decref(buffer->wined3d_buffer); wined3d_mutex_unlock(); @@ -383,7 +383,7 @@ static HRESULT WINAPI d3d_vertex_buffer7_ProcessVertices(IDirect3DVertexBuffer7 wined3d_device_set_stream_source(device_impl->wined3d_device, 0, src_buffer_impl->wined3d_buffer, 0, get_flexible_vertex_size(src_buffer_impl->fvf)); - wined3d_device_set_vertex_declaration(device_impl->wined3d_device, src_buffer_impl->wineD3DVertexDeclaration); + wined3d_device_set_vertex_declaration(device_impl->wined3d_device, src_buffer_impl->wined3d_declaration); hr = wined3d_device_process_vertices(device_impl->wined3d_device, src_idx, dst_idx, count, dst_buffer_impl->wined3d_buffer, NULL, flags, dst_buffer_impl->fvf); @@ -603,15 +603,14 @@ HRESULT d3d_vertex_buffer_create(struct d3d_vertex_buffer **vertex_buf, goto end; } - buffer->wineD3DVertexDeclaration = ddraw_find_decl(ddraw, desc->dwFVF); - if (!buffer->wineD3DVertexDeclaration) + if (!(buffer->wined3d_declaration = ddraw_find_decl(ddraw, desc->dwFVF))) { ERR("Failed to find vertex declaration for fvf %#x.\n", desc->dwFVF); wined3d_buffer_decref(buffer->wined3d_buffer); hr = DDERR_INVALIDPARAMS; goto end; } - wined3d_vertex_declaration_incref(buffer->wineD3DVertexDeclaration); + wined3d_vertex_declaration_incref(buffer->wined3d_declaration); end: wined3d_mutex_unlock();

1 0

Henri Verbeet : ddraw: Rename "wineD3DVertexBuffer" to "wined3d_buffer".
by Alexandre Julliard 26 Aug '16

26 Aug '16

Module: wine Branch: master Commit: d2b782f4e4f0efa6e783031d57cf98789cdc4742 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2b782f4e4f0efa6e783031d5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 26 13:51:22 2016 +0200 ddraw: Rename "wineD3DVertexBuffer" to "wined3d_buffer". Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/device.c | 8 ++++---- dlls/ddraw/vertexbuffer.c | 25 ++++++++++++------------- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index f7b8cd0..a908c11 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -552,7 +552,7 @@ struct d3d_vertex_buffer LONG ref; /*** WineD3D and ddraw links ***/ - struct wined3d_buffer *wineD3DVertexBuffer; + struct wined3d_buffer *wined3d_buffer; struct wined3d_vertex_declaration *wineD3DVertexDeclaration; struct ddraw *ddraw; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 3598bd8..a473682 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4277,8 +4277,8 @@ static HRESULT d3d_device7_DrawPrimitiveVB(IDirect3DDevice7 *iface, D3DPRIMITIVE wined3d_mutex_lock(); wined3d_device_set_vertex_declaration(device->wined3d_device, vb_impl->wineD3DVertexDeclaration); - hr = wined3d_device_set_stream_source(device->wined3d_device, 0, vb_impl->wineD3DVertexBuffer, 0, stride); - if (FAILED(hr)) + if (FAILED(hr = wined3d_device_set_stream_source(device->wined3d_device, + 0, vb_impl->wined3d_buffer, 0, stride))) { WARN("Failed to set stream source, hr %#x.\n", hr); wined3d_mutex_unlock(); @@ -4409,8 +4409,8 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, wined3d_device_set_index_buffer(device->wined3d_device, device->index_buffer, WINED3DFMT_R16_UINT, 0); /* Set the vertex stream source */ - hr = wined3d_device_set_stream_source(device->wined3d_device, 0, vb_impl->wineD3DVertexBuffer, 0, stride); - if (FAILED(hr)) + if (FAILED(hr = wined3d_device_set_stream_source(device->wined3d_device, + 0, vb_impl->wined3d_buffer, 0, stride))) { ERR("(%p) IDirect3DDevice::SetStreamSource failed with hr = %08x\n", device, hr); wined3d_mutex_unlock(); diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index 84c0e69..9b86129 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -155,11 +155,11 @@ static ULONG WINAPI d3d_vertex_buffer7_Release(IDirect3DVertexBuffer7 *iface) wined3d_mutex_lock(); wined3d_device_get_stream_source(buffer->ddraw->wined3d_device, 0, &curVB, &offset, &stride); - if (curVB == buffer->wineD3DVertexBuffer) + if (curVB == buffer->wined3d_buffer) wined3d_device_set_stream_source(buffer->ddraw->wined3d_device, 0, NULL, 0, 0); wined3d_vertex_declaration_decref(buffer->wineD3DVertexDeclaration); - wined3d_buffer_decref(buffer->wineD3DVertexBuffer); + wined3d_buffer_decref(buffer->wined3d_buffer); wined3d_mutex_unlock(); HeapFree(GetProcessHeap(), 0, buffer); @@ -253,8 +253,8 @@ static HRESULT WINAPI d3d_vertex_buffer7_Lock(IDirect3DVertexBuffer7 *iface, if (SUCCEEDED(hr)) { buffer->dynamic = TRUE; - wined3d_buffer_decref(buffer->wineD3DVertexBuffer); - buffer->wineD3DVertexBuffer = new_buffer; + wined3d_buffer_decref(buffer->wined3d_buffer); + buffer->wined3d_buffer = new_buffer; } else { @@ -268,12 +268,12 @@ static HRESULT WINAPI d3d_vertex_buffer7_Lock(IDirect3DVertexBuffer7 *iface, if (data_size) { /* Get the size, for returning it, and for locking */ - wined3d_resource = wined3d_buffer_get_resource(buffer->wineD3DVertexBuffer); + wined3d_resource = wined3d_buffer_get_resource(buffer->wined3d_buffer); wined3d_resource_get_desc(wined3d_resource, &wined3d_desc); *data_size = wined3d_desc.size; } - hr = wined3d_buffer_map(buffer->wineD3DVertexBuffer, 0, 0, (BYTE **)data, wined3d_flags); + hr = wined3d_buffer_map(buffer->wined3d_buffer, 0, 0, (BYTE **)data, wined3d_flags); wined3d_mutex_unlock(); @@ -306,7 +306,7 @@ static HRESULT WINAPI d3d_vertex_buffer7_Unlock(IDirect3DVertexBuffer7 *iface) TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - wined3d_buffer_unmap(buffer->wineD3DVertexBuffer); + wined3d_buffer_unmap(buffer->wined3d_buffer); wined3d_mutex_unlock(); return D3D_OK; @@ -382,10 +382,10 @@ static HRESULT WINAPI d3d_vertex_buffer7_ProcessVertices(IDirect3DVertexBuffer7 wined3d_device_set_render_state(device_impl->wined3d_device, WINED3D_RS_CLIPPING, doClip); wined3d_device_set_stream_source(device_impl->wined3d_device, - 0, src_buffer_impl->wineD3DVertexBuffer, 0, get_flexible_vertex_size(src_buffer_impl->fvf)); + 0, src_buffer_impl->wined3d_buffer, 0, get_flexible_vertex_size(src_buffer_impl->fvf)); wined3d_device_set_vertex_declaration(device_impl->wined3d_device, src_buffer_impl->wineD3DVertexDeclaration); hr = wined3d_device_process_vertices(device_impl->wined3d_device, src_idx, dst_idx, - count, dst_buffer_impl->wineD3DVertexBuffer, NULL, flags, dst_buffer_impl->fvf); + count, dst_buffer_impl->wined3d_buffer, NULL, flags, dst_buffer_impl->fvf); /* Restore the states if needed */ if (doClip != oldClip) @@ -436,7 +436,7 @@ static HRESULT WINAPI d3d_vertex_buffer7_GetVertexBufferDesc(IDirect3DVertexBuff if (!desc) return DDERR_INVALIDPARAMS; wined3d_mutex_lock(); - wined3d_resource = wined3d_buffer_get_resource(buffer->wineD3DVertexBuffer); + wined3d_resource = wined3d_buffer_get_resource(buffer->wined3d_buffer); wined3d_resource_get_desc(wined3d_resource, &wined3d_desc); wined3d_mutex_unlock(); @@ -595,8 +595,7 @@ HRESULT d3d_vertex_buffer_create(struct d3d_vertex_buffer **vertex_buf, wined3d_mutex_lock(); - hr = d3d_vertex_buffer_create_wined3d_buffer(buffer, FALSE, &buffer->wineD3DVertexBuffer); - if (FAILED(hr)) + if (FAILED(hr = d3d_vertex_buffer_create_wined3d_buffer(buffer, FALSE, &buffer->wined3d_buffer))) { WARN("Failed to create wined3d vertex buffer, hr %#x.\n", hr); if (hr == WINED3DERR_INVALIDCALL) @@ -608,7 +607,7 @@ HRESULT d3d_vertex_buffer_create(struct d3d_vertex_buffer **vertex_buf, if (!buffer->wineD3DVertexDeclaration) { ERR("Failed to find vertex declaration for fvf %#x.\n", desc->dwFVF); - wined3d_buffer_decref(buffer->wineD3DVertexBuffer); + wined3d_buffer_decref(buffer->wined3d_buffer); hr = DDERR_INVALIDPARAMS; goto end; }

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
78
Older →

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 2016