wine-commits March 2009

wine-commits@winehq.org

2 participants
834 discussions

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: Implement MsiReinstallProductA/W.
by Alexandre Julliard 24 Mar '09

24 Mar '09

Module: wine Branch: master Commit: 7590a3f33501b9dd837c4f6ac80f15c10c158d0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7590a3f33501b9dd837c4f6ac… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 24 10:25:34 2009 +0100 msi: Implement MsiReinstallProductA/W. --- dlls/msi/msi.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 2f2938c..445d135 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -249,14 +249,26 @@ UINT WINAPI MsiInstallProductW(LPCWSTR szPackagePath, LPCWSTR szCommandLine) UINT WINAPI MsiReinstallProductA(LPCSTR szProduct, DWORD dwReinstallMode) { - FIXME("%s %08x\n", debugstr_a(szProduct), dwReinstallMode); - return ERROR_CALL_NOT_IMPLEMENTED; + LPWSTR wszProduct; + UINT rc; + + TRACE("%s %08x\n", debugstr_a(szProduct), dwReinstallMode); + + wszProduct = strdupAtoW(szProduct); + + rc = MsiReinstallProductW(wszProduct, dwReinstallMode); + + msi_free(wszProduct); + return rc; } UINT WINAPI MsiReinstallProductW(LPCWSTR szProduct, DWORD dwReinstallMode) { - FIXME("%s %08x\n", debugstr_w(szProduct), dwReinstallMode); - return ERROR_CALL_NOT_IMPLEMENTED; + static const WCHAR szAll[] = {'A','L','L',0}; + + TRACE("%s %08x\n", debugstr_w(szProduct), dwReinstallMode); + + return MsiReinstallFeatureW(szProduct, szAll, dwReinstallMode); } UINT WINAPI MsiApplyPatchA(LPCSTR szPatchPackage, LPCSTR szInstallPackage,

1 0

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

24 Mar '09

Module: wine Branch: master Commit: 201e291e5d3a22c24c9dceca9aa3ea3cba836c30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=201e291e5d3a22c24c9dceca9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 24 10:24:46 2009 +0100 msi: Add stub implementations of MsiDeterminePatchSequenceA/W. --- dlls/msi/msi.c | 18 ++++++++++++++++++ dlls/msi/msi.spec | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index be1eafd..2f2938c 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -395,6 +395,24 @@ UINT WINAPI MsiDetermineApplicablePatchesW(LPCWSTR szProductPackagePath, return ERROR_CALL_NOT_IMPLEMENTED; } +UINT MsiDeterminePatchSequenceA(LPCSTR szProductCode, LPCSTR szUserSid, + MSIINSTALLCONTEXT dwContext, DWORD cPatchInfo, PMSIPATCHSEQUENCEINFOA pPatchInfo) +{ + FIXME("(%s, %s, %d, %d, %p): stub!\n", debugstr_a(szProductCode), + debugstr_a(szUserSid), dwContext, cPatchInfo, pPatchInfo); + + return ERROR_CALL_NOT_IMPLEMENTED; +} + +UINT MsiDeterminePatchSequenceW(LPCWSTR szProductCode, LPCWSTR szUserSid, + MSIINSTALLCONTEXT dwContext, DWORD cPatchInfo, PMSIPATCHSEQUENCEINFOW pPatchInfo) +{ + FIXME("(%s, %s, %d, %d, %p): stub!\n", debugstr_w(szProductCode), + debugstr_w(szUserSid), dwContext, cPatchInfo, pPatchInfo); + + return ERROR_CALL_NOT_IMPLEMENTED; +} + static UINT msi_open_package(LPCWSTR product, MSIINSTALLCONTEXT context, MSIPACKAGE **package) { diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index e1644be..7f0627a 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -246,8 +246,8 @@ 250 stdcall MsiQueryComponentStateW(wstr wstr long wstr ptr) 251 stub MsiQueryFeatureStateExA 252 stub MsiQueryFeatureStateExW -253 stub MsiDeterminePatchSequenceA -254 stub MsiDeterminePatchSequenceW +253 stdcall MsiDeterminePatchSequenceA(str str long long ptr) +254 stdcall MsiDeterminePatchSequenceW(wstr wstr long long ptr) 255 stdcall MsiSourceListAddSourceExA(str str long long str long) 256 stdcall MsiSourceListAddSourceExW(wstr wstr long long wstr long) 257 stdcall MsiSourceListClearSourceA(str str long long str)

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

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

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

Paul Vriens : riched20/tests: Fix and extend EM_FORMATRANGE tests.
by Alexandre Julliard 24 Mar '09

24 Mar '09

Module: wine Branch: master Commit: e96fb0fa50170d1aa987e131fdc5bc6e7ee8821a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e96fb0fa50170d1aa987e131f… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Mar 24 10:17:13 2009 +0100 riched20/tests: Fix and extend EM_FORMATRANGE tests. --- dlls/riched20/tests/editor.c | 103 +++++++++++++++++++++++++++++++----------- 1 files changed, 76 insertions(+), 27 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 40d0045..e5d7e2d 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -4746,46 +4746,95 @@ static void test_WM_PASTE(void) static void test_EM_FORMATRANGE(void) { - int r; - FORMATRANGE fr; + int i, tpp_x, tpp_y; HDC hdc; HWND hwndRichEdit = new_richedit(NULL); - - SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) haystack); + static const struct { + const char *string; /* The string */ + int first; /* First 'pagebreak', 0 for don't care */ + int second; /* Second 'pagebreak', 0 for don't care */ + } fmtstrings[] = { + {"WINE wine", 0, 0}, + {"WINE wineWine", 0, 0}, + {"WINE\r\nwine\r\nwine", 5, 10}, + {"WINE\r\nWINEwine\r\nWINEwine", 5, 14}, + {"WINE\r\n\r\nwine\r\nwine", 5, 6} + }; hdc = GetDC(hwndRichEdit); ok(hdc != NULL, "Could not get HDC\n"); - fr.hdc = fr.hdcTarget = hdc; - fr.rc.top = fr.rcPage.top = fr.rc.left = fr.rcPage.left = 0; - fr.rc.right = fr.rcPage.right = GetDeviceCaps(hdc, HORZRES); - fr.rc.bottom = fr.rcPage.bottom = GetDeviceCaps(hdc, VERTRES); - fr.chrg.cpMin = 0; - fr.chrg.cpMax = 20; + /* Calculate the twips per pixel */ + tpp_x = 1440 / GetDeviceCaps(hdc, LOGPIXELSX); + tpp_y = 1440 / GetDeviceCaps(hdc, LOGPIXELSY); - r = SendMessage(hwndRichEdit, EM_FORMATRANGE, TRUE, 0); - todo_wine { - ok(r == 31, "EM_FORMATRANGE expect %d, got %d\n", 31, r); - } + SendMessage(hwndRichEdit, EM_FORMATRANGE, FALSE, 0); - r = SendMessage(hwndRichEdit, EM_FORMATRANGE, TRUE, (LPARAM) &fr); - todo_wine { - ok(r == 20 || r == 9, "EM_FORMATRANGE expect 20 or 9, got %d\n", r); - } + for (i = 0; i < sizeof(fmtstrings)/sizeof(fmtstrings[0]); i++) + { + FORMATRANGE fr; + GETTEXTLENGTHEX gtl; + SIZE stringsize; + int r, len; - fr.chrg.cpMin = 0; - fr.chrg.cpMax = 10; + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) fmtstrings[i].string); - r = SendMessage(hwndRichEdit, EM_FORMATRANGE, TRUE, (LPARAM) &fr); - todo_wine { - ok(r == 10, "EM_FORMATRANGE expect %d, got %d\n", 10, r); - } + gtl.flags = GTL_NUMCHARS | GTL_PRECISE; + gtl.codepage = CP_ACP; + len = SendMessageA(hwndRichEdit, EM_GETTEXTLENGTHEX, (WPARAM)&gtl, 0); - r = SendMessage(hwndRichEdit, EM_FORMATRANGE, TRUE, 0); - todo_wine { - ok(r == 31, "EM_FORMATRANGE expect %d, got %d\n", 31, r); + /* Get some size information for the string */ + GetTextExtentPoint32(hdc, fmtstrings[i].string, strlen(fmtstrings[i].string), &stringsize); + + /* Define the box to be half the width needed and a bit larger than the height. + * Changes to the width means we have at least 2 pages. Changes to the height + * is done so we can check the changing of fr.rc.bottom. + */ + fr.hdc = fr.hdcTarget = hdc; + fr.rc.top = fr.rcPage.top = fr.rc.left = fr.rcPage.left = 0; + fr.rc.right = fr.rcPage.right = (stringsize.cx / 2) * tpp_x; + fr.rc.bottom = fr.rcPage.bottom = (stringsize.cy + 10) * tpp_y; + + r = SendMessage(hwndRichEdit, EM_FORMATRANGE, TRUE, 0); + todo_wine { + ok(r == len, "Expected %d, got %d\n", len, r); + } + + /* We know that the page can't hold the full string. See how many characters + * are on the first one + */ + fr.chrg.cpMin = 0; + fr.chrg.cpMax = -1; + r = SendMessage(hwndRichEdit, EM_FORMATRANGE, TRUE, (LPARAM) &fr); + todo_wine { + ok(fr.rc.bottom == (stringsize.cy * tpp_y), "Expected bottom to be %d, got %d\n", (stringsize.cy * tpp_y), fr.rc.bottom); + } + if (fmtstrings[i].first) + todo_wine { + ok(r == fmtstrings[i].first, "Expected %d, got %d\n", fmtstrings[i].first, r); + } + else + ok(r < len, "Expected < %d, got %d\n", len, r); + + /* Do another page */ + fr.chrg.cpMin = r; + r = SendMessage(hwndRichEdit, EM_FORMATRANGE, TRUE, (LPARAM) &fr); + if (fmtstrings[i].second) + todo_wine { + ok(r == fmtstrings[i].second, "Expected %d, got %d\n", fmtstrings[i].second, r); + } + else + ok (r < len, "Expected < %d, got %d\n", len, r); + + /* There is at least on more page, but we don't care */ + + r = SendMessage(hwndRichEdit, EM_FORMATRANGE, TRUE, 0); + todo_wine { + ok(r == len, "Expected %d, got %d\n", len, r); + } } + ReleaseDC(NULL, hdc); DestroyWindow(hwndRichEdit); }

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2009