July 2016 - Wine-commits - list.winehq.org

Hans Leidekker : sspicli: Implement SspiLocalFree.
by Alexandre Julliard 14 Jul '16

14 Jul '16

Module: wine Branch: master Commit: 1ec8dd7556bd373353d53cf530c3f91aab20835f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ec8dd7556bd373353d53cf53… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 13 10:28:34 2016 +0200 sspicli: Implement SspiLocalFree. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sspicli/main.c | 9 +++++++++ dlls/sspicli/sspicli.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/sspicli/main.c b/dlls/sspicli/main.c index cd34d28..34f0a64 100644 --- a/dlls/sspicli/main.c +++ b/dlls/sspicli/main.c @@ -131,3 +131,12 @@ void SEC_ENTRY SspiFreeAuthIdentity( PSEC_WINNT_AUTH_IDENTITY_OPAQUE opaque_id ) TRACE( "%p\n", opaque_id ); HeapFree( GetProcessHeap(), 0, opaque_id ); } + +/*********************************************************************** + * SspiLocalFree (SECUR32.0) + */ +void SEC_ENTRY SspiLocalFree( void *ptr ) +{ + TRACE( "%p\n", ptr ); + HeapFree( GetProcessHeap(), 0, ptr ); +} diff --git a/dlls/sspicli/sspicli.spec b/dlls/sspicli/sspicli.spec index e7f02df..8876bc0 100644 --- a/dlls/sspicli/sspicli.spec +++ b/dlls/sspicli/sspicli.spec @@ -92,7 +92,7 @@ @ stub SspiGetComputerNameForSPN @ stub SspiGetTargetHostName @ stub SspiIsAuthIdentityEncrypted -@ stub SspiLocalFree +@ stdcall SspiLocalFree(ptr) @ stub SspiMarshalAuthIdentity @ stub SspiPrepareForCredRead @ stub SspiPrepareForCredWrite

1 0

Hans Leidekker : secur32: Forward Sspi functions to sspicli.
by Alexandre Julliard 14 Jul '16

14 Jul '16

Module: wine Branch: master Commit: 33cb792056ae38cb09174191a7baf11c947629bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=33cb792056ae38cb09174191a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 13 10:28:35 2016 +0200 secur32: Forward Sspi functions to sspicli. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/secur32.c | 105 ---------------------------------------------- dlls/secur32/secur32.spec | 10 ++--- 2 files changed, 5 insertions(+), 110 deletions(-) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index 76f6f37..5035ec36 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -1170,111 +1170,6 @@ BOOLEAN WINAPI TranslateNameW( } /*********************************************************************** - * SspiEncodeAuthIdentityAsStrings (SECUR32.0) - */ -SECURITY_STATUS SEC_ENTRY SspiEncodeAuthIdentityAsStrings( - PSEC_WINNT_AUTH_IDENTITY_OPAQUE opaque_id, PCWSTR *username, - PCWSTR *domainname, PCWSTR *creds ) -{ - SEC_WINNT_AUTH_IDENTITY_W *id = (SEC_WINNT_AUTH_IDENTITY_W *)opaque_id; - - FIXME("%p %p %p %p\n", opaque_id, username, domainname, creds); - - *username = SECUR32_strdupW( id->User ); - *domainname = SECUR32_strdupW( id->Domain ); - *creds = SECUR32_strdupW( id->Password ); - - return SEC_E_OK; -} - -/*********************************************************************** - * SspiEncodeStringsAsAuthIdentity (SECUR32.0) - */ -SECURITY_STATUS SEC_ENTRY SspiEncodeStringsAsAuthIdentity( - PCWSTR username, PCWSTR domainname, PCWSTR creds, - PSEC_WINNT_AUTH_IDENTITY_OPAQUE *opaque_id ) -{ - SEC_WINNT_AUTH_IDENTITY_W *id; - DWORD len_username = 0, len_domainname = 0, len_password = 0, size; - WCHAR *ptr; - - FIXME( "%s %s %s %p\n", debugstr_w(username), debugstr_w(domainname), - debugstr_w(creds), opaque_id ); - - if (!username && !domainname && !creds) return SEC_E_INVALID_TOKEN; - - if (username) len_username = strlenW( username ); - if (domainname) len_domainname = strlenW( domainname ); - if (creds) len_password = strlenW( creds ); - - size = sizeof(*id); - if (username) size += (len_username + 1) * sizeof(WCHAR); - if (domainname) size += (len_domainname + 1) * sizeof(WCHAR); - if (creds) size += (len_password + 1) * sizeof(WCHAR); - if (!(id = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size ))) return ERROR_OUTOFMEMORY; - ptr = (WCHAR *)(id + 1); - - if (username) - { - memcpy( ptr, username, (len_username + 1) * sizeof(WCHAR) ); - id->User = ptr; - id->UserLength = len_username; - ptr += len_username + 1; - } - if (domainname) - { - memcpy( ptr, domainname, (len_domainname + 1) * sizeof(WCHAR) ); - id->Domain = ptr; - id->DomainLength = len_domainname; - ptr += len_domainname + 1; - } - if (creds) - { - memcpy( ptr, creds, (len_password + 1) * sizeof(WCHAR) ); - id->Password = ptr; - id->PasswordLength = len_password; - } - - *opaque_id = id; - return SEC_E_OK; -} - -/*********************************************************************** - * SspiFreeAuthIdentity (SECUR32.0) - */ -void SEC_ENTRY SspiFreeAuthIdentity( PSEC_WINNT_AUTH_IDENTITY_OPAQUE opaque_id ) -{ - - TRACE( "%p\n", opaque_id ); - HeapFree( GetProcessHeap(), 0, opaque_id ); -} - -/*********************************************************************** - * SspiLocalFree (SECUR32.0) - */ -void SEC_ENTRY SspiLocalFree( void *ptr ) -{ - TRACE( "%p\n", ptr ); - HeapFree( GetProcessHeap(), 0, ptr ); -} - -/*********************************************************************** - * SspiZeroAuthIdentity (SECUR32.0) - */ -void SEC_ENTRY SspiZeroAuthIdentity( PSEC_WINNT_AUTH_IDENTITY_OPAQUE opaque_id ) -{ - SEC_WINNT_AUTH_IDENTITY_W *id = (SEC_WINNT_AUTH_IDENTITY_W *)opaque_id; - - TRACE( "%p\n", opaque_id ); - - if (!id) return; - if (id->User) memset( id->User, 0, id->UserLength * sizeof(WCHAR) ); - if (id->Domain) memset( id->Domain, 0, id->DomainLength * sizeof(WCHAR) ); - if (id->Password) memset( id->Password, 0, id->PasswordLength * sizeof(WCHAR) ); - memset( id, 0, sizeof(*id) ); -} - -/*********************************************************************** * DllMain (SECUR32.0) */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) diff --git a/dlls/secur32/secur32.spec b/dlls/secur32/secur32.spec index cccc034..623ffe5 100644 --- a/dlls/secur32/secur32.spec +++ b/dlls/secur32/secur32.spec @@ -69,11 +69,11 @@ @ stub SecpTranslateNameEx @ stdcall SetContextAttributesA(ptr long ptr long) @ stdcall SetContextAttributesW(ptr long ptr long) -@ stdcall SspiEncodeAuthIdentityAsStrings(ptr ptr ptr ptr) -@ stdcall SspiEncodeStringsAsAuthIdentity(wstr wstr wstr ptr) -@ stdcall SspiFreeAuthIdentity(ptr) -@ stdcall SspiLocalFree(ptr) -@ stdcall SspiZeroAuthIdentity(ptr) +@ stdcall SspiEncodeAuthIdentityAsStrings(ptr ptr ptr ptr) sspicli.SspiEncodeAuthIdentityAsStrings +@ stdcall SspiEncodeStringsAsAuthIdentity(wstr wstr wstr ptr) sspicli.SspiEncodeStringsAsAuthIdentity +@ stdcall SspiFreeAuthIdentity(ptr) sspicli.SspiFreeAuthIdentity +@ stdcall SspiLocalFree(ptr) sspicli.SspiLocalFree +@ stdcall SspiZeroAuthIdentity(ptr) sspicli.SspiZeroAuthIdentity @ stdcall TranslateNameA(str long long ptr ptr) @ stdcall TranslateNameW(wstr long long ptr ptr) @ stdcall UnsealMessage(ptr ptr long ptr) DecryptMessage

1 0

Hans Leidekker : credui: Add a stub implementation of CredUIPromptForWindowsCredentialsW.
by Alexandre Julliard 14 Jul '16

14 Jul '16

Module: wine Branch: master Commit: 0ec0f075263626ade64dcf85f723d44abb693641 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ec0f075263626ade64dcf85f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 13 10:30:53 2016 +0200 credui: Add a stub implementation of CredUIPromptForWindowsCredentialsW. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/credui/credui.spec | 1 + dlls/credui/credui_main.c | 12 ++++++++++++ include/wincred.h | 4 ++++ 3 files changed, 17 insertions(+) diff --git a/dlls/credui/credui.spec b/dlls/credui/credui.spec index 891416c..bb2b408 100644 --- a/dlls/credui/credui.spec +++ b/dlls/credui/credui.spec @@ -7,6 +7,7 @@ @ stdcall CredUIParseUserNameW(wstr ptr long ptr long) @ stub CredUIPromptForCredentialsA @ stdcall CredUIPromptForCredentialsW(ptr wstr ptr long ptr long ptr long ptr long) +@ stdcall CredUIPromptForWindowsCredentialsW(ptr long ptr ptr long ptr ptr ptr long) @ stdcall CredUIReadSSOCredA(str ptr) @ stdcall CredUIReadSSOCredW(wstr ptr) @ stdcall CredUIStoreSSOCredA(str str str long) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index beb3c58..d2a098e 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -929,3 +929,15 @@ ULONG SEC_ENTRY SspiPromptForCredentialsW( PCWSTR target, void *info, return ret; } + +/****************************************************************************** + * CredUIPromptForWindowsCredentialsW [CREDUI.@] + */ +DWORD WINAPI CredUIPromptForWindowsCredentialsW( CREDUI_INFOW *info, DWORD error, ULONG *package, + const void *in_buf, ULONG in_buf_size, void **out_buf, + ULONG *out_buf_size, BOOL *save, DWORD flags ) +{ + FIXME( "(%p, %u, %p, %p, %u, %p, %p, %p, %08x) stub\n", info, error, package, in_buf, in_buf_size, + out_buf, out_buf_size, save, flags ); + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/include/wincred.h b/include/wincred.h index f238c05..74fc16f 100644 --- a/include/wincred.h +++ b/include/wincred.h @@ -271,6 +271,8 @@ WINADVAPI BOOL WINAPI CredWriteA(PCREDENTIALA,DWORD); WINADVAPI BOOL WINAPI CredWriteW(PCREDENTIALW,DWORD); #define CredWrite WINELIB_NAME_AW(CredWrite) +BOOL WINAPI CredPackAuthenticationBufferW(DWORD,LPWSTR,LPWSTR,PBYTE,DWORD *); +BOOL WINAPI CredUnPackAuthenticationBufferW(DWORD,PVOID,DWORD,LPWSTR,DWORD *,LPWSTR,DWORD *,LPWSTR,DWORD *); DWORD WINAPI CredUICmdLinePromptForCredentialsW(PCWSTR,PCtxtHandle,DWORD,PWSTR,ULONG,PWSTR,ULONG,PBOOL,DWORD); DWORD WINAPI CredUICmdLinePromptForCredentialsA(PCSTR,PCtxtHandle,DWORD,PSTR,ULONG,PSTR,ULONG,PBOOL,DWORD); #define CredUICmdLinePromptForCredentials WINELIB_NAME_AW(CredUICmdLinePromptForCredentials) @@ -283,6 +285,8 @@ DWORD WINAPI CredUIParseUserNameA(PCSTR,PSTR,ULONG,PSTR,ULONG); DWORD WINAPI CredUIPromptForCredentialsW(PCREDUI_INFOW,PCWSTR,PCtxtHandle,DWORD,PWSTR,ULONG,PWSTR,ULONG,PBOOL,DWORD); DWORD WINAPI CredUIPromptForCredentialsA(PCREDUI_INFOA,PCSTR,PCtxtHandle,DWORD,PSTR,ULONG,PSTR,ULONG,PBOOL,DWORD); #define CredUIPromptForCredentials WINELIB_NAME_AW(CredUIPromptForCredentials) +DWORD WINAPI CredUIPromptForWindowsCredentialsW(PCREDUI_INFOW,DWORD,ULONG *,LPCVOID,ULONG,LPVOID *, ULONG *, BOOL *, + DWORD); DWORD WINAPI CredUIStoreSSOCredW(PCWSTR,PCWSTR,PCWSTR,BOOL); /* Note: no CredUIStoreSSOCredA in PSDK header */ DWORD WINAPI CredUIReadSSOCredW(PCWSTR,PWSTR*);

1 0

Hans Leidekker : credui: Add stub implementations of CredPackAuthenticationBufferW and CredUnpackAuthenticationBufferW.
by Alexandre Julliard 14 Jul '16

14 Jul '16

Module: wine Branch: master Commit: 09686ff589814a8220bf67f1e1c214cf612a2662 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09686ff589814a8220bf67f1e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 13 10:30:54 2016 +0200 credui: Add stub implementations of CredPackAuthenticationBufferW and CredUnpackAuthenticationBufferW. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/credui/credui.spec | 2 ++ dlls/credui/credui_main.c | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/dlls/credui/credui.spec b/dlls/credui/credui.spec index bb2b408..dd4bc75 100644 --- a/dlls/credui/credui.spec +++ b/dlls/credui/credui.spec @@ -1,3 +1,4 @@ +@ stdcall CredPackAuthenticationBufferW(long wstr ptr ptr ptr) @ stub CredUICmdLinePromptForCredentialsA @ stub CredUICmdLinePromptForCredentialsW @ stub CredUIConfirmCredentialsA @@ -12,6 +13,7 @@ @ stdcall CredUIReadSSOCredW(wstr ptr) @ stdcall CredUIStoreSSOCredA(str str str long) @ stdcall CredUIStoreSSOCredW(wstr wstr wstr long) +@ stdcall CredUnPackAuthenticationBufferW(long ptr long ptr ptr ptr ptr ptr ptr) @ stub DllCanUnloadNow @ stub DllGetClassObject @ stub DllRegisterServer diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index d2a098e..c63983e 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -941,3 +941,25 @@ DWORD WINAPI CredUIPromptForWindowsCredentialsW( CREDUI_INFOW *info, DWORD error out_buf, out_buf_size, save, flags ); return ERROR_CALL_NOT_IMPLEMENTED; } + +/****************************************************************************** + * CredPackAuthenticationBufferW [CREDUI.@] + */ +BOOL WINAPI CredPackAuthenticationBufferW( DWORD flags, WCHAR *username, WCHAR *password, BYTE *buf, + DWORD *size ) +{ + FIXME( "(%08x, %s, %p, %p, %p) stub\n", flags, debugstr_w(username), password, buf, size ); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/****************************************************************************** + * CredUnPackAuthenticationBufferW [CREDUI.@] + */ +BOOL WINAPI CredUnPackAuthenticationBufferW( DWORD flags, void *buf, DWORD size, WCHAR *username, + DWORD *len_username, WCHAR *domain, DWORD *len_domain, + WCHAR *password, DWORD *len_password ) +{ + FIXME( "(%08x, %p, %u, %p, %p, %p, %p, %p, %p) stub\n", flags, buf, size, username, len_username, + domain, len_domain, password, len_password ); + return ERROR_CALL_NOT_IMPLEMENTED; +}

1 0

Hans Leidekker : credui: Use the input identity passed to SspiPromptForCredentialsW.
by Alexandre Julliard 14 Jul '16

14 Jul '16

Module: wine Branch: master Commit: 1ca4fc094365d7d1502c31dbed9a5ba0d9620189 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ca4fc094365d7d1502c31dbe… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 13 10:30:55 2016 +0200 credui: Use the input identity passed to SspiPromptForCredentialsW. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/credui/credui_main.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index c63983e..b85129a 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -871,6 +871,7 @@ ULONG SEC_ENTRY SspiPromptForCredentialsW( PCWSTR target, void *info, DWORD len_password = sizeof(password) / sizeof(password[0]); DWORD ret, flags; CREDUI_INFOW *cred_info = info; + SEC_WINNT_AUTH_IDENTITY_W *id = input_id; FIXME( "(%s, %p, %u, %s, %p, %p, %p, %x) stub\n", debugstr_w(target), info, error, debugstr_w(package), input_id, output_id, save, sspi_flags ); @@ -882,11 +883,6 @@ ULONG SEC_ENTRY SspiPromptForCredentialsW( PCWSTR target, void *info, FIXME( "package %s not supported\n", debugstr_w(package) ); return ERROR_NO_SUCH_PACKAGE; } - if (input_id) - { - FIXME( "input identity not supported\n" ); - return ERROR_CALL_NOT_IMPLEMENTED; - } flags = CREDUI_FLAGS_ALWAYS_SHOW_UI | CREDUI_FLAGS_GENERIC_CREDENTIALS; @@ -896,12 +892,24 @@ ULONG SEC_ENTRY SspiPromptForCredentialsW( PCWSTR target, void *info, if (!(sspi_flags & SSPIPFC_NO_CHECKBOX)) flags |= CREDUI_FLAGS_SHOW_SAVE_CHECK_BOX; - find_existing_credential( target, username, len_username, password, len_password ); + if (!id) find_existing_credential( target, username, len_username, password, len_password ); + else + { + if (id->User && id->UserLength > 0 && id->UserLength <= CREDUI_MAX_USERNAME_LENGTH) + { + memcpy( username, id->User, id->UserLength * sizeof(WCHAR) ); + username[id->UserLength] = 0; + } + if (id->Password && id->PasswordLength > 0 && id->PasswordLength <= CREDUI_MAX_PASSWORD_LENGTH) + { + memcpy( password, id->Password, id->PasswordLength * sizeof(WCHAR) ); + password[id->PasswordLength] = 0; + } + } if (!(ret = CredUIPromptForCredentialsW( cred_info, target, NULL, error, username, len_username, password, len_password, save, flags ))) { - SEC_WINNT_AUTH_IDENTITY_W *id; DWORD size = sizeof(*id); WCHAR *ptr;

1 0

Huw Davies : gdi32: Use the get_mono_dc_colors() helper.
by Alexandre Julliard 14 Jul '16

14 Jul '16

Module: wine Branch: master Commit: f5bffe0ef7afbeb2528f8025283d0fd887f4271e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5bffe0ef7afbeb2528f80252… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 13 10:02:27 2016 +0100 gdi32: Use the get_mono_dc_colors() helper. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 2 +- dlls/gdi32/dib.c | 9 +-------- dlls/gdi32/gdi_private.h | 1 + 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index d2b3de2..ed011fc 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -222,7 +222,7 @@ static DWORD blend_bits( const BITMAPINFO *src_info, const struct gdi_image_bits } /* helper to retrieve either both colors or only the background color for monochrome blits */ -static void get_mono_dc_colors( HDC hdc, BITMAPINFO *info, int count ) +void get_mono_dc_colors( HDC hdc, BITMAPINFO *info, int count ) { RGBQUAD *colors = info->bmiColors; COLORREF color = GetBkColor( hdc ); diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index ad2bf4f..c3009a2 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -581,14 +581,7 @@ INT nulldrv_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT he if (dst_info->bmiHeader.biBitCount == 1 && !dst_colors) { if (src_info->bmiHeader.biBitCount > 1) - { - COLORREF color = GetBkColor( dev->hdc ); - dst_info->bmiColors[0].rgbRed = GetRValue( color ); - dst_info->bmiColors[0].rgbGreen = GetGValue( color ); - dst_info->bmiColors[0].rgbBlue = GetBValue( color ); - dst_info->bmiColors[0].rgbReserved = 0; - dst_info->bmiHeader.biClrUsed = 1; - } + get_mono_dc_colors( dev->hdc, dst_info, 1 ); else { memcpy( dst_info->bmiColors, src_info->bmiColors, 2 * sizeof(dst_info->bmiColors[0]) ); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 79a7a74..8bdf9f1 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -205,6 +205,7 @@ extern BOOL intersect_vis_rectangles( struct bitblt_coords *dst, struct bitblt_c extern DWORD stretch_bits( const BITMAPINFO *src_info, struct bitblt_coords *src, BITMAPINFO *dst_info, struct bitblt_coords *dst, struct gdi_image_bits *bits, int mode ) DECLSPEC_HIDDEN; +extern void get_mono_dc_colors( HDC hdc, BITMAPINFO *info, int count ) DECLSPEC_HIDDEN; /* brush.c */ extern BOOL store_brush_pattern( LOGBRUSH *brush, struct brush_pattern *pattern ) DECLSPEC_HIDDEN;

1 0

Huw Davies : gdi32: Add a mask_rect primitive for use when the src is 1bpp.
by Alexandre Julliard 14 Jul '16

14 Jul '16

Module: wine Branch: master Commit: a8044bebe8257ef2487d3e5c747b4265bc5d3d76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8044bebe8257ef2487d3e5c7… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 13 10:02:28 2016 +0100 gdi32: Add a mask_rect primitive for use when the src is 1bpp. This essentially combines the format conversion with a copy_rect. It cannot be used when stretching, since stretching of 1bpp is slightly special. Similarly, it cannot be used if the dst is also 1bpp (hence there is no mask_rect_1) or if the rop involves the brush. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/bitblt.c | 51 +++++- dlls/gdi32/dibdrv/dibdrv.h | 2 + dlls/gdi32/dibdrv/primitives.c | 348 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 396 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a8044bebe8257ef2487d3…

1 0

Michael Müller : ntdll: Use sysinfo to report correct number of physical pages.
by Alexandre Julliard 14 Jul '16

14 Jul '16

Module: wine Branch: master Commit: d0832cdf428696e2c08b1aa27382baad4d1e376f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0832cdf428696e2c08b1aa27… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Jul 8 05:40:22 2016 +0200 ntdll: Use sysinfo to report correct number of physical pages. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/ntdll/virtual.c | 14 ++++++++++++++ include/config.h.in | 3 +++ 4 files changed, 19 insertions(+) diff --git a/configure b/configure index 944ff6b..ce49aed 100755 --- a/configure +++ b/configure @@ -6809,6 +6809,7 @@ for ac_header in \ sys/statvfs.h \ sys/strtio.h \ sys/syscall.h \ + sys/sysinfo.h \ sys/tihdr.h \ sys/time.h \ sys/timeout.h \ diff --git a/configure.ac b/configure.ac index 6e960a1..019d549 100644 --- a/configure.ac +++ b/configure.ac @@ -494,6 +494,7 @@ AC_CHECK_HEADERS(\ sys/statvfs.h \ sys/strtio.h \ sys/syscall.h \ + sys/sysinfo.h \ sys/tihdr.h \ sys/time.h \ sys/timeout.h \ diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 5c43d26..2e63b78 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -38,6 +38,9 @@ #ifdef HAVE_SYS_MMAN_H # include <sys/mman.h> #endif +#ifdef HAVE_SYS_SYSINFO_H +# include <sys/sysinfo.h> +#endif #ifdef HAVE_VALGRIND_VALGRIND_H # include <valgrind/valgrind.h> #endif @@ -1356,11 +1359,22 @@ void virtual_init_threading(void) */ void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ) { +#ifdef HAVE_SYS_SYSINFO_H + struct sysinfo sinfo; +#endif + info->unknown = 0; info->KeMaximumIncrement = 0; /* FIXME */ info->PageSize = page_size; info->MmLowestPhysicalPage = 1; info->MmHighestPhysicalPage = 0x7fffffff / page_size; +#ifdef HAVE_SYS_SYSINFO_H + if (!sysinfo(&sinfo)) + { + ULONG64 total = (ULONG64)sinfo.totalram * sinfo.mem_unit; + info->MmHighestPhysicalPage = max(1, total / page_size); + } +#endif info->MmNumberOfPhysicalPages = info->MmHighestPhysicalPage - info->MmLowestPhysicalPage; info->AllocationGranularity = get_mask(0) + 1; info->LowestUserAddress = (void *)0x10000; diff --git a/include/config.h.in b/include/config.h.in index a4a4bb4..64f56fd 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1119,6 +1119,9 @@ /* Define to 1 if you have the <sys/sysctl.h> header file. */ #undef HAVE_SYS_SYSCTL_H +/* Define to 1 if you have the <sys/sysinfo.h> header file. */ +#undef HAVE_SYS_SYSINFO_H + /* Define to 1 if you have the <sys/thr.h> header file. */ #undef HAVE_SYS_THR_H

1 0

Michael Stefaniuc : taskmgr: Remove some old commented out code, mostly C++.
by Alexandre Julliard 14 Jul '16

14 Jul '16

Module: wine Branch: master Commit: 4c5e3205eee1653b153494951807e51fd9e59de5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c5e3205eee1653b153494951… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 13 09:51:26 2016 +0200 taskmgr: Remove some old commented out code, mostly C++. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/taskmgr/applpage.c | 6 --- programs/taskmgr/graphctl.c | 108 -------------------------------------------- programs/taskmgr/graphctl.h | 13 ------ programs/taskmgr/perfpage.c | 24 +--------- programs/taskmgr/procpage.c | 6 --- 5 files changed, 1 insertion(+), 156 deletions(-) diff --git a/programs/taskmgr/applpage.c b/programs/taskmgr/applpage.c index c7debec..e2874b5 100644 --- a/programs/taskmgr/applpage.c +++ b/programs/taskmgr/applpage.c @@ -49,12 +49,6 @@ static HANDLE hApplicationPageEvent = NULL; /* When this event becomes signa static BOOL bSortAscending = TRUE; static const WCHAR wszUser32[] = {'U','S','E','R','3','2','.','D','L','L',0}; -#if 0 -void SwitchToThisWindow ( -HWND hWnd, /* Handle to the window that should be activated */ -BOOL bRestore /* Restore the window if it is minimized */ -); -#endif static void ApplicationPageUpdate(void) { diff --git a/programs/taskmgr/graphctl.c b/programs/taskmgr/graphctl.c index 6e83412..70051eb 100644 --- a/programs/taskmgr/graphctl.c +++ b/programs/taskmgr/graphctl.c @@ -106,21 +106,6 @@ static void GraphCtrl_Init(TGraphCtrl* this) this->m_bitmapOldPlot = NULL; } -#if 0 -TGraphCtrl::~TGraphCtrl(void) -{ - /* just to be picky restore the bitmaps for the two memory dc's */ - /* (these dc's are being destroyed so there shouldn't be any leaks) */ - if (m_bitmapOldGrid != NULL) SelectObject(m_dcGrid, m_bitmapOldGrid); - if (m_bitmapOldPlot != NULL) SelectObject(m_dcPlot, m_bitmapOldPlot); - if (m_bitmapGrid != NULL) DeleteObject(m_bitmapGrid); - if (m_bitmapPlot != NULL) DeleteObject(m_bitmapPlot); - if (m_dcGrid != NULL) DeleteDC(m_dcGrid); - if (m_dcPlot != NULL) DeleteDC(m_dcPlot); - if (m_brushBack != NULL) DeleteObject(m_brushBack); -} -#endif - static void GraphCtrl_Resize(TGraphCtrl* this) { /* NOTE: Resize automatically gets called during the setup of the control */ @@ -132,17 +117,10 @@ static void GraphCtrl_Resize(TGraphCtrl* this) /* the "left" coordinate and "width" will be modified in */ /* InvalidateCtrl to be based on the width of the y axis scaling */ -#if 0 - this->m_rectPlot.left = 20; - this->m_rectPlot.top = 10; - this->m_rectPlot.right = this->m_rectClient.right-10; - this->m_rectPlot.bottom = this->m_rectClient.bottom-25; -#else this->m_rectPlot.left = 0; this->m_rectPlot.top = -1; this->m_rectPlot.right = this->m_rectClient.right-0; this->m_rectPlot.bottom = this->m_rectClient.bottom-0; -#endif /* set some member variables to avoid multiple function calls */ this->m_nPlotHeight = this->m_rectPlot.bottom - this->m_rectPlot.top;/* m_rectPlot.Height(); */ @@ -242,61 +220,6 @@ static void GraphCtrl_InvalidateCtrl(TGraphCtrl* this) } } -#if 0 - /* create some fonts (horizontal and vertical) */ - /* use a height of 14 pixels and 300 weight */ - /* (these may need to be adjusted depending on the display) */ - axisFont = CreateFont (14, 0, 0, 0, 300, - FALSE, FALSE, 0, ANSI_CHARSET, - OUT_DEFAULT_PRECIS, - CLIP_DEFAULT_PRECIS, - DEFAULT_QUALITY, - DEFAULT_PITCH|FF_SWISS, "Arial"); - yUnitFont = CreateFont (14, 0, 900, 0, 300, - FALSE, FALSE, 0, ANSI_CHARSET, - OUT_DEFAULT_PRECIS, - CLIP_DEFAULT_PRECIS, - DEFAULT_QUALITY, - DEFAULT_PITCH|FF_SWISS, "Arial"); - - /* grab the horizontal font */ - oldFont = SelectObject(m_dcGrid, axisFont); - - /* y max */ - SetTextColor(m_dcGrid, m_crGridColor); - SetTextAlign(m_dcGrid, TA_RIGHT|TA_TOP); - sprintf(strTemp, "%.*lf", m_nYDecimals, m_dUpperLimit); - TextOut(m_dcGrid, m_rectPlot.left-4, m_rectPlot.top, strTemp, _tcslen(strTemp)); - - /* y min */ - SetTextAlign(m_dcGrid, TA_RIGHT|TA_BASELINE); - sprintf(strTemp, "%.*lf", m_nYDecimals, m_dLowerLimit); - TextOut(m_dcGrid, m_rectPlot.left-4, m_rectPlot.bottom, strTemp, _tcslen(strTemp)); - - /* x min */ - SetTextAlign(m_dcGrid, TA_LEFT|TA_TOP); - TextOut(m_dcGrid, m_rectPlot.left, m_rectPlot.bottom+4, "0", 1); - - /* x max */ - SetTextAlign(m_dcGrid, TA_RIGHT|TA_TOP); - sprintf(strTemp, "%d", m_nPlotWidth/m_nShiftPixels); - TextOut(m_dcGrid, m_rectPlot.right, m_rectPlot.bottom+4, strTemp, _tcslen(strTemp)); - - /* x units */ - SetTextAlign(m_dcGrid, TA_CENTER|TA_TOP); - TextOut(m_dcGrid, (m_rectPlot.left+m_rectPlot.right)/2, - m_rectPlot.bottom+4, m_strXUnitsString, _tcslen(m_strXUnitsString)); - - /* restore the font */ - SelectObject(m_dcGrid, oldFont); - - /* y units */ - oldFont = SelectObject(m_dcGrid, yUnitFont); - SetTextAlign(m_dcGrid, TA_CENTER|TA_BASELINE); - TextOut(m_dcGrid, (m_rectClient.left+m_rectPlot.left)/2, - (m_rectPlot.bottom+m_rectPlot.top)/2, m_strYUnitsString, _tcslen(m_strYUnitsString)); - SelectObject(m_dcGrid, oldFont); -#endif /* at this point we are done filling the grid bitmap, */ /* no more drawing to this bitmap is needed until the settings are changed */ @@ -329,22 +252,6 @@ void GraphCtrl_SetRange(TGraphCtrl* this, double dLower, double dUpper, int nDec GraphCtrl_InvalidateCtrl(this); } -#if 0 -void TGraphCtrl::SetXUnits(const char* string) -{ - lstrcpynA(m_strXUnitsString, string, sizeof(m_strXUnitsString)); - /* clear out the existing garbage, re-start with a clean plot */ - InvalidateCtrl(); -} - -void TGraphCtrl::SetYUnits(const char* string) -{ - lstrcpynA(m_strYUnitsString, string, sizeof(m_strYUnitsString)); - /* clear out the existing garbage, re-start with a clean plot */ - InvalidateCtrl(); -} -#endif - void GraphCtrl_SetGridColor(TGraphCtrl* this, COLORREF color) { this->m_crGridColor = color; @@ -479,12 +386,6 @@ static void GraphCtrl_Paint(TGraphCtrl* this, HWND hWnd, HDC dc) HBITMAP memBitmap; HBITMAP oldBitmap; /* bitmap originally found in CMemDC */ -/* RECT rcClient; */ -/* GetClientRect(hWnd, &rcClient); */ -/* FillSolidRect(dc, &rcClient, RGB(255, 0, 255)); */ -/* m_nClientWidth = rcClient.right - rcClient.left; */ -/* m_nClientHeight = rcClient.bottom - rcClient.top; */ - /* no real plotting work is performed here, */ /* just putting the existing bitmaps on the client */ @@ -509,15 +410,6 @@ static void GraphCtrl_Paint(TGraphCtrl* this, HWND hWnd, HDC dc) DeleteDC(memDC); } -#if 0 -void TGraphCtrl::Reset(void) -{ - /* to clear the existing data (in the form of a bitmap) */ - /* simply invalidate the entire control */ - InvalidateCtrl(); -} -#endif - extern TGraphCtrl PerformancePageCpuUsageHistoryGraph; extern TGraphCtrl PerformancePageMemUsageHistoryGraph; extern HWND hPerformancePageCpuUsageHistoryGraph; diff --git a/programs/taskmgr/graphctl.h b/programs/taskmgr/graphctl.h index 2adb494..f9fb967 100644 --- a/programs/taskmgr/graphctl.h +++ b/programs/taskmgr/graphctl.h @@ -30,19 +30,6 @@ extern "C" { #endif -#if 0 - -/* Attributes */ -public: - void SetXUnits(const char* string); - void SetYUnits(const char* string); - - /* Operations */ -public: - BOOL Create(DWORD dwStyle, const RECT& rect, HWND hParentWnd, UINT nID=NULL); - -#endif - typedef struct { int m_nShiftPixels; /* amount to shift with each new point */ diff --git a/programs/taskmgr/perfpage.c b/programs/taskmgr/perfpage.c index 5276de7..3969ce4 100644 --- a/programs/taskmgr/perfpage.c +++ b/programs/taskmgr/perfpage.c @@ -273,9 +273,6 @@ PerformancePageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) int nXDifference; int nYDifference; -/* HDC hdc; */ -/* PAINTSTRUCT ps; */ - switch (message) { case WM_INITDIALOG: @@ -324,11 +321,6 @@ PerformancePageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) GraphCtrl_Create(&PerformancePageCpuUsageHistoryGraph, hPerformancePageCpuUsageHistoryGraph, hDlg, IDC_CPU_USAGE_HISTORY_GRAPH); /* customize the control */ GraphCtrl_SetRange(&PerformancePageCpuUsageHistoryGraph, 0.0, 100.0, 10); -/* PerformancePageCpuUsageHistoryGraph.SetYUnits("Current") ; */ -/* PerformancePageCpuUsageHistoryGraph.SetXUnits("Samples (Windows Timer: 100 msec)") ; */ -/* PerformancePageCpuUsageHistoryGraph.SetBackgroundColor(RGB(0, 0, 64)) ; */ -/* PerformancePageCpuUsageHistoryGraph.SetGridColor(RGB(192, 192, 255)) ; */ -/* PerformancePageCpuUsageHistoryGraph.SetPlotColor(RGB(255, 255, 255)) ; */ GraphCtrl_SetBackgroundColor(&PerformancePageCpuUsageHistoryGraph, RGB(0, 0, 0)) ; GraphCtrl_SetGridColor(&PerformancePageCpuUsageHistoryGraph, RGB(152, 205, 152)) ; GraphCtrl_SetPlotColor(&PerformancePageCpuUsageHistoryGraph, 0, RGB(255, 0, 0)) ; @@ -356,21 +348,7 @@ PerformancePageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) case WM_COMMAND: break; -#if 0 - case WM_NCPAINT: - hdc = GetDC(hDlg); - GetClientRect(hDlg, &rc); - Draw3dRect(hdc, rc.left, rc.top, rc.right, rc.top + 2, GetSysColor(COLOR_3DSHADOW), GetSysColor(COLOR_3DHILIGHT)); - ReleaseDC(hDlg, hdc); - break; - - case WM_PAINT: - hdc = BeginPaint(hDlg, &ps); - GetClientRect(hDlg, &rc); - Draw3dRect(hdc, rc.left, rc.top, rc.right, rc.top + 2, GetSysColor(COLOR_3DSHADOW), GetSysColor(COLOR_3DHILIGHT)); - EndPaint(hDlg, &ps); - break; -#endif + case WM_SIZE: do { int cx, cy; diff --git a/programs/taskmgr/procpage.c b/programs/taskmgr/procpage.c index 1b0aacd..beccd86 100644 --- a/programs/taskmgr/procpage.c +++ b/programs/taskmgr/procpage.c @@ -166,12 +166,6 @@ static void ProcessPageOnNotify(LPARAM lParam) { switch (pnmh->code) { -#if 0 - case LVN_ITEMCHANGED: - ProcessPageUpdate(); - break; -#endif - case LVN_GETDISPINFOW: if (!(pnmdi->item.mask & LVIF_TEXT))

1 0

Michael Stefaniuc : taskmgr: Use SetRect() instead of open coding it.
by Alexandre Julliard 14 Jul '16

14 Jul '16

Module: wine Branch: master Commit: b11b448d7209ce8bd1b639c5c1ecefc929759110 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b11b448d7209ce8bd1b639c5c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 13 09:52:13 2016 +0200 taskmgr: Use SetRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/taskmgr/graphctl.c | 16 ++++------------ programs/taskmgr/taskmgr.c | 5 +---- programs/taskmgr/trayicon.c | 5 +---- 3 files changed, 6 insertions(+), 20 deletions(-) diff --git a/programs/taskmgr/graphctl.c b/programs/taskmgr/graphctl.c index 70051eb..214cd75 100644 --- a/programs/taskmgr/graphctl.c +++ b/programs/taskmgr/graphctl.c @@ -117,10 +117,7 @@ static void GraphCtrl_Resize(TGraphCtrl* this) /* the "left" coordinate and "width" will be modified in */ /* InvalidateCtrl to be based on the width of the y axis scaling */ - this->m_rectPlot.left = 0; - this->m_rectPlot.top = -1; - this->m_rectPlot.right = this->m_rectClient.right-0; - this->m_rectPlot.bottom = this->m_rectClient.bottom-0; + SetRect(&this->m_rectPlot, 0, -1, this->m_rectClient.right, this->m_rectClient.bottom); /* set some member variables to avoid multiple function calls */ this->m_nPlotHeight = this->m_rectPlot.bottom - this->m_rectPlot.top;/* m_rectPlot.Height(); */ @@ -340,19 +337,14 @@ static void GraphCtrl_DrawPoint(TGraphCtrl* this) if ((prevY <= this->m_rectPlot.top) || (currY <= this->m_rectPlot.top)) { RECT rc; - rc.bottom = this->m_rectPlot.top+1; - rc.left = prevX; - rc.right = currX+1; - rc.top = this->m_rectClient.top; + SetRect(&rc, prevX, this->m_rectClient.top, currX + 1, this->m_rectPlot.top + 1); FillRect(this->m_dcPlot, &rc, this->m_brushBack); } if ((prevY >= this->m_rectPlot.bottom) || (currY >= this->m_rectPlot.bottom)) { RECT rc; - rc.bottom = this->m_rectClient.bottom+1; - rc.left = prevX; - rc.right = currX+1; - rc.top = this->m_rectPlot.bottom+1; + SetRect(&rc, prevX, this->m_rectPlot.bottom + 1, currX + 1, + this->m_rectClient.bottom + 1); /* RECT rc(prevX, m_rectPlot.bottom+1, currX+1, m_rectClient.bottom+1); */ FillRect(this->m_dcPlot, &rc, this->m_brushBack); } diff --git a/programs/taskmgr/taskmgr.c b/programs/taskmgr/taskmgr.c index 80dc81c..b280f79 100644 --- a/programs/taskmgr/taskmgr.c +++ b/programs/taskmgr/taskmgr.c @@ -65,10 +65,7 @@ static void FillSolidRect2(HDC hDC, int x, int y, int cx, int cy, COLORREF clr) RECT rect; SetBkColor(hDC, clr); - rect.left = x; - rect.top = y; - rect.right = x + cx; - rect.bottom = y + cy; + SetRect(&rect, x, y, x + cx, y + cy); ExtTextOutW(hDC, 0, 0, ETO_OPAQUE, &rect, NULL, 0, NULL); } diff --git a/programs/taskmgr/trayicon.c b/programs/taskmgr/trayicon.c index 636d3bd..af98474 100644 --- a/programs/taskmgr/trayicon.c +++ b/programs/taskmgr/trayicon.c @@ -90,10 +90,7 @@ static HICON TrayIcon_GetProcessorUsageIcon(void) * just having 10. */ nLinesToDraw = (ProcessorUsage + (ProcessorUsage / 10)) / 11; - rc.left = 3; - rc.top = 12 - nLinesToDraw; - rc.right = 13; - rc.bottom = 13; + SetRect(&rc, 3, 12 - nLinesToDraw, 13, 13); /* * Now draw the cpu usage

1 0