February 2015 - Wine-Commits

Henri Verbeet : dxgi: Implement dxgi_output_GetPrivateData().
by Alexandre Julliard Feb. 16, 2015

Feb. 16, 2015

Module: wine Branch: master Commit: 3fe5d9b6d2e592c4635e1aaf9a64001492baf90e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fe5d9b6d2e592c4635e1aaf9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 16 12:25:54 2015 +0100 dxgi: Implement dxgi_output_GetPrivateData(). --- dlls/dxgi/output.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index b85fe0f..6ff10a9 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -100,9 +100,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_SetPrivateDataInterface(IDXGIOutput static HRESULT STDMETHODCALLTYPE dxgi_output_GetPrivateData(IDXGIOutput *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + struct dxgi_output *output = impl_from_IDXGIOutput(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return dxgi_get_private_data(&output->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE dxgi_output_GetParent(IDXGIOutput *iface,

1 0

Austin English : crytpui: Add CryptUIWizDigitalSign stub.
by Alexandre Julliard Feb. 16, 2015

Feb. 16, 2015

Module: wine Branch: master Commit: edb5ccc3f956d911930d18fd05a232c3c97ee3bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=edb5ccc3f956d911930d18fd0… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 11 20:26:37 2015 -0600 crytpui: Add CryptUIWizDigitalSign stub. --- dlls/cryptui/cryptui.spec | 2 +- dlls/cryptui/main.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/cryptui/cryptui.spec b/dlls/cryptui/cryptui.spec index c4b579a..dfdc5a4 100644 --- a/dlls/cryptui/cryptui.spec +++ b/dlls/cryptui/cryptui.spec @@ -30,7 +30,7 @@ 30 stub CryptUIWizBuildCTL 31 stub CryptUIWizCertRequest 32 stub CryptUIWizCreateCertRequestNoDS -33 stub CryptUIWizDigitalSign +33 stdcall CryptUIWizDigitalSign(long long wstr ptr ptr) 34 stdcall CryptUIWizExport(long ptr wstr ptr ptr) 35 stub CryptUIWizFreeCertRequestNoDS 36 stub CryptUIWizFreeDigitalSignContext diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 9f76456..616ccf7 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -7057,3 +7057,10 @@ PCCERT_CONTEXT WINAPI CryptUIDlgSelectCertificateFromStore(HCERTSTORE hCertStore FIXME("%p %p %s %s %d %d %p: stub\n", hCertStore, hwnd, debugstr_w(pwszTitle), debugstr_w(pwszDisplayString), dwDontUseColumn, dwFlags, pvReserved); return NULL; } + +BOOL WINAPI CryptUIWizDigitalSign(DWORD flags, HWND parent, LPCWSTR title, PCCRYPTUI_WIZ_DIGITAL_SIGN_INFO info, + PCCRYPTUI_WIZ_DIGITAL_SIGN_CONTEXT *context) +{ + FIXME("%d %p %s %p %p: stub\n", flags, parent, debugstr_w(title), info, context); + return FALSE; +}

1 0

Hans Leidekker : winhttp: Implement IWinHttpRequest::get_ResponseStream.
by Alexandre Julliard Feb. 16, 2015

Feb. 16, 2015

Module: wine Branch: master Commit: 5505413a81c67547f72236674619c8ee9025a89c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5505413a81c67547f72236674… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 16 14:41:47 2015 +0100 winhttp: Implement IWinHttpRequest::get_ResponseStream. --- dlls/winhttp/request.c | 195 ++++++++++++++++++++++++++++++++++++++++++- dlls/winhttp/tests/winhttp.c | 63 ++++++++++++-- 2 files changed, 248 insertions(+), 10 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 135a291..a12d73a 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3695,12 +3695,203 @@ done: return HRESULT_FROM_WIN32( err ); } +struct stream +{ + IStream IStream_iface; + LONG refs; + char *data; + ULARGE_INTEGER pos, size; +}; + +static inline struct stream *impl_from_IStream( IStream *iface ) +{ + return CONTAINING_RECORD( iface, struct stream, IStream_iface ); +} + +static HRESULT WINAPI stream_QueryInterface( IStream *iface, REFIID riid, void **obj ) +{ + struct stream *stream = impl_from_IStream( iface ); + + TRACE("%p, %s, %p\n", stream, debugstr_guid(riid), obj); + + if (IsEqualGUID( riid, &IID_IStream ) || IsEqualGUID( riid, &IID_IUnknown )) + { + *obj = iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + IStream_AddRef( iface ); + return S_OK; +} + +static ULONG WINAPI stream_AddRef( IStream *iface ) +{ + struct stream *stream = impl_from_IStream( iface ); + return InterlockedIncrement( &stream->refs ); +} + +static ULONG WINAPI stream_Release( IStream *iface ) +{ + struct stream *stream = impl_from_IStream( iface ); + LONG refs = InterlockedDecrement( &stream->refs ); + if (!refs) + { + heap_free( stream->data ); + heap_free( stream ); + } + return refs; +} + +static HRESULT WINAPI stream_Read( IStream *iface, void *buf, ULONG len, ULONG *read ) +{ + struct stream *stream = impl_from_IStream( iface ); + ULONG size; + + if (stream->pos.QuadPart >= stream->size.QuadPart) + { + *read = 0; + return S_FALSE; + } + + size = min( stream->size.QuadPart - stream->pos.QuadPart, len ); + memcpy( buf, stream->data + stream->pos.QuadPart, size ); + stream->pos.QuadPart += size; + *read = size; + + return S_OK; +} + +static HRESULT WINAPI stream_Write( IStream *iface, const void *buf, ULONG len, ULONG *written ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_Seek( IStream *iface, LARGE_INTEGER move, DWORD origin, ULARGE_INTEGER *newpos ) +{ + struct stream *stream = impl_from_IStream( iface ); + + if (origin == STREAM_SEEK_SET) + stream->pos.QuadPart = move.QuadPart; + else if (origin == STREAM_SEEK_CUR) + stream->pos.QuadPart += move.QuadPart; + else if (origin == STREAM_SEEK_END) + stream->pos.QuadPart = stream->size.QuadPart - move.QuadPart; + + if (newpos) newpos->QuadPart = stream->pos.QuadPart; + return S_OK; +} + +static HRESULT WINAPI stream_SetSize( IStream *iface, ULARGE_INTEGER newsize ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_CopyTo( IStream *iface, IStream *stream, ULARGE_INTEGER len, ULARGE_INTEGER *read, + ULARGE_INTEGER *written ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_Commit( IStream *iface, DWORD flags ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_Revert( IStream *iface ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_LockRegion( IStream *iface, ULARGE_INTEGER offset, ULARGE_INTEGER len, DWORD locktype ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_UnlockRegion( IStream *iface, ULARGE_INTEGER offset, ULARGE_INTEGER len, DWORD locktype ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_Stat( IStream *iface, STATSTG *stg, DWORD flag ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_Clone( IStream *iface, IStream **stream ) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static const IStreamVtbl stream_vtbl = +{ + stream_QueryInterface, + stream_AddRef, + stream_Release, + stream_Read, + stream_Write, + stream_Seek, + stream_SetSize, + stream_CopyTo, + stream_Commit, + stream_Revert, + stream_LockRegion, + stream_UnlockRegion, + stream_Stat, + stream_Clone +}; + static HRESULT WINAPI winhttp_request_get_ResponseStream( IWinHttpRequest *iface, VARIANT *body ) { - FIXME("\n"); - return E_NOTIMPL; + struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); + DWORD err = ERROR_SUCCESS; + struct stream *stream; + + TRACE("%p, %p\n", request, body); + + if (!body) return E_INVALIDARG; + + EnterCriticalSection( &request->cs ); + if (request->state < REQUEST_STATE_SENT) + { + err = ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND; + goto done; + } + if (!(stream = heap_alloc( sizeof(*stream) ))) + { + err = ERROR_OUTOFMEMORY; + goto done; + } + stream->IStream_iface.lpVtbl = &stream_vtbl; + stream->refs = 1; + if (!(stream->data = heap_alloc( request->offset ))) + { + heap_free( stream ); + err = ERROR_OUTOFMEMORY; + goto done; + } + memcpy( stream->data, request->buffer, request->offset ); + stream->pos.QuadPart = 0; + stream->size.QuadPart = request->offset; + V_VT( body ) = VT_UNKNOWN; + V_UNKNOWN( body ) = (IUnknown *)&stream->IStream_iface; + +done: + LeaveCriticalSection( &request->cs ); + return HRESULT_FROM_WIN32( err ); } static HRESULT WINAPI winhttp_request_get_Option( diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 2cad807..1423cef 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2624,11 +2624,15 @@ static void test_IWinHttpRequest(void) IWinHttpRequest *req; BSTR method, url, username, password, response = NULL, status_text = NULL, headers = NULL; BSTR date, today, connection, value = NULL; - VARIANT async, empty, timeout, body, proxy_server, bypass_list, data; + VARIANT async, empty, timeout, body, body2, proxy_server, bypass_list, data; VARIANT_BOOL succeeded; LONG status; WCHAR todayW[WINHTTP_TIME_FORMAT_BUFSIZE]; SYSTEMTIME st; + IStream *stream, *stream2; + LARGE_INTEGER pos; + char buf[128]; + DWORD count; GetSystemTime( &st ); WinHttpTimeFromSystemTime( &st, todayW ); @@ -2680,8 +2684,7 @@ static void test_IWinHttpRequest(void) hr = IWinHttpRequest_Abort( req ); ok( hr == S_OK, "got %08x\n", hr ); - hr = IWinHttpRequest_Release( req ); - ok( hr == S_OK, "got %08x\n", hr ); + IWinHttpRequest_Release( req ); hr = CoCreateInstance( &CLSID_WinHttpRequest, NULL, CLSCTX_INPROC_SERVER, &IID_IWinHttpRequest, (void **)&req ); ok( hr == S_OK, "got %08x\n", hr ); @@ -2714,8 +2717,7 @@ static void test_IWinHttpRequest(void) hr = IWinHttpRequest_Abort( req ); ok( hr == S_OK, "got %08x\n", hr ); - hr = IWinHttpRequest_Release( req ); - ok( hr == S_OK, "got %08x\n", hr ); + IWinHttpRequest_Release( req ); hr = CoCreateInstance( &CLSID_WinHttpRequest, NULL, CLSCTX_INPROC_SERVER, &IID_IWinHttpRequest, (void **)&req ); ok( hr == S_OK, "got %08x\n", hr ); @@ -2974,6 +2976,41 @@ static void test_IWinHttpRequest(void) hr = VariantClear( &body ); ok( hr == S_OK, "got %08x\n", hr ); + VariantInit( &body ); + V_VT( &body ) = VT_ERROR; + hr = IWinHttpRequest_get_ResponseStream( req, &body ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &body ) == VT_UNKNOWN, "got %08x\n", V_VT( &body ) ); + + hr = IUnknown_QueryInterface( V_UNKNOWN( &body ), &IID_IStream, (void **)&stream ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_UNKNOWN( &body ) == (IUnknown *)stream, "got different interface pointer\n" ); + + buf[0] = 0; + count = 0xdeadbeef; + hr = IStream_Read( stream, buf, 128, &count ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( count != 0xdeadbeef, "count not set\n" ); + ok( buf[0], "no data\n" ); + + VariantInit( &body2 ); + V_VT( &body2 ) = VT_ERROR; + hr = IWinHttpRequest_get_ResponseStream( req, &body2 ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &body2 ) == VT_UNKNOWN, "got %08x\n", V_VT( &body2 ) ); + ok( V_UNKNOWN( &body ) != V_UNKNOWN( &body2 ), "got same interface pointer\n" ); + + hr = IUnknown_QueryInterface( V_UNKNOWN( &body2 ), &IID_IStream, (void **)&stream2 ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_UNKNOWN( &body2 ) == (IUnknown *)stream2, "got different interface pointer\n" ); + IStream_Release( stream2 ); + + hr = VariantClear( &body ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = VariantClear( &body2 ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = IWinHttpRequest_SetProxy( req, HTTPREQUEST_PROXYSETTING_PROXY, proxy_server, bypass_list ); ok( hr == S_OK, "got %08x\n", hr ); @@ -3003,8 +3040,19 @@ static void test_IWinHttpRequest(void) hr = IWinHttpRequest_Abort( req ); ok( hr == S_OK, "got %08x\n", hr ); - hr = IWinHttpRequest_Release( req ); + IWinHttpRequest_Release( req ); + + pos.QuadPart = 0; + IStream_Seek( stream, pos, STREAM_SEEK_SET, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + buf[0] = 0; + count = 0xdeadbeef; + hr = IStream_Read( stream, buf, 128, &count ); ok( hr == S_OK, "got %08x\n", hr ); + ok( count != 0xdeadbeef, "count not set\n" ); + ok( buf[0], "no data\n" ); + IStream_Release( stream ); hr = CoCreateInstance( &CLSID_WinHttpRequest, NULL, CLSCTX_INPROC_SERVER, &IID_IWinHttpRequest, (void **)&req ); ok( hr == S_OK, "got %08x\n", hr ); @@ -3020,8 +3068,7 @@ static void test_IWinHttpRequest(void) hr = IWinHttpRequest_WaitForResponse( req, timeout, &succeeded ); ok( hr == S_OK, "got %08x\n", hr ); - hr = IWinHttpRequest_Release( req ); - ok( hr == S_OK, "got %08x\n", hr ); + IWinHttpRequest_Release( req ); SysFreeString( method ); SysFreeString( url );

1 0

Jacek Caban : wininet: Don' t strip port part from server name in GetAddress.
by Alexandre Julliard Feb. 16, 2015

Feb. 16, 2015

Module: wine Branch: master Commit: 11d09f1fe7be3b418ffc669bb60b79049f90d6b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11d09f1fe7be3b418ffc669bb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 16 11:16:16 2015 +0100 wininet: Don't strip port part from server name in GetAddress. Callers take care of that already. --- dlls/wininet/utility.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/dlls/wininet/utility.c b/dlls/wininet/utility.c index 871db1b..ec82779 100644 --- a/dlls/wininet/utility.c +++ b/dlls/wininet/utility.c @@ -129,27 +129,15 @@ BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort, struct sockaddr *psa, socklen_t *sa_len) { struct addrinfo *res, hints; - WCHAR *found; char *name; - int len, sz; + int sz; int ret; TRACE("%s\n", debugstr_w(lpszServerName)); - /* Validate server name first - * Check if there is something like - * pinger.macromedia.com:80 - * if yes, eliminate the :80.... - */ - found = strchrW(lpszServerName, ':'); - if (found) - len = found - lpszServerName; - else - len = strlenW(lpszServerName); - - sz = WideCharToMultiByte( CP_UNIXCP, 0, lpszServerName, len, NULL, 0, NULL, NULL ); + sz = WideCharToMultiByte( CP_UNIXCP, 0, lpszServerName, -1, NULL, 0, NULL, NULL ); if (!(name = heap_alloc(sz + 1))) return FALSE; - WideCharToMultiByte( CP_UNIXCP, 0, lpszServerName, len, name, sz, NULL, NULL ); + WideCharToMultiByte( CP_UNIXCP, 0, lpszServerName, -1, name, sz, NULL, NULL ); name[sz] = 0; memset( &hints, 0, sizeof(hints) );

1 0

Mark Harmstone : comctl32: Redraw themed editboxes on focus change.
by Alexandre Julliard Feb. 16, 2015

Feb. 16, 2015

Module: wine Branch: master Commit: 707361321a9202cc5ca773e22ad5370583025da5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=707361321a9202cc5ca773e22… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Fri Feb 13 00:33:55 2015 +0000 comctl32: Redraw themed editboxes on focus change. --- dlls/comctl32/theme_edit.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/comctl32/theme_edit.c b/dlls/comctl32/theme_edit.c index c6fd34c..ff4e56c 100644 --- a/dlls/comctl32/theme_edit.c +++ b/dlls/comctl32/theme_edit.c @@ -119,6 +119,8 @@ LRESULT CALLBACK THEMING_EditSubclassProc (HWND hwnd, UINT msg, break; case WM_ENABLE: + case WM_KILLFOCUS: + case WM_SETFOCUS: theme = GetWindowTheme( hwnd ); if (theme) RedrawWindow (hwnd, NULL, NULL, RDW_FRAME | RDW_INVALIDATE | RDW_UPDATENOW);

1 0

Mark Harmstone : comctl32: Use theming when drawing IP address control.
by Alexandre Julliard Feb. 16, 2015

Feb. 16, 2015

Module: wine Branch: master Commit: 6f9724d581b0b09b66a829346cf67eb5dfb7efe9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f9724d581b0b09b66a829346… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Thu Feb 12 23:29:03 2015 +0000 comctl32: Use theming when drawing IP address control. --- dlls/comctl32/ipaddress.c | 57 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 44 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index 97b6a0f..98e7259 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -45,6 +45,9 @@ #include "winnls.h" #include "commctrl.h" #include "comctl32.h" +#include "uxtheme.h" +#include "vsstyle.h" +#include "vssym32.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -150,36 +153,64 @@ static LRESULT IPADDRESS_Draw (const IPADDRESS_INFO *infoPtr, HDC hdc) static const WCHAR dotW[] = { '.', 0 }; RECT rect, rcPart; COLORREF bgCol, fgCol; - int i; + HTHEME theme; + int i, state = ETS_NORMAL; TRACE("\n"); GetClientRect (infoPtr->Self, &rect); - if (infoPtr->Enabled) { - bgCol = comctl32_color.clrWindow; - fgCol = comctl32_color.clrWindowText; + theme = OpenThemeData(infoPtr->Self, WC_EDITW); + + if (theme) { + DWORD dwStyle = GetWindowLongW (infoPtr->Self, GWL_STYLE); + + if (!infoPtr->Enabled) + state = ETS_DISABLED; + else if (dwStyle & ES_READONLY) + state = ETS_READONLY; + else if (GetFocus() == infoPtr->Self) + state = ETS_FOCUSED; + + GetThemeColor(theme, EP_EDITTEXT, state, TMT_FILLCOLOR, &bgCol); + GetThemeColor(theme, EP_EDITTEXT, state, TMT_TEXTCOLOR, &fgCol); + + if (IsThemeBackgroundPartiallyTransparent (theme, EP_EDITTEXT, state)) + DrawThemeParentBackground(infoPtr->Self, hdc, &rect); + DrawThemeBackground (theme, hdc, EP_EDITTEXT, state, &rect, 0); } else { - bgCol = comctl32_color.clr3dFace; - fgCol = comctl32_color.clrGrayText; + if (infoPtr->Enabled) { + bgCol = comctl32_color.clrWindow; + fgCol = comctl32_color.clrWindowText; + } else { + bgCol = comctl32_color.clr3dFace; + fgCol = comctl32_color.clrGrayText; + } + + FillRect (hdc, &rect, (HBRUSH)(DWORD_PTR)(bgCol+1)); + DrawEdge (hdc, &rect, EDGE_SUNKEN, BF_RECT | BF_ADJUST); } - FillRect (hdc, &rect, (HBRUSH)(DWORD_PTR)(bgCol+1)); - DrawEdge (hdc, &rect, EDGE_SUNKEN, BF_RECT | BF_ADJUST); - SetBkColor (hdc, bgCol); SetTextColor(hdc, fgCol); for (i = 0; i < 3; i++) { GetWindowRect (infoPtr->Part[i].EditHwnd, &rcPart); MapWindowPoints( 0, infoPtr->Self, (POINT *)&rcPart, 2 ); - rect.left = rcPart.right; - GetWindowRect (infoPtr->Part[i+1].EditHwnd, &rcPart); + rect.left = rcPart.right; + GetWindowRect (infoPtr->Part[i+1].EditHwnd, &rcPart); MapWindowPoints( 0, infoPtr->Self, (POINT *)&rcPart, 2 ); - rect.right = rcPart.left; - DrawTextW(hdc, dotW, 1, &rect, DT_SINGLELINE | DT_CENTER | DT_BOTTOM); + rect.right = rcPart.left; + + if (theme) + DrawThemeText(theme, hdc, EP_EDITTEXT, state, dotW, 1, DT_SINGLELINE | DT_CENTER | DT_BOTTOM, 0, &rect); + else + DrawTextW(hdc, dotW, 1, &rect, DT_SINGLELINE | DT_CENTER | DT_BOTTOM); } + if (theme) + CloseThemeData(theme); + return 0; }

1 0

Mark Harmstone : comctl32: Add themed scrollbar stub.
by Alexandre Julliard Feb. 16, 2015

Feb. 16, 2015

Module: wine Branch: master Commit: ca5184f512a4e70a8c966cf54914025824b521f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca5184f512a4e70a8c966cf54… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sun Feb 15 16:10:10 2015 +0000 comctl32: Add themed scrollbar stub. --- dlls/comctl32/Makefile.in | 1 + dlls/comctl32/theme_scrollbar.c | 44 +++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/theming.c | 9 +++++++-- 3 files changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/Makefile.in b/dlls/comctl32/Makefile.in index e63f0ac..27f9741 100644 --- a/dlls/comctl32/Makefile.in +++ b/dlls/comctl32/Makefile.in @@ -35,6 +35,7 @@ C_SRCS = \ theme_dialog.c \ theme_edit.c \ theme_listbox.c \ + theme_scrollbar.c \ theming.c \ toolbar.c \ tooltips.c \ diff --git a/dlls/comctl32/theme_scrollbar.c b/dlls/comctl32/theme_scrollbar.c new file mode 100644 index 0000000..9978598 --- /dev/null +++ b/dlls/comctl32/theme_scrollbar.c @@ -0,0 +1,44 @@ +/* + * Theming - Scrollbar control + * + * Copyright (c) 2015 Mark Harmstone + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include <stdarg.h> +#include <string.h> +#include <stdlib.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "uxtheme.h" +#include "vssym32.h" +#include "comctl32.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(theme_scroll); + +LRESULT CALLBACK THEMING_ScrollbarSubclassProc (HWND hwnd, UINT msg, + WPARAM wParam, LPARAM lParam, + ULONG_PTR dwRefData) +{ + TRACE("(%p, 0x%x, %lu, %lu, %lu)\n", hwnd, msg, wParam, lParam, dwRefData); + + return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); +} diff --git a/dlls/comctl32/theming.c b/dlls/comctl32/theming.c index aa99fc1..93d6fe6 100644 --- a/dlls/comctl32/theming.c +++ b/dlls/comctl32/theming.c @@ -44,6 +44,8 @@ extern LRESULT CALLBACK THEMING_EditSubclassProc (HWND, UINT, WPARAM, LPARAM, ULONG_PTR) DECLSPEC_HIDDEN; extern LRESULT CALLBACK THEMING_ListBoxSubclassProc (HWND, UINT, WPARAM, LPARAM, ULONG_PTR) DECLSPEC_HIDDEN; +extern LRESULT CALLBACK THEMING_ScrollbarSubclassProc (HWND, UINT, WPARAM, LPARAM, + ULONG_PTR) DECLSPEC_HIDDEN; static const WCHAR dialogClass[] = {'#','3','2','7','7','0',0}; static const WCHAR comboLboxClass[] = {'C','o','m','b','o','L','b','o','x',0}; @@ -59,7 +61,8 @@ static const struct ThemingSubclass {WC_COMBOBOXW, THEMING_ComboSubclassProc}, {comboLboxClass, THEMING_ListBoxSubclassProc}, {WC_EDITW, THEMING_EditSubclassProc}, - {WC_LISTBOXW, THEMING_ListBoxSubclassProc} + {WC_LISTBOXW, THEMING_ListBoxSubclassProc}, + {WC_SCROLLBARW, THEMING_ScrollbarSubclassProc} }; #define NUM_SUBCLASSES (sizeof(subclasses)/sizeof(subclasses[0])) @@ -95,6 +98,7 @@ MAKE_SUBCLASS_PROC(2) MAKE_SUBCLASS_PROC(3) MAKE_SUBCLASS_PROC(4) MAKE_SUBCLASS_PROC(5) +MAKE_SUBCLASS_PROC(6) static const WNDPROC subclassProcs[NUM_SUBCLASSES] = { subclass_proc0, @@ -102,7 +106,8 @@ static const WNDPROC subclassProcs[NUM_SUBCLASSES] = { subclass_proc2, subclass_proc3, subclass_proc4, - subclass_proc5 + subclass_proc5, + subclass_proc6 }; /***********************************************************************

1 0

Ken Thomases : gdi32: Change an ERR to a WARN for fonts with too-long names.
by Alexandre Julliard Feb. 16, 2015

Feb. 16, 2015

Module: wine Branch: master Commit: e9c36154e35c66673199fb6aebd447a53a16ebe8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9c36154e35c66673199fb6ae… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sat Feb 14 07:29:14 2015 -0600 gdi32: Change an ERR to a WARN for fonts with too-long names. The situation is commonplace on Macs and benign. --- dlls/gdi32/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 5122fb5..fc19f51 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2026,7 +2026,7 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr family = get_family( ft_face, flags & ADDFONT_VERTICAL_FONT ); if (strlenW(family->FamilyName) >= LF_FACESIZE) { - ERR("Ignoring %s because name is too long\n", debugstr_w(family->FamilyName)); + WARN("Ignoring %s because name is too long\n", debugstr_w(family->FamilyName)); release_face( face ); release_family( family ); return;

1 0

Jacek Caban : mshtml: Added execCommand("fontsize") support.
by Alexandre Julliard Feb. 16, 2015

Feb. 16, 2015

Module: wine Branch: master Commit: 32f177ae309ce6026ebb8214c5f386b67ee7dd1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=32f177ae309ce6026ebb8214c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 13 17:54:15 2015 +0100 mshtml: Added execCommand("fontsize") support. --- dlls/mshtml/htmldoc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 79dc5c1..a9ef3d9 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1141,6 +1141,8 @@ static const WCHAR cutW[] = {'c','u','t',0}; static const WCHAR fontnameW[] = {'f','o','n','t','n','a','m','e',0}; +static const WCHAR fontsizeW[] = + {'f','o','n','t','s','i','z','e',0}; static const WCHAR indentW[] = {'i','n','d','e','n','t',0}; static const WCHAR insertorderedlistW[] = @@ -1161,6 +1163,7 @@ static const struct { {copyW, IDM_COPY}, {cutW, IDM_CUT}, {fontnameW, IDM_FONTNAME}, + {fontsizeW, IDM_FONTSIZE}, {indentW, IDM_INDENT}, {insertorderedlistW, IDM_ORDERLIST}, {insertunorderedlistW, IDM_UNORDERLIST},

1 0

Mark Harmstone : comctl32: Fix graphical error on themed progress bars.
by Alexandre Julliard Feb. 16, 2015

Feb. 16, 2015

Module: wine Branch: master Commit: 50c2144999a70ecbfaeeff39ffd2cab97050029d URL: http://source.winehq.org/git/wine.git/?a=commit;h=50c2144999a70ecbfaeeff39f… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sun Feb 15 20:07:06 2015 +0000 comctl32: Fix graphical error on themed progress bars. --- dlls/comctl32/progress.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c index 44fdd3f..1b8fcf7 100644 --- a/dlls/comctl32/progress.c +++ b/dlls/comctl32/progress.c @@ -280,23 +280,33 @@ static void draw_theme_bar_V (const ProgressDrawInfo* di, int start, int end) /* draw themed horizontal background from 'start' to 'end' */ static void draw_theme_bkg_H (const ProgressDrawInfo* di, int start, int end) { - RECT r; + RECT bgrect, r; + r.left = di->rect.left + start; r.top = di->rect.top; r.right = di->rect.left + end; r.bottom = di->rect.bottom; - DrawThemeBackground (di->theme, di->hdc, PP_BAR, 0, &di->bgRect, &r); + + bgrect = di->bgRect; + OffsetRect(&bgrect, -bgrect.left, -bgrect.top); + + DrawThemeBackground (di->theme, di->hdc, PP_BAR, 0, &bgrect, &r); } /* draw themed vertical background from 'start' to 'end' */ static void draw_theme_bkg_V (const ProgressDrawInfo* di, int start, int end) { - RECT r; + RECT bgrect, r; + r.left = di->rect.left; r.top = di->rect.bottom - end; r.right = di->rect.right; r.bottom = di->rect.bottom - start; - DrawThemeBackground (di->theme, di->hdc, PP_BARVERT, 0, &di->bgRect, &r); + + bgrect = di->bgRect; + OffsetRect(&bgrect, -bgrect.left, -bgrect.top); + + DrawThemeBackground (di->theme, di->hdc, PP_BARVERT, 0, &bgrect, &r); } /* drawing functions for themed style */

1 0