November 2015 - Wine-Commits

Alexandre Julliard : configure: Build binaries as PIE on Android.
by Alexandre Julliard Nov. 17, 2015

Nov. 17, 2015

Module: wine Branch: master Commit: 3d8a91e14d4858fdfd959206f0edbe4c51ff8a56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d8a91e14d4858fdfd959206f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 17 12:48:39 2015 +0900 configure: Build binaries as PIE on Android. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 25 ++++++++++--------------- configure.ac | 9 ++------- 2 files changed, 12 insertions(+), 22 deletions(-) diff --git a/configure b/configure index 3d3dfc9..3a5a309 100755 --- a/configure +++ b/configure @@ -8350,36 +8350,31 @@ $as_echo "$ac_cv_cflags__Wl___enable_new_dtags" >&6; } if test "x$ac_cv_cflags__Wl___enable_new_dtags" = xyes; then : LDRPATH_INSTALL="$LDRPATH_INSTALL -Wl,--enable-new-dtags" fi - - case $host_cpu in - *i[3456789]86* | x86_64) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,--section-start,.interp=0x7bf00400" >&5 -$as_echo_n "checking whether the compiler supports -Wl,--section-start,.interp=0x7bf00400... " >&6; } -if ${ac_cv_cflags__Wl___section_start__interp_0x7bf00400+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-pie" >&5 +$as_echo_n "checking whether the compiler supports -Wl,-pie... " >&6; } +if ${ac_cv_cflags__Wl__pie+:} false; then : $as_echo_n "(cached) " >&6 else ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -Wl,--section-start,.interp=0x7bf00400" +CFLAGS="$CFLAGS -Wl,-pie" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_cflags__Wl___section_start__interp_0x7bf00400=yes + ac_cv_cflags__Wl__pie=yes else - ac_cv_cflags__Wl___section_start__interp_0x7bf00400=no + ac_cv_cflags__Wl__pie=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$ac_wine_try_cflags_saved fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl___section_start__interp_0x7bf00400" >&5 -$as_echo "$ac_cv_cflags__Wl___section_start__interp_0x7bf00400" >&6; } -if test "x$ac_cv_cflags__Wl___section_start__interp_0x7bf00400" = xyes; then : - LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x7bf00400" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl__pie" >&5 +$as_echo "$ac_cv_cflags__Wl__pie" >&6; } +if test "x$ac_cv_cflags__Wl__pie" = xyes; then : + LDRPATH_INSTALL="$LDRPATH_INSTALL -Wl,-pie" fi - ;; - esac LIBWINE_SHAREDLIB="libwine.so" diff --git a/configure.ac b/configure.ac index 7d2449f..8bdfade 100644 --- a/configure.ac +++ b/configure.ac @@ -860,13 +860,8 @@ case $host_os in WINE_TRY_CFLAGS([-Wl,--enable-new-dtags], [LDRPATH_INSTALL="$LDRPATH_INSTALL -Wl,--enable-new-dtags"]) - - case $host_cpu in - *i[[3456789]]86* | x86_64) - WINE_TRY_CFLAGS([-Wl,--section-start,.interp=0x7bf00400], - [LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x7bf00400"]) - ;; - esac + WINE_TRY_CFLAGS([-Wl,-pie], + [LDRPATH_INSTALL="$LDRPATH_INSTALL -Wl,-pie"]) AC_SUBST(LIBWINE_SHAREDLIB,"libwine.so") AC_SUBST(LIBWINE_INSTALL_LIB,"libwine.so")

1 0

Alexandre Julliard : make_makefiles: Configure substitutions are allowed in the top makefile.
by Alexandre Julliard Nov. 17, 2015

Nov. 17, 2015

Module: wine Branch: master Commit: a30feab7d737c5f121d0127fdd0ddf2eee8f7d5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a30feab7d737c5f121d0127fd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 17 12:45:14 2015 +0900 make_makefiles: Configure substitutions are allowed in the top makefile. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/make_makefiles | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/make_makefiles b/tools/make_makefiles index 78b6dea..e65429f 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -202,7 +202,7 @@ sub parse_makefile($) if (/\@[A-Z_]+\@/) # config.status substitution variable { - die "Configure substitution is not allowed in $file"; + die "Configure substitution is not allowed in $file" unless $file eq "Makefile"; } if (/^\s*(MODULE|IMPORTLIB|TESTDLL|PARENTSRC|APPMODE)\s*=\s*(.*)/) {

1 0

Alexandre Julliard : transl: Fix the resfile filtering regexps.
by Alexandre Julliard Nov. 17, 2015

Nov. 17, 2015

Module: tools Branch: master Commit: 13946a57c5b7b4d24860ef985bb7373fb5d26504 URL: http://source.winehq.org/git/tools.git/?a=commit;h=13946a57c5b7b4d24860ef98… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 17 14:14:46 2015 +0900 transl: Fix the resfile filtering regexps. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- transl/lib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/transl/lib.php b/transl/lib.php index 0e6c5e7..2300a59 100644 --- a/transl/lib.php +++ b/transl/lib.php @@ -93,7 +93,7 @@ function validate_type($type) function validate_resfile($resfile) { - if (!preg_match("*^[a-zA-Z0-9/.-_]+(#locale[0-9a-f]{3}:[0-9a-f]{2})?$*", $resfile)) + if (!preg_match("*^[-_a-zA-Z0-9/.]+(#locale[0-9a-f]{3}:[0-9a-f]{2})?$*", $resfile)) die("Invalid resource file"); return $resfile; } @@ -179,7 +179,7 @@ function get_res_path($resfile) function get_resfile_name($resfile) { - if (preg_match("*^([a-zA-Z0-9/.-_]+)#locale([0-9a-f]{3}:[0-9a-f]{2})$*", $resfile, $m)) + if (preg_match("*^([-_a-zA-Z0-9/.]+)#locale([0-9a-f]{3}:[0-9a-f]{2})$*", $resfile, $m)) { return "Locale data for: ".get_locale_name($m[2])." (".$m[1].")"; }

1 0

Alexandre Julliard : winetest: Make the build dependencies in order to get the .mo files.
by Alexandre Julliard Nov. 17, 2015

Nov. 17, 2015

Module: tools Branch: master Commit: 09b0d2a74fbb6066d4eb79dd7360aaeef3d5de32 URL: http://source.winehq.org/git/tools.git/?a=commit;h=09b0d2a74fbb6066d4eb79dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 17 14:15:02 2015 +0900 winetest: Make the build dependencies in order to get the .mo files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/make-winetest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winetest/make-winetest b/winetest/make-winetest index 9fd21a0..0ae85fe 100755 --- a/winetest/make-winetest +++ b/winetest/make-winetest @@ -81,7 +81,7 @@ umask 022 cd build-native && ../wine/configure --enable-win64 --without-x --without-freetype) || exit - (cd build-native && make depend && make __tooldeps__ include) || exit + (cd build-native && make depend && make __builddeps__) || exit # update the translations status

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.55
by Jeremy Newman Nov. 16, 2015

Nov. 16, 2015

Module: website Branch: master Commit: faa749e5307bab3eba05a7c86594a63c3d3ff208 URL: http://source.winehq.org/git/website.git/?a=commit;h=faa749e5307bab3eba05a7… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Nov 14 06:58:09 2015 +0100 Polish translation for release 1.7.55 Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/pl/2015111301.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/pl/2015111301.xml b/news/pl/2015111301.xml new file mode 100644 index 0000000..eee260e --- /dev/null +++ b/news/pl/2015111301.xml @@ -0,0 +1,17 @@ +<news> +<date>Listopad 13, 2015</date> +<title>Wydano Wine 1.7.55</title> +<body> + Wydanie rozwojowe Wine 1.7.55 jest już dostępne. + <a href="{$root}/announce/1.7.55">Co nowego</a> w tym wydaniu: +<ul> + <li>Sterownik dźwięku Pulse.</li> + <li>Rozmaite poprawki w obsłudze Microsoft Office 2013.</li> + <li>Dalsza implementajca biblioteki DLL Usług Sieciowych.</li> + <li>Więcej poprawek do najnowszej wersji biblioteki uruchomieniowej C.</li> + <li>Ulepszenia w generowaniu plików Makefile.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="//dl.winehq.org/wine/source/1.7/wine-1.7.55.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Aric Stewart : hidclass.sys: Break the report descriptor into multiple lines.
by Alexandre Julliard Nov. 16, 2015

Nov. 16, 2015

Module: wine Branch: master Commit: 91d46cb3a14219dcdb0ddd3af45e1ae1fae8491e URL: http://source.winehq.org/git/wine.git/?a=commit;h=91d46cb3a14219dcdb0ddd3af… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Nov 16 07:08:46 2015 -0600 hidclass.sys: Break the report descriptor into multiple lines. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 822de3d..eb0b42a 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -1028,7 +1028,11 @@ WINE_HIDP_PREPARSED_DATA* ParseDescriptor(BYTE *descriptor, unsigned int length) { TRACE("Descriptor[%i]: ", length); for (cidx = 0; cidx < length; cidx++) + { TRACE("%x ",descriptor[cidx]); + if (cidx % 80 == 0) + TRACE("\n"); + } TRACE("\n"); }

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_RSGetViewports().
by Alexandre Julliard Nov. 16, 2015

Nov. 16, 2015

Module: wine Branch: master Commit: cd525dda2a1ba40530149ee938bf9ec85f7e8d88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd525dda2a1ba40530149ee93… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 13 15:16:26 2015 +0100 d3d11: Implement d3d11_immediate_context_RSGetViewports(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 0c146e4..f9d7c9e 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1556,7 +1556,33 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetState(ID3D11DeviceCon static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetViewports(ID3D11DeviceContext *iface, UINT *viewport_count, D3D11_VIEWPORT *viewports) { - FIXME("iface %p, viewport_count %p, viewports %p stub!\n", iface, viewport_count, viewports); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct wined3d_viewport wined3d_vp; + + TRACE("iface %p, viewport_count %p, viewports %p.\n", iface, viewport_count, viewports); + + if (!viewports) + { + *viewport_count = 1; + return; + } + + if (!*viewport_count) + return; + + wined3d_mutex_lock(); + wined3d_device_get_viewport(device->wined3d_device, &wined3d_vp); + wined3d_mutex_unlock(); + + viewports[0].TopLeftX = wined3d_vp.x; + viewports[0].TopLeftY = wined3d_vp.y; + viewports[0].Width = wined3d_vp.width; + viewports[0].Height = wined3d_vp.height; + viewports[0].MinDepth = wined3d_vp.min_z; + viewports[0].MaxDepth = wined3d_vp.max_z; + + if (*viewport_count > 1) + memset(&viewports[1], 0, (*viewport_count - 1) * sizeof(*viewports)); } static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetScissorRects(ID3D11DeviceContext *iface,

1 0

Nikolay Sivov : user32/tests: Use separate test window for each scrollbar test.
by Alexandre Julliard Nov. 16, 2015

Nov. 16, 2015

Module: wine Branch: master Commit: f7468386a78fb72556fcafafba0fc8f9b5ef0c34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7468386a78fb72556fcafafb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 15 22:37:24 2015 +0300 user32/tests: Use separate test window for each scrollbar test. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/scroll.c | 77 +++++++++++++++++++++++++++++++--------------- 1 file changed, 53 insertions(+), 24 deletions(-) diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index df37534..41201ec 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -25,7 +25,7 @@ #include "wine/test.h" -static HWND hScroll, hMainWnd; +static HWND hScroll; static BOOL bThemeActive = FALSE; static LRESULT CALLBACK MyWndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam ) @@ -52,20 +52,45 @@ static LRESULT CALLBACK MyWndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lP } return 0; } + +static HWND create_main_test_wnd(void) +{ + HWND hMainWnd; + + hScroll = NULL; + hMainWnd = CreateWindowExA( 0, "MyTestWnd", "Scroll", + WS_OVERLAPPEDWINDOW|WS_VSCROLL|WS_HSCROLL, + CW_USEDEFAULT, CW_USEDEFAULT, 100, 100, NULL, NULL, GetModuleHandleA(NULL), 0 ); + ok(hMainWnd != NULL, "Failed to create parent window. Tests aborted.\n"); + ok(hScroll != NULL, "got NULL scroll bar handle\n"); + + return hMainWnd; +} + static void scrollbar_test_track(void) { + HWND mainwnd; + + mainwnd = create_main_test_wnd(); + /* test that scrollbar tracking is terminated when * the control looses mouse capture */ SendMessageA( hScroll, WM_LBUTTONDOWN, 0, MAKELPARAM( 1, 1)); /* a normal return from the sendmessage */ /* not normal for instance by closing the windws */ ok( IsWindow( hScroll), "Scrollbar has gone!\n"); + + DestroyWindow(hScroll); + DestroyWindow(mainwnd); } -static void scrollbar_test1(void) +static void test_EnableScrollBar(void) { + HWND mainwnd; BOOL ret; + mainwnd = create_main_test_wnd(); + ret = EnableScrollBar( hScroll, SB_CTL, ESB_DISABLE_BOTH ); ok( ret, "The scrollbar should be disabled.\n" ); ok( !IsWindowEnabled( hScroll ), "The scrollbar window should be disabled.\n" ); @@ -88,13 +113,17 @@ static void scrollbar_test1(void) ret = EnableScrollBar( hScroll, SB_CTL, ESB_ENABLE_BOTH ); ok( ret, "The scrollbar should be enabled.\n" ); ok( IsWindowEnabled( hScroll ), "The scrollbar window should be enabled.\n" ); + + DestroyWindow(hScroll); + DestroyWindow(mainwnd); } -static void scrollbar_test2(void) +static void test_SetScrollPos(void) { + HWND mainwnd; int ret; - trace("The scrollbar is disabled.\n"); + mainwnd = create_main_test_wnd(); EnableWindow( hScroll, FALSE ); ok( !IsWindowEnabled( hScroll ), "The scroll should be disabled.\n" ); @@ -114,8 +143,6 @@ static void scrollbar_test2(void) ret = GetScrollPos( hScroll, SB_CTL); ok( ret == 30, "The position should be set!!!\n"); - trace("The scrollbar is enabled.\n"); - EnableWindow( hScroll, TRUE ); ok( IsWindowEnabled( hScroll ), "The scroll should be enabled.\n" ); @@ -133,12 +160,18 @@ static void scrollbar_test2(void) ret = GetScrollPos( hScroll, SB_CTL); ok( ret == 30, "The position should not be equal to zero\n"); + + DestroyWindow(hScroll); + DestroyWindow(mainwnd); } -static void scrollbar_test3(void) +static void test_ShowScrollBar(void) { + HWND mainwnd; BOOL ret; + mainwnd = create_main_test_wnd(); + ret = ShowScrollBar( hScroll, SB_CTL, FALSE ); ok( ret, "The ShowScrollBar() should not failed.\n" ); ok( !IsWindowVisible( hScroll ), "The scrollbar window should not be visible\n" ); @@ -150,10 +183,13 @@ static void scrollbar_test3(void) ret = ShowScrollBar( NULL, SB_CTL, TRUE ); ok( !ret, "The ShowScrollBar() should failed.\n" ); + DestroyWindow(hScroll); + DestroyWindow(mainwnd); } -static void scrollbar_test4(void) +static void test_GetScrollBarInfo(void) { + HWND hMainWnd; BOOL ret; SCROLLBARINFO sbi; RECT rect; @@ -166,6 +202,8 @@ static void scrollbar_test4(void) return; } + hMainWnd = create_main_test_wnd(); + /* Test GetScrollBarInfo to make sure it returns rcScrollBar in screen * coordinates. */ sbi.cbSize = sizeof(sbi); @@ -218,6 +256,9 @@ static void scrollbar_test4(void) rect.top, rect.left, rect.bottom, rect.right, sbi.rcScrollBar.top, sbi.rcScrollBar.left, sbi.rcScrollBar.bottom, sbi.rcScrollBar.right ); + + DestroyWindow(hScroll); + DestroyWindow(hMainWnd); } /* some tests designed to show that Horizontal and Vertical @@ -502,19 +543,10 @@ START_TEST ( scroll ) wc.lpfnWndProc = MyWndProc; RegisterClassA(&wc); - hMainWnd = CreateWindowExA( 0, "MyTestWnd", "Scroll", - WS_OVERLAPPEDWINDOW|WS_VSCROLL|WS_HSCROLL, - CW_USEDEFAULT, CW_USEDEFAULT, 100, 100, NULL, NULL, GetModuleHandleA(NULL), 0 ); - - ok(hMainWnd != NULL, "Failed to create parent window. Tests aborted.\n"); - if (!hMainWnd) return; - - assert( hScroll ); - - scrollbar_test1(); - scrollbar_test2(); - scrollbar_test3(); - scrollbar_test4(); + test_EnableScrollBar(); + test_SetScrollPos(); + test_ShowScrollBar(); + test_GetScrollBarInfo(); scrollbar_test_track(); /* Some test results vary depending of theming being active or not */ @@ -533,7 +565,4 @@ START_TEST ( scroll ) scrollbar_test_default( WS_HSCROLL | WS_VSCROLL); scrollbar_test_init(); - - DestroyWindow(hScroll); - DestroyWindow(hMainWnd); }

1 0

Andrey Gusev : wine.inf: Add HKLM\Software\Microsoft\MediaPlayer\Installation DirectoryLFN key.
by Alexandre Julliard Nov. 16, 2015

Nov. 16, 2015

Module: wine Branch: master Commit: 6b97ce5bf00756f2a6835512e6e496b26c0dd043 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b97ce5bf00756f2a6835512e… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Nov 16 12:54:37 2015 +0200 wine.inf: Add HKLM\Software\Microsoft\MediaPlayer\Installation DirectoryLFN key. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index e091727..c8de5f9 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -635,6 +635,7 @@ HKLM,Software\Microsoft\DFS,,16 HKLM,Software\Microsoft\Driver Signing,,16 HKLM,Software\Microsoft\EnterpriseCertificates,,16 HKLM,Software\Microsoft\EventSystem,,16 +HKLM,Software\Microsoft\MediaPlayer,"Installation DirectoryLFN",2,"%16422%\Windows Media Player" HKLM,Software\Microsoft\MediaPlayer\PlayerUpgrade,"PlayerVersion",2,"12,0,7601,18840" HKLM,Software\Microsoft\MSMQ,,16 HKLM,Software\Microsoft\Non-Driver Signing,,16

1 0

Andrew Eikum : user32: Use font default height if GetTextExtentPoint returns empty rectangle.
by Alexandre Julliard Nov. 16, 2015

Nov. 16, 2015

Module: wine Branch: master Commit: c465209cc1578cf39074b4a8574f7444a0a03891 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c465209cc1578cf39074b4a85… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Nov 13 14:52:10 2015 -0600 user32: Use font default height if GetTextExtentPoint returns empty rectangle. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/text.c | 48 +++++++++++++++++++++++------------------------- dlls/user32/text.c | 9 +++++++-- 2 files changed, 30 insertions(+), 27 deletions(-) diff --git a/dlls/user32/tests/text.c b/dlls/user32/tests/text.c index 06705a7..df8d3ee 100644 --- a/dlls/user32/tests/text.c +++ b/dlls/user32/tests/text.c @@ -604,15 +604,13 @@ static void strfmt( const char *str, char *strout) #define TABTEST( tabval, tabcount, string, _exp) \ -{ int i,x_act, x_exp; char strdisp[64];\ +{ int i; char strdisp[64];\ for(i=0;i<8;i++) tabs[i]=(i+1)*(tabval); \ extent = GetTabbedTextExtentA( hdc, string, strlen( string), (tabcount), tabs); \ strfmt( string, strdisp); \ /* trace( "Extent is %08lx\n", extent); */\ - x_act = LOWORD( extent); \ - x_exp = (_exp); \ - ok( x_act == x_exp, "Test case \"%s\". Text extent is %d, expected %d tab %d tabcount %d\n", \ - strdisp, x_act, x_exp, tabval, tabcount); \ + ok( extent == _exp, "Test case \"%s\". Text extent is 0x%x, expected 0x%x tab %d tabcount %d\n", \ + strdisp, extent, _exp, tabval, tabcount); \ } \ @@ -649,16 +647,16 @@ static void test_TabbedText(void) tab = (cx *4 + t); /* test the special case tabcount =1 and the general array (80 of tabs */ for( tabcount = 1; tabcount <= 8; tabcount +=7) { - TABTEST( align * tab, tabcount, "\t", tab) - TABTEST( align * tab, tabcount, "xxx\t", tab) - TABTEST( align * tab, tabcount, "\tx", tab+cx) - TABTEST( align * tab, tabcount, "\t\t", tab*2) - TABTEST( align * tab, tabcount, "\tx\t", tab*2) - TABTEST( align * tab, tabcount, "x\tx", tab+cx) - TABTEST( align * tab, tabcount, "xx\tx", tab+cx) - TABTEST( align * tab, tabcount, "xxx\tx", tab+cx) - TABTEST( align * tab, tabcount, "xxxx\tx", t>0 ? tab + cx : 2*tab+cx) - TABTEST( align * tab, tabcount, "xxxxx\tx", 2*tab+cx) + TABTEST( align * tab, tabcount, "\t", MAKELONG(tab, cy)) + TABTEST( align * tab, tabcount, "xxx\t", MAKELONG(tab, cy)) + TABTEST( align * tab, tabcount, "\tx", MAKELONG(tab+cx, cy)) + TABTEST( align * tab, tabcount, "\t\t", MAKELONG(tab*2, cy)) + TABTEST( align * tab, tabcount, "\tx\t", MAKELONG(tab*2, cy)) + TABTEST( align * tab, tabcount, "x\tx", MAKELONG(tab+cx, cy)) + TABTEST( align * tab, tabcount, "xx\tx", MAKELONG(tab+cx, cy)) + TABTEST( align * tab, tabcount, "xxx\tx", MAKELONG(tab+cx, cy)) + TABTEST( align * tab, tabcount, "xxxx\tx", MAKELONG(t>0 ? tab + cx : 2*tab+cx, cy)) + TABTEST( align * tab, tabcount, "xxxxx\tx", MAKELONG(2*tab+cx, cy)) } } align=-1; @@ -667,16 +665,16 @@ static void test_TabbedText(void) tab = (cx *4 + t); /* test the special case tabcount =1 and the general array (8) of tabs */ for( tabcount = 1; tabcount <= 8; tabcount +=7) { - TABTEST( align * tab, tabcount, "\t", tab) - TABTEST( align * tab, tabcount, "xxx\t", tab) - TABTEST( align * tab, tabcount, "\tx", tab) - TABTEST( align * tab, tabcount, "\t\t", tab*2) - TABTEST( align * tab, tabcount, "\tx\t", tab*2) - TABTEST( align * tab, tabcount, "x\tx", tab) - TABTEST( align * tab, tabcount, "xx\tx", tab) - TABTEST( align * tab, tabcount, "xxx\tx", 4 * cx >= tab ? 2*tab :tab) - TABTEST( align * tab, tabcount, "xxxx\tx", 2*tab) - TABTEST( align * tab, tabcount, "xxxxx\tx", 2*tab) + TABTEST( align * tab, tabcount, "\t", MAKELONG(tab, cy)) + TABTEST( align * tab, tabcount, "xxx\t", MAKELONG(tab, cy)) + TABTEST( align * tab, tabcount, "\tx", MAKELONG(tab, cy)) + TABTEST( align * tab, tabcount, "\t\t", MAKELONG(tab*2, cy)) + TABTEST( align * tab, tabcount, "\tx\t", MAKELONG(tab*2, cy)) + TABTEST( align * tab, tabcount, "x\tx", MAKELONG(tab, cy)) + TABTEST( align * tab, tabcount, "xx\tx", MAKELONG(tab, cy)) + TABTEST( align * tab, tabcount, "xxx\tx", MAKELONG(4 * cx >= tab ? 2*tab :tab, cy)) + TABTEST( align * tab, tabcount, "xxxx\tx", MAKELONG(2*tab, cy)) + TABTEST( align * tab, tabcount, "xxxxx\tx", MAKELONG(2*tab, cy)) } } diff --git a/dlls/user32/text.c b/dlls/user32/text.c index 642da57..7b0302e 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -1316,12 +1316,15 @@ static LONG TEXT_TabbedTextOut( HDC hdc, INT x, INT y, LPCWSTR lpstr, SIZE extent; int i, j; int start = x; + TEXTMETRICW tm; if (!lpstr || count == 0) return 0; if (!lpTabPos) cTabStops=0; + GetTextMetricsW( hdc, &tm ); + if (cTabStops == 1) { defWidth = *lpTabPos; @@ -1329,8 +1332,6 @@ static LONG TEXT_TabbedTextOut( HDC hdc, INT x, INT y, LPCWSTR lpstr, } else { - TEXTMETRICW tm; - GetTextMetricsW( hdc, &tm ); defWidth = 8 * tm.tmAveCharWidth; } @@ -1398,6 +1399,10 @@ static LONG TEXT_TabbedTextOut( HDC hdc, INT x, INT y, LPCWSTR lpstr, count -= j; lpstr += j; } + + if(!extent.cy) + extent.cy = tm.tmHeight; + return MAKELONG(x - start, extent.cy); }

1 0