April 2016 - Wine-commits - list.winehq.org

Nikolay Sivov : ucrtbase: Implement _initialize_onexit_table().
by Alexandre Julliard 26 Apr '16

26 Apr '16

Module: wine Branch: master Commit: 4551b72e75c6932f6d48d0a603d683ada2cec15f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4551b72e75c6932f6d48d0a60… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 26 14:13:39 2016 +0300 ucrtbase: Implement _initialize_onexit_table(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-runtime-l1-1-0.spec | 2 +- dlls/msvcrt/exit.c | 23 +++++ dlls/ucrtbase/tests/Makefile.in | 1 + dlls/ucrtbase/tests/misc.c | 112 +++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 5 files changed, 138 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec index 5a41548..9c36583 100644 --- a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec @@ -52,7 +52,7 @@ @ cdecl _getdllprocaddr(long str long) ucrtbase._getdllprocaddr @ cdecl _getpid() ucrtbase._getpid @ cdecl _initialize_narrow_environment() ucrtbase._initialize_narrow_environment -@ stub _initialize_onexit_table +@ cdecl _initialize_onexit_table(ptr) ucrtbase._initialize_onexit_table @ cdecl _initialize_wide_environment() ucrtbase._initialize_wide_environment @ cdecl _initterm(ptr ptr) ucrtbase._initterm @ cdecl _initterm_e(ptr ptr) ucrtbase._initterm_e diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 610525d..0cddd3f 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -34,6 +34,13 @@ static int MSVCRT_atexit_table_size = 0; static int MSVCRT_atexit_registered = 0; /* Points to free slot */ static MSVCRT_purecall_handler purecall_handler = NULL; +typedef struct MSVCRT__onexit_table_t +{ + MSVCRT__onexit_t *_first; + MSVCRT__onexit_t *_last; + MSVCRT__onexit_t *_end; +} MSVCRT__onexit_table_t; + static const char szMsgBoxTitle[] = "Wine C++ Runtime Library"; extern int MSVCRT_app_type; @@ -334,6 +341,22 @@ int CDECL MSVCRT__crt_atexit(void (*func)(void)) return MSVCRT__onexit((MSVCRT__onexit_t)func) == (MSVCRT__onexit_t)func ? 0 : -1; } + +/********************************************************************* + * _initialize_onexit_table (UCRTBASE.@) + */ +int CDECL MSVCRT__initialize_onexit_table(MSVCRT__onexit_table_t *table) +{ + TRACE("(%p)\n", table); + + if (!table) + return -1; + + if (table->_first == table->_end) + table->_last = table->_end = table->_first = NULL; + return 0; +} + /********************************************************************* * _set_purecall_handler (MSVCR71.@) */ diff --git a/dlls/ucrtbase/tests/Makefile.in b/dlls/ucrtbase/tests/Makefile.in index 10e4f0d..bdd259d 100644 --- a/dlls/ucrtbase/tests/Makefile.in +++ b/dlls/ucrtbase/tests/Makefile.in @@ -3,5 +3,6 @@ APPMODE = -mno-cygwin C_SRCS = \ cpp.c \ + misc.c \ printf.c \ string.c diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c new file mode 100644 index 0000000..5e22601 --- /dev/null +++ b/dlls/ucrtbase/tests/misc.c @@ -0,0 +1,112 @@ +/* + * Copyright 2016 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <errno.h> +#include <stdarg.h> +#include <stdlib.h> +#include <wchar.h> +#include <stdio.h> + +#include <windef.h> +#include <winbase.h> +#include "wine/test.h" + +typedef int (CDECL *MSVCRT__onexit_t)(void); + +typedef struct MSVCRT__onexit_table_t +{ + MSVCRT__onexit_t *_first; + MSVCRT__onexit_t *_last; + MSVCRT__onexit_t *_end; +} MSVCRT__onexit_table_t; + +static int (CDECL *p_initialize_onexit_table)(MSVCRT__onexit_table_t *table); + +static void test__initialize_onexit_table(void) +{ + MSVCRT__onexit_table_t table, table2; + int ret; + + if (!p_initialize_onexit_table) + { + win_skip("_initialize_onexit_table() is not available.\n"); + return; + } + + ret = p_initialize_onexit_table(NULL); + ok(ret == -1, "got %d\n", ret); + + memset(&table, 0, sizeof(table)); + ret = p_initialize_onexit_table(&table); + ok(ret == 0, "got %d\n", ret); + ok(table._first == table._last && table._first == table._end, "got first %p, last %p, end %p\n", + table._first, table._last, table._end); + + memset(&table2, 0, sizeof(table2)); + ret = p_initialize_onexit_table(&table2); + ok(ret == 0, "got %d\n", ret); + ok(table2._first == table._first, "got %p, %p\n", table2._first, table._first); + + /* uninitialized table */ + table._first = table._last = table._end = (void*)0x123; + ret = p_initialize_onexit_table(&table); + ok(ret == 0, "got %d\n", ret); + ok(table._first == table._last && table._first == table._end, "got first %p, last %p, end %p\n", + table._first, table._last, table._end); + ok(table._first != (void*)0x123, "got %p\n", table._first); + + table._first = (void*)0x123; + table._last = (void*)0x456; + table._end = (void*)0x123; + ret = p_initialize_onexit_table(&table); + ok(ret == 0, "got %d\n", ret); + ok(table._first == table._last && table._first == table._end, "got first %p, last %p, end %p\n", + table._first, table._last, table._end); + ok(table._first != (void*)0x123, "got %p\n", table._first); + + table._first = (void*)0x123; + table._last = (void*)0x456; + table._end = (void*)0x789; + ret = p_initialize_onexit_table(&table); + ok(ret == 0, "got %d\n", ret); + ok(table._first == (void*)0x123, "got %p\n", table._first); + ok(table._last == (void*)0x456, "got %p\n", table._last); + ok(table._end == (void*)0x789, "got %p\n", table._end); + + table._first = NULL; + table._last = (void*)0x456; + table._end = NULL; + ret = p_initialize_onexit_table(&table); + ok(ret == 0, "got %d\n", ret); + ok(table._first == table._last && table._first == table._end, "got first %p, last %p, end %p\n", + table._first, table._last, table._end); +} + +static void init(void) +{ + HMODULE module = LoadLibraryA("ucrtbase.dll"); + + p_initialize_onexit_table = (void*)GetProcAddress(module, "_initialize_onexit_table"); +} + +START_TEST(misc) +{ + init(); + + test__initialize_onexit_table(); +} diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index a54a71a..c436779 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -419,7 +419,7 @@ @ cdecl _i64tow(int64 ptr long) ntdll._i64tow @ cdecl _i64tow_s(int64 ptr long long) MSVCRT__i64tow_s @ cdecl _initialize_narrow_environment() -@ stub _initialize_onexit_table +@ cdecl _initialize_onexit_table(ptr) MSVCRT__initialize_onexit_table @ cdecl _initialize_wide_environment() @ cdecl _initterm(ptr ptr) @ cdecl _initterm_e(ptr ptr)

1 0

Nikolay Sivov : ucrtbase: Implement _register_onexit_function().
by Alexandre Julliard 26 Apr '16

26 Apr '16

Module: wine Branch: master Commit: 5f490de4592eccc08681fa8131670ca6826a5dbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f490de4592eccc08681fa813… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 26 14:13:40 2016 +0300 ucrtbase: Implement _register_onexit_function(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-runtime-l1-1-0.spec | 2 +- dlls/msvcrt/exit.c | 42 +++++++++++++++++++++ dlls/ucrtbase/tests/misc.c | 44 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 4 files changed, 88 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec index 9c36583..ceb4e35 100644 --- a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec @@ -60,7 +60,7 @@ @ stub _invalid_parameter_noinfo_noreturn @ stub _invoke_watson @ stub _query_app_type -@ stub _register_onexit_function +@ cdecl _register_onexit_function(ptr ptr) ucrtbase._register_onexit_function @ stub _register_thread_local_exe_atexit_callback @ cdecl _resetstkoflw() ucrtbase._resetstkoflw @ cdecl -arch=i386,x86_64,arm _seh_filter_dll(long ptr) ucrtbase._seh_filter_dll diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 0cddd3f..60aa85d 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -358,6 +358,48 @@ int CDECL MSVCRT__initialize_onexit_table(MSVCRT__onexit_table_t *table) } /********************************************************************* + * _register_onexit_function (UCRTBASE.@) + */ +int CDECL MSVCRT__register_onexit_function(MSVCRT__onexit_table_t *table, MSVCRT__onexit_t func) +{ + TRACE("(%p %p)\n", table, func); + + if (!table) + return -1; + + if (!table->_first) + { + table->_first = MSVCRT_calloc(32, sizeof(void *)); + if (!table->_first) + { + WARN("failed to allocate initial table.\n"); + return -1; + } + table->_last = table->_first; + table->_end = table->_first + 32; + } + + /* grow if full */ + if (table->_last == table->_end) + { + int len = table->_end - table->_first; + MSVCRT__onexit_t *tmp = MSVCRT_realloc(table->_first, 2 * len * sizeof(void *)); + if (!tmp) + { + WARN("failed to grow table.\n"); + return -1; + } + table->_first = tmp; + table->_end = table->_first + 2 * len; + table->_last = table->_first + len; + } + + *table->_last = func; + table->_last++; + return 0; +} + +/********************************************************************* * _set_purecall_handler (MSVCR71.@) */ MSVCRT_purecall_handler CDECL _set_purecall_handler(MSVCRT_purecall_handler function) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 5e22601..0b77066 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -36,6 +36,7 @@ typedef struct MSVCRT__onexit_table_t } MSVCRT__onexit_table_t; static int (CDECL *p_initialize_onexit_table)(MSVCRT__onexit_table_t *table); +static int (CDECL *p_register_onexit_function)(MSVCRT__onexit_table_t *table, MSVCRT__onexit_t func); static void test__initialize_onexit_table(void) { @@ -97,11 +98,53 @@ static void test__initialize_onexit_table(void) table._first, table._last, table._end); } +static int CDECL onexit_func(void) +{ + return 0; +} + +static void test__register_onexit_function(void) +{ + MSVCRT__onexit_table_t table; + MSVCRT__onexit_t *f; + int ret; + + if (!p_register_onexit_function) + { + win_skip("_register_onexit_function() is not available.\n"); + return; + } + + memset(&table, 0, sizeof(table)); + ret = p_initialize_onexit_table(&table); + ok(ret == 0, "got %d\n", ret); + + ret = p_register_onexit_function(NULL, NULL); + ok(ret == -1, "got %d\n", ret); + + ret = p_register_onexit_function(NULL, onexit_func); + ok(ret == -1, "got %d\n", ret); + + f = table._last; + ret = p_register_onexit_function(&table, NULL); + ok(ret == 0, "got %d\n", ret); + ok(f != table._last, "got %p, initial %p\n", table._last, f); + + ret = p_register_onexit_function(&table, onexit_func); + ok(ret == 0, "got %d\n", ret); + + f = table._last; + ret = p_register_onexit_function(&table, onexit_func); + ok(ret == 0, "got %d\n", ret); + ok(f != table._last, "got %p, initial %p\n", table._last, f); +} + static void init(void) { HMODULE module = LoadLibraryA("ucrtbase.dll"); p_initialize_onexit_table = (void*)GetProcAddress(module, "_initialize_onexit_table"); + p_register_onexit_function = (void*)GetProcAddress(module, "_register_onexit_function"); } START_TEST(misc) @@ -109,4 +152,5 @@ START_TEST(misc) init(); test__initialize_onexit_table(); + test__register_onexit_function(); } diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index c436779..3ac30eb 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1861,7 +1861,7 @@ @ cdecl _read(long ptr long) MSVCRT__read @ stub _realloc_base @ cdecl _recalloc(ptr long long) -@ stub _register_onexit_function +@ cdecl _register_onexit_function(ptr ptr) MSVCRT__register_onexit_function @ stub _register_thread_local_exe_atexit_callback @ cdecl _resetstkoflw() MSVCRT__resetstkoflw @ cdecl _rmdir(str) MSVCRT__rmdir

1 0

Francois Gouget : riched20: Fix a spelling error in a dump message.
by Alexandre Julliard 26 Apr '16

26 Apr '16

Module: wine Branch: master Commit: ca147f51f06bbaf8015460374681cc0c67b2deeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca147f51f06bbaf8015460374… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Apr 23 07:48:39 2016 +0200 riched20: Fix a spelling error in a dump message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/para.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 3ea98c5..6721698 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -506,7 +506,7 @@ void ME_DumpParaStyleToBuf(const PARAFORMAT2 *pFmt, char buf[2048]) DUMP(PFM_STYLE, "Text style:", "%d", sStyle); DUMP(PFM_LINESPACING, "Line spacing rule:", "%u", bLineSpacingRule); /* bOutlineLevel should be 0 */ - DUMP(PFM_SHADING, "Shading Weigth:", "%u", wShadingWeight); + DUMP(PFM_SHADING, "Shading Weight:", "%u", wShadingWeight); DUMP(PFM_SHADING, "Shading Style:", "%u", wShadingStyle); DUMP(PFM_NUMBERINGSTART, "Numbering Start:", "%u", wNumberingStart); DUMP(PFM_NUMBERINGSTYLE, "Numbering Style:", "0x%x", wNumberingStyle);

1 0

Francois Gouget : ole32: Fix a typo in a TRACE() message.
by Alexandre Julliard 26 Apr '16

26 Apr '16

Module: wine Branch: master Commit: 1ec8fa53db86c54d5b023927fdf83a460116d7d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ec8fa53db86c54d5b023927f… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Apr 23 07:48:48 2016 +0200 ole32: Fix a typo in a TRACE() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/marshal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 73b9409..bdde38b 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -1776,7 +1776,7 @@ HRESULT WINAPI CoMarshalInterface(IStream *pStream, REFIID riid, IUnknown *pUnk, } } - TRACE("Calling IMarshal::MarshalInterace\n"); + TRACE("Calling IMarshal::MarshalInterface\n"); /* call helper object to do the actual marshaling */ hr = IMarshal_MarshalInterface(pMarshal, pStream, riid, pUnk, dwDestContext, pvDestContext, mshlFlags);

1 0

Alex Henrie : shell32: Add SHLimitInputEdit stub.
by Alexandre Julliard 26 Apr '16

26 Apr '16

Module: wine Branch: master Commit: 1dc0669894676db648d1222627f4de5f75396ff1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dc0669894676db648d122262… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Apr 25 21:13:04 2016 -0600 shell32: Add SHLimitInputEdit stub. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.spec | 1 + dlls/shell32/shlfolder.c | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 93fd449..7ebd032 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -264,6 +264,7 @@ 727 stdcall SHGetImageList(long ptr ptr) 730 stdcall -noname RestartDialogEx(long wstr long long) 743 stdcall SHCreateFileExtractIconW(wstr long ptr ptr) + 747 stdcall SHLimitInputEdit(ptr ptr) 1217 stub FOOBAR1217 # no joke! This is the real name!! diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index 46ccc56..c39d968 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -600,3 +600,12 @@ HRESULT WINAPI SHGetSetFolderCustomSettings( LPSHFOLDERCUSTOMSETTINGS fcs, LPCST FIXME("%p %s 0x%x: stub\n", fcs, path, flag); return E_NOTIMPL; } + +/*********************************************************************** + * SHLimitInputEdit (SHELL32.747) + */ +HRESULT WINAPI SHLimitInputEdit( HWND textbox, IShellFolder *folder ) +{ + FIXME("%p %p: stub\n", textbox, folder); + return E_NOTIMPL; +}

1 0

Austin English : hal: Add READ_PORT_UCHAR stub.
by Alexandre Julliard 26 Apr '16

26 Apr '16

Module: wine Branch: master Commit: d830f508834c2d55c0a58a2340f9585863425193 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d830f508834c2d55c0a58a234… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Apr 25 23:47:05 2016 -0500 hal: Add READ_PORT_UCHAR stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hal/hal.c | 6 ++++++ dlls/hal/hal.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/hal/hal.c b/dlls/hal/hal.c index bca688e..79bbfed 100644 --- a/dlls/hal/hal.c +++ b/dlls/hal/hal.c @@ -156,6 +156,12 @@ KIRQL WINAPI KeGetCurrentIrql(VOID) return 0; } +UCHAR WINAPI READ_PORT_UCHAR(UCHAR *port) +{ + FIXME("(%p) stub!\n", port); + return 0; +} + ULONG WINAPI READ_PORT_ULONG(ULONG *port) { FIXME("(%p) stub!\n", port); diff --git a/dlls/hal/hal.spec b/dlls/hal/hal.spec index 02f778c..071eba5 100644 --- a/dlls/hal/hal.spec +++ b/dlls/hal/hal.spec @@ -81,7 +81,7 @@ @ stub READ_PORT_BUFFER_UCHAR @ stub READ_PORT_BUFFER_ULONG @ stub READ_PORT_BUFFER_USHORT -@ stub READ_PORT_UCHAR +@ stdcall READ_PORT_UCHAR(ptr) @ stdcall READ_PORT_ULONG(ptr) @ stub READ_PORT_USHORT @ stub WRITE_PORT_BUFFER_UCHAR

1 0

Austin English : hal: Add WRITE_PORT_ULONG stub.
by Alexandre Julliard 26 Apr '16

26 Apr '16

Module: wine Branch: master Commit: e507e59bce09ff1041571defbba4d1e3d6bf5160 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e507e59bce09ff1041571defb… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Apr 25 23:47:28 2016 -0500 hal: Add WRITE_PORT_ULONG stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hal/hal.c | 5 +++++ dlls/hal/hal.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/hal/hal.c b/dlls/hal/hal.c index 79bbfed..0b2e422 100644 --- a/dlls/hal/hal.c +++ b/dlls/hal/hal.c @@ -167,3 +167,8 @@ ULONG WINAPI READ_PORT_ULONG(ULONG *port) FIXME("(%p) stub!\n", port); return 0; } + +void WINAPI WRITE_PORT_ULONG(ULONG *port, ULONG value) +{ + FIXME("(%p %d) stub!\n", port, value); +} diff --git a/dlls/hal/hal.spec b/dlls/hal/hal.spec index 071eba5..c21806c 100644 --- a/dlls/hal/hal.spec +++ b/dlls/hal/hal.spec @@ -88,5 +88,5 @@ @ stub WRITE_PORT_BUFFER_ULONG @ stub WRITE_PORT_BUFFER_USHORT @ stub WRITE_PORT_UCHAR -@ stub WRITE_PORT_ULONG +@ stdcall WRITE_PORT_ULONG(ptr long) @ stub WRITE_PORT_USHORT

1 0

Hugh McMaster : kernel32/tests: Add initial tests for GetConsoleFontInfo.
by Alexandre Julliard 26 Apr '16

26 Apr '16

Module: wine Branch: master Commit: de13e818ce3f44fe57898862e7d5828d39a94d98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de13e818ce3f44fe57898862e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Apr 26 12:06:51 2016 +0000 kernel32/tests: Add initial tests for GetConsoleFontInfo. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 74 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 4dca17d..3f627be 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2779,6 +2779,79 @@ static void test_GetLargestConsoleWindowSize(HANDLE std_output) pSetConsoleFont(std_output, index); /* restore original font size */ } +static void test_GetConsoleFontInfo(HANDLE std_output) +{ + HANDLE hmod; + BOOL (WINAPI *pGetConsoleFontInfo)(HANDLE, BOOL, DWORD, CONSOLE_FONT_INFO *); + DWORD (WINAPI *pGetNumberOfConsoleFonts)(void); + DWORD num_fonts, index, i; + int memsize, win_width, win_height, tmp_w, tmp_h; + CONSOLE_FONT_INFO *cfi; + BOOL ret; + CONSOLE_SCREEN_BUFFER_INFO csbi; + COORD orig_font, tmp_font; + + hmod = GetModuleHandleA("kernel32.dll"); + pGetConsoleFontInfo = (void *)GetProcAddress(hmod, "GetConsoleFontInfo"); + if (!pGetConsoleFontInfo) + { + win_skip("GetConsoleFontInfo is not available\n"); + return; + } + + pGetNumberOfConsoleFonts = (void *)GetProcAddress(hmod, "GetNumberOfConsoleFonts"); + if (!pGetNumberOfConsoleFonts) + { + win_skip("GetNumberOfConsoleFonts is not available\n"); + return; + } + + num_fonts = pGetNumberOfConsoleFonts(); + memsize = num_fonts * sizeof(CONSOLE_FONT_INFO); + cfi = HeapAlloc(GetProcessHeap(), 0, memsize); + memset(cfi, 0, memsize); + + SetLastError(0xdeadbeef); + ret = pGetConsoleFontInfo(NULL, FALSE, 0, cfi); + ok(!ret, "got %d, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetConsoleFontInfo(GetStdHandle(STD_INPUT_HANDLE), FALSE, 0, cfi); + ok(!ret, "got %d, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetConsoleFontInfo(std_output, FALSE, 0, cfi); + ok(!ret, "got %d, expected zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + GetConsoleScreenBufferInfo(std_output, &csbi); + win_width = csbi.srWindow.Right - csbi.srWindow.Left + 1; + win_height = csbi.srWindow.Bottom - csbi.srWindow.Top + 1; + + GetCurrentConsoleFont(std_output, FALSE, &cfi[0]); + index = cfi[0].nFont; + orig_font = GetConsoleFontSize(std_output, index); + + SetLastError(0xdeadbeef); + ret = pGetConsoleFontInfo(std_output, FALSE, num_fonts, cfi); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + ok(cfi[index].dwFontSize.X == win_width, "got %d, expected %d\n", cfi[index].dwFontSize.X, win_width); + ok(cfi[index].dwFontSize.Y == win_height, "got %d, expected %d\n", cfi[index].dwFontSize.Y, win_height); + + for (i = 0; i < num_fonts; i++) + { + tmp_font = GetConsoleFontSize(std_output, cfi[i].nFont); + tmp_w = (double)orig_font.X / tmp_font.X * win_width; + tmp_h = (double)orig_font.Y / tmp_font.Y * win_height; + ok(cfi[i].dwFontSize.X == tmp_w, "got %d, expected %d\n", cfi[i].dwFontSize.X, tmp_w); + ok(cfi[i].dwFontSize.Y == tmp_h, "got %d, expected %d\n", cfi[i].dwFontSize.Y, tmp_h); + } +} + START_TEST(console) { static const char font_name[] = "Lucida Console"; @@ -2925,4 +2998,5 @@ START_TEST(console) test_GetCurrentConsoleFont(hConOut); test_GetConsoleFontSize(hConOut); test_GetLargestConsoleWindowSize(hConOut); + test_GetConsoleFontInfo(hConOut); }

1 0

Damjan Jovanovic : winex11.drv: Improve some XDND log messages.
by Alexandre Julliard 26 Apr '16

26 Apr '16

Module: wine Branch: master Commit: d2314223aee8c1d1236de3f0bce5d93a8ea69d26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2314223aee8c1d1236de3f0b… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon Apr 25 02:59:07 2016 +0200 winex11.drv: Improve some XDND log messages. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xdnd.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index c83caea..0d18110 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -210,7 +210,7 @@ void X11DRV_XDND_EnterEvent( HWND hWnd, XClientMessageEvent *event ) if (version > WINE_XDND_VERSION) { - TRACE("Ignores unsupported version\n"); + ERR("ignoring unsupported XDND version %d\n", version); return; } @@ -345,8 +345,8 @@ void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) effect = DROPEFFECT_COPY; } - TRACE("action req: %ld accept(%d) at x(%d),y(%d)\n", - event->data.l[4], accept, XDNDxy.x, XDNDxy.y); + TRACE("actionRequested(%ld) accept(%d) chosen(0x%x) at x(%d),y(%d)\n", + event->data.l[4], accept, effect, XDNDxy.x, XDNDxy.y); /* * Let source know if we're accepting the drop by @@ -381,8 +381,6 @@ void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) int accept = 0; /* Assume we're not accepting */ BOOL drop_file = TRUE; - TRACE("\n"); - /* Notify OLE of Drop */ if (XDNDAccepted) { @@ -441,6 +439,9 @@ void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) } } + TRACE("effectRequested(0x%x) accept(%d) performed(0x%x) at x(%d),y(%d)\n", + XDNDDropEffect, accept, effect, XDNDxy.x, XDNDxy.y); + X11DRV_XDND_FreeDragDropOp(); /* Tell the target we are finished. */

1 0

Damjan Jovanovic : winex11.drv: Really ignore the drop effect returned from IDropTarget::DragEnter.
by Alexandre Julliard 26 Apr '16

26 Apr '16

Module: wine Branch: master Commit: cd5b868fa0e414cc400a936c532d63ac1dd6eb6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd5b868fa0e414cc400a936c5… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon Apr 25 03:00:11 2016 +0200 winex11.drv: Really ignore the drop effect returned from IDropTarget::DragEnter. Commit a2f3d9740642ca6d4a7c63175f7e8db34120c2b9 wanted to ignore the drop effect returned in IDropTarget::DragEnter, but never did so, instead it just copied effect to effect_ignore so it can later be logged. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xdnd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 0d18110..cbc917a 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -307,7 +307,7 @@ void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) { DWORD effect_ignore = effect; hr = IDropTarget_DragEnter(dropTarget, &XDNDDataObject, - MK_LBUTTON, pointl, &effect); + MK_LBUTTON, pointl, &effect_ignore); if (hr == S_OK) { XDNDAccepted = TRUE;

1 0