December 2009 - Wine-commits

Jacek Caban : wininet: Remove a few more INTERNET_SetLastError calls.
by Alexandre Julliard 03 Dec '09

03 Dec '09

Module: wine Branch: master Commit: 903d9c460d812211c4675027439b0f4ff56619da URL: http://source.winehq.org/git/wine.git/?a=commit;h=903d9c460d812211c46750274… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 3 14:47:43 2009 +0100 wininet: Remove a few more INTERNET_SetLastError calls. --- dlls/wininet/internet.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index c13f44a..8a3340c 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -321,7 +321,7 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) BOOL WINAPI InternetInitializeAutoProxyDll(DWORD dwReserved) { FIXME("STUB\n"); - INTERNET_SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -338,7 +338,7 @@ BOOL WINAPI DetectAutoProxyUrl(LPSTR lpszAutoProxyUrl, DWORD dwAutoProxyUrlLength, DWORD dwDetectFlags) { FIXME("STUB\n"); - INTERNET_SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -2920,7 +2920,7 @@ static HINTERNET INTERNET_InternetOpenUrlW(appinfo_t *hIC, LPCWSTR lpszUrl, /* gopher doesn't seem to be implemented in wine, but it's supposed * to be supported by InternetOpenUrlA. */ default: - INTERNET_SetLastError(ERROR_INTERNET_UNRECOGNIZED_SCHEME); + SetLastError(ERROR_INTERNET_UNRECOGNIZED_SCHEME); break; } @@ -2965,13 +2965,13 @@ HINTERNET WINAPI InternetOpenUrlW(HINTERNET hInternet, LPCWSTR lpszUrl, if (!lpszUrl) { - INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + SetLastError(ERROR_INVALID_PARAMETER); goto lend; } hIC = (appinfo_t*)WININET_GetObject( hInternet ); if (NULL == hIC || hIC->hdr.htype != WH_HINIT) { - INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); + SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); goto lend; } @@ -2992,7 +2992,7 @@ HINTERNET WINAPI InternetOpenUrlW(HINTERNET hInternet, LPCWSTR lpszUrl, /* * This is from windows. */ - INTERNET_SetLastError(ERROR_IO_PENDING); + SetLastError(ERROR_IO_PENDING); } else { ret = INTERNET_InternetOpenUrlW(hIC, lpszUrl, lpszHeaders, dwHeadersLength, dwFlags, dwContext); } @@ -3266,7 +3266,7 @@ BOOL WINAPI InternetQueryDataAvailable( HINTERNET hFile, hdr = WININET_GetObject( hFile ); if (!hdr) { - INTERNET_SetLastError(ERROR_INVALID_HANDLE); + SetLastError(ERROR_INVALID_HANDLE); return FALSE; } @@ -3604,7 +3604,7 @@ BOOL WINAPI InternetCreateUrlA(LPURL_COMPONENTSA lpUrlComponents, DWORD dwFlags, if (!lpUrlComponents || lpUrlComponents->dwStructSize != sizeof(URL_COMPONENTSW) || !lpdwUrlLength) { - INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + SetLastError(ERROR_INVALID_PARAMETER); return FALSE; }

1 0

Jacek Caban : wininet: Directly return error from HTTP_HttpSendRequest.
by Alexandre Julliard 03 Dec '09

03 Dec '09

Module: wine Branch: master Commit: c952e81a898006a4c0789f523859827d2620c146 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c952e81a898006a4c0789f523… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 3 14:48:54 2009 +0100 wininet: Directly return error from HTTP_HttpSendRequest. --- dlls/wininet/http.c | 73 ++++++++++++++++++++------------------------ dlls/wininet/tests/http.c | 3 +- 2 files changed, 34 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c952e81a898006a4c0789…

1 0

Jacek Caban : wininet: Directly return error status fro HTTP_HttpEndRequest .
by Alexandre Julliard 03 Dec '09

03 Dec '09

Module: wine Branch: master Commit: 741b6611fbd6fbbe876490ebc03ae982edcdb6d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=741b6611fbd6fbbe876490ebc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 3 14:49:29 2009 +0100 wininet: Directly return error status fro HTTP_HttpEndRequest. --- dlls/wininet/http.c | 39 +++++++++++++++++++-------------------- 1 files changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index ccdb6d1..0aa78b5 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3701,20 +3701,19 @@ static void AsyncHttpSendRequestProc(WORKREQUEST *workRequest) } -static BOOL HTTP_HttpEndRequestW(http_request_t *lpwhr, DWORD dwFlags, DWORD_PTR dwContext) +static DWORD HTTP_HttpEndRequestW(http_request_t *lpwhr, DWORD dwFlags, DWORD_PTR dwContext) { - BOOL rc = FALSE; INT responseLen; DWORD dwBufferSize; INTERNET_ASYNC_RESULT iar; - DWORD res; + DWORD res = ERROR_SUCCESS; INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0); responseLen = HTTP_GetResponseHeaders(lpwhr, TRUE); - if (responseLen) - rc = TRUE; + if (!responseLen) + res = ERROR_HTTP_HEADER_NOT_FOUND; INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_RESPONSE_RECEIVED, &responseLen, sizeof(DWORD)); @@ -3742,16 +3741,14 @@ static BOOL HTTP_HttpEndRequestW(http_request_t *lpwhr, DWORD dwFlags, DWORD_PTR HTTP_DrainContent(lpwhr); if ((new_url = HTTP_GetRedirectURL( lpwhr, szNewLocation ))) { + BOOL rc; INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_REDIRECT, new_url, (strlenW(new_url) + 1) * sizeof(WCHAR)); rc = HTTP_HandleRedirect(lpwhr, new_url); - if (rc) { + if (rc) res = HTTP_HttpSendRequestW(lpwhr, NULL, 0, NULL, 0, 0, TRUE); - if(res != ERROR_SUCCESS) { - rc = FALSE; - INTERNET_SetLastError(res); - } - } + else + res = INTERNET_GetLastError(); HeapFree( GetProcessHeap(), 0, new_url ); } } @@ -3759,12 +3756,12 @@ static BOOL HTTP_HttpEndRequestW(http_request_t *lpwhr, DWORD dwFlags, DWORD_PTR } iar.dwResult = (DWORD_PTR)lpwhr->hdr.hInternet; - iar.dwError = rc ? 0 : INTERNET_GetLastError(); + iar.dwError = res; INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_REQUEST_COMPLETE, &iar, sizeof(INTERNET_ASYNC_RESULT)); - return rc; + return res; } /*********************************************************************** @@ -3814,14 +3811,14 @@ static void AsyncHttpEndRequestProc(WORKREQUEST *work) BOOL WINAPI HttpEndRequestW(HINTERNET hRequest, LPINTERNET_BUFFERSW lpBuffersOut, DWORD dwFlags, DWORD_PTR dwContext) { - BOOL rc = FALSE; http_request_t *lpwhr; + DWORD res; TRACE("-->\n"); if (lpBuffersOut) { - INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } @@ -3829,7 +3826,7 @@ BOOL WINAPI HttpEndRequestW(HINTERNET hRequest, if (NULL == lpwhr || lpwhr->hdr.htype != WH_HHTTPREQ) { - INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); + SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); if (lpwhr) WININET_Release( &lpwhr->hdr ); return FALSE; @@ -3849,14 +3846,16 @@ BOOL WINAPI HttpEndRequestW(HINTERNET hRequest, request->dwContext = dwContext; INTERNET_AsyncCall(&work); - INTERNET_SetLastError(ERROR_IO_PENDING); + res = ERROR_IO_PENDING; } else - rc = HTTP_HttpEndRequestW(lpwhr, dwFlags, dwContext); + res = HTTP_HttpEndRequestW(lpwhr, dwFlags, dwContext); WININET_Release( &lpwhr->hdr ); - TRACE("%i <--\n",rc); - return rc; + TRACE("%u <--\n", res); + if(res != ERROR_SUCCESS) + SetLastError(res); + return res == ERROR_SUCCESS; } /***********************************************************************

1 0

Stefan Dösinger : wined3d: Remove needless NULL checks (coverity).
by Alexandre Julliard 03 Dec '09

03 Dec '09

Module: wine Branch: master Commit: 6a1933920767c953445b97216f7a27af4ea07924 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a1933920767c953445b97216… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 2 10:44:55 2009 +0100 wined3d: Remove needless NULL checks (coverity). --- dlls/wined3d/surface.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 221f16e..d75c5e9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4053,7 +4053,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD IWineD3DDeviceImpl *myDevice = This->resource.wineD3DDevice; TRACE("(%p)->(%d, %d, %p, %p, %08x\n", iface, dstx, dsty, Source, rsrc, trans); - if ( (This->Flags & SFLAG_LOCKED) || ((srcImpl != NULL) && (srcImpl->Flags & SFLAG_LOCKED))) + if ( (This->Flags & SFLAG_LOCKED) || (srcImpl->Flags & SFLAG_LOCKED)) { WARN(" Surface is busy, returning DDERR_SURFACEBUSY\n"); return WINEDDERR_SURFACEBUSY; @@ -4061,14 +4061,14 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD if(myDevice->inScene && (iface == myDevice->stencilBufferTarget || - (Source && Source == myDevice->stencilBufferTarget))) { + (Source == myDevice->stencilBufferTarget))) { TRACE("Attempt to access the depth stencil surface in a BeginScene / EndScene pair, returning WINED3DERR_INVALIDCALL\n"); return WINED3DERR_INVALIDCALL; } /* Special cases for RenderTargets */ if( (This->resource.usage & WINED3DUSAGE_RENDERTARGET) || - ( srcImpl && (srcImpl->resource.usage & WINED3DUSAGE_RENDERTARGET) )) { + (srcImpl->resource.usage & WINED3DUSAGE_RENDERTARGET) ) { RECT SrcRect, DstRect; DWORD Flags=0;

1 0

Marcus Meissner : winspool.drv: Check ptr for being NULL (Coverity).
by Alexandre Julliard 03 Dec '09

03 Dec '09

Module: wine Branch: master Commit: faf1485e4e0744af0bc6119f0d680a8ab025b08e URL: http://source.winehq.org/git/wine.git/?a=commit;h=faf1485e4e0744af0bc6119f0… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Dec 3 10:18:19 2009 +0100 winspool.drv: Check ptr for being NULL (Coverity). --- dlls/winspool.drv/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index ad99988..8e4d714 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -3337,7 +3337,7 @@ static BOOL WINSPOOL_GetDevModeFromReg(HKEY hkey, LPCWSTR ValueName, if (ptr && ((DEVMODEA*)ptr)->dmSize < sizeof(DEVMODEA)) ((DEVMODEA*)ptr)->dmSize = sizeof(DEVMODEA); sz += (CCHDEVICENAME + CCHFORMNAME); - if(buflen >= sz) { + if (ptr && (buflen >= sz)) { DEVMODEW *dmW = GdiConvertToDevmodeW((DEVMODEA*)ptr); memcpy(ptr, dmW, sz); HeapFree(GetProcessHeap(),0,dmW);

1 0

Andrew Nguyen : shlwapi: The third parameter of UrlCombineA/ W is an output parameter.
by Alexandre Julliard 03 Dec '09

03 Dec '09

Module: wine Branch: master Commit: 77933a925b2bb652d38db0a57710f48e73901089 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77933a925b2bb652d38db0a57… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Thu Dec 3 03:20:08 2009 -0600 shlwapi: The third parameter of UrlCombineA/W is an output parameter. --- dlls/shlwapi/shlwapi.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 1a79174..a8e7428 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -810,8 +810,8 @@ @ stdcall UrlApplySchemeW(wstr ptr ptr long) @ stdcall UrlCanonicalizeA(str ptr ptr long) @ stdcall UrlCanonicalizeW(wstr ptr ptr long) -@ stdcall UrlCombineA(str str str ptr long) -@ stdcall UrlCombineW(wstr wstr wstr ptr long) +@ stdcall UrlCombineA(str str ptr ptr long) +@ stdcall UrlCombineW(wstr wstr ptr ptr long) @ stdcall UrlCompareA(str str long) @ stdcall UrlCompareW(wstr wstr long) @ stdcall UrlCreateFromPathA(str ptr ptr long)

1 0

Henri Verbeet : dxgi: Implement IDXGIOutput::GetParent().
by Alexandre Julliard 03 Dec '09

03 Dec '09

Module: wine Branch: master Commit: aa85b4c61d9b4021c99378c2746b2743da76a753 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa85b4c61d9b4021c99378c27… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 3 11:38:19 2009 +0100 dxgi: Implement IDXGIOutput::GetParent(). --- dlls/dxgi/adapter.c | 2 +- dlls/dxgi/dxgi_private.h | 3 ++- dlls/dxgi/output.c | 9 ++++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 1efbec9..d13e3e1 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -189,7 +189,7 @@ HRESULT dxgi_adapter_init(struct dxgi_adapter *adapter, IDXGIFactory *parent, UI { return E_OUTOFMEMORY; } - dxgi_output_init(output); + dxgi_output_init(output, adapter); adapter->output = (IDXGIOutput *)output; return S_OK; diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 46b6f43..2929534 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -102,9 +102,10 @@ struct dxgi_output { const struct IDXGIOutputVtbl *vtbl; LONG refcount; + struct dxgi_adapter *adapter; }; -void dxgi_output_init(struct dxgi_output *output) DECLSPEC_HIDDEN; +void dxgi_output_init(struct dxgi_output *output, struct dxgi_adapter *adapter) DECLSPEC_HIDDEN; /* IDXGIAdapter */ struct dxgi_adapter diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index c3f8289..5b83427 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -98,9 +98,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetPrivateData(IDXGIOutput *iface, static HRESULT STDMETHODCALLTYPE dxgi_output_GetParent(IDXGIOutput *iface, REFIID riid, void **parent) { - FIXME("iface %p, riid %s, parent %p stub!\n", iface, debugstr_guid(riid), parent); + struct dxgi_output *This = (struct dxgi_output *)iface; - return E_NOTIMPL; + TRACE("iface %p, riid %s, parent %p.\n", iface, debugstr_guid(riid), parent); + + return IDXGIAdapter_QueryInterface((IDXGIAdapter *)This->adapter, riid, parent); } /* IDXGIOutput methods */ @@ -217,8 +219,9 @@ static const struct IDXGIOutputVtbl dxgi_output_vtbl = dxgi_output_GetFrameStatistics, }; -void dxgi_output_init(struct dxgi_output *output) +void dxgi_output_init(struct dxgi_output *output, struct dxgi_adapter *adapter) { output->vtbl = &dxgi_output_vtbl; output->refcount = 1; + output->adapter = adapter; }

1 0

Henri Verbeet : dxgi: Implement IDXGIDevice::GetParent().
by Alexandre Julliard 03 Dec '09

03 Dec '09

Module: wine Branch: master Commit: bfdd5df7f0038796ffa37f23fa617cf4c4cafed7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfdd5df7f0038796ffa37f23f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 3 11:38:20 2009 +0100 dxgi: Implement IDXGIDevice::GetParent(). --- dlls/dxgi/device.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 9741d0e..8562d67 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -112,9 +112,22 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_GetPrivateData(IWineDXGIDevice *ifa static HRESULT STDMETHODCALLTYPE dxgi_device_GetParent(IWineDXGIDevice *iface, REFIID riid, void **parent) { - FIXME("iface %p, riid %s, parent %p stub!\n", iface, debugstr_guid(riid), parent); + IDXGIAdapter *adapter; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, riid %s, parent %p.\n", iface, debugstr_guid(riid), parent); + + hr = IDXGIDevice_GetAdapter(iface, &adapter); + if (FAILED(hr)) + { + ERR("Failed to get adapter, hr %#x.\n", hr); + return hr; + } + + hr = IDXGIAdapter_QueryInterface(adapter, riid, parent); + IDXGIAdapter_Release(adapter); + + return hr; } /* IDXGIDevice methods */

1 0

Henri Verbeet : dxgi: Implement IDXGIFactory::GetParent().
by Alexandre Julliard 03 Dec '09

03 Dec '09

Module: wine Branch: master Commit: 3543e3d8cc047b4f462680d74d025c49db6fb3bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3543e3d8cc047b4f462680d74… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 3 11:38:21 2009 +0100 dxgi: Implement IDXGIFactory::GetParent(). --- dlls/dxgi/factory.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 33c1576..150e40c 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -110,9 +110,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_GetPrivateData(IWineDXGIFactory *i static HRESULT STDMETHODCALLTYPE dxgi_factory_GetParent(IWineDXGIFactory *iface, REFIID riid, void **parent) { - FIXME("iface %p, riid %s, parent %p stub!\n", iface, debugstr_guid(riid), parent); + WARN("iface %p, riid %s, parent %p.\n", iface, debugstr_guid(riid), parent); - return E_NOTIMPL; + *parent = NULL; + + return E_NOINTERFACE; } /* IDXGIFactory methods */

1 0

Jacek Caban : mshtml: Added generic bind_to_tree node notification and use it to set frame' s content window.
by Alexandre Julliard 03 Dec '09

03 Dec '09

Module: wine Branch: master Commit: 451f5b4ad6e4cbad9f5d06f9ee7012b8256bf305 URL: http://source.winehq.org/git/wine.git/?a=commit;h=451f5b4ad6e4cbad9f5d06f9e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 3 01:12:12 2009 +0100 mshtml: Added generic bind_to_tree node notification and use it to set frame's content window. --- dlls/mshtml/htmlelem.c | 5 ++- dlls/mshtml/htmlframebase.c | 72 +++++++++++++++++++++++----- dlls/mshtml/htmliframe.c | 61 +++++++++-------------- dlls/mshtml/mshtml_private.h | 8 ++- dlls/mshtml/mutation.c | 107 ++++++++---------------------------------- 5 files changed, 112 insertions(+), 141 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=451f5b4ad6e4cbad9f5d0…

1 0