February 2014 - Wine-commits

Jacek Caban : wmp/tests: Fixed tests on old WMP versions.
by Alexandre Julliard 20 Feb '14

20 Feb '14

Module: wine Branch: master Commit: 89c5cefb2539bd27ca77d6ab447dd848579c8b2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=89c5cefb2539bd27ca77d6ab4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 20 16:01:33 2014 +0100 wmp/tests: Fixed tests on old WMP versions. --- dlls/wmp/tests/oleobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index fba35e5..61cfcb9 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -692,7 +692,7 @@ static void test_wmp(void) client_site = (void*)0xdeadbeef; hres = IOleObject_GetClientSite(oleobj, &client_site); - ok(hres == E_FAIL, "GetClientSite failed: %08x\n", hres); + ok(hres == E_FAIL || broken(hres == S_OK), "GetClientSite failed: %08x\n", hres); ok(!client_site, "client_site = %p\n", client_site); ref = IOleObject_Release(oleobj);

1 0

Jacek Caban : wmp: Added DoVerb(OLEIVERB_INPLACEACTIVATE) implementation.
by Alexandre Julliard 20 Feb '14

20 Feb '14

Module: wine Branch: master Commit: 79fc46ddbb7c89c7c25a4c5a893f4f92cccdb1ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=79fc46ddbb7c89c7c25a4c5a8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 20 16:01:45 2014 +0100 wmp: Added DoVerb(OLEIVERB_INPLACEACTIVATE) implementation. --- dlls/wmp/Makefile.in | 1 + dlls/wmp/oleobj.c | 188 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/wmp/wmp_main.c | 5 +- dlls/wmp/wmp_private.h | 5 ++ 4 files changed, 197 insertions(+), 2 deletions(-) diff --git a/dlls/wmp/Makefile.in b/dlls/wmp/Makefile.in index a4d07c1..a82cc36 100644 --- a/dlls/wmp/Makefile.in +++ b/dlls/wmp/Makefile.in @@ -1,4 +1,5 @@ MODULE = wmp.dll +IMPORTS = user32 gdi32 C_SRCS = \ oleobj.c \ diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index a6daabb..7074bd6 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -23,11 +23,189 @@ WINE_DEFAULT_DEBUG_CHANNEL(wmp); +static HWND get_container_hwnd(WindowsMediaPlayer *This) +{ + IOleWindow *ole_window; + HWND hwnd = NULL; + HRESULT hres; + + /* IOleInPlaceSite (which inherits from IOleWindow) is prefered. */ + hres = IOleClientSite_QueryInterface(This->client_site, &IID_IOleInPlaceSite, (void**)&ole_window); + if(FAILED(hres)) { + hres = IOleClientSite_QueryInterface(This->client_site, &IID_IOleWindow, (void**)&ole_window); + if(FAILED(hres)) { + IOleContainer *container = NULL; + + hres = IOleClientSite_GetContainer(This->client_site, &container); + if(SUCCEEDED(hres)) { + hres = IOleContainer_QueryInterface(container, &IID_IOleWindow, (void**)&ole_window); + IOleContainer_Release(container); + } + } + } + + if(FAILED(hres)) + return NULL; + + hres = IOleWindow_GetWindow(ole_window, &hwnd); + IOleWindow_Release(ole_window); + if(FAILED(hres)) + return NULL; + + TRACE("Got window %p\n", hwnd); + return hwnd; +} + +static LRESULT WINAPI wmp_wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch(msg) { + case WM_PAINT: { + PAINTSTRUCT ps; + HFONT font; + RECT rect; + HDC hdc; + + TRACE("WM_PAINT\n"); + + GetClientRect(hwnd, &rect); + hdc = BeginPaint(hwnd, &ps); + + SelectObject(hdc, GetStockObject(DC_BRUSH)); + SetDCBrushColor(hdc, RGB(255,0,0)); + SetBkColor(hdc, RGB(255,0,0)); + + font = CreateFontA(25,0,0,0,400,0,0,0,ANSI_CHARSET,0,0,DEFAULT_QUALITY,DEFAULT_PITCH,NULL); + SelectObject(hdc, font); + + Rectangle(hdc, rect.left, rect.top, rect.right, rect.bottom); + DrawTextA(hdc, "FIXME: WMP", -1, &rect, DT_CENTER | DT_SINGLELINE | DT_VCENTER); + + DeleteObject(font); + EndPaint(hwnd, &ps); + break; + } + } + + return DefWindowProcW(hwnd, msg, wParam, lParam); + +} + +static ATOM wmp_class; + +static BOOL WINAPI register_wmp_class(INIT_ONCE *once, void *param, void **context) +{ + /* It seems that native uses ATL for this. We use a fake name to make tests happy. */ + static const WCHAR atl_wmpW[] = {'A','T','L',':','W','M','P',0}; + + static WNDCLASSEXW wndclass = { + sizeof(wndclass), CS_DBLCLKS, wmp_wnd_proc, 0, 0, + NULL, NULL, NULL, NULL, NULL, + atl_wmpW, NULL + }; + + wndclass.hInstance = wmp_instance; + wmp_class = RegisterClassExW(&wndclass); + return TRUE; +} + +void unregister_wmp_class(void) +{ + if(wmp_class) + UnregisterClassW(MAKEINTRESOURCEW(wmp_class), wmp_instance); +} + +static HWND create_wmp_window(WindowsMediaPlayer *wmp, const RECT *posrect) +{ + static INIT_ONCE class_init_once = INIT_ONCE_STATIC_INIT; + + InitOnceExecuteOnce(&class_init_once, register_wmp_class, NULL, NULL); + if(!wmp_class) + return NULL; + + return CreateWindowExW(0, MAKEINTRESOURCEW(wmp_class), NULL, WS_CLIPCHILDREN|WS_CLIPSIBLINGS|WS_VISIBLE|WS_CHILD, + posrect->left, posrect->top, posrect->right-posrect->left, posrect->bottom-posrect->top, + get_container_hwnd(wmp), NULL, wmp_instance, NULL); +} + +static HRESULT activate_inplace(WindowsMediaPlayer *This) +{ + IOleInPlaceSiteWindowless *ipsite_windowless; + IOleInPlaceSiteEx *ipsiteex = NULL; + IOleInPlaceSite *ipsite; + IOleInPlaceUIWindow *ip_window = NULL; + IOleInPlaceFrame *ip_frame = NULL; + RECT posrect = {0}, cliprect = {0}; + OLEINPLACEFRAMEINFO frameinfo = { sizeof(frameinfo) }; + HRESULT hres; + + if(This->hwnd) { + FIXME("Already activated\n"); + return E_UNEXPECTED; + } + + hres = IOleClientSite_QueryInterface(This->client_site, &IID_IOleInPlaceSiteWindowless, (void**)&ipsite_windowless); + if(SUCCEEDED(hres)) { + hres = IOleInPlaceSiteWindowless_CanWindowlessActivate(ipsite_windowless); + IOleInPlaceSiteWindowless_Release(ipsite_windowless); + if(hres == S_OK) + FIXME("Windowless activation not supported\n"); + ipsiteex = (IOleInPlaceSiteEx*)ipsite_windowless; + }else { + IOleClientSite_QueryInterface(This->client_site, &IID_IOleInPlaceSiteEx, (void**)&ipsiteex); + } + + if(ipsiteex) { + BOOL redraw = FALSE; /* Not really used. */ + IOleInPlaceSiteEx_OnInPlaceActivateEx(ipsiteex, &redraw, 0); + ipsite = (IOleInPlaceSite*)ipsiteex; + }else { + IOleClientSite_QueryInterface(This->client_site, &IID_IOleInPlaceSite, (void**)&ipsite); + if(FAILED(hres)) { + FIXME("No IOleInPlaceSite instance\n"); + return hres; + } + + IOleInPlaceSite_OnInPlaceActivate(ipsite); + } + + hres = IOleInPlaceSite_GetWindowContext(ipsite, &ip_frame, &ip_window, &posrect, &cliprect, &frameinfo); + IOleInPlaceSite_Release(ipsite); + if(FAILED(hres)) { + FIXME("GetWindowContext failed: %08x\n", hres); + return hres; + } + + This->hwnd = create_wmp_window(This, &posrect); + if(!This->hwnd) + return E_FAIL; + + IOleClientSite_ShowObject(This->client_site); + return S_OK; +} + +static void deactivate_window(WindowsMediaPlayer *This) +{ + IOleInPlaceSite *ip_site; + HRESULT hres; + + hres = IOleClientSite_QueryInterface(This->client_site, &IID_IOleInPlaceSite, (void**)&ip_site); + if(SUCCEEDED(hres)) { + IOleInPlaceSite_OnInPlaceDeactivate(ip_site); + IOleInPlaceSite_Release(ip_site); + } + + DestroyWindow(This->hwnd); + This->hwnd = NULL; +} + static void release_client_site(WindowsMediaPlayer *This) { if(!This->client_site) return; + if(This->hwnd) + deactivate_window(This); + IOleClientSite_Release(This->client_site); This->client_site = NULL; } @@ -206,7 +384,15 @@ static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG iVerb, LPMSG lpms LONG lindex, HWND hwndParent, LPCRECT lprcPosRect) { WindowsMediaPlayer *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%d %p %p %d %p %p)\n", This, iVerb, lpmsg, pActiveSite, lindex, hwndParent, lprcPosRect); + + switch(iVerb) { + case OLEIVERB_INPLACEACTIVATE: + TRACE("(%p)->(OLEIVERB_INPLACEACTIVATE)\n", This); + return activate_inplace(This); + default: + FIXME("Unsupported iVerb %d\n", iVerb); + } + return E_NOTIMPL; } diff --git a/dlls/wmp/wmp_main.c b/dlls/wmp/wmp_main.c index 995c08e..29b096f 100644 --- a/dlls/wmp/wmp_main.c +++ b/dlls/wmp/wmp_main.c @@ -24,7 +24,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wmp); -static HINSTANCE wmp_instance; +HINSTANCE wmp_instance; static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) { @@ -89,6 +89,9 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) DisableThreadLibraryCalls(hInstDLL); wmp_instance = hInstDLL; break; + case DLL_PROCESS_DETACH: + unregister_wmp_class(); + break; } return TRUE; diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index 8f1a85a..11d4c22 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -33,12 +33,17 @@ struct WindowsMediaPlayer { LONG ref; IOleClientSite *client_site; + HWND hwnd; }; void init_player_ifaces(WindowsMediaPlayer*) DECLSPEC_HIDDEN; HRESULT WINAPI WMPFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; +void unregister_wmp_class(void) DECLSPEC_HIDDEN; + +extern HINSTANCE wmp_instance; + static inline void *heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len);

1 0

Jacek Caban : wmp: Added IOleObject::Close implementation.
by Alexandre Julliard 20 Feb '14

20 Feb '14

Module: wine Branch: master Commit: 543905f4d2fc6c4becc7985550d2260b52554fbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=543905f4d2fc6c4becc798555… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 20 16:01:54 2014 +0100 wmp: Added IOleObject::Close implementation. --- dlls/wmp/oleobj.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index 7074bd6..d82cb41 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -347,8 +347,15 @@ static HRESULT WINAPI OleObject_SetHostNames(IOleObject *iface, LPCOLESTR szCont static HRESULT WINAPI OleObject_Close(IOleObject *iface, DWORD dwSaveOption) { WindowsMediaPlayer *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%08x)\n", This, dwSaveOption); - return E_NOTIMPL; + + TRACE("(%p)->(%08x)\n", This, dwSaveOption); + + if(dwSaveOption) + FIXME("Unsupported option %d\n", dwSaveOption); + + if(This->hwnd) /* FIXME: Possibly hide window */ + deactivate_window(This); + return S_OK; } static HRESULT WINAPI OleObject_SetMoniker(IOleObject *iface, DWORD dwWhichMoniker, IMoniker *pmk)

1 0

Jacek Caban : wmp: Added IOleInPlaceObject::GetWindow implementaiton.
by Alexandre Julliard 20 Feb '14

20 Feb '14

Module: wine Branch: master Commit: bea155e491d1449d88633c3a15ec3157f3883200 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bea155e491d1449d88633c3a1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 20 16:02:03 2014 +0100 wmp: Added IOleInPlaceObject::GetWindow implementaiton. --- dlls/wmp/oleobj.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index d82cb41..1e50a45 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -553,8 +553,11 @@ static ULONG WINAPI OleInPlaceObjectWindowless_Release(IOleInPlaceObjectWindowle static HRESULT WINAPI OleInPlaceObjectWindowless_GetWindow(IOleInPlaceObjectWindowless *iface, HWND *phwnd) { WindowsMediaPlayer *This = impl_from_IOleInPlaceObjectWindowless(iface); - FIXME("(%p)->(%p)\n", This, phwnd); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, phwnd); + + *phwnd = This->hwnd; + return This->hwnd ? S_OK : E_UNEXPECTED; } static HRESULT WINAPI OleInPlaceObjectWindowless_ContextSensitiveHelp(IOleInPlaceObjectWindowless *iface,

1 0

Jacek Caban : wmp: Added more tests.
by Alexandre Julliard 20 Feb '14

20 Feb '14

Module: wine Branch: master Commit: a818e9a6c915cf92a313730914699b759b54dfea URL: http://source.winehq.org/git/wine.git/?a=commit;h=a818e9a6c915cf92a31373091… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 20 16:02:13 2014 +0100 wmp: Added more tests. --- dlls/wmp/tests/Makefile.in | 2 +- dlls/wmp/tests/oleobj.c | 304 ++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 291 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a818e9a6c915cf92a3137…

1 0

Ken Thomases : kernel32: Fix build on newer Mac OS X.
by Alexandre Julliard 20 Feb '14

20 Feb '14

Module: wine Branch: master Commit: ed11dc0ba3cc3f9f85e1096be0cfe9edfa4a5ec3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed11dc0ba3cc3f9f85e1096be… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 19 16:12:11 2014 -0600 kernel32: Fix build on newer Mac OS X. --- dlls/kernel32/heap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 8b38119..db1b401 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1251,7 +1251,7 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) count = HOST_VM_INFO64_COUNT; if (host_statistics64(host, HOST_VM_INFO64, (host_info64_t)&vm_stat, &count) == KERN_SUCCESS && - host_page_size(host, &page_size == KERN_SUCCESS)) + host_page_size(host, &page_size) == KERN_SUCCESS) lpmemex->ullAvailPhys = (vm_stat.free_count + vm_stat.inactive_count) * (DWORDLONG)page_size; #endif if (!total)

1 0

Vincent Povirk : gdiplus: Improve GdipFillRectangles parameter validation.
by Alexandre Julliard 20 Feb '14

20 Feb '14

Module: wine Branch: master Commit: 78459aea0dcce1e5b7dd9d30b1e516646f33722d URL: http://source.winehq.org/git/wine.git/?a=commit;h=78459aea0dcce1e5b7dd9d30b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Feb 19 15:16:48 2014 -0600 gdiplus: Improve GdipFillRectangles parameter validation. --- dlls/gdiplus/graphics.c | 2 +- dlls/gdiplus/tests/graphics.c | 47 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 2608bf4..1f01b82 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3747,7 +3747,7 @@ GpStatus WINGDIPAPI GdipFillRectangles(GpGraphics *graphics, GpBrush *brush, GDI TRACE("(%p, %p, %p, %d)\n", graphics, brush, rects, count); - if(!rects) + if(!graphics || !brush || !rects || count <= 0) return InvalidParameter; if (graphics->image && graphics->image->type == ImageTypeMetafile) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 4d74081..9fb1347 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -5493,6 +5493,52 @@ static void test_clipping_2(void) DeleteDC(hdc); } + +static void test_GdipFillRectangles(void) +{ + GpStatus status; + GpGraphics *graphics = NULL; + GpBrush *brush = NULL; + HDC hdc = GetDC( hwnd ); + GpRectF rects[2] = {{0,0,10,10}, {10,10,10,10}}; + + ok(hdc != NULL, "Expected HDC to be initialized\n"); + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + ok(graphics != NULL, "Expected graphics to be initialized\n"); + + status = GdipCreateSolidFill((ARGB)0xffff00ff, (GpSolidFill**)&brush); + expect(Ok, status); + ok(brush != NULL, "Expected brush to be initialized\n"); + + status = GdipFillRectangles(NULL, brush, rects, 2); + expect(InvalidParameter, status); + + status = GdipFillRectangles(graphics, NULL, rects, 2); + expect(InvalidParameter, status); + + status = GdipFillRectangles(graphics, brush, NULL, 2); + expect(InvalidParameter, status); + + status = GdipFillRectangles(graphics, brush, rects, 0); + expect(InvalidParameter, status); + + status = GdipFillRectangles(graphics, brush, rects, -1); + expect(InvalidParameter, status); + + status = GdipFillRectangles(graphics, brush, rects, 1); + expect(Ok, status); + + status = GdipFillRectangles(graphics, brush, rects, 2); + expect(Ok, status); + + GdipDeleteBrush(brush); + GdipDeleteGraphics(graphics); + + ReleaseDC(hwnd, hdc); +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -5563,6 +5609,7 @@ START_TEST(graphics) test_getdc_scaled(); test_alpha_hdc(); test_bitmapfromgraphics(); + test_GdipFillRectangles(); GdiplusShutdown(gdiplusToken); DestroyWindow( hwnd );

1 0

Frédéric Delanoy : user32: Use BOOL type where appropriate.
by Alexandre Julliard 20 Feb '14

20 Feb '14

Module: wine Branch: master Commit: e7c5c9ae9b14be8ae25f8f23010d107adb250974 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7c5c9ae9b14be8ae25f8f230… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Feb 19 22:13:30 2014 +0100 user32: Use BOOL type where appropriate. --- dlls/user32/sysparams.c | 2 +- dlls/user32/win.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 4b510f2..9944119 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -1543,7 +1543,7 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, case SPI_GETFASTTASKSWITCH: /* 35 */ if (!pvParam) return FALSE; - *(BOOL *)pvParam = 1; + *(BOOL *)pvParam = TRUE; ret = TRUE; break; diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 275b93c..d60427f 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1849,7 +1849,8 @@ BOOL WINAPI DestroyWindow( HWND hwnd ) { for (;;) { - int i, got_one = 0; + int i; + BOOL got_one = FALSE; HWND *list = WIN_ListChildren( GetDesktopWindow() ); if (list) { @@ -1859,7 +1860,7 @@ BOOL WINAPI DestroyWindow( HWND hwnd ) if (WIN_IsCurrentThread( list[i] )) { DestroyWindow( list[i] ); - got_one = 1; + got_one = TRUE; continue; } WIN_SetOwner( list[i], 0 );

1 0

Frédéric Delanoy : cabarc: Use BOOL type where appropriate.
by Alexandre Julliard 20 Feb '14

20 Feb '14

Module: wine Branch: master Commit: 8bd2eb3e78fb28241dcd5d34b5e6c44207b722b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bd2eb3e78fb28241dcd5d34b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Feb 19 22:13:29 2014 +0100 cabarc: Use BOOL type where appropriate. --- programs/cabarc/cabarc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/cabarc/cabarc.c b/programs/cabarc/cabarc.c index c49796d..04f2a9f 100644 --- a/programs/cabarc/cabarc.c +++ b/programs/cabarc/cabarc.c @@ -75,8 +75,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(cabarc); static int opt_cabinet_size = CB_MAX_DISK; static int opt_cabinet_id; static int opt_compression = tcompTYPE_MSZIP; -static int opt_recurse; -static int opt_preserve_paths; +static BOOL opt_recurse; +static BOOL opt_preserve_paths; static int opt_reserve_space; static int opt_verbose; static char *opt_cab_file; @@ -672,10 +672,10 @@ int wmain( int argc, WCHAR *argv[] ) } break; case 'p': - opt_preserve_paths = 1; + opt_preserve_paths = TRUE; break; case 'r': - opt_recurse = 1; + opt_recurse = TRUE; break; case 's': argv++; argc--;

1 0

Michael Stefaniuc : strmbase: Return the iface instead of the object pointer.
by Alexandre Julliard 20 Feb '14

20 Feb '14

Module: wine Branch: master Commit: 974e5af3fe316161a2fa25aa65571c5ffcb305c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=974e5af3fe316161a2fa25aa6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Feb 20 00:10:51 2014 +0100 strmbase: Return the iface instead of the object pointer. --- dlls/strmbase/filter.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index 67f7c9f..e2cf807 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -36,23 +36,15 @@ static inline BaseFilter *impl_from_IBaseFilter(IBaseFilter *iface) HRESULT WINAPI BaseFilterImpl_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) { - BaseFilter *This = impl_from_IBaseFilter(iface); TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); *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 (*ppv) + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IPersist) || + IsEqualIID(riid, &IID_IMediaFilter) || IsEqualIID(riid, &IID_IBaseFilter)) { - IUnknown_AddRef((IUnknown *)(*ppv)); + *ppv = iface; + IBaseFilter_AddRef(iface); return S_OK; }

1 0