December 2010 - Wine-commits

Greg Geldorp : kernel32/tests: Add tests to verify USERPROFILE and environment variables from registry are present and correct .
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: 0650cb2456c1fc75cadf299a54eff321b59fe1be URL: http://source.winehq.org/git/wine.git/?a=commit;h=0650cb2456c1fc75cadf299a5… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Sun Dec 19 17:47:42 2010 +0100 kernel32/tests: Add tests to verify USERPROFILE and environment variables from registry are present and correct. --- dlls/kernel32/tests/environ.c | 109 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 109 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c index c38aef7..b6a900e 100644 --- a/dlls/kernel32/tests/environ.c +++ b/dlls/kernel32/tests/environ.c @@ -25,6 +25,7 @@ #include "winbase.h" #include "winerror.h" #include "winnls.h" +#include "winreg.h" static CHAR string[MAX_PATH]; #define ok_w(res, format, szString) \ @@ -34,13 +35,120 @@ static CHAR string[MAX_PATH]; static BOOL (WINAPI *pGetComputerNameExA)(COMPUTER_NAME_FORMAT,LPSTR,LPDWORD); static BOOL (WINAPI *pGetComputerNameExW)(COMPUTER_NAME_FORMAT,LPWSTR,LPDWORD); +static BOOL (WINAPI *pOpenProcessToken)(HANDLE,DWORD,PHANDLE); +static BOOL (WINAPI *pGetUserProfileDirectoryA)(HANDLE,LPSTR,LPDWORD); static void init_functionpointers(void) { HMODULE hkernel32 = GetModuleHandleA("kernel32.dll"); + HMODULE hadvapi32 = GetModuleHandleA("advapi32.dll"); + HMODULE huserenv = LoadLibraryA("userenv.dll"); pGetComputerNameExA = (void *)GetProcAddress(hkernel32, "GetComputerNameExA"); pGetComputerNameExW = (void *)GetProcAddress(hkernel32, "GetComputerNameExW"); + pOpenProcessToken = (void *)GetProcAddress(hadvapi32, "OpenProcessToken"); + pGetUserProfileDirectoryA = (void *)GetProcAddress(huserenv, + "GetUserProfileDirectoryA"); +} + +static void test_Predefined(void) +{ + /* + * If anything fails here, your test environment is probably not set up + * correctly. + */ + HKEY UserEnvironment; + LSTATUS Err; + DWORD Index; + char ValueName[256]; + DWORD ValueNameSize; + DWORD Type; + char Data[1024]; + DWORD DataSize; + char Env[sizeof(Data)]; + DWORD EnvSize; + HANDLE Token; + BOOL NoErr; + + /* + * Enumerate all values in HKCU\Environment and verify that environment + * variables with those names/values are present. + */ + Err = RegOpenKeyExA(HKEY_CURRENT_USER, "Environment", 0, KEY_QUERY_VALUE, + &UserEnvironment); + ok(Err == ERROR_SUCCESS || Err == ERROR_FILE_NOT_FOUND, + "Failed to open HKCU\\Environment key, error %d\n", + Err); + + if (Err == ERROR_SUCCESS) + { + Index = 0; + do + { + ValueNameSize = sizeof(ValueName); + DataSize = sizeof(Data); + Err = RegEnumValueA(UserEnvironment, Index, ValueName, &ValueNameSize, + NULL, &Type, (LPBYTE) Data, &DataSize); + if (Err == ERROR_SUCCESS) + { + if (Type == REG_EXPAND_SZ) + { + char Expanded[sizeof(Data)]; + DWORD ExpandedSize; + ExpandedSize = ExpandEnvironmentStringsA(Data, Expanded, + sizeof(Expanded)); + ok(ExpandedSize != 0 && ExpandedSize <= sizeof(Expanded), + "Failed to expand %s, error %u\n", Data, GetLastError()); + memcpy(Data, Expanded, ExpandedSize); + Type = REG_SZ; + } + ok(Type == REG_SZ, "Expected data type REG_SZ, got %d\n", Type); + EnvSize = GetEnvironmentVariableA(ValueName, Env, sizeof(Env)); + ok(EnvSize != 0 && EnvSize <= sizeof(Env), + "Failed to retrieve environment variable %s, error %u\n", + ValueName, GetLastError()); + ok(strcmp(Data, Env) == 0, + "Expected value %s for env var %s, got %s\n", Data, ValueName, + Env); + } + Index++; + } + while (Err == ERROR_SUCCESS); + ok(Err == ERROR_NO_MORE_ITEMS, + "Unexpected return %d from RegEnumValueA\n", Err); + + Err = RegCloseKey(UserEnvironment); + ok(Err == ERROR_SUCCESS, "Failed to close reg key, error %d\n", Err); + } + + /* + * Check value of %USERPROFILE%, should be same as GetUserProfileDirectory() + */ + if (pOpenProcessToken == NULL || pGetUserProfileDirectoryA == NULL) + { + skip("Skipping USERPROFILE check\n"); + return; + } + NoErr = pOpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &Token); + ok(NoErr, "Failed to open token, error %u\n", GetLastError()); + DataSize = sizeof(Data); + NoErr = pGetUserProfileDirectoryA(Token, Data, &DataSize); + todo_wine ok(NoErr, "Failed to get user profile dir, error %u\n", + GetLastError()); + if (NoErr) + { + EnvSize = GetEnvironmentVariableA("USERPROFILE", Env, sizeof(Env)); + ok(EnvSize != 0 && EnvSize <= sizeof(Env), + "Failed to retrieve environment variable USERPROFILE, error %u\n", + GetLastError()); + ok(strcmp(Data, Env) == 0, + "USERPROFILE env var %s doesn't match GetUserProfileDirectory %s\n", + Env, Data); + } + else + skip("Skipping USERPROFILE check, can't get user profile dir\n"); + NoErr = CloseHandle(Token); + ok(NoErr, "Failed to close token, error %u\n", GetLastError()); } static void test_GetSetEnvironmentVariableA(void) @@ -512,6 +620,7 @@ START_TEST(environ) { init_functionpointers(); + test_Predefined(); test_GetSetEnvironmentVariableA(); test_GetSetEnvironmentVariableW(); test_ExpandEnvironmentStringsA();

1 0

David Hedberg : urlmon: Set BINDF_NEEDFILE if BINDF_PULLDATA is not specified.
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: 7af43bb1b234c318b4016f0bfb7296d3007c20b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7af43bb1b234c318b4016f0bf… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Sun Dec 19 21:26:06 2010 +0100 urlmon: Set BINDF_NEEDFILE if BINDF_PULLDATA is not specified. --- dlls/urlmon/binding.c | 2 +- dlls/urlmon/tests/url.c | 25 +++++++++++++++++++++++-- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 699bf98..beedddd 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -1496,7 +1496,7 @@ static HRESULT Binding_Create(IMoniker *mon, Binding *binding_ctx, IUri *uri, IB if(to_obj) ret->bindinfo.dwOptions |= 0x100000; - if(!(ret->bindf & BINDF_ASYNCHRONOUS)) { + if(!(ret->bindf & BINDF_ASYNCHRONOUS) || !(ret->bindf & BINDF_PULLDATA)) { ret->bindf |= BINDF_NEEDFILE; ret->use_cache_file = TRUE; }else if(!is_urlmon_protocol(uri)) { diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 818fff9..c635da3 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -192,6 +192,7 @@ static HRESULT binding_hres; static BOOL have_IHttpNegotiate2, use_bscex, is_async_prot; static BOOL test_redirect, use_cache_file, callback_read, no_callback, test_abort; static WCHAR cache_file_name[MAX_PATH]; +static BOOL only_check_prot_args = FALSE; static LPCWSTR urls[] = { WINE_ABOUT_URL, @@ -566,7 +567,8 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, ok(bind_info & BINDF_FROMURLMON, "BINDF_FROMURLMON is not set\n"); - if(filedwl_api || !is_urlmon_protocol(test_protocol) || !(bindf&BINDF_ASYNCSTORAGE) || tymed != TYMED_ISTREAM) + if(filedwl_api || !is_urlmon_protocol(test_protocol) || tymed != TYMED_ISTREAM || + !(bindf&BINDF_ASYNCSTORAGE) || !(bindf&BINDF_PULLDATA)) ok(bind_info & BINDF_NEEDFILE, "BINDF_NEEDFILE is not set\n"); else ok(!(bind_info & BINDF_NEEDFILE), "BINDF_NEEDFILE is set\n"); @@ -593,6 +595,9 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, ok(!bindinfo.pUnk, "bindinfo.pUnk = %p\n", bindinfo.pUnk); ok(!bindinfo.dwReserved, "bindinfo.dwReserved = %d\n", bindinfo.dwReserved); + if(only_check_prot_args) + return E_FAIL; + switch(test_protocol) { case MK_TEST: hres = IInternetProtocolSink_ReportProgress(pOIProtSink, @@ -1543,6 +1548,11 @@ static HRESULT WINAPI statusclb_OnStopBinding(IBindStatusCallbackEx *iface, HRES ok(GetCurrentThreadId() == thread_id, "wrong thread %d\n", GetCurrentThreadId()); + if(only_check_prot_args) { + todo_wine ok(hresult == S_OK, "Got %08x\n", hresult); + return S_OK; + } + /* ignore DNS failure */ if (hresult == HRESULT_FROM_WIN32(ERROR_INTERNET_NAME_NOT_RESOLVED)) return S_OK; @@ -2510,6 +2520,8 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) if(tymed == TYMED_FILE && (test_protocol == ABOUT_TEST || test_protocol == ITS_TEST)) binding_hres = INET_E_DATA_NOT_AVAILABLE; + if(only_check_prot_args) + SET_EXPECT(OnStopBinding); if(!no_callback) { SET_EXPECT(QueryInterface_IBindStatusCallbackEx); SET_EXPECT(GetBindInfo); @@ -2568,7 +2580,10 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) return; } - if(no_callback) { + if(only_check_prot_args) { + ok(hres == E_FAIL, "Got %08x\n", hres); + CHECK_CALLED(OnStopBinding); + }else if(no_callback) { if(emulate_protocol) WaitForSingleObject(complete_event2, INFINITE); ok(hres == S_OK, "IMoniker_BindToStorage failed: %08x\n", hres); @@ -3346,6 +3361,12 @@ START_TEST(url) trace("test failures...\n"); test_BindToStorage_fail(); + + bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE; + only_check_prot_args = TRUE; /* Fail after checking arguments to Protocol_Start */ + + trace("check emulated http protocol arguments...\n"); + test_BindToStorage(HTTP_TEST, BINDTEST_EMULATE, TYMED_ISTREAM); } DeleteFileA(wszIndexHtmlA);

1 0

David Hedberg : wininet: Respect SECURITY_FLAG_IGNORE_CERT_DATE_INVALID.
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: 3ce9304592c16d5bdc4053460b9d266f15cc551f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ce9304592c16d5bdc4053460… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Sun Dec 19 21:27:23 2010 +0100 wininet: Respect SECURITY_FLAG_IGNORE_CERT_DATE_INVALID. --- dlls/wininet/netconnection.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 6a06b9a..958abfb 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -248,7 +248,8 @@ static DWORD netconn_verify_cert(PCCERT_CONTEXT cert, HCERTSTORE store, CERT_TRUST_IS_REVOKED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE; - if (chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_NOT_TIME_VALID) + if (chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_NOT_TIME_VALID && + !(security_flags & SECURITY_FLAG_IGNORE_CERT_DATE_INVALID)) err = ERROR_INTERNET_SEC_CERT_DATE_INVALID; else if (chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_UNTRUSTED_ROOT &&

1 0

David Hedberg : wininet: Make module handle scope global.
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: 46be41271cd6f4d6264e751ab72c9f5400c90e5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=46be41271cd6f4d6264e751ab… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Sun Dec 19 21:34:27 2010 +0100 wininet: Make module handle scope global. --- dlls/wininet/dialogs.c | 5 ++--- dlls/wininet/internet.c | 2 +- dlls/wininet/internet.h | 2 ++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index 2c4a527..b3713a5 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -490,7 +490,6 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest, DWORD dwError, DWORD dwFlags, LPVOID* lppvData) { struct WININET_ErrorDlgParams params; - HMODULE hwininet = GetModuleHandleA( "wininet.dll" ); INT dwStatus; TRACE("%p %p %d %08x %p\n", hWnd, hRequest, dwError, dwFlags, lppvData); @@ -512,10 +511,10 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest, switch (dwStatus) { case HTTP_STATUS_PROXY_AUTH_REQ: - return DialogBoxParamW( hwininet, MAKEINTRESOURCEW( IDD_PROXYDLG ), + return DialogBoxParamW( WININET_hModule, MAKEINTRESOURCEW( IDD_PROXYDLG ), hWnd, WININET_ProxyPasswordDialog, (LPARAM) &params ); case HTTP_STATUS_DENIED: - return DialogBoxParamW( hwininet, MAKEINTRESOURCEW( IDD_AUTHDLG ), + return DialogBoxParamW( WININET_hModule, MAKEINTRESOURCEW( IDD_AUTHDLG ), hWnd, WININET_PasswordDialog, (LPARAM) &params ); default: WARN("unhandled status %u\n", dwStatus); diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 95776df..002f4e4 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -88,7 +88,7 @@ typedef struct } WITHREADERROR, *LPWITHREADERROR; static DWORD g_dwTlsErrIndex = TLS_OUT_OF_INDEXES; -static HMODULE WININET_hModule; +HMODULE WININET_hModule; #define HANDLE_CHUNK_SIZE 0x10 diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 86b16bd..3963578 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -47,6 +47,8 @@ #define ioctlsocket ioctl #endif /* __MINGW32__ */ +extern HMODULE WININET_hModule; + /* used for netconnection.c stuff */ typedef struct {

1 0

David Hedberg : wininet: Add a simple certificate dialog to InternetErrorDlg.
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: 08fe24de06ea46c1e9c03595a162a8b42b143c37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08fe24de06ea46c1e9c03595a… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Sun Dec 19 21:34:28 2010 +0100 wininet: Add a simple certificate dialog to InternetErrorDlg. --- dlls/wininet/dialogs.c | 125 ++++++++++++++++++++++++++++++++- dlls/wininet/resource.h | 6 ++ dlls/wininet/tests/Makefile.in | 2 +- dlls/wininet/tests/internet.c | 148 ++++++++++++++++++++++++++++++++++++++++ dlls/wininet/wininet_En.rc | 16 ++++ dlls/wininet/wininet_Sv.rc | 16 ++++ 6 files changed, 308 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=08fe24de06ea46c1e9c03…

1 0

David Hedberg : shell32: Fix ExplorerBrowser:: SetRect to work properly when passed a NULL-valued hdwp.
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: f6dad197304b2771d56470a6e3d39063c487a557 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6dad197304b2771d56470a6e… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Sun Dec 19 22:07:12 2010 +0100 shell32: Fix ExplorerBrowser::SetRect to work properly when passed a NULL-valued hdwp. --- dlls/shell32/ebrowser.c | 4 +++- dlls/shell32/tests/ebrowser.c | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/ebrowser.c b/dlls/shell32/ebrowser.c index 87ff578..e6d1165 100644 --- a/dlls/shell32/ebrowser.c +++ b/dlls/shell32/ebrowser.c @@ -908,11 +908,13 @@ static HRESULT WINAPI IExplorerBrowser_fnSetRect(IExplorerBrowser *iface, ExplorerBrowserImpl *This = (ExplorerBrowserImpl*)iface; TRACE("%p (%p, %s)\n", This, phdwp, wine_dbgstr_rect(&rcBrowser)); - if(phdwp) + if(phdwp && *phdwp) { *phdwp = DeferWindowPos(*phdwp, This->hwnd_main, NULL, rcBrowser.left, rcBrowser.top, rcBrowser.right - rcBrowser.left, rcBrowser.bottom - rcBrowser.top, SWP_NOZORDER | SWP_NOACTIVATE); + if(!*phdwp) + return E_FAIL; } else { diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index faaf6c7..99368d0 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -1076,6 +1076,7 @@ static void test_basics(void) HWND eb_hwnd; RECT eb_rc; static const RECT exp_rc = {11, 21, 49, 49}; + static const RECT exp_rc2 = {11, 21, 49, 24}; hr = IShellBrowser_GetWindow(psb, &eb_hwnd); ok(hr == S_OK, "Got 0x%08x\n", hr); @@ -1085,6 +1086,24 @@ static void test_basics(void) ok(EqualRect(&eb_rc, &exp_rc), "Got rect (%d, %d) - (%d, %d)\n", eb_rc.left, eb_rc.top, eb_rc.right, eb_rc.bottom); + /* Try resizing with invalid hdwp */ + rc.bottom = 25; + hdwp = (HDWP)0xdeadbeef; + hr = IExplorerBrowser_SetRect(peb, &hdwp, rc); + ok(hr == E_FAIL, "Got 0x%08x\n", hr); + GetClientRect(eb_hwnd, &eb_rc); + MapWindowPoints(eb_hwnd, hwnd, (POINT*)&eb_rc, 2); + ok(EqualRect(&eb_rc, &exp_rc), "Got rect (%d, %d) - (%d, %d)\n", + eb_rc.left, eb_rc.top, eb_rc.right, eb_rc.bottom); + + hdwp = NULL; + hr = IExplorerBrowser_SetRect(peb, &hdwp, rc); + ok(hr == S_OK, "Got 0x%08x\n", hr); + GetClientRect(eb_hwnd, &eb_rc); + MapWindowPoints(eb_hwnd, hwnd, (POINT*)&eb_rc, 2); + ok(EqualRect(&eb_rc, &exp_rc2), "Got rect (%d, %d) - (%d, %d)\n", + eb_rc.left, eb_rc.top, eb_rc.right, eb_rc.bottom); + IShellBrowser_Release(psb); }

1 0

David Hedberg : shell32: Return S_OK in ::SetPropertyBag.
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: dfc2f20b892c565356529c199d78c18dcf944974 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfc2f20b892c565356529c199… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Sun Dec 19 22:11:23 2010 +0100 shell32: Return S_OK in ::SetPropertyBag. --- dlls/shell32/ebrowser.c | 10 +++++++++- dlls/shell32/tests/ebrowser.c | 7 +++++++ 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/ebrowser.c b/dlls/shell32/ebrowser.c index e6d1165..f781082 100644 --- a/dlls/shell32/ebrowser.c +++ b/dlls/shell32/ebrowser.c @@ -931,7 +931,15 @@ static HRESULT WINAPI IExplorerBrowser_fnSetPropertyBag(IExplorerBrowser *iface, ExplorerBrowserImpl *This = (ExplorerBrowserImpl*)iface; FIXME("stub, %p (%s)\n", This, debugstr_w(pszPropertyBag)); - return E_NOTIMPL; + if(!pszPropertyBag) + return E_INVALIDARG; + + /* FIXME: This method is currently useless as we don't save any + * settings anywhere, but at least one application breaks if we + * return E_NOTIMPL. + */ + + return S_OK; } static HRESULT WINAPI IExplorerBrowser_fnSetEmptyText(IExplorerBrowser *iface, diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index 99368d0..15c2cb4 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -1037,6 +1037,7 @@ static void test_basics(void) HDWP hdwp; RECT rc; HRESULT hr; + static const WCHAR winetest[] = {'W','i','n','e','T','e','s','t',0}; ebrowser_instantiate(&peb); ebrowser_initialize(peb); @@ -1145,6 +1146,12 @@ static void test_basics(void) hr = IExplorerBrowser_SetFolderSettings(peb, &fs); todo_wine ok(hr == E_INVALIDARG, "got (0x%08x)\n", hr); + /* SetPropertyBag */ + hr = IExplorerBrowser_SetPropertyBag(peb, NULL); + ok(hr == E_INVALIDARG, "Got 0x%08x\n", hr); + hr = IExplorerBrowser_SetPropertyBag(peb, winetest); + ok(hr == S_OK, "Got 0x%08x\n", hr); + /* TODO: Test after browsing somewhere. */ IExplorerBrowser_Destroy(peb);

1 0

David Hedberg : include: Add IShellItem2 interface declaration.
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: 7b67d4f5c66b5a435dd996bc67adf46c6bceffbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b67d4f5c66b5a435dd996bc6… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Sun Dec 19 23:15:11 2010 +0100 include: Add IShellItem2 interface declaration. --- include/shobjidl.idl | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 69 insertions(+), 0 deletions(-) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index fece0dd..176b63f 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -389,6 +389,75 @@ interface IShellItem : IUnknown [out] int *piOrder); } +/***************************************************************************** + * IShellItem2 interface + */ +[ + object, + uuid(7E9FB0D3-919F-4307-AB2E-9B1860310C93), + pointer_default(unique) +] +interface IShellItem2 : IShellItem +{ + HRESULT GetPropertyStore( + [in] GETPROPERTYSTOREFLAGS flags, + [in] REFIID riid, + [out, iid_is(riid)] void **ppv); + + HRESULT GetPropertyStoreWithCreateObject( + [in] GETPROPERTYSTOREFLAGS flags, + [in] IUnknown *punkCreateObject, + [in] REFIID riid, + [out, iid_is(riid)] void **ppv); + + HRESULT GetPropertyStoreForKeys( + [in, size_is(cKeys)] const PROPERTYKEY *rgKeys, + [in] UINT cKeys, + [in] GETPROPERTYSTOREFLAGS flags, + [in] REFIID riid, + [out, iid_is(riid)] void **ppv); + + HRESULT GetPropertyDescriptionList( + [in] REFPROPERTYKEY keyType, + [in] REFIID riid, + [out, iid_is(riid)] void **ppv); + + HRESULT Update( + [in, unique] IBindCtx *pbc); + + HRESULT GetProperty( + [in] REFPROPERTYKEY key, + [out] PROPVARIANT *ppropvar); + + HRESULT GetCLSID( + [in] REFPROPERTYKEY key, + [out] CLSID *pclsid); + + HRESULT GetFileTime ( + [in] REFPROPERTYKEY key, + [out] FILETIME *pft); + + HRESULT GetInt32( + [in] REFPROPERTYKEY key, + [out] int *pi); + + HRESULT GetString( + [in] REFPROPERTYKEY key, + [out, string] LPWSTR *ppsz); + + HRESULT GetUInt32( + [in] REFPROPERTYKEY key, + [out] ULONG *pui); + + HRESULT GetUInt64( + [in] REFPROPERTYKEY key, + [out] ULONGLONG *pull); + + HRESULT GetBool( + [in] REFPROPERTYKEY key, + [out] BOOL *pf); +} + typedef enum tagNWMF { NWMF_UNLOADING = 0x0001, NWMF_USERINITED = 0x0002,

1 0

David Hedberg : shell32: IShellItem:: GetAttributes should also work on the desktop shellfolder.
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: 0d87e1f9fdfb96648ce03709e9c6bca285ec5c73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d87e1f9fdfb96648ce03709e… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Sun Dec 19 23:15:12 2010 +0100 shell32: IShellItem::GetAttributes should also work on the desktop shellfolder. --- dlls/shell32/shellitem.c | 5 +++- dlls/shell32/tests/shlfolder.c | 44 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index d694503..fab7541 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -259,7 +259,10 @@ static HRESULT WINAPI ShellItem_GetAttributes(IShellItem *iface, SFGAOF sfgaoMas TRACE("(%p,%x,%p)\n", iface, sfgaoMask, psfgaoAttribs); - ret = ShellItem_get_parent_shellfolder(This, &parent_folder); + if (_ILIsDesktop(This->pidl)) + ret = SHGetDesktopFolder(&parent_folder); + else + ret = ShellItem_get_parent_shellfolder(This, &parent_folder); if (SUCCEEDED(ret)) { child_pidl = ILFindLastID(This->pidl); diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index c72eed2..0bf2ec7 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -3670,6 +3670,49 @@ static void test_ShellItemBindToHandler(void) pILFree(pidl_desktop); } +void test_ShellItemGetAttributes(void) +{ + IShellItem *psi; + LPITEMIDLIST pidl_desktop; + SFGAOF sfgao; + HRESULT hr; + + if(!pSHCreateShellItem) + { + skip("SHCreateShellItem missing.\n"); + return; + } + + hr = pSHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl_desktop); + ok(hr == S_OK, "Got 0x%08x\n", hr); + if(SUCCEEDED(hr)) + { + hr = pSHCreateShellItem(NULL, NULL, pidl_desktop, &psi); + ok(hr == S_OK, "Got 0x%08x\n", hr); + pILFree(pidl_desktop); + } + if(FAILED(hr)) + { + skip("Skipping tests."); + return; + } + + if(0) + { + /* Crashes on native (Win 7) */ + hr = IShellItem_GetAttributes(psi, 0, NULL); + ok(hr == S_OK, "Got 0x%08x\n", hr); + } + + /* Test GetAttributes on the desktop folder. */ + sfgao = 0xdeadbeef; + hr = IShellItem_GetAttributes(psi, SFGAO_FOLDER, &sfgao); + ok(hr == S_OK || broken(hr == E_FAIL) /* <Vista */, "Got 0x%08x\n", hr); + ok(sfgao == SFGAO_FOLDER || broken(sfgao == 0) /* <Vista */, "Got 0x%08x\n", sfgao); + + IShellItem_Release(psi); +} + static void test_SHParseDisplayName(void) { LPITEMIDLIST pidl1, pidl2; @@ -4432,6 +4475,7 @@ START_TEST(shlfolder) test_ShellItemCompare(); test_SHChangeNotify(); test_ShellItemBindToHandler(); + test_ShellItemGetAttributes(); OleUninitialize(); }

1 0

Alexandre Julliard : loader: Define asm functions instead of inlines for x86-64 syscalls to avoid trouble with register constraints .
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: 61d2d80795d336cf344a1218642b93009396e984 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61d2d80795d336cf344a12186… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 18 12:33:29 2010 +0100 loader: Define asm functions instead of inlines for x86-64 syscalls to avoid trouble with register constraints. --- loader/preloader.c | 125 +++++++++++++++++++--------------------------------- 1 files changed, 45 insertions(+), 80 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index 995cf59..4344a16 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -371,93 +371,58 @@ __ASM_GLOBAL_FUNC(_start, "xorq %r11,%r11\n\t" "ret") -#define SYSCALL_RET(ret) (((ret) < 0 && (ret) > -4096) ? -1 : (ret)) - -static inline __attribute__((noreturn)) void wld_exit( int code ) -{ - for (;;) /* avoid warning */ - __asm__ __volatile__( "syscall" : : "a" (SYS_exit), "D" (code) ); -} - -static inline int wld_open( const char *name, int flags ) -{ - int ret; - __asm__ __volatile__( "syscall" : "=a" (ret) : "0" (SYS_open), "D" (name), "S" (flags) ); - return SYSCALL_RET(ret); -} - -static inline int wld_close( int fd ) -{ - int ret; - __asm__ __volatile__( "syscall" : "=a" (ret) : "0" (SYS_close), "D" (fd) ); - return SYSCALL_RET(ret); -} - -static inline ssize_t wld_read( int fd, void *buffer, size_t len ) -{ - int ret; - __asm__ __volatile__( "syscall" - : "=a" (ret) - : "0" (SYS_read), "D" (fd), "S" (buffer), "d" (len) - : "memory" ); - return SYSCALL_RET(ret); -} - -static inline ssize_t wld_write( int fd, const void *buffer, size_t len ) -{ - int ret; - __asm__ __volatile__( "syscall" : "=a" (ret) : "0" (SYS_write), "D" (fd), "S" (buffer), "d" (len) ); - return SYSCALL_RET(ret); -} - -static inline int wld_mprotect( const void *addr, size_t len, int prot ) -{ - int ret; - __asm__ __volatile__( "syscall" : "=a" (ret) : "0" (SYS_mprotect), "D" (addr), "S" (len), "d" (prot) ); - return SYSCALL_RET(ret); -} +#define SYSCALL_FUNC( name, nr ) \ + __ASM_GLOBAL_FUNC( name, \ + "movq $" #nr ",%rax\n\t" \ + "movq %rcx,%r10\n\t" \ + "syscall\n\t" \ + "leaq 4096(%rax),%rcx\n\t" \ + "movq $-1,%rdx\n\t" \ + "cmp $4096,%rcx\n\t" \ + "cmovb %rdx,%rax\n\t" \ + "ret" ) + +#define SYSCALL_NOERR( name, nr ) \ + __ASM_GLOBAL_FUNC( name, \ + "movq $" #nr ",%rax\n\t" \ + "syscall\n\t" \ + "ret" ) + +void wld_exit( int code ) __attribute__((noreturn)); +SYSCALL_NOERR( wld_exit, 60 /* SYS_exit */ ); + +ssize_t wld_read( int fd, void *buffer, size_t len ); +SYSCALL_FUNC( wld_read, 0 /* SYS_read */ ); + +ssize_t wld_write( int fd, const void *buffer, size_t len ); +SYSCALL_FUNC( wld_write, 1 /* SYS_write */ ); + +int wld_open( const char *name, int flags ); +SYSCALL_FUNC( wld_open, 2 /* SYS_open */ ); + +int wld_close( int fd ); +SYSCALL_FUNC( wld_close, 3 /* SYS_close */ ); void *wld_mmap( void *start, size_t len, int prot, int flags, int fd, off_t offset ); -__ASM_GLOBAL_FUNC( wld_mmap, - "movq %rcx,%r10\n\t" - "movq $9,%rax\n\t" /* SYS_mmap */ - "syscall\n\t" - "ret" ); +SYSCALL_FUNC( wld_mmap, 9 /* SYS_mmap */ ); -static inline uid_t wld_getuid(void) -{ - uid_t ret; - __asm__( "syscall" : "=a" (ret) : "0" (SYS_getuid) ); - return ret; -} +int wld_mprotect( const void *addr, size_t len, int prot ); +SYSCALL_FUNC( wld_mprotect, 10 /* SYS_mprotect */ ); -static inline uid_t wld_geteuid(void) -{ - uid_t ret; - __asm__( "syscall" : "=a" (ret) : "0" (SYS_geteuid) ); - return ret; -} +int wld_prctl( int code, int arg ); +SYSCALL_FUNC( wld_prctl, 157 /* SYS_prctl */ ); -static inline gid_t wld_getgid(void) -{ - gid_t ret; - __asm__( "syscall" : "=a" (ret) : "0" (SYS_getgid) ); - return ret; -} +uid_t wld_getuid(void); +SYSCALL_NOERR( wld_getuid, 102 /* SYS_getuid */ ); -static inline gid_t wld_getegid(void) -{ - gid_t ret; - __asm__( "syscall" : "=a" (ret) : "0" (SYS_getegid) ); - return ret; -} +gid_t wld_getgid(void); +SYSCALL_NOERR( wld_getgid, 104 /* SYS_getgid */ ); -static inline int wld_prctl( int code, int arg ) -{ - int ret; - __asm__ __volatile__( "syscall" : "=a" (ret) : "D" (SYS_prctl), "S" (code), "d" (arg) ); - return SYSCALL_RET(ret); -} +uid_t wld_geteuid(void); +SYSCALL_NOERR( wld_geteuid, 107 /* SYS_geteuid */ ); + +gid_t wld_getegid(void); +SYSCALL_NOERR( wld_getegid, 108 /* SYS_getegid */ ); #else #error preloader not implemented for this CPU

1 0