December 2018 - Wine-commits

Józef Kucia : tests: Skip stencil shader resource view tests on Windows AMD drivers.
by Alexandre Julliard 17 Dec '18

17 Dec '18

Module: vkd3d Branch: master Commit: 128dadaac1a5b9ef8c743a476753f84c19b994c9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=128dadaac1a5b9ef8c743a4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 13 10:28:42 2018 +0100 tests: Skip stencil shader resource view tests on Windows AMD drivers. 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> --- tests/d3d12.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 7fe54c9..7d67de2 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -14689,6 +14689,8 @@ static void test_depth_stencil_sampling(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { + vkd3d_test_set_context("Test %u", i); + reset_command_list(command_list, context.allocator); init_depth_stencil(&ds, device, context.render_target_desc.Width, @@ -14753,6 +14755,13 @@ static void test_depth_stencil_sampling(void) destroy_depth_stencil(&ds); continue; } + if (is_amd_device(device)) + { + skip("Reads from depth/stencil shader resource views return stale values on some AMD drivers.\n"); + destroy_depth_stencil(&ds); + continue; + } + srv_desc.Format = tests[i].stencil_view_format; srv_desc.Texture2D.PlaneSlice = 1; ID3D12Device_CreateShaderResourceView(device, texture, &srv_desc, srv_cpu_handle); @@ -14791,6 +14800,7 @@ static void test_depth_stencil_sampling(void) destroy_depth_stencil(&ds); } + vkd3d_test_set_context(NULL); ID3D12Resource_Release(cb); ID3D12DescriptorHeap_Release(srv_heap);

1 0

Alexandre Julliard : Wine release 4.0-rc2
by Alexandre Julliard 14 Dec '18

14 Dec '18

Module: website Branch: master Commit: 124e2925f4632dfe03dcf705273688d869404206 URL: https://source.winehq.org/git/website.git/?a=commit;h=124e2925f4632dfe03dcf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 14 18:57:28 2018 +0100 Wine release 4.0-rc2 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018121401.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/en/2018121401.xml b/news/en/2018121401.xml new file mode 100644 index 0000000..027a806 --- /dev/null +++ b/news/en/2018121401.xml @@ -0,0 +1,12 @@ +<news> +<date>December 14, 2018</date> +<title>Wine 4.0-rc2 Released</title> +<body> + The Wine development release 4.0-rc2 is now available. + <a href="{$root}/announce/4.0-rc2">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/4.0/wine-4.0-rc2.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Daniel Lehman : msvcrt/tests: Add tests for C locale.
by Alexandre Julliard 14 Dec '18

14 Dec '18

Module: wine Branch: master Commit: 6d7a03d2fa37fdb8ce5bd68e0d9e8b86dfed180f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d7a03d2fa37fdb8ce5bd68e… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Nov 26 20:18:11 2018 -0800 msvcrt/tests: Add tests for C locale. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 0568bcf..e80a518 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -89,6 +89,12 @@ static errno_t (__cdecl *p_mbslwr_s)(unsigned char *str, size_t numberOfElements static int (__cdecl *p_wctob)(wint_t); static size_t (__cdecl *p_wcrtomb)(char*, wchar_t, mbstate_t*); static int (__cdecl *p_tolower)(int); +static int (__cdecl *p_towlower)(wint_t); +static int (__cdecl *p__towlower_l)(wint_t, _locale_t); +static int (__cdecl *p_towupper)(wint_t); +static int (__cdecl *p__towupper_l)(wint_t, _locale_t); +static _locale_t(__cdecl *p__create_locale)(int, const char*); +static void(__cdecl *p__free_locale)(_locale_t); static size_t (__cdecl *p_mbrlen)(const char*, size_t, mbstate_t*); static size_t (__cdecl *p_mbrtowc)(wchar_t*, const char*, size_t, mbstate_t*); static int (__cdecl *p__atodbl_l)(_CRT_DOUBLE*,char*,_locale_t); @@ -3603,6 +3609,73 @@ static void test___strncnt(void) } } +static void test_C_locale(void) +{ + int i, j; + wint_t ret, exp; + _locale_t locale; + static const char *locales[] = { NULL, "C" }; + + /* C locale only converts case for [a-zA-Z] */ + setlocale(LC_ALL, "C"); + for (i = 0; i <= 0xffff; i++) + { + ret = p_towlower(i); + if (i >= 'A' && i <= 'Z') + { + exp = i + 'a' - 'A'; + ok(ret == exp, "expected %x, got %x for C locale\n", exp, ret); + } + else + todo_wine_if(ret != i) + ok(ret == i, "expected self %x, got %x for C locale\n", i, ret); + + ret = p_towupper(i); + if (i >= 'a' && i <= 'z') + { + exp = i + 'A' - 'a'; + ok(ret == exp, "expected %x, got %x for C locale\n", exp, ret); + } + else + todo_wine_if(ret != i) + ok(ret == i, "expected self %x, got %x for C locale\n", i, ret); + } + + if (!p__towlower_l || !p__towupper_l || !p__create_locale) + { + win_skip("_towlower_l/_towupper_l/_create_locale not available\n"); + return; + } + + for (i = 0; i < ARRAY_SIZE(locales); i++) { + locale = locales[i] ? p__create_locale(LC_ALL, locales[i]) : NULL; + + for (j = 0; j <= 0xffff; j++) { + ret = p__towlower_l(j, locale); + if (j >= 'A' && j <= 'Z') + { + exp = j + 'a' - 'A'; + ok(ret == exp, "expected %x, got %x for C locale\n", exp, ret); + } + else + todo_wine_if(ret != j) + ok(ret == j, "expected self %x, got %x for C locale\n", j, ret); + + ret = p__towupper_l(j, locale); + if (j >= 'a' && j <= 'z') + { + exp = j + 'A' - 'a'; + ok(ret == exp, "expected %x, got %x for C locale\n", exp, ret); + } + else + todo_wine_if(ret != j) + ok(ret == j, "expected self %x, got %x for C locale\n", j, ret); + } + + p__free_locale(locale); + } +} + START_TEST(string) { char mem[100]; @@ -3648,6 +3721,12 @@ START_TEST(string) p_wctob = (void*)GetProcAddress(hMsvcrt, "wctob"); p_wcrtomb = (void*)GetProcAddress(hMsvcrt, "wcrtomb"); p_tolower = (void*)GetProcAddress(hMsvcrt, "tolower"); + p_towlower = (void*)GetProcAddress(hMsvcrt, "towlower"); + p__towlower_l = (void*)GetProcAddress(hMsvcrt, "_towlower_l"); + p_towupper = (void*)GetProcAddress(hMsvcrt, "towupper"); + p__towupper_l = (void*)GetProcAddress(hMsvcrt, "_towupper_l"); + p__create_locale = (void*)GetProcAddress(hMsvcrt, "_create_locale"); + p__free_locale = (void*)GetProcAddress(hMsvcrt, "_free_locale"); p_mbrlen = (void*)GetProcAddress(hMsvcrt, "mbrlen"); p_mbrtowc = (void*)GetProcAddress(hMsvcrt, "mbrtowc"); p_mbsrtowcs = (void*)GetProcAddress(hMsvcrt, "mbsrtowcs"); @@ -3730,4 +3809,5 @@ START_TEST(string) test__tcsncoll(); test__tcsnicoll(); test___strncnt(); + test_C_locale(); }

1 0

Dmitry Timoshkov : comctl32/tests: Fix a test failure under Windows 7.
by Alexandre Julliard 14 Dec '18

14 Dec '18

Module: wine Branch: master Commit: 685a4b5062bf6b8d6c2171aca999a0411ce4b82e URL: https://source.winehq.org/git/wine.git/?a=commit;h=685a4b5062bf6b8d6c2171ac… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Dec 14 14:10:18 2018 +0300 comctl32/tests: Fix a test failure under Windows 7. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/misc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 85f339b..5e91a80 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -265,8 +265,7 @@ static void test_LoadIconWithScaleDown(void) /* non-existing filename */ hr = pLoadIconMetric(NULL, nonexisting_fileW, LIM_LARGE, &icon); - todo_wine - ok(hr == HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND), + ok(hr == HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND) || hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) /* Win7 */, "Expected HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND), got %x\n", hr); hr = pLoadIconWithScaleDown(NULL, nonexisting_fileW, 32, 32, &icon);

1 0

Dmitry Timoshkov : comctl32/tests: Add a test to check built-in comctl32 classes.
by Alexandre Julliard 14 Dec '18

14 Dec '18

Module: wine Branch: master Commit: bf4304211c3713b98a1e7712bd779eb38e599144 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf4304211c3713b98a1e7712… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Dec 14 14:10:26 2018 +0300 comctl32/tests: Add a test to check built-in comctl32 classes. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/misc.c | 58 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 44 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 5e91a80..c027852 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -338,7 +338,7 @@ static void test_LoadIconWithScaleDown(void) FreeLibrary(hinst); } -static void check_class( const char *name, int must_exist, UINT style, UINT ignore ) +static void check_class( const char *name, int must_exist, UINT style, UINT ignore, BOOL v6 ) { WNDCLASSA wc; @@ -347,14 +347,14 @@ static void check_class( const char *name, int must_exist, UINT style, UINT igno char buff[64]; HWND hwnd; -todo_wine_if(strcmp(name, "Button") && - strcmp(name, "ComboBox") && - strcmp(name, "Edit") && - strcmp(name, "Static") && - strcmp(name, "ListBox") && - strcmp(name, "ComboLBox")) +todo_wine_if(!strcmp(name, "SysLink") && !must_exist && !v6) + ok( must_exist, "System class %s should %sexist\n", name, must_exist ? "" : "NOT " ); + if (!must_exist) return; + +todo_wine_if(!strcmp(name, "ScrollBar") || (!strcmp(name, "tooltips_class32") && v6)) ok( !(~wc.style & style & ~ignore), "System class %s is missing bits %x (%08x/%08x)\n", name, ~wc.style & style, wc.style, style ); +todo_wine_if((!strcmp(name, "tooltips_class32") && v6) || !strcmp(name, "SysLink")) ok( !(wc.style & ~style), "System class %s has extra bits %x (%08x/%08x)\n", name, wc.style & ~style, wc.style, style ); ok( !wc.hInstance, "System class %s has hInstance %p\n", name, wc.hInstance ); @@ -373,13 +373,40 @@ todo_wine_if(strcmp(name, "Button") && static void test_builtin_classes(void) { /* check style bits */ - check_class( "Button", 1, CS_PARENTDC | CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS, 0 ); - check_class( "ComboBox", 1, CS_PARENTDC | CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS, 0 ); - check_class( "Edit", 1, CS_PARENTDC | CS_DBLCLKS | CS_GLOBALCLASS, 0 ); - check_class( "ListBox", 1, CS_PARENTDC | CS_DBLCLKS | CS_GLOBALCLASS, 0 ); - check_class( "ScrollBar", 1, CS_PARENTDC | CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS, 0 ); - check_class( "Static", 1, CS_PARENTDC | CS_DBLCLKS | CS_GLOBALCLASS, 0 ); - check_class( "ComboLBox", 1, CS_SAVEBITS | CS_DBLCLKS | CS_DROPSHADOW | CS_GLOBALCLASS, CS_DROPSHADOW ); + check_class( "Button", 1, CS_PARENTDC | CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS, 0, FALSE ); + check_class( "ComboBox", 1, CS_PARENTDC | CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS, 0, FALSE ); + check_class( "Edit", 1, CS_PARENTDC | CS_DBLCLKS | CS_GLOBALCLASS, 0, FALSE ); + check_class( "ListBox", 1, CS_PARENTDC | CS_DBLCLKS | CS_GLOBALCLASS, 0, FALSE ); + check_class( "ScrollBar", 1, CS_PARENTDC | CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS, 0, FALSE ); + check_class( "Static", 1, CS_PARENTDC | CS_DBLCLKS | CS_GLOBALCLASS, 0, FALSE ); + check_class( "ComboLBox", 1, CS_SAVEBITS | CS_DBLCLKS | CS_DROPSHADOW | CS_GLOBALCLASS, CS_DROPSHADOW, FALSE ); +} + +static void test_comctl32_classes(BOOL v6) +{ + check_class(ANIMATE_CLASSA, 1, CS_DBLCLKS | CS_GLOBALCLASS, 0, FALSE); + check_class(WC_COMBOBOXEXA, 1, CS_GLOBALCLASS, 0, FALSE); + check_class(DATETIMEPICK_CLASSA, 1, CS_GLOBALCLASS, 0, FALSE); + check_class(WC_HEADERA, 1, CS_DBLCLKS | CS_GLOBALCLASS, 0, FALSE); + check_class(HOTKEY_CLASSA, 1, CS_GLOBALCLASS, 0, FALSE); + check_class(WC_IPADDRESSA, 1, CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS, 0, FALSE); + check_class(WC_LISTVIEWA, 1, CS_DBLCLKS | CS_GLOBALCLASS, 0, FALSE); + check_class(MONTHCAL_CLASSA, 1, CS_GLOBALCLASS, 0, FALSE); + check_class(WC_NATIVEFONTCTLA, 1, CS_GLOBALCLASS, 0, FALSE); + check_class(WC_PAGESCROLLERA, 1, CS_GLOBALCLASS, 0, FALSE); + check_class(PROGRESS_CLASSA, 1, CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS, 0, FALSE); + check_class(REBARCLASSNAMEA, 1, CS_DBLCLKS | CS_GLOBALCLASS, 0, FALSE); + check_class(STATUSCLASSNAMEA, 1, CS_DBLCLKS | CS_VREDRAW | CS_GLOBALCLASS, 0, FALSE); + check_class(WC_TABCONTROLA, 1, CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS, 0, FALSE); + check_class(TOOLBARCLASSNAMEA, 1, CS_DBLCLKS | CS_GLOBALCLASS, 0, FALSE); + if (v6) + check_class(TOOLTIPS_CLASSA, 1, CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS | CS_DROPSHADOW, CS_SAVEBITS | CS_HREDRAW | CS_VREDRAW /* XP */, TRUE); + else + check_class(TOOLTIPS_CLASSA, 1, CS_DBLCLKS | CS_GLOBALCLASS | CS_SAVEBITS, CS_HREDRAW | CS_VREDRAW /* XP */, FALSE); + check_class(TRACKBAR_CLASSA, 1, CS_GLOBALCLASS, 0, FALSE); + check_class(WC_TREEVIEWA, 1, CS_DBLCLKS | CS_GLOBALCLASS, 0, FALSE); + check_class(UPDOWN_CLASSA, 1, CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS, 0, FALSE); + check_class("SysLink", v6, CS_GLOBALCLASS, 0, FALSE); } START_TEST(misc) @@ -393,9 +420,12 @@ START_TEST(misc) test_GetPtrAW(); test_Alloc(); + test_comctl32_classes(FALSE); + if (!load_v6_module(&ctx_cookie, &hCtx)) return; + test_comctl32_classes(TRUE); test_builtin_classes(); test_LoadIconWithScaleDown();

1 0

Alexandre Julliard : winspool.drv: Make cupsGetPPD optional to work around deprecation warning.
by Alexandre Julliard 14 Dec '18

14 Dec '18

Module: wine Branch: master Commit: d4bc97c5546f446a241c1e18bd4d3cc9d9a47cb6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4bc97c5546f446a241c1e18… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 14 11:21:00 2018 +0100 winspool.drv: Make cupsGetPPD optional to work around deprecation warning. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index e91138d..bfa63f9 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -786,11 +786,11 @@ static void *cupshandle; DO_FUNC(cupsFreeOptions); \ DO_FUNC(cupsGetDests); \ DO_FUNC(cupsGetOption); \ - DO_FUNC(cupsGetPPD); \ DO_FUNC(cupsParseOptions); \ DO_FUNC(cupsPrintFile) #define CUPS_OPT_FUNCS \ DO_FUNC(cupsGetNamedDest); \ + DO_FUNC(cupsGetPPD); \ DO_FUNC(cupsGetPPD3); \ DO_FUNC(cupsLastErrorString) @@ -798,6 +798,7 @@ static void *cupshandle; CUPS_FUNCS; #undef DO_FUNC static cups_dest_t * (*pcupsGetNamedDest)(http_t *, const char *, const char *); +static const char * (*pcupsGetPPD)(const char *); static http_status_t (*pcupsGetPPD3)(http_t *, const char *, time_t *, char *, size_t); static const char * (*pcupsLastErrorString)(void);

1 0

Alexandre Julliard : msvcrt: Export onexit functions for compatibility with Mingw.
by Alexandre Julliard 14 Dec '18

14 Dec '18

Module: wine Branch: master Commit: 32bac734632cf082da40a82de7f3135262688351 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32bac734632cf082da40a82d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 14 17:31:14 2018 +0100 msvcrt: Export onexit functions for compatibility with Mingw. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/exit.c | 7 ------- dlls/msvcrt/file.c | 2 -- dlls/msvcrt/msvcrt.spec | 4 ++++ 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 51bc6f0..0a7e303 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -39,10 +39,7 @@ typedef struct MSVCRT__onexit_table_t } MSVCRT__onexit_table_t; static MSVCRT__onexit_table_t MSVCRT_atexit_table; - -#if _MSVCR_VER>=140 static MSVCRT__onexit_table_t MSVCRT_quick_exit_table; -#endif typedef void (__stdcall *_tls_callback_type)(void*,ULONG,void*); static _tls_callback_type tls_atexit_callback; @@ -406,8 +403,6 @@ int CDECL MSVCRT_atexit(void (__cdecl *func)(void)) return MSVCRT__onexit((MSVCRT__onexit_t)func) == (MSVCRT__onexit_t)func ? 0 : -1; } -#if _MSVCR_VER>=140 - /********************************************************************* * _crt_at_quick_exit (UCRTBASE.@) */ @@ -476,8 +471,6 @@ void CDECL _register_thread_local_exe_atexit_callback(_tls_callback_type callbac tls_atexit_callback = callback; } -#endif /* _MSVCR_VER>=140 */ - #if _MSVCR_VER>=71 /********************************************************************* * _set_purecall_handler (MSVCR71.@) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 224e6ea..43d4b56 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -786,7 +786,6 @@ MSVCRT_FILE * CDECL MSVCRT___iob_func(void) return &MSVCRT__iob[0]; } -#if _MSVCR_VER >= 140 /********************************************************************* * __acrt_iob_func(UCRTBASE.@) */ @@ -794,7 +793,6 @@ MSVCRT_FILE * CDECL MSVCRT___acrt_iob_func(unsigned idx) { return &MSVCRT__iob[idx]; } -#endif /********************************************************************* * _access (MSVCRT.@) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index d71d37a..cd6834b 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -197,6 +197,7 @@ @ cdecl ___mb_cur_max_func() MSVCRT____mb_cur_max_func @ cdecl ___setlc_active_func() MSVCRT____setlc_active_func @ cdecl ___unguarded_readlc_active_add_func() MSVCRT____unguarded_readlc_active_add_func +@ cdecl __acrt_iob_func(long) MSVCRT___acrt_iob_func # for compatibility with Mingw @ extern __argc MSVCRT___argc @ extern __argv MSVCRT___argv @ extern __badioinfo MSVCRT___badioinfo @@ -421,6 +422,7 @@ @ varargs _execle(str str) @ varargs _execlp(str str) @ varargs _execlpe(str str) +@ cdecl _execute_onexit_table(ptr) MSVCRT__execute_onexit_table # for compatibility with Mingw @ cdecl _execv(str ptr) @ cdecl _execve(str ptr ptr) MSVCRT__execve @ cdecl _execvp(str ptr) @@ -553,6 +555,7 @@ @ cdecl _i64toa_s(int64 ptr long long) MSVCRT__i64toa_s @ cdecl _i64tow(int64 ptr long) ntdll._i64tow @ cdecl _i64tow_s(int64 ptr long long) MSVCRT__i64tow_s +@ cdecl _initialize_onexit_table(ptr) MSVCRT__initialize_onexit_table # for compatibility with Mingw @ cdecl _initterm(ptr ptr) @ cdecl _initterm_e(ptr ptr) @ stub -arch=i386 _inp(long) @@ -866,6 +869,7 @@ # extern _pwctype @ cdecl _read(long ptr long) MSVCRT__read # stub _realloc_dbg(ptr long long str long) +@ cdecl _register_onexit_function(ptr ptr) MSVCRT__register_onexit_function # for compatibility with Mingw @ cdecl _resetstkoflw() MSVCRT__resetstkoflw @ cdecl _rmdir(str) MSVCRT__rmdir @ cdecl _rmtmp() MSVCRT__rmtmp

1 0

Alexandre Julliard : msvcrt: Fix __p__fmode() prototype.
by Alexandre Julliard 14 Dec '18

14 Dec '18

Module: wine Branch: master Commit: e4d34098a65afbc5923d1bc7845ca80b6a24f8d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4d34098a65afbc5923d1bc7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 14 17:39:06 2018 +0100 msvcrt: Fix __p__fmode() prototype. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/data.c | 4 ++-- dlls/msvcrt/msvcrt.h | 2 +- include/msvcrt/stdlib.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index f08d9b1..24a36bd 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -33,7 +33,7 @@ int MSVCRT___argc = 0; static int argc_expand; static int wargc_expand; unsigned int MSVCRT__commode = 0; -unsigned int MSVCRT__fmode = 0; +int MSVCRT__fmode = 0; unsigned int MSVCRT__osver = 0; unsigned int MSVCRT__osplatform = 0; unsigned int MSVCRT__winmajor = 0; @@ -180,7 +180,7 @@ int CDECL _get_wpgmptr(WCHAR** p) /*********************************************************************** * __p__fmode (MSVCRT.@) */ -unsigned int* CDECL __p__fmode(void) { return &MSVCRT__fmode; } +int* CDECL __p__fmode(void) { return &MSVCRT__fmode; } /*********************************************************************** * _set_fmode (MSVCRT.@) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 37e820a..4046dd1 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1121,7 +1121,7 @@ int WINAPIV _cprintf(const char*,...); int WINAPIV _cwprintf(const MSVCRT_wchar_t*,...); char*** __cdecl MSVCRT___p__environ(void); int* __cdecl __p___mb_cur_max(void); -unsigned int* __cdecl __p__fmode(void); +int* __cdecl __p__fmode(void); MSVCRT_wchar_t* __cdecl MSVCRT__wcsdup(const MSVCRT_wchar_t*); MSVCRT_size_t __cdecl MSVCRT_strnlen(const char *,MSVCRT_size_t); MSVCRT_size_t __cdecl MSVCRT_wcsnlen(const MSVCRT_wchar_t*,MSVCRT_size_t); diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index e8ca2fa..bc7c86e 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -109,7 +109,7 @@ extern char*** __cdecl __p__environ(void); #define _environ (*__p__environ()) extern wchar_t*** __cdecl __p__wenviron(void); #define _wenviron (*__p__wenviron()) -extern unsigned int* __cdecl __p__fmode(void); +extern int* __cdecl __p__fmode(void); #define _fmode (*__p__fmode()) #else /* __i386__ */

1 0

Alexandre Julliard : msvcrt: Add some more MSVCRT prefixes to avoid conflicts with recent Mingw.
by Alexandre Julliard 14 Dec '18

14 Dec '18

Module: wine Branch: master Commit: dd016c031a4eb55783a1606b604057daf47560cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd016c031a4eb55783a1606b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 14 17:47:08 2018 +0100 msvcrt: Add some more MSVCRT prefixes to avoid conflicts with recent Mingw. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 6 +++--- dlls/msvcr110/msvcr110.spec | 6 +++--- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr70/msvcr70.spec | 6 +++--- dlls/msvcr71/msvcr71.spec | 6 +++--- dlls/msvcr80/msvcr80.spec | 6 +++--- dlls/msvcr90/msvcr90.spec | 6 +++--- dlls/msvcrt/data.c | 6 +++--- dlls/msvcrt/file.c | 2 +- dlls/msvcrt/msvcrt.h | 2 +- dlls/msvcrt/msvcrt.spec | 6 +++--- dlls/msvcrt/process.c | 2 +- dlls/ucrtbase/ucrtbase.spec | 6 +++--- 13 files changed, 33 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dd016c031a4eb55783a1…

1 0

Alexandre Julliard : winedbg: Fix incorrect pointer casts.
by Alexandre Julliard 14 Dec '18

14 Dec '18

Module: wine Branch: master Commit: 2a64e751e36d78fdd106c2bb4ddfe471546bf25a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a64e751e36d78fdd106c2bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 14 18:20:23 2018 +0100 winedbg: Fix incorrect pointer casts. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/be_i386.c | 3 +-- programs/winedbg/db_disasm.c | 2 +- programs/winedbg/info.c | 2 +- programs/winedbg/tgt_active.c | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index 3a2b91a..9656244 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -770,8 +770,7 @@ static BOOL be_i386_remove_Xpoint(HANDLE hProcess, const struct be_process_io* p if (size != 0) return FALSE; if (!pio->read(hProcess, addr, &ch, 1, &sz) || sz != 1) return FALSE; if (ch != (unsigned char)0xCC) - WINE_FIXME("Cannot get back %02x instead of 0xCC at %08lx\n", - ch, (unsigned long)addr); + WINE_FIXME("Cannot get back %02x instead of 0xCC at %p\n", ch, addr); ch = (unsigned char)val; if (!pio->write(hProcess, addr, &ch, 1, &sz) || sz != 1) return FALSE; break; diff --git a/programs/winedbg/db_disasm.c b/programs/winedbg/db_disasm.c index f57f009..41b1da2 100644 --- a/programs/winedbg/db_disasm.c +++ b/programs/winedbg/db_disasm.c @@ -1230,7 +1230,7 @@ static void db_print_address(const char *seg, int size, struct i_addr *addrp, in } else if (!dbg_read_memory(a1, &a2, sizeof(a2))) { dbg_printf("(invalid destination)"); } else { - db_task_printsym((unsigned long)a1, 0); + db_task_printsym((ULONG_PTR)a1, 0); } } else diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index c965759..72c57a2 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -984,7 +984,7 @@ void info_win32_exception(void) dbg_printf(" in 16-bit code (%04x:%04x)", addr.Segment, (unsigned) addr.Offset); break; case AddrMode1632: - dbg_printf(" in segmented 32-bit code (%04x:%08lx)", addr.Segment, (unsigned long) addr.Offset); + dbg_printf(" in segmented 32-bit code (%04x:%08x)", addr.Segment, (unsigned) addr.Offset); break; default: dbg_printf(" bad address"); } diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index f632ca0..5385d0e 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -301,7 +301,7 @@ static void fetch_module_name(void* name_addr, BOOL unicode, void* mod_addr, snprintfW(buffer, bufsz, pcspid, dbg_curr_pid); } else - snprintfW(buffer, bufsz, dlladdr, (unsigned long)mod_addr); + snprintfW(buffer, bufsz, dlladdr, (ULONG_PTR)mod_addr); } }

1 0