- wine-devel - winehq.org

[PATCH 1/3] testbot: Fix the activity start and end times.
by Francois Gouget 08 Feb '18

08 Feb '18

Even if the last job completed hours ago, the period covered by the data we have in the jobs table always goes all the way up to now. Also it starts with when the oldest job on record was submitted, whether that job completed successfully or not. Similarly the data in our activity records always covers everything up until the present. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Activity.pm | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index 8c22e0144..5d8ee5f2a 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -43,11 +43,6 @@ sub _UpdateMin($$) $_[0] = $_[1] if (!defined $_[0] or $_[1] < $_[0]); } -sub _UpdateMax($$) -{ - $_[0] = $_[1] if (!defined $_[0] or $_[0] < $_[1]); -} - =pod =over 12 @@ -345,6 +340,7 @@ sub GetStatistics($) foreach my $Job (@{$Jobs->GetItems()}) { $GlobalStats->{"jobs.count"}++; + _UpdateMin($GlobalStats->{start}, $Job->Submitted); my $IsSpecialJob; my $Steps = $Job->Steps; @@ -386,9 +382,6 @@ sub GetStatistics($) my $Time = $Job->Ended - $Job->Submitted; _AddFullStat($GlobalStats, "jobs.time", $Time, undef, $Job); push @JobTimes, $Time; - - _UpdateMin($GlobalStats->{start}, $Job->Submitted); - _UpdateMax($GlobalStats->{end}, $Job->Ended); } } @@ -408,7 +401,6 @@ sub GetStatistics($) foreach my $Group (@$Activity) { _UpdateMin($VMsStats->{start}, $Group->{start}); - _UpdateMax($VMsStats->{end}, $Group->{end}); next if (!$Group->{statusvms}); my ($IsGroupBusy, %IsHostBusy); @@ -464,6 +456,9 @@ sub GetStatistics($) $GlobalStats->{"busy.elapsed"} += $Group->{end} - $Group->{start}; } } + + # The end is now! + $GlobalStats->{end} = $VMsStats->{end} = $Counters->{now}; $GlobalStats->{elapsed} = $GlobalStats->{end} - $GlobalStats->{start}; $HostsStats->{elapsed} = $VMsStats->{elapsed} = $VMsStats->{end} - $VMsStats->{start}; -- 2.15.1

1 0

[PATCH 5/5] secur32: Implement QueryContextAttributesA(SECPKG_ATTR_NEGOTIATION_INFO) in the LSA wrapper.
by Hans Leidekker 08 Feb '18

08 Feb '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/secur32/lsa.c | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 511e24a90a..b93006a24f 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -554,6 +554,32 @@ static SECURITY_STATUS WINAPI lsa_QueryContextAttributesW(CtxtHandle *context, U return lsa_package->lsa_api->SpQueryContextAttributes(lsa_context, attribute, buffer); } +static SecPkgInfoA *package_infoWtoA( const SecPkgInfoW *info ) +{ + SecPkgInfoA *ret; + int size_name = WideCharToMultiByte( CP_ACP, 0, info->Name, -1, NULL, 0, NULL, NULL ); + int size_comment = WideCharToMultiByte( CP_ACP, 0, info->Comment, -1, NULL, 0, NULL, NULL ); + + 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); + WideCharToMultiByte( CP_ACP, 0, info->Name, -1, ret->Name, size_name, NULL, NULL ); + ret->Comment = ret->Name + size_name; + WideCharToMultiByte( CP_ACP, 0, info->Comment, -1, ret->Comment, size_comment, NULL, NULL ); + return ret; +} + +static SECURITY_STATUS nego_info_WtoA( const SecPkgContext_NegotiationInfoW *infoW, + SecPkgContext_NegotiationInfoA *infoA ) +{ + infoA->NegotiationState = infoW->NegotiationState; + if (!(infoA->PackageInfo = package_infoWtoA( infoW->PackageInfo ))) return SEC_E_INSUFFICIENT_MEMORY; + return SEC_E_OK; +} + static SECURITY_STATUS WINAPI lsa_QueryContextAttributesA(CtxtHandle *context, ULONG attribute, void *buffer) { TRACE("%p %d %p\n", context, attribute, buffer); @@ -565,6 +591,18 @@ static SECURITY_STATUS WINAPI lsa_QueryContextAttributesA(CtxtHandle *context, U case SECPKG_ATTR_SIZES: return lsa_QueryContextAttributesW( context, attribute, buffer ); + case SECPKG_ATTR_NEGOTIATION_INFO: + { + SecPkgContext_NegotiationInfoW infoW; + SecPkgContext_NegotiationInfoA *infoA = (SecPkgContext_NegotiationInfoA *)buffer; + SECURITY_STATUS status = lsa_QueryContextAttributesW( context, SECPKG_ATTR_NEGOTIATION_INFO, &infoW ); + + if (status != SEC_E_OK) return status; + status = nego_info_WtoA( &infoW, infoA ); + FreeContextBuffer( infoW.PackageInfo ); + return status; + } + #define X(x) case (x) : FIXME(#x" stub\n"); break X(SECPKG_ATTR_ACCESS_TOKEN); X(SECPKG_ATTR_AUTHORITY); @@ -578,7 +616,6 @@ static SECURITY_STATUS WINAPI lsa_QueryContextAttributesA(CtxtHandle *context, U X(SECPKG_ATTR_SESSION_KEY); X(SECPKG_ATTR_STREAM_SIZES); X(SECPKG_ATTR_TARGET_INFORMATION); - X(SECPKG_ATTR_NEGOTIATION_INFO); #undef X default: FIXME( "unknown attribute %u\n", attribute ); -- 2.11.0

1 0

[PATCH 3/5] kerberos: Simplify kerberos_SpInitLsaModeContext.
by Hans Leidekker 08 Feb '18

08 Feb '18

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 08 Feb '18

08 Feb '18

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 08 Feb '18

08 Feb '18

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 08 Feb '18

08 Feb '18

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 08 Feb '18

08 Feb '18

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 08 Feb '18

08 Feb '18

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 08 Feb '18

08 Feb '18

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 08 Feb '18

08 Feb '18

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 08 Feb '18

08 Feb '18

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 08 Feb '18

08 Feb '18

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

[PATCH 5/5] d3d8: Use the global memory allocation helpers.
by Henri Verbeet 07 Feb '18

07 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/buffer.c | 4 +-- dlls/d3d8/d3d8_main.c | 4 +-- dlls/d3d8/d3d8_private.h | 1 + dlls/d3d8/device.c | 82 +++++++++++++++++++------------------------ dlls/d3d8/directx.c | 7 ++-- dlls/d3d8/shader.c | 9 +++-- dlls/d3d8/surface.c | 2 +- dlls/d3d8/swapchain.c | 6 ++-- dlls/d3d8/texture.c | 2 +- dlls/d3d8/vertexdeclaration.c | 15 ++++---- dlls/d3d8/volume.c | 2 +- 11 files changed, 61 insertions(+), 73 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 14a2fb6..b30762b 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -262,7 +262,7 @@ static void STDMETHODCALLTYPE d3d8_vertexbuffer_wined3d_object_destroyed(void *p { struct d3d8_vertexbuffer *buffer = parent; d3d8_resource_cleanup(&buffer->resource); - HeapFree(GetProcessHeap(), 0, buffer); + heap_free(buffer); } static const struct wined3d_parent_ops d3d8_vertexbuffer_wined3d_parent_ops = @@ -558,7 +558,7 @@ static void STDMETHODCALLTYPE d3d8_indexbuffer_wined3d_object_destroyed(void *pa { struct d3d8_indexbuffer *buffer = parent; d3d8_resource_cleanup(&buffer->resource); - HeapFree(GetProcessHeap(), 0, buffer); + heap_free(buffer); } static const struct wined3d_parent_ops d3d8_indexbuffer_wined3d_parent_ops = diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index 8ac704c..92c5032 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -41,13 +41,13 @@ IDirect3D8 * WINAPI DECLSPEC_HOTPATCH Direct3DCreate8(UINT sdk_version) TRACE("sdk_version %#x.\n", sdk_version); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return NULL; if (!d3d8_init(object)) { WARN("Failed to initialize d3d8.\n"); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return NULL; } diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 0e764b1..129cffb 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -33,6 +33,7 @@ #include "winbase.h" #include "wingdi.h" #include "wine/debug.h" +#include "wine/heap.h" #include "d3d8.h" #include "wine/wined3d.h" diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 3ce0460..160d296 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -324,9 +324,9 @@ static DWORD d3d8_allocate_handle(struct d3d8_handle_table *t, void *object, enu { /* Grow the table */ UINT new_size = t->table_size + (t->table_size >> 1); - struct d3d8_handle_entry *new_entries = HeapReAlloc(GetProcessHeap(), - 0, t->entries, new_size * sizeof(*t->entries)); - if (!new_entries) + struct d3d8_handle_entry *new_entries; + + if (!(new_entries = heap_realloc(t->entries, new_size * sizeof(*t->entries)))) { ERR("Failed to grow the handle table.\n"); return D3D8_INVALID_HANDLE; @@ -444,7 +444,7 @@ static ULONG WINAPI d3d8_device_Release(IDirect3DDevice8 *iface) { d3d8_vertex_declaration_destroy(device->decls[i].declaration); } - HeapFree(GetProcessHeap(), 0, device->decls); + heap_free(device->decls); if (device->vertex_buffer) wined3d_buffer_decref(device->vertex_buffer); @@ -454,8 +454,8 @@ static ULONG WINAPI d3d8_device_Release(IDirect3DDevice8 *iface) wined3d_device_uninit_3d(device->wined3d_device); wined3d_device_release_focus_window(device->wined3d_device); wined3d_device_decref(device->wined3d_device); - HeapFree(GetProcessHeap(), 0, device->handle_table.entries); - HeapFree(GetProcessHeap(), 0, device); + heap_free(device->handle_table.entries); + heap_free(device); wined3d_mutex_unlock(); @@ -863,15 +863,14 @@ static HRESULT WINAPI d3d8_device_CreateTexture(IDirect3DDevice8 *iface, return D3DERR_INVALIDCALL; *texture = NULL; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = heap_alloc_zero(sizeof(*object)))) return D3DERR_OUTOFVIDEOMEMORY; hr = texture_init(object, device, width, height, levels, usage, format, pool); if (FAILED(hr)) { WARN("Failed to initialize texture, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -896,15 +895,14 @@ static HRESULT WINAPI d3d8_device_CreateVolumeTexture(IDirect3DDevice8 *iface, return D3DERR_INVALIDCALL; *texture = NULL; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = heap_alloc_zero(sizeof(*object)))) return D3DERR_OUTOFVIDEOMEMORY; hr = volumetexture_init(object, device, width, height, depth, levels, usage, format, pool); if (FAILED(hr)) { WARN("Failed to initialize volume texture, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -928,15 +926,14 @@ static HRESULT WINAPI d3d8_device_CreateCubeTexture(IDirect3DDevice8 *iface, UIN return D3DERR_INVALIDCALL; *texture = NULL; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = heap_alloc_zero(sizeof(*object)))) return D3DERR_OUTOFVIDEOMEMORY; hr = cubetexture_init(object, device, edge_length, levels, usage, format, pool); if (FAILED(hr)) { WARN("Failed to initialize cube texture, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -956,15 +953,14 @@ static HRESULT WINAPI d3d8_device_CreateVertexBuffer(IDirect3DDevice8 *iface, UI TRACE("iface %p, size %u, usage %#x, fvf %#x, pool %#x, buffer %p.\n", iface, size, usage, fvf, pool, buffer); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = heap_alloc_zero(sizeof(*object)))) return D3DERR_OUTOFVIDEOMEMORY; hr = vertexbuffer_init(object, device, size, usage, fvf, pool); if (FAILED(hr)) { WARN("Failed to initialize vertex buffer, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -984,15 +980,14 @@ static HRESULT WINAPI d3d8_device_CreateIndexBuffer(IDirect3DDevice8 *iface, UIN TRACE("iface %p, size %u, usage %#x, format %#x, pool %#x, buffer %p.\n", iface, size, usage, format, pool, buffer); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = heap_alloc_zero(sizeof(*object)))) return D3DERR_OUTOFVIDEOMEMORY; hr = indexbuffer_init(object, device, size, usage, format, pool); if (FAILED(hr)) { WARN("Failed to initialize index buffer, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -2355,8 +2350,7 @@ static HRESULT WINAPI d3d8_device_CreateVertexShader(IDirect3DDevice8 *iface, TRACE("iface %p, declaration %p, byte_code %p, shader %p, usage %#x.\n", iface, declaration, byte_code, shader, usage); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = heap_alloc_zero(sizeof(*object)))) { *shader = 0; return E_OUTOFMEMORY; @@ -2368,7 +2362,7 @@ static HRESULT WINAPI d3d8_device_CreateVertexShader(IDirect3DDevice8 *iface, if (handle == D3D8_INVALID_HANDLE) { ERR("Failed to allocate vertex shader handle.\n"); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); *shader = 0; return E_OUTOFMEMORY; } @@ -2382,7 +2376,7 @@ static HRESULT WINAPI d3d8_device_CreateVertexShader(IDirect3DDevice8 *iface, wined3d_mutex_lock(); d3d8_free_handle(&device->handle_table, handle, D3D8_HANDLE_VS); wined3d_mutex_unlock(); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); *shader = 0; return hr; } @@ -2422,13 +2416,13 @@ static struct d3d8_vertex_declaration *d3d8_device_get_fvf_declaration(struct d3 } TRACE("not found. Creating and inserting at position %d.\n", low); - if (!(d3d8_declaration = HeapAlloc(GetProcessHeap(), 0, sizeof(*d3d8_declaration)))) + if (!(d3d8_declaration = heap_alloc(sizeof(*d3d8_declaration)))) return NULL; if (FAILED(hr = d3d8_vertex_declaration_init_fvf(d3d8_declaration, device, fvf))) { WARN("Failed to initialize vertex declaration, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, d3d8_declaration); + heap_free(d3d8_declaration); return NULL; } @@ -2436,9 +2430,8 @@ static struct d3d8_vertex_declaration *d3d8_device_get_fvf_declaration(struct d3 { UINT grow = device->declArraySize / 2; - convertedDecls = HeapReAlloc(GetProcessHeap(), 0, convertedDecls, - sizeof(*convertedDecls) * (device->numConvertedDecls + grow)); - if (!convertedDecls) + if (!(convertedDecls = heap_realloc(convertedDecls, + sizeof(*convertedDecls) * (device->numConvertedDecls + grow)))) { d3d8_vertex_declaration_destroy(d3d8_declaration); return NULL; @@ -2733,8 +2726,7 @@ static HRESULT WINAPI d3d8_device_CreatePixelShader(IDirect3DDevice8 *iface, if (!shader) return D3DERR_INVALIDCALL; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; wined3d_mutex_lock(); @@ -2743,7 +2735,7 @@ static HRESULT WINAPI d3d8_device_CreatePixelShader(IDirect3DDevice8 *iface, if (handle == D3D8_INVALID_HANDLE) { ERR("Failed to allocate pixel shader handle.\n"); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return E_OUTOFMEMORY; } @@ -2756,7 +2748,7 @@ static HRESULT WINAPI d3d8_device_CreatePixelShader(IDirect3DDevice8 *iface, wined3d_mutex_lock(); d3d8_free_handle(&device->handle_table, handle, D3D8_HANDLE_PS); wined3d_mutex_unlock(); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); *shader = 0; return hr; } @@ -3119,7 +3111,7 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent TRACE("device_parent %p, wined3d_texture %p, sub_resource_idx %u, parent %p, parent_ops %p.\n", device_parent, wined3d_texture, sub_resource_idx, parent, parent_ops); - if (!(d3d_surface = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d3d_surface)))) + if (!(d3d_surface = heap_alloc_zero(sizeof(*d3d_surface)))) return E_OUTOFMEMORY; surface_init(d3d_surface, wined3d_texture, sub_resource_idx, parent_ops); @@ -3138,7 +3130,7 @@ static HRESULT CDECL device_parent_volume_created(struct wined3d_device_parent * TRACE("device_parent %p, texture %p, sub_resource_idx %u, parent %p, parent_ops %p.\n", device_parent, wined3d_texture, sub_resource_idx, parent, parent_ops); - if (!(d3d_volume = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d3d_volume)))) + if (!(d3d_volume = heap_alloc_zero(sizeof(*d3d_volume)))) return E_OUTOFMEMORY; volume_init(d3d_volume, wined3d_texture, sub_resource_idx, parent_ops); @@ -3234,9 +3226,8 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine device->IDirect3DDevice8_iface.lpVtbl = &d3d8_device_vtbl; device->device_parent.ops = &d3d8_wined3d_device_parent_ops; device->ref = 1; - device->handle_table.entries = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - D3D8_INITIAL_HANDLE_TABLE_SIZE * sizeof(*device->handle_table.entries)); - if (!device->handle_table.entries) + if (!(device->handle_table.entries = heap_alloc_zero(D3D8_INITIAL_HANDLE_TABLE_SIZE + * sizeof(*device->handle_table.entries)))) { ERR("Failed to allocate handle table memory.\n"); return E_OUTOFMEMORY; @@ -3252,7 +3243,7 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine { WARN("Failed to create wined3d device, hr %#x.\n", hr); wined3d_mutex_unlock(); - HeapFree(GetProcessHeap(), 0, device->handle_table.entries); + heap_free(device->handle_table.entries); return hr; } @@ -3267,7 +3258,7 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine ERR("Failed to acquire focus window, hr %#x.\n", hr); wined3d_device_decref(device->wined3d_device); wined3d_mutex_unlock(); - HeapFree(GetProcessHeap(), 0, device->handle_table.entries); + heap_free(device->handle_table.entries); return hr; } @@ -3286,7 +3277,7 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine wined3d_device_release_focus_window(device->wined3d_device); wined3d_device_decref(device->wined3d_device); wined3d_mutex_unlock(); - HeapFree(GetProcessHeap(), 0, device->handle_table.entries); + heap_free(device->handle_table.entries); return D3DERR_INVALIDCALL; } @@ -3296,7 +3287,7 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine wined3d_device_release_focus_window(device->wined3d_device); wined3d_device_decref(device->wined3d_device); wined3d_mutex_unlock(); - HeapFree(GetProcessHeap(), 0, device->handle_table.entries); + heap_free(device->handle_table.entries); return hr; } @@ -3308,8 +3299,7 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine present_parameters_from_wined3d_swapchain_desc(parameters, &swapchain_desc); device->declArraySize = 16; - device->decls = HeapAlloc(GetProcessHeap(), 0, device->declArraySize * sizeof(*device->decls)); - if (!device->decls) + if (!(device->decls = heap_alloc(device->declArraySize * sizeof(*device->decls)))) { ERR("Failed to allocate FVF vertex declaration map memory.\n"); hr = E_OUTOFMEMORY; @@ -3330,6 +3320,6 @@ err: wined3d_device_release_focus_window(device->wined3d_device); wined3d_device_decref(device->wined3d_device); wined3d_mutex_unlock(); - HeapFree(GetProcessHeap(), 0, device->handle_table.entries); + heap_free(device->handle_table.entries); return hr; } diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 24bd831..68300c0 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -81,7 +81,7 @@ static ULONG WINAPI d3d8_Release(IDirect3D8 *iface) wined3d_decref(d3d8->wined3d); wined3d_mutex_unlock(); - HeapFree(GetProcessHeap(), 0, d3d8); + heap_free(d3d8); } return refcount; @@ -373,15 +373,14 @@ static HRESULT WINAPI d3d8_CreateDevice(IDirect3D8 *iface, UINT adapter, TRACE("iface %p, adapter %u, device_type %#x, focus_window %p, flags %#x, parameters %p, device %p.\n", iface, adapter, device_type, focus_window, flags, parameters, device); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; hr = device_init(object, d3d8, d3d8->wined3d, adapter, device_type, focus_window, flags, parameters); if (FAILED(hr)) { WARN("Failed to initialize device, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } diff --git a/dlls/d3d8/shader.c b/dlls/d3d8/shader.c index 093cb5a..8192b23 100644 --- a/dlls/d3d8/shader.c +++ b/dlls/d3d8/shader.c @@ -26,7 +26,7 @@ static void STDMETHODCALLTYPE d3d8_vertexshader_wined3d_object_destroyed(void *p { struct d3d8_vertex_shader *shader = parent; d3d8_vertex_declaration_destroy(shader->vertex_declaration); - HeapFree(GetProcessHeap(), 0, shader); + heap_free(shader); } void d3d8_vertex_shader_destroy(struct d3d8_vertex_shader *shader) @@ -59,15 +59,14 @@ static HRESULT d3d8_vertexshader_create_vertexdeclaration(struct d3d8_device *de TRACE("device %p, declaration %p, shader_handle %#x, decl_ptr %p.\n", device, declaration, shader_handle, decl_ptr); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; hr = d3d8_vertex_declaration_init(object, device, declaration, shader_handle); if (FAILED(hr)) { WARN("Failed to initialize vertex declaration, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -143,7 +142,7 @@ HRESULT d3d8_vertex_shader_init(struct d3d8_vertex_shader *shader, struct d3d8_d static void STDMETHODCALLTYPE d3d8_pixelshader_wined3d_object_destroyed(void *parent) { - HeapFree(GetProcessHeap(), 0, parent); + heap_free(parent); } void d3d8_pixel_shader_destroy(struct d3d8_pixel_shader *shader) diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 3ece82a..6ad43a4 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -306,7 +306,7 @@ static void STDMETHODCALLTYPE surface_wined3d_object_destroyed(void *parent) { struct d3d8_surface *surface = parent; d3d8_resource_cleanup(&surface->resource); - HeapFree(GetProcessHeap(), 0, surface); + heap_free(surface); } static const struct wined3d_parent_ops d3d8_surface_wined3d_parent_ops = diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index 6fd30e5..7003aa3 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -158,7 +158,7 @@ static const IDirect3DSwapChain8Vtbl d3d8_swapchain_vtbl = static void STDMETHODCALLTYPE d3d8_swapchain_wined3d_object_released(void *parent) { - HeapFree(GetProcessHeap(), 0, parent); + heap_free(parent); } static const struct wined3d_parent_ops d3d8_swapchain_wined3d_parent_ops = @@ -197,13 +197,13 @@ HRESULT d3d8_swapchain_create(struct d3d8_device *device, struct wined3d_swapcha struct d3d8_swapchain *object; HRESULT hr; - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; if (FAILED(hr = swapchain_init(object, device, desc))) { WARN("Failed to initialize swapchain, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index c51a471..5ad6cf8 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -1083,7 +1083,7 @@ static void STDMETHODCALLTYPE d3d8_texture_wined3d_object_destroyed(void *parent { struct d3d8_texture *texture = parent; d3d8_resource_cleanup(&texture->resource); - HeapFree(GetProcessHeap(), 0, texture); + heap_free(texture); } static const struct wined3d_parent_ops d3d8_texture_wined3d_parent_ops = diff --git a/dlls/d3d8/vertexdeclaration.c b/dlls/d3d8/vertexdeclaration.c index 9206a2c..0cae3cd 100644 --- a/dlls/d3d8/vertexdeclaration.c +++ b/dlls/d3d8/vertexdeclaration.c @@ -266,7 +266,7 @@ static UINT convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3 TRACE("d3d8_elements %p, d3d8_elements_size %p, wined3d_elements %p\n", d3d8_elements, d3d8_elements_size, wined3d_elements); /* 128 should be enough for anyone... */ - *wined3d_elements = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 128 * sizeof(**wined3d_elements)); + *wined3d_elements = heap_alloc_zero(128 * sizeof(**wined3d_elements)); while (D3DVSD_END() != *token) { token_type = ((*token & D3DVSD_TOKENTYPEMASK) >> D3DVSD_TOKENTYPESHIFT); @@ -314,8 +314,8 @@ static UINT convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3 static void STDMETHODCALLTYPE d3d8_vertexdeclaration_wined3d_object_destroyed(void *parent) { struct d3d8_vertex_declaration *declaration = parent; - HeapFree(GetProcessHeap(), 0, declaration->elements); - HeapFree(GetProcessHeap(), 0, declaration); + heap_free(declaration->elements); + heap_free(declaration); } void d3d8_vertex_declaration_destroy(struct d3d8_vertex_declaration *declaration) @@ -342,11 +342,10 @@ HRESULT d3d8_vertex_declaration_init(struct d3d8_vertex_declaration *declaration declaration->shader_handle = shader_handle; wined3d_element_count = convert_to_wined3d_declaration(elements, &declaration->elements_size, &wined3d_elements); - declaration->elements = HeapAlloc(GetProcessHeap(), 0, declaration->elements_size); - if (!declaration->elements) + if (!(declaration->elements = heap_alloc(declaration->elements_size))) { ERR("Failed to allocate vertex declaration elements memory.\n"); - HeapFree(GetProcessHeap(), 0, wined3d_elements); + heap_free(wined3d_elements); return E_OUTOFMEMORY; } @@ -356,11 +355,11 @@ HRESULT d3d8_vertex_declaration_init(struct d3d8_vertex_declaration *declaration hr = wined3d_vertex_declaration_create(device->wined3d_device, wined3d_elements, wined3d_element_count, declaration, &d3d8_vertexdeclaration_wined3d_parent_ops, &declaration->wined3d_vertex_declaration); wined3d_mutex_unlock(); - HeapFree(GetProcessHeap(), 0, wined3d_elements); + heap_free(wined3d_elements); if (FAILED(hr)) { WARN("Failed to create wined3d vertex declaration, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, declaration->elements); + heap_free(declaration->elements); return hr; } diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index bcc6a93..2e14a59 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -195,7 +195,7 @@ static void STDMETHODCALLTYPE volume_wined3d_object_destroyed(void *parent) { struct d3d8_volume *volume = parent; d3d8_resource_cleanup(&volume->resource); - HeapFree(GetProcessHeap(), 0, volume); + heap_free(volume); } static const struct wined3d_parent_ops d3d8_volume_wined3d_parent_ops = -- 2.1.4

1 0

[PATCH 4/5] d3d9: Use wined3d_buffer_create() in vertexbuffer_init().
by Henri Verbeet 07 Feb '18

07 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/buffer.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 795164c..30e86f8 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -274,25 +274,29 @@ static const struct wined3d_parent_ops d3d9_vertexbuffer_wined3d_parent_ops = HRESULT vertexbuffer_init(struct d3d9_vertexbuffer *buffer, struct d3d9_device *device, UINT size, UINT usage, DWORD fvf, D3DPOOL pool) { - enum wined3d_pool wined3d_pool; - DWORD wined3d_usage; + struct wined3d_buffer_desc desc; HRESULT hr; - wined3d_pool = pool; - wined3d_usage = usage & WINED3DUSAGE_MASK; if (pool == D3DPOOL_SCRATCH) { - wined3d_pool = WINED3D_POOL_SYSTEM_MEM; - wined3d_usage |= WINED3DUSAGE_SCRATCH; + WARN("Vertex buffer with D3DPOOL_SCRATCH requested.\n"); + return D3DERR_INVALIDCALL; } buffer->IDirect3DVertexBuffer9_iface.lpVtbl = &d3d9_vertexbuffer_vtbl; buffer->fvf = fvf; d3d9_resource_init(&buffer->resource); + desc.byte_width = size; + desc.usage = usage & WINED3DUSAGE_MASK; + desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; + desc.access = wined3daccess_from_d3dpool(pool); + desc.misc_flags = 0; + desc.structure_byte_stride = 0; + wined3d_mutex_lock(); - hr = wined3d_buffer_create_vb(device->wined3d_device, size, wined3d_usage, wined3d_pool, - buffer, &d3d9_vertexbuffer_wined3d_parent_ops, &buffer->wined3d_buffer); + hr = wined3d_buffer_create(device->wined3d_device, &desc, NULL, buffer, + &d3d9_vertexbuffer_wined3d_parent_ops, &buffer->wined3d_buffer); wined3d_mutex_unlock(); if (FAILED(hr)) { -- 2.1.4

1 0

[PATCH 3/5] d3d8: Use wined3d_buffer_create() in d3d8_device_prepare_vertex_buffer().
by Henri Verbeet 07 Feb '18

07 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/device.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 590ab45..3ce0460 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2108,15 +2108,22 @@ static HRESULT d3d8_device_prepare_vertex_buffer(struct d3d8_device *device, UIN if (device->vertex_buffer_size < min_size || !device->vertex_buffer) { UINT size = max(device->vertex_buffer_size * 2, min_size); + struct wined3d_buffer_desc desc; struct wined3d_buffer *buffer; TRACE("Growing vertex buffer to %u bytes\n", size); - hr = wined3d_buffer_create_vb(device->wined3d_device, size, WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY, - WINED3D_POOL_DEFAULT, NULL, &d3d8_null_wined3d_parent_ops, &buffer); - if (FAILED(hr)) + desc.byte_width = size; + desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY; + desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; + desc.access = WINED3D_RESOURCE_ACCESS_GPU; + desc.misc_flags = 0; + desc.structure_byte_stride = 0; + + if (FAILED(hr = wined3d_buffer_create(device->wined3d_device, &desc, + NULL, NULL, &d3d8_null_wined3d_parent_ops, &buffer))) { - ERR("(%p) wined3d_buffer_create_vb failed with hr = %08x\n", device, hr); + ERR("Failed to create vertex buffer, hr %#x.\n", hr); return hr; } -- 2.1.4

1 0

[PATCH 2/5] d3d8: Use wined3d_buffer_create() in vertexbuffer_init().
by Henri Verbeet 07 Feb '18

07 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/buffer.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 10ba302..14a2fb6 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -273,25 +273,29 @@ static const struct wined3d_parent_ops d3d8_vertexbuffer_wined3d_parent_ops = HRESULT vertexbuffer_init(struct d3d8_vertexbuffer *buffer, struct d3d8_device *device, UINT size, DWORD usage, DWORD fvf, D3DPOOL pool) { - enum wined3d_pool wined3d_pool; - DWORD wined3d_usage; + struct wined3d_buffer_desc desc; HRESULT hr; - wined3d_pool = pool; - wined3d_usage = usage & WINED3DUSAGE_MASK; if (pool == D3DPOOL_SCRATCH) { - wined3d_pool = WINED3D_POOL_SYSTEM_MEM; - wined3d_usage |= WINED3DUSAGE_SCRATCH; + WARN("Vertex buffer with D3DPOOL_SCRATCH requested.\n"); + return D3DERR_INVALIDCALL; } buffer->IDirect3DVertexBuffer8_iface.lpVtbl = &Direct3DVertexBuffer8_Vtbl; d3d8_resource_init(&buffer->resource); buffer->fvf = fvf; + desc.byte_width = size; + desc.usage = usage & WINED3DUSAGE_MASK; + desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; + desc.access = wined3daccess_from_d3dpool(pool); + desc.misc_flags = 0; + desc.structure_byte_stride = 0; + wined3d_mutex_lock(); - hr = wined3d_buffer_create_vb(device->wined3d_device, size, wined3d_usage, wined3d_pool, - buffer, &d3d8_vertexbuffer_wined3d_parent_ops, &buffer->wined3d_buffer); + hr = wined3d_buffer_create(device->wined3d_device, &desc, NULL, buffer, + &d3d8_vertexbuffer_wined3d_parent_ops, &buffer->wined3d_buffer); wined3d_mutex_unlock(); if (FAILED(hr)) { -- 2.1.4

1 0

[PATCH 1/5] ddraw: Use wined3d_buffer_create() in d3d_vertex_buffer_create_wined3d_buffer().
by Henri Verbeet 07 Feb '18

07 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/vertexbuffer.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index 6a9544b..df8531d 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -115,22 +115,24 @@ static ULONG WINAPI d3d_vertex_buffer7_Release(IDirect3DVertexBuffer7 *iface) static HRESULT d3d_vertex_buffer_create_wined3d_buffer(struct d3d_vertex_buffer *buffer, BOOL dynamic, struct wined3d_buffer **wined3d_buffer) { - DWORD usage = WINED3DUSAGE_STATICDECL; - enum wined3d_pool pool; - - if (buffer->Caps & D3DVBCAPS_SYSTEMMEMORY) - pool = WINED3D_POOL_SYSTEM_MEM; - else - pool = WINED3D_POOL_DEFAULT; + struct wined3d_buffer_desc desc; + desc.byte_width = buffer->size; + desc.usage = WINED3DUSAGE_STATICDECL; if (buffer->Caps & D3DVBCAPS_WRITEONLY) - usage |= WINED3DUSAGE_WRITEONLY; + desc.usage |= WINED3DUSAGE_WRITEONLY; if (dynamic) - usage |= WINED3DUSAGE_DYNAMIC; + desc.usage |= WINED3DUSAGE_DYNAMIC; + desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; + if (buffer->Caps & D3DVBCAPS_SYSTEMMEMORY) + desc.access = WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP; + else + desc.access = WINED3D_RESOURCE_ACCESS_GPU; + desc.misc_flags = 0; + desc.structure_byte_stride = 0; - return wined3d_buffer_create_vb(buffer->ddraw->wined3d_device, - buffer->size, usage, pool, buffer, &ddraw_null_wined3d_parent_ops, - wined3d_buffer); + return wined3d_buffer_create(buffer->ddraw->wined3d_device, &desc, + NULL, buffer, &ddraw_null_wined3d_parent_ops, wined3d_buffer); } /***************************************************************************** -- 2.1.4

1 0

[PATCH] reg: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 07 Feb '18

07 Feb '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/reg/export.c | 1 + programs/reg/import.c | 1 + programs/reg/reg.c | 15 +++------------ programs/reg/reg.h | 1 - 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/programs/reg/export.c b/programs/reg/export.c index 39001c81a8..622e7ca8d9 100644 --- a/programs/reg/export.c +++ b/programs/reg/export.c @@ -20,6 +20,7 @@ #include <stdlib.h> #include <wine/unicode.h> +#include <wine/heap.h> #include "reg.h" diff --git a/programs/reg/import.c b/programs/reg/import.c index 8350fa7e69..f2ce80e7cb 100644 --- a/programs/reg/import.c +++ b/programs/reg/import.c @@ -23,6 +23,7 @@ #include <wine/unicode.h> #include <wine/debug.h> +#include <wine/heap.h> #include "reg.h" diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 8d510f7f7e..455d3dd96a 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -21,6 +21,7 @@ #include <stdlib.h> #include <wine/unicode.h> #include <wine/debug.h> +#include <wine/heap.h> #include "reg.h" WINE_DEFAULT_DEBUG_CHANNEL(reg); @@ -81,7 +82,7 @@ static const WCHAR newlineW[] = {'\n',0}; void *heap_xalloc(size_t size) { - void *buf = HeapAlloc(GetProcessHeap(), 0, size); + void *buf = heap_alloc(size); if (!buf) { ERR("Out of memory!\n"); @@ -92,12 +93,7 @@ void *heap_xalloc(size_t size) void *heap_xrealloc(void *buf, size_t size) { - void *new_buf; - - if (buf) - new_buf = HeapReAlloc(GetProcessHeap(), 0, buf, size); - else - new_buf = HeapAlloc(GetProcessHeap(), 0, size); + void *new_buf = heap_realloc(buf, size); if (!new_buf) { @@ -108,11 +104,6 @@ void *heap_xrealloc(void *buf, size_t size) return new_buf; } -BOOL heap_free(void *buf) -{ - return HeapFree(GetProcessHeap(), 0, buf); -} - void output_writeconsole(const WCHAR *str, DWORD wlen) { DWORD count, ret; diff --git a/programs/reg/reg.h b/programs/reg/reg.h index eb792bbf88..dbce738ecd 100644 --- a/programs/reg/reg.h +++ b/programs/reg/reg.h @@ -27,7 +27,6 @@ /* reg.c */ void *heap_xalloc(size_t size); void *heap_xrealloc(void *buf, size_t size); -BOOL heap_free(void *buf); void output_writeconsole(const WCHAR *str, DWORD wlen); void WINAPIV output_message(unsigned int id, ...); BOOL ask_confirm(unsigned int msgid, WCHAR *reg_info); -- 2.14.3

1 0

[PATCH] kernel32: Added support for MOVEFILE_WRITE_THROUGH in MoveFileWithProgress
by Oded Elisha 07 Feb '18

07 Feb '18

Added support for MOVEFILE_WRITE_THROUGH using linux sync syscall. Tested on Arch Linux. Signed-off-by: Oded Elisha <oded123456(a)gmail.com> --- dlls/kernel32/path.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index a389743..81610a2 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1268,6 +1268,9 @@ BOOL WINAPI CopyFileExA(LPCSTR sourceFilename, LPCSTR destFilename, return ret; } +extern int CDECL wine_server_handle_to_fd( HANDLE handle, unsigned int access, int *unix_fd, + unsigned int *options ); + /************************************************************************** * MoveFileWithProgressW (KERNEL32.@) @@ -1283,6 +1286,7 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, NTSTATUS status; HANDLE source_handle = 0, dest_handle; ANSI_STRING source_unix, dest_unix; + BOOL should_sync = FALSE; TRACE("(%s,%s,%p,%p,%04x)\n", debugstr_w(source), debugstr_w(dest), fnProgress, param, flag ); @@ -1293,8 +1297,9 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, if (!dest) return DeleteFileW( source ); - if (flag & MOVEFILE_WRITE_THROUGH) - FIXME("MOVEFILE_WRITE_THROUGH unimplemented\n"); + if ((flag & MOVEFILE_WRITE_THROUGH) && !(flag & MOVEFILE_DELAY_UNTIL_REBOOT)) { + should_sync = TRUE; + } /* check if we are allowed to rename the source */ @@ -1404,6 +1409,10 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, } } + if (should_sync) { + sync(); + } + NtClose( source_handle ); RtlFreeAnsiString( &source_unix ); RtlFreeAnsiString( &dest_unix ); -- 2.16.1

4 7

[PATCH v3 1/9] wined3d: Add WINED3D_RTYPE_TEXTURE_1D.
by Sven Hesse 07 Feb '18

07 Feb '18

Signed-off-by: Sven Hesse <shesse(a)codeweavers.com> --- dlls/wined3d/context.c | 1 + dlls/wined3d/device.c | 4 +++- dlls/wined3d/directx.c | 14 ++++++++++++++ dlls/wined3d/resource.c | 1 + dlls/wined3d/utils.c | 1 + include/wine/wined3d.h | 5 +++-- 6 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index ccfe630e1f..f8419f063c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1017,6 +1017,7 @@ void context_resource_released(const struct wined3d_device *device, switch (type) { + case WINED3D_RTYPE_TEXTURE_1D: case WINED3D_RTYPE_TEXTURE_2D: case WINED3D_RTYPE_TEXTURE_3D: texture = texture_from_resource(resource); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2d1603f0b0..096f4010fb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4239,7 +4239,8 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str height = 1; depth = 1; } - else if (resource->type == WINED3D_RTYPE_TEXTURE_2D || resource->type == WINED3D_RTYPE_TEXTURE_3D) + else if (resource->type == WINED3D_RTYPE_TEXTURE_1D || resource->type == WINED3D_RTYPE_TEXTURE_2D + || resource->type == WINED3D_RTYPE_TEXTURE_3D) { struct wined3d_texture *texture = texture_from_resource(resource); unsigned int level; @@ -5006,6 +5007,7 @@ void device_resource_released(struct wined3d_device *device, struct wined3d_reso switch (type) { + case WINED3D_RTYPE_TEXTURE_1D: case WINED3D_RTYPE_TEXTURE_2D: case WINED3D_RTYPE_TEXTURE_3D: for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 000d0b7546..e1b064d030 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5312,6 +5312,20 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad gl_type_end = WINED3D_GL_RES_TYPE_TEX_3D; break; + case WINED3D_RTYPE_TEXTURE_1D: + allowed_usage = WINED3DUSAGE_AUTOGENMIPMAP + | WINED3DUSAGE_DYNAMIC + | WINED3DUSAGE_SOFTWAREPROCESSING + | WINED3DUSAGE_TEXTURE + | WINED3DUSAGE_QUERY_FILTER + | WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING + | WINED3DUSAGE_QUERY_SRGBREAD + | WINED3DUSAGE_QUERY_SRGBWRITE + | WINED3DUSAGE_QUERY_VERTEXTEXTURE + | WINED3DUSAGE_QUERY_WRAPANDMIP; + gl_type = gl_type_end = WINED3D_GL_RES_TYPE_TEX_1D; + break; + case WINED3D_RTYPE_TEXTURE_2D: allowed_usage = WINED3DUSAGE_DEPTHSTENCIL | WINED3DUSAGE_RENDERTARGET diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 61ff20679b..82a0082f6d 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -76,6 +76,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * resource_types[] = { {WINED3D_RTYPE_BUFFER, 0, WINED3D_GL_RES_TYPE_BUFFER}, + {WINED3D_RTYPE_TEXTURE_1D, 0, WINED3D_GL_RES_TYPE_TEX_1D}, {WINED3D_RTYPE_TEXTURE_2D, 0, WINED3D_GL_RES_TYPE_TEX_2D}, {WINED3D_RTYPE_TEXTURE_2D, 0, WINED3D_GL_RES_TYPE_TEX_RECT}, {WINED3D_RTYPE_TEXTURE_2D, 0, WINED3D_GL_RES_TYPE_RB}, diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a31baa43a7..c1cceebb58 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4262,6 +4262,7 @@ const char *debug_d3dresourcetype(enum wined3d_resource_type resource_type) #define WINED3D_TO_STR(x) case x: return #x WINED3D_TO_STR(WINED3D_RTYPE_NONE); WINED3D_TO_STR(WINED3D_RTYPE_BUFFER); + WINED3D_TO_STR(WINED3D_RTYPE_TEXTURE_1D); WINED3D_TO_STR(WINED3D_RTYPE_TEXTURE_2D); WINED3D_TO_STR(WINED3D_RTYPE_TEXTURE_3D); #undef WINED3D_TO_STR diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 72168e5fa7..16ea11d8b1 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -676,8 +676,9 @@ enum wined3d_resource_type { WINED3D_RTYPE_NONE = 0, WINED3D_RTYPE_BUFFER = 1, - WINED3D_RTYPE_TEXTURE_2D = 2, - WINED3D_RTYPE_TEXTURE_3D = 3, + WINED3D_RTYPE_TEXTURE_1D = 2, + WINED3D_RTYPE_TEXTURE_2D = 3, + WINED3D_RTYPE_TEXTURE_3D = 4, }; enum wined3d_pool -- 2.16.1

3 10

[PATCH] user32: Improve EnumDisplayDevices
by Andrew Eikum 07 Feb '18

07 Feb '18

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- On my 2-monitor setup this results in: for device 0, got name: \\.\DISPLAY1, string: X11 Windowing System, flags: 0x15 for device 0 sub 0, got name: \\.\DISPLAY1\Monitor0, string: Generic PnP Monitor, flags: 0x3 for device 1, got name: \\.\DISPLAY1, string: X11 Windowing System, flags: 0x11 for device 1 sub 0, got name: \\.\DISPLAY1\Monitor0, string: Generic PnP Monitor, flags: 0x3 Which nearly matches Windows 10 on the same hardware. The differences are the 2nd device should be DISPLAY2, not DISPLAY1; and the primary adapter comes 2nd on Windows. However, DISPLAY1 is hard-coded at least in gdi32, winex11, and winemac, so I hard-coded it here as well. This results in both monitors and adapters having the same name, which is clumsy. But it is sufficient to fix Unity games displaying on the non-primary monitor by default. dlls/user32/misc.c | 94 ++++++++++++++++++++++++++++++++++++++++++++---------- include/wingdi.h | 6 +++- 2 files changed, 82 insertions(+), 18 deletions(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 895ccce312..96d5212725 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -243,11 +243,13 @@ DWORD WINAPI SetLogonNotifyWindow(HWINSTA hwinsta,HWND hwnd) return 1; } -static const WCHAR primary_device_name[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; -static const WCHAR primary_device_string[] = {'X','1','1',' ','W','i','n','d','o','w','i','n','g',' ', +static const WCHAR device_name[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; +static const WCHAR device_string[] = {'X','1','1',' ','W','i','n','d','o','w','i','n','g',' ', 'S','y','s','t','e','m',0}; -static const WCHAR primary_device_deviceid[] = {'P','C','I','\\','V','E','N','_','0','0','0','0','&', +static const WCHAR monitor_string[] = {'G','e','n','e','r','i','c',' ','P','n','P',' ','M','o','n','i','t','o','r',0}; +static const WCHAR device_deviceid[] = {'P','C','I','\\','V','E','N','_','0','0','0','0','&', 'D','E','V','_','0','0','0','0',0}; +static const WCHAR monitor0W[] = {'\\','M','o','n','i','t','o','r','0',0}; /*********************************************************************** * EnumDisplayDevicesA (USER32.@) @@ -282,29 +284,87 @@ BOOL WINAPI EnumDisplayDevicesA( LPCSTR lpDevice, DWORD i, LPDISPLAY_DEVICEA lpD return TRUE; } +struct edd_enum_info +{ + UINT idx; + UINT desired; + HMONITOR hmon; +}; + +static BOOL CALLBACK edd_enum( HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM lp ) +{ + struct edd_enum_info *info = (struct edd_enum_info *)lp; + if (info->idx == info->desired) + { + info->hmon = monitor; + return FALSE; + } + info->idx++; + return TRUE; +} + /*********************************************************************** * EnumDisplayDevicesW (USER32.@) */ BOOL WINAPI EnumDisplayDevicesW( LPCWSTR lpDevice, DWORD i, LPDISPLAY_DEVICEW lpDisplayDevice, DWORD dwFlags ) { - FIXME("(%s,%d,%p,0x%08x), stub!\n",debugstr_w(lpDevice),i,lpDisplayDevice,dwFlags); + TRACE("(%s, %d, %p, 0x%08x)\n", debugstr_w(lpDevice), i, lpDisplayDevice, dwFlags); - if (i) + if (!lpDisplayDevice) return FALSE; - memcpy(lpDisplayDevice->DeviceName, primary_device_name, sizeof(primary_device_name)); - memcpy(lpDisplayDevice->DeviceString, primary_device_string, sizeof(primary_device_string)); - - lpDisplayDevice->StateFlags = - DISPLAY_DEVICE_ATTACHED_TO_DESKTOP | - DISPLAY_DEVICE_PRIMARY_DEVICE | - DISPLAY_DEVICE_VGA_COMPATIBLE; - - if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) - memcpy(lpDisplayDevice->DeviceID, primary_device_deviceid, sizeof(primary_device_deviceid)); - if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) - lpDisplayDevice->DeviceKey[0] = 0; + if (!lpDevice) + { + struct edd_enum_info info = {0}; + MONITORINFO monitor = {0}; + + /* one adapter per monitor */ + info.desired = i; + EnumDisplayMonitors(0, NULL, edd_enum, (LPARAM)&info); + + if (info.hmon == NULL) + return FALSE; + + monitor.cbSize = sizeof(monitor); + if (!GetMonitorInfoW(info.hmon, &monitor)) + return FALSE; + + memcpy(lpDisplayDevice->DeviceName, device_name, sizeof(device_name)); + memcpy(lpDisplayDevice->DeviceString, device_string, sizeof(device_string)); + + lpDisplayDevice->StateFlags = DISPLAY_DEVICE_ATTACHED_TO_DESKTOP | + DISPLAY_DEVICE_VGA_COMPATIBLE; + + if (monitor.dwFlags & MONITORINFOF_PRIMARY) + lpDisplayDevice->StateFlags |= DISPLAY_DEVICE_PRIMARY_DEVICE; + + if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) + memcpy(lpDisplayDevice->DeviceID, device_deviceid, sizeof(device_deviceid)); + if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) + lpDisplayDevice->DeviceKey[0] = 0; + } + else + { + if (i != 0) + /* one monitor per adapter */ + return FALSE; + + if (strcmpW(lpDevice, device_name) != 0) + return FALSE; + + strcpyW(lpDisplayDevice->DeviceName, lpDevice); + strcatW(lpDisplayDevice->DeviceName, monitor0W); + + memcpy(lpDisplayDevice->DeviceString, monitor_string, sizeof(monitor_string)); + + lpDisplayDevice->StateFlags = DISPLAY_DEVICE_ACTIVE | DISPLAY_DEVICE_ATTACHED; + + if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) + memcpy(lpDisplayDevice->DeviceID, device_deviceid, sizeof(device_deviceid)); + if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) + lpDisplayDevice->DeviceKey[0] = 0; + } return TRUE; } diff --git a/include/wingdi.h b/include/wingdi.h index 1851654194..03b7ed2ce4 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3318,13 +3318,17 @@ DECL_WINELIB_TYPE_AW(DISPLAY_DEVICE) DECL_WINELIB_TYPE_AW(PDISPLAY_DEVICE) DECL_WINELIB_TYPE_AW(LPDISPLAY_DEVICE) -/* DISPLAY_DEVICE.StateFlags (?)*/ +/* DISPLAY_DEVICE.StateFlags, adapter flags */ #define DISPLAY_DEVICE_ATTACHED_TO_DESKTOP 0x00000001 #define DISPLAY_DEVICE_MULTI_DRIVER 0x00000002 #define DISPLAY_DEVICE_PRIMARY_DEVICE 0x00000004 #define DISPLAY_DEVICE_MIRRORING_DRIVER 0x00000008 #define DISPLAY_DEVICE_VGA_COMPATIBLE 0x00000010 +/* DISPLAY_DEVICE.StateFlags, monitor flags */ +#define DISPLAY_DEVICE_ACTIVE 0x00000001 +#define DISPLAY_DEVICE_ATTACHED 0x00000002 + typedef struct DISPLAYCONFIG_DESKTOP_IMAGE_INFO { POINTL PathSourceSize; -- 2.16.1

1 1

[PATCH] wscript: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 07 Feb '18

07 Feb '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/wscript/host.c | 1 + programs/wscript/wscript.h | 15 --------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/programs/wscript/host.c b/programs/wscript/host.c index 3c30c3ca5d..fb95c0c94d 100644 --- a/programs/wscript/host.c +++ b/programs/wscript/host.c @@ -28,6 +28,7 @@ #include "wscript.h" #include <wine/debug.h> +#include <wine/heap.h> #include <wine/unicode.h> WINE_DEFAULT_DEBUG_CHANNEL(wscript); diff --git a/programs/wscript/wscript.h b/programs/wscript/wscript.h index 2a64b3456b..d624a2d851 100644 --- a/programs/wscript/wscript.h +++ b/programs/wscript/wscript.h @@ -33,18 +33,3 @@ extern WCHAR **argums; extern int numOfArgs; extern VARIANT_BOOL wshInteractive; - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} -- 2.14.3

2 1

[PATCH] include: Add some math function declarations.
by Daniel Lehman 07 Feb '18

07 Feb '18

2 2

[PATCH] mshtml: Added IHTMLKeyboardEvent::location property implementation.
by Jacek Caban 07 Feb '18

07 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/dispex.c | 1 + dlls/mshtml/htmlevent.c | 13 +++++++++++-- dlls/mshtml/tests/events.js | 1 + 3 files changed, 13 insertions(+), 2 deletions(-)

1 0

[PATCH] msvcp120/tests: A spelling fix in a comment.
by Francois Gouget 07 Feb '18

07 Feb '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/msvcp120/tests/msvcp120.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 5ae858d4853..dfd2d06cc73 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -2496,7 +2496,7 @@ static void test_queue_base_v4(void) ok(b, "pop returned false\n"); ok(c == (char)('a'+i), "got '%c', expected '%c'\n", c, 'a'+i); - /* destructor does't clear the memory, _Internal_finish_clear needs to be called */ + /* destructor doesn't clear the memory, _Internal_finish_clear needs to be called */ SET_EXPECT(queue_char__Deallocate_page); call_func1(p_queue_base_v4__Internal_finish_clear, &queue); CHECK_CALLED(queue_char__Deallocate_page); -- 2.15.1

2 1

[v2 PATCH] user32/class: Automatically load the module implementing redirected class
by Nikolay Sivov 07 Feb '18

07 Feb '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: fixed a test failure dlls/user32/class.c | 5 ++ dlls/user32/tests/class.c | 223 +++++++++++++++++++++++++++++++++------------- 2 files changed, 167 insertions(+), 61 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 441d5cb132..dce9bf2269 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -336,6 +336,7 @@ const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset ) ULONG module_len; ULONG module_offset; } *wndclass; + const WCHAR *module; if (basename_offset) *basename_offset = 0; @@ -354,6 +355,10 @@ const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset ) if (basename_offset) *basename_offset = wndclass->name_len / sizeof(WCHAR) - strlenW(name); + module = (const WCHAR *)((BYTE *)data.lpSectionBase + wndclass->module_offset); + if (!GetModuleHandleW( module )) + LoadLibraryW( module ); + return (const WCHAR *)((BYTE *)wndclass + wndclass->name_offset); } diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 9ae306e090..ae885dbac9 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -38,6 +38,42 @@ #define IS_WNDPROC_HANDLE(x) (((ULONG_PTR)(x) >> 16) == (~0u >> 16)) +#ifdef __i386__ +#define ARCH "x86" +#elif defined __x86_64__ +#define ARCH "amd64" +#elif defined __arm__ +#define ARCH "arm" +#elif defined __aarch64__ +#define ARCH "arm64" +#else +#define ARCH "none" +#endif + +static const char comctl32_manifest[] = +"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n" +"<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">\n" +" <assemblyIdentity\n" +" type=\"win32\"\n" +" name=\"Wine.User32.Tests\"\n" +" version=\"1.0.0.0\"\n" +" processorArchitecture=\"" ARCH "\"\n" +" />\n" +"<description>Wine comctl32 test suite</description>\n" +"<dependency>\n" +" <dependentAssembly>\n" +" <assemblyIdentity\n" +" type=\"win32\"\n" +" name=\"microsoft.windows.common-controls\"\n" +" version=\"6.0.0.0\"\n" +" processorArchitecture=\"" ARCH "\"\n" +" publicKeyToken=\"6595b64144ccf1df\"\n" +" language=\"*\"\n" +" />\n" +"</dependentAssembly>\n" +"</dependency>\n" +"</assembly>\n"; + static LRESULT WINAPI ClassTest_WndProc (HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { if (msg == WM_NCCREATE) return 1; @@ -1041,6 +1077,45 @@ static void test_icons(void) DestroyWindow(hwnd); } +static void create_manifest_file(const char *filename, const char *manifest) +{ + WCHAR path[MAX_PATH]; + HANDLE file; + DWORD size; + + MultiByteToWideChar( CP_ACP, 0, filename, -1, path, MAX_PATH ); + file = CreateFileW(path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); + WriteFile(file, manifest, strlen(manifest), &size, NULL); + CloseHandle(file); +} + +static HANDLE create_test_actctx(const char *file) +{ + WCHAR path[MAX_PATH]; + ACTCTXW actctx; + HANDLE handle; + + MultiByteToWideChar(CP_ACP, 0, file, -1, path, MAX_PATH); + memset(&actctx, 0, sizeof(ACTCTXW)); + actctx.cbSize = sizeof(ACTCTXW); + actctx.lpSource = path; + + handle = CreateActCtxW(&actctx); + ok(handle != INVALID_HANDLE_VALUE, "failed to create context, error %u\n", GetLastError()); + + ok(actctx.cbSize == sizeof(actctx), "cbSize=%d\n", actctx.cbSize); + ok(actctx.dwFlags == 0, "dwFlags=%d\n", actctx.dwFlags); + ok(actctx.lpSource == path, "lpSource=%p\n", actctx.lpSource); + ok(actctx.wProcessorArchitecture == 0, "wProcessorArchitecture=%d\n", actctx.wProcessorArchitecture); + ok(actctx.wLangId == 0, "wLangId=%d\n", actctx.wLangId); + ok(actctx.lpAssemblyDirectory == NULL, "lpAssemblyDirectory=%p\n", actctx.lpAssemblyDirectory); + ok(actctx.lpResourceName == NULL, "lpResourceName=%p\n", actctx.lpResourceName); + ok(actctx.lpApplicationName == NULL, "lpApplicationName=%p\n", actctx.lpApplicationName); + ok(actctx.hModule == NULL, "hModule=%p\n", actctx.hModule); + + return handle; +} static void test_comctl32_class( const char *name ) { WNDCLASSA wcA; @@ -1050,23 +1125,82 @@ static void test_comctl32_class( const char *name ) WCHAR nameW[20]; HWND hwnd; - module = GetModuleHandleA( "comctl32" ); - ok( !module, "comctl32 already loaded\n" ); - ret = GetClassInfoA( 0, name, &wcA ); - ok( ret || broken(!ret) /* <= winxp */, "GetClassInfoA failed for %s\n", name ); - if (!ret) return; - MultiByteToWideChar( CP_ACP, 0, name, -1, nameW, sizeof(nameW)/sizeof(WCHAR) ); - ret = GetClassInfoW( 0, nameW, &wcW ); - ok( ret, "GetClassInfoW failed for %s\n", name ); - module = GetModuleHandleA( "comctl32" ); - ok( module != 0, "comctl32 not loaded\n" ); - FreeLibrary( module ); - module = GetModuleHandleA( "comctl32" ); - ok( !module, "comctl32 still loaded\n" ); - hwnd = CreateWindowA( name, "test", WS_OVERLAPPEDWINDOW, 0, 0, 10, 10, NULL, NULL, NULL, 0 ); - ok( hwnd != 0, "failed to create window for %s\n", name ); - module = GetModuleHandleA( "comctl32" ); - ok( module != 0, "comctl32 not loaded\n" ); + if (name[0] == '!') + { + char path[MAX_PATH]; + ULONG_PTR cookie; + HANDLE context; + + name++; + + GetTempPathA(sizeof(path)/sizeof(path[0]), path); + strcat(path, "comctl32_class.manifest"); + + create_manifest_file(path, comctl32_manifest); + context = create_test_actctx(path); + ret = DeleteFileA(path); + ok(ret, "Failed to delete manifest file, error %d.\n", GetLastError()); + + module = GetModuleHandleA( "comctl32" ); + ok( !module, "comctl32 already loaded\n" ); + + ret = ActivateActCtx(context, &cookie); + ok(ret, "Failed to activate context.\n"); + + /* Some systems load modules during context activation. In this case skip the rest of the test. */ + module = GetModuleHandleA( "comctl32" ); + ok( !module || broken(module != NULL) /* Vista/Win7 */, "comctl32 already loaded\n" ); + if (module) + { + win_skip("Module loaded during context activation. Skipping tests.\n"); + goto skiptest; + } + + ret = GetClassInfoA( 0, name, &wcA ); + ok( ret || broken(!ret) /* WinXP */, "GetClassInfoA failed for %s\n", name ); + if (!ret) + goto skiptest; + + MultiByteToWideChar( CP_ACP, 0, name, -1, nameW, sizeof(nameW)/sizeof(WCHAR) ); + ret = GetClassInfoW( 0, nameW, &wcW ); + ok( ret, "GetClassInfoW failed for %s\n", name ); + module = GetModuleHandleA( "comctl32" ); + ok( module != 0, "comctl32 not loaded\n" ); + FreeLibrary( module ); + module = GetModuleHandleA( "comctl32" ); + ok( !module || broken(module != NULL) /* Vista */, "comctl32 still loaded\n" ); + hwnd = CreateWindowA( name, "test", WS_OVERLAPPEDWINDOW, 0, 0, 10, 10, NULL, NULL, NULL, 0 ); + ok( hwnd != 0, "failed to create window for %s\n", name ); + module = GetModuleHandleA( "comctl32" ); + ok( module != 0, "comctl32 not loaded\n" ); + DestroyWindow( hwnd ); + + skiptest: + ret = DeactivateActCtx(0, cookie); + ok(ret, "Failed to deactivate context.\n"); + ReleaseActCtx(context); + } + else + { + module = GetModuleHandleA( "comctl32" ); + ok( !module, "comctl32 already loaded\n" ); + ret = GetClassInfoA( 0, name, &wcA ); + ok( ret || broken(!ret) /* <= winxp */, "GetClassInfoA failed for %s\n", name ); + if (!ret) return; + MultiByteToWideChar( CP_ACP, 0, name, -1, nameW, sizeof(nameW)/sizeof(WCHAR) ); + ret = GetClassInfoW( 0, nameW, &wcW ); + ok( ret, "GetClassInfoW failed for %s\n", name ); + module = GetModuleHandleA( "comctl32" ); + ok( module != 0, "comctl32 not loaded\n" ); + FreeLibrary( module ); + module = GetModuleHandleA( "comctl32" ); + ok( !module, "comctl32 still loaded\n" ); + hwnd = CreateWindowA( name, "test", WS_OVERLAPPEDWINDOW, 0, 0, 10, 10, NULL, NULL, NULL, 0 ); + ok( hwnd != 0, "failed to create window for %s\n", name ); + module = GetModuleHandleA( "comctl32" ); + ok( module != 0, "comctl32 not loaded\n" ); + DestroyWindow( hwnd ); + } } /* verify that comctl32 classes are automatically loaded by user32 */ @@ -1099,7 +1233,9 @@ static void test_comctl32_classes(void) TOOLTIPS_CLASSA, TRACKBAR_CLASSA, WC_TREEVIEWA, - UPDOWN_CLASSA + UPDOWN_CLASSA, + "!Button", + "!Edit", }; winetest_get_mainargs( &argv ); @@ -1162,46 +1298,6 @@ static void test_IME(void) ok(!lstrcmpiA(ptr, "user32.dll") || !lstrcmpiA(ptr, "ntdll.dll"), "IME window proc implemented in %s\n", ptr); } -static void create_manifest_file(const char *filename, const char *manifest) -{ - WCHAR path[MAX_PATH]; - HANDLE file; - DWORD size; - - MultiByteToWideChar( CP_ACP, 0, filename, -1, path, MAX_PATH ); - file = CreateFileW(path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); - WriteFile(file, manifest, strlen(manifest), &size, NULL); - CloseHandle(file); -} - -static HANDLE create_test_actctx(const char *file) -{ - WCHAR path[MAX_PATH]; - ACTCTXW actctx; - HANDLE handle; - - MultiByteToWideChar(CP_ACP, 0, file, -1, path, MAX_PATH); - memset(&actctx, 0, sizeof(ACTCTXW)); - actctx.cbSize = sizeof(ACTCTXW); - actctx.lpSource = path; - - handle = CreateActCtxW(&actctx); - ok(handle != INVALID_HANDLE_VALUE, "failed to create context, error %u\n", GetLastError()); - - ok(actctx.cbSize == sizeof(actctx), "cbSize=%d\n", actctx.cbSize); - ok(actctx.dwFlags == 0, "dwFlags=%d\n", actctx.dwFlags); - ok(actctx.lpSource == path, "lpSource=%p\n", actctx.lpSource); - ok(actctx.wProcessorArchitecture == 0, "wProcessorArchitecture=%d\n", actctx.wProcessorArchitecture); - ok(actctx.wLangId == 0, "wLangId=%d\n", actctx.wLangId); - ok(actctx.lpAssemblyDirectory == NULL, "lpAssemblyDirectory=%p\n", actctx.lpAssemblyDirectory); - ok(actctx.lpResourceName == NULL, "lpResourceName=%p\n", actctx.lpResourceName); - ok(actctx.lpApplicationName == NULL, "lpApplicationName=%p\n", actctx.lpApplicationName); - ok(actctx.hModule == NULL, "hModule=%p\n", actctx.hModule); - - return handle; -} - static void test_actctx_classes(void) { static const char main_manifest[] = @@ -1220,10 +1316,15 @@ static void test_actctx_classes(void) HINSTANCE hinst; char buff[64]; HWND hwnd; + char path[MAX_PATH]; + + GetTempPathA(sizeof(path)/sizeof(path[0]), path); + strcat(path, "actctx_classes.manifest"); - create_manifest_file("main.manifest", main_manifest); - context = create_test_actctx("main.manifest"); - DeleteFileA("main.manifest"); + create_manifest_file(path, main_manifest); + context = create_test_actctx(path); + ret = DeleteFileA(path); + ok(ret, "Failed to delete manifest file, error %d.\n", GetLastError()); ret = ActivateActCtx(context, &cookie); ok(ret, "Failed to activate context.\n"); -- 2.15.1

1 0

[PATCH] user32/class: Automatically load the module implementing redirected class
by Nikolay Sivov 07 Feb '18

07 Feb '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- When the program does not load comctl32.dll, linking to it or dynamically, new builtin controls behavior still could be easily made available with an external manifest. Very simple test program to demostrate that is attached to https://bugs.winehq.org/show_bug.cgi?id=30103. Tests show some differences between system versions, but important part is consistent - module is loaded right on context activation, or lazily when first window/class call is made. dlls/user32/class.c | 5 ++ dlls/user32/tests/class.c | 223 +++++++++++++++++++++++++++++++++------------- 2 files changed, 167 insertions(+), 61 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 441d5cb132..dce9bf2269 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -336,6 +336,7 @@ const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset ) ULONG module_len; ULONG module_offset; } *wndclass; + const WCHAR *module; if (basename_offset) *basename_offset = 0; @@ -354,6 +355,10 @@ const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset ) if (basename_offset) *basename_offset = wndclass->name_len / sizeof(WCHAR) - strlenW(name); + module = (const WCHAR *)((BYTE *)data.lpSectionBase + wndclass->module_offset); + if (!GetModuleHandleW( module )) + LoadLibraryW( module ); + return (const WCHAR *)((BYTE *)wndclass + wndclass->name_offset); } diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 9ae306e090..2ff3649b6e 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -38,6 +38,42 @@ #define IS_WNDPROC_HANDLE(x) (((ULONG_PTR)(x) >> 16) == (~0u >> 16)) +#ifdef __i386__ +#define ARCH "x86" +#elif defined __x86_64__ +#define ARCH "amd64" +#elif defined __arm__ +#define ARCH "arm" +#elif defined __aarch64__ +#define ARCH "arm64" +#else +#define ARCH "none" +#endif + +static const char comctl32_manifest[] = +"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n" +"<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">\n" +" <assemblyIdentity\n" +" type=\"win32\"\n" +" name=\"Wine.User32.Tests\"\n" +" version=\"1.0.0.0\"\n" +" processorArchitecture=\"" ARCH "\"\n" +" />\n" +"<description>Wine comctl32 test suite</description>\n" +"<dependency>\n" +" <dependentAssembly>\n" +" <assemblyIdentity\n" +" type=\"win32\"\n" +" name=\"microsoft.windows.common-controls\"\n" +" version=\"6.0.0.0\"\n" +" processorArchitecture=\"" ARCH "\"\n" +" publicKeyToken=\"6595b64144ccf1df\"\n" +" language=\"*\"\n" +" />\n" +"</dependentAssembly>\n" +"</dependency>\n" +"</assembly>\n"; + static LRESULT WINAPI ClassTest_WndProc (HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { if (msg == WM_NCCREATE) return 1; @@ -1041,6 +1077,45 @@ static void test_icons(void) DestroyWindow(hwnd); } +static void create_manifest_file(const char *filename, const char *manifest) +{ + WCHAR path[MAX_PATH]; + HANDLE file; + DWORD size; + + MultiByteToWideChar( CP_ACP, 0, filename, -1, path, MAX_PATH ); + file = CreateFileW(path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); + WriteFile(file, manifest, strlen(manifest), &size, NULL); + CloseHandle(file); +} + +static HANDLE create_test_actctx(const char *file) +{ + WCHAR path[MAX_PATH]; + ACTCTXW actctx; + HANDLE handle; + + MultiByteToWideChar(CP_ACP, 0, file, -1, path, MAX_PATH); + memset(&actctx, 0, sizeof(ACTCTXW)); + actctx.cbSize = sizeof(ACTCTXW); + actctx.lpSource = path; + + handle = CreateActCtxW(&actctx); + ok(handle != INVALID_HANDLE_VALUE, "failed to create context, error %u\n", GetLastError()); + + ok(actctx.cbSize == sizeof(actctx), "cbSize=%d\n", actctx.cbSize); + ok(actctx.dwFlags == 0, "dwFlags=%d\n", actctx.dwFlags); + ok(actctx.lpSource == path, "lpSource=%p\n", actctx.lpSource); + ok(actctx.wProcessorArchitecture == 0, "wProcessorArchitecture=%d\n", actctx.wProcessorArchitecture); + ok(actctx.wLangId == 0, "wLangId=%d\n", actctx.wLangId); + ok(actctx.lpAssemblyDirectory == NULL, "lpAssemblyDirectory=%p\n", actctx.lpAssemblyDirectory); + ok(actctx.lpResourceName == NULL, "lpResourceName=%p\n", actctx.lpResourceName); + ok(actctx.lpApplicationName == NULL, "lpApplicationName=%p\n", actctx.lpApplicationName); + ok(actctx.hModule == NULL, "hModule=%p\n", actctx.hModule); + + return handle; +} static void test_comctl32_class( const char *name ) { WNDCLASSA wcA; @@ -1050,23 +1125,82 @@ static void test_comctl32_class( const char *name ) WCHAR nameW[20]; HWND hwnd; - module = GetModuleHandleA( "comctl32" ); - ok( !module, "comctl32 already loaded\n" ); - ret = GetClassInfoA( 0, name, &wcA ); - ok( ret || broken(!ret) /* <= winxp */, "GetClassInfoA failed for %s\n", name ); - if (!ret) return; - MultiByteToWideChar( CP_ACP, 0, name, -1, nameW, sizeof(nameW)/sizeof(WCHAR) ); - ret = GetClassInfoW( 0, nameW, &wcW ); - ok( ret, "GetClassInfoW failed for %s\n", name ); - module = GetModuleHandleA( "comctl32" ); - ok( module != 0, "comctl32 not loaded\n" ); - FreeLibrary( module ); - module = GetModuleHandleA( "comctl32" ); - ok( !module, "comctl32 still loaded\n" ); - hwnd = CreateWindowA( name, "test", WS_OVERLAPPEDWINDOW, 0, 0, 10, 10, NULL, NULL, NULL, 0 ); - ok( hwnd != 0, "failed to create window for %s\n", name ); - module = GetModuleHandleA( "comctl32" ); - ok( module != 0, "comctl32 not loaded\n" ); + if (name[0] == '!') + { + char path[MAX_PATH]; + ULONG_PTR cookie; + HANDLE context; + + name++; + + GetTempPathA(sizeof(path)/sizeof(path[0]), path); + strcat(path, "comctl32_class.manifest"); + + create_manifest_file(path, comctl32_manifest); + context = create_test_actctx(path); + ret = DeleteFileA(path); + ok(ret, "Failed to delete manifest file, error %d.\n", GetLastError()); + + module = GetModuleHandleA( "comctl32" ); + ok( !module, "comctl32 already loaded\n" ); + + ret = ActivateActCtx(context, &cookie); + ok(ret, "Failed to activate context.\n"); + + /* Some systems load modules during context activation. In this case skip the rest of the test. */ + module = GetModuleHandleA( "comctl32" ); + ok( !module || broken(module != NULL) /* Vista/Win7 */, "comctl32 already loaded\n" ); + if (module) + { + win_skip("Module loaded during context activation. Skipping tests.\n"); + goto skiptest; + } + + ret = GetClassInfoA( 0, name, &wcA ); + ok( ret || broken(!ret) /* WinXP */, "GetClassInfoA failed for %s\n", name ); + if (!ret) + goto skiptest; + + MultiByteToWideChar( CP_ACP, 0, name, -1, nameW, sizeof(nameW)/sizeof(WCHAR) ); + ret = GetClassInfoW( 0, nameW, &wcW ); + ok( ret, "GetClassInfoW failed for %s\n", name ); + module = GetModuleHandleA( "comctl32" ); + ok( module != 0, "comctl32 not loaded\n" ); + FreeLibrary( module ); + module = GetModuleHandleA( "comctl32" ); + ok( !module, "comctl32 still loaded\n" ); + hwnd = CreateWindowA( name, "test", WS_OVERLAPPEDWINDOW, 0, 0, 10, 10, NULL, NULL, NULL, 0 ); + ok( hwnd != 0, "failed to create window for %s\n", name ); + module = GetModuleHandleA( "comctl32" ); + ok( module != 0, "comctl32 not loaded\n" ); + DestroyWindow( hwnd ); + + skiptest: + ret = DeactivateActCtx(0, cookie); + ok(ret, "Failed to deactivate context.\n"); + ReleaseActCtx(context); + } + else + { + module = GetModuleHandleA( "comctl32" ); + ok( !module, "comctl32 already loaded\n" ); + ret = GetClassInfoA( 0, name, &wcA ); + ok( ret || broken(!ret) /* <= winxp */, "GetClassInfoA failed for %s\n", name ); + if (!ret) return; + MultiByteToWideChar( CP_ACP, 0, name, -1, nameW, sizeof(nameW)/sizeof(WCHAR) ); + ret = GetClassInfoW( 0, nameW, &wcW ); + ok( ret, "GetClassInfoW failed for %s\n", name ); + module = GetModuleHandleA( "comctl32" ); + ok( module != 0, "comctl32 not loaded\n" ); + FreeLibrary( module ); + module = GetModuleHandleA( "comctl32" ); + ok( !module, "comctl32 still loaded\n" ); + hwnd = CreateWindowA( name, "test", WS_OVERLAPPEDWINDOW, 0, 0, 10, 10, NULL, NULL, NULL, 0 ); + ok( hwnd != 0, "failed to create window for %s\n", name ); + module = GetModuleHandleA( "comctl32" ); + ok( module != 0, "comctl32 not loaded\n" ); + DestroyWindow( hwnd ); + } } /* verify that comctl32 classes are automatically loaded by user32 */ @@ -1099,7 +1233,9 @@ static void test_comctl32_classes(void) TOOLTIPS_CLASSA, TRACKBAR_CLASSA, WC_TREEVIEWA, - UPDOWN_CLASSA + UPDOWN_CLASSA, + "!Button", + "!Edit", }; winetest_get_mainargs( &argv ); @@ -1162,46 +1298,6 @@ static void test_IME(void) ok(!lstrcmpiA(ptr, "user32.dll") || !lstrcmpiA(ptr, "ntdll.dll"), "IME window proc implemented in %s\n", ptr); } -static void create_manifest_file(const char *filename, const char *manifest) -{ - WCHAR path[MAX_PATH]; - HANDLE file; - DWORD size; - - MultiByteToWideChar( CP_ACP, 0, filename, -1, path, MAX_PATH ); - file = CreateFileW(path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); - WriteFile(file, manifest, strlen(manifest), &size, NULL); - CloseHandle(file); -} - -static HANDLE create_test_actctx(const char *file) -{ - WCHAR path[MAX_PATH]; - ACTCTXW actctx; - HANDLE handle; - - MultiByteToWideChar(CP_ACP, 0, file, -1, path, MAX_PATH); - memset(&actctx, 0, sizeof(ACTCTXW)); - actctx.cbSize = sizeof(ACTCTXW); - actctx.lpSource = path; - - handle = CreateActCtxW(&actctx); - ok(handle != INVALID_HANDLE_VALUE, "failed to create context, error %u\n", GetLastError()); - - ok(actctx.cbSize == sizeof(actctx), "cbSize=%d\n", actctx.cbSize); - ok(actctx.dwFlags == 0, "dwFlags=%d\n", actctx.dwFlags); - ok(actctx.lpSource == path, "lpSource=%p\n", actctx.lpSource); - ok(actctx.wProcessorArchitecture == 0, "wProcessorArchitecture=%d\n", actctx.wProcessorArchitecture); - ok(actctx.wLangId == 0, "wLangId=%d\n", actctx.wLangId); - ok(actctx.lpAssemblyDirectory == NULL, "lpAssemblyDirectory=%p\n", actctx.lpAssemblyDirectory); - ok(actctx.lpResourceName == NULL, "lpResourceName=%p\n", actctx.lpResourceName); - ok(actctx.lpApplicationName == NULL, "lpApplicationName=%p\n", actctx.lpApplicationName); - ok(actctx.hModule == NULL, "hModule=%p\n", actctx.hModule); - - return handle; -} - static void test_actctx_classes(void) { static const char main_manifest[] = @@ -1220,10 +1316,15 @@ static void test_actctx_classes(void) HINSTANCE hinst; char buff[64]; HWND hwnd; + char path[MAX_PATH]; + + GetTempPathA(sizeof(path)/sizeof(path[0]), path); + strcat(path, "actctx_classes.manifest"); - create_manifest_file("main.manifest", main_manifest); - context = create_test_actctx("main.manifest"); - DeleteFileA("main.manifest"); + create_manifest_file(path, main_manifest); + context = create_test_actctx(path); + ret = DeleteFileA(path); + ok(ret, "Failed to delete manifest file, error %d.\n", GetLastError()); ret = ActivateActCtx(context, &cookie); ok(ret, "Failed to activate context.\n"); -- 2.15.1

2 1

[PATCH] winedbg: Handle byte-sized registers in cpu_register() and cpu_register_hex_from().
by Henri Verbeet 07 Feb '18

07 Feb '18

Like for example the recently added floating-point TagWord on AMD64. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- programs/winedbg/gdbproxy.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 7b9a476..67a95f6 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -517,6 +517,7 @@ static inline DWORD64 cpu_register(CONTEXT* ctx, unsigned idx) { switch (cpu_register_map[idx].ctx_length) { + case 1: return *(BYTE*)cpu_register_ptr(ctx, idx); case 2: return *(WORD*)cpu_register_ptr(ctx, idx); case 4: return *(DWORD*)cpu_register_ptr(ctx, idx); case 8: return *(DWORD64*)cpu_register_ptr(ctx, idx); @@ -545,6 +546,7 @@ static inline void cpu_register_hex_from(CONTEXT* ctx, unsigned idx, const } switch (cpu_register_map[idx].ctx_length) { + case 1: *(BYTE*)cpu_register_ptr(ctx, idx) = (BYTE)val; break; case 2: *(WORD*)cpu_register_ptr(ctx, idx) = (WORD)val; break; case 4: *(DWORD*)cpu_register_ptr(ctx, idx) = (DWORD)val; break; case 8: *(DWORD64*)cpu_register_ptr(ctx, idx) = val; break; -- 2.1.4

1 0

[v2 PATCH] comctl32/button: Fix dialog code for new button types
by Nikolay Sivov 07 Feb '18

07 Feb '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: fixed test failures on WinXP dlls/comctl32/button.c | 4 ++++ dlls/comctl32/tests/button.c | 28 ++++++++++++++++++++++++++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index b0eea996a4..a39a64c9a3 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -237,12 +237,16 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L case WM_GETDLGCODE: switch(btn_type) { + case BS_COMMANDLINK: case BS_USERBUTTON: case BS_PUSHBUTTON: return DLGC_BUTTON | DLGC_UNDEFPUSHBUTTON; + case BS_DEFCOMMANDLINK: case BS_DEFPUSHBUTTON: return DLGC_BUTTON | DLGC_DEFPUSHBUTTON; case BS_RADIOBUTTON: case BS_AUTORADIOBUTTON: return DLGC_BUTTON | DLGC_RADIOBUTTON; case BS_GROUPBOX: return DLGC_STATIC; + case BS_SPLITBUTTON: return DLGC_BUTTON | DLGC_UNDEFPUSHBUTTON | DLGC_WANTARROWS; + case BS_DEFSPLITBUTTON: return DLGC_BUTTON | DLGC_DEFPUSHBUTTON | DLGC_WANTARROWS; default: return DLGC_BUTTON; } diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 38e55c8f69..425e1455ff 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -511,6 +511,18 @@ static void test_button_messages(void) { BS_OWNERDRAW, DLGC_BUTTON, setfocus_ownerdraw_seq, killfocus_ownerdraw_seq, setstyle_ownerdraw_seq, setstate_ownerdraw_seq, clearstate_ownerdraw_seq, setcheck_ignored_seq }, + { BS_SPLITBUTTON, DLGC_BUTTON | DLGC_UNDEFPUSHBUTTON | DLGC_WANTARROWS, + setfocus_seq, killfocus_seq, setstyle_seq, + setstate_seq, setstate_seq, setcheck_ignored_seq }, + { BS_DEFSPLITBUTTON, DLGC_BUTTON | DLGC_DEFPUSHBUTTON | DLGC_WANTARROWS, + setfocus_seq, killfocus_seq, setstyle_seq, + setstate_seq, setstate_seq, setcheck_ignored_seq }, + { BS_COMMANDLINK, DLGC_BUTTON | DLGC_UNDEFPUSHBUTTON, + setfocus_seq, killfocus_seq, setstyle_seq, + setstate_seq, setstate_seq, setcheck_ignored_seq }, + { BS_DEFCOMMANDLINK, DLGC_BUTTON | DLGC_DEFPUSHBUTTON, + setfocus_seq, killfocus_seq, setstyle_seq, + setstate_seq, setstate_seq, setcheck_ignored_seq }, }; const struct message *seq; unsigned int i; @@ -550,7 +562,15 @@ static void test_button_messages(void) ok(style == button[i].style, "expected style %x got %x\n", button[i].style, style); dlg_code = SendMessageA(hwnd, WM_GETDLGCODE, 0, 0); - ok(dlg_code == button[i].dlg_code, "%u: wrong dlg_code %08x\n", i, dlg_code); + if (button[i].style == BS_SPLITBUTTON || + button[i].style == BS_DEFSPLITBUTTON || + button[i].style == BS_COMMANDLINK || + button[i].style == BS_DEFCOMMANDLINK) + { + ok(dlg_code == button[i].dlg_code || broken(dlg_code == DLGC_BUTTON) /* WinXP */, "%u: wrong dlg_code %08x\n", i, dlg_code); + } + else + ok(dlg_code == button[i].dlg_code, "%u: wrong dlg_code %08x\n", i, dlg_code); ShowWindow(hwnd, SW_SHOW); UpdateWindow(hwnd); @@ -650,7 +670,11 @@ static void test_button_messages(void) button[i].style == BS_DEFPUSHBUTTON || button[i].style == BS_GROUPBOX || button[i].style == BS_USERBUTTON || - button[i].style == BS_OWNERDRAW) + button[i].style == BS_OWNERDRAW || + button[i].style == BS_SPLITBUTTON || + button[i].style == BS_DEFSPLITBUTTON || + button[i].style == BS_COMMANDLINK || + button[i].style == BS_DEFCOMMANDLINK) { ok_sequence(sequences, COMBINED_SEQ_INDEX, button[i].setcheck, "BM_SETCHECK on a button", FALSE); state = SendMessageA(hwnd, BM_GETCHECK, 0, 0); -- 2.15.1

1 0

[PATCH] winebuild: On x86_64, save xmm0 - 3 during the delayed import lookup.
by Huw Davies 07 Feb '18

07 Feb '18

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- tools/winebuild/import.c | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 01a418f..7ed2f7d 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -943,24 +943,32 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tjmp *%%eax\n" ); break; case CPU_x86_64: - output( "\tsubq $88,%%rsp\n" ); - output_cfi( ".cfi_adjust_cfa_offset 88" ); - output( "\tmovq %%rdx,80(%%rsp)\n" ); - output( "\tmovq %%rcx,72(%%rsp)\n" ); - output( "\tmovq %%r8,64(%%rsp)\n" ); - output( "\tmovq %%r9,56(%%rsp)\n" ); - output( "\tmovq %%r10,48(%%rsp)\n" ); - output( "\tmovq %%r11,40(%%rsp)\n" ); + output( "\tsubq $0x98,%%rsp\n" ); + output_cfi( ".cfi_adjust_cfa_offset 0x98" ); + output( "\tmovq %%rdx,0x88(%%rsp)\n" ); + output( "\tmovq %%rcx,0x80(%%rsp)\n" ); + output( "\tmovq %%r8,0x78(%%rsp)\n" ); + output( "\tmovq %%r9,0x70(%%rsp)\n" ); + output( "\tmovq %%r10,0x68(%%rsp)\n" ); + output( "\tmovq %%r11,0x60(%%rsp)\n" ); + output( "\tmovaps %%xmm0,0x50(%%rsp)\n" ); + output( "\tmovaps %%xmm1,0x40(%%rsp)\n" ); + output( "\tmovaps %%xmm2,0x30(%%rsp)\n" ); + output( "\tmovaps %%xmm3,0x20(%%rsp)\n" ); output( "\tmovq %%rax,%%rcx\n" ); output( "\tcall %s\n", asm_name("__wine_spec_delay_load") ); - output( "\tmovq 40(%%rsp),%%r11\n" ); - output( "\tmovq 48(%%rsp),%%r10\n" ); - output( "\tmovq 56(%%rsp),%%r9\n" ); - output( "\tmovq 64(%%rsp),%%r8\n" ); - output( "\tmovq 72(%%rsp),%%rcx\n" ); - output( "\tmovq 80(%%rsp),%%rdx\n" ); - output( "\taddq $88,%%rsp\n" ); - output_cfi( ".cfi_adjust_cfa_offset -88" ); + output( "\tmovaps 0x20(%%rsp),%%xmm3\n" ); + output( "\tmovaps 0x30(%%rsp),%%xmm2\n" ); + output( "\tmovaps 0x40(%%rsp),%%xmm1\n" ); + output( "\tmovaps 0x50(%%rsp),%%xmm0\n" ); + output( "\tmovq 0x60(%%rsp),%%r11\n" ); + output( "\tmovq 0x68(%%rsp),%%r10\n" ); + output( "\tmovq 0x70(%%rsp),%%r9\n" ); + output( "\tmovq 0x78(%%rsp),%%r8\n" ); + output( "\tmovq 0x80(%%rsp),%%rcx\n" ); + output( "\tmovq 0x88(%%rsp),%%rdx\n" ); + output( "\taddq $0x98,%%rsp\n" ); + output_cfi( ".cfi_adjust_cfa_offset -0x98" ); output( "\tjmp *%%rax\n" ); break; case CPU_ARM: -- 2.7.4

1 0

[PATCH v2 0/7] Minimal headless WMP control implementation
by Anton Romanov 07 Feb '18

07 Feb '18

v2 Switches to global HeapAlloc wrappers, moves wmpids.h to include/ and changes C++ comments to C ones. This series implement enough of WMP for WPF's MediaPlayer class to be mostly functional and makes "Magic The Gathering: Online" have sound. Anton Romanov (7): wmp: Add IWMPPlayer interface wmp: Implement IConnectionPoint[Container] and add _WMPOCXEvents wmp: add IWMPControls stub implementation wmp: Add wmp defs wmp: Add IWMPMedia stub wmp: Add IWMPNetwork stub wmp: Implement minimal headless WMP dlls/wmp/Makefile.in | 3 +- dlls/wmp/events.c | 388 ++++++++++++++++++ dlls/wmp/oleobj.c | 81 +--- dlls/wmp/player.c | 1004 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/wmp/tests/oleobj.c | 2 +- dlls/wmp/wmp_main.c | 2 + dlls/wmp/wmp_private.h | 66 +++- include/wmp.idl | 27 +- include/wmpids.h | 435 ++++++++++++++++++++ 9 files changed, 1911 insertions(+), 97 deletions(-) create mode 100644 dlls/wmp/events.c create mode 100644 include/wmpids.h -- 2.16.1

2 12

[PATCH] msi: Don't mark uncompressed global assembly files as installed until they are in the assembly cache.
by Hans Leidekker 07 Feb '18

07 Feb '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/files.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 02ff8ec28c..adffcafb58 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -200,8 +200,6 @@ static UINT copy_file(MSIFILE *file, LPWSTR source) return GetLastError(); SetFileAttributesW(file->TargetPath, FILE_ATTRIBUTE_NORMAL); - - file->state = msifs_installed; return ERROR_SUCCESS; } @@ -249,7 +247,6 @@ static UINT copy_install_file(MSIPACKAGE *package, MSIFILE *file, LPWSTR source) MoveFileExW(file->TargetPath, NULL, MOVEFILE_DELAY_UNTIL_REBOOT) && MoveFileExW(tmpfileW, file->TargetPath, MOVEFILE_DELAY_UNTIL_REBOOT)) { - file->state = msifs_installed; package->need_reboot_at_end = 1; gle = ERROR_SUCCESS; } @@ -365,6 +362,8 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry ) { + BOOL is_global_assembly = msi_is_global_assembly( file->Component ); + msi_file_update_ui( package, file, szInstallFiles ); rc = msi_load_media_info( package, file->Sequence, mi ); @@ -412,7 +411,7 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) TRACE("copying %s to %s\n", debugstr_w(source), debugstr_w(file->TargetPath)); - if (!msi_is_global_assembly( file->Component )) + if (!is_global_assembly) { msi_create_directory(package, file->Component->Directory); } @@ -424,10 +423,11 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) msi_free(source); goto done; } + if (!is_global_assembly) file->state = msifs_installed; msi_free(source); } - else if (!msi_is_global_assembly( file->Component ) && - file->state != msifs_installed && !(file->Attributes & msidbFileAttributesPatchAdded)) + else if (!is_global_assembly && file->state != msifs_installed && + !(file->Attributes & msidbFileAttributesPatchAdded)) { ERR("compressed file wasn't installed (%s)\n", debugstr_w(file->File)); rc = ERROR_INSTALL_FAILURE; -- 2.11.0

1 0

[PATCH] testbot: Use the same 'now' for all activity values.
by Francois Gouget 07 Feb '18

07 Feb '18

The code was calling time() in various places which could result in different notions of when 'now' is depending on the place. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Activity.pm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index a2bd1b00a..8c22e0144 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -106,12 +106,13 @@ sub GetActivity($;$) { my ($VMs, $Seconds) = @_; my ($ActivityHash, $Activity, $Counters) = ({}, [], {}); + $Counters->{now} = time(); ### First load all the RecordGroups my $RecordGroups = CreateRecordGroups(); if ($Seconds) { - $RecordGroups->AddFilter("Timestamp", [time() - $Seconds], ">="); + $RecordGroups->AddFilter("Timestamp", [$Counters->{now} - $Seconds], ">="); } my $MinId; $Counters->{recordgroups} = $RecordGroups->GetItemsCount(); @@ -302,13 +303,13 @@ sub GetActivity($;$) $LastStatusVMs{$VM->Name} = $StatusVMs; } } - $LastGroup->{end} = time() if ($LastGroup); + $LastGroup->{end} = $Counters->{now} if ($LastGroup); foreach my $VM (@{$VMs->GetItems()}) { my $LastVMStatus = $LastStatusVMs{$VM->Name}->{$VM->Name}; next if (!$LastVMStatus); - $LastVMStatus->{end} = time(); + $LastVMStatus->{end} = $Counters->{now}; if ($LastVMStatus->{status} eq "unknown") { $LastVMStatus->{status} = $VM->Status; -- 2.15.1

1 0

[PATCH] testbot/web: Fix an indentation in the Stats code.
by Francois Gouget 07 Feb '18

07 Feb '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Stats.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index d9a3ce50c..9db2ad377 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -82,8 +82,8 @@ sub _AddRate($$;$) $RateKey =~ s/(?:\.time)?\.count$/.rate/; $AllStats ||= $Stats; $Stats->{$RateKey} = $AllStats->{elapsed} ? - 3600 * $Stats->{$StatKey} / $AllStats->{elapsed} : - "n/a"; + 3600 * $Stats->{$StatKey} / $AllStats->{elapsed} : + "n/a"; } sub _GetAverage($$) -- 2.15.1

1 0

[PATCH] adsldp: Add a stub for IADsADSystemInfo.
by Dmitry Timoshkov 07 Feb '18

07 Feb '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- configure | 75 ++++++---- configure.ac | 1 + dlls/adsldp/Makefile.in | 7 + dlls/adsldp/adsldp.c | 358 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/adsldp/adsldp.idl | 23 ++++ dlls/adsldp/adsldp.spec | 4 + include/iads.idl | 50 +++++++ 7 files changed, 489 insertions(+), 29 deletions(-) create mode 100644 dlls/adsldp/Makefile.in create mode 100644 dlls/adsldp/adsldp.c create mode 100644 dlls/adsldp/adsldp.idl create mode 100644 dlls/adsldp/adsldp.spec diff --git a/configure.ac b/configure.ac index 23f297b469..bf45709272 100644 --- a/configure.ac +++ b/configure.ac @@ -2793,6 +2793,7 @@ WINE_CONFIG_DLL(aclui,,[implib]) WINE_CONFIG_DLL(activeds,,[implib]) WINE_CONFIG_DLL(actxprxy,,[clean]) WINE_CONFIG_LIB(adsiid) +WINE_CONFIG_DLL(adsldp) WINE_CONFIG_DLL(adsldpc) WINE_CONFIG_DLL(advapi32,,[clean,implib]) WINE_CONFIG_TEST(dlls/advapi32/tests) diff --git a/dlls/adsldp/Makefile.in b/dlls/adsldp/Makefile.in new file mode 100644 index 0000000000..e033d91a7e --- /dev/null +++ b/dlls/adsldp/Makefile.in @@ -0,0 +1,7 @@ +MODULE = adsldp.dll + +C_SRCS = \ + adsldp.c + +IDL_SRCS = \ + adsldp.idl diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c new file mode 100644 index 0000000000..15f1d23acd --- /dev/null +++ b/dlls/adsldp/adsldp.c @@ -0,0 +1,358 @@ +/* + * Active Directory services LDAP Provider + * + * Copyright 2018 Dmitry Timoshkov + * + * 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> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "initguid.h" +#include "objbase.h" +#include "rpcproxy.h" +#include "iads.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(adsldp); + +static HMODULE adsldp_hinst; + +typedef struct +{ + IADsADSystemInfo IADsADSystemInfo_iface; + LONG ref; +} AD_sysinfo; + +static inline AD_sysinfo *impl_from_IADsADSystemInfo(IADsADSystemInfo *iface) +{ + return CONTAINING_RECORD(iface, AD_sysinfo, IADsADSystemInfo_iface); +} + +static HRESULT WINAPI sysinfo_QueryInterface(IADsADSystemInfo *iface, REFIID riid, void **obj) +{ + TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), obj); + + if (!riid || !obj) return E_INVALIDARG; + + if (IsEqualGUID(riid, &IID_IADsADSystemInfo) || + IsEqualGUID(riid, &IID_IDispatch) || + IsEqualGUID(riid, &IID_IUnknown)) + { + IADsADSystemInfo_AddRef(iface); + *obj = iface; + return S_OK; + } + + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI sysinfo_AddRef(IADsADSystemInfo *iface) +{ + AD_sysinfo *sysinfo = impl_from_IADsADSystemInfo(iface); + return InterlockedIncrement(&sysinfo->ref); +} + +static ULONG WINAPI sysinfo_Release(IADsADSystemInfo *iface) +{ + AD_sysinfo *sysinfo = impl_from_IADsADSystemInfo(iface); + LONG ref = InterlockedDecrement(&sysinfo->ref); + + if (!ref) + { + TRACE("destroying %p\n", iface); + HeapFree(GetProcessHeap(), 0, sysinfo); + } + + return ref; +} + +static HRESULT WINAPI sysinfo_GetTypeInfoCount(IADsADSystemInfo *iface, UINT *count) +{ + FIXME("%p,%p: stub\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI sysinfo_GetTypeInfo(IADsADSystemInfo *iface, UINT index, LCID lcid, ITypeInfo **info) +{ + FIXME("%p,%u,%#x,%p: stub\n", iface, index, lcid, info); + return E_NOTIMPL; +} + +static HRESULT WINAPI sysinfo_GetIDsOfNames(IADsADSystemInfo *iface, REFIID riid, LPOLESTR *names, + UINT count, LCID lcid, DISPID *dispid) +{ + FIXME("%p,%s,%p,%u,%u,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); + return E_NOTIMPL; +} + +static HRESULT WINAPI sysinfo_Invoke(IADsADSystemInfo *iface, DISPID dispid, REFIID riid, LCID lcid, WORD flags, + DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *argerr) +{ + FIXME("%p,%d,%s,%04x,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, + params, result, excepinfo, argerr); + return E_NOTIMPL; +} + +static HRESULT WINAPI sysinfo_get_UserName(IADsADSystemInfo *iface, BSTR *retval) +{ + FIXME("%p,%p: stub\n", iface, retval); + return E_NOTIMPL; +} + +static HRESULT WINAPI sysinfo_get_ComputerName(IADsADSystemInfo *iface, BSTR *retval) +{ + FIXME("%p,%p: stub\n", iface, retval); + return E_NOTIMPL; +} + +static HRESULT WINAPI sysinfo_get_SiteName(IADsADSystemInfo *iface, BSTR *retval) +{ + FIXME("%p,%p: stub\n", iface, retval); + return E_NOTIMPL; +} + +static HRESULT WINAPI sysinfo_get_DomainShortName(IADsADSystemInfo *iface, BSTR *retval) +{ + FIXME("%p,%p: stub\n", iface, retval); + return E_NOTIMPL; +} + +static HRESULT WINAPI sysinfo_get_DomainDNSName(IADsADSystemInfo *iface, BSTR *retval) +{ + FIXME("%p,%p: stub\n", iface, retval); + return E_NOTIMPL; +} + +static HRESULT WINAPI sysinfo_get_ForestDNSName(IADsADSystemInfo *iface, BSTR *retval) +{ + FIXME("%p,%p: stub\n", iface, retval); + return E_NOTIMPL; +} + +static HRESULT WINAPI sysinfo_get_PDCRoleOwner(IADsADSystemInfo *iface, BSTR *retval) +{ + FIXME("%p,%p: stub\n", iface, retval); + return E_NOTIMPL; +} + +static HRESULT WINAPI sysinfo_get_SchemaRoleOwner(IADsADSystemInfo *iface, BSTR *retval) +{ + FIXME("%p,%p: stub\n", iface, retval); + return E_NOTIMPL; +} + +static HRESULT WINAPI sysinfo_get_IsNativeMode(IADsADSystemInfo *iface, VARIANT_BOOL *retval) +{ + FIXME("%p,%p: stub\n", iface, retval); + return E_NOTIMPL; +} + +static HRESULT WINAPI sysinfo_GetAnyDCName(IADsADSystemInfo *iface, BSTR *retval) +{ + FIXME("%p,%p: stub\n", iface, retval); + return E_NOTIMPL; +} + +static HRESULT WINAPI sysinfo_GetDCSiteName(IADsADSystemInfo *iface, BSTR server, BSTR *retval) +{ + FIXME("%p,%s,%p: stub\n", iface, debugstr_w(server), retval); + return E_NOTIMPL; +} + +static HRESULT WINAPI sysinfo_RefreshSchemaCache(IADsADSystemInfo *iface) +{ + FIXME("%p: stub\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI sysinfo_GetTrees(IADsADSystemInfo *iface, VARIANT *retval) +{ + FIXME("%p,%p: stub\n", iface, retval); + return E_NOTIMPL; +} + +static const IADsADSystemInfoVtbl IADsADSystemInfo_vtbl = +{ + sysinfo_QueryInterface, + sysinfo_AddRef, + sysinfo_Release, + sysinfo_GetTypeInfoCount, + sysinfo_GetTypeInfo, + sysinfo_GetIDsOfNames, + sysinfo_Invoke, + sysinfo_get_UserName, + sysinfo_get_ComputerName, + sysinfo_get_SiteName, + sysinfo_get_DomainShortName, + sysinfo_get_DomainDNSName, + sysinfo_get_ForestDNSName, + sysinfo_get_PDCRoleOwner, + sysinfo_get_SchemaRoleOwner, + sysinfo_get_IsNativeMode, + sysinfo_GetAnyDCName, + sysinfo_GetDCSiteName, + sysinfo_RefreshSchemaCache, + sysinfo_GetTrees +}; + +static HRESULT ADSystemInfo_create(void **obj) +{ + AD_sysinfo *sysinfo; + + sysinfo = HeapAlloc(GetProcessHeap(), 0, sizeof(*sysinfo)); + if (!sysinfo) return E_OUTOFMEMORY; + + sysinfo->IADsADSystemInfo_iface.lpVtbl = &IADsADSystemInfo_vtbl; + sysinfo->ref = 1; + *obj = &sysinfo->IADsADSystemInfo_iface; + + TRACE("created %p\n", *obj); + + return S_OK; +} + +typedef struct +{ + IClassFactory IClassFactory_iface; + HRESULT (*constructor)(void **); +} ADSystemInfo_factory; + +static inline ADSystemInfo_factory *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, ADSystemInfo_factory, IClassFactory_iface); +} + +static HRESULT WINAPI factory_QueryInterface(IClassFactory *iface, REFIID riid, LPVOID *obj) +{ + TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), obj); + + if (!riid || !obj) return E_INVALIDARG; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IClassFactory)) + { + IClassFactory_AddRef(iface); + *obj = iface; + return S_OK; + } + + *obj = NULL; + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI factory_AddRef(IClassFactory *iface) +{ + return 2; +} + +static ULONG WINAPI factory_Release(IClassFactory *iface) +{ + return 1; +} + +static HRESULT WINAPI factory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **obj) +{ + ADSystemInfo_factory *factory = impl_from_IClassFactory(iface); + IUnknown *unknown; + HRESULT hr; + + TRACE("%p,%s,%p\n", outer, debugstr_guid(riid), obj); + + if (!riid || !obj) return E_INVALIDARG; + + *obj = NULL; + if (outer) return CLASS_E_NOAGGREGATION; + + hr = factory->constructor((void **)&unknown); + if (hr == S_OK) + { + hr = IUnknown_QueryInterface(unknown, riid, obj); + IUnknown_Release(unknown); + } + return hr; +} + +static HRESULT WINAPI factory_LockServer(IClassFactory *iface, BOOL lock) +{ + FIXME("%p,%d: stub\n", iface, lock); + return S_OK; +} + +static const struct IClassFactoryVtbl factory_vtbl = +{ + factory_QueryInterface, + factory_AddRef, + factory_Release, + factory_CreateInstance, + factory_LockServer +}; + +static ADSystemInfo_factory ADSystemInfo_cf = { { &factory_vtbl }, ADSystemInfo_create }; + +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, LPVOID *obj) +{ + TRACE("%s,%s,%p\n", debugstr_guid(clsid), debugstr_guid(iid), obj); + + if (!clsid || !iid || !obj) return E_INVALIDARG; + + *obj = NULL; + + if (IsEqualGUID(clsid, &CLSID_ADSystemInfo)) + return IClassFactory_QueryInterface(&ADSystemInfo_cf.IClassFactory_iface, iid, obj); + + FIXME("class %s/%s is not implemented\n", debugstr_guid(clsid), debugstr_guid(iid)); + return CLASS_E_CLASSNOTAVAILABLE; +} + +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +HRESULT WINAPI DllRegisterServer(void) +{ + return __wine_register_resources(adsldp_hinst); +} + +HRESULT WINAPI DllUnregisterServer(void) +{ + return __wine_unregister_resources(adsldp_hinst); +} + +BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) +{ + TRACE("%p,%u,%p\n", hinst, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + + case DLL_PROCESS_ATTACH: + adsldp_hinst = hinst; + DisableThreadLibraryCalls(hinst); + break; + } + + return TRUE; +} diff --git a/dlls/adsldp/adsldp.idl b/dlls/adsldp/adsldp.idl new file mode 100644 index 0000000000..26faff5656 --- /dev/null +++ b/dlls/adsldp/adsldp.idl @@ -0,0 +1,23 @@ +/* + * Active Directory services LDAP Provider + * + * Copyright 2018 Dmitry Timoshkov + * + * 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 + */ + +#pragma makedep register + +#include "iads.idl" diff --git a/dlls/adsldp/adsldp.spec b/dlls/adsldp/adsldp.spec new file mode 100644 index 0000000000..b16365d0c9 --- /dev/null +++ b/dlls/adsldp/adsldp.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/include/iads.idl b/include/iads.idl index e7ad5fb549..4a54a2c933 100644 --- a/include/iads.idl +++ b/include/iads.idl @@ -777,3 +777,53 @@ interface IDirectorySearch : IUnknown HRESULT FreeColumn([in] PADS_SEARCH_COLUMN pSearchColumn); HRESULT CloseSearchHandle([in] ADS_SEARCH_HANDLE hSearchResult); } + +/***************************************************************************** + * IADsADSystemInfo interface + */ +[ + odl, + uuid(5bb11929-afd1-11d2-9cb9-0000f87a369e), + dual, + oleautomation +] +interface IADsADSystemInfo : IDispatch +{ + [id(0x00000002), propget] + HRESULT UserName([out, retval] BSTR *retval); + [id(0x00000003), propget] + HRESULT ComputerName([out, retval] BSTR *retval); + [id(0x00000004), propget] + HRESULT SiteName([out, retval] BSTR *retval); + [id(0x00000005), propget] + HRESULT DomainShortName([out, retval] BSTR *retval); + [id(0x00000006), propget] + HRESULT DomainDNSName([out, retval] BSTR *retval); + [id(0x00000007), propget] + HRESULT ForestDNSName([out, retval] BSTR *retval); + [id(0x00000008), propget] + HRESULT PDCRoleOwner([out, retval] BSTR *retval); + [id(0x00000009), propget] + HRESULT SchemaRoleOwner([out, retval] BSTR *retval); + [id(0x0000000a), propget] + HRESULT IsNativeMode([out, retval] VARIANT_BOOL *retval); + [id(0x0000000b)] + HRESULT GetAnyDCName([out, retval] BSTR *retval); + [id(0x0000000c)] + HRESULT GetDCSiteName([in] BSTR server, [out, retval] BSTR *retval); + [id(0x0000000d)] + HRESULT RefreshSchemaCache(); + [id(0x0000000e)] + HRESULT GetTrees([out, retval] VARIANT *retval); +} + +[ + helpstring("AD SystemInfo Object"), + uuid(50b6327f-afd1-11d2-9cb9-0000f87a369e), + threading(both) +] +coclass ADSystemInfo +{ + [default] interface IADsADSystemInfo; + interface IDispatch; +} -- 2.16.1

1 0

[PATCH] regedit: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 06 Feb '18

06 Feb '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Though this sounds like a perfect opportunity for the infallible alloc / realloc versions. Maybe paired with an exception handler for STATUS_NO_MEMORY. programs/regedit/childwnd.c | 3 ++- programs/regedit/edit.c | 1 + programs/regedit/framewnd.c | 1 + programs/regedit/hexedit.c | 1 + programs/regedit/listview.c | 1 + programs/regedit/regedit.c | 1 + programs/regedit/regproc.c | 15 +++------------ programs/regedit/regproc.h | 1 - programs/regedit/treeview.c | 1 + 9 files changed, 11 insertions(+), 14 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 7a5633fb0d..0c6d895193 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -27,8 +27,9 @@ #include "regproc.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unicode.h" - + WINE_DEFAULT_DEBUG_CHANNEL(regedit); ChildWnd* g_pChildWnd; diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 6ccce00ce5..c8b77bd755 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -29,6 +29,7 @@ #include <shellapi.h> #include <shlwapi.h> +#include "wine/heap.h" #include "wine/unicode.h" #include "main.h" #include "regproc.h" diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index c6fcee466d..94da217045 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -31,6 +31,7 @@ #include "main.h" #include "regproc.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(regedit); diff --git a/programs/regedit/hexedit.c b/programs/regedit/hexedit.c index 3f05aa6d65..fc6c3a3b08 100644 --- a/programs/regedit/hexedit.c +++ b/programs/regedit/hexedit.c @@ -35,6 +35,7 @@ #include "winnls.h" #include "commctrl.h" +#include "wine/heap.h" #include "main.h" #include "regproc.h" diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index 4c2ec36bb0..0934e03a39 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -27,6 +27,7 @@ #include "main.h" #include "regproc.h" +#include "wine/heap.h" #include "wine/unicode.h" static INT Image_String; diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index fe0163c56e..a69e929e48 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -24,6 +24,7 @@ #include <shellapi.h> #include "wine/unicode.h" #include "wine/debug.h" +#include "wine/heap.h" #include "regproc.h" WINE_DEFAULT_DEBUG_CHANNEL(regedit); diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 0911b50110..35b03228c4 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -29,6 +29,7 @@ #include <windows.h> #include <wine/unicode.h> #include <wine/debug.h> +#include <wine/heap.h> #include "regproc.h" WINE_DEFAULT_DEBUG_CHANNEL(regedit); @@ -46,7 +47,7 @@ static HKEY reg_class_keys[] = { void *heap_xalloc(size_t size) { - void *buf = HeapAlloc(GetProcessHeap(), 0, size); + void *buf = heap_alloc(size); if (!buf) { ERR("Out of memory!\n"); @@ -57,12 +58,7 @@ void *heap_xalloc(size_t size) void *heap_xrealloc(void *buf, size_t size) { - void *new_buf; - - if (buf) - new_buf = HeapReAlloc(GetProcessHeap(), 0, buf, size); - else - new_buf = HeapAlloc(GetProcessHeap(), 0, size); + void *new_buf = heap_realloc(buf, size); if (!new_buf) { @@ -73,11 +69,6 @@ void *heap_xrealloc(void *buf, size_t size) return new_buf; } -BOOL heap_free(void *buf) -{ - return HeapFree(GetProcessHeap(), 0, buf); -} - /****************************************************************************** * Allocates memory and converts input from multibyte to wide chars * Returned string must be freed by the caller diff --git a/programs/regedit/regproc.h b/programs/regedit/regproc.h index 9364fde7ec..bfb0cba04b 100644 --- a/programs/regedit/regproc.h +++ b/programs/regedit/regproc.h @@ -30,7 +30,6 @@ void WINAPIV error_exit(unsigned int id, ...); char *GetMultiByteString(const WCHAR *strW); void *heap_xalloc(size_t size); void *heap_xrealloc(void *buf, size_t size); -BOOL heap_free(void *buf); BOOL import_registry_file(FILE *reg_file); void delete_registry_key(WCHAR *reg_key_name); BOOL export_registry_key(WCHAR *file_name, WCHAR *path, DWORD format); diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index 77befb5280..4bbec40df8 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -30,6 +30,7 @@ #include <wine/debug.h> #include <shlwapi.h> +#include "wine/heap.h" #include "main.h" #include "regproc.h" -- 2.14.3

1 0

[PATCH] wmvcore: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 06 Feb '18

06 Feb '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Somehow I'm not happy about this patch as wmvcore.h remains pretty empty and my temptation was to just remove it. That can be a second patch though if desired. dlls/wmvcore/wmvcore.h | 10 ---------- dlls/wmvcore/wmvcore_main.c | 1 + dlls/wmvcore/writer.c | 1 + 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/wmvcore/wmvcore.h b/dlls/wmvcore/wmvcore.h index ca06e0a4a6..e17547052d 100644 --- a/dlls/wmvcore/wmvcore.h +++ b/dlls/wmvcore/wmvcore.h @@ -24,13 +24,3 @@ #include "windef.h" #include "winbase.h" - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index ae8b486532..1b452884f1 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -21,6 +21,7 @@ #include "initguid.h" #include "wmsdk.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(wmvcore); diff --git a/dlls/wmvcore/writer.c b/dlls/wmvcore/writer.c index c1c30be895..717984db1a 100644 --- a/dlls/wmvcore/writer.c +++ b/dlls/wmvcore/writer.c @@ -20,6 +20,7 @@ #include "wmsdkidl.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(wmvcore); -- 2.14.3

1 0

[PATCH] wmp: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 06 Feb '18

06 Feb '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wmp/oleobj.c | 1 + dlls/wmp/wmp_private.h | 15 --------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index acf38f3223..4799712d3a 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -20,6 +20,7 @@ #include "olectl.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(wmp); diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index 7b7f51cd63..04173f3ad3 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -46,18 +46,3 @@ HRESULT WINAPI WMPFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) void unregister_wmp_class(void) DECLSPEC_HIDDEN; extern HINSTANCE wmp_instance DECLSPEC_HIDDEN; - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} -- 2.14.3

1 0

[PATCH 5/5] d3d9: Use the global memory allocation helpers.
by Henri Verbeet 06 Feb '18

06 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/buffer.c | 4 +-- dlls/d3d9/d3d9_main.c | 8 ++--- dlls/d3d9/d3d9_private.h | 1 + dlls/d3d9/device.c | 84 ++++++++++++++++++------------------------- dlls/d3d9/directx.c | 12 +++---- dlls/d3d9/query.c | 2 +- dlls/d3d9/shader.c | 4 +-- dlls/d3d9/stateblock.c | 2 +- dlls/d3d9/surface.c | 2 +- dlls/d3d9/swapchain.c | 6 ++-- dlls/d3d9/texture.c | 2 +- dlls/d3d9/vertexdeclaration.c | 28 +++++++-------- dlls/d3d9/volume.c | 2 +- 13 files changed, 70 insertions(+), 87 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 635483c..795164c 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -263,7 +263,7 @@ static void STDMETHODCALLTYPE d3d9_vertexbuffer_wined3d_object_destroyed(void *p { struct d3d9_vertexbuffer *buffer = parent; d3d9_resource_cleanup(&buffer->resource); - HeapFree(GetProcessHeap(), 0, buffer); + heap_free(buffer); } static const struct wined3d_parent_ops d3d9_vertexbuffer_wined3d_parent_ops = @@ -553,7 +553,7 @@ static void STDMETHODCALLTYPE d3d9_indexbuffer_wined3d_object_destroyed(void *pa { struct d3d9_indexbuffer *buffer = parent; d3d9_resource_cleanup(&buffer->resource); - HeapFree(GetProcessHeap(), 0, buffer); + heap_free(buffer); } static const struct wined3d_parent_ops d3d9_indexbuffer_wined3d_parent_ops = diff --git a/dlls/d3d9/d3d9_main.c b/dlls/d3d9/d3d9_main.c index 0afdc04..c23fa54 100644 --- a/dlls/d3d9/d3d9_main.c +++ b/dlls/d3d9/d3d9_main.c @@ -39,13 +39,13 @@ IDirect3D9 * WINAPI DECLSPEC_HOTPATCH Direct3DCreate9(UINT sdk_version) TRACE("sdk_version %#x.\n", sdk_version); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return NULL; if (!d3d9_init(object, FALSE)) { WARN("Failed to initialize d3d9.\n"); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return NULL; } @@ -60,13 +60,13 @@ HRESULT WINAPI DECLSPEC_HOTPATCH Direct3DCreate9Ex(UINT sdk_version, IDirect3D9E TRACE("sdk_version %#x, d3d9ex %p.\n", sdk_version, d3d9ex); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; if (!d3d9_init(object, TRUE)) { WARN("Failed to initialize d3d9.\n"); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return D3DERR_NOTAVAILABLE; } diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 5a1aac8..24b793e 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -34,6 +34,7 @@ #include "wingdi.h" #include "winuser.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unicode.h" #include "d3d9.h" diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 8f992ba..9dd58a3 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -480,14 +480,14 @@ static ULONG WINAPI DECLSPEC_HOTPATCH d3d9_device_Release(IDirect3DDevice9Ex *if { wined3d_vertex_declaration_decref(device->fvf_decls[i].decl); } - HeapFree(GetProcessHeap(), 0, device->fvf_decls); + heap_free(device->fvf_decls); if (device->vertex_buffer) wined3d_buffer_decref(device->vertex_buffer); if (device->index_buffer) wined3d_buffer_decref(device->index_buffer); - HeapFree(GetProcessHeap(), 0, device->implicit_swapchains); + heap_free(device->implicit_swapchains); wined3d_device_uninit_3d(device->wined3d_device); wined3d_device_release_focus_window(device->wined3d_device); @@ -496,7 +496,7 @@ static ULONG WINAPI DECLSPEC_HOTPATCH d3d9_device_Release(IDirect3DDevice9Ex *if IDirect3D9Ex_Release(&device->d3d_parent->IDirect3D9Ex_iface); - HeapFree(GetProcessHeap(), 0, device); + heap_free(device); } return refcount; @@ -796,8 +796,7 @@ static HRESULT d3d9_device_get_swapchains(struct d3d9_device *device) UINT i, new_swapchain_count = wined3d_device_get_swapchain_count(device->wined3d_device); struct wined3d_swapchain *wined3d_swapchain; - if (!(device->implicit_swapchains = HeapAlloc(GetProcessHeap(), 0, - new_swapchain_count * sizeof(*device->implicit_swapchains)))) + if (!(device->implicit_swapchains = heap_alloc(new_swapchain_count * sizeof(*device->implicit_swapchains)))) return E_OUTOFMEMORY; for (i = 0; i < new_swapchain_count; ++i) @@ -855,7 +854,7 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, if (SUCCEEDED(hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, mode ? &wined3d_mode : NULL, reset_enum_callback, !extended))) { - HeapFree(GetProcessHeap(), 0, device->implicit_swapchains); + heap_free(device->implicit_swapchains); if (!extended) { @@ -1051,15 +1050,14 @@ static HRESULT WINAPI d3d9_device_CreateTexture(IDirect3DDevice9Ex *iface, } } - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = heap_alloc_zero(sizeof(*object)))) return D3DERR_OUTOFVIDEOMEMORY; hr = texture_init(object, device, width, height, levels, usage, format, pool); if (FAILED(hr)) { WARN("Failed to initialize texture, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -1104,15 +1102,14 @@ static HRESULT WINAPI d3d9_device_CreateVolumeTexture(IDirect3DDevice9Ex *iface, FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); } - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = heap_alloc_zero(sizeof(*object)))) return D3DERR_OUTOFVIDEOMEMORY; hr = volumetexture_init(object, device, width, height, depth, levels, usage, format, pool); if (FAILED(hr)) { WARN("Failed to initialize volume texture, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -1150,15 +1147,14 @@ static HRESULT WINAPI d3d9_device_CreateCubeTexture(IDirect3DDevice9Ex *iface, FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); } - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = heap_alloc_zero(sizeof(*object)))) return D3DERR_OUTOFVIDEOMEMORY; hr = cubetexture_init(object, device, edge_length, levels, usage, format, pool); if (FAILED(hr)) { WARN("Failed to initialize cube texture, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -1195,15 +1191,14 @@ static HRESULT WINAPI d3d9_device_CreateVertexBuffer(IDirect3DDevice9Ex *iface, FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); } - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = heap_alloc_zero(sizeof(*object)))) return D3DERR_OUTOFVIDEOMEMORY; hr = vertexbuffer_init(object, device, size, usage, fvf, pool); if (FAILED(hr)) { WARN("Failed to initialize vertex buffer, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -1240,15 +1235,14 @@ static HRESULT WINAPI d3d9_device_CreateIndexBuffer(IDirect3DDevice9Ex *iface, U FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); } - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = heap_alloc_zero(sizeof(*object)))) return D3DERR_OUTOFVIDEOMEMORY; hr = indexbuffer_init(object, device, size, usage, format, pool); if (FAILED(hr)) { WARN("Failed to initialize index buffer, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -2107,15 +2101,14 @@ static HRESULT WINAPI d3d9_device_CreateStateBlock(IDirect3DDevice9Ex *iface, return D3DERR_INVALIDCALL; } - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; hr = stateblock_init(object, device, type, NULL); if (FAILED(hr)) { WARN("Failed to initialize stateblock, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -2157,8 +2150,7 @@ static HRESULT WINAPI d3d9_device_EndStateBlock(IDirect3DDevice9Ex *iface, IDire return hr; } - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = heap_alloc_zero(sizeof(*object)))) { wined3d_mutex_lock(); wined3d_stateblock_decref(wined3d_stateblock); @@ -2173,7 +2165,7 @@ static HRESULT WINAPI d3d9_device_EndStateBlock(IDirect3DDevice9Ex *iface, IDire wined3d_mutex_lock(); wined3d_stateblock_decref(wined3d_stateblock); wined3d_mutex_unlock(); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -2897,7 +2889,7 @@ static struct wined3d_vertex_declaration *device_get_fvf_declaration(struct d3d9 return NULL; hr = d3d9_vertex_declaration_create(device, elements, &d3d9_declaration); - HeapFree(GetProcessHeap(), 0, elements); + heap_free(elements); if (FAILED(hr)) return NULL; @@ -2905,8 +2897,7 @@ static struct wined3d_vertex_declaration *device_get_fvf_declaration(struct d3d9 { UINT grow = max(device->fvf_decl_size / 2, 8); - fvf_decls = HeapReAlloc(GetProcessHeap(), 0, fvf_decls, sizeof(*fvf_decls) * (device->fvf_decl_size + grow)); - if (!fvf_decls) + if (!(fvf_decls = heap_realloc(fvf_decls, sizeof(*fvf_decls) * (device->fvf_decl_size + grow)))) { IDirect3DVertexDeclaration9_Release(&d3d9_declaration->IDirect3DVertexDeclaration9_iface); return NULL; @@ -2992,15 +2983,14 @@ static HRESULT WINAPI d3d9_device_CreateVertexShader(IDirect3DDevice9Ex *iface, TRACE("iface %p, byte_code %p, shader %p.\n", iface, byte_code, shader); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; hr = vertexshader_init(object, device, byte_code); if (FAILED(hr)) { WARN("Failed to initialize vertex shader, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -3290,8 +3280,7 @@ static HRESULT WINAPI d3d9_device_CreatePixelShader(IDirect3DDevice9Ex *iface, TRACE("iface %p, byte_code %p, shader %p.\n", iface, byte_code, shader); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = heap_alloc_zero(sizeof(*object)))) { FIXME("Failed to allocate pixel shader memory.\n"); return E_OUTOFMEMORY; @@ -3301,7 +3290,7 @@ static HRESULT WINAPI d3d9_device_CreatePixelShader(IDirect3DDevice9Ex *iface, if (FAILED(hr)) { WARN("Failed to initialize pixel shader, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -3478,15 +3467,14 @@ static HRESULT WINAPI d3d9_device_CreateQuery(IDirect3DDevice9Ex *iface, D3DQUER TRACE("iface %p, type %#x, query %p.\n", iface, type, query); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; hr = query_init(object, device, type); if (FAILED(hr)) { WARN("Failed to initialize query, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -3915,7 +3903,7 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent TRACE("device_parent %p, wined3d_texture %p, sub_resource_idx %u, parent %p, parent_ops %p.\n", device_parent, wined3d_texture, sub_resource_idx, parent, parent_ops); - if (!(d3d_surface = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d3d_surface)))) + if (!(d3d_surface = heap_alloc_zero(sizeof(*d3d_surface)))) return E_OUTOFMEMORY; surface_init(d3d_surface, wined3d_texture, sub_resource_idx, parent_ops); @@ -3934,7 +3922,7 @@ static HRESULT CDECL device_parent_volume_created(struct wined3d_device_parent * TRACE("device_parent %p, texture %p, sub_resource_idx %u, parent %p, parent_ops %p.\n", device_parent, wined3d_texture, sub_resource_idx, parent, parent_ops); - if (!(d3d_volume = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d3d_volume)))) + if (!(d3d_volume = heap_alloc_zero(sizeof(*d3d_volume)))) return E_OUTOFMEMORY; volume_init(d3d_volume, wined3d_texture, sub_resource_idx, parent_ops); @@ -4085,8 +4073,7 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine } } - swapchain_desc = HeapAlloc(GetProcessHeap(), 0, sizeof(*swapchain_desc) * count); - if (!swapchain_desc) + if (!(swapchain_desc = heap_alloc(sizeof(*swapchain_desc) * count))) { ERR("Failed to allocate wined3d parameters.\n"); wined3d_device_release_focus_window(device->wined3d_device); @@ -4102,7 +4089,7 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine { wined3d_device_release_focus_window(device->wined3d_device); wined3d_device_decref(device->wined3d_device); - HeapFree(GetProcessHeap(), 0, swapchain_desc); + heap_free(swapchain_desc); wined3d_mutex_unlock(); return D3DERR_INVALIDCALL; } @@ -4112,7 +4099,7 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine { WARN("Failed to initialize 3D, hr %#x.\n", hr); wined3d_device_release_focus_window(device->wined3d_device); - HeapFree(GetProcessHeap(), 0, swapchain_desc); + heap_free(swapchain_desc); wined3d_device_decref(device->wined3d_device); wined3d_mutex_unlock(); return hr; @@ -4137,16 +4124,15 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine wined3d_mutex_unlock(); - HeapFree(GetProcessHeap(), 0, swapchain_desc); + heap_free(swapchain_desc); /* Initialize the converted declaration array. This creates a valid pointer * and when adding decls HeapReAlloc() can be used without further checking. */ - device->fvf_decls = HeapAlloc(GetProcessHeap(), 0, 0); - if (!device->fvf_decls) + if (!(device->fvf_decls = heap_alloc(0))) { ERR("Failed to allocate FVF vertex declaration map memory.\n"); wined3d_mutex_lock(); - HeapFree(GetProcessHeap(), 0, device->implicit_swapchains); + heap_free(device->implicit_swapchains); wined3d_device_uninit_3d(device->wined3d_device); wined3d_device_release_focus_window(device->wined3d_device); wined3d_device_decref(device->wined3d_device); diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 08c3131..cdce669 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -86,7 +86,7 @@ static ULONG WINAPI d3d9_Release(IDirect3D9Ex *iface) wined3d_decref(d3d9->wined3d); wined3d_mutex_unlock(); - HeapFree(GetProcessHeap(), 0, d3d9); + heap_free(d3d9); } return refcount; @@ -400,15 +400,14 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_CreateDevice(IDirect3D9Ex *iface, U TRACE("iface %p, adapter %u, device_type %#x, focus_window %p, flags %#x, parameters %p, device %p.\n", iface, adapter, device_type, focus_window, flags, parameters, device); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; hr = device_init(object, d3d9, d3d9->wined3d, adapter, device_type, focus_window, flags, parameters, NULL); if (FAILED(hr)) { WARN("Failed to initialize device, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -508,15 +507,14 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_CreateDeviceEx(IDirect3D9Ex *iface, TRACE("iface %p, adapter %u, device_type %#x, focus_window %p, flags %#x, parameters %p, mode %p, device %p.\n", iface, adapter, device_type, focus_window, flags, parameters, mode, device); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; hr = device_init(object, d3d9, d3d9->wined3d, adapter, device_type, focus_window, flags, parameters, mode); if (FAILED(hr)) { WARN("Failed to initialize device, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } diff --git a/dlls/d3d9/query.c b/dlls/d3d9/query.c index df7eb6e..12ff95b 100644 --- a/dlls/d3d9/query.c +++ b/dlls/d3d9/query.c @@ -72,7 +72,7 @@ static ULONG WINAPI d3d9_query_Release(IDirect3DQuery9 *iface) wined3d_mutex_unlock(); IDirect3DDevice9Ex_Release(query->parent_device); - HeapFree(GetProcessHeap(), 0, query); + heap_free(query); } return refcount; } diff --git a/dlls/d3d9/shader.c b/dlls/d3d9/shader.c index 8aa3eaa..9cb3983 100644 --- a/dlls/d3d9/shader.c +++ b/dlls/d3d9/shader.c @@ -126,7 +126,7 @@ static const IDirect3DVertexShader9Vtbl d3d9_vertexshader_vtbl = static void STDMETHODCALLTYPE d3d9_vertexshader_wined3d_object_destroyed(void *parent) { - HeapFree(GetProcessHeap(), 0, parent); + heap_free(parent); } static const struct wined3d_parent_ops d3d9_vertexshader_wined3d_parent_ops = @@ -280,7 +280,7 @@ static const IDirect3DPixelShader9Vtbl d3d9_pixelshader_vtbl = static void STDMETHODCALLTYPE d3d9_pixelshader_wined3d_object_destroyed(void *parent) { - HeapFree(GetProcessHeap(), 0, parent); + heap_free(parent); } static const struct wined3d_parent_ops d3d9_pixelshader_wined3d_parent_ops = diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index 5eea835..62b3bac 100644 --- a/dlls/d3d9/stateblock.c +++ b/dlls/d3d9/stateblock.c @@ -72,7 +72,7 @@ static ULONG WINAPI d3d9_stateblock_Release(IDirect3DStateBlock9 *iface) wined3d_mutex_unlock(); IDirect3DDevice9Ex_Release(stateblock->parent_device); - HeapFree(GetProcessHeap(), 0, stateblock); + heap_free(stateblock); } return refcount; diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 8c42a8c..fae6ca6 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -340,7 +340,7 @@ static void STDMETHODCALLTYPE surface_wined3d_object_destroyed(void *parent) { struct d3d9_surface *surface = parent; d3d9_resource_cleanup(&surface->resource); - HeapFree(GetProcessHeap(), 0, surface); + heap_free(surface); } static const struct wined3d_parent_ops d3d9_surface_wined3d_parent_ops = diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index 8f3803a..411040a 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -335,7 +335,7 @@ static const struct IDirect3DSwapChain9ExVtbl d3d9_swapchain_vtbl = static void STDMETHODCALLTYPE d3d9_swapchain_wined3d_object_released(void *parent) { - HeapFree(GetProcessHeap(), 0, parent); + heap_free(parent); } static const struct wined3d_parent_ops d3d9_swapchain_wined3d_parent_ops = @@ -374,13 +374,13 @@ HRESULT d3d9_swapchain_create(struct d3d9_device *device, struct wined3d_swapcha struct d3d9_swapchain *object; HRESULT hr; - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; if (FAILED(hr = swapchain_init(object, device, desc))) { WARN("Failed to initialize swapchain, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index a1c5259..6b7a30c 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1195,7 +1195,7 @@ static void STDMETHODCALLTYPE d3d9_texture_wined3d_object_destroyed(void *parent { struct d3d9_texture *texture = parent; d3d9_resource_cleanup(&texture->resource); - HeapFree(GetProcessHeap(), 0, texture); + heap_free(texture); } static const struct wined3d_parent_ops d3d9_texture_wined3d_parent_ops = diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index b66827f..f7e0eb9 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -89,8 +89,8 @@ HRESULT vdecl_convert_fvf( has_psize + has_diffuse + has_specular + num_textures + 1; /* convert the declaration */ - elements = HeapAlloc(GetProcessHeap(), 0, size * sizeof(D3DVERTEXELEMENT9)); - if (!elements) return D3DERR_OUTOFVIDEOMEMORY; + if (!(elements = heap_alloc(size * sizeof(*elements)))) + return D3DERR_OUTOFVIDEOMEMORY; elements[size-1] = end_element; idx = 0; @@ -310,8 +310,8 @@ struct d3d9_vertex_declaration *unsafe_impl_from_IDirect3DVertexDeclaration9(IDi static void STDMETHODCALLTYPE d3d9_vertexdeclaration_wined3d_object_destroyed(void *parent) { struct d3d9_vertex_declaration *declaration = parent; - HeapFree(GetProcessHeap(), 0, declaration->elements); - HeapFree(GetProcessHeap(), 0, declaration); + heap_free(declaration->elements); + heap_free(declaration); } static const struct wined3d_parent_ops d3d9_vertexdeclaration_wined3d_parent_ops = @@ -336,8 +336,8 @@ static HRESULT convert_to_wined3d_declaration(const D3DVERTEXELEMENT9 *d3d9_elem /* Skip the END element */ --count; - *wined3d_elements = HeapAlloc(GetProcessHeap(), 0, count * sizeof(**wined3d_elements)); - if (!*wined3d_elements) { + if (!(*wined3d_elements = heap_alloc(count * sizeof(**wined3d_elements)))) + { FIXME("Memory allocation failed\n"); return D3DERR_OUTOFVIDEOMEMORY; } @@ -347,7 +347,7 @@ static HRESULT convert_to_wined3d_declaration(const D3DVERTEXELEMENT9 *d3d9_elem if (d3d9_elements[i].Type >= (sizeof(d3d_dtype_lookup) / sizeof(*d3d_dtype_lookup))) { WARN("Invalid element type %#x.\n", d3d9_elements[i].Type); - HeapFree(GetProcessHeap(), 0, *wined3d_elements); + heap_free(*wined3d_elements); return E_FAIL; } (*wined3d_elements)[i].format = d3d_dtype_lookup[d3d9_elements[i].Type].format; @@ -385,10 +385,9 @@ static HRESULT vertexdeclaration_init(struct d3d9_vertex_declaration *declaratio declaration->refcount = 1; element_count = wined3d_element_count + 1; - declaration->elements = HeapAlloc(GetProcessHeap(), 0, element_count * sizeof(*declaration->elements)); - if (!declaration->elements) + if (!(declaration->elements = heap_alloc(element_count * sizeof(*declaration->elements)))) { - HeapFree(GetProcessHeap(), 0, wined3d_elements); + heap_free(wined3d_elements); ERR("Failed to allocate vertex declaration elements memory.\n"); return D3DERR_OUTOFVIDEOMEMORY; } @@ -399,10 +398,10 @@ static HRESULT vertexdeclaration_init(struct d3d9_vertex_declaration *declaratio hr = wined3d_vertex_declaration_create(device->wined3d_device, wined3d_elements, wined3d_element_count, declaration, &d3d9_vertexdeclaration_wined3d_parent_ops, &declaration->wined3d_declaration); wined3d_mutex_unlock(); - HeapFree(GetProcessHeap(), 0, wined3d_elements); + heap_free(wined3d_elements); if (FAILED(hr)) { - HeapFree(GetProcessHeap(), 0, declaration->elements); + heap_free(declaration->elements); WARN("Failed to create wined3d vertex declaration, hr %#x.\n", hr); return hr; } @@ -419,15 +418,14 @@ HRESULT d3d9_vertex_declaration_create(struct d3d9_device *device, struct d3d9_vertex_declaration *object; HRESULT hr; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; hr = vertexdeclaration_init(object, device, elements); if (FAILED(hr)) { WARN("Failed to initialize vertex declaration, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index 08e0d77..0fcc2a4 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -195,7 +195,7 @@ static void STDMETHODCALLTYPE volume_wined3d_object_destroyed(void *parent) { struct d3d9_volume *volume = parent; d3d9_resource_cleanup(&volume->resource); - HeapFree(GetProcessHeap(), 0, volume); + heap_free(volume); } static const struct wined3d_parent_ops d3d9_volume_wined3d_parent_ops = -- 2.1.4

1 0

[PATCH 4/5] ddraw: Avoid using WINED3DUSAGE_DYNAMIC without WINED3D_RESOURCE_ACCESS_GPU in d3d_execute_buffer_SetExecuteData().
by Henri Verbeet 06 Feb '18

06 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/executebuffer.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index b1afcf5..d710b34 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -620,7 +620,7 @@ static HRESULT WINAPI d3d_execute_buffer_SetExecuteData(IDirect3DExecuteBuffer * struct wined3d_buffer_desc desc; desc.byte_width = new_size * sizeof(D3DVERTEX); - desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY; + desc.usage = 0; desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; desc.access = WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP; desc.misc_flags = 0; @@ -660,9 +660,8 @@ static HRESULT WINAPI d3d_execute_buffer_SetExecuteData(IDirect3DExecuteBuffer * { box.left = buffer->src_vertex_pos * sizeof(D3DVERTEX); box.right = box.left + data->dwVertexCount * sizeof(D3DVERTEX); - hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->src_vertex_buffer), 0, - &map_desc, &box, buffer->src_vertex_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); - if (FAILED(hr)) + if (FAILED(hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->src_vertex_buffer), + 0, &map_desc, &box, 0))) return hr; memcpy(map_desc.data, ((BYTE *)buffer->desc.lpData) + data->dwVertexOffset, -- 2.1.4

1 0

[PATCH 3/5] ddraw: Use wined3d_buffer_create() in d3d_execute_buffer_SetExecuteData().
by Henri Verbeet 06 Feb '18

06 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/executebuffer.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 6ce77e3..b1afcf5 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -617,17 +617,25 @@ static HRESULT WINAPI d3d_execute_buffer_SetExecuteData(IDirect3DExecuteBuffer * { unsigned int new_size = max(data->dwVertexCount, buffer->vertex_size * 2); struct wined3d_buffer *src_buffer, *dst_buffer; + struct wined3d_buffer_desc desc; - hr = wined3d_buffer_create_vb(buffer->d3ddev->wined3d_device, new_size * sizeof(D3DVERTEX), - WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY, WINED3D_POOL_SYSTEM_MEM, - NULL, &ddraw_null_wined3d_parent_ops, &src_buffer); - if (FAILED(hr)) + desc.byte_width = new_size * sizeof(D3DVERTEX); + desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY; + desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; + desc.access = WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP; + desc.misc_flags = 0; + desc.structure_byte_stride = 0; + + if (FAILED(hr = wined3d_buffer_create(buffer->d3ddev->wined3d_device, &desc, + NULL, NULL, &ddraw_null_wined3d_parent_ops, &src_buffer))) return hr; - hr = wined3d_buffer_create_vb(buffer->d3ddev->wined3d_device, new_size * sizeof(D3DTLVERTEX), - WINED3DUSAGE_STATICDECL, WINED3D_POOL_DEFAULT, - NULL, &ddraw_null_wined3d_parent_ops, &dst_buffer); - if (FAILED(hr)) + desc.byte_width = new_size * sizeof(D3DTLVERTEX); + desc.usage = WINED3DUSAGE_STATICDECL; + desc.access = WINED3D_RESOURCE_ACCESS_GPU; + + if (FAILED(hr = wined3d_buffer_create(buffer->d3ddev->wined3d_device, &desc, + NULL, NULL, &ddraw_null_wined3d_parent_ops, &dst_buffer))) { wined3d_buffer_decref(src_buffer); return hr; -- 2.1.4

1 0

[PATCH 2/5] ddraw: Use wined3d_buffer_create() in d3d_device_prepare_vertex_buffer().
by Henri Verbeet 06 Feb '18

06 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/device.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 75fd6c4..c052dc2 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3465,15 +3465,22 @@ static HRESULT d3d_device_prepare_vertex_buffer(struct d3d_device *device, UINT if (device->vertex_buffer_size < min_size || !device->vertex_buffer) { UINT size = max(device->vertex_buffer_size * 2, min_size); + struct wined3d_buffer_desc desc; struct wined3d_buffer *buffer; TRACE("Growing vertex buffer to %u bytes\n", size); - hr = wined3d_buffer_create_vb(device->wined3d_device, size, WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY, - WINED3D_POOL_DEFAULT, NULL, &ddraw_null_wined3d_parent_ops, &buffer); - if (FAILED(hr)) + desc.byte_width = size; + desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY; + desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; + desc.access = WINED3D_RESOURCE_ACCESS_GPU; + desc.misc_flags = 0; + desc.structure_byte_stride = 0; + + if (FAILED(hr = wined3d_buffer_create(device->wined3d_device, &desc, + NULL, NULL, &ddraw_null_wined3d_parent_ops, &buffer))) { - ERR("(%p) wined3d_buffer_create_vb failed with hr = %08x\n", device, hr); + ERR("Failed to create vertex buffer, hr %#x.\n", hr); return hr; } -- 2.1.4

1 0

[PATCH 1/5] d3d9: Use wined3d_buffer_create() in d3d9_device_prepare_index_buffer().
by Henri Verbeet 06 Feb '18

06 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/device.c | 15 +++++++++++---- dlls/wined3d/buffer.c | 18 ------------------ dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 3 --- 4 files changed, 11 insertions(+), 26 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 954f3fa..8f992ba 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2646,15 +2646,22 @@ static HRESULT d3d9_device_prepare_index_buffer(struct d3d9_device *device, UINT if (device->index_buffer_size < min_size || !device->index_buffer) { UINT size = max(device->index_buffer_size * 2, min_size); + struct wined3d_buffer_desc desc; struct wined3d_buffer *buffer; TRACE("Growing index buffer to %u bytes.\n", size); - hr = wined3d_buffer_create_ib(device->wined3d_device, size, WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY, - WINED3D_POOL_DEFAULT, NULL, &d3d9_null_wined3d_parent_ops, &buffer); - if (FAILED(hr)) + desc.byte_width = size; + desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY | WINED3DUSAGE_STATICDECL; + desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; + desc.access = WINED3D_RESOURCE_ACCESS_GPU; + desc.misc_flags = 0; + desc.structure_byte_stride = 0; + + if (FAILED(hr = wined3d_buffer_create(device->wined3d_device, &desc, + NULL, NULL, &d3d9_null_wined3d_parent_ops, &buffer))) { - ERR("(%p) wined3d_buffer_create_ib failed with hr = %08x.\n", device, hr); + ERR("Failed to create index buffer, hr %#x.\n", hr); return hr; } diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 593d886..f1b4556 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1487,21 +1487,3 @@ HRESULT CDECL wined3d_buffer_create_vb(struct wined3d_device *device, UINT size, return wined3d_buffer_create(device, &desc, NULL, parent, parent_ops, buffer); } - -HRESULT CDECL wined3d_buffer_create_ib(struct wined3d_device *device, UINT size, DWORD usage, enum wined3d_pool pool, - void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_buffer **buffer) -{ - struct wined3d_buffer_desc desc; - - TRACE("device %p, size %u, usage %#x, pool %#x, parent %p, parent_ops %p, buffer %p.\n", - device, size, usage, pool, parent, parent_ops, buffer); - - desc.byte_width = size; - desc.usage = usage | WINED3DUSAGE_STATICDECL; - desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; - desc.access = resource_access_from_pool(pool); - desc.misc_flags = 0; - desc.structure_byte_stride = 0; - - return wined3d_buffer_create(device, &desc, NULL, parent, parent_ops, buffer); -} diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 74e61ea..606ba0b 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -23,7 +23,6 @@ @ cdecl wined3d_set_adapter_display_mode(ptr long ptr) @ cdecl wined3d_buffer_create(ptr ptr ptr ptr ptr ptr) -@ cdecl wined3d_buffer_create_ib(ptr long long long ptr ptr ptr) @ cdecl wined3d_buffer_create_vb(ptr long long long ptr ptr ptr) @ cdecl wined3d_buffer_decref(ptr) @ cdecl wined3d_buffer_get_parent(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 72168e5..2a79602 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2189,9 +2189,6 @@ HRESULT __cdecl wined3d_set_adapter_display_mode(struct wined3d *wined3d, HRESULT __cdecl wined3d_buffer_create(struct wined3d_device *device, const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_buffer **buffer); -HRESULT __cdecl wined3d_buffer_create_ib(struct wined3d_device *device, UINT length, DWORD usage, - enum wined3d_pool pool, void *parent, const struct wined3d_parent_ops *parent_ops, - struct wined3d_buffer **buffer); HRESULT __cdecl wined3d_buffer_create_vb(struct wined3d_device *device, UINT length, DWORD usage, enum wined3d_pool pool, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_buffer **buffer); -- 2.1.4

1 0

[PATCH] xaudio2: Fix ClassFactory ref counting
by Andrew Eikum 06 Feb '18

06 Feb '18

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/xaudio2_7/xapofx.c | 27 ++++++++++++++++++++------- dlls/xaudio2_7/xaudio_dll.c | 38 ++++++++++++++++++++------------------ dlls/xaudio2_7/xaudio_private.h | 2 +- 3 files changed, 41 insertions(+), 26 deletions(-) diff --git a/dlls/xaudio2_7/xapofx.c b/dlls/xaudio2_7/xapofx.c index 44dfb47a22..c39b428e29 100644 --- a/dlls/xaudio2_7/xapofx.c +++ b/dlls/xaudio2_7/xapofx.c @@ -764,7 +764,8 @@ static HRESULT WINAPI xapocf_CreateInstance(IClassFactory *iface, IUnknown *pOut static HRESULT WINAPI xapocf_LockServer(IClassFactory *iface, BOOL dolock) { - FIXME("(static)->(%d): stub!\n", dolock); + struct xapo_cf *This = xapo_impl_from_IClassFactory(iface); + FIXME("(%p)->(%d): stub!\n", This, dolock); return S_OK; } @@ -777,13 +778,17 @@ static const IClassFactoryVtbl xapo_Vtbl = xapocf_LockServer }; -IClassFactory *make_xapo_factory(REFCLSID clsid) +HRESULT make_xapo_factory(REFCLSID clsid, REFIID riid, void **ppv) { + HRESULT hr; struct xapo_cf *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(struct xapo_cf)); ret->IClassFactory_iface.lpVtbl = &xapo_Vtbl; ret->class = clsid; ret->ref = 0; - return &ret->IClassFactory_iface; + hr = IClassFactory_QueryInterface(&ret->IClassFactory_iface, riid, ppv); + if(FAILED(hr)) + HeapFree(GetProcessHeap(), 0, ret); + return hr; } #if XAUDIO2_VER >= 8 @@ -792,7 +797,9 @@ HRESULT WINAPI CreateAudioVolumeMeter(IUnknown **out) IClassFactory *cf; HRESULT hr; - cf = make_xapo_factory(&CLSID_AudioVolumeMeter27); + hr = make_xapo_factory(&CLSID_AudioVolumeMeter27, &IID_IClassFactory, (void**)&cf); + if(FAILED(hr)) + return hr; hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)out); @@ -806,7 +813,9 @@ HRESULT WINAPI CreateAudioReverb(IUnknown **out) IClassFactory *cf; HRESULT hr; - cf = make_xapo_factory(&CLSID_FXReverb); + hr = make_xapo_factory(&CLSID_FXReverb, &IID_IClassFactory, (void**)&cf); + if(FAILED(hr)) + return hr; hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)out); @@ -832,7 +841,9 @@ HRESULT CDECL CreateFX(REFCLSID clsid, IUnknown **out, void *initdata, UINT32 in class = &CLSID_FXEQ; if(class){ - cf = make_xapo_factory(class); + hr = make_xapo_factory(class, &IID_IClassFactory, (void**)&cf); + if(FAILED(hr)) + return hr; hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)&obj); IClassFactory_Release(cf); @@ -890,7 +901,9 @@ HRESULT CDECL CreateFX(REFCLSID clsid, IUnknown **out) /* TODO FXECHO, FXMasteringLimiter, */ if(class){ - cf = make_xapo_factory(class); + hr = make_xapo_factory(class, &IID_IClassFactory, (void**)&cf); + if(FAILED(hr)) + return hr; hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)&obj); IClassFactory_Release(cf); diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 9b7a07f7b3..0682a5f3b3 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -2121,7 +2121,8 @@ static HRESULT WINAPI XAudio2CF_CreateInstance(IClassFactory *iface, IUnknown *p static HRESULT WINAPI XAudio2CF_LockServer(IClassFactory *iface, BOOL dolock) { - FIXME("(static)->(%d): stub!\n", dolock); + struct xaudio2_cf *This = impl_from_IClassFactory(iface); + FIXME("(%p)->(%d): stub!\n", This, dolock); return S_OK; } @@ -2134,18 +2135,20 @@ static const IClassFactoryVtbl XAudio2CF_Vtbl = XAudio2CF_LockServer }; -static IClassFactory *make_xaudio2_factory(void) +static HRESULT make_xaudio2_factory(REFIID riid, void **ppv) { + HRESULT hr; struct xaudio2_cf *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(struct xaudio2_cf)); ret->IClassFactory_iface.lpVtbl = &XAudio2CF_Vtbl; ret->ref = 0; - return &ret->IClassFactory_iface; + hr = IClassFactory_QueryInterface(&ret->IClassFactory_iface, riid, ppv); + if(FAILED(hr)) + HeapFree(GetProcessHeap(), 0, ret); + return hr; } HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) { - IClassFactory *factory = NULL; - TRACE("(%s, %s, %p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); if(IsEqualGUID(rclsid, &CLSID_XAudio20) || @@ -2155,33 +2158,30 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) IsEqualGUID(rclsid, &CLSID_XAudio24) || IsEqualGUID(rclsid, &CLSID_XAudio25) || IsEqualGUID(rclsid, &CLSID_XAudio26) || - IsEqualGUID(rclsid, &CLSID_XAudio27)){ - factory = make_xaudio2_factory(); + IsEqualGUID(rclsid, &CLSID_XAudio27)) + return make_xaudio2_factory(riid, ppv); - }else if(IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter20) || + if(IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter20) || IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter21) || IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter22) || IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter23) || IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter24) || IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter25) || IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter26) || - IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter27)){ - factory = make_xapo_factory(&CLSID_AudioVolumeMeter27); + IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter27)) + return make_xapo_factory(&CLSID_AudioVolumeMeter27, riid, ppv); - }else if(IsEqualGUID(rclsid, &CLSID_AudioReverb20) || + if(IsEqualGUID(rclsid, &CLSID_AudioReverb20) || IsEqualGUID(rclsid, &CLSID_AudioReverb21) || IsEqualGUID(rclsid, &CLSID_AudioReverb22) || IsEqualGUID(rclsid, &CLSID_AudioReverb23) || IsEqualGUID(rclsid, &CLSID_AudioReverb24) || IsEqualGUID(rclsid, &CLSID_AudioReverb25) || IsEqualGUID(rclsid, &CLSID_AudioReverb26) || - IsEqualGUID(rclsid, &CLSID_AudioReverb27)){ - factory = make_xapo_factory(&CLSID_FXReverb); - } + IsEqualGUID(rclsid, &CLSID_AudioReverb27)) + return make_xapo_factory(&CLSID_FXReverb, riid, ppv); - if(!factory) return CLASS_E_CLASSNOTAVAILABLE; - - return IClassFactory_QueryInterface(factory, riid, ppv); + return CLASS_E_CLASSNOTAVAILABLE; } HRESULT xaudio2_initialize(IXAudio2Impl *This, UINT32 flags, XAUDIO2_PROCESSOR proc) @@ -2200,7 +2200,9 @@ HRESULT WINAPI XAudio2Create(IXAudio2 **ppxa2, UINT32 flags, XAUDIO2_PROCESSOR p TRACE("%p 0x%x 0x%x\n", ppxa2, flags, proc); - cf = make_xaudio2_factory(); + hr = make_xaudio2_factory(&IID_IClassFactory, (void**)&cf); + if(FAILED(hr)) + return hr; hr = IClassFactory_CreateInstance(cf, NULL, &IID_IXAudio2, (void**)&xa2); IClassFactory_Release(cf); diff --git a/dlls/xaudio2_7/xaudio_private.h b/dlls/xaudio2_7/xaudio_private.h index 1a4aa08ce5..5d3814fb9e 100644 --- a/dlls/xaudio2_7/xaudio_private.h +++ b/dlls/xaudio2_7/xaudio_private.h @@ -181,5 +181,5 @@ extern const IXAudio22Vtbl XAudio22_Vtbl DECLSPEC_HIDDEN; extern const IXAudio27Vtbl XAudio27_Vtbl DECLSPEC_HIDDEN; #endif -extern IClassFactory *make_xapo_factory(REFCLSID clsid) DECLSPEC_HIDDEN; +extern HRESULT make_xapo_factory(REFCLSID clsid, REFIID riid, void **ppv) DECLSPEC_HIDDEN; extern HRESULT xaudio2_initialize(IXAudio2Impl *This, UINT32 flags, XAUDIO2_PROCESSOR proc) DECLSPEC_HIDDEN; -- 2.16.1

1 0

[PATCH] advapi32: Also wait on services without a control thread during shutdown
by Andrew Eikum 06 Feb '18

06 Feb '18

Tested service messages during OS shutdown manually on Windows 7. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- I could submit those tests as WINETEST_INTERACTIVE or something, but they require a reboot, leave a lingering winetest service, and require manual validation of a file written to disk during the shutdown process. For bug 38838. --- dlls/advapi32/service.c | 94 +++++++++++++++++++++++++++++++------------------ 1 file changed, 59 insertions(+), 35 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 7d66326d51..70907e1fe2 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -529,6 +529,63 @@ static DWORD WINAPI service_control_dispatcher(LPVOID arg) return 1; } +/* wait for services which accept this type of message to become STOPPED */ +static void handle_shutdown_msg(DWORD msg, DWORD accept) +{ + SERVICE_STATUS st; + SERVICE_PRESHUTDOWN_INFO spi; + DWORD i, n = 0, sz, timeout = 2000; + ULONGLONG stop_time; + BOOL res, done = TRUE; + SC_HANDLE *wait_handles = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SC_HANDLE) * nb_services ); + + EnterCriticalSection( &service_cs ); + for (i = 0; i < nb_services; i++) + { + res = QueryServiceStatus( services[i]->full_access_handle, &st ); + if (!res || st.dwCurrentState == SERVICE_STOPPED || !(st.dwControlsAccepted & accept)) + continue; + + done = FALSE; + + if (accept == SERVICE_ACCEPT_PRESHUTDOWN) + { + res = QueryServiceConfig2W( services[i]->full_access_handle, SERVICE_CONFIG_PRESHUTDOWN_INFO, + (LPBYTE)&spi, sizeof(spi), &sz ); + if (res) + { + FIXME( "service should be able to delay shutdown\n" ); + timeout = max( spi.dwPreshutdownTimeout, timeout ); + } + } + + service_handle_control( services[i], msg, NULL, 0 ); + wait_handles[n++] = services[i]->full_access_handle; + } + LeaveCriticalSection( &service_cs ); + + /* FIXME: these timeouts should be more generous, but we can't currently delay prefix shutdown */ + timeout = min( timeout, 3000 ); + stop_time = GetTickCount64() + timeout; + + while (!done && GetTickCount64() < stop_time) + { + done = TRUE; + for (i = 0; i < n; i++) + { + res = QueryServiceStatus( wait_handles[i], &st ); + if (!res || st.dwCurrentState == SERVICE_STOPPED) + continue; + + done = FALSE; + Sleep( 100 ); + break; + } + } + + HeapFree( GetProcessHeap(), 0, wait_handles ); +} + /****************************************************************************** * service_run_main_thread */ @@ -583,41 +640,8 @@ static BOOL service_run_main_thread(void) ret = WaitForMultipleObjects( n, wait_handles, FALSE, INFINITE ); if (!ret) /* system process event */ { - SERVICE_STATUS st; - SERVICE_PRESHUTDOWN_INFO spi; - DWORD timeout = 5000; - BOOL res; - - EnterCriticalSection( &service_cs ); - n = 0; - for (i = 0; i < nb_services && n < MAXIMUM_WAIT_OBJECTS; i++) - { - if (!services[i]->thread) continue; - - res = QueryServiceStatus(services[i]->full_access_handle, &st); - ret = ERROR_SUCCESS; - if (res && (st.dwControlsAccepted & SERVICE_ACCEPT_PRESHUTDOWN)) - { - res = QueryServiceConfig2W( services[i]->full_access_handle, SERVICE_CONFIG_PRESHUTDOWN_INFO, - (LPBYTE)&spi, sizeof(spi), &i ); - if (res) - { - FIXME("service should be able to delay shutdown\n"); - timeout += spi.dwPreshutdownTimeout; - ret = service_handle_control( services[i], SERVICE_CONTROL_PRESHUTDOWN, NULL, 0 ); - wait_handles[n++] = services[i]->thread; - } - } - else if (res && (st.dwControlsAccepted & SERVICE_ACCEPT_SHUTDOWN)) - { - ret = service_handle_control( services[i], SERVICE_CONTROL_SHUTDOWN, NULL, 0 ); - wait_handles[n++] = services[i]->thread; - } - } - LeaveCriticalSection( &service_cs ); - - TRACE("last user process exited, shutting down (timeout: %d)\n", timeout); - WaitForMultipleObjects( n, wait_handles, TRUE, timeout ); + handle_shutdown_msg(SERVICE_CONTROL_PRESHUTDOWN, SERVICE_ACCEPT_PRESHUTDOWN); + handle_shutdown_msg(SERVICE_CONTROL_SHUTDOWN, SERVICE_ACCEPT_SHUTDOWN); ExitProcess(0); } else if (ret == 1) -- 2.16.1

1 0

[PATCH] msvcr100: Add _ReentrantPPLLock::_Scoped_lock class implementation
by Piotr Caban 06 Feb '18

06 Feb '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcr100/msvcr100.spec | 8 ++++---- dlls/msvcr110/msvcr110.spec | 12 ++++++------ dlls/msvcr120/msvcr120.spec | 12 ++++++------ dlls/msvcrt/lock.c | 35 +++++++++++++++++++++++++++++++++++ 4 files changed, 51 insertions(+), 16 deletions(-)

1 0

[PATCH 1/5] wined3d: Introduce wined3d_bit_scan().
by Józef Kucia 06 Feb '18

06 Feb '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/wined3d_private.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 05576cd967de..334724514df3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4352,6 +4352,13 @@ static inline BOOL is_rasterization_disabled(const struct wined3d_shader *geomet && geometry_shader->u.gs.so_desc.rasterizer_stream_idx == WINED3D_NO_RASTERIZER_STREAM; } +static inline int wined3d_bit_scan(unsigned int *x) +{ + int bit_offset = ffs(*x) - 1; + *x ^= 1u << bit_offset; + return bit_offset; +} + static inline DWORD wined3d_extract_bits(const DWORD *bitstream, unsigned int offset, unsigned int count) { -- 2.13.6

2 9

[PATCH] urlmon: Do not canonicalize Unicode characters.
by Zhiyi Zhang 06 Feb '18

06 Feb '18

This fixes bug 37217 Signed-off-by: Zhiyi Zhang <yi.gd.cn(a)gmail.com> --- dlls/urlmon/tests/uri.c | 35 +++++++++++++++++++++++++++++++++-- dlls/urlmon/uri.c | 21 +++++++++++++-------- 2 files changed, 46 insertions(+), 10 deletions(-)

2 1

[PATCH] kernel32: Save xmm0 - 3 to work around a Delphi bug on x86_64.
by Huw Davies 06 Feb '18

06 Feb '18

When delay loading a symbol, Delphi saves rcx, rdx, r8 and r9 to the stack. It then calls GetProcAddress(), pops the saved registers and calls the function. This works fine if all of the parameters are ints. However, since it does not save xmm0 - 3, it relies on GetProcAddress() preserving these registers if the function takes floating point parameters. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/kernel32/module.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index b97c79b942..e57356632a 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -1363,7 +1363,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH FreeLibrary(HINSTANCE hLibModule) * Success: A pointer to the symbol in the process address space. * Failure: NULL. Use GetLastError() to determine the cause. */ -FARPROC WINAPI GetProcAddress( HMODULE hModule, LPCSTR function ) +FARPROC get_proc_address( HMODULE hModule, LPCSTR function ) { NTSTATUS nts; FARPROC fp; @@ -1387,6 +1387,54 @@ FARPROC WINAPI GetProcAddress( HMODULE hModule, LPCSTR function ) return fp; } +#ifdef __x86_64__ +/* + * Work around a Delphi bug on x86_64. When delay loading a symbol, + * Delphi saves rcx, rdx, r8 and r9 to the stack. It then calls + * GetProcAddress(), pops the saved registers and calls the function. + * This works fine if all of the parameters are ints. However, since + * it does not save xmm0 - 3, it relies on GetProcAddress() preserving + * these registers if the function takes floating point parameters. + * This wrapper saves xmm0 - 3 to the stack. + */ +extern FARPROC get_proc_address_wrapper( HMODULE module, LPCSTR function ); + +__ASM_GLOBAL_FUNC( get_proc_address_wrapper, + "pushq %rbp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") + __ASM_CFI(".cfi_rel_offset %rbp,0\n\t") + "movq %rsp,%rbp\n\t" + __ASM_CFI(".cfi_def_cfa_register %rbp\n\t") + "subq $0x40,%rsp\n\t" + "movaps %xmm0,-0x10(%rbp)\n\t" + "movaps %xmm1,-0x20(%rbp)\n\t" + "movaps %xmm2,-0x30(%rbp)\n\t" + "movaps %xmm3,-0x40(%rbp)\n\t" + "call _get_proc_address\n\t" + "movaps -0x40(%rbp), %xmm3\n\t" + "movaps -0x30(%rbp), %xmm2\n\t" + "movaps -0x20(%rbp), %xmm1\n\t" + "movaps -0x10(%rbp), %xmm0\n\t" + "movq %rbp,%rsp\n\t" + __ASM_CFI(".cfi_def_cfa_register %rsp\n\t") + "popq %rbp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") + __ASM_CFI(".cfi_same_value %rbp\n\t") + "ret" ); +#else /* __x86_64__ */ + +static inline FARPROC get_proc_address_wrapper( HMODULE module, LPCSTR function ) +{ + return get_proc_address( module, function ); +} + +#endif /* __x86_64__ */ + +FARPROC WINAPI GetProcAddress( HMODULE hModule, LPCSTR function ) +{ + return get_proc_address_wrapper( hModule, function ); +} + /*********************************************************************** * DelayLoadFailureHook (KERNEL32.@) */ -- 2.12.0

4 5

[PATCH vkd3d 1/5] libs/vkd3d-shader: Translate dcl_tessellator_domain instructions.
by Józef Kucia 06 Feb '18

06 Feb '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 8a4567691b16..85e2593d1a5c 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3704,6 +3704,31 @@ static void vkd3d_dxbc_compiler_emit_dcl_gs_instances(struct vkd3d_dxbc_compiler SpvExecutionModeInvocations, instruction->declaration.count); } +static void vkd3d_dxbc_compiler_emit_dcl_tessellator_domain(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_instruction *instruction) +{ + enum vkd3d_tessellator_domain domain = instruction->declaration.tessellator_domain; + SpvExecutionMode mode; + + switch (domain) + { + case VKD3D_TESSELLATOR_DOMAIN_LINE: + mode = SpvExecutionModeIsolines; + break; + case VKD3D_TESSELLATOR_DOMAIN_TRIANGLE: + mode = SpvExecutionModeTriangles; + break; + case VKD3D_TESSELLATOR_DOMAIN_QUAD: + mode = SpvExecutionModeQuads; + break; + default: + FIXME("Invalid tessellator domain %#x.\n", domain); + return; + } + + vkd3d_dxbc_compiler_emit_execution_mode(compiler, mode, NULL, 0); +} + static void vkd3d_dxbc_compiler_emit_dcl_thread_group(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { @@ -5644,6 +5669,9 @@ void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler case VKD3DSIH_DCL_GS_INSTANCES: vkd3d_dxbc_compiler_emit_dcl_gs_instances(compiler, instruction); break; + case VKD3DSIH_DCL_TESSELLATOR_DOMAIN: + vkd3d_dxbc_compiler_emit_dcl_tessellator_domain(compiler, instruction); + break; case VKD3DSIH_DCL_THREAD_GROUP: vkd3d_dxbc_compiler_emit_dcl_thread_group(compiler, instruction); break; -- 2.13.6

2 9

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-devel