wine-commits February 2015

wine-commits@winehq.org

2 participants
411 discussions

Henri Verbeet : dxgi: Implement dxgi_factory_SetPrivateDataInterface().
by Alexandre Julliard 16 Feb '15

16 Feb '15

Module: wine Branch: master Commit: b3159320101cd35c14aa1b299f4f931e8032e8e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3159320101cd35c14aa1b299… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 16 12:25:50 2015 +0100 dxgi: Implement dxgi_factory_SetPrivateDataInterface(). --- dlls/dxgi/factory.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 13b72f0..3943051 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -103,9 +103,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_SetPrivateData(IDXGIFactory1 *ifac static HRESULT STDMETHODCALLTYPE dxgi_factory_SetPrivateDataInterface(IDXGIFactory1 *iface, REFGUID guid, const IUnknown *object) { - FIXME("iface %p, guid %s, object %p stub!\n", iface, debugstr_guid(guid), object); + struct dxgi_factory *factory = impl_from_IDXGIFactory1(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, object %p.\n", iface, debugstr_guid(guid), object); + + return dxgi_set_private_data_interface(&factory->private_store, guid, object); } static HRESULT STDMETHODCALLTYPE dxgi_factory_GetPrivateData(IDXGIFactory1 *iface,

1 0

Jacek Caban : wininet: Don't include ws2tcpip.h after zlib.h.
by Alexandre Julliard 16 Feb '15

16 Feb '15

Module: wine Branch: master Commit: 6a0eb2ddd764ee61f1717211f26744ea751f1712 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a0eb2ddd764ee61f1717211f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 16 11:17:08 2015 +0100 wininet: Don't include ws2tcpip.h after zlib.h. --- dlls/wininet/http.c | 4 ++-- dlls/wininet/internet.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index b878cab..d515d7d 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -30,11 +30,11 @@ #include "config.h" #ifdef HAVE_ZLIB -# define Z_SOLO # include <zlib.h> #endif -#include "ws2tcpip.h" +#include "winsock2.h" +#include "ws2ipdef.h" #include <stdarg.h> #include <stdio.h> diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 2ad414f..e0baf2a 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -37,7 +37,7 @@ typedef struct { INTERNET_PORT port; BOOL is_https; struct sockaddr_storage addr; - socklen_t addr_len; + int addr_len; char addr_str[INET6_ADDRSTRLEN]; WCHAR *scheme_host_port;

1 0

Jacek Caban : wininet: Moved inet_ntop call to GetAddress.
by Alexandre Julliard 16 Feb '15

16 Feb '15

Module: wine Branch: master Commit: 47778f95fa7136a64440dfc9b00b3c4cb5267e9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=47778f95fa7136a64440dfc9b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 16 11:16:53 2015 +0100 wininet: Moved inet_ntop call to GetAddress. --- dlls/wininet/ftp.c | 5 ++--- dlls/wininet/http.c | 18 ++---------------- dlls/wininet/internet.c | 2 +- dlls/wininet/internet.h | 3 +-- dlls/wininet/utility.c | 7 ++++++- 5 files changed, 12 insertions(+), 23 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 05f5d4b..9be3096 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2447,7 +2447,7 @@ HINTERNET FTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, socklen_t sock_namelen; BOOL bSuccess = FALSE; ftp_session_t *lpwfs = NULL; - char szaddr[INET_ADDRSTRLEN]; + char szaddr[INET6_ADDRSTRLEN]; TRACE("%p Server(%s) Port(%d) User(%s) Paswd(%s)\n", hIC, debugstr_w(lpszServerName), @@ -2535,7 +2535,7 @@ HINTERNET FTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, (LPWSTR) lpszServerName, (strlenW(lpszServerName)+1) * sizeof(WCHAR)); sock_namelen = sizeof(socketAddr); - if (!GetAddress(lpszServerName, lpwfs->serverport, (struct sockaddr *)&socketAddr, &sock_namelen)) + if (!GetAddress(lpszServerName, lpwfs->serverport, (struct sockaddr *)&socketAddr, &sock_namelen, szaddr)) { INTERNET_SetLastError(ERROR_INTERNET_NAME_NOT_RESOLVED); goto lerror; @@ -2548,7 +2548,6 @@ HINTERNET FTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, goto lerror; } - inet_ntop(socketAddr.sin_family, &socketAddr.sin_addr, szaddr, sizeof(szaddr)); SendAsyncCallback(&hIC->hdr, dwContext, INTERNET_STATUS_NAME_RESOLVED, szaddr, strlen(szaddr)+1); diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 59c358c..b878cab 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1852,8 +1852,7 @@ static BOOL HTTP_DealWithProxy(appinfo_t *hIC, http_session_t *session, http_req static DWORD HTTP_ResolveName(http_request_t *request) { server_t *server = request->proxy ? request->proxy : request->server; - socklen_t addr_len; - void *addr; + int addr_len; if(server->addr_len) return ERROR_SUCCESS; @@ -1864,23 +1863,10 @@ static DWORD HTTP_ResolveName(http_request_t *request) (strlenW(server->name)+1) * sizeof(WCHAR)); addr_len = sizeof(server->addr); - if (!GetAddress(server->name, server->port, (struct sockaddr *)&server->addr, &addr_len)) + if (!GetAddress(server->name, server->port, (SOCKADDR*)&server->addr, &addr_len, server->addr_str)) return ERROR_INTERNET_NAME_NOT_RESOLVED; - switch(server->addr.ss_family) { - case AF_INET: - addr = &((struct sockaddr_in *)&server->addr)->sin_addr; - break; - case AF_INET6: - addr = &((struct sockaddr_in6 *)&server->addr)->sin6_addr; - break; - default: - WARN("unsupported family %d\n", server->addr.ss_family); - return ERROR_INTERNET_NAME_NOT_RESOLVED; - } - server->addr_len = addr_len; - inet_ntop(server->addr.ss_family, addr, server->addr_str, sizeof(server->addr_str)); INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_NAME_RESOLVED, server->addr_str, strlen(server->addr_str)+1); diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index a1e22d6..65bb434 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3453,7 +3453,7 @@ BOOL WINAPI InternetCheckConnectionW( LPCWSTR lpszUrl, DWORD dwFlags, DWORD dwRe socklen_t sa_len = sizeof(saddr); int fd; - if (!GetAddress(hostW, port, (struct sockaddr *)&saddr, &sa_len)) + if (!GetAddress(hostW, port, (struct sockaddr *)&saddr, &sa_len, NULL)) goto End; init_winsock(); fd = socket(saddr.ss_family, SOCK_STREAM, 0); diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 5741d24..2ad414f 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -397,8 +397,7 @@ DWORD HTTP_Connect(appinfo_t*,LPCWSTR, LPCWSTR lpszPassword, DWORD dwFlags, DWORD_PTR dwContext, DWORD dwInternalFlags, HINTERNET*) DECLSPEC_HIDDEN; -BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort, - struct sockaddr *psa, socklen_t *sa_len) DECLSPEC_HIDDEN; +BOOL GetAddress(const WCHAR*,INTERNET_PORT,SOCKADDR*,int*,char*) DECLSPEC_HIDDEN; DWORD get_cookie_header(const WCHAR*,const WCHAR*,WCHAR**) DECLSPEC_HIDDEN; DWORD set_cookie(const WCHAR*,const WCHAR*,const WCHAR*,const WCHAR*,DWORD) DECLSPEC_HIDDEN; diff --git a/dlls/wininet/utility.c b/dlls/wininet/utility.c index 16447e4..dd926dd 100644 --- a/dlls/wininet/utility.c +++ b/dlls/wininet/utility.c @@ -125,9 +125,10 @@ time_t ConvertTimeString(LPCWSTR asctime) } -BOOL GetAddress(const WCHAR *name, INTERNET_PORT port, struct sockaddr *psa, socklen_t *sa_len) +BOOL GetAddress(const WCHAR *name, INTERNET_PORT port, struct sockaddr *psa, int *sa_len, char *addr_str) { ADDRINFOW *res, hints; + void *addr = NULL; int ret; TRACE("%s\n", debugstr_w(name)); @@ -162,13 +163,17 @@ BOOL GetAddress(const WCHAR *name, INTERNET_PORT port, struct sockaddr *psa, soc switch (res->ai_family) { case AF_INET: + addr = &((struct sockaddr_in *)psa)->sin_addr; ((struct sockaddr_in *)psa)->sin_port = htons(port); break; case AF_INET6: + addr = &((struct sockaddr_in6 *)psa)->sin6_addr; ((struct sockaddr_in6 *)psa)->sin6_port = htons(port); break; } + if(addr_str) + inet_ntop(res->ai_family, addr, addr_str, INET6_ADDRSTRLEN); FreeAddrInfoW(res); return TRUE; }

1 0

Jacek Caban : wininet: Use GetAddrInfoW in GetAddress.
by Alexandre Julliard 16 Feb '15

16 Feb '15

Module: wine Branch: master Commit: 100bd11ae5e65bea9cdaecf4ce75a2aa8ba3ac2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=100bd11ae5e65bea9cdaecf4c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 16 11:16:39 2015 +0100 wininet: Use GetAddrInfoW in GetAddress. --- dlls/wininet/utility.c | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/dlls/wininet/utility.c b/dlls/wininet/utility.c index ec82779..16447e4 100644 --- a/dlls/wininet/utility.c +++ b/dlls/wininet/utility.c @@ -125,20 +125,12 @@ time_t ConvertTimeString(LPCWSTR asctime) } -BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort, - struct sockaddr *psa, socklen_t *sa_len) +BOOL GetAddress(const WCHAR *name, INTERNET_PORT port, struct sockaddr *psa, socklen_t *sa_len) { - struct addrinfo *res, hints; - char *name; - int sz; + ADDRINFOW *res, hints; int ret; - TRACE("%s\n", debugstr_w(lpszServerName)); - - sz = WideCharToMultiByte( CP_UNIXCP, 0, lpszServerName, -1, NULL, 0, NULL, NULL ); - if (!(name = heap_alloc(sz + 1))) return FALSE; - WideCharToMultiByte( CP_UNIXCP, 0, lpszServerName, -1, name, sz, NULL, NULL ); - name[sz] = 0; + TRACE("%s\n", debugstr_w(name)); memset( &hints, 0, sizeof(hints) ); /* Prefer IPv4 to IPv6 addresses, since some servers do not listen on @@ -146,23 +138,22 @@ BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort, */ hints.ai_family = AF_INET; - ret = getaddrinfo( name, NULL, &hints, &res ); + ret = GetAddrInfoW(name, NULL, &hints, &res); if (ret != 0) { - TRACE("failed to get IPv4 address of %s, retrying with IPv6\n", debugstr_w(lpszServerName)); + TRACE("failed to get IPv4 address of %s, retrying with IPv6\n", debugstr_w(name)); hints.ai_family = AF_INET6; - ret = getaddrinfo( name, NULL, &hints, &res ); + ret = GetAddrInfoW(name, NULL, &hints, &res); } - heap_free( name ); if (ret != 0) { - TRACE("failed to get address of %s\n", debugstr_w(lpszServerName)); + TRACE("failed to get address of %s\n", debugstr_w(name)); return FALSE; } if (*sa_len < res->ai_addrlen) { WARN("address too small\n"); - freeaddrinfo( res ); + FreeAddrInfoW(res); return FALSE; } *sa_len = res->ai_addrlen; @@ -171,14 +162,14 @@ BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort, switch (res->ai_family) { case AF_INET: - ((struct sockaddr_in *)psa)->sin_port = htons(nServerPort); + ((struct sockaddr_in *)psa)->sin_port = htons(port); break; case AF_INET6: - ((struct sockaddr_in6 *)psa)->sin6_port = htons(nServerPort); + ((struct sockaddr_in6 *)psa)->sin6_port = htons(port); break; } - freeaddrinfo( res ); + FreeAddrInfoW(res); return TRUE; }

1 0

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

16 Feb '15

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: Fix graphical error on themed progress bars.
by Alexandre Julliard 16 Feb '15

16 Feb '15

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

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

16 Feb '15

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 16 Feb '15

16 Feb '15

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 16 Feb '15

16 Feb '15

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

Mark Harmstone : comctl32: Draw focus rect on themed pushbuttons.
by Alexandre Julliard 16 Feb '15

16 Feb '15

Module: wine Branch: master Commit: 18c41f7128522d3f3c50baf76c3653a970ef7dd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18c41f7128522d3f3c50baf76… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sun Feb 15 14:23:35 2015 +0000 comctl32: Draw focus rect on themed pushbuttons. --- dlls/comctl32/theme_button.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/comctl32/theme_button.c b/dlls/comctl32/theme_button.c index 3935333..9b0a5cf 100644 --- a/dlls/comctl32/theme_button.c +++ b/dlls/comctl32/theme_button.c @@ -122,6 +122,21 @@ static void PB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UIN HeapFree(GetProcessHeap(), 0, text); } + if (focused) + { + MARGINS margins; + RECT focusRect = bgRect; + + GetThemeMargins(theme, hDC, BP_PUSHBUTTON, state, TMT_CONTENTMARGINS, NULL, &margins); + + focusRect.left += margins.cxLeftWidth; + focusRect.top += margins.cyTopHeight; + focusRect.right -= margins.cxRightWidth; + focusRect.bottom -= margins.cyBottomHeight; + + DrawFocusRect( hDC, &focusRect ); + } + if (hPrevFont) SelectObject(hDC, hPrevFont); }

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
42
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2015