wine-commits December 2016

wine-commits@winehq.org

2 participants
342 discussions

Hans Leidekker : webservices/tests: Add a helper to print the contents of the output buffer.
by Alexandre Julliard 23 Dec '16

23 Dec '16

Module: wine Branch: master Commit: 3b050d615d99dc46fd6dc3f6f37fedef6e47d1a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b050d615d99dc46fd6dc3f6f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 23 12:52:38 2016 +0100 webservices/tests: Add a helper to print the contents of the output buffer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index b5288a5..6ad691f 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -339,6 +339,41 @@ static void test_WsSetOutputToBuffer(void) WsFreeHeap( heap ); } +static char strbuf[512]; +static const char *debugstr_bytes( const BYTE *bytes, ULONG len ) +{ + const BYTE *src = bytes; + char *dst = strbuf; + + while (len) + { + BYTE c = *src++; + if (dst - strbuf > sizeof(strbuf) - 7) break; + switch (c) + { + case '\n': *dst++ = '\\'; *dst++ = 'n'; break; + case '\r': *dst++ = '\\'; *dst++ = 'r'; break; + case '\t': *dst++ = '\\'; *dst++ = 't'; break; + default: + if (c >= ' ' && c < 127) *dst++ = c; + else + { + sprintf( dst, "\\%02x", c ); + dst += 3; + } + } + len--; + } + if (len) + { + *dst++ = '.'; + *dst++ = '.'; + *dst++ = '.'; + } + *dst = 0; + return strbuf; +} + static void check_output( WS_XML_WRITER *writer, const char *expected, unsigned int line ) { WS_BYTES bytes; @@ -351,7 +386,8 @@ static void check_output( WS_XML_WRITER *writer, const char *expected, unsigned ok( hr == S_OK, "%u: got %08x\n", line, hr ); ok( bytes.length == len, "%u: got %u expected %u\n", line, bytes.length, len ); if (bytes.length != len) return; - ok( !memcmp( bytes.bytes, expected, len ), "%u: got %s expected %s\n", line, bytes.bytes, expected ); + ok( !memcmp( bytes.bytes, expected, len ), + "%u: got %s expected %s\n", line, debugstr_bytes(bytes.bytes, bytes.length), expected ); } static void test_WsWriteStartElement(void)

1 0

Hugh McMaster : msvcrt: Fix typo in message_format array.
by Alexandre Julliard 23 Dec '16

23 Dec '16

Module: wine Branch: master Commit: 87c1ce80f3aef5d2b6b0aae429a91e383ef6dae2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87c1ce80f3aef5d2b6b0aae42… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Dec 23 11:38:56 2016 +0000 msvcrt: Fix typo in message_format array. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/exit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 2034ddf..318bafb 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -113,7 +113,7 @@ static void DoMessageBoxW(const MSVCRT_wchar_t *lead, const MSVCRT_wchar_t *mess static const MSVCRT_wchar_t message_format[] = {'%','s','\n','\n','P','r','o','g','r','a','m',':',' ','%','s','\n', '%','s','\n','\n','P','r','e','s','s',' ','O','K',' ','t','o',' ','e','x','i','t',' ','t','h','e',' ', 'p','r','o','g','r','a','m',',',' ','o','r',' ','C','a','n','c','e','l',' ','t','o',' ','s','t','a','r','t',' ', - 't','h','e',' ','W','i','n','e',' ','d','e','b','b','u','g','e','r','.','\n',0}; + 't','h','e',' ','W','i','n','e',' ','d','e','b','u','g','g','e','r','.','\n',0}; static const WCHAR title[] = {'W','i','n','e',' ','C','+','+',' ','R','u','n','t','i','m','e',' ','L','i','b','r','a','r','y',0};

1 0

Alex Henrie : msvcrt: Pass wide char caption string to MessageBoxIndirectW.
by Alexandre Julliard 23 Dec '16

23 Dec '16

Module: wine Branch: master Commit: df37daf175fb9b47e23bc2591853bae6d7ed424f URL: http://source.winehq.org/git/wine.git/?a=commit;h=df37daf175fb9b47e23bc2591… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Dec 22 15:06:35 2016 -0700 msvcrt: Pass wide char caption string to MessageBoxIndirectW. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/exit.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 9ba0891..2034ddf 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -41,8 +41,6 @@ typedef struct MSVCRT__onexit_table_t MSVCRT__onexit_t *_end; } MSVCRT__onexit_table_t; -static const char szMsgBoxTitle[] = "Wine C++ Runtime Library"; - extern int MSVCRT_app_type; extern MSVCRT_wchar_t *MSVCRT__wpgmptr; @@ -116,6 +114,8 @@ static void DoMessageBoxW(const MSVCRT_wchar_t *lead, const MSVCRT_wchar_t *mess '%','s','\n','\n','P','r','e','s','s',' ','O','K',' ','t','o',' ','e','x','i','t',' ','t','h','e',' ', 'p','r','o','g','r','a','m',',',' ','o','r',' ','C','a','n','c','e','l',' ','t','o',' ','s','t','a','r','t',' ', 't','h','e',' ','W','i','n','e',' ','d','e','b','b','u','g','e','r','.','\n',0}; + static const WCHAR title[] = + {'W','i','n','e',' ','C','+','+',' ','R','u','n','t','i','m','e',' ','L','i','b','r','a','r','y',0}; MSGBOXPARAMSW msgbox; MSVCRT_wchar_t text[2048]; @@ -126,8 +126,8 @@ static void DoMessageBoxW(const MSVCRT_wchar_t *lead, const MSVCRT_wchar_t *mess msgbox.cbSize = sizeof(msgbox); msgbox.hwndOwner = GetActiveWindow(); msgbox.hInstance = 0; - msgbox.lpszText = (LPCWSTR)text; - msgbox.lpszCaption = (LPCWSTR)szMsgBoxTitle; + msgbox.lpszText = text; + msgbox.lpszCaption = title; msgbox.dwStyle = MB_OKCANCEL|MB_ICONERROR; msgbox.lpszIcon = NULL; msgbox.dwContextHelpId = 0;

1 0

André Hentschel : hlink/tests: Ignore single character fails on Win10.
by Alexandre Julliard 23 Dec '16

23 Dec '16

Module: wine Branch: master Commit: 00c47a2a09b8bb142bd4e4e622ef9b5f8feab8ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=00c47a2a09b8bb142bd4e4e62… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 20 23:21:26 2016 +0100 hlink/tests: Ignore single character fails on Win10. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hlink/tests/hlink.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index 8a01f19..42fe6cb 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -400,6 +400,11 @@ static void test_persist_save_data(const char *testname, IHlink *lnk, same = TRUE; for (i = 0; i < min(data_size, expected_data_alt_size); i++) { + if ((expected_data_alt == expected_hlink_data_ie7 && i == 89) /* Win10 */ || + (expected_data_alt == expected_hlink_data2_ie7 && i == 109) /* Win10 */ || + (expected_data_alt == expected_hlink_data3_ie7 && i == 109) /* Win10 */ || + (expected_data_alt == expected_hlink_data5_ie7 && i == 107) /* Win10 */) + continue; if ((expected_data_alt[i] != data[i]) && (((expected_data_alt != expected_hlink_data2) && (expected_data_alt != expected_hlink_data3)) ||

1 0

Nikolay Sivov : mscoree: Free argument buffer on error (Coverity).
by Alexandre Julliard 23 Dec '16

23 Dec '16

Module: wine Branch: master Commit: cee34cb14125d981183f57c7463fc5647c8a2e50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cee34cb14125d981183f57c74… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 22 13:23:22 2016 +0300 mscoree: Free argument buffer on error (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 86eb759..eed96da 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1423,7 +1423,10 @@ __int32 WINAPI _CorExeMain(void) filenameA = WtoA(filename); if (!filenameA) + { + HeapFree(GetProcessHeap(), 0, argv); return -1; + } FixupVTable(GetModuleHandleW(NULL));

1 0

Nikolay Sivov : winspool: Fix potential string buffer leaks (Coverity).
by Alexandre Julliard 23 Dec '16

23 Dec '16

Module: wine Branch: master Commit: 614ad0c8c284d6a75039704fe8340b542d7a02f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=614ad0c8c284d6a75039704fe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 22 13:02:02 2016 +0300 winspool: Fix potential string buffer leaks (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 2c6a816..f09745d 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -8565,17 +8565,17 @@ LPSTR WINAPI StartDocDlgA( HANDLE hPrinter, DOCINFOA *doc ) if (doc->lpszDocName) { docnameW = asciitounicode(&usBuffer, doc->lpszDocName); - if (!(docW.lpszDocName = docnameW)) return NULL; + if (!(docW.lpszDocName = docnameW)) goto failed; } if (doc->lpszOutput) { outputW = asciitounicode(&usBuffer, doc->lpszOutput); - if (!(docW.lpszOutput = outputW)) return NULL; + if (!(docW.lpszOutput = outputW)) goto failed; } if (doc->lpszDatatype) { datatypeW = asciitounicode(&usBuffer, doc->lpszDatatype); - if (!(docW.lpszDatatype = datatypeW)) return NULL; + if (!(docW.lpszDatatype = datatypeW)) goto failed; } docW.fwType = doc->fwType; @@ -8589,6 +8589,7 @@ LPSTR WINAPI StartDocDlgA( HANDLE hPrinter, DOCINFOA *doc ) HeapFree(GetProcessHeap(), 0, retW); } +failed: HeapFree(GetProcessHeap(), 0, datatypeW); HeapFree(GetProcessHeap(), 0, outputW); HeapFree(GetProcessHeap(), 0, docnameW);

1 0

Nikolay Sivov : winspool: Initialize string pointers passed to StartDocDlgW() (Coverity).
by Alexandre Julliard 23 Dec '16

23 Dec '16

Module: wine Branch: master Commit: a3aad9d80fb2cf0bbfee6f3741e89c5a7c44ca13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3aad9d80fb2cf0bbfee6f374… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 22 13:02:01 2016 +0300 winspool: Initialize string pointers passed to StartDocDlgW() (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 39ae4eb..2c6a816 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -8556,7 +8556,7 @@ end: LPSTR WINAPI StartDocDlgA( HANDLE hPrinter, DOCINFOA *doc ) { UNICODE_STRING usBuffer; - DOCINFOW docW; + DOCINFOW docW = { 0 }; LPWSTR retW; LPWSTR docnameW = NULL, outputW = NULL, datatypeW = NULL; LPSTR ret = NULL;

1 0

Alexandre Julliard : msvcirt/tests: Silence a compiler warning.
by Alexandre Julliard 22 Dec '16

22 Dec '16

Module: wine Branch: master Commit: c28816cc378a580258bfb35a8fc8a32d1b40afde URL: http://source.winehq.org/git/wine.git/?a=commit;h=c28816cc378a580258bfb35a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 22 15:07:05 2016 +0100 msvcirt/tests: Silence a compiler warning. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/tests/msvcirt.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 2234abf..63582e8 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -2122,14 +2122,14 @@ static void test_strstreambuf(void) ok(ssb1.base.allocated == 0, "wrong allocate value, expected 0 got %d\n", ssb1.base.allocated); ok(ssb1.base.unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", ssb1.base.unbuffered); ok(ssb1.base.base == buffer, "wrong buffer, expected %p got %p\n", buffer, ssb1.base.base); - ok(ssb1.base.ebuf == buffer + 0x7fffffff || ssb1.base.ebuf == (char*)-1, + ok(ssb1.base.ebuf == (char *)((ULONG_PTR)buffer + 0x7fffffff) || ssb1.base.ebuf == (char*)-1, "wrong buffer end, expected %p + 0x7fffffff or -1, got %p\n", buffer, ssb1.base.ebuf); ok(ssb1.base.eback == buffer, "wrong get base, expected %p got %p\n", buffer, ssb1.base.eback); ok(ssb1.base.gptr == buffer, "wrong get pointer, expected %p got %p\n", buffer, ssb1.base.gptr); ok(ssb1.base.egptr == buffer + 20, "wrong get end, expected %p got %p\n", buffer + 20, ssb1.base.egptr); ok(ssb1.base.pbase == buffer + 20, "wrong put base, expected %p got %p\n", buffer + 20, ssb1.base.pbase); ok(ssb1.base.pptr == buffer + 20, "wrong put pointer, expected %p got %p\n", buffer + 20, ssb1.base.pptr); - ok(ssb1.base.epptr == buffer + 0x7fffffff || ssb1.base.epptr == (char*)-1, + ok(ssb1.base.epptr == (char *)((ULONG_PTR)buffer + 0x7fffffff) || ssb1.base.epptr == (char*)-1, "wrong put end, expected %p + 0x7fffffff or -1, got %p\n", buffer, ssb1.base.epptr); ok(ssb1.dynamic == 0, "expected 0, got %d\n", ssb1.dynamic); ok(ssb1.constant == 1, "expected 1, got %d\n", ssb1.constant); @@ -4208,14 +4208,14 @@ static void test_ostrstream(void) ok(pssb->base.allocated == 0, "wrong allocate value, expected 0 got %d\n", pssb->base.allocated); ok(pssb->base.unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", pssb->base.unbuffered); ok(pssb->base.base == buffer, "wrong buffer, expected %p got %p\n", buffer, pssb->base.base); - ok(pssb->base.ebuf == buffer + 0x7fffffff || pssb->base.ebuf == (char*) -1, + ok(pssb->base.ebuf == (char *)((ULONG_PTR)buffer + 0x7fffffff) || pssb->base.ebuf == (char*) -1, "wrong buffer end, expected %p + 0x7fffffff or -1, got %p\n", buffer, pssb->base.ebuf); ok(pssb->base.eback == buffer, "wrong get base, expected %p got %p\n", buffer, pssb->base.eback); ok(pssb->base.gptr == buffer, "wrong get pointer, expected %p got %p\n", buffer, pssb->base.gptr); ok(pssb->base.egptr == buffer, "wrong get end, expected %p got %p\n", buffer, pssb->base.egptr); ok(pssb->base.pbase == buffer, "wrong put base, expected %p got %p\n", buffer, pssb->base.pbase); ok(pssb->base.pptr == buffer + 4, "wrong put pointer, expected %p got %p\n", buffer + 4, pssb->base.pptr); - ok(pssb->base.epptr == buffer + 0x7fffffff || pssb->base.epptr == (char*) -1, + ok(pssb->base.epptr == (char *)((ULONG_PTR)buffer + 0x7fffffff) || pssb->base.epptr == (char*) -1, "wrong buffer end, expected %p + 0x7fffffff or -1, got %p\n", buffer, pssb->base.epptr); ok(pssb->base.do_lock == -1, "expected -1 got %d\n", pssb->base.do_lock); call_func1(p_ostrstream_dtor, &os1.base_ios); @@ -6858,14 +6858,14 @@ static void test_strstream(void) ok(pssb->base.allocated == 0, "wrong allocate value, expected 0 got %d\n", pssb->base.allocated); ok(pssb->base.unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", pssb->base.unbuffered); ok(pssb->base.base == buffer, "wrong buffer, expected %p got %p\n", buffer, pssb->base.base); - ok(pssb->base.ebuf == buffer + 0x7fffffff || pssb->base.ebuf == (char*) -1, + ok(pssb->base.ebuf == (char *)((ULONG_PTR)buffer + 0x7fffffff) || pssb->base.ebuf == (char*) -1, "wrong buffer end, expected %p + 0x7fffffff or -1, got %p\n", buffer, pssb->base.ebuf); ok(pssb->base.eback == buffer, "wrong get base, expected %p got %p\n", buffer, pssb->base.eback); ok(pssb->base.gptr == buffer, "wrong get pointer, expected %p got %p\n", buffer, pssb->base.gptr); ok(pssb->base.egptr == buffer, "wrong get end, expected %p got %p\n", buffer, pssb->base.egptr); ok(pssb->base.pbase == buffer, "wrong put base, expected %p got %p\n", buffer, pssb->base.pbase); ok(pssb->base.pptr == buffer, "wrong put pointer, expected %p got %p\n", buffer, pssb->base.pptr); - ok(pssb->base.epptr == buffer + 0x7fffffff || pssb->base.epptr == (char*) -1, + ok(pssb->base.epptr == (char *)((ULONG_PTR)buffer + 0x7fffffff) || pssb->base.epptr == (char*) -1, "wrong buffer end, expected %p + 0x7fffffff or -1, got %p\n", buffer, pssb->base.epptr); ok(pssb->base.do_lock == -1, "expected -1 got %d\n", pssb->base.do_lock); call_func1(p_strstream_vbase_dtor, &ios1);

1 0

Piotr Caban : msvcrt/tests: Correctly declare base class to avoid a compiler warning.
by Alexandre Julliard 22 Dec '16

22 Dec '16

Module: wine Branch: master Commit: da071d939fb5acb3bfcf197a29806d0b6b65891b URL: http://source.winehq.org/git/wine.git/?a=commit;h=da071d939fb5acb3bfcf197a2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 22 15:06:25 2016 +0100 msvcrt/tests: Correctly declare base class to avoid a compiler warning. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/cpp.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index 490ddee..cf5e4c7 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -969,7 +969,11 @@ static void test_rtti(void) void *child_class_sig0 = &child_class_sig0_vtbl[1]; void *virtual_base_class_vtbl[2] = {&virtual_base_class_rtti.object_locator}; int virtual_base_class_vbtbl[2] = {0, 0x100}; - void *virtual_base_class[2] = {&virtual_base_class_vtbl[1], virtual_base_class_vbtbl}; + struct { + void *virtual_base[2]; + char data[0x110-sizeof(void*)]; + void *vbthis; + } virtual_base_class = { {&virtual_base_class_vtbl[1], virtual_base_class_vbtbl} }; static const char* e_name = "name"; type_info *ti,*bti; @@ -1082,7 +1086,7 @@ static void test_rtti(void) ok(casted == (char*)&child_class+4, "failed cast to child class (%p %p)\n", casted, &child_class); casted = p__RTDynamicCast(&virtual_base_class, 0, &virtual_base_class_rtti.type_info[0], &virtual_base_class_rtti.type_info[1], 0); - ok(casted == (char*)&virtual_base_class+0x110+sizeof(void*), "failed cast to child class (%p %p)\n", casted, &virtual_base_class); + ok(casted == &virtual_base_class.vbthis, "failed cast to child class (%p %p)\n", casted, &virtual_base_class); } struct _demangle {

1 0

Alexandre Julliard : wineconsole: Leave room for wide characters only when using a DBCS codepage.
by Alexandre Julliard 22 Dec '16

22 Dec '16

Module: wine Branch: master Commit: 29533e4844761c499c16be73e2db7dc055776fdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=29533e4844761c499c16be73e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 22 14:23:54 2016 +0100 wineconsole: Leave room for wide characters only when using a DBCS codepage. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/user.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index eb68373..316c011 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -449,6 +449,7 @@ HFONT WCUSER_CopyFont(struct config_data* config, HWND hWnd, const LOGFONTW* lf, TEXTMETRICW tm; HDC hDC; HFONT hFont, hOldFont; + CPINFO cpinfo; if (!(hDC = GetDC(hWnd))) return NULL; if (!(hFont = CreateFontIndirectW(lf))) @@ -461,12 +462,16 @@ HFONT WCUSER_CopyFont(struct config_data* config, HWND hWnd, const LOGFONTW* lf, SelectObject(hDC, hOldFont); ReleaseDC(hWnd, hDC); - config->cell_width = tm.tmMaxCharWidth; + config->cell_width = tm.tmAveCharWidth; config->cell_height = tm.tmHeight + tm.tmExternalLeading; config->font_weight = tm.tmWeight; lstrcpyW(config->face_name, lf->lfFaceName); if (el) *el = tm.tmExternalLeading; + /* FIXME: use maximum width for DBCS codepages since some chars take two cells */ + if (GetCPInfo( GetConsoleOutputCP(), &cpinfo ) && cpinfo.MaxCharSize > 1) + config->cell_width = tm.tmMaxCharWidth; + return hFont; }

1 0

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 December 2016