March 2018 - Wine-commits - list.winehq.org

Stefan Leichter : advapi32: Silence the fixme in EventActivityIdControl.
by Alexandre Julliard 26 Mar '18

26 Mar '18

Module: wine Branch: master Commit: bae48da7c5e16ec5b1a6e3db48e2eaaec7515db8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bae48da7c5e16ec5b1a6e3db… Author: Stefan Leichter <sle85276(a)gmx.de> Date: Sun Mar 25 10:29:39 2018 +0200 advapi32: Silence the fixme in EventActivityIdControl. Signed-off-by: Stefan Leichter <sle85276(a)gmx.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/eventlog.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 34a21c8..fbab8e8 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -830,7 +830,9 @@ BOOLEAN WINAPI EventProviderEnabled( REGHANDLE handle, UCHAR level, ULONGLONG ke */ ULONG WINAPI EventActivityIdControl(ULONG code, GUID *guid) { - FIXME("0x%x, %p: stub\n", code, guid); + static int once; + + if (!once++) FIXME("0x%x, %p: stub\n", code, guid); return ERROR_SUCCESS; }

1 0

Hua Meng : msvcrt: Implement _atol_l.
by Alexandre Julliard 26 Mar '18

26 Mar '18

Module: wine Branch: master Commit: 2f9dd7f6cbedd58ec551b73acdb873402666d74e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f9dd7f6cbedd58ec551b73a… Author: Hua Meng <161220092(a)smail.nju.edu.cn> Date: Mon Mar 26 21:20:22 2018 +0200 msvcrt: Implement _atol_l. Signed-off-by: Hua Meng <161220092(a)smail.nju.edu.cn> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-convert-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 17 +++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 10 files changed, 26 insertions(+), 9 deletions(-) diff --git a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec index bb9a677..aa2f513 100644 --- a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec +++ b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec @@ -7,7 +7,7 @@ @ cdecl -ret64 _atoi64(str) ucrtbase._atoi64 @ stub _atoi64_l @ cdecl _atoi_l(str ptr) ucrtbase._atoi_l -@ stub _atol_l +@ cdecl _atol_l(str ptr) ucrtbase._atol_l @ cdecl _atoldbl(ptr str) ucrtbase._atoldbl @ stub _atoldbl_l @ cdecl -ret64 _atoll_l(str ptr) ucrtbase._atoll_l diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 11d2351..150f235 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -699,7 +699,7 @@ @ cdecl -ret64 _atoi64(str) ntdll._atoi64 @ stub _atoi64_l @ cdecl _atoi_l(str ptr) MSVCRT__atoi_l -@ stub _atol_l +@ cdecl _atol_l(str ptr) MSVCRT__atol_l @ cdecl _atoldbl(ptr str) MSVCRT__atoldbl @ stub _atoldbl_l @ cdecl _beep(long long) MSVCRT__beep diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 7c4e547..d151480 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1047,7 +1047,7 @@ @ cdecl -ret64 _atoi64(str) ntdll._atoi64 @ stub _atoi64_l @ cdecl _atoi_l(str ptr) MSVCRT__atoi_l -@ stub _atol_l +@ cdecl _atol_l(str ptr) MSVCRT__atol_l @ cdecl _atoldbl(ptr str) MSVCRT__atoldbl @ stub _atoldbl_l @ cdecl _beep(long long) MSVCRT__beep diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 9e3deb2..5b13600 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1037,7 +1037,7 @@ @ cdecl -ret64 _atoi64(str) ntdll._atoi64 @ stub _atoi64_l @ cdecl _atoi_l(str ptr) MSVCRT__atoi_l -@ stub _atol_l +@ cdecl _atol_l(str ptr) MSVCRT__atol_l @ cdecl _atoldbl(ptr str) MSVCRT__atoldbl @ stub _atoldbl_l @ cdecl -ret64 _atoll_l(str ptr) MSVCRT__atoll_l diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 6a6da4b..c60160d 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1008,7 +1008,7 @@ @ cdecl -ret64 _atoi64(str) msvcr120._atoi64 @ stub _atoi64_l @ cdecl _atoi_l(str ptr) msvcr120._atoi_l -@ stub _atol_l +@ cdecl _atol_l(str ptr) msvcr120._atol_l @ cdecl _atoldbl(ptr str) msvcr120._atoldbl @ stub _atoldbl_l @ cdecl -ret64 _atoll_l(str ptr) msvcr120._atoll_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 0913fc9..4c7177c 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -363,7 +363,7 @@ @ cdecl -ret64 _atoi64(str) ntdll._atoi64 @ stub _atoi64_l @ cdecl _atoi_l(str ptr) MSVCRT__atoi_l -@ stub _atol_l +@ cdecl _atol_l(str ptr) MSVCRT__atol_l @ cdecl _atoldbl(ptr str) MSVCRT__atoldbl @ stub _atoldbl_l @ cdecl _beep(long long) MSVCRT__beep diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 8287864..da9e0ae 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -347,7 +347,7 @@ @ cdecl -ret64 _atoi64(str) ntdll._atoi64 @ stub _atoi64_l @ cdecl _atoi_l(str ptr) MSVCRT__atoi_l -@ stub _atol_l +@ cdecl _atol_l(str ptr) MSVCRT__atol_l @ cdecl _atoldbl(ptr str) MSVCRT__atoldbl @ stub _atoldbl_l @ cdecl _beep(long long) MSVCRT__beep diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 15d9ffc..5fe9977 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -334,7 +334,7 @@ @ cdecl -ret64 _atoi64(str) ntdll._atoi64 # stub -ret64 _atoi64_l(str ptr) @ cdecl _atoi_l(str ptr) MSVCRT__atoi_l -# stub _atol_l(str ptr) +@ cdecl _atol_l(str ptr) MSVCRT__atol_l @ cdecl _atoldbl(ptr str) MSVCRT__atoldbl # stub _atoldbl_l(ptr str ptr) @ cdecl _beep(long long) MSVCRT__beep diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index d70f235..50c146f 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1068,6 +1068,23 @@ int CDECL MSVCRT_atoi(const char *str) } #endif +/****************************************************************** + * _atol_l (MSVCRT.@) + */ +MSVCRT_long CDECL MSVCRT__atol_l(const char *str, MSVCRT__locale_t locale) +{ + __int64 ret = MSVCRT_strtoi64_l(str, NULL, 10, locale); + + if(ret > LONG_MAX) { + ret = LONG_MAX; + *MSVCRT__errno() = MSVCRT_ERANGE; + } else if(ret < LONG_MIN) { + ret = LONG_MIN; + *MSVCRT__errno() = MSVCRT_ERANGE; + } + return ret; +} + #if _MSVCR_VER>=120 /****************************************************************** diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index ff33d86..63d040f 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -198,7 +198,7 @@ @ cdecl -ret64 _atoi64(str) ntdll._atoi64 @ stub _atoi64_l @ cdecl _atoi_l(str ptr) MSVCRT__atoi_l -@ stub _atol_l +@ cdecl _atol_l(str ptr) MSVCRT__atol_l @ cdecl _atoldbl(ptr str) MSVCRT__atoldbl @ stub _atoldbl_l @ cdecl -ret64 _atoll_l(str ptr) MSVCRT__atoll_l

1 0

Gijs Vermeulen : kernelbase: Add missing forward.
by Alexandre Julliard 26 Mar '18

26 Mar '18

Module: wine Branch: master Commit: 5818bfdbf59df79eb68757174590e11a15c48c73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5818bfdbf59df79eb6875717… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Mar 26 11:40:00 2018 +0200 kernelbase: Add missing forward. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/kernelbase.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index fd4e8d4..be1e5b5 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1191,7 +1191,7 @@ @ stdcall PulseEvent(long) kernel32.PulseEvent @ stdcall PurgeComm(long long) kernel32.PurgeComm @ stdcall QISearch(long long long long) shlwapi.QISearch -# @ stub QueryActCtxSettingsW +@ stdcall QueryActCtxSettingsW(long ptr wstr wstr ptr long ptr) kernel32.QueryActCtxSettingsW @ stdcall QueryActCtxW(long ptr ptr long ptr long ptr) kernel32.QueryActCtxW @ stdcall QueryDepthSList(ptr) kernel32.QueryDepthSList @ stdcall QueryDosDeviceW(wstr ptr long) kernel32.QueryDosDeviceW

1 0

Józef Kucia : wined3d: Pass fully initialized shader objects to CS.
by Alexandre Julliard 26 Mar '18

26 Mar '18

Module: wine Branch: master Commit: b62aa91758a8a08b48811d8fae8a4de1178ee0bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=b62aa91758a8a08b48811d8f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 26 08:38:49 2018 +0200 wined3d: Pass fully initialized shader objects to CS. It shouldn't matter right now, but it might be an issue when we start to precompile other shader types than compute shaders. 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/wined3d/shader.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 2a047fa..93079e8 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3685,8 +3685,6 @@ static HRESULT shader_init(struct wined3d_shader *shader, struct wined3d_device shader->load_local_constsF = shader->lconst_inf_or_nan; - wined3d_cs_init_object(shader->device->cs, wined3d_shader_init_object, shader); - return hr; } @@ -4118,6 +4116,8 @@ HRESULT CDECL wined3d_shader_create_cs(struct wined3d_device *device, const stru return hr; } + wined3d_cs_init_object(device->cs, wined3d_shader_init_object, object); + TRACE("Created compute shader %p.\n", object); *shader = object; @@ -4143,6 +4143,8 @@ HRESULT CDECL wined3d_shader_create_ds(struct wined3d_device *device, const stru return hr; } + wined3d_cs_init_object(device->cs, wined3d_shader_init_object, object); + TRACE("Created domain shader %p.\n", object); *shader = object; @@ -4169,6 +4171,8 @@ HRESULT CDECL wined3d_shader_create_gs(struct wined3d_device *device, const stru return hr; } + wined3d_cs_init_object(device->cs, wined3d_shader_init_object, object); + TRACE("Created geometry shader %p.\n", object); *shader = object; @@ -4194,6 +4198,8 @@ HRESULT CDECL wined3d_shader_create_hs(struct wined3d_device *device, const stru return hr; } + wined3d_cs_init_object(device->cs, wined3d_shader_init_object, object); + TRACE("Created hull shader %p.\n", object); *shader = object; @@ -4219,6 +4225,8 @@ HRESULT CDECL wined3d_shader_create_ps(struct wined3d_device *device, const stru return hr; } + wined3d_cs_init_object(device->cs, wined3d_shader_init_object, object); + TRACE("Created pixel shader %p.\n", object); *shader = object; @@ -4244,6 +4252,8 @@ HRESULT CDECL wined3d_shader_create_vs(struct wined3d_device *device, const stru return hr; } + wined3d_cs_init_object(device->cs, wined3d_shader_init_object, object); + TRACE("Created vertex shader %p.\n", object); *shader = object;

1 0

Henri Verbeet : usp10: Use heap_calloc() in computeIsolatingRunsSet().
by Alexandre Julliard 26 Mar '18

26 Mar '18

Module: wine Branch: master Commit: a3b7712263c8520b521ffbee8ad5f006a863868d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3b7712263c8520b521ffbee… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 26 14:18:41 2018 +0430 usp10: Use heap_calloc() in computeIsolatingRunsSet(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/bidi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c index b0df781..0fb03ef 100644 --- a/dlls/usp10/bidi.c +++ b/dlls/usp10/bidi.c @@ -998,7 +998,7 @@ static void computeIsolatingRunsSet(unsigned baselevel, WORD *pcls, const WORD * Run *runs; IsolatedRun *current_isolated; - if (!(runs = heap_alloc(uCount * sizeof(*runs)))) + if (!(runs = heap_calloc(uCount, sizeof(*runs)))) return; list_init(set);

1 0

Gijs Vermeulen : msvcrt: Add __get_current_locale.
by Alexandre Julliard 26 Mar '18

26 Mar '18

Module: wine Branch: master Commit: d1c872f8ebd42180bf7be09e986037354a366e9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1c872f8ebd42180bf7be09e… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Mar 26 11:41:02 2018 +0200 msvcrt: Add __get_current_locale. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 20d8848..e9c557a 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -589,7 +589,7 @@ @ stub ___fls_setvalue(a)8 @ cdecl __fpecode() @ cdecl __free_locale(ptr) MSVCRT__free_locale -@ stub __get_current_locale +@ cdecl __get_current_locale() MSVCRT__get_current_locale @ stub __get_flsindex @ stub __get_tlsindex @ cdecl __getmainargs(ptr ptr ptr long ptr) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 437ecef..2890402 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -937,7 +937,7 @@ @ cdecl __dstbias() MSVCRT___p__dstbias @ cdecl __fpecode() @ cdecl __free_locale(ptr) MSVCRT__free_locale -@ stub __get_current_locale +@ cdecl __get_current_locale() MSVCRT__get_current_locale @ stub __get_flsindex @ stub __get_tlsindex @ cdecl __getmainargs(ptr ptr ptr long ptr) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 9aec9e0..59fd636 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -927,7 +927,7 @@ @ cdecl __dstbias() MSVCRT___p__dstbias @ cdecl __fpecode() @ cdecl __free_locale(ptr) MSVCRT__free_locale -@ stub __get_current_locale +@ cdecl __get_current_locale() MSVCRT__get_current_locale @ stub __get_flsindex @ stub __get_tlsindex @ cdecl __getmainargs(ptr ptr ptr long ptr) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 3075bbc..245c151 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -903,7 +903,7 @@ @ cdecl __dstbias() msvcr120.__dstbias @ cdecl __fpecode() msvcr120.__fpecode @ cdecl __free_locale(ptr) msvcr120.__free_locale -@ stub __get_current_locale +@ cdecl __get_current_locale() msvcr120.__get_current_locale @ stub __get_flsindex @ stub __get_tlsindex @ cdecl __getmainargs(ptr ptr ptr long ptr) msvcr120.__getmainargs diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 4a86c7f..7e657d6 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -228,7 +228,7 @@ @ cdecl __fpecode() @ cdecl __free_locale(ptr) MSVCRT__free_locale @ stub __get_app_type -@ stub __get_current_locale +@ cdecl __get_current_locale() MSVCRT__get_current_locale @ stub __get_flsindex @ stub __get_tlsindex @ cdecl __getmainargs(ptr ptr ptr long ptr) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index d3d480d..288975e 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -217,7 +217,7 @@ @ cdecl __fpecode() @ cdecl __free_locale(ptr) MSVCRT__free_locale @ stub __get_app_type -@ stub __get_current_locale +@ cdecl __get_current_locale() MSVCRT__get_current_locale @ stub __get_flsindex @ stub __get_tlsindex @ cdecl __getmainargs(ptr ptr ptr long ptr)

1 0

Gijs Vermeulen : msvcrt: Add __create_locale.
by Alexandre Julliard 26 Mar '18

26 Mar '18

Module: wine Branch: master Commit: 0eb68ad8b6e8fc597457f2882001ddb940fbb018 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0eb68ad8b6e8fc597457f288… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Mar 26 11:41:03 2018 +0200 msvcrt: Add __create_locale. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index e9c557a..11d2351 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -576,7 +576,7 @@ @ extern __badioinfo MSVCRT___badioinfo @ cdecl __clean_type_info_names_internal(ptr) @ cdecl -arch=i386 __control87_2(long long ptr ptr) -@ stub __create_locale +@ cdecl __create_locale(long str) MSVCRT__create_locale @ cdecl __crtCompareStringA(long long str long str long) @ cdecl __crtCompareStringW(long long wstr long wstr long) @ cdecl __crtLCMapStringA(long long str long ptr long long long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 2890402..7c4e547 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -903,7 +903,7 @@ @ extern __badioinfo MSVCRT___badioinfo @ cdecl __clean_type_info_names_internal(ptr) @ cdecl -arch=i386 __control87_2(long long ptr ptr) -@ stub __create_locale +@ cdecl __create_locale(long str) MSVCRT__create_locale @ stub -arch=win64 __crtCaptureCurrentContext @ stub -arch=win64 __crtCapturePreviousContext @ cdecl __crtCompareStringA(long long str long str long) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 59fd636..9e3deb2 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -888,7 +888,7 @@ @ extern __badioinfo MSVCRT___badioinfo @ cdecl __clean_type_info_names_internal(ptr) @ cdecl -arch=i386 __control87_2(long long ptr ptr) -@ stub __create_locale +@ cdecl __create_locale(long str) MSVCRT__create_locale @ stub -arch=win64 __crtCaptureCurrentContext @ stub -arch=win64 __crtCapturePreviousContext @ cdecl __crtCompareStringA(long long str long str long) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 245c151..6a6da4b 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -882,7 +882,7 @@ @ extern __badioinfo msvcr120.__badioinfo @ cdecl __clean_type_info_names_internal(ptr) msvcr120.__clean_type_info_names_internal @ cdecl -arch=i386 __control87_2(long long ptr ptr) msvcr120.__control87_2 -@ stub __create_locale +@ cdecl __create_locale(long str) msvcr120.__create_locale @ stub -arch=win64 __crtCaptureCurrentContext @ stub -arch=win64 __crtCapturePreviousContext @ stub __crtCloseWinRTThreadHandle diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 7e657d6..0913fc9 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -210,7 +210,7 @@ @ extern __badioinfo MSVCRT___badioinfo @ cdecl __clean_type_info_names_internal(ptr) @ cdecl -arch=i386 __control87_2(long long ptr ptr) -@ stub __create_locale +@ cdecl __create_locale(long str) MSVCRT__create_locale @ cdecl __crtCompareStringA(long long str long str long) @ cdecl __crtCompareStringW(long long wstr long wstr long) @ cdecl __crtGetLocaleInfoW(long long ptr long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 288975e..8287864 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -201,7 +201,7 @@ @ extern __badioinfo MSVCRT___badioinfo @ cdecl __clean_type_info_names_internal(ptr) @ cdecl -arch=i386 __control87_2(long long ptr ptr) -@ stub __create_locale +@ cdecl __create_locale(long str) MSVCRT__create_locale @ cdecl __crtCompareStringA(long long str long str long) @ cdecl __crtCompareStringW(long long wstr long wstr long) @ cdecl __crtGetLocaleInfoW(long long ptr long)

1 0

Zhiyi Zhang : comctl32/datetime: Change DATETIME_ReturnFieldWidth() to return width.
by Alexandre Julliard 26 Mar '18

26 Mar '18

Module: wine Branch: master Commit: cc893cdcabb578b0eb434c6aca04acf61bcf8444 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc893cdcabb578b0eb434c6a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Mar 26 18:09:19 2018 +0800 comctl32/datetime: Change DATETIME_ReturnFieldWidth() to return width. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/datetime.c | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 6231070..fb8a5c0 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -598,8 +598,7 @@ DATETIME_IncreaseField (DATETIME_INFO *infoPtr, int number, int delta) } } -static void -DATETIME_ReturnFieldWidth (const DATETIME_INFO *infoPtr, HDC hdc, int count, SHORT *width) +static int DATETIME_GetFieldWidth (const DATETIME_INFO *infoPtr, HDC hdc, int count) { /* fields are a fixed width, determined by the largest possible string */ /* presumably, these widths should be language dependent */ @@ -613,13 +612,7 @@ DATETIME_ReturnFieldWidth (const DATETIME_INFO *infoPtr, HDC hdc, int count, SHO LPCWSTR bufptr; SIZE size; - TRACE ("%d,%d\n", infoPtr->nrFields, count); - if (count>infoPtr->nrFields || count < 0) { - WARN ("buffer overrun, have %d want %d\n", infoPtr->nrFields, count); - return; - } - - if (!infoPtr->fieldspec) return; + if (!infoPtr->fieldspec) return 0; spec = infoPtr->fieldspec[count]; if (spec & DT_STRING) { @@ -709,8 +702,7 @@ DATETIME_ReturnFieldWidth (const DATETIME_INFO *infoPtr, HDC hdc, int count, SHO break; } } - *width = cx; - return; + return cx; } case ONELETTERAMPM: bufptr = fld_am1; @@ -724,7 +716,7 @@ DATETIME_ReturnFieldWidth (const DATETIME_INFO *infoPtr, HDC hdc, int count, SHO } } GetTextExtentPoint32W (hdc, bufptr, strlenW(bufptr), &size); - *width = size.cx; + return size.cx; } static void @@ -738,7 +730,6 @@ DATETIME_Refresh (DATETIME_INFO *infoPtr, HDC hdc) RECT *rcDraw = &infoPtr->rcDraw; SIZE size; COLORREF oldTextColor; - SHORT fieldWidth = 0; HFONT oldFont = SelectObject (hdc, infoPtr->hFont); INT oldBkMode = SetBkMode (hdc, TRANSPARENT); WCHAR txt[80]; @@ -752,10 +743,9 @@ DATETIME_Refresh (DATETIME_INFO *infoPtr, HDC hdc) for (i = 0; i < infoPtr->nrFields; i++) { DATETIME_ReturnTxt (infoPtr, i, txt, ARRAY_SIZE(txt)); GetTextExtentPoint32W (hdc, txt, strlenW(txt), &size); - DATETIME_ReturnFieldWidth (infoPtr, hdc, i, &fieldWidth); field = &infoPtr->fieldRect[i]; field->left = prevright; - field->right = prevright + fieldWidth; + field->right = prevright + DATETIME_GetFieldWidth (infoPtr, hdc, i); field->top = rcDraw->top; field->bottom = rcDraw->bottom; prevright = field->right; @@ -1458,7 +1448,6 @@ static BOOL DATETIME_GetIdealSize(DATETIME_INFO *infoPtr, SIZE *size) { SIZE field_size; RECT rect; - SHORT width; WCHAR txt[80]; HDC hdc; HFONT oldFont; @@ -1477,8 +1466,7 @@ static BOOL DATETIME_GetIdealSize(DATETIME_INFO *infoPtr, SIZE *size) /* Get text font width */ for (i = 0; i < infoPtr->nrFields; i++) { - DATETIME_ReturnFieldWidth(infoPtr, hdc, i, &width); - size->cx += width; + size->cx += DATETIME_GetFieldWidth(infoPtr, hdc, i); } SelectObject(hdc, oldFont);

1 0

André Hentschel : gdiplus: Add stub for GdipSetPathGradientPath.
by Alexandre Julliard 26 Mar '18

26 Mar '18

Module: wine Branch: master Commit: e7b16bcb577fd38a1e13f1e0efc7f8a91a2ab240 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7b16bcb577fd38a1e13f1e0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Mar 26 20:09:37 2018 +0200 gdiplus: Add stub for GdipSetPathGradientPath. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/brush.c | 12 ++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- include/gdiplusflat.h | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 26e3419..0114a51 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1686,6 +1686,18 @@ GpStatus WINGDIPAPI GdipSetPathGradientGammaCorrection(GpPathGradient *grad, return Ok; } +GpStatus WINGDIPAPI GdipSetPathGradientPath(GpPathGradient *grad, GDIPCONST GpPath *path) +{ + static int calls; + + TRACE("(%p, %p)\n", grad, path); + + if (!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipSetPathGradientSigmaBlend(GpPathGradient *grad, REAL focus, REAL scale) { diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 25b27e7..e0cf6d5 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -534,7 +534,7 @@ 534 stdcall GdipSetPathGradientFocusScales(ptr float float) 535 stdcall GdipSetPathGradientGammaCorrection(ptr long) 536 stdcall GdipSetPathGradientLinearBlend(ptr float float) -537 stub GdipSetPathGradientPath +537 stdcall GdipSetPathGradientPath(ptr ptr) 538 stdcall GdipSetPathGradientPresetBlend(ptr ptr ptr long) 539 stdcall GdipSetPathGradientSigmaBlend(ptr float float) 540 stdcall GdipSetPathGradientSurroundColorsWithCount(ptr ptr ptr) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 8bfe8b8..7ea39f4 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -589,6 +589,7 @@ GpStatus WINGDIPAPI GdipSetPathGradientCenterPoint(GpPathGradient*,GpPointF*); GpStatus WINGDIPAPI GdipSetPathGradientCenterPointI(GpPathGradient*,GpPoint*); GpStatus WINGDIPAPI GdipSetPathGradientFocusScales(GpPathGradient*,REAL,REAL); GpStatus WINGDIPAPI GdipSetPathGradientGammaCorrection(GpPathGradient*,BOOL); +GpStatus WINGDIPAPI GdipSetPathGradientPath(GpPathGradient*,GDIPCONST GpPath*); GpStatus WINGDIPAPI GdipSetPathGradientSigmaBlend(GpPathGradient*,REAL,REAL); GpStatus WINGDIPAPI GdipSetPathGradientSurroundColorsWithCount(GpPathGradient*, GDIPCONST ARGB*,INT*);

1 0

Nikolay Sivov : gdiplus: Implement GdipTranslatePenTransform.
by Alexandre Julliard 26 Mar '18

26 Mar '18

Module: wine Branch: master Commit: b809b19f84d983fccb51c1e3cff72b086b29ea4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b809b19f84d983fccb51c1e3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 24 16:10:12 2018 +0300 gdiplus: Implement GdipTranslatePenTransform. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/pen.c | 7 +------ dlls/gdiplus/tests/pen.c | 32 ++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 34 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index 2c49371..b86808b 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -460,17 +460,12 @@ GpStatus WINGDIPAPI GdipGetPenTransform(GpPen *pen, GpMatrix *matrix) GpStatus WINGDIPAPI GdipTranslatePenTransform(GpPen *pen, REAL dx, REAL dy, GpMatrixOrder order) { - static int calls; - TRACE("(%p,%0.2f,%0.2f,%u)\n", pen, dx, dy, order); if(!pen) return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); - - return NotImplemented; + return GdipTranslateMatrix(&pen->transform, dx, dy, order); } GpStatus WINGDIPAPI GdipScalePenTransform(GpPen *pen, REAL sx, REAL sy, GpMatrixOrder order) diff --git a/dlls/gdiplus/tests/pen.c b/dlls/gdiplus/tests/pen.c index ded6e64..be3d76d6 100644 --- a/dlls/gdiplus/tests/pen.c +++ b/dlls/gdiplus/tests/pen.c @@ -431,6 +431,38 @@ static void test_transform(void) expectf(6.0, values[4]); expectf(3.0, values[5]); + /* Translate */ + status = GdipTranslatePenTransform(NULL, 1.0, -2.0, MatrixOrderAppend); + expect(InvalidParameter, status); + + status = GdipTranslatePenTransform(pen, 1.0, -2.0, MatrixOrderAppend); + expect(Ok, status); + + status = GdipGetPenTransform(pen, matrix); + expect(Ok, status); + status = GdipGetMatrixElements(matrix, values); + expect(Ok, status); + expectf(3.0, values[0]); + expectf(-2.0, values[1]); + expectf(5.0, values[2]); + expectf(2.0, values[3]); + expectf(7.0, values[4]); + expectf(1.0, values[5]); + + status = GdipTranslatePenTransform(pen, -3.0, 5.0, MatrixOrderPrepend); + expect(Ok, status); + + status = GdipGetPenTransform(pen, matrix); + expect(Ok, status); + status = GdipGetMatrixElements(matrix, values); + expect(Ok, status); + expectf(3.0, values[0]); + expectf(-2.0, values[1]); + expectf(5.0, values[2]); + expectf(2.0, values[3]); + expectf(23.0, values[4]); + expectf(17.0, values[5]); + status = GdipResetPenTransform(pen); expect(Ok, status); diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 7ea39f4..628db82 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -656,6 +656,7 @@ GpStatus WINGDIPAPI GdipGetPenMiterLimit(GpPen*,REAL*); GpStatus WINGDIPAPI GdipGetPenStartCap(GpPen*,GpLineCap*); GpStatus WINGDIPAPI GdipGetPenUnit(GpPen*,GpUnit*); GpStatus WINGDIPAPI GdipGetPenWidth(GpPen*,REAL*); +GpStatus WINGDIPAPI GdipTranslatePenTransform(GpPen*,REAL,REAL,GpMatrixOrder); /* Region */ GpStatus WINGDIPAPI GdipCloneRegion(GpRegion *, GpRegion **);

1 0