wine-commits January 2013

wine-commits@winehq.org

2 participants
736 discussions

Henri Verbeet : d3drm: Avoid LPD3DRMQUATERNION.
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: e84e2e8c9acfdfc665e84bb3bf49376320cf3530 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e84e2e8c9acfdfc665e84bb3b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 24 11:37:37 2013 +0100 d3drm: Avoid LPD3DRMQUATERNION. --- dlls/d3drm/math.c | 7 ++++--- dlls/d3drm/tests/vector.c | 5 +++-- include/d3drmdef.h | 9 +++++---- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/d3drm/math.c b/dlls/d3drm/math.c index 2b23c8f..a1ad727 100644 --- a/dlls/d3drm/math.c +++ b/dlls/d3drm/math.c @@ -75,7 +75,7 @@ D3DVALUE WINAPI D3DRMColorGetRed(D3DCOLOR color) } /* Product of 2 quaternions */ -LPD3DRMQUATERNION WINAPI D3DRMQuaternionMultiply(LPD3DRMQUATERNION q, LPD3DRMQUATERNION a, LPD3DRMQUATERNION b) +D3DRMQUATERNION * WINAPI D3DRMQuaternionMultiply(D3DRMQUATERNION *q, D3DRMQUATERNION *a, D3DRMQUATERNION *b) { D3DRMQUATERNION temp; D3DVECTOR cross_product; @@ -91,7 +91,7 @@ LPD3DRMQUATERNION WINAPI D3DRMQuaternionMultiply(LPD3DRMQUATERNION q, LPD3DRMQUA } /* Matrix for the Rotation that a unit quaternion represents */ -void WINAPI D3DRMMatrixFromQuaternion(D3DRMMATRIX4D m, LPD3DRMQUATERNION q) +void WINAPI D3DRMMatrixFromQuaternion(D3DRMMATRIX4D m, D3DRMQUATERNION *q) { D3DVALUE w,x,y,z; w = q->s; @@ -125,7 +125,8 @@ D3DRMQUATERNION * WINAPI D3DRMQuaternionFromRotation(D3DRMQUATERNION *q, D3DVECT } /* Interpolation between two quaternions */ -LPD3DRMQUATERNION WINAPI D3DRMQuaternionSlerp(LPD3DRMQUATERNION q, LPD3DRMQUATERNION a, LPD3DRMQUATERNION b, D3DVALUE alpha) +D3DRMQUATERNION * WINAPI D3DRMQuaternionSlerp(D3DRMQUATERNION *q, + D3DRMQUATERNION *a, D3DRMQUATERNION *b, D3DVALUE alpha) { D3DVALUE dot, epsilon, temp, theta, u; D3DVECTOR v1, v2; diff --git a/dlls/d3drm/tests/vector.c b/dlls/d3drm/tests/vector.c index 5be6369..c9e40fe 100644 --- a/dlls/d3drm/tests/vector.c +++ b/dlls/d3drm/tests/vector.c @@ -67,7 +67,7 @@ static HMODULE d3drm_handle = 0; -static void (WINAPI * pD3DRMMatrixFromQuaternion)(D3DRMMATRIX4D, LPD3DRMQUATERNION); +static void (WINAPI * pD3DRMMatrixFromQuaternion)(D3DRMMATRIX4D, D3DRMQUATERNION *); static D3DVECTOR *(WINAPI *pD3DRMVectorAdd)(D3DVECTOR *, D3DVECTOR *, D3DVECTOR *); static D3DVECTOR *(WINAPI *pD3DRMVectorCrossProduct)(D3DVECTOR *, D3DVECTOR *, D3DVECTOR *); static D3DVALUE (WINAPI *pD3DRMVectorDotProduct)(D3DVECTOR *, D3DVECTOR *); @@ -78,7 +78,8 @@ static D3DVECTOR *(WINAPI *pD3DRMVectorRotate)(D3DVECTOR *, D3DVECTOR *, D3DVECT static D3DVECTOR *(WINAPI *pD3DRMVectorScale)(D3DVECTOR *, D3DVECTOR *, D3DVALUE); static D3DVECTOR *(WINAPI *pD3DRMVectorSubtract)(D3DVECTOR *, D3DVECTOR *, D3DVECTOR *); static D3DRMQUATERNION *(WINAPI *pD3DRMQuaternionFromRotation)(D3DRMQUATERNION*, D3DVECTOR *, D3DVALUE); -static LPD3DRMQUATERNION (WINAPI * pD3DRMQuaternionSlerp)(LPD3DRMQUATERNION, LPD3DRMQUATERNION, LPD3DRMQUATERNION, D3DVALUE); +static D3DRMQUATERNION *(WINAPI * pD3DRMQuaternionSlerp)(D3DRMQUATERNION *, + D3DRMQUATERNION *, D3DRMQUATERNION *, D3DVALUE); static D3DCOLOR (WINAPI * pD3DRMCreateColorRGB)(D3DVALUE, D3DVALUE, D3DVALUE); static D3DCOLOR (WINAPI * pD3DRMCreateColorRGBA)(D3DVALUE, D3DVALUE, D3DVALUE, D3DVALUE); static D3DVALUE (WINAPI * pD3DRMColorGetAlpha)(D3DCOLOR); diff --git a/include/d3drmdef.h b/include/d3drmdef.h index f763cf3..89d2db9 100644 --- a/include/d3drmdef.h +++ b/include/d3drmdef.h @@ -429,11 +429,12 @@ typedef struct _D3DRMVERTEX { typedef LONG D3DRMGROUPINDEX; static const D3DRMGROUPINDEX D3DRMGROUP_ALLGROUPS = -1; -void WINAPI D3DRMMatrixFromQuaternion(D3DRMMATRIX4D, LPD3DRMQUATERNION); +void WINAPI D3DRMMatrixFromQuaternion(D3DRMMATRIX4D m, D3DRMQUATERNION *q); -LPD3DRMQUATERNION WINAPI D3DRMQuaternionFromRotation(D3DRMQUATERNION *x, D3DVECTOR *axis, D3DVALUE theta); -LPD3DRMQUATERNION WINAPI D3DRMQuaternionMultiply(LPD3DRMQUATERNION, LPD3DRMQUATERNION, LPD3DRMQUATERNION); -LPD3DRMQUATERNION WINAPI D3DRMQuaternionSlerp(LPD3DRMQUATERNION, LPD3DRMQUATERNION, LPD3DRMQUATERNION, D3DVALUE); +D3DRMQUATERNION * WINAPI D3DRMQuaternionFromRotation(D3DRMQUATERNION *x, D3DVECTOR *axis, D3DVALUE theta); +D3DRMQUATERNION * WINAPI D3DRMQuaternionMultiply(D3DRMQUATERNION *ret, D3DRMQUATERNION *x, D3DRMQUATERNION *y); +D3DRMQUATERNION * WINAPI D3DRMQuaternionSlerp(D3DRMQUATERNION *ret, + D3DRMQUATERNION *x, D3DRMQUATERNION *y, D3DVALUE alpha); D3DVECTOR * WINAPI D3DRMVectorAdd(D3DVECTOR *ret, D3DVECTOR *x, D3DVECTOR *y); D3DVECTOR * WINAPI D3DRMVectorCrossProduct(D3DVECTOR *ret, D3DVECTOR *x, D3DVECTOR *y);

1 0

Rico Schüller : advapi32: Use the lower 32bit of the special HKEYs on 64bit.
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: cea0e758e632fcc27a057c656d271e532f7646bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=cea0e758e632fcc27a057c656… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Jan 23 17:55:08 2013 +0100 advapi32: Use the lower 32bit of the special HKEYs on 64bit. --- dlls/advapi32/registry.c | 20 +++++++++++--------- dlls/advapi32/tests/registry.c | 36 ++++++++++++++++++++++++++++++++++-- 2 files changed, 45 insertions(+), 11 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 744908f..c01e125 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -228,9 +228,9 @@ static NTSTATUS open_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES *a static HKEY create_special_root_hkey( HKEY hkey, DWORD access ) { HKEY ret = 0; - int idx = (UINT_PTR)hkey - (UINT_PTR)HKEY_SPECIAL_ROOT_FIRST; + int idx = HandleToUlong(hkey) - HandleToUlong(HKEY_SPECIAL_ROOT_FIRST); - if (hkey == HKEY_CURRENT_USER) + if (HandleToUlong(hkey) == HandleToUlong(HKEY_CURRENT_USER)) { if (RtlOpenCurrentUser( access, (HANDLE *)&hkey )) return 0; TRACE( "HKEY_CURRENT_USER -> %p\n", hkey ); @@ -267,9 +267,10 @@ static inline HKEY get_special_root_hkey( HKEY hkey ) { HKEY ret = hkey; - if ((hkey >= HKEY_SPECIAL_ROOT_FIRST) && (hkey <= HKEY_SPECIAL_ROOT_LAST)) + if ((HandleToUlong(hkey) >= HandleToUlong(HKEY_SPECIAL_ROOT_FIRST)) + && (HandleToUlong(hkey) <= HandleToUlong(HKEY_SPECIAL_ROOT_LAST))) { - if (!(ret = special_root_keys[(UINT_PTR)hkey - (UINT_PTR)HKEY_SPECIAL_ROOT_FIRST])) + if (!(ret = special_root_keys[HandleToUlong(hkey) - HandleToUlong(HKEY_SPECIAL_ROOT_FIRST)])) ret = create_special_root_hkey( hkey, MAXIMUM_ALLOWED ); } return ret; @@ -286,9 +287,10 @@ LSTATUS WINAPI RegOverridePredefKey( HKEY hkey, HKEY override ) TRACE("(%p %p)\n", hkey, override); - if ((hkey < HKEY_SPECIAL_ROOT_FIRST) || (hkey > HKEY_SPECIAL_ROOT_LAST)) + if ((HandleToUlong(hkey) < HandleToUlong(HKEY_SPECIAL_ROOT_FIRST)) + || (HandleToUlong(hkey) > HandleToUlong(HKEY_SPECIAL_ROOT_LAST))) return ERROR_INVALID_PARAMETER; - idx = (UINT_PTR)hkey - (UINT_PTR)HKEY_SPECIAL_ROOT_FIRST; + idx = HandleToUlong(hkey) - HandleToUlong(HKEY_SPECIAL_ROOT_FIRST); if (override) { @@ -443,7 +445,7 @@ LSTATUS WINAPI RegOpenKeyExW( HKEY hkey, LPCWSTR name, DWORD options, REGSAM acc UNICODE_STRING nameW; /* NT+ allows beginning backslash for HKEY_CLASSES_ROOT */ - if (hkey == HKEY_CLASSES_ROOT && name && *name == '\\') name++; + if (HandleToUlong(hkey) == HandleToUlong(HKEY_CLASSES_ROOT) && name && *name == '\\') name++; if (!retkey) return ERROR_INVALID_PARAMETER; if (!(hkey = get_special_root_hkey( hkey ))) return ERROR_INVALID_HANDLE; @@ -490,7 +492,7 @@ LSTATUS WINAPI RegOpenKeyExA( HKEY hkey, LPCSTR name, DWORD options, REGSAM acce else { /* NT+ allows beginning backslash for HKEY_CLASSES_ROOT */ - if (hkey == HKEY_CLASSES_ROOT && name && *name == '\\') name++; + if (HandleToUlong(hkey) == HandleToUlong(HKEY_CLASSES_ROOT) && name && *name == '\\') name++; } if (!(hkey = get_special_root_hkey( hkey ))) return ERROR_INVALID_HANDLE; @@ -2814,7 +2816,7 @@ cleanup: LSTATUS WINAPI RegDisablePredefinedCache(void) { HKEY hkey_current_user; - int idx = (UINT_PTR)HKEY_CURRENT_USER - (UINT_PTR)HKEY_SPECIAL_ROOT_FIRST; + int idx = HandleToUlong(HKEY_CURRENT_USER) - HandleToUlong(HKEY_SPECIAL_ROOT_FIRST); /* prevent caching of future requests */ hkcu_cache_disabled = TRUE; diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 33b5d9b..b2483a7 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -36,6 +36,7 @@ static DWORD GLE; static const char * sTestpath1 = "%LONGSYSTEMVAR%\\subdir1"; static const char * sTestpath2 = "%FOO%\\subdir1"; +static const DWORD ptr_size = 8 * sizeof(void*); static DWORD (WINAPI *pRegGetValueA)(HKEY,LPCSTR,LPCSTR,DWORD,LPDWORD,PVOID,LPDWORD); static DWORD (WINAPI *pRegDeleteTreeA)(HKEY,LPCSTR); @@ -947,6 +948,39 @@ static void test_reg_open_key(void) "RegOpenKeyEx with KEY_WOW64_64KEY failed (err=%u)\n", ret); RegCloseKey(hkResult); + /* check special HKEYs on 64bit + * only the lower 4 bytes of the supplied key are used + */ + if (ptr_size == 64) + { + /* HKEY_CURRENT_USER */ + ret = RegOpenKeyA(UlongToHandle(HandleToUlong(HKEY_CURRENT_USER)), "Software", &hkResult); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + ok(hkResult != NULL, "expected hkResult != NULL\n"); + RegCloseKey(hkResult); + + ret = RegOpenKeyA((HKEY)(HandleToUlong(HKEY_CURRENT_USER) | (ULONG64)1 << 32), "Software", &hkResult); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + ok(hkResult != NULL, "expected hkResult != NULL\n"); + RegCloseKey(hkResult); + + ret = RegOpenKeyA((HKEY)(HandleToUlong(HKEY_CURRENT_USER) | (ULONG64)0xdeadbeef << 32), "Software", &hkResult); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + ok(hkResult != NULL, "expected hkResult != NULL\n"); + RegCloseKey(hkResult); + + ret = RegOpenKeyA((HKEY)(HandleToUlong(HKEY_CURRENT_USER) | (ULONG64)0xffffffff << 32), "Software", &hkResult); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + ok(hkResult != NULL, "expected hkResult != NULL\n"); + RegCloseKey(hkResult); + + /* HKEY_LOCAL_MACHINE */ + ret = RegOpenKeyA((HKEY)(HandleToUlong(HKEY_LOCAL_MACHINE) | (ULONG64)0xdeadbeef << 32), "Software", &hkResult); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + ok(hkResult != NULL, "expected hkResult != NULL\n"); + RegCloseKey(hkResult); + } + /* Try using WOW64 flags when opening a key with a DACL set to verify that * the registry access check is performed correctly. Redirection isn't * being tested, so the tests don't care about whether the process is @@ -1798,8 +1832,6 @@ static void test_symlinks(void) pRtlFreeUnicodeString( &target_str ); } -static const DWORD ptr_size = 8 * sizeof(void*); - static DWORD get_key_value( HKEY root, const char *name, DWORD flags ) { HKEY key;

1 0

Andrew Talbot : gdiplus: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: 32d070afb0d6bcec3a19f509066028fcdfcb043f URL: http://source.winehq.org/git/wine.git/?a=commit;h=32d070afb0d6bcec3a19f5090… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Jan 23 21:42:47 2013 +0000 gdiplus: Avoid signed-unsigned integer comparisons. --- dlls/gdiplus/graphics.c | 6 ++++-- dlls/gdiplus/image.c | 5 +++-- dlls/gdiplus/region.c | 6 +++--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index e287683..659c46b 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -429,7 +429,8 @@ static GpStatus alpha_blend_pixels_hrgn(GpGraphics *graphics, INT dst_x, INT dst if (graphics->image && graphics->image->type == ImageTypeBitmap) { - int i, size; + DWORD i; + int size; RGNDATA *rgndata; RECT *rects; HRGN hrgn, visible_rgn; @@ -642,7 +643,8 @@ static int color_is_gray(ARGB color) static void apply_image_attributes(const GpImageAttributes *attributes, LPBYTE data, UINT width, UINT height, INT stride, ColorAdjustType type) { - UINT x, y, i; + UINT x, y; + INT i; if (attributes->colorkeys[type].enabled || attributes->colorkeys[ColorAdjustTypeDefault].enabled) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index bb555a8..6aa8d32 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -370,7 +370,7 @@ static inline UINT get_palette_index(BYTE r, BYTE g, BYTE b, BYTE a, ColorPalett BYTE index = 0; int best_distance = 0x7fff; int distance; - int i; + UINT i; if (!palette) return 0; /* This algorithm scans entire palette, @@ -3793,7 +3793,8 @@ static GpStatus get_decoder_info(IStream* stream, const struct image_codec **res LARGE_INTEGER seek; HRESULT hr; UINT bytesread; - int i, j, sig; + int i; + DWORD j, sig; /* seek to the start of the stream */ seek.QuadPart = 0; diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index f62b599..f7bad57 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -588,7 +588,7 @@ GpStatus WINGDIPAPI GdipCreateRegionHrgn(HRGN hrgn, GpRegion **region) GpStatus stat; GpPath* path; GpRegion* local; - int i; + DWORD i; TRACE("(%p, %p)\n", hrgn, region); @@ -1467,7 +1467,7 @@ GpStatus WINGDIPAPI GdipGetRegionScansCount(GpRegion *region, UINT *count, GpMat GpStatus WINGDIPAPI GdipGetRegionScansI(GpRegion *region, GpRect *scans, INT *count, GpMatrix *matrix) { GpStatus stat; - INT i; + DWORD i; LPRGNDATA data; RECT *rects; @@ -1501,7 +1501,7 @@ GpStatus WINGDIPAPI GdipGetRegionScansI(GpRegion *region, GpRect *scans, INT *co GpStatus WINGDIPAPI GdipGetRegionScans(GpRegion *region, GpRectF *scans, INT *count, GpMatrix *matrix) { GpStatus stat; - INT i; + DWORD i; LPRGNDATA data; RECT *rects;

1 0

Nikolay Sivov : user32: Accept BI_BITFIELDS format for icons when creating icons.
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: 4c24882e3e1e7e373fc35f19a077c4acf9f57f0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c24882e3e1e7e373fc35f19a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 23 23:18:07 2013 +0400 user32: Accept BI_BITFIELDS format for icons when creating icons. --- dlls/user32/cursoricon.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 8f6f9ce..25059e0 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -813,7 +813,8 @@ static HICON create_icon_from_bmi( BITMAPINFO *bmi, HMODULE module, LPCWSTR resn if ( (bmi->bmiHeader.biSize != sizeof(BITMAPCOREHEADER)) && (bmi->bmiHeader.biSize != sizeof(BITMAPINFOHEADER) || - bmi->bmiHeader.biCompression != BI_RGB) ) + (bmi->bmiHeader.biCompression != BI_RGB && + bmi->bmiHeader.biCompression != BI_BITFIELDS)) ) { WARN_(cursor)("\tinvalid resource bitmap header.\n"); return 0;

1 0

Jacek Caban : winhttp: Use schannel for HTTPS connection by defaul and get rid of OpenSSL dependency .
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: 5b38dac7ac3f8b246624830f1559628cda3e1a1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b38dac7ac3f8b246624830f1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 23 15:50:35 2013 +0100 winhttp: Use schannel for HTTPS connection by defaul and get rid of OpenSSL dependency. --- dlls/winhttp/net.c | 485 ---------------------------------------- dlls/winhttp/winhttp_private.h | 1 - 2 files changed, 0 insertions(+), 486 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5b38dac7ac3f8b2466248…

1 0

Jacek Caban : winhttp: Added schannel-based netconn_get_cipher_strength implementation.
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: 90124e084f75dc8705d8c7b41e5c4f0515e86736 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90124e084f75dc8705d8c7b41… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 23 15:50:17 2013 +0100 winhttp: Added schannel-based netconn_get_cipher_strength implementation. --- dlls/winhttp/net.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 2f1b8fe..af422b6 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -1467,6 +1467,13 @@ int netconn_get_cipher_strength( netconn_t *conn ) pSSL_CIPHER_get_bits( cipher, &bits ); return bits; #else - return 0; + SecPkgContext_ConnectionInfo conn_info; + SECURITY_STATUS res; + + if (!conn->secure) return 0; + res = QueryContextAttributesW(&conn->ssl_ctx, SECPKG_ATTR_CONNECTION_INFO, (void*)&conn_info); + if(res != SEC_E_OK) + WARN("QueryContextAttributesW failed: %08x\n", res); + return res == SEC_E_OK ? conn_info.dwCipherStrength : 0; #endif }

1 0

Jacek Caban : winhttp: Added schannel-based netconn_get_certificate implementation.
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: d15265db286edca795037db133ca09a1ea3a09e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d15265db286edca795037db13… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 23 15:50:08 2013 +0100 winhttp: Added schannel-based netconn_get_certificate implementation. --- dlls/winhttp/net.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 2e16cc0..2f1b8fe 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -1443,7 +1443,12 @@ const void *netconn_get_certificate( netconn_t *conn ) ret = X509_to_cert_context( cert ); return ret; #else - return NULL; + const CERT_CONTEXT *ret; + SECURITY_STATUS res; + + if (!conn->secure) return NULL; + res = QueryContextAttributesW(&conn->ssl_ctx, SECPKG_ATTR_REMOTE_CERT_CONTEXT, (void*)&ret); + return res == SEC_E_OK ? ret : NULL; #endif }

1 0

Jacek Caban : winhttp: Added schannel-based netconn_send implementation.
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: a3e15549d667ada741fffdbea0615b77f361a219 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3e15549d667ada741fffdbea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 23 15:49:46 2013 +0100 winhttp: Added schannel-based netconn_send implementation. --- dlls/winhttp/net.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 664bef7..2e16cc0 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -909,18 +909,63 @@ fail: return TRUE; } +#ifndef SONAME_LIBSSL +static BOOL send_ssl_chunk(netconn_t *conn, const void *msg, size_t size) +{ + SecBuffer bufs[4] = { + {conn->ssl_sizes.cbHeader, SECBUFFER_STREAM_HEADER, conn->ssl_buf}, + {size, SECBUFFER_DATA, conn->ssl_buf+conn->ssl_sizes.cbHeader}, + {conn->ssl_sizes.cbTrailer, SECBUFFER_STREAM_TRAILER, conn->ssl_buf+conn->ssl_sizes.cbHeader+size}, + {0, SECBUFFER_EMPTY, NULL} + }; + SecBufferDesc buf_desc = {SECBUFFER_VERSION, sizeof(bufs)/sizeof(*bufs), bufs}; + SECURITY_STATUS res; + + memcpy(bufs[1].pvBuffer, msg, size); + res = EncryptMessage(&conn->ssl_ctx, 0, &buf_desc, 0); + if(res != SEC_E_OK) { + WARN("EncryptMessage failed\n"); + return FALSE; + } + + if(send(conn->socket, conn->ssl_buf, bufs[0].cbBuffer+bufs[1].cbBuffer+bufs[2].cbBuffer, 0) < 1) { + WARN("send failed\n"); + return FALSE; + } + + return TRUE; +} +#endif + BOOL netconn_send( netconn_t *conn, const void *msg, size_t len, int flags, int *sent ) { if (!netconn_connected( conn )) return FALSE; if (conn->secure) { #ifdef SONAME_LIBSSL - if (flags) FIXME("SSL_write doesn't support any flags (%08x)\n", flags); + if (flags) FIXME("flags %08x not supported in SSL\n", flags); *sent = pSSL_write( conn->ssl_conn, msg, len ); if (*sent < 1 && len) return FALSE; return TRUE; #else - return FALSE; + const BYTE *ptr = msg; + size_t chunk_size; + + if (flags) FIXME("flags %08x not supported in SSL\n", flags); + + *sent = 0; + + while(len) { + chunk_size = min(len, conn->ssl_sizes.cbMaximumMessage); + if(!send_ssl_chunk(conn, ptr, chunk_size)) + return FALSE; + + *sent += chunk_size; + ptr += chunk_size; + len -= chunk_size; + } + + return TRUE; #endif } if ((*sent = send( conn->socket, msg, len, flags )) == -1)

1 0

Jacek Caban : winhttp: Added schannel-based netconn_recv implementation.
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: db22753a055768e4f786d21ec0af815d6a1883b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db22753a055768e4f786d21ec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 23 15:49:29 2013 +0100 winhttp: Added schannel-based netconn_recv implementation. --- dlls/secur32/schannel.c | 2 +- dlls/winhttp/net.c | 148 +++++++++++++++++++++++++++++++++++++++- dlls/winhttp/winhttp_private.h | 1 + 3 files changed, 148 insertions(+), 3 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 37af15e..bf64fcd 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -1134,7 +1134,7 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle if (status != SEC_E_OK) { HeapFree(GetProcessHeap(), 0, data); - ERR("Returning %d\n", status); + ERR("Returning %x\n", status); return status; } diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 5581a6f..664bef7 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -666,6 +666,8 @@ BOOL netconn_close( netconn_t *conn ) conn->ssl_conn = NULL; #else + heap_free(conn->ssl_buf); + conn->ssl_buf = NULL; heap_free(conn->extra_buf); conn->extra_buf = NULL; conn->extra_len = 0; @@ -880,12 +882,20 @@ fail: WARN("Could not get cert\n"); break; } + + conn->ssl_buf = heap_alloc(conn->ssl_sizes.cbHeader + conn->ssl_sizes.cbMaximumMessage + conn->ssl_sizes.cbTrailer); + if(!conn->ssl_buf) { + res = GetLastError(); + break; + } } } if(status != SEC_E_OK || res != ERROR_SUCCESS) { WARN("Failed to initialize security context failed: %08x\n", status); + heap_free(conn->ssl_buf); + conn->ssl_buf = NULL; DeleteSecurityContext(&ctx); set_last_error(res ? res : ERROR_WINHTTP_SECURE_CHANNEL_ERROR); return FALSE; @@ -921,6 +931,103 @@ BOOL netconn_send( netconn_t *conn, const void *msg, size_t len, int flags, int return TRUE; } +#ifndef SONAME_LIBSSL + +static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, SIZE_T *ret_size, BOOL *eof) +{ + const SIZE_T ssl_buf_size = conn->ssl_sizes.cbHeader+conn->ssl_sizes.cbMaximumMessage+conn->ssl_sizes.cbTrailer; + SecBuffer bufs[4]; + SecBufferDesc buf_desc = {SECBUFFER_VERSION, sizeof(bufs)/sizeof(*bufs), bufs}; + SSIZE_T size, buf_len; + int i; + SECURITY_STATUS res; + + assert(conn->extra_len < ssl_buf_size); + + if(conn->extra_len) { + memcpy(conn->ssl_buf, conn->extra_buf, conn->extra_len); + buf_len = conn->extra_len; + conn->extra_len = 0; + heap_free(conn->extra_buf); + conn->extra_buf = NULL; + }else { + buf_len = recv(conn->socket, conn->ssl_buf+conn->extra_len, ssl_buf_size-conn->extra_len, 0); + if(buf_len < 0) { + WARN("recv failed\n"); + return FALSE; + } + + if(!buf_len) { + *eof = TRUE; + return TRUE; + } + } + + *ret_size = 0; + *eof = FALSE; + + do { + memset(bufs, 0, sizeof(bufs)); + bufs[0].BufferType = SECBUFFER_DATA; + bufs[0].cbBuffer = buf_len; + bufs[0].pvBuffer = conn->ssl_buf; + + res = DecryptMessage(&conn->ssl_ctx, &buf_desc, 0, NULL); + switch(res) { + case SEC_E_OK: + break; + case SEC_I_CONTEXT_EXPIRED: + TRACE("context expired\n"); + *eof = TRUE; + return TRUE; + case SEC_E_INCOMPLETE_MESSAGE: + assert(buf_len < ssl_buf_size); + + size = recv(conn->socket, conn->ssl_buf+buf_len, ssl_buf_size-buf_len, 0); + if(size < 1) + return FALSE; + + buf_len += size; + continue; + default: + WARN("failed: %08x\n", res); + return FALSE; + } + } while(res != SEC_E_OK); + + for(i=0; i < sizeof(bufs)/sizeof(*bufs); i++) { + if(bufs[i].BufferType == SECBUFFER_DATA) { + size = min(buf_size, bufs[i].cbBuffer); + memcpy(buf, bufs[i].pvBuffer, size); + if(size < bufs[i].cbBuffer) { + assert(!conn->peek_len); + conn->peek_msg_mem = conn->peek_msg = heap_alloc(bufs[i].cbBuffer - size); + if(!conn->peek_msg) + return FALSE; + conn->peek_len = bufs[i].cbBuffer-size; + memcpy(conn->peek_msg, (char*)bufs[i].pvBuffer+size, conn->peek_len); + } + + *ret_size = size; + } + } + + for(i=0; i < sizeof(bufs)/sizeof(*bufs); i++) { + if(bufs[i].BufferType == SECBUFFER_EXTRA) { + conn->extra_buf = heap_alloc(bufs[i].cbBuffer); + if(!conn->extra_buf) + return FALSE; + + conn->extra_len = bufs[i].cbBuffer; + memcpy(conn->extra_buf, bufs[i].pvBuffer, conn->extra_len); + } + } + + return TRUE; +} + +#endif + BOOL netconn_recv( netconn_t *conn, void *buf, size_t len, int flags, int *recvd ) { *recvd = 0; @@ -931,16 +1038,23 @@ BOOL netconn_recv( netconn_t *conn, void *buf, size_t len, int flags, int *recvd { #ifdef SONAME_LIBSSL int ret; +#else + SIZE_T size, cread; + BOOL res, eof; +#endif if (flags & ~(MSG_PEEK | MSG_WAITALL)) FIXME("SSL_read does not support the following flags: %08x\n", flags); +#ifdef SONAME_LIBSSL /* this ugly hack is all for MSG_PEEK */ if (flags & MSG_PEEK && !conn->peek_msg) { if (!(conn->peek_msg = conn->peek_msg_mem = heap_alloc( len + 1 ))) return FALSE; } - else if (flags & MSG_PEEK && conn->peek_msg) + else +#endif + if (flags & MSG_PEEK && conn->peek_msg) { if (len < conn->peek_len) FIXME("buffer isn't big enough, should we wrap?\n"); *recvd = min( len, conn->peek_len ); @@ -963,6 +1077,7 @@ BOOL netconn_recv( netconn_t *conn, void *buf, size_t len, int flags, int *recvd /* check if we have enough data from the peek buffer */ if (!(flags & MSG_WAITALL) || (*recvd == len)) return TRUE; } +#ifdef SONAME_LIBSSL ret = pSSL_read( conn->ssl_conn, (char *)buf + *recvd, len - *recvd ); if (ret < 0) return FALSE; @@ -988,7 +1103,36 @@ BOOL netconn_recv( netconn_t *conn, void *buf, size_t len, int flags, int *recvd *recvd += ret; return TRUE; #else - return FALSE; + size = *recvd; + + do { + res = read_ssl_chunk(conn, (BYTE*)buf+size, len-size, &cread, &eof); + if(!res) { + WARN("read_ssl_chunk failed\n"); + if(!size) + return FALSE; + break; + } + + if(eof) { + TRACE("EOF\n"); + break; + } + + size += cread; + }while(!size || ((flags & MSG_WAITALL) && size < len)); + + if(size && (flags & MSG_PEEK)) { + conn->peek_msg_mem = conn->peek_msg = heap_alloc(size); + if(!conn->peek_msg) + return FALSE; + + memcpy(conn->peek_msg, buf, size); + } + + TRACE("received %ld bytes\n", size); + *recvd = size; + return TRUE; #endif } if ((*recvd = recv( conn->socket, buf, len, flags )) == -1) diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index c5ac903..b24fbd1 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -132,6 +132,7 @@ typedef struct void *ssl_conn; CtxtHandle ssl_ctx; SecPkgContext_StreamSizes ssl_sizes; + char *ssl_buf; char *extra_buf; size_t extra_len; char *peek_msg;

1 0

Jacek Caban : winhttp: Use schannel in netconn_secure_connect if OpenSSL is not available.
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: de0d75312b4cbdabff8304829827253a4ea2696d URL: http://source.winehq.org/git/wine.git/?a=commit;h=de0d75312b4cbdabff8304829… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 23 15:49:15 2013 +0100 winhttp: Use schannel in netconn_secure_connect if OpenSSL is not available. --- dlls/winhttp/Makefile.in | 2 +- dlls/winhttp/net.c | 182 +++++++++++++++++++++++++++++++++++++++- dlls/winhttp/winhttp_private.h | 6 ++ 3 files changed, 186 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/Makefile.in b/dlls/winhttp/Makefile.in index 53b5b97..07c0484 100644 --- a/dlls/winhttp/Makefile.in +++ b/dlls/winhttp/Makefile.in @@ -1,7 +1,7 @@ MODULE = winhttp.dll IMPORTLIB = winhttp IMPORTS = uuid user32 advapi32 -DELAYIMPORTS = oleaut32 ole32 crypt32 +DELAYIMPORTS = oleaut32 ole32 crypt32 secur32 EXTRALIBS = @SOCKETLIBS@ C_SRCS = \ diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 83d5fc1..5581a6f 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -1,5 +1,6 @@ /* * Copyright 2008 Hans Leidekker for CodeWeavers + * Copyright 2013 Jacek Caban for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,6 +23,7 @@ #include <stdarg.h> #include <stdio.h> #include <errno.h> +#include <assert.h> #include <sys/types.h> #ifdef HAVE_SYS_SOCKET_H @@ -52,6 +54,7 @@ #include "winbase.h" #include "winhttp.h" #include "wincrypt.h" +#include "schannel.h" #include "winhttp_private.h" @@ -261,6 +264,7 @@ static PCCERT_CONTEXT X509_to_cert_context(X509 *cert) return ret; } +#endif static DWORD netconn_verify_cert( PCCERT_CONTEXT cert, HCERTSTORE store, WCHAR *server, DWORD security_flags ) @@ -355,6 +359,7 @@ static DWORD netconn_verify_cert( PCCERT_CONTEXT cert, HCERTSTORE store, return err; } +#ifdef SONAME_LIBSSL static int netconn_secure_verify( int preverify_ok, X509_STORE_CTX *ctx ) { SSL *ssl; @@ -408,6 +413,44 @@ static int netconn_secure_verify( int preverify_ok, X509_STORE_CTX *ctx ) } return ret; } + +#else + +static SecHandle cred_handle; +static BOOL cred_handle_initialized; + +static CRITICAL_SECTION init_sechandle_cs; +static CRITICAL_SECTION_DEBUG init_sechandle_cs_debug = { + 0, 0, &init_sechandle_cs, + { &init_sechandle_cs_debug.ProcessLocksList, + &init_sechandle_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": init_sechandle_cs") } +}; +static CRITICAL_SECTION init_sechandle_cs = { &init_sechandle_cs_debug, -1, 0, 0, 0, 0 }; + +static BOOL ensure_cred_handle(void) +{ + BOOL ret = TRUE; + + EnterCriticalSection(&init_sechandle_cs); + + if(!cred_handle_initialized) { + SECURITY_STATUS res; + + res = AcquireCredentialsHandleW(NULL, (WCHAR*)UNISP_NAME_W, SECPKG_CRED_OUTBOUND, NULL, NULL, + NULL, NULL, &cred_handle, NULL); + if(res == SEC_E_OK) { + cred_handle_initialized = TRUE; + }else { + WARN("AcquireCredentialsHandleW failed: %u\n", res); + ret = FALSE; + } + } + + LeaveCriticalSection(&init_sechandle_cs); + return ret; +} + #endif BOOL netconn_init( netconn_t *conn, BOOL secure ) @@ -580,6 +623,10 @@ void netconn_unload( void ) heap_free( ssl_locks ); } DeleteCriticalSection(&init_ssl_cs); +#else + if(cred_handle_initialized) + FreeCredentialsHandle(&cred_handle); + DeleteCriticalSection(&init_sechandle_cs); #endif #ifndef HAVE_GETADDRINFO DeleteCriticalSection(&cs_gethostbyname); @@ -606,7 +653,6 @@ BOOL netconn_close( netconn_t *conn ) { int res; -#ifdef SONAME_LIBSSL if (conn->secure) { heap_free( conn->peek_msg_mem ); @@ -614,13 +660,19 @@ BOOL netconn_close( netconn_t *conn ) conn->peek_msg = NULL; conn->peek_len = 0; +#ifdef SONAME_LIBSSL pSSL_shutdown( conn->ssl_conn ); pSSL_free( conn->ssl_conn ); conn->ssl_conn = NULL; +#else + heap_free(conn->extra_buf); + conn->extra_buf = NULL; + conn->extra_len = 0; + DeleteSecurityContext(&conn->ssl_ctx); +#endif conn->secure = FALSE; } -#endif res = closesocket( conn->socket ); conn->socket = -1; if (res == -1) @@ -719,8 +771,132 @@ fail: pSSL_free( conn->ssl_conn ); conn->ssl_conn = NULL; } +#else + SecBuffer out_buf = {0, SECBUFFER_TOKEN, NULL}, in_bufs[2] = {{0, SECBUFFER_TOKEN}, {0, SECBUFFER_EMPTY}}; + SecBufferDesc out_desc = {SECBUFFER_VERSION, 1, &out_buf}, in_desc = {SECBUFFER_VERSION, 2, in_bufs}; + BYTE *read_buf; + SIZE_T read_buf_size = 2048; + ULONG attrs = 0; + CtxtHandle ctx; + SSIZE_T size; + const CERT_CONTEXT *cert; + SECURITY_STATUS status; + DWORD res = ERROR_SUCCESS; + + const DWORD isc_req_flags = ISC_REQ_ALLOCATE_MEMORY|ISC_REQ_USE_SESSION_KEY|ISC_REQ_CONFIDENTIALITY + |ISC_REQ_SEQUENCE_DETECT|ISC_REQ_REPLAY_DETECT|ISC_REQ_MANUAL_CRED_VALIDATION; + + if(!ensure_cred_handle()) + return FALSE; + + read_buf = heap_alloc(read_buf_size); + if(!read_buf) + return FALSE; + + status = InitializeSecurityContextW(&cred_handle, NULL, hostname, isc_req_flags, 0, 0, NULL, 0, + &ctx, &out_desc, &attrs, NULL); + + assert(status != SEC_E_OK); + + while(status == SEC_I_CONTINUE_NEEDED || status == SEC_E_INCOMPLETE_MESSAGE) { + if(out_buf.cbBuffer) { + assert(status == SEC_I_CONTINUE_NEEDED); + + TRACE("sending %u bytes\n", out_buf.cbBuffer); + + size = send(conn->socket, out_buf.pvBuffer, out_buf.cbBuffer, 0); + if(size != out_buf.cbBuffer) { + ERR("send failed\n"); + status = ERROR_WINHTTP_SECURE_CHANNEL_ERROR; + break; + } + + FreeContextBuffer(out_buf.pvBuffer); + out_buf.pvBuffer = NULL; + out_buf.cbBuffer = 0; + } + + if(status == SEC_I_CONTINUE_NEEDED) { + assert(in_bufs[1].cbBuffer < read_buf_size); + + memmove(read_buf, (BYTE*)in_bufs[0].pvBuffer+in_bufs[0].cbBuffer-in_bufs[1].cbBuffer, in_bufs[1].cbBuffer); + in_bufs[0].cbBuffer = in_bufs[1].cbBuffer; + + in_bufs[1].BufferType = SECBUFFER_EMPTY; + in_bufs[1].cbBuffer = 0; + in_bufs[1].pvBuffer = NULL; + } + + assert(in_bufs[0].BufferType == SECBUFFER_TOKEN); + assert(in_bufs[1].BufferType == SECBUFFER_EMPTY); + + if(in_bufs[0].cbBuffer + 1024 > read_buf_size) { + BYTE *new_read_buf; + + new_read_buf = heap_realloc(read_buf, read_buf_size + 1024); + if(!new_read_buf) { + status = E_OUTOFMEMORY; + break; + } + + in_bufs[0].pvBuffer = read_buf = new_read_buf; + read_buf_size += 1024; + } + + size = recv(conn->socket, read_buf+in_bufs[0].cbBuffer, read_buf_size-in_bufs[0].cbBuffer, 0); + if(size < 1) { + WARN("recv error\n"); + status = ERROR_WINHTTP_SECURE_CHANNEL_ERROR; + break; + } + + TRACE("recv %lu bytes\n", size); + + in_bufs[0].cbBuffer += size; + in_bufs[0].pvBuffer = read_buf; + status = InitializeSecurityContextW(&cred_handle, &ctx, hostname, isc_req_flags, 0, 0, &in_desc, + 0, NULL, &out_desc, &attrs, NULL); + TRACE("InitializeSecurityContext ret %08x\n", status); + + if(status == SEC_E_OK) { + if(in_bufs[1].BufferType == SECBUFFER_EXTRA) + FIXME("SECBUFFER_EXTRA not supported\n"); + + status = QueryContextAttributesW(&ctx, SECPKG_ATTR_STREAM_SIZES, &conn->ssl_sizes); + if(status != SEC_E_OK) { + WARN("Could not get sizes\n"); + break; + } + + status = QueryContextAttributesW(&ctx, SECPKG_ATTR_REMOTE_CERT_CONTEXT, (void*)&cert); + if(status == SEC_E_OK) { + res = netconn_verify_cert(cert, cert->hCertStore, hostname, conn->security_flags); + CertFreeCertificateContext(cert); + if(res != ERROR_SUCCESS) { + WARN("cert verify failed: %u\n", res); + break; + } + }else { + WARN("Could not get cert\n"); + break; + } + } + } + + + if(status != SEC_E_OK || res != ERROR_SUCCESS) { + WARN("Failed to initialize security context failed: %08x\n", status); + DeleteSecurityContext(&ctx); + set_last_error(res ? res : ERROR_WINHTTP_SECURE_CHANNEL_ERROR); + return FALSE; + } + + + TRACE("established SSL connection\n"); + conn->secure = TRUE; + conn->ssl_ctx = ctx; #endif - return FALSE; + return TRUE; } BOOL netconn_send( netconn_t *conn, const void *msg, size_t len, int flags, int *sent ) diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 021bc93..c5ac903 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -42,7 +42,9 @@ # define closesocket close # define ioctlsocket ioctl #endif + #include "ole2.h" +#include "sspi.h" static const WCHAR getW[] = {'G','E','T',0}; static const WCHAR postW[] = {'P','O','S','T',0}; @@ -128,6 +130,10 @@ typedef struct int socket; BOOL secure; /* SSL active on connection? */ void *ssl_conn; + CtxtHandle ssl_ctx; + SecPkgContext_StreamSizes ssl_sizes; + char *extra_buf; + size_t extra_len; char *peek_msg; char *peek_msg_mem; size_t peek_len;

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
74
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2013