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

David Hedberg : explorerframe: Handle keyboard events.
by Alexandre Julliard 17 Aug '10

17 Aug '10

Module: wine Branch: master Commit: b349072687f2694d12871867e9854a16af35298b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b349072687f2694d12871867e… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Mon Aug 16 09:17:34 2010 +0200 explorerframe: Handle keyboard events. --- dlls/explorerframe/nstc.c | 85 +++++++++++++++++++++++++++++++++++++++ dlls/explorerframe/tests/nstc.c | 28 +++++++++++++ 2 files changed, 113 insertions(+), 0 deletions(-) diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index a9e667f..1852921 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -54,6 +54,8 @@ typedef struct { HWND hwnd_main; HWND hwnd_tv; + WNDPROC tv_oldwndproc; + NSTCSTYLE style; NSTCSTYLE2 style2; struct list roots; @@ -69,6 +71,9 @@ static const DWORD unsupported_styles2 = NSTCS2_INTERRUPTNOTIFICATIONS | NSTCS2_SHOWNULLSPACEMENU | NSTCS2_DISPLAYPADDING | NSTCS2_DISPLAYPINNEDONLY | NTSCS2_NOSINGLETONAUTOEXPAND | NTSCS2_NEVERINSERTNONENUMERATED; +/* Forward declarations */ +static LRESULT CALLBACK tv_wndproc(HWND hWnd, UINT uMessage, WPARAM wParam, LPARAM lParam); + /************************************************************************* * NamespaceTree event wrappers */ @@ -145,6 +150,13 @@ static HRESULT events_OnSelectionChanged(NSTC2Impl *This, IShellItemArray *psia) return INameSpaceTreeControlEvents_OnSelectionChanged(This->pnstce, psia); } +static HRESULT events_OnKeyboardInput(NSTC2Impl *This, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + if(!This->pnstce) return S_OK; + + return INameSpaceTreeControlEvents_OnKeyboardInput(This->pnstce, uMsg, wParam, lParam); +} + /************************************************************************* * NamespaceTree helper functions */ @@ -325,6 +337,16 @@ static UINT fill_sublevel(NSTC2Impl *This, HTREEITEM hitem) return added; } +static HTREEITEM get_selected_treeitem(NSTC2Impl *This) +{ + return (HTREEITEM)SendMessageW(This->hwnd_tv, TVM_GETNEXTITEM, TVGN_CARET, 0); +} + +static IShellItem *get_selected_shellitem(NSTC2Impl *This) +{ + return shellitem_from_treeitem(This, get_selected_treeitem(This)); +} + /************************************************************************* * NamespaceTree window functions */ @@ -378,6 +400,12 @@ static LRESULT create_namespacetree(HWND hWnd, CREATESTRUCTW *crs) INameSpaceTreeControl_AddRef((INameSpaceTreeControl*)This); + /* Subclass the treeview to get the keybord events. */ + This->tv_oldwndproc = (WNDPROC)SetWindowLongPtrW(This->hwnd_tv, GWLP_WNDPROC, + (ULONG_PTR)tv_wndproc); + if(This->tv_oldwndproc) + SetPropA(This->hwnd_tv, "PROP_THIS", This); + return TRUE; } @@ -396,6 +424,13 @@ static LRESULT destroy_namespacetree(NSTC2Impl *This) { TRACE("%p\n", This); + /* Undo the subclassing */ + if(This->tv_oldwndproc) + { + SetWindowLongPtrW(This->hwnd_tv, GWLP_WNDPROC, (ULONG_PTR)This->tv_oldwndproc); + RemovePropA(This->hwnd_tv, "PROP_THIS"); + } + INameSpaceTreeControl_RemoveAllRoots((INameSpaceTreeControl*)This); /* This reference was added in create_namespacetree */ @@ -535,6 +570,56 @@ static LRESULT on_tvn_selchangedw(NSTC2Impl *This, LPARAM lParam) return TRUE; } +static LRESULT on_kbd_event(NSTC2Impl *This, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + IShellItem *psi; + HTREEITEM hitem; + TRACE("%p : %d, %lx, %lx\n", This, uMsg, wParam, lParam); + + /* Handled by the client? */ + if(FAILED(events_OnKeyboardInput(This, uMsg, wParam, lParam))) + return TRUE; + + if(uMsg == WM_KEYDOWN) + { + switch(wParam) + { + case VK_DELETE: + psi = get_selected_shellitem(This); + FIXME("Deletion of file requested (shellitem: %p).\n", psi); + return TRUE; + + case VK_F2: + hitem = get_selected_treeitem(This); + SendMessageW(This->hwnd_tv, TVM_EDITLABELW, 0, (LPARAM)hitem); + return TRUE; + } + } + + /* Let the TreeView handle the key */ + return FALSE; +} + +static LRESULT CALLBACK tv_wndproc(HWND hWnd, UINT uMessage, WPARAM wParam, LPARAM lParam) +{ + NSTC2Impl *This = (NSTC2Impl*)GetPropA(hWnd, "PROP_THIS"); + + switch(uMessage) { + case WM_KEYDOWN: + case WM_KEYUP: + case WM_CHAR: + case WM_SYSKEYDOWN: + case WM_SYSKEYUP: + case WM_SYSCHAR: + if(on_kbd_event(This, uMessage, wParam, lParam)) + return TRUE; + break; + } + + /* Pass the message on to the treeview */ + return CallWindowProcW(This->tv_oldwndproc, hWnd, uMessage, wParam, lParam); +} + static LRESULT CALLBACK NSTC2_WndProc(HWND hWnd, UINT uMessage, WPARAM wParam, LPARAM lParam) { diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index 77d9254..170f189 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -160,6 +160,8 @@ static HRESULT WINAPI NSTCEvents_fnOnKeyboardInput( LPARAM lParam) { NSTCE_IMPL(iface)->count[OnKeyboardInput]++; + ok(wParam == 0x1234, "Got unexpected wParam %lx\n", wParam); + ok(lParam == 0x1234, "Got unexpected lParam %lx\n", lParam); return E_NOTIMPL; } @@ -1252,6 +1254,12 @@ static void test_events(void) if(hwnd_tv) { HTREEITEM hroot, hitem; + UINT i; + static const UINT kbd_msgs_event[] = { + WM_KEYDOWN, WM_KEYUP, WM_CHAR, WM_SYSKEYDOWN, WM_SYSKEYUP, + WM_SYSCHAR, 0 }; + static const UINT kbd_msgs_noevent[] ={ + WM_DEADCHAR, WM_SYSDEADCHAR, WM_UNICHAR, 0 }; /* Test On*Expand */ hroot = (HTREEITEM)SendMessageW(hwnd_tv, TVM_GETNEXTITEM, TVGN_ROOT, 0); @@ -1275,6 +1283,26 @@ static void test_events(void) process_msgs(); ok_event_count(pnstceimpl, OnSelectionChanged, 1); ok_no_events(pnstceimpl); + + /* Test OnKeyboardInput */ + for(i = 0; kbd_msgs_event[i] != 0; i++) + { + SendMessageW(hwnd_tv, kbd_msgs_event[i], 0x1234, 0x1234); + ok(pnstceimpl->count[OnKeyboardInput] == 1, + "%d (%x): Got count %d\n", + kbd_msgs_event[i], kbd_msgs_event[i], pnstceimpl->count[OnKeyboardInput]); + pnstceimpl->count[OnKeyboardInput] = 0; + } + + for(i = 0; kbd_msgs_noevent[i] != 0; i++) + { + SendMessageW(hwnd_tv, kbd_msgs_noevent[i], 0x1234, 0x1234); + ok(pnstceimpl->count[OnKeyboardInput] == 0, + "%d (%x): Got count %d\n", + kbd_msgs_noevent[i], kbd_msgs_noevent[i], pnstceimpl->count[OnKeyboardInput]); + pnstceimpl->count[OnKeyboardInput] = 0; + } + ok_no_events(pnstceimpl); } else skip("Skipping some tests.\n");

1 0

David Hedberg : explorerframe: Handle some mouse events.
by Alexandre Julliard 17 Aug '10

17 Aug '10

Module: wine Branch: master Commit: 1f76341488723b5ac74751dab9921b925f385c48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f76341488723b5ac74751dab… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Mon Aug 16 09:17:35 2010 +0200 explorerframe: Handle some mouse events. --- dlls/explorerframe/nstc.c | 71 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 71 insertions(+), 0 deletions(-) diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index 1852921..b2d780f 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -143,6 +143,20 @@ static HRESULT events_OnAfterExpand(NSTC2Impl *This, IShellItem *psi) return ret; } +static HRESULT events_OnItemClick(NSTC2Impl *This, IShellItem *psi, + NSTCEHITTEST nstceHitTest, NSTCECLICKTYPE nstceClickType) +{ + HRESULT ret; + LONG refcount; + if(!This->pnstce) return S_OK; + + refcount = IShellItem_AddRef(psi); + ret = INameSpaceTreeControlEvents_OnItemClick(This->pnstce, psi, nstceHitTest, nstceClickType); + if(IShellItem_Release(psi) < refcount - 1) + ERR("ShellItem was released by client - please file a bug.\n"); + return ret; +} + static HRESULT events_OnSelectionChanged(NSTC2Impl *This, IShellItemArray *psia) { if(!This->pnstce) return S_OK; @@ -570,6 +584,60 @@ static LRESULT on_tvn_selchangedw(NSTC2Impl *This, LPARAM lParam) return TRUE; } +static LRESULT on_nm_click(NSTC2Impl *This, NMHDR *nmhdr) +{ + TVHITTESTINFO tvhit; + IShellItem *psi; + HRESULT hr; + TRACE("%p (%p)\n", This, nmhdr); + + GetCursorPos(&tvhit.pt); + ScreenToClient(This->hwnd_tv, &tvhit.pt); + SendMessageW(This->hwnd_tv, TVM_HITTEST, 0, (LPARAM)&tvhit); + + if(tvhit.flags & (TVHT_NOWHERE|TVHT_ABOVE|TVHT_BELOW)) + return TRUE; + + /* TVHT_ maps onto the corresponding NSTCEHT_ */ + psi = shellitem_from_treeitem(This, tvhit.hItem); + hr = events_OnItemClick(This, psi, tvhit.flags, NSTCECT_LBUTTON); + + /* The expando should not be expanded unless + * double-clicked. */ + if(tvhit.flags == TVHT_ONITEMBUTTON) + return TRUE; + + if(SUCCEEDED(hr)) + return FALSE; + else + return TRUE; +} + +static LRESULT on_wm_mbuttonup(NSTC2Impl *This, WPARAM wParam, LPARAM lParam) +{ + TVHITTESTINFO tvhit; + IShellItem *psi; + HRESULT hr; + TRACE("%p (%lx, %lx)\n", This, wParam, lParam); + + tvhit.pt.x = (int)(short)LOWORD(lParam); + tvhit.pt.y = (int)(short)HIWORD(lParam); + + SendMessageW(This->hwnd_tv, TVM_HITTEST, 0, (LPARAM)&tvhit); + + /* Seems to generate only ONITEM and ONITEMICON */ + if( !(tvhit.flags & (TVHT_ONITEM|TVHT_ONITEMICON)) ) + return FALSE; + + psi = shellitem_from_treeitem(This, tvhit.hItem); + hr = events_OnItemClick(This, psi, tvhit.flags, NSTCECT_MBUTTON); + + if(SUCCEEDED(hr)) + return FALSE; + else + return TRUE; +} + static LRESULT on_kbd_event(NSTC2Impl *This, UINT uMsg, WPARAM wParam, LPARAM lParam) { IShellItem *psi; @@ -614,6 +682,8 @@ static LRESULT CALLBACK tv_wndproc(HWND hWnd, UINT uMessage, WPARAM wParam, LPAR if(on_kbd_event(This, uMessage, wParam, lParam)) return TRUE; break; + + case WM_MBUTTONUP: return on_wm_mbuttonup(This, wParam, lParam); } /* Pass the message on to the treeview */ @@ -635,6 +705,7 @@ static LRESULT CALLBACK NSTC2_WndProc(HWND hWnd, UINT uMessage, nmhdr = (NMHDR*)lParam; switch(nmhdr->code) { + case NM_CLICK: return on_nm_click(This, nmhdr); case TVN_DELETEITEMW: return on_tvn_deleteitemw(This, lParam); case TVN_GETDISPINFOW: return on_tvn_getdispinfow(This, lParam); case TVN_ITEMEXPANDINGW: return on_tvn_itemexpandingw(This, lParam);

1 0

Andrew Nguyen : ipconfig: Add stub implementation.
by Alexandre Julliard 17 Aug '10

17 Aug '10

Module: wine Branch: master Commit: 6919c8dfc8b7a893fd50b89d47316b526dfc0f7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6919c8dfc8b7a893fd50b89d4… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Aug 16 02:54:00 2010 -0500 ipconfig: Add stub implementation. --- configure | 1 + configure.ac | 1 + programs/ipconfig/Makefile.in | 11 +++++++++++ programs/ipconfig/ipconfig.c | 31 +++++++++++++++++++++++++++++++ 4 files changed, 44 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 907dbe0..844dde5 100755 --- a/configure +++ b/configure @@ -14905,6 +14905,7 @@ wine_fn_config_program extrac32 enable_extrac32 install wine_fn_config_program hh enable_hh install wine_fn_config_program icinfo enable_icinfo install wine_fn_config_program iexplore enable_iexplore install +wine_fn_config_program ipconfig enable_ipconfig install wine_fn_config_program lodctr enable_lodctr install wine_fn_config_program mshta enable_mshta install wine_fn_config_program msiexec enable_msiexec installbin diff --git a/configure.ac b/configure.ac index 0f61046..982e6f6 100644 --- a/configure.ac +++ b/configure.ac @@ -2744,6 +2744,7 @@ WINE_CONFIG_PROGRAM(extrac32,install) WINE_CONFIG_PROGRAM(hh,install) WINE_CONFIG_PROGRAM(icinfo,install) WINE_CONFIG_PROGRAM(iexplore,install) +WINE_CONFIG_PROGRAM(ipconfig,install) WINE_CONFIG_PROGRAM(lodctr,install) WINE_CONFIG_PROGRAM(mshta,install) WINE_CONFIG_PROGRAM(msiexec,installbin) diff --git a/programs/ipconfig/Makefile.in b/programs/ipconfig/Makefile.in new file mode 100644 index 0000000..0cd8ce6 --- /dev/null +++ b/programs/ipconfig/Makefile.in @@ -0,0 +1,11 @@ +EXTRADEFS = -DWINE_NO_UNICODE_MACROS +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = ipconfig.exe +APPMODE = -mconsole -municode + +C_SRCS = ipconfig.c + +(a)MAKE_PROG_RULES@ diff --git a/programs/ipconfig/ipconfig.c b/programs/ipconfig/ipconfig.c new file mode 100644 index 0000000..fc5d95c --- /dev/null +++ b/programs/ipconfig/ipconfig.c @@ -0,0 +1,31 @@ +/* + * IP configuration utility + * + * Copyright 2010 Andrew Nguyen + * + * 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 <windows.h> +#include <wine/debug.h> +#include <wine/unicode.h> + +WINE_DEFAULT_DEBUG_CHANNEL(ipconfig); + +int wmain(int argc, WCHAR *argv[]) +{ + WINE_FIXME("ipconfig.exe is not implemented\n"); + return 0; +}

1 0

Andrew Nguyen : ipconfig: Implement basic command-line parsing.
by Alexandre Julliard 17 Aug '10

17 Aug '10

Module: wine Branch: master Commit: de239dc852c8df5914abe974eac202d60b83611d URL: http://source.winehq.org/git/wine.git/?a=commit;h=de239dc852c8df5914abe974e… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Aug 16 02:54:10 2010 -0500 ipconfig: Implement basic command-line parsing. --- programs/ipconfig/En.rc | 30 ++++++++++++++++ programs/ipconfig/Makefile.in | 3 ++ programs/ipconfig/ipconfig.c | 76 ++++++++++++++++++++++++++++++++++++++++- programs/ipconfig/ipconfig.h | 25 +++++++++++++ 4 files changed, 133 insertions(+), 1 deletions(-) diff --git a/programs/ipconfig/En.rc b/programs/ipconfig/En.rc new file mode 100644 index 0000000..4635ff6 --- /dev/null +++ b/programs/ipconfig/En.rc @@ -0,0 +1,30 @@ +/* + * IP configuration utility + * English language support + * + * Copyright 2010 Andrew Nguyen + * + * 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" + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +STRINGTABLE +{ + STRING_USAGE, "Usage: ipconfig [ /? | /all ]\n" + STRING_INVALID_CMDLINE, "Error: Unknown or invalid command line parameters specified\n" +} diff --git a/programs/ipconfig/Makefile.in b/programs/ipconfig/Makefile.in index 0cd8ce6..18a7714 100644 --- a/programs/ipconfig/Makefile.in +++ b/programs/ipconfig/Makefile.in @@ -5,7 +5,10 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = ipconfig.exe APPMODE = -mconsole -municode +IMPORTS = user32 C_SRCS = ipconfig.c +RC_SRCS = En.rc + @MAKE_PROG_RULES@ diff --git a/programs/ipconfig/ipconfig.c b/programs/ipconfig/ipconfig.c index fc5d95c..7c988bb 100644 --- a/programs/ipconfig/ipconfig.c +++ b/programs/ipconfig/ipconfig.c @@ -1,6 +1,7 @@ /* * IP configuration utility * + * Copyright 2008 Andrew Riedi * Copyright 2010 Andrew Nguyen * * This library is free software; you can redistribute it and/or @@ -22,10 +23,83 @@ #include <wine/debug.h> #include <wine/unicode.h> +#include "ipconfig.h" + WINE_DEFAULT_DEBUG_CHANNEL(ipconfig); +static int ipconfig_printfW(const WCHAR *msg, ...) +{ + va_list va_args; + int wlen; + DWORD count, ret; + WCHAR msg_buffer[8192]; + + va_start(va_args, msg); + wlen = vsprintfW(msg_buffer, msg, va_args); + va_end(va_args); + + ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), msg_buffer, wlen, &count, NULL); + if (!ret) + { + DWORD len; + char *msgA; + + len = WideCharToMultiByte(GetConsoleOutputCP(), 0, msg_buffer, wlen, + NULL, 0, NULL, NULL); + msgA = HeapAlloc(GetProcessHeap(), 0, len); + if (!msgA) + return 0; + + WideCharToMultiByte(GetConsoleOutputCP(), 0, msg_buffer, wlen, msgA, len, + NULL, NULL); + WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), msgA, len, &count, FALSE); + HeapFree(GetProcessHeap(), 0, msgA); + } + + return count; +} + +static int ipconfig_message(int msg) +{ + static const WCHAR formatW[] = {'%','s',0}; + WCHAR msg_buffer[8192]; + + LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, + sizeof(msg_buffer)/sizeof(WCHAR)); + return ipconfig_printfW(formatW, msg_buffer); +} + int wmain(int argc, WCHAR *argv[]) { - WINE_FIXME("ipconfig.exe is not implemented\n"); + static const WCHAR slashHelp[] = {'/','?',0}; + static const WCHAR slashAll[] = {'/','a','l','l',0}; + + if (argc > 1) + { + if (!strcmpW(slashHelp, argv[1])) + { + ipconfig_message(STRING_USAGE); + return 1; + } + else if (!strcmpiW(slashAll, argv[1])) + { + if (argv[2]) + { + ipconfig_message(STRING_INVALID_CMDLINE); + ipconfig_message(STRING_USAGE); + return 1; + } + + WINE_FIXME("/all option is not currently handled\n"); + } + else + { + ipconfig_message(STRING_INVALID_CMDLINE); + ipconfig_message(STRING_USAGE); + return 1; + } + } + + WINE_FIXME("Network interface output is not currently implemented\n"); return 0; } diff --git a/programs/ipconfig/ipconfig.h b/programs/ipconfig/ipconfig.h new file mode 100644 index 0000000..f02792d --- /dev/null +++ b/programs/ipconfig/ipconfig.h @@ -0,0 +1,25 @@ +/* + * IP configuration utility private definitions + * + * Copyright 2010 Andrew Nguyen + * + * 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 <windef.h> + +/* Translation IDs. */ +#define STRING_USAGE 101 +#define STRING_INVALID_CMDLINE 102

1 0

David Hedberg : shell32: Partial implementation of IShellItem:: BindToHandler.
by Alexandre Julliard 17 Aug '10

17 Aug '10

Module: wine Branch: master Commit: 6fbfb7cd1dfc1904c0748670db3c468d748438bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fbfb7cd1dfc1904c0748670d… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Mon Aug 16 09:17:30 2010 +0200 shell32: Partial implementation of IShellItem::BindToHandler. --- dlls/shell32/shellitem.c | 43 +++++++++++- dlls/shell32/tests/shlfolder.c | 152 ++++++++++++++++++++++++++++++++++++++++ include/shlguid.h | 17 +++++ 3 files changed, 210 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6fbfb7cd1dfc1904c0748…

1 0

David Hedberg : explorerframe: Fix INameSpaceTreeControl::RemoveRoot.
by Alexandre Julliard 17 Aug '10

17 Aug '10

Module: wine Branch: master Commit: 6963f372531986f609e48f3a6cda44b3b87311b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6963f372531986f609e48f3a6… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Mon Aug 16 09:17:31 2010 +0200 explorerframe: Fix INameSpaceTreeControl::RemoveRoot. The root shellitem was being freed before getting passed to the event sink. --- dlls/explorerframe/nstc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index 320b67d..e00249d 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -647,8 +647,8 @@ static HRESULT WINAPI NSTC2_fnRemoveRoot(INameSpaceTreeControl2* iface, TRACE("root %p\n", root); if(root) { - SendMessageW(This->hwnd_tv, TVM_DELETEITEM, 0, (LPARAM)root->htreeitem); events_OnItemDeleted(This, root->psi, TRUE); + SendMessageW(This->hwnd_tv, TVM_DELETEITEM, 0, (LPARAM)root->htreeitem); list_remove(&root->entry); HeapFree(GetProcessHeap(), 0, root); return S_OK;

1 0

David Hedberg : explorerframe: Implement expansion of nodes.
by Alexandre Julliard 17 Aug '10

17 Aug '10

Module: wine Branch: master Commit: 4ad1050eb55b4de64b0f93088d8080fd43fddaf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ad1050eb55b4de64b0f93088… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Mon Aug 16 09:17:32 2010 +0200 explorerframe: Implement expansion of nodes. --- dlls/explorerframe/nstc.c | 152 +++++++++++++++++++++++++++++++++++++++ dlls/explorerframe/tests/nstc.c | 119 ++++++++++++++++++++++++++++++ 2 files changed, 271 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4ad1050eb55b4de64b0f9…

1 0

Alexandre Goujon : atl: Fix AtlAxAttachControl wine check.
by Alexandre Julliard 17 Aug '10

17 Aug '10

Module: wine Branch: master Commit: e4bb3ae755cee67c7631425a4f21d9b3a2e22895 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4bb3ae755cee67c7631425a4… Author: Alexandre Goujon <ale.goujon(a)gmail.com> Date: Sun Aug 15 12:01:28 2010 +0200 atl: Fix AtlAxAttachControl wine check. --- dlls/atl/atl_ax.c | 3 +++ dlls/atl/tests/atl_ax.c | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index d9d60a5..1293cb8 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -1053,6 +1053,9 @@ HRESULT WINAPI AtlAxAttachControl(IUnknown* pControl, HWND hWnd, IUnknown** ppUn *ppUnkContainer = (IUnknown*) pUnkContainer; } + if(!hWnd) + return S_FALSE; + return hr; } diff --git a/dlls/atl/tests/atl_ax.c b/dlls/atl/tests/atl_ax.c index d17046d..4555bd6 100644 --- a/dlls/atl/tests/atl_ax.c +++ b/dlls/atl/tests/atl_ax.c @@ -94,12 +94,10 @@ static void test_AtlAxAttachControl(void) } hr = pAtlAxAttachControl(pObj, NULL, NULL); - todo_wine ok(hr == S_FALSE, "Expected AtlAxAttachControl to return S_FALSE, got 0x%08x\n", hr); pContainer = (IUnknown *)0xdeadbeef; hr = pAtlAxAttachControl(pObj, NULL, &pContainer); - todo_wine ok(hr == S_FALSE, "Expected AtlAxAttachControl to return S_FALSE, got 0x%08x\n", hr); ok(pContainer != (IUnknown *)0xdeadbeef && pContainer != NULL,

1 0

Wolfram Sang : user32: Check for valid pointer in CreateIconFromResource.
by Alexandre Julliard 17 Aug '10

17 Aug '10

Module: wine Branch: master Commit: 9f0f17f8535879ed4807226062310e0858207026 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f0f17f8535879ed480722606… Author: Wolfram Sang <wolfram(a)the-dreams.de> Date: Wed Aug 4 16:05:00 2010 +0200 user32: Check for valid pointer in CreateIconFromResource. --- dlls/user32/cursoricon.c | 5 +++-- dlls/user32/tests/cursoricon.c | 5 +++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 9a1810e..938f0dd 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1064,8 +1064,6 @@ static HCURSOR CURSORICON_CreateIconFromANI( const LPBYTE bits, DWORD bits_size, TRACE("bits %p, bits_size %d\n", bits, bits_size); - if (!bits) return 0; - riff_find_chunk( ANI_ACON_ID, ANI_RIFF_ID, &root_chunk, &ACON_chunk ); if (!ACON_chunk.data) { @@ -1104,6 +1102,7 @@ static HCURSOR CURSORICON_CreateIconFromANI( const LPBYTE bits, DWORD bits_size, width, height, depth ); frame_bits = HeapAlloc( GetProcessHeap(), 0, entry->dwDIBSize ); + if (!frame_bits) return 0; memcpy( frame_bits, icon_data + entry->dwDIBOffset, entry->dwDIBSize ); if (!header.width || !header.height) @@ -1142,6 +1141,8 @@ HICON WINAPI CreateIconFromResourceEx( LPBYTE bits, UINT cbSize, bits, cbSize, dwVersion, width, height, bIcon ? "icon" : "cursor", (cFlag & LR_MONOCHROME) ? "mono" : "" ); + if (!bits) return 0; + if (bIcon) { hotspot.x = width / 2; diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index b2e1d84..e81e76d 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1005,6 +1005,11 @@ static void test_CreateIconFromResource(void) error = GetLastError(); ok(error == 0xdeadbeef, "Last error: %u\n", error); + /* Rejection of NULL pointer crashes at least on WNT4WSSP6, W2KPROSP4, WXPPROSP3 + * + * handle = CreateIconFromResource(NULL, ICON_RES_SIZE, TRUE, 0x00030000); + * ok(handle == NULL, "Invalid pointer accepted (%p)\n", handle); + */ HeapFree(GetProcessHeap(), 0, hotspot); }

1 0

Wolfram Sang : kernel32: Change fixme to trace in comm.c.
by Alexandre Julliard 17 Aug '10

17 Aug '10

Module: wine Branch: master Commit: f999060f4d88d1595987a24862ed9b8b74e86aa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f999060f4d88d1595987a2486… Author: Wolfram Sang <wolfram(a)the-dreams.de> Date: Mon Aug 9 12:15:50 2010 +0200 kernel32: Change fixme to trace in comm.c. --- dlls/kernel32/comm.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/comm.c b/dlls/kernel32/comm.c index f4edfd3..9653d6e 100644 --- a/dlls/kernel32/comm.c +++ b/dlls/kernel32/comm.c @@ -1138,7 +1138,7 @@ BOOL WINAPI GetCommProperties( HANDLE hFile, /* [in] handle of the comm port */ LPCOMMPROP lpCommProp) /* [out] pointer to struct to be filled */ { - FIXME("(%p %p )\n",hFile,lpCommProp); + TRACE("(%p %p)\n",hFile,lpCommProp); if(!lpCommProp) return FALSE; @@ -1150,7 +1150,6 @@ BOOL WINAPI GetCommProperties( lpCommProp->wPacketLength = 1; lpCommProp->wPacketVersion = 1; lpCommProp->dwServiceMask = SP_SERIALCOMM; - lpCommProp->dwReserved1 = 0; lpCommProp->dwMaxTxQueue = 4096; lpCommProp->dwMaxRxQueue = 4096; lpCommProp->dwMaxBaud = BAUD_115200;

1 0