February 2018 - Wine-Devel - list.winehq.org

[PATCH 3/5] kerberos: Simplify kerberos_SpInitLsaModeContext.
by Hans Leidekker Feb. 8, 2018

Feb. 8, 2018

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/kerberos/krb5_ap.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 34a2fe054a..8d02e97832 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -920,16 +920,11 @@ static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, cred_handle = credhandle_sspi_to_gss( credential ); ctxt_handle = ctxthandle_sspi_to_gss( context ); - if (!input) input_token.length = 0; + if (!input || (idx = get_buffer_index( input, SECBUFFER_TOKEN )) == -1) input_token.length = 0; else { - if ((idx = get_buffer_index( input, SECBUFFER_TOKEN )) == -1) - input_token.length = 0; - else - { - input_token.length = input->pBuffers[idx].cbBuffer; - input_token.value = input->pBuffers[idx].pvBuffer; - } + input_token.length = input->pBuffers[idx].cbBuffer; + input_token.value = input->pBuffers[idx].pvBuffer; } if ((idx = get_buffer_index( output, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; -- 2.11.0

1 0

[PATCH 2/5] kerberos: Don't fail on caller supplied credentials in kerberos_SpAcquireCredentialsHandle.
by Hans Leidekker Feb. 8, 2018

Feb. 8, 2018

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/kerberos/krb5_ap.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index e3ede45f49..34a2fe054a 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -833,11 +833,7 @@ static NTSTATUS NTAPI kerberos_SpAcquireCredentialsHandle( TRACE( "(%s 0x%08x %p %p %p %p %p %p)\n", debugstr_us(principal_us), credential_use, logon_id, auth_data, get_key_fn, get_key_arg, credential, ts_expiry ); - if (auth_data) - { - FIXME( "specific credentials not supported\n" ); - return SEC_E_UNKNOWN_CREDENTIALS; - } + if (auth_data) FIXME( "specific credentials not supported\n" ); switch (credential_use) { -- 2.11.0

1 0

[PATCH 1/5] secur32: Implement SECPKG_ATTR_NEGOTIATION_INFO for NTLM.
by Hans Leidekker Feb. 8, 2018

Feb. 8, 2018

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/secur32/ntlm.c | 149 +++++++++++++++++++++++++++++++--------------- dlls/secur32/tests/ntlm.c | 2 - 2 files changed, 100 insertions(+), 51 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 94b94f48ce..6a94d4224c 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -1421,6 +1421,87 @@ SECURITY_STATUS SEC_ENTRY ntlm_DeleteSecurityContext(PCtxtHandle phContext) return SEC_E_OK; } +#define NTLM_COMMENT \ + { 'N', 'T', 'L', 'M', ' ', \ + 'S', 'e', 'c', 'u', 'r', 'i', 't', 'y', ' ', \ + 'P', 'a', 'c', 'k', 'a', 'g', 'e', 0} + +static CHAR ntlm_comment_A[] = NTLM_COMMENT; +static WCHAR ntlm_comment_W[] = NTLM_COMMENT; + +#define NTLM_NAME {'N', 'T', 'L', 'M', 0} + +static char ntlm_name_A[] = NTLM_NAME; +static WCHAR ntlm_name_W[] = NTLM_NAME; + +#define NTLM_CAPS ( \ + SECPKG_FLAG_INTEGRITY | \ + SECPKG_FLAG_PRIVACY | \ + SECPKG_FLAG_TOKEN_ONLY | \ + SECPKG_FLAG_CONNECTION | \ + SECPKG_FLAG_MULTI_REQUIRED | \ + SECPKG_FLAG_IMPERSONATION | \ + SECPKG_FLAG_ACCEPT_WIN32_NAME | \ + SECPKG_FLAG_NEGOTIABLE | \ + SECPKG_FLAG_LOGON | \ + SECPKG_FLAG_RESTRICTED_TOKENS ) + +static const SecPkgInfoW infoW = { + NTLM_CAPS, + 1, + RPC_C_AUTHN_WINNT, + NTLM_MAX_BUF, + ntlm_name_W, + ntlm_comment_W +}; + +static const SecPkgInfoA infoA = { + NTLM_CAPS, + 1, + RPC_C_AUTHN_WINNT, + NTLM_MAX_BUF, + ntlm_name_A, + ntlm_comment_A +}; + +SecPkgInfoA *ntlm_package_infoA = (SecPkgInfoA *)&infoA; +SecPkgInfoW *ntlm_package_infoW = (SecPkgInfoW *)&infoW; + +static SecPkgInfoW *build_package_infoW( const SecPkgInfoW *info ) +{ + SecPkgInfoW *ret; + DWORD size_name = (strlenW(info->Name) + 1) * sizeof(WCHAR); + DWORD size_comment = (strlenW(info->Comment) + 1) * sizeof(WCHAR); + + if (!(ret = HeapAlloc( GetProcessHeap(), 0, sizeof(*ret) + size_name + size_comment ))) return NULL; + ret->fCapabilities = info->fCapabilities; + ret->wVersion = info->wVersion; + ret->wRPCID = info->wRPCID; + ret->cbMaxToken = info->cbMaxToken; + ret->Name = (SEC_WCHAR *)(ret + 1); + memcpy( ret->Name, info->Name, size_name ); + ret->Comment = (SEC_WCHAR *)((char *)ret->Name + size_name); + memcpy( ret->Comment, info->Comment, size_comment ); + return ret; +} + +static SecPkgInfoA *build_package_infoA( const SecPkgInfoA *info ) +{ + SecPkgInfoA *ret; + DWORD size_name = strlen(info->Name) + 1, size_comment = strlen(info->Comment) + 1; + + if (!(ret = HeapAlloc( GetProcessHeap(), 0, sizeof(*ret) + size_name + size_comment ))) return NULL; + ret->fCapabilities = info->fCapabilities; + ret->wVersion = info->wVersion; + ret->wRPCID = info->wRPCID; + ret->cbMaxToken = info->cbMaxToken; + ret->Name = (SEC_CHAR *)(ret + 1); + memcpy( ret->Name, info->Name, size_name ); + ret->Comment = ret->Name + size_name; + memcpy( ret->Comment, info->Comment, size_comment ); + return ret; +} + /*********************************************************************** * QueryContextAttributesW */ @@ -1453,7 +1534,13 @@ SECURITY_STATUS SEC_ENTRY ntlm_QueryContextAttributesW(PCtxtHandle phContext, _x(SECPKG_ATTR_LIFESPAN); _x(SECPKG_ATTR_NAMES); _x(SECPKG_ATTR_NATIVE_NAMES); - _x(SECPKG_ATTR_NEGOTIATION_INFO); + case SECPKG_ATTR_NEGOTIATION_INFO: + { + SecPkgContext_NegotiationInfoW *info = (SecPkgContext_NegotiationInfoW *)pBuffer; + if (!(info->PackageInfo = build_package_infoW( &infoW ))) return SEC_E_INSUFFICIENT_MEMORY; + info->NegotiationState = SECPKG_NEGOTIATION_COMPLETE; + return SEC_E_OK; + } _x(SECPKG_ATTR_PACKAGE_INFO); _x(SECPKG_ATTR_PASSWORD_EXPIRY); _x(SECPKG_ATTR_SESSION_KEY); @@ -1482,7 +1569,18 @@ SECURITY_STATUS SEC_ENTRY ntlm_QueryContextAttributesW(PCtxtHandle phContext, SECURITY_STATUS SEC_ENTRY ntlm_QueryContextAttributesA(PCtxtHandle phContext, ULONG ulAttribute, void *pBuffer) { - return ntlm_QueryContextAttributesW(phContext, ulAttribute, pBuffer); + switch(ulAttribute) + { + case SECPKG_ATTR_NEGOTIATION_INFO: + { + SecPkgContext_NegotiationInfoA *info = (SecPkgContext_NegotiationInfoA *)pBuffer; + if (!(info->PackageInfo = build_package_infoA( &infoA ))) return SEC_E_INSUFFICIENT_MEMORY; + info->NegotiationState = SECPKG_NEGOTIATION_COMPLETE; + return SEC_E_OK; + } + default: + return ntlm_QueryContextAttributesW( phContext, ulAttribute, pBuffer ); + } } /*********************************************************************** @@ -1976,53 +2074,6 @@ static const SecurityFunctionTableW ntlmTableW = { NULL, /* SetContextAttributesW */ }; -#define NTLM_COMMENT \ - { 'N', 'T', 'L', 'M', ' ', \ - 'S', 'e', 'c', 'u', 'r', 'i', 't', 'y', ' ', \ - 'P', 'a', 'c', 'k', 'a', 'g', 'e', 0} - -static CHAR ntlm_comment_A[] = NTLM_COMMENT; -static WCHAR ntlm_comment_W[] = NTLM_COMMENT; - -#define NTLM_NAME {'N', 'T', 'L', 'M', 0} - -static char ntlm_name_A[] = NTLM_NAME; -static WCHAR ntlm_name_W[] = NTLM_NAME; - -/* According to Windows, NTLM has the following capabilities. */ -#define CAPS ( \ - SECPKG_FLAG_INTEGRITY | \ - SECPKG_FLAG_PRIVACY | \ - SECPKG_FLAG_TOKEN_ONLY | \ - SECPKG_FLAG_CONNECTION | \ - SECPKG_FLAG_MULTI_REQUIRED | \ - SECPKG_FLAG_IMPERSONATION | \ - SECPKG_FLAG_ACCEPT_WIN32_NAME | \ - SECPKG_FLAG_NEGOTIABLE | \ - SECPKG_FLAG_LOGON | \ - SECPKG_FLAG_RESTRICTED_TOKENS ) - -static const SecPkgInfoW infoW = { - CAPS, - 1, - RPC_C_AUTHN_WINNT, - NTLM_MAX_BUF, - ntlm_name_W, - ntlm_comment_W -}; - -static const SecPkgInfoA infoA = { - CAPS, - 1, - RPC_C_AUTHN_WINNT, - NTLM_MAX_BUF, - ntlm_name_A, - ntlm_comment_A -}; - -SecPkgInfoA *ntlm_package_infoA = (SecPkgInfoA *)&infoA; -SecPkgInfoW *ntlm_package_infoW = (SecPkgInfoW *)&infoW; - void SECUR32_initNTLMSP(void) { PNegoHelper helper; diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index c060420a3f..b9fdf6f237 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -916,12 +916,10 @@ static void testAuth(ULONG data_rep, BOOL fake) memset(&info, 0, sizeof(info)); sec_status = QueryContextAttributesA(&client.ctxt, SECPKG_ATTR_NEGOTIATION_INFO, &info); -todo_wine ok(sec_status == SEC_E_OK, "QueryContextAttributesA returned %08x\n", sec_status); pi = info.PackageInfo; ok(info.NegotiationState == SECPKG_NEGOTIATION_COMPLETE, "got %u\n", info.NegotiationState); -todo_wine ok(pi != NULL, "expected non-NULL PackageInfo\n"); if (pi) { -- 2.11.0

1 0

[PATCH] user32: Remove confusing comments
by Nikolay Sivov Feb. 8, 2018

Feb. 8, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/button.c | 9 --------- dlls/user32/combo.c | 9 --------- dlls/user32/edit.c | 9 --------- dlls/user32/listbox.c | 9 --------- dlls/user32/scroll.c | 9 --------- dlls/user32/static.c | 9 --------- 6 files changed, 54 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index e5cee120c1..52e718f8e5 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -18,15 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * - * NOTES - * - * This code was audited for completeness against the documented features - * of Comctl32.dll version 6.0 on Oct. 3, 2004, by Dimitrie O. Paun. - * - * Unless otherwise noted, we believe this code to be complete, as per - * the specification mentioned above. - * If you discover missing features, or bugs, please note them below. - * * TODO * Styles * - BS_NOTIFY: is it complete? diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index b69f892b78..ef75c7637e 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -17,15 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * - * NOTES - * - * This code was audited for completeness against the documented features - * of Comctl32.dll version 6.0 on Oct. 4, 2004, by Dimitrie O. Paun. - * - * Unless otherwise noted, we believe this code to be complete, as per - * the specification mentioned above. - * If you discover missing features, or bugs, please note them below. - * * TODO: * - ComboBox_[GS]etMinVisible() * - CB_GETMINVISIBLE, CB_SETMINVISIBLE diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 614a979a39..693c58f6f8 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -20,15 +20,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * - * NOTES - * - * This code was audited for completeness against the documented features - * of Comctl32.dll version 6.0 on Oct. 8, 2004, by Dimitrie O. Paun. - * - * Unless otherwise noted, we believe this code to be complete, as per - * the specification mentioned above. - * If you discover missing features, or bugs, please note them below. - * * TODO: * - EDITBALLOONTIP structure * - EM_GETCUEBANNER/Edit_GetCueBannerText diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 6b47f053ae..f6b936ab90 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -17,15 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * - * NOTES - * - * This code was audited for completeness against the documented features - * of Comctl32.dll version 6.0 on Oct. 9, 2004, by Dimitrie O. Paun. - * - * Unless otherwise noted, we believe this code to be complete, as per - * the specification mentioned above. - * If you discover missing features, or bugs, please note them below. - * * TODO: * - LBS_NODATA */ diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 4b572e59f9..1c127fbc71 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -17,15 +17,6 @@ * 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 - * - * NOTES - * - * This code was audited for completeness against the documented features - * of Comctl32.dll version 6.0 on Oct. 8, 2004, by Dimitrie O. Paun. - * - * Unless otherwise noted, we believe this code to be complete, as per - * the specification mentioned above. - * If you discover missing features, or bugs, please note them below. */ #include "config.h" diff --git a/dlls/user32/static.c b/dlls/user32/static.c index 60fcb793d3..11b04fc98f 100644 --- a/dlls/user32/static.c +++ b/dlls/user32/static.c @@ -17,15 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * - * NOTES - * - * This code was audited for completeness against the documented features - * of Comctl32.dll version 6.0 on Oct. 4, 2004, by Dimitrie O. Paun. - * - * Unless otherwise noted, we believe this code to be complete, as per - * the specification mentioned above. - * If you discover missing features, or bugs, please note them below. - * * Notes: * - Windows XP introduced new behavior: The background of centered * icons and bitmaps is painted differently. This is only done if -- 2.15.1

1 0

[PATCH] comctl32: Introduce Static control
by Nikolay Sivov Feb. 8, 2018

Feb. 8, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/Makefile.in | 1 + dlls/comctl32/button.c | 2 +- dlls/comctl32/comctl32.h | 3 + dlls/comctl32/commctrl.c | 2 + dlls/comctl32/static.c | 812 +++++++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/tests/misc.c | 3 +- dlls/user32/class.c | 1 - dlls/user32/tests/class.c | 1 + 8 files changed, 822 insertions(+), 3 deletions(-) create mode 100644 dlls/comctl32/static.c diff --git a/dlls/comctl32/Makefile.in b/dlls/comctl32/Makefile.in index 37bc025510..1531dc4aed 100644 --- a/dlls/comctl32/Makefile.in +++ b/dlls/comctl32/Makefile.in @@ -28,6 +28,7 @@ C_SRCS = \ propsheet.c \ rebar.c \ smoothscroll.c \ + static.c \ status.c \ string.c \ syslink.c \ diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index a39a64c9a3..f1182f4802 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -198,7 +198,7 @@ static inline WCHAR *get_button_text( HWND hwnd ) return buffer; } -static HRGN set_control_clipping( HDC hdc, const RECT *rect ) +HRGN set_control_clipping( HDC hdc, const RECT *rect ) { RECT rc = *rect; HRGN hrgn = CreateRectRgn( 0, 0, 0, 0 ); diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h index 33cb0c78e2..960ec882ef 100644 --- a/dlls/comctl32/comctl32.h +++ b/dlls/comctl32/comctl32.h @@ -173,6 +173,8 @@ INT WINAPI Str_GetPtrW (LPCWSTR, LPWSTR, INT); LRESULT WINAPI SetPathWordBreakProc(HWND hwnd, BOOL bSet); BOOL WINAPI MirrorIcon(HICON *phicon1, HICON *phicon2); +HRGN set_control_clipping(HDC hdc, const RECT *rect) DECLSPEC_HIDDEN; + extern void ANIMATE_Register(void) DECLSPEC_HIDDEN; extern void ANIMATE_Unregister(void) DECLSPEC_HIDDEN; extern void BUTTON_Register(void) DECLSPEC_HIDDEN; @@ -201,6 +203,7 @@ extern void PROGRESS_Register(void) DECLSPEC_HIDDEN; extern void PROGRESS_Unregister(void) DECLSPEC_HIDDEN; extern void REBAR_Register(void) DECLSPEC_HIDDEN; extern void REBAR_Unregister(void) DECLSPEC_HIDDEN; +extern void STATIC_Register(void) DECLSPEC_HIDDEN; extern void STATUS_Register(void) DECLSPEC_HIDDEN; extern void STATUS_Unregister(void) DECLSPEC_HIDDEN; extern void SYSLINK_Register(void) DECLSPEC_HIDDEN; diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index b618ff2bfa..f04ab136b8 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -100,6 +100,7 @@ static void unregister_versioned_classes(void) { VERSION WC_BUTTONA, VERSION WC_EDITA, + VERSION WC_STATICA, }; int i; @@ -170,6 +171,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) BUTTON_Register (); EDIT_Register (); + STATIC_Register (); /* subclass user32 controls */ THEMING_Initialize (); diff --git a/dlls/comctl32/static.c b/dlls/comctl32/static.c new file mode 100644 index 0000000000..b66986b245 --- /dev/null +++ b/dlls/comctl32/static.c @@ -0,0 +1,812 @@ +/* + * Static control + * + * Copyright David W. Metcalfe, 1993 + * + * 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 + * + * NOTES + * + * This code was audited for completeness against the documented features + * of Comctl32.dll version 6.0 on Oct. 4, 2004, by Dimitrie O. Paun. + * + * Unless otherwise noted, we believe this code to be complete, as per + * the specification mentioned above. + * If you discover missing features, or bugs, please note them below. + * + * Notes: + * - Windows XP introduced new behavior: The background of centered + * icons and bitmaps is painted differently. This is only done if + * a manifest is present. + * Because it has not yet been decided how to implement the two + * different modes in Wine, only the Windows XP mode is implemented. + * - Controls with SS_SIMPLE but without SS_NOPREFIX: + * The text should not be changed. Windows doesn't clear the + * client rectangle, so the new text must be larger than the old one. + * - The SS_RIGHTJUST style is currently not implemented by Windows + * (or it does something different than documented). + * + * TODO: + * - Animated cursors + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "commctrl.h" + +#include "wine/debug.h" + +#include "comctl32.h" + +WINE_DEFAULT_DEBUG_CHANNEL(static); + +static void STATIC_PaintOwnerDrawfn( HWND hwnd, HDC hdc, DWORD style ); +static void STATIC_PaintTextfn( HWND hwnd, HDC hdc, DWORD style ); +static void STATIC_PaintRectfn( HWND hwnd, HDC hdc, DWORD style ); +static void STATIC_PaintIconfn( HWND hwnd, HDC hdc, DWORD style ); +static void STATIC_PaintBitmapfn( HWND hwnd, HDC hdc, DWORD style ); +static void STATIC_PaintEnhMetafn( HWND hwnd, HDC hdc, DWORD style ); +static void STATIC_PaintEtchedfn( HWND hwnd, HDC hdc, DWORD style ); + +static COLORREF color_3dshadow, color_3ddkshadow, color_3dhighlight; + +/* offsets for GetWindowLong for static private information */ +#define HFONT_GWL_OFFSET 0 +#define HICON_GWL_OFFSET (sizeof(HFONT)) +#define STATIC_EXTRA_BYTES (HICON_GWL_OFFSET + sizeof(HICON)) + +typedef void (*pfPaint)( HWND hwnd, HDC hdc, DWORD style ); + +static const pfPaint staticPaintFunc[SS_TYPEMASK+1] = +{ + STATIC_PaintTextfn, /* SS_LEFT */ + STATIC_PaintTextfn, /* SS_CENTER */ + STATIC_PaintTextfn, /* SS_RIGHT */ + STATIC_PaintIconfn, /* SS_ICON */ + STATIC_PaintRectfn, /* SS_BLACKRECT */ + STATIC_PaintRectfn, /* SS_GRAYRECT */ + STATIC_PaintRectfn, /* SS_WHITERECT */ + STATIC_PaintRectfn, /* SS_BLACKFRAME */ + STATIC_PaintRectfn, /* SS_GRAYFRAME */ + STATIC_PaintRectfn, /* SS_WHITEFRAME */ + NULL, /* SS_USERITEM */ + STATIC_PaintTextfn, /* SS_SIMPLE */ + STATIC_PaintTextfn, /* SS_LEFTNOWORDWRAP */ + STATIC_PaintOwnerDrawfn, /* SS_OWNERDRAW */ + STATIC_PaintBitmapfn, /* SS_BITMAP */ + STATIC_PaintEnhMetafn, /* SS_ENHMETAFILE */ + STATIC_PaintEtchedfn, /* SS_ETCHEDHORZ */ + STATIC_PaintEtchedfn, /* SS_ETCHEDVERT */ + STATIC_PaintEtchedfn, /* SS_ETCHEDFRAME */ +}; + +static BOOL get_icon_size( HICON handle, SIZE *size ) +{ + ICONINFO info; + BITMAP bmp; + int ret; + + if (!GetIconInfo(handle, &info)) + return FALSE; + + ret = GetObjectW(info.hbmColor, sizeof(bmp), &bmp); + if (ret) + { + size->cx = bmp.bmWidth; + size->cy = bmp.bmHeight; + } + + DeleteObject(info.hbmMask); + DeleteObject(info.hbmColor); + + return !!ret; +} + +/*********************************************************************** + * STATIC_SetIcon + * + * Set the icon for an SS_ICON control. + */ +static HICON STATIC_SetIcon( HWND hwnd, HICON hicon, DWORD style ) +{ + HICON prevIcon; + SIZE size; + + if ((style & SS_TYPEMASK) != SS_ICON) return 0; + if (hicon && !get_icon_size( hicon, &size )) + { + WARN("hicon != 0, but invalid\n"); + return 0; + } + prevIcon = (HICON)SetWindowLongPtrW( hwnd, HICON_GWL_OFFSET, (LONG_PTR)hicon ); + if (hicon && !(style & SS_CENTERIMAGE) && !(style & SS_REALSIZECONTROL)) + { + /* Windows currently doesn't implement SS_RIGHTJUST */ + /* + if ((style & SS_RIGHTJUST) != 0) + { + RECT wr; + GetWindowRect(hwnd, &wr); + SetWindowPos( hwnd, 0, wr.right - info->nWidth, wr.bottom - info->nHeight, + info->nWidth, info->nHeight, SWP_NOACTIVATE | SWP_NOZORDER ); + } + else */ + { + SetWindowPos( hwnd, 0, 0, 0, size.cx, size.cy, SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER ); + } + } + return prevIcon; +} + +/*********************************************************************** + * STATIC_SetBitmap + * + * Set the bitmap for an SS_BITMAP control. + */ +static HBITMAP STATIC_SetBitmap( HWND hwnd, HBITMAP hBitmap, DWORD style ) +{ + HBITMAP hOldBitmap; + + if ((style & SS_TYPEMASK) != SS_BITMAP) return 0; + if (hBitmap && GetObjectType(hBitmap) != OBJ_BITMAP) + { + WARN("hBitmap != 0, but it's not a bitmap\n"); + return 0; + } + hOldBitmap = (HBITMAP)SetWindowLongPtrW( hwnd, HICON_GWL_OFFSET, (LONG_PTR)hBitmap ); + if (hBitmap && !(style & SS_CENTERIMAGE) && !(style & SS_REALSIZECONTROL)) + { + BITMAP bm; + GetObjectW(hBitmap, sizeof(bm), &bm); + /* Windows currently doesn't implement SS_RIGHTJUST */ + /* + if ((style & SS_RIGHTJUST) != 0) + { + RECT wr; + GetWindowRect(hwnd, &wr); + SetWindowPos( hwnd, 0, wr.right - bm.bmWidth, wr.bottom - bm.bmHeight, + bm.bmWidth, bm.bmHeight, SWP_NOACTIVATE | SWP_NOZORDER ); + } + else */ + { + SetWindowPos( hwnd, 0, 0, 0, bm.bmWidth, bm.bmHeight, + SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER ); + } + } + return hOldBitmap; +} + +/*********************************************************************** + * STATIC_SetEnhMetaFile + * + * Set the enhanced metafile for an SS_ENHMETAFILE control. + */ +static HENHMETAFILE STATIC_SetEnhMetaFile( HWND hwnd, HENHMETAFILE hEnhMetaFile, DWORD style ) +{ + if ((style & SS_TYPEMASK) != SS_ENHMETAFILE) return 0; + if (hEnhMetaFile && GetObjectType(hEnhMetaFile) != OBJ_ENHMETAFILE) + { + WARN("hEnhMetaFile != 0, but it's not an enhanced metafile\n"); + return 0; + } + return (HENHMETAFILE)SetWindowLongPtrW( hwnd, HICON_GWL_OFFSET, (LONG_PTR)hEnhMetaFile ); +} + +/*********************************************************************** + * STATIC_GetImage + * + * Gets the bitmap for an SS_BITMAP control, the icon/cursor for an + * SS_ICON control or the enhanced metafile for an SS_ENHMETAFILE control. + */ +static HANDLE STATIC_GetImage( HWND hwnd, WPARAM wParam, DWORD style ) +{ + switch (style & SS_TYPEMASK) + { + case SS_ICON: + if ((wParam != IMAGE_ICON) && + (wParam != IMAGE_CURSOR)) return NULL; + break; + case SS_BITMAP: + if (wParam != IMAGE_BITMAP) return NULL; + break; + case SS_ENHMETAFILE: + if (wParam != IMAGE_ENHMETAFILE) return NULL; + break; + default: + return NULL; + } + return (HANDLE)GetWindowLongPtrW( hwnd, HICON_GWL_OFFSET ); +} + +/*********************************************************************** + * STATIC_LoadIconW + * + * Load the icon for an SS_ICON control. + */ +static HICON STATIC_LoadIconW( HINSTANCE hInstance, LPCWSTR name, DWORD style ) +{ + HICON hicon = 0; + + if (hInstance && ((ULONG_PTR)hInstance >> 16)) + { + if ((style & SS_REALSIZEIMAGE) != 0) + hicon = LoadImageW(hInstance, name, IMAGE_ICON, 0, 0, LR_SHARED); + else + { + hicon = LoadIconW( hInstance, name ); + if (!hicon) hicon = LoadCursorW( hInstance, name ); + } + } + if (!hicon) hicon = LoadIconW( 0, name ); + /* Windows doesn't try to load a standard cursor, + probably because most IDs for standard cursors conflict + with the IDs for standard icons anyway */ + return hicon; +} + +/*********************************************************************** + * STATIC_TryPaintFcn + * + * Try to immediately paint the control. + */ +static VOID STATIC_TryPaintFcn(HWND hwnd, LONG full_style) +{ + LONG style = full_style & SS_TYPEMASK; + RECT rc; + + GetClientRect( hwnd, &rc ); + if (!IsRectEmpty(&rc) && IsWindowVisible(hwnd) && staticPaintFunc[style]) + { + HDC hdc; + HRGN hrgn; + + hdc = GetDC( hwnd ); + hrgn = set_control_clipping( hdc, &rc ); + (staticPaintFunc[style])( hwnd, hdc, full_style ); + SelectClipRgn( hdc, hrgn ); + if (hrgn) DeleteObject( hrgn ); + ReleaseDC( hwnd, hdc ); + } +} + +static HBRUSH STATIC_SendWmCtlColorStatic(HWND hwnd, HDC hdc) +{ + HBRUSH hBrush; + HWND parent = GetParent(hwnd); + + if (!parent) parent = hwnd; + hBrush = (HBRUSH) SendMessageW( parent, WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd ); + if (!hBrush) /* did the app forget to call DefWindowProc ? */ + { + /* FIXME: DefWindowProc should return different colors if a + manifest is present */ + hBrush = (HBRUSH)DefWindowProcW( parent, WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd); + } + return hBrush; +} + +static VOID STATIC_InitColours(void) +{ + color_3ddkshadow = GetSysColor(COLOR_3DDKSHADOW); + color_3dshadow = GetSysColor(COLOR_3DSHADOW); + color_3dhighlight = GetSysColor(COLOR_3DHIGHLIGHT); +} + +/*********************************************************************** + * hasTextStyle + * + * Tests if the control displays text. + */ +static BOOL hasTextStyle( DWORD style ) +{ + switch (style & SS_TYPEMASK) + { + case SS_SIMPLE: + case SS_LEFT: + case SS_LEFTNOWORDWRAP: + case SS_CENTER: + case SS_RIGHT: + case SS_OWNERDRAW: + return TRUE; + } + + return FALSE; +} + +static LRESULT CALLBACK STATIC_WindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) +{ + LRESULT lResult = 0; + LONG full_style = GetWindowLongW( hwnd, GWL_STYLE ); + LONG style = full_style & SS_TYPEMASK; + + if (!IsWindow( hwnd )) return 0; + + switch (uMsg) + { + case WM_CREATE: + if (style < 0L || style > SS_TYPEMASK) + { + ERR("Unknown style 0x%02x\n", style ); + return -1; + } + STATIC_InitColours(); + break; + + case WM_NCDESTROY: + if (style == SS_ICON) + { +/* + * FIXME + * DestroyIcon32( STATIC_SetIcon( wndPtr, 0 ) ); + * + * We don't want to do this yet because DestroyIcon32 is broken. If the icon + * had already been loaded by the application the last thing we want to do is + * GlobalFree16 the handle. + */ + break; + } + else + return DefWindowProcW(hwnd, uMsg, wParam, lParam); + + case WM_ERASEBKGND: + /* do all painting in WM_PAINT like Windows does */ + return 1; + + case WM_PRINTCLIENT: + case WM_PAINT: + { + PAINTSTRUCT ps; + RECT rect; + HDC hdc = wParam ? (HDC)wParam : BeginPaint(hwnd, &ps); + GetClientRect( hwnd, &rect ); + if (staticPaintFunc[style]) + { + HRGN hrgn = set_control_clipping( hdc, &rect ); + (staticPaintFunc[style])( hwnd, hdc, full_style ); + SelectClipRgn( hdc, hrgn ); + if (hrgn) DeleteObject( hrgn ); + } + if (!wParam) EndPaint(hwnd, &ps); + } + break; + + case WM_ENABLE: + STATIC_TryPaintFcn( hwnd, full_style ); + if (full_style & SS_NOTIFY) + { + if (wParam) + SendMessageW( GetParent(hwnd), WM_COMMAND, + MAKEWPARAM( GetWindowLongPtrW(hwnd,GWLP_ID), STN_ENABLE ), (LPARAM)hwnd); + else + SendMessageW( GetParent(hwnd), WM_COMMAND, + MAKEWPARAM( GetWindowLongPtrW(hwnd,GWLP_ID), STN_DISABLE ), (LPARAM)hwnd); + } + break; + + case WM_SYSCOLORCHANGE: + STATIC_InitColours(); + STATIC_TryPaintFcn( hwnd, full_style ); + break; + + case WM_NCCREATE: + { + CREATESTRUCTW *cs = (CREATESTRUCTW *)lParam; + + if (full_style & SS_SUNKEN) + SetWindowLongW( hwnd, GWL_EXSTYLE, + GetWindowLongW( hwnd, GWL_EXSTYLE ) | WS_EX_STATICEDGE ); + + switch (style) + { + case SS_ICON: + { + HICON hIcon; + + hIcon = STATIC_LoadIconW(cs->hInstance, cs->lpszName, full_style); + STATIC_SetIcon(hwnd, hIcon, full_style); + } + break; + case SS_BITMAP: + if ((ULONG_PTR)cs->hInstance >> 16) + { + HBITMAP hBitmap; + hBitmap = LoadBitmapW(cs->hInstance, cs->lpszName); + STATIC_SetBitmap(hwnd, hBitmap, full_style); + } + break; + } + /* SS_ENHMETAFILE: Despite what MSDN says, Windows does not load + the enhanced metafile that was specified as the window text. */ + } + return DefWindowProcW(hwnd, uMsg, wParam, lParam); + + case WM_SETTEXT: + if (hasTextStyle( full_style )) + { + lResult = DefWindowProcW( hwnd, uMsg, wParam, lParam ); + STATIC_TryPaintFcn( hwnd, full_style ); + } + break; + + case WM_SETFONT: + if (hasTextStyle( full_style )) + { + SetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET, wParam ); + if (LOWORD(lParam)) + RedrawWindow( hwnd, NULL, 0, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_ALLCHILDREN ); + } + break; + + case WM_GETFONT: + return GetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET ); + + case WM_NCHITTEST: + if (full_style & SS_NOTIFY) + return HTCLIENT; + else + return HTTRANSPARENT; + + case WM_GETDLGCODE: + return DLGC_STATIC; + + case WM_LBUTTONDOWN: + case WM_NCLBUTTONDOWN: + if (full_style & SS_NOTIFY) + SendMessageW( GetParent(hwnd), WM_COMMAND, + MAKEWPARAM( GetWindowLongPtrW(hwnd,GWLP_ID), STN_CLICKED ), (LPARAM)hwnd); + return 0; + + case WM_LBUTTONDBLCLK: + case WM_NCLBUTTONDBLCLK: + if (full_style & SS_NOTIFY) + SendMessageW( GetParent(hwnd), WM_COMMAND, + MAKEWPARAM( GetWindowLongPtrW(hwnd,GWLP_ID), STN_DBLCLK ), (LPARAM)hwnd); + return 0; + + case STM_GETIMAGE: + return (LRESULT)STATIC_GetImage( hwnd, wParam, full_style ); + + case STM_GETICON: + return (LRESULT)STATIC_GetImage( hwnd, IMAGE_ICON, full_style ); + + case STM_SETIMAGE: + switch (wParam) + { + case IMAGE_BITMAP: + lResult = (LRESULT)STATIC_SetBitmap( hwnd, (HBITMAP)lParam, full_style ); + break; + case IMAGE_ENHMETAFILE: + lResult = (LRESULT)STATIC_SetEnhMetaFile( hwnd, (HENHMETAFILE)lParam, full_style ); + break; + case IMAGE_ICON: + case IMAGE_CURSOR: + lResult = (LRESULT)STATIC_SetIcon( hwnd, (HICON)lParam, full_style ); + break; + default: + FIXME("STM_SETIMAGE: Unhandled type %lx\n", wParam); + break; + } + STATIC_TryPaintFcn( hwnd, full_style ); + break; + + case STM_SETICON: + lResult = (LRESULT)STATIC_SetIcon( hwnd, (HICON)wParam, full_style ); + STATIC_TryPaintFcn( hwnd, full_style ); + break; + + default: + return DefWindowProcW(hwnd, uMsg, wParam, lParam); + } + return lResult; +} + +static void STATIC_PaintOwnerDrawfn( HWND hwnd, HDC hdc, DWORD style ) +{ + DRAWITEMSTRUCT dis; + HFONT font, oldFont = NULL; + UINT id = (UINT)GetWindowLongPtrW( hwnd, GWLP_ID ); + + dis.CtlType = ODT_STATIC; + dis.CtlID = id; + dis.itemID = 0; + dis.itemAction = ODA_DRAWENTIRE; + dis.itemState = IsWindowEnabled(hwnd) ? 0 : ODS_DISABLED; + dis.hwndItem = hwnd; + dis.hDC = hdc; + dis.itemData = 0; + GetClientRect( hwnd, &dis.rcItem ); + + font = (HFONT)GetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET ); + if (font) oldFont = SelectObject( hdc, font ); + SendMessageW( GetParent(hwnd), WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd ); + SendMessageW( GetParent(hwnd), WM_DRAWITEM, id, (LPARAM)&dis ); + if (font) SelectObject( hdc, oldFont ); +} + +static void STATIC_PaintTextfn( HWND hwnd, HDC hdc, DWORD style ) +{ + RECT rc; + HBRUSH hBrush; + HFONT hFont, hOldFont = NULL; + UINT format; + INT len, buf_size; + WCHAR *text; + + GetClientRect( hwnd, &rc); + + switch (style & SS_TYPEMASK) + { + case SS_LEFT: + format = DT_LEFT | DT_EXPANDTABS | DT_WORDBREAK; + break; + + case SS_CENTER: + format = DT_CENTER | DT_EXPANDTABS | DT_WORDBREAK; + break; + + case SS_RIGHT: + format = DT_RIGHT | DT_EXPANDTABS | DT_WORDBREAK; + break; + + case SS_SIMPLE: + format = DT_LEFT | DT_SINGLELINE; + break; + + case SS_LEFTNOWORDWRAP: + format = DT_LEFT | DT_EXPANDTABS; + break; + + default: + return; + } + + if (GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_RIGHT) + format = DT_RIGHT | (format & ~(DT_LEFT | DT_CENTER)); + + if (style & SS_NOPREFIX) + format |= DT_NOPREFIX; + + if ((style & SS_TYPEMASK) != SS_SIMPLE) + { + if (style & SS_CENTERIMAGE) + format |= DT_SINGLELINE | DT_VCENTER; + if (style & SS_EDITCONTROL) + format |= DT_EDITCONTROL; + if (style & SS_ENDELLIPSIS) + format |= DT_SINGLELINE | DT_END_ELLIPSIS; + if (style & SS_PATHELLIPSIS) + format |= DT_SINGLELINE | DT_PATH_ELLIPSIS; + if (style & SS_WORDELLIPSIS) + format |= DT_SINGLELINE | DT_WORD_ELLIPSIS; + } + + if ((hFont = (HFONT)GetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET ))) + hOldFont = SelectObject( hdc, hFont ); + + /* SS_SIMPLE controls: WM_CTLCOLORSTATIC is sent, but the returned + brush is not used */ + hBrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); + + if ((style & SS_TYPEMASK) != SS_SIMPLE) + { + FillRect( hdc, &rc, hBrush ); + if (!IsWindowEnabled(hwnd)) SetTextColor(hdc, GetSysColor(COLOR_GRAYTEXT)); + } + + buf_size = 256; + if (!(text = HeapAlloc( GetProcessHeap(), 0, buf_size * sizeof(WCHAR) ))) + goto no_TextOut; + + while ((len = InternalGetWindowText( hwnd, text, buf_size )) == buf_size - 1) + { + buf_size *= 2; + if (!(text = HeapReAlloc( GetProcessHeap(), 0, text, buf_size * sizeof(WCHAR) ))) + goto no_TextOut; + } + + if (!len) goto no_TextOut; + + if (((style & SS_TYPEMASK) == SS_SIMPLE) && (style & SS_NOPREFIX)) + { + /* Windows uses the faster ExtTextOut() to draw the text and + to paint the whole client rectangle with the text background + color. Reference: "Static Controls" by Kyle Marsh, 1992 */ + ExtTextOutW( hdc, rc.left, rc.top, ETO_CLIPPED | ETO_OPAQUE, + &rc, text, len, NULL ); + } + else + { + DrawTextW( hdc, text, -1, &rc, format ); + } + +no_TextOut: + HeapFree( GetProcessHeap(), 0, text ); + + if (hFont) + SelectObject( hdc, hOldFont ); +} + +static void STATIC_PaintRectfn( HWND hwnd, HDC hdc, DWORD style ) +{ + RECT rc; + HBRUSH hBrush; + + GetClientRect( hwnd, &rc); + + /* FIXME: send WM_CTLCOLORSTATIC */ + switch (style & SS_TYPEMASK) + { + case SS_BLACKRECT: + hBrush = CreateSolidBrush(color_3ddkshadow); + FillRect( hdc, &rc, hBrush ); + break; + case SS_GRAYRECT: + hBrush = CreateSolidBrush(color_3dshadow); + FillRect( hdc, &rc, hBrush ); + break; + case SS_WHITERECT: + hBrush = CreateSolidBrush(color_3dhighlight); + FillRect( hdc, &rc, hBrush ); + break; + case SS_BLACKFRAME: + hBrush = CreateSolidBrush(color_3ddkshadow); + FrameRect( hdc, &rc, hBrush ); + break; + case SS_GRAYFRAME: + hBrush = CreateSolidBrush(color_3dshadow); + FrameRect( hdc, &rc, hBrush ); + break; + case SS_WHITEFRAME: + hBrush = CreateSolidBrush(color_3dhighlight); + FrameRect( hdc, &rc, hBrush ); + break; + default: + return; + } + DeleteObject( hBrush ); +} + + +static void STATIC_PaintIconfn( HWND hwnd, HDC hdc, DWORD style ) +{ + RECT rc, iconRect; + HBRUSH hbrush; + HICON hIcon; + SIZE size; + + GetClientRect( hwnd, &rc ); + hbrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); + hIcon = (HICON)GetWindowLongPtrW( hwnd, HICON_GWL_OFFSET ); + if (!hIcon || !get_icon_size( hIcon, &size )) + { + FillRect(hdc, &rc, hbrush); + } + else + { + if (style & SS_CENTERIMAGE) + { + iconRect.left = (rc.right - rc.left) / 2 - size.cx / 2; + iconRect.top = (rc.bottom - rc.top) / 2 - size.cy / 2; + iconRect.right = iconRect.left + size.cx; + iconRect.bottom = iconRect.top + size.cy; + } + else + iconRect = rc; + FillRect( hdc, &rc, hbrush ); + DrawIconEx( hdc, iconRect.left, iconRect.top, hIcon, iconRect.right - iconRect.left, + iconRect.bottom - iconRect.top, 0, NULL, DI_NORMAL ); + } +} + +static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, DWORD style ) +{ + HDC hMemDC; + HBITMAP hBitmap, oldbitmap; + HBRUSH hbrush; + + /* message is still sent, even if the returned brush is not used */ + hbrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); + + if ((hBitmap = (HBITMAP)GetWindowLongPtrW( hwnd, HICON_GWL_OFFSET )) + && (GetObjectType(hBitmap) == OBJ_BITMAP) + && (hMemDC = CreateCompatibleDC( hdc ))) + { + BITMAP bm; + RECT rcClient; + LOGBRUSH brush; + + GetObjectW(hBitmap, sizeof(bm), &bm); + oldbitmap = SelectObject(hMemDC, hBitmap); + + /* Set the background color for monochrome bitmaps + to the color of the background brush */ + if (GetObjectW( hbrush, sizeof(brush), &brush )) + { + if (brush.lbStyle == BS_SOLID) + SetBkColor(hdc, brush.lbColor); + } + GetClientRect(hwnd, &rcClient); + if (style & SS_CENTERIMAGE) + { + FillRect( hdc, &rcClient, hbrush ); + rcClient.left = (rcClient.right - rcClient.left)/2 - bm.bmWidth/2; + rcClient.top = (rcClient.bottom - rcClient.top)/2 - bm.bmHeight/2; + rcClient.right = rcClient.left + bm.bmWidth; + rcClient.bottom = rcClient.top + bm.bmHeight; + } + StretchBlt(hdc, rcClient.left, rcClient.top, rcClient.right - rcClient.left, + rcClient.bottom - rcClient.top, hMemDC, + 0, 0, bm.bmWidth, bm.bmHeight, SRCCOPY); + SelectObject(hMemDC, oldbitmap); + DeleteDC(hMemDC); + } +} + +static void STATIC_PaintEnhMetafn(HWND hwnd, HDC hdc, DWORD style ) +{ + HENHMETAFILE hEnhMetaFile; + RECT rc; + HBRUSH hbrush; + + GetClientRect(hwnd, &rc); + hbrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); + FillRect(hdc, &rc, hbrush); + if ((hEnhMetaFile = (HENHMETAFILE)GetWindowLongPtrW( hwnd, HICON_GWL_OFFSET ))) + { + /* The control's current font is not selected into the + device context! */ + if (GetObjectType(hEnhMetaFile) == OBJ_ENHMETAFILE) + PlayEnhMetaFile(hdc, hEnhMetaFile, &rc); + } +} + +static void STATIC_PaintEtchedfn( HWND hwnd, HDC hdc, DWORD style ) +{ + RECT rc; + + /* FIXME: sometimes (not always) sends WM_CTLCOLORSTATIC */ + GetClientRect( hwnd, &rc ); + switch (style & SS_TYPEMASK) + { + case SS_ETCHEDHORZ: + DrawEdge(hdc, &rc, EDGE_ETCHED, BF_TOP | BF_BOTTOM); + break; + case SS_ETCHEDVERT: + DrawEdge(hdc, &rc, EDGE_ETCHED, BF_LEFT | BF_RIGHT); + break; + case SS_ETCHEDFRAME: + DrawEdge(hdc, &rc, EDGE_ETCHED, BF_RECT); + break; + } +} + +void STATIC_Register(void) +{ + WNDCLASSW wndClass; + + memset(&wndClass, 0, sizeof(wndClass)); + wndClass.style = CS_DBLCLKS | CS_PARENTDC | CS_GLOBALCLASS; + wndClass.lpfnWndProc = STATIC_WindowProc; + wndClass.cbClsExtra = 0; + wndClass.cbWndExtra = STATIC_EXTRA_BYTES; + wndClass.hCursor = LoadCursorW(0, (LPWSTR)IDC_ARROW); + wndClass.hbrBackground = NULL; + wndClass.lpszClassName = WC_STATICW; + RegisterClassW(&wndClass); +} diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index cb59de243e..f5b361e6f0 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -346,7 +346,8 @@ static void check_class( const char *name, int must_exist, UINT style, UINT igno if (GetClassInfoA( 0, name, &wc )) { todo_wine_if(strcmp(name, "Button") && - strcmp(name, "Edit")) + strcmp(name, "Edit") && + strcmp(name, "Static")) ok( !(~wc.style & style & ~ignore), "System class %s is missing bits %x (%08x/%08x)\n", name, ~wc.style & style, wc.style, style ); ok( !(wc.style & ~style), "System class %s has extra bits %x (%08x/%08x)\n", diff --git a/dlls/user32/class.c b/dlls/user32/class.c index dce9bf2269..d4b95609a8 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -172,7 +172,6 @@ static BOOL is_builtin_class( const WCHAR *name ) {'L','i','s','t','B','o','x',0}, {'M','D','I','C','l','i','e','n','t',0}, {'S','c','r','o','l','l','b','a','r',0}, - {'S','t','a','t','i','c',0}, }; int min = 0, max = (sizeof(classesW) / sizeof(classesW[0])) - 1; diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index ae885dbac9..7701f25c18 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -1236,6 +1236,7 @@ static void test_comctl32_classes(void) UPDOWN_CLASSA, "!Button", "!Edit", + "!Static", }; winetest_get_mainargs( &argv ); -- 2.15.1

1 0

[PATCH] kerberos: Slightly simplify name_sspi_to_gss.
by Dmitry Timoshkov Feb. 8, 2018

Feb. 8, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index e3ede45f49..99673b05c5 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -748,10 +748,9 @@ static SECURITY_STATUS name_sspi_to_gss( const UNICODE_STRING *name_str, gss_nam gss_OID type = GSS_C_NO_OID; /* FIXME: detect the appropriate value for this ourselves? */ gss_buffer_desc buf; - buf.length = WideCharToMultiByte( CP_UNIXCP, 0, name_str->Buffer, name_str->Length / sizeof(WCHAR), NULL, 0, NULL, NULL ) + 1; + buf.length = WideCharToMultiByte( CP_UNIXCP, 0, name_str->Buffer, name_str->Length / sizeof(WCHAR), NULL, 0, NULL, NULL ); if (!(buf.value = heap_alloc( buf.length ))) return SEC_E_INSUFFICIENT_MEMORY; WideCharToMultiByte( CP_UNIXCP, 0, name_str->Buffer, name_str->Length / sizeof(WCHAR), buf.value, buf.length, NULL, NULL ); - buf.length--; ret = pgss_import_name( &minor_status, &buf, type, name ); TRACE( "gss_import_name returned %08x minor status %08x\n", ret, minor_status ); -- 2.16.1

2 1

[PATCH 4/4] gdi32: Fix ABC width calculations when using vertical font.
by Akihiro Sagawa Feb. 8, 2018

Feb. 8, 2018

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/freetype.c | 3 ++- dlls/gdi32/tests/font.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-)

2 1

[PATCH 3/4] gdi32/tests: Add more ABC width tests with vertical font.
by Akihiro Sagawa Feb. 8, 2018

Feb. 8, 2018

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/tests/font.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)

2 1

[PATCH 2/4] gdi32/tests: Add more ABC width tests in various widths.
by Akihiro Sagawa Feb. 8, 2018

Feb. 8, 2018

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/tests/font.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+)

2 1

[PATCH 1/4] gdi32: Fix ABC width calculations when applying transformations internally.
by Akihiro Sagawa Feb. 8, 2018

Feb. 8, 2018

This fixes a regression introduced by f6bc356860a1ea2e5b4aed43e38ddf8b7d24a8b0. Fixes Bug 43256. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/freetype.c | 15 ++++++++------- dlls/gdi32/tests/font.c | 44 +++++++++++++++++++------------------------- 2 files changed, 27 insertions(+), 32 deletions(-)

2 1