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

Christian Costa : d3drm: Add support for frame with fake data in IDirect3DRMX:Load methods + tests.
by Alexandre Julliard April 2, 2012

April 2, 2012

Module: wine Branch: master Commit: 4d53115cb99f7b5ab678068572770fc52d5e5e56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d53115cb99f7b5ab67806857… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Mar 29 23:56:54 2012 +0200 d3drm: Add support for frame with fake data in IDirect3DRMX:Load methods + tests. --- dlls/d3drm/d3drm.c | 15 ++++++++++++++- dlls/d3drm/tests/d3drm.c | 14 ++++++++++---- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index afd794e..c067c27 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1389,6 +1389,8 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3* iface, LPVOID ObjSourc else if (IsEqualGUID(pGuid, &TID_D3DRMFrame)) { BOOL requested = FALSE; + HRESULT hr; + LPDIRECT3DRMFRAME3 frame; TRACE("Found TID_D3DRMFrame\n"); @@ -1400,7 +1402,18 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3* iface, LPVOID ObjSourc if (requested) { - FIXME("Processing frame not supported yet\n"); + FIXME("Fake frame data and notify application\n"); + + hr = IDirect3DRM3_CreateFrame(iface, NULL, &frame); + if (SUCCEEDED(hr)) + { + LoadProc((LPDIRECT3DRMOBJECT)frame, &IID_IDirect3DRMFrame, ArgLP); + IDirect3DRMFrame3_Release(frame); + } + + if (FAILED(hr)) + ERR("Cannot process mesh\n"); + } } else if (IsEqualGUID(pGuid, &TID_D3DRMMaterial)) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 8d18d3b..0a05dcd 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -153,6 +153,11 @@ static char data_d3drm_load[] = " 0.1; 0.2; 0.3;,\n" " 1;\n" " 3; 0, 1, 2;;\n" +"}\n" +"Frame Scene\n" +"{\n" +" {Object1}\n" +" {Object2}\n" "}\n"; static void test_MeshBuilder(void) @@ -604,7 +609,8 @@ static int nb_objects = 0; static const GUID* refiids[] = { &IID_IDirect3DRMMeshBuilder, - &IID_IDirect3DRMMeshBuilder + &IID_IDirect3DRMMeshBuilder, + &IID_IDirect3DRMFrame }; void __cdecl object_load_callback(LPDIRECT3DRMOBJECT object, REFIID objectguid, LPVOID arg) @@ -620,16 +626,16 @@ static void test_d3drm_load(void) HRESULT hr; LPDIRECT3DRM pD3DRM; D3DRMLOADMEMORY info; - const GUID* req_refiids[] = { &IID_IDirect3DRMMeshBuilder }; + const GUID* req_refiids[] = { &IID_IDirect3DRMMeshBuilder, &IID_IDirect3DRMFrame }; hr = pDirect3DRMCreate(&pD3DRM); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); info.lpMemory = data_d3drm_load; info.dSize = strlen(data_d3drm_load); - hr = IDirect3DRM_Load(pD3DRM, &info, NULL, (GUID**)req_refiids, 1, D3DRMLOAD_FROMMEMORY, object_load_callback, (LPVOID)0xdeadbeef, NULL, NULL, NULL); + hr = IDirect3DRM_Load(pD3DRM, &info, NULL, (GUID**)req_refiids, 2, D3DRMLOAD_FROMMEMORY, object_load_callback, (LPVOID)0xdeadbeef, NULL, NULL, NULL); ok(hr == D3DRM_OK, "Cannot load data (hr = %x)\n", hr); - ok(nb_objects == 2, "Should have loaded 2 objects (got %d)\n", nb_objects); + ok(nb_objects == 3, "Should have loaded 3 objects (got %d)\n", nb_objects); IDirect3DRM_Release(pD3DRM); }

1 0

Daniel Jelinski : comctl32/tests: Added test for treeview expand notifications on keyboard events.
by Alexandre Julliard April 2, 2012

April 2, 2012

Module: wine Branch: master Commit: c52d7acf5464747c1eed521b287e0bec4ef042a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c52d7acf5464747c1eed521b2… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sun Apr 1 00:03:56 2012 +0200 comctl32/tests: Added test for treeview expand notifications on keyboard events. --- dlls/comctl32/tests/treeview.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 8c0ec93..61a3ce6 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -204,6 +204,20 @@ static const struct message parent_expand_seq[] = { { 0 } }; +static const struct message parent_expand_kb_seq[] = { + { WM_NOTIFY, sent|id|optional, 0, 0, TVN_KEYDOWN }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDINGA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDEDA }, + { WM_CHANGEUISTATE, sent|optional }, + { 0 } +}; + +static const struct message parent_expand_empty_kb_seq[] = { + { WM_NOTIFY, sent|id|optional, 0, 0, TVN_KEYDOWN }, + { WM_CHANGEUISTATE, sent|optional }, + { 0 } +}; + static const struct message parent_singleexpand_seq[] = { { WM_NOTIFY, sent|id, 0, 0, TVN_SELCHANGINGA }, { WM_NOTIFY, sent|id, 0, 0, TVN_SELCHANGEDA }, @@ -1423,6 +1437,31 @@ static void test_expandnotify(void) ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "toggle node (collapse)", FALSE); DestroyWindow(hTree); + + /* some keyboard events are also translated to expand */ + hTree = create_treeview_control(0); + fill_tree(hTree); + + /* preselect root node here */ + ret = SendMessageA(hTree, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hRoot); + expect(TRUE, ret); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + ret = SendMessageA(hTree, WM_KEYDOWN, VK_ADD, 0); + expect(FALSE, ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_expand_kb_seq, "expand node", FALSE); + + /* go to child */ + ret = SendMessageA(hTree, WM_KEYDOWN, VK_RIGHT, 0); + expect(FALSE, ret); + + /* try to expand child that doesn't have children itself */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + ret = SendMessageA(hTree, WM_KEYDOWN, VK_ADD, 0); + expect(FALSE, ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_expand_empty_kb_seq, "expand node with no children", TRUE); + + DestroyWindow(hTree); } static void test_expandedimage(void)

1 0

Kusanagi Kouichi : gdi32: Improve font cache.
by Alexandre Julliard April 2, 2012

April 2, 2012

Module: wine Branch: master Commit: c0c7547f373b2d418bdff8949f781b1ea54da277 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0c7547f373b2d418bdff8949… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Mon Apr 2 19:58:22 2012 +0900 gdi32: Improve font cache. --- dlls/gdi32/freetype.c | 22 ++++++---------------- 1 files changed, 6 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index fd362ab..72b74be 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -484,10 +484,9 @@ static const WCHAR wine_fonts_key[] = {'S','o','f','t','w','a','r','e','\\','W', static const WCHAR wine_fonts_cache_key[] = {'C','a','c','h','e',0}; static const WCHAR english_name_value[] = {'E','n','g','l','i','s','h',' ','N','a','m','e',0}; static const WCHAR face_index_value[] = {'I','n','d','e','x',0}; -static const WCHAR face_italic_value[] = {'I','t','a','l','i','c',0}; -static const WCHAR face_bold_value[] = {'B','o','l','d',0}; +static const WCHAR face_ntmflags_value[] = {'N','t','m','f','l','a','g','s',0}; static const WCHAR face_version_value[] = {'V','e','r','s','i','o','n',0}; -static const WCHAR face_external_value[] = {'E','x','t','e','r','n','a','l',0}; +static const WCHAR face_vertical_value[] = {'V','e','r','t','i','c','a','l',0}; static const WCHAR face_height_value[] = {'H','e','i','g','h','t',0}; static const WCHAR face_width_value[] = {'W','i','d','t','h',0}; static const WCHAR face_size_value[] = {'S','i','z','e',0}; @@ -1316,7 +1315,6 @@ static void load_face(HKEY hkey_face, WCHAR *face_name, Family *family) key of a bunch of non-scalable strikes */ if(RegQueryValueExA(hkey_face, "File Name", NULL, NULL, NULL, &needed) == ERROR_SUCCESS) { - DWORD italic, bold; Face *face; face = HeapAlloc(GetProcessHeap(), 0, sizeof(*face)); face->cached_enum_data = NULL; @@ -1325,7 +1323,6 @@ static void load_face(HKEY hkey_face, WCHAR *face_name, Family *family) RegQueryValueExA(hkey_face, "File Name", NULL, NULL, (BYTE*)face->file, &needed); face->StyleName = strdupW(face_name); - face->vertical = (family->FamilyName[0] == '@'); if(RegQueryValueExW(hkey_face, face_full_name_value, NULL, NULL, NULL, &needed) == ERROR_SUCCESS) { @@ -1337,10 +1334,9 @@ static void load_face(HKEY hkey_face, WCHAR *face_name, Family *family) face->FullName = NULL; reg_load_dword(hkey_face, face_index_value, (DWORD*)&face->face_index); - reg_load_dword(hkey_face, face_italic_value, &italic); - reg_load_dword(hkey_face, face_bold_value, &bold); + reg_load_dword(hkey_face, face_ntmflags_value, &face->ntmFlags); reg_load_dword(hkey_face, face_version_value, (DWORD*)&face->font_version); - reg_load_dword(hkey_face, face_external_value, (DWORD*)&face->external); + reg_load_dword(hkey_face, face_vertical_value, (DWORD*)&face->vertical); needed = sizeof(face->fs); RegQueryValueExW(hkey_face, face_font_sig_value, NULL, NULL, (BYTE*)&face->fs, &needed); @@ -1364,11 +1360,6 @@ static void load_face(HKEY hkey_face, WCHAR *face_name, Family *family) face->size.x_ppem >> 6, face->size.y_ppem >> 6); } - face->ntmFlags = 0; - if (italic) face->ntmFlags |= NTM_ITALIC; - if (bold) face->ntmFlags |= NTM_BOLD; - if (face->ntmFlags == 0) face->ntmFlags = NTM_REGULAR; - TRACE("fsCsb = %08x %08x/%08x %08x %08x %08x\n", face->fs.fsCsb[0], face->fs.fsCsb[1], face->fs.fsUsb[0], face->fs.fsUsb[1], @@ -1517,10 +1508,9 @@ static void add_face_to_cache(Face *face) (strlenW(face->FullName) + 1) * sizeof(WCHAR)); reg_save_dword(hkey_face, face_index_value, face->face_index); - reg_save_dword(hkey_face, face_italic_value, (face->ntmFlags & NTM_ITALIC) != 0); - reg_save_dword(hkey_face, face_bold_value, (face->ntmFlags & NTM_BOLD) != 0); + reg_save_dword(hkey_face, face_ntmflags_value, face->ntmFlags); reg_save_dword(hkey_face, face_version_value, face->font_version); - reg_save_dword(hkey_face, face_external_value, face->external); + reg_save_dword(hkey_face, face_vertical_value, face->vertical); RegSetValueExW(hkey_face, face_font_sig_value, 0, REG_BINARY, (BYTE*)&face->fs, sizeof(face->fs));

1 0

Christian Costa : d3drm: Make IDirect3DRMMeshBuilderX stub return D3DRM_OK.
by Alexandre Julliard April 2, 2012

April 2, 2012

Module: wine Branch: master Commit: 5763eb16414798c912c500adc12c1455286e6df8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5763eb16414798c912c500adc… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Mar 29 23:56:46 2012 +0200 d3drm: Make IDirect3DRMMeshBuilderX stub return D3DRM_OK. --- dlls/d3drm/meshbuilder.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 398ce2c..db64917 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -460,7 +460,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_Scale(IDirect3DRMMeshBuilder2* FIXME("(%p)->(%f,%f,%f): stub\n", This, sx, sy, sz); - return E_NOTIMPL; + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_Translate(IDirect3DRMMeshBuilder2* iface,

1 0

Huw Davies : winspool: Propagate the printer's devmode to a new job.
by Alexandre Julliard April 2, 2012

April 2, 2012

Module: wine Branch: master Commit: 0b9a3f9de44075c16541ee98ca9c787f25d74aed URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b9a3f9de44075c16541ee98c… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 2 11:42:36 2012 +0100 winspool: Propagate the printer's devmode to a new job. --- dlls/winspool.drv/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index d832b4b..c50a894 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -2311,7 +2311,7 @@ BOOL WINAPI AddJobW(HANDLE hPrinter, DWORD Level, LPBYTE pData, DWORD cbBuf, LPD memcpy(job->filename, filename, (len + 1) * sizeof(WCHAR)); job->document_title = strdupW(default_doc_title); job->printer_name = strdupW(printer->name); - job->devmode = NULL; + job->devmode = dup_devmode( printer->devmode ); list_add_tail(&printer->queue->jobs, &job->entry); *pcbNeeded = (len + 1) * sizeof(WCHAR) + sizeof(*addjob);

1 0

Aric Stewart : quartz: COM cleanup in ACMWrapperImpl.
by Alexandre Julliard April 2, 2012

April 2, 2012

Module: wine Branch: master Commit: c6289fecec4afa1355222c29dd525fbc180880c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6289fecec4afa1355222c29d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Mar 30 20:10:47 2012 -0500 quartz: COM cleanup in ACMWrapperImpl. --- dlls/quartz/acmwrapper.c | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 1c840b7..300559e 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -54,9 +54,19 @@ typedef struct ACMWrapperImpl static const IBaseFilterVtbl ACMWrapper_Vtbl; +static inline ACMWrapperImpl *impl_from_TransformFilter( TransformFilter *iface ) +{ + return CONTAINING_RECORD(iface, ACMWrapperImpl, tf.filter); +} + +static inline ACMWrapperImpl *impl_from_IBaseFilter( IBaseFilter *iface ) +{ + return CONTAINING_RECORD(iface, ACMWrapperImpl, tf.filter.IBaseFilter_iface); +} + static HRESULT WINAPI ACMWrapper_Receive(TransformFilter *tf, IMediaSample *pSample) { - ACMWrapperImpl* This = (ACMWrapperImpl*)tf; + ACMWrapperImpl* This = impl_from_TransformFilter(tf); AM_MEDIA_TYPE amt; IMediaSample* pOutSample = NULL; DWORD cbDstStream, cbSrcStream; @@ -244,7 +254,7 @@ error: static HRESULT WINAPI ACMWrapper_SetMediaType(TransformFilter *tf, PIN_DIRECTION dir, const AM_MEDIA_TYPE * pmt) { - ACMWrapperImpl* This = (ACMWrapperImpl *)tf; + ACMWrapperImpl* This = impl_from_TransformFilter(tf); MMRESULT res; TRACE("(%p)->(%i %p)\n", This, dir, pmt); @@ -301,7 +311,7 @@ static HRESULT WINAPI ACMWrapper_SetMediaType(TransformFilter *tf, PIN_DIRECTION static HRESULT WINAPI ACMWrapper_CompleteConnect(TransformFilter *tf, PIN_DIRECTION dir, IPin *pin) { - ACMWrapperImpl* This = (ACMWrapperImpl *)tf; + ACMWrapperImpl* This = impl_from_TransformFilter(tf); MMRESULT res; HACMSTREAM drv; @@ -325,7 +335,7 @@ static HRESULT WINAPI ACMWrapper_CompleteConnect(TransformFilter *tf, PIN_DIRECT static HRESULT WINAPI ACMWrapper_BreakConnect(TransformFilter *tf, PIN_DIRECTION dir) { - ACMWrapperImpl *This = (ACMWrapperImpl *)tf; + ACMWrapperImpl *This = impl_from_TransformFilter(tf); TRACE("(%p)->(%i)\n", This,dir); @@ -343,7 +353,7 @@ static HRESULT WINAPI ACMWrapper_BreakConnect(TransformFilter *tf, PIN_DIRECTION static HRESULT WINAPI ACMWrapper_DecideBufferSize(TransformFilter *tf, IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest) { - ACMWrapperImpl *pACM = (ACMWrapperImpl*)tf; + ACMWrapperImpl *pACM = impl_from_TransformFilter(tf); ALLOCATOR_PROPERTIES actual; if (!ppropInputRequest->cbAlign) @@ -394,7 +404,7 @@ HRESULT ACMWrapper_create(IUnknown * pUnkOuter, LPVOID * ppv) ISeekingPassThru *passthru; hr = CoCreateInstance(&CLSID_SeekingPassThru, (IUnknown*)This, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&This->seekthru_unk); IUnknown_QueryInterface(This->seekthru_unk, &IID_ISeekingPassThru, (void**)&passthru); - ISeekingPassThru_Init(passthru, FALSE, (IPin*)This->tf.ppPins[0]); + ISeekingPassThru_Init(passthru, FALSE, This->tf.ppPins[0]); ISeekingPassThru_Release(passthru); } @@ -407,7 +417,7 @@ HRESULT ACMWrapper_create(IUnknown * pUnkOuter, LPVOID * ppv) static HRESULT WINAPI ACMWrapper_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) { HRESULT hr; - ACMWrapperImpl *This = (ACMWrapperImpl *)iface; + ACMWrapperImpl *This = impl_from_IBaseFilter(iface); TRACE("(%p/%p)->(%s, %p)\n", This, iface, qzdebugstr_guid(riid), ppv); if (IsEqualIID(riid, &IID_IMediaSeeking))

1 0

Jacek Caban : mshtml.idl: Added IHTMLMetaElement* declarations.
by Alexandre Julliard April 2, 2012

April 2, 2012

Module: wine Branch: master Commit: 5d8d4b8f3f8fc2e83e8892136fb8ad7317e958de URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d8d4b8f3f8fc2e83e8892136… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 2 15:52:54 2012 +0200 mshtml.idl: Added IHTMLMetaElement* declarations. --- include/mshtml.idl | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 78 insertions(+), 0 deletions(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index 2b532be..a6a9954 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -9611,6 +9611,84 @@ interface IHTMLTitleElement : IDispatch } /***************************************************************************** + * IHTMLMetaElement interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f203-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLMetaElement : IDispatch +{ + [propput, id(DISPID_IHTMLMETAELEMENT_HTTPEQUIV), displaybind, bindable] + HRESULT httpEquiv([in] BSTR v); + + [propget, id(DISPID_IHTMLMETAELEMENT_HTTPEQUIV), displaybind, bindable] + HRESULT httpEquiv([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLMETAELEMENT_CONTENT), displaybind, bindable] + HRESULT content([in] BSTR v); + + [propget, id(DISPID_IHTMLMETAELEMENT_CONTENT), displaybind, bindable] + HRESULT content([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLMETAELEMENT_NAME), displaybind, bindable] + HRESULT name([in] BSTR v); + + [propget, id(DISPID_IHTMLMETAELEMENT_NAME), displaybind, bindable] + HRESULT name([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLMETAELEMENT_URL), displaybind, bindable] + HRESULT url([in] BSTR v); + + [propget, id(DISPID_IHTMLMETAELEMENT_URL), displaybind, bindable] + HRESULT url([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLMETAELEMENT_CHARSET), displaybind, bindable] + HRESULT charset([in] BSTR v); + + [propget, id(DISPID_IHTMLMETAELEMENT_CHARSET), displaybind, bindable] + HRESULT charset([out, retval] BSTR *p); +} + +/***************************************************************************** + * IHTMLMetaElement2 interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f81f-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLMetaElement2 : IDispatch +{ + [propput, id(DISPID_IHTMLMETAELEMENT2_SCHEME), displaybind, bindable] + HRESULT scheme([in] BSTR v); + + [propget, id(DISPID_IHTMLMETAELEMENT2_SCHEME), displaybind, bindable] + HRESULT scheme([out, retval] BSTR *p); +} + +/***************************************************************************** + * IHTMLMetaElement3 interface + */ +[ + odl, + oleautomation, + dual, + uuid(30510495-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLMetaElement3 : IDispatch +{ + [propput, id(DISPID_IHTMLMETAELEMENT3_IE8_URL)] + HRESULT url([in] BSTR v); + + [propget, id(DISPID_IHTMLMETAELEMENT3_IE8_URL)] + HRESULT url([out, retval] BSTR *p); +} + +/***************************************************************************** * DispHTMLHeadElement interface */ [

1 0

Jacek Caban : mshtml: Added IHTMLMetaElement stub implementation.
by Alexandre Julliard April 2, 2012

April 2, 2012

Module: wine Branch: master Commit: 2d206abeac725a15bfb2bb74387d66403d263138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d206abeac725a15bfb2bb743… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 2 15:53:07 2012 +0200 mshtml: Added IHTMLMetaElement stub implementation. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/htmlelem.c | 2 + dlls/mshtml/htmlmeta.c | 255 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 3 + dlls/mshtml/tests/dom.c | 15 ++- 5 files changed, 274 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2d206abeac725a15bfb2b…

1 0

Huw Davies : wineps: Use the unicode version of StartDocPrinter.
by Alexandre Julliard April 2, 2012

April 2, 2012

Module: wine Branch: master Commit: d963a8f864a495f7230dc6fe717d71e61ae51d67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d963a8f864a495f7230dc6fe7… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 2 14:14:08 2012 +0100 wineps: Use the unicode version of StartDocPrinter. --- dlls/wineps.drv/escape.c | 68 ++++++++------------------------------------- dlls/wineps.drv/init.c | 18 +++++++++--- dlls/wineps.drv/psdrv.h | 2 +- 3 files changed, 26 insertions(+), 62 deletions(-) diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index eff7500..66a1a89 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -409,15 +409,15 @@ INT PSDRV_EndPage( PHYSDEV dev ) /************************************************************************ - * PSDRV_StartDocA + * PSDRV_StartDoc */ -static INT PSDRV_StartDocA( PHYSDEV dev, const DOCINFOA *doc ) +INT PSDRV_StartDoc( PHYSDEV dev, const DOCINFOW *doc ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); - DOC_INFO_1A di; + DOC_INFO_1W di; - TRACE("(%p, %p) => %s, %s, %s\n", physDev, doc, debugstr_a(doc->lpszDocName), - debugstr_a(doc->lpszOutput), debugstr_a(doc->lpszDatatype)); + TRACE("(%p, %p) => %s, %s, %s\n", physDev, doc, debugstr_w(doc->lpszDocName), + debugstr_w(doc->lpszOutput), debugstr_w(doc->lpszDatatype)); if(physDev->job.id) { FIXME("hJob != 0. Now what?\n"); @@ -431,21 +431,21 @@ static INT PSDRV_StartDocA( PHYSDEV dev, const DOCINFOA *doc ) return 0; } - di.pDocName = (LPSTR) doc->lpszDocName; + di.pDocName = (LPWSTR) doc->lpszDocName; di.pDatatype = NULL; if(doc->lpszOutput) - di.pOutputFile = (LPSTR) doc->lpszOutput; + di.pOutputFile = (LPWSTR) doc->lpszOutput; else if(physDev->job.output) di.pOutputFile = physDev->job.output; else di.pOutputFile = NULL; - TRACE("using output: %s\n", debugstr_a(di.pOutputFile)); + TRACE("using output: %s\n", debugstr_w(di.pOutputFile)); /* redirection located in HKCU\Software\Wine\Printing\Spooler is done during winspool.drv,ScheduleJob */ - physDev->job.id = StartDocPrinterA(physDev->job.hprinter, 1, (LPBYTE) &di); + physDev->job.id = StartDocPrinterW(physDev->job.hprinter, 1, (LPBYTE) &di); if(!physDev->job.id) { WARN("StartDocPrinter() failed: %d\n", GetLastError()); ClosePrinter(physDev->job.hprinter); @@ -458,8 +458,9 @@ static INT PSDRV_StartDocA( PHYSDEV dev, const DOCINFOA *doc ) physDev->job.in_passthrough = FALSE; physDev->job.had_passthrough_rect = FALSE; if(doc->lpszDocName) { - physDev->job.DocName = HeapAlloc(GetProcessHeap(), 0, strlen(doc->lpszDocName)+1); - strcpy(physDev->job.DocName, doc->lpszDocName); + INT len = WideCharToMultiByte( CP_ACP, 0, doc->lpszDocName, -1, NULL, 0, NULL, NULL ); + physDev->job.DocName = HeapAlloc( GetProcessHeap(), 0, len ); + WideCharToMultiByte( CP_ACP, 0, doc->lpszDocName, -1, physDev->job.DocName, len, NULL, NULL ); } else physDev->job.DocName = NULL; @@ -467,51 +468,6 @@ static INT PSDRV_StartDocA( PHYSDEV dev, const DOCINFOA *doc ) } /************************************************************************ - * PSDRV_StartDoc - */ -INT PSDRV_StartDoc( PHYSDEV dev, const DOCINFOW *doc ) -{ - DOCINFOA docA; - INT ret, len; - LPSTR docname = NULL, output = NULL, datatype = NULL; - - TRACE("(%p, %p) => %d,%s,%s,%s\n", dev, doc, doc->cbSize, debugstr_w(doc->lpszDocName), - debugstr_w(doc->lpszOutput), debugstr_w(doc->lpszDatatype)); - - docA.cbSize = doc->cbSize; - if (doc->lpszDocName) - { - len = WideCharToMultiByte( CP_ACP, 0, doc->lpszDocName, -1, NULL, 0, NULL, NULL ); - if ((docname = HeapAlloc( GetProcessHeap(), 0, len ))) - WideCharToMultiByte( CP_ACP, 0, doc->lpszDocName, -1, docname, len, NULL, NULL ); - } - if (doc->lpszOutput) - { - len = WideCharToMultiByte( CP_ACP, 0, doc->lpszOutput, -1, NULL, 0, NULL, NULL ); - if ((output = HeapAlloc( GetProcessHeap(), 0, len ))) - WideCharToMultiByte( CP_ACP, 0, doc->lpszOutput, -1, output, len, NULL, NULL ); - } - if (doc->lpszDatatype) - { - len = WideCharToMultiByte( CP_ACP, 0, doc->lpszDatatype, -1, NULL, 0, NULL, NULL ); - if ((datatype = HeapAlloc( GetProcessHeap(), 0, len ))) - WideCharToMultiByte( CP_ACP, 0, doc->lpszDatatype, -1, datatype, len, NULL, NULL ); - } - docA.lpszDocName = docname; - docA.lpszOutput = output; - docA.lpszDatatype = datatype; - docA.fwType = doc->fwType; - - ret = PSDRV_StartDocA(dev, &docA); - - HeapFree( GetProcessHeap(), 0, docname ); - HeapFree( GetProcessHeap(), 0, output ); - HeapFree( GetProcessHeap(), 0, datatype ); - - return ret; -} - -/************************************************************************ * PSDRV_EndDoc */ INT PSDRV_EndDoc( PHYSDEV dev ) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index fa47573..c6a4488 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -41,6 +41,7 @@ #include "winnls.h" #include "psdrv.h" #include "winspool.h" +#include "wine/unicode.h" #include "wine/library.h" #include "wine/debug.h" @@ -171,6 +172,17 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) return TRUE; } +static inline WCHAR *strdupW( const WCHAR *str ) +{ + int size; + WCHAR *ret; + + if (!str) return NULL; + size = (strlenW( str ) + 1) * sizeof(WCHAR); + ret = HeapAlloc( GetProcessHeap(), 0, size ); + if (ret) memcpy( ret, str, size ); + return ret; +} static void PSDRV_UpdateDevCaps( PSDRV_PDEVICE *physDev ) { @@ -355,11 +367,7 @@ static BOOL PSDRV_CreateDC( PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device, if (!(physDev = create_psdrv_physdev( pi ))) return FALSE; - if (output && *output) { - INT len = WideCharToMultiByte( CP_ACP, 0, output, -1, NULL, 0, NULL, NULL ); - if ((physDev->job.output = HeapAlloc( PSDRV_Heap, 0, len ))) - WideCharToMultiByte( CP_ACP, 0, output, -1, physDev->job.output, len, NULL, NULL ); - } + if (output && *output) physDev->job.output = strdupW( output ); if(initData) { DEVMODEA *devmodeA = DEVMODEdupWtoA(PSDRV_Heap, initData); diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 3bcad2c..fd82bd5 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -346,7 +346,7 @@ typedef struct { typedef struct { DWORD id; /* Job id */ HANDLE hprinter; /* Printer handle */ - LPSTR output; /* Output file/port */ + LPWSTR output; /* Output file/port */ LPSTR DocName; /* Document Name */ BOOL banding; /* Have we received a NEXTBAND */ BOOL OutOfPage; /* Page header not sent yet */

1 0

Aric Stewart : strmbase: More additions to BaseRenderer for video renderers .
by Alexandre Julliard April 2, 2012

April 2, 2012

Module: wine Branch: master Commit: e1a72011e52d6a76ee3824adb61066da89475940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1a72011e52d6a76ee3824adb… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Mar 30 20:08:25 2012 -0500 strmbase: More additions to BaseRenderer for video renderers. --- dlls/strmbase/renderer.c | 39 +++++++++++++++++++++++++++++++++++++++ include/wine/strmbase.h | 4 ++++ 2 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 1d3f3b5..3f665f7 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -82,6 +82,7 @@ static HRESULT WINAPI BaseRenderer_InputPin_Disconnect(IPin * iface) if (renderer->pFuncsTable->pfnBreakConnect) hr = renderer->pFuncsTable->pfnBreakConnect(renderer); } + BaseRendererImpl_ClearPendingSample(renderer); LeaveCriticalSection(This->pin.pCritSec); return hr; @@ -254,6 +255,9 @@ HRESULT WINAPI BaseRenderer_Init(BaseRenderer * This, const IBaseFilterVtbl *Vtb InitializeCriticalSection(&This->csRenderLock); This->csRenderLock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__": BaseRenderer.csRenderLock"); This->evComplete = CreateEventW(NULL, TRUE, TRUE, NULL); + This->ThreadSignal = CreateEventW(NULL, TRUE, TRUE, NULL); + This->RenderEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + This->pMediaSample = NULL; } return hr; @@ -291,7 +295,11 @@ ULONG WINAPI BaseRendererImpl_Release(IBaseFilter* iface) This->csRenderLock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->csRenderLock); + + BaseRendererImpl_ClearPendingSample(This); CloseHandle(This->evComplete); + CloseHandle(This->ThreadSignal); + CloseHandle(This->RenderEvent); } return refCount; } @@ -318,6 +326,9 @@ HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSamp } } + This->pMediaSample = pSample; + IMediaSample_AddRef(pSample); + if (This->pFuncsTable->pfnPrepareReceive) hr = This->pFuncsTable->pfnPrepareReceive(This, pSample); if (FAILED(hr)) @@ -368,6 +379,8 @@ HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSamp if (SUCCEEDED(hr)) hr = This->pFuncsTable->pfnDoRenderSample(This, pSample); + + BaseRendererImpl_ClearPendingSample(This); LeaveCriticalSection(&This->csRenderLock); return hr; @@ -405,6 +418,8 @@ HRESULT WINAPI BaseRendererImpl_Stop(IBaseFilter * iface) This->pFuncsTable->pfnOnStopStreaming(This); This->filter.state = State_Stopped; SetEvent(This->evComplete); + SetEvent(This->ThreadSignal); + SetEvent(This->RenderEvent); } LeaveCriticalSection(&This->csRenderLock); @@ -423,6 +438,7 @@ HRESULT WINAPI BaseRendererImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStart) goto out; SetEvent(This->evComplete); + ResetEvent(This->ThreadSignal); if (This->pInputPin->pin.pConnectedTo) { @@ -443,6 +459,9 @@ HRESULT WINAPI BaseRendererImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStart) { if (This->pFuncsTable->pfnOnStartStreaming) This->pFuncsTable->pfnOnStartStreaming(This); + if (This->filter.state == State_Stopped) + BaseRendererImpl_ClearPendingSample(This); + SetEvent(This->RenderEvent); This->filter.state = State_Running; } out: @@ -469,9 +488,14 @@ HRESULT WINAPI BaseRendererImpl_Pause(IBaseFilter * iface) } else if (This->pFuncsTable->pfnOnStopStreaming) This->pFuncsTable->pfnOnStopStreaming(This); + + if (This->filter.state == State_Stopped) + BaseRendererImpl_ClearPendingSample(This); + ResetEvent(This->RenderEvent); This->filter.state = State_Paused; } } + ResetEvent(This->ThreadSignal); LeaveCriticalSection(&This->csRenderLock); return S_OK; @@ -520,6 +544,9 @@ HRESULT WINAPI BaseRendererImpl_EndOfStream(BaseRenderer* iface) HRESULT WINAPI BaseRendererImpl_BeginFlush(BaseRenderer* iface) { TRACE("(%p)\n", iface); + BaseRendererImpl_ClearPendingSample(iface); + SetEvent(iface->ThreadSignal); + SetEvent(iface->RenderEvent); return S_OK; } @@ -527,5 +554,17 @@ HRESULT WINAPI BaseRendererImpl_EndFlush(BaseRenderer* iface) { TRACE("(%p)\n", iface); RendererPosPassThru_ResetMediaTime(iface->pPosition); + ResetEvent(iface->ThreadSignal); + ResetEvent(iface->RenderEvent); + return S_OK; +} + +HRESULT WINAPI BaseRendererImpl_ClearPendingSample(BaseRenderer *iface) +{ + if (iface->pMediaSample) + { + IMediaSample_Release(iface->pMediaSample); + iface->pMediaSample = NULL; + } return S_OK; } diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 46544ba..7e25c04 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -583,6 +583,9 @@ typedef struct BaseRendererTag IUnknown *pPosition; CRITICAL_SECTION csRenderLock; HANDLE evComplete; + HANDLE ThreadSignal; + HANDLE RenderEvent; + IMediaSample *pMediaSample; const struct BaseRendererFuncTable * pFuncsTable; } BaseRenderer; @@ -639,6 +642,7 @@ HRESULT WINAPI BaseRendererImpl_GetState(IBaseFilter * iface, DWORD dwMilliSecsT HRESULT WINAPI BaseRendererImpl_EndOfStream(BaseRenderer* iface); HRESULT WINAPI BaseRendererImpl_BeginFlush(BaseRenderer* iface); HRESULT WINAPI BaseRendererImpl_EndFlush(BaseRenderer* iface); +HRESULT WINAPI BaseRendererImpl_ClearPendingSample(BaseRenderer *iface); HRESULT WINAPI BaseRenderer_Init(BaseRenderer *This, const IBaseFilterVtbl *Vtbl, IUnknown *pUnkOuter, const CLSID *pClsid, DWORD_PTR DebugInfo, const BaseRendererFuncTable* pBaseFuncsTable);

1 0