July 2020 - Wine-Commits - list.winehq.org

Piotr Caban : msi: Add support for appending data to _TransformView table.
by Alexandre Julliard July 2, 2020

July 2, 2020

Module: wine Branch: master Commit: 3459c90cd6a49e817213b6e6764bdfafa7d4bcc7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3459c90cd6a49e817213b6e6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 1 10:43:08 2020 +0200 msi: Add support for appending data to _TransformView table. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/table.c | 48 ++++++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 27f3763d34..612a369597 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2336,7 +2336,7 @@ static UINT TransformView_fetch_stream( MSIVIEW *view, UINT row, UINT col, IStre static UINT TransformView_set_row( MSIVIEW *view, UINT row, MSIRECORD *rec, UINT mask ) { static const WCHAR query_pfx[] = - L"INSERT INTO `_TransformView` (`Table`, `Column`, `Row`, `Data`, `Current`) VALUES ('"; + L"INSERT INTO `_TransformView` (`new`, `Table`, `Column`, `Row`, `Data`, `Current`) VALUES (1, '"; MSITABLEVIEW *tv = (MSITABLEVIEW*)view; WCHAR buf[256], *query; @@ -2372,7 +2372,7 @@ static UINT TransformView_set_row( MSIVIEW *view, UINT row, MSIRECORD *rec, UINT if (tv->columns[i].type & MSITYPE_KEY) continue; - qlen = p = wcslen( query_pfx ); + qlen = p = ARRAY_SIZE( query_pfx ) - 1; qlen += wcslen( tv->name ) + 3; /* strlen("','") */ qlen += wcslen( tv->columns[i].colname ) + 3; qlen += wcslen( key ) + 3; @@ -2481,7 +2481,7 @@ static UINT TransformView_set_row( MSIVIEW *view, UINT row, MSIRECORD *rec, UINT static UINT TransformView_create_table( MSITABLEVIEW *tv, MSIRECORD *rec ) { static const WCHAR query_fmt[] = - L"INSERT INTO `_TransformView` (`Table`, `Column`) VALUES ('%s', 'CREATE')"; + L"INSERT INTO `_TransformView` (`Table`, `Column`, `new`) VALUES ('%s', 'CREATE', 1)"; WCHAR buf[256], *query = buf; const WCHAR *name; @@ -2516,7 +2516,7 @@ static UINT TransformView_create_table( MSITABLEVIEW *tv, MSIRECORD *rec ) static UINT TransformView_add_column( MSITABLEVIEW *tv, MSIRECORD *rec ) { static const WCHAR query_pfx[] = - L"INSERT INTO `_TransformView` (`Table`, `Current`, `Column`, `Data`) VALUES ('"; + L"INSERT INTO `_TransformView` (`new`, `Table`, `Current`, `Column`, `Data`) VALUES (1, '"; WCHAR buf[256], *query = buf; UINT i, p, len, r, qlen; @@ -2569,7 +2569,7 @@ static UINT TransformView_add_column( MSITABLEVIEW *tv, MSIRECORD *rec ) static UINT TransformView_insert_row( MSIVIEW *view, MSIRECORD *rec, UINT row, BOOL temporary ) { static const WCHAR query_fmt[] = - L"INSERT INTO `_TransformView` (`Table`, `Column`, `Row`) VALUES ('%s', 'INSERT', '%s')"; + L"INSERT INTO `_TransformView` (`new`, `Table`, `Column`, `Row`) VALUES (1, '%s', 'INSERT', '%s')"; MSITABLEVIEW *tv = (MSITABLEVIEW*)view; WCHAR buf[256], *query = buf; @@ -2617,7 +2617,7 @@ static UINT TransformView_insert_row( MSIVIEW *view, MSIRECORD *rec, UINT row, B static UINT TransformView_drop_table( MSITABLEVIEW *tv, UINT row ) { - static const WCHAR query_pfx[] = L"INSERT INTO `_TransformView` ( `Table`, `Column` ) VALUES ( '"; + static const WCHAR query_pfx[] = L"INSERT INTO `_TransformView` ( `new`, `Table`, `Column` ) VALUES ( 1, '"; static const WCHAR query_sfx[] = L"', 'DROP' )"; WCHAR buf[256], *query = buf; @@ -2661,7 +2661,7 @@ static UINT TransformView_drop_table( MSITABLEVIEW *tv, UINT row ) static UINT TransformView_delete_row( MSIVIEW *view, UINT row ) { - static const WCHAR query_pfx[] = L"INSERT INTO `_TransformView` ( `Table`, `Column`, `Row`) VALUES ( '"; + static const WCHAR query_pfx[] = L"INSERT INTO `_TransformView` ( `new`, `Table`, `Column`, `Row`) VALUES ( 1, '"; static const WCHAR query_column[] = L"', 'DELETE', '"; static const WCHAR query_sfx[] = L"')"; @@ -2780,7 +2780,7 @@ static const MSIVIEWOPS transform_view_ops = UINT TransformView_Create( MSIDATABASE *db, string_table *st, LPCWSTR name, MSIVIEW **view ) { static const WCHAR query_pfx[] = L"SELECT `Column`, `Data`, `Current` FROM `_TransformView` WHERE `Table`='"; - static const WCHAR query_sfx[] = L"' AND `Row` IS NULL AND `Current` IS NOT NULL"; + static const WCHAR query_sfx[] = L"' AND `Row` IS NULL AND `Current` IS NOT NULL AND `new` = 1"; WCHAR buf[256], *query = buf; UINT r, len, name_len, size, add_col; @@ -3392,7 +3392,7 @@ UINT msi_table_apply_transform( MSIDATABASE *db, IStorage *stg, int err_cond ) UINT ret = ERROR_FUNCTION_FAILED; UINT bytes_per_strref; BOOL property_update = FALSE; - BOOL free_transform_view = FALSE; + MSIVIEW *transform_view = NULL; TRACE("%p %p\n", db, stg ); @@ -3472,11 +3472,19 @@ UINT msi_table_apply_transform( MSIDATABASE *db, IStorage *stg, int err_cond ) if (r == ERROR_SUCCESS) MSI_ViewClose( query ); msiobj_release( &query->hdr ); + if (r != ERROR_BAD_QUERY_SYNTAX && r != ERROR_SUCCESS) + goto end; + + if (TABLE_CreateView(db, L"_TransformView", &transform_view) != ERROR_SUCCESS) + goto end; + if (r == ERROR_BAD_QUERY_SYNTAX) - FIXME( "support adding to _TransformView\n" ); + transform_view->ops->add_ref( transform_view ); + + r = transform_view->ops->add_column( transform_view, L"new", + MSITYPE_TEMPORARY | MSITYPE_NULLABLE | 0x402 /* INT */, FALSE ); if (r != ERROR_SUCCESS) goto end; - free_transform_view = TRUE; } /* @@ -3520,16 +3528,16 @@ end: IEnumSTATSTG_Release( stgenum ); if ( strings ) msi_destroy_stringtable( strings ); - if (ret != ERROR_SUCCESS && free_transform_view) + if (transform_view) { - MSIQUERY *query; - if (MSI_DatabaseOpenViewW( db, L"ALTER TABLE `_TransformView` FREE", - &query ) == ERROR_SUCCESS) - { - if (MSI_ViewExecute( query, NULL ) == ERROR_SUCCESS) - MSI_ViewClose( query ); - msiobj_release( &query->hdr ); - } + struct tagMSITABLE *table = ((MSITABLEVIEW*)transform_view)->table; + + if (ret != ERROR_SUCCESS) + transform_view->ops->release( transform_view ); + + if (!wcscmp(table->colinfo[table->col_count - 1].colname, L"new")) + TABLE_remove_column( transform_view, table->colinfo[table->col_count - 1].number ); + transform_view->ops->delete( transform_view ); } return ret;

1 0

Shawn M. Chapla : advapi32: Add RegRenameKey stub.
by Alexandre Julliard July 2, 2020

July 2, 2020

Module: wine Branch: master Commit: 1e8cfc016e92c609ee23340d42bdefbb8e7f126f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e8cfc016e92c609ee23340d… Author: Shawn M. Chapla <schapla(a)codeweavers.com> Date: Wed Jul 1 19:34:44 2020 -0400 advapi32: Add RegRenameKey stub. Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/registry.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 64b0288dc9..fcef859a7c 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -676,7 +676,7 @@ @ stdcall -import RegQueryValueExW(long wstr ptr ptr ptr ptr) @ stdcall RegQueryValueW(long wstr ptr ptr) @ stub RegRemapPreDefKey -# @ stub RegRenameKey +@ stdcall RegRenameKey(long wstr wstr) @ stdcall RegReplaceKeyA(long str str str) @ stdcall RegReplaceKeyW(long wstr wstr wstr) @ stdcall -import RegRestoreKeyA(long str long) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 7cfdbaa53b..ba24d648ff 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -507,6 +507,17 @@ LSTATUS WINAPI RegReplaceKeyW( HKEY hkey, LPCWSTR lpSubKey, LPCWSTR lpNewFile, } +/****************************************************************************** + * RegRenameKey [ADVAPI32.@] + * + */ +LSTATUS WINAPI RegRenameKey( HKEY hkey, LPCWSTR lpSubKey, LPCWSTR lpNewName ) +{ + FIXME("(%p,%s,%s): stub\n", hkey, debugstr_w(lpSubKey), debugstr_w(lpNewName)); + return ERROR_CALL_NOT_IMPLEMENTED; +} + + /****************************************************************************** * RegReplaceKeyA [ADVAPI32.@] *

1 0

Vijay Kiran Kamuju : include: Add IXACT3WaveBank definition.
by Alexandre Julliard July 2, 2020

July 2, 2020

Module: wine Branch: master Commit: b1d78184f0746732126c5e2ae7a2c14d2644b247 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1d78184f0746732126c5e2a… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Jul 1 23:26:19 2020 +0200 include: Add IXACT3WaveBank definition. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/xact3.h | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/include/xact3.h b/include/xact3.h index cdb91d145d..d66874a511 100644 --- a/include/xact3.h +++ b/include/xact3.h @@ -585,6 +585,50 @@ DECLARE_INTERFACE(IXACT3SoundBank) #define IXACT3SoundBank_GetState(p,a) (p)->GetState(a) #endif +#define XACT_WAVEBANKSTATE_INUSE XACT_STATE_INUSE +#define XACT_WAVEBANKSTATE_PREPARED XACT_STATE_PREPARED +#define XACT_WAVEBANKSTATE_PREPAREFAILED XACT_STATE_PREPAREFAILED + +/***************************************************************************** + * IXACT3WaveBank interface + */ +#define INTERFACE IXACT3WaveBank +DECLARE_INTERFACE(IXACT3WaveBank) +{ + /*** IXACT3WaveBank methods ***/ + STDMETHOD(Destroy)(THIS) PURE; + STDMETHOD(GetNumWaves)(THIS_ XACTINDEX *pnNumWaves) PURE; + STDMETHOD_(XACTINDEX,GetWaveIndex)(THIS_ PCSTR szFriendlyName) PURE; + STDMETHOD(GetWaveProperties)(THIS_ XACTINDEX nWaveIndex, LPXACT_WAVE_PROPERTIES pWaveProperties) PURE; + STDMETHOD(Prepare)(THIS_ XACTINDEX nWaveIndex, DWORD dwFlags, DWORD dwPlayOffset, XACTLOOPCOUNT nLoopCount, IXACT3Wave **ppWave) PURE; + STDMETHOD(Play)(THIS_ XACTINDEX nWaveIndex, DWORD dwFlags, DWORD dwPlayOffset, XACTLOOPCOUNT nLoopCount, IXACT3Wave **ppWave) PURE; + STDMETHOD(Stop)(THIS_ XACTINDEX nWaveIndex, DWORD dwFlags) PURE; + STDMETHOD(GetState)(THIS_ DWORD *pdwState) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +/*** IXACT3WaveBank methods ***/ +#define IXACT3WaveBank_Destroy(p) (p)->lpVtbl->Destroy(p) +#define IXACT3WaveBank_GetNumWaves(p,a) (p)->lpVtbl->GetNumCues(p,a) +#define IXACT3WaveBank_GetWaveIndex(p,a) (p)->lpVtbl->GetWaveIndex(p,a) +#define IXACT3WaveBank_GetWaveProperties(p,a,b) (p)->lpVtbl->GetWaveProperties(p,a,b) +#define IXACT3WaveBank_Prepare(p,a,b,c,d,e) (p)->lpVtbl->Prepare(p,a,b,c,d,e) +#define IXACT3WaveBank_Play(p,a,b,c,d,e) (p)->lpVtbl->Play(p,a,b,c,d,e) +#define IXACT3WaveBank_Stop(p,a,b) (p)->lpVtbl->Stop(p,a,b) +#define IXACT3WaveBank_GetState(p,a) (p)->lpVtbl->GetState(p,a) +#else +/*** IXACT3WaveBank methods ***/ +#define IXACT3WaveBank_Destroy(p) (p)->Destroy() +#define IXACT3WaveBank_GetNumWaves(p,a) (p)->GetNumWaves(a) +#define IXACT3WaveBank_GetWaveIndex(p,a) (p)->GetWaveIndex(a) +#define IXACT3WaveBank_GetWaveProperties(p,a,b) (p)->GetWaveProperties(a,b) +#define IXACT3WaveBank_Prepare(p,a,b,c,d,e) (p)->Prepare(a,b,c,d,e) +#define IXACT3WaveBank_Play(p,a,b,c,d,e) (p)->Play(a,b,c,d,e) +#define IXACT3WaveBank_Stop(p,a,b) (p)->Stop(a,b) +#define IXACT3WaveBank_GetState(p,a) (p)->GetState(a) +#endif + #define XACT_FLAG_ENGINE_CREATE_MANAGEDATA XACT_FLAG_MANAGEDATA #define XACT_FLAG_ENGINE_STOP_IMMEDIATE XACT_FLAG_STOP_IMMEDIATE

1 0

Vijay Kiran Kamuju : include: Add IXACT3Cue definition.
by Alexandre Julliard July 2, 2020

July 2, 2020

Module: wine Branch: master Commit: 057eaf13851b256b756ff1ec9d01473dc5254775 URL: https://source.winehq.org/git/wine.git/?a=commit;h=057eaf13851b256b756ff1ec… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Jul 1 23:07:28 2020 +0200 include: Add IXACT3Cue definition. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/xact3.h | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 114 insertions(+) diff --git a/include/xact3.h b/include/xact3.h index f869077534..46f3bc467d 100644 --- a/include/xact3.h +++ b/include/xact3.h @@ -206,6 +206,57 @@ typedef struct XACT_STREAMING_PARAMETERS typedef const XACT_STREAMING_PARAMETERS *LPCXACT_STREAMING_PARAMETERS; typedef const XACT_WAVE_STREAMING_PARAMETERS *LPCXACT_WAVE_STREAMING_PARAMETERS; +typedef struct XACT_CUE_PROPERTIES +{ + char friendlyName[XACT_CUE_NAME_LENGTH]; + BOOL interactive; + XACTINDEX iaVariableIndex; + XACTINDEX numVariations; + XACTINSTANCELIMIT maxInstances; + XACTINSTANCELIMIT currentInstances; +} XACT_CUE_PROPERTIES, *LPXACT_CUE_PROPERTIES; + +typedef struct XACT_TRACK_PROPERTIES +{ + XACTTIME duration; + XACTINDEX numVariations; + XACTCHANNEL numChannels; + XACTINDEX waveVariation; + XACTLOOPCOUNT loopCount; +} XACT_TRACK_PROPERTIES, *LPXACT_TRACK_PROPERTIES; + +typedef struct XACT_VARIATION_PROPERTIES +{ + XACTINDEX index; + XACTVARIATIONWEIGHT weight; + XACTVARIABLEVALUE iaVariableMin; + XACTVARIABLEVALUE iaVariableMax; + BOOL linger; +} XACT_VARIATION_PROPERTIES, *LPXACT_VARIATION_PROPERTIES; + +typedef struct XACT_SOUND_PROPERTIES +{ + XACTCATEGORY category; + BYTE priority; + XACTPITCH pitch; + XACTVOLUME volume; + XACTINDEX numTracks; + XACT_TRACK_PROPERTIES arrTrackProperties[1]; +} XACT_SOUND_PROPERTIES, *LPXACT_SOUND_PROPERTIES; + +typedef struct XACT_SOUND_VARIATION_PROPERTIES +{ + XACT_VARIATION_PROPERTIES variationProperties; + XACT_SOUND_PROPERTIES soundProperties; +} XACT_SOUND_VARIATION_PROPERTIES, *LPXACT_SOUND_VARIATION_PROPERTIES; + +typedef struct XACT_CUE_INSTANCE_PROPERTIES +{ + DWORD allocAttributes; + XACT_CUE_PROPERTIES cueProperties; + XACT_SOUND_VARIATION_PROPERTIES activeVariationProperties; +} XACT_CUE_INSTANCE_PROPERTIES, *LPXACT_CUE_INSTANCE_PROPERTIES; + typedef struct XACTCHANNELMAPENTRY { XACTCHANNEL InputChannel; @@ -368,6 +419,69 @@ typedef const XACT_RUNTIME_PARAMETERS *LPCXACT_RUNTIME_PARAMETERS; #include <poppack.h> +#define XACT_FLAG_CUE_STOP_RELEASE XACT_FLAG_STOP_RELEASE +#define XACT_FLAG_CUE_STOP_IMMEDIATE XACT_FLAG_STOP_IMMEDIATE + +#define XACT_CUESTATE_CREATED XACT_STATE_CREATED +#define XACT_CUESTATE_PREPARING XACT_STATE_PREPARING +#define XACT_CUESTATE_PREPARED XACT_STATE_PREPARED +#define XACT_CUESTATE_PLAYING XACT_STATE_PLAYING +#define XACT_CUESTATE_STOPPING XACT_STATE_STOPPING +#define XACT_CUESTATE_STOPPED XACT_STATE_STOPPED +#define XACT_CUESTATE_PAUSED XACT_STATE_PAUSED + +/***************************************************************************** + * IXACT3Cue interface + */ +#define INTERFACE IXACT3Cue +DECLARE_INTERFACE(IXACT3Cue) +{ + /*** IXACT3Cue methods ***/ + STDMETHOD(Play)(THIS) PURE; + STDMETHOD(Stop)(THIS_ DWORD pdwFlags) PURE; + STDMETHOD(GetState)(THIS_ DWORD *pdwState) PURE; + STDMETHOD(Destroy)(THIS) PURE; + STDMETHOD(SetMatrixCoefficients)(THIS_ UINT32 uSrcChannelCount, UINT32 uDstChannelCount, float *pMatrixCoefficients) PURE; + STDMETHOD_(XACTVARIABLEINDEX,GetVariableIndex)(THIS_ PCSTR szFriendlyName) PURE; + STDMETHOD(SetVariable)(THIS_ XACTVARIABLEINDEX nIndex, XACTVARIABLEVALUE nValue) PURE; + STDMETHOD(GetVariable)(THIS_ XACTVARIABLEINDEX nIndex, XACTVARIABLEVALUE *nValue) PURE; + STDMETHOD(Pause)(THIS_ BOOL fPause) PURE; + STDMETHOD(GetProperties)(THIS_ LPXACT_CUE_INSTANCE_PROPERTIES *ppProperties) PURE; + STDMETHOD(SetOutputVoices)(THIS_ const XAUDIO2_VOICE_SENDS *pSendList) PURE; + STDMETHOD(SetOutputVoiceMatrix)(THIS_ IXAudio2Voice *pDestinationVoice, UINT32 SourceChannels, UINT32 DestinationChannels, const float *pLevelMatrix) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +/*** IXACT3Cue methods ***/ +#define IXACT3Cue_Play(p) (p)->lpVtbl->Destroy(p) +#define IXACT3Cue_Stop(p,a) (p)->lpVtbl->Stop(p,a) +#define IXACT3Cue_GetState(p,a) (p)->lpVtbl->GetState(p,a) +#define IXACT3Cue_Destroy(p) (p)->lpVtbl->Destroy(p) +#define IXACT3Cue_SetMatrixCoefficients(p,a,b,c) (p)->lpVtbl->SetMatrixCoefficients(p,a,b,c) +#define IXACT3Cue_GetVariableIndex(p,a) (p)->lpVtbl->GetVariableIndex(p,a) +#define IXACT3Cue_SetVariable(p,a,b) (p)->lpVtbl->SetVariable(p,a,b) +#define IXACT3Cue_GetVariable(p,a,b) (p)->lpVtbl->GetVariable(p,a,b) +#define IXACT3Cue_Pause(p,a) (p)->lpVtbl->Pause(p,a) +#define IXACT3Cue_GetProperties(p,a) (p)->lpVtbl->GetProperties(p,a) +#define IXACT3Cue_SetOutputVoices(p,a) (p)->lpVtbl->SetOutputVoices(p,a) +#define IXACT3Cue_SetOutputVoiceMatrix(p,a,b,c,d) (p)->lpVtbl->SetOutputVoiceMatrix(p,a,b,c,d) +#else +/*** IXACT3Cue methods ***/ +#define IXACT3Cue_Play(p) (p)->Destroy() +#define IXACT3Cue_Stop(p,a) (p)->Stop(a) +#define IXACT3Cue_GetState(p,a) (p)->Stop(a) +#define IXACT3Cue_Destroy(p) (p)->Destroy() +#define IXACT3Cue_SetMatrixCoefficients(p,a,b,c) (p)->SetMatrixCoefficients(a,b,c) +#define IXACT3Cue_GetVariableIndex(p,a) (p)->GetVariableIndex(a) +#define IXACT3Cue_SetVariable(p,a,b) (p)->SetVariable(a,b) +#define IXACT3Cue_GetVariable(p,a,b) (p)->GetVariable(a,b) +#define IXACT3Cue_Pause(p,a) (p)->Pause(a) +#define IXACT3Cue_GetProperties(p,a) (p)->GetProperties(a) +#define IXACT3Cue_SetOutputVoices(p,a) (p)->SetOutputVoices(a) +#define IXACT3Cue_SetOutputVoiceMatrix(p,a,b,c,d) (p)->SetOutputVoiceMatrix(a,b,c,d) +#endif + #define XACT_FLAG_ENGINE_CREATE_MANAGEDATA XACT_FLAG_MANAGEDATA #define XACT_FLAG_ENGINE_STOP_IMMEDIATE XACT_FLAG_STOP_IMMEDIATE

1 0

Vijay Kiran Kamuju : include: Add xact3.h.
by Alexandre Julliard July 2, 2020

July 2, 2020

Module: wine Branch: master Commit: 41288f5e6ae18491f2074a695b08f616e3dd979c URL: https://source.winehq.org/git/wine.git/?a=commit;h=41288f5e6ae18491f2074a69… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Mon Mar 16 01:31:24 2020 +0100 include: Add xact3.h. Based on work by Ethan Lee and Alistair Leslie-Hughes Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/xact3.h | 472 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 473 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=41288f5e6ae18491f207…

1 0

Vijay Kiran Kamuju : include: Add IXACT3Wave definition.
by Alexandre Julliard July 2, 2020

July 2, 2020

Module: wine Branch: master Commit: b4a59b3ffc2c4123a68a0cbc5a7802b02c9d8e8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4a59b3ffc2c4123a68a0cbc… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Jul 1 23:14:50 2020 +0200 include: Add IXACT3Wave definition. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/xact3.h | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/include/xact3.h b/include/xact3.h index 46f3bc467d..8b9c3967cf 100644 --- a/include/xact3.h +++ b/include/xact3.h @@ -331,6 +331,23 @@ typedef struct XACT_NOTIFICATION_CUE } XACT_NOTIFICATION_CUE, *LPXACT_NOTIFICATION_CUE; typedef const XACT_NOTIFICATION_CUE *LPCXACT_NOTIFICATION_CUE; +typedef struct XACT_WAVE_PROPERTIES +{ + char friendlyName[WAVEBANK_ENTRYNAME_LENGTH]; + WAVEBANKMINIWAVEFORMAT format; + DWORD durationInSamples; + WAVEBANKSAMPLEREGION loopRegion; + BOOL streaming; +} XACT_WAVE_PROPERTIES, *LPXACT_WAVE_PROPERTIES; +typedef const XACT_WAVE_PROPERTIES *LPCXACT_WAVE_PROPERTIES; + +typedef struct XACT_WAVE_INSTANCE_PROPERTIES +{ + XACT_WAVE_PROPERTIES properties; + BOOL backgroundMusic; +} XACT_WAVE_INSTANCE_PROPERTIES, *LPXACT_WAVE_INSTANCE_PROPERTIES; +typedef const XACT_WAVE_INSTANCE_PROPERTIES *LPCXACT_WAVE_INSTANCE_PROPERTIES; + typedef struct XACT_NOTIFICATION_MARKER { XACTINDEX cueIndex; @@ -482,6 +499,49 @@ DECLARE_INTERFACE(IXACT3Cue) #define IXACT3Cue_SetOutputVoiceMatrix(p,a,b,c,d) (p)->SetOutputVoiceMatrix(a,b,c,d) #endif +/***************************************************************************** + * IXACT3Wave interface + */ +#define INTERFACE IXACT3Wave +DECLARE_INTERFACE(IXACT3Wave) +{ + /*** IXACT3Wave methods ***/ + STDMETHOD(Destroy)(THIS) PURE; + STDMETHOD(Play)(THIS) PURE; + STDMETHOD(Stop)(THIS_ DWORD pdwFlags) PURE; + STDMETHOD(Pause)(THIS_ BOOL fPause) PURE; + STDMETHOD(GetState)(THIS_ DWORD *pdwState) PURE; + STDMETHOD(SetPitch)(THIS_ XACTPITCH pitch) PURE; + STDMETHOD(SetVolume)(THIS_ XACTVOLUME volume) PURE; + STDMETHOD(SetMatrixCoefficients)(THIS_ UINT32 uSrcChannelCount, UINT32 uDstChannelCount, float *pMatrixCoefficients) PURE; + STDMETHOD(GetProperties)(THIS_ LPXACT_WAVE_INSTANCE_PROPERTIES pProperties) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +/*** IXACT3Wave methods ***/ +#define IXACT3Wave_Destroy(p) (p)->lpVtbl->Destroy(p) +#define IXACT3Wave_Play(p) (p)->lpVtbl->Destroy(p) +#define IXACT3Wave_Stop(p,a) (p)->lpVtbl->Stop(p,a) +#define IXACT3Wave_Pause(p,a) (p)->lpVtbl->Pause(p,a) +#define IXACT3Wave_GetState(p,a) (p)->lpVtbl->GetState(p,a) +#define IXACT3Wave_SetPitch(p,a) (p)->lpVtbl->SetPitch(p,a) +#define IXACT3Wave_SetVolume(p,a) (p)->lpVtbl->SetVolume(p,a) +#define IXACT3Wave_SetMatrixCoefficients(p,a,b,c) (p)->lpVtbl->SetMatrixCoefficients(p,a,b,c) +#define IXACT3Wave_GetProperties(p,a) (p)->lpVtbl->GetProperties(p,a) +#else +/*** IXACT3Wave methods ***/ +#define IXACT3Wave_Destroy(p) (p)->Destroy() +#define IXACT3Wave_Play(p) (p)->Destroy() +#define IXACT3Wave_Stop(p,a) (p)->Stop(a) +#define IXACT3Wave_Pause(p,a) (p)->Pause(a) +#define IXACT3Wave_GetState(p,a) (p)->Stop(a) +#define IXACT3Wave_SetPitch(p,a) (p)->SetVariable(a) +#define IXACT3Wave_SetVolume(p,a) (p)->SetVolume(a) +#define IXACT3Wave_SetMatrixCoefficients(p,a,b,c) (p)->SetMatrixCoefficients(a,b,c) +#define IXACT3Wave_GetProperties(p,a) (p)->GetProperties(a) +#endif + #define XACT_FLAG_ENGINE_CREATE_MANAGEDATA XACT_FLAG_MANAGEDATA #define XACT_FLAG_ENGINE_STOP_IMMEDIATE XACT_FLAG_STOP_IMMEDIATE

1 0

Hans Leidekker : iphlpapi: Return gateway address 0.0.0.0/255.255.255.255 from GetAdaptersInfo if it's not set.
by Alexandre Julliard July 2, 2020

July 2, 2020

Module: wine Branch: master Commit: 3e0369970d90b5ca42d2e1f7dc5810fec5477587 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e0369970d90b5ca42d2e1f7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 2 10:23:27 2020 +0200 iphlpapi: Return gateway address 0.0.0.0/255.255.255.255 from GetAdaptersInfo if it's not set. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 2 ++ dlls/iphlpapi/tests/iphlpapi.c | 9 ++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index ff9d0d3a53..c039086229 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -742,6 +742,8 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen) } /* Find first router through this interface, which we'll assume * is the default gateway for this adapter */ + strcpy(ptr->GatewayList.IpAddress.String, "0.0.0.0"); + strcpy(ptr->GatewayList.IpMask.String, "255.255.255.255"); for (i = 0; i < routeTable->dwNumEntries; i++) if (routeTable->table[i].dwForwardIfIndex == ptr->Index && routeTable->table[i].u1.ForwardType == diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index d5690c11ee..6965ae8457 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1120,10 +1120,13 @@ static void testGetAdaptersInfo(void) apiReturn); ptr = buf; while (ptr) { - ok(ptr->IpAddressList.IpAddress.String[0], "A valid IP must be present\n"); + ok(ptr->IpAddressList.IpAddress.String[0], "A valid IP address must be present\n"); ok(ptr->IpAddressList.IpMask.String[0], "A valid mask must be present\n"); - trace("Adapter '%s', IP %s, Mask %s\n", ptr->AdapterName, - ptr->IpAddressList.IpAddress.String, ptr->IpAddressList.IpMask.String); + ok(ptr->GatewayList.IpAddress.String[0], "A valid IP address must be present\n"); + ok(ptr->GatewayList.IpMask.String[0], "A valid mask must be present\n"); + trace("adapter '%s', address %s/%s gateway %s/%s\n", ptr->AdapterName, + ptr->IpAddressList.IpAddress.String, ptr->IpAddressList.IpMask.String, + ptr->GatewayList.IpAddress.String, ptr->GatewayList.IpMask.String); ptr = ptr->Next; } HeapFree(GetProcessHeap(), 0, buf);

1 0

Huw Davies : ntdll: Pass the start of the string to compose_string().
by Alexandre Julliard July 2, 2020

July 2, 2020

Module: wine Branch: master Commit: 25d6abb951e111fd4da1130fef16749ae6981540 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25d6abb951e111fd4da1130f… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 2 10:44:16 2020 +0100 ntdll: Pass the start of the string to compose_string(). Fixes a regression caused by 520040dc4a287fd62d7d5161c083cee990c3d6e6. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 789a398405..eb75e6e949 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -557,7 +557,7 @@ DWORD ntdll_umbstowcs( const char *src, DWORD srclen, WCHAR *dst, DWORD dstlen ) } reslen = dstlen - (dstend - dst); #ifdef __APPLE__ /* work around broken Mac OS X filesystem that enforces NFD */ - if (reslen && nfc_table) reslen = compose_string( nfc_table, dst, reslen ); + if (reslen && nfc_table) reslen = compose_string( nfc_table, dst - reslen, reslen ); #endif } return reslen;

1 0

Piotr Caban : msi: Fix use after free error in TransformView_set_row.
by Alexandre Julliard July 2, 2020

July 2, 2020

Module: wine Branch: master Commit: 6a0a0d2a0b15bffa9d4a5b41e75be6765e731d69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a0a0d2a0b15bffa9d4a5b41… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 1 10:43:00 2020 +0200 msi: Fix use after free error in TransformView_set_row. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/table.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index d4912ab3ae..3febcb3aa9 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2341,7 +2341,7 @@ static UINT TransformView_set_row( MSIVIEW *view, UINT row, MSIRECORD *rec, UINT L"INSERT INTO `_TransformView` (`Table`, `Column`, `Row`, `Data`, `Current`) VALUES ('"; MSITABLEVIEW *tv = (MSITABLEVIEW*)view; - WCHAR buf[256], *query = buf; + WCHAR buf[256], *query; MSIRECORD *old_rec; MSIQUERY *q; WCHAR *key; @@ -2409,6 +2409,10 @@ static UINT TransformView_set_row( MSIVIEW *view, UINT row, MSIRECORD *rec, UINT return ERROR_OUTOFMEMORY; } } + else + { + query = buf; + } memcpy( query, query_pfx, p * sizeof(WCHAR) ); len = wcslen( tv->name );

1 0

Henri Verbeet : vkd3d-compiler: Add an explicit --help option.
by Alexandre Julliard July 2, 2020

July 2, 2020

Module: vkd3d Branch: master Commit: 7df61873d089965f718bbc978c46dd6f4074044d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7df61873d089965f718bbc9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 2 18:31:14 2020 +0430 vkd3d-compiler: Add an explicit --help option. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 8fa4d4f..e975572 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -31,7 +31,8 @@ enum { - OPTION_STRIP_DEBUG = CHAR_MAX + 1, + OPTION_HELP = CHAR_MAX + 1, + OPTION_STRIP_DEBUG, }; static bool read_shader(struct vkd3d_shader_code *shader, const char *filename) @@ -97,6 +98,7 @@ static void print_usage(const char *program_name) static const char usage[] = "[options...] file\n" "Options:\n" + " -h, --help Display this information and exit.\n" " -o <file> Write the output to <file>.\n" " --strip-debug Strip debug information from the output.\n" " -- Stop option processing. Any subsequent argument is\n" @@ -109,6 +111,7 @@ struct options { const char *filename; const char *output_filename; + struct vkd3d_shader_compile_option compile_options[MAX_COMPILE_OPTIONS]; unsigned int compile_option_count; }; @@ -147,6 +150,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) static struct option long_options[] = { + {"help", no_argument, NULL, OPTION_HELP}, {"strip-debug", no_argument, NULL, OPTION_STRIP_DEBUG}, {NULL, 0, NULL, 0}, }; @@ -155,7 +159,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) for (;;) { - if ((option = getopt_long(argc, argv, "o:", long_options, NULL)) == -1) + if ((option = getopt_long(argc, argv, "ho:", long_options, NULL)) == -1) break; switch (option)

1 0