wine-commits March 2010

wine-commits@winehq.org

3 participants
919 discussions

Andrew Nguyen : dxdiagn: Fix return value of IDxDiagContainer:: GetProp on property search failure.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: 61cb53e24d8fd4bc03a4985ab4be71ec00a5f815 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61cb53e24d8fd4bc03a4985ab… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Mon Mar 22 23:56:51 2010 -0500 dxdiagn: Fix return value of IDxDiagContainer::GetProp on property search failure. --- dlls/dxdiagn/container.c | 2 +- dlls/dxdiagn/tests/container.c | 93 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+), 1 deletions(-) diff --git a/dlls/dxdiagn/container.c b/dlls/dxdiagn/container.c index 0682145..db1a336 100644 --- a/dlls/dxdiagn/container.c +++ b/dlls/dxdiagn/container.c @@ -227,7 +227,7 @@ static HRESULT WINAPI IDxDiagContainerImpl_GetProp(PDXDIAGCONTAINER iface, LPCWS } p = p->next; } - return S_OK; + return E_INVALIDARG; } HRESULT WINAPI IDxDiagContainerImpl_AddProp(PDXDIAGCONTAINER iface, LPCWSTR pwszPropName, VARIANT* pVarProp) { diff --git a/dlls/dxdiagn/tests/container.c b/dlls/dxdiagn/tests/container.c index 6557e37..214e7dd 100644 --- a/dlls/dxdiagn/tests/container.c +++ b/dlls/dxdiagn/tests/container.c @@ -22,6 +22,7 @@ #include <stdio.h> #include "dxdiag.h" +#include "oleauto.h" #include "wine/test.h" static IDxDiagProvider *pddp; @@ -527,6 +528,97 @@ cleanup: IDxDiagProvider_Release(pddp); } +static void test_GetProp(void) +{ + HRESULT hr; + WCHAR container[256], property[256]; + IDxDiagContainer *child = NULL; + DWORD count, index; + VARIANT var; + static const WCHAR emptyW[] = {0}; + static const WCHAR testW[] = {'t','e','s','t',0}; + + if (!create_root_IDxDiagContainer()) + { + skip("Unable to create the root IDxDiagContainer\n"); + return; + } + + /* Find a container with a property. */ + hr = IDxDiagContainer_GetNumberOfChildContainers(pddc, &count); + ok(hr == S_OK, "Expected IDxDiagContainer::GetNumberOfChildContainers to return S_OK, got 0x%08x\n", hr); + if (FAILED(hr)) + { + skip("IDxDiagContainer::GetNumberOfChildContainers failed\n"); + goto cleanup; + } + + for (index = 0; index < count; index++) + { + hr = IDxDiagContainer_EnumChildContainerNames(pddc, index, container, sizeof(container)/sizeof(WCHAR)); + ok(hr == S_OK, "Expected IDxDiagContainer_EnumChildContainerNames to return S_OK, got 0x%08x\n", hr); + if (FAILED(hr)) + { + skip("IDxDiagContainer::EnumChildContainerNames failed\n"); + goto cleanup; + } + + hr = IDxDiagContainer_GetChildContainer(pddc, container, &child); + ok(hr == S_OK, "Expected IDxDiagContainer::GetChildContainer to return S_OK, got 0x%08x\n", hr); + + if (SUCCEEDED(hr)) + { + hr = IDxDiagContainer_EnumPropNames(child, 0, property, sizeof(property)/sizeof(WCHAR)); + ok(hr == S_OK || hr == E_INVALIDARG, + "Expected IDxDiagContainer::EnumPropNames to return S_OK or E_INVALIDARG, got 0x%08x\n", hr); + + if (SUCCEEDED(hr)) + break; + else + { + IDxDiagContainer_Release(child); + child = NULL; + } + } + } + + if (!child) + { + skip("Unable to find a suitable container\n"); + goto cleanup; + } + + hr = IDxDiagContainer_GetProp(child, NULL, NULL); + ok(hr == E_INVALIDARG, "Expected IDxDiagContainer::GetProp to return E_INVALIDARG, got 0x%08x\n", hr); + + V_VT(&var) = 0xdead; + hr = IDxDiagContainer_GetProp(child, NULL, &var); + ok(hr == E_INVALIDARG, "Expected IDxDiagContainer::GetProp to return E_INVALIDARG, got 0x%08x\n", hr); + ok(V_VT(&var) == 0xdead, "Expected the variant to be untouched, got %u\n", V_VT(&var)); + + hr = IDxDiagContainer_GetProp(child, emptyW, NULL); + ok(hr == E_INVALIDARG, "Expected IDxDiagContainer::GetProp to return E_INVALIDARG, got 0x%08x\n", hr); + + V_VT(&var) = 0xdead; + hr = IDxDiagContainer_GetProp(child, emptyW, &var); + ok(hr == E_INVALIDARG, "Expected IDxDiagContainer::GetProp to return E_INVALIDARG, got 0x%08x\n", hr); + ok(V_VT(&var) == 0xdead, "Expected the variant to be untouched, got %u\n", V_VT(&var)); + + hr = IDxDiagContainer_GetProp(child, testW, NULL); + ok(hr == E_INVALIDARG, "Expected IDxDiagContainer::GetProp to return E_INVALIDARG, got 0x%08x\n", hr); + + V_VT(&var) = 0xdead; + hr = IDxDiagContainer_GetProp(child, testW, &var); + ok(hr == E_INVALIDARG, "Expected IDxDiagContainer::GetProp to return E_INVALIDARG, got 0x%08x\n", hr); + ok(V_VT(&var) == 0xdead, "Expected the variant to be untouched, got %u\n", V_VT(&var)); + + IDxDiagContainer_Release(child); + +cleanup: + IDxDiagContainer_Release(pddc); + IDxDiagProvider_Release(pddp); +} + START_TEST(container) { CoInitialize(NULL); @@ -536,5 +628,6 @@ START_TEST(container) test_GetChildContainer(); test_dot_parsing(); test_EnumPropNames(); + test_GetProp(); CoUninitialize(); }

1 0

Nikolay Sivov : shell32: Add IFolderView::Item implementation.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: 34577a84d967e1e93a94b565bb0b4f71e644afb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34577a84d967e1e93a94b565b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 23 05:08:10 2010 +0300 shell32: Add IFolderView::Item implementation. --- dlls/shell32/shlview.c | 21 ++++++++++++++++++--- dlls/shell32/tests/shlview.c | 12 +++++++++++- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 3049c1b..653e5f3 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -2741,9 +2741,24 @@ static HRESULT WINAPI IFView_GetFolder(IFolderView *iface, REFIID riid, void **p static HRESULT WINAPI IFView_Item(IFolderView *iface, int index, PITEMID_CHILD *ppidl) { - IShellViewImpl *This = impl_from_IFolderView(iface); - FIXME("(%p)->(%d %p), stub\n", This, index, ppidl); - return E_NOTIMPL; + IShellViewImpl *This = impl_from_IFolderView(iface); + LVITEMW item; + + TRACE("(%p)->(%d %p)\n", This, index, ppidl); + + item.mask = LVIF_PARAM; + item.iItem = index; + + if (SendMessageW(This->hWndList, LVM_GETITEMW, 0, (LPARAM)&item)) + { + *ppidl = ILClone((PITEMID_CHILD)item.lParam); + return S_OK; + } + else + { + *ppidl = 0; + return E_INVALIDARG; + } } static HRESULT WINAPI IFView_ItemCount(IFolderView *iface, UINT flags, int *items) diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index 35b001a..59716d5 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -370,6 +370,7 @@ static void test_IFolderView(void) IShellBrowser *browser; IFolderView *fv; HWND hwnd_view, hwnd_list; + PITEMID_CHILD pidl; HRESULT hr; INT ret; POINT pt; @@ -395,6 +396,11 @@ static void test_IFolderView(void) hr = IFolderView_GetSpacing(fv, NULL); ok(hr == S_FALSE || broken(hr == S_OK) /* win7 */, "got (0x%08x)\n", hr); + pidl = (void*)0xdeadbeef; + hr = IFolderView_Item(fv, 0, &pidl); + ok(hr == E_INVALIDARG || broken(hr == E_FAIL) /* < Vista */, "got (0x%08x)\n", hr); + ok(pidl == 0 || broken(pidl == (void*)0xdeadbeef) /* < Vista */, "got %p\n", pidl); + if (0) { /* crashes on Vista and Win2k8 - List not created yet case */ @@ -403,6 +409,9 @@ if (0) /* crashes on XP */ hr = IFolderView_GetSelectionMarkedItem(fv, NULL); hr = IFolderView_GetFocusedItem(fv, NULL); + + /* crashes on Vista+ */ + hr = IFolderView_Item(fv, 0, NULL); } browser = IShellBrowserImpl_Construct(); @@ -585,7 +594,8 @@ static void test_IShellFolderView(void) i = 0xdeadbeef; hr = IShellFolderView_RemoveObject(folderview, NULL, &i); ok(hr == S_OK, "got (0x%08x)\n", hr); - ok(i == 0, "got %d\n", i); + ok(i == 0 || i == -1 /* Win7 */ || broken(i == 0xdeadbeef) /* Vista, 2k8 */, + "got %d\n", i); IShellFolderView_Release(folderview);

1 0

Nikolay Sivov : shell32/tests: Use strict comparison for return values.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: edcaf53f94be16e71714571eae55a8d602d849d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edcaf53f94be16e71714571ea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 23 04:21:13 2010 +0300 shell32/tests: Use strict comparison for return values. --- dlls/shell32/tests/autocomplete.c | 10 +- dlls/shell32/tests/shelllink.c | 122 +++++++++++----------- dlls/shell32/tests/shellpath.c | 24 ++-- dlls/shell32/tests/shlexec.c | 2 +- dlls/shell32/tests/shlfolder.c | 210 ++++++++++++++++++------------------ 5 files changed, 184 insertions(+), 184 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=edcaf53f94be16e717145…

1 0

Nikolay Sivov : shell32: Add IShellFolderView::RemoveObject for IShellView.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: 0a32123d106284a5678f90182926af4acaa1363a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a32123d106284a5678f90182… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 23 03:30:04 2010 +0300 shell32: Add IShellFolderView::RemoveObject for IShellView. --- dlls/shell32/shlview.c | 73 ++++++++++++++++++++++------------------- dlls/shell32/tests/shlview.c | 6 +++ 2 files changed, 45 insertions(+), 34 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 13b7c92..3049c1b 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -585,19 +585,6 @@ static BOOLEAN LV_AddItem(IShellViewImpl * This, LPCITEMIDLIST pidl) } /********************************************************** -* LV_DeleteItem() -*/ -static BOOLEAN LV_DeleteItem(IShellViewImpl * This, LPCITEMIDLIST pidl) -{ - int nIndex; - - TRACE("(%p)(pidl=%p)\n", This, pidl); - - nIndex = LV_FindItemByPidl(This, ILFindLastID(pidl)); - return (-1==SendMessageW(This->hWndList, LVM_DELETEITEM, nIndex, 0))? FALSE: TRUE; -} - -/********************************************************** * LV_RenameItem() */ static BOOLEAN LV_RenameItem(IShellViewImpl * This, LPCITEMIDLIST pidlOld, LPCITEMIDLIST pidlNew ) @@ -1608,28 +1595,33 @@ static LRESULT ShellView_OnNotify(IShellViewImpl * This, UINT CtlID, LPNMHDR lpn * ShellView_OnChange() */ -static LRESULT ShellView_OnChange(IShellViewImpl * This, const LPCITEMIDLIST * Pidls, LONG wEventId) +static LRESULT ShellView_OnChange(IShellViewImpl * This, const LPCITEMIDLIST *pidls, LONG event) { + BOOL ret = TRUE; - TRACE("(%p)(%p,%p,0x%08x)\n", This, Pidls[0], Pidls[1], wEventId); - switch(wEventId) - { - case SHCNE_MKDIR: - case SHCNE_CREATE: - LV_AddItem(This, Pidls[0]); - break; - case SHCNE_RMDIR: - case SHCNE_DELETE: - LV_DeleteItem(This, Pidls[0]); - break; - case SHCNE_RENAMEFOLDER: - case SHCNE_RENAMEITEM: - LV_RenameItem(This, Pidls[0], Pidls[1]); - break; - case SHCNE_UPDATEITEM: + TRACE("(%p)->(%p, %p, 0x%08x)\n", This, pidls[0], pidls[1], event); + + switch (event) + { + case SHCNE_MKDIR: + case SHCNE_CREATE: + LV_AddItem(This, pidls[0]); + break; + case SHCNE_RMDIR: + case SHCNE_DELETE: + { + INT i = LV_FindItemByPidl(This, ILFindLastID(pidls[0])); + ret = SendMessageW(This->hWndList, LVM_DELETEITEM, i, 0); + break; + } + case SHCNE_RENAMEFOLDER: + case SHCNE_RENAMEITEM: + LV_RenameItem(This, pidls[0], pidls[1]); + break; + case SHCNE_UPDATEITEM: break; - } - return TRUE; + } + return ret; } /********************************************************** * ShellView_WndProc @@ -2989,8 +2981,21 @@ static HRESULT WINAPI IShellFolderView_fnRemoveObject( UINT *item) { IShellViewImpl *This = impl_from_IShellFolderView(iface); - FIXME("(%p)->(%p %p) stub\n", This, pidl, item); - return E_NOTIMPL; + + TRACE("(%p)->(%p %p)\n", This, pidl, item); + + if (pidl) + { + *item = LV_FindItemByPidl(This, ILFindLastID(pidl)); + SendMessageW(This->hWndList, LVM_DELETEITEM, *item, 0); + } + else + { + *item = 0; + SendMessageW(This->hWndList, LVM_DELETEALLITEMS, 0, 0); + } + + return S_OK; } static HRESULT WINAPI IShellFolderView_fnGetObjectCount( diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index f3d3809..35b001a 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -581,6 +581,12 @@ static void test_IShellFolderView(void) ok(hr == S_OK, "got (0x%08x)\n", hr); ok(i == 0xdeadbeef, "got %d\n", i); + /* ::RemoveObject */ + i = 0xdeadbeef; + hr = IShellFolderView_RemoveObject(folderview, NULL, &i); + ok(hr == S_OK, "got (0x%08x)\n", hr); + ok(i == 0, "got %d\n", i); + IShellFolderView_Release(folderview); IShellView_Release(view);

1 0

Nikolay Sivov : shell32: IShellView::ContextSensitiveHelp not implemented.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: 1f6c759e0c183d7952f83e7a31f94e96a294ec1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f6c759e0c183d7952f83e7a3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 23 02:19:34 2010 +0300 shell32: IShellView::ContextSensitiveHelp not implemented. --- dlls/shell32/shlview.c | 12 +++++------- dlls/shell32/tests/shlview.c | 23 +++++++++++++++++++++++ 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 8e9323a..13b7c92 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -1807,13 +1807,11 @@ static HRESULT WINAPI IShellView_fnGetWindow(IShellView2 * iface,HWND * phWnd) return S_OK; } -static HRESULT WINAPI IShellView_fnContextSensitiveHelp(IShellView2 * iface,BOOL fEnterMode) +static HRESULT WINAPI IShellView_fnContextSensitiveHelp(IShellView2 *iface, BOOL mode) { - IShellViewImpl *This = (IShellViewImpl *)iface; - - FIXME("(%p) stub\n",This); - - return E_NOTIMPL; + IShellViewImpl *This = (IShellViewImpl *)iface; + TRACE("(%p)->(%d)\n", This, mode); + return E_NOTIMPL; } /********************************************************** @@ -3074,7 +3072,7 @@ static HRESULT WINAPI IShellFolderView_fnGetSelectedObjects( *pidl = LocalAlloc(0, *items*sizeof(LPITEMIDLIST)); if (!*pidl) return E_OUTOFMEMORY; - /* it's documented that caller shouldn't PIDLs, only array itself */ + /* it's documented that caller shouldn't free PIDLs, only array itself */ memcpy((PITEMID_CHILD*)*pidl, This->apidl, *items*sizeof(LPITEMIDLIST)); } diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index 82e198b..f3d3809 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -587,6 +587,28 @@ static void test_IShellFolderView(void) IShellFolder_Release(desktop); } +static void test_IOleWindow(void) +{ + IShellFolder *desktop; + IShellView *view; + HRESULT hr; + + hr = SHGetDesktopFolder(&desktop); + ok(hr == S_OK, "got (0x%08x)\n", hr); + + hr = IShellFolder_CreateViewObject(desktop, NULL, &IID_IShellView, (void**)&view); + ok(hr == S_OK, "got (0x%08x)\n", hr); + + /* IShellView::ContextSensitiveHelp */ + hr = IShellView_ContextSensitiveHelp(view, TRUE); + ok(hr == E_NOTIMPL, "got (0x%08x)\n", hr); + hr = IShellView_ContextSensitiveHelp(view, FALSE); + ok(hr == E_NOTIMPL, "got (0x%08x)\n", hr); + + IShellView_Release(view); + IShellFolder_Release(desktop); +} + START_TEST(shlview) { OleInitialize(NULL); @@ -597,6 +619,7 @@ START_TEST(shlview) test_IFolderView(); test_GetItemObject(); test_IShellFolderView(); + test_IOleWindow(); OleUninitialize(); }

1 0

André Hentschel : msxml3: Fix a typo in a comment.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: acdce245ae5c75bbbdf4f8eee89487c3ec9dc628 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acdce245ae5c75bbbdf4f8eee… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Mar 22 19:48:29 2010 +0100 msxml3: Fix a typo in a comment. --- dlls/msxml3/node.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index ac97681..b05f06e 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1371,7 +1371,7 @@ static BSTR EnsureNoEncoding(BSTR sInput) /* * We are trying to replicate the same behaviour as msxml by converting - * line endings to \r\n and using idents as \t. The problem is that msxml + * line endings to \r\n and using indents as \t. The problem is that msxml * only formats nodes that have a line ending. Using libxml we cannot * reproduce behaviour exactly. *

1 0

Alexandre Julliard : configure: Makefile should be generated last.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: 92b57312b54277cb67fba60aba5ead2e74ab2375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92b57312b54277cb67fba60ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 22 20:25:30 2010 +0100 configure: Makefile should be generated last. --- configure | 7 ++++--- configure.ac | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 8cdd421..5b48965 100755 --- a/configure +++ b/configure @@ -13853,8 +13853,6 @@ esac ac_config_commands="$ac_config_commands include/stamp-h" -ac_config_files="$ac_config_files Makefile" - ALL_MAKEFILE_DEPENDS="# Makefile dependencies Makefile: Makefile.in Make.rules config.status" @@ -14660,6 +14658,9 @@ wine_fn_config_tool tools/winegcc wine_fn_config_tool tools/wmc wine_fn_config_tool tools/wrc +ac_config_files="$ac_config_files Makefile" + + test -n "$DLLEXT" || ALL_PROGRAM_BIN_INSTALL_DIRS="" cat >confcache <<\_ACEOF @@ -15356,7 +15357,6 @@ do case $ac_config_target in "include/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;; "include/stamp-h") CONFIG_COMMANDS="$CONFIG_COMMANDS include/stamp-h" ;; - "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "dlls/wineps.drv/generic.ppd") CONFIG_LINKS="$CONFIG_LINKS dlls/wineps.drv/generic.ppd:dlls/wineps.drv/generic.ppd" ;; "fonts/marlett.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/marlett.ttf:fonts/marlett.ttf" ;; "fonts/symbol.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/symbol.ttf:fonts/symbol.ttf" ;; @@ -15374,6 +15374,7 @@ do "dlls/Makedll.rules") CONFIG_FILES="$CONFIG_FILES dlls/Makedll.rules" ;; "dlls/Makeimplib.rules") CONFIG_FILES="$CONFIG_FILES dlls/Makeimplib.rules" ;; "programs/Makeprog.rules") CONFIG_FILES="$CONFIG_FILES programs/Makeprog.rules" ;; + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac diff --git a/configure.ac b/configure.ac index bf66934..31c7170 100644 --- a/configure.ac +++ b/configure.ac @@ -2132,7 +2132,6 @@ dnl **** Generate output files **** AH_TOP([#define __WINE_CONFIG_H]) AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h]) -AC_CONFIG_FILES([Makefile]) WINE_CONFIG_SYMLINK(dlls/wineps.drv/generic.ppd) WINE_CONFIG_SYMLINK(fonts/marlett.ttf) @@ -2703,6 +2702,8 @@ WINE_CONFIG_TOOL(tools/wmc) WINE_CONFIG_TOOL(tools/wrc) dnl End of auto-generated output commands +AC_CONFIG_FILES([Makefile]) + dnl Don't install in bin dir for Windows build test -n "$DLLEXT" || ALL_PROGRAM_BIN_INSTALL_DIRS=""

1 0

Alexandre Julliard : user32: Store the current cursor and show count in the server.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: 49de5ca39f6474ed15dc22e4b8ffa53bedb4acf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49de5ca39f6474ed15dc22e4b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 22 17:54:21 2010 +0100 user32: Store the current cursor and show count in the server. --- dlls/user32/cursoricon.c | 71 ++++++++++++++++++++++++++++----------- dlls/user32/tests/cursoricon.c | 12 +++--- dlls/user32/user_private.h | 4 +-- 3 files changed, 58 insertions(+), 29 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 0a9a895..6f2359d 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -54,9 +54,10 @@ #include "wine/winbase16.h" #include "wine/winuser16.h" #include "wine/exception.h" -#include "wine/debug.h" +#include "wine/server.h" #include "controls.h" #include "user_private.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(cursor); WINE_DECLARE_DEBUG_CHANNEL(icon); @@ -1587,7 +1588,7 @@ BOOL WINAPI DestroyIcon( HICON hIcon ) */ BOOL WINAPI DestroyCursor( HCURSOR hCursor ) { - if (get_user_thread_info()->cursor == hCursor) + if (GetCursor() == hCursor) { WARN_(cursor)("Destroying active cursor!\n" ); return FALSE; @@ -1762,15 +1763,28 @@ BOOL WINAPI DrawIcon( HDC hdc, INT x, INT y, HICON hIcon ) */ HCURSOR WINAPI DECLSPEC_HOTPATCH SetCursor( HCURSOR hCursor /* [in] Handle of cursor to show */ ) { - struct user_thread_info *thread_info = get_user_thread_info(); HCURSOR hOldCursor; + int show_count; + BOOL ret; - if (hCursor == thread_info->cursor) return hCursor; /* No change */ TRACE("%p\n", hCursor); - hOldCursor = thread_info->cursor; - thread_info->cursor = hCursor; + + SERVER_START_REQ( set_cursor ) + { + req->flags = SET_CURSOR_HANDLE; + req->handle = wine_server_user_handle( hCursor ); + if ((ret = !wine_server_call_err( req ))) + { + hOldCursor = wine_server_ptr_handle( reply->prev_handle ); + show_count = reply->prev_count; + } + } + SERVER_END_REQ; + + if (!ret) return 0; + /* Change the cursor shape only if it is visible */ - if (thread_info->cursor_count >= 0) + if (show_count >= 0) { CURSORICONINFO *info = get_icon_ptr( hCursor ); /* release before calling driver (FIXME) */ @@ -1785,26 +1799,34 @@ HCURSOR WINAPI DECLSPEC_HOTPATCH SetCursor( HCURSOR hCursor /* [in] Handle of cu */ INT WINAPI DECLSPEC_HOTPATCH ShowCursor( BOOL bShow ) { - struct user_thread_info *thread_info = get_user_thread_info(); + HCURSOR cursor; + int increment = bShow ? 1 : -1; + int prev_count; - TRACE("%d, count=%d\n", bShow, thread_info->cursor_count ); + SERVER_START_REQ( set_cursor ) + { + req->flags = SET_CURSOR_COUNT; + req->show_count = increment; + wine_server_call( req ); + cursor = wine_server_ptr_handle( reply->prev_handle ); + prev_count = reply->prev_count; + } + SERVER_END_REQ; + + TRACE("%d, count=%d\n", bShow, prev_count + increment ); - if (bShow) + if (!prev_count) { - if (++thread_info->cursor_count == 0) /* Show it */ + if (bShow) { - CURSORICONINFO *info = get_icon_ptr( thread_info->cursor ); + CURSORICONINFO *info = get_icon_ptr( cursor ); /* release before calling driver (FIXME) */ - if (info) release_icon_ptr( thread_info->cursor, info ); + if (info) release_icon_ptr( cursor, info ); USER_Driver->pSetCursor( info ); } + else USER_Driver->pSetCursor( NULL ); } - else - { - if (--thread_info->cursor_count == -1) /* Hide it */ - USER_Driver->pSetCursor( NULL ); - } - return thread_info->cursor_count; + return prev_count + increment; } /*********************************************************************** @@ -1812,7 +1834,16 @@ INT WINAPI DECLSPEC_HOTPATCH ShowCursor( BOOL bShow ) */ HCURSOR WINAPI GetCursor(void) { - return get_user_thread_info()->cursor; + HCURSOR ret; + + SERVER_START_REQ( set_cursor ) + { + req->flags = 0; + wine_server_call( req ); + ret = wine_server_ptr_handle( reply->prev_handle ); + } + SERVER_END_REQ; + return ret; } diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 650e5fc..11d11cf 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1445,7 +1445,7 @@ static void test_SetCursor(void) WaitForSingleObject( thread, 1000 ); GetExitCodeThread( thread, &result ); ok( result == (DWORD_PTR)old_cursor, "wrong thread cursor %x/%p\n", result, old_cursor ); - todo_wine ok( GetCursor() == cursor, "wrong cursor %p/0\n", cursor ); + ok( GetCursor() == cursor, "wrong cursor %p/0\n", cursor ); if (pGetCursorInfo) { @@ -1461,7 +1461,7 @@ static void test_SetCursor(void) cursor = SetCursor( (HCURSOR)0xbadbad ); error = GetLastError(); ok( cursor == 0, "wrong cursor %p/0\n", cursor ); - todo_wine ok( error == ERROR_INVALID_CURSOR_HANDLE || broken( error == 0xdeadbeef ), /* win9x */ + ok( error == ERROR_INVALID_CURSOR_HANDLE || broken( error == 0xdeadbeef ), /* win9x */ "wrong error %u\n", error ); if (pGetCursorInfo) @@ -1559,22 +1559,22 @@ static void test_ShowCursor(void) thread = CreateThread( NULL, 0, show_cursor_thread, NULL, 0, &id ); WaitForSingleObject( event_start, 1000 ); count = ShowCursor( TRUE ); - todo_wine ok( count == -2, "wrong count %d\n", count ); + ok( count == -2, "wrong count %d\n", count ); SetEvent( event_next ); WaitForSingleObject( thread, 1000 ); GetExitCodeThread( thread, &result ); - todo_wine ok( result == -3, "wrong thread count %d\n", result ); + ok( result == -3, "wrong thread count %d\n", result ); count = ShowCursor( FALSE ); ok( count == -2, "wrong count %d\n", count ); thread = CreateThread( NULL, 0, show_cursor_thread, (void *)3, 0, &id ); WaitForSingleObject( event_start, 1000 ); count = ShowCursor( TRUE ); - todo_wine ok( count == 2, "wrong count %d\n", count ); + ok( count == 2, "wrong count %d\n", count ); SetEvent( event_next ); WaitForSingleObject( thread, 1000 ); GetExitCodeThread( thread, &result ); - todo_wine ok( result == 1, "wrong thread count %d\n", result ); + ok( result == 1, "wrong thread count %d\n", result ); count = ShowCursor( FALSE ); ok( count == -2, "wrong count %d\n", count ); diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 893d4b5..eb6bdc9 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -175,13 +175,11 @@ struct user_thread_info DWORD GetMessageTimeVal; /* Value for GetMessageTime */ DWORD GetMessagePosVal; /* Value for GetMessagePos */ ULONG_PTR GetMessageExtraInfoVal; /* Value for GetMessageExtraInfo */ - HCURSOR cursor; /* Current cursor */ - INT cursor_count; /* Cursor show count */ UINT active_hooks; /* Bitmap of active hooks */ HWND top_window; /* Desktop window */ HWND msg_window; /* HWND_MESSAGE parent window */ - ULONG pad[9]; /* Available for more data */ + ULONG pad[11]; /* Available for more data */ }; struct hook_extra_info

1 0

Alexandre Julliard : server: Add support for storing the cursor and show count in the thread input structure .
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: 8159d4eb99819858b6791436a4b355881d2d965e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8159d4eb99819858b6791436a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 22 17:52:23 2010 +0100 server: Add support for storing the cursor and show count in the thread input structure. --- include/wine/server_protocol.h | 23 +++++++++++++- server/protocol.def | 13 ++++++++ server/queue.c | 65 +++++++++++++++++++++++++++++++++------ server/request.h | 8 +++++ server/trace.c | 17 ++++++++++ 5 files changed, 115 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8159d4eb99819858b6791…

1 0

Alexandre Julliard : server: Add a helper function to change a queue thread input.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: 5efe996c6af9b7812cde0fdceb127dc0bf6b9676 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5efe996c6af9b7812cde0fdce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 22 17:48:22 2010 +0100 server: Add a helper function to change a queue thread input. --- server/queue.c | 54 +++++++++++++++++++++++++++++------------------------- 1 files changed, 29 insertions(+), 25 deletions(-) diff --git a/server/queue.c b/server/queue.c index b2bc603..becdbda 100644 --- a/server/queue.c +++ b/server/queue.c @@ -241,23 +241,19 @@ static struct thread_input *create_thread_input( struct thread *thread ) return input; } -/* release the thread input data of a given thread */ -static inline void release_thread_input( struct thread *thread ) -{ - struct thread_input *input = thread->queue->input; - - if (!input) return; - release_object( input ); - thread->queue->input = NULL; -} - /* create a message queue object */ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_input *input ) { + struct thread_input *new_input = NULL; struct msg_queue *queue; int i; - if (!input && !(input = create_thread_input( thread ))) return NULL; + if (!input) + { + if (!(new_input = create_thread_input( thread ))) return NULL; + input = new_input; + } + if ((queue = alloc_object( &msg_queue_ops ))) { queue->fd = NULL; @@ -281,7 +277,7 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_ thread->queue = queue; } - release_object( input ); + if (new_input) release_object( new_input ); return queue; } @@ -294,6 +290,20 @@ void free_msg_queue( struct thread *thread ) thread->queue = NULL; } +/* change the thread input data of a given thread */ +static int assign_thread_input( struct thread *thread, struct thread_input *new_input ) +{ + if (!thread->queue) + { + thread->queue = create_msg_queue( thread, new_input ); + return thread->queue != NULL; + } + + if (thread->queue->input) release_object( thread->queue->input ); + thread->queue->input = (struct thread_input *)grab_object( new_input ); + return 1; +} + /* get the hook table for a given thread */ struct hook_table *get_queue_hooks( struct thread *thread ) { @@ -917,6 +927,7 @@ int attach_thread_input( struct thread *thread_from, struct thread *thread_to ) { struct desktop *desktop; struct thread_input *input; + int ret; if (!thread_to->queue && !(thread_to->queue = create_msg_queue( thread_to, NULL ))) return 0; if (!(desktop = get_thread_desktop( thread_from, 0 ))) return 0; @@ -930,17 +941,10 @@ int attach_thread_input( struct thread *thread_from, struct thread *thread_to ) } release_object( desktop ); - if (thread_from->queue) - { - release_thread_input( thread_from ); - thread_from->queue->input = input; - } - else - { - if (!(thread_from->queue = create_msg_queue( thread_from, input ))) return 0; - } - memset( input->keystate, 0, sizeof(input->keystate) ); - return 1; + ret = assign_thread_input( thread_from, input ); + if (ret) memset( input->keystate, 0, sizeof(input->keystate) ); + release_object( input ); + return ret; } /* detach two thread input data structures */ @@ -950,8 +954,8 @@ void detach_thread_input( struct thread *thread_from ) if ((input = create_thread_input( thread_from ))) { - release_thread_input( thread_from ); - thread_from->queue->input = input; + assign_thread_input( thread_from, input ); + release_object( input ); } }

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
92
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 March 2010