April 2008 - Wine-Commits - list.winehq.org

Dan Hipschman : qedit: Add a stub for IMediaDet_get_StreamLength.
by Alexandre Julliard April 10, 2008

April 10, 2008

Module: wine Branch: master Commit: dfbb2fc9e0ded9b06147f653de7e878cef3657dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfbb2fc9e0ded9b06147f653d… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed Apr 9 16:02:40 2008 -0700 qedit: Add a stub for IMediaDet_get_StreamLength. To get this working by querying the filters for IMediaSeeking and calling GetDuration, we need a little better support from quartz. For now a stub is better than nothing. --- dlls/qedit/mediadet.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index 0dab032..2cf37f9 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -252,8 +252,8 @@ static HRESULT WINAPI MediaDet_get_StreamTypeB(IMediaDet* iface, BSTR *pVal) static HRESULT WINAPI MediaDet_get_StreamLength(IMediaDet* iface, double *pVal) { MediaDetImpl *This = (MediaDetImpl *)iface; - FIXME("(%p)->(%p): not implemented!\n", This, pVal); - return E_NOTIMPL; + FIXME("(%p): stub!\n", This); + return VFW_E_INVALIDMEDIATYPE; } static HRESULT WINAPI MediaDet_get_Filename(IMediaDet* iface, BSTR *pVal)

1 0

Lei Zhang : user32: Handle VK_TAB in EDIT_WM_KeyDown.
by Alexandre Julliard April 10, 2008

April 10, 2008

Module: wine Branch: master Commit: 95f323ed4666b5194816c707abc425fcf5745f6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=95f323ed4666b5194816c707a… Author: Lei Zhang <thestig(a)google.com> Date: Wed Apr 9 19:10:38 2008 -0700 user32: Handle VK_TAB in EDIT_WM_KeyDown. --- dlls/user32/dialog.c | 2 +- dlls/user32/edit.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 243bb5a..a9867c6 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -1094,7 +1094,7 @@ BOOL WINAPI IsDialogMessageW( HWND hwndDlg, LPMSG msg ) { case WM_KEYDOWN: dlgCode = SendMessageW( msg->hwnd, WM_GETDLGCODE, msg->wParam, (LPARAM)msg ); - if (dlgCode & (DLGC_WANTCHARS|DLGC_WANTMESSAGE)) break; + if (dlgCode & (DLGC_WANTMESSAGE)) break; switch(msg->wParam) { diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 85de02e..b2bfe1c 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -814,9 +814,6 @@ static LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg, case VK_ESCAPE: SendMessageW(GetParent(hwnd), WM_CLOSE, 0, 0); break; - case VK_TAB: - SendMessageW(GetParent(hwnd), WM_NEXTDLGCTL, (GetKeyState(VK_SHIFT) & 0x8000), 0); - break; default: break; } @@ -4639,6 +4636,9 @@ static LRESULT EDIT_WM_KeyDown(EDITSTATE *es, INT key) if (!(es->style & ES_MULTILINE)) SendMessageW(GetParent(es->hwndSelf), WM_COMMAND, IDCANCEL, (LPARAM)GetDlgItem( GetParent(es->hwndSelf), IDCANCEL ) ); break; + case VK_TAB: + SendMessageW(es->hwndParent, WM_NEXTDLGCTL, shift, 0); + break; } return 0; }

1 0

Dan Hipschman : qedit: Implement IMediaDet_get_FrameRate.
by Alexandre Julliard April 10, 2008

April 10, 2008

Module: wine Branch: master Commit: 953600255210c563e938b3b83277aab058613a7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=953600255210c563e938b3b83… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed Apr 9 16:02:02 2008 -0700 qedit: Implement IMediaDet_get_FrameRate. --- dlls/qedit/mediadet.c | 26 +++++++++++++++- dlls/qedit/tests/mediadet.c | 68 +++++++++++++++++++++++------------------- 2 files changed, 61 insertions(+), 33 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index 16b2a85..0dab032 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -524,8 +524,30 @@ static HRESULT WINAPI MediaDet_GetSampleGrabber(IMediaDet* iface, static HRESULT WINAPI MediaDet_get_FrameRate(IMediaDet* iface, double *pVal) { MediaDetImpl *This = (MediaDetImpl *)iface; - FIXME("(%p)->(%p): not implemented!\n", This, pVal); - return E_NOTIMPL; + AM_MEDIA_TYPE mt; + VIDEOINFOHEADER *vh; + HRESULT hr; + + TRACE("(%p)\n", This); + + if (!pVal) + return E_POINTER; + + hr = MediaDet_get_StreamMediaType(iface, &mt); + if (FAILED(hr)) + return hr; + + if (!IsEqualGUID(&mt.majortype, &MEDIATYPE_Video)) + { + CoTaskMemFree(mt.pbFormat); + return VFW_E_INVALIDMEDIATYPE; + } + + vh = (VIDEOINFOHEADER *) mt.pbFormat; + *pVal = 1.0e7 / (double) vh->AvgTimePerFrame; + + CoTaskMemFree(mt.pbFormat); + return S_OK; } static HRESULT WINAPI MediaDet_EnterBitmapGrabMode(IMediaDet* iface, diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index c97ccc2..235133c 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -23,6 +23,7 @@ #define COBJMACROS #include "ole2.h" +#include "vfwmsgs.h" #include "uuids.h" #include "wine/test.h" #include "qedit.h" @@ -95,7 +96,9 @@ static void test_mediadet(void) long nstrms = 0; long strm; AM_MEDIA_TYPE mt; + double fps; int flags; + int i; /* test.avi has one video stream. */ hr = CoCreateInstance(&CLSID_MediaDet, NULL, CLSCTX_INPROC_SERVER, @@ -211,6 +214,13 @@ static void test_mediadet(void) "IMediaDet_get_StreamMediaType\n"); CoTaskMemFree(mt.pbFormat); + hr = IMediaDet_get_FrameRate(pM, NULL); + ok(hr == E_POINTER, "IMediaDet_get_FrameRate\n"); + + hr = IMediaDet_get_FrameRate(pM, &fps); + ok(hr == S_OK, "IMediaDet_get_FrameRate\n"); + ok(fps == 10.0, "IMediaDet_get_FrameRate\n"); + hr = IMediaDet_Release(pM); ok(hr == 0, "IMediaDet_Release returned: %x\n", hr); @@ -242,37 +252,33 @@ static void test_mediadet(void) for both an audio and video stream. */ flags = 0; - hr = IMediaDet_put_CurrentStream(pM, 0); - ok(hr == S_OK, "IMediaDet_put_CurrentStream\n"); - - ZeroMemory(&mt, sizeof mt); - hr = IMediaDet_get_StreamMediaType(pM, &mt); - ok(hr == S_OK, "IMediaDet_get_StreamMediaType\n"); - flags += (IsEqualGUID(&mt.majortype, &MEDIATYPE_Video) - ? 1 - : (IsEqualGUID(&mt.majortype, &MEDIATYPE_Audio) - ? 2 - : 0)); - CoTaskMemFree(mt.pbFormat); - - hr = IMediaDet_put_CurrentStream(pM, 1); - ok(hr == S_OK, "IMediaDet_put_CurrentStream\n"); - - strm = -1; - hr = IMediaDet_get_CurrentStream(pM, &strm); - ok(hr == S_OK, "IMediaDet_get_CurrentStream\n"); - ok(strm == 1, "IMediaDet_get_CurrentStream\n"); - - ZeroMemory(&mt, sizeof mt); - hr = IMediaDet_get_StreamMediaType(pM, &mt); - ok(hr == S_OK, "IMediaDet_get_StreamMediaType\n"); - flags += (IsEqualGUID(&mt.majortype, &MEDIATYPE_Video) - ? 1 - : (IsEqualGUID(&mt.majortype, &MEDIATYPE_Audio) - ? 2 - : 0)); - CoTaskMemFree(mt.pbFormat); - + for (i = 0; i < 2; ++i) + { + hr = IMediaDet_put_CurrentStream(pM, i); + ok(hr == S_OK, "IMediaDet_put_CurrentStream\n"); + + strm = -1; + hr = IMediaDet_get_CurrentStream(pM, &strm); + ok(hr == S_OK, "IMediaDet_get_CurrentStream\n"); + ok(strm == i, "IMediaDet_get_CurrentStream\n"); + + ZeroMemory(&mt, sizeof mt); + hr = IMediaDet_get_StreamMediaType(pM, &mt); + ok(hr == S_OK, "IMediaDet_get_StreamMediaType\n"); + flags += (IsEqualGUID(&mt.majortype, &MEDIATYPE_Video) + ? 1 + : (IsEqualGUID(&mt.majortype, &MEDIATYPE_Audio) + ? 2 + : 0)); + + if (IsEqualGUID(&mt.majortype, &MEDIATYPE_Audio)) + { + hr = IMediaDet_get_FrameRate(pM, &fps); + ok(hr == VFW_E_INVALIDMEDIATYPE, "IMediaDet_get_FrameRate\n"); + } + + CoTaskMemFree(mt.pbFormat); + } ok(flags == 3, "IMediaDet_get_StreamMediaType\n"); hr = IMediaDet_put_CurrentStream(pM, 2);

1 0

Piotr Caban : oleview: Added returns as arguments in interfaces with oleautomation flag.
by Alexandre Julliard April 10, 2008

April 10, 2008

Module: wine Branch: master Commit: 38994a42f4fc864f927346485eaa4df9d072385a URL: http://source.winehq.org/git/wine.git/?a=commit;h=38994a42f4fc864f927346485… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Apr 9 23:38:13 2008 +0200 oleview: Added returns as arguments in interfaces with oleautomation flag. --- programs/oleview/typelib.c | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 4c58c4e..217ce7d 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -522,16 +522,6 @@ static int EnumFuncs(ITypeInfo *pTypeInfo, TYPEATTR *pTypeAttr, HTREEITEM hParen if(FAILED(ITypeInfo_GetDocumentation(pTypeInfo, pFuncDesc->memid, &bstrName, &bstrHelpString, NULL, NULL))) continue; - bstrParamNames = HeapAlloc(GetProcessHeap(), 0, - sizeof(BSTR*)*(pFuncDesc->cParams+1)); - if(FAILED(ITypeInfo_GetNames(pTypeInfo, pFuncDesc->memid, bstrParamNames, - pFuncDesc->cParams+1, &namesNo))) - { - HeapFree(GetProcessHeap(), 0, bstrParamNames); - continue; - } - SysFreeString(bstrParamNames[0]); - memset(wszText, 0, sizeof(wszText)); memset(wszAfter, 0, sizeof(wszAfter)); tld = InitializeTLData(); @@ -605,12 +595,25 @@ static int EnumFuncs(ITypeInfo *pTypeInfo, TYPEATTR *pTypeAttr, HTREEITEM hParen AddToTLDataStrW(tld, wszNewLine); } - if(pTypeAttr->wTypeFlags & TYPEFLAG_FOLEAUTOMATION) + if(pTypeAttr->wTypeFlags & TYPEFLAG_FOLEAUTOMATION) { AddToTLDataStrW(tld, wszVT_HRESULT); + if(strcmpW(wszText, wszVT_VOID)) pFuncDesc->cParams++; + } else { AddToTLDataStrW(tld, wszText); AddToTLDataStrW(tld, wszAfter); } + + bstrParamNames = HeapAlloc(GetProcessHeap(), 0, + sizeof(BSTR*)*(pFuncDesc->cParams+1)); + if(FAILED(ITypeInfo_GetNames(pTypeInfo, pFuncDesc->memid, bstrParamNames, + pFuncDesc->cParams+1, &namesNo))) + { + HeapFree(GetProcessHeap(), 0, bstrParamNames); + continue; + } + SysFreeString(bstrParamNames[0]); + AddToTLDataStrW(tld, wszSpace); if(pFuncDesc->memid >= MIN_FUNC_ID) {

1 0

Piotr Caban : oleview: Hide functions without id property in dual interfaces.
by Alexandre Julliard April 10, 2008

April 10, 2008

Module: wine Branch: master Commit: dc0d29c70843da710ccd448c19a9802345e41794 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc0d29c70843da710ccd448c1… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Apr 9 21:25:57 2008 +0200 oleview: Hide functions without id property in dual interfaces. --- programs/oleview/typelib.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 0759b21..4c58c4e 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -517,6 +517,8 @@ static int EnumFuncs(ITypeInfo *pTypeInfo, TYPEATTR *pTypeAttr, HTREEITEM hParen TYPELIB_DATA *tld; if(FAILED(ITypeInfo_GetFuncDesc(pTypeInfo, i, &pFuncDesc))) continue; + if(pTypeAttr->wTypeFlags & TYPEFLAG_FDUAL && pFuncDesc->memid >= MIN_FUNC_ID) continue; + if(FAILED(ITypeInfo_GetDocumentation(pTypeInfo, pFuncDesc->memid, &bstrName, &bstrHelpString, NULL, NULL))) continue;

1 0

Dan Hipschman : qedit: Implement IMediaDet_get_StreamMediaType.
by Alexandre Julliard April 10, 2008

April 10, 2008

Module: wine Branch: master Commit: 3b0d68e4093622cdf7a943cc5e3825e81176be31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b0d68e4093622cdf7a943cc5… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed Apr 9 16:01:30 2008 -0700 qedit: Implement IMediaDet_get_StreamMediaType. --- dlls/qedit/mediadet.c | 88 +++++++++++++++++++++++++++++++++++++++++-- dlls/qedit/tests/mediadet.c | 26 ++++++++++--- 2 files changed, 104 insertions(+), 10 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index abccca9..16b2a85 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -1,6 +1,6 @@ /* DirectShow Media Detector object (QEDIT.DLL) * - * Copyright 2008 Google (Lei Zhang) + * Copyright 2008 Google (Lei Zhang, Dan Hipschman) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> #include <stdarg.h> #define COBJMACROS @@ -39,10 +40,13 @@ typedef struct MediaDetImpl { IBaseFilter *splitter; long num_streams; long cur_stream; + IPin *cur_pin; } MediaDetImpl; static void MD_cleanup(MediaDetImpl *This) { + if (This->cur_pin) IPin_Release(This->cur_pin); + This->cur_pin = NULL; if (This->source) IBaseFilter_Release(This->source); This->source = NULL; if (This->splitter) IBaseFilter_Release(This->splitter); @@ -164,6 +168,47 @@ static HRESULT WINAPI MediaDet_get_CurrentStream(IMediaDet* iface, long *pVal) return S_OK; } +static HRESULT SetCurPin(MediaDetImpl *This, long strm) +{ + IEnumPins *pins; + IPin *pin; + HRESULT hr; + + assert(This->splitter); + assert(0 <= strm && strm < This->num_streams); + + if (This->cur_pin) + { + IPin_Release(This->cur_pin); + This->cur_pin = NULL; + } + + hr = IBaseFilter_EnumPins(This->splitter, &pins); + if (FAILED(hr)) + return hr; + + while (IEnumPins_Next(pins, 1, &pin, NULL) == S_OK && !This->cur_pin) + { + PIN_DIRECTION dir; + hr = IPin_QueryDirection(pin, &dir); + if (FAILED(hr)) + { + IPin_Release(pin); + IEnumPins_Release(pins); + return hr; + } + + if (dir == PINDIR_OUTPUT && strm-- == 0) + This->cur_pin = pin; + else + IPin_Release(pin); + } + IEnumPins_Release(pins); + + assert(This->cur_pin); + return S_OK; +} + static HRESULT WINAPI MediaDet_put_CurrentStream(IMediaDet* iface, long newVal) { MediaDetImpl *This = (MediaDetImpl *)iface; @@ -182,6 +227,10 @@ static HRESULT WINAPI MediaDet_put_CurrentStream(IMediaDet* iface, long newVal) if (newVal < 0 || This->num_streams <= newVal) return E_INVALIDARG; + hr = SetCurPin(This, newVal); + if (FAILED(hr)) + return hr; + This->cur_stream = newVal; return S_OK; } @@ -403,7 +452,11 @@ static HRESULT WINAPI MediaDet_put_Filename(IMediaDet* iface, BSTR newVal) This->graph = gb; This->source = bf; - return GetSplitter(This); + hr = GetSplitter(This); + if (FAILED(hr)) + return hr; + + return MediaDet_put_CurrentStream(iface, 0); } static HRESULT WINAPI MediaDet_GetBitmapBits(IMediaDet* iface, @@ -430,8 +483,34 @@ static HRESULT WINAPI MediaDet_get_StreamMediaType(IMediaDet* iface, AM_MEDIA_TYPE *pVal) { MediaDetImpl *This = (MediaDetImpl *)iface; - FIXME("(%p)->(%p): not implemented!\n", This, pVal); - return E_NOTIMPL; + IEnumMediaTypes *types; + AM_MEDIA_TYPE *pmt; + HRESULT hr; + + TRACE("(%p)\n", This); + + if (!pVal) + return E_POINTER; + + if (!This->cur_pin) + return E_INVALIDARG; + + hr = IPin_EnumMediaTypes(This->cur_pin, &types); + if (SUCCEEDED(hr)) + { + hr = (IEnumMediaTypes_Next(types, 1, &pmt, NULL) == S_OK + ? S_OK + : E_NOINTERFACE); + IEnumMediaTypes_Release(types); + } + + if (SUCCEEDED(hr)) + { + *pVal = *pmt; + CoTaskMemFree(pmt); + } + + return hr; } static HRESULT WINAPI MediaDet_GetSampleGrabber(IMediaDet* iface, @@ -500,6 +579,7 @@ HRESULT MediaDet_create(IUnknown * pUnkOuter, LPVOID * ppv) { obj->graph = NULL; obj->source = NULL; obj->splitter = NULL; + obj->cur_pin = NULL; obj->num_streams = -1; obj->cur_stream = 0; *ppv = obj; diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index 422554d..c97ccc2 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -1,7 +1,7 @@ /* * Unit tests for Media Detector * - * Copyright (C) 2008 Google (Lei Zhang) + * Copyright (C) 2008 Google (Lei Zhang, Dan Hipschman) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -136,6 +136,12 @@ static void test_mediadet(void) hr = IMediaDet_put_CurrentStream(pM, -1); ok(hr == E_INVALIDARG, "IMediaDet_put_CurrentStream\n"); + hr = IMediaDet_get_StreamMediaType(pM, &mt); + ok(hr == E_INVALIDARG, "IMediaDet_get_StreamMediaType\n"); + + hr = IMediaDet_get_StreamMediaType(pM, NULL); + ok(hr == E_POINTER, "IMediaDet_get_StreamMediaType\n"); + filename = SysAllocString(test_avi_filename); hr = IMediaDet_put_Filename(pM, filename); ok(hr == S_OK, "IMediaDet_put_Filename -> %x\n", hr); @@ -147,6 +153,11 @@ static void test_mediadet(void) ok(hr == S_OK, "IMediaDet_get_CurrentStream\n"); ok(strm == 0, "IMediaDet_get_CurrentStream\n"); + ZeroMemory(&mt, sizeof mt); + hr = IMediaDet_get_StreamMediaType(pM, &mt); + ok(hr == S_OK, "IMediaDet_get_StreamMediaType\n"); + CoTaskMemFree(mt.pbFormat); + /* Even before get_OutputStreams. */ hr = IMediaDet_put_CurrentStream(pM, 1); ok(hr == E_INVALIDARG, "IMediaDet_put_CurrentStream\n"); @@ -195,9 +206,10 @@ static void test_mediadet(void) ZeroMemory(&mt, sizeof mt); hr = IMediaDet_get_StreamMediaType(pM, &mt); - todo_wine ok(hr == S_OK, "IMediaDet_get_StreamMediaType\n"); - todo_wine ok(IsEqualGUID(&mt.majortype, &MEDIATYPE_Video), + ok(hr == S_OK, "IMediaDet_get_StreamMediaType\n"); + ok(IsEqualGUID(&mt.majortype, &MEDIATYPE_Video), "IMediaDet_get_StreamMediaType\n"); + CoTaskMemFree(mt.pbFormat); hr = IMediaDet_Release(pM); ok(hr == 0, "IMediaDet_Release returned: %x\n", hr); @@ -235,12 +247,13 @@ static void test_mediadet(void) ZeroMemory(&mt, sizeof mt); hr = IMediaDet_get_StreamMediaType(pM, &mt); - todo_wine ok(hr == S_OK, "IMediaDet_get_StreamMediaType\n"); + ok(hr == S_OK, "IMediaDet_get_StreamMediaType\n"); flags += (IsEqualGUID(&mt.majortype, &MEDIATYPE_Video) ? 1 : (IsEqualGUID(&mt.majortype, &MEDIATYPE_Audio) ? 2 : 0)); + CoTaskMemFree(mt.pbFormat); hr = IMediaDet_put_CurrentStream(pM, 1); ok(hr == S_OK, "IMediaDet_put_CurrentStream\n"); @@ -252,14 +265,15 @@ static void test_mediadet(void) ZeroMemory(&mt, sizeof mt); hr = IMediaDet_get_StreamMediaType(pM, &mt); - todo_wine ok(hr == S_OK, "IMediaDet_get_StreamMediaType\n"); + ok(hr == S_OK, "IMediaDet_get_StreamMediaType\n"); flags += (IsEqualGUID(&mt.majortype, &MEDIATYPE_Video) ? 1 : (IsEqualGUID(&mt.majortype, &MEDIATYPE_Audio) ? 2 : 0)); + CoTaskMemFree(mt.pbFormat); - todo_wine ok(flags == 3, "IMediaDet_get_StreamMediaType\n"); + ok(flags == 3, "IMediaDet_get_StreamMediaType\n"); hr = IMediaDet_put_CurrentStream(pM, 2); ok(hr == E_INVALIDARG, "IMediaDet_put_CurrentStream\n");

1 0

Piotr Caban : oleview: Fixed idl files generation with dual interfaces.
by Alexandre Julliard April 10, 2008

April 10, 2008

Module: wine Branch: master Commit: 4e51c022240101d12a5b0379bef488296d98196b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e51c022240101d12a5b0379b… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Apr 9 21:25:36 2008 +0200 oleview: Fixed idl files generation with dual interfaces. --- programs/oleview/main.h | 1 + programs/oleview/typelib.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/programs/oleview/main.h b/programs/oleview/main.h index 90f184d..c196883 100644 --- a/programs/oleview/main.h +++ b/programs/oleview/main.h @@ -120,6 +120,7 @@ typedef struct WCHAR wszInsertAfter[MAX_LOAD_STRING]; INT idlLen; BOOL bPredefine; + BOOL bHide; }TYPELIB_DATA; extern GLOBALS globals; diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 46d5b4d..247f21b 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -758,8 +758,10 @@ static void AddIdlData(HTREEITEM hCur, TYPELIB_DATA *pTLData) { tvi.hItem = hCur; SendMessage(typelib.hTree, TVM_GETITEM, 0, (LPARAM)&tvi); - AddToTLDataStrW(pTLData, wszNewLine); - AddToTLDataStrWithTabsW(pTLData, ((TYPELIB_DATA*)(tvi.lParam))->idl); + if(!((TYPELIB_DATA*)(tvi.lParam))->bHide) { + AddToTLDataStrW(pTLData, wszNewLine); + AddToTLDataStrWithTabsW(pTLData, ((TYPELIB_DATA*)(tvi.lParam))->idl); + } hCur = TreeView_GetNextSibling(typelib.hTree, hCur); } } @@ -788,7 +790,8 @@ static void AddPredefinitions(HTREEITEM hFirst, TYPELIB_DATA *pTLData) { tvi.hItem = hCur; SendMessage(typelib.hTree, TVM_GETITEM, 0, (LPARAM)&tvi); - if(((TYPELIB_DATA*)(tvi.lParam))->bPredefine) + if(((TYPELIB_DATA*)(tvi.lParam))->bPredefine && + !((TYPELIB_DATA*)(tvi.lParam))->bHide) { AddToStrW(wszText, wszSemicolon); AddToTLDataStrWithTabsW(pTLData, wszText); @@ -1164,6 +1167,8 @@ static int PopulateTree(void) CreateInterfaceInfo(pTypeInfo, pTypeAttr->cImplTypes, bstrName, bstrData, ulHelpContext, pTypeAttr, tld); tld->bPredefine = TRUE; + if(pTypeAttr->wTypeFlags & TYPEFLAG_FDUAL) + tld->bHide = TRUE; AddToStrW(wszText, wszTKIND_DISPATCH); AddToStrW(wszText, bstrName);

1 0

Andrew Talbot : msdmo: Fix calculation of array size in bytes.
by Alexandre Julliard April 10, 2008

April 10, 2008

Module: wine Branch: master Commit: 6324670b312c93e3c14ba2caf186caf7bc519d90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6324670b312c93e3c14ba2caf… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Apr 9 23:07:51 2008 +0100 msdmo: Fix calculation of array size in bytes. --- dlls/msdmo/dmoreg.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index f6d71bd..22789d9 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -293,11 +293,11 @@ lend: */ HRESULT WINAPI DMOGetName(REFCLSID clsidDMO, WCHAR szName[]) { -#define NAME_SIZE 80 /* Size of szName[] */ WCHAR szguid[64]; HRESULT hres; HKEY hrkey = 0; HKEY hkey = 0; + static const INT max_name_len = 80; DWORD count; TRACE("%s\n", debugstr_guid(clsidDMO)); @@ -312,7 +312,7 @@ HRESULT WINAPI DMOGetName(REFCLSID clsidDMO, WCHAR szName[]) if (ERROR_SUCCESS != hres) goto lend; - count = NAME_SIZE; + count = max_name_len * sizeof(WCHAR); hres = RegQueryValueExW(hkey, NULL, NULL, NULL, (LPBYTE) szName, &count); @@ -324,7 +324,6 @@ lend: RegCloseKey(hkey); return hres; -#undef NAME_SIZE }

1 0

Piotr Caban : oleview: Added helpstring to functions.
by Alexandre Julliard April 10, 2008

April 10, 2008

Module: wine Branch: master Commit: d19f1673ae9ae8a89d0c7eb0a13124e95552ce30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d19f1673ae9ae8a89d0c7eb0a… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Apr 9 21:50:16 2008 +0200 oleview: Added helpstring to functions. --- programs/oleview/typelib.c | 32 +++++++++++++++++++++++--------- 1 files changed, 23 insertions(+), 9 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 355826b..46d5b4d 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -78,9 +78,10 @@ static const WCHAR wszVT_DATE[] = { 'D','A','T','E','\0' }; static const WCHAR wszVT_R8[] = { 'd','o','u','b','l','e','\0' }; static const WCHAR wszVT_SAFEARRAY[] = { 'S','A','F','E','A','R','R','A','Y','\0' }; -const WCHAR wszFormat[] = { '0','x','%','.','8','l','x','\0' }; +static const WCHAR wszFormat[] = { '0','x','%','.','8','l','x','\0' }; static const WCHAR wszStdCall[] = { '_','s','t','d','c','a','l','l','\0' }; static const WCHAR wszId[] = { 'i','d','\0' }; +static const WCHAR wszHelpstring[] = { 'h','e','l','p','s','t','r','i','n','g','\0' }; static const WCHAR wszPropPut[] = { 'p','r','o','p','p','u','t','\0' }; static const WCHAR wszPropGet[] = { 'p','r','o','p','g','e','t','\0' }; static const WCHAR wszPropPutRef[] = { 'p','r','o','p','p','u','t','r','e','f','\0' }; @@ -494,11 +495,11 @@ static int EnumEnums(ITypeInfo *pTypeInfo, int cVars, HTREEITEM hParent) static int EnumFuncs(ITypeInfo *pTypeInfo, int cFuncs, HTREEITEM hParent) { - int i, j, tabSize; + int i, j; unsigned namesNo; TVINSERTSTRUCT tvis; FUNCDESC *pFuncDesc; - BSTR bstrName, *bstrParamNames; + BSTR bstrName, bstrHelpString, *bstrParamNames; WCHAR wszText[MAX_LOAD_STRING]; WCHAR wszAfter[MAX_LOAD_STRING]; WCHAR szRhs[] = {'r','h','s',0}; /* Right-hand side of a propput */ @@ -514,7 +515,7 @@ static int EnumFuncs(ITypeInfo *pTypeInfo, int cFuncs, HTREEITEM hParent) if(FAILED(ITypeInfo_GetFuncDesc(pTypeInfo, i, &pFuncDesc))) continue; if(FAILED(ITypeInfo_GetDocumentation(pTypeInfo, pFuncDesc->memid, &bstrName, - NULL, NULL, NULL))) continue; + &bstrHelpString, NULL, NULL))) continue; bstrParamNames = HeapAlloc(GetProcessHeap(), 0, sizeof(BSTR*)*(pFuncDesc->cParams+1)); @@ -544,6 +545,20 @@ static int EnumFuncs(ITypeInfo *pTypeInfo, int cFuncs, HTREEITEM hParent) AddToTLDataStrW(tld, wszCloseBrackets2); memset(wszText, 0, sizeof(wszText)); } + if(SysStringLen(bstrHelpString)) { + if(bFirst) AddToTLDataStrW(tld, wszOpenBrackets1); + else { + AddToTLDataStrW(tld, wszComa); + AddToTLDataStrW(tld, wszSpace); + } + bFirst = FALSE; + AddToTLDataStrW(tld, wszHelpstring); + AddToTLDataStrW(tld, wszOpenBrackets2); + AddToTLDataStrW(tld, wszInvertedComa); + AddToTLDataStrW(tld, bstrHelpString); + AddToTLDataStrW(tld, wszInvertedComa); + AddToTLDataStrW(tld, wszCloseBrackets2); + } CreateTypeInfo(wszText, wszAfter, pFuncDesc->elemdescFunc.tdesc, pTypeInfo); switch(pFuncDesc->invkind) { @@ -584,6 +599,7 @@ static int EnumFuncs(ITypeInfo *pTypeInfo, int cFuncs, HTREEITEM hParent) AddToTLDataStrW(tld, wszCloseBrackets1); AddToTLDataStrW(tld, wszNewLine); } + AddToTLDataStrW(tld, wszText); AddToTLDataStrW(tld, wszAfter); AddToTLDataStrW(tld, wszSpace); @@ -592,7 +608,6 @@ static int EnumFuncs(ITypeInfo *pTypeInfo, int cFuncs, HTREEITEM hParent) AddToTLDataStrW(tld, wszStdCall); AddToTLDataStrW(tld, wszSpace); } - tabSize = tld->idlLen; AddToTLDataStrW(tld, bstrName); AddToTLDataStrW(tld, wszOpenBrackets2); @@ -602,7 +617,7 @@ static int EnumFuncs(ITypeInfo *pTypeInfo, int cFuncs, HTREEITEM hParent) if(pFuncDesc->cParams != 1) { AddToTLDataStrW(tld, wszNewLine); - AddSpaces(tld, tabSize); + AddSpaces(tld, 4); } bFirst = TRUE; #define ENUM_PARAM_FLAG(x)\ @@ -676,6 +691,7 @@ static int EnumFuncs(ITypeInfo *pTypeInfo, int cFuncs, HTREEITEM hParent) SendMessage(typelib.hTree, TVM_INSERTITEM, 0, (LPARAM)&tvis); HeapFree(GetProcessHeap(), 0, bstrParamNames); SysFreeString(bstrName); + SysFreeString(bstrHelpString); ITypeInfo_ReleaseFuncDesc(pTypeInfo, pFuncDesc); } @@ -795,7 +811,6 @@ static void CreateInterfaceInfo(ITypeInfo *pTypeInfo, int cImplTypes, WCHAR *wsz const WCHAR wszInterface[] = { 'i','n','t','e','r','f','a','c','e',' ','\0' }; const WCHAR wszDispinterface[] = { 'd','i','s','p','i','n','t','e','r','f','a','c','e',' ','\0' }; - const WCHAR wszHelpstring[] = { 'h','e','l','p','s','t','r','i','n','g','\0' }; const WCHAR wszHelpcontext[] = { 'h','e','l','p','c','o','n','t','e','x','t','\0' }; const WCHAR wszTYPEFLAG_FAPPOBJECT[] = { 'a','p','p','o','b','j','e','c','t','\0' }; const WCHAR wszTYPEFLAG_FCANCREATE[] = { 'c','a','n','c','r','e','a','t','e','\0' }; @@ -998,7 +1013,6 @@ static int PopulateTree(void) const WCHAR wszTKIND_UNION[] = { 't','y','p','e','d','e','f',' ','u','n','i','o','n',' ','\0' }; - const WCHAR wszHelpString[] = { 'h','e','l','p','s','t','r','i','n','g','\0' }; const WCHAR wszLibrary[] = { 'l','i','b','r','a','r','y',' ','\0' }; const WCHAR wszTag[] = { 't','a','g','\0' }; @@ -1050,7 +1064,7 @@ static int PopulateTree(void) AddToTLDataStrW(tld, wszComa); AddToTLDataStrW(tld, wszNewLine); AddSpaces(tld, 4); - AddToTLDataStrW(tld, wszHelpString); + AddToTLDataStrW(tld, wszHelpstring); AddToTLDataStrW(tld, wszOpenBrackets2); AddToTLDataStrW(tld, wszInvertedComa); AddToTLDataStrW(tld, bstrData);

1 0

Piotr Caban : oleview: Fixed idl files generation with oleautomation flag.
by Alexandre Julliard April 10, 2008

April 10, 2008

Module: wine Branch: master Commit: bd4437f18f716f54d876edd7c7bbba33c5cd92f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd4437f18f716f54d876edd7c… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Apr 9 21:25:49 2008 +0200 oleview: Fixed idl files generation with oleautomation flag. --- programs/oleview/typelib.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 247f21b..0759b21 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -493,9 +493,10 @@ static int EnumEnums(ITypeInfo *pTypeInfo, int cVars, HTREEITEM hParent) return 0; } -static int EnumFuncs(ITypeInfo *pTypeInfo, int cFuncs, HTREEITEM hParent) +static int EnumFuncs(ITypeInfo *pTypeInfo, TYPEATTR *pTypeAttr, HTREEITEM hParent) { int i, j; + int cFuncs; unsigned namesNo; TVINSERTSTRUCT tvis; FUNCDESC *pFuncDesc; @@ -509,6 +510,8 @@ static int EnumFuncs(ITypeInfo *pTypeInfo, int cFuncs, HTREEITEM hParent) tvis.hInsertAfter = (HTREEITEM)TVI_LAST; tvis.hParent = hParent; + cFuncs = pTypeAttr->cFuncs; + for(i=0; i<cFuncs; i++) { TYPELIB_DATA *tld; @@ -600,8 +603,12 @@ static int EnumFuncs(ITypeInfo *pTypeInfo, int cFuncs, HTREEITEM hParent) AddToTLDataStrW(tld, wszNewLine); } - AddToTLDataStrW(tld, wszText); - AddToTLDataStrW(tld, wszAfter); + if(pTypeAttr->wTypeFlags & TYPEFLAG_FOLEAUTOMATION) + AddToTLDataStrW(tld, wszVT_HRESULT); + else { + AddToTLDataStrW(tld, wszText); + AddToTLDataStrW(tld, wszAfter); + } AddToTLDataStrW(tld, wszSpace); if(pFuncDesc->memid >= MIN_FUNC_ID) { @@ -735,7 +742,7 @@ static int EnumImplTypes(ITypeInfo *pTypeInfo, int cImplTypes, HTREEITEM hParent hParent = TreeView_InsertItem(typelib.hTree, &tvis); EnumVars(pRefTypeInfo, pTypeAttr->cVars, hParent); - EnumFuncs(pRefTypeInfo, pTypeAttr->cFuncs, hParent); + EnumFuncs(pRefTypeInfo, pTypeAttr, hParent); EnumImplTypes(pRefTypeInfo, pTypeAttr->cImplTypes, hParent); SysFreeString(bstrName); @@ -1195,7 +1202,7 @@ static int PopulateTree(void) AddToTLDataStrW(tld, wszColon); AddToTLDataStrW(tld, wszNewLine); tvis.hParent = TreeView_InsertItem(typelib.hTree, &tvis); - EnumFuncs(pTypeInfo, pTypeAttr->cFuncs, tvis.hParent); + EnumFuncs(pTypeInfo, pTypeAttr, tvis.hParent); AddChildrenData(tvis.hParent, tld); EnumImplTypes(pTypeInfo, pTypeAttr->cImplTypes, hParent); @@ -1254,7 +1261,7 @@ static int PopulateTree(void) hParent = TreeView_InsertItem(typelib.hTree, &tvis); EnumVars(pTypeInfo, pTypeAttr->cVars, hParent); - EnumFuncs(pTypeInfo, pTypeAttr->cFuncs, hParent); + EnumFuncs(pTypeInfo, pTypeAttr, hParent); EnumImplTypes(pTypeInfo, pTypeAttr->cImplTypes, hParent); if(memcmp(bstrName, wszVT_UNKNOWN, sizeof(wszVT_UNKNOWN)))

1 0