January 2012 - Wine-commits

Alexandre Julliard : view: Convert to Unicode.
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: be91790988e49a003eb6c5ab214d2b620e4fdc9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=be91790988e49a003eb6c5ab2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 19 20:04:00 2012 +0100 view: Convert to Unicode. --- programs/view/Makefile.in | 3 +- programs/view/view.c | 162 +++++++++++++++++++++++---------------------- 2 files changed, 85 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=be91790988e49a003eb6c…

1 0

Alexandre Julliard : winemine: Convert to Unicode.
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: 020faceaae650fd899ae0c11a78bae20f029ce72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=020faceaae650fd899ae0c11a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 19 20:24:31 2012 +0100 winemine: Convert to Unicode. --- programs/winemine/Makefile.in | 3 +- programs/winemine/dialog.c | 11 ++-- programs/winemine/main.c | 135 ++++++++++++++++++++++------------------- programs/winemine/main.h | 2 +- programs/winemine/resource.h | 11 +++ programs/winemine/winemine.rc | 10 ++-- 6 files changed, 96 insertions(+), 76 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=020faceaae650fd899ae0…

1 0

Alexandre Julliard : winetest: Avoid Unicode macros.
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: 7175324992f250eca138e2a8b2397920333866e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7175324992f250eca138e2a8b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 19 21:05:28 2012 +0100 winetest: Avoid Unicode macros. --- programs/winetest/Makefile.in | 1 + programs/winetest/gui.c | 57 ++++++++++++++++++----------------------- programs/winetest/main.c | 57 ++++++++++++++++++++--------------------- programs/winetest/send.c | 2 +- programs/winetest/util.c | 2 +- programs/winetest/winetest.rc | 8 +++--- 6 files changed, 60 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7175324992f250eca138e…

1 0

Frédéric Delanoy : po: Remove English strings from the French translation.
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: 273b88100ca9af7e2cdb606ac4689ea065bbabce URL: http://source.winehq.org/git/wine.git/?a=commit;h=273b88100ca9af7e2cdb606ac… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jan 19 17:22:45 2012 +0100 po: Remove English strings from the French translation. --- po/fr.po | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index 35e1c8c..02e308e 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1324,9 +1324,8 @@ msgid "Certificate Type" msgstr "Type de certificat" #: crypt32.rc:59 -#, fuzzy msgid "Certificate Manifold" -msgstr "Certificate Manifold" +msgstr "" #: crypt32.rc:60 msgid "Netscape Cert Type"

1 0

Luca Bennati : po: Update Italian translation.
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: 6dd16ec1f0ca01800090b0c9b9aa1a189fdd49a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dd16ec1f0ca01800090b0c9b… Author: Luca Bennati <lucak3(a)gmail.com> Date: Thu Jan 19 09:52:05 2012 +0100 po: Update Italian translation. --- po/it.po | 41 +++++++++++++++-------------------------- 1 files changed, 15 insertions(+), 26 deletions(-) diff --git a/po/it.po b/po/it.po index 4eddc86..84a40b2 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-01-13 12:10+0100\n" +"PO-Revision-Date: 2012-01-19 09:43+0100\n" "Last-Translator: Luca Bennati <lucak3(a)gmail.com>\n" "Language-Team: none\n" "Language: Italian\n" @@ -40,9 +40,8 @@ msgstr "" "lista e clicca Cambia/Rimuovi." #: appwiz.rc:64 -#, fuzzy msgid "&Support Information" -msgstr "Informazioni di supporto" +msgstr "Informazioni di &supporto" #: appwiz.rc:65 regedit.rc:42 regedit.rc:87 msgid "&Modify..." @@ -3488,12 +3487,11 @@ msgstr "Impossibile avere 'continue' fuori dal ciclo" #: jscript.rc:40 msgid "Label redefined" -msgstr "" +msgstr "Etichetta ridefinita" #: jscript.rc:41 -#, fuzzy msgid "Label not found" -msgstr "File non trovato" +msgstr "Etichetta non trovata" #: jscript.rc:42 msgid "Conditional compilation is turned off" @@ -7504,9 +7502,8 @@ msgid "Resource Failures" msgstr "Fallimenti della risorsa" #: shdoclc.rc:198 -#, fuzzy msgid "Dump Tracking Info" -msgstr "Informazioni di Dump Tracking" +msgstr "" #: shdoclc.rc:199 msgid "Debug Break" @@ -13073,9 +13070,8 @@ msgid "Command history" msgstr "Cronologia" #: wineconsole.rc:73 -#, fuzzy msgid "&Number of recalled commands:" -msgstr "&Numero di comandi richiamati :" +msgstr "&Numero di comandi richiamati:" #: wineconsole.rc:76 msgid "&Remove doubles" @@ -13098,12 +13094,10 @@ msgid "Buffer zone" msgstr "Zona del buffer" #: wineconsole.rc:101 -#, fuzzy msgid "&Width:" msgstr "&Larghezza:" #: wineconsole.rc:104 -#, fuzzy msgid "&Height:" msgstr "&Altezza:" @@ -13112,12 +13106,10 @@ msgid "Window size" msgstr "Dimensione della finestra" #: wineconsole.rc:109 -#, fuzzy msgid "W&idth:" msgstr "&Larghezza:" #: wineconsole.rc:112 -#, fuzzy msgid "H&eight:" msgstr "&Altezza:" @@ -13274,7 +13266,6 @@ msgstr "" "spiacenti per l'inconveniente." #: winedbg.rc:55 -#, fuzzy msgid "" "This can be caused by a problem in the program or a deficiency in Wine. You " "may want to check the <a href=\"http://appdb.winehq.org\">Application " @@ -13282,20 +13273,15 @@ msgid "" msgstr "" "Ciò può essere causato da un problema nel programma o da una mancanza di " "Wine. Potresti voler consultare il <a href=\"http://appdb.winehq.org" -"\">Database delle applicazioni</a> per consigli su questa applicazione.\n" -"\n" -"Se questo problema non è presente sotto Windows e non è stato ancora " -"segnalato, puoi <a href=\"http://wiki.winehq.org/Bugs\">segnalarlo</a>." +"\">Database delle applicazioni</a> per consigli su questa applicazione." #: winedbg.rc:58 -#, fuzzy msgid "Show &Details" -msgstr "&Dettagli" +msgstr "Mostra i &dettagli" #: winedbg.rc:63 -#, fuzzy msgid "Program Error Details" -msgstr "Errore del programma" +msgstr "Dettagli dell'errore del programma" #: winedbg.rc:70 msgid "" @@ -13304,6 +13290,10 @@ msgid "" "button, then <a href=\"http://wiki.winehq.org/Bugs\">file a bug report</a> " "and attach that file to the report." msgstr "" +"Se questo problema non è presente sotto Windows e non è stato ancora " +"riportato, puoi salvare le informazioni dettagliate su un file usando il " +"pulsante \"Salva con nome\", poi <a href=\"http://wiki.winehq.org/Bugs" +"\">segnalalo</a> e allega quel file al report del bug." #: winedbg.rc:35 msgid "Wine program crash" @@ -13318,13 +13308,12 @@ msgid "(unidentified)" msgstr "(non identificato)" #: winedbg.rc:40 -#, fuzzy msgid "Saving failed" -msgstr "Creazione fallita\n" +msgstr "Salvataggio fallito" #: winedbg.rc:41 msgid "Loading detailed information, please wait..." -msgstr "" +msgstr "Caricamento delle informazioni dettagliate, aspetta un momento..." #: winefile.rc:26 msgid "&Open\tEnter"

1 0

Aric Stewart : wineqtdecoder: Implement QTSplitter_ChangeStart.
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: 676754d11a08afa29426bdd481a105803aa9559c URL: http://source.winehq.org/git/wine.git/?a=commit;h=676754d11a08afa29426bdd48… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jan 19 09:42:42 2012 -0600 wineqtdecoder: Implement QTSplitter_ChangeStart. --- dlls/wineqtdecoder/qtsplitter.c | 37 +++++++++++++++++---------- include/tlogstg.idl | 52 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 14 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index aab9fc1..9f01094 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -166,6 +166,9 @@ typedef struct QTSplitter { CRITICAL_SECTION csReceive; SourceSeeking sourceSeeking; + TimeValue movie_time; + TimeValue movie_start; + TimeScale movie_scale; } QTSplitter; static const IPinVtbl QT_OutputPin_Vtbl; @@ -468,7 +471,7 @@ static DWORD WINAPI QTSplitter_thread(LPVOID data) { QTSplitter *This = (QTSplitter *)data; HRESULT hr = S_OK; - TimeValue movie_time=0, next_time; + TimeValue next_time; CVPixelBufferRef pixelBuffer = NULL; OSStatus err; TimeRecord tr; @@ -486,11 +489,13 @@ static DWORD WINAPI QTSplitter_thread(LPVOID data) WaitForSingleObject(This->runEvent, -1); + EnterCriticalSection(&This->csReceive); This->state = State_Running; /* Prime the pump: Needed for MPEG streams */ - GetMovieNextInterestingTime(This->pQTMovie, nextTimeEdgeOK | nextTimeStep, 0, NULL, movie_time, 1, &next_time, NULL); + GetMovieNextInterestingTime(This->pQTMovie, nextTimeEdgeOK | nextTimeStep, 0, NULL, This->movie_time, 1, &next_time, NULL); GetMovieTime(This->pQTMovie, &tr); + LeaveCriticalSection(&This->csReceive); do { LONGLONG tStart=0, tStop=0; @@ -498,7 +503,7 @@ static DWORD WINAPI QTSplitter_thread(LPVOID data) float time; EnterCriticalSection(&This->csReceive); - GetMovieNextInterestingTime(This->pQTMovie, nextTimeStep, 0, NULL, movie_time, 1, &next_time, NULL); + GetMovieNextInterestingTime(This->pQTMovie, nextTimeStep, 0, NULL, This->movie_time, 1, &next_time, NULL); if (next_time == -1) { @@ -512,15 +517,15 @@ static DWORD WINAPI QTSplitter_thread(LPVOID data) MoviesTask(This->pQTMovie,0); QTVisualContextTask(This->vContext); - TRACE("In loop at time %ld\n",movie_time); + TRACE("In loop at time %ld\n",This->movie_time); TRACE("In Next time %ld\n",next_time); - mStart = movie_time; + mStart = This->movie_time; mStop = next_time; - time = (float)movie_time / tr.scale; + time = (float)(This->movie_time - This->movie_start) / This->movie_scale; tStart = time * 10000000; - time = (float)next_time / tr.scale; + time = (float)(next_time - This->movie_start) / This->movie_scale; tStop = time * 10000000; /* Deliver Audio */ @@ -552,8 +557,8 @@ static DWORD WINAPI QTSplitter_thread(LPVOID data) goto audio_error; } - duration = (float)next_time / tr.scale; - time = (float)movie_time / tr.scale; + duration = (float)next_time / This->movie_scale; + time = (float)This->movie_time / This->movie_scale; duration -= time; frames = pvi->nSamplesPerSec * duration; TRACE("Need audio for %f seconds (%li frames)\n",duration,frames); @@ -643,7 +648,7 @@ audio_error: else TRACE("No video to deliver\n"); - movie_time = next_time; + This->movie_time = next_time; LeaveCriticalSection(&This->csReceive); } while (hr == S_OK); @@ -923,7 +928,6 @@ static HRESULT QT_Process_Movie(QTSplitter* filter) DWORD tid; HANDLE thread; LONGLONG time; - TimeScale scale; TRACE("Trying movie connect\n"); @@ -963,8 +967,8 @@ static HRESULT QT_Process_Movie(QTSplitter* filter) hr = QT_Process_Audio_Track(filter, trk); time = GetMovieDuration(filter->pQTMovie); - scale = GetMovieTimeScale(filter->pQTMovie); - filter->sourceSeeking.llDuration = ((double)time / scale) * 10000000; + filter->movie_scale = GetMovieTimeScale(filter->pQTMovie); + filter->sourceSeeking.llDuration = ((double)time / filter->movie_scale) * 10000000; filter->sourceSeeking.llStop = filter->sourceSeeking.llDuration; TRACE("Movie duration is %s\n",wine_dbgstr_longlong(filter->sourceSeeking.llDuration)); @@ -1364,7 +1368,12 @@ static HRESULT QT_AddPin(QTSplitter *This, const PIN_INFO *piOutput, const AM_ME static HRESULT WINAPI QTSplitter_ChangeStart(IMediaSeeking *iface) { - FIXME("(%p) filter hasn't implemented start position change!\n", iface); + QTSplitter *This = impl_from_IMediaSeeking(iface); + TRACE("(%p)\n", iface); + EnterCriticalSection(&This->csReceive); + This->movie_time = (This->sourceSeeking.llCurrent * This->movie_scale)/10000000; + This->movie_start = This->movie_time; + LeaveCriticalSection(&This->csReceive); return S_OK; } diff --git a/include/tlogstg.idl b/include/tlogstg.idl new file mode 100644 index 0000000..ff82ffc --- /dev/null +++ b/include/tlogstg.idl @@ -0,0 +1,52 @@ +/* + * Copyright 2012 Jacek Caban for CodeWeavers + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "objidl.idl"; +import "oleidl.idl"; +import "shtypes.idl"; + +typedef struct _WINDOWDATA { + DWORD dwWindowID; + UINT uiCP; + PIDLIST_ABSOLUTE pidl; + [string] LPWSTR lpszUrl; + [string] LPWSTR lpszUrlLocation; + [string] LPWSTR lpszTitle; +} WINDOWDATA; + +typedef WINDOWDATA *LPWINDOWDATA; +typedef const WINDOWDATA *LPCWINDOWDATA; + +[ + uuid(241c033e-e659-43da-aa4d-4086dbc4758d), + object +] +interface ITravelLogClient : IUnknown +{ + HRESULT FindWindowByIndex( + [in] DWORD dwID, + [out] IUnknown **ppunk); + + HRESULT GetWindowData( + [in] IStream *pStream, + [out] LPWINDOWDATA pWinData); + + HRESULT LoadHistoryPosition( + [in] LPWSTR pszUrlLocation, + [in] DWORD dwPosition); +}

1 0

Jacek Caban : tlogstg.idl: Added new file and ITravelLogClient declaration.
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: 97f4b22543c44216f5286eb1cd42b201d884eca5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97f4b22543c44216f5286eb1c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 19 15:49:11 2012 +0100 tlogstg.idl: Added new file and ITravelLogClient declaration. --- .gitignore | 1 + dlls/uuid/uuid.c | 1 + include/Makefile.in | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 9164c25..b97d5b5 100644 --- a/.gitignore +++ b/.gitignore @@ -226,6 +226,7 @@ include/stdole2.tlb include/strmif.h include/structuredquerycondition.h include/textstor.h +include/tlogstg.h include/tom.h include/unknwn.h include/urlhist.h diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index 25e98a7..cae55c7 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -83,6 +83,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "sensevts.h" #include "ocmm.h" #include "commoncontrols.h" +#include "tlogstg.h" /* FIXME: cguids declares GUIDs but does not define their values */ diff --git a/include/Makefile.in b/include/Makefile.in index 0c4122e..5ffc5e8 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -92,6 +92,7 @@ PUBLIC_IDL_H_SRCS = \ strmif.idl \ structuredquerycondition.idl \ textstor.idl \ + tlogstg.idl \ tom.idl \ unknwn.idl \ urlhist.idl \

1 0

Jacek Caban : mshtml: Added ITargetContainer:: GetFramesContainer implementation.
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: 537d05fb4bca899d301ff6b1f36d90fc350135a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=537d05fb4bca899d301ff6b1f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 19 17:03:24 2012 +0100 mshtml: Added ITargetContainer::GetFramesContainer implementation. --- dlls/mshtml/oleobj.c | 9 +++++++-- dlls/mshtml/tests/htmldoc.c | 40 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index 9d50347..9f3d75a 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -924,8 +924,13 @@ static HRESULT WINAPI TargetContainer_GetFrameUrl(ITargetContainer *iface, LPWST static HRESULT WINAPI TargetContainer_GetFramesContainer(ITargetContainer *iface, IOleContainer **ppContainer) { HTMLDocumentObj *This = impl_from_ITargetContainer(iface); - FIXME("(%p)->(%p)\n", This, ppContainer); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, ppContainer); + + /* NOTE: we should return wrapped interface here */ + IOleContainer_AddRef(&This->basedoc.IOleContainer_iface); + *ppContainer = &This->basedoc.IOleContainer_iface; + return S_OK; } static const ITargetContainerVtbl TargetContainerVtbl = { diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 736e60f..0fb115a 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -310,6 +310,21 @@ static BOOL is_lang_english(void) return PRIMARYLANGID(GetUserDefaultLangID()) == LANG_ENGLISH; } +static BOOL iface_cmp(IUnknown *iface1, IUnknown *iface2) +{ + IUnknown *unk1, *unk2; + + if(iface1 == iface2) + return TRUE; + + IUnknown_QueryInterface(iface1, &IID_IUnknown, (void**)&unk1); + IUnknown_Release(unk1); + IUnknown_QueryInterface(iface2, &IID_IUnknown, (void**)&unk2); + IUnknown_Release(unk2); + + return unk1 == unk2; +} + #define EXPECT_UPDATEUI 1 #define EXPECT_SETTITLE 2 @@ -5212,7 +5227,6 @@ static void test_open_window(IHTMLDocument2 *doc, BOOL do_block) }else { ok(new_window != NULL, "new_window == NULL\n"); - trace("WINDOW %p\n", new_window); hres = IHTMLWindow2_close(new_window); ok(hres == S_OK, "close failed: %08x\n", hres); } @@ -6170,6 +6184,29 @@ static void test_external(IHTMLDocument2 *doc, BOOL initialized) IHTMLWindow2_Release(htmlwin); } +static void test_target_container(IHTMLDocument2 *doc) +{ + IOleContainer *ole_container, *doc_ole_container; + ITargetContainer *target_container; + HRESULT hres; + + hres = IHTMLDocument2_QueryInterface(doc, &IID_ITargetContainer, (void**)&target_container); + ok(hres == S_OK, "Could not get ITargetContainer iface: %08x\n", hres); + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IOleContainer, (void**)&doc_ole_container); + ok(hres == S_OK, "Could not get ITargetContainer iface: %08x\n", hres); + + ole_container = (void*)0xdeadbeef; + hres = ITargetContainer_GetFramesContainer(target_container, &ole_container); + ok(hres == S_OK, "GetFramesContainer failed: %08x\n", hres); + ok(ole_container != NULL, "ole_container == NULL\n"); + ok(iface_cmp((IUnknown*)ole_container, (IUnknown*)doc_ole_container), "ole_container != doc_ole_container\n"); + IOleContainer_Release(ole_container); + + ITargetContainer_Release(target_container); + IOleContainer_Release(doc_ole_container); +} + static void test_StreamLoad(IHTMLDocument2 *doc) { IPersistStreamInit *init; @@ -6354,6 +6391,7 @@ static void test_HTMLDocument(BOOL do_load) test_OnAmbientPropertyChange(doc); test_Window(doc, TRUE); test_external(doc, TRUE); + test_target_container(doc); test_UIDeactivate(); test_OleCommandTarget(doc);

1 0

Jacek Caban : mshtml: Added IOleContainer::EnumObjects implementation.
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: 3b80784b63f4ad72f077c44a79b6b8b3bd1b1b1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b80784b63f4ad72f077c44a7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 19 17:03:37 2012 +0100 mshtml: Added IOleContainer::EnumObjects implementation. --- dlls/mshtml/oleobj.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 109 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index 9f3d75a..261eda3 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -40,6 +40,102 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define DOCHOST_DOCCANNAVIGATE 0 +typedef struct { + IEnumUnknown IEnumUnknown_iface; + LONG ref; +} EnumUnknown; + +static inline EnumUnknown *impl_from_IEnumUnknown(IEnumUnknown *iface) +{ + return CONTAINING_RECORD(iface, EnumUnknown, IEnumUnknown_iface); +} + +static HRESULT WINAPI EnumUnknown_QueryInterface(IEnumUnknown *iface, REFIID riid, void **ppv) +{ + EnumUnknown *This = impl_from_IEnumUnknown(iface); + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IEnumUnknown_iface; + }else if(IsEqualGUID(&IID_IEnumUnknown, riid)) { + TRACE("(%p)->(IID_IEnumUnknown %p)\n", This, ppv); + *ppv = &This->IEnumUnknown_iface; + }else { + WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI EnumUnknown_AddRef(IEnumUnknown *iface) +{ + EnumUnknown *This = impl_from_IEnumUnknown(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI EnumUnknown_Release(IEnumUnknown *iface) +{ + EnumUnknown *This = impl_from_IEnumUnknown(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) + heap_free(This); + + return ref; +} + +static HRESULT WINAPI EnumUnknown_Next(IEnumUnknown *iface, ULONG celt, IUnknown **rgelt, ULONG *pceltFetched) +{ + EnumUnknown *This = impl_from_IEnumUnknown(iface); + + TRACE("(%p)->(%u %p %p)\n", This, celt, rgelt, pceltFetched); + + /* FIXME: It's not clear if we should ever return something here */ + if(pceltFetched) + *pceltFetched = 0; + return S_FALSE; +} + +static HRESULT WINAPI EnumUnknown_Skip(IEnumUnknown *iface, ULONG celt) +{ + EnumUnknown *This = impl_from_IEnumUnknown(iface); + FIXME("(%p)->(%u)\n", This, celt); + return E_NOTIMPL; +} + +static HRESULT WINAPI EnumUnknown_Reset(IEnumUnknown *iface) +{ + EnumUnknown *This = impl_from_IEnumUnknown(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI EnumUnknown_Clone(IEnumUnknown *iface, IEnumUnknown **ppenum) +{ + EnumUnknown *This = impl_from_IEnumUnknown(iface); + FIXME("(%p)->(%p)\n", This, ppenum); + return E_NOTIMPL; +} + +static const IEnumUnknownVtbl EnumUnknownVtbl = { + EnumUnknown_QueryInterface, + EnumUnknown_AddRef, + EnumUnknown_Release, + EnumUnknown_Next, + EnumUnknown_Skip, + EnumUnknown_Reset, + EnumUnknown_Clone +}; + /********************************************************** * IOleObject implementation */ @@ -871,8 +967,19 @@ static HRESULT WINAPI OleContainer_ParseDisplayName(IOleContainer *iface, IBindC static HRESULT WINAPI OleContainer_EnumObjects(IOleContainer *iface, DWORD grfFlags, IEnumUnknown **ppenum) { HTMLDocument *This = impl_from_IOleContainer(iface); - FIXME("(%p)->(%x %p)\n", This, grfFlags, ppenum); - return E_NOTIMPL; + EnumUnknown *ret; + + TRACE("(%p)->(%x %p)\n", This, grfFlags, ppenum); + + ret = heap_alloc(sizeof(*ret)); + if(!ret) + return E_OUTOFMEMORY; + + ret->IEnumUnknown_iface.lpVtbl = &EnumUnknownVtbl; + ret->ref = 1; + + *ppenum = &ret->IEnumUnknown_iface; + return S_OK; } static HRESULT WINAPI OleContainer_LockContainer(IOleContainer *iface, BOOL fLock)

1 0

Jacek Caban : mshtml: Added IOleContainer::EnumObjects tests.
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: 882d126dbaed7cd1a3d698e17a15d35cb339f7d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=882d126dbaed7cd1a3d698e17… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 19 17:03:51 2012 +0100 mshtml: Added IOleContainer::EnumObjects tests. --- dlls/mshtml/tests/htmldoc.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 0fb115a..a79e50e 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -6184,6 +6184,35 @@ static void test_external(IHTMLDocument2 *doc, BOOL initialized) IHTMLWindow2_Release(htmlwin); } +static void test_enum_objects(IOleContainer *container) +{ + IEnumUnknown *enum_unknown; + IUnknown *buf[100] = {(void*)0xdeadbeef}; + ULONG fetched; + HRESULT hres; + + enum_unknown = NULL; + hres = IOleContainer_EnumObjects(container, OLECONTF_EMBEDDINGS, &enum_unknown); + ok(hres == S_OK, "EnumObjects failed: %08x\n", hres); + ok(enum_unknown != NULL, "enum_unknown == NULL\n"); + + fetched = 0xdeadbeef; + hres = IEnumUnknown_Next(enum_unknown, sizeof(buf)/sizeof(*buf), buf, &fetched); + ok(hres == S_FALSE, "Next returned %08x\n", hres); + ok(!fetched, "fetched = %d\n", fetched); + ok(buf[0] == (void*)0xdeadbeef, "buf[0] = %p\n", buf[0]); + + fetched = 0xdeadbeef; + hres = IEnumUnknown_Next(enum_unknown, 1, buf, &fetched); + ok(hres == S_FALSE, "Next returned %08x\n", hres); + ok(!fetched, "fetched = %d\n", fetched); + + hres = IEnumUnknown_Next(enum_unknown, 1, buf, NULL); + ok(hres == S_FALSE, "Next returned %08x\n", hres); + + IEnumUnknown_Release(enum_unknown); +} + static void test_target_container(IHTMLDocument2 *doc) { IOleContainer *ole_container, *doc_ole_container; @@ -6201,6 +6230,7 @@ static void test_target_container(IHTMLDocument2 *doc) ok(hres == S_OK, "GetFramesContainer failed: %08x\n", hres); ok(ole_container != NULL, "ole_container == NULL\n"); ok(iface_cmp((IUnknown*)ole_container, (IUnknown*)doc_ole_container), "ole_container != doc_ole_container\n"); + test_enum_objects(ole_container); IOleContainer_Release(ole_container); ITargetContainer_Release(target_container);

1 0