March 2009 - Wine-commits - list.winehq.org

Hans Leidekker : msi: Add stub implementations of MsiSourceListClearAllExA/ W.
by Alexandre Julliard 24 Mar '09

24 Mar '09

Module: wine Branch: master Commit: c844582177ba7653c0e912702c0d5f7ad3edcd69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c844582177ba7653c0e912702… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 24 10:25:54 2009 +0100 msi: Add stub implementations of MsiSourceListClearAllExA/W. --- dlls/msi/msi.spec | 4 ++-- dlls/msi/source.c | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index 7f0627a..14178e8 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -252,8 +252,8 @@ 256 stdcall MsiSourceListAddSourceExW(wstr wstr long long wstr long) 257 stdcall MsiSourceListClearSourceA(str str long long str) 258 stdcall MsiSourceListClearSourceW(wstr wstr long long wstr) -259 stub MsiSourceListClearAllExA -260 stub MsiSourceListClearAllExW +259 stdcall MsiSourceListClearAllExA(str str long long) +260 stdcall MsiSourceListClearAllExW(wstr wstr long long) 261 stub MsiSourceListForceResolutionExA 262 stub MsiSourceListForceResolutionExW 263 stdcall MsiSourceListEnumSourcesA(str str long long long ptr ptr) diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 7d61618..df5905d 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -1320,6 +1320,28 @@ UINT WINAPI MsiSourceListClearAllW( LPCWSTR szProduct, LPCWSTR szUserName, DWORD } /****************************************************************** + * MsiSourceListClearAllExA (MSI.@) + */ +UINT WINAPI MsiSourceListClearAllExA( LPCSTR szProduct, LPCSTR szUserSid, + MSIINSTALLCONTEXT dwContext, DWORD dwOptions ) +{ + FIXME("(%s %s %d %08x)\n", debugstr_a(szProduct), debugstr_a(szUserSid), + dwContext, dwOptions); + return ERROR_SUCCESS; +} + +/****************************************************************** + * MsiSourceListClearAllExW (MSI.@) + */ +UINT WINAPI MsiSourceListClearAllExW( LPCWSTR szProduct, LPCWSTR szUserSid, + MSIINSTALLCONTEXT dwContext, DWORD dwOptions ) +{ + FIXME("(%s %s %d %08x)\n", debugstr_w(szProduct), debugstr_w(szUserSid), + dwContext, dwOptions); + return ERROR_SUCCESS; +} + +/****************************************************************** * MsiSourceListClearSourceA (MSI.@) */ UINT WINAPI MsiSourceListClearSourceA(LPCSTR szProductCodeOrPatchCode, LPCSTR szUserSid,

1 0

Hans Leidekker : msi: Don't initialize COM for custom action threads.
by Alexandre Julliard 24 Mar '09

24 Mar '09

Module: wine Branch: master Commit: b8965ee7c90a687af4c84ad0ede73b1df901e16c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8965ee7c90a687af4c84ad0e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 24 10:26:24 2009 +0100 msi: Don't initialize COM for custom action threads. --- dlls/msi/custom.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index ffac63f..fa8f951 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -695,8 +695,6 @@ static DWORD ACTION_CallDllFunction( const GUID *guid ) TRACE("calling %s\n", debugstr_w( function ) ); handle_msi_break( function ); - CoInitializeEx(NULL, COINIT_MULTITHREADED); - __TRY { r = fn( hPackage ); @@ -709,8 +707,6 @@ static DWORD ACTION_CallDllFunction( const GUID *guid ) } __ENDTRY; - CoUninitialize(); - MsiCloseHandle( hPackage ); } else

1 0

Hans Leidekker : msi: Only apply a transform when its language id matches the system language id .
by Alexandre Julliard 24 Mar '09

24 Mar '09

Module: wine Branch: master Commit: 86af876987a714cbd88b36858178d6ef1a36943e URL: http://source.winehq.org/git/wine.git/?a=commit;h=86af876987a714cbd88b36858… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 24 10:26:42 2009 +0100 msi: Only apply a transform when its language id matches the system language id. Fix for office 2007 sp1 installer. --- dlls/msi/action.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++----- dlls/msi/package.c | 8 ++++++- 2 files changed, 62 insertions(+), 7 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index eb07f22..ce038a1 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -401,9 +401,13 @@ static LPWSTR* msi_split_string( LPCWSTR str, WCHAR sep ) static UINT msi_check_transform_applicable( MSIPACKAGE *package, IStorage *patch ) { - WCHAR szProductCode[] = { 'P','r','o','d','u','c','t','C','o','d','e',0 }; - LPWSTR prod_code, patch_product; - UINT ret; + static const WCHAR szProductCode[] = + { 'P','r','o','d','u','c','t','C','o','d','e',0 }; + static const WCHAR szSystemLanguageID[] = + { 'S','y','s','t','e','m','L','a','n','g','u','a','g','e','I','D',0 }; + + LPWSTR prod_code, patch_product, langid = NULL, template = NULL; + UINT ret = ERROR_FUNCTION_FAILED; prod_code = msi_dup_property( package, szProductCode ); patch_product = msi_get_suminfo_product( patch ); @@ -411,12 +415,57 @@ static UINT msi_check_transform_applicable( MSIPACKAGE *package, IStorage *patch TRACE("db = %s patch = %s\n", debugstr_w(prod_code), debugstr_w(patch_product)); if ( strstrW( patch_product, prod_code ) ) - ret = ERROR_SUCCESS; - else - ret = ERROR_FUNCTION_FAILED; + { + static const WCHAR zero[] = {'0',0}; + MSISUMMARYINFO *si; + const WCHAR *p; + + si = MSI_GetSummaryInformationW( patch, 0 ); + if (!si) + { + ERR("no summary information!\n"); + goto end; + } + template = msi_suminfo_dup_string( si, PID_TEMPLATE ); + if (!template) + { + ERR("no template property!\n"); + msiobj_release( &si->hdr ); + goto end; + } + + if (!template[0]) + { + ret = ERROR_SUCCESS; + msiobj_release( &si->hdr ); + goto end; + } + + langid = msi_dup_property( package, szSystemLanguageID ); + if (!langid) + { + msiobj_release( &si->hdr ); + goto end; + } + + p = strchrW( template, ';' ); + if (p && (!strcmpW( p + 1, langid ) || !strcmpW( p + 1, zero ))) + { + TRACE("applicable transform\n"); + ret = ERROR_SUCCESS; + } + + /* FIXME: check platform */ + + msiobj_release( &si->hdr ); + } + +end: msi_free( patch_product ); msi_free( prod_code ); + msi_free( template ); + msi_free( langid ); return ret; } diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 378ad76..b2c46a2 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -440,11 +440,12 @@ static VOID set_installer_properties(MSIPACKAGE *package) static const WCHAR szDate[] = {'D','a','t','e',0}; static const WCHAR szTime[] = {'T','i','m','e',0}; static const WCHAR szUserLangID[] = {'U','s','e','r','L','a','n','g','u','a','g','e','I','D',0}; + static const WCHAR szSystemLangID[] = {'S','y','s','t','e','m','L','a','n','g','u','a','g','e','I','D',0}; /* * Other things that probably should be set: * - * SystemLanguageID ComputerName UserLanguageID LogonUser VirtualMemory + * ComputerName LogonUser VirtualMemory * ShellAdvSupport DefaultUIFont PackagecodeChanging * ProductState CaptionHeight BorderTop BorderSide TextHeight * RedirectedDllSupport @@ -640,6 +641,11 @@ static VOID set_installer_properties(MSIPACKAGE *package) sprintfW(bufstr, szIntFormat, langid); MSI_SetPropertyW( package, szUserLangID, bufstr ); + + langid = GetSystemDefaultLangID(); + sprintfW(bufstr, szIntFormat, langid); + + MSI_SetPropertyW( package, szSystemLangID, bufstr ); } static UINT msi_load_summary_properties( MSIPACKAGE *package )

1 0

Michael Stefaniuc : msi: Add the Romanian translation.
by Alexandre Julliard 24 Mar '09

24 Mar '09

Module: wine Branch: master Commit: 6789fa85448c2cf904cde0360f443e52cf23bd1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6789fa85448c2cf904cde0360… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 24 11:00:06 2009 +0100 msi: Add the Romanian translation. --- dlls/msi/msi.rc | 1 + dlls/msi/msi_Ro.rc | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/msi/msi.rc b/dlls/msi/msi.rc index 4091184..ffcb0c1 100644 --- a/dlls/msi/msi.rc +++ b/dlls/msi/msi.rc @@ -42,6 +42,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "msi_No.rc" #include "msi_Pl.rc" #include "msi_Pt.rc" +#include "msi_Ro.rc" #include "msi_Ru.rc" #include "msi_Si.rc" #include "msi_Sv.rc" diff --git a/dlls/msi/msi_Ro.rc b/dlls/msi/msi_Ro.rc new file mode 100644 index 0000000..a167d05 --- /dev/null +++ b/dlls/msi/msi_Ro.rc @@ -0,0 +1,37 @@ +/* + * Copyright 2005 Mike McCormack + * Copyright 2009 Michael Stefaniuc + * + * 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 + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +STRINGTABLE DISCARDABLE +{ + 4 "Pachetul de instalare menționat nu a putut fi deschis. Verificați calea și încercați din nou." + 5 "calea %s nu a fost găsită" + 9 "inserați discul %s" + 10 "parameteri greșiți" + 11 "introduceți fișierul care conține %s" + 12 "lipsește sursa de instalare pentru această caracteristică" + 13 "lipsește unitatea de rețea pentru această caracteristică" + 14 "caracteristică de la:" + 15 "selectați fișierul care conține %s" +} + +#pragma code_page(default)

1 0

Rob Shearman : services: Add a ref count to the service entry in svcctl_CreateServiceW.
by Alexandre Julliard 24 Mar '09

24 Mar '09

Module: wine Branch: master Commit: 8f07e6932b23acf5a3233dc55bbe7a426f35fc28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f07e6932b23acf5a3233dc55… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Mar 24 11:25:35 2009 +0000 services: Add a ref count to the service entry in svcctl_CreateServiceW. The ref count will be released by SC_RPC_HANDLE_destroy when the returned handle is destroyed. Change svcctl_OpenServiceW to use InterlockedIncrement to increment the ref count since the service is in the database and therefore could be shared and SC_RPC_HANDLE_destroy doesn't take the scmdatabase lock when decrementing the ref count. --- programs/services/rpc.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 7c09f55..22391c2 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -309,7 +309,7 @@ DWORD svcctl_OpenServiceW( scmdatabase_lock_shared(manager->db); entry = scmdatabase_find_service(manager->db, lpServiceName); if (entry != NULL) - entry->ref_count++; + InterlockedIncrement(&entry->ref_count); scmdatabase_unlock(manager->db); if (entry == NULL) @@ -358,6 +358,7 @@ DWORD svcctl_CreateServiceW( err = service_create(lpServiceName, &entry); if (err != ERROR_SUCCESS) return err; + entry->ref_count = 1; entry->config.dwServiceType = entry->status.dwServiceType = dwServiceType; entry->config.dwStartType = dwStartType; entry->config.dwErrorControl = dwErrorControl;

1 0

Rob Shearman : advapi32: Trace the contents of the in parameter to GetServiceKeyNameW, not the out parameter.
by Alexandre Julliard 24 Mar '09

24 Mar '09

Module: wine Branch: master Commit: b9587e69e406b216c90d0440569fca120c44d502 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9587e69e406b216c90d04405… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Mar 24 11:25:51 2009 +0000 advapi32: Trace the contents of the in parameter to GetServiceKeyNameW, not the out parameter. --- dlls/advapi32/service.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 9af7952..39a1afc 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1570,7 +1570,7 @@ BOOL WINAPI GetServiceKeyNameW( SC_HANDLE hSCManager, LPCWSTR lpDisplayName, WCHAR buffer[2]; TRACE("%p %s %p %p\n", hSCManager, - debugstr_w(lpServiceName), lpDisplayName, lpcchBuffer); + debugstr_w(lpDisplayName), lpServiceName, lpcchBuffer); if (!hSCManager) {

1 0

Rob Shearman : services: svcctl_GetServiceDisplayNameW and svcctl_GetServiceKeyNameW should have string attribute on output buffer .
by Alexandre Julliard 24 Mar '09

24 Mar '09

Module: wine Branch: master Commit: 1c89dacf9c032e2d8e727f75eeb292c463fc2689 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c89dacf9c032e2d8e727f75e… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Mar 24 11:26:12 2009 +0000 services: svcctl_GetServiceDisplayNameW and svcctl_GetServiceKeyNameW should have string attribute on output buffer. They also should not have two parameters for specifying the size of the buffer. The buffer size should also not include in the nul-terminating character. --- dlls/advapi32/service.c | 22 ++++++++++++++++++++-- include/wine/svcctl.idl | 10 ++++------ programs/services/rpc.c | 30 ++++++++++++++++-------------- 3 files changed, 40 insertions(+), 22 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 39a1afc..51a41e7 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1568,6 +1568,7 @@ BOOL WINAPI GetServiceKeyNameW( SC_HANDLE hSCManager, LPCWSTR lpDisplayName, { DWORD err; WCHAR buffer[2]; + DWORD size; TRACE("%p %s %p %p\n", hSCManager, debugstr_w(lpDisplayName), lpServiceName, lpcchBuffer); @@ -1588,10 +1589,14 @@ BOOL WINAPI GetServiceKeyNameW( SC_HANDLE hSCManager, LPCWSTR lpDisplayName, *lpcchBuffer = 2; } + /* RPC call takes size excluding nul-terminator, whereas *lpcchBuffer + * includes the nul-terminator on input. */ + size = *lpcchBuffer - 1; + __TRY { err = svcctl_GetServiceKeyNameW(hSCManager, lpDisplayName, lpServiceName, - *lpcchBuffer, lpcchBuffer); + &size); } __EXCEPT(rpc_filter) { @@ -1599,6 +1604,10 @@ BOOL WINAPI GetServiceKeyNameW( SC_HANDLE hSCManager, LPCWSTR lpDisplayName, } __ENDTRY + /* The value of *lpcchBuffer excludes nul-terminator on output. */ + if (err == ERROR_SUCCESS || err == ERROR_INSUFFICIENT_BUFFER) + *lpcchBuffer = size; + if (err) SetLastError(err); return err == ERROR_SUCCESS; @@ -1682,6 +1691,7 @@ BOOL WINAPI GetServiceDisplayNameW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, LPWSTR lpDisplayName, LPDWORD lpcchBuffer) { DWORD err; + DWORD size; WCHAR buffer[2]; TRACE("%p %s %p %p\n", hSCManager, @@ -1703,10 +1713,14 @@ BOOL WINAPI GetServiceDisplayNameW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, *lpcchBuffer = 2; } + /* RPC call takes size excluding nul-terminator, whereas *lpcchBuffer + * includes the nul-terminator on input. */ + size = *lpcchBuffer - 1; + __TRY { err = svcctl_GetServiceDisplayNameW(hSCManager, lpServiceName, lpDisplayName, - *lpcchBuffer, lpcchBuffer); + &size); } __EXCEPT(rpc_filter) { @@ -1714,6 +1728,10 @@ BOOL WINAPI GetServiceDisplayNameW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, } __ENDTRY + /* The value of *lpcchBuffer excludes nul-terminator on output. */ + if (err == ERROR_SUCCESS || err == ERROR_INSUFFICIENT_BUFFER) + *lpcchBuffer = size; + if (err) SetLastError(err); return err == ERROR_SUCCESS; diff --git a/include/wine/svcctl.idl b/include/wine/svcctl.idl index 1e9aae2..0414dc4 100644 --- a/include/wine/svcctl.idl +++ b/include/wine/svcctl.idl @@ -257,17 +257,15 @@ typedef [switch_type(DWORD)] union DWORD svcctl_GetServiceDisplayNameW( [in] SC_RPC_HANDLE hSCManager, [in] LPCWSTR lpServiceName, - [out,size_is(cchBufSize)] WCHAR lpBuffer[], - [in] DWORD cchBufSize, - [in,out] DWORD *cchLength); + [out,string,size_is(*cchBufSize+1)] WCHAR lpBuffer[], + [in,out] DWORD *cchBufSize); /* Compatible with Windows function 0x15 */ DWORD svcctl_GetServiceKeyNameW( [in] SC_RPC_HANDLE hSCManager, [in] LPCWSTR lpServiceDisplayName, - [out,size_is(cchBufSize)] WCHAR lpBuffer[], - [in] DWORD cchBufSize, - [in,out] DWORD *cchLength); + [out,string,size_is(*cchBufSize+1)] WCHAR lpBuffer[], + [in,out] DWORD *cchBufSize); /* Not compatible with Windows function 0x16 */ DWORD svcctl_SCSetServiceBitsA(/* FIXME */); diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 22391c2..d463b62 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -184,14 +184,13 @@ DWORD svcctl_GetServiceDisplayNameW( SC_RPC_HANDLE hSCManager, LPCWSTR lpServiceName, WCHAR *lpBuffer, - DWORD cchBufSize, - DWORD *cchLength) + DWORD *cchBufSize) { struct sc_manager_handle *manager; struct service_entry *entry; DWORD err; - WINE_TRACE("(%s, %d)\n", wine_dbgstr_w(lpServiceName), cchBufSize); + WINE_TRACE("(%s, %d)\n", wine_dbgstr_w(lpServiceName), *cchBufSize); if ((err = validate_scm_handle(hSCManager, 0, &manager)) != ERROR_SUCCESS) return err; @@ -202,16 +201,18 @@ DWORD svcctl_GetServiceDisplayNameW( if (entry != NULL) { LPCWSTR name; + int len; service_lock_shared(entry); name = get_display_name(entry); - *cchLength = strlenW(name); - if (*cchLength < cchBufSize) + len = strlenW(name); + if (len <= *cchBufSize) { err = ERROR_SUCCESS; - lstrcpyW(lpBuffer, name); + memcpy(lpBuffer, name, (len + 1)*sizeof(*name)); } else err = ERROR_INSUFFICIENT_BUFFER; + *cchBufSize = len; service_unlock(entry); } else @@ -219,7 +220,7 @@ DWORD svcctl_GetServiceDisplayNameW( scmdatabase_unlock(manager->db); - if (err != ERROR_SUCCESS && cchBufSize > 0) + if (err != ERROR_SUCCESS) lpBuffer[0] = 0; return err; @@ -229,14 +230,13 @@ DWORD svcctl_GetServiceKeyNameW( SC_RPC_HANDLE hSCManager, LPCWSTR lpServiceDisplayName, WCHAR *lpBuffer, - DWORD cchBufSize, - DWORD *cchLength) + DWORD *cchBufSize) { struct service_entry *entry; struct sc_manager_handle *manager; DWORD err; - WINE_TRACE("(%s, %d)\n", wine_dbgstr_w(lpServiceDisplayName), cchBufSize); + WINE_TRACE("(%s, %d)\n", wine_dbgstr_w(lpServiceDisplayName), *cchBufSize); if ((err = validate_scm_handle(hSCManager, 0, &manager)) != ERROR_SUCCESS) return err; @@ -246,15 +246,17 @@ DWORD svcctl_GetServiceKeyNameW( entry = scmdatabase_find_service_by_displayname(manager->db, lpServiceDisplayName); if (entry != NULL) { + int len; service_lock_shared(entry); - *cchLength = strlenW(entry->name); - if (*cchLength < cchBufSize) + len = strlenW(entry->name); + if (len <= *cchBufSize) { err = ERROR_SUCCESS; - lstrcpyW(lpBuffer, entry->name); + memcpy(lpBuffer, entry->name, (len + 1)*sizeof(*entry->name)); } else err = ERROR_INSUFFICIENT_BUFFER; + *cchBufSize = len; service_unlock(entry); } else @@ -262,7 +264,7 @@ DWORD svcctl_GetServiceKeyNameW( scmdatabase_unlock(manager->db); - if (err != ERROR_SUCCESS && cchBufSize > 0) + if (err != ERROR_SUCCESS) lpBuffer[0] = 0; return err;

1 0

Rob Shearman : services: Always initialise the out buffer in svcctl_QueryServiceStatusEx and svcctl_QueryServiceConfig2W .
by Alexandre Julliard 24 Mar '09

24 Mar '09

Module: wine Branch: master Commit: 286dc62e34ebd57913a5e86f44acf4cd38d43322 URL: http://source.winehq.org/git/wine.git/?a=commit;h=286dc62e34ebd57913a5e86f4… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Mar 24 11:26:35 2009 +0000 services: Always initialise the out buffer in svcctl_QueryServiceStatusEx and svcctl_QueryServiceConfig2W. --- programs/services/rpc.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index d463b62..46756ce 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -654,6 +654,8 @@ DWORD svcctl_QueryServiceConfig2W( SC_RPC_HANDLE hService, DWORD level, struct sc_service_handle *service; DWORD err; + memset(buffer, 0, size); + if ((err = validate_service_handle(hService, SERVICE_QUERY_STATUS, &service)) != 0) return err; @@ -701,6 +703,8 @@ DWORD svcctl_QueryServiceStatusEx( DWORD err; LPSERVICE_STATUS_PROCESS pSvcStatusData; + memset(lpBuffer, 0, cbBufSize); + if ((err = validate_service_handle(hService, SERVICE_QUERY_STATUS, &service)) != 0) return err;

1 0

Rob Shearman : rpcrt4: Fix crash when calling RpcServerUseProtseq for ncacn_np and ncalrpc.
by Alexandre Julliard 24 Mar '09

24 Mar '09

Module: wine Branch: master Commit: cdf509d71f93c0d3b7b83e38f8d39d8c4c57d93e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdf509d71f93c0d3b7b83e38f… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Mar 24 11:29:12 2009 +0000 rpcrt4: Fix crash when calling RpcServerUseProtseq for ncacn_np and ncalrpc. Add tests for these protocol sequences and for ncacn_ip_tcp. --- dlls/rpcrt4/rpc_transport.c | 22 ++++ dlls/rpcrt4/tests/Makefile.in | 1 + dlls/rpcrt4/tests/rpc.c | 64 ------------ dlls/rpcrt4/tests/rpc_protseq.c | 208 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 231 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cdf509d71f93c0d3b7b83…

1 0

Henri Verbeet : d3d8: Cleanup the vertexshader handling code a bit.
by Alexandre Julliard 24 Mar '09

24 Mar '09

Module: wine Branch: master Commit: c0cefb35016fbfdeab629aaca139d1e5523c6381 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0cefb35016fbfdeab629aaca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 24 10:09:22 2009 +0100 d3d8: Cleanup the vertexshader handling code a bit. --- dlls/d3d8/device.c | 120 +++++++++++++++++++++++++++------------------------- 1 files changed, 62 insertions(+), 58 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index c1031b4..0e8c480 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1879,75 +1879,78 @@ static IDirect3DVertexDeclaration8Impl *IDirect3DDevice8Impl_FindDecl(IDirect3DD static HRESULT WINAPI IDirect3DDevice8Impl_SetVertexShader(LPDIRECT3DDEVICE8 iface, DWORD pShader) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; - HRESULT hrc = D3D_OK; + IDirect3DVertexShader8Impl *shader; + HRESULT hr; TRACE("(%p) : Relay\n", This); - EnterCriticalSection(&d3d8_cs); + if (VS_HIGHESTFIXEDFXF >= pShader) { TRACE("Setting FVF, %#x\n", pShader); + + EnterCriticalSection(&d3d8_cs); IWineD3DDevice_SetVertexDeclaration(This->WineD3DDevice, IDirect3DDevice8Impl_FindDecl(This, pShader)->wined3d_vertex_declaration); IWineD3DDevice_SetVertexShader(This->WineD3DDevice, NULL); - } else { - IDirect3DVertexShader8Impl *shader; + LeaveCriticalSection(&d3d8_cs); + return D3D_OK; + } - TRACE("Setting shader\n"); + TRACE("Setting shader\n"); - shader = d3d8_get_object(&This->handle_table, pShader - (VS_HIGHESTFIXEDFXF + 1)); - if (!shader) - { - WARN("Invalid handle (%#x) passed.\n", pShader); - hrc = D3DERR_INVALIDCALL; - } - else - { - hrc = IWineD3DDevice_SetVertexDeclaration(This->WineD3DDevice, - ((IDirect3DVertexDeclaration8Impl *)shader->vertex_declaration)->wined3d_vertex_declaration); - if (SUCCEEDED(hrc)) - hrc = IWineD3DDevice_SetVertexShader(This->WineD3DDevice, shader->wineD3DVertexShader); - } + EnterCriticalSection(&d3d8_cs); + shader = d3d8_get_object(&This->handle_table, pShader - (VS_HIGHESTFIXEDFXF + 1)); + if (!shader) + { + WARN("Invalid handle (%#x) passed.\n", pShader); + LeaveCriticalSection(&d3d8_cs); + return D3DERR_INVALIDCALL; } - TRACE("(%p) : returning hr(%u)\n", This, hrc); + + hr = IWineD3DDevice_SetVertexDeclaration(This->WineD3DDevice, + ((IDirect3DVertexDeclaration8Impl *)shader->vertex_declaration)->wined3d_vertex_declaration); + if (SUCCEEDED(hr)) hr = IWineD3DDevice_SetVertexShader(This->WineD3DDevice, shader->wineD3DVertexShader); LeaveCriticalSection(&d3d8_cs); - return hrc; + TRACE("Returning hr %#x\n", hr); + + return hr; } static HRESULT WINAPI IDirect3DDevice8Impl_GetVertexShader(LPDIRECT3DDEVICE8 iface, DWORD* ppShader) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; IWineD3DVertexDeclaration *wined3d_declaration; + IDirect3DVertexDeclaration8 *d3d8_declaration; HRESULT hrc; TRACE("(%p) : Relay device@%p\n", This, This->WineD3DDevice); EnterCriticalSection(&d3d8_cs); hrc = IWineD3DDevice_GetVertexDeclaration(This->WineD3DDevice, &wined3d_declaration); - if (SUCCEEDED(hrc)) - { - if (wined3d_declaration) - { - IDirect3DVertexDeclaration8 *d3d8_declaration; - hrc = IWineD3DVertexDeclaration_GetParent(wined3d_declaration, (IUnknown **)&d3d8_declaration); - IWineD3DVertexDeclaration_Release(wined3d_declaration); - if (SUCCEEDED(hrc)) - { - *ppShader = ((IDirect3DVertexDeclaration8Impl *)d3d8_declaration)->shader_handle; - IDirect3DVertexDeclaration8_Release(d3d8_declaration); - } - } - else - { - *ppShader = 0; - hrc = D3D_OK; - } - } - else + if (FAILED(hrc)) { + LeaveCriticalSection(&d3d8_cs); WARN("(%p) : Call to IWineD3DDevice_GetVertexDeclaration failed %#x (device %p)\n", This, hrc, This->WineD3DDevice); + return hrc; } - TRACE("(%p) : returning %#x\n", This, *ppShader); + + if (!wined3d_declaration) + { + LeaveCriticalSection(&d3d8_cs); + *ppShader = 0; + return D3D_OK; + } + + hrc = IWineD3DVertexDeclaration_GetParent(wined3d_declaration, (IUnknown **)&d3d8_declaration); + IWineD3DVertexDeclaration_Release(wined3d_declaration); LeaveCriticalSection(&d3d8_cs); + if (SUCCEEDED(hrc)) + { + *ppShader = ((IDirect3DVertexDeclaration8Impl *)d3d8_declaration)->shader_handle; + IDirect3DVertexDeclaration8_Release(d3d8_declaration); + } + + TRACE("(%p) : returning %#x\n", This, *ppShader); return hrc; } @@ -1955,6 +1958,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetVertexShader(LPDIRECT3DDEVICE8 ifa static HRESULT WINAPI IDirect3DDevice8Impl_DeleteVertexShader(LPDIRECT3DDEVICE8 iface, DWORD pShader) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; IDirect3DVertexShader8Impl *shader; + IWineD3DVertexShader *cur = NULL; TRACE("(%p) : pShader %#x\n", This, pShader); @@ -1966,22 +1970,23 @@ static HRESULT WINAPI IDirect3DDevice8Impl_DeleteVertexShader(LPDIRECT3DDEVICE WARN("Invalid handle (%#x) passed.\n", pShader); LeaveCriticalSection(&d3d8_cs); return D3DERR_INVALIDCALL; - } else { - IWineD3DVertexShader *cur = NULL; + } - IWineD3DDevice_GetVertexShader(This->WineD3DDevice, &cur); - if(cur) { - if(cur == shader->wineD3DVertexShader) IDirect3DDevice8_SetVertexShader(iface, 0); - IWineD3DVertexShader_Release(cur); - } + IWineD3DDevice_GetVertexShader(This->WineD3DDevice, &cur); - if (IUnknown_Release((IUnknown *)shader)) - { - ERR("Shader %p has references left, this shouldn't happen.\n", shader); - } + if (cur) + { + if (cur == shader->wineD3DVertexShader) IDirect3DDevice8_SetVertexShader(iface, 0); + IWineD3DVertexShader_Release(cur); } + LeaveCriticalSection(&d3d8_cs); + if (IUnknown_Release((IUnknown *)shader)) + { + ERR("Shader %p has references left, this shouldn't happen.\n", shader); + } + return D3D_OK; } @@ -2060,16 +2065,15 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetVertexShaderFunction(LPDIRECT3DDEV return D3DERR_INVALIDCALL; } - if (shader->wineD3DVertexShader) - { - hr = IWineD3DVertexShader_GetFunction(shader->wineD3DVertexShader, pData, pSizeOfData); - } - else + if (!shader->wineD3DVertexShader) { + LeaveCriticalSection(&d3d8_cs); *pSizeOfData = 0; - hr = D3D_OK; + return D3D_OK; } + hr = IWineD3DVertexShader_GetFunction(shader->wineD3DVertexShader, pData, pSizeOfData); + LeaveCriticalSection(&d3d8_cs); return hr; }

1 0