February 2008 - Wine-Commits

Jacek Caban : browseui: Code clean up.
by Alexandre Julliard Feb. 21, 2008

Feb. 21, 2008

Module: wine Branch: master Commit: aac079a87d4d345e918a7e554f9f0a0596741307 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aac079a87d4d345e918a7e554… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 20 21:29:39 2008 +0100 browseui: Code clean up. --- dlls/browseui/aclmulti.c | 56 +++++++++++++++++++++------------------------ dlls/browseui/browseui.h | 17 +++++++++++++- 2 files changed, 42 insertions(+), 31 deletions(-) diff --git a/dlls/browseui/aclmulti.c b/dlls/browseui/aclmulti.c index 11ba3b1..95ede34 100644 --- a/dlls/browseui/aclmulti.c +++ b/dlls/browseui/aclmulti.c @@ -58,10 +58,6 @@ typedef struct tagACLMulti { struct ACLMultiSublist *objs; } ACLMulti; -static const IEnumStringVtbl ACLMultiVtbl; -static const IACListVtbl ACLMulti_ACListVtbl; -static const IObjMgrVtbl ACLMulti_ObjMgrVtbl; - static inline ACLMulti *impl_from_IACList(IACList *iface) { return (ACLMulti *)((char *)iface - FIELD_OFFSET(ACLMulti, aclVtbl)); @@ -81,35 +77,14 @@ static void release_obj(struct ACLMultiSublist *obj) IACList_Release(obj->pACL); } -HRESULT ACLMulti_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) -{ - ACLMulti *This; - if (pUnkOuter) - return CLASS_E_NOAGGREGATION; - - This = CoTaskMemAlloc(sizeof(ACLMulti)); - if (This == NULL) - return E_OUTOFMEMORY; - ZeroMemory(This, sizeof(*This)); - This->vtbl = &ACLMultiVtbl; - This->aclVtbl = &ACLMulti_ACListVtbl; - This->objmgrVtbl = &ACLMulti_ObjMgrVtbl; - This->refCount = 1; - - TRACE("returning %p\n", This); - *ppOut = (IUnknown *)This; - BROWSEUI_refCount++; - return S_OK; -} - -static void WINAPI ACLMulti_Destructor(ACLMulti *This) +static void ACLMulti_Destructor(ACLMulti *This) { int i; TRACE("destroying %p\n", This); for (i = 0; i < This->nObjs; i++) release_obj(&This->objs[i]); - CoTaskMemFree(This->objs); - CoTaskMemFree(This); + heap_free(This->objs); + heap_free(This); BROWSEUI_refCount--; } @@ -166,7 +141,7 @@ static HRESULT WINAPI ACLMulti_Append(IObjMgr *iface, IUnknown *obj) if (obj == NULL) return E_FAIL; - This->objs = CoTaskMemRealloc(This->objs, sizeof(This->objs[0]) * (This->nObjs+1)); + This->objs = heap_realloc(This->objs, sizeof(This->objs[0]) * (This->nObjs+1)); This->objs[This->nObjs].punk = obj; IUnknown_AddRef(obj); if (FAILED(IUnknown_QueryInterface(obj, &IID_IEnumString, (LPVOID *)&This->objs[This->nObjs].pEnum))) @@ -189,7 +164,7 @@ static HRESULT WINAPI ACLMulti_Remove(IObjMgr *iface, IUnknown *obj) release_obj(&This->objs[i]); memmove(&This->objs[i], &This->objs[i+1], (This->nObjs-i-1)*sizeof(struct ACLMultiSublist)); This->nObjs--; - This->objs = CoTaskMemRealloc(This->objs, sizeof(This->objs[0]) * This->nObjs); + This->objs = heap_realloc(This->objs, sizeof(This->objs[0]) * This->nObjs); return S_OK; } @@ -328,3 +303,24 @@ static const IACListVtbl ACLMulti_ACListVtbl = ACLMulti_Expand }; + +HRESULT ACLMulti_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) +{ + ACLMulti *This; + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + + This = heap_alloc(sizeof(ACLMulti)); + if (This == NULL) + return E_OUTOFMEMORY; + ZeroMemory(This, sizeof(*This)); + This->vtbl = &ACLMultiVtbl; + This->aclVtbl = &ACLMulti_ACListVtbl; + This->objmgrVtbl = &ACLMulti_ObjMgrVtbl; + This->refCount = 1; + + TRACE("returning %p\n", This); + *ppOut = (IUnknown *)This; + BROWSEUI_refCount++; + return S_OK; +} diff --git a/dlls/browseui/browseui.h b/dlls/browseui/browseui.h index fb46462..0b62009 100644 --- a/dlls/browseui/browseui.h +++ b/dlls/browseui/browseui.h @@ -30,4 +30,19 @@ extern HRESULT CompCatCacheDaemon_Constructor(IUnknown *punkOuter, IUnknown **pp extern const GUID CLSID_CompCatCacheDaemon; -#endif /* __WINE_SHDOCVW_H */ +static inline void *heap_alloc(size_t size) +{ + return HeapAlloc(GetProcessHeap(), 0, size); +} + +static inline void *heap_realloc(void *mem, size_t size) +{ + return mem ? HeapReAlloc(GetProcessHeap(), 0, mem, size) : heap_alloc(size); +} + +static inline BOOL heap_free(void *mem) +{ + return HeapFree(GetProcessHeap(), 0, mem); +} + +#endif /* __WINE_BROWSEUI_H */

1 0

Mikołaj Zalewski : oleview: Move the TypeLib open dialog filter message into a resource.
by Alexandre Julliard Feb. 21, 2008

Feb. 21, 2008

Module: wine Branch: master Commit: 9e1e80a33cc738b26a78e1d329981398f7300d0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e1e80a33cc738b26a78e1d32… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Feb 20 18:47:01 2008 +0100 oleview: Move the TypeLib open dialog filter message into a resource. --- programs/oleview/De.rc | 1 + programs/oleview/En.rc | 1 + programs/oleview/Fr.rc | 1 + programs/oleview/Ko.rc | 1 + programs/oleview/Nl.rc | 1 + programs/oleview/No.rc | 1 + programs/oleview/Pl.rc | 1 + programs/oleview/oleview.c | 9 ++------- programs/oleview/resource.h | 1 + 9 files changed, 10 insertions(+), 7 deletions(-) diff --git a/programs/oleview/De.rc b/programs/oleview/De.rc index 7bbf207..f4ec309 100644 --- a/programs/oleview/De.rc +++ b/programs/oleview/De.rc @@ -96,6 +96,7 @@ STRINGTABLE IDS_ABOUTVER "Version 1.0" IDS_TYPELIBTITLE "ITypeLib-Betrachter" IDS_OPEN "�ffnen" + IDS_OPEN_TYPELIB_FILTER "TypeLib Files (*.tlb;*.olb;*.dll;*.ocx;*.exe)\0*.tlb;*.olb;*.dll;*.ocx;*.exe\0All Files (*.*)\0*.*\0\0" IDM_BIND, "An Datei via Datei-Moniker binden" IDM_TYPELIB, "TypeLib-Datei �ffnen und Inhalt betrachten" diff --git a/programs/oleview/En.rc b/programs/oleview/En.rc index f67f8f9..34f6c33 100644 --- a/programs/oleview/En.rc +++ b/programs/oleview/En.rc @@ -96,6 +96,7 @@ STRINGTABLE IDS_ABOUTVER "version 1.0" IDS_TYPELIBTITLE "ITypeLib viewer" IDS_OPEN "Open" + IDS_OPEN_TYPELIB_FILTER "TypeLib Files (*.tlb;*.olb;*.dll;*.ocx;*.exe)\0*.tlb;*.olb;*.dll;*.ocx;*.exe\0All Files (*.*)\0*.*\0\0" IDM_BIND, "Bind to file via a File Moniker" IDM_TYPELIB, "Open a TypeLib file and view the contents" diff --git a/programs/oleview/Fr.rc b/programs/oleview/Fr.rc index 50f5a03..2d7d6c0 100644 --- a/programs/oleview/Fr.rc +++ b/programs/oleview/Fr.rc @@ -96,6 +96,7 @@ STRINGTABLE IDS_ABOUTVER "version 1.0" IDS_TYPELIBTITLE "Visionneur d'ITypeLib" IDS_OPEN "Ouvrir" + IDS_OPEN_TYPELIB_FILTER "TypeLib Files (*.tlb;*.olb;*.dll;*.ocx;*.exe)\0*.tlb;*.olb;*.dll;*.ocx;*.exe\0All Files (*.*)\0*.*\0\0" IDM_BIND, "Lie � un fichier � l'aide d'un File Moniker" IDM_TYPELIB, "Ouvre un fichier TypeLib et afficher son contenu" diff --git a/programs/oleview/Ko.rc b/programs/oleview/Ko.rc index 318e856..aa373a6 100644 --- a/programs/oleview/Ko.rc +++ b/programs/oleview/Ko.rc @@ -98,6 +98,7 @@ STRINGTABLE IDS_ABOUTVER "�� 1.0" IDS_TYPELIBTITLE "ITypeLib ��" IDS_OPEN "��" + IDS_OPEN_TYPELIB_FILTER "TypeLib Files (*.tlb;*.olb;*.dll;*.ocx;*.exe)\0*.tlb;*.olb;*.dll;*.ocx;*.exe\0All Files (*.*)\0*.*\0\0" IDM_BIND, "�� " IDM_TYPELIB, "Ÿ�� ̺귯�� " diff --git a/programs/oleview/Nl.rc b/programs/oleview/Nl.rc index eacbc3a..cb38aba 100644 --- a/programs/oleview/Nl.rc +++ b/programs/oleview/Nl.rc @@ -96,6 +96,7 @@ STRINGTABLE IDS_ABOUTVER "versie 1.0" IDS_TYPELIBTITLE "ITypeLib Toner" IDS_OPEN "Open" + IDS_OPEN_TYPELIB_FILTER "TypeLib Files (*.tlb;*.olb;*.dll;*.ocx;*.exe)\0*.tlb;*.olb;*.dll;*.ocx;*.exe\0All Files (*.*)\0*.*\0\0" IDM_BIND, "Verbind aan een bestand via een Bestandsbeschrijver (Moniker)" IDM_TYPELIB, "Open een TypeLib bestand en bekijk de inhoud" diff --git a/programs/oleview/No.rc b/programs/oleview/No.rc index 03ab556..e878b3a 100644 --- a/programs/oleview/No.rc +++ b/programs/oleview/No.rc @@ -96,6 +96,7 @@ STRINGTABLE IDS_ABOUTVER "versjon 1.0" IDS_TYPELIBTITLE "ITypeLib-viser" IDS_OPEN "�pne" + IDS_OPEN_TYPELIB_FILTER "TypeLib Files (*.tlb;*.olb;*.dll;*.ocx;*.exe)\0*.tlb;*.olb;*.dll;*.ocx;*.exe\0All Files (*.*)\0*.*\0\0" IDM_BIND, "Bind til fil via File Moniker" IDM_TYPELIB, "�pne en TypeLib-fil og vis innholdet" diff --git a/programs/oleview/Pl.rc b/programs/oleview/Pl.rc index 6963ff3..90cc69e 100644 --- a/programs/oleview/Pl.rc +++ b/programs/oleview/Pl.rc @@ -97,6 +97,7 @@ STRINGTABLE IDS_ABOUTVER "wersja 1.0" IDS_TYPELIBTITLE "Przegl�darka ITypeLib" IDS_OPEN "Otw�rz" + IDS_OPEN_TYPELIB_FILTER "Pliki TypeLib (*.tlb;*.olb;*.dll;*.ocx;*.exe)\0*.tlb;*.olb;*.dll;*.ocx;*.exe\0Wszystkie pliki (*.*)\0*.*\0\0" IDM_BIND, "Dowi�� do pliku za pomoc� obiektu File Moniker" IDM_TYPELIB, "Otw�rz plik z biblioteki typ�w (TypeLib) i wy�wietl jego zawarto��" diff --git a/programs/oleview/oleview.c b/programs/oleview/oleview.c index 978024b..7f6a549 100644 --- a/programs/oleview/oleview.c +++ b/programs/oleview/oleview.c @@ -25,13 +25,6 @@ static WCHAR wszRegEdit[] = { 'r','e','g','e','d','i','t','.','e','x','e','\0' } static WCHAR wszFormat[] = { '<','o','b','j','e','c','t','\n',' ',' ',' ', 'c','l','a','s','s','i','d','=','\"','c','l','s','i','d',':','%','s','\"','\n', '>','\n','<','/','o','b','j','e','c','t','>','\0' }; -WCHAR wszFilter[] = { 'T','y','p','e','L','i','b',' ','F','i','l','e','s',' ', - '(','*','t','l','b',';','*','o','l','b',';','*','.','d','l','l',';', - '*','.','o','c','x',';','*','.','e','x','e',')','\0', - '*','.','t','l','b',';','*','.','o','l','b',';','*','.','d','l','l',';', - '*','.','o','c','x','*','.','e','x','e','\0', - 'A','l','l',' ','F','i','l','e','s',' ','(','*','.','*',')','\0', - '*','.','*','\0','\0' }; INT_PTR CALLBACK SysConfProc(HWND hDlgWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -408,8 +401,10 @@ static int MenuCommand(WPARAM wParam, HWND hWnd) OPENFILENAME ofn; static WCHAR wszTitle[MAX_LOAD_STRING]; static WCHAR wszName[MAX_LOAD_STRING]; + static WCHAR wszFilter[MAX_LOAD_STRING]; LoadString(globals.hMainInst, IDS_OPEN, wszTitle, sizeof(wszTitle)); + LoadString(globals.hMainInst, IDS_OPEN_TYPELIB_FILTER, wszFilter, sizeof(wszFilter)); InitOpenFileName(hWnd, &ofn, wszFilter, wszTitle, wszName); if(GetOpenFileName(&ofn)) CreateTypeLibWindow(globals.hMainInst, wszName); break; diff --git a/programs/oleview/resource.h b/programs/oleview/resource.h index bb37212..e88ec05 100644 --- a/programs/oleview/resource.h +++ b/programs/oleview/resource.h @@ -30,6 +30,7 @@ #define IDS_ABOUTVER 21 #define IDS_OPEN 30 +#define IDS_OPEN_TYPELIB_FILTER 31 #define IDM_BIND 100 #define IDM_TYPELIB 101

1 0

Mikołaj Zalewski : oleview: Add Polish translation.
by Alexandre Julliard Feb. 21, 2008

Feb. 21, 2008

Module: wine Branch: master Commit: 1e3f7a58c2cc7e1d4a253e37211d8e73f3c2e038 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e3f7a58c2cc7e1d4a253e372… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Feb 20 18:31:38 2008 +0100 oleview: Add Polish translation. --- programs/oleview/Pl.rc | 213 ++++++++++++++++++++++++++++++++++++++++++++++ programs/oleview/rsrc.rc | 1 + 2 files changed, 214 insertions(+), 0 deletions(-) diff --git a/programs/oleview/Pl.rc b/programs/oleview/Pl.rc new file mode 100644 index 0000000..a88699a --- /dev/null +++ b/programs/oleview/Pl.rc @@ -0,0 +1,213 @@ +/* + * OleView (Pl.rc) + * Polish Language Support + * + * Copyright 2006 Piotr Caban + * Copyright 2008 Mikolaj Zalewski + * + * 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 + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +IDM_MENU MENU +{ + POPUP "&Plik" + { + MENUITEM "&Dowi�� do pliku...", IDM_BIND + MENUITEM "&Otw�rz bibliotek� typ�w...", IDM_TYPELIB + MENUITEM SEPARATOR + MENUITEM "&Konfiguracja systemu", IDM_SYSCONF + MENUITEM "&Uruchom Edytor Rejestr�w", IDM_REGEDIT + MENUITEM SEPARATOR + MENUITEM "&Zako�cz", IDM_EXIT + } + POPUP "&Obiekt" + { + POPUP "Flagi &CoCreateInstance" + { + MENUITEM "CLSCTX_&INPROC_SERVER", IDM_FLAG_INSERV,CHECKED + MENUITEM "CLSCTX_INPROC_&HANDLER", IDM_FLAG_INHANDL + MENUITEM "CLSCTX_&LOCAL_SERVER", IDM_FLAG_LOCSERV,CHECKED + MENUITEM "CLSCTX_&REMOTE_SERVER", IDM_FLAG_REMSERV + } + MENUITEM SEPARATOR + MENUITEM "Wy�wietl informacje o &typie", IDM_TYPEINFO, GRAYED + MENUITEM SEPARATOR + MENUITEM "Stw�rz &instancj�", IDM_CREATEINST, GRAYED + MENUITEM "Stw�rz instancj� &na", IDM_CREATEINSTON, GRAYED + MENUITEM "&Zwolnij instancj�", IDM_RELEASEINST, GRAYED + MENUITEM SEPARATOR + MENUITEM "Kopiuj C&LSID do schowka", IDM_COPYCLSID, GRAYED + MENUITEM "Kopiuj tag obiektu &HTML do schowka", IDM_HTMLTAG, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Wy�wietl...", IDM_VIEW, GRAYED + } + POPUP "&Widok" + { + MENUITEM "Tryb &eksperta", IDM_EXPERT,CHECKED + MENUITEM SEPARATOR + MENUITEM "&Ukryte kategorie komponent�w", IDM_HIDDEN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Pasek &narz�dzi", IDM_TOOLBAR,CHECKED + MENUITEM "Pasek &stanu", IDM_STATUSBAR,CHECKED + MENUITEM SEPARATOR + MENUITEM "&Od�wie�\tF5", IDM_REFRESH + } + POPUP "Pomo&c" + { + MENUITEM "&OleView - informacje", IDM_ABOUT + } +} + +IDM_TYPELIB MENU +{ + POPUP "&Plik" + { + MENUITEM "Z&apisz jako", IDM_SAVEAS + MENUITEM "&Zamknij", IDM_CLOSE + } + POPUP "&Widok" + { + MENUITEM "&Grupuj wed�ug rodzaju", IDM_GROUP + MENUITEM SEPARATOR + MENUITEM "Pasek &narz�dzi", IDM_TOOLBAR + MENUITEM "Pasek &stanu", IDM_STATUSBAR,CHECKED + } +} + +STRINGTABLE +{ + IDS_APPNAME "OleView" + IDS_APPTITLE "OleView" + IDS_READY "Gotowy" + IDS_ABOUT "OleView - przegl�darka obiekt�w OLE/COM" + IDS_ABOUTVER "wersja 1.0" + IDS_TYPELIBTITLE "Przegl�darka ITypeLib" + IDS_OPEN "Otw�rz" + + IDM_BIND, "Dowi�� do pliku za pomoc� obiektu File Moniker" + IDM_TYPELIB, "Otw�rz plik z biblioteki typ�w (TypeLib) i wy�wietl jego zawarto��" + IDM_SYSCONF, "Zmie� ustawienia Distributed COM tego komputera" + IDM_REGEDIT, "Uruchom Edytor Rejestr�w Wine" + IDM_EXIT, "Zako�cz aplikacj�. Mo�esz zosta� zapytany, czy zapisa� zmiany." + IDM_CREATEINST, "Stw�rz instancj� wybranego obiektu" + IDM_CREATEINSTON, "Stw�rz instancj� wybranego obiektu na okre�lonym komputerze" + IDM_RELEASEINST, "Zwolnij aktualnie wybran� instancj� obiektu" + IDM_COPYCLSID, "Skopiuj GUID aktualnie wybranego obiektu do schowka" + IDM_VIEW, "Wy�wietl przegl�dark� aktualnie wybranego elementu" + IDM_FLAG_INSERV, "U�yj flagi CLSCTX_INPROC_SERVER podczas wywo�ywania CoGetClassObject" + IDM_FLAG_INHANDL, "U�yj flagi CLSCTX_INPROC_HANDLER podczas wywo�ywania CoGetClassObject" + IDM_FLAG_LOCSERV, "U�yj flagi CLSCTX_LOCAL_SERVER podczas wywo�ywania CoGetClassObject" + IDM_FLAG_REMSERV, "U�yj flagi CLSCTX_REMOTE_SERVER podczas wywo�ywania CoGetClassObject" + IDM_EXPERT, "Prze��cz pomi�dzy trybem eksperta i pocz�tkuj�cego" + IDM_HIDDEN, "Prze��cz wy�wietlanie kategorii, kt�re nie musz� by� widoczne" /* ? */ + IDM_TOOLBAR, "Poka� lub ukryj pasek narz�dzi" + IDM_STATUSBAR, "Poka� lub ukryj pasek stanu" + IDM_REFRESH, "Od�wie� wszystkie listy" + IDM_ABOUT, "Wy�wietl informacje o programie, numerze jego wersji i prawach autorskich" + + IDM_SAVEAS, "Zapisz jako plik .IDL lub .H" + IDM_CLOSE, "Zamknij okno" + IDM_GROUP, "Grupuj informacje o typach wed�ug rodzaj�w" + + IDS_TREE_OC, "Klasy obiekt�w" + IDS_TREE_GBCC, "Zgrupowane wed��w kategorii komponent�w" + IDS_TREE_O1O, "Obiekty OLE 1.0" + IDS_TREE_CLO, "Obiekty standardowe COM" + IDS_TREE_AO, "Wszystkie obiekty" + IDS_TREE_AID, "Identyfikatory aplikacji (AppID)" + IDS_TREE_TL, "Biblioteki typ�w (TypeLib)" + IDS_TL_VER, "wer." + IDS_TREE_I, "Interfejsy" + + IDS_TAB_REG, "Rejestr" + IDS_TAB_IMPL, "Implementacja" + IDS_TAB_ACTIV, "Aktywacja" + + IDS_CGCOFAIL, "CoGetClassObject nie powiod�o si�." + IDS_ERROR_UNKN, "Nieznany b��d" + IDS_TRUE, "Prawda" + IDS_FALSE, "Fa�sz" + IDS_BYTES, "bajty(�w)" + + IDS_ERROR_LOADTYPELIB, "LoadTypeLib( %s ) nie powiod�o si� ($%x)" + IDS_INHERITINTERFACES, "Odziedziczone interfejsy" +} + +DLG_CREATEINSTON DIALOG DISCARDABLE 0, 0, 250, 41 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "Po��cz z innym komputerem" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Nazwa komputera:", IDIGNORE, 5, 6, 190, 8 + EDITTEXT IDC_MACHINE, 5, 16, 190, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL + DEFPUSHBUTTON "&OK", IDOK, 200, 5, 45, 14 + PUSHBUTTON "&Anuluj", IDCANCEL, 200, 22, 45, 14 +} + +DLG_SYSCONF DIALOG DISCARDABLE 0, 0, 170, 100 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "Konfiguracja systemu" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Ustawienia systemu", IDIGNORE, 5, 6, 160, 8 + CHECKBOX "W��cz &Distributed COM", IDC_ENABLEDCOM, 5, 20, 160, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX + CHECKBOX "W��cz &zadalne po��czenia (tylko Win95)", IDC_ENABLEREMOTE, 5, 35, 160, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX + LTEXT "Te ustawienia zmieniaj� tylko warto�ci w rejestrze. Nie maj� wp�ywu na zachowanie Wine.", IDIGNORE, 5, 50, 160, 40 + DEFPUSHBUTTON "&OK", IDOK, 70, 80, 45, 14 + PUSHBUTTON "&Anuluj", IDCANCEL, 120, 80, 45, 14 +} + +DLG_DEFAULT_IV DIALOG DISCARDABLE 0, 0, 280, 50 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "Standardowa przegl�darka interfejsu" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Interfejs", IDIGNORE, 5, 6, 50, 8 + LTEXT "", IDC_LABEL, 60, 6, 145, 8 + LTEXT "IID:", IDIGNORE, 5, 16, 50, 8 + LTEXT "", IDC_IDENTIFIER, 60, 16, 165, 8 + DEFPUSHBUTTON "&Zamknij", IDCANCEL, 230, 6, 45, 14 + PUSHBUTTON "&Wy�wietl TypeInfo", IDC_VIEWTYPEINFO, 6, 31, 70, 14, WS_DISABLED +} + +DLG_IPERSIST_IV DIALOG DISCARDABLE 0, 0, 280, 29 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "Przegl�darka interfejsu IPersist" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Nazwa klasy:", IDIGNORE, 5, 6, 50, 8 + LTEXT "", IDC_LABEL, 60, 6, 145, 8 + LTEXT "CLSID:", IDIGNORE, 5, 16, 50, 8 + LTEXT "", IDC_IDENTIFIER, 60, 16, 165, 8 + DEFPUSHBUTTON "&Zamknij", IDCANCEL, 230, 6, 45, 14 +} + +DLG_IPERSISTSTREAM_IV DIALOG DISCARDABLE 0, 0, 280, 68 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "Przegl�darka interfejsu IPersistStream" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Nazwa klasy:", IDIGNORE, 5, 6, 50, 8 + LTEXT "", IDC_LABEL, 60, 6, 145, 8 + LTEXT "CLSID:", IDIGNORE, 5, 16, 50, 8 + LTEXT "", IDC_IDENTIFIER, 60, 16, 165, 8 + DEFPUSHBUTTON "&Zamknij", IDCANCEL, 230, 6, 45, 14 + PUSHBUTTON "&IsDirty", IDC_ISDIRTY_BUTTON, 6, 31, 50, 14 + LTEXT "???", IDC_ISDIRTY, 60, 34, 145, 8 + PUSHBUTTON "&GetSizeMax", IDC_GETSIZEMAX_BUTTON, 6, 49, 50, 14 + LTEXT "???", IDC_GETSIZEMAX, 60, 52, 145, 8 +} diff --git a/programs/oleview/rsrc.rc b/programs/oleview/rsrc.rc index 2053acd..c1a5890 100644 --- a/programs/oleview/rsrc.rc +++ b/programs/oleview/rsrc.rc @@ -29,6 +29,7 @@ #include "Ko.rc" #include "Nl.rc" #include "No.rc" +#include "Pl.rc" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

1 0

Mikołaj Zalewski : oleview: Add ellipsis to menu items that show dialogs.
by Alexandre Julliard Feb. 21, 2008

Feb. 21, 2008

Module: wine Branch: master Commit: c610afe7b45d41232a669d0d875e08044d203c21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c610afe7b45d41232a669d0d8… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Feb 20 18:35:50 2008 +0100 oleview: Add ellipsis to menu items that show dialogs. --- programs/oleview/De.rc | 4 ++-- programs/oleview/En.rc | 6 +++--- programs/oleview/Fr.rc | 6 +++--- programs/oleview/Ko.rc | 6 +++--- programs/oleview/Nl.rc | 6 +++--- programs/oleview/No.rc | 6 +++--- programs/oleview/Pl.rc | 6 +++--- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/programs/oleview/De.rc b/programs/oleview/De.rc index e6605f4..7bbf207 100644 --- a/programs/oleview/De.rc +++ b/programs/oleview/De.rc @@ -46,7 +46,7 @@ IDM_MENU MENU MENUITEM "&Typ-Informationen anzeigen", IDM_TYPEINFO, GRAYED MENUITEM SEPARATOR MENUITEM "&Instanz erstellen", IDM_CREATEINST, GRAYED - MENUITEM "Instanz erstellen &auf", IDM_CREATEINSTON, GRAYED + MENUITEM "Instanz erstellen &auf...", IDM_CREATEINSTON, GRAYED MENUITEM "Instanz &freigeben", IDM_RELEASEINST, GRAYED MENUITEM SEPARATOR MENUITEM "C&LSID in Zwischenablage kopieren", IDM_COPYCLSID, GRAYED @@ -75,7 +75,7 @@ IDM_TYPELIB MENU { POPUP "&Datei" { - MENUITEM "&Speichern unter", IDM_SAVEAS + MENUITEM "&Speichern unter...", IDM_SAVEAS MENUITEM "&Schliessen", IDM_CLOSE } POPUP "&Ansicht" diff --git a/programs/oleview/En.rc b/programs/oleview/En.rc index f3bd451..f67f8f9 100644 --- a/programs/oleview/En.rc +++ b/programs/oleview/En.rc @@ -28,7 +28,7 @@ IDM_MENU MENU MENUITEM "&Bind to file...", IDM_BIND MENUITEM "&View TypeLib...", IDM_TYPELIB MENUITEM SEPARATOR - MENUITEM "&System Configuration", IDM_SYSCONF + MENUITEM "&System Configuration...", IDM_SYSCONF MENUITEM "&Run the Registry Editor", IDM_REGEDIT MENUITEM SEPARATOR MENUITEM "E&xit", IDM_EXIT @@ -46,7 +46,7 @@ IDM_MENU MENU MENUITEM "View &Type information", IDM_TYPEINFO, GRAYED MENUITEM SEPARATOR MENUITEM "Create &Instance", IDM_CREATEINST, GRAYED - MENUITEM "Create Instance &On", IDM_CREATEINSTON, GRAYED + MENUITEM "Create Instance &On...", IDM_CREATEINSTON, GRAYED MENUITEM "&Release Instance", IDM_RELEASEINST, GRAYED MENUITEM SEPARATOR MENUITEM "Copy C&LSID to clipboard", IDM_COPYCLSID, GRAYED @@ -75,7 +75,7 @@ IDM_TYPELIB MENU { POPUP "&File" { - MENUITEM "&Save as", IDM_SAVEAS + MENUITEM "&Save as...", IDM_SAVEAS MENUITEM "&Close", IDM_CLOSE } POPUP "&View" diff --git a/programs/oleview/Fr.rc b/programs/oleview/Fr.rc index c3563f6..50f5a03 100644 --- a/programs/oleview/Fr.rc +++ b/programs/oleview/Fr.rc @@ -28,7 +28,7 @@ IDM_MENU MENU MENUITEM "&Lier au fichier...", IDM_BIND MENUITEM "&Afficher la TypeLib...", IDM_TYPELIB MENUITEM SEPARATOR - MENUITEM "&Configuration syst�me", IDM_SYSCONF + MENUITEM "&Configuration syst�me...", IDM_SYSCONF MENUITEM "&Ex�cuter l'�diteur de la base de registre", IDM_REGEDIT MENUITEM SEPARATOR MENUITEM "&Quitter", IDM_EXIT @@ -46,7 +46,7 @@ IDM_MENU MENU MENUITEM "Afficher les informations sur le &type", IDM_TYPEINFO, GRAYED MENUITEM SEPARATOR MENUITEM "Cr�er une &instance", IDM_CREATEINST, GRAYED - MENUITEM "Cr�er une instance &sur", IDM_CREATEINSTON, GRAYED + MENUITEM "Cr�er une instance &sur...", IDM_CREATEINSTON, GRAYED MENUITEM "&Lib�rer l'instance", IDM_RELEASEINST, GRAYED MENUITEM SEPARATOR MENUITEM "Copier le &CLSID dans le presse-papiers", IDM_COPYCLSID, GRAYED @@ -75,7 +75,7 @@ IDM_TYPELIB MENU { POPUP "&Fichier" { - MENUITEM "Enregistrer &sous", IDM_SAVEAS + MENUITEM "Enregistrer &sous...", IDM_SAVEAS MENUITEM "&Fermer", IDM_CLOSE } POPUP "&Affichage" diff --git a/programs/oleview/Ko.rc b/programs/oleview/Ko.rc index 8fab7ff..318e856 100644 --- a/programs/oleview/Ko.rc +++ b/programs/oleview/Ko.rc @@ -29,7 +29,7 @@ IDM_MENU MENU MENUITEM "��Ͽ� ��(&B)...", IDM_BIND MENUITEM "Ÿ�� ̺귯�� (&V)...", IDM_TYPELIB MENUITEM SEPARATOR - MENUITEM "�ý�� (&S)", IDM_SYSCONF + MENUITEM "�ý�� (&S)...", IDM_SYSCONF MENUITEM "��Ʈ�� (&R)", IDM_REGEDIT MENUITEM SEPARATOR MENUITEM "��(&X)", IDM_EXIT @@ -47,7 +47,7 @@ IDM_MENU MENU MENUITEM "Ÿ�� (&T)", IDM_TYPEINFO, GRAYED MENUITEM SEPARATOR MENUITEM "�ν��Ͻ� ��(&I)", IDM_CREATEINST, GRAYED - MENUITEM "�ν��Ʈ ��(Instance &On) ��", IDM_CREATEINSTON, GRAYED + MENUITEM "�ν��Ʈ ��(Instance &On) ��...", IDM_CREATEINSTON, GRAYED MENUITEM "�ν��Ʈ ��ϱ�(&R)", IDM_RELEASEINST, GRAYED MENUITEM SEPARATOR MENUITEM "C&LSID�� Ŭ�� ", IDM_COPYCLSID, GRAYED @@ -76,7 +76,7 @@ IDM_TYPELIB MENU { POPUP "��(&F)" { - MENUITEM "�ٸ� �̸�� (&S)", IDM_SAVEAS + MENUITEM "�ٸ� �̸�� (&S)...", IDM_SAVEAS MENUITEM "�ݱ�(&C)", IDM_CLOSE } POPUP "��(&V)" diff --git a/programs/oleview/Nl.rc b/programs/oleview/Nl.rc index 8ac4598..eacbc3a 100644 --- a/programs/oleview/Nl.rc +++ b/programs/oleview/Nl.rc @@ -28,7 +28,7 @@ IDM_MENU MENU MENUITEM "&Verbind aan bestand...", IDM_BIND MENUITEM "&Bekijk TypeLib...", IDM_TYPELIB MENUITEM SEPARATOR - MENUITEM "&Systeem Configuratie", IDM_SYSCONF + MENUITEM "&Systeem Configuratie...", IDM_SYSCONF MENUITEM "&Run de Register Editer", IDM_REGEDIT MENUITEM SEPARATOR MENUITEM "&Afsluiten", IDM_EXIT @@ -46,7 +46,7 @@ IDM_MENU MENU MENUITEM "Bekijk &Type informatie", IDM_TYPEINFO, GRAYED MENUITEM SEPARATOR MENUITEM "Cre�er &Instantie", IDM_CREATEINST, GRAYED - MENUITEM "Cre�er Instantie &Op", IDM_CREATEINSTON, GRAYED + MENUITEM "Cre�er Instantie &Op...", IDM_CREATEINSTON, GRAYED MENUITEM "&Verwijder Instantie", IDM_RELEASEINST, GRAYED MENUITEM SEPARATOR MENUITEM "Copieer C&LSID naar clipbord", IDM_COPYCLSID, GRAYED @@ -75,7 +75,7 @@ IDM_TYPELIB MENU { POPUP "&Bestand" { - MENUITEM "Op&slaan als", IDM_SAVEAS + MENUITEM "Op&slaan als...", IDM_SAVEAS MENUITEM "S&luiten", IDM_CLOSE } POPUP "Be&kijken" diff --git a/programs/oleview/No.rc b/programs/oleview/No.rc index c904987..03ab556 100644 --- a/programs/oleview/No.rc +++ b/programs/oleview/No.rc @@ -28,7 +28,7 @@ IDM_MENU MENU MENUITEM "&Bind til fil . . .", IDM_BIND MENUITEM "&Vis TypeLib . . .", IDM_TYPELIB MENUITEM SEPARATOR - MENUITEM "&Systemoppsett", IDM_SYSCONF + MENUITEM "&Systemoppsett . . .", IDM_SYSCONF MENUITEM "Kj�&r registerredigerer", IDM_REGEDIT MENUITEM SEPARATOR MENUITEM "&Avslutt", IDM_EXIT @@ -46,7 +46,7 @@ IDM_MENU MENU MENUITEM "Vis &type-informasjon", IDM_TYPEINFO, GRAYED MENUITEM SEPARATOR MENUITEM "Opprett &instans", IDM_CREATEINST, GRAYED - MENUITEM "&Opprett instans p�", IDM_CREATEINSTON, GRAYED + MENUITEM "&Opprett instans p� . . .", IDM_CREATEINSTON, GRAYED MENUITEM "&Slipp instans", IDM_RELEASEINST, GRAYED MENUITEM SEPARATOR MENUITEM "Kopier C&LSID til utklippstavlen", IDM_COPYCLSID, GRAYED @@ -75,7 +75,7 @@ IDM_TYPELIB MENU { POPUP "&Fil" { - MENUITEM "Lagre &som", IDM_SAVEAS + MENUITEM "Lagre &som . . .", IDM_SAVEAS MENUITEM "&Lukk", IDM_CLOSE } POPUP "&Vis" diff --git a/programs/oleview/Pl.rc b/programs/oleview/Pl.rc index a88699a..6963ff3 100644 --- a/programs/oleview/Pl.rc +++ b/programs/oleview/Pl.rc @@ -29,7 +29,7 @@ IDM_MENU MENU MENUITEM "&Dowi�� do pliku...", IDM_BIND MENUITEM "&Otw�rz bibliotek� typ�w...", IDM_TYPELIB MENUITEM SEPARATOR - MENUITEM "&Konfiguracja systemu", IDM_SYSCONF + MENUITEM "&Konfiguracja systemu...", IDM_SYSCONF MENUITEM "&Uruchom Edytor Rejestr�w", IDM_REGEDIT MENUITEM SEPARATOR MENUITEM "&Zako�cz", IDM_EXIT @@ -47,7 +47,7 @@ IDM_MENU MENU MENUITEM "Wy�wietl informacje o &typie", IDM_TYPEINFO, GRAYED MENUITEM SEPARATOR MENUITEM "Stw�rz &instancj�", IDM_CREATEINST, GRAYED - MENUITEM "Stw�rz instancj� &na", IDM_CREATEINSTON, GRAYED + MENUITEM "Stw�rz instancj� &na...", IDM_CREATEINSTON, GRAYED MENUITEM "&Zwolnij instancj�", IDM_RELEASEINST, GRAYED MENUITEM SEPARATOR MENUITEM "Kopiuj C&LSID do schowka", IDM_COPYCLSID, GRAYED @@ -76,7 +76,7 @@ IDM_TYPELIB MENU { POPUP "&Plik" { - MENUITEM "Z&apisz jako", IDM_SAVEAS + MENUITEM "Z&apisz jako...", IDM_SAVEAS MENUITEM "&Zamknij", IDM_CLOSE } POPUP "&Widok"

1 0

Chris Robinson : winemp3: Don't keep unused data buffered.
by Alexandre Julliard Feb. 21, 2008

Feb. 21, 2008

Module: wine Branch: master Commit: 8f46a5119249562aceabff6d120948cbfacb6423 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f46a5119249562aceabff6d1… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Wed Feb 20 05:14:07 2008 -0800 winemp3: Don't keep unused data buffered. --- dlls/winemp3.acm/interface.c | 5 ++++- dlls/winemp3.acm/mpegl3.c | 7 +++++-- dlls/winemp3.acm/mpglib.h | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/winemp3.acm/interface.c b/dlls/winemp3.acm/interface.c index 336a4f8..6ed8562 100644 --- a/dlls/winemp3.acm/interface.c +++ b/dlls/winemp3.acm/interface.c @@ -48,7 +48,7 @@ BOOL InitMP3(struct mpstr *mp) return !0; } -void ExitMP3(struct mpstr *mp) +void ClearMP3Buffer(struct mpstr *mp) { struct buf *b,*bn; @@ -59,6 +59,9 @@ void ExitMP3(struct mpstr *mp) free(b); b = bn; } + mp->tail = NULL; + mp->head = NULL; + mp->bsize = 0; } static struct buf *addbuf(struct mpstr *mp,const unsigned char *buf,int size) diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c index e960dbe..3d18c9e 100644 --- a/dlls/winemp3.acm/mpegl3.c +++ b/dlls/winemp3.acm/mpegl3.c @@ -163,6 +163,9 @@ static void mp3_horse(PACMDRVSTREAMINSTANCE adsi, buffered_after = get_num_buffered_bytes(&amd->mp); TRACE("before %d put %d during %d after %d\n", buffered_before, *nsrc, buffered_during, buffered_after); + + *nsrc -= buffered_after; + ClearMP3Buffer(&amd->mp); } /*********************************************************************** @@ -376,7 +379,7 @@ static LRESULT MPEG3_FormatSuggest(PACMDRVFORMATSUGGEST adfs) */ static void MPEG3_Reset(PACMDRVSTREAMINSTANCE adsi, AcmMpeg3Data* aad) { - ExitMP3(&aad->mp); + ClearMP3Buffer(&aad->mp); InitMP3(&aad->mp); } @@ -438,7 +441,7 @@ static LRESULT MPEG3_StreamOpen(PACMDRVSTREAMINSTANCE adsi) */ static LRESULT MPEG3_StreamClose(PACMDRVSTREAMINSTANCE adsi) { - ExitMP3(&((AcmMpeg3Data*)adsi->dwDriver)->mp); + ClearMP3Buffer(&((AcmMpeg3Data*)adsi->dwDriver)->mp); HeapFree(GetProcessHeap(), 0, (void*)adsi->dwDriver); return MMSYSERR_NOERROR; } diff --git a/dlls/winemp3.acm/mpglib.h b/dlls/winemp3.acm/mpglib.h index 4efe8ae..865e781 100644 --- a/dlls/winemp3.acm/mpglib.h +++ b/dlls/winemp3.acm/mpglib.h @@ -62,7 +62,7 @@ extern "C" { BOOL InitMP3(struct mpstr *mp); int decodeMP3(struct mpstr *mp,const unsigned char *inmemory,int inmemsize, unsigned char *outmemory,int outmemsize,int *done); -void ExitMP3(struct mpstr *mp); +void ClearMP3Buffer(struct mpstr *mp); #ifdef __cplusplus }

1 0

Alistair Leslie-Hughes : msxml3: Implement IDispatch for IXMLDOMImplementation.
by Alexandre Julliard Feb. 21, 2008

Feb. 21, 2008

Module: wine Branch: master Commit: f90fcca18120d0cfbfb61fc4d221313cddf618d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f90fcca18120d0cfbfb61fc4d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Feb 20 23:05:45 2008 +1100 msxml3: Implement IDispatch for IXMLDOMImplementation. --- dlls/msxml3/domimpl.c | 57 +++++++++++++++++++++++++++++++++++++------ dlls/msxml3/main.c | 1 + dlls/msxml3/msxml_private.h | 1 + 3 files changed, 51 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/domimpl.c b/dlls/msxml3/domimpl.c index c8afd6d..090c2c4 100644 --- a/dlls/msxml3/domimpl.c +++ b/dlls/msxml3/domimpl.c @@ -99,8 +99,13 @@ static HRESULT WINAPI dimimpl_GetTypeInfoCount( IXMLDOMImplementation *iface, UINT* pctinfo ) { - FIXME("\n"); - return E_NOTIMPL; + domimpl *This = impl_from_IXMLDOMImplementation( iface ); + + TRACE("(%p)->(%p)\n", This, pctinfo); + + *pctinfo = 1; + + return S_OK; } static HRESULT WINAPI dimimpl_GetTypeInfo( @@ -108,8 +113,14 @@ static HRESULT WINAPI dimimpl_GetTypeInfo( UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo ) { - FIXME("\n"); - return E_NOTIMPL; + domimpl *This = impl_from_IXMLDOMImplementation( iface ); + HRESULT hr; + + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + + hr = get_typeinfo(IXMLDOMImplementation_tid, ppTInfo); + + return hr; } static HRESULT WINAPI dimimpl_GetIDsOfNames( @@ -117,8 +128,24 @@ static HRESULT WINAPI dimimpl_GetIDsOfNames( REFIID riid, LPOLESTR* rgszNames, UINT cNames, LCID lcid, DISPID* rgDispId ) { - FIXME("\n"); - return E_NOTIMPL; + domimpl *This = impl_from_IXMLDOMImplementation( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, + lcid, rgDispId); + + if(!rgszNames || cNames == 0 || !rgDispId) + return E_INVALIDARG; + + hr = get_typeinfo(IXMLDOMImplementation_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI dimimpl_Invoke( @@ -127,8 +154,22 @@ static HRESULT WINAPI dimimpl_Invoke( WORD wFlags, DISPPARAMS* pDispParams, VARIANT* pVarResult, EXCEPINFO* pExcepInfo, UINT* puArgErr ) { - FIXME("\n"); - return E_NOTIMPL; + domimpl *This = impl_from_IXMLDOMImplementation( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hr = get_typeinfo(IXMLDOMImplementation_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, &(This->lpVtbl), dispIdMember, wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI dimimpl_hasFeature(IXMLDOMImplementation* This, BSTR feature, BSTR version, VARIANT_BOOL *hasFeature) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 5cce644..92e9dbb 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -49,6 +49,7 @@ static REFIID tid_ids[] = { &IID_IXMLDOMDocumentFragment, &IID_IXMLDOMElement, &IID_IXMLDOMEntityReference, + &IID_IXMLDOMImplementation, &IID_IXMLDOMNamedNodeMap, &IID_IXMLDOMNodeList, &IID_IXMLDOMParseError, diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 96bb3de..6feb8ac 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -99,6 +99,7 @@ enum tid_t { IXMLDOMDocumentFragment_tid, IXMLDOMElement_tid, IXMLDOMEntityReference_tid, + IXMLDOMImplementation_tid, IXMLDOMNamedNodeMap_tid, IXMLDOMNodeList_tid, IXMLDOMParseError_tid,

1 0

Alistair Leslie-Hughes : msxml3: Implement IDispatch for IXMLDOMNodeList.
by Alexandre Julliard Feb. 21, 2008

Feb. 21, 2008

Module: wine Branch: master Commit: 64683549b0919e1608e4c2477220827883b4707a URL: http://source.winehq.org/git/wine.git/?a=commit;h=64683549b0919e1608e4c2477… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 21 20:24:32 2008 +1100 msxml3: Implement IDispatch for IXMLDOMNodeList. --- dlls/msxml3/nodelist.c | 57 +++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 49 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/nodelist.c b/dlls/msxml3/nodelist.c index 9b1aa90..79bc710 100644 --- a/dlls/msxml3/nodelist.c +++ b/dlls/msxml3/nodelist.c @@ -111,8 +111,13 @@ static HRESULT WINAPI xmlnodelist_GetTypeInfoCount( IXMLDOMNodeList *iface, UINT* pctinfo ) { - FIXME("\n"); - return E_NOTIMPL; + xmlnodelist *This = impl_from_IXMLDOMNodeList( iface ); + + TRACE("(%p)->(%p)\n", This, pctinfo); + + *pctinfo = 1; + + return S_OK; } static HRESULT WINAPI xmlnodelist_GetTypeInfo( @@ -121,8 +126,14 @@ static HRESULT WINAPI xmlnodelist_GetTypeInfo( LCID lcid, ITypeInfo** ppTInfo ) { - FIXME("\n"); - return E_NOTIMPL; + xmlnodelist *This = impl_from_IXMLDOMNodeList( iface ); + HRESULT hr; + + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + + hr = get_typeinfo(IXMLDOMNodeList_tid, ppTInfo); + + return hr; } static HRESULT WINAPI xmlnodelist_GetIDsOfNames( @@ -133,8 +144,24 @@ static HRESULT WINAPI xmlnodelist_GetIDsOfNames( LCID lcid, DISPID* rgDispId ) { - FIXME("\n"); - return E_NOTIMPL; + xmlnodelist *This = impl_from_IXMLDOMNodeList( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, + lcid, rgDispId); + + if(!rgszNames || cNames == 0 || !rgDispId) + return E_INVALIDARG; + + hr = get_typeinfo(IXMLDOMNodeList_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI xmlnodelist_Invoke( @@ -148,8 +175,22 @@ static HRESULT WINAPI xmlnodelist_Invoke( EXCEPINFO* pExcepInfo, UINT* puArgErr ) { - FIXME("\n"); - return E_NOTIMPL; + xmlnodelist *This = impl_from_IXMLDOMNodeList( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hr = get_typeinfo(IXMLDOMNodeList_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, &(This->lpVtbl), dispIdMember, wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI xmlnodelist_get_item(

1 0

Alistair Leslie-Hughes : msxml3: Added PI tests.
by Alexandre Julliard Feb. 21, 2008

Feb. 21, 2008

Module: wine Branch: master Commit: 93d1c2755ac287facf99f3afbe861e7cecde2a36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93d1c2755ac287facf99f3afb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Feb 20 22:35:07 2008 +1100 msxml3: Added PI tests. --- dlls/msxml3/tests/domdoc.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 8609e5d..ccd20e5 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -645,6 +645,18 @@ static void test_domdoc( void ) ok( !lstrcmpW( str, _bstr_("processinginstruction") ), "incorrect nodeTypeString string\n"); SysFreeString(str); + /* test get_nodeValue */ + r = IXMLDOMProcessingInstruction_get_nodeValue(nodePI, &var); + ok(r == S_OK, "ret %08x\n", r ); + ok( !lstrcmpW( V_BSTR(&var), _bstr_("version=\"1.0\"") ), "incorrect data string\n"); + VariantClear(&var); + + /* test get_data */ + r = IXMLDOMProcessingInstruction_get_data(nodePI, &str); + ok(r == S_OK, "ret %08x\n", r ); + ok( !lstrcmpW( str, _bstr_("version=\"1.0\"") ), "incorrect data string\n"); + SysFreeString(str); + IXMLDOMProcessingInstruction_Release(nodePI); }

1 0

Alistair Leslie-Hughes : msxml3: Implement get_data for PI Nodes.
by Alexandre Julliard Feb. 21, 2008

Feb. 21, 2008

Module: wine Branch: master Commit: 8c4f9fe62c7d373a4b9bbd2e41ef21fe31ff2426 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c4f9fe62c7d373a4b9bbd2e4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Feb 20 22:34:31 2008 +1100 msxml3: Implement get_data for PI Nodes. --- dlls/msxml3/pi.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index a0b0cf2..fcef7a0 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -483,8 +483,20 @@ static HRESULT WINAPI dom_pi_get_data( IXMLDOMProcessingInstruction *iface, BSTR *p) { - FIXME("\n"); - return E_NOTIMPL; + dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); + HRESULT hr = E_FAIL; + VARIANT vRet; + + if(!p) + return E_INVALIDARG; + + hr = IXMLDOMNode_get_nodeValue( This->node, &vRet ); + if(hr == S_OK) + { + *p = V_BSTR(&vRet); + } + + return hr; } static HRESULT WINAPI dom_pi_put_data(

1 0

Alistair Leslie-Hughes : msxml3: Correct get_nodeValue for PI Nodes.
by Alexandre Julliard Feb. 21, 2008

Feb. 21, 2008

Module: wine Branch: master Commit: a2debce7c54b6faa8fcd3989c3c4abecc1679b17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2debce7c54b6faa8fcd3989c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Feb 20 22:34:01 2008 +1100 msxml3: Correct get_nodeValue for PI Nodes. --- dlls/msxml3/node.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index ba3fc58..1b6c9d1 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -251,6 +251,7 @@ static HRESULT WINAPI xmlnode_get_nodeValue( switch ( This->node->type ) { + case XML_PI_NODE: case XML_ATTRIBUTE_NODE: { xmlChar *content = xmlNodeGetContent(This->node); @@ -269,7 +270,7 @@ static HRESULT WINAPI xmlnode_get_nodeValue( case XML_DOCUMENT_NODE: /* these seem to return NULL */ break; - case XML_PI_NODE: + default: FIXME("node %p type %d\n", This, This->node->type); }

1 0