May 2017 - Wine-Commits - list.winehq.org

Alistair Leslie-Hughes : include: Add drmexternals.idl and wmdrmsdk.idl.
by Alexandre Julliard May 11, 2017

May 11, 2017

Module: wine Branch: master Commit: d5930db829680734ac0a6b10b1a2125cf24dba15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5930db829680734ac0a6b10b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 10 21:51:42 2017 -0600 include: Add drmexternals.idl and wmdrmsdk.idl. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 2 ++ include/drmexternals.idl | 19 ++++++++++++ include/wmdrmsdk.idl | 81 ++++++++++++++++++++++++++++++++++++++++++++++++ include/wmsdkidl.idl | 2 +- 4 files changed, 103 insertions(+), 1 deletion(-) diff --git a/include/Makefile.in b/include/Makefile.in index 497c76f..7846d67 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -58,6 +58,7 @@ IDL_SRCS = \ docobj.idl \ docobjectservice.idl \ downloadmgr.idl \ + drmexternals.idl \ dwrite.idl \ dwrite_1.idl \ dwrite_2.idl \ @@ -177,6 +178,7 @@ IDL_SRCS = \ wine/svcctl.idl \ wine/winedxgi.idl \ winsxs.idl \ + wmdrmsdk.idl \ wmiutils.idl \ wmp.idl \ wmsbuffer.idl \ diff --git a/include/drmexternals.idl b/include/drmexternals.idl new file mode 100644 index 0000000..88826ad --- /dev/null +++ b/include/drmexternals.idl @@ -0,0 +1,19 @@ +/* + * Copyright 2017 Alistair Leslie-Hughes + * + * 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 + */ + +import "wmdrmsdk.idl"; diff --git a/include/wmdrmsdk.idl b/include/wmdrmsdk.idl new file mode 100644 index 0000000..8de3b35 --- /dev/null +++ b/include/wmdrmsdk.idl @@ -0,0 +1,81 @@ +/* + * Copyright 2017 Alistair Leslie-Hughes + * + * 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 + */ + +import "oaidl.idl"; +import "ocidl.idl"; +import "mfobjects.idl"; +import "mfidl.idl"; + +typedef struct _DRM_MINIMUM_OUTPUT_PROTECTION_LEVELS +{ + WORD wCompressedDigitalVideo; + WORD wUncompressedDigitalVideo; + WORD wAnalogVideo; + WORD wCompressedDigitalAudio; + WORD wUncompressedDigitalAudio; +} DRM_MINIMUM_OUTPUT_PROTECTION_LEVELS; + +typedef struct _DRM_VIDEO_OUTPUT_PROTECTION +{ + GUID guidId; + BYTE bConfigData; +} DRM_VIDEO_OUTPUT_PROTECTION; + +typedef struct _DRM_VIDEO_OUTPUT_PROTECTION_IDS +{ + WORD cEntries; + DRM_VIDEO_OUTPUT_PROTECTION *rgVop; +} DRM_VIDEO_OUTPUT_PROTECTION_IDS; + +typedef struct _DRM_OPL_OUTPUT_IDS +{ + WORD cIds; + GUID *rgIds; +} DRM_OPL_OUTPUT_IDS; + +typedef struct __tagDRM_COPY_OPL +{ + WORD wMinimumCopyLevel; + DRM_OPL_OUTPUT_IDS oplIdIncludes; + DRM_OPL_OUTPUT_IDS oplIdExcludes; +} DRM_COPY_OPL; + +typedef struct __tagDRM_PLAY_OPL +{ + DRM_MINIMUM_OUTPUT_PROTECTION_LEVELS minOPL; + DRM_OPL_OUTPUT_IDS oplIdReserved; + DRM_VIDEO_OUTPUT_PROTECTION_IDS vopi; +} DRM_PLAY_OPL; + + +[ + uuid(82435be0-f7c1-4df9-8103-eeabebf3d6e1), + version(1.0) +] +library WMDRMContentEnablerLib +{ + importlib("stdole2.tlb"); + + [ + uuid(82435bdf-f7c1-4df9-8103-eeabebf3d6e1) + ] + coclass WMDRMContentEnablerActivate + { + [default] interface IPersistStream; + }; +}; diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index 5ce849f..433ec46 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -18,7 +18,7 @@ import "oaidl.idl"; import "wmsbuffer.idl"; -/* import "drmexternals.idl"; */ +import "drmexternals.idl"; typedef unsigned __int64 QWORD;

1 0

Paul Gofman : d3dx9: Sort preshader opcode table.
by Alexandre Julliard May 11, 2017

May 11, 2017

Module: wine Branch: master Commit: 6a06baee60a4561d3a6dfcc25c35e3f63d59d2ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a06baee60a4561d3a6dfcc25… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon May 8 18:39:35 2017 +0300 d3dx9: Sort preshader opcode table. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index b17d0b5..a4e5e3a 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -29,21 +29,21 @@ enum pres_ops { PRESHADER_OP_NOP, PRESHADER_OP_MOV, - PRESHADER_OP_ADD, - PRESHADER_OP_MUL, - PRESHADER_OP_DOT, PRESHADER_OP_NEG, PRESHADER_OP_RCP, - PRESHADER_OP_LT, PRESHADER_OP_FRC, + PRESHADER_OP_EXP, + PRESHADER_OP_RSQ, + PRESHADER_OP_SIN, + PRESHADER_OP_COS, PRESHADER_OP_MIN, PRESHADER_OP_MAX, + PRESHADER_OP_LT, PRESHADER_OP_GE, + PRESHADER_OP_ADD, + PRESHADER_OP_MUL, PRESHADER_OP_CMP, - PRESHADER_OP_SIN, - PRESHADER_OP_COS, - PRESHADER_OP_RSQ, - PRESHADER_OP_EXP, + PRESHADER_OP_DOT, PRESHADER_OP_DOTSWIZ6, PRESHADER_OP_DOTSWIZ8, }; @@ -120,21 +120,21 @@ static const struct op_info pres_op_info[] = { {0x000, "nop", 0, 0, NULL }, /* PRESHADER_OP_NOP */ {0x100, "mov", 1, 0, pres_mov}, /* PRESHADER_OP_MOV */ - {0x204, "add", 2, 0, pres_add}, /* PRESHADER_OP_ADD */ - {0x205, "mul", 2, 0, pres_mul}, /* PRESHADER_OP_MUL */ - {0x500, "dot", 2, 1, pres_dot}, /* PRESHADER_OP_DOT */ {0x101, "neg", 1, 0, pres_neg}, /* PRESHADER_OP_NEG */ {0x103, "rcp", 1, 0, pres_rcp}, /* PRESHADER_OP_RCP */ - {0x202, "lt", 2, 0, pres_lt }, /* PRESHADER_OP_LT */ {0x104, "frc", 1, 0, pres_frc}, /* PRESHADER_OP_FRC */ + {0x105, "exp", 1, 0, pres_exp}, /* PRESHADER_OP_EXP */ + {0x107, "rsq", 1, 0, pres_rsq}, /* PRESHADER_OP_RSQ */ + {0x108, "sin", 1, 0, pres_sin}, /* PRESHADER_OP_SIN */ + {0x109, "cos", 1, 0, pres_cos}, /* PRESHADER_OP_COS */ {0x200, "min", 2, 0, pres_min}, /* PRESHADER_OP_MIN */ {0x201, "max", 2, 0, pres_max}, /* PRESHADER_OP_MAX */ + {0x202, "lt", 2, 0, pres_lt }, /* PRESHADER_OP_LT */ {0x203, "ge", 2, 0, pres_ge }, /* PRESHADER_OP_GE */ + {0x204, "add", 2, 0, pres_add}, /* PRESHADER_OP_ADD */ + {0x205, "mul", 2, 0, pres_mul}, /* PRESHADER_OP_MUL */ {0x300, "cmp", 3, 0, pres_cmp}, /* PRESHADER_OP_CMP */ - {0x108, "sin", 1, 0, pres_sin}, /* PRESHADER_OP_SIN */ - {0x109, "cos", 1, 0, pres_cos}, /* PRESHADER_OP_COS */ - {0x107, "rsq", 1, 0, pres_rsq}, /* PRESHADER_OP_RSQ */ - {0x105, "exp", 1, 0, pres_exp}, /* PRESHADER_OP_EXP */ + {0x500, "dot", 2, 1, pres_dot}, /* PRESHADER_OP_DOT */ {0x70e, "d3ds_dotswiz", 6, 0, pres_dotswiz6}, /* PRESHADER_OP_DOTSWIZ6 */ {0x70e, "d3ds_dotswiz", 8, 0, pres_dotswiz8}, /* PRESHADER_OP_DOTSWIZ8 */ };

1 0

Józef Kucia : d3dx9: Fix compilation on systems that don't support nameless unions.
by Alexandre Julliard May 11, 2017

May 11, 2017

Module: wine Branch: master Commit: 1bef693767197eaf8a847bab8d8ea2d7d649436f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bef693767197eaf8a847bab8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 11 16:36:29 2017 +0200 d3dx9: Fix compilation on systems that don't support nameless unions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_private.h | 2 +- dlls/d3dx9_36/effect.c | 50 +++++++++++++++++++++---------------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h index e28798a..49c351f 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -224,7 +224,7 @@ struct d3dx_parameter { struct d3dx_parameter *referenced_param; struct d3dx_shared_data *shared_data; - }; + } u; }; static inline BOOL is_param_dirty(struct d3dx_parameter *param) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 6cc098d..30855a6 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1032,7 +1032,7 @@ static HRESULT d3dx9_get_param_value_ptr(struct d3dx_pass *pass, struct d3dx_sta switch (state->type) { case ST_PARAMETER: - param = param->referenced_param; + param = param->u.referenced_param; *param_dirty = is_param_dirty(param); /* fallthrough */ case ST_CONSTANT: @@ -1062,7 +1062,7 @@ static HRESULT d3dx9_get_param_value_ptr(struct d3dx_pass *pass, struct d3dx_sta { array_idx = state->index; } - ref_param = param->referenced_param; + ref_param = param->u.referenced_param; TRACE("Array index %u, stored array index %u, element_count %u.\n", array_idx, state->index, ref_param->element_count); @@ -1478,7 +1478,7 @@ static void set_dirty(struct d3dx_parameter *param) struct d3dx_shared_data *shared_data; unsigned int i; - if ((shared_data = param->top_level_param->shared_data)) + if ((shared_data = param->top_level_param->u.shared_data)) { for (i = 0; i < shared_data->count; ++i) shared_data->parameters[i]->runtime_flags |= PARAMETER_FLAG_DIRTY; @@ -3204,7 +3204,7 @@ static HRESULT d3dx_pool_sync_shared_parameter(struct d3dx_effect_pool *pool, st for (j = 0; j < pool->size; ++j) for (k = 0; k < new_alloc[j].count; ++k) - new_alloc[j].parameters[k]->shared_data = &new_alloc[j]; + new_alloc[j].parameters[k]->u.shared_data = &new_alloc[j]; } } pool->shared_data = new_alloc; @@ -3235,7 +3235,7 @@ static HRESULT d3dx_pool_sync_shared_parameter(struct d3dx_effect_pool *pool, st pool->shared_data[i].size = new_size; } - param->shared_data = &pool->shared_data[i]; + param->u.shared_data = &pool->shared_data[i]; pool->shared_data[i].parameters[new_count - 1] = param; TRACE("name %s, parameter idx %u, new refcount %u.\n", param->name, i, @@ -3254,11 +3254,11 @@ static void d3dx_pool_release_shared_parameter(struct d3dx_parameter *param) { unsigned int new_count; - if (!(param->flags & PARAMETER_FLAG_SHARED) || !param->shared_data) + if (!(param->flags & PARAMETER_FLAG_SHARED) || !param->u.shared_data) return; - new_count = --param->shared_data->count; + new_count = --param->u.shared_data->count; - TRACE("param %p, param->shared_param %p, new_count %d.\n", param, param->shared_data, new_count); + TRACE("param %p, param->u.shared_data %p, new_count %d.\n", param, param->u.shared_data, new_count); if (new_count) { @@ -3266,11 +3266,11 @@ static void d3dx_pool_release_shared_parameter(struct d3dx_parameter *param) for (i = 0; i < new_count; ++i) { - if (param->shared_data->parameters[i] == param) + if (param->u.shared_data->parameters[i] == param) { - memmove(&param->shared_data->parameters[i], - &param->shared_data->parameters[i + 1], - sizeof(param->shared_data->parameters[i]) * (new_count - i)); + memmove(&param->u.shared_data->parameters[i], + &param->u.shared_data->parameters[i + 1], + sizeof(param->u.shared_data->parameters[i]) * (new_count - i)); break; } } @@ -3278,10 +3278,10 @@ static void d3dx_pool_release_shared_parameter(struct d3dx_parameter *param) } else { - HeapFree(GetProcessHeap(), 0, param->shared_data->parameters); + HeapFree(GetProcessHeap(), 0, param->u.shared_data->parameters); /* Zeroing table size is required as the entry in pool parameters table can be reused. */ - param->shared_data->size = 0; - param->shared_data = NULL; + param->u.shared_data->size = 0; + param->u.shared_data = NULL; } } @@ -3971,7 +3971,7 @@ static BOOL walk_state_dep(struct d3dx_state *state, walk_parameter_dep_func par } else if (state->type == ST_ARRAY_SELECTOR || state->type == ST_PARAMETER) { - if (walk_parameter_dep(state->parameter.referenced_param, param_func, data)) + if (walk_parameter_dep(state->parameter.u.referenced_param, param_func, data)) return TRUE; } return walk_param_eval_dep(state->parameter.param_eval, param_func, data); @@ -5929,10 +5929,10 @@ static HRESULT d3dx9_parse_array_selector(struct d3dx9_base_effect *base, struct TRACE("Parsing array entry selection state for parameter %p.\n", param); string_size = *(DWORD *)ptr; - param->referenced_param = get_parameter_by_name(base, NULL, ptr + 4); - if (param->referenced_param) + param->u.referenced_param = get_parameter_by_name(base, NULL, ptr + 4); + if (param->u.referenced_param) { - TRACE("Mapping to parameter %s.\n", debugstr_a(param->referenced_param->name)); + TRACE("Mapping to parameter %s.\n", debugstr_a(param->u.referenced_param->name)); } else { @@ -5946,7 +5946,7 @@ static HRESULT d3dx9_parse_array_selector(struct d3dx9_base_effect *base, struct d3dx_create_param_eval(base, (DWORD *)(ptr + string_size) + 1, object->size - (string_size + sizeof(DWORD)), D3DXPT_INT, &param->param_eval); ret = D3D_OK; - param = param->referenced_param; + param = param->u.referenced_param; if (param->type == D3DXPT_VERTEXSHADER || param->type == D3DXPT_PIXELSHADER) { unsigned int i; @@ -6101,10 +6101,10 @@ static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char * return hr; TRACE("Looking for parameter %s.\n", debugstr_a(object->data)); - param->referenced_param = get_parameter_by_name(base, NULL, object->data); - if (param->referenced_param) + param->u.referenced_param = get_parameter_by_name(base, NULL, object->data); + if (param->u.referenced_param) { - struct d3dx_parameter *refpar = param->referenced_param; + struct d3dx_parameter *refpar = param->u.referenced_param; TRACE("Mapping to parameter %p, having object id %u.\n", refpar, refpar->object_id); if (refpar->type == D3DXPT_VERTEXSHADER || refpar->type == D3DXPT_PIXELSHADER) @@ -6570,12 +6570,12 @@ static void free_effect_pool(struct d3dx_effect_pool *pool) WARN("Releasing pool with referenced parameters.\n"); param_set_data_pointer(pool->shared_data[i].parameters[0], NULL, FALSE, TRUE); - pool->shared_data[i].parameters[0]->shared_data = NULL; + pool->shared_data[i].parameters[0]->u.shared_data = NULL; for (j = 1; j < pool->shared_data[i].count; ++j) { walk_parameter_tree(pool->shared_data[i].parameters[j], param_zero_data_func, NULL); - pool->shared_data[i].parameters[j]->shared_data = NULL; + pool->shared_data[i].parameters[j]->u.shared_data = NULL; } HeapFree(GetProcessHeap(), 0, pool->shared_data[i].parameters); }

1 0

Michael Stefaniuc : dmusic: Set the dsound pointer to NULL on an error path.
by Alexandre Julliard May 11, 2017

May 11, 2017

Module: wine Branch: master Commit: 3b4909fd9424e299f8ad11fe1deec11579ed9a83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b4909fd9424e299f8ad11fe1… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu May 11 11:05:51 2017 +0200 dmusic: Set the dsound pointer to NULL on an error path. Spotted by Sebastian Lackner. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/dmusic.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index d5d061c..105e6f7 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -298,8 +298,10 @@ static HRESULT WINAPI IDirectMusic8Impl_SetDirectSound(IDirectMusic8 *iface, IDi return hr; hr = IDirectSound_SetCooperativeLevel(This->dsound, hwnd ? hwnd : GetForegroundWindow(), DSSCL_PRIORITY); - if (FAILED(hr)) + if (FAILED(hr)) { IDirectSound_Release(This->dsound); + This->dsound = NULL; + } return hr; }

1 0

Michael Stefaniuc : dmime: Finish the cleanup of InitAudio().
by Alexandre Julliard May 11, 2017

May 11, 2017

Module: wine Branch: master Commit: 3236e4ccab754eac8a14ff94efc19db8fae898e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3236e4ccab754eac8a14ff94e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu May 11 11:05:49 2017 +0200 dmime: Finish the cleanup of InitAudio(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/performance.c | 46 ++++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 2bd34d5..bbfc04f 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -28,8 +28,7 @@ typedef struct IDirectMusicPerformance8Impl { IDirectMusic8 *dmusic; IDirectSound *dsound; IDirectMusicGraph *pToolGraph; - DMUS_AUDIOPARAMS pParams; - /* global parameters */ + DMUS_AUDIOPARAMS params; BOOL fAutoDownload; char cMasterGrooveLevel; float fMasterTempo; @@ -892,14 +891,14 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_RhythmToTime(IDirectMusicPerf /* IDirectMusicPerformance8 Interface part follow: */ static HRESULT WINAPI IDirectMusicPerformance8Impl_InitAudio(IDirectMusicPerformance8 *iface, - IDirectMusic **dmusic, IDirectSound **dsound, HWND hwnd, - DWORD dwDefaultPathType, DWORD dwPChannelCount, DWORD dwFlags, DMUS_AUDIOPARAMS* pParams) + IDirectMusic **dmusic, IDirectSound **dsound, HWND hwnd, DWORD default_path_type, + DWORD num_channels, DWORD flags, DMUS_AUDIOPARAMS *params) { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); HRESULT hr = S_OK; - TRACE("(%p, %p, %p, %p, %x, %u, %x, %p)\n", This, dmusic, dsound, hwnd, dwDefaultPathType, - dwPChannelCount, dwFlags, pParams); + TRACE("(%p, %p, %p, %p, %x, %u, %x, %p)\n", This, dmusic, dsound, hwnd, default_path_type, + num_channels, flags, params); if (This->dmusic) return DMUS_E_ALREADY_INITED; @@ -929,26 +928,25 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_InitAudio(IDirectMusicPerform if (dsound) IDirectSound_AddRef(This->dsound); - /* as seen in msdn we need params init before audio path creation */ - if (NULL != pParams) { - This->pParams = *pParams; - } else { - /* TODO, how can i fill the struct as seen on msdn */ - memset(&This->pParams, 0, sizeof(DMUS_AUDIOPARAMS)); - This->pParams.dwSize = sizeof(DMUS_AUDIOPARAMS); - This->pParams.fInitNow = FALSE; - This->pParams.dwValidData = DMUS_AUDIOPARAMS_FEATURES | DMUS_AUDIOPARAMS_VOICES | DMUS_AUDIOPARAMS_SAMPLERATE | DMUS_AUDIOPARAMS_DEFAULTSYNTH; - This->pParams.dwVoices = 64; - This->pParams.dwSampleRate = (DWORD) 22.050; - This->pParams.dwFeatures = dwFlags; - This->pParams.clsidDefaultSynth = CLSID_DirectMusicSynthSink; - } - if(dwDefaultPathType != 0) - hr = IDirectMusicPerformance8_CreateStandardAudioPath(iface, dwDefaultPathType, dwPChannelCount, FALSE, &This->pDefaultPath); + if (!params) { + This->params.dwSize = sizeof(DMUS_AUDIOPARAMS); + This->params.fInitNow = FALSE; + This->params.dwValidData = DMUS_AUDIOPARAMS_FEATURES | DMUS_AUDIOPARAMS_VOICES | + DMUS_AUDIOPARAMS_SAMPLERATE | DMUS_AUDIOPARAMS_DEFAULTSYNTH; + This->params.dwVoices = 64; + This->params.dwSampleRate = 22050; + This->params.dwFeatures = flags; + This->params.clsidDefaultSynth = CLSID_DirectMusicSynthSink; + } else + This->params = *params; + + if (default_path_type) + hr = IDirectMusicPerformance8_CreateStandardAudioPath(iface, default_path_type, + num_channels, FALSE, &This->pDefaultPath); - PostMessageToProcessMsgThread(This, PROCESSMSG_START); + PostMessageToProcessMsgThread(This, PROCESSMSG_START); - return hr; + return hr; } static HRESULT WINAPI IDirectMusicPerformance8Impl_PlaySegmentEx(IDirectMusicPerformance8 *iface,

1 0

Michael Stefaniuc : dmime: Avoid a temporary variable in IDirectMusicPerformance8Impl_InitAudio().
by Alexandre Julliard May 11, 2017

May 11, 2017

Module: wine Branch: master Commit: 9572b5f6d34d82c0abe179f45a1cd4e5f4278dd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9572b5f6d34d82c0abe179f45… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu May 11 11:05:46 2017 +0200 dmime: Avoid a temporary variable in IDirectMusicPerformance8Impl_InitAudio(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/performance.c | 70 ++++++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 38 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 2c94123..57ee670 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -26,7 +26,7 @@ typedef struct IDirectMusicPerformance8Impl { IDirectMusicPerformance8 IDirectMusicPerformance8_iface; LONG ref; IDirectMusic8 *dmusic; - IDirectSound *pDirectSound; + IDirectSound *dsound; IDirectMusicGraph *pToolGraph; DMUS_AUDIOPARAMS pParams; /* global parameters */ @@ -257,15 +257,15 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_Init(IDirectMusicPerformance8 return DMUS_E_ALREADY_INITED; if (NULL != pDirectSound) { - This->pDirectSound = pDirectSound; - IDirectSound_AddRef(This->pDirectSound); + This->dsound = pDirectSound; + IDirectSound_AddRef(This->dsound); } else { - DirectSoundCreate8(NULL, (LPDIRECTSOUND8*) &This->pDirectSound, NULL); - if (!This->pDirectSound) return DSERR_NODRIVER; + DirectSoundCreate8(NULL, (IDirectSound8 **) &This->dsound, NULL); + if (!This->dsound) return DSERR_NODRIVER; if (!hWnd) hWnd = GetForegroundWindow(); - IDirectSound_SetCooperativeLevel(This->pDirectSound, hWnd, DSSCL_PRIORITY); + IDirectSound_SetCooperativeLevel(This->dsound, hWnd, DSSCL_PRIORITY); } if (NULL != ppDirectMusic && NULL != *ppDirectMusic) { @@ -828,10 +828,10 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_CloseDown(IDirectMusicPerform This->procThreadTicStarted = FALSE; CloseHandle(This->procThread); } - if (NULL != This->pDirectSound) { - IDirectSound_Release(This->pDirectSound); - This->pDirectSound = NULL; - } + if (This->dsound) { + IDirectSound_Release(This->dsound); + This->dsound = NULL; + } if (This->dmusic) { IDirectMusic8_Release(This->dmusic); This->dmusic = NULL; @@ -891,38 +891,33 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_RhythmToTime(IDirectMusicPerf /* IDirectMusicPerformance8 Interface part follow: */ static HRESULT WINAPI IDirectMusicPerformance8Impl_InitAudio(IDirectMusicPerformance8 *iface, - IDirectMusic **ppDirectMusic, IDirectSound **ppDirectSound, HWND hWnd, + IDirectMusic **ppDirectMusic, IDirectSound **dsound, HWND hwnd, DWORD dwDefaultPathType, DWORD dwPChannelCount, DWORD dwFlags, DMUS_AUDIOPARAMS* pParams) { - IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - IDirectSound* dsound = NULL; - HRESULT hr = S_OK; + IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); + HRESULT hr = S_OK; - FIXME("(%p, %p, %p, %p, %x, %u, %x, %p): to check\n", This, ppDirectMusic, ppDirectSound, hWnd, dwDefaultPathType, dwPChannelCount, dwFlags, pParams); + TRACE("(%p, %p, %p, %p, %x, %u, %x, %p)\n", This, ppDirectMusic, dsound, hwnd, dwDefaultPathType, dwPChannelCount, dwFlags, pParams); - if (This->dmusic) - return DMUS_E_ALREADY_INITED; + if (This->dmusic) + return DMUS_E_ALREADY_INITED; - if (NULL != ppDirectSound && NULL != *ppDirectSound) { - dsound = *ppDirectSound; - } else { - hr = DirectSoundCreate8 (NULL, (LPDIRECTSOUND8*) &dsound, NULL); - FIXME("return dsound(%p,%d)\n", dsound, hr); - if (FAILED(hr) || !dsound) - return DSERR_NODRIVER; - if (!hWnd) - hWnd = GetForegroundWindow(); - IDirectSound_SetCooperativeLevel(dsound, hWnd, DSSCL_PRIORITY); - if (ppDirectSound) - *ppDirectSound = dsound; - } + if (!dsound || !*dsound) { + hr = DirectSoundCreate8(NULL, (IDirectSound8 **)&This->dsound, NULL); + if (FAILED(hr)) + return hr; + IDirectSound_SetCooperativeLevel(This->dsound, hwnd ? hwnd : GetForegroundWindow(), + DSSCL_PRIORITY); + if (dsound) + *dsound = This->dsound; + } else + This->dsound = *dsound; - IDirectMusicPerformance8_Init(iface, ppDirectMusic, dsound, hWnd); + IDirectMusicPerformance8_Init(iface, ppDirectMusic, This->dsound, hwnd); - /* Init increases the ref count of the dsound object. Decrement it if the app doesn't want a pointer to the object. */ - if (NULL == ppDirectSound) { - IDirectSound_Release(This->pDirectSound); - } + /* Init increases the ref count of the dsound object. Decrement it if the app doesn't want a pointer to the object. */ + if (!dsound) + IDirectSound_Release(This->dsound); /* as seen in msdn we need params init before audio path creation */ if (NULL != pParams) { @@ -1059,7 +1054,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_CreateStandardAudioPath(IDire } /* FIXME: Should we create one secondary buffer for each PChannel? */ - hr = IDirectSound8_CreateSoundBuffer ((LPDIRECTSOUND8) This->pDirectSound, &desc, &buffer, NULL); + hr = IDirectSound_CreateSoundBuffer(This->dsound, &desc, &buffer, NULL); if (FAILED(hr)) return DSERR_BUFFERLOST; @@ -1068,7 +1063,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_CreateStandardAudioPath(IDire desc.dwBufferBytes = 0; desc.lpwfxFormat = NULL; - hr = IDirectSound8_CreateSoundBuffer ((LPDIRECTSOUND8) This->pDirectSound, &desc, &primary_buffer, NULL); + hr = IDirectSound_CreateSoundBuffer(This->dsound, &desc, &primary_buffer, NULL); if (FAILED(hr)) { IDirectSoundBuffer_Release(buffer); return DSERR_BUFFERLOST; @@ -1203,7 +1198,6 @@ HRESULT WINAPI create_dmperformance(REFIID lpcGUID, void **ppobj) } obj->IDirectMusicPerformance8_iface.lpVtbl = &DirectMusicPerformance8_Vtbl; obj->ref = 0; /* will be inited by QueryInterface */ - obj->pDirectSound = NULL; obj->pDefaultPath = NULL; InitializeCriticalSection(&obj->safe); obj->safe.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IDirectMusicPerformance8Impl*->safe");

1 0

Michael Stefaniuc : dmime: Simplify the check if the performance was initialized.
by Alexandre Julliard May 11, 2017

May 11, 2017

Module: wine Branch: master Commit: a2685a8bc05475503f8f9660e28e25cebbd1c489 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2685a8bc05475503f8f9660e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu May 11 11:05:45 2017 +0200 dmime: Simplify the check if the performance was initialized. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/performance.c | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index a0f70b0..2c94123 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -25,8 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime); typedef struct IDirectMusicPerformance8Impl { IDirectMusicPerformance8 IDirectMusicPerformance8_iface; LONG ref; - /* IDirectMusicPerformanceImpl fields */ - IDirectMusic8 *pDirectMusic; + IDirectMusic8 *dmusic; IDirectSound *pDirectSound; IDirectMusicGraph *pToolGraph; DMUS_AUDIOPARAMS pParams; @@ -254,7 +253,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_Init(IDirectMusicPerformance8 IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); FIXME("(iface = %p, dmusic = %p, dsound = %p, hwnd = %p)\n", This, ppDirectMusic, pDirectSound, hWnd); - if (This->pDirectMusic || This->pDirectSound) + if (This->dmusic) return DMUS_E_ALREADY_INITED; if (NULL != pDirectSound) { @@ -271,16 +270,16 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_Init(IDirectMusicPerformance8 if (NULL != ppDirectMusic && NULL != *ppDirectMusic) { /* app creates its own dmusic object and gives it to performance */ - This->pDirectMusic = (IDirectMusic8*) *ppDirectMusic; - IDirectMusic8_AddRef(This->pDirectMusic); + This->dmusic = (IDirectMusic8 *)*ppDirectMusic; + IDirectMusic8_AddRef(This->dmusic); } else { HRESULT hr; /* App enables the performance to initialize itself and needs a pointer to object */ - hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic8, (void**)&This->pDirectMusic); + hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic8, (void **)&This->dmusic); if (FAILED(hr)) return hr; if (ppDirectMusic) { - *ppDirectMusic = (LPDIRECTMUSIC)This->pDirectMusic; + *ppDirectMusic = (IDirectMusic *)This->dmusic; IDirectMusic8_AddRef((LPDIRECTMUSIC8)*ppDirectMusic); } } @@ -601,20 +600,21 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_AddPort(IDirectMusicPerforman HRESULT hr = E_FAIL; FIXME("(%p, %p): stub\n", This, pPort); - if (!This->pDirectMusic || !This->pDirectSound) return DMUS_E_NOT_INIT; + if (!This->dmusic) + return DMUS_E_NOT_INIT; if (NULL == pPort) { GUID port_guid; IDirectMusicPort* pDefaultPort = NULL; DMUS_PORTPARAMS params; int i, j; - hr = IDirectMusic8_GetDefaultPort(This->pDirectMusic, &port_guid); + hr = IDirectMusic8_GetDefaultPort(This->dmusic, &port_guid); if (FAILED(hr)) return hr; ZeroMemory(&params, sizeof(params)); params.dwSize = sizeof(params); params.dwValidParams = DMUS_PORTPARAMS_CHANNELGROUPS | DMUS_PORTPARAMS_SHARE; params.dwChannelGroups = 1; params.fShare = TRUE; - hr = IDirectMusic8_CreatePort(This->pDirectMusic, &port_guid, &params, &pDefaultPort, NULL); + hr = IDirectMusic8_CreatePort(This->dmusic, &port_guid, &params, &pDefaultPort, NULL); if (FAILED(hr)) return hr; hr = IDirectMusicPort_Activate(pDefaultPort, TRUE); if (FAILED(hr)) { IDirectMusicPort_Release(pDefaultPort); return hr; } @@ -698,8 +698,8 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_PChannelInfo(IDirectMusicPerf port_params.dwSize = sizeof(DMUS_PORTPARAMS8); port_params.dwValidParams = 0; - IDirectMusic8_GetDefaultPort(This->pDirectMusic, &default_port); - IDirectMusic8_CreatePort(This->pDirectMusic, &default_port, &port_params, port, NULL); + IDirectMusic8_GetDefaultPort(This->dmusic, &default_port); + IDirectMusic8_CreatePort(This->dmusic, &default_port, &port_params, port, NULL); return S_OK; } @@ -832,11 +832,11 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_CloseDown(IDirectMusicPerform IDirectSound_Release(This->pDirectSound); This->pDirectSound = NULL; } - if (NULL != This->pDirectMusic) { - IDirectMusic8_Release(This->pDirectMusic); - This->pDirectMusic = NULL; - } - return S_OK; + if (This->dmusic) { + IDirectMusic8_Release(This->dmusic); + This->dmusic = NULL; + } + return S_OK; } static HRESULT WINAPI IDirectMusicPerformance8Impl_GetResolvedTime(IDirectMusicPerformance8 *iface, @@ -900,7 +900,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_InitAudio(IDirectMusicPerform FIXME("(%p, %p, %p, %p, %x, %u, %x, %p): to check\n", This, ppDirectMusic, ppDirectSound, hWnd, dwDefaultPathType, dwPChannelCount, dwFlags, pParams); - if (This->pDirectMusic || This->pDirectSound) + if (This->dmusic) return DMUS_E_ALREADY_INITED; if (NULL != ppDirectSound && NULL != *ppDirectSound) { @@ -1203,7 +1203,6 @@ HRESULT WINAPI create_dmperformance(REFIID lpcGUID, void **ppobj) } obj->IDirectMusicPerformance8_iface.lpVtbl = &DirectMusicPerformance8_Vtbl; obj->ref = 0; /* will be inited by QueryInterface */ - obj->pDirectMusic = NULL; obj->pDirectSound = NULL; obj->pDefaultPath = NULL; InitializeCriticalSection(&obj->safe);

1 0

Paul Gofman : d3dx9: Add 'log' preshader opcode.
by Alexandre Julliard May 11, 2017

May 11, 2017

Module: wine Branch: master Commit: 651e8bfaee90870d430a7fb045382a803037c260 URL: http://source.winehq.org/git/wine.git/?a=commit;h=651e8bfaee90870d430a7fb04… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon May 8 18:39:36 2017 +0300 d3dx9: Add 'log' preshader opcode. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 12 ++++++++++++ dlls/d3dx9_36/tests/effect.c | 2 ++ 2 files changed, 14 insertions(+) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index a4e5e3a..fbd99ac 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -33,6 +33,7 @@ enum pres_ops PRESHADER_OP_RCP, PRESHADER_OP_FRC, PRESHADER_OP_EXP, + PRESHADER_OP_LOG, PRESHADER_OP_RSQ, PRESHADER_OP_SIN, PRESHADER_OP_COS, @@ -95,6 +96,16 @@ static double pres_rsq(double *args, int n) return 1.0 / sqrt(v); } static double pres_exp(double *args, int n) {return pow(2.0, args[0]);} +static double pres_log(double *args, int n) +{ + double v; + + v = fabs(args[0]); + if (v == 0.0) + return 0.0; + else + return log2(v); +} #define PRES_OPCODE_MASK 0x7ff00000 #define PRES_OPCODE_SHIFT 20 @@ -124,6 +135,7 @@ static const struct op_info pres_op_info[] = {0x103, "rcp", 1, 0, pres_rcp}, /* PRESHADER_OP_RCP */ {0x104, "frc", 1, 0, pres_frc}, /* PRESHADER_OP_FRC */ {0x105, "exp", 1, 0, pres_exp}, /* PRESHADER_OP_EXP */ + {0x106, "log", 1, 0, pres_log}, /* PRESHADER_OP_LOG */ {0x107, "rsq", 1, 0, pres_rsq}, /* PRESHADER_OP_RSQ */ {0x108, "sin", 1, 0, pres_sin}, /* PRESHADER_OP_SIN */ {0x109, "cos", 1, 0, pres_cos}, /* PRESHADER_OP_COS */ diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 7b39e31..a1cdfc2 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -4554,6 +4554,8 @@ static void test_effect_preshader_ops(IDirect3DDevice9 *device) { {"exp", 0x10500001, 1, {0x3f800000, 0x3f800000, 0x3e5edc66, 0x7f800000}, {0.0f, -0.0f, -2.2f, 3.402823466e+38f}, {1.0f, 2.0f, -3.0f, 4.0f}}, + {"log", 0x10600001, 1, {0, 0x40000000, 0x3f9199b7, 0x43000000}, + {0.0f, 4.0f, -2.2f, 3.402823466e+38f}, {1.0f, 2.0f, -3.0f, 4.0f}}, {"0 * INF", 0x20500004, 2, {0xffc00000, 0xffc00000, 0xc0d33334, 0x7f800000}, {0.0f, -0.0f, -2.2f, 3.402823466e+38f}, {INFINITY, INFINITY, 3.0f, 4.0f}}, };

1 0

Bruno Jesus : ws2_32: Use unsigned interface index on interface_bind_check.
by Alexandre Julliard May 11, 2017

May 11, 2017

Module: wine Branch: master Commit: 1639c23cae273acd5977c454d1c8f29201e4480f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1639c23cae273acd5977c454d… Author: Bruno Jesus <bjesus(a)codeweavers.com> Date: Wed May 10 22:46:31 2017 -0300 ws2_32: Use unsigned interface index on interface_bind_check. Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 9d27fab..f6db832 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3671,7 +3671,8 @@ static void interface_bind_check(int fd, struct sockaddr_in *addr) #if !defined(IP_BOUND_IF) && !defined(LINUX_BOUND_IF) return; #else - int ifindex; + unsigned int ifindex; + int ret; socklen_t len; /* Check for IPv4, address 0.0.0.0 and UDP socket */ @@ -3680,15 +3681,14 @@ static void interface_bind_check(int fd, struct sockaddr_in *addr) if (_get_fd_type(fd) != SOCK_DGRAM) return; - ifindex = -1; len = sizeof(ifindex); #if defined(IP_BOUND_IF) - getsockopt(fd, IPPROTO_IP, IP_BOUND_IF, &ifindex, &len); + ret = getsockopt(fd, IPPROTO_IP, IP_BOUND_IF, &ifindex, &len); #elif defined(LINUX_BOUND_IF) - getsockopt(fd, IPPROTO_IP, IP_UNICAST_IF, &ifindex, &len); - if (ifindex > 0) ifindex = ntohl(ifindex); + ret = getsockopt(fd, IPPROTO_IP, IP_UNICAST_IF, &ifindex, &len); + if (!ret) ifindex = ntohl(ifindex); #endif - if (ifindex > 0) + if (!ret) { PIP_ADAPTER_INFO adapters, adapter; DWORD adap_size;

1 0

Michael Stefaniuc : dmime: Finish the reindentation in CloseDown().
by Alexandre Julliard May 11, 2017

May 11, 2017

Module: wine Branch: master Commit: 3a145ac92b0e0f2226a6d20999bc8b2117969f01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a145ac92b0e0f2226a6d2099… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu May 11 11:05:47 2017 +0200 dmime: Finish the reindentation in CloseDown(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/performance.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 57ee670..292ae80 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -820,14 +820,15 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_AdjustTime(IDirectMusicPerfor static HRESULT WINAPI IDirectMusicPerformance8Impl_CloseDown(IDirectMusicPerformance8 *iface) { - IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); + IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p): stub\n", This); - if (PostMessageToProcessMsgThread(This, PROCESSMSG_EXIT)) { - WaitForSingleObject(This->procThread, INFINITE); - This->procThreadTicStarted = FALSE; - CloseHandle(This->procThread); - } + FIXME("(%p): semi-stub\n", This); + + if (PostMessageToProcessMsgThread(This, PROCESSMSG_EXIT)) { + WaitForSingleObject(This->procThread, INFINITE); + This->procThreadTicStarted = FALSE; + CloseHandle(This->procThread); + } if (This->dsound) { IDirectSound_Release(This->dsound); This->dsound = NULL;

1 0