wine-commits November 2015

wine-commits@winehq.org

2 participants
623 discussions

Austin English : opengl32: Add "Not Microsoft" to Copyright string to satisfy CATIA.
by Alexandre Julliard 17 Nov '15

17 Nov '15

Module: wine Branch: master Commit: b54c3811feb3065298fa5fb571b19cd61c05110b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b54c3811feb3065298fa5fb57… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Nov 16 14:34:51 2015 -0600 opengl32: Add "Not Microsoft" to Copyright string to satisfy CATIA. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/version.rc | 1 + include/wine/wine_common_ver.rc | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/opengl32/version.rc b/dlls/opengl32/version.rc index 5d87404..6fd4ff9 100644 --- a/dlls/opengl32/version.rc +++ b/dlls/opengl32/version.rc @@ -20,6 +20,7 @@ #define WINE_FILENAME_STR "opengl32.dll" #define WINE_FILEVERSION 5,1,2600,2082 #define WINE_FILEVERSION_STR "5.1.2600.2082" +#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2015 the Wine project. Not Microsoft" /* CATIA needs 'Microsoft' in both CompanyName _and_ LegalCopyright */ #define WINE_PRODUCTVERSION 5,1,2600,2082 #define WINE_PRODUCTVERSION_STR "5.1" diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc index 5938582..cae5408 100644 --- a/include/wine/wine_common_ver.rc +++ b/include/wine/wine_common_ver.rc @@ -73,6 +73,10 @@ never complain. #define WINE_FILESUBTYPE VFT2_UNKNOWN #endif +#ifndef WINE_LEGALCOPYRIGHT +#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2015 the Wine project authors (see the file AUTHORS for a complete list)" +#endif + #ifndef WINE_PRODUCTVERSION #define WINE_PRODUCTVERSION 1,0,0,0 #endif @@ -106,7 +110,7 @@ FILESUBTYPE WINE_FILESUBTYPE VALUE "FileDescription", WINE_FILEDESCRIPTION_STR VALUE "FileVersion", WINE_FILEVERSION_STR VALUE "InternalName", WINE_FILENAME - VALUE "LegalCopyright", "Copyright (c) 1993-2015 the Wine project authors (see the file AUTHORS for a complete list)" + VALUE "LegalCopyright", WINE_LEGALCOPYRIGHT VALUE "OriginalFilename", WINE_FILENAME_STR VALUE "ProductName", WINE_PRODUCTNAME_STR VALUE "ProductVersion", WINE_PRODUCTVERSION_STR

1 0

Austin English : user32: Use winediag debug channel for some error messages.
by Alexandre Julliard 17 Nov '15

17 Nov '15

Module: wine Branch: master Commit: 230217e4d2a62a079efdb8a06afbba08f12021b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=230217e4d2a62a079efdb8a06… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Nov 16 14:31:11 2015 -0600 user32: Use winediag debug channel for some error messages. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 59bfc5c..dbac3ef 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -32,6 +32,7 @@ #include "controls.h" WINE_DEFAULT_DEBUG_CHANNEL(user); +WINE_DECLARE_DEBUG_CHANNEL(winediag); static USER_DRIVER null_driver, lazy_load_driver; @@ -402,8 +403,8 @@ static BOOL CDECL nulldrv_CreateWindow( HWND hwnd ) if (!parent || parent == get_user_thread_info()->msg_window) return TRUE; if (warned++) return FALSE; - MESSAGE( "Application tried to create a window, but no driver could be loaded.\n"); - if (driver_load_error[0]) MESSAGE( "%s\n", driver_load_error ); + ERR_(winediag)( "Application tried to create a window, but no driver could be loaded.\n" ); + if (driver_load_error[0]) ERR_(winediag)( "%s\n", driver_load_error ); return FALSE; }

1 0

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

17 Nov '15

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

Alexandre Julliard : transl: Fix the resfile filtering regexps.
by Alexandre Julliard 17 Nov '15

17 Nov '15

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

Łukasz Wojniłowicz : Polish translation for release 1.7.55
by Jeremy Newman 16 Nov '15

16 Nov '15

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

Alexandre Julliard : winegcc: Disable setting image base address on Android.
by Alexandre Julliard 16 Nov '15

16 Nov '15

Module: wine Branch: master Commit: 097006b1466854fbd80af8d85a729d85ec52b163 URL: http://source.winehq.org/git/wine.git/?a=commit;h=097006b1466854fbd80af8d85… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 16 23:30:10 2015 +0900 winegcc: Disable setting image base address on Android. The Android linker doesn't handle this correctly. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/utils.h | 7 ++++++- tools/winegcc/winegcc.c | 7 +++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/tools/winegcc/utils.h b/tools/winegcc/utils.h index 789b4ea..536fb2d 100644 --- a/tools/winegcc/utils.h +++ b/tools/winegcc/utils.h @@ -42,7 +42,12 @@ enum target_cpu enum target_platform { - PLATFORM_UNSPECIFIED, PLATFORM_APPLE, PLATFORM_SOLARIS, PLATFORM_WINDOWS, PLATFORM_CYGWIN + PLATFORM_UNSPECIFIED, + PLATFORM_APPLE, + PLATFORM_ANDROID, + PLATFORM_SOLARIS, + PLATFORM_WINDOWS, + PLATFORM_CYGWIN }; void error(const char* s, ...) DECLSPEC_NORETURN; diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index ee5ac6b..c07243b 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -171,6 +171,7 @@ static const struct { { "macos", PLATFORM_APPLE }, { "darwin", PLATFORM_APPLE }, + { "android", PLATFORM_ANDROID }, { "solaris", PLATFORM_SOLARIS }, { "cygwin", PLATFORM_CYGWIN }, { "mingw32", PLATFORM_WINDOWS }, @@ -229,6 +230,8 @@ static const enum target_cpu build_cpu = CPU_ARM64; #ifdef __APPLE__ static enum target_platform build_platform = PLATFORM_APPLE; +#elif defined(__ANDROID__) +static enum target_platform build_platform = PLATFORM_ANDROID; #elif defined(__sun) static enum target_platform build_platform = PLATFORM_SOLARIS; #elif defined(__CYGWIN__) @@ -384,6 +387,7 @@ static const strarray* get_lddllflags( const struct options *opts, const strarra } break; + case PLATFORM_ANDROID: case PLATFORM_SOLARIS: case PLATFORM_UNSPECIFIED: strarray_add( flags, "-shared" ); @@ -1121,6 +1125,9 @@ static void build(struct options* opts) strarray_add(tmp_files, mapfile); } break; + case PLATFORM_ANDROID: + /* not supported on Android */ + break; default: if (opts->image_base) {

1 0

Alexandre Julliard : winegcc: Force stack alignment on all x86 platforms.
by Alexandre Julliard 16 Nov '15

16 Nov '15

Module: wine Branch: master Commit: bf73faefc7eb67a4940d3b9179568942e48b47c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf73faefc7eb67a4940d3b917… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 16 22:52:41 2015 +0900 winegcc: Force stack alignment on all x86 platforms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index ad139f5..ee5ac6b 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -548,47 +548,34 @@ static void compile(struct options* opts, const char* lang) if (gcc_defs) { - int fastcall_done = 0; - if (opts->target_cpu == CPU_x86_64) + switch (opts->target_cpu) { + case CPU_x86_64: strarray_add(comp_args, "-D__stdcall=__attribute__((ms_abi))"); strarray_add(comp_args, "-D__cdecl=__attribute__((ms_abi))"); strarray_add(comp_args, "-D_stdcall=__attribute__((ms_abi))"); strarray_add(comp_args, "-D_cdecl=__attribute__((ms_abi))"); strarray_add(comp_args, "-D__fastcall=__attribute__((ms_abi))"); strarray_add(comp_args, "-D_fastcall=__attribute__((ms_abi))"); - fastcall_done = 1; - } - else if (opts->target_platform == PLATFORM_APPLE) - { - /* Mac OS X uses a 16-byte aligned stack and not a 4-byte one */ + break; + case CPU_x86: strarray_add(comp_args, "-D__stdcall=__attribute__((__stdcall__)) __attribute__((__force_align_arg_pointer__))"); strarray_add(comp_args, "-D__cdecl=__attribute__((__cdecl__)) __attribute__((__force_align_arg_pointer__))"); strarray_add(comp_args, "-D_stdcall=__attribute__((__stdcall__)) __attribute__((__force_align_arg_pointer__))"); strarray_add(comp_args, "-D_cdecl=__attribute__((__cdecl__)) __attribute__((__force_align_arg_pointer__))"); - } - else if (opts->target_cpu == CPU_ARM || opts->target_cpu == CPU_ARM64) - { + strarray_add(comp_args, "-D__fastcall=__attribute__((__fastcall__))"); + strarray_add(comp_args, "-D_fastcall=__attribute__((__fastcall__))"); + break; + case CPU_ARM: + case CPU_ARM64: + case CPU_POWERPC: strarray_add(comp_args, "-D__stdcall="); strarray_add(comp_args, "-D__cdecl="); strarray_add(comp_args, "-D_stdcall="); strarray_add(comp_args, "-D_cdecl="); strarray_add(comp_args, "-D__fastcall="); strarray_add(comp_args, "-D_fastcall="); - fastcall_done = 1; - } - else - { - strarray_add(comp_args, "-D__stdcall=__attribute__((__stdcall__))"); - strarray_add(comp_args, "-D__cdecl=__attribute__((__cdecl__))"); - strarray_add(comp_args, "-D_stdcall=__attribute__((__stdcall__))"); - strarray_add(comp_args, "-D_cdecl=__attribute__((__cdecl__))"); - } - - if (!fastcall_done) - { - strarray_add(comp_args, "-D__fastcall=__attribute__((__fastcall__))"); - strarray_add(comp_args, "-D_fastcall=__attribute__((__fastcall__))"); + break; } strarray_add(comp_args, "-D__declspec(x)=__declspec_##x"); strarray_add(comp_args, "-D__declspec_align(x)=__attribute__((aligned(x)))");

1 0

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

16 Nov '15

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

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

16 Nov '15

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

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

16 Nov '15

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

← Newer
1
...
19
20
21
22
23
24
25
...
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2015