April 2018 - Wine-Commits - list.winehq.org

Matteo Bruni : ddraw/tests: Port test_viewport() to ddraw4.
by Alexandre Julliard April 18, 2018

April 18, 2018

Module: wine Branch: master Commit: 5c43d6e34f1a610dcef25a07c650b436e71f8a13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c43d6e34f1a610dcef25a07… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 18 01:32:17 2018 +0200 ddraw/tests: Port test_viewport() to ddraw4. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw4.c | 241 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 235 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5c43d6e34f1a610dcef2…

1 0

Piotr Caban : ucrtbase: Add _timespec{32,64}_get implementation.
by Alexandre Julliard April 18, 2018

April 18, 2018

Module: wine Branch: master Commit: 7a50abd8949c47fd35c68358ba07336ed5f1c5eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a50abd8949c47fd35c68358… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 18 20:38:18 2018 +0200 ucrtbase: Add _timespec{32,64}_get implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-time-l1-1-0.spec | 4 +- dlls/msvcrt/time.c | 53 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 4 +- 3 files changed, 57 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec b/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec index db36c29..e21e07e 100644 --- a/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec +++ b/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec @@ -47,8 +47,8 @@ @ cdecl _strtime_s(ptr long) ucrtbase._strtime_s @ cdecl _time32(ptr) ucrtbase._time32 @ cdecl _time64(ptr) ucrtbase._time64 -@ stub _timespec32_get -@ stub _timespec64_get +@ cdecl _timespec32_get(ptr long) ucrtbase._timespec32_get +@ cdecl _timespec64_get(ptr long) ucrtbase._timespec64_get @ cdecl _tzset() ucrtbase._tzset @ cdecl _utime32(str ptr) ucrtbase._utime32 @ cdecl _utime64(str ptr) ucrtbase._utime64 diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index a2500c4..861b2ed 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1620,3 +1620,56 @@ int CDECL _get_daylight(int *hours) } #endif /* _MSVCR_VER >= 80 */ + +#if _MSVCR_VER >= 140 + +#define TIME_UTC 1 + +struct _timespec32 +{ + MSVCRT___time32_t tv_sec; + LONG tv_nsec; +}; + +struct _timespec64 +{ + MSVCRT___time64_t tv_sec; + LONG tv_nsec; +}; + +/********************************************************************* + * _timespec64_get (UCRTBASE.@) + */ +int CDECL _timespec64_get(struct _timespec64 *ts, int base) +{ + ULONGLONG time; + FILETIME ft; + + if(!MSVCRT_CHECK_PMT(ts != NULL)) return 0; + if(base != TIME_UTC) return 0; + + GetSystemTimePreciseAsFileTime(&ft); + time = ((ULONGLONG)ft.dwHighDateTime << 32) | ft.dwLowDateTime; + + ts->tv_sec = time / TICKSPERSEC - SECS_1601_TO_1970; + ts->tv_nsec = time % TICKSPERSEC * 100; + return base; +} + +/********************************************************************* + * _timespec32_get (UCRTBASE.@) + */ +int CDECL _timespec32_get(struct _timespec32 *ts, int base) +{ + struct _timespec64 ts64; + + if(_timespec64_get(&ts64, base) != base) + return 0; + if(ts64.tv_sec != (MSVCRT___time32_t)ts64.tv_sec) + return 0; + + ts->tv_sec = ts64.tv_sec; + ts->tv_nsec = ts64.tv_nsec; + return base; +} +#endif /* _MSVCR_VER >= 140 */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index b12a1b1..ce226fe 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1972,8 +1972,8 @@ @ cdecl _tempnam(str str) MSVCRT__tempnam @ cdecl _time32(ptr) MSVCRT__time32 @ cdecl _time64(ptr) MSVCRT__time64 -@ stub _timespec32_get -@ stub _timespec64_get +@ cdecl _timespec32_get(ptr long) +@ cdecl _timespec64_get(ptr long) @ cdecl _tolower(long) MSVCRT__tolower @ cdecl _tolower_l(long ptr) MSVCRT__tolower_l @ cdecl _toupper(long) MSVCRT__toupper

1 0

Zhiyi Zhang : comctl32: GroupBox can have multiline text.
by Alexandre Julliard April 18, 2018

April 18, 2018

Module: wine Branch: master Commit: 45eb3cb4fc2ab54f1c6dfa041e10c5a4c5c53130 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45eb3cb4fc2ab54f1c6dfa04… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Apr 18 21:58:39 2018 +0800 comctl32: GroupBox can have multiline text. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 1b187e3..1feb07a 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -282,9 +282,6 @@ static UINT BUTTON_BStoDT( DWORD style, DWORD ex_style ) default: dtStyle |= DT_VCENTER; break; } } - else - /* GroupBox's text is always single line and is top aligned. */ - dtStyle |= DT_SINGLELINE; return dtStyle; }

1 0

Nikolay Sivov : d3d10: Add support for returning multiple viewports.
by Alexandre Julliard April 18, 2018

April 18, 2018

Module: wine Branch: master Commit: 134d3f51fbbbca4a097b90bf7595e92d02f0c46d URL: https://source.winehq.org/git/wine.git/?a=commit;h=134d3f51fbbbca4a097b90bf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 18 12:50:47 2018 +0300 d3d10: Add support for returning multiple viewports. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 11 +++++++---- dlls/d3d11/device.c | 39 ++++++++++++++++++++++----------------- 2 files changed, 29 insertions(+), 21 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 140ffe6..26218bf 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -4934,7 +4934,7 @@ float4 main(float4 color : COLOR) : SV_TARGET "Got unexpected scissor rect %s in slot %u.\n", wine_dbgstr_rect(&tmp_rect[i]), i); } ID3D10Device_RSGetViewports(device, &count, NULL); - todo_wine ok(!count, "Got unexpected viewport count %u.\n", count); + ok(!count, "Got unexpected viewport count %u.\n", count); memset(tmp_viewport, 0x55, sizeof(tmp_viewport)); count = D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE; ID3D10Device_RSGetViewports(device, &count, tmp_viewport); @@ -5329,7 +5329,7 @@ float4 main(float4 color : COLOR) : SV_TARGET "Got unexpected scissor rect %s in slot %u.\n", wine_dbgstr_rect(&tmp_rect[i]), i); } ID3D10Device_RSGetViewports(device, &count, NULL); - todo_wine ok(count == D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE, + ok(count == D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE, "Got unexpected viewport count %u.\n", count); memset(tmp_viewport, 0x55, sizeof(tmp_viewport)); ID3D10Device_RSGetViewports(device, &count, tmp_viewport); @@ -5467,7 +5467,7 @@ float4 main(float4 color : COLOR) : SV_TARGET wine_dbgstr_rect(&tmp_rect[i]), i); } ID3D10Device_RSGetViewports(device, &count, NULL); - todo_wine ok(!count, "Got unexpected viewport count %u.\n", count); + ok(!count, "Got unexpected viewport count %u.\n", count); memset(tmp_viewport, 0x55, sizeof(tmp_viewport)); count = D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE; ID3D10Device_RSGetViewports(device, &count, tmp_viewport); @@ -16330,6 +16330,10 @@ static void test_multiple_viewports(void) vp[1].Width = width; ID3D10Device_RSSetViewports(device, 2, vp); + count = ARRAY_SIZE(vp); + ID3D10Device_RSGetViewports(device, &count, vp); + ok(count == 2, "Unexpected viewport count %d.\n", count); + constant.draw_id = 0; ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)cb, 0, NULL, &constant, 0, 0); draw_quad(&test_context); @@ -16379,7 +16383,6 @@ static void test_multiple_viewports(void) count = ARRAY_SIZE(vp); memset(vp, 0, sizeof(vp)); ID3D10Device_RSGetViewports(device, &count, vp); -todo_wine ok(count == 1, "Unexpected viewport count %d.\n", count); ok(vp[0].TopLeftX == 0.0f && vp[0].Width == width, "Unexpected viewport.\n"); diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index d47dfc9..7377952 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -4900,32 +4900,37 @@ static void STDMETHODCALLTYPE d3d10_device_RSGetViewports(ID3D10Device1 *iface, UINT *viewport_count, D3D10_VIEWPORT *viewports) { struct d3d_device *device = impl_from_ID3D10Device(iface); - struct wined3d_viewport wined3d_vp; + struct wined3d_viewport wined3d_vp[WINED3D_MAX_VIEWPORTS]; + unsigned int actual_count = ARRAY_SIZE(wined3d_vp), i; TRACE("iface %p, viewport_count %p, viewports %p.\n", iface, viewport_count, viewports); - if (!viewports) - { - *viewport_count = 1; - return; - } - - if (!*viewport_count) + if (!viewport_count) return; wined3d_mutex_lock(); - wined3d_device_get_viewports(device->wined3d_device, NULL, &wined3d_vp); + wined3d_device_get_viewports(device->wined3d_device, &actual_count, viewports ? wined3d_vp : NULL); wined3d_mutex_unlock(); - viewports[0].TopLeftX = wined3d_vp.x; - viewports[0].TopLeftY = wined3d_vp.y; - viewports[0].Width = wined3d_vp.width; - viewports[0].Height = wined3d_vp.height; - viewports[0].MinDepth = wined3d_vp.min_z; - viewports[0].MaxDepth = wined3d_vp.max_z; + if (!viewports) + { + *viewport_count = actual_count; + return; + } - if (*viewport_count > 1) - memset(&viewports[1], 0, (*viewport_count - 1) * sizeof(*viewports)); + if (*viewport_count > actual_count) + memset(&viewports[actual_count], 0, (*viewport_count - actual_count) * sizeof(*viewports)); + + *viewport_count = min(actual_count, *viewport_count); + for (i = 0; i < *viewport_count; ++i) + { + viewports[i].TopLeftX = wined3d_vp[i].x; + viewports[i].TopLeftY = wined3d_vp[i].y; + viewports[i].Width = wined3d_vp[i].width; + viewports[i].Height = wined3d_vp[i].height; + viewports[i].MinDepth = wined3d_vp[i].min_z; + viewports[i].MaxDepth = wined3d_vp[i].max_z; + } } static void STDMETHODCALLTYPE d3d10_device_RSGetScissorRects(ID3D10Device1 *iface, UINT *rect_count, D3D10_RECT *rects)

1 0

Nikolay Sivov : d3d11: Add support for returning multiple viewports.
by Alexandre Julliard April 18, 2018

April 18, 2018

Module: wine Branch: master Commit: be106e5d80e8cee92cf72c7612dff4e538d779a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be106e5d80e8cee92cf72c76… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 18 12:50:46 2018 +0300 d3d11: Add support for returning multiple viewports. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 39 ++++++++++++++++++++++----------------- dlls/d3d11/tests/d3d11.c | 11 +++++++---- 2 files changed, 29 insertions(+), 21 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 0ee756d..d47dfc9 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2093,32 +2093,37 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetViewports(ID3D11Devic UINT *viewport_count, D3D11_VIEWPORT *viewports) { struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); - struct wined3d_viewport wined3d_vp; + struct wined3d_viewport wined3d_vp[WINED3D_MAX_VIEWPORTS]; + unsigned int actual_count = ARRAY_SIZE(wined3d_vp), i; TRACE("iface %p, viewport_count %p, viewports %p.\n", iface, viewport_count, viewports); - if (!viewports) - { - *viewport_count = 1; - return; - } - - if (!*viewport_count) + if (!viewport_count) return; wined3d_mutex_lock(); - wined3d_device_get_viewports(device->wined3d_device, NULL, &wined3d_vp); + wined3d_device_get_viewports(device->wined3d_device, &actual_count, viewports ? wined3d_vp : NULL); wined3d_mutex_unlock(); - viewports[0].TopLeftX = wined3d_vp.x; - viewports[0].TopLeftY = wined3d_vp.y; - viewports[0].Width = wined3d_vp.width; - viewports[0].Height = wined3d_vp.height; - viewports[0].MinDepth = wined3d_vp.min_z; - viewports[0].MaxDepth = wined3d_vp.max_z; + if (!viewports) + { + *viewport_count = actual_count; + return; + } - if (*viewport_count > 1) - memset(&viewports[1], 0, (*viewport_count - 1) * sizeof(*viewports)); + if (*viewport_count > actual_count) + memset(&viewports[actual_count], 0, (*viewport_count - actual_count) * sizeof(*viewports)); + + *viewport_count = min(actual_count, *viewport_count); + for (i = 0; i < *viewport_count; ++i) + { + viewports[i].TopLeftX = wined3d_vp[i].x; + viewports[i].TopLeftY = wined3d_vp[i].y; + viewports[i].Width = wined3d_vp[i].width; + viewports[i].Height = wined3d_vp[i].height; + viewports[i].MinDepth = wined3d_vp[i].min_z; + viewports[i].MaxDepth = wined3d_vp[i].max_z; + } } static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetScissorRects(ID3D11DeviceContext *iface, diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index b917dcf..e591452 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -9821,7 +9821,7 @@ static void test_clear_state(void) "Got unexpected scissor rect %s in slot %u.\n", wine_dbgstr_rect(&tmp_rect[i]), i); } ID3D11DeviceContext_RSGetViewports(context, &count, NULL); - todo_wine ok(!count, "Got unexpected viewport count %u.\n", count); + ok(!count, "Got unexpected viewport count %u.\n", count); memset(tmp_viewport, 0x55, sizeof(tmp_viewport)); count = D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE; ID3D11DeviceContext_RSGetViewports(context, &count, tmp_viewport); @@ -10353,7 +10353,7 @@ static void test_clear_state(void) "Got unexpected scissor rect %s in slot %u.\n", wine_dbgstr_rect(&tmp_rect[i]), i); } ID3D11DeviceContext_RSGetViewports(context, &count, NULL); - todo_wine ok(count == D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE, + ok(count == D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE, "Got unexpected viewport count %u.\n", count); memset(tmp_viewport, 0x55, sizeof(tmp_viewport)); ID3D11DeviceContext_RSGetViewports(context, &count, tmp_viewport); @@ -10572,7 +10572,7 @@ static void test_clear_state(void) wine_dbgstr_rect(&tmp_rect[i]), i); } ID3D11DeviceContext_RSGetViewports(context, &count, NULL); - todo_wine ok(!count, "Got unexpected viewport count %u.\n", count); + ok(!count, "Got unexpected viewport count %u.\n", count); memset(tmp_viewport, 0x55, sizeof(tmp_viewport)); count = D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE; ID3D11DeviceContext_RSGetViewports(context, &count, tmp_viewport); @@ -26068,6 +26068,10 @@ static void test_multiple_viewports(void) vp[1].Width = width; ID3D11DeviceContext_RSSetViewports(context, 2, vp); + count = ARRAY_SIZE(vp); + ID3D11DeviceContext_RSGetViewports(context, &count, vp); + ok(count == 2, "Unexpected viewport count %d.\n", count); + constant.draw_id = 0; ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &constant, 0, 0); draw_quad(&test_context); @@ -26117,7 +26121,6 @@ static void test_multiple_viewports(void) count = ARRAY_SIZE(vp); memset(vp, 0, sizeof(vp)); ID3D11DeviceContext_RSGetViewports(context, &count, vp); -todo_wine ok(count == 1, "Unexpected viewport count %d.\n", count); ok(vp[0].TopLeftX == 0.0f && vp[0].Width == width, "Unexpected viewport.\n");

1 0

Francois Gouget : windowscodecs: Make get_metadata_container() static.
by Alexandre Julliard April 18, 2018

April 18, 2018

Module: wine Branch: master Commit: e7cc7f347d291418b14488075c10654f12f684fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7cc7f347d291418b1448807… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 18 03:24:47 2018 +0200 windowscodecs: Make get_metadata_container() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 6652ee3..21e6610 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -1514,7 +1514,7 @@ typedef struct UINT container_count; } MetadataReaderInfo; -struct metadata_container *get_metadata_container(MetadataReaderInfo *info, const GUID *guid) +static struct metadata_container *get_metadata_container(MetadataReaderInfo *info, const GUID *guid) { unsigned i;

1 0

Hans Leidekker : secur32: Return a handle from LsaRegisterLogonProcess.
by Alexandre Julliard April 18, 2018

April 18, 2018

Module: wine Branch: master Commit: 61171a5f11a1e631c3075f1415ddc0bf8f4c31ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=61171a5f11a1e631c3075f14… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 18 12:53:57 2018 +0200 secur32: Return a handle from LsaRegisterLogonProcess. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/lsa.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 779d67a..5fe6f3a 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -88,18 +88,34 @@ NTSTATUS WINAPI LsaCallAuthenticationPackage(HANDLE lsa_handle, ULONG package_id return STATUS_INVALID_PARAMETER; } +struct lsa_connection *alloc_lsa_connection(void) +{ + struct lsa_connection *ret; + if (!(ret = heap_alloc(sizeof(*ret)))) return NULL; + ret->magic = LSA_MAGIC; + return ret; +} + NTSTATUS WINAPI LsaConnectUntrusted(PHANDLE LsaHandle) { struct lsa_connection *lsa_conn; TRACE("%p\n", LsaHandle); - lsa_conn = heap_alloc(sizeof(*lsa_conn)); - if (!lsa_conn) return STATUS_NO_MEMORY; - - lsa_conn->magic = LSA_MAGIC; + if (!(lsa_conn = alloc_lsa_connection())) return STATUS_NO_MEMORY; *LsaHandle = lsa_conn; + return STATUS_SUCCESS; +} + +NTSTATUS WINAPI LsaRegisterLogonProcess(PLSA_STRING LogonProcessName, + PHANDLE LsaHandle, PLSA_OPERATIONAL_MODE SecurityMode) +{ + struct lsa_connection *lsa_conn; + + FIXME("%s %p %p stub\n", debugstr_as(LogonProcessName), LsaHandle, SecurityMode); + if (!(lsa_conn = alloc_lsa_connection())) return STATUS_NO_MEMORY; + *LsaHandle = lsa_conn; return STATUS_SUCCESS; } @@ -923,10 +939,3 @@ NTSTATUS WINAPI LsaLookupAuthenticationPackage(HANDLE lsa_handle, return STATUS_UNSUCCESSFUL; /* FIXME */ } - -NTSTATUS WINAPI LsaRegisterLogonProcess(PLSA_STRING LogonProcessName, - PHANDLE LsaHandle, PLSA_OPERATIONAL_MODE SecurityMode) -{ - FIXME("%p %p %p stub\n", LogonProcessName, LsaHandle, SecurityMode); - return STATUS_SUCCESS; -}

1 0

Francois Gouget : kernel32/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard April 18, 2018

April 18, 2018

Module: wine Branch: master Commit: 1b88ec9c7a8f22ceec38dc53f206fb8486f79f49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b88ec9c7a8f22ceec38dc53… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 18 03:25:56 2018 +0200 kernel32/tests: Add a trailing '\n' to an ok() call. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index b9b36d8..91a8703 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -5612,7 +5612,7 @@ static void test_NormalizeString(void) todo_wine { dstlen = pNormalizeString( NormalizationD, ptest->str, -1, dst, 1 ); - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Should have failed with ERROR_INSUFFICIENT_BUFFER"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Should have failed with ERROR_INSUFFICIENT_BUFFER\n"); } /*

1 0

Francois Gouget : winevulkan: Tweak the wording of a comment.
by Alexandre Julliard April 18, 2018

April 18, 2018

Module: wine Branch: master Commit: 7e35f9e8d93e5ec28ac94634b07128d85ed7781c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e35f9e8d93e5ec28ac94634… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 18 03:23:01 2018 +0200 winevulkan: Tweak the wording of a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 7d84cfb..f0583b4 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -576,7 +576,7 @@ class VkFunction(object): Args prefix (str, optional): prefix to prepend to entry point name. - symbol (str, optional): allows to override function name implementing entry point. + symbol (str, optional): allows overriding the name of the function implementing the entry point. """ spec = ""

1 0

Hans Leidekker : kerberos: Consistently use NTSTATUS return values.
by Alexandre Julliard April 18, 2018

April 18, 2018

Module: wine Branch: master Commit: 697bda8ac3a1020cf466efcd9e44cc84b9228e6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=697bda8ac3a1020cf466efcd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 18 12:53:55 2018 +0200 kerberos: Consistently use NTSTATUS return values. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index e51f7ea..d40ec04 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -691,7 +691,7 @@ static inline void ctxthandle_gss_to_sspi( gss_ctx_id_t handle, LSA_SEC_HANDLE * *ctxt = (LSA_SEC_HANDLE)handle; } -static SECURITY_STATUS status_gss_to_sspi( OM_uint32 status ) +static NTSTATUS status_gss_to_sspi( OM_uint32 status ) { switch (status) { @@ -712,7 +712,7 @@ static SECURITY_STATUS status_gss_to_sspi( OM_uint32 status ) case GSS_S_GAP_TOKEN: return SEC_E_OUT_OF_SEQUENCE; default: - FIXME( "couldn't convert status 0x%08x to SECURITY_STATUS\n", status ); + FIXME( "couldn't convert status 0x%08x to NTSTATUS\n", status ); return SEC_E_INTERNAL_ERROR; } } @@ -761,7 +761,7 @@ static void expirytime_gss_to_sspi( OM_uint32 expirytime, TimeStamp *timestamp ) timestamp->HighPart = tmp.QuadPart >> 32; } -static SECURITY_STATUS name_sspi_to_gss( const UNICODE_STRING *name_str, gss_name_t *name ) +static NTSTATUS name_sspi_to_gss( const UNICODE_STRING *name_str, gss_name_t *name ) { OM_uint32 ret, minor_status; gss_OID type = GSS_C_NO_OID; /* FIXME: detect the appropriate value for this ourselves? */ @@ -925,8 +925,9 @@ static NTSTATUS acquire_credentials_handle( UNICODE_STRING *principal_us, gss_cr OM_uint32 ret, minor_status, expiry_time; gss_name_t principal = GSS_C_NO_NAME; gss_cred_id_t cred_handle; + NTSTATUS status; - if (principal_us && ((ret = name_sspi_to_gss( principal_us, &principal )) != SEC_E_OK)) return ret; + if (principal_us && ((status = name_sspi_to_gss( principal_us, &principal )) != SEC_E_OK)) return status; ret = pgss_acquire_cred( &minor_status, principal, GSS_C_INDEFINITE, GSS_C_NULL_OID_SET, cred_usage, &cred_handle, NULL, &expiry_time ); @@ -1018,6 +1019,7 @@ static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, gss_ctx_id_t ctxt_handle; gss_buffer_desc input_token, output_token; gss_name_t target = GSS_C_NO_NAME; + NTSTATUS status; int idx; TRACE( "(%lx %lx %s 0x%08x %u %p %p %p %p %p %p %p)\n", credential, context, debugstr_us(target_name), @@ -1041,7 +1043,7 @@ static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, output_token.length = 0; output_token.value = NULL; - if (target_name && ((ret = name_sspi_to_gss( target_name, &target )) != SEC_E_OK)) return ret; + if (target_name && ((status = name_sspi_to_gss( target_name, &target )) != SEC_E_OK)) return status; ret = pgss_init_sec_context( &minor_status, cred_handle, &ctxt_handle, target, GSS_C_NO_OID, req_flags, 0, GSS_C_NO_CHANNEL_BINDINGS, &input_token, NULL, &output_token, &ret_flags, @@ -1369,7 +1371,7 @@ static NTSTATUS SEC_ENTRY kerberos_SpMakeSignature( LSA_SEC_HANDLE context, ULON #endif } -static SECURITY_STATUS SEC_ENTRY kerberos_SpVerifySignature( LSA_SEC_HANDLE context, SecBufferDesc *message, +static NTSTATUS NTAPI kerberos_SpVerifySignature( LSA_SEC_HANDLE context, SecBufferDesc *message, ULONG message_seq_no, ULONG *quality_of_protection ) { #ifdef SONAME_LIBGSSAPI_KRB5

1 0