May 2010 - Wine-commits - list.winehq.org

Henri Verbeet : user32: Verify we got a valid window handle in GetDCEx().
by Alexandre Julliard 19 May '10

19 May '10

Module: wine Branch: master Commit: 2c2e3f8665913776c84171c9521392d6f4c31fd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c2e3f8665913776c84171c95… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 19 11:13:38 2010 +0200 user32: Verify we got a valid window handle in GetDCEx(). --- dlls/user32/painting.c | 2 ++ dlls/user32/tests/dce.c | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 732c889..efb0884 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -908,6 +908,8 @@ HDC WINAPI GetDCEx( HWND hwnd, HRGN hrgnClip, DWORD flags ) TRACE("hwnd %p, hrgnClip %p, flags %08x\n", hwnd, hrgnClip, flags); + if (!IsWindow(hwnd)) return 0; + /* fixup flags */ if (flags & (DCX_WINDOW | DCX_PARENTCLIP)) flags |= DCX_CACHE; diff --git a/dlls/user32/tests/dce.c b/dlls/user32/tests/dce.c index 37b9546..31c6ec0 100644 --- a/dlls/user32/tests/dce.c +++ b/dlls/user32/tests/dce.c @@ -392,6 +392,23 @@ static void test_invisible_create(void) DestroyWindow(hwnd_owndc); } +static void test_destroyed_window(void) +{ + HDC dc; + + dc = GetDCEx(hwnd_cache, 0, DCX_USESTYLE); + ok(!dc, "Got a non-NULL DC (%p) for a destroyed window.\n", dc); + + dc = GetDCEx(hwnd_owndc, 0, DCX_USESTYLE); + ok(!dc, "Got a non-NULL DC (%p) for a destroyed window.\n", dc); + + dc = GetDCEx(hwnd_classdc, 0, DCX_USESTYLE); + ok(!dc, "Got a non-NULL DC (%p) for a destroyed window.\n", dc); + + dc = GetDCEx(hwnd_classdc2, 0, DCX_USESTYLE); + ok(!dc, "Got a non-NULL DC (%p) for a destroyed window.\n", dc); +} + START_TEST(dce) { WNDCLASSA cls; @@ -431,4 +448,11 @@ START_TEST(dce) test_dc_visrgn(); test_begin_paint(); test_invisible_create(); + + DestroyWindow(hwnd_classdc2); + DestroyWindow(hwnd_classdc); + DestroyWindow(hwnd_owndc); + DestroyWindow(hwnd_cache); + + test_destroyed_window(); }

1 0

Maarten Lankhorst : mciqtz32: Handle mciOpen better.
by Alexandre Julliard 19 May '10

19 May '10

Module: wine Branch: master Commit: 4eddb852b12e516e6976768edcbca858e131af88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4eddb852b12e516e6976768ed… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue May 18 20:14:07 2010 +0200 mciqtz32: Handle mciOpen better. --- dlls/mciqtz32/mciqtz.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 36a7fcb..cdd0c33 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -145,6 +145,8 @@ static DWORD MCIQTZ_mciOpen(UINT wDevID, DWORD dwFlags, { WINE_MCIQTZ* wma; HRESULT hr; + IBasicVideo *vidbasic; + IVideoWindow *vidwin; TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpOpenParms); @@ -190,6 +192,31 @@ static DWORD MCIQTZ_mciOpen(UINT wDevID, DWORD dwFlags, goto err; } + hr = IFilterGraph2_QueryInterface(wma->pgraph, &IID_IVideoWindow, (void**)&vidwin); + if (SUCCEEDED(hr)) + hr = IFilterGraph2_QueryInterface(wma->pgraph, &IID_IBasicVideo, (void**)&vidbasic); + if (SUCCEEDED(hr)) { + DWORD style; + RECT rc = { 0, 0, 0, 0 }; + IVideoWindow_put_AutoShow(vidwin, OAFALSE); + style = 0; + if (dwFlags & MCI_DGV_OPEN_WS) + style |= lpOpenParms->dwStyle; + if (dwFlags & MCI_DGV_OPEN_PARENT) { + style |= WS_CHILD; + IVideoWindow_put_MessageDrain(vidwin, (OAHWND)lpOpenParms->hWndParent); + IVideoWindow_put_WindowState(vidwin, SW_HIDE); + IVideoWindow_put_Owner(vidwin, (OAHWND)lpOpenParms->hWndParent); + } + IVideoWindow_put_WindowStyle(vidwin, style); + IBasicVideo_GetVideoSize(vidbasic, &rc.right, &rc.bottom); + IVideoWindow_SetWindowPosition(vidwin, rc.left, rc.top, rc.right, rc.bottom); + IVideoWindow_put_Visible(vidwin, OATRUE); + IBasicVideo_Release(vidbasic); + } + if (vidwin) + IVideoWindow_Release(vidwin); + wma->opened = TRUE; return 0;

1 0

Maarten Lankhorst : mciqtz32: Add support for MCI_DGV_WHERE_SOURCE.
by Alexandre Julliard 19 May '10

19 May '10

Module: wine Branch: master Commit: e51d5af9d6538431ddc623d9e6ff2f455ac536a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e51d5af9d6538431ddc623d9e… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue May 18 20:16:18 2010 +0200 mciqtz32: Add support for MCI_DGV_WHERE_SOURCE. --- dlls/mciqtz32/mciqtz.c | 38 ++++++++++++++++++++++++++++---------- 1 files changed, 28 insertions(+), 10 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index cdd0c33..005b1a3 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -639,9 +639,11 @@ static DWORD MCIQTZ_mciWhere(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RECT_PARMS lp { WINE_MCIQTZ* wma; IVideoWindow* pVideoWindow; + IBasicVideo *pBasicVideo; HRESULT hr; HWND hWnd; RECT rc; + DWORD ret = MCIERR_UNRECOGNIZED_COMMAND; TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); @@ -659,19 +661,31 @@ static DWORD MCIQTZ_mciWhere(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RECT_PARMS lp return MCIERR_INTERNAL; } + hr = IGraphBuilder_QueryInterface(wma->pgraph, &IID_IBasicVideo, (LPVOID*)&pBasicVideo); + if (FAILED(hr)) { + ERR("Cannot get IBasicVideo interface (hr = %x)\n", hr); + IUnknown_Release(pVideoWindow); + return MCIERR_INTERNAL; + } + hr = IVideoWindow_get_Owner(pVideoWindow, (OAHWND*)&hWnd); - IVideoWindow_Release(pVideoWindow); if (FAILED(hr)) { TRACE("No video stream, returning no window error\n"); + IUnknown_Release(pVideoWindow); return MCIERR_NO_WINDOW; } if (dwFlags & MCI_DGV_WHERE_SOURCE) { if (dwFlags & MCI_DGV_WHERE_MAX) - FIXME("MCI_DGV_WHERE_SOURCE_MAX not supported yet\n"); - else - FIXME("MCI_DGV_WHERE_SOURCE not supported yet\n"); - return MCIERR_UNRECOGNIZED_COMMAND; + FIXME("MCI_DGV_WHERE_SOURCE_MAX stub %s\n", wine_dbgstr_rect(&rc)); + IBasicVideo_get_SourceLeft(pBasicVideo, &rc.left); + IBasicVideo_get_SourceTop(pBasicVideo, &rc.top); + IBasicVideo_get_SourceWidth(pBasicVideo, &rc.right); + IBasicVideo_get_SourceHeight(pBasicVideo, &rc.bottom); + /* Undo conversion done below */ + rc.right += rc.left; + rc.bottom += rc.top; + TRACE("MCI_DGV_WHERE_SOURCE %s\n", wine_dbgstr_rect(&rc)); } if (dwFlags & MCI_DGV_WHERE_DESTINATION) { if (dwFlags & MCI_DGV_WHERE_MAX) { @@ -679,7 +693,7 @@ static DWORD MCIQTZ_mciWhere(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RECT_PARMS lp TRACE("MCI_DGV_WHERE_DESTINATION_MAX %s\n", wine_dbgstr_rect(&rc)); } else { FIXME("MCI_DGV_WHERE_DESTINATION not supported yet\n"); - return MCIERR_UNRECOGNIZED_COMMAND; + goto out; } } if (dwFlags & MCI_DGV_WHERE_FRAME) { @@ -687,14 +701,14 @@ static DWORD MCIQTZ_mciWhere(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RECT_PARMS lp FIXME("MCI_DGV_WHERE_FRAME_MAX not supported yet\n"); else FIXME("MCI_DGV_WHERE_FRAME not supported yet\n"); - return MCIERR_UNRECOGNIZED_COMMAND; + goto out; } if (dwFlags & MCI_DGV_WHERE_VIDEO) { if (dwFlags & MCI_DGV_WHERE_MAX) FIXME("MCI_DGV_WHERE_VIDEO_MAX not supported yet\n"); else FIXME("MCI_DGV_WHERE_VIDEO not supported yet\n"); - return MCIERR_UNRECOGNIZED_COMMAND; + goto out; } if (dwFlags & MCI_DGV_WHERE_WINDOW) { if (dwFlags & MCI_DGV_WHERE_MAX) { @@ -705,15 +719,19 @@ static DWORD MCIQTZ_mciWhere(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RECT_PARMS lp TRACE("MCI_DGV_WHERE_WINDOW %s\n", wine_dbgstr_rect(&rc)); } } + ret = 0; +out: /* In MCI, RECT structure is used differently: rc.right = width & rc.bottom = height * So convert the normal RECT into a MCI RECT before returning */ + IVideoWindow_Release(pVideoWindow); + IBasicVideo_Release(pBasicVideo); lpParms->rc.left = rc.left; - lpParms->rc.top = rc.right; + lpParms->rc.top = rc.top; lpParms->rc.right = rc.right - rc.left; lpParms->rc.bottom = rc.bottom - rc.top; - return 0; + return ret; } /***************************************************************************

1 0

Maarten Lankhorst : mciqtz32: Add support for mciUpdate.
by Alexandre Julliard 19 May '10

19 May '10

Module: wine Branch: master Commit: 6956ce61534862e1922dbc2e83b44c69cba5dab9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6956ce61534862e1922dbc2e8… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue May 18 20:16:57 2010 +0200 mciqtz32: Add support for mciUpdate. --- dlls/mciqtz32/Makefile.in | 2 +- dlls/mciqtz32/mciqtz.c | 71 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 71 insertions(+), 2 deletions(-) diff --git a/dlls/mciqtz32/Makefile.in b/dlls/mciqtz32/Makefile.in index fde3f90..6dbdb87 100644 --- a/dlls/mciqtz32/Makefile.in +++ b/dlls/mciqtz32/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = mciqtz32.dll -IMPORTS = strmiids oleaut32 ole32 winmm user32 kernel32 +IMPORTS = strmiids oleaut32 ole32 winmm user32 gdi32 kernel32 C_SRCS = \ mciqtz.c diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 005b1a3..4c9baf5 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -734,6 +734,74 @@ out: return ret; } +/****************************************************************************** + * MCIAVI_mciUpdate [internal] + */ +static DWORD MCIQTZ_mciUpdate(UINT wDevID, DWORD dwFlags, LPMCI_DGV_UPDATE_PARMS lpParms) +{ + WINE_MCIQTZ *wma; + DWORD res = 0; + + TRACE("%04x, %08x, %p\n", wDevID, dwFlags, lpParms); + + if (!lpParms) + return MCIERR_NULL_PARAMETER_BLOCK; + + wma = MCIQTZ_mciGetOpenDev(wDevID); + if (!wma) + return MCIERR_INVALID_DEVICE_ID; + + if (dwFlags & MCI_DGV_UPDATE_HDC) { + IBasicVideo *vidbasic; + IVideoWindow *vidwin; + res = MCIERR_INTERNAL; + IFilterGraph2_QueryInterface(wma->pgraph, &IID_IVideoWindow, (void**)&vidwin); + IFilterGraph2_QueryInterface(wma->pgraph, &IID_IBasicVideo, (void**)&vidbasic); + if (vidbasic && vidwin) { + LONG state, size; + BYTE *data; + BITMAPINFO *info; + HRESULT hr; + RECT src, dest; + + /* If in stopped state, nothing has been drawn to screen + * moving to pause, which is needed for the old dib renderer, will result + * in a single frame drawn, so hide the window here */ + IVideoWindow_put_Visible(vidwin, OAFALSE); + /* FIXME: Should we check the original state and restore it? */ + IMediaControl_Pause(wma->pmctrl); + IMediaControl_GetState(wma->pmctrl, -1, &state); + if (FAILED(hr = IBasicVideo_GetCurrentImage(vidbasic, &size, NULL))) { + WARN("Could not get image size (hr = %x)\n", hr); + goto out; + } + data = HeapAlloc(GetProcessHeap(), 0, size); + info = (BITMAPINFO*)data; + IBasicVideo_GetCurrentImage(vidbasic, &size, (LONG*)data); + data += info->bmiHeader.biSize; + + IBasicVideo_GetSourcePosition(vidbasic, &src.left, &src.top, &src.right, &src.bottom); + IBasicVideo_GetDestinationPosition(vidbasic, &dest.left, &dest.top, &dest.right, &dest.bottom); + StretchDIBits(lpParms->hDC, + dest.left, dest.top, dest.right + dest.left, dest.bottom + dest.top, + src.left, src.top, src.right + src.left, src.bottom + src.top, + data, info, DIB_RGB_COLORS, SRCCOPY); + HeapFree(GetProcessHeap(), 0, data); + } + res = 0; +out: + if (vidbasic) + IBasicVideo_Release(vidbasic); + if (vidwin) { + IVideoWindow_put_Visible(vidwin, OATRUE); + IVideoWindow_Release(vidwin); + } + } + else if (dwFlags) + FIXME("Unhandled flags %x\n", dwFlags); + return res; +} + /*************************************************************************** * MCIQTZ_mciSetAudio [internal] */ @@ -797,6 +865,8 @@ LRESULT CALLBACK MCIQTZ_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case MCI_WHERE: return MCIQTZ_mciWhere (dwDevID, dwParam1, (LPMCI_DGV_RECT_PARMS) dwParam2); /* Digital Video specific */ case MCI_SETAUDIO: return MCIQTZ_mciSetAudio (dwDevID, dwParam1, (LPMCI_DGV_SETAUDIO_PARMSW) dwParam2); + case MCI_UPDATE: + return MCIQTZ_mciUpdate(dwDevID, dwParam1, (LPMCI_DGV_UPDATE_PARMS)dwParam2); case MCI_RECORD: case MCI_PAUSE: case MCI_RESUME: @@ -808,7 +878,6 @@ LRESULT CALLBACK MCIQTZ_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case MCI_FREEZE: case MCI_REALIZE: case MCI_UNFREEZE: - case MCI_UPDATE: case MCI_STEP: case MCI_COPY: case MCI_CUT:

1 0

Maarten Lankhorst : quartz: Add support for windowstate in video renderer.
by Alexandre Julliard 19 May '10

19 May '10

Module: wine Branch: master Commit: 231396de90901675fdf5a8200d983af1409230c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=231396de90901675fdf5a8200… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue May 18 20:17:53 2010 +0200 quartz: Add support for windowstate in video renderer. --- dlls/quartz/videorenderer.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index ed8f24e..845921c 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -1840,16 +1840,20 @@ static HRESULT WINAPI Videowindow_put_WindowState(IVideoWindow *iface, LONG WindowState) { ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface); - FIXME("(%p/%p)->(%d): stub !!!\n", This, iface, WindowState); - + TRACE("(%p/%p)->(%d)\n", This, iface, WindowState); + ShowWindow(This->hWnd, WindowState); return S_OK; } static HRESULT WINAPI Videowindow_get_WindowState(IVideoWindow *iface, LONG *WindowState) { + WINDOWPLACEMENT place; ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface); - FIXME("(%p/%p)->(%p): stub !!!\n", This, iface, WindowState); + place.length = sizeof(place); + GetWindowPlacement(This->hWnd, &place); + TRACE("(%p/%p)->(%p)\n", This, iface, WindowState); + *WindowState = place.showCmd; return S_OK; }

1 0

Damjan Jovanovic : winemenubuilder: associate .lnk files with wine.
by Alexandre Julliard 19 May '10

19 May '10

Module: wine Branch: master Commit: 0666c0da00ea3ddebc7baecefcb987e238b00330 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0666c0da00ea3ddebc7baecef… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 18 21:33:03 2010 +0200 winemenubuilder: associate .lnk files with wine. --- programs/winemenubuilder/winemenubuilder.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 4dc08d5..9f10fdb 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1994,6 +1994,14 @@ static BOOL is_extension_blacklisted(LPCWSTR extension) return FALSE; } +static const char* get_special_mime_type(LPCWSTR extension) +{ + static const WCHAR lnkW[] = {'.','l','n','k',0}; + if (!strcmpiW(extension, lnkW)) + return "application/x-ms-shortcut"; + return NULL; +} + static BOOL write_freedesktop_association_entry(const char *desktopPath, const char *dot_extension, const char *friendlyAppName, const char *mimeType, const char *progId) @@ -2102,6 +2110,8 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package { if (contentTypeW != NULL && strchrW(contentTypeW, '/')) mimeTypeA = wchars_to_utf8_chars(contentTypeW); + else if ((get_special_mime_type(extensionW))) + mimeTypeA = strdupA(get_special_mime_type(extensionW)); else mimeTypeA = heap_printf("application/x-wine-extension-%s", &extensionA[1]);

1 0

Damjan Jovanovic : wine.desktop: Associate with winemenubuilder' s application/x-ms-shortcut.
by Alexandre Julliard 19 May '10

19 May '10

Module: wine Branch: master Commit: 8e10c65367b9bdf6dc9d4a2d44ca0f5817bfb0f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e10c65367b9bdf6dc9d4a2d4… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 18 21:34:53 2010 +0200 wine.desktop: Associate with winemenubuilder's application/x-ms-shortcut. --- tools/wine.desktop | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wine.desktop b/tools/wine.desktop index 50489e1..f39ebca 100644 --- a/tools/wine.desktop +++ b/tools/wine.desktop @@ -20,7 +20,7 @@ Name[sr]=Wine - дизач Windows програма Name[sr(a)latin]=Wine - dizač Windows programa Name[hr]=Wine - dizač Windows programa Exec=wine start /unix %f -MimeType=application/x-ms-dos-executable;application/x-msi;application/x-win-lnk; +MimeType=application/x-ms-dos-executable;application/x-msi;application/x-win-lnk;application/x-ms-shortcut Icon=wine NoDisplay=true StartupNotify=true

1 0

Ilya Shpigor : shdocvw: Added IDataObject stub implementation.
by Alexandre Julliard 19 May '10

19 May '10

Module: wine Branch: master Commit: cc784e277f7300638aa4ab5d993e518e9043ffdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc784e277f7300638aa4ab5d9… Author: Ilya Shpigor <shpigor(a)etersoft.ru> Date: Tue May 18 17:17:29 2010 +0400 shdocvw: Added IDataObject stub implementation. --- dlls/shdocvw/shdocvw.h | 3 + dlls/shdocvw/view.c | 114 +++++++++++++++++++++++++++++++++++++++++++++ dlls/shdocvw/webbrowser.c | 4 ++ 3 files changed, 121 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 1184298..2dce575 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -127,6 +127,7 @@ struct WebBrowser { const IOleCommandTargetVtbl *lpOleCommandTargetVtbl; const IHlinkFrameVtbl *lpHlinkFrameVtbl; const IServiceProviderVtbl *lpServiceProviderVtbl; + const IDataObjectVtbl *lpDataObjectVtbl; LONG ref; @@ -184,6 +185,7 @@ struct InternetExplorer { #define ACTIVEOBJ(x) ((IOleInPlaceActiveObject*) &(x)->lpOleInPlaceActiveObjectVtbl) #define OLECMD(x) ((IOleCommandTarget*) &(x)->lpOleCommandTargetVtbl) #define HLINKFRAME(x) ((IHlinkFrame*) &(x)->lpHlinkFrameVtbl) +#define DATAOBJECT(x) ((IDataObject*) &(x)->lpDataObjectVtbl) #define CLIENTSITE(x) ((IOleClientSite*) &(x)->lpOleClientSiteVtbl) #define INPLACESITE(x) ((IOleInPlaceSite*) &(x)->lpOleInPlaceSiteVtbl) @@ -198,6 +200,7 @@ struct InternetExplorer { void WebBrowser_OleObject_Init(WebBrowser*); void WebBrowser_ViewObject_Init(WebBrowser*); +void WebBrowser_DataObject_Init(WebBrowser*); void WebBrowser_Persist_Init(WebBrowser*); void WebBrowser_ClassInfo_Init(WebBrowser*); void WebBrowser_HlinkFrame_Init(WebBrowser*); diff --git a/dlls/shdocvw/view.c b/dlls/shdocvw/view.c index d2e5857..9ee7c06 100644 --- a/dlls/shdocvw/view.c +++ b/dlls/shdocvw/view.c @@ -1,5 +1,6 @@ /* * Copyright 2005 Jacek Caban + * Copyright 2010 Ilya Shpigor * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,6 +22,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +/********************************************************************** + * Implement the IViewObject interface + */ + #define VIEWOBJ_THIS(iface) DEFINE_THIS(WebBrowser, ViewObject, iface) static HRESULT WINAPI ViewObject_QueryInterface(IViewObject2 *iface, REFIID riid, void **ppv) @@ -122,3 +127,112 @@ void WebBrowser_ViewObject_Init(WebBrowser *This) { This->lpViewObjectVtbl = &ViewObjectVtbl; } + +/********************************************************************** + * Implement the IDataObject interface + */ + +#define DATAOBJ_THIS(iface) DEFINE_THIS(WebBrowser, DataObject, iface) + +static HRESULT WINAPI DataObject_QueryInterface(LPDATAOBJECT iface, REFIID riid, LPVOID * ppvObj) +{ + WebBrowser *This = DATAOBJ_THIS(iface); + return IWebBrowser2_QueryInterface(WEBBROWSER(This), riid, ppvObj); +} + +static ULONG WINAPI DataObject_AddRef(LPDATAOBJECT iface) +{ + WebBrowser *This = DATAOBJ_THIS(iface); + return IWebBrowser2_AddRef(WEBBROWSER(This)); +} + +static ULONG WINAPI DataObject_Release(LPDATAOBJECT iface) +{ + WebBrowser *This = DATAOBJ_THIS(iface); + return IWebBrowser2_Release(WEBBROWSER(This)); +} + +static HRESULT WINAPI DataObject_GetData(LPDATAOBJECT iface, LPFORMATETC pformatetcIn, STGMEDIUM *pmedium) +{ + WebBrowser *This = DATAOBJ_THIS(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI DataObject_GetDataHere(LPDATAOBJECT iface, LPFORMATETC pformatetc, STGMEDIUM *pmedium) +{ + WebBrowser *This = DATAOBJ_THIS(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI DataObject_QueryGetData(LPDATAOBJECT iface, LPFORMATETC pformatetc) +{ + WebBrowser *This = DATAOBJ_THIS(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI DataObject_GetCanonicalFormatEtc(LPDATAOBJECT iface, LPFORMATETC pformatectIn, LPFORMATETC pformatetcOut) +{ + WebBrowser *This = DATAOBJ_THIS(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI DataObject_SetData(LPDATAOBJECT iface, LPFORMATETC pformatetc, STGMEDIUM *pmedium, BOOL fRelease) +{ + WebBrowser *This = DATAOBJ_THIS(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI DataObject_EnumFormatEtc(LPDATAOBJECT iface, DWORD dwDirection, IEnumFORMATETC **ppenumFormatEtc) +{ + WebBrowser *This = DATAOBJ_THIS(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI DataObject_DAdvise(LPDATAOBJECT iface, FORMATETC *pformatetc, DWORD advf, IAdviseSink *pAdvSink, DWORD *pdwConnection) +{ + WebBrowser *This = DATAOBJ_THIS(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI DataObject_DUnadvise(LPDATAOBJECT iface, DWORD dwConnection) +{ + WebBrowser *This = DATAOBJ_THIS(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI DataObject_EnumDAdvise(LPDATAOBJECT iface, IEnumSTATDATA **ppenumAdvise) +{ + WebBrowser *This = DATAOBJ_THIS(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static const IDataObjectVtbl DataObjectVtbl = { + DataObject_QueryInterface, + DataObject_AddRef, + DataObject_Release, + DataObject_GetData, + DataObject_GetDataHere, + DataObject_QueryGetData, + DataObject_GetCanonicalFormatEtc, + DataObject_SetData, + DataObject_EnumFormatEtc, + DataObject_DAdvise, + DataObject_DUnadvise, + DataObject_EnumDAdvise +}; + +#undef DATAOBJ_THIS + +void WebBrowser_DataObject_Init(WebBrowser *This) +{ + This->lpDataObjectVtbl = &DataObjectVtbl; +} diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 2ac9b99..b2fce6a 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -105,6 +105,9 @@ static HRESULT WINAPI WebBrowser_QueryInterface(IWebBrowser2 *iface, REFIID riid }else if(IsEqualGUID(&IID_IServiceProvider, riid)) { *ppv = SERVPROV(This); TRACE("(%p)->(IID_IServiceProvider %p)\n", This, ppv); + }else if(IsEqualGUID(&IID_IDataObject, riid)) { + *ppv = DATAOBJECT(This); + TRACE("(%p)->(IID_IDataObject %p)\n", This, ppv); }else if(IsEqualGUID(&IID_IQuickActivate, riid)) { TRACE("(%p)->(IID_IQuickActivate %p) returning NULL\n", This, ppv); return E_NOINTERFACE; @@ -1132,6 +1135,7 @@ static HRESULT WebBrowser_Create(INT version, IUnknown *pOuter, REFIID riid, voi WebBrowser_OleObject_Init(ret); WebBrowser_ViewObject_Init(ret); + WebBrowser_DataObject_Init(ret); WebBrowser_Persist_Init(ret); WebBrowser_ClassInfo_Init(ret); WebBrowser_HlinkFrame_Init(ret);

1 0

Maarten Lankhorst : winmm: Make timer keep a ref on winmm while it' s running.
by Alexandre Julliard 19 May '10

19 May '10

Module: wine Branch: master Commit: 00eaa9294559bb75cf5cbf7f1b61c3e239d08d62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00eaa9294559bb75cf5cbf7f1… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon May 17 19:58:28 2010 +0200 winmm: Make timer keep a ref on winmm while it's running. --- dlls/winmm/time.c | 43 +++++++++++++++++++++++-------------------- 1 files changed, 23 insertions(+), 20 deletions(-) diff --git a/dlls/winmm/time.c b/dlls/winmm/time.c index ee835c7..3d45fd9 100644 --- a/dlls/winmm/time.c +++ b/dlls/winmm/time.c @@ -138,7 +138,6 @@ static int TIME_MMSysTimeCallback(void) * mm timer crit sect locked. */ - EnterCriticalSection(&WINMM_cs); for (;;) { struct list *ptr = list_head( &timer_list ); @@ -188,7 +187,6 @@ static int TIME_MMSysTimeCallback(void) } HeapFree( GetProcessHeap(), 0, to_free ); } - LeaveCriticalSection(&WINMM_cs); return delta_time; } @@ -206,20 +204,21 @@ static DWORD CALLBACK TIME_MMSysTimeThread(LPVOID arg) TRACE("Starting main winmm thread\n"); - /* FIXME: As an optimization, we could have - this thread die when there are no more requests - pending, and then get recreated on the first - new event; it's not clear if that would be worth - it or not. */ - + EnterCriticalSection(&WINMM_cs); while (! TIME_TimeToDie) { sleep_time = TIME_MMSysTimeCallback(); + if (sleep_time < 0) + break; if (sleep_time == 0) continue; - if ((ret = poll(&pfd, 1, sleep_time)) < 0) + LeaveCriticalSection(&WINMM_cs); + ret = poll(&pfd, 1, sleep_time); + EnterCriticalSection(&WINMM_cs); + + if (ret < 0) { if (errno != EINTR && errno != EAGAIN) { @@ -230,7 +229,11 @@ static DWORD CALLBACK TIME_MMSysTimeThread(LPVOID arg) while (ret > 0) ret = read(TIME_fdWake[0], readme, sizeof(readme)); } + CloseHandle(TIME_hMMTimer); + TIME_hMMTimer = NULL; + LeaveCriticalSection(&WINMM_cs); TRACE("Exiting main winmm thread\n"); + FreeLibraryAndExitThread(arg, 0); return 0; } @@ -239,7 +242,9 @@ static DWORD CALLBACK TIME_MMSysTimeThread(LPVOID arg) */ static void TIME_MMTimeStart(void) { + TIME_TimeToDie = 0; if (!TIME_hMMTimer) { + HMODULE mod; if (pipe(TIME_fdWake) < 0) { TIME_fdWake[0] = TIME_fdWake[1] = -1; @@ -248,8 +253,8 @@ static void TIME_MMTimeStart(void) fcntl(TIME_fdWake[0], F_SETFL, O_NONBLOCK); fcntl(TIME_fdWake[1], F_SETFL, O_NONBLOCK); } - TIME_TimeToDie = FALSE; - TIME_hMMTimer = CreateThread(NULL, 0, TIME_MMSysTimeThread, NULL, 0, NULL); + GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCWSTR)TIME_MMSysTimeThread, &mod); + TIME_hMMTimer = CreateThread(NULL, 0, TIME_MMSysTimeThread, mod, 0, NULL); SetThreadPriority(TIME_hMMTimer, THREAD_PRIORITY_TIME_CRITICAL); } } @@ -269,17 +274,13 @@ static void TIME_MMTimeStart(void) void TIME_MMTimeStop(void) { if (TIME_hMMTimer) { - const char a='a'; - - TIME_TimeToDie = TRUE; - write(TIME_fdWake[1], &a, sizeof(a)); - - WaitForSingleObject(TIME_hMMTimer, INFINITE); + EnterCriticalSection(&WINMM_cs); + if (TIME_hMMTimer) { + ERR("Timer still active?!\n"); + CloseHandle(TIME_hMMTimer); + } close(TIME_fdWake[0]); close(TIME_fdWake[1]); - TIME_fdWake[0] = TIME_fdWake[1] = -1; - CloseHandle(TIME_hMMTimer); - TIME_hMMTimer = 0; DeleteCriticalSection(&TIME_cbcrst); } } @@ -368,6 +369,8 @@ MMRESULT WINAPI timeKillEvent(UINT wID) break; } } + if (list_empty(&timer_list)) + TIME_TimeToDie = 1; LeaveCriticalSection(&WINMM_cs); if (!lpSelf)

1 0

Alexandre Julliard : winecfg: Don' t crash when DllOverrides contain invalid values.
by Alexandre Julliard 19 May '10

19 May '10

Module: wine Branch: master Commit: fa4d3becf65575194f375a74640de8e8d2ed6e2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa4d3becf65575194f375a746… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 19 11:26:29 2010 +0200 winecfg: Don't crash when DllOverrides contain invalid values. --- programs/winecfg/libraries.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c index 19504d6..e402b4e 100644 --- a/programs/winecfg/libraries.c +++ b/programs/winecfg/libraries.c @@ -136,7 +136,7 @@ static const char* mode_to_string(enum dllmode mode) case NATIVE_BUILTIN: return "native,builtin"; case BUILTIN_NATIVE: return "builtin,native"; case DISABLE: return ""; - default: assert(FALSE); return ""; + default: return ""; } } @@ -153,7 +153,7 @@ static const char* mode_to_label(enum dllmode mode) case NATIVE_BUILTIN: id = IDS_DLL_NATIVE_BUILTIN; break; case BUILTIN_NATIVE: id = IDS_DLL_BUILTIN_NATIVE; break; case DISABLE: id = IDS_DLL_DISABLED; break; - default: assert(FALSE); + default: return "??"; } if (!LoadStringA( GetModuleHandleA(NULL), id, buffer, sizeof(buffer) )) buffer[0] = 0; return buffer; @@ -183,7 +183,7 @@ static DWORD mode_to_id(enum dllmode mode) case NATIVE_BUILTIN: return IDC_RAD_NATIVE_BUILTIN; case BUILTIN_NATIVE: return IDC_RAD_BUILTIN_NATIVE; case DISABLE: return IDC_RAD_DISABLE; - default: assert( FALSE ); return 0; /* should not be reached */ + default: return IDC_RAD_BUILTIN_NATIVE; } }

1 0