wine-commits July 2007

wine-commits@winehq.org

3 participants
957 discussions

James Hawkins : msi: Forward MsiFormatRecordA to MsiFormatRecordW.
by Alexandre Julliard 06 Jul '07

06 Jul '07

Module: wine Branch: master Commit: ba4919912c0087ea614f0f55d31c7dfcdd809427 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba4919912c0087ea614f0f55d… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Jul 5 17:52:07 2007 -0700 msi: Forward MsiFormatRecordA to MsiFormatRecordW. --- dlls/msi/format.c | 93 +++++++++++++++++----------------------------------- dlls/msi/msipriv.h | 1 - 2 files changed, 30 insertions(+), 64 deletions(-) diff --git a/dlls/msi/format.c b/dlls/msi/format.c index 147ae56..8dc99b8 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -657,57 +657,6 @@ UINT MSI_FormatRecordW( MSIPACKAGE* package, MSIRECORD* record, LPWSTR buffer, return rc; } -UINT MSI_FormatRecordA( MSIPACKAGE* package, MSIRECORD* record, LPSTR buffer, - DWORD *size ) -{ - LPWSTR deformated; - LPWSTR rec; - DWORD len,lenA; - UINT rc = ERROR_INVALID_PARAMETER; - - TRACE("%p %p %p %i\n", package, record ,buffer, *size); - - rec = msi_dup_record_field(record,0); - if (!rec) - rec = build_default_format(record); - - TRACE("(%s)\n",debugstr_w(rec)); - - len = deformat_string_internal(package,rec,&deformated,strlenW(rec), - record, NULL); - /* If len is zero then WideCharToMultiByte will return 0 indicating - * failure, but that will do just as well since we are ignoring - * possible errors. - */ - lenA = WideCharToMultiByte(CP_ACP,0,deformated,len,NULL,0,NULL,NULL); - - if (buffer) - { - /* Ditto above */ - WideCharToMultiByte(CP_ACP,0,deformated,len,buffer,*size,NULL, NULL); - if (*size>lenA) - { - rc = ERROR_SUCCESS; - buffer[lenA] = 0; - } - else - { - rc = ERROR_MORE_DATA; - if (*size) - buffer[(*size)-1] = 0; - } - } - else - rc = ERROR_SUCCESS; - - *size = lenA; - - msi_free(rec); - msi_free(deformated); - return rc; -} - - UINT WINAPI MsiFormatRecordW( MSIHANDLE hInstall, MSIHANDLE hRecord, LPWSTR szResult, DWORD *sz ) { @@ -791,30 +740,48 @@ done: UINT WINAPI MsiFormatRecordA( MSIHANDLE hInstall, MSIHANDLE hRecord, LPSTR szResult, DWORD *sz ) { - UINT r = ERROR_INVALID_HANDLE; - MSIPACKAGE *package = NULL; - MSIRECORD *record = NULL; + UINT r; + DWORD len, save; + LPWSTR value; TRACE("%ld %ld %p %p\n", hInstall, hRecord, szResult, sz); - record = msihandle2msiinfo( hRecord, MSIHANDLETYPE_RECORD ); - - if (!record) + if (!hRecord) return ERROR_INVALID_HANDLE; + if (!sz) { - msiobj_release( &record->hdr ); if (szResult) return ERROR_INVALID_PARAMETER; else return ERROR_SUCCESS; } - package = msihandle2msiinfo( hInstall, MSIHANDLETYPE_PACKAGE ); + r = MsiFormatRecordW( hInstall, hRecord, NULL, &len ); + if (r != ERROR_SUCCESS) + return r; - r = MSI_FormatRecordA( package, record, szResult, sz ); - msiobj_release( &record->hdr ); - if (package) - msiobj_release( &package->hdr ); + value = msi_alloc(++len * sizeof(WCHAR)); + if (!value) + return ERROR_OUTOFMEMORY; + + r = MsiFormatRecordW( hInstall, hRecord, value, &len ); + if (r != ERROR_SUCCESS) + goto done; + + save = len + 1; + len = WideCharToMultiByte(CP_ACP, 0, value, -1, NULL, 0, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, value, -1, szResult, *sz, NULL, NULL); + + if (szResult && len > *sz) + { + if (*sz) szResult[*sz - 1] = '\0'; + r = ERROR_MORE_DATA; + } + + *sz = save - 1; + +done: + msi_free(value); return r; } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index bb85e9a..79bda64 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -691,7 +691,6 @@ extern UINT msi_package_add_media_disk(MSIPACKAGE *, DWORD, DWORD, DWORD, LPWSTR /* for deformating */ extern UINT MSI_FormatRecordW( MSIPACKAGE *, MSIRECORD *, LPWSTR, DWORD * ); -extern UINT MSI_FormatRecordA( MSIPACKAGE *, MSIRECORD *, LPSTR, DWORD * ); /* registry data encoding/decoding functions */ extern BOOL unsquash_guid(LPCWSTR in, LPWSTR out);

1 0

James Hawkins : msi: Handle remote calls to MsiFormatRecordW.
by Alexandre Julliard 06 Jul '07

06 Jul '07

Module: wine Branch: master Commit: cba1b1e1f480cecc6e3bca4fe2978efb2585a800 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cba1b1e1f480cecc6e3bca4fe… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Jul 5 17:48:43 2007 -0700 msi: Handle remote calls to MsiFormatRecordW. --- dlls/msi/format.c | 59 +++++++++++++++++++++++++++++++++++++++++++++-- dlls/msi/msiserver.idl | 1 + dlls/msi/package.c | 9 +++++++ 3 files changed, 66 insertions(+), 3 deletions(-) diff --git a/dlls/msi/format.c b/dlls/msi/format.c index 4b5edc4..147ae56 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -33,8 +33,12 @@ http://msdn.microsoft.com/library/default.asp?url=/library/en-us/msi/setup/… #include "winerror.h" #include "wine/debug.h" #include "msi.h" -#include "msipriv.h" #include "winnls.h" +#include "objbase.h" +#include "oleauto.h" + +#include "msipriv.h" +#include "msiserver.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(msi); @@ -713,6 +717,57 @@ UINT WINAPI MsiFormatRecordW( MSIHANDLE hInstall, MSIHANDLE hRecord, TRACE("%ld %ld %p %p\n", hInstall, hRecord, szResult, sz); + package = msihandle2msiinfo( hInstall, MSIHANDLETYPE_PACKAGE ); + if (!package) + { + HRESULT hr; + IWineMsiRemotePackage *remote_package; + BSTR value = NULL; + DWORD len; + awstring wstr; + + remote_package = (IWineMsiRemotePackage *)msi_get_remote( hInstall ); + if (remote_package) + { + len = 0; + hr = IWineMsiRemotePackage_FormatRecord( remote_package, hRecord, + NULL, &len ); + if (FAILED(hr)) + goto done; + + len++; + value = SysAllocStringLen( NULL, len ); + if (!value) + { + r = ERROR_OUTOFMEMORY; + goto done; + } + + hr = IWineMsiRemotePackage_FormatRecord( remote_package, hRecord, + value, &len ); + if (FAILED(hr)) + goto done; + + wstr.unicode = TRUE; + wstr.str.w = szResult; + r = msi_strcpy_to_awstring( value, &wstr, sz ); + +done: + IWineMsiRemotePackage_Release( remote_package ); + SysFreeString( value ); + + if (FAILED(hr)) + { + if (HRESULT_FACILITY(hr) == FACILITY_WIN32) + return HRESULT_CODE(hr); + + return ERROR_FUNCTION_FAILED; + } + + return r; + } + } + record = msihandle2msiinfo( hRecord, MSIHANDLETYPE_RECORD ); if (!record) @@ -726,8 +781,6 @@ UINT WINAPI MsiFormatRecordW( MSIHANDLE hInstall, MSIHANDLE hRecord, return ERROR_SUCCESS; } - package = msihandle2msiinfo( hInstall, MSIHANDLETYPE_PACKAGE ); - r = MSI_FormatRecordW( package, record, szResult, sz ); msiobj_release( &record->hdr ); if (package) diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index b8db7dc..e293b10 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -55,6 +55,7 @@ interface IWineMsiRemotePackage : IUnknown HRESULT SetComponentState( [in] BSTR component, [in] INSTALLSTATE state ); HRESULT GetLanguage( [out] LANGID *language ); HRESULT SetInstallLevel( [in] int level ); + HRESULT FormatRecord( [in] MSIHANDLE record, [out] BSTR value, [out] DWORD *size ); } [ diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 0bf3460..f68be84 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1684,6 +1684,14 @@ HRESULT WINAPI mrp_SetInstallLevel( IWineMsiRemotePackage *iface, int level ) return HRESULT_FROM_WIN32(r); } +HRESULT WINAPI mrp_FormatRecord( IWineMsiRemotePackage *iface, MSIHANDLE record, + BSTR value, DWORD *size ) +{ + msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); + UINT r = MsiFormatRecordW(This->package, record, (LPWSTR)value, size); + return HRESULT_FROM_WIN32(r); +} + static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl = { mrp_QueryInterface, @@ -1706,6 +1714,7 @@ static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl = mrp_SetComponentState, mrp_GetLanguage, mrp_SetInstallLevel, + mrp_FormatRecord, }; HRESULT create_msi_remote_package( IUnknown *pOuter, LPVOID *ppObj )

1 0

James Hawkins : msi: Fix use of BSTRs.
by Alexandre Julliard 06 Jul '07

06 Jul '07

Module: wine Branch: master Commit: 29ce520df98005c8b6e74145a9097b3020e91872 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29ce520df98005c8b6e74145a… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Jul 5 17:48:08 2007 -0700 msi: Fix use of BSTRs. --- dlls/msi/install.c | 113 +++++++++++++++++++++++++++++++++++++++++++----- dlls/msi/msiserver.idl | 22 +++++----- dlls/msi/package.c | 52 ++++++++++++++++------ 3 files changed, 150 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=29ce520df98005c8b6e74…

1 0

Andrew Talbot : ole32: Cast-qual warnings fix.
by Alexandre Julliard 06 Jul '07

06 Jul '07

Module: wine Branch: master Commit: ca78a8b65f90a8a72f1e599ef9cb0931f09d85a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca78a8b65f90a8a72f1e599ef… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Jul 5 23:27:24 2007 +0100 ole32: Cast-qual warnings fix. --- dlls/ole32/stg_bigblockfile.c | 2 +- dlls/ole32/stg_prop.c | 4 ++-- dlls/ole32/storage32.c | 6 +----- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/stg_bigblockfile.c b/dlls/ole32/stg_bigblockfile.c index aa48a9d..0fe2a3b 100644 --- a/dlls/ole32/stg_bigblockfile.c +++ b/dlls/ole32/stg_bigblockfile.c @@ -896,7 +896,7 @@ static HRESULT WINAPI ImplBIGBLOCKFILE_WriteAt( if (bytes_left) { - readPtr = (LPBYTE)readPtr + bytes_to_page; + readPtr = (const BYTE *)readPtr + bytes_to_page; page_index ++; offset_in_page = 0; if (bytes_left > PAGE_SIZE) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index f2c96ee..76a86ca 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -1775,8 +1775,8 @@ static BOOL PropertyStorage_PropertiesWriter(const void *key, const void *value, assert(value); assert(extra); assert(closure); - c->hr = PropertyStorage_WritePropertyToStream(This, - c->propNum++, (DWORD)key, (PROPVARIANT *)value, c->sectionOffset); + c->hr = PropertyStorage_WritePropertyToStream(This, c->propNum++, + (DWORD)key, value, c->sectionOffset); return SUCCEEDED(c->hr); } diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index f787faa..584b132 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -4643,10 +4643,6 @@ HRESULT BlockChainStream_WriteAt(BlockChainStream* This, return STG_E_DOCFILECORRUPT; } - /* - * Here, I'm casting away the constness on the buffer variable - * This is OK since we don't intend to modify that buffer. - */ *bytesWritten = 0; bufferWalker = (const BYTE*)buffer; @@ -4667,7 +4663,7 @@ HRESULT BlockChainStream_WriteAt(BlockChainStream* This, StorageImpl_WriteAt(This->parentStorage, ulOffset, - (BYTE*)bufferWalker, + bufferWalker, bytesToWrite, &bytesWrittenAt);

1 0

Andrew Talbot : ole32: Constify a variable ( and fix a typo concerning its level of indirection).
by Alexandre Julliard 06 Jul '07

06 Jul '07

Module: wine Branch: master Commit: eb7a89ccc6c52af07ad079831d5da92f7bb156d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb7a89ccc6c52af07ad079831… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Jul 5 23:27:19 2007 +0100 ole32: Constify a variable (and fix a typo concerning its level of indirection). --- dlls/ole32/ifs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c index bd8f483..ec20da3 100644 --- a/dlls/ole32/ifs.c +++ b/dlls/ole32/ifs.c @@ -116,7 +116,7 @@ static int AddMemoryLocation(LPVOID * pMem) return 1; } -static int RemoveMemoryLocation(LPVOID * pMem) +static int RemoveMemoryLocation(LPCVOID pMem) { LPVOID * Current;

1 0

Paul Vriens : advapi32/tests: Add tests for CloseServiceHandle.
by Alexandre Julliard 06 Jul '07

06 Jul '07

Module: wine Branch: master Commit: db892decda732b2eb2272dda503ff81719de48f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db892decda732b2eb2272dda5… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Jul 5 21:22:06 2007 +0200 advapi32/tests: Add tests for CloseServiceHandle. --- dlls/advapi32/tests/service.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 3e66ff2..341423e 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -133,6 +133,33 @@ static void test_open_svc(void) CloseServiceHandle(scm_handle); } +static void test_close(void) +{ + SC_HANDLE handle; + BOOL ret; + + /* NULL handle */ + SetLastError(0xdeadbeef); + ret = CloseServiceHandle(NULL); + todo_wine + { + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + } + + /* TODO: Add some tests with invalid handles. These produce errors on Windows but crash on Wine */ + + /* Proper call */ + handle = OpenSCManagerA(NULL, NULL, SC_MANAGER_CONNECT); + SetLastError(0xdeadbeef); + ret = CloseServiceHandle(handle); + ok(ret, "Expected success\n"); + ok(GetLastError() == ERROR_IO_PENDING /* W2K */ || + GetLastError() == ERROR_SUCCESS /* W2K3 */ || + GetLastError() == 0xdeadbeef /* NT4, XP, Vista */, + "Expected ERROR_SUCCESS, ERROR_IO_PENDING or 0xdeadbeef, got %d\n", GetLastError()); +} + static void test_sequence(void) { SC_HANDLE scm_handle, svc_handle; @@ -264,6 +291,7 @@ START_TEST(service) /* First some parameter checking */ test_open_scm(); test_open_svc(); + test_close(); /* Test the creation, querying and deletion of a service */ test_sequence(); }

1 0

Paul Vriens : advapi32/tests: Add tests for OpenServiceA.
by Alexandre Julliard 06 Jul '07

06 Jul '07

Module: wine Branch: master Commit: 71982a4257aeb37961fa22485aa8dad9b64f7951 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71982a4257aeb37961fa22485… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Jul 5 21:00:14 2007 +0200 advapi32/tests: Add tests for OpenServiceA. --- dlls/advapi32/tests/service.c | 49 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 49 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index c5e391c..3e66ff2 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -85,6 +85,54 @@ static void test_open_scm(void) CloseServiceHandle(scm_handle); } +static void test_open_svc(void) +{ + SC_HANDLE scm_handle, svc_handle; + + /* All NULL (invalid access rights) */ + SetLastError(0xdeadbeef); + svc_handle = OpenServiceA(NULL, NULL, 0); + ok(!svc_handle, "Expected failure\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + + /* TODO: Add some tests with invalid handles. These produce errors on Windows but crash on Wine */ + + /* NULL service */ + scm_handle = OpenSCManagerA(NULL, NULL, SC_MANAGER_CONNECT); + SetLastError(0xdeadbeef); + svc_handle = OpenServiceA(scm_handle, NULL, GENERIC_READ); + ok(!svc_handle, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_ADDRESS /* W2K, XP, W2K3, Vista */ || + GetLastError() == ERROR_INVALID_PARAMETER /* NT4 */, + "Expected ERROR_INVALID_ADDRESS or ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + /* Non-existent service */ + scm_handle = OpenSCManagerA(NULL, NULL, SC_MANAGER_CONNECT); + SetLastError(0xdeadbeef); + svc_handle = OpenServiceA(scm_handle, "deadbeef", GENERIC_READ); + ok(!svc_handle, "Expected failure\n"); + ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST, "Expected ERROR_SERVICE_DOES_NOT_EXIST, got %d\n", GetLastError()); + CloseServiceHandle(scm_handle); + + /* Proper SCM handle but different access rights */ + scm_handle = OpenSCManagerA(NULL, NULL, SC_MANAGER_CONNECT); + SetLastError(0xdeadbeef); + svc_handle = OpenServiceA(scm_handle, "Spooler", GENERIC_WRITE); + if (!svc_handle && (GetLastError() == ERROR_ACCESS_DENIED)) + skip("Not enough rights to get a handle to the service\n"); + else + { + ok(svc_handle != NULL, "Expected success\n"); + ok(GetLastError() == ERROR_SUCCESS /* W2K3, Vista */ || + GetLastError() == ERROR_IO_PENDING /* W2K */ || + GetLastError() == 0xdeadbeef /* XP, NT4 */, + "Expected ERROR_SUCCESS or 0xdeadbeef, got %d\n", GetLastError()); + CloseServiceHandle(svc_handle); + } + CloseServiceHandle(scm_handle); +} + static void test_sequence(void) { SC_HANDLE scm_handle, svc_handle; @@ -215,6 +263,7 @@ START_TEST(service) /* First some parameter checking */ test_open_scm(); + test_open_svc(); /* Test the creation, querying and deletion of a service */ test_sequence(); }

1 0

appdb/include mail.php
by WineHQ 06 Jul '07

06 Jul '07

ChangeSet ID: 31240 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/05 20:24:09 Modified files: include : mail.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix email messageboxes to be on multiple lines again. The email array passed to addmsg() must be space-separated. Patch: http://cvs.winehq.org/patch.py?id=31240 Old revision New revision Changes Path 1.10 1.11 +2 -2 appdb/include/mail.php Index: appdb/include/mail.php diff -u -p appdb/include/mail.php:1.10 appdb/include/mail.php:1.11 --- appdb/include/mail.php:1.10 6 Jul 2007 1:24: 9 -0000 +++ appdb/include/mail.php 6 Jul 2007 1:24: 9 -0000 @@ -8,12 +8,12 @@ function mail_appdb($sEmailList,$sSubjec if(defined("DISABLE_EMAIL")) return; - $sEmailList = str_replace(" ",",",$sEmailList); + $sEmailListComma = str_replace(" ",",",$sEmailList); $sHeaders = "MIME-Version: 1.0\r\n"; $sHeaders .= "From: AppDB <".APPDB_SENDER_EMAIL.">\r\n"; $sHeaders .= "Reply-to: AppDB <".APPDB_SENDER_EMAIL.">\r\n"; - $sHeaders .= "Bcc: $sEmailList\r\n"; + $sHeaders .= "Bcc: $sEmailListComma\r\n"; $sHeaders .= "X-Priority: 3\r\n"; $sHeaders .= "X-Mailer: ".APPDB_OWNER." mailer\r\n"; $sMsg = trim(ereg_replace("\r\n","\n",$sMsg));

1 0

appdb/include filter.php
by WineHQ 05 Jul '07

05 Jul '07

ChangeSet ID: 31239 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/05 16:49:17 Modified files: include : filter.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Add a suggestion to users that are receiving filter errors to clear out their cookies. Patch: http://cvs.winehq.org/patch.py?id=31239 Old revision New revision Changes Path 1.14 1.15 +10 -4 appdb/include/filter.php Index: appdb/include/filter.php diff -u -p appdb/include/filter.php:1.14 appdb/include/filter.php:1.15 --- appdb/include/filter.php:1.14 5 Jul 2007 21:49:17 -0000 +++ appdb/include/filter.php 5 Jul 2007 21:49:17 -0000 @@ -20,6 +20,8 @@ function filter_perform_filtering() function filter_gpc() { global $aClean; + $sErrorSuggestion = " Please try clearing out your cookies. If the problem continues ". + " please email ".APPDB_OWNER_EMAIL." with the error text."; $aKeys = array_keys($_REQUEST); for($i=0; $i < sizeof($aKeys); $i++) @@ -61,13 +63,15 @@ function filter_gpc() else if(empty($_REQUEST[$aKeys[$i]])) $aClean[$aKeys[$i]] = 0; else - return "Fatal error: ".$aKeys[$i]." should be a numeric value."; + return "Fatal error: ".$aKeys[$i]." should be a numeric value. ". + $sErrorSuggestion; break; case "b": // boolean if($_REQUEST[$aKeys[$i]]=="true" || $_REQUEST[$aKeys[$i]]=="false") $aClean[$aKeys[$i]] = $_REQUEST[$aKeys[$i]]; else - return "Fatal error: ".$aKeys[$i]." should be a boolean value."; + return "Fatal error: ".$aKeys[$i]." should be a boolean value. ". + $sErrorSuggestion; break; case "s": // string switch($aKeys[$i][1]) @@ -85,10 +89,12 @@ function filter_gpc() break; case "a": // array if(!is_array($_REQUEST[$aKeys[$i]])) - return "Fatal error: ".$aKeys[$i]." should be an array."; + return "Fatal error: ".$aKeys[$i]." should be an array. ". + $sErrorSuggestion; break; default: - return "Fatal error: type of variable ".$aKeys[$i]." is not recognized."; + return "Fatal error: type of variable ".$aKeys[$i]." is not recognized.". + $sErrorSuggestion; break; } }

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 05 Jul '07

05 Jul '07

Module: wine Branch: master Commit: a3317a5c01a8c6ff0dff95498512a66837a56a8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3317a5c01a8c6ff0dff95498… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 5 16:10:30 2007 +0200 Assorted spelling fixes. --- dlls/advapi32/tests/lsa.c | 2 +- dlls/crypt32/tests/msg.c | 2 +- dlls/ddraw/tests/dsurface.c | 2 +- dlls/dsound/primary.c | 4 ++-- dlls/ntprint/ntprint.c | 2 +- dlls/setupapi/tests/install.c | 2 +- dlls/winealsa.drv/dsoutput.c | 10 +++++----- include/basetsd.h | 2 +- programs/cmd/builtins.c | 2 +- programs/cmd/wcmdmain.c | 4 ++-- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index 575fc21..4035416 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -85,7 +85,7 @@ static void test_lsa(void) status = pLsaQueryInformationPolicy(handle, PolicyAuditEventsInformation, (PVOID*)&audit_events_info); if (status == STATUS_ACCESS_DENIED) - skip("Not enought rights to retrieve PolicyAuditEventsInformation\n"); + skip("Not enough rights to retrieve PolicyAuditEventsInformation\n"); else ok(status == STATUS_SUCCESS, "LsaQueryInformationPolicy(PolicyAuditEventsInformation) failed, returned 0x%08x\n", status); if (status == STATUS_SUCCESS) { diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 16ab7f6..20b52ad 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -358,7 +358,7 @@ static void test_data_msg_update(void) msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, CMSG_DETACHED_FLAG, CMSG_DATA, NULL, NULL, NULL); - /* Dont appear to be able to update CMSG-DATA with non-final updates */ + /* Doesn't appear to be able to update CMSG-DATA with non-final updates */ SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, NULL, 0, FALSE); ok(!ret && GetLastError() == E_INVALIDARG, diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index b0a2195..e999aeb 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -2315,7 +2315,7 @@ static void StructSizeTest(void) union { DDSURFACEDESC desc1; DDSURFACEDESC2 desc2; - char blob[1024]; /* To get a buch of writeable memory */ + char blob[1024]; /* To get a bunch of writable memory */ } desc; DDSURFACEDESC create; HRESULT hr; diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index d8d7dc6..a89889c 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -48,7 +48,7 @@ static void DSOUND_RecalcPrimary(DirectSoundDevice *device) * If DS_TIME_DEL is about 10 ms, 512 * nBlockAlign is roughly correct */ fraglen = 512 * nBlockAlign; - /* Compensate for only being rougly accurate */ + /* Compensate for only being roughly accurate */ if (device->pwfx->nSamplesPerSec <= 26000) fraglen /= 2; @@ -324,7 +324,7 @@ HRESULT DSOUND_PrimaryStop(DirectSoundDevice *device) } } else { - /* dont call the wave system with the lock set */ + /* don't call the wave system with the lock set */ LeaveCriticalSection(&(device->mixlock)); /* **** */ diff --git a/dlls/ntprint/ntprint.c b/dlls/ntprint/ntprint.c index ece26ef..32a2c08 100644 --- a/dlls/ntprint/ntprint.c +++ b/dlls/ntprint/ntprint.c @@ -131,7 +131,7 @@ VOID WINAPI PSetupDestroyMonitorInfo(HANDLE monitorinfo) * index [I] Nr. of the Monitorname to copy * buffer [I] Target, that receive the Monitorname * psize [IO] PTR to a DWORD that hold the size of the buffer and receive - * the needed size, when the buffer is to small + * the needed size, when the buffer is too small * * RETURNS * Success: TRUE diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 124f831..3145ae4 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -43,7 +43,7 @@ static char CURR_DIR[MAX_PATH]; * occurs (e.g., unquoted inf file with spaces, registry keys are written but last error is 6). Also, on Win98 last error * is set to ERROR_SUCCESS even if install fails (e.g., quoted inf file with spaces, no registry keys set, MessageBox with * "Installation Error" displayed). Thus, we must use functional tests (e.g., is registry key created) to determine whether - * or not installation occured. + * or not installation occurred. * - On installation problems, a MessageBox() is displayed and a Beep() is issued. The MessageBox() is disabled with a * CBT hook. */ diff --git a/dlls/winealsa.drv/dsoutput.c b/dlls/winealsa.drv/dsoutput.c index e6958d3..c5ad141 100644 --- a/dlls/winealsa.drv/dsoutput.c +++ b/dlls/winealsa.drv/dsoutput.c @@ -328,7 +328,7 @@ static HRESULT SetFormat(IDsDriverBufferImpl *This, LPWAVEFORMATEX pwfx, BOOL fo { /* **** */ LeaveCriticalSection(&This->pcm_crst); - WARN("Can not open sound device: %s\n", snd_strerror(err)); + WARN("Cannot open sound device: %s\n", snd_strerror(err)); return DSERR_GENERIC; } snd_pcm_drop(This->pcm); @@ -339,7 +339,7 @@ static HRESULT SetFormat(IDsDriverBufferImpl *This, LPWAVEFORMATEX pwfx, BOOL fo { /* **** */ LeaveCriticalSection(&This->pcm_crst); - WARN("Can not open sound device: %s\n", snd_strerror(err)); + WARN("Cannot open sound device: %s\n", snd_strerror(err)); return DSERR_BUFFERLOST; } } @@ -353,7 +353,7 @@ static HRESULT SetFormat(IDsDriverBufferImpl *This, LPWAVEFORMATEX pwfx, BOOL fo if (err < 0) { WARN("Could not set format to %d bpp\n", pwfx->wBitsPerSample); goto err; } /* Alsa's rate resampling is only used if the application specifically requests - * a buffer at a certain frequency, else it is better to disable due to unwanted + * a buffer at a certain frequency, else it is better to disable it due to unwanted * side effects, which may include: Less granular pointer, changing buffer sizes, etc */ #if SND_LIB_VERSION >= 0x010009 @@ -383,7 +383,7 @@ static HRESULT SetFormat(IDsDriverBufferImpl *This, LPWAVEFORMATEX pwfx, BOOL fo TRACE("Period size is: %lu\n", psize); /* If period size is 'high', try to commit less - * dmix needs at least 2 buffers to work succesfully but prefers 3 + * dmix needs at least 2 buffers to work successfully but prefers 3 * however it seems to work ok if I just commit 2 1/2 buffers */ if (psize >= 512) @@ -709,7 +709,7 @@ static HRESULT WINAPI IDsDriverImpl_CreateSoundBuffer(PIDSDRIVER iface, err = SetFormat(*ippdsdb, pwfx, FALSE); if (FAILED(err)) { - WARN("Error occured: %08x\n", err); + WARN("Error occurred: %08x\n", err); goto err; } diff --git a/include/basetsd.h b/include/basetsd.h index dcdf8fa..7fba324 100644 --- a/include/basetsd.h +++ b/include/basetsd.h @@ -32,7 +32,7 @@ extern "C" { * and pointer are 32-bit. * * Win64, however, will cause some problems when implemented under Unix. - * Linux/{Alpha, Sparc64} and most (all?) other 64-bit Unices uses + * Linux/{Alpha, Sparc64} and most (all?) other 64-bit Unices use * the LP64 type model where int is 32-bit and long and pointer are * 64-bit. Win64 on the other hand uses the P64 (sometimes called LLP64) * type model where int and long are 32 bit and pointer is 64-bit. diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 482d870..33e96c1 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -734,7 +734,7 @@ void WCMD_part_execute(CMD_LIST **cmdList, WCHAR *firstcmd, WCHAR *variable, } - /* If it didnt move the position, step to next command */ + /* If it didn't move the position, step to next command */ if (curPosition == *cmdList) *cmdList = (*cmdList)->nextcommand; /* Process any other parts of the command */ diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 36b8612..247ee81 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -497,7 +497,7 @@ void WCMD_process_command (WCHAR *command, CMD_LIST **cmdList) while ((p = strchrW(p, '%'))) { i = *(p+1) - '0'; - /* Dont touch %% */ + /* Don't touch %% */ if (*(p+1) == '%') { p+=2; @@ -1895,7 +1895,7 @@ void WCMD_DumpCommands(CMD_LIST *commands) { * * Either uses supplied input or * Reads a file from the handle, and then... - * Parse the text buffer, spliting into seperate commands + * Parse the text buffer, spliting into separate commands * - unquoted && strings split 2 commands but the 2nd is flagged as * following an && * - ( as the first character just ups the bracket depth

1 0

← Newer
1
...
80
81
82
83
84
85
86
...
96
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 July 2007