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

Alexandre Julliard : Maketest.rules: Add dependency on IDL headers for crosstest objects.
by Alexandre Julliard 06 Jul '07

06 Jul '07

Module: wine Branch: master Commit: fff723d7393756d0e9fc78564b08283e09b06cc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fff723d7393756d0e9fc78564… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 6 18:20:06 2007 +0200 Maketest.rules: Add dependency on IDL headers for crosstest objects. --- dlls/Maketest.rules.in | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/Maketest.rules.in b/dlls/Maketest.rules.in index 73bf4d9..6c70a23 100644 --- a/dlls/Maketest.rules.in +++ b/dlls/Maketest.rules.in @@ -68,6 +68,8 @@ crosstest:: @CROSSTEST@ $(CROSSTEST): $(CROSSOBJS) Makefile.in $(CROSSCC) $(CROSSOBJS) -o $@ $(ALL_LIBS) +$(CROSSOBJS): $(IDL_GEN_HEADERS) + # Rules for cleaning testclean::

1 0

Romain Iehl : dsound: Correct field access.
by Alexandre Julliard 06 Jul '07

06 Jul '07

Module: wine Branch: master Commit: 684a121aed556d1c9edf04b7f68cccf88fb945fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=684a121aed556d1c9edf04b7f… Author: Romain Iehl <romain.iehl.wine(a)gmail.com> Date: Thu Jul 5 19:32:18 2007 +0200 dsound: Correct field access. --- dlls/dsound/sound3d.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index ce7899f..cae1c28 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -272,13 +272,13 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) /* FIXME: Doppler Effect disabled since i have no idea which frequency to change and how to do it */ #if 0 /* doppler shift*/ - if ((VectorMagnitude(&ds3db.vVelocity) == 0) && (VectorMagnitude(&dsb->device->ds3dl.vVelocity) == 0)) + if ((VectorMagnitude(&ds3db_ds3db.vVelocity) == 0) && (VectorMagnitude(&dsb->device->ds3dl.vVelocity) == 0)) { TRACE("doppler: Buffer and Listener don't have velocities\n"); } else { - /* calculate length of ds3db.vVelocity component which causes Doppler Effect + /* calculate length of ds3db_ds3db.vVelocity component which causes Doppler Effect NOTE: if buffer moves TOWARDS the listener, it's velocity component is NEGATIVE if buffer moves AWAY from listener, it's velocity component is POSITIVE */ flBufferVel = ProjectVector(&dsb->ds3db_ds3db.vVelocity, &vDistance);

1 0

Paul Vriens : ddraw/tests: Use skip instead of trace.
by Alexandre Julliard 06 Jul '07

06 Jul '07

Module: wine Branch: master Commit: a470ea62050371796f41e8917bc56636a11affe9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a470ea62050371796f41e8917… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Jul 5 17:40:26 2007 +0200 ddraw/tests: Use skip instead of trace. --- dlls/ddraw/tests/refcount.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/refcount.c b/dlls/ddraw/tests/refcount.c index 9da30ec..9038c57 100644 --- a/dlls/ddraw/tests/refcount.c +++ b/dlls/ddraw/tests/refcount.c @@ -434,7 +434,7 @@ START_TEST(refcount) init_function_pointers(); if(!pDirectDrawCreateEx) { - trace("function DirectDrawCreateEx not available, skipping tests\n"); + skip("function DirectDrawCreateEx not available\n"); return; } test_ddraw_objects();

1 0

Romain Iehl : dsound: Fix bug preventing correct calculation of the sound parameters
by Alexandre Julliard 06 Jul '07

06 Jul '07

Module: wine Branch: master Commit: 3a8ae53de4e63dae3dbe130f0f13d4110ab0ece2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a8ae53de4e63dae3dbe130f0… Author: Romain Iehl <romain.iehl.wine(a)gmail.com> Date: Thu Jul 5 18:55:39 2007 +0200 dsound: Fix bug preventing correct calculation of the sound parameters of a 3Dbuffer, when an application calls CommitDeferredSettings after the 3DBuffer has been released. --- dlls/dsound/sound3d.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index f6ae455..0e4ea0e 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -326,11 +326,6 @@ static void DSOUND_ChangeListener(IDirectSound3DListenerImpl *ds3dl) TRACE("(%p)\n",ds3dl); for (i = 0; i < ds3dl->device->nrofbuffers; i++) { - /* some buffers don't have 3d buffer (Ultima IX seems to - crash without the following line) */ - if (ds3dl->device->buffers[i]->ds3db == NULL) - continue; - /* check if this buffer is waiting for recalculation */ if (ds3dl->device->buffers[i]->ds3db_need_recalc) {

1 0

Romain Iehl : dsound: Simplify the calculation of sound attenuation due to distance.
by Alexandre Julliard 06 Jul '07

06 Jul '07

Module: wine Branch: master Commit: 8de6b7da4035cc4bb8f4a2276de7e34d169935f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8de6b7da4035cc4bb8f4a2276… Author: Romain Iehl <romain.iehl.wine(a)gmail.com> Date: Thu Jul 5 19:30:18 2007 +0200 dsound: Simplify the calculation of sound attenuation due to distance. --- dlls/dsound/sound3d.c | 17 ++--------------- 1 files changed, 2 insertions(+), 15 deletions(-) diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index 0e4ea0e..ce7899f 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -53,8 +53,6 @@ #include "dsdriver.h" #include "dsound_private.h" -/* default intensity level for human ears */ -#define DEFAULT_INTENSITY 0.000000000001f /* default velocity of sound in the air */ #define DEFAULT_VELOCITY 340 @@ -167,9 +165,6 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) { /* volume, at which the sound will be played after all calcs. */ D3DVALUE lVolume = 0; - /* intensity (used for distance related stuff) */ - double flIntensity; - double flTemp; /* stuff for distance related stuff calc. */ D3DVECTOR vDistance; D3DVALUE flDistance = 0; @@ -223,16 +218,8 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) if (flDistance < dsb->ds3db_ds3db.flMinDistance) flDistance = dsb->ds3db_ds3db.flMinDistance; - /* the following formula is taken from my physics book. I think it's ok for the *real* world...i hope m$ does it that way */ - lVolume += 10000; /* ms likes working with negative volume...i don't */ - lVolume /= 1000; /* convert hundreths of dB into B */ - /* intensity level (loudness) = log10(Intensity/DefaultIntensity)...therefore */ - flIntensity = pow(10,lVolume)*DEFAULT_INTENSITY; - flTemp = (flDistance/dsb->ds3db_ds3db.flMinDistance)*(flDistance/dsb->ds3db_ds3db.flMinDistance); - flIntensity /= flTemp; - lVolume = log10(flIntensity/DEFAULT_INTENSITY); - lVolume *= 1000; /* convert back to hundreths of dB */ - lVolume -= 10000; /* we need to do it in ms way */ + /* attenuation proportional to the distance squared, converted to millibels as in lVolume*/ + lVolume -= log10(flDistance/dsb->ds3db_ds3db.flMinDistance * flDistance/dsb->ds3db_ds3db.flMinDistance)*1000; TRACE("dist. att: Distance = %f, MinDistance = %f => adjusting volume %d to %f\n", flDistance, dsb->ds3db_ds3db.flMinDistance, dsb->ds3db_lVolume, lVolume); /* conning */

1 0

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 MsiEvaluateCondition.
by Alexandre Julliard 06 Jul '07

06 Jul '07

Module: wine Branch: master Commit: 6b97f8905dc9435b8018a297472b4f4dbec315a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b97f8905dc9435b8018a2974… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Jul 5 17:53:03 2007 -0700 msi: Handle remote calls to MsiEvaluateCondition. --- dlls/msi/cond.y | 46 +++++++++++++++++++++++++++++++++++++++++----- dlls/msi/msiserver.idl | 1 + dlls/msi/package.c | 8 ++++++++ 3 files changed, 50 insertions(+), 5 deletions(-) diff --git a/dlls/msi/cond.y b/dlls/msi/cond.y index ee42ede..8612ffe 100644 --- a/dlls/msi/cond.y +++ b/dlls/msi/cond.y @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + #include "config.h" #include <stdarg.h> @@ -29,12 +31,15 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "wine/debug.h" -#include "wine/unicode.h" - #include "msi.h" #include "msiquery.h" +#include "objbase.h" +#include "oleauto.h" + #include "msipriv.h" +#include "msiserver.h" +#include "wine/debug.h" +#include "wine/unicode.h" #define YYLEX_PARAM info #define YYPARSE_PARAM info @@ -742,8 +747,39 @@ MSICONDITION WINAPI MsiEvaluateConditionW( MSIHANDLE hInstall, LPCWSTR szConditi UINT ret; package = msihandle2msiinfo( hInstall, MSIHANDLETYPE_PACKAGE); - if( !package) - return MSICONDITION_ERROR; + if( !package ) + { + HRESULT hr; + BSTR condition; + IWineMsiRemotePackage *remote_package; + + remote_package = (IWineMsiRemotePackage *)msi_get_remote( hInstall ); + if (!remote_package) + return MSICONDITION_ERROR; + + condition = SysAllocString( szCondition ); + if (!condition) + { + IWineMsiRemotePackage_Release( remote_package ); + return ERROR_OUTOFMEMORY; + } + + hr = IWineMsiRemotePackage_EvaluateCondition( remote_package, condition ); + + SysFreeString( condition ); + IWineMsiRemotePackage_Release( remote_package ); + + if (FAILED(hr)) + { + if (HRESULT_FACILITY(hr) == FACILITY_WIN32) + return HRESULT_CODE(hr); + + return ERROR_FUNCTION_FAILED; + } + + return ERROR_SUCCESS; + } + ret = MSI_EvaluateConditionW( package, szCondition ); msiobj_release( &package->hdr ); return ret; diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index e293b10..1b162be 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -56,6 +56,7 @@ interface IWineMsiRemotePackage : IUnknown HRESULT GetLanguage( [out] LANGID *language ); HRESULT SetInstallLevel( [in] int level ); HRESULT FormatRecord( [in] MSIHANDLE record, [out] BSTR value, [out] DWORD *size ); + HRESULT EvaluateCondition( [in] BSTR condition ); } [ diff --git a/dlls/msi/package.c b/dlls/msi/package.c index f68be84..f3d6130 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1692,6 +1692,13 @@ HRESULT WINAPI mrp_FormatRecord( IWineMsiRemotePackage *iface, MSIHANDLE record, return HRESULT_FROM_WIN32(r); } +HRESULT WINAPI mrp_EvaluateCondition( IWineMsiRemotePackage *iface, BSTR condition ) +{ + msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); + UINT r = MsiEvaluateConditionW(This->package, (LPWSTR)condition); + return HRESULT_FROM_WIN32(r); +} + static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl = { mrp_QueryInterface, @@ -1715,6 +1722,7 @@ static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl = mrp_GetLanguage, mrp_SetInstallLevel, mrp_FormatRecord, + mrp_EvaluateCondition, }; HRESULT create_msi_remote_package( IUnknown *pOuter, LPVOID *ppObj )

1 0

James Hawkins : msi: Enable remote custom actions.
by Alexandre Julliard 06 Jul '07

06 Jul '07

Module: wine Branch: master Commit: 1647de570bedb0052359075367e49dbae5ecc7b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1647de570bedb005235907536… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Jul 5 17:56:22 2007 -0700 msi: Enable remote custom actions. --- dlls/msi/custom.c | 81 +++++++++++++++++++++++++++++++++++------------- dlls/msi/msiserver.idl | 2 +- 2 files changed, 60 insertions(+), 23 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 850db04..06699d2 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -613,41 +613,75 @@ static void handle_msi_break( LPCWSTR target ) DebugBreak(); } +static UINT get_action_info( const GUID *guid, INT *type, MSIHANDLE *handle, + BSTR *dll, BSTR *funcname, + IWineMsiRemotePackage **package ) +{ + IClassFactory *cf = NULL; + IWineMsiRemoteCustomAction *rca = NULL; + HRESULT r; + + r = DllGetClassObject( &CLSID_IWineMsiRemoteCustomAction, + &IID_IClassFactory, (LPVOID *)&cf ); + if (FAILED(r)) + { + ERR("failed to get IClassFactory interface\n"); + return ERROR_FUNCTION_FAILED; + } + + r = IClassFactory_CreateInstance( cf, NULL, &IID_IWineMsiRemoteCustomAction, (LPVOID *)&rca ); + if (FAILED(r)) + { + ERR("failed to get IWineMsiRemoteCustomAction interface\n"); + return ERROR_FUNCTION_FAILED; + } + + r = IWineMsiRemoteCustomAction_GetActionInfo( rca, guid, type, handle, dll, funcname, package ); + IWineMsiRemoteCustomAction_Release( rca ); + if (FAILED(r)) + { + ERR("GetActionInfo failed\n"); + return ERROR_FUNCTION_FAILED; + } + + return ERROR_SUCCESS; +} + static DWORD WINAPI ACTION_CallDllFunction( const GUID *guid ) { - msi_custom_action_info *info; MsiCustomActionEntryPoint fn; - MSIHANDLE hPackage; + MSIHANDLE hPackage, handle; HANDLE hModule; LPSTR proc; UINT r = ERROR_FUNCTION_FAILED; + BSTR dll = NULL, function = NULL; + INT type; + IWineMsiRemotePackage *remote_package = NULL; - info = find_action_by_guid( guid ); - if (!info) - { - ERR("failed to find action %s\n", debugstr_guid( guid) ); - return r; - } + TRACE("%s\n", debugstr_guid( guid )); - TRACE("%s %s\n", debugstr_w( info->source ), debugstr_w( info->target ) ); + r = get_action_info( guid, &type, &handle, &dll, &function, &remote_package ); + if (r != ERROR_SUCCESS) + return r; - hModule = LoadLibraryW( info->source ); + hModule = LoadLibraryW( dll ); if (!hModule) { - ERR("failed to load dll %s\n", debugstr_w( info->source ) ); + ERR("failed to load dll %s\n", debugstr_w( dll ) ); return r; } - proc = strdupWtoA( info->target ); + proc = strdupWtoA( function ); fn = (MsiCustomActionEntryPoint) GetProcAddress( hModule, proc ); msi_free( proc ); if (fn) { - hPackage = alloc_msihandle( &info->package->hdr ); + hPackage = alloc_msi_remote_handle( (IUnknown *)remote_package ); if (hPackage) { - TRACE("calling %s\n", debugstr_w( info->target ) ); - handle_msi_break( info->target ); + IWineMsiRemotePackage_SetMsiHandle( remote_package, handle ); + TRACE("calling %s\n", debugstr_w( function ) ); + handle_msi_break( function ); __TRY { @@ -656,7 +690,7 @@ static DWORD WINAPI ACTION_CallDllFunction( const GUID *guid ) __EXCEPT_PAGE_FAULT { ERR("Custom action (%s:%s) caused a page fault: %08x\n", - debugstr_w(info->source), debugstr_w(info->target), GetExceptionCode()); + debugstr_w(dll), debugstr_w(function), GetExceptionCode()); r = ERROR_SUCCESS; } __ENDTRY; @@ -664,16 +698,17 @@ static DWORD WINAPI ACTION_CallDllFunction( const GUID *guid ) MsiCloseHandle( hPackage ); } else - ERR("failed to create handle for %p\n", info->package ); + ERR("failed to create handle for %p\n", remote_package ); } else - ERR("GetProcAddress(%s) failed\n", debugstr_w( info->target ) ); + ERR("GetProcAddress(%s) failed\n", debugstr_w( function ) ); FreeLibrary(hModule); - if (info->type & msidbCustomActionTypeAsync && - info->type & msidbCustomActionTypeContinue) - release_custom_action_data( info ); + IWineMsiRemotePackage_Release( remote_package ); + SysFreeString( dll ); + SysFreeString( function ); + MsiCloseHandle( handle ); return r; } @@ -1413,7 +1448,7 @@ static ULONG WINAPI mcr_Release( IWineMsiRemoteCustomAction *iface ) } static HRESULT WINAPI mcr_GetActionInfo( IWineMsiRemoteCustomAction *iface, LPCGUID custom_action_guid, - MSIHANDLE *handle, BSTR *dll, BSTR *func, IWineMsiRemotePackage **remote_package ) + INT *type, MSIHANDLE *handle, BSTR *dll, BSTR *func, IWineMsiRemotePackage **remote_package ) { msi_custom_action_info *info; @@ -1421,10 +1456,12 @@ static HRESULT WINAPI mcr_GetActionInfo( IWineMsiRemoteCustomAction *iface, LPCG if (!info) return E_FAIL; + *type = info->type; *handle = alloc_msihandle( &info->package->hdr ); *dll = SysAllocString( info->source ); *func = SysAllocString( info->target ); + release_custom_action_data( info ); return create_msi_remote_package( NULL, (LPVOID *)remote_package ); } diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index 1b162be..f095f6a 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -66,7 +66,7 @@ interface IWineMsiRemotePackage : IUnknown ] interface IWineMsiRemoteCustomAction : IUnknown { - HRESULT GetActionInfo( [in] LPCGUID guid, [out] MSIHANDLE *handle, [out] BSTR *dllname, + HRESULT GetActionInfo( [in] LPCGUID guid, [out] INT *type, [out] MSIHANDLE *handle, [out] BSTR *dllname, [out] BSTR *function, [out] IWineMsiRemotePackage **package ); }

1 0

Damjan Jovanovic : shell32: DragQueryFile doesn't count the null terminator .
by Alexandre Julliard 06 Jul '07

06 Jul '07

Module: wine Branch: master Commit: 1d5575b905007f6236b56b92ba484a4fa890e4d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d5575b905007f6236b56b92b… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri Jul 6 07:27:56 2007 +0200 shell32: DragQueryFile doesn't count the null terminator. --- dlls/shell32/shell.c | 4 +--- dlls/shell32/shellole.c | 9 ++------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/shell.c b/dlls/shell32/shell.c index cb95078..7ffc33b 100644 --- a/dlls/shell32/shell.c +++ b/dlls/shell32/shell.c @@ -121,10 +121,8 @@ UINT16 WINAPI DragQueryFile16( } i = strlen(lpDrop); - i++; if (!lpszFile ) goto end; /* needed buffer size */ - i = (wLength > i) ? i : wLength; - lstrcpynA (lpszFile, lpDrop, i); + lstrcpynA (lpszFile, lpDrop, wLength); end: GlobalUnlock16(hDrop); return i; diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index e5d8368..f4853b5 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -621,10 +621,8 @@ UINT WINAPI DragQueryFileA( } i = strlen(lpDrop); - i++; if (!lpszFile ) goto end; /* needed buffer size */ - i = (lLength > i) ? i : lLength; - lstrcpynA (lpszFile, lpDrop, i); + lstrcpynA (lpszFile, lpDrop, lLength); end: GlobalUnlock(hDrop); return i; @@ -679,11 +677,8 @@ UINT WINAPI DragQueryFileW( } i = strlenW(lpwDrop); - i++; if ( !lpszwFile) goto end; /* needed buffer size */ - - i = (lLength > i) ? i : lLength; - lstrcpynW (lpszwFile, lpwDrop, i); + lstrcpynW (lpszwFile, lpwDrop, lLength); end: GlobalUnlock(hDrop); return i;

1 0

Vitaliy Margolen : dinput: Correct test - use appropriate mouse state structure.
by Alexandre Julliard 06 Jul '07

06 Jul '07

Module: wine Branch: master Commit: 1f72c13a5ae2661cd8ca947913b959824d5e6d8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f72c13a5ae2661cd8ca94791… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Fri Jul 6 07:25:47 2007 -0600 dinput: Correct test - use appropriate mouse state structure. --- dlls/dinput/tests/mouse.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index de6bff0..0f9c88b 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -72,7 +72,7 @@ static void test_acquire(LPDIRECTINPUT pDI, HWND hwnd) { HRESULT hr; LPDIRECTINPUTDEVICE pMouse = NULL; - DIMOUSESTATE2 m_state; + DIMOUSESTATE m_state; hr = IDirectInput_CreateDevice(pDI, &GUID_SysMouse, &pMouse, NULL); ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %s\n", DXGetErrorString8(hr));

1 0