June 2019 - Wine-Commits - list.winehq.org

Alexandre Julliard : netcfgx: Build with msvcrt.
by Alexandre Julliard June 14, 2019

June 14, 2019

Module: wine Branch: master Commit: dfaddf309ee93a27fa92f35fa8c01b8f397718de URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfaddf309ee93a27fa92f35f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 14 09:22:17 2019 +0200 netcfgx: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netcfgx/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/netcfgx/Makefile.in b/dlls/netcfgx/Makefile.in index 7e5e1fc..d4dae8f 100644 --- a/dlls/netcfgx/Makefile.in +++ b/dlls/netcfgx/Makefile.in @@ -1,6 +1,8 @@ MODULE = netcfgx.dll IMPORTS = uuid +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c \ netcfg.c

1 0

Alexandre Julliard : ndis.sys: Build with msvcrt.
by Alexandre Julliard June 14, 2019

June 14, 2019

Module: wine Branch: master Commit: 6705519f098b3147da777dc93ca4a9ac795f114b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6705519f098b3147da777dc9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 14 09:22:06 2019 +0200 ndis.sys: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ndis.sys/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ndis.sys/Makefile.in b/dlls/ndis.sys/Makefile.in index 3b466ad..cc52260 100644 --- a/dlls/ndis.sys/Makefile.in +++ b/dlls/ndis.sys/Makefile.in @@ -1,5 +1,7 @@ MODULE = ndis.sys EXTRADLLFLAGS = -Wl,--subsystem,native +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c

1 0

Gabriel Ivăncescu : comctl32/listview: Get rid of useless casts.
by Alexandre Julliard June 14, 2019

June 14, 2019

Module: wine Branch: master Commit: a0a3d6161c6ea23b5f7ac43e107bfed3dd423c9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0a3d6161c6ea23b5f7ac43e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jun 5 14:39:01 2019 +0300 comctl32/listview: Get rid of useless casts. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 4ecff20..2717812 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -9909,7 +9909,7 @@ static LRESULT LISTVIEW_HScroll(LISTVIEW_INFO *infoPtr, INT nScrollCode, static LRESULT LISTVIEW_MouseWheel(LISTVIEW_INFO *infoPtr, INT wheelDelta) { - UINT pulScrollLines = 3; + INT pulScrollLines = 3; TRACE("(wheelDelta=%d)\n", wheelDelta); @@ -9938,8 +9938,8 @@ static LRESULT LISTVIEW_MouseWheel(LISTVIEW_INFO *infoPtr, INT wheelDelta) { int cLineScroll; pulScrollLines = min((UINT)LISTVIEW_GetCountPerColumn(infoPtr), pulScrollLines); - cLineScroll = pulScrollLines * (float)infoPtr->cWheelRemainder / WHEEL_DELTA; - infoPtr->cWheelRemainder -= WHEEL_DELTA * cLineScroll / (int)pulScrollLines; + cLineScroll = pulScrollLines * infoPtr->cWheelRemainder / WHEEL_DELTA; + infoPtr->cWheelRemainder -= WHEEL_DELTA * cLineScroll / pulScrollLines; LISTVIEW_VScroll(infoPtr, SB_INTERNAL, -cLineScroll); } break;

1 0

Gabriel Ivăncescu : comctl32/listbox: Fix mouse wheel scrolling for multi-column listboxes.
by Alexandre Julliard June 14, 2019

June 14, 2019

Module: wine Branch: master Commit: 1f3787519463bd99994a34a8648b7b9797bca985 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f3787519463bd99994a34a8… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jun 5 14:38:57 2019 +0300 comctl32/listbox: Fix mouse wheel scrolling for multi-column listboxes. Multi-column listboxes scroll horizontally, so each wheel tick must go an entire page at a time instead of an item at a time. But we have to limit the amount of scrolling in this case to avoid "jumping over" columns, if the window is too small. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22253 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 8fd556c..ab4c481 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -2068,7 +2068,7 @@ static LRESULT LISTBOX_HandleHScroll( LB_DESCR *descr, WORD scrollReq, WORD pos static LRESULT LISTBOX_HandleMouseWheel(LB_DESCR *descr, SHORT delta ) { - UINT pulScrollLines = 3; + INT pulScrollLines = 3; SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0); @@ -2082,9 +2082,20 @@ static LRESULT LISTBOX_HandleMouseWheel(LB_DESCR *descr, SHORT delta ) if (descr->wheel_remain && pulScrollLines) { int cLineScroll; - pulScrollLines = min((UINT) descr->page_size, pulScrollLines); - cLineScroll = pulScrollLines * (float)descr->wheel_remain / WHEEL_DELTA; - descr->wheel_remain -= WHEEL_DELTA * cLineScroll / (int)pulScrollLines; + if (descr->style & LBS_MULTICOLUMN) + { + pulScrollLines = min(descr->width / descr->column_width, pulScrollLines); + pulScrollLines = max(1, pulScrollLines); + cLineScroll = pulScrollLines * descr->wheel_remain / WHEEL_DELTA; + descr->wheel_remain -= WHEEL_DELTA * cLineScroll / pulScrollLines; + cLineScroll *= descr->page_size; + } + else + { + pulScrollLines = min(descr->page_size, pulScrollLines); + cLineScroll = pulScrollLines * descr->wheel_remain / WHEEL_DELTA; + descr->wheel_remain -= WHEEL_DELTA * cLineScroll / pulScrollLines; + } LISTBOX_SetTopItem( descr, descr->top_item - cLineScroll, TRUE ); } return 0;

1 0

Alexandre Julliard : msxml: Build with msvcrt.
by Alexandre Julliard June 14, 2019

June 14, 2019

Module: wine Branch: master Commit: 1d73a3b8b4a58aa6c0f5e59b31fcbbf4586dfb59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d73a3b8b4a58aa6c0f5e59b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 14 09:20:55 2019 +0200 msxml: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msxml/Makefile.in b/dlls/msxml/Makefile.in index 715ed59..5ac35cc 100644 --- a/dlls/msxml/Makefile.in +++ b/dlls/msxml/Makefile.in @@ -1,5 +1,7 @@ MODULE = msxml.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = main.c IDL_SRCS = msxml_tlb.idl

1 0

Zebediah Figura : qcap/smartteefilter: Store the capture source pin inline in the SmartTeeFilter structure.
by Alexandre Julliard June 14, 2019

June 14, 2019

Module: wine Branch: master Commit: 2d7b374ed89c0823a21c1328c59ad9da10462ce1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d7b374ed89c0823a21c1328… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 13 18:09:22 2019 -0500 qcap/smartteefilter: Store the capture source pin inline in the SmartTeeFilter structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/smartteefilter.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index 69341af..541d7a8 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(qcap); typedef struct { BaseFilter filter; BaseInputPin sink; - BaseOutputPin *capture; + BaseOutputPin capture; BaseOutputPin *preview; } SmartTeeFilter; @@ -125,7 +125,7 @@ static IPin *smart_tee_get_pin(BaseFilter *iface, unsigned int index) if (index == 0) return &filter->sink.pin.IPin_iface; else if (index == 1) - return &filter->capture->pin.IPin_iface; + return &filter->capture.pin.IPin_iface; else if (index == 2) return &filter->preview->pin.IPin_iface; return NULL; @@ -136,8 +136,7 @@ static void smart_tee_destroy(BaseFilter *iface) SmartTeeFilter *filter = impl_from_BaseFilter(iface); strmbase_sink_cleanup(&filter->sink); - if (filter->capture) - BaseOutputPinImpl_Release(&filter->capture->pin.IPin_iface); + strmbase_source_cleanup(&filter->capture); if (filter->preview) BaseOutputPinImpl_Release(&filter->preview->pin.IPin_iface); strmbase_filter_cleanup(&filter->filter); @@ -308,11 +307,11 @@ static HRESULT WINAPI SmartTeeFilterInput_Receive(BaseInputPin *base, IMediaSamp /* FIXME: we should ideally do each of these in a separate thread */ EnterCriticalSection(&This->filter.csFilter); - if (This->capture->pin.pConnectedTo) - hrCapture = copy_sample(inputSample, This->capture->pAllocator, &captureSample); + if (This->capture.pin.pConnectedTo) + hrCapture = copy_sample(inputSample, This->capture.pAllocator, &captureSample); LeaveCriticalSection(&This->filter.csFilter); if (SUCCEEDED(hrCapture)) - hrCapture = BaseOutputPinImpl_Deliver(This->capture, captureSample); + hrCapture = BaseOutputPinImpl_Deliver(&This->capture, captureSample); if (captureSample) IMediaSample_Release(captureSample); @@ -535,10 +534,8 @@ IUnknown* WINAPI QCAP_createSmartTeeFilter(IUnknown *outer, HRESULT *phr) goto end; capturePinInfo.pFilter = &This->filter.IBaseFilter_iface; - hr = BaseOutputPin_Construct(&SmartTeeFilterCaptureVtbl, sizeof(BaseOutputPin), &capturePinInfo, - &SmartTeeFilterCaptureFuncs, &This->filter.csFilter, (IPin**)&This->capture); - if (FAILED(hr)) - goto end; + strmbase_source_init(&This->capture, &SmartTeeFilterCaptureVtbl, &capturePinInfo, + &SmartTeeFilterCaptureFuncs, &This->filter.csFilter); previewPinInfo.pFilter = &This->filter.IBaseFilter_iface; hr = BaseOutputPin_Construct(&SmartTeeFilterPreviewVtbl, sizeof(BaseOutputPin), &previewPinInfo,

1 0

Zebediah Figura : widl: Remove the unused "indent" parameter from write_type_tfs().
by Alexandre Julliard June 14, 2019

June 14, 2019

Module: wine Branch: master Commit: fcb96cf8456f12a521dd87412ca8a935a29c5b5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcb96cf8456f12a521dd8741… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 13 17:49:35 2019 -0500 widl: Remove the unused "indent" parameter from write_type_tfs(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typegen.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index fbc9f3c..c62ba96 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3577,9 +3577,8 @@ static unsigned int write_range_tfs(FILE *file, const attr_list_t *attrs, return start_offset; } -static unsigned int write_type_tfs(FILE *file, int indent, - const attr_list_t *attrs, type_t *type, - const char *name, +static unsigned int write_type_tfs(FILE *file, const attr_list_t *attrs, + type_t *type, const char *name, enum type_context context, unsigned int *typeformat_offset) { @@ -3660,13 +3659,13 @@ static unsigned int write_type_tfs(FILE *file, int indent, if (context != TYPE_CONTEXT_CONTAINER_NO_POINTERS) write_pointer_tfs(file, attrs, type, *typeformat_offset + 4, context, typeformat_offset); - offset = write_type_tfs(file, indent, attrs, ref, name, ref_context, typeformat_offset); + offset = write_type_tfs(file, attrs, ref, name, ref_context, typeformat_offset); if (context == TYPE_CONTEXT_CONTAINER_NO_POINTERS) return 0; return offset; } - offset = write_type_tfs( file, indent, attrs, type_pointer_get_ref(type), name, + offset = write_type_tfs( file, attrs, type_pointer_get_ref(type), name, ref_context, typeformat_offset); if (context == TYPE_CONTEXT_CONTAINER_NO_POINTERS) return 0; @@ -3682,7 +3681,7 @@ static unsigned int write_type_tfs(FILE *file, int indent, static int write_embedded_types(FILE *file, const attr_list_t *attrs, type_t *type, const char *name, int write_ptr, unsigned int *tfsoff) { - return write_type_tfs(file, 2, attrs, type, name, write_ptr ? TYPE_CONTEXT_CONTAINER : TYPE_CONTEXT_CONTAINER_NO_POINTERS, tfsoff); + return write_type_tfs(file, attrs, type, name, write_ptr ? TYPE_CONTEXT_CONTAINER : TYPE_CONTEXT_CONTAINER_NO_POINTERS, tfsoff); } static void process_tfs_iface(type_t *iface, FILE *file, int indent, unsigned int *offset) @@ -3709,12 +3708,12 @@ static void process_tfs_iface(type_t *iface, FILE *file, int indent, unsigned in var = type_function_get_retval(func->type); if (!is_void(var->type)) - var->typestring_offset = write_type_tfs( file, 2, var->attrs, var->type, func->name, + var->typestring_offset = write_type_tfs( file, var->attrs, var->type, func->name, TYPE_CONTEXT_RETVAL, offset); if (type_get_function_args(func->type)) LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->type), var_t, entry ) - var->typestring_offset = write_type_tfs( file, 2, var->attrs, var->type, var->name, + var->typestring_offset = write_type_tfs( file, var->attrs, var->type, var->name, TYPE_CONTEXT_TOPLEVELPARAM, offset ); break; @@ -3726,7 +3725,7 @@ static void process_tfs_iface(type_t *iface, FILE *file, int indent, unsigned in { if (is_attr(type_entry->type->attrs, ATTR_ENCODE) || is_attr(type_entry->type->attrs, ATTR_DECODE)) - type_entry->type->typestring_offset = write_type_tfs( file, 2, + type_entry->type->typestring_offset = write_type_tfs( file, type_entry->type->attrs, type_entry->type, type_entry->type->name, TYPE_CONTEXT_CONTAINER, offset); }

1 0

Zebediah Figura : widl: Mark unions, user types, and ranges as IsSimpleRef.
by Alexandre Julliard June 14, 2019

June 14, 2019

Module: wine Branch: master Commit: 0afbcee924d0a9a7461291ea389c5a78d3ed2227 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0afbcee924d0a9a7461291ea… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 13 17:49:34 2019 -0500 widl: Mark unions, user types, and ranges as IsSimpleRef. This fixes a regression introduced by 02976b655a5d9ad8ee25dbfb2051acb5b7431381. That patch should only have affected arrays. 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, 2 insertions(+), 1 deletion(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index f320f57..fbc9f3c 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1064,7 +1064,8 @@ 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; + *flags |= MustFree | IsSimpleRef; + *typestring_offset = ref->typestring_offset; if (!is_in && is_out) server_size = type_memsize( ref ); break; case TGT_ARRAY:

1 0

Alexandre Julliard : ncrypt: Build with msvcrt.
by Alexandre Julliard June 14, 2019

June 14, 2019

Module: wine Branch: master Commit: 1c6256575b2c015e86be7f6eea78b087a4aa472e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c6256575b2c015e86be7f6e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 14 09:21:52 2019 +0200 ncrypt: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ncrypt/Makefile.in | 2 ++ dlls/ncrypt/main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ncrypt/Makefile.in b/dlls/ncrypt/Makefile.in index d54b921..c387c35 100644 --- a/dlls/ncrypt/Makefile.in +++ b/dlls/ncrypt/Makefile.in @@ -1,4 +1,6 @@ MODULE = ncrypt.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 6e79eeb..bfda1d8 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : msxml6: Build with msvcrt.
by Alexandre Julliard June 14, 2019

June 14, 2019

Module: wine Branch: master Commit: 63decbd7aa67595f8a69810be75ea5a16e769bd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63decbd7aa67595f8a69810b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 14 09:21:11 2019 +0200 msxml6: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml6/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msxml6/Makefile.in b/dlls/msxml6/Makefile.in index 61a61a7..da4c212 100644 --- a/dlls/msxml6/Makefile.in +++ b/dlls/msxml6/Makefile.in @@ -1,6 +1,8 @@ MODULE = msxml6.dll IMPORTS = oleaut32 ole32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c

1 0