January 2006 - Wine-commits

Eric Pouech : wineoss: Proper support in OSS driver for audio when no mixer is present.
by Alexandre Julliard 27 Jan '06

27 Jan '06

Module: wine Branch: refs/heads/master Commit: aef4a77d46a3881ad35c3aeeb70e9ab96efed2b6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=aef4a77d46a3881ad35c3ae… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri Jan 27 12:10:25 2006 +0100 wineoss: Proper support in OSS driver for audio when no mixer is present. Fixed a couple of potential fd leaks. --- dlls/winmm/wineoss/audio.c | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/winmm/wineoss/audio.c b/dlls/winmm/wineoss/audio.c index 7df0bca..596190b 100644 --- a/dlls/winmm/wineoss/audio.c +++ b/dlls/winmm/wineoss/audio.c @@ -740,9 +740,7 @@ static BOOL OSS_WaveOutInit(OSS_DEVICE* } close(mixer); } else { - ERR("open(%s) failed (%s)\n", ossdev->mixer_name , strerror(errno)); - OSS_CloseDevice(ossdev); - return FALSE; + WARN("open(%s) failed (%s)\n", ossdev->mixer_name , strerror(errno)); } } #endif /* SOUND_MIXER_INFO */ @@ -892,9 +890,7 @@ static BOOL OSS_WaveInInit(OSS_DEVICE* o } close(mixer); } else { - ERR("open(%s) failed (%s)\n", ossdev->mixer_name, strerror(errno)); - OSS_CloseDevice(ossdev); - return FALSE; + WARN("open(%s) failed (%s)\n", ossdev->mixer_name, strerror(errno)); } } #endif /* SOUND_MIXER_INFO */ @@ -2254,6 +2250,7 @@ static DWORD wodGetVolume(WORD wDevID, L return MMSYSERR_NOTENABLED; } if (ioctl(mixer, SOUND_MIXER_READ_PCM, &volume) == -1) { + close(mixer); WARN("ioctl(%s, SOUND_MIXER_READ_PCM) failed (%s)\n", WOutDev[wDevID].ossdev->mixer_name, strerror(errno)); return MMSYSERR_NOTENABLED; @@ -2297,12 +2294,12 @@ DWORD wodSetVolume(WORD wDevID, DWORD dw return MMSYSERR_NOTENABLED; } if (ioctl(mixer, SOUND_MIXER_WRITE_PCM, &volume) == -1) { + close(mixer); WARN("ioctl(%s, SOUND_MIXER_WRITE_PCM) failed (%s)\n", WOutDev[wDevID].ossdev->mixer_name, strerror(errno)); return MMSYSERR_NOTENABLED; - } else { - TRACE("volume=%04x\n", (unsigned)volume); } + TRACE("volume=%04x\n", (unsigned)volume); close(mixer); /* save requested volume */

1 0

lostwages/templates/en status_changelog.templa ...
by Jeremy Newman 26 Jan '06

26 Jan '06

ChangeSet ID: 22554 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/01/26 17:19:17 Modified files: templates/en : status_changelog.template status_directx.template status_dlls.template Log message: Tom Wickline <twickline(a)gmail.com> Fix a typo, add remaining dll's Patch: http://cvs.winehq.org/patch.py?id=22554 Old revision New revision Changes Path 1.39 1.40 +6 -0 lostwages/templates/en/status_changelog.template 1.16 1.17 +7 -0 lostwages/templates/en/status_directx.template 1.33 1.34 +54 -3 lostwages/templates/en/status_dlls.template Index: lostwages/templates/en/status_changelog.template diff -u -p lostwages/templates/en/status_changelog.template:1.39 lostwages/templates/en/status_changelog.template:1.40 --- lostwages/templates/en/status_changelog.template:1.39 26 Jan 2006 23:19:17 -0000 +++ lostwages/templates/en/status_changelog.template 26 Jan 2006 23:19:17 -0000 @@ -5,6 +5,12 @@ Changes since January 26, 2006: <ul> + <li>ADD - dxdiagn.dll section</li> + <li>ADD - mswsock.dll section</li> + <li>ADD - objsel.dll section</li> + <li>ADD - odbccp32.dll section</li> + <li>ADD - riched20.dll section</li> + <li>ADD - security.dll section</li> <li>ADD - usp10.dll section</li> <li>ADD - wldap32.dll section</li> <li>Update - WWN links</li> Index: lostwages/templates/en/status_directx.template diff -u -p lostwages/templates/en/status_directx.template:1.16 lostwages/templates/en/status_directx.template:1.17 --- lostwages/templates/en/status_directx.template:1.16 26 Jan 2006 23:19:18 -0000 +++ lostwages/templates/en/status_directx.template 26 Jan 2006 23:19:18 -0000 @@ -268,6 +268,13 @@ <td class="pct85">85% complete</a></td> <td></td> </tr> + <tr> + <td>dxdiagn.dll</td> + <td class="adequate"><a href="http://msdn.microsoft.com/archive/default.asp?url=/archive/en-us/directx9_c…">MSDN: DirectX Diagnostic Tool Reference</a></td> + <td>None</td> + <td class="pct5">5% complete</a></td> + <td>Raphaël Junqueira</td> + </tr> </table> </td> </tr> Index: lostwages/templates/en/status_dlls.template diff -u -p lostwages/templates/en/status_dlls.template:1.33 lostwages/templates/en/status_dlls.template:1.34 --- lostwages/templates/en/status_dlls.template:1.33 26 Jan 2006 23:19:18 -0000 +++ lostwages/templates/en/status_dlls.template 26 Jan 2006 23:19:18 -0000 @@ -161,7 +161,7 @@ <td>hhctrl.ocx</td> <td class="adequate"><a href="http://www.helpware.net/htmlhelp/hh_info.htm">HTML Help overview</a></td> <td><a href="{$root}/site/?issue=284#HTML%20Help%20Status">#284</a>, - <td><a href="{$root}/site/??issue=290#HTML%20Help">#290</a></td> + <a href="{$root}/site/??issue=290#HTML%20Help">#290</a></td> <td class="pct5">5% complete</td> <td>Mike McCormack</td> <tr> @@ -320,6 +320,20 @@ <td>Jon Griffiths</td> </tr> <tr> + <td>mswsock.dll</td> + <td class="adequate"><a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/winsock/wi…">MSDN: Winsock Reference</a></td> + <td>None</td> + <td class="pct5">5% complete</td> + <td></td> + </tr> + <tr> + <td>msxml3.dll</td> + <td class="adequate"><a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dnanchor/h…">MSDN: XML Products</a></td> + <td>None</td> + <td class="pct5">5% complete</td> + <td>Huw Davies</td> + </tr> + <tr> <td>netapi32.dll</td> <td class="adequate"><a href="http://www.andreavb.com/API_NETAPI32.html">netapi32 API calls</a></td> <td><a href="{$root}/site/?issue=198#NetBIOS%20Functionality">#198</a></td> @@ -343,6 +357,13 @@ <td>Alexandre Julliard, Eric Pouech</td> </tr> <tr> + <td>objsel.dll</td> + <td class="adequate"><a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/ad/ad/dire…">MSDN: Directory Object Picker</a></td> + <td>None</td> + <td class="pct5">5% complete</td> + <td>Thomas Weidenmueller</td> + </tr> + <tr> <td>odbc32.dll</td> <td class="adequate"><a href="http://www.winehq.org/site/docs/wineusr-guide/misc-things-to-configure#AEN4…">WineHQ ODBC Docs</a> <a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore98/h…">MSDN: ODBC</a></td> @@ -353,6 +374,13 @@ <td>Alex Villacís Lasso</td> </tr> <tr> + <td>odbccp32.dll</td> + <td class="adequate"><a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/odbc/htm/o…">MSDN: ODBC Appendixes</a></td> + <td>None</td> + <td class="pct5">5% complete</td> + <td>Hans Leidekker</td> + </tr> + <tr> <td>ole32.dll</td> <td class="adequate"><a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/com/html/3…">MSDN: COM</a> <a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/mobilesdk5…">MSDN: OLE Reference</a></td> @@ -441,6 +469,13 @@ <td></td> </tr> <tr> + <td>riched20.dll</td> + <td class="adequate"><a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/shellcc/pl…">MSDN: Rich Edit Controls</a></td> + <td>None</td> + <td class="pct5">5% complete</td> + <td>Krzysztof Foltman, Phil Krylov</td> + </tr> + <tr> <td>riched32.dll</td> <td class="adequate"><a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/shellcc/pl…">MSDN: Rich Edit Controls</a></td> <td><a href="{$root}/site/?issue=127#MS%20Write%20Support">#127</a>, @@ -495,6 +530,14 @@ <td class="pct5">5% complete</td> <td></td> </tr> + <tr> + <td>security.dll</td> + <td class="nonexistent">Nonexistent</td> + <td>None</td> + <td class="pct5">5% complete</td> + <td>Robert Shearman</td> + </tr> + <tr> <td>sensapi.dll</td> <td class="adequate"><a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/syncmgr/sy…">MSDN: SENS Reference</a></td> <td>None</td> @@ -552,8 +595,16 @@ <td></td> </tr> <tr> + <td>stdole2.tlb</td> + <td class="adequate"><a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/automat/ht…">MSDN: Type Building Interfaces</a></td> + <td><a href="{$root}/site/?issue=154#InstallShield%206%20Insight">#154</a>, + <a href="{$root}/site/?issue=284#stdole2.tlb">#284</a></td> + <td class="pct100">100% complete</td> + <td>Huw D M Davies</td> + </tr> + <tr> <td>stdole32.tlb</td> - <td class="adequate"><a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/automat/ht…">MSDN: Type Building Interfaces</a></td> + <td class="adequate"><a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/automat/ht…">MSDN: Type Building Interfaces</a></td> <td>None</td> <td class="pct100">100% complete</td> <td>Huw D M Davies</td> @@ -738,7 +789,7 @@ </tr> <tr> <td>wsock32.dll</td> - <td class="adequate"><a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/wcemain4/h…">MSDN: Winsock 2 Functions</a></td> + <td class="adequate"><a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/winsock/wi…">MSDN: Winsock 2 Functions</a></td> <td><a href="{$root}/site/?issue=108#Winsock2">#108 (1)</a>, <a href="{$root}/site/?issue=108#Overlapped%20I/O">#108 (2)</a>, <a href="{$root}/site/?issue=121#Winsock2%20Patches">#121</a>,

1 0

lostwages/templates/en status_changelog.templa ...
by Jeremy Newman 26 Jan '06

26 Jan '06

ChangeSet ID: 22553 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/01/26 14:15:10 Modified files: templates/en : status_changelog.template status_directx.template status_dlls.template status_multimedia.template status_wine.template Log message: Tom Wickline <twickline(a)gmail.com> add a couple missing dll's and update WWN links Patch: http://cvs.winehq.org/patch.py?id=22553 Old revision New revision Changes Path 1.38 1.39 +9 -0 lostwages/templates/en/status_changelog.template 1.15 1.16 +10 -3 lostwages/templates/en/status_directx.template 1.32 1.33 +41 -12 lostwages/templates/en/status_dlls.template 1.12 1.13 +10 -5 lostwages/templates/en/status_multimedia.template 1.23 1.24 +46 -24 lostwages/templates/en/status_wine.template

1 0

Jacek Caban : shdocvw: Added client site's IDispatch stub implementation.
by Alexandre Julliard 26 Jan '06

26 Jan '06

Module: wine Branch: refs/heads/master Commit: 0e1ef8ac2ef68faee2d35ff8a4e3dc6dbd054899 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0e1ef8ac2ef68faee2d35ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 26 13:30:04 2006 +0100 shdocvw: Added client site's IDispatch stub implementation. --- dlls/shdocvw/client.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/shdocvw/shdocvw.h | 2 + 2 files changed, 72 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/client.c b/dlls/shdocvw/client.c index 5e989d4..45b2b98 100644 --- a/dlls/shdocvw/client.c +++ b/dlls/shdocvw/client.c @@ -53,6 +53,9 @@ static HRESULT WINAPI ClientSite_QueryIn }else if(IsEqualGUID(&IID_IOleClientSite, riid)) { TRACE("(%p)->(IID_IOleClientSite %p)\n", This, ppv); *ppv = CLOLECMD(This); + }else if(IsEqualGUID(&IID_IDispatch, riid)) { + TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); + *ppv = CLDISP(This); } if(*ppv) { @@ -341,11 +344,78 @@ static const IOleDocumentSiteVtbl OleDoc OleDocumentSite_ActivateMe }; +#define DISP_THIS(iface) DEFINE_THIS(WebBrowser, Dispatch, iface) + +static HRESULT WINAPI ClDispatch_QueryInterface(IDispatch *iface, REFIID riid, void **ppv) +{ + WebBrowser *This = DISP_THIS(iface); + return IOleClientSite_QueryInterface(CLIENTSITE(This), riid, ppv); +} + +static ULONG WINAPI ClDispatch_AddRef(IDispatch *iface) +{ + WebBrowser *This = DISP_THIS(iface); + return IWebBrowser2_AddRef(WEBBROWSER(This)); +} + +static ULONG WINAPI ClDispatch_Release(IDispatch *iface) +{ + WebBrowser *This = DISP_THIS(iface); + return IWebBrowser2_Release(WEBBROWSER(This)); +} + +static HRESULT WINAPI ClDispatch_GetTypeInfoCount(IDispatch *iface, UINT *pctinfo) +{ + WebBrowser *This = DISP_THIS(iface); + FIXME("(%p)->(%p)\n", This, pctinfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI ClDispatch_GetTypeInfo(IDispatch *iface, UINT iTInfo, LCID lcid, + ITypeInfo **ppTInfo) +{ + WebBrowser *This = DISP_THIS(iface); + FIXME("(%p)->(%u %ld %p)\n", This, iTInfo, lcid, ppTInfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI ClDispatch_GetIDsOfNames(IDispatch *iface, REFIID riid, LPOLESTR *rgszNames, + UINT cNames, LCID lcid, DISPID *rgDispId) +{ + WebBrowser *This = DISP_THIS(iface); + FIXME("(%p)->(%s %p %u %ld %p)\n", This, debugstr_guid(riid), rgszNames, cNames, + lcid, rgDispId); + return E_NOTIMPL; +} + +static HRESULT WINAPI ClDispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REFIID riid, + LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + WebBrowser *This = DISP_THIS(iface); + FIXME("(%p)->(%ld %s %ld %04x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + return E_NOTIMPL; +} + +#undef DISP_THIS + +static const IDispatchVtbl DispatchVtbl = { + ClDispatch_QueryInterface, + ClDispatch_AddRef, + ClDispatch_Release, + ClDispatch_GetTypeInfoCount, + ClDispatch_GetTypeInfo, + ClDispatch_GetIDsOfNames, + ClDispatch_Invoke +}; + void WebBrowser_ClientSite_Init(WebBrowser *This) { This->lpOleClientSiteVtbl = &OleClientSiteVtbl; This->lpOleInPlaceSiteVtbl = &OleInPlaceSiteVtbl; This->lpOleDocumentSiteVtbl = &OleDocumentSiteVtbl; + This->lpDispatchVtbl = &DispatchVtbl; This->view = NULL; } diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 6679a02..ba10279 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -85,6 +85,7 @@ typedef struct { const IDocHostUIHandler2Vtbl *lpDocHostUIHandlerVtbl; const IOleDocumentSiteVtbl *lpOleDocumentSiteVtbl; const IOleCommandTargetVtbl *lpClOleCommandTargetVtbl; + const IDispatchVtbl *lpDispatchVtbl; /* Interfaces of InPlaceFrame object */ @@ -142,6 +143,7 @@ typedef struct { #define DOCHOSTUI2(x) ((IDocHostUIHandler2*) &(x)->lpDocHostUIHandlerVtbl) #define DOCSITE(x) ((IOleDocumentSite*) &(x)->lpOleDocumentSiteVtbl) #define CLOLECMD(x) ((IOleCommandTarget*) &(x)->lpClOleCommandTargetVtbl) +#define CLDISP(x) ((IDispatch*) &(x)->lpDispatchVtbl) #define INPLACEFRAME(x) ((IOleInPlaceFrame*) &(x)->lpOleInPlaceFrameVtbl)

1 0

Jacek Caban : shdocvw: Added WebBrowser's IOleCommandTarget stub implementation.
by Alexandre Julliard 26 Jan '06

26 Jan '06

Module: wine Branch: refs/heads/master Commit: 1b966122f85817195f3d32c1cf03d33e7f6abafb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1b966122f85817195f3d32c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 26 13:29:35 2006 +0100 shdocvw: Added WebBrowser's IOleCommandTarget stub implementation. --- dlls/shdocvw/oleobject.c | 51 +++++++++++++++++++++++++++++++++++++++++++++ dlls/shdocvw/shdocvw.h | 2 ++ dlls/shdocvw/webbrowser.c | 3 +++ 3 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index 4f41da3..fa3e9dc 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -691,12 +691,63 @@ static const IOleInPlaceActiveObjectVtbl InPlaceActiveObject_EnableModeless }; +#define OLECMD_THIS(iface) DEFINE_THIS(WebBrowser, WBOleCommandTarget, iface) + +static HRESULT WINAPI WBOleCommandTarget_QueryInterface(IOleCommandTarget *iface, + REFIID riid, void **ppv) +{ + WebBrowser *This = OLECMD_THIS(iface); + return IWebBrowser2_QueryInterface(WEBBROWSER(This), riid, ppv); +} + +static ULONG WINAPI WBOleCommandTarget_AddRef(IOleCommandTarget *iface) +{ + WebBrowser *This = OLECMD_THIS(iface); + return IWebBrowser2_AddRef(WEBBROWSER(This)); +} + +static ULONG WINAPI WBOleCommandTarget_Release(IOleCommandTarget *iface) +{ + WebBrowser *This = OLECMD_THIS(iface); + return IWebBrowser2_Release(WEBBROWSER(This)); +} + +static HRESULT WINAPI WBOleCommandTarget_QueryStatus(IOleCommandTarget *iface, + const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[], OLECMDTEXT *pCmdText) +{ + WebBrowser *This = OLECMD_THIS(iface); + FIXME("(%p)->(%s %lu %p %p)\n", This, debugstr_guid(pguidCmdGroup), cCmds, prgCmds, + pCmdText); + return E_NOTIMPL; +} + +static HRESULT WINAPI WBOleCommandTarget_Exec(IOleCommandTarget *iface, + const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, + VARIANT *pvaOut) +{ + WebBrowser *This = OLECMD_THIS(iface); + FIXME("(%p)->(%s %ld %ld %p %p)\n", This, debugstr_guid(pguidCmdGroup), nCmdID, + nCmdexecopt, pvaIn, pvaOut); + return E_NOTIMPL; +} + +#undef OLECMD_THIS + +static const IOleCommandTargetVtbl OleCommandTargetVtbl = { + WBOleCommandTarget_QueryInterface, + WBOleCommandTarget_AddRef, + WBOleCommandTarget_Release, + WBOleCommandTarget_QueryStatus, + WBOleCommandTarget_Exec +}; + void WebBrowser_OleObject_Init(WebBrowser *This) { This->lpOleObjectVtbl = &OleObjectVtbl; This->lpOleInPlaceObjectVtbl = &OleInPlaceObjectVtbl; This->lpOleControlVtbl = &OleControlVtbl; This->lpOleInPlaceActiveObjectVtbl = &OleInPlaceActiveObjectVtbl; + This->lpWBOleCommandTargetVtbl = &OleCommandTargetVtbl; This->client = NULL; This->container = NULL; diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 9b777fc..6679a02 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -76,6 +76,7 @@ typedef struct { const IConnectionPointContainerVtbl *lpConnectionPointContainerVtbl; const IViewObject2Vtbl *lpViewObjectVtbl; const IOleInPlaceActiveObjectVtbl *lpOleInPlaceActiveObjectVtbl; + const IOleCommandTargetVtbl *lpWBOleCommandTargetVtbl; /* Interfaces available for embeded document */ @@ -133,6 +134,7 @@ typedef struct { #define VIEWOBJ(x) ((IViewObject*) &(x)->lpViewObjectVtbl); #define VIEWOBJ2(x) ((IViewObject2*) &(x)->lpViewObjectVtbl); #define ACTIVEOBJ(x) ((IOleInPlaceActiveObject*) &(x)->lpOleInPlaceActiveObjectVtbl) +#define WBOLECMD(x) ((IOleCommandTarget*) &(x)->lpWBOleCommandTargetVtbl) #define CLIENTSITE(x) ((IOleClientSite*) &(x)->lpOleClientSiteVtbl) #define INPLACESITE(x) ((IOleInPlaceSite*) &(x)->lpOleInPlaceSiteVtbl) diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 8110950..1c435bd 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -97,6 +97,9 @@ static HRESULT WINAPI WebBrowser_QueryIn }else if(IsEqualGUID(&IID_IOleInPlaceActiveObject, riid)) { TRACE("(%p)->(IID_IOleInPlaceActiveObject %p)\n", This, ppv); *ppv = ACTIVEOBJ(This); + }else if(IsEqualGUID(&IID_IOleCommandTarget, riid)) { + TRACE("(%p)->(IID_IOleCommandTarget %p)\n", This, ppv); + *ppv = WBOLECMD(This); } if(*ppv) {

1 0

Jacek Caban : shdocvw: Added client site's IOleCommandTarget stub implementation.
by Alexandre Julliard 26 Jan '06

26 Jan '06

Module: wine Branch: refs/heads/master Commit: 254bdf08f147720d8d5305423652b7cf5f7d7624 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=254bdf08f147720d8d53054… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 26 13:28:43 2006 +0100 shdocvw: Added client site's IOleCommandTarget stub implementation. --- dlls/shdocvw/client.c | 3 +++ dlls/shdocvw/dochost.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/shdocvw/shdocvw.h | 2 ++ 3 files changed, 57 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/client.c b/dlls/shdocvw/client.c index 842c184..5e989d4 100644 --- a/dlls/shdocvw/client.c +++ b/dlls/shdocvw/client.c @@ -50,6 +50,9 @@ static HRESULT WINAPI ClientSite_QueryIn }else if(IsEqualGUID(&IID_IOleDocumentSite, riid)) { TRACE("(%p)->(IID_IOleDocumentSite %p)\n", This, ppv); *ppv = DOCSITE(This); + }else if(IsEqualGUID(&IID_IOleClientSite, riid)) { + TRACE("(%p)->(IID_IOleClientSite %p)\n", This, ppv); + *ppv = CLOLECMD(This); } if(*ppv) { diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index 2a4a81d..ffe1fda 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -206,6 +206,56 @@ void deactivate_document(WebBrowser *Thi This->document = NULL; } +#define OLECMD_THIS(iface) DEFINE_THIS(WebBrowser, ClOleCommandTarget, iface) + +static HRESULT WINAPI ClOleCommandTarget_QueryInterface(IOleCommandTarget *iface, + REFIID riid, void **ppv) +{ + WebBrowser *This = OLECMD_THIS(iface); + return IOleClientSite_QueryInterface(CLIENTSITE(This), riid, ppv); +} + +static ULONG WINAPI ClOleCommandTarget_AddRef(IOleCommandTarget *iface) +{ + WebBrowser *This = OLECMD_THIS(iface); + return IWebBrowser2_AddRef(WEBBROWSER(This)); +} + +static ULONG WINAPI ClOleCommandTarget_Release(IOleCommandTarget *iface) +{ + WebBrowser *This = OLECMD_THIS(iface); + return IWebBrowser2_Release(WEBBROWSER(This)); +} + +static HRESULT WINAPI ClOleCommandTarget_QueryStatus(IOleCommandTarget *iface, + const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[], OLECMDTEXT *pCmdText) +{ + WebBrowser *This = OLECMD_THIS(iface); + FIXME("(%p)->(%s %lu %p %p)\n", This, debugstr_guid(pguidCmdGroup), cCmds, prgCmds, + pCmdText); + return E_NOTIMPL; +} + +static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface, + const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, + VARIANT *pvaOut) +{ + WebBrowser *This = OLECMD_THIS(iface); + FIXME("(%p)->(%s %ld %ld %p %p)\n", This, debugstr_guid(pguidCmdGroup), nCmdID, + nCmdexecopt, pvaIn, pvaOut); + return E_NOTIMPL; +} + +#undef OLECMD_THIS + +static const IOleCommandTargetVtbl OleCommandTargetVtbl = { + ClOleCommandTarget_QueryInterface, + ClOleCommandTarget_AddRef, + ClOleCommandTarget_Release, + ClOleCommandTarget_QueryStatus, + ClOleCommandTarget_Exec +}; + #define DOCHOSTUI_THIS(iface) DEFINE_THIS(WebBrowser, DocHostUIHandler, iface) static HRESULT WINAPI DocHostUIHandler_QueryInterface(IDocHostUIHandler2 *iface, @@ -419,7 +469,8 @@ static const IDocHostUIHandler2Vtbl DocH void WebBrowser_DocHost_Init(WebBrowser *This) { - This->lpDocHostUIHandlerVtbl = &DocHostUIHandler2Vtbl; + This->lpDocHostUIHandlerVtbl = &DocHostUIHandler2Vtbl; + This->lpClOleCommandTargetVtbl = &OleCommandTargetVtbl; This->hostui = NULL; diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 1aa8480..9b777fc 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -83,6 +83,7 @@ typedef struct { const IOleInPlaceSiteVtbl *lpOleInPlaceSiteVtbl; const IDocHostUIHandler2Vtbl *lpDocHostUIHandlerVtbl; const IOleDocumentSiteVtbl *lpOleDocumentSiteVtbl; + const IOleCommandTargetVtbl *lpClOleCommandTargetVtbl; /* Interfaces of InPlaceFrame object */ @@ -138,6 +139,7 @@ typedef struct { #define DOCHOSTUI(x) ((IDocHostUIHandler*) &(x)->lpDocHostUIHandlerVtbl) #define DOCHOSTUI2(x) ((IDocHostUIHandler2*) &(x)->lpDocHostUIHandlerVtbl) #define DOCSITE(x) ((IOleDocumentSite*) &(x)->lpOleDocumentSiteVtbl) +#define CLOLECMD(x) ((IOleCommandTarget*) &(x)->lpClOleCommandTargetVtbl) #define INPLACEFRAME(x) ((IOleInPlaceFrame*) &(x)->lpOleInPlaceFrameVtbl)

1 0

Phil Krylov : riched20: EM_STREAMIN should send a EN_UPDATE notification.
by Alexandre Julliard 26 Jan '06

26 Jan '06

Module: wine Branch: refs/heads/master Commit: ecbccb97636a2d0094974d23d377faa838f63b73 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ecbccb97636a2d0094974d2… Author: Phil Krylov <phil(a)newstar.rinet.ru> Date: Thu Jan 26 13:28:35 2006 +0100 riched20: EM_STREAMIN should send a EN_UPDATE notification. --- dlls/riched20/editor.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index abcc9a8..01a55c1 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -299,7 +299,7 @@ static LRESULT ME_StreamInText(ME_TextEd stream->dwSize = 0; } while(1); ME_CommitUndo(editor); - ME_Repaint(editor); + ME_UpdateRepaint(editor); return 0; } @@ -605,10 +605,6 @@ static LRESULT ME_StreamIn(ME_TextEditor /* put the cursor at the top */ if (!(format & SFF_SELECTION)) SendMessageA(editor->hWnd, EM_SETSEL, 0, 0); - else - { - /* FIXME where to put cursor now ? */ - } } editor->nUndoMode = nUndoMode;

1 0

Phil Krylov : riched20: Selection painting fixes.
by Alexandre Julliard 26 Jan '06

26 Jan '06

Module: wine Branch: refs/heads/master Commit: bb9631b1963914e236fbb57251e8f6782521c782 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bb9631b1963914e236fbb57… Author: Phil Krylov <phil(a)newstar.rinet.ru> Date: Thu Jan 26 13:27:28 2006 +0100 riched20: Selection painting fixes. --- dlls/riched20/caret.c | 5 +++-- dlls/riched20/editor.c | 8 ++++---- dlls/riched20/paint.c | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 1bb9457..df99987 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -759,8 +759,8 @@ void ME_MouseMove(ME_TextEditor *editor, return; HideCaret(editor->hWnd); + ME_InvalidateSelection(editor); ME_MoveCaret(editor); - ME_Repaint(editor); ShowCaret(editor->hWnd); ME_SendSelChange(editor); } @@ -1185,7 +1185,8 @@ ME_ArrowKey(ME_TextEditor *editor, int n editor->pCursors[1] = tmp_curs; *p = tmp_curs; - ME_InvalidateSelection(editor); + if (ME_IsSelection(editor)) + ME_InvalidateSelection(editor); HideCaret(editor->hWnd); ME_EnsureVisible(editor, tmp_curs.pRun); ME_ShowCaret(editor); diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 2bd3982..abcc9a8 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1278,8 +1278,9 @@ LRESULT WINAPI RichEditANSIWndProc(HWND return 0; case EM_SETSEL: { + ME_InvalidateSelection(editor); ME_SetSelection(editor, wParam, lParam); - ME_Repaint(editor); + ME_InvalidateSelection(editor); ME_SendSelChange(editor); return 0; } @@ -1287,9 +1288,9 @@ LRESULT WINAPI RichEditANSIWndProc(HWND { CHARRANGE *pRange = (CHARRANGE *)lParam; TRACE("EM_EXSETSEL (%ld,%ld)\n", pRange->cpMin, pRange->cpMax); + ME_InvalidateSelection(editor); ME_SetSelection(editor, pRange->cpMin, pRange->cpMax); - /* FIXME optimize */ - ME_Repaint(editor); + ME_InvalidateSelection(editor); ME_SendSelChange(editor); return 0; } @@ -1365,7 +1366,6 @@ LRESULT WINAPI RichEditANSIWndProc(HWND else nStyle &= ~ES_READONLY; SetWindowLongW(hWnd, GWL_STYLE, nStyle); - ME_Repaint(editor); return 0; } case EM_SETEVENTMASK: diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 0995482..b9745e2 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -143,13 +143,13 @@ void ME_Repaint(ME_TextEditor *editor) { ME_Cursor *pCursor = &editor->pCursors[0]; - ME_MarkSelectionForRepaint(editor); if (ME_WrapMarkedParagraphs(editor)) { ME_UpdateScrollBar(editor); } if (editor->bRedraw) { ME_EnsureVisible(editor, pCursor->pRun); + UpdateWindow(editor->hWnd); } }

1 0

Hans Leidekker : ntdll: Add implementation of tape IOCTLs.
by Alexandre Julliard 26 Jan '06

26 Jan '06

Module: wine Branch: refs/heads/master Commit: 0844b702b4c42f0a73320ff2c357fedf84d1f8f4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0844b702b4c42f0a73320ff… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Thu Jan 26 13:23:08 2006 +0100 ntdll: Add implementation of tape IOCTLs. --- configure | 2 configure.ac | 1 dlls/ntdll/Makefile.in | 1 dlls/ntdll/file.c | 7 + dlls/ntdll/ntdll_misc.h | 7 + dlls/ntdll/tape.c | 523 +++++++++++++++++++++++++++++++++++++++++++++++ include/config.h.in | 3 7 files changed, 544 insertions(+), 0 deletions(-) create mode 100644 dlls/ntdll/tape.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=0844b702b4c42f0a733…

1 0

Hans Leidekker : include: Add some defines related to tape support.
by Alexandre Julliard 26 Jan '06

26 Jan '06

Module: wine Branch: refs/heads/master Commit: 69c5f62da8381afb469074a5933cfe705efcb64e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=69c5f62da8381afb469074a… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Thu Jan 26 13:22:24 2006 +0100 include: Add some defines related to tape support. --- include/Makefile.in | 1 include/ddk/ntddtape.h | 50 ++++++++++++++++++++++++ include/winbase.h | 5 ++ include/winnt.h | 98 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 154 insertions(+), 0 deletions(-) create mode 100644 include/ddk/ntddtape.h diff --git a/include/Makefile.in b/include/Makefile.in index 6bda65a..8d6d6cf 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -92,6 +92,7 @@ WINDOWS_INCLUDES = \ ddeml.h \ ddk/cfgmgr32.h \ ddk/ntddser.h \ + ddk/ntddtape.h \ ddk/wdm.h \ ddk/winsplp.h \ ddraw.h \ diff --git a/include/ddk/ntddtape.h b/include/ddk/ntddtape.h new file mode 100644 index 0000000..494ca38 --- /dev/null +++ b/include/ddk/ntddtape.h @@ -0,0 +1,50 @@ +/* + * DDK definitions for tape access + * + * Copyright (C) 2006 Hans Leidekker + * Based on the w32api version by Casper S. Hornstrup. + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _NTDDTAPE_H_ +#define _NTDDTAPE_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#define IOCTL_TAPE_BASE FILE_DEVICE_TAPE + +#define IOCTL_TAPE_CHECK_VERIFY CTL_CODE(IOCTL_TAPE_BASE, 0x0200, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_TAPE_CREATE_PARTITION CTL_CODE(IOCTL_TAPE_BASE, 0x000a, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_TAPE_ERASE CTL_CODE(IOCTL_TAPE_BASE, 0x0000, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_TAPE_FIND_NEW_DEVICES CTL_CODE(IOCTL_DISK_BASE, 0x0206, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_TAPE_GET_DRIVE_PARAMS CTL_CODE(IOCTL_TAPE_BASE, 0x0005, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_TAPE_GET_MEDIA_PARAMS CTL_CODE(IOCTL_TAPE_BASE, 0x0007, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_TAPE_GET_POSITION CTL_CODE(IOCTL_TAPE_BASE, 0x0003, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_TAPE_GET_STATUS CTL_CODE(IOCTL_TAPE_BASE, 0x0009, METHOD_BUFFERED, FILE_READ_ACCESS ) + +#define IOCTL_TAPE_PREPARE CTL_CODE(IOCTL_TAPE_BASE, 0x0001, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_TAPE_SET_DRIVE_PARAMS CTL_CODE(IOCTL_TAPE_BASE, 0x0006, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_TAPE_SET_MEDIA_PARAMS CTL_CODE(IOCTL_TAPE_BASE, 0x0008, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_TAPE_SET_POSITION CTL_CODE(IOCTL_TAPE_BASE, 0x0004, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_TAPE_WRITE_MARKS CTL_CODE(IOCTL_TAPE_BASE, 0x0002, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) + +#ifdef __cplusplus +} +#endif + +#endif /* _NTDDTAPE_H_ */ diff --git a/include/winbase.h b/include/winbase.h index 650cf96..9a86490 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1091,6 +1091,11 @@ typedef struct tagCOMMTIMEOUTS { DWORD WriteTotalTimeoutConstant; } COMMTIMEOUTS,*LPCOMMTIMEOUTS; +#define GET_TAPE_MEDIA_INFORMATION 0 +#define GET_TAPE_DRIVE_INFORMATION 1 +#define SET_TAPE_MEDIA_INFORMATION 0 +#define SET_TAPE_DRIVE_INFORMATION 1 + typedef void (CALLBACK *PAPCFUNC)(ULONG_PTR); typedef void (CALLBACK *PTIMERAPCROUTINE)(LPVOID,DWORD,DWORD); diff --git a/include/winnt.h b/include/winnt.h index f55203d..428a682 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3858,6 +3858,104 @@ typedef struct _FILE_NOTIFY_INFORMATION WCHAR FileName[1]; } FILE_NOTIFY_INFORMATION, *PFILE_NOTIFY_INFORMATION; +/* ----------------------------- begin tape storage --------------------- */ + +#define TAPE_FIXED_PARTITIONS 0 +#define TAPE_SELECT_PARTITIONS 1 +#define TAPE_INITIATOR_PARTITIONS 2 +#define TAPE_ERASE_SHORT 0 +#define TAPE_ERASE_LONG 1 +#define TAPE_LOAD 0 +#define TAPE_UNLOAD 1 +#define TAPE_TENSION 2 +#define TAPE_LOCK 3 +#define TAPE_UNLOCK 4 +#define TAPE_FORMAT 5 +#define TAPE_SETMARKS 0 +#define TAPE_FILEMARKS 1 +#define TAPE_SHORT_FILEMARKS 2 +#define TAPE_LONG_FILEMARKS 3 +#define TAPE_REWIND 0 +#define TAPE_ABSOLUTE_BLOCK 1 +#define TAPE_LOGICAL_BLOCK 2 +#define TAPE_PSEUDO_LOGICAL_BLOCK 3 +#define TAPE_SPACE_END_OF_DATA 4 +#define TAPE_SPACE_RELATIVE_BLOCKS 5 +#define TAPE_SPACE_FILEMARKS 6 +#define TAPE_SPACE_SEQUENTIAL_FMKS 7 +#define TAPE_SPACE_SETMARKS 8 +#define TAPE_SPACE_SEQUENTIAL_SMKS 9 + +typedef struct _TAPE_CREATE_PARTITION { + DWORD Method; + DWORD Count; + DWORD Size; +} TAPE_CREATE_PARTITION, *PTAPE_CREATE_PARTITION; + +typedef struct _TAPE_ERASE { + DWORD Type; + BOOLEAN Immediate; +} TAPE_ERASE, *PTAPE_ERASE; + +typedef struct _TAPE_PREPARE { + DWORD Operation; + BOOLEAN Immediate; +} TAPE_PREPARE, *PTAPE_PREPARE; + +typedef struct _TAPE_SET_DRIVE_PARAMETERS { + BOOLEAN ECC; + BOOLEAN Compression; + BOOLEAN DataPadding; + BOOLEAN ReportSetmarks; + ULONG EOTWarningZoneSize; +} TAPE_SET_DRIVE_PARAMETERS, *PTAPE_SET_DRIVE_PARAMETERS; + +typedef struct _TAPE_SET_MEDIA_PARAMETERS { + ULONG BlockSize; +} TAPE_SET_MEDIA_PARAMETERS, *PTAPE_SET_MEDIA_PARAMETERS; + +typedef struct _TAPE_WRITE_MARKS { + DWORD Type; + DWORD Count; + BOOLEAN Immediate; +} TAPE_WRITE_MARKS, *PTAPE_WRITE_MARKS; + +typedef struct _TAPE_GET_POSITION { + ULONG Type; + ULONG Partition; + ULONG OffsetLow; + ULONG OffsetHigh; +} TAPE_GET_POSITION, *PTAPE_GET_POSITION; + +typedef struct _TAPE_SET_POSITION { + ULONG Method; + ULONG Partition; + LARGE_INTEGER Offset; + BOOLEAN Immediate; +} TAPE_SET_POSITION, *PTAPE_SET_POSITION; + +typedef struct _TAPE_GET_DRIVE_PARAMETERS { + BOOLEAN ECC; + BOOLEAN Compression; + BOOLEAN DataPadding; + BOOLEAN ReportSetmarks; + DWORD DefaultBlockSize; + DWORD MaximumBlockSize; + DWORD MinimumBlockSize; + DWORD MaximumPartitionCount; + DWORD FeaturesLow; + DWORD FeaturesHigh; + DWORD EOTWarningZoneSize; +} TAPE_GET_DRIVE_PARAMETERS, *PTAPE_GET_DRIVE_PARAMETERS; + +typedef struct _TAPE_GET_MEDIA_PARAMETERS { + LARGE_INTEGER Capacity; + LARGE_INTEGER Remaining; + DWORD BlockSize; + DWORD PartitionCount; + BOOLEAN WriteProtected; +} TAPE_GET_MEDIA_PARAMETERS, *PTAPE_GET_MEDIA_PARAMETERS; + /* ----------------------------- begin registry ----------------------------- */ /* Registry security values */

1 0