May 2022 - Wine-Commits - list.winehq.org

Nikolay Sivov : kerberos: Pass input/output buffers directly for verify_signature() call.
by Alexandre Julliard May 30, 2022

May 30, 2022

Module: wine Branch: master Commit: 958e03b7064b09e664e4344398c8ac47b86eb9e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=958e03b7064b09e664e43443… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 28 14:17:46 2022 +0300 kerberos: Pass input/output buffers directly for verify_signature() call. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kerberos/krb5_ap.c | 14 +++++++++++++- dlls/kerberos/unixlib.c | 13 ++++--------- dlls/kerberos/unixlib.h | 5 ++++- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 50d58538836..f2bcfc3f7f4 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -668,7 +668,19 @@ static NTSTATUS NTAPI kerberos_SpVerifySignature( LSA_SEC_HANDLE context, SecBuf if (context) { struct context_handle *context_handle = (void *)context; - struct verify_signature_params params = { context_handle->handle, message, quality_of_protection }; + struct verify_signature_params params; + int data_idx, token_idx; + + if ((data_idx = get_buffer_index( message, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; + if ((token_idx = get_buffer_index( message, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + + params.context = context_handle->handle; + params.data_length = message->pBuffers[data_idx].cbBuffer; + params.data = message->pBuffers[data_idx].pvBuffer; + params.token_length = message->pBuffers[token_idx].cbBuffer; + params.token = message->pBuffers[token_idx].pvBuffer; + params.qop = quality_of_protection; + return KRB5_CALL( verify_signature, &params ); } else return SEC_E_INVALID_HANDLE; diff --git a/dlls/kerberos/unixlib.c b/dlls/kerberos/unixlib.c index 100a905b066..6404b6ab190 100644 --- a/dlls/kerberos/unixlib.c +++ b/dlls/kerberos/unixlib.c @@ -996,19 +996,14 @@ static NTSTATUS unseal_message( void *args ) static NTSTATUS verify_signature( void *args ) { struct verify_signature_params *params = args; - SecBufferDesc *msg = params->msg; OM_uint32 ret, minor_status; gss_buffer_desc data_buffer, token_buffer; gss_ctx_id_t ctx_handle = ctxhandle_sspi_to_gss( params->context ); - int data_idx, token_idx; - if ((data_idx = get_buffer_index( msg, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; - data_buffer.length = msg->pBuffers[data_idx].cbBuffer; - data_buffer.value = msg->pBuffers[data_idx].pvBuffer; - - if ((token_idx = get_buffer_index( msg, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; - token_buffer.length = msg->pBuffers[token_idx].cbBuffer; - token_buffer.value = msg->pBuffers[token_idx].pvBuffer; + data_buffer.length = params->data_length; + data_buffer.value = params->data; + token_buffer.length = params->token_length; + token_buffer.value = params->token; ret = pgss_verify_mic( &minor_status, ctx_handle, &data_buffer, &token_buffer, NULL ); TRACE( "gss_verify_mic returned %#x minor status %#x\n", ret, minor_status ); diff --git a/dlls/kerberos/unixlib.h b/dlls/kerberos/unixlib.h index b5a058b855c..e7ce7e0b4f3 100644 --- a/dlls/kerberos/unixlib.h +++ b/dlls/kerberos/unixlib.h @@ -108,7 +108,10 @@ struct unseal_message_params struct verify_signature_params { UINT64 context; - SecBufferDesc *msg; + BYTE *data; + ULONG data_length; + BYTE *token; + ULONG token_length; ULONG *qop; };

1 0

Roman Pišl : tapi32: Add lineGetCallInfoW stub.
by Alexandre Julliard May 30, 2022

May 30, 2022

Module: wine Branch: master Commit: 5f3a0156d1e0ed014fca355cf1ec50120d6f8fce URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f3a0156d1e0ed014fca355c… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Sat May 28 13:18:01 2022 +0200 tapi32: Add lineGetCallInfoW stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53061 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tapi32/line.c | 9 +++++++++ dlls/tapi32/tapi32.spec | 1 + 2 files changed, 10 insertions(+) diff --git a/dlls/tapi32/line.c b/dlls/tapi32/line.c index 75bfe837f3d..2dbca2aba3e 100644 --- a/dlls/tapi32/line.c +++ b/dlls/tapi32/line.c @@ -296,6 +296,15 @@ DWORD WINAPI lineGetCallInfoA(HCALL hCall, LPLINECALLINFO lpCallInfo) return 0; } +/*********************************************************************** + * lineGetCallInfoW (TAPI32.@) + */ +DWORD WINAPI lineGetCallInfoW(HCALL hCall, LPLINECALLINFO lpCallInfo) +{ + FIXME("(%p, %p): stub.\n", hCall, lpCallInfo); + return 0; +} + /*********************************************************************** * lineGetCallStatus (TAPI32.@) */ diff --git a/dlls/tapi32/tapi32.spec b/dlls/tapi32/tapi32.spec index 6c01a870479..757e387c8d2 100644 --- a/dlls/tapi32/tapi32.spec +++ b/dlls/tapi32/tapi32.spec @@ -39,6 +39,7 @@ @ stdcall lineGetAppPriorityA(str long ptr long ptr ptr) @ stdcall lineGetCallInfo(long ptr) lineGetCallInfoA @ stdcall lineGetCallInfoA(long ptr) +@ stdcall lineGetCallInfoW(long ptr) @ stdcall lineGetCallStatus(long ptr) @ stdcall lineGetConfRelatedCalls(long ptr) @ stdcall lineGetCountry(long long ptr) lineGetCountryA

1 0

Alistair Leslie-Hughes : d3drm: Implement IDirect3DRMTexture3::{Get,Set}DecalTransparency().
by Alexandre Julliard May 30, 2022

May 30, 2022

Module: wine Branch: master Commit: 66c8cb3ee961ef259071f90c86d32018e1e9b1ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=66c8cb3ee961ef259071f90c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri May 27 09:10:29 2022 +0000 d3drm: Implement IDirect3DRMTexture3::{Get,Set}DecalTransparency(). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/d3drm/d3drm_private.h | 1 + dlls/d3drm/tests/d3drm.c | 13 +++++++++++++ dlls/d3drm/texture.c | 15 +++++++++++---- 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 44bf41fdabf..c5df376a72e 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -68,6 +68,7 @@ struct d3drm_texture LONG decal_y; DWORD max_colors; DWORD max_shades; + BOOL transparency; }; struct d3drm_frame diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 72c71ebae09..c9cfe932ca4 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -2712,6 +2712,7 @@ static void test_Texture(void) IDirectDrawSurface *surface; LONG decalx, decaly; DWORD colors, shades; + BOOL transparency; D3DRMIMAGE initimg = { @@ -2919,6 +2920,18 @@ static void test_Texture(void) hr = IDirect3DRMTexture_SetShades(texture1, 8); ok(hr == S_OK, "got %#lx.\n", hr); + transparency = IDirect3DRMTexture_GetDecalTransparency(texture1); + ok(transparency == FALSE, "Got %d.\n", transparency); + + hr = IDirect3DRMTexture_SetDecalTransparency(texture1, TRUE); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + transparency = IDirect3DRMTexture_GetDecalTransparency(texture1); + ok(transparency == TRUE, "Got %d.\n", transparency); + + hr = IDirect3DRMTexture_SetDecalTransparency(texture1, FALSE); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + d3drm_img = IDirect3DRMTexture_GetImage(texture1); ok(!!d3drm_img, "Failed to get image.\n"); ok(d3drm_img == &initimg, "Expected image returned == %p, got %p.\n", &initimg, d3drm_img); diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index 76f82671811..a14e47efc1e 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -1219,9 +1219,13 @@ static HRESULT WINAPI d3drm_texture3_SetDecalScale(IDirect3DRMTexture3 *iface, D static HRESULT WINAPI d3drm_texture3_SetDecalTransparency(IDirect3DRMTexture3 *iface, BOOL transparency) { - FIXME("iface %p, transparency %#x stub!\n", iface, transparency); + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture3(iface); - return E_NOTIMPL; + TRACE("iface %p, transparency %#x.\n", iface, transparency); + + texture->transparency = transparency; + + return S_OK; } static HRESULT WINAPI d3drm_texture3_SetDecalTransparentColor(IDirect3DRMTexture3 *iface, D3DCOLOR color) @@ -1282,9 +1286,11 @@ static DWORD WINAPI d3drm_texture3_GetDecalScale(IDirect3DRMTexture3 *iface) static BOOL WINAPI d3drm_texture3_GetDecalTransparency(IDirect3DRMTexture3 *iface) { - FIXME("iface %p stub!\n", iface); + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture3(iface); + + TRACE("iface %p.\n", iface); - return FALSE; + return texture->transparency; } static D3DCOLOR WINAPI d3drm_texture3_GetDecalTransparentColor(IDirect3DRMTexture3 *iface) @@ -1441,6 +1447,7 @@ HRESULT d3drm_texture_create(struct d3drm_texture **texture, IDirect3DRM *d3drm) object->d3drm = d3drm; object->max_colors = 8; object->max_shades = 16; + object->transparency = FALSE; d3drm_object_init(&object->obj, classname);

1 0

Zhao Yi : mscms: Return the correct value for bmformat.
by Alexandre Julliard May 30, 2022

May 30, 2022

Module: wine Branch: master Commit: 148c708bdaebaba50ab7c115f5fbe711a61ea8ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=148c708bdaebaba50ab7c115… Author: Zhao Yi <zhaoyi(a)uniontech.com> Date: Mon May 30 15:55:42 2022 +0200 mscms: Return the correct value for bmformat. Signed-off-by: Zhao Yi <zhaoyi(a)uniontech.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscms/tests/profile.c | 8 ++++---- dlls/mscms/transform.c | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index 025b1531796..e5f924fb2da 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -1396,22 +1396,22 @@ static void test_TranslateBitmapBits( char *standardprofile, char *testprofile ) memset( destbits, 0, sizeof(destbits) ); ret = pTranslateBitmapBits( transform, srcbits, BM_RGBTRIPLETS, 1, 1, 3, destbits, BM_xBGRQUADS, 4, NULL, 0 ); ok( ret, "got %lu\n", GetLastError() ); - todo_wine ok( !memcmp(expect_destbits, destbits, sizeof(expect_destbits)), "unexpected destbits\n" ); + ok( !memcmp(expect_destbits, destbits, sizeof(expect_destbits)), "unexpected destbits\n" ); memset( destbits, 0, sizeof(destbits) ); ret = pTranslateBitmapBits( transform, srcbits, BM_RGBTRIPLETS, 1, 1, 3, destbits, BM_xRGBQUADS, 4, NULL, 0 ); ok( ret, "got %lu\n", GetLastError() ); - todo_wine ok( !memcmp(expect_destbits2, destbits, sizeof(expect_destbits2)), "unexpected destbits\n" ); + ok( !memcmp(expect_destbits2, destbits, sizeof(expect_destbits2)), "unexpected destbits\n" ); memset( destbits, 0, sizeof(destbits) ); ret = pTranslateBitmapBits( transform, srcbits2, BM_xRGBQUADS, 1, 1, 4, destbits, BM_RGBTRIPLETS, 3, NULL, 0 ); ok( ret, "got %lu\n", GetLastError() ); - todo_wine ok( !memcmp(expect_destbits3, destbits, sizeof(expect_destbits3)), "unexpected destbits\n" ); + ok( !memcmp(expect_destbits3, destbits, sizeof(expect_destbits3)), "unexpected destbits\n" ); memset( destbits, 0, sizeof(destbits) ); ret = pTranslateBitmapBits( transform, srcbits2, BM_xRGBQUADS, 1, 1, 4, destbits, BM_BGRTRIPLETS, 3, NULL, 0 ); ok( ret, "got %lu\n", GetLastError() ); - todo_wine ok( !memcmp(expect_destbits4, destbits, sizeof(expect_destbits4)), "unexpected destbits\n" ); + ok( !memcmp(expect_destbits4, destbits, sizeof(expect_destbits4)), "unexpected destbits\n" ); pDeleteColorTransform( transform ); pCloseColorProfile( handle[0] ); diff --git a/dlls/mscms/transform.c b/dlls/mscms/transform.c index 0d48e217d66..22901ad721c 100644 --- a/dlls/mscms/transform.c +++ b/dlls/mscms/transform.c @@ -39,12 +39,12 @@ static DWORD from_bmformat( BMFORMAT format ) switch (format) { - case BM_RGBTRIPLETS: ret = TYPE_RGB_8; break; - case BM_BGRTRIPLETS: ret = TYPE_BGR_8; break; + case BM_RGBTRIPLETS: ret = TYPE_BGR_8; break; + case BM_BGRTRIPLETS: ret = TYPE_RGB_8; break; case BM_GRAY: ret = TYPE_GRAY_8; break; - case BM_xRGBQUADS: ret = TYPE_ARGB_8; break; - case BM_xBGRQUADS: ret = TYPE_ABGR_8; break; - case BM_KYMCQUADS: ret = TYPE_KYMC_8; break; + case BM_xRGBQUADS: ret = TYPE_BGRA_8; break; + case BM_xBGRQUADS: ret = TYPE_RGBA_8; break; + case BM_KYMCQUADS: ret = TYPE_CMYK_8; break; default: if (!quietfixme) {

1 0

Nikolay Sivov : kerberos: Separate ticket query function from call handler.
by Alexandre Julliard May 30, 2022

May 30, 2022

Module: wine Branch: master Commit: ce8aed90edabc00f52ffd70beafd2198f458edfb URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce8aed90edabc00f52ffd70b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 28 19:31:26 2022 +0300 kerberos: Separate ticket query function from call handler. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kerberos/unixlib.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/kerberos/unixlib.c b/dlls/kerberos/unixlib.c index 38b1cf50895..95e832e81d3 100644 --- a/dlls/kerberos/unixlib.c +++ b/dlls/kerberos/unixlib.c @@ -303,16 +303,13 @@ static NTSTATUS copy_tickets_to_client( struct ticket_list *list, KERB_QUERY_TKT return STATUS_SUCCESS; } -static NTSTATUS query_ticket_cache( void *args ) +static NTSTATUS kerberos_fill_ticket_list( struct ticket_list *list ) { - struct query_ticket_cache_params *params = args; NTSTATUS status; krb5_error_code err; krb5_context ctx; krb5_cccol_cursor cursor = NULL; krb5_ccache cache; - ULONG i; - struct ticket_list list = { 0 }; if ((err = p_krb5_init_context( &ctx ))) return krb5_error_to_status( err ); if ((err = p_krb5_cccol_cursor_new( ctx, &cursor ))) @@ -330,7 +327,7 @@ static NTSTATUS query_ticket_cache( void *args ) } if (!cache) break; - status = copy_tickets_from_cache( ctx, cache, &list ); + status = copy_tickets_from_cache( ctx, cache, list ); p_krb5_cc_close( ctx, cache ); if (status != STATUS_SUCCESS) goto done; } @@ -339,6 +336,18 @@ done: if (cursor) p_krb5_cccol_cursor_free( ctx, &cursor ); if (ctx) p_krb5_free_context( ctx ); + return status; +} + +static NTSTATUS query_ticket_cache( void *args ) +{ + struct query_ticket_cache_params *params = args; + struct ticket_list list = { 0 }; + NTSTATUS status; + ULONG i; + + status = kerberos_fill_ticket_list( &list ); + if (status == STATUS_SUCCESS) status = copy_tickets_to_client( &list, params->resp, params->out_size ); for (i = 0; i < list.count; i++)

1 0

Alistair Leslie-Hughes : d3drm: Implement IDirect3DRMTexture3::{Get,Set}DecalSize().
by Alexandre Julliard May 30, 2022

May 30, 2022

Module: wine Branch: master Commit: a8a126c4a32b41be80022f02b37579bf4fbcc596 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8a126c4a32b41be80022f02… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri May 27 09:10:30 2022 +0000 d3drm: Implement IDirect3DRMTexture3::{Get,Set}DecalSize(). --- dlls/d3drm/d3drm_private.h | 2 ++ dlls/d3drm/tests/d3drm.c | 17 +++++++++++++++++ dlls/d3drm/texture.c | 20 ++++++++++++++++---- 3 files changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index c5df376a72e..2fb6bafe951 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -69,6 +69,8 @@ struct d3drm_texture DWORD max_colors; DWORD max_shades; BOOL transparency; + D3DVALUE decal_width; + D3DVALUE decal_height; }; struct d3drm_frame diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index c9cfe932ca4..5745fea4b09 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -2713,6 +2713,7 @@ static void test_Texture(void) LONG decalx, decaly; DWORD colors, shades; BOOL transparency; + D3DVALUE width, height; D3DRMIMAGE initimg = { @@ -2920,6 +2921,22 @@ static void test_Texture(void) hr = IDirect3DRMTexture_SetShades(texture1, 8); ok(hr == S_OK, "got %#lx.\n", hr); + hr = IDirect3DRMTexture_GetDecalSize(texture1, &width, &height); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(width == 1.0f, "Got %.8e.\n", width); + ok(height == 1.0f, "Got %.8e.\n", height); + + hr = IDirect3DRMTexture_SetDecalSize(texture1, 8.0f, 7.0f); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IDirect3DRMTexture_GetDecalSize(texture1, &width, &height); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(width == 8.0f, "Got %.8e.\n", width); + ok(height == 7.0f, "Got %.8e.\n", height); + + hr = IDirect3DRMTexture_SetDecalSize(texture1, 1.0f, 1.0f); + ok(hr == S_OK, "got %#lx.\n", hr); + transparency = IDirect3DRMTexture_GetDecalTransparency(texture1); ok(transparency == FALSE, "Got %d.\n", transparency); diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index a14e47efc1e..a60317b48bc 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -1193,9 +1193,14 @@ static HRESULT WINAPI d3drm_texture3_SetShades(IDirect3DRMTexture3 *iface, DWORD static HRESULT WINAPI d3drm_texture3_SetDecalSize(IDirect3DRMTexture3 *iface, D3DVALUE width, D3DVALUE height) { - FIXME("iface %p, width %.8e, height %.8e stub!\n", iface, width, height); + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture3(iface); - return E_NOTIMPL; + TRACE("iface %p, width %.8e, height %.8e.\n", iface, width, height); + + texture->decal_width = width; + texture->decal_height = height; + + return S_OK; } static HRESULT WINAPI d3drm_texture3_SetDecalOrigin(IDirect3DRMTexture3 *iface, LONG x, LONG y) @@ -1237,9 +1242,14 @@ static HRESULT WINAPI d3drm_texture3_SetDecalTransparentColor(IDirect3DRMTexture static HRESULT WINAPI d3drm_texture3_GetDecalSize(IDirect3DRMTexture3 *iface, D3DVALUE *width, D3DVALUE *height) { - FIXME("iface %p, width %p, height %p stub!\n", iface, width, height); + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture3(iface); - return E_NOTIMPL; + TRACE("iface %p, width %p, height %p.\n", iface, width, height); + + *width = texture->decal_width; + *height = texture->decal_height; + + return S_OK; } static HRESULT WINAPI d3drm_texture3_GetDecalOrigin(IDirect3DRMTexture3 *iface, LONG *x, LONG *y) @@ -1448,6 +1458,8 @@ HRESULT d3drm_texture_create(struct d3drm_texture **texture, IDirect3DRM *d3drm) object->max_colors = 8; object->max_shades = 16; object->transparency = FALSE; + object->decal_width = 1.0f; + object->decal_height = 1.0f; d3drm_object_init(&object->obj, classname);

1 0

Paul Gofman : wininet: Return INTERNET_RAS_INSTALLED flag from InternetGetConnectedStateExW().
by Alexandre Julliard May 30, 2022

May 30, 2022

Module: wine Branch: master Commit: 49845c512d731c1bd614077f000f39e1fd00b6d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=49845c512d731c1bd614077f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 27 17:22:37 2022 -0500 wininet: Return INTERNET_RAS_INSTALLED flag from InternetGetConnectedStateExW(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/wininet/internet.c | 4 ++-- dlls/wininet/tests/internet.c | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 4d512e4ef39..120cc9af4cc 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1213,8 +1213,8 @@ BOOL WINAPI InternetGetConnectedStateExW(LPDWORD lpdwStatus, LPWSTR lpszConnecti return FALSE; if (lpdwStatus) { - WARN("always returning LAN connection.\n"); - *lpdwStatus = INTERNET_CONNECTION_LAN; + WARN("always returning LAN connection and RAS installed.\n"); + *lpdwStatus = INTERNET_CONNECTION_LAN | INTERNET_RAS_INSTALLED; } /* When the buffer size is zero LoadStringW fills the buffer with a pointer to diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 5083596f9df..97bd36f9427 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1632,7 +1632,6 @@ static void test_InternetGetConnectedStateExA(void) buffer[0] = 0; res = pInternetGetConnectedStateExA(&flags, buffer, sizeof(buffer), 0); trace("Internet Connection: Flags 0x%02lx - Name '%s'\n", flags, buffer); - todo_wine ok (flags & INTERNET_RAS_INSTALLED, "Missing RAS flag\n"); if(!res) { win_skip("InternetGetConnectedStateExA tests require a valid connection\n"); @@ -1734,7 +1733,6 @@ static void test_InternetGetConnectedStateExW(void) buffer[0] = 0; res = pInternetGetConnectedStateExW(&flags, buffer, ARRAY_SIZE(buffer), 0); trace("Internet Connection: Flags 0x%02lx - Name '%s'\n", flags, wine_dbgstr_w(buffer)); - todo_wine ok (flags & INTERNET_RAS_INSTALLED, "Missing RAS flag\n"); if(!res) { win_skip("InternetGetConnectedStateExW tests require a valid connection\n");

1 0

Hans Leidekker : mscms: Get rid of an unused structure.
by Alexandre Julliard May 30, 2022

May 30, 2022

Module: wine Branch: master Commit: 4a4f73d7f6102a0baa1aaf1a2e8ced83527c8d45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a4f73d7f6102a0baa1aaf1a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 30 15:55:44 2022 +0200 mscms: Get rid of an unused structure. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscms/mscms_priv.h | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/dlls/mscms/mscms_priv.h b/dlls/mscms/mscms_priv.h index 7a4a35ebc24..29895fb8ae8 100644 --- a/dlls/mscms/mscms_priv.h +++ b/dlls/mscms/mscms_priv.h @@ -65,19 +65,4 @@ extern BOOL set_tag_data( const struct profile *, TAGTYPE, DWORD, const void *, extern void get_profile_header( const struct profile *, PROFILEHEADER * ) DECLSPEC_HIDDEN; extern void set_profile_header( const struct profile *, const PROFILEHEADER * ) DECLSPEC_HIDDEN; -struct lcms_funcs -{ - void * (CDECL *open_profile)( void *data, DWORD size ); - void (CDECL *close_profile)( void *profile ); - void * (CDECL *create_transform)( void *output, void *target, DWORD intent ); - void * (CDECL *create_multi_transform)( void *profiles, DWORD count, DWORD intent ); - BOOL (CDECL *translate_bits)( void *transform, void *srcbits, BMFORMAT input, - void *dstbits, BMFORMAT output, DWORD size ); - BOOL (CDECL *translate_colors)( void *transform, COLOR *in, DWORD count, COLORTYPE input_type, - COLOR *out, COLORTYPE output_type ); - void (CDECL *close_transform)( void *transform ); -}; - -extern const struct lcms_funcs *lcms_funcs; - extern const char *dbgstr_tag(DWORD) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : mscms: Use CRT memory allocation functions.
by Alexandre Julliard May 30, 2022

May 30, 2022

Module: wine Branch: master Commit: 948e2f6554ef8a5481f8a552739ee627d524e3fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=948e2f6554ef8a5481f8a552… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 30 15:55:45 2022 +0200 mscms: Use CRT memory allocation functions. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscms/handle.c | 17 +++--- dlls/mscms/profile.c | 166 +++++++++++++++++++-------------------------------- 2 files changed, 73 insertions(+), 110 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=948e2f6554ef8a5481f8…

1 0

Nikolay Sivov : kerberos: Pass input/output buffers directly for make_signature() call.
by Alexandre Julliard May 30, 2022

May 30, 2022

Module: wine Branch: master Commit: d974d58466a0c0560d2b8470df23dfb5141376de URL: https://source.winehq.org/git/wine.git/?a=commit;h=d974d58466a0c0560d2b8470… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 28 13:39:55 2022 +0300 kerberos: Pass input/output buffers directly for make_signature() call. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kerberos/krb5_ap.c | 14 +++++++++++++- dlls/kerberos/unixlib.c | 14 ++++---------- dlls/kerberos/unixlib.h | 5 ++++- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 5cc2623c4ad..50d58538836 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -641,7 +641,19 @@ static NTSTATUS SEC_ENTRY kerberos_SpMakeSignature( LSA_SEC_HANDLE context, ULON if (context) { struct context_handle *context_handle = (void *)context; - struct make_signature_params params = { context_handle->handle, message }; + struct make_signature_params params; + int data_idx, token_idx; + + /* FIXME: multiple data buffers, read-only buffers */ + if ((data_idx = get_buffer_index( message, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; + if ((token_idx = get_buffer_index( message, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + + params.context = context_handle->handle; + params.data_length = message->pBuffers[data_idx].cbBuffer; + params.data = message->pBuffers[data_idx].pvBuffer; + params.token_length = &message->pBuffers[token_idx].cbBuffer; + params.token = message->pBuffers[token_idx].pvBuffer; + return KRB5_CALL( make_signature, &params ); } else return SEC_E_INVALID_HANDLE; diff --git a/dlls/kerberos/unixlib.c b/dlls/kerberos/unixlib.c index 45d8f0b02da..100a905b066 100644 --- a/dlls/kerberos/unixlib.c +++ b/dlls/kerberos/unixlib.c @@ -753,18 +753,12 @@ static NTSTATUS initialize_context( void *args ) static NTSTATUS make_signature( void *args ) { struct make_signature_params *params = args; - SecBufferDesc *msg = params->msg; OM_uint32 ret, minor_status; gss_buffer_desc data_buffer, token_buffer; gss_ctx_id_t ctx_handle = ctxhandle_sspi_to_gss( params->context ); - int data_idx, token_idx; - - /* FIXME: multiple data buffers, read-only buffers */ - if ((data_idx = get_buffer_index( msg, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; - data_buffer.length = msg->pBuffers[data_idx].cbBuffer; - data_buffer.value = msg->pBuffers[data_idx].pvBuffer; - if ((token_idx = get_buffer_index( msg, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + data_buffer.length = params->data_length; + data_buffer.value = params->data; token_buffer.length = 0; token_buffer.value = NULL; @@ -773,8 +767,8 @@ static NTSTATUS make_signature( void *args ) if (GSS_ERROR( ret )) trace_gss_status( ret, minor_status ); if (ret == GSS_S_COMPLETE) { - memcpy( msg->pBuffers[token_idx].pvBuffer, token_buffer.value, token_buffer.length ); - msg->pBuffers[token_idx].cbBuffer = token_buffer.length; + memcpy( params->token, token_buffer.value, token_buffer.length ); + *params->token_length = token_buffer.length; pgss_release_buffer( &minor_status, &token_buffer ); } diff --git a/dlls/kerberos/unixlib.h b/dlls/kerberos/unixlib.h index 4fada1e1618..b5a058b855c 100644 --- a/dlls/kerberos/unixlib.h +++ b/dlls/kerberos/unixlib.h @@ -72,7 +72,10 @@ struct initialize_context_params struct make_signature_params { UINT64 context; - SecBufferDesc *msg; + BYTE *data; + ULONG data_length; + BYTE *token; + ULONG *token_length; }; struct query_context_attributes_params

1 0