wine-commits August 2010

wine-commits@winehq.org

2 participants
884 discussions

David Hedberg : explorerframe: Implement GetNextItem.
by Alexandre Julliard 18 Aug '10

18 Aug '10

Module: wine Branch: master Commit: 29bf096f276bf478c166bda3b03b54eb626d7dea URL: http://source.winehq.org/git/wine.git/?a=commit;h=29bf096f276bf478c166bda3b… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Wed Aug 18 07:08:14 2010 +0200 explorerframe: Implement GetNextItem. --- dlls/explorerframe/nstc.c | 39 ++++++++++++++++++++++++++- dlls/explorerframe/tests/nstc.c | 54 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 2 deletions(-) diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index c993b08..28029e5 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -1256,8 +1256,43 @@ static HRESULT WINAPI NSTC2_fnGetNextItem(INameSpaceTreeControl2* iface, IShellItem **ppsiNext) { NSTC2Impl *This = (NSTC2Impl*)iface; - FIXME("stub, %p (%p, %x, %p)\n", This, psi, nstcgi, ppsiNext); - return E_NOTIMPL; + HTREEITEM hitem, hnext; + UINT tvgn; + TRACE("%p (%p, %x, %p)\n", This, psi, nstcgi, ppsiNext); + + if(!ppsiNext) return E_POINTER; + if(!psi) return E_FAIL; + + *ppsiNext = NULL; + + hitem = treeitem_from_shellitem(This, psi); + if(!hitem) + return E_INVALIDARG; + + switch(nstcgi) + { + case NSTCGNI_NEXT: tvgn = TVGN_NEXT; break; + case NSTCGNI_NEXTVISIBLE: tvgn = TVGN_NEXTVISIBLE; break; + case NSTCGNI_PREV: tvgn = TVGN_PREVIOUS; break; + case NSTCGNI_PREVVISIBLE: tvgn = TVGN_PREVIOUSVISIBLE; break; + case NSTCGNI_PARENT: tvgn = TVGN_PARENT; break; + case NSTCGNI_CHILD: tvgn = TVGN_CHILD; break; + case NSTCGNI_FIRSTVISIBLE: tvgn = TVGN_FIRSTVISIBLE; break; + case NSTCGNI_LASTVISIBLE: tvgn = TVGN_LASTVISIBLE; break; + default: + FIXME("Unknown nstcgi value %d\n", nstcgi); + return E_FAIL; + } + + hnext = (HTREEITEM)SendMessageW(This->hwnd_tv, TVM_GETNEXTITEM, tvgn, (WPARAM)hitem); + if(hnext) + { + *ppsiNext = shellitem_from_treeitem(This, hnext); + IShellItem_AddRef(*ppsiNext); + return S_OK; + } + + return E_FAIL; } static HRESULT WINAPI NSTC2_fnHitTest(INameSpaceTreeControl2* iface, diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index 5d650a9..89ed1e0 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -1329,6 +1329,7 @@ static void test_events(void) IOleWindow *pow; LPITEMIDLIST pidl_desktop; NSTCITEMSTATE itemstate; + IShellItem *psi; DWORD cookie1, cookie2; HWND hwnd_tv; HRESULT hr; @@ -1797,6 +1798,59 @@ static void test_events(void) ok_event_count(pnstceimpl, OnItemDeleted, 1); ok_no_events(pnstceimpl); + /* GetNextItem */ + hr = INameSpaceTreeControl_GetNextItem(pnstc, NULL, 0, NULL); + ok(hr == E_POINTER, "Got (0x%08x)\n", hr); + ok_no_events(pnstceimpl); + + hr = INameSpaceTreeControl_GetNextItem(pnstc, psidesktop, 0, NULL); + ok(hr == E_POINTER, "Got (0x%08x)\n", hr); + ok_no_events(pnstceimpl); + + hr = INameSpaceTreeControl_GetNextItem(pnstc, NULL, 0, &psi); + ok(hr == E_FAIL, "Got (0x%08x)\n", hr); + ok_no_events(pnstceimpl); + + hr = INameSpaceTreeControl_GetNextItem(pnstc, psidesktop, 0, &psi); + ok(hr == E_INVALIDARG, "Got (0x%08x)\n", hr); + ok_no_events(pnstceimpl); + + hr = INameSpaceTreeControl_AppendRoot(pnstc, psidesktop, SHCONTF_FOLDERS | SHCONTF_NONFOLDERS, 0, NULL); + ok(hr == S_OK, "Got (0x%08x)\n", hr); + process_msgs(); + ok_event_count_broken(pnstceimpl, OnItemAdded, 1, 0 /* Vista */); + ok_no_events(pnstceimpl); + + /* Get child from unexpanded and unfilled parent */ + psi = (void*)0xDEADBEEF; + hr = INameSpaceTreeControl_GetNextItem(pnstc, psidesktop, NSTCGNI_CHILD, &psi); + ok(hr == E_FAIL, "Got (0x%08x)\n", hr); + ok(psi == NULL, "psi is %p\n", psi); + process_msgs(); + ok_no_events(pnstceimpl); + + /* Expand and try again */ + hr = INameSpaceTreeControl_SetItemState(pnstc, psidesktop, NSTCIS_EXPANDED, 0xffff); + ok(hr == S_OK, "Got (0x%08x)\n", hr); + process_msgs(); + ok_event_count(pnstceimpl, OnBeforeExpand, 1); + ok_event_broken(pnstceimpl, OnItemAdded); /* Does not fire on Vista */ + ok_event_count(pnstceimpl, OnAfterExpand, 1); + todo_wine ok_event_count_broken(pnstceimpl, OnSelectionChanged, 1, 0 /*Vista */); + ok_no_events(pnstceimpl); + psi = (void*)0xDEADBEEF; + hr = INameSpaceTreeControl_GetNextItem(pnstc, psidesktop, NSTCGNI_CHILD, &psi); + ok(hr == S_OK, "Got (0x%08x)\n", hr); + ok((psi != NULL) && (psi != (void*)0xDEADBEEF), "psi is %p\n", psi); + process_msgs(); + ok_no_events(pnstceimpl); + if(SUCCEEDED(hr)) IShellItem_Release(psi); + + hr = INameSpaceTreeControl_RemoveAllRoots(pnstc); + ok(hr == S_OK, "Got (0x%08x)\n", hr); + ok_event_count(pnstceimpl, OnItemDeleted, 1); + ok_no_events(pnstceimpl); + hr = INameSpaceTreeControl_QueryInterface(pnstc, &IID_IOleWindow, (void**)&pow); ok(hr == S_OK, "Got 0x%08x\n", hr); if(SUCCEEDED(hr))

1 0

David Hedberg : comctl32: Return 0 when extended item state is requested from a treeview.
by Alexandre Julliard 18 Aug '10

18 Aug '10

Module: wine Branch: master Commit: 31f538516ad50e7b2debaae168bc3173b7e3175c URL: http://source.winehq.org/git/wine.git/?a=commit;h=31f538516ad50e7b2debaae16… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Wed Aug 18 07:08:13 2010 +0200 comctl32: Return 0 when extended item state is requested from a treeview. --- dlls/comctl32/treeview.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index cd2dfb2..3e987ab 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -33,7 +33,8 @@ * * missing styles: TVS_FULLROWSELECT, TVS_INFOTIP, TVS_RTLREADING, * - * missing item styles: TVIS_CUT, TVIS_EXPANDPARTIAL + * missing item styles: TVIS_CUT, TVIS_EXPANDPARTIAL, TVIS_EX_FLAT, + * TVIS_EX_DISABLED * * Make the insertion mark look right. * Scroll (instead of repaint) as much as possible. @@ -2142,6 +2143,13 @@ TREEVIEW_GetItemT(const TREEVIEW_INFO *infoPtr, LPTVITEMEXW tvItem, BOOL isW) } } } + + if (tvItem->mask & TVIF_STATEEX) + { + FIXME("Extended item state not supported, returning 0.\n"); + tvItem->uStateEx = 0; + } + TRACE("item <%p>, txt %p, img %p, mask %x\n", wineItem, tvItem->pszText, &tvItem->iImage, tvItem->mask);

1 0

David Hedberg : explorerframe: Implement SetItemState and GetItemState.
by Alexandre Julliard 18 Aug '10

18 Aug '10

Module: wine Branch: master Commit: 7e65349c0d7d3659962ae9ded29ba8667472d985 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e65349c0d7d3659962ae9ded… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Wed Aug 18 07:08:12 2010 +0200 explorerframe: Implement SetItemState and GetItemState. --- dlls/explorerframe/nstc.c | 132 +++++++++++- dlls/explorerframe/tests/msg.h | 116 ++++++++++ dlls/explorerframe/tests/nstc.c | 480 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 724 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7e65349c0d7d3659962ae…

1 0

David Hedberg : comctl32: Don't break on TVIS_NOSINGLEEXPAND.
by Alexandre Julliard 18 Aug '10

18 Aug '10

Module: wine Branch: master Commit: 4507905f8bfdb9bba467dc4c15dd368ebed26a86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4507905f8bfdb9bba467dc4c1… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Wed Aug 18 07:08:11 2010 +0200 comctl32: Don't break on TVIS_NOSINGLEEXPAND. --- dlls/comctl32/treeview.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 2745ce9..cd2dfb2 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -4351,6 +4351,9 @@ TREEVIEW_DoSelectItem(TREEVIEW_INFO *infoPtr, INT action, HTREEITEM newSelect, switch (action) { + case TVGN_CARET|TVSI_NOSINGLEEXPAND: + FIXME("TVSI_NOSINGLEEXPAND specified.\n"); + /* Fall through */ case TVGN_CARET: prevSelect = infoPtr->selectedItem;

1 0

David Hedberg : explorerframe: Implement CollapseAll.
by Alexandre Julliard 18 Aug '10

18 Aug '10

Module: wine Branch: master Commit: e7a3998c1f3eb351641ba615f6f041b7520712e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7a3998c1f3eb351641ba615f… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Wed Aug 18 07:08:10 2010 +0200 explorerframe: Implement CollapseAll. --- dlls/explorerframe/nstc.c | 23 +++++++++++++++++++++-- dlls/explorerframe/tests/nstc.c | 7 +++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index b2d780f..ca10493 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -361,6 +361,20 @@ static IShellItem *get_selected_shellitem(NSTC2Impl *This) return shellitem_from_treeitem(This, get_selected_treeitem(This)); } +static void collapse_all(NSTC2Impl *This, HTREEITEM node) +{ + HTREEITEM next; + + /* Collapse this node first, and then first child/next sibling. */ + SendMessageW(This->hwnd_tv, TVM_EXPAND, TVE_COLLAPSE, (LPARAM)node); + + next = (HTREEITEM)SendMessageW(This->hwnd_tv, TVM_GETNEXTITEM, TVGN_CHILD, (LPARAM)node); + if(next) collapse_all(This, next); + + next = (HTREEITEM)SendMessageW(This->hwnd_tv, TVM_GETNEXTITEM, TVGN_NEXT, (LPARAM)node); + if(next) collapse_all(This, next); +} + /************************************************************************* * NamespaceTree window functions */ @@ -1143,8 +1157,13 @@ static HRESULT WINAPI NSTC2_fnGetItemRect(INameSpaceTreeControl2* iface, static HRESULT WINAPI NSTC2_fnCollapseAll(INameSpaceTreeControl2* iface) { NSTC2Impl *This = (NSTC2Impl*)iface; - FIXME("stub, %p\n", This); - return E_NOTIMPL; + nstc_root *root; + TRACE("%p\n", This); + + LIST_FOR_EACH_ENTRY(root, &This->roots, nstc_root, entry) + collapse_all(This, root->htreeitem); + + return S_OK; } static HRESULT WINAPI NSTC2_fnSetControlStyle(INameSpaceTreeControl2* iface, diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index 170f189..4ca4320 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -1077,9 +1077,16 @@ static void test_basics(void) roots[9] = NULL; verify_root_order(pnstc, roots); + /* CollapseAll */ + hr = INameSpaceTreeControl_CollapseAll(pnstc); + ok(hr == S_OK, "Got 0x%08x\n", hr); + hr = INameSpaceTreeControl_RemoveAllRoots(pnstc); ok(hr == S_OK, "Got (0x%08x)\n", hr); + hr = INameSpaceTreeControl_CollapseAll(pnstc); + ok(hr == S_OK, "Got 0x%08x\n", hr); + IShellItem_Release(psidesktop); IShellItem_Release(psidesktop2); IShellItem_Release(psitestdir);

1 0

Luca Bennati : ipconfig: Add Italian translation.
by Alexandre Julliard 18 Aug '10

18 Aug '10

Module: wine Branch: master Commit: 4a7628af8a7bc99dcab4cde1ef180c62031cf8d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a7628af8a7bc99dcab4cde1e… Author: Luca Bennati <lucak3(a)gmail.com> Date: Tue Aug 17 19:00:05 2010 +0200 ipconfig: Add Italian translation. --- programs/ipconfig/It.rc | 49 +++++++++++++++++++++++++++++++++++++++++ programs/ipconfig/Makefile.in | 1 + 2 files changed, 50 insertions(+), 0 deletions(-) diff --git a/programs/ipconfig/It.rc b/programs/ipconfig/It.rc new file mode 100644 index 0000000..0a7bf40 --- /dev/null +++ b/programs/ipconfig/It.rc @@ -0,0 +1,49 @@ +/* + * IP configuration utility + * Italian language support + * + * Copyright 2010 Andrew Nguyen + * Copyright 2010 Luca Bennati <lucak3(a)gmail.com> + * + * 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 + */ + +#include "ipconfig.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE +{ + STRING_USAGE, "Uso: ipconfig [ /? | /all ]\n" + STRING_INVALID_CMDLINE, "Errore: i parametri specificati della riga di comando sono sconosciuti o non validi\n" + STRING_ADAPTER_FRIENDLY, "%s adattatore %s\n" + STRING_ETHERNET, "Ethernet" + STRING_UNKNOWN, "Sconosciuto" + STRING_CONN_DNS_SUFFIX, "Suffisso DNS specifico per la connessione" + STRING_IP_ADDRESS, "Indirizzo IP" + STRING_HOSTNAME, "Nome host" + STRING_NODE_TYPE, "Tipo nodo" + STRING_BROADCAST, "Broadcast" + STRING_PEER_TO_PEER, "Peer-to-peer" + STRING_MIXED, "Misto" + STRING_HYBRID, "Ibrido" + STRING_IP_ROUTING, "IP routing abilitato" + STRING_DESCRIPTION, "Descrizione" + STRING_PHYS_ADDR, "Indirizzo fisico" + STRING_DHCP_ENABLED, "DHCP abilitato" +} diff --git a/programs/ipconfig/Makefile.in b/programs/ipconfig/Makefile.in index 50cdf15..551076a 100644 --- a/programs/ipconfig/Makefile.in +++ b/programs/ipconfig/Makefile.in @@ -12,6 +12,7 @@ C_SRCS = ipconfig.c RC_SRCS = \ En.rc \ Fr.rc \ + It.rc \ Lt.rc @MAKE_PROG_RULES@

1 0

Aurimas Fišeras : ipconfig: Add Lithuanian translation .
by Alexandre Julliard 18 Aug '10

18 Aug '10

Module: wine Branch: master Commit: e948f3d64925f45831493d7e2efc049635819f03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e948f3d64925f45831493d7e2… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Tue Aug 17 21:43:32 2010 +0300 ipconfig: Add Lithuanian translation. --- programs/ipconfig/Lt.rc | 48 +++++++++++++++++++++++++++++++++++++++++ programs/ipconfig/Makefile.in | 3 +- 2 files changed, 50 insertions(+), 1 deletions(-) diff --git a/programs/ipconfig/Lt.rc b/programs/ipconfig/Lt.rc new file mode 100644 index 0000000..eeaac6b --- /dev/null +++ b/programs/ipconfig/Lt.rc @@ -0,0 +1,48 @@ +/* + * IP configuration utility + * Lithuanian language support + * + * Copyright 2010 Aurimas Fišeras <aurimas(a)gmail.com> + * + * 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 + */ + +#include "ipconfig.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +STRINGTABLE +{ + STRING_USAGE, "Naudojimas: ipconfig [ /? | /all ]\n" + STRING_INVALID_CMDLINE, "Klaida: nurodytas nežinomas arba netinkamas komandinės eilutės parametras\n" + STRING_ADAPTER_FRIENDLY, "%s adapteris %s\n" + STRING_ETHERNET, "Eterneto" + STRING_UNKNOWN, "Nežinomas" + STRING_CONN_DNS_SUFFIX, "Ryšiui būdingas DNS sufiksas" + STRING_IP_ADDRESS, "IP adresas" + STRING_HOSTNAME, "Kompiuterio vardas" + STRING_NODE_TYPE, "Mazgo tipas" + STRING_BROADCAST, "Transliavimas" + STRING_PEER_TO_PEER, "Lygiarangis" + STRING_MIXED, "Maišytas" + STRING_HYBRID, "Mišrusis" + STRING_IP_ROUTING, "IP maršruto parinkimas įjungtas" + STRING_DESCRIPTION, "Aprašas" + STRING_PHYS_ADDR, "Fizinis adresas" + STRING_DHCP_ENABLED, "DHCP įjungta" +} diff --git a/programs/ipconfig/Makefile.in b/programs/ipconfig/Makefile.in index 461d32d..50cdf15 100644 --- a/programs/ipconfig/Makefile.in +++ b/programs/ipconfig/Makefile.in @@ -11,6 +11,7 @@ C_SRCS = ipconfig.c RC_SRCS = \ En.rc \ - Fr.rc + Fr.rc \ + Lt.rc @MAKE_PROG_RULES@

1 0

Frédéric Delanoy : ipconfig: Add French translation.
by Alexandre Julliard 18 Aug '10

18 Aug '10

Module: wine Branch: master Commit: 5131ce467166dc34ac4996ed6468668fd3d97633 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5131ce467166dc34ac4996ed6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Aug 17 19:39:45 2010 +0200 ipconfig: Add French translation. --- programs/ipconfig/Fr.rc | 47 +++++++++++++++++++++++++++++++++++++++++ programs/ipconfig/Makefile.in | 4 ++- 2 files changed, 50 insertions(+), 1 deletions(-) diff --git a/programs/ipconfig/Fr.rc b/programs/ipconfig/Fr.rc new file mode 100644 index 0000000..af3b557 --- /dev/null +++ b/programs/ipconfig/Fr.rc @@ -0,0 +1,47 @@ +/* + * IP configuration utility (French resources) + * + * Copyright 2010 Frédéric Delanoy + * + * 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 + */ + +#include "ipconfig.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE +{ + STRING_USAGE, "Usage : ipconfig [ /? | /all ]\n" + STRING_INVALID_CMDLINE, "Erreur : les paramètres de ligne de commande spécifiés sont inconnus ou invalides\n" + STRING_ADAPTER_FRIENDLY, "Adaptateur %s %s\n" + STRING_ETHERNET, "Ethernet" + STRING_UNKNOWN, "Inconnu" + STRING_CONN_DNS_SUFFIX, "Suffixe DNS propre à la connexion" + STRING_IP_ADDRESS, "Adresse IP" + STRING_HOSTNAME, "Nom d'hôte" + STRING_NODE_TYPE, "Type de nœud" + STRING_BROADCAST, "Diffusion" + STRING_PEER_TO_PEER, "Pair à pair" + STRING_MIXED, "Mixte" + STRING_HYBRID, "Hybride" + STRING_IP_ROUTING, "Routage IP activé" + STRING_DESCRIPTION, "Description" + STRING_PHYS_ADDR, "Adresse physique" + STRING_DHCP_ENABLED, "DHCP activé" +} diff --git a/programs/ipconfig/Makefile.in b/programs/ipconfig/Makefile.in index cd0c2dc..461d32d 100644 --- a/programs/ipconfig/Makefile.in +++ b/programs/ipconfig/Makefile.in @@ -9,6 +9,8 @@ IMPORTS = iphlpapi ws2_32 user32 C_SRCS = ipconfig.c -RC_SRCS = En.rc +RC_SRCS = \ + En.rc \ + Fr.rc @MAKE_PROG_RULES@

1 0

Piotr Caban : msvcp90: Added bad_alloc exception.
by Alexandre Julliard 18 Aug '10

18 Aug '10

Module: wine Branch: master Commit: b13e3772d464ca9c85cba48177fab908b16663b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b13e3772d464ca9c85cba4817… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 18 10:36:52 2010 +0200 msvcp90: Added bad_alloc exception. --- dlls/msvcp90/exception.c | 184 ++++++++++++++++++++++++++++++++++++++++++---- dlls/msvcp90/msvcp90.h | 51 +++++++++++++- 2 files changed, 219 insertions(+), 16 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 1988be2..4710848 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -28,23 +28,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcp90); /* dlls/msvcrt/cppexcept.h */ -typedef struct __type_info -{ - const vtable_ptr *vtable; - char *name; /* Unmangled name, allocated lazily */ - char mangled[32]; /* Variable length, but we declare it large enough for static RTTI */ -} type_info; - typedef void (*cxx_copy_ctor)(void); -/* offsets for computing the this pointer */ -typedef struct -{ - int this_offset; /* offset of base class this pointer from start of object */ - int vbase_descr; /* offset of virtual base class descriptor */ - int vbase_offset; /* offset of this pointer offset in virtual base class descriptor */ -} this_ptr_offsets; - /* complete information about a C++ type */ typedef struct __cxx_type_info { @@ -75,6 +60,40 @@ typedef struct __cxx_exception_type void CDECL _CxxThrowException(exception*,const cxx_exception_type*); +/* vtables */ + +#ifdef _WIN64 + +#define __ASM_VTABLE(name,funcs) \ + __asm__(".data\n" \ + "\t.align 8\n" \ + "\t.quad " __ASM_NAME(#name "_rtti") "\n" \ + "\t.globl " __ASM_NAME("MSVCP_" #name "_vtable") "\n" \ + __ASM_NAME("MSVCP_" #name "_vtable") ":\n" \ + "\t.quad " THISCALL_NAME(MSVCP_ ## name ## _vector_dtor) "\n" \ + funcs "\n\t.text"); + +#define __ASM_EXCEPTION_VTABLE(name) \ + __ASM_VTABLE(name, "\t.quad " THISCALL_NAME(MSVCP_what_exception) ) + +#else + +#define __ASM_VTABLE(name,funcs) \ + __asm__(".data\n" \ + "\t.align 4\n" \ + "\t.long " __ASM_NAME(#name "_rtti") "\n" \ + "\t.globl " __ASM_NAME("MSVCP_" #name "_vtable") "\n" \ + __ASM_NAME("MSVCP_" #name "_vtable") ":\n" \ + "\t.long " THISCALL_NAME(MSVCP_ ## name ## _vector_dtor) "\n" \ + funcs "\n\t.text"); + +#define __ASM_EXCEPTION_VTABLE(name) \ + __ASM_VTABLE(name, "\t.long " THISCALL_NAME(MSVCP_what_exception) ) + +#endif /* _WIN64 */ + +extern const vtable_ptr MSVCP_bad_alloc_vtable; + /* exception class data */ static type_info exception_type_info = { NULL, /* set by set_exception_vtable */ @@ -124,6 +143,13 @@ void __stdcall MSVCP_exception_dtor(exception *this) free(this->name); } +static const rtti_base_descriptor exception_rtti_base_descriptor = { + &exception_type_info, + 0, + { 0, -1, 0 }, + 0 +}; + static const cxx_type_info exception_cxx_type_info = { 0, &exception_type_info, @@ -154,6 +180,129 @@ void set_exception_vtable(void) exception_type_info.vtable = (void*)GetProcAddress(hmod, "??_7exception@@6B@"); } +/* bad_alloc class data */ +typedef exception bad_alloc; + +DEFINE_THISCALL_WRAPPER(MSVCP_bad_alloc_ctor, 8) +bad_alloc* __stdcall MSVCP_bad_alloc_ctor(bad_alloc *this, const char **name) +{ + TRACE("%p %s\n", this, *name); + MSVCP_exception_ctor(this, name); + this->vtable = &MSVCP_bad_alloc_vtable; + return this; +} + +DEFINE_THISCALL_WRAPPER(MSVCP_bad_alloc_copy_ctor, 8) +bad_alloc* __stdcall MSVCP_bad_alloc_copy_ctor(bad_alloc *this, const bad_alloc *rhs) +{ + TRACE("%p %p\n", this, rhs); + MSVCP_exception_copy_ctor(this, rhs); + this->vtable = &MSVCP_bad_alloc_vtable; + return this; +} + +DEFINE_THISCALL_WRAPPER(MSVCP_bad_alloc_dtor, 4) +void __stdcall MSVCP_bad_alloc_dtor(bad_alloc *this) +{ + TRACE("%p\n", this); + MSVCP_exception_dtor(this); +} + +DEFINE_THISCALL_WRAPPER(MSVCP_bad_alloc_vector_dtor, 8) +void * __stdcall MSVCP_bad_alloc_vector_dtor(bad_alloc *this, unsigned int flags) +{ + TRACE("%p %x\n", this, flags); + if(flags & 2) { + /* we have an array, with the number of elements stored before the first object */ + int i, *ptr = (int *)this-1; + + for(i=*ptr-1; i>=0; i--) + MSVCP_bad_alloc_dtor(this+i); + MSVCRT_operator_delete(ptr); + } else { + MSVCP_bad_alloc_dtor(this); + if(flags & 1) + MSVCRT_operator_delete(this); + } + + return this; +} + +DEFINE_THISCALL_WRAPPER(MSVCP_what_exception,4) +const char* __stdcall MSVCP_what_exception(exception * this) +{ + TRACE("(%p) returning %s\n", this, this->name); + return this->name ? this->name : "Unknown exception"; +} + +static const type_info bad_alloc_type_info = { + &MSVCP_bad_alloc_vtable, + NULL, + ".?AVbad_alloc@std@@" +}; + +static const rtti_base_descriptor bad_alloc_rtti_base_descriptor = { + &bad_alloc_type_info, + 1, + { 0, -1, 0 }, + 64 +}; + +static const rtti_base_array bad_alloc_rtti_base_array = { + { + &bad_alloc_rtti_base_descriptor, + &exception_rtti_base_descriptor, + NULL + } +}; + +static const rtti_object_hierarchy bad_alloc_type_hierarchy = { + 0, + 0, + 2, + &bad_alloc_rtti_base_array +}; + +const rtti_object_locator bad_alloc_rtti = { + 0, + 0, + 0, + &bad_alloc_type_info, + &bad_alloc_type_hierarchy +}; + +static const cxx_type_info bad_alloc_cxx_type_info = { + 0, + &bad_alloc_type_info, + { 0, -1, 0 }, + sizeof(bad_alloc), + (cxx_copy_ctor)THISCALL(MSVCP_bad_alloc_copy_ctor) +}; + +static const cxx_type_info_table bad_alloc_cxx_type_table = { + 2, + { + &bad_alloc_cxx_type_info, + &exception_cxx_type_info, + NULL + } +}; + +static const cxx_exception_type bad_alloc_cxx_type = { + 0, + (cxx_copy_ctor)THISCALL(MSVCP_bad_alloc_dtor), + NULL, + &bad_alloc_cxx_type_table +}; + +#ifndef __GNUC__ +void __asm_dummy_vtables(void) { +#endif + __ASM_EXCEPTION_VTABLE(bad_alloc) +#ifndef __GNUC__ +} +#endif + /* Internal: throws selected exception */ void throw_exception(exception_type et, const char *str) { @@ -166,5 +315,10 @@ void throw_exception(exception_type et, const char *str) _CxxThrowException(&e, &exception_cxx_type); return; } + case EXCEPTION_BAD_ALLOC: { + bad_alloc e; + MSVCP_bad_alloc_ctor(&e, &addr); + _CxxThrowException(&e, &bad_alloc_cxx_type); + } } } diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index f27958b..8d588ef 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -31,6 +31,7 @@ extern void (__cdecl *MSVCRT_operator_delete)(void*); #ifdef __i386__ /* thiscall functions are i386-specific */ #define THISCALL(func) __thiscall_ ## func +#define THISCALL_NAME(func) __ASM_NAME("__thiscall_" #func) #define DEFINE_THISCALL_WRAPPER(func,args) \ extern void THISCALL(func)(void); \ __ASM_GLOBAL_FUNC(__thiscall_ ## func, \ @@ -41,6 +42,7 @@ extern void (__cdecl *MSVCRT_operator_delete)(void*); #else /* __i386__ */ #define THISCALL(func) func +#define THISCALL_NAME(func) __ASM_NAME(#func) #define DEFINE_THISCALL_WRAPPER(func,args) /* nothing */ #endif /* __i386__ */ @@ -56,7 +58,54 @@ typedef struct __exception /* Internal: throws selected exception */ typedef enum __exception_type { - EXCEPTION + EXCEPTION, + EXCEPTION_BAD_ALLOC } exception_type; void throw_exception(exception_type, const char *); void set_exception_vtable(void); + +/* rtti */ +typedef struct __type_info +{ + const vtable_ptr *vtable; + char *name; /* Unmangled name, allocated lazily */ + char mangled[32]; /* Variable length, but we declare it large enough for static RTTI */ +} type_info; + +/* offsets for computing the this pointer */ +typedef struct +{ + int this_offset; /* offset of base class this pointer from start of object */ + int vbase_descr; /* offset of virtual base class descriptor */ + int vbase_offset; /* offset of this pointer offset in virtual base class descriptor */ +} this_ptr_offsets; + +typedef struct _rtti_base_descriptor +{ + const type_info *type_descriptor; + int num_base_classes; + this_ptr_offsets offsets; /* offsets for computing the this pointer */ + unsigned int attributes; +} rtti_base_descriptor; + +typedef struct _rtti_base_array +{ + const rtti_base_descriptor *bases[3]; /* First element is the class itself */ +} rtti_base_array; + +typedef struct _rtti_object_hierarchy +{ + unsigned int signature; + unsigned int attributes; + int array_len; /* Size of the array pointed to by 'base_classes' */ + const rtti_base_array *base_classes; +} rtti_object_hierarchy; + +typedef struct _rtti_object_locator +{ + unsigned int signature; + int base_class_offset; + unsigned int flags; + const type_info *type_descriptor; + const rtti_object_hierarchy *type_hierarchy; +} rtti_object_locator;

1 0

Piotr Caban : msvcp90: Add exception throwing function.
by Alexandre Julliard 18 Aug '10

18 Aug '10

Module: wine Branch: master Commit: c83d56628a7a9d22074bbd23a2e61b29d152d98e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c83d56628a7a9d22074bbd23a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 18 10:36:40 2010 +0200 msvcp90: Add exception throwing function. --- dlls/msvcp90/Makefile.in | 1 + dlls/msvcp90/exception.c | 170 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 17 ++++ dlls/msvcp90/msvcp90_main.c | 1 + 4 files changed, 189 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/Makefile.in b/dlls/msvcp90/Makefile.in index 5331c45..4581c65 100644 --- a/dlls/msvcp90/Makefile.in +++ b/dlls/msvcp90/Makefile.in @@ -8,6 +8,7 @@ MODCFLAGS = @BUILTINFLAG@ EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt C_SRCS = \ + exception.c \ memory.c \ msvcp90_main.c \ string.c diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c new file mode 100644 index 0000000..1988be2 --- /dev/null +++ b/dlls/msvcp90/exception.c @@ -0,0 +1,170 @@ +/* + * Copyright 2010 Piotr 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 + */ + +#include "config.h" + +#include <stdarg.h> + +#include "msvcp90.h" + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" +WINE_DEFAULT_DEBUG_CHANNEL(msvcp90); + +/* dlls/msvcrt/cppexcept.h */ +typedef struct __type_info +{ + const vtable_ptr *vtable; + char *name; /* Unmangled name, allocated lazily */ + char mangled[32]; /* Variable length, but we declare it large enough for static RTTI */ +} type_info; + +typedef void (*cxx_copy_ctor)(void); + +/* offsets for computing the this pointer */ +typedef struct +{ + int this_offset; /* offset of base class this pointer from start of object */ + int vbase_descr; /* offset of virtual base class descriptor */ + int vbase_offset; /* offset of this pointer offset in virtual base class descriptor */ +} this_ptr_offsets; + +/* complete information about a C++ type */ +typedef struct __cxx_type_info +{ + UINT flags; /* flags (see CLASS_* flags below) */ + const type_info *type_info; /* C++ type info */ + this_ptr_offsets offsets; /* offsets for computing the this pointer */ + unsigned int size; /* object size */ + cxx_copy_ctor copy_ctor; /* copy constructor */ +} cxx_type_info; +#define CLASS_IS_SIMPLE_TYPE 1 +#define CLASS_HAS_VIRTUAL_BASE_CLASS 4 + +/* table of C++ types that apply for a given object */ +typedef struct __cxx_type_info_table +{ + UINT count; /* number of types */ + const cxx_type_info *info[3]; /* variable length, we declare it large enough for static RTTI */ +} cxx_type_info_table; + +/* type information for an exception object */ +typedef struct __cxx_exception_type +{ + UINT flags; /* TYPE_FLAG flags */ + void (*destructor)(void);/* exception object destructor */ + void* /*cxx_exc_custom_handler*/ custom_handler; /* custom handler for this exception */ + const cxx_type_info_table *type_info_table; /* list of types for this exception object */ +} cxx_exception_type; + +void CDECL _CxxThrowException(exception*,const cxx_exception_type*); + +/* exception class data */ +static type_info exception_type_info = { + NULL, /* set by set_exception_vtable */ + NULL, + ".?AVexception@std@@" +}; + +DEFINE_THISCALL_WRAPPER(MSVCP_exception_ctor, 8) +exception* __stdcall MSVCP_exception_ctor(exception *this, const char **name) +{ + TRACE("(%p %s)\n", this, *name); + + this->vtable = exception_type_info.vtable; + if(*name) { + unsigned int name_len = strlen(*name) + 1; + this->name = malloc(name_len); + memcpy(this->name, *name, name_len); + this->do_free = TRUE; + } else { + this->name = NULL; + this->do_free = FALSE; + } + return this; +} + +DEFINE_THISCALL_WRAPPER(MSVCP_exception_copy_ctor,8) +exception* __stdcall MSVCP_exception_copy_ctor(exception *this, const exception *rhs) +{ + TRACE("(%p,%p)\n", this, rhs); + + if(!rhs->do_free) { + this->vtable = exception_type_info.vtable; + this->name = rhs->name; + this->do_free = FALSE; + } else + MSVCP_exception_ctor(this, (const char**)&rhs->name); + TRACE("name = %s\n", this->name); + return this; +} + +DEFINE_THISCALL_WRAPPER(MSVCP_exception_dtor,4) +void __stdcall MSVCP_exception_dtor(exception *this) +{ + TRACE("(%p)\n", this); + this->vtable = exception_type_info.vtable; + if(this->do_free) + free(this->name); +} + +static const cxx_type_info exception_cxx_type_info = { + 0, + &exception_type_info, + { 0, -1, 0 }, + sizeof(exception), + (cxx_copy_ctor)THISCALL(MSVCP_exception_dtor) +}; + +static const cxx_type_info_table exception_cxx_type_table = { + 1, + { + &exception_cxx_type_info, + NULL, + NULL + } +}; + +static const cxx_exception_type exception_cxx_type = { + 0, + (cxx_copy_ctor)THISCALL(MSVCP_exception_copy_ctor), + NULL, + &exception_cxx_type_table +}; + +void set_exception_vtable(void) +{ + HMODULE hmod = GetModuleHandleA("msvcrt.dll"); + exception_type_info.vtable = (void*)GetProcAddress(hmod, "??_7exception@@6B@"); +} + +/* Internal: throws selected exception */ +void throw_exception(exception_type et, const char *str) +{ + const char *addr = str; + + switch(et) { + case EXCEPTION: { + exception e; + MSVCP_exception_ctor(&e, &addr); + _CxxThrowException(&e, &exception_cxx_type); + return; + } + } +} diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index c70f1c9..f27958b 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -17,6 +17,7 @@ */ #include "stdlib.h" +#include "windef.h" typedef unsigned char MSVCP_BOOL; @@ -43,3 +44,19 @@ extern void (__cdecl *MSVCRT_operator_delete)(void*); #define DEFINE_THISCALL_WRAPPER(func,args) /* nothing */ #endif /* __i386__ */ + +/* exception object */ +typedef void (*vtable_ptr)(void); +typedef struct __exception +{ + const vtable_ptr *vtable; + char *name; /* Name of this exception, always a new copy for each object */ + int do_free; /* Whether to free 'name' in our dtor */ +} exception; + +/* Internal: throws selected exception */ +typedef enum __exception_type { + EXCEPTION +} exception_type; +void throw_exception(exception_type, const char *); +void set_exception_vtable(void); diff --git a/dlls/msvcp90/msvcp90_main.c b/dlls/msvcp90/msvcp90_main.c index dd542fc..9555d48 100644 --- a/dlls/msvcp90/msvcp90_main.c +++ b/dlls/msvcp90/msvcp90_main.c @@ -56,6 +56,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: init_cxx_funcs(); + set_exception_vtable(); break; case DLL_PROCESS_DETACH: break;

1 0

← Newer
1
...
49
50
51
52
53
54
55
...
89
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2010