May 2019 - Wine-commits - list.winehq.org

Alexandre Julliard : d3dx11: Build with msvcrt.
by Alexandre Julliard 30 May '19

30 May '19

Module: wine Branch: master Commit: f277b969081eb45a0b3d3b3b8a5cca8f83da80ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=f277b969081eb45a0b3d3b3b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 30 09:17:00 2019 +0200 d3dx11: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx11_42/Makefile.in | 2 ++ dlls/d3dx11_43/Makefile.in | 2 ++ dlls/d3dx11_43/async.c | 7 ++----- dlls/d3dx11_43/main.c | 2 -- dlls/d3dx11_43/texture.c | 2 -- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx11_42/Makefile.in b/dlls/d3dx11_42/Makefile.in index 4a8fd0b..41792c9 100644 --- a/dlls/d3dx11_42/Makefile.in +++ b/dlls/d3dx11_42/Makefile.in @@ -3,6 +3,8 @@ MODULE = d3dx11_42.dll IMPORTS = d3dcompiler PARENTSRC = ../d3dx11_43 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ async.c \ main.c \ diff --git a/dlls/d3dx11_43/Makefile.in b/dlls/d3dx11_43/Makefile.in index c64d037..bf5a263 100644 --- a/dlls/d3dx11_43/Makefile.in +++ b/dlls/d3dx11_43/Makefile.in @@ -3,6 +3,8 @@ MODULE = d3dx11_43.dll IMPORTLIB = d3dx11 IMPORTS = d3dcompiler +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ async.c \ main.c \ diff --git a/dlls/d3dx11_43/async.c b/dlls/d3dx11_43/async.c index f640b6c..cde87ce 100644 --- a/dlls/d3dx11_43/async.c +++ b/dlls/d3dx11_43/async.c @@ -16,13 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" #include "d3dx11.h" #include "d3dcompiler.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); @@ -317,13 +314,13 @@ HRESULT WINAPI D3DX11CreateAsyncFileLoaderW(const WCHAR *filename, ID3DX11DataLo return E_OUTOFMEMORY; object->ID3DX11DataLoader_iface.lpVtbl = &filedataloadervtbl; - object->u.file.path = HeapAlloc(GetProcessHeap(), 0, (strlenW(filename) + 1) * sizeof(WCHAR)); + object->u.file.path = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(filename) + 1) * sizeof(WCHAR)); if (!object->u.file.path) { HeapFree(GetProcessHeap(), 0, object); return E_OUTOFMEMORY; } - strcpyW(object->u.file.path, filename); + lstrcpyW(object->u.file.path, filename); object->data = NULL; object->size = 0; diff --git a/dlls/d3dx11_43/main.c b/dlls/d3dx11_43/main.c index b1bf969..215a51b 100644 --- a/dlls/d3dx11_43/main.c +++ b/dlls/d3dx11_43/main.c @@ -17,8 +17,6 @@ * */ -#include "config.h" -#include "wine/port.h" #include <stdarg.h> #define COBJMACROS diff --git a/dlls/d3dx11_43/texture.c b/dlls/d3dx11_43/texture.c index 6aaf8a7..bc30015 100644 --- a/dlls/d3dx11_43/texture.c +++ b/dlls/d3dx11_43/texture.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" #include "d3dx11.h" #include "d3dcompiler.h"

1 0

Alexandre Julliard : d3dx9: Build with msvcrt.
by Alexandre Julliard 30 May '19

30 May '19

1 0

Rémi Bernon : xinput: Fix rumble amount value rounding.
by Alexandre Julliard 29 May '19

29 May '19

Module: wine Branch: master Commit: d636cc18ba53ed7ca798c919dd56b0d5dabee9fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=d636cc18ba53ed7ca798c919… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 28 16:41:20 2019 +0200 xinput: Fix rumble amount value rounding. XINPUT_VIBRATION structure documentation says that wLeftMotorSpeed and wRightMotorSpeed can range from 0 to 65535. The values were incorrectly divided by 255 in HID_set_state, which made the value range overflow one byte. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/hid.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/xinput1_3/hid.c b/dlls/xinput1_3/hid.c index 34e4e51..dc5601c 100644 --- a/dlls/xinput1_3/hid.c +++ b/dlls/xinput1_3/hid.c @@ -469,8 +469,8 @@ DWORD HID_set_state(xinput_controller* device, XINPUT_VIBRATION* state) report.report = 0; report.pad1[0] = 0x8; report.pad1[1] = 0x0; - report.left = (BYTE)(state->wLeftMotorSpeed / 255); - report.right = (BYTE)(state->wRightMotorSpeed / 255); + report.left = (BYTE)(state->wLeftMotorSpeed / 256); + report.right = (BYTE)(state->wRightMotorSpeed / 256); memset(&report.pad2, 0, sizeof(report.pad2)); EnterCriticalSection(&private->crit);

1 0

Jacek Caban : ieframe: Keep Busy property in sync with download state.
by Alexandre Julliard 29 May '19

29 May '19

Module: wine Branch: master Commit: d535df42f665a097ec721b10fb49d7b18f899be9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d535df42f665a097ec721b10… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 29 20:06:27 2019 +0200 ieframe: Keep Busy property in sync with download state. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47069 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/dochost.c | 3 ++- dlls/ieframe/navigate.c | 5 ++-- dlls/ieframe/shellbrowser.c | 3 --- dlls/ieframe/tests/webbrowser.c | 56 ++++++++++++++++++++++++++++------------- 4 files changed, 43 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d535df42f665a097ec72…

1 0

Zebediah Figura : qcap/avimux: Use strmbase filter methods directly.
by Alexandre Julliard 29 May '19

29 May '19

Module: wine Branch: master Commit: ffe9fee151dda690de72de45413510e0e08755eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffe9fee151dda690de72de45… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 28 23:10:20 2019 -0500 qcap/avimux: Use strmbase filter methods directly. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avimux.c | 57 ++++-------------------------------------------------- 1 file changed, 4 insertions(+), 53 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index 3ca55ca..bf10fe3 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -709,55 +709,6 @@ static HRESULT WINAPI AviMux_Run(IBaseFilter *iface, REFERENCE_TIME tStart) return S_OK; } -static HRESULT WINAPI AviMux_EnumPins(IBaseFilter *iface, IEnumPins **ppEnum) -{ - AviMux *This = impl_from_IBaseFilter(iface); - TRACE("(%p)->(%p)\n", This, ppEnum); - return BaseFilterImpl_EnumPins(iface, ppEnum); -} - -static HRESULT WINAPI AviMux_FindPin(IBaseFilter *iface, LPCWSTR Id, IPin **ppPin) -{ - AviMux *This = impl_from_IBaseFilter(iface); - int i; - - TRACE("(%p)->(%s %p)\n", This, debugstr_w(Id), ppPin); - - if(!Id || !ppPin) - return E_POINTER; - - if(!lstrcmpiW(Id, This->out->pin.pin.pinInfo.achName)) { - IPin_AddRef(&This->out->pin.pin.IPin_iface); - *ppPin = &This->out->pin.pin.IPin_iface; - return S_OK; - } - - for(i=0; i<This->input_pin_no; i++) { - if(lstrcmpiW(Id, This->in[i]->pin.pin.pinInfo.achName)) - continue; - - IPin_AddRef(&This->in[i]->pin.pin.IPin_iface); - *ppPin = &This->in[i]->pin.pin.IPin_iface; - return S_OK; - } - - return VFW_E_NOT_FOUND; -} - -static HRESULT WINAPI AviMux_QueryFilterInfo(IBaseFilter *iface, FILTER_INFO *pInfo) -{ - AviMux *This = impl_from_IBaseFilter(iface); - FIXME("(%p)->(%p)\n", This, pInfo); - return E_NOTIMPL; -} - -static HRESULT WINAPI AviMux_QueryVendorInfo(IBaseFilter *iface, LPWSTR *pVendorInfo) -{ - AviMux *This = impl_from_IBaseFilter(iface); - FIXME("(%p)->(%p)\n", This, pVendorInfo); - return E_NOTIMPL; -} - static const IBaseFilterVtbl AviMuxVtbl = { AviMux_QueryInterface, BaseFilterImpl_AddRef, @@ -769,11 +720,11 @@ static const IBaseFilterVtbl AviMuxVtbl = { BaseFilterImpl_GetState, BaseFilterImpl_SetSyncSource, BaseFilterImpl_GetSyncSource, - AviMux_EnumPins, - AviMux_FindPin, - AviMux_QueryFilterInfo, + BaseFilterImpl_EnumPins, + BaseFilterImpl_FindPin, + BaseFilterImpl_QueryFilterInfo, BaseFilterImpl_JoinFilterGraph, - AviMux_QueryVendorInfo + BaseFilterImpl_QueryVendorInfo }; static inline AviMux* impl_from_IConfigAviMux(IConfigAviMux *iface)

1 0

Zebediah Figura : widl: Use IsSimpleRef only for explicitly declared arrays.
by Alexandre Julliard 29 May '19

29 May '19

Module: wine Branch: master Commit: 02976b655a5d9ad8ee25dbfb2051acb5b7431381 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02976b655a5d9ad8ee25dbfb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 29 00:24:05 2019 -0500 widl: Use IsSimpleRef only for explicitly declared arrays. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47285 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typegen.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index e5fb20c..9137712 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1064,9 +1064,16 @@ static unsigned char get_parameter_fc( const var_t *var, int is_return, unsigned case TGT_UNION: case TGT_USER_TYPE: case TGT_RANGE: + *flags |= MustFree; + if (!is_in && is_out) server_size = type_memsize( ref ); + break; case TGT_ARRAY: - *flags |= IsSimpleRef | MustFree; - *typestring_offset = ref->typestring_offset; + *flags |= MustFree; + if (!type_array_is_decl_as_ptr(ref)) + { + *flags |= IsSimpleRef; + *typestring_offset = ref->typestring_offset; + } if (!is_in && is_out) server_size = type_memsize( ref ); break; case TGT_STRING:

1 0

Zebediah Figura : widl: Also allocate top-level pointers to arrays as on-stack in -Oicf mode.
by Alexandre Julliard 29 May '19

29 May '19

Module: wine Branch: master Commit: 3c4d0bf4e3102c6fcff7acab189f874d6bd45003 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c4d0bf4e3102c6fcff7acab… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 29 00:24:06 2019 -0500 widl: Also allocate top-level pointers to arrays as on-stack in -Oicf mode. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47285 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typegen.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 9137712..c710df17 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2132,6 +2132,7 @@ static unsigned int write_nonsimple_pointer(FILE *file, const attr_list_t *attrs case TGT_POINTER: case TGT_CTXT_HANDLE: case TGT_CTXT_HANDLE_POINTER: + case TGT_ARRAY: flags |= FC_ALLOCED_ON_STACK; break; case TGT_IFACE_POINTER:

1 0

Zebediah Figura : widl: Remove an unused variable.
by Alexandre Julliard 29 May '19

29 May '19

Module: wine Branch: master Commit: 55a0ec420f7ed92e7f53e391ab086cd35b815c04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55a0ec420f7ed92e7f53e391… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 29 00:24:07 2019 -0500 widl: Remove an unused variable. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typegen.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index c710df17..2c70d15 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2951,15 +2951,11 @@ static unsigned int write_array_tfs(FILE *file, const attr_list_t *attrs, type_t unsigned int size; unsigned int start_offset; unsigned char fc; - int pointer_type = get_attrv(attrs, ATTR_POINTERTYPE); unsigned int baseoff = !type_array_is_decl_as_ptr(type) && current_structure ? type_memsize(current_structure) : 0; - if (!pointer_type) - pointer_type = FC_RP; - if (!is_string_type(attrs, type_array_get_element(type))) write_embedded_types(file, attrs, type_array_get_element(type), name, FALSE, typestring_offset);

1 0

Zebediah Figura : widl: Write array pointers as FC_OP pointers if appropriate.
by Alexandre Julliard 29 May '19

29 May '19

Module: wine Branch: master Commit: 8e7fefe3d8c1104cb93d5ed7509b2462a3486a7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e7fefe3d8c1104cb93d5ed7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 29 00:24:08 2019 -0500 widl: Write array pointers as FC_OP pointers if appropriate. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47285 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typegen.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 2c70d15..d47bee7 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3607,8 +3607,7 @@ static unsigned int write_type_tfs(FILE *file, int indent, context != TYPE_CONTEXT_CONTAINER_NO_POINTERS) { int ptr_type; - ptr_type = get_pointer_fc(type, attrs, - context == TYPE_CONTEXT_TOPLEVELPARAM); + ptr_type = get_pointer_fc_context(type, attrs, context); if (ptr_type != FC_RP || type_array_is_decl_as_ptr(type)) { unsigned int absoff = type->typestring_offset;

1 0

Zebediah Figura : widl: Non-top-level conformant arrays are always [ref] by default.
by Alexandre Julliard 29 May '19

29 May '19

Module: wine Branch: master Commit: bb0e8059f01541049c4fcbbb5fc514946191c2db URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb0e8059f01541049c4fcbbb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 29 00:24:09 2019 -0500 widl: Non-top-level conformant arrays are always [ref] by default. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index dd676e9..5d91085 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1632,7 +1632,7 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl else *ptype = type_new_array((*ptype)->name, type_array_get_element(*ptype), FALSE, - 0, dim, NULL, 0); + 0, dim, NULL, FC_RP); } else if (is_ptr(*ptype)) *ptype = type_new_array((*ptype)->name, type_pointer_get_ref(*ptype), TRUE,

1 0