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

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

June 14, 2019

Module: wine Branch: master Commit: 501778aa0873faa24632cee2390c15f79c49a943 URL: https://source.winehq.org/git/wine.git/?a=commit;h=501778aa0873faa24632cee2… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jun 5 14:39:00 2019 +0300 user32/edit: 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/user32/edit.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 3c5331f..00900e6 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -5158,7 +5158,7 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B case WM_MOUSEWHEEL: { int wheelDelta; - UINT pulScrollLines = 3; + INT pulScrollLines = 3; SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0); if (wParam & (MK_SHIFT | MK_CONTROL)) { @@ -5175,9 +5175,9 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B if (es->wheelDeltaRemainder && pulScrollLines) { int cLineScroll; - pulScrollLines = (int) min((UINT) es->line_count, pulScrollLines); - cLineScroll = pulScrollLines * (float)es->wheelDeltaRemainder / WHEEL_DELTA; - es->wheelDeltaRemainder -= WHEEL_DELTA * cLineScroll / (int)pulScrollLines; + pulScrollLines = min(es->line_count, pulScrollLines); + cLineScroll = pulScrollLines * es->wheelDeltaRemainder / WHEEL_DELTA; + es->wheelDeltaRemainder -= WHEEL_DELTA * cLineScroll / pulScrollLines; result = EDIT_EM_LineScroll(es, 0, -cLineScroll); } }

1 0

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

June 14, 2019

Module: wine Branch: master Commit: f3cfb66cf7a9384ae21b3bfef5d4f94aea4feddf URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3cfb66cf7a9384ae21b3bfe… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jun 5 14:38:59 2019 +0300 comctl32/edit: 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/edit.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index e64e260..bdd3b72 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -5017,7 +5017,7 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR case WM_MOUSEWHEEL: { int wheelDelta; - UINT pulScrollLines = 3; + INT pulScrollLines = 3; SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0); if (wParam & (MK_SHIFT | MK_CONTROL)) @@ -5037,9 +5037,9 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR if (es->wheelDeltaRemainder && pulScrollLines) { int cLineScroll; - pulScrollLines = (int) min((UINT) es->line_count, pulScrollLines); - cLineScroll = pulScrollLines * (float)es->wheelDeltaRemainder / WHEEL_DELTA; - es->wheelDeltaRemainder -= WHEEL_DELTA * cLineScroll / (int)pulScrollLines; + pulScrollLines = min(es->line_count, pulScrollLines); + cLineScroll = pulScrollLines * es->wheelDeltaRemainder / WHEEL_DELTA; + es->wheelDeltaRemainder -= WHEEL_DELTA * cLineScroll / pulScrollLines; result = EDIT_EM_LineScroll(es, 0, -cLineScroll); } break;

1 0

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

June 14, 2019

Module: wine Branch: master Commit: e97ec06022640c8e747fc4e7bf3346902fa3cc43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e97ec06022640c8e747fc4e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 14 09:22:56 2019 +0200 newdev: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/newdev/Makefile.in | 2 ++ dlls/newdev/main.c | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/newdev/Makefile.in b/dlls/newdev/Makefile.in index c447a38..85086f1 100644 --- a/dlls/newdev/Makefile.in +++ b/dlls/newdev/Makefile.in @@ -2,4 +2,6 @@ MODULE = newdev.dll IMPORTLIB = newdev IMPORTS = setupapi +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = main.c diff --git a/dlls/newdev/main.c b/dlls/newdev/main.c index 108aec0..72e7cbc 100644 --- a/dlls/newdev/main.c +++ b/dlls/newdev/main.c @@ -23,6 +23,7 @@ #include "windef.h" #include "winerror.h" #include "winbase.h" +#include "winnls.h" #include "winuser.h" #include "winreg.h" #include "cfgmgr32.h" @@ -30,7 +31,6 @@ #include "wine/debug.h" #include "wine/heap.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(setupapi); @@ -71,9 +71,9 @@ static BOOL hardware_id_matches(const WCHAR *id, const WCHAR *device_ids) { while (*device_ids) { - if (!strcmpW(id, device_ids)) + if (!wcscmp(id, device_ids)) return TRUE; - device_ids += strlenW(device_ids) + 1; + device_ids += lstrlenW(device_ids) + 1; } return FALSE; } @@ -128,7 +128,7 @@ BOOL WINAPI UpdateDriverForPlugAndPlayDevicesW(HWND parent, const WCHAR *hardwar if (!SetupDiGetDeviceInstallParamsW(set, &device, &params)) continue; - strcpyW(params.DriverPath, inf_path); + lstrcpyW(params.DriverPath, inf_path); params.Flags |= DI_ENUMSINGLEINF; if (!SetupDiSetDeviceInstallParamsW(set, &device, &params)) continue;

1 0

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

June 14, 2019

Module: wine Branch: master Commit: 3e5db60e84ae57c37afabed8141eb5449d220436 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e5db60e84ae57c37afabed8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 14 09:22:32 2019 +0200 netprofm: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netprofm/Makefile.in | 2 ++ dlls/netprofm/list.c | 1 - dlls/netprofm/main.c | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/netprofm/Makefile.in b/dlls/netprofm/Makefile.in index def2614..d57d1d6 100644 --- a/dlls/netprofm/Makefile.in +++ b/dlls/netprofm/Makefile.in @@ -1,6 +1,8 @@ MODULE = netprofm.dll IMPORTS = iphlpapi +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ list.c \ main.c diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index f6823f0..93e9d14 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -21,7 +21,6 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "config.h" #include <stdarg.h> #include "windef.h" #include "winbase.h" diff --git a/dlls/netprofm/main.c b/dlls/netprofm/main.c index 9808dee..d1e622f 100644 --- a/dlls/netprofm/main.c +++ b/dlls/netprofm/main.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #include "windef.h" #include "winbase.h"

1 0

Paul Gofman : d3d9/tests: Add test for 'nrm' opcode.
by Alexandre Julliard June 14, 2019

June 14, 2019

Module: wine Branch: master Commit: b56fb673119a00f61e85b40fb9add91ff00e4dec URL: https://source.winehq.org/git/wine.git/?a=commit;h=b56fb673119a00f61e85b40f… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Jun 14 16:20:46 2019 +0300 d3d9/tests: Add test for 'nrm' opcode. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 229 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 229 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b56fb673119a00f61e85…

1 0

Henri Verbeet : wined3d: Download texture data through the texture ops in wined3d_texture_download_from_texture ().
by Alexandre Julliard June 14, 2019

June 14, 2019

Module: wine Branch: master Commit: 8e6d89b752e7081785039651d46656039a0bb5ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e6d89b752e7081785039651… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 14 16:05:23 2019 +0430 wined3d: Download texture data through the texture ops in wined3d_texture_download_from_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 87 ++++++++++++++++++++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 5 +++ 2 files changed, 88 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 71bec04..16f0a56 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2494,10 +2494,74 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, src_box, src_bo_addr, src_row_pitch, src_slice_pitch, dst_x, dst_y, dst_z, srgb); } +static void wined3d_texture_gl_download_data(struct wined3d_context *context, + struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, unsigned int src_location, + const struct wined3d_box *src_box, const struct wined3d_bo_address *dst_bo_addr, + const struct wined3d_format *dst_format, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, + unsigned int dst_row_pitch, unsigned int dst_slice_pitch) +{ + unsigned int src_level, src_width, src_height, src_depth; + unsigned int src_row_pitch, src_slice_pitch; + BOOL srgb = FALSE; + + TRACE("context %p, src_texture %p, src_sub_resource_idx %u, src_location %s, src_box %s, dst_bo_addr %s, " + "dst_format %s, dst_x %u, dst_y %u, dst_z %u, dst_row_pitch %u, dst_slice_pitch %u.\n", + context, src_texture, src_sub_resource_idx, wined3d_debug_location(src_location), + debug_box(src_box), debug_bo_address(dst_bo_addr), debug_d3dformat(dst_format->id), + dst_x, dst_y, dst_z, dst_row_pitch, dst_slice_pitch); + + if (src_location == WINED3D_LOCATION_TEXTURE_SRGB) + { + srgb = TRUE; + } + else if (src_location != WINED3D_LOCATION_TEXTURE_RGB) + { + FIXME("Unhandled location %s.\n", wined3d_debug_location(src_location)); + return; + } + + src_level = src_sub_resource_idx % src_texture->level_count; + src_width = wined3d_texture_get_level_width(src_texture, src_level); + src_height = wined3d_texture_get_level_height(src_texture, src_level); + src_depth = wined3d_texture_get_level_depth(src_texture, src_level); + if (src_box->left || src_box->top || src_box->right != src_width || src_box->bottom != src_height + || src_box->front || src_box->back != src_depth) + { + FIXME("Unhandled source box %s.\n", debug_box(src_box)); + return; + } + + if (dst_x || dst_y || dst_z) + { + FIXME("Unhandled destination (%u, %u, %u).\n", dst_x, dst_y, dst_z); + return; + } + + if (dst_format->id != src_texture->resource.format->id) + { + FIXME("Unhandled format conversion (%s -> %s).\n", + debug_d3dformat(src_texture->resource.format->id), + debug_d3dformat(dst_format->id)); + return; + } + + wined3d_texture_get_pitch(src_texture, src_level, &src_row_pitch, &src_slice_pitch); + if (src_row_pitch != dst_row_pitch || src_slice_pitch != dst_slice_pitch) + { + FIXME("Unhandled destination pitches %u/%u (source pitches %u/%u).\n", + dst_row_pitch, dst_slice_pitch, src_row_pitch, src_slice_pitch); + return; + } + + wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(src_texture), wined3d_context_gl(context), srgb); + wined3d_texture_download_data(src_texture, src_sub_resource_idx, context, dst_bo_addr); +} + static const struct wined3d_texture_ops texture2d_ops = { texture2d_load_location, wined3d_texture_gl_upload_data, + wined3d_texture_gl_download_data, }; struct wined3d_texture * __cdecl wined3d_texture_from_resource(struct wined3d_resource *resource) @@ -2881,6 +2945,7 @@ static const struct wined3d_texture_ops texture1d_ops = { texture1d_load_location, wined3d_texture_gl_upload_data, + wined3d_texture_gl_download_data, }; static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struct wined3d_resource_desc *desc, @@ -3297,6 +3362,7 @@ static const struct wined3d_texture_ops texture3d_ops = { texture3d_load_location, wined3d_texture_gl_upload_data, + wined3d_texture_gl_download_data, }; HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, @@ -3870,17 +3936,30 @@ void wined3d_texture_upload_from_texture(struct wined3d_texture *dst_texture, un void wined3d_texture_download_from_texture(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx) { + unsigned int src_level, dst_level, dst_row_pitch, dst_slice_pitch; + unsigned int dst_location = dst_texture->resource.map_binding; struct wined3d_context *context; struct wined3d_bo_address data; - DWORD dst_location = dst_texture->resource.map_binding; + struct wined3d_box src_box; + unsigned int src_location; context = context_acquire(src_texture->resource.device, NULL, 0); wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, dst_location); wined3d_texture_get_memory(dst_texture, dst_sub_resource_idx, &data, dst_location); - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(src_texture), wined3d_context_gl(context), - !(src_texture->sub_resources[src_sub_resource_idx].locations & WINED3D_LOCATION_TEXTURE_RGB)); - wined3d_texture_download_data(src_texture, src_sub_resource_idx, context, &data); + + if (src_texture->sub_resources[src_sub_resource_idx].locations & WINED3D_LOCATION_TEXTURE_RGB) + src_location = WINED3D_LOCATION_TEXTURE_RGB; + else + src_location = WINED3D_LOCATION_TEXTURE_SRGB; + src_level = src_sub_resource_idx % src_texture->level_count; + wined3d_texture_get_level_box(src_texture, src_level, &src_box); + + dst_level = dst_sub_resource_idx % dst_texture->level_count; + wined3d_texture_get_pitch(dst_texture, dst_level, &dst_row_pitch, &dst_slice_pitch); + + src_texture->texture_ops->texture_download_data(context, src_texture, src_sub_resource_idx, src_location, + &src_box, &data, dst_texture->resource.format, 0, 0, 0, dst_row_pitch, dst_slice_pitch); context_release(context); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 31eb31a..bbcc6ac 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3386,6 +3386,11 @@ struct wined3d_texture_ops const struct wined3d_format *src_format, const struct wined3d_box *src_box, unsigned int src_row_pitch, unsigned int src_slice_pitch, struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, unsigned int dst_location, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z); + void (*texture_download_data)(struct wined3d_context *context, struct wined3d_texture *src_texture, + unsigned int src_sub_resource_idx, unsigned int src_location, const struct wined3d_box *src_box, + const struct wined3d_bo_address *dst_bo_addr, const struct wined3d_format *dst_format, + unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, + unsigned int dst_row_pitch, unsigned int dst_slice_pitch); }; #define WINED3D_TEXTURE_COND_NP2 0x00000001

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_attach_surface_fbo().
by Alexandre Julliard June 14, 2019

June 14, 2019

Module: wine Branch: master Commit: 6c1bd3a067700fa983086164b791db8894e023fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c1bd3a067700fa983086164… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 14 16:05:20 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_attach_surface_fbo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d195469..2ed1e48 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -213,10 +213,9 @@ static void wined3d_context_gl_attach_depth_stencil_fbo(struct wined3d_context_g } /* Context activation is done by the caller. */ -static void context_attach_surface_fbo(struct wined3d_context *context, - GLenum fbo_target, DWORD idx, const struct wined3d_fbo_resource *resource, BOOL rb_namespace) +static void wined3d_context_gl_attach_surface_fbo(struct wined3d_context_gl *context_gl, + GLenum fbo_target, unsigned int idx, const struct wined3d_fbo_resource *resource, BOOL rb_namespace) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; TRACE("Attach GL object %u to %u.\n", resource->object, idx); @@ -735,8 +734,8 @@ static void wined3d_context_gl_apply_fbo_entry(struct wined3d_context_gl *contex /* Apply render targets */ for (i = 0; i < gl_info->limits.buffers; ++i) { - context_attach_surface_fbo(&context_gl->c, target, i, &entry->key.objects[i + 1], - entry->key.rb_namespace & (1 << (i + 1))); + wined3d_context_gl_attach_surface_fbo(context_gl, target, i, + &entry->key.objects[i + 1], entry->key.rb_namespace & (1 << (i + 1))); } wined3d_context_gl_attach_depth_stencil_fbo(context_gl, target,

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_attach_depth_stencil_fbo() .
by Alexandre Julliard June 14, 2019

June 14, 2019

Module: wine Branch: master Commit: 5a143e5a29adda807160d0bd77f8900abc60c24c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a143e5a29adda807160d0bd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 14 16:05:19 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_attach_depth_stencil_fbo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index be34614..d195469 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -173,12 +173,11 @@ static void wined3d_context_gl_attach_gl_texture_fbo(struct wined3d_context_gl * } /* Context activation is done by the caller. */ -static void context_attach_depth_stencil_fbo(struct wined3d_context *context, +static void wined3d_context_gl_attach_depth_stencil_fbo(struct wined3d_context_gl *context_gl, GLenum fbo_target, const struct wined3d_fbo_resource *resource, BOOL rb_namespace, - DWORD flags) + uint32_t flags) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; if (resource->object) { @@ -740,8 +739,8 @@ static void wined3d_context_gl_apply_fbo_entry(struct wined3d_context_gl *contex entry->key.rb_namespace & (1 << (i + 1))); } - context_attach_depth_stencil_fbo(&context_gl->c, target, &entry->key.objects[0], - entry->key.rb_namespace & 0x1, entry->flags); + wined3d_context_gl_attach_depth_stencil_fbo(context_gl, target, + &entry->key.objects[0], entry->key.rb_namespace & 0x1, entry->flags); /* Set valid read and draw buffer bindings to satisfy pedantic pre-ES2_compatibility * GL contexts requirements. */

1 0

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

June 14, 2019

Module: wine Branch: master Commit: b95bc8427322d1fdcb79937aa16ef7e31f95f556 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b95bc8427322d1fdcb79937a… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jun 5 14:38:58 2019 +0300 user32/listbox: Fix mouse wheel scrolling for multi-column listboxes. 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/user32/listbox.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 52f01a7..3949610 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -2083,7 +2083,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); @@ -2097,9 +2097,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 : nddeapi: Build with msvcrt.
by Alexandre Julliard June 14, 2019

June 14, 2019

Module: wine Branch: master Commit: 47df0afda07a9e37bfa5a0fb779f4b00725b9e24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47df0afda07a9e37bfa5a0fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 14 09:22:01 2019 +0200 nddeapi: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nddeapi/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/nddeapi/Makefile.in b/dlls/nddeapi/Makefile.in index 6a33511..c044cde 100644 --- a/dlls/nddeapi/Makefile.in +++ b/dlls/nddeapi/Makefile.in @@ -1,5 +1,7 @@ MODULE = nddeapi.dll IMPORTLIB = nddeapi +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ nddeapi.c

1 0