May 2015 - Wine-commits - list.winehq.org

Sebastian Lackner : kernel32/tests: Add tests for calling VirtualProtect with NULL as last argument.
by Alexandre Julliard 04 May '15

04 May '15

Module: wine Branch: master Commit: 152b575eed7566cba9575891dad9c07706a3f353 URL: http://source.winehq.org/git/wine.git/?a=commit;h=152b575eed7566cba9575891d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat May 2 18:37:26 2015 +0200 kernel32/tests: Add tests for calling VirtualProtect with NULL as last argument. --- dlls/kernel32/tests/virtual.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 75e91d5..2dea156 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -47,6 +47,7 @@ static struct _TEB * (WINAPI *pNtCurrentTeb)(void); static PVOID (WINAPI *pRtlAddVectoredExceptionHandler)(ULONG, PVECTORED_EXCEPTION_HANDLER); static ULONG (WINAPI *pRtlRemoveVectoredExceptionHandler)(PVOID); static BOOL (WINAPI *pGetProcessDEPPolicy)(HANDLE, LPDWORD, PBOOL); +static NTSTATUS (WINAPI *pNtProtectVirtualMemory)(HANDLE, PVOID *, SIZE_T *, ULONG, ULONG *); /* ############################### */ @@ -2478,6 +2479,9 @@ static void test_VirtualProtect(void) DWORD ret, old_prot, rw_prot, exec_prot, i, j; MEMORY_BASIC_INFORMATION info; SYSTEM_INFO si; + void *addr; + SIZE_T size; + NTSTATUS status; GetSystemInfo(&si); trace("system page size %#x\n", si.dwPageSize); @@ -2486,6 +2490,31 @@ static void test_VirtualProtect(void) base = VirtualAlloc(0, si.dwPageSize, MEM_RESERVE | MEM_COMMIT, PAGE_NOACCESS); ok(base != NULL, "VirtualAlloc failed %d\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = VirtualProtect(base, si.dwPageSize, PAGE_READONLY, NULL); + todo_wine + ok(!ret, "VirtualProtect should fail\n"); + todo_wine + ok(GetLastError() == ERROR_NOACCESS, "expected ERROR_NOACCESS, got %d\n", GetLastError()); + old_prot = 0xdeadbeef; + ret = VirtualProtect(base, si.dwPageSize, PAGE_NOACCESS, &old_prot); + ok(ret, "VirtualProtect failed %d\n", GetLastError()); + todo_wine + ok(old_prot == PAGE_NOACCESS, "got %#x != expected PAGE_NOACCESS\n", old_prot); + + addr = base; + size = si.dwPageSize; + status = pNtProtectVirtualMemory(GetCurrentProcess(), &addr, &size, PAGE_READONLY, NULL); + todo_wine + ok(status == STATUS_ACCESS_VIOLATION, "NtProtectVirtualMemory should fail, got %08x\n", status); + addr = base; + size = si.dwPageSize; + old_prot = 0xdeadbeef; + status = pNtProtectVirtualMemory(GetCurrentProcess(), &addr, &size, PAGE_NOACCESS, &old_prot); + ok(status == STATUS_SUCCESS, "NtProtectVirtualMemory should succeed, got %08x\n", status); + todo_wine + ok(old_prot == PAGE_NOACCESS, "got %#x != expected PAGE_NOACCESS\n", old_prot); + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) { SetLastError(0xdeadbeef); @@ -3477,6 +3506,7 @@ START_TEST(virtual) pNtCurrentTeb = (void *)GetProcAddress( hntdll, "NtCurrentTeb" ); pRtlAddVectoredExceptionHandler = (void *)GetProcAddress( hntdll, "RtlAddVectoredExceptionHandler" ); pRtlRemoveVectoredExceptionHandler = (void *)GetProcAddress( hntdll, "RtlRemoveVectoredExceptionHandler" ); + pNtProtectVirtualMemory = (void *)GetProcAddress( hntdll, "NtProtectVirtualMemory" ); test_shared_memory(FALSE); test_shared_memory_ro(FALSE, FILE_MAP_READ|FILE_MAP_WRITE);

1 0

Sebastian Lackner : kernel32: Do not omit mandatory argument for VirtualProtect.
by Alexandre Julliard 04 May '15

04 May '15

Module: wine Branch: master Commit: 1119da47ee1c7f530da7d69609ebadbe4bf6450a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1119da47ee1c7f530da7d6960… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat May 2 18:42:09 2015 +0200 kernel32: Do not omit mandatory argument for VirtualProtect. --- dlls/kernel32/except.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/except.c b/dlls/kernel32/except.c index bd50e88..2a7dbaa 100644 --- a/dlls/kernel32/except.c +++ b/dlls/kernel32/except.c @@ -401,6 +401,7 @@ static BOOL start_debugger_atomic(PEXCEPTION_POINTERS epointers) */ static inline BOOL check_resource_write( void *addr ) { + DWORD old_prot; void *rsrc; DWORD size; MEMORY_BASIC_INFORMATION info; @@ -412,7 +413,7 @@ static inline BOOL check_resource_write( void *addr ) return FALSE; if (addr < rsrc || (char *)addr >= (char *)rsrc + size) return FALSE; TRACE( "Broken app is writing to the resource data, enabling work-around\n" ); - VirtualProtect( rsrc, size, PAGE_READWRITE, NULL ); + VirtualProtect( rsrc, size, PAGE_READWRITE, &old_prot ); return TRUE; }

1 0

Aaryaman Vasishta : d3drm: Fix IDirect3DRMDevice declaration.
by Alexandre Julliard 04 May '15

04 May '15

Module: wine Branch: master Commit: ffbfd031a68b77beb17fd9d377f407ab1312fd27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffbfd031a68b77beb17fd9d37… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Mon May 4 15:22:27 2015 +0530 d3drm: Fix IDirect3DRMDevice declaration. --- include/d3drmobj.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/d3drmobj.h b/include/d3drmobj.h index f0ab369..942c69a 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -360,7 +360,7 @@ DECLARE_INTERFACE_(IDirect3DRMVisual,IDirect3DRMObject) #undef GetClassName #endif #define INTERFACE IDirect3DRMDevice -DECLARE_INTERFACE_(IDirect3DRMDevice,IUnknown) +DECLARE_INTERFACE_(IDirect3DRMDevice,IDirect3DRMObject) { /*** IUnknown methods ***/ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;

1 0

Alexandre Julliard : Wine release 1.7.42
by Alexandre Julliard 01 May '15

01 May '15

Module: website Branch: master Commit: f93903a79309bfd74bce82bb5a5d60436abc8476 URL: http://source.winehq.org/git/website.git/?a=commit;h=f93903a79309bfd74bce82… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 1 21:50:20 2015 +0900 Wine release 1.7.42 --- news/en/2015050101.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2015050101.xml b/news/en/2015050101.xml new file mode 100644 index 0000000..1834956 --- /dev/null +++ b/news/en/2015050101.xml @@ -0,0 +1,15 @@ +<news> +<date>May 1, 2015</date> +<title>Wine 1.7.42 Released</title> +<body> + The Wine development release 1.7.42 is now available. + <a href="{$root}/announce/1.7.42">What's new</a> in this release: +<ul> + <li>Support for dynamic timezone information.</li> + <li>Initial desktop shell window support.</li> + <li>Some more Direct2D support.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.42.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.7.42.
by Alexandre Julliard 01 May '15

01 May '15

Module: wine Branch: master Commit: e7a405ad9e377baf691042b877e88ef37cc617d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7a405ad9e377baf691042b87… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 1 21:48:19 2015 +0900 Release 1.7.42. --- ANNOUNCE | 579 +++++++++++++++++++++++++++++++++----------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 318 insertions(+), 281 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e7a405ad9e377baf69104…

1 0

Tag wine-1.7.42 : Alexandre Julliard : Release 1.7.42
by Alexandre Julliard 01 May '15

01 May '15

Module: wine Branch: refs/tags/wine-1.7.42 Tag: 758126d337e3d9b72d080ff5fc4fc8da85e85b3b URL: http://source.winehq.org/git/wine.git/?a=tag;h=758126d337e3d9b72d080ff5fc4f… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 1 21:48:19 2015 +0900 Release 1.7.42

1 0

Hans Leidekker : wininet: Reuse cached basic authorization across sessions.
by Alexandre Julliard 01 May '15

01 May '15

Module: wine Branch: master Commit: 0b69c706b99edac1663e433e99699b51d1adf11c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b69c706b99edac1663e433e9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 30 11:50:26 2015 +0200 wininet: Reuse cached basic authorization across sessions. --- dlls/wininet/http.c | 62 ++++++++++++++++++++++++++++++------------ dlls/wininet/tests/http.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 113 insertions(+), 17 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 8a872e8..f91fd21 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -863,7 +863,7 @@ static void destroy_authinfo( struct HttpAuthInfo *authinfo ) heap_free(authinfo); } -static UINT retrieve_cached_basic_authorization(LPWSTR host, LPWSTR realm, LPSTR *auth_data) +static UINT retrieve_cached_basic_authorization(const WCHAR *host, const WCHAR *realm, char **auth_data) { basicAuthorizationData *ad; UINT rc = 0; @@ -873,7 +873,7 @@ static UINT retrieve_cached_basic_authorization(LPWSTR host, LPWSTR realm, LPSTR EnterCriticalSection(&authcache_cs); LIST_FOR_EACH_ENTRY(ad, &basicAuthorizationCache, basicAuthorizationData, entry) { - if (!strcmpiW(host,ad->host) && !strcmpW(realm,ad->realm)) + if (!strcmpiW(host, ad->host) && (!realm || !strcmpW(realm, ad->realm))) { TRACE("Authorization found in cache\n"); *auth_data = heap_alloc(ad->authorizationLen); @@ -1620,6 +1620,21 @@ static UINT HTTP_DecodeBase64( LPCWSTR base64, LPSTR bin ) return n; } +static WCHAR *encode_auth_data( const WCHAR *scheme, const char *data, UINT data_len ) +{ + WCHAR *ret; + UINT len, scheme_len = strlenW( scheme ); + + /* scheme + space + base64 encoded data (3/2/1 bytes data -> 4 bytes of characters) */ + len = scheme_len + 1 + ((data_len + 2) * 4) / 3; + if (!(ret = heap_alloc( (len + 1) * sizeof(WCHAR) ))) return NULL; + memcpy( ret, scheme, scheme_len * sizeof(WCHAR) ); + ret[scheme_len] = ' '; + HTTP_EncodeBase64( data, data_len, ret + scheme_len + 1 ); + return ret; +} + + /*********************************************************************** * HTTP_InsertAuthorization * @@ -1627,27 +1642,16 @@ static UINT HTTP_DecodeBase64( LPCWSTR base64, LPSTR bin ) */ static BOOL HTTP_InsertAuthorization( http_request_t *request, struct HttpAuthInfo *pAuthInfo, LPCWSTR header ) { + static const WCHAR wszBasic[] = {'B','a','s','i','c',0}; + WCHAR *host, *authorization = NULL; + if (pAuthInfo) { - static const WCHAR wszSpace[] = {' ',0}; - static const WCHAR wszBasic[] = {'B','a','s','i','c',0}; - unsigned int len; - WCHAR *authorization = NULL; - if (pAuthInfo->auth_data_len) { - /* scheme + space + base64 encoded data (3/2/1 bytes data -> 4 bytes of characters) */ - len = strlenW(pAuthInfo->scheme)+1+((pAuthInfo->auth_data_len+2)*4)/3; - authorization = heap_alloc((len+1)*sizeof(WCHAR)); - if (!authorization) + if (!(authorization = encode_auth_data(pAuthInfo->scheme, pAuthInfo->auth_data, pAuthInfo->auth_data_len))) return FALSE; - strcpyW(authorization, pAuthInfo->scheme); - strcatW(authorization, wszSpace); - HTTP_EncodeBase64(pAuthInfo->auth_data, - pAuthInfo->auth_data_len, - authorization+strlenW(authorization)); - /* clear the data as it isn't valid now that it has been sent to the * server, unless it's Basic authentication which doesn't do * connection tracking */ @@ -1664,6 +1668,30 @@ static BOOL HTTP_InsertAuthorization( http_request_t *request, struct HttpAuthIn HTTP_ProcessHeader(request, header, authorization, HTTP_ADDHDR_FLAG_REQ | HTTP_ADDHDR_FLAG_REPLACE); heap_free(authorization); } + else if (!strcmpW(header, szAuthorization) && (host = get_host_header(request))) + { + UINT data_len; + char *data; + + if ((data_len = retrieve_cached_basic_authorization(host, NULL, &data))) + { + TRACE("Found cached basic authorization for %s\n", debugstr_w(host)); + + if (!(authorization = encode_auth_data(wszBasic, data, data_len))) + { + heap_free(data); + heap_free(host); + return FALSE; + } + + TRACE("Inserting authorization: %s\n", debugstr_w(authorization)); + + HTTP_ProcessHeader(request, header, authorization, HTTP_ADDHDR_FLAG_REQ | HTTP_ADDHDR_FLAG_REPLACE); + heap_free(data); + heap_free(authorization); + } + heap_free(host); + } return TRUE; } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 3e66a27..3b2f9a5 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2321,6 +2321,20 @@ static DWORD CALLBACK server_thread(LPVOID param) else send(c, notokmsg, sizeof notokmsg-1, 0); } + if (strstr(buffer, "HEAD /upload.txt")) + { + if (strstr(buffer, "Authorization: Basic dXNlcjpwd2Q=")) + send(c, okmsg, sizeof okmsg-1, 0); + else + send(c, noauthmsg, sizeof noauthmsg-1, 0); + } + if (strstr(buffer, "PUT /upload2.txt")) + { + if (strstr(buffer, "Authorization: Basic dXNlcjpwd2Q=")) + send(c, okmsg, sizeof okmsg-1, 0); + else + send(c, notokmsg, sizeof notokmsg-1, 0); + } shutdown(c, 2); closesocket(c); c = -1; @@ -4212,6 +4226,59 @@ static void test_accept_encoding(int port) InternetCloseHandle(ses); } +static void test_basic_auth_credentials_reuse(int port) +{ + HINTERNET ses, con, req; + DWORD status, size; + BOOL ret; + + ses = InternetOpenA( "winetest", 0, NULL, NULL, 0 ); + ok( ses != NULL, "InternetOpenA failed\n" ); + + con = InternetConnectA( ses, "localhost", port, "user", "pwd", + INTERNET_SERVICE_HTTP, 0, 0 ); + ok( con != NULL, "InternetConnectA failed %u\n", GetLastError() ); + + req = HttpOpenRequestA( con, "HEAD", "/upload.txt", NULL, NULL, NULL, 0, 0 ); + ok( req != NULL, "HttpOpenRequestA failed %u\n", GetLastError() ); + + ret = HttpSendRequestA( req, NULL, 0, NULL, 0 ); + ok( ret, "HttpSendRequestA failed %u\n", GetLastError() ); + + status = 0xdeadbeef; + size = sizeof(status); + ret = HttpQueryInfoA( req, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); + ok( ret, "HttpQueryInfoA failed %u\n", GetLastError() ); + ok( status == 200, "got %u\n", status ); + + InternetCloseHandle( req ); + InternetCloseHandle( con ); + InternetCloseHandle( ses ); + + ses = InternetOpenA( "winetest", 0, NULL, NULL, 0 ); + ok( ses != NULL, "InternetOpenA failed\n" ); + + con = InternetConnectA( ses, "localhost", port, NULL, NULL, + INTERNET_SERVICE_HTTP, 0, 0 ); + ok( con != NULL, "InternetConnectA failed %u\n", GetLastError() ); + + req = HttpOpenRequestA( con, "PUT", "/upload2.txt", NULL, NULL, NULL, 0, 0 ); + ok( req != NULL, "HttpOpenRequestA failed %u\n", GetLastError() ); + + ret = HttpSendRequestA( req, NULL, 0, NULL, 0 ); + ok( ret, "HttpSendRequestA failed %u\n", GetLastError() ); + + status = 0xdeadbeef; + size = sizeof(status); + ret = HttpQueryInfoA( req, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); + ok( ret, "HttpQueryInfoA failed %u\n", GetLastError() ); + ok( status == 200, "got %u\n", status ); + + InternetCloseHandle( req ); + InternetCloseHandle( con ); + InternetCloseHandle( ses ); +} + static void test_http_connection(void) { struct server_info si; @@ -4259,6 +4326,7 @@ static void test_http_connection(void) test_head_request(si.port); test_request_content_length(si.port); test_accept_encoding(si.port); + test_basic_auth_credentials_reuse(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, "GET", "/quit");

1 0

Nikolay Sivov : dmime: COM cleanup for IDirectMusicAudioPath.
by Alexandre Julliard 01 May '15

01 May '15

Module: wine Branch: master Commit: 02ab73beb19fa744cef03c05d845f1f1ead110f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02ab73beb19fa744cef03c05d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 27 10:49:11 2015 +0300 dmime: COM cleanup for IDirectMusicAudioPath. --- dlls/dmime/audiopath.c | 255 ++++++++++++++++++++++++++++--------------------- 1 file changed, 147 insertions(+), 108 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=02ab73beb19fa744cef03…

1 0

Nikolay Sivov : shell32: Update to IFolderView2.
by Alexandre Julliard 01 May '15

01 May '15

Module: wine Branch: master Commit: e91dac5153cf8526fe39b7d8ef3d655f2720d698 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e91dac5153cf8526fe39b7d8e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 29 21:20:15 2015 +0300 shell32: Update to IFolderView2. --- dlls/actxprxy/usrmarshal.c | 18 ++ dlls/shell32/shlview.c | 380 ++++++++++++++++++++++++++++++++----------- dlls/shell32/tests/shlview.c | 6 + include/shobjidl.idl | 120 ++++++++++++++ 4 files changed, 431 insertions(+), 93 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e91dac5153cf8526fe39b…

1 0

Nikolay Sivov : shell32: Forward to CreateViewWindow3().
by Alexandre Julliard 01 May '15

01 May '15

Module: wine Branch: master Commit: 06b60cc4d0874b301439b5cc1c6f8ab5ad7602af URL: http://source.winehq.org/git/wine.git/?a=commit;h=06b60cc4d0874b301439b5cc1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 29 21:30:50 2015 +0300 shell32: Forward to CreateViewWindow3(). --- dlls/shell32/shlview.c | 127 ++++++++++++++++++++++--------------------------- 1 file changed, 57 insertions(+), 70 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index d47e677..b26a2ce 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -1912,25 +1912,13 @@ static HRESULT WINAPI IShellView_fnRefresh(IShellView3 *iface) return S_OK; } -static HRESULT WINAPI IShellView_fnCreateViewWindow(IShellView3 *iface, IShellView *lpPrevView, - LPCFOLDERSETTINGS lpfs, IShellBrowser *psb, RECT *prcView, HWND *phWnd) +static HRESULT WINAPI IShellView_fnCreateViewWindow(IShellView3 *iface, IShellView *prev_view, + const FOLDERSETTINGS *settings, IShellBrowser *owner, RECT *rect, HWND *hWnd) { - HRESULT hr; - SV2CVW2_PARAMS view_params; - view_params.cbSize = sizeof(view_params); - view_params.psvPrev = lpPrevView; - view_params.pfs = lpfs; - view_params.psbOwner = psb; - view_params.prcView = prcView; - view_params.pvid = NULL; - view_params.hwndView = 0; - - TRACE("(%p) Forwarding to CreateViewWindow2\n", iface); - - hr = IShellView3_CreateViewWindow2(iface, &view_params); - *phWnd = view_params.hwndView; - - return hr; + IShellViewImpl *This = impl_from_IShellView3(iface); + TRACE("(%p)->(%p %p %p %p %p)\n", This, prev_view, settings, owner, rect, hWnd); + return IShellView3_CreateViewWindow3(iface, owner, prev_view, SV3CVW3_DEFAULT, + settings->fFlags, settings->fFlags, settings->ViewMode, NULL, rect, hWnd); } static HRESULT WINAPI IShellView_fnDestroyViewWindow(IShellView3 *iface) @@ -2041,51 +2029,74 @@ static HRESULT WINAPI IShellView2_fnGetView(IShellView3 *iface, SHELLVIEWID *vie static HRESULT WINAPI IShellView2_fnCreateViewWindow2(IShellView3 *iface, SV2CVW2_PARAMS *view_params) { IShellViewImpl *This = impl_from_IShellView3(iface); + TRACE("(%p)->(%p)\n", This, view_params); + return IShellView3_CreateViewWindow3(iface, view_params->psbOwner, view_params->psvPrev, + SV3CVW3_DEFAULT, view_params->pfs->fFlags, view_params->pfs->fFlags, + view_params->pfs->ViewMode, view_params->pvid, view_params->prcView, &view_params->hwndView); +} + +static HRESULT WINAPI IShellView2_fnHandleRename(IShellView3 *iface, LPCITEMIDLIST new_pidl) +{ + FIXME("(%p)->(new_pidl %p) stub!\n", iface, new_pidl); + return E_NOTIMPL; +} + +static HRESULT WINAPI IShellView2_fnSelectAndPositionItem(IShellView3 *iface, LPCITEMIDLIST item, + UINT flags, POINT *point) +{ + IShellViewImpl *This = impl_from_IShellView3(iface); + TRACE("(%p)->(item %p, flags %#x, point %p)\n", This, item, flags, point); + return IFolderView2_SelectAndPositionItems(&This->IFolderView2_iface, 1, &item, point, flags); +} + +static HRESULT WINAPI IShellView3_fnCreateViewWindow3(IShellView3 *iface, IShellBrowser *owner, + IShellView *prev_view, SV3CVW3_FLAGS view_flags, FOLDERFLAGS mask, FOLDERFLAGS flags, + FOLDERVIEWMODE mode, const SHELLVIEWID *view_id, const RECT *rect, HWND *hwnd) +{ + IShellViewImpl *This = impl_from_IShellView3(iface); INITCOMMONCONTROLSEX icex; WNDCLASSW wc; HRESULT hr; HWND wnd; - icex.dwSize = sizeof( icex ); - icex.dwICC = ICC_LISTVIEW_CLASSES; - InitCommonControlsEx( &icex ); + TRACE("(%p)->(%p %p 0x%08x 0x%08x 0x%08x %d %s %s %p)\n", This, owner, prev_view, view_flags, + mask, flags, mode, debugstr_guid(view_id), wine_dbgstr_rect(rect), hwnd); - TRACE("(%p)->(view_params %p)\n", iface, view_params); + icex.dwSize = sizeof(icex); + icex.dwICC = ICC_LISTVIEW_CLASSES; + InitCommonControlsEx(&icex); - if (view_params->cbSize != sizeof(*view_params)) - { - FIXME("Got unexpected cbSize %#x\n", view_params->cbSize); - return E_FAIL; - } + *hwnd = NULL; - TRACE("-- psvPrev %p, pfs %p, psbOwner %p, prcView %p\n", - view_params->psvPrev, view_params->pfs, view_params->psbOwner, view_params->prcView); - TRACE("-- vmode %#x, flags %#x, view %s\n", view_params->pfs->ViewMode, view_params->pfs->fFlags, wine_dbgstr_rect(view_params->prcView)); + if (!owner) + return E_UNEXPECTED; - if (!view_params->psbOwner) return E_UNEXPECTED; + if (view_flags != SV3CVW3_DEFAULT) + FIXME("unsupported view flags 0x%08x\n", view_flags); /* Set up the member variables */ - This->pShellBrowser = view_params->psbOwner; - This->FolderSettings = *view_params->pfs; + This->pShellBrowser = owner; + This->FolderSettings.ViewMode = mode; + This->FolderSettings.fFlags = mask & flags; - if (view_params->pvid) + if (view_id) { - if (IsEqualGUID(view_params->pvid, &VID_LargeIcons)) + if (IsEqualGUID(view_id, &VID_LargeIcons)) This->FolderSettings.ViewMode = FVM_ICON; - else if (IsEqualGUID(view_params->pvid, &VID_SmallIcons)) + else if (IsEqualGUID(view_id, &VID_SmallIcons)) This->FolderSettings.ViewMode = FVM_SMALLICON; - else if (IsEqualGUID(view_params->pvid, &VID_List)) + else if (IsEqualGUID(view_id, &VID_List)) This->FolderSettings.ViewMode = FVM_LIST; - else if (IsEqualGUID(view_params->pvid, &VID_Details)) + else if (IsEqualGUID(view_id, &VID_Details)) This->FolderSettings.ViewMode = FVM_DETAILS; - else if (IsEqualGUID(view_params->pvid, &VID_Thumbnails)) + else if (IsEqualGUID(view_id, &VID_Thumbnails)) This->FolderSettings.ViewMode = FVM_THUMBNAIL; - else if (IsEqualGUID(view_params->pvid, &VID_Tile)) + else if (IsEqualGUID(view_id, &VID_Tile)) This->FolderSettings.ViewMode = FVM_TILE; - else if (IsEqualGUID(view_params->pvid, &VID_ThumbStrip)) + else if (IsEqualGUID(view_id, &VID_ThumbStrip)) This->FolderSettings.ViewMode = FVM_THUMBSTRIP; else - FIXME("Ignoring unrecognized VID %s\n", debugstr_guid(view_params->pvid)); + FIXME("Ignoring unrecognized VID %s\n", debugstr_guid(view_id)); } /* Get our parent window */ @@ -2116,9 +2127,9 @@ static HRESULT WINAPI IShellView2_fnCreateViewWindow2(IShellView3 *iface, SV2CVW } wnd = CreateWindowExW(0, SV_CLASS_NAME, NULL, WS_CHILD | WS_TABSTOP, - view_params->prcView->left, view_params->prcView->top, - view_params->prcView->right - view_params->prcView->left, - view_params->prcView->bottom - view_params->prcView->top, + rect->left, rect->top, + rect->right - rect->left, + rect->bottom - rect->top, This->hWndParent, 0, shell32_hInstance, This); CheckToolbar(This); @@ -2132,35 +2143,11 @@ static HRESULT WINAPI IShellView2_fnCreateViewWindow2(IShellView3 *iface, SV2CVW SetWindowPos(wnd, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW); UpdateWindow(wnd); - view_params->hwndView = wnd; + *hwnd = wnd; return S_OK; } -static HRESULT WINAPI IShellView2_fnHandleRename(IShellView3 *iface, LPCITEMIDLIST new_pidl) -{ - FIXME("(%p)->(new_pidl %p) stub!\n", iface, new_pidl); - return E_NOTIMPL; -} - -static HRESULT WINAPI IShellView2_fnSelectAndPositionItem(IShellView3 *iface, LPCITEMIDLIST item, - UINT flags, POINT *point) -{ - IShellViewImpl *This = impl_from_IShellView3(iface); - TRACE("(%p)->(item %p, flags %#x, point %p)\n", This, item, flags, point); - return IFolderView2_SelectAndPositionItems(&This->IFolderView2_iface, 1, &item, point, flags); -} - -static HRESULT WINAPI IShellView3_fnCreateViewWindow3(IShellView3 *iface, IShellBrowser *owner, - IShellView *prev_view, SV3CVW3_FLAGS view_flags, FOLDERFLAGS mask, FOLDERFLAGS flags, - FOLDERVIEWMODE mode, const SHELLVIEWID *view_id, const RECT *rect, HWND *hwnd) -{ - IShellViewImpl *This = impl_from_IShellView3(iface); - FIXME("(%p)->(%p %p 0x%08x 0x%08x 0x%08x %d %s %s %p): stub\n", This, owner, prev_view, view_flags, - mask, flags, mode, debugstr_guid(view_id), wine_dbgstr_rect(rect), hwnd); - return E_NOTIMPL; -} - static const IShellView3Vtbl shellviewvtbl = { IShellView_fnQueryInterface,

1 0