April 2010 - Wine-Commits - list.winehq.org

Nikolay Sivov : shell32: Add ::Initialize() and ::GetCurFolder() for printers folder IPersistFolder2 interface.
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: 90a5529de8aa7f376945df620bd604e6696a4b69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90a5529de8aa7f376945df620… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 18 18:14:47 2010 +0400 shell32: Add ::Initialize() and ::GetCurFolder() for printers folder IPersistFolder2 interface. --- dlls/shell32/shfldr_printers.c | 21 +++++++++++++++++---- dlls/shell32/tests/shfldr_special.c | 27 +++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shfldr_printers.c b/dlls/shell32/shfldr_printers.c index 7bb954e..66fa571 100644 --- a/dlls/shell32/shfldr_printers.c +++ b/dlls/shell32/shfldr_printers.c @@ -42,6 +42,8 @@ typedef struct { const IShellFolder2Vtbl *lpVtbl; const IPersistFolder2Vtbl *lpvtblPersistFolder2; LONG ref; + + LPITEMIDLIST pidl; } IPrintersFolderImpl; static inline IPrintersFolderImpl *impl_from_IPersistFolder2(IPersistFolder2 *iface) @@ -111,6 +113,7 @@ static ULONG WINAPI IShellFolder_Printers_fnRelease (IShellFolder2 * iface) if (!refCount) { TRACE ("-- destroying IShellFolder(%p)\n", This); + SHFree(This->pidl); LocalFree (This); } return refCount; @@ -380,15 +383,24 @@ static HRESULT WINAPI IPersistFolder2_Printers_fnGetClassID(IPersistFolder2 *ifa static HRESULT WINAPI IPersistFolder2_Printers_fnInitialize(IPersistFolder2 *iface, LPCITEMIDLIST pidl) { IPrintersFolderImpl *This = impl_from_IPersistFolder2(iface); - FIXME("(%p) stub\n", This); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pidl); + + SHFree(This->pidl); + This->pidl = ILClone(pidl); + + return S_OK; } static HRESULT WINAPI IPersistFolder2_Printers_fnGetCurFolder(IPersistFolder2 *iface, LPITEMIDLIST *pidl) { IPrintersFolderImpl *This = impl_from_IPersistFolder2(iface); - FIXME("(%p) stub\n", This); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pidl); + + *pidl = ILClone(This->pidl); + + return *pidl ? S_OK : S_FALSE; } static const IPersistFolder2Vtbl vtbl_PersistFolder2 = @@ -417,6 +429,7 @@ HRESULT WINAPI Printers_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * return E_OUTOFMEMORY; sf->ref = 0; + sf->pidl = NULL; sf->lpVtbl = &vtbl_ShellFolder2; sf->lpvtblPersistFolder2 = &vtbl_PersistFolder2; diff --git a/dlls/shell32/tests/shfldr_special.c b/dlls/shell32/tests/shfldr_special.c index e971270..3320130 100644 --- a/dlls/shell32/tests/shfldr_special.c +++ b/dlls/shell32/tests/shfldr_special.c @@ -125,8 +125,10 @@ static void test_parse_for_control_panel(void) static void test_printers_folder(void) { IShellFolder2 *folder; + IPersistFolder2 *pf; SHELLDETAILS details; SHCOLSTATEF state; + LPITEMIDLIST pidl1, pidl2; INT i; HRESULT hr; @@ -145,6 +147,7 @@ if (0) /* crashes on XP */ hr = IShellFolder2_GetDetailsOf(folder, NULL, 0, NULL); hr = IShellFolder2_GetDefaultColumnState(folder, 0, NULL); + hr = IPersistFolder2_GetCurFolder(pf, NULL); } /* 5 columns defined */ @@ -173,6 +176,30 @@ if (0) ok(state == (SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT), "got 0x%x\n", state); } + /* default pidl */ + hr = IShellFolder2_QueryInterface(folder, &IID_IPersistFolder2, (void**)&pf); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* not initialized */ + pidl1 = (void*)0xdeadbeef; + hr = IPersistFolder2_GetCurFolder(pf, &pidl1); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(pidl1 == NULL, "got %p\n", pidl1); + + hr = SHGetSpecialFolderLocation(NULL, CSIDL_PRINTERS, &pidl2); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IPersistFolder2_Initialize(pf, pidl2); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IPersistFolder2_GetCurFolder(pf, &pidl1); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ok(ILIsEqual(pidl1, pidl2), "expected same PIDL\n"); + IPersistFolder2_Release(pf); + + ILFree(pidl1); + ILFree(pidl2); IShellFolder2_Release(folder); CoUninitialize();

1 0

Nikolay Sivov : shell32: Use shared code to return column details from IShellFolder2::GetDetailsOf( ).
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: e51fe8e070b1a4c464c5a8dccb977aa132f070e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e51fe8e070b1a4c464c5a8dcc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 18 18:04:25 2010 +0400 shell32: Use shared code to return column details from IShellFolder2::GetDetailsOf(). --- dlls/shell32/shfldr.h | 3 +- dlls/shell32/shfldr_desktop.c | 15 ++---- dlls/shell32/shfldr_mycomp.c | 42 ++++++--------- dlls/shell32/shfldr_netplaces.c | 29 ++++++----- dlls/shell32/shfldr_printers.c | 9 +--- dlls/shell32/shfldr_unixfs.c | 106 +++++++++++++++++++-------------------- dlls/shell32/shlfolder.c | 12 ++++ 7 files changed, 104 insertions(+), 112 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e51fe8e070b1a4c464c5a…

1 0

Detlef Riekenberg : shlwapi/tests: Add initial test for SHGetThreadRef.
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: 261bc3859ff9b0747dda592a1f8722264371677b URL: http://source.winehq.org/git/wine.git/?a=commit;h=261bc3859ff9b0747dda592a1… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Apr 19 00:45:17 2010 +0200 shlwapi/tests: Add initial test for SHGetThreadRef. --- dlls/shlwapi/tests/Makefile.in | 1 + dlls/shlwapi/tests/thread.c | 66 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/tests/Makefile.in b/dlls/shlwapi/tests/Makefile.in index 585607c..038d76c 100644 --- a/dlls/shlwapi/tests/Makefile.in +++ b/dlls/shlwapi/tests/Makefile.in @@ -15,6 +15,7 @@ C_SRCS = \ path.c \ shreg.c \ string.c \ + thread.c \ url.c @MAKE_TEST_RULES@ diff --git a/dlls/shlwapi/tests/thread.c b/dlls/shlwapi/tests/thread.c new file mode 100644 index 0000000..b345604 --- /dev/null +++ b/dlls/shlwapi/tests/thread.c @@ -0,0 +1,66 @@ +/* Tests for Thread and SHGlobalCounter functions + * + * Copyright 2010 Detlef Riekenberg + * + * 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 <stdio.h> +#include <stdarg.h> + +#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "ole2.h" +#include "shlwapi.h" + +#include "wine/test.h" + +static HRESULT (WINAPI *pSHGetThreadRef)(IUnknown**); + +/* ##### */ + +static void test_SHGetThreadRef(void) +{ + IUnknown *punk; + HRESULT hr; + + /* Not present before IE 5 */ + if (!pSHGetThreadRef) { + win_skip("SHGetThreadRef not found\n"); + return; + } + + punk = NULL; + hr = pSHGetThreadRef(&punk); + ok( (hr == E_NOINTERFACE) && (punk == NULL), + "got 0x%x and %p (expected E_NOINTERFACE and NULL)\n", hr, punk); + + if (0) { + /* this crash on Windows */ + hr = pSHGetThreadRef(NULL); + } +} + +START_TEST(thread) +{ + HMODULE hshlwapi = GetModuleHandleA("shlwapi.dll"); + + pSHGetThreadRef = (void *) GetProcAddress(hshlwapi, "SHGetThreadRef"); + + test_SHGetThreadRef(); + +}

1 0

Detlef Riekenberg : shlwapi: Fix broken NULL checks (with tests).
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: a9ac4a119a5ee94896298532c602713389b7a5c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9ac4a119a5ee94896298532c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Apr 19 00:45:19 2010 +0200 shlwapi: Fix broken NULL checks (with tests). --- dlls/shlwapi/tests/thread.c | 16 +++++++++++++++- dlls/shlwapi/thread.c | 8 ++++---- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/shlwapi/tests/thread.c b/dlls/shlwapi/tests/thread.c index 90e87f5..ea89424 100644 --- a/dlls/shlwapi/tests/thread.c +++ b/dlls/shlwapi/tests/thread.c @@ -110,6 +110,11 @@ static void test_SHSetThreadRef(void) return; } + /* start with a clean state */ + hr = pSHSetThreadRef(NULL); + ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); + + /* build and set out object */ init_threadref(&ref, &refcount); AddRef_called = 0; refcount = 1; @@ -118,7 +123,7 @@ static void test_SHSetThreadRef(void) "got 0x%x with %d, %d (expected S_OK with 1, 0)\n", hr, refcount, AddRef_called); - /* Read back IUnkonwn */ + /* read back our object */ AddRef_called = 0; refcount = 1; punk = NULL; @@ -127,6 +132,15 @@ static void test_SHSetThreadRef(void) "got 0x%x and %p with %d, %d (expected S_OK and %p with 2, 1)\n", hr, punk, refcount, AddRef_called, &ref); + /* clear the onject pointer */ + hr = pSHSetThreadRef(NULL); + ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); + + /* verify, that our object is no longer known as ThreadRef */ + hr = pSHGetThreadRef(&punk); + ok( (hr == E_NOINTERFACE) && (punk == NULL), + "got 0x%x and %p (expected E_NOINTERFACE and NULL)\n", hr, punk); + } START_TEST(thread) diff --git a/dlls/shlwapi/thread.c b/dlls/shlwapi/thread.c index cfe6615..fd9e4ba 100644 --- a/dlls/shlwapi/thread.c +++ b/dlls/shlwapi/thread.c @@ -131,13 +131,13 @@ typedef struct tagSHLWAPI_THREAD_INFO * * RETURNS * Success: S_OK. lppUnknown is set to the object reference. - * Failure: E_NOINTERFACE, if an error occurs or lppUnknown is NULL. + * Failure: E_NOINTERFACE, if an error occurs or no object is set */ HRESULT WINAPI SHGetThreadRef(IUnknown **lppUnknown) { TRACE("(%p)\n", lppUnknown); - if (!lppUnknown || SHLWAPI_ThreadRef_index == TLS_OUT_OF_INDEXES) + if (SHLWAPI_ThreadRef_index == TLS_OUT_OF_INDEXES) return E_NOINTERFACE; *lppUnknown = TlsGetValue(SHLWAPI_ThreadRef_index); @@ -159,13 +159,13 @@ HRESULT WINAPI SHGetThreadRef(IUnknown **lppUnknown) * * RETURNS * Success: S_OK. lpUnknown is stored and can be retrieved by SHGetThreadRef() - * Failure: E_NOINTERFACE, if an error occurs or lpUnknown is NULL. + * Failure: E_NOINTERFACE, if an error occurs */ HRESULT WINAPI SHSetThreadRef(IUnknown *lpUnknown) { TRACE("(%p)\n", lpUnknown); - if (!lpUnknown || SHLWAPI_ThreadRef_index == TLS_OUT_OF_INDEXES) + if (SHLWAPI_ThreadRef_index == TLS_OUT_OF_INDEXES) return E_NOINTERFACE; TlsSetValue(SHLWAPI_ThreadRef_index, lpUnknown);

1 0

Detlef Riekenberg : shlwapi/tests: Add tests for SHSetThreadRef.
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: 324783ad09bf766097f8602c09b74f33113fb780 URL: http://source.winehq.org/git/wine.git/?a=commit;h=324783ad09bf766097f8602c0… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Apr 19 00:45:18 2010 +0200 shlwapi/tests: Add tests for SHSetThreadRef. --- dlls/shlwapi/tests/thread.c | 76 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 76 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/tests/thread.c b/dlls/shlwapi/tests/thread.c index b345604..90e87f5 100644 --- a/dlls/shlwapi/tests/thread.c +++ b/dlls/shlwapi/tests/thread.c @@ -30,6 +30,48 @@ #include "wine/test.h" static HRESULT (WINAPI *pSHGetThreadRef)(IUnknown**); +static HRESULT (WINAPI *pSHSetThreadRef)(IUnknown*); + +static DWORD AddRef_called; + +typedef struct +{ + void* lpVtbl; + LONG *ref; +} threadref; + +static HRESULT WINAPI threadref_QueryInterface(threadref *This, REFIID riid, LPVOID *ppvObj) +{ + trace("unexpected QueryInterface(%p, %p, %p) called\n", This, riid, ppvObj); + *ppvObj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI threadref_AddRef(threadref *This) +{ + AddRef_called++; + return InterlockedIncrement(This->ref); +} + +static ULONG WINAPI threadref_Release(threadref *This) +{ + trace("unexpected Release(%p) called\n", This); + return InterlockedDecrement(This->ref); +} + +/* VTable */ +static void* threadref_vt[] = +{ + threadref_QueryInterface, + threadref_AddRef, + threadref_Release +}; + +static void init_threadref(threadref* iface, LONG *refcount) +{ + iface->lpVtbl = (void*)threadref_vt; + iface->ref = refcount; +} /* ##### */ @@ -55,12 +97,46 @@ static void test_SHGetThreadRef(void) } } +static void test_SHSetThreadRef(void) +{ + threadref ref; + IUnknown *punk; + HRESULT hr; + LONG refcount; + + /* Not present before IE 5 */ + if (!pSHSetThreadRef) { + win_skip("SHSetThreadRef not found\n"); + return; + } + + init_threadref(&ref, &refcount); + AddRef_called = 0; + refcount = 1; + hr = pSHSetThreadRef( (IUnknown *)&ref); + ok( (hr == S_OK) && (refcount == 1) && (!AddRef_called), + "got 0x%x with %d, %d (expected S_OK with 1, 0)\n", + hr, refcount, AddRef_called); + + /* Read back IUnkonwn */ + AddRef_called = 0; + refcount = 1; + punk = NULL; + hr = pSHGetThreadRef(&punk); + ok( (hr == S_OK) && (punk == (IUnknown *)&ref) && (refcount == 2) && (AddRef_called == 1), + "got 0x%x and %p with %d, %d (expected S_OK and %p with 2, 1)\n", + hr, punk, refcount, AddRef_called, &ref); + +} + START_TEST(thread) { HMODULE hshlwapi = GetModuleHandleA("shlwapi.dll"); pSHGetThreadRef = (void *) GetProcAddress(hshlwapi, "SHGetThreadRef"); + pSHSetThreadRef = (void *) GetProcAddress(hshlwapi, "SHSetThreadRef"); test_SHGetThreadRef(); + test_SHSetThreadRef(); }

1 0

Andrew Nguyen : shell32/tests: Release the test desktop interface on all appropriate exit paths in ParseDisplayName tests .
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: 7a7ece786cfb94ee83c6ef51d8321c0487b586a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a7ece786cfb94ee83c6ef51d… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Apr 18 15:10:43 2010 -0500 shell32/tests: Release the test desktop interface on all appropriate exit paths in ParseDisplayName tests. --- dlls/shell32/tests/shlfolder.c | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 6e9f764..f63bf6e 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -102,6 +102,7 @@ static void test_ParseDisplayName(void) BOOL bRes; hr = SHGetDesktopFolder(&IDesktopFolder); + ok(hr == S_OK, "Expected SHGetDesktopFolder to return S_OK, got 0x%08x\n", hr); if(hr != S_OK) return; /* Tests crash on W2K and below (SHCreateShellItem available as of XP) */ @@ -147,7 +148,11 @@ static void test_ParseDisplayName(void) } res = GetFileAttributesA(cNonExistDir1A); - if(res != INVALID_FILE_ATTRIBUTES) return; + if(res != INVALID_FILE_ATTRIBUTES) + { + skip("Test directory unexpectedly exists\n"); + goto finished; + } MultiByteToWideChar(CP_ACP, 0, cNonExistDir1A, -1, cTestDirW, MAX_PATH); hr = IShellFolder_ParseDisplayName(IDesktopFolder, @@ -156,7 +161,11 @@ static void test_ParseDisplayName(void) "ParseDisplayName returned %08x, expected 80070002 or E_FAIL\n", hr); res = GetFileAttributesA(cNonExistDir2A); - if(res != INVALID_FILE_ATTRIBUTES) return; + if(res != INVALID_FILE_ATTRIBUTES) + { + skip("Test directory unexpectedly exists\n"); + goto finished; + } MultiByteToWideChar(CP_ACP, 0, cNonExistDir2A, -1, cTestDirW, MAX_PATH); hr = IShellFolder_ParseDisplayName(IDesktopFolder, @@ -167,8 +176,12 @@ static void test_ParseDisplayName(void) /* I thought that perhaps the DesktopFolder's ParseDisplayName would recognize the * path corresponding to CSIDL_PERSONAL and return a CLSID_MyDocuments PIDL. Turns * out it doesn't. The magic seems to happen in the file dialogs, then. */ - if (!pSHGetSpecialFolderPathW || !pILFindLastID) goto finished; - + if (!pSHGetSpecialFolderPathW || !pILFindLastID) + { + win_skip("SHGetSpecialFolderPathW and/or ILFindLastID are not available\n"); + goto finished; + } + bRes = pSHGetSpecialFolderPathW(NULL, cTestDirW, CSIDL_PERSONAL, FALSE); ok(bRes, "SHGetSpecialFolderPath(CSIDL_PERSONAL) failed! %u\n", GetLastError()); if (!bRes) goto finished;

1 0

Detlef Riekenberg : shdocvw: Implement SHRestricted2A.
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: 79d7ca6037864935a26393bb5cb1a16d6e935f15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79d7ca6037864935a26393bb5… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Apr 18 15:31:05 2010 +0200 shdocvw: Implement SHRestricted2A. --- dlls/shdocvw/shdocvw.spec | 2 +- dlls/shdocvw/shdocvw_main.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/shdocvw.spec b/dlls/shdocvw/shdocvw.spec index aa5ef51..4a0dd2c 100644 --- a/dlls/shdocvw/shdocvw.spec +++ b/dlls/shdocvw/shdocvw.spec @@ -40,7 +40,7 @@ 151 stdcall -noname URLSubRegQueryA(str str long ptr long long) 152 stub -noname CShellUIHelper_CreateInstance2 153 stub -noname IsURLChild -158 stub -noname SHRestricted2A +158 stdcall -noname SHRestricted2A(long str long) 159 stdcall -noname SHRestricted2W(long wstr long) 160 stub -noname SHIsRestricted2W 161 stub @ # CSearchAssistantOC::OnDraw diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index 746753f..5dfd2b9 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -440,3 +440,24 @@ DWORD WINAPI SHRestricted2W(DWORD res, LPCWSTR url, DWORD reserved) FIXME("(%d %s %d) stub\n", res, debugstr_w(url), reserved); return 0; } + +/****************************************************************** + * SHRestricted2A (SHDOCVW.158) + * + * See SHRestricted2W + */ +DWORD WINAPI SHRestricted2A(DWORD restriction, LPCSTR url, DWORD reserved) +{ + LPWSTR urlW = NULL; + DWORD res; + + TRACE("(%d, %s, %d)\n", restriction, debugstr_a(url), reserved); + if (url) { + DWORD len = MultiByteToWideChar(CP_ACP, 0, url, -1, NULL, 0); + urlW = heap_alloc(len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, url, -1, urlW, len); + } + res = SHRestricted2W(restriction, urlW, reserved); + heap_free(urlW); + return res; +}

1 0

Nikolay Sivov : shell32: Add ::GetDefaultColumnState() and partial :: GetDetailsOf() for printers folder.
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: 506264becd71041ef96a9d26b56ae8ebd107f7e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=506264becd71041ef96a9d26b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 18 18:00:31 2010 +0400 shell32: Add ::GetDefaultColumnState() and partial ::GetDetailsOf() for printers folder. --- dlls/shell32/regsvr.c | 7 ++++ dlls/shell32/shell32_En.rc | 4 ++ dlls/shell32/shfldr_printers.c | 51 ++++++++++++++++++++++++++--- dlls/shell32/shresdef.h | 4 ++ dlls/shell32/tests/shfldr_special.c | 59 +++++++++++++++++++++++++++++++++++ 5 files changed, 119 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/regsvr.c b/dlls/shell32/regsvr.c index 8ae513f..b02c2ce 100644 --- a/dlls/shell32/regsvr.c +++ b/dlls/shell32/regsvr.c @@ -674,6 +674,13 @@ static struct regsvr_coclass const coclass_list[] = { SHELLFOLDER_WANTSFORDISPLAY|SHELLFOLDER_ATTRIBUTES|SHELLFOLDER_HIDEASDELETE, SFGAO_FOLDER|SFGAO_HASSUBFOLDER, }, + { &CLSID_Printers, + "Printers and Faxes", + 0, + NULL, + "shell32.dll", + "Apartment" + }, { NULL } /* list terminator */ }; diff --git a/dlls/shell32/shell32_En.rc b/dlls/shell32/shell32_En.rc index 6d68083..5ec5191 100644 --- a/dlls/shell32/shell32_En.rc +++ b/dlls/shell32/shell32_En.rc @@ -205,6 +205,10 @@ STRINGTABLE IDS_SHV_COLUMN11 "Group" IDS_SHV_COLUMN_DELFROM "Original location" IDS_SHV_COLUMN_DELDATE "Date deleted" + IDS_SHV_COL_DOCS "Documents" + IDS_SHV_COL_STATUS "Status" + IDS_SHV_COL_LOCATION "Location" + IDS_SHV_COL_MODEL "Model" /* special folders */ IDS_DESKTOP "Desktop" diff --git a/dlls/shell32/shfldr_printers.c b/dlls/shell32/shfldr_printers.c index 77e2439..b1d5939 100644 --- a/dlls/shell32/shfldr_printers.c +++ b/dlls/shell32/shfldr_printers.c @@ -19,6 +19,7 @@ */ #include <stdarg.h> +#include <stdio.h> #define COBJMACROS #define NONAMELESSUNION @@ -32,6 +33,9 @@ #include "wine/debug.h" #include "debughlp.h" +#include "shresdef.h" +#include "shfldr.h" + WINE_DEFAULT_DEBUG_CHANNEL (shell); typedef struct { @@ -45,6 +49,17 @@ static inline IPrintersFolderImpl *impl_from_IPersistFolder2(IPersistFolder2 *if return (IPrintersFolderImpl *)((char*)iface - FIELD_OFFSET(IPrintersFolderImpl, lpvtblPersistFolder2)); } +static const shvheader printers_header[] = { + { IDS_SHV_COLUMN8, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 20 }, + { IDS_SHV_COL_DOCS, SHCOLSTATE_TYPE_INT | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 12 }, + { IDS_SHV_COL_STATUS, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 12 }, + { IDS_SHV_COLUMN9, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 30 }, + { IDS_SHV_COL_LOCATION, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 20 }, + { IDS_SHV_COL_MODEL, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 20 } +}; + +#define PRINTERS_FOLDER_COL_NUM sizeof(printers_header)/sizeof(shvheader) + static HRESULT WINAPI IShellFolder_Printers_fnQueryInterface(IShellFolder2 *iface, REFIID riid, LPVOID *ppvObj) { @@ -255,11 +270,18 @@ static HRESULT WINAPI IShellFolder_Printers_fnGetDefaultColumn ( } static HRESULT WINAPI IShellFolder_Printers_fnGetDefaultColumnState ( - IShellFolder2 * iface, UINT iColumn, DWORD * pcsFlags) + IShellFolder2 *iface, UINT iColumn, DWORD *pcsFlags) { IPrintersFolderImpl *This = (IPrintersFolderImpl *)iface; - FIXME("(%p) stub\n", This); - return E_NOTIMPL; + + TRACE("(%p)->(%d %p)\n", This, iColumn, pcsFlags); + + if (iColumn >= PRINTERS_FOLDER_COL_NUM) + return E_INVALIDARG; + + *pcsFlags = printers_header[iColumn].pcsFlags; + + return S_OK; } static HRESULT WINAPI IShellFolder_Printers_fnGetDetailsEx (IShellFolder2 * iface, @@ -270,11 +292,28 @@ static HRESULT WINAPI IShellFolder_Printers_fnGetDetailsEx (IShellFolder2 * ifac return E_NOTIMPL; } -static HRESULT WINAPI IShellFolder_Printers_fnGetDetailsOf (IShellFolder2 * iface, - LPCITEMIDLIST pidl, UINT iColumn, SHELLDETAILS * psd) +static HRESULT WINAPI IShellFolder_Printers_fnGetDetailsOf (IShellFolder2 *iface, + LPCITEMIDLIST pidl, UINT iColumn, SHELLDETAILS *psd) { IPrintersFolderImpl *This = (IPrintersFolderImpl *)iface; - FIXME("(%p)->(%p %i %p) stub\n", This, pidl, iColumn, psd); + + TRACE("(%p)->(%p %i %p)\n", This, pidl, iColumn, psd); + + if (iColumn >= PRINTERS_FOLDER_COL_NUM) + return E_NOTIMPL; + + if (!pidl) + { + psd->fmt = printers_header[iColumn].fmt; + psd->cxChar = printers_header[iColumn].cxChar; + psd->str.uType = STRRET_CSTR; + LoadStringA (shell32_hInstance, printers_header[iColumn].colnameid, + psd->str.u.cStr, MAX_PATH); + return S_OK; + } + + FIXME("unimplemented for supplied pidl\n"); + return E_NOTIMPL; } diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 2880135..88c93c8 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -42,6 +42,10 @@ #define IDS_SHV_COLUMN11 17 #define IDS_SHV_COLUMN_DELFROM 18 #define IDS_SHV_COLUMN_DELDATE 19 +#define IDS_SHV_COL_DOCS 80 +#define IDS_SHV_COL_STATUS 81 +#define IDS_SHV_COL_LOCATION 82 +#define IDS_SHV_COL_MODEL 83 #define IDS_DESKTOP 20 #define IDS_MYCOMPUTER 21 diff --git a/dlls/shell32/tests/shfldr_special.c b/dlls/shell32/tests/shfldr_special.c index 06533ba..e971270 100644 --- a/dlls/shell32/tests/shfldr_special.c +++ b/dlls/shell32/tests/shfldr_special.c @@ -23,6 +23,9 @@ #include <stdio.h> #define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + #define WIN32_LEAN_AND_MEAN #include <windows.h> #include "shellapi.h" @@ -119,9 +122,65 @@ static void test_parse_for_control_panel(void) ILFree(pidl); } +static void test_printers_folder(void) +{ + IShellFolder2 *folder; + SHELLDETAILS details; + SHCOLSTATEF state; + INT i; + HRESULT hr; + + CoInitialize( NULL ); + + hr = CoCreateInstance(&CLSID_Printers, NULL, CLSCTX_INPROC_SERVER, &IID_IShellFolder2, (void**)&folder); + if (hr != S_OK) + { + win_skip("Failed to created IShellFolder2 for Printers folder\n"); + CoUninitialize(); + return; + } + +if (0) +{ + /* crashes on XP */ + hr = IShellFolder2_GetDetailsOf(folder, NULL, 0, NULL); + hr = IShellFolder2_GetDefaultColumnState(folder, 0, NULL); +} + + /* 5 columns defined */ + hr = IShellFolder2_GetDetailsOf(folder, NULL, 6, &details); + ok(hr == E_NOTIMPL, "got 0x%08x\n", hr); + + hr = IShellFolder2_GetDefaultColumnState(folder, 6, &state); + ok(broken(hr == E_NOTIMPL) || hr == E_INVALIDARG /* Win7 */, "got 0x%08x\n", hr); + + for(i = 0; i < 6; i++) + { + hr = IShellFolder2_GetDetailsOf(folder, NULL, i, &details); + /* doesn't work on W2K */ + if (hr == E_NOTIMPL) break; + + ok(hr == S_OK, "got 0x%08x\n", hr); + /* all columns are left-aligned */ + ok(details.fmt == LVCFMT_LEFT, "got 0x%x\n", details.fmt); + + hr = IShellFolder2_GetDefaultColumnState(folder, i, &state); + ok(hr == S_OK, "got 0x%08x\n", hr); + /* all columns are string except document count */ + if (i == 1) + ok(state == (SHCOLSTATE_TYPE_INT | SHCOLSTATE_ONBYDEFAULT), "got 0x%x\n", state); + else + ok(state == (SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT), "got 0x%x\n", state); + } + + IShellFolder2_Release(folder); + + CoUninitialize(); +} START_TEST(shfldr_special) { test_parse_for_entire_network(); test_parse_for_control_panel(); + test_printers_folder(); }

1 0

Octavian Voicu : msi: Sync combo control value with associated property.
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: 80878d00da9b83fe456500efd73b8312e8383836 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80878d00da9b83fe456500efd… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Mon Apr 19 12:59:03 2010 +0300 msi: Sync combo control value with associated property. --- dlls/msi/dialog.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 70 insertions(+), 0 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index f53e122..002ea83 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -171,6 +171,8 @@ static MSIFEATURE *msi_seltree_get_selected_feature( msi_control *control ); static DWORD uiThreadId; static HWND hMsiHiddenWindow; +static LPWSTR msi_get_window_text( HWND hwnd ); + static INT msi_dialog_scale_unit( msi_dialog *dialog, INT val ) { return MulDiv( val, dialog->scale, 12 ); @@ -1311,6 +1313,69 @@ static UINT msi_combobox_add_items( struct msi_combobox_info *info, LPCWSTR prop return r; } +static UINT msi_dialog_combobox_handler( msi_dialog *dialog, + msi_control *control, WPARAM param ) +{ + struct msi_combobox_info *info; + int index; + LPWSTR value; + + if (HIWORD(param) != CBN_SELCHANGE && HIWORD(param) != CBN_EDITCHANGE) + return ERROR_SUCCESS; + + info = GetPropW( control->hwnd, szButtonData ); + index = SendMessageW( control->hwnd, CB_GETCURSEL, 0, 0 ); + if (index == CB_ERR) + value = msi_get_window_text( control->hwnd ); + else + value = (LPWSTR) SendMessageW( control->hwnd, CB_GETITEMDATA, index, 0 ); + + MSI_SetPropertyW( info->dialog->package, + control->property, value ); + msi_dialog_evaluate_control_conditions( info->dialog ); + + if (index == CB_ERR) + msi_free( value ); + + return ERROR_SUCCESS; +} + +static void msi_dialog_combobox_update( msi_dialog *dialog, + msi_control *control ) +{ + struct msi_combobox_info *info; + LPWSTR value, tmp; + DWORD j; + + info = GetPropW( control->hwnd, szButtonData ); + + value = msi_dup_property( dialog->package, control->property ); + if (!value) + { + SendMessageW( control->hwnd, CB_SETCURSEL, -1, 0 ); + return; + } + + for (j = 0; j < info->num_items; j++) + { + tmp = (LPWSTR) SendMessageW( control->hwnd, CB_GETITEMDATA, j, 0 ); + if (!lstrcmpW( value, tmp )) + break; + } + + if (j < info->num_items) + { + SendMessageW( control->hwnd, CB_SETCURSEL, j, 0 ); + } + else + { + SendMessageW( control->hwnd, CB_SETCURSEL, -1, 0 ); + SetWindowTextW( control->hwnd, value ); + } + + msi_free(value); +} + static UINT msi_dialog_combo_control( msi_dialog *dialog, MSIRECORD *rec ) { struct msi_combobox_info *info; @@ -1338,6 +1403,9 @@ static UINT msi_dialog_combo_control( msi_dialog *dialog, MSIRECORD *rec ) return ERROR_FUNCTION_FAILED; } + control->handler = msi_dialog_combobox_handler; + control->update = msi_dialog_combobox_update; + prop = MSI_RecordGetString( rec, 9 ); control->property = msi_dialog_dup_property( dialog, prop, FALSE ); @@ -1353,6 +1421,8 @@ static UINT msi_dialog_combo_control( msi_dialog *dialog, MSIRECORD *rec ) if (control->property) msi_combobox_add_items( info, control->property ); + msi_dialog_combobox_update( dialog, control ); + return ERROR_SUCCESS; }

1 0

Octavian Voicu : msi: Fill combo control with items from database.
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: 857f979468a5a9f542f4502e719f035847cbb92b URL: http://source.winehq.org/git/wine.git/?a=commit;h=857f979468a5a9f542f4502e7… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Mon Apr 19 12:59:02 2010 +0300 msi: Fill combo control with items from database. --- dlls/msi/dialog.c | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 113 insertions(+), 0 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 5afced2..f53e122 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1222,10 +1222,105 @@ static UINT msi_dialog_icon_control( msi_dialog *dialog, MSIRECORD *rec ) return ERROR_SUCCESS; } +/******************** Combo Box ***************************************/ + +struct msi_combobox_info +{ + msi_dialog *dialog; + HWND hwnd; + WNDPROC oldproc; + DWORD num_items; + DWORD addpos_items; + LPWSTR *items; +}; + +static LRESULT WINAPI MSIComboBox_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + struct msi_combobox_info *info; + LRESULT r; + DWORD j; + + TRACE("%p %04x %08lx %08lx\n", hWnd, msg, wParam, lParam); + + info = GetPropW( hWnd, szButtonData ); + if (!info) + return 0; + + r = CallWindowProcW( info->oldproc, hWnd, msg, wParam, lParam ); + + switch (msg) + { + case WM_NCDESTROY: + for (j = 0; j < info->num_items; j++) + msi_free( info->items[j] ); + msi_free( info->items ); + msi_free( info ); + RemovePropW( hWnd, szButtonData ); + break; + } + + return r; +} + +static UINT msi_combobox_add_item( MSIRECORD *rec, LPVOID param ) +{ + struct msi_combobox_info *info = param; + LPCWSTR value, text; + int pos; + + value = MSI_RecordGetString( rec, 3 ); + text = MSI_RecordGetString( rec, 4 ); + + info->items[info->addpos_items] = strdupW( value ); + + pos = SendMessageW( info->hwnd, CB_ADDSTRING, 0, (LPARAM)text ); + SendMessageW( info->hwnd, CB_SETITEMDATA, pos, (LPARAM)info->items[info->addpos_items] ); + info->addpos_items++; + + return ERROR_SUCCESS; +} + +static UINT msi_combobox_add_items( struct msi_combobox_info *info, LPCWSTR property ) +{ + UINT r; + MSIQUERY *view = NULL; + DWORD count; + + static const WCHAR query[] = { + 'S','E','L','E','C','T',' ','*',' ', + 'F','R','O','M',' ','`','C','o','m','b','o','B','o','x','`',' ', + 'W','H','E','R','E',' ', + '`','P','r','o','p','e','r','t','y','`',' ','=',' ','\'','%','s','\'',' ', + 'O','R','D','E','R',' ','B','Y',' ','`','O','r','d','e','r','`',0 + }; + + r = MSI_OpenQuery( info->dialog->package->db, &view, query, property ); + if (r != ERROR_SUCCESS) + return r; + + /* just get the number of records */ + count = 0; + r = MSI_IterateRecords( view, &count, NULL, NULL ); + + info->num_items = count; + info->items = msi_alloc( sizeof(*info->items) * count ); + + r = MSI_IterateRecords( view, NULL, msi_combobox_add_item, info ); + msiobj_release( &view->hdr ); + + return r; +} + static UINT msi_dialog_combo_control( msi_dialog *dialog, MSIRECORD *rec ) { + struct msi_combobox_info *info; msi_control *control; DWORD attributes, style; + LPCWSTR prop; + + info = msi_alloc( sizeof *info ); + if (!info) + return ERROR_FUNCTION_FAILED; style = CBS_AUTOHSCROLL | WS_TABSTOP | WS_GROUP | WS_CHILD; attributes = MSI_RecordGetInteger( rec, 8 ); @@ -1238,7 +1333,25 @@ static UINT msi_dialog_combo_control( msi_dialog *dialog, MSIRECORD *rec ) control = msi_dialog_add_control( dialog, rec, WC_COMBOBOXW, style ); if (!control) + { + msi_free( info ); return ERROR_FUNCTION_FAILED; + } + + prop = MSI_RecordGetString( rec, 9 ); + control->property = msi_dialog_dup_property( dialog, prop, FALSE ); + + /* subclass */ + info->dialog = dialog; + info->hwnd = control->hwnd; + info->items = NULL; + info->addpos_items = 0; + info->oldproc = (WNDPROC)SetWindowLongPtrW( control->hwnd, GWLP_WNDPROC, + (LONG_PTR)MSIComboBox_WndProc ); + SetPropW( control->hwnd, szButtonData, info ); + + if (control->property) + msi_combobox_add_items( info, control->property ); return ERROR_SUCCESS; }

1 0