October 2015 - Wine-Commits

Thomas Faller : amstream: Fix use of uninitialized memory.
by Alexandre Julliard Oct. 8, 2015

Oct. 8, 2015

Module: wine Branch: master Commit: 2fb791b0ebcdfbbebc20afb1dd1205d793617d1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fb791b0ebcdfbbebc20afb1d… Author: Thomas Faller <tfaller1(a)gmx.de> Date: Mon Sep 28 18:16:57 2015 +0200 amstream: Fix use of uninitialized memory. --- dlls/amstream/mediastream.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 947be1e..79f9822 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -1003,6 +1003,7 @@ static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectD desc.ddpfPixelFormat.dwBBitMask = 0x0000ff; desc.ddpfPixelFormat.dwRGBAlphaBitMask = 0; desc.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY|DDSCAPS_OFFSCREENPLAIN; + desc.lpSurface = NULL; hr = IDirectDraw_CreateSurface(ddraw, &desc, &object->surface, NULL); IDirectDraw_Release(ddraw);

1 0

Henri Verbeet : d2d1: Only search for the initial edge for each figure in d2d_cdt_insert_segments ().
by Alexandre Julliard Oct. 8, 2015

Oct. 8, 2015

Module: wine Branch: master Commit: 76aa675da352cb1b5c0d7de35770c150588f9912 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76aa675da352cb1b5c0d7de35… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 7 17:56:02 2015 +0200 d2d1: Only search for the initial edge for each figure in d2d_cdt_insert_segments(). For each subsequent segment we can just re-use the edge we just inserted. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 61 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 24 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index b6a11f7..80d004b 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -1332,7 +1332,7 @@ static void d2d_cdt_cut_edges(struct d2d_cdt *cdt, struct d2d_cdt_edge_ref *end_ } static BOOL d2d_cdt_insert_segment(struct d2d_cdt *cdt, struct d2d_geometry *geometry, - const struct d2d_cdt_edge_ref *origin, size_t end_vertex) + const struct d2d_cdt_edge_ref *origin, struct d2d_cdt_edge_ref *edge, size_t end_vertex) { struct d2d_cdt_edge_ref base_edge, current, next, target; @@ -1341,7 +1341,10 @@ static BOOL d2d_cdt_insert_segment(struct d2d_cdt *cdt, struct d2d_geometry *geo d2d_cdt_edge_next_origin(cdt, &next, &current); if (d2d_cdt_edge_destination(cdt, &current) == end_vertex) + { + d2d_cdt_edge_sym(edge, &current); return TRUE; + } if (d2d_cdt_rightof(cdt, end_vertex, &next) && d2d_cdt_leftof(cdt, end_vertex, &current)) { @@ -1353,6 +1356,7 @@ static BOOL d2d_cdt_insert_segment(struct d2d_cdt *cdt, struct d2d_geometry *geo if (!d2d_cdt_connect(cdt, &base_edge, &target, &current)) return FALSE; + *edge = base_edge; if (!d2d_cdt_fixup(cdt, &base_edge)) return FALSE; d2d_cdt_edge_sym(&base_edge, &base_edge); @@ -1373,9 +1377,10 @@ static BOOL d2d_cdt_insert_segment(struct d2d_cdt *cdt, struct d2d_geometry *geo static BOOL d2d_cdt_insert_segments(struct d2d_cdt *cdt, struct d2d_geometry *geometry) { size_t start_vertex, end_vertex, i, j, k; + struct d2d_cdt_edge_ref edge, new_edge; const struct d2d_figure *figure; - struct d2d_cdt_edge_ref edge; const D2D1_POINT_2F *p; + BOOL found; for (i = 0; i < geometry->u.path.figure_count; ++i) { @@ -1385,6 +1390,33 @@ static BOOL d2d_cdt_insert_segments(struct d2d_cdt *cdt, struct d2d_geometry *ge geometry->vertex_count, sizeof(*p), d2d_cdt_compare_vertices); start_vertex = p - cdt->vertices; + for (k = 0, found = FALSE; k < cdt->edge_count; ++k) + { + if (cdt->edges[k].flags & D2D_CDT_EDGE_FLAG_FREED) + continue; + + edge.idx = k; + edge.r = 0; + + if (d2d_cdt_edge_origin(cdt, &edge) == start_vertex) + { + found = TRUE; + break; + } + d2d_cdt_edge_sym(&edge, &edge); + if (d2d_cdt_edge_origin(cdt, &edge) == start_vertex) + { + found = TRUE; + break; + } + } + + if (!found) + { + ERR("Edge not found.\n"); + return FALSE; + } + for (j = 0; j < figure->vertex_count; start_vertex = end_vertex, ++j) { p = bsearch(&figure->vertices[j], cdt->vertices, @@ -1394,28 +1426,9 @@ static BOOL d2d_cdt_insert_segments(struct d2d_cdt *cdt, struct d2d_geometry *ge if (start_vertex == end_vertex) continue; - for (k = 0; k < cdt->edge_count; ++k) - { - if (cdt->edges[k].flags & D2D_CDT_EDGE_FLAG_FREED) - continue; - - edge.idx = k; - edge.r = 0; - - if (d2d_cdt_edge_origin(cdt, &edge) == start_vertex) - { - if (!d2d_cdt_insert_segment(cdt, geometry, &edge, end_vertex)) - return FALSE; - break; - } - d2d_cdt_edge_sym(&edge, &edge); - if (d2d_cdt_edge_origin(cdt, &edge) == start_vertex) - { - if (!d2d_cdt_insert_segment(cdt, geometry, &edge, end_vertex)) - return FALSE; - break; - } - } + if (!d2d_cdt_insert_segment(cdt, geometry, &edge, &new_edge, end_vertex)) + return FALSE; + edge = new_edge; } }

1 0

Riccardo Bortolato : wined3d: Merge wined3d_volume_{inc, dec}ref in their respective caller.
by Alexandre Julliard Oct. 8, 2015

Oct. 8, 2015

Module: wine Branch: master Commit: cee9409ab857593f04c9709c8a20c5bac80f2934 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cee9409ab857593f04c9709c8… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Wed Oct 7 19:04:35 2015 +0200 wined3d: Merge wined3d_volume_{inc, dec}ref in their respective caller. Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/volume.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 6a7cc5c..41264e8 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -460,20 +460,6 @@ static void volume_unload(struct wined3d_resource *resource) resource_unload(resource); } -static ULONG CDECL wined3d_volume_incref(struct wined3d_volume *volume) -{ - TRACE("Forwarding to container %p.\n", volume->container); - - return wined3d_texture_incref(volume->container); -} - -static ULONG CDECL wined3d_volume_decref(struct wined3d_volume *volume) -{ - TRACE("Forwarding to container %p.\n", volume->container); - - return wined3d_texture_decref(volume->container); -} - static BOOL volume_check_block_align(const struct wined3d_volume *volume, const struct wined3d_box *box) { @@ -700,12 +686,18 @@ HRESULT wined3d_volume_unmap(struct wined3d_volume *volume) static ULONG volume_resource_incref(struct wined3d_resource *resource) { - return wined3d_volume_incref(volume_from_resource(resource)); + struct wined3d_volume *volume = volume_from_resource(resource); + TRACE("Forwarding to container %p.\n", volume->container); + + return wined3d_texture_incref(volume->container); } static ULONG volume_resource_decref(struct wined3d_resource *resource) { - return wined3d_volume_decref(volume_from_resource(resource)); + struct wined3d_volume *volume = volume_from_resource(resource); + TRACE("Forwarding to container %p.\n", volume->container); + + return wined3d_texture_decref(volume->container); } static const struct wined3d_resource_ops volume_resource_ops =

1 0

Andrew Eikum : xaudio2_0: Add compatibility implementation and forward to xaudio2_7.
by Alexandre Julliard Oct. 8, 2015

Oct. 8, 2015

Module: wine Branch: master Commit: 4185cc7a94cd74ce2b76ea57601dc32305c944b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4185cc7a94cd74ce2b76ea576… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Oct 7 11:19:35 2015 -0500 xaudio2_0: Add compatibility implementation and forward to xaudio2_7. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/xaudio2_0/Makefile.in | 7 + dlls/xaudio2_0/xaudio2_0.spec | 4 + dlls/xaudio2_0/xaudio_classes.idl | 42 ++ dlls/xaudio2_0/xaudio_dll.c | 52 +++ dlls/xaudio2_7/compat.c | 859 ++++++++++++++++++++++++++++++++++++++ dlls/xaudio2_7/xaudio_dll.c | 263 +++++++----- dlls/xaudio2_7/xaudio_private.h | 11 + include/xapo.idl | 16 + include/xaudio2.idl | 243 +++++++++++ include/xaudio2fx.idl | 14 + 12 files changed, 1413 insertions(+), 101 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4185cc7a94cd74ce2b76e…

1 0

Julian Rüger : German translation for release 1.7.52
by Jeremy Newman Oct. 7, 2015

Oct. 7, 2015

Module: website Branch: master Commit: 4c974ba6666c56664cab0255b5f41454c3c0cde4 URL: http://source.winehq.org/git/website.git/?a=commit;h=4c974ba6666c56664cab02… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Oct 7 16:43:37 2015 +0200 German translation for release 1.7.52 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2015100201.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2015100201.xml b/news/de/2015100201.xml new file mode 100644 index 0000000..361349e --- /dev/null +++ b/news/de/2015100201.xml @@ -0,0 +1,17 @@ +<news> +<date>2. Oktober 2015</date> +<title>Wine 1.7.52 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.52 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.52">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unicode-Daten auf den Stand von Unicode 8.0.0 aktualisiert.</li> + <li>Teilweise Implementierung der Webservices-DLL.</li> + <li>Zusätzliche Direct3D-11-Schnittstellen.</li> + <li>Einige zusätzliche Funktionen der C++-Laufzeit implementiert.</li> + <li>Der PostScript-Treiber gibt nun die Standardnamen von Glyphen aus.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.52.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Charles Davis : configure: Try harder to disable Fortify.
by Alexandre Julliard Oct. 7, 2015

Oct. 7, 2015

Module: wine Branch: master Commit: 5252d19fbaa5c504dd6502f01736afa8fe62c068 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5252d19fbaa5c504dd6502f01… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Tue Sep 22 15:57:00 2015 -0600 configure: Try harder to disable Fortify. Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 33f0343..b4bbb2f 100755 --- a/configure +++ b/configure @@ -14550,7 +14550,7 @@ else int main () { -#if defined(__USE_FORTIFY_LEVEL) && __USE_FORTIFY_LEVEL > 0 +#if (defined(__USE_FORTIFY_LEVEL) && __USE_FORTIFY_LEVEL > 0) || (defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0) #error Fortify enabled #endif ; diff --git a/configure.ac b/configure.ac index 74ab202..ce631e4 100644 --- a/configure.ac +++ b/configure.ac @@ -1898,7 +1898,7 @@ dnl **** Disable Fortify, it has too many false positives AC_CACHE_CHECK([for the need to disable Fortify], ac_cv_c_fortify_enabled, AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <string.h>]], -[[#if defined(__USE_FORTIFY_LEVEL) && __USE_FORTIFY_LEVEL > 0 +[[#if (defined(__USE_FORTIFY_LEVEL) && __USE_FORTIFY_LEVEL > 0) || (defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0) #error Fortify enabled #endif]])], [ac_cv_c_fortify_enabled=no],[ac_cv_c_fortify_enabled=yes]))

1 0

Erich E. Hoover : ws2_32: Add stub for TransmitFile.
by Alexandre Julliard Oct. 7, 2015

Oct. 7, 2015

Module: wine Branch: master Commit: 23c293ae4c9929a08fd122b64d928c2cfb37f2b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23c293ae4c9929a08fd122b64… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Thu Jan 16 17:52:50 2014 -0700 ws2_32: Add stub for TransmitFile. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> --- dlls/ws2_32/socket.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 5098f85..4edb579 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2725,6 +2725,19 @@ static BOOL WINAPI WS2_AcceptEx(SOCKET listener, SOCKET acceptor, PVOID dest, DW } /*********************************************************************** + * TransmitFile + */ +static BOOL WINAPI WS2_TransmitFile( SOCKET s, HANDLE h, DWORD file_bytes, DWORD bytes_per_send, + LPOVERLAPPED overlapped, LPTRANSMIT_FILE_BUFFERS buffers, + DWORD flags ) +{ + FIXME("(%lx, %p, %d, %d, %p, %p, %d): stub !\n", s, h, file_bytes, bytes_per_send, overlapped, + buffers, flags ); + WSASetLastError( WSAEOPNOTSUPP ); + return FALSE; +} + +/*********************************************************************** * GetAcceptExSockaddrs */ static void WINAPI WS2_GetAcceptExSockaddrs(PVOID buffer, DWORD data_size, DWORD local_size, DWORD remote_size, @@ -4430,7 +4443,8 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID } else if ( IsEqualGUID(&transmitfile_guid, in_buff) ) { - FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER: unimplemented TransmitFile\n"); + *(LPFN_TRANSMITFILE *)out_buff = WS2_TransmitFile; + break; } else if ( IsEqualGUID(&transmitpackets_guid, in_buff) ) {

1 0

Matteo Bruni : wined3d: Initialize unwritten color varyings.
by Alexandre Julliard Oct. 7, 2015

Oct. 7, 2015

Module: wine Branch: master Commit: 97ee9451edae82154b289cb57b46ef13aedd58b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97ee9451edae82154b289cb57… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Oct 6 14:24:23 2015 +0200 wined3d: Initialize unwritten color varyings. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5dfe0fa..042cd03 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4927,6 +4927,7 @@ static GLuint generate_param_reorder_function(struct shader_glsl_priv *priv, if (ps_major < 3) { + DWORD colors_written_mask[2] = {0}; DWORD texcoords_written_mask[MAX_TEXTURES] = {0}; if (!legacy_context) @@ -4949,7 +4950,7 @@ static GLuint generate_param_reorder_function(struct shader_glsl_priv *priv, write_mask = output->mask; shader_glsl_write_mask_to_str(write_mask, reg_mask); - if (shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_COLOR)) + if (shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_COLOR) && semantic_idx < 2) { if (!semantic_idx) shader_addline(buffer, "gl_FrontColor%s = vs_out[%u]%s;\n", @@ -4957,6 +4958,8 @@ static GLuint generate_param_reorder_function(struct shader_glsl_priv *priv, else if (semantic_idx == 1) shader_addline(buffer, "gl_FrontSecondaryColor%s = vs_out[%u]%s;\n", reg_mask, output->register_idx, reg_mask); + + colors_written_mask[semantic_idx] = write_mask; } else if (shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_POSITION) && !semantic_idx) { @@ -4985,6 +4988,19 @@ static GLuint generate_param_reorder_function(struct shader_glsl_priv *priv, } } + for (i = 0; i < 2; ++i) + { + if (colors_written_mask[i] != WINED3DSP_WRITEMASK_ALL) + { + shader_glsl_write_mask_to_str(~colors_written_mask[i] & WINED3DSP_WRITEMASK_ALL, reg_mask); + if (!i) + shader_addline(buffer, "gl_FrontColor%s = vec4(1.0)%s;\n", + reg_mask, reg_mask); + else + shader_addline(buffer, "gl_FrontSecondaryColor%s = vec4(0.0)%s;\n", + reg_mask, reg_mask); + } + } for (i = 0; i < MAX_TEXTURES; ++i) { if (ps && !(ps->reg_maps.texcoord & (1u << i)))

1 0

Michael Müller : wbemprox: Add bios name column in Win32_BIOS.
by Alexandre Julliard Oct. 7, 2015

Oct. 7, 2015

Module: wine Branch: master Commit: 20ff3352eb19292d47eaa8f3aecc61523ac1f1d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20ff3352eb19292d47eaa8f3a… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Oct 7 14:20:25 2015 +0200 wbemprox: Add bios name column in Win32_BIOS. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 6 +++++- dlls/wbemprox/tests/query.c | 12 ++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 1c960eb..2ff3f50 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -374,6 +374,7 @@ static const struct column col_bios[] = { prop_descriptionW, CIM_STRING }, { prop_identificationcodeW, CIM_STRING }, { prop_manufacturerW, CIM_STRING }, + { prop_nameW, CIM_STRING }, { prop_releasedateW, CIM_DATETIME }, { prop_serialnumberW, CIM_STRING }, { prop_smbiosbiosversionW, CIM_STRING }, @@ -658,6 +659,8 @@ static const WCHAR bios_descriptionW[] = {'D','e','f','a','u','l','t',' ','S','y','s','t','e','m',' ','B','I','O','S',0}; static const WCHAR bios_manufacturerW[] = {'T','h','e',' ','W','i','n','e',' ','P','r','o','j','e','c','t',0}; +static const WCHAR bios_nameW[] = + {'W','I','N','E',' ','B','I','O','S',0}; static const WCHAR bios_releasedateW[] = {'2','0','1','2','0','6','0','8','0','0','0','0','0','0','.','0','0','0','0','0','0','+','0','0','0',0}; static const WCHAR bios_serialnumberW[] = @@ -761,6 +764,7 @@ struct record_bios const WCHAR *description; const WCHAR *identificationcode; const WCHAR *manufacturer; + const WCHAR *name; const WCHAR *releasedate; const WCHAR *serialnumber; const WCHAR *smbiosbiosversion; @@ -1040,7 +1044,7 @@ static const struct record_baseboard data_baseboard[] = }; static const struct record_bios data_bios[] = { - { bios_descriptionW, bios_descriptionW, bios_manufacturerW, bios_releasedateW, bios_serialnumberW, + { bios_descriptionW, bios_descriptionW, bios_manufacturerW, bios_nameW, bios_releasedateW, bios_serialnumberW, bios_smbiosbiosversionW, bios_versionW } }; static const struct record_computersystemproduct data_compsysproduct[] = diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 98550d5..3138c7a 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -299,15 +299,11 @@ static void test_Win32_Bios( IWbemServices *services ) type = 0xdeadbeef; VariantInit( &val ); hr = IWbemClassObject_Get( obj, nameW, 0, &val, &type, NULL ); - todo_wine ok( hr == S_OK, "failed to get name %08x\n", hr ); - if (hr == S_OK) - { - ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); - trace( "name: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); - VariantClear( &val ); - } + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "name: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); type = 0xdeadbeef; VariantInit( &val );

1 0

Joachim Priesner : user32: Hide horizontal Listbox scroll bar if no horizontal extent is set.
by Alexandre Julliard Oct. 7, 2015

Oct. 7, 2015

Module: wine Branch: master Commit: 175e714656a8a7c0552e2a7627b107f4d665f584 URL: http://source.winehq.org/git/wine.git/?a=commit;h=175e714656a8a7c0552e2a762… Author: Joachim Priesner <joachim.priesner(a)web.de> Date: Mon Sep 28 11:20:45 2015 +0200 user32: Hide horizontal Listbox scroll bar if no horizontal extent is set. Signed-off-by: Joachim Priesner <joachim.priesner(a)web.de> --- dlls/user32/listbox.c | 18 +++++++- dlls/user32/tests/listbox.c | 103 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 120 insertions(+), 1 deletion(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 2902ac9..cf065e4 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -265,7 +265,7 @@ static void LISTBOX_UpdateScroll( LB_DESCR *descr ) if (descr->style & WS_VSCROLL) SetScrollInfo( descr->self, SB_VERT, &info, TRUE ); - if (descr->style & WS_HSCROLL) + if ((descr->style & WS_HSCROLL) && descr->horz_extent) { info.nPos = descr->horz_pos; info.nPage = descr->width; @@ -274,6 +274,20 @@ static void LISTBOX_UpdateScroll( LB_DESCR *descr ) info.fMask |= SIF_DISABLENOSCROLL; SetScrollInfo( descr->self, SB_HORZ, &info, TRUE ); } + else + { + if (descr->style & LBS_DISABLENOSCROLL) + { + info.nMin = 0; + info.nMax = 0; + info.fMask = SIF_RANGE | SIF_DISABLENOSCROLL; + SetScrollInfo( descr->self, SB_HORZ, &info, TRUE ); + } + else + { + ShowScrollBar( descr->self, SB_HORZ, FALSE ); + } + } } } @@ -1248,6 +1262,8 @@ static LRESULT LISTBOX_SetHorizontalExtent( LB_DESCR *descr, INT extent ) info.nMin = 0; info.nMax = descr->horz_extent ? descr->horz_extent - 1 : 0; info.fMask = SIF_RANGE; + if (descr->style & LBS_DISABLENOSCROLL) + info.fMask |= SIF_DISABLENOSCROLL; SetScrollInfo( descr->self, SB_HORZ, &info, TRUE ); } if (descr->horz_pos > extent - descr->width) diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 79d18e7..9380457 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -1665,7 +1665,10 @@ static void test_extents(void) ok(br == TRUE, "GetScrollInfo failed\n"); ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); ok(sinfo.nMax == 100, "got wrong max: %u\n", sinfo.nMax); + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) == 0, + "List box should not have a horizontal scroll bar\n"); + /* horizontal extent < width */ SendMessageA(listbox, LB_SETHORIZONTALEXTENT, 64, 0); res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); @@ -1677,6 +1680,23 @@ static void test_extents(void) ok(br == TRUE, "GetScrollInfo failed\n"); ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); ok(sinfo.nMax == 100, "got wrong max: %u\n", sinfo.nMax); + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) == 0, + "List box should not have a horizontal scroll bar\n"); + + /* horizontal extent > width */ + SendMessageA(listbox, LB_SETHORIZONTALEXTENT, 184, 0); + + res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); + ok(res == 184, "Got wrong horizontal extent: %u\n", res); + + sinfo.cbSize = sizeof(sinfo); + sinfo.fMask = SIF_RANGE; + br = GetScrollInfo(listbox, SB_HORZ, &sinfo); + ok(br == TRUE, "GetScrollInfo failed\n"); + ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); + ok(sinfo.nMax == 100, "got wrong max: %u\n", sinfo.nMax); + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) == 0, + "List box should not have a horizontal scroll bar\n"); DestroyWindow(listbox); @@ -1692,7 +1712,71 @@ static void test_extents(void) ok(br == TRUE, "GetScrollInfo failed\n"); ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); ok(sinfo.nMax == 100, "got wrong max: %u\n", sinfo.nMax); + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) == 0, + "List box should not have a horizontal scroll bar\n"); + + /* horizontal extent < width */ + SendMessageA(listbox, LB_SETHORIZONTALEXTENT, 64, 0); + + res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); + ok(res == 64, "Got wrong horizontal extent: %u\n", res); + + sinfo.cbSize = sizeof(sinfo); + sinfo.fMask = SIF_RANGE; + br = GetScrollInfo(listbox, SB_HORZ, &sinfo); + ok(br == TRUE, "GetScrollInfo failed\n"); + ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); + ok(sinfo.nMax == 63, "got wrong max: %u\n", sinfo.nMax); + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) == 0, + "List box should not have a horizontal scroll bar\n"); + + /* horizontal extent > width */ + SendMessageA(listbox, LB_SETHORIZONTALEXTENT, 184, 0); + + res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); + ok(res == 184, "Got wrong horizontal extent: %u\n", res); + + sinfo.cbSize = sizeof(sinfo); + sinfo.fMask = SIF_RANGE; + br = GetScrollInfo(listbox, SB_HORZ, &sinfo); + ok(br == TRUE, "GetScrollInfo failed\n"); + ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); + ok(sinfo.nMax == 183, "got wrong max: %u\n", sinfo.nMax); + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) != 0, + "List box should have a horizontal scroll bar\n"); + + SendMessageA(listbox, LB_SETHORIZONTALEXTENT, 0, 0); + res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); + ok(res == 0, "Got wrong horizontal extent: %u\n", res); + + sinfo.cbSize = sizeof(sinfo); + sinfo.fMask = SIF_RANGE; + br = GetScrollInfo(listbox, SB_HORZ, &sinfo); + ok(br == TRUE, "GetScrollInfo failed\n"); + ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); + ok(sinfo.nMax == 0, "got wrong max: %u\n", sinfo.nMax); + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) == 0, + "List box should not have a horizontal scroll bar\n"); + + DestroyWindow(listbox); + + + listbox = create_listbox(WS_CHILD | WS_VISIBLE | WS_HSCROLL | LBS_DISABLENOSCROLL, parent); + + res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); + ok(res == 0, "Got wrong initial horizontal extent: %u\n", res); + + sinfo.cbSize = sizeof(sinfo); + sinfo.fMask = SIF_RANGE; + br = GetScrollInfo(listbox, SB_HORZ, &sinfo); + ok(br == TRUE, "GetScrollInfo failed\n"); + ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); + ok(sinfo.nMax == 0, "got wrong max: %u\n", sinfo.nMax); + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) != 0, + "List box should have a horizontal scroll bar\n"); + + /* horizontal extent < width */ SendMessageA(listbox, LB_SETHORIZONTALEXTENT, 64, 0); res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); @@ -1704,6 +1788,23 @@ static void test_extents(void) ok(br == TRUE, "GetScrollInfo failed\n"); ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); ok(sinfo.nMax == 63, "got wrong max: %u\n", sinfo.nMax); + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) != 0, + "List box should have a horizontal scroll bar\n"); + + /* horizontal extent > width */ + SendMessageA(listbox, LB_SETHORIZONTALEXTENT, 184, 0); + + res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); + ok(res == 184, "Got wrong horizontal extent: %u\n", res); + + sinfo.cbSize = sizeof(sinfo); + sinfo.fMask = SIF_RANGE; + br = GetScrollInfo(listbox, SB_HORZ, &sinfo); + ok(br == TRUE, "GetScrollInfo failed\n"); + ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); + ok(sinfo.nMax == 183, "got wrong max: %u\n", sinfo.nMax); + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) != 0, + "List box should have a horizontal scroll bar\n"); SendMessageA(listbox, LB_SETHORIZONTALEXTENT, 0, 0); @@ -1716,6 +1817,8 @@ static void test_extents(void) ok(br == TRUE, "GetScrollInfo failed\n"); ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); ok(sinfo.nMax == 0, "got wrong max: %u\n", sinfo.nMax); + ok((GetWindowLongA(listbox, GWL_STYLE) & WS_HSCROLL) != 0, + "List box should have a horizontal scroll bar\n"); DestroyWindow(listbox);

1 0