August 2010 - Wine-commits - list.winehq.org

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

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

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 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: 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 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 : explorerframe: Implement GetSelectedItems.
by Alexandre Julliard 18 Aug '10

18 Aug '10

Module: wine Branch: master Commit: 20872fadce7ece0fa330b2b49d33033cb298e137 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20872fadce7ece0fa330b2b49… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Wed Aug 18 07:08:15 2010 +0200 explorerframe: Implement GetSelectedItems. --- dlls/explorerframe/nstc.c | 13 ++- dlls/explorerframe/tests/nstc.c | 203 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 213 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=20872fadce7ece0fa330b…

1 0

Austin English : kernel32: Add stub for SetFileValidData.
by Alexandre Julliard 18 Aug '10

18 Aug '10

Module: wine Branch: master Commit: 7cd7851ca149101183ee90ea3b69e1ad7d55591a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cd7851ca149101183ee90ea3… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Aug 18 00:17:39 2010 -0700 kernel32: Add stub for SetFileValidData. --- dlls/kernel32/file.c | 10 ++++++++++ dlls/kernel32/kernel32.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index edec6b0..dadaea6 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1001,6 +1001,16 @@ error: } /*********************************************************************** + * SetFileValidData (KERNEL32.@) + */ +BOOL WINAPI SetFileValidData( HANDLE hFile, LONGLONG ValidDataLength ) +{ + FIXME("stub: %p, %s\n", hFile, wine_dbgstr_longlong(ValidDataLength)); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** * GetFileTime (KERNEL32.@) */ BOOL WINAPI GetFileTime( HANDLE hFile, FILETIME *lpCreationTime, diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index e7ae774..601644f 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1030,7 +1030,7 @@ # @ stub SetFileShortNameA # @ stub SetFileShortNameW @ stdcall SetFileTime(long ptr ptr ptr) -# @ stub SetFileValidData +@ stdcall SetFileValidData(ptr double) # @ stub SetFirmwareEnvironmentVariableA # @ stub SetFirmwareEnvironmentVariableW @ stdcall SetHandleContext(long long)

1 0

Piotr Caban : msvcp90: Added allocator<char> 64-bit exports.
by Alexandre Julliard 18 Aug '10

18 Aug '10

Module: wine Branch: master Commit: 2a866928c9834dbc94b506225b58276a4198d937 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a866928c9834dbc94b506225… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 18 10:36:10 2010 +0200 msvcp90: Added allocator<char> 64-bit exports. --- dlls/msvcp90/memory.c | 19 +++++++++++++++---- dlls/msvcp90/msvcp90.spec | 22 +++++++++++----------- 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/dlls/msvcp90/memory.c b/dlls/msvcp90/memory.c index 14e6ea0..6c0c50a 100644 --- a/dlls/msvcp90/memory.c +++ b/dlls/msvcp90/memory.c @@ -29,6 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcp90); /* ?address@?$allocator(a)D@std@@QBEPADAAD(a)Z */ +/* ?address@?$allocator(a)D@std@@QEBAPEADAEAD(a)Z */ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_address, 8) char* __stdcall MSVCP_allocator_char_address(void *this, char *ptr) { @@ -36,6 +37,7 @@ char* __stdcall MSVCP_allocator_char_address(void *this, char *ptr) } /* ?address@?$allocator(a)D@std@@QBEPBDABD(a)Z */ +/* ?address@?$allocator(a)D@std@@QEBAPEBDAEBD(a)Z */ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_const_address, 8) const char* __stdcall MSVCP_allocator_char_const_address(void *this, const char *ptr) { @@ -43,6 +45,7 @@ const char* __stdcall MSVCP_allocator_char_const_address(void *this, const char } /* ??0?$allocator(a)D@std@@QAE(a)XZ */ +/* ??0?$allocator(a)D@std@@QEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_ctor, 4) void* __stdcall MSVCP_allocator_char_ctor(void *this) { @@ -50,6 +53,7 @@ void* __stdcall MSVCP_allocator_char_ctor(void *this) } /* ??0?$allocator(a)D@std@@QAE(a)ABV01@@Z */ +/* ??0?$allocator(a)D@std@@QEAA(a)AEBV01@@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_copy_ctor, 8) void* __stdcall MSVCP_allocator_char_copy_ctor(void *this, void *copy) { @@ -57,6 +61,7 @@ void* __stdcall MSVCP_allocator_char_copy_ctor(void *this, void *copy) } /* ??4?$allocator(a)D@std@@QAEAAV01(a)ABV01@@Z */ +/* ??4?$allocator(a)D@std@@QEAAAEAV01(a)AEBV01@@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_assign, 8); void* __stdcall MSVCP_allocator_char_assign(void *this, void *assign) { @@ -64,29 +69,33 @@ void* __stdcall MSVCP_allocator_char_assign(void *this, void *assign) } /* ?deallocate@?$allocator(a)D@std@@QAEXPADI(a)Z */ +/* ?deallocate@?$allocator(a)D@std@@QEAAXPEAD_K(a)Z */ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_deallocate, 12); -void __stdcall MSVCP_allocator_char_deallocate(void *this, char *ptr, unsigned int size) +void __stdcall MSVCP_allocator_char_deallocate(void *this, char *ptr, size_t size) { MSVCRT_operator_delete(ptr); } /* ?allocate@?$allocator(a)D@std@@QAEPADI(a)Z */ +/* ?allocate@?$allocator(a)D@std@@QEAAPEAD_K(a)Z */ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_allocate, 8); -char* __stdcall MSVCP_allocator_char_allocate(void *this, unsigned int count) +char* __stdcall MSVCP_allocator_char_allocate(void *this, size_t count) { return MSVCRT_operator_new(sizeof(char[count])); } /* ?allocate@?$allocator(a)D@std@@QAEPADIPBX(a)Z */ +/* ?allocate@?$allocator(a)D@std@@QEAAPEAD_KPEBX(a)Z */ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_allocate_hint, 12); char* __stdcall MSVCP_allocator_char_allocate_hint(void *this, - unsigned int count, const void *hint) + size_t count, const void *hint) { /* Native ignores hint */ return MSVCP_allocator_char_allocate(this, count); } /* ?construct@?$allocator(a)D@std@@QAEXPADABD(a)Z */ +/* ?construct@?$allocator(a)D@std@@QEAAXPEADAEBD(a)Z */ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_construct, 12); void __stdcall MSVCP_allocator_char_construct(void *this, char *ptr, const char *val) { @@ -94,14 +103,16 @@ void __stdcall MSVCP_allocator_char_construct(void *this, char *ptr, const char } /* ?destroy@?$allocator(a)D@std@@QAEXPAD(a)Z */ +/* ?destroy@?$allocator(a)D@std@@QEAAXPEAD(a)Z */ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_destroy, 8); void __stdcall MSVCP_allocator_char_destroy(void *this, char *ptr) { } /* ?max_size@?$allocator(a)D@std@@QBEIXZ */ +/* ?max_size@?$allocator(a)D@std@@QEBA_KXZ */ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_max_size, 4); -unsigned int __stdcall MSVCP_allocator_char_max_size(void *this) +size_t __stdcall MSVCP_allocator_char_max_size(void *this) { return UINT_MAX/sizeof(char); } diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 34d19f1..34c9061 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -531,9 +531,9 @@ @ stub -arch=win32 ??0?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@QAE(a)ABV01@@Z @ stub -arch=win64 ??0?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@QEAA(a)AEBV01@@Z @ cdecl -arch=win32 -i386 -norelay ??0?$allocator(a)D@std@@QAE(a)ABV01@@Z(ptr) __thiscall_MSVCP_allocator_char_copy_ctor -@ stub -arch=win64 ??0?$allocator(a)D@std@@QEAA(a)AEBV01@@Z +@ cdecl -arch=win64 ??0?$allocator(a)D@std@@QEAA(a)AEBV01@@Z(ptr ptr) MSVCP_allocator_char_copy_ctor @ cdecl -arch=win32 -i386 -norelay ??0?$allocator(a)D@std@@QAE(a)XZ() __thiscall_MSVCP_allocator_char_ctor -@ stub -arch=win64 ??0?$allocator(a)D@std@@QEAA(a)XZ +@ cdecl -arch=win64 ??0?$allocator(a)D@std@@QEAA(a)XZ(ptr) MSVCP_allocator_char_ctor @ stub -arch=win32 ??0?$allocator(a)G@std@@QAE(a)ABV01@@Z @ stub -arch=win64 ??0?$allocator(a)G@std@@QEAA(a)AEBV01@@Z @ stub -arch=win32 ??0?$allocator(a)G@std@@QAE(a)XZ @@ -1373,7 +1373,7 @@ @ stub -arch=win32 ??4?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@QAEAAV01(a)ABV01@@Z @ stub -arch=win64 ??4?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@QEAAAEAV01(a)AEBV01@@Z @ cdecl -arch=win32 -i386 -norelay ??4?$allocator(a)D@std@@QAEAAV01(a)ABV01@@Z(ptr) __thiscall_MSVCP_allocator_char_assign -@ stub -arch=win64 ??4?$allocator(a)D@std@@QEAAAEAV01(a)AEBV01@@Z +@ cdecl -arch=win64 ??4?$allocator(a)D@std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) MSVCP_allocator_char_assign @ stub -arch=win32 ??4?$allocator(a)G@std@@QAEAAV01(a)ABV01@@Z @ stub -arch=win64 ??4?$allocator(a)G@std@@QEAAAEAV01(a)AEBV01@@Z @ stub -arch=win32 ??4?$allocator(a)X@std@@QAEAAV01(a)ABV01@@Z @@ -2891,9 +2891,9 @@ @ stub -arch=win64 ?_Xsgetn_s@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MEAA_JPEA_W_K_J(a)Z @ stub ?_Xweak(a)tr1@std@@YAXXZ @ cdecl -arch=win32 -i386 -norelay ?address@?$allocator(a)D@std@@QBEPADAAD(a)Z(ptr) __thiscall_MSVCP_allocator_char_address -@ stub -arch=win64 ?address@?$allocator(a)D@std@@QEBAPEADAEAD(a)Z +@ cdecl -arch=win64 ?address@?$allocator(a)D@std@@QEBAPEADAEAD(a)Z(ptr ptr) MSVCP_allocator_char_address @ cdecl -arch=win32 -i386 -norelay ?address@?$allocator(a)D@std@@QBEPBDABD(a)Z(ptr) __thiscall_MSVCP_allocator_char_const_address -@ stub -arch=win64 ?address@?$allocator(a)D@std@@QEBAPEBDAEBD(a)Z +@ cdecl -arch=win64 ?address@?$allocator(a)D@std@@QEBAPEBDAEBD(a)Z(ptr ptr) MSVCP_allocator_char_const_address @ stub -arch=win32 ?address@?$allocator(a)G@std@@QBEPAGAAG(a)Z @ stub -arch=win64 ?address@?$allocator(a)G@std@@QEBAPEAGAEAG(a)Z @ stub -arch=win32 ?address@?$allocator(a)G@std@@QBEPBGABG(a)Z @@ -2903,9 +2903,9 @@ @ stub -arch=win32 ?address@?$allocator(a)_W@std@@QBEPB_WAB_W(a)Z @ stub -arch=win64 ?address@?$allocator(a)_W@std@@QEBAPEB_WAEB_W(a)Z @ cdecl -arch=win32 -i386 -norelay ?allocate@?$allocator(a)D@std@@QAEPADI(a)Z(long) __thiscall_MSVCP_allocator_char_allocate -@ stub -arch=win64 ?allocate@?$allocator(a)D@std@@QEAAPEAD_K(a)Z +@ cdecl -arch=win64 ?allocate@?$allocator(a)D@std@@QEAAPEAD_K(a)Z(ptr long) MSVCP_allocator_char_allocate @ cdecl -arch=win32 -i386 -norelay ?allocate@?$allocator(a)D@std@@QAEPADIPBX(a)Z(long ptr) __thiscall_MSVCP_allocator_char_allocate_hint -@ stub -arch=win64 ?allocate@?$allocator(a)D@std@@QEAAPEAD_KPEBX(a)Z +@ cdecl -arch=win64 ?allocate@?$allocator(a)D@std@@QEAAPEAD_KPEBX(a)Z(ptr long ptr) MSVCP_allocator_char_allocate_hint @ stub -arch=win32 ?allocate@?$allocator(a)G@std@@QAEPAGI(a)Z @ stub -arch=win64 ?allocate@?$allocator(a)G@std@@QEAAPEAG_K(a)Z @ stub -arch=win32 ?allocate@?$allocator(a)G@std@@QAEPAGIPBX(a)Z @@ -3163,7 +3163,7 @@ @ stub -arch=win32 ?compare@?$collate(a)_W@std@@QBEHPB_W000(a)Z @ stub -arch=win64 ?compare@?$collate(a)_W@std@@QEBAHPEB_W000(a)Z @ cdecl -arch=win32 -i386 -norelay ?construct@?$allocator(a)D@std@@QAEXPADABD(a)Z(ptr ptr) __thiscall_MSVCP_allocator_char_construct -@ stub -arch=win64 ?construct@?$allocator(a)D@std@@QEAAXPEADAEBD(a)Z +@ cdecl -arch=win64 ?construct@?$allocator(a)D@std@@QEAAXPEADAEBD(a)Z(ptr ptr ptr) MSVCP_allocator_char_construct @ stub -arch=win32 ?construct@?$allocator(a)G@std@@QAEXPAGABG(a)Z @ stub -arch=win64 ?construct@?$allocator(a)G@std@@QEAAXPEAGAEBG(a)Z @ stub -arch=win32 ?construct@?$allocator(a)_W@std@@QAEXPA_WAB_W(a)Z @@ -3211,7 +3211,7 @@ @ stub -arch=win32 ?date_order@?$time_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@QBE?AW4dateorder(a)time_base@2(a)XZ @ stub -arch=win64 ?date_order@?$time_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@QEBA?AW4dateorder(a)time_base@2(a)XZ @ cdecl -arch=win32 -i386 -norelay ?deallocate@?$allocator(a)D@std@@QAEXPADI(a)Z(ptr long) __thiscall_MSVCP_allocator_char_deallocate -@ stub -arch=win64 ?deallocate@?$allocator(a)D@std@@QEAAXPEAD_K(a)Z +@ cdecl -arch=win64 ?deallocate@?$allocator(a)D@std@@QEAAXPEAD_K(a)Z(ptr ptr long) MSVCP_allocator_char_deallocate @ stub -arch=win32 ?deallocate@?$allocator(a)G@std@@QAEXPAGI(a)Z @ stub -arch=win64 ?deallocate@?$allocator(a)G@std@@QEAAXPEAG_K(a)Z @ stub -arch=win32 ?deallocate@?$allocator(a)_W@std@@QAEXPA_WI(a)Z @@ -3245,7 +3245,7 @@ @ stub ?denorm_min@?$numeric_limits(a)_N@std@@SA_NXZ @ stub ?denorm_min@?$numeric_limits(a)_W@std@@SA_WXZ @ cdecl -arch=win32 -i386 -norelay ?destroy@?$allocator(a)D@std@@QAEXPAD(a)Z(ptr) __thiscall_MSVCP_allocator_char_destroy -@ stub -arch=win64 ?destroy@?$allocator(a)D@std@@QEAAXPEAD(a)Z +@ cdecl -arch=win64 ?destroy@?$allocator(a)D@std@@QEAAXPEAD(a)Z(ptr ptr) MSVCP_allocator_char_destroy @ stub -arch=win32 ?destroy@?$allocator(a)G@std@@QAEXPAG(a)Z @ stub -arch=win64 ?destroy@?$allocator(a)G@std@@QEAAXPEAG(a)Z @ stub -arch=win32 ?destroy@?$allocator(a)_W@std@@QAEXPA_W(a)Z @@ -4510,7 +4510,7 @@ @ stub -arch=win32 ?max_length(a)codecvt_base@std@@QBEHXZ @ stub -arch=win64 ?max_length(a)codecvt_base@std@@QEBAHXZ @ cdecl -arch=win32 -i386 -norelay ?max_size@?$allocator(a)D@std@@QBEIXZ() __thiscall_MSVCP_allocator_char_max_size -@ stub -arch=win64 ?max_size@?$allocator(a)D@std@@QEBA_KXZ +@ cdecl -arch=win64 ?max_size@?$allocator(a)D@std@@QEBA_KXZ(ptr) MSVCP_allocator_char_max_size @ stub -arch=win32 ?max_size@?$allocator(a)G@std@@QBEIXZ @ stub -arch=win64 ?max_size@?$allocator(a)G@std@@QEBA_KXZ @ stub -arch=win32 ?max_size@?$allocator(a)_W@std@@QBEIXZ

1 0

Piotr Caban : msvcp90/tests: Added allocator<char> tests.
by Alexandre Julliard 18 Aug '10

18 Aug '10

Module: wine Branch: master Commit: 51a55fc9e2a59a4f702ceb9528f84abdbc2e2648 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51a55fc9e2a59a4f702ceb952… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 18 10:36:29 2010 +0200 msvcp90/tests: Added allocator<char> tests. --- dlls/msvcp90/tests/misc.c | 168 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 168 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index a3f7401..d052225 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -34,6 +34,22 @@ static BYTE (__cdecl *p_short_eq)(const void*, const void*); static char* (__cdecl *p_Copy_s)(char*, size_t, const char*, size_t); +#ifdef __i386__ +static char* (WINAPI *p_char_address)(char*); +static void* (WINAPI *p_char_ctor)(void); +static void (WINAPI *p_char_deallocate)(char*, size_t); +static char* (WINAPI *p_char_allocate)(size_t); +static void (WINAPI *p_char_construct)(char*, const char*); +static size_t (WINAPI *p_char_max_size)(void); +#else +static char* (__cdecl *p_char_address)(void*, char*); +static void* (__cdecl *p_char_ctor)(void*); +static void (__cdecl *p_char_deallocate)(void*, char*, size_t); +static char* (__cdecl *p_char_allocate)(void*, size_t); +static void (__cdecl *p_char_construct)(void*, char*, const char*); +static size_t (__cdecl *p_char_max_size)(void*); +#endif + static int invalid_parameter = 0; static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, const wchar_t *function, const wchar_t *file, @@ -47,6 +63,105 @@ static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, invalid_parameter++; } +/* Emulate a __thiscall */ +#ifdef __i386__ +#ifdef _MSC_VER +static inline void* do_call_func1(void *func, void *_this) +{ + volatile void* retval = 0; + __asm + { + push ecx + mov ecx, _this + call func + mov retval, eax + pop ecx + } + return (void*)retval; +} + +static inline void* do_call_func2(void *func, void *_this, const void *arg) +{ + volatile void* retval = 0; + __asm + { + push ecx + push arg + mov ecx, _this + call func + mov retval, eax + pop ecx + } + return (void*)retval; +} + +static inline void* do_call_func3(void *func, void *_this, + const void *arg1, const void *arg2) +{ + volatile void* retval = 0; + __asm + { + push ecx + push arg1 + push arg2 + mov ecx, _this + call func + mov retval, eax + pop ecx + } + return (void*)retval; +} +#else +static void* do_call_func1(void *func, void *_this) +{ + void *ret, *dummy; + __asm__ __volatile__ ( + "call *%2" + : "=a" (ret), "=c" (dummy) + : "g" (func), "1" (_this) + : "edx", "memory" + ); + return ret; +} + +static void* do_call_func2(void *func, void *_this, const void *arg) +{ + void *ret, *dummy; + __asm__ __volatile__ ( + "pushl %3\n\tcall *%2" + : "=a" (ret), "=c" (dummy) + : "r" (func), "r" (arg), "1" (_this) + : "edx", "memory" + ); + return ret; +} + +static void* do_call_func3(void *func, void *_this, + const void *arg1, const void *arg2) +{ + void *ret, *dummy; + __asm__ __volatile__ ( + "pushl %4\n\tpushl %3\n\tcall *%2" + : "=a" (ret), "=c" (dummy) + : "r" (func), "r" (arg1), "r" (arg2), "1" (_this) + : "edx", "memory" + ); + return ret; +} +#endif + +#define call_func1(func,_this) do_call_func1(func,_this) +#define call_func2(func,_this,a) do_call_func2(func,_this,(const void*)a) +#define call_func3(func,_this,a,b) do_call_func3(func,_this,(const void*)a,(const void*)b) + +#else + +#define call_func1(func,_this) func(_this) +#define call_func2(func,_this,a) func(_this,a) +#define call_func3(func,_this,a,b) func(_this,a,b) + +#endif /* __i386__ */ + static BOOL init(void) { HMODULE msvcr = LoadLibraryA("msvcr90.dll"); @@ -74,6 +189,13 @@ static BOOL init(void) p_short_eq = (void*)GetProcAddress(msvcp, "?eq@?$char_traits(a)G@std@@SA_NAEBG0(a)Z"); p_Copy_s = (void*)GetProcAddress(msvcp, "?_Copy_s@?$char_traits(a)D@std@@SAPEADPEAD_KPEBD1(a)Z"); + + p_char_address = (void*)GetProcAddress(msvcp, "?address@?$allocator(a)D@std@@QEBAPEADAEAD(a)Z"); + p_char_ctor = (void*)GetProcAddress(msvcp, "??0?$allocator(a)D@std@@QEAA(a)XZ"); + p_char_deallocate = (void*)GetProcAddress(msvcp, "?deallocate@?$allocator(a)D@std@@QEAAXPEAD_K(a)Z"); + p_char_allocate = (void*)GetProcAddress(msvcp, "?allocate@?$allocator(a)D@std@@QEAAPEAD_K(a)Z"); + p_char_construct = (void*)GetProcAddress(msvcp, "?construct@?$allocator(a)D@std@@QEAAXPEADAEBD(a)Z"); + p_char_max_size = (void*)GetProcAddress(msvcp, "?max_size@?$allocator(a)D@std@@QEBA_KXZ"); } else { p_char_assign = (void*)GetProcAddress(msvcp, "?assign@?$char_traits(a)D@std@@SAXAADABD(a)Z"); p_wchar_assign = (void*)GetProcAddress(msvcp, "?assign@?$char_traits(a)_W@std@@SAXAA_WAB_W(a)Z"); @@ -84,6 +206,13 @@ static BOOL init(void) p_short_eq = (void*)GetProcAddress(msvcp, "?eq@?$char_traits(a)G@std@@SA_NABG0(a)Z"); p_Copy_s = (void*)GetProcAddress(msvcp, "?_Copy_s@?$char_traits(a)D@std@@SAPADPADIPBDI(a)Z"); + + p_char_address = (void*)GetProcAddress(msvcp, "?address@?$allocator(a)D@std@@QBEPADAAD(a)Z"); + p_char_ctor = (void*)GetProcAddress(msvcp, "??0?$allocator(a)D@std@@QAE(a)XZ"); + p_char_deallocate = (void*)GetProcAddress(msvcp, "?deallocate@?$allocator(a)D@std@@QAEXPADI(a)Z"); + p_char_allocate = (void*)GetProcAddress(msvcp, "?allocate@?$allocator(a)D@std@@QAEPADI(a)Z"); + p_char_construct = (void*)GetProcAddress(msvcp, "?construct@?$allocator(a)D@std@@QAEXPADABD(a)Z"); + p_char_max_size = (void*)GetProcAddress(msvcp, "?max_size@?$allocator(a)D@std@@QBEIXZ"); } return TRUE; @@ -199,6 +328,43 @@ static void test_Copy_s(void) ok(errno == 0xdeadbeef, "errno = %d\n", errno); } +static void test_allocator_char(void) +{ + void *allocator = (void*)0xdeadbeef; + char *ptr; + char val; + unsigned int size; + + if(!p_char_address || !p_char_ctor || !p_char_deallocate || !p_char_allocate + || !p_char_construct || !p_char_max_size) { + win_skip("allocator<char> class not available\n"); + return; + } + + allocator = call_func1(p_char_ctor, allocator); + ok(allocator == (void*)0xdeadbeef, "allocator = %p\n", allocator); + + ptr = call_func2(p_char_address, NULL, (void*)0xdeadbeef); + ok(ptr == (void*)0xdeadbeef, "incorrect address (%p)\n", ptr); + + ptr = NULL; + ptr = call_func2(p_char_allocate, allocator, 10); + ok(ptr != NULL, "Memory allocation failed\n"); + + ptr[0] = ptr[1] = '#'; + val = 'a'; + call_func3(p_char_construct, allocator, ptr, &val); + val = 'b'; + call_func3(p_char_construct, allocator, (ptr+1), &val); + ok(ptr[0] == 'a', "ptr[0] = %c\n", ptr[0]); + ok(ptr[1] == 'b', "ptr[1] = %c\n", ptr[1]); + + call_func3(p_char_deallocate, allocator, ptr, -1); + + size = (unsigned int)call_func1(p_char_max_size, allocator); + ok(size == (unsigned int)0xffffffff, "size = %x\n", size); +} + START_TEST(misc) { if(!init()) @@ -208,5 +374,7 @@ START_TEST(misc) test_equal(); test_Copy_s(); + test_allocator_char(); + ok(!invalid_parameter, "invalid_parameter_handler was invoked too many times\n"); }

1 0