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

Henri Verbeet : d3drm: Release the child object after we' re done with it in load_data() (Valgrind).
by Alexandre Julliard May 1, 2015

May 1, 2015

Module: wine Branch: master Commit: 90239052ab5dd011d0bd1f747cf5a7b6312a57b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90239052ab5dd011d0bd1f747… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 30 16:46:40 2015 +0200 d3drm: Release the child object after we're done with it in load_data() (Valgrind). --- dlls/d3drm/d3drm.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 725093f..7b74cfb 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1173,32 +1173,29 @@ static HRESULT load_data(IDirect3DRM3 *iface, IDirectXFileData *data_object, IID IDirectXFileDataReference *reference; IDirectXFileBinary *binary; - hr = IDirectXFileObject_QueryInterface(child, &IID_IDirectXFileBinary, (void **)&binary); - if (SUCCEEDED(hr)) + if (SUCCEEDED(IDirectXFileObject_QueryInterface(child, + &IID_IDirectXFileBinary, (void **)&binary))) { FIXME("Binary Object not supported yet\n"); IDirectXFileBinary_Release(binary); - continue; } - - hr = IDirectXFileObject_QueryInterface(child, &IID_IDirectXFileData, (void **)&data); - if (SUCCEEDED(hr)) + else if (SUCCEEDED(IDirectXFileObject_QueryInterface(child, + &IID_IDirectXFileData, (void **)&data))) { TRACE("Found Data Object\n"); hr = load_data(iface, data, GUIDs, nb_GUIDs, LoadProc, ArgLP, LoadTextureProc, ArgLTP, frame); IDirectXFileData_Release(data); - continue; } - hr = IDirectXFileObject_QueryInterface(child, &IID_IDirectXFileDataReference, (void **)&reference); - if (SUCCEEDED(hr)) + else if (SUCCEEDED(IDirectXFileObject_QueryInterface(child, + &IID_IDirectXFileDataReference, (void **)&reference))) { TRACE("Found Data Object Reference\n"); IDirectXFileDataReference_Resolve(reference, &data); hr = load_data(iface, data, GUIDs, nb_GUIDs, LoadProc, ArgLP, LoadTextureProc, ArgLTP, frame); IDirectXFileData_Release(data); IDirectXFileDataReference_Release(reference); - continue; } + IDirectXFileObject_Release(child); } if (hr != DXFILEERR_NOMOREOBJECTS)

1 0

Nikolay Sivov : shell32: Forward to CreateViewWindow3().
by Alexandre Julliard May 1, 2015

May 1, 2015

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

Nikolay Sivov : shell32: Update to IFolderView2.
by Alexandre Julliard May 1, 2015

May 1, 2015

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

Hans Leidekker : wininet: Reuse cached basic authorization across sessions.
by Alexandre Julliard May 1, 2015

May 1, 2015

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 : ole32/tests: Fix test failures on some VMs with limited user permissions.
by Alexandre Julliard May 1, 2015

May 1, 2015

Module: wine Branch: master Commit: 3d33d8a9c4c63ff06dc4decf89249dcf4d9b3509 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d33d8a9c4c63ff06dc4decf8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 1 11:52:43 2015 +0300 ole32/tests: Fix test failures on some VMs with limited user permissions. --- dlls/ole32/tests/compobj.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 4be9c8b..38d82a8 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -1964,7 +1964,12 @@ static void test_TreatAsClass(void) ok(lr == ERROR_SUCCESS, "Couldn't open CLSID key\n"); lr = RegCreateKeyExA(clsidkey, deadbeefA, 0, NULL, 0, KEY_WRITE, NULL, &deadbeefkey, NULL); - ok(lr == ERROR_SUCCESS, "Couldn't create class key\n"); + if (lr) { + win_skip("CoGetTreatAsClass() tests will be skipped (failed to create a test key, error %d)\n", + GetLastError()); + RegCloseKey(clsidkey); + return; + } hr = pCoTreatAsClass(&deadbeef, &deadbeef); ok(hr == REGDB_E_WRITEREGDB, "CoTreatAsClass gave wrong error: %08x\n", hr);

1 0

Nikolay Sivov : dwrite: Improve run tracing format.
by Alexandre Julliard May 1, 2015

May 1, 2015

Module: wine Branch: master Commit: 4fa8d3a444aee257733fb119d9e1c805562afd46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fa8d3a444aee257733fb119d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 1 11:35:13 2015 +0300 dwrite: Improve run tracing format. --- dlls/dwrite/layout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 5935918..68e582e 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -249,7 +249,7 @@ static inline struct dwrite_typography *impl_from_IDWriteTypography(IDWriteTypog static inline const char *debugstr_run(const struct regular_layout_run *run) { - return wine_dbg_sprintf("[%u,%u]", run->descr.textPosition, run->descr.textPosition + + return wine_dbg_sprintf("[%u,%u)", run->descr.textPosition, run->descr.textPosition + run->descr.stringLength); }

1 0

Henri Verbeet : d3dcompiler: Rename "func" to "decl" in free_function_decl ().
by Alexandre Julliard May 1, 2015

May 1, 2015

Module: wine Branch: master Commit: bef432a19c9c2ae50b090ab9f01dd07ad5474f38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bef432a19c9c2ae50b090ab9f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 30 16:46:39 2015 +0200 d3dcompiler: Rename "func" to "decl" in free_function_decl(). Mostly just for consistency with other uses of struct hlsl_ir_function_decl. --- dlls/d3dcompiler_43/utils.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 2d88975..83f815f 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -2445,12 +2445,12 @@ void free_instr(struct hlsl_ir_node *node) } } -static void free_function_decl(struct hlsl_ir_function_decl *func) +static void free_function_decl(struct hlsl_ir_function_decl *decl) { - d3dcompiler_free((void *)func->semantic); - d3dcompiler_free(func->parameters); - free_instr_list(func->body); - d3dcompiler_free(func); + d3dcompiler_free((void *)decl->semantic); + d3dcompiler_free(decl->parameters); + free_instr_list(decl->body); + d3dcompiler_free(decl); } static void free_function_decl_rb(struct wine_rb_entry *entry, void *context)

1 0

Henri Verbeet : d3dcompiler: Free the filename if we don' t store it in the HLSL preproc_directive rule (Valgrind).
by Alexandre Julliard May 1, 2015

May 1, 2015

Module: wine Branch: master Commit: 307cf703af34fe9c661890cbf368abb00fb68646 URL: http://source.winehq.org/git/wine.git/?a=commit;h=307cf703af34fe9c661890cbf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 30 16:46:37 2015 +0200 d3dcompiler: Free the filename if we don't store it in the HLSL preproc_directive rule (Valgrind). --- dlls/d3dcompiler_43/hlsl.y | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index f37e07e..80fe0e6 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -1097,20 +1097,23 @@ hlsl_prog: /* empty */ preproc_directive: PRE_LINE STRING { + const char **new_array = NULL; + TRACE("Updating line information to file %s, line %u\n", debugstr_a($2), $1); hlsl_ctx.line_no = $1; if (strcmp($2, hlsl_ctx.source_file)) - { - const char **new_array; - - hlsl_ctx.source_file = $2; new_array = d3dcompiler_realloc(hlsl_ctx.source_files, sizeof(*hlsl_ctx.source_files) * hlsl_ctx.source_files_count + 1); - if (new_array) - { - hlsl_ctx.source_files = new_array; - hlsl_ctx.source_files[hlsl_ctx.source_files_count++] = $2; - } + + if (new_array) + { + hlsl_ctx.source_files = new_array; + hlsl_ctx.source_files[hlsl_ctx.source_files_count++] = $2; + hlsl_ctx.source_file = $2; + } + else + { + d3dcompiler_free($2); } }

1 0