October 2011 - Wine-Commits

Jacek Caban : mshtml: Properly release body element in basic_style_test.
by Alexandre Julliard Oct. 3, 2011

Oct. 3, 2011

Module: wine Branch: master Commit: 93d54b1759b1b60723c0ce6c37880681f920947d URL: http://source.winehq.org/git/wine.git/?a=commit;h=93d54b1759b1b60723c0ce6c3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 3 13:51:28 2011 -0500 mshtml: Properly release body element in basic_style_test. --- dlls/mshtml/tests/style.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index d4d9a20..e37c593 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -2044,10 +2044,10 @@ static void basic_style_test(IHTMLDocument2 *doc) cstyle = get_current_style(elem); test_current_style(cstyle); IHTMLCurrentStyle_Release(cstyle); + IHTMLElement_Release(elem); elem = get_element_by_id(doc, "divid"); test_style_filters(elem); - IHTMLElement_Release(elem); test_set_csstext(style); IHTMLStyle_Release(style);

1 0

Henri Verbeet : secur32: Properly handle GNUTLS_E_AGAIN in (GnuTLS) schan_imp_send().
by Alexandre Julliard Oct. 3, 2011

Oct. 3, 2011

Module: wine Branch: master Commit: 65aed972c0dac659800faf0097df190278c37883 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65aed972c0dac659800faf009… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 3 20:22:50 2011 +0200 secur32: Properly handle GNUTLS_E_AGAIN in (GnuTLS) schan_imp_send(). --- dlls/secur32/schannel.c | 19 +------------------ dlls/secur32/schannel_gnutls.c | 16 +++++++++++++++- dlls/secur32/secur32_priv.h | 18 ++++++++++++++++++ 3 files changed, 34 insertions(+), 19 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 69ee0e6..0355982 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -62,23 +62,6 @@ struct schan_context ULONG req_ctx_attr; }; -struct schan_buffers -{ - SIZE_T offset; - SIZE_T limit; - const SecBufferDesc *desc; - int current_buffer_idx; - BOOL allow_buffer_resize; - int (*get_next_buffer)(const struct schan_transport *, struct schan_buffers *); -}; - -struct schan_transport -{ - struct schan_context *ctx; - struct schan_buffers in; - struct schan_buffers out; -}; - static struct schan_handle *schan_handle_table; static struct schan_handle *schan_free_handles; static SIZE_T schan_handle_table_size; @@ -496,7 +479,7 @@ static void schan_resize_current_buffer(const struct schan_buffers *s, SIZE_T mi b->pvBuffer = new_data; } -static char *schan_get_buffer(const struct schan_transport *t, struct schan_buffers *s, SIZE_T *count) +char *schan_get_buffer(const struct schan_transport *t, struct schan_buffers *s, SIZE_T *count) { SIZE_T max_count; PSecBuffer buffer; diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 870c553..e47c022 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -65,6 +65,7 @@ MAKE_FUNCPTR(gnutls_set_default_priority); MAKE_FUNCPTR(gnutls_record_get_max_size); MAKE_FUNCPTR(gnutls_record_recv); MAKE_FUNCPTR(gnutls_record_send); +MAKE_FUNCPTR(gnutls_transport_get_ptr); MAKE_FUNCPTR(gnutls_transport_set_errno); MAKE_FUNCPTR(gnutls_transport_set_ptr); MAKE_FUNCPTR(gnutls_transport_set_pull_function); @@ -340,11 +341,23 @@ SECURITY_STATUS schan_imp_send(schan_imp_session session, const void *buffer, SIZE_T *length) { gnutls_session_t s = (gnutls_session_t)session; - ssize_t ret = pgnutls_record_send(s, buffer, *length); + ssize_t ret; + +again: + ret = pgnutls_record_send(s, buffer, *length); + if (ret >= 0) *length = ret; else if (ret == GNUTLS_E_AGAIN) + { + struct schan_transport *t = (struct schan_transport *)pgnutls_transport_get_ptr(s); + SIZE_T count = 0; + + if (schan_get_buffer(t, &t->out, &count)) + goto again; + return SEC_I_CONTINUE_NEEDED; + } else { pgnutls_perror(ret); @@ -432,6 +445,7 @@ BOOL schan_imp_init(void) LOAD_FUNCPTR(gnutls_record_get_max_size); LOAD_FUNCPTR(gnutls_record_recv); LOAD_FUNCPTR(gnutls_record_send); + LOAD_FUNCPTR(gnutls_transport_get_ptr) LOAD_FUNCPTR(gnutls_transport_set_errno) LOAD_FUNCPTR(gnutls_transport_set_ptr) LOAD_FUNCPTR(gnutls_transport_set_pull_function) diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 3aa5af6..c6b362b 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -183,6 +183,24 @@ typedef struct schan_imp_certificate_credentials_opaque *schan_imp_certificate_c struct schan_transport; +struct schan_buffers +{ + SIZE_T offset; + SIZE_T limit; + const SecBufferDesc *desc; + int current_buffer_idx; + BOOL allow_buffer_resize; + int (*get_next_buffer)(const struct schan_transport *, struct schan_buffers *); +}; + +struct schan_transport +{ + struct schan_context *ctx; + struct schan_buffers in; + struct schan_buffers out; +}; + +char *schan_get_buffer(const struct schan_transport *t, struct schan_buffers *s, SIZE_T *count) DECLSPEC_HIDDEN; extern int schan_pull(struct schan_transport *t, void *buff, size_t *buff_len) DECLSPEC_HIDDEN; extern int schan_push(struct schan_transport *t, const void *buff, size_t *buff_len) DECLSPEC_HIDDEN;

1 0

Frédéric Delanoy : cmd: Handle truncation for console reads.
by Alexandre Julliard Oct. 3, 2011

Oct. 3, 2011

Module: wine Branch: master Commit: 5e8893f2f6b259a26ed5bfb7e3b4ea4580145445 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e8893f2f6b259a26ed5bfb7e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Oct 1 13:43:18 2011 +0200 cmd: Handle truncation for console reads. --- programs/cmd/batch.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 52dd08e..5f83c35 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -199,7 +199,12 @@ WCHAR *WCMD_fgets(WCHAR *s, int noChars, HANDLE h, BOOL is_console_handle) if (is_console_handle) { status = ReadConsoleW(h, s, noChars, &charsRead, NULL); if (!status) return NULL; - s[charsRead-2] = '\0'; /* Strip \r\n */ + if (s[charsRead-2] == '\r') + s[charsRead-2] = '\0'; /* Strip \r\n */ + else { + /* Truncate */ + s[noChars-1] = '\0'; + } return p; }

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_present() const.
by Alexandre Julliard Oct. 3, 2011

Oct. 3, 2011

Module: wine Branch: master Commit: adf9e6120d493f134489b3d8f257961e2716728d URL: http://source.winehq.org/git/wine.git/?a=commit;h=adf9e6120d493f134489b3d8f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 3 20:22:52 2011 +0200 wined3d: Make the device parameter to wined3d_device_present() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d1bec23..8e4d827 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4045,7 +4045,7 @@ HRESULT CDECL wined3d_device_end_scene(struct wined3d_device *device) return WINED3D_OK; } -HRESULT CDECL wined3d_device_present(struct wined3d_device *device, const RECT *src_rect, +HRESULT CDECL wined3d_device_present(const struct wined3d_device *device, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region) { UINT i; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 208c5c0..8a38668 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2278,7 +2278,7 @@ HRESULT __cdecl wined3d_device_init_3d(struct wined3d_device *device, WINED3DPRE HRESULT __cdecl wined3d_device_init_gdi(struct wined3d_device *device, WINED3DPRESENT_PARAMETERS *present_parameters); HRESULT __cdecl wined3d_device_multiply_transform(struct wined3d_device *device, WINED3DTRANSFORMSTATETYPE state, const WINED3DMATRIX *matrix); -HRESULT __cdecl wined3d_device_present(struct wined3d_device *device, const RECT *src_rect, +HRESULT __cdecl wined3d_device_present(const struct wined3d_device *device, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region); HRESULT __cdecl wined3d_device_process_vertices(struct wined3d_device *device, UINT src_start_idx, UINT dst_idx, UINT vertex_count, struct wined3d_buffer *dst_buffer,

1 0

André Hentschel : winevdm: Don't give up if we can' t shorten the current directory.
by Alexandre Julliard Oct. 3, 2011

Oct. 3, 2011

Module: wine Branch: master Commit: 42c1b06a134d71592017062a72364b9e38ea407b URL: http://source.winehq.org/git/wine.git/?a=commit;h=42c1b06a134d71592017062a7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 2 16:37:29 2011 +0200 winevdm: Don't give up if we can't shorten the current directory. --- programs/winevdm/winevdm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c index 7950985..288fa01 100644 --- a/programs/winevdm/winevdm.c +++ b/programs/winevdm/winevdm.c @@ -165,7 +165,7 @@ static void start_dosbox( const char *appname, const char *args ) if (!GetTempFileNameW( path, cfgW, 0, config )) return; if (!GetCurrentDirectoryW( MAX_PATH, path )) return; if (!GetShortPathNameA( appname, app, MAX_PATH )) return; - if (!GetShortPathNameW( path, path, MAX_PATH )) return; + GetShortPathNameW( path, path, MAX_PATH ); file = CreateFileW( config, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0 ); if (file == INVALID_HANDLE_VALUE) return;

1 0

Nikolay Sivov : comctl32/monthcal: After notification safely free buffer allocated on heap.
by Alexandre Julliard Oct. 3, 2011

Oct. 3, 2011

Module: wine Branch: master Commit: 40c783fcc10e47c9653322644956021029368a34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40c783fcc10e47c9653322644… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 30 23:41:04 2011 +0400 comctl32/monthcal: After notification safely free buffer allocated on heap. --- dlls/comctl32/monthcal.c | 29 +++++++++++++++-------------- dlls/comctl32/tests/monthcal.c | 23 +++++++++++++++++++++++ 2 files changed, 38 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index a2d8a19..0c51075 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1884,24 +1884,25 @@ MONTHCAL_HitTest(const MONTHCAL_INFO *infoPtr, MCHITTESTINFO *lpht) /* MCN_GETDAYSTATE notification helper */ static void MONTHCAL_NotifyDayState(MONTHCAL_INFO *infoPtr) { - if(infoPtr->dwStyle & MCS_DAYSTATE) { - NMDAYSTATE nmds; + MONTHDAYSTATE *state; + NMDAYSTATE nmds; - nmds.nmhdr.hwndFrom = infoPtr->hwndSelf; - nmds.nmhdr.idFrom = GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_ID); - nmds.nmhdr.code = MCN_GETDAYSTATE; - nmds.cDayState = MONTHCAL_GetMonthRange(infoPtr, GMR_DAYSTATE, 0); - nmds.prgDayState = Alloc(nmds.cDayState * sizeof(MONTHDAYSTATE)); + if (!(infoPtr->dwStyle & MCS_DAYSTATE)) return; - MONTHCAL_GetMinDate(infoPtr, &nmds.stStart); - nmds.stStart.wDay = 1; + nmds.nmhdr.hwndFrom = infoPtr->hwndSelf; + nmds.nmhdr.idFrom = GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_ID); + nmds.nmhdr.code = MCN_GETDAYSTATE; + nmds.cDayState = MONTHCAL_GetMonthRange(infoPtr, GMR_DAYSTATE, 0); + nmds.prgDayState = state = Alloc(nmds.cDayState * sizeof(MONTHDAYSTATE)); - SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmds.nmhdr.idFrom, (LPARAM)&nmds); - memcpy(infoPtr->monthdayState, nmds.prgDayState, - MONTHCAL_GetMonthRange(infoPtr, GMR_DAYSTATE, 0)*sizeof(MONTHDAYSTATE)); + MONTHCAL_GetMinDate(infoPtr, &nmds.stStart); + nmds.stStart.wDay = 1; - Free(nmds.prgDayState); - } + SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmds.nmhdr.idFrom, (LPARAM)&nmds); + memcpy(infoPtr->monthdayState, nmds.prgDayState, + MONTHCAL_GetMonthRange(infoPtr, GMR_DAYSTATE, 0)*sizeof(MONTHDAYSTATE)); + + Free(state); } /* no valid range check performed */ diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 2686fb7..9775095 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -466,6 +466,29 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP add_message(sequences, PARENT_SEQ_INDEX, &msg); } + if (message == WM_NOTIFY) + { + NMHDR *hdr = (NMHDR*)lParam; + switch (hdr->code) + { + case MCN_GETDAYSTATE: + { + NMDAYSTATE *nmstate = (NMDAYSTATE*)lParam; + MONTHDAYSTATE months[14] = { 0 }; + + ok(nmstate->cDayState > 0, "got %d\n", nmstate->cDayState); + ok(nmstate->cDayState <= 14, "got %d\n", nmstate->cDayState); + ok(nmstate->prgDayState != NULL, "got %p\n", nmstate->prgDayState); + + nmstate->prgDayState = months; + + return TRUE; + } + default: + break; + } + } + defwndproc_counter++; ret = DefWindowProcA(hwnd, message, wParam, lParam); defwndproc_counter--;

1 0

Frédéric Delanoy : cmd: Improve WCMD_fgets documentation.
by Alexandre Julliard Oct. 3, 2011

Oct. 3, 2011

Module: wine Branch: master Commit: e3a72698c1ea89f0b6a0d4c1459c339c5a2ed8a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3a72698c1ea89f0b6a0d4c14… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Oct 1 13:43:17 2011 +0200 cmd: Improve WCMD_fgets documentation. --- programs/cmd/batch.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 447eccd..52dd08e 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -176,9 +176,14 @@ WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **where, WCHAR **end) { /**************************************************************************** * WCMD_fgets * - * Get one line from a batch file/console. We can't use the native f* functions because - * of the filename syntax differences between DOS and Unix. Also need to lose - * the LF (or CRLF) from the line. + * Gets one line from a file/console and puts it into buffer s + * Pre: s has size noChars + * 1 <= noChars <= MAXSTRING + * Post: s is filled with at most noChars-1 characters, and gets nul-terminated + s does not include EOL terminator + * Returns: + * s on success + * NULL on error or EOF */ WCHAR *WCMD_fgets(WCHAR *s, int noChars, HANDLE h, BOOL is_console_handle) @@ -187,6 +192,9 @@ WCHAR *WCMD_fgets(WCHAR *s, int noChars, HANDLE h, BOOL is_console_handle) BOOL status; WCHAR *p; + /* We can't use the native f* functions because of the filename syntax differences + between DOS and Unix. Also need to lose the LF (or CRLF) from the line. */ + p = s; if (is_console_handle) { status = ReadConsoleW(h, s, noChars, &charsRead, NULL);

1 0

Huw Davies : winex11: Remove some unused function ptrs.
by Alexandre Julliard Oct. 3, 2011

Oct. 3, 2011

Module: wine Branch: master Commit: ea3895e133854620012ac5829f32edcbed040346 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea3895e133854620012ac5829… Author: Huw Davies <huw(a)codeweavers.com> Date: Sun Oct 2 15:01:06 2011 +0100 winex11: Remove some unused function ptrs. --- dlls/winex11.drv/xrender.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index e37ddc2..de469e2 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -188,9 +188,6 @@ static void *xrender_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f; MAKE_FUNCPTR(XRenderAddGlyphs) MAKE_FUNCPTR(XRenderComposite) -MAKE_FUNCPTR(XRenderCompositeString8) -MAKE_FUNCPTR(XRenderCompositeString16) -MAKE_FUNCPTR(XRenderCompositeString32) MAKE_FUNCPTR(XRenderCompositeText16) MAKE_FUNCPTR(XRenderCreateGlyphSet) MAKE_FUNCPTR(XRenderCreatePicture) @@ -365,9 +362,6 @@ const struct gdi_dc_funcs *X11DRV_XRender_Init(void) #define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(xrender_handle, #f, NULL, 0)) == NULL) goto sym_not_found; LOAD_FUNCPTR(XRenderAddGlyphs) LOAD_FUNCPTR(XRenderComposite) -LOAD_FUNCPTR(XRenderCompositeString8) -LOAD_FUNCPTR(XRenderCompositeString16) -LOAD_FUNCPTR(XRenderCompositeString32) LOAD_FUNCPTR(XRenderCompositeText16) LOAD_FUNCPTR(XRenderCreateGlyphSet) LOAD_FUNCPTR(XRenderCreatePicture)

1 0

Henri Verbeet : secur32: Use gnutls_record_get_max_size() to get the maximum message size.
by Alexandre Julliard Oct. 3, 2011

Oct. 3, 2011

Module: wine Branch: master Commit: 0903855456ccc2e12188a29a178810f398d33cf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0903855456ccc2e12188a29a1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 3 20:22:48 2011 +0200 secur32: Use gnutls_record_get_max_size() to get the maximum message size. --- dlls/secur32/schannel.c | 6 ++++-- dlls/secur32/schannel_gnutls.c | 7 +++++++ dlls/secur32/schannel_macosx.c | 6 ++++++ dlls/secur32/secur32_priv.h | 1 + 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index f12baaa..13353a7 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -821,13 +821,15 @@ static SECURITY_STATUS SEC_ENTRY schan_QueryContextAttributesW( SecPkgContext_StreamSizes *stream_sizes = buffer; SIZE_T mac_size = info.dwHashStrength; unsigned int block_size = schan_imp_get_session_cipher_block_size(ctx->session); + unsigned int message_size = schan_imp_get_max_message_size(ctx->session); - TRACE("Using %lu mac bytes, block size %u\n", mac_size, block_size); + TRACE("Using %lu mac bytes, message size %u, block size %u\n", + mac_size, message_size, block_size); /* These are defined by the TLS RFC */ stream_sizes->cbHeader = 5; stream_sizes->cbTrailer = mac_size + 256; /* Max 255 bytes padding + 1 for padding size */ - stream_sizes->cbMaximumMessage = 1 << 14; + stream_sizes->cbMaximumMessage = message_size; stream_sizes->cbBuffers = 4; stream_sizes->cbBlockSize = block_size; } diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 782cc64..870c553 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -62,6 +62,7 @@ MAKE_FUNCPTR(gnutls_mac_get_key_size); MAKE_FUNCPTR(gnutls_perror); MAKE_FUNCPTR(gnutls_protocol_get_version); MAKE_FUNCPTR(gnutls_set_default_priority); +MAKE_FUNCPTR(gnutls_record_get_max_size); MAKE_FUNCPTR(gnutls_record_recv); MAKE_FUNCPTR(gnutls_record_send); MAKE_FUNCPTR(gnutls_transport_set_errno); @@ -289,6 +290,11 @@ unsigned int schan_imp_get_session_cipher_block_size(schan_imp_session session) return schannel_get_cipher_block_size(cipher); } +unsigned int schan_imp_get_max_message_size(schan_imp_session session) +{ + return pgnutls_record_get_max_size((gnutls_session_t)session); +} + SECURITY_STATUS schan_imp_get_connection_info(schan_imp_session session, SecPkgContext_ConnectionInfo *info) { @@ -423,6 +429,7 @@ BOOL schan_imp_init(void) LOAD_FUNCPTR(gnutls_perror) LOAD_FUNCPTR(gnutls_protocol_get_version) LOAD_FUNCPTR(gnutls_set_default_priority) + LOAD_FUNCPTR(gnutls_record_get_max_size); LOAD_FUNCPTR(gnutls_record_recv); LOAD_FUNCPTR(gnutls_record_send); LOAD_FUNCPTR(gnutls_transport_set_errno) diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index fbaa432..1158b14 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -628,6 +628,12 @@ unsigned int schan_imp_get_session_cipher_block_size(schan_imp_session session) } } +unsigned int schan_imp_get_max_message_size(schan_imp_session session) +{ + FIXME("Returning 1 << 14.\n"); + return 1 << 14; +} + SECURITY_STATUS schan_imp_get_connection_info(schan_imp_session session, SecPkgContext_ConnectionInfo *info) { diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 2d2fc1e..3aa5af6 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -196,6 +196,7 @@ extern void schan_imp_set_session_transport(schan_imp_session session, struct schan_transport *t) DECLSPEC_HIDDEN; extern SECURITY_STATUS schan_imp_handshake(schan_imp_session session) DECLSPEC_HIDDEN; extern unsigned int schan_imp_get_session_cipher_block_size(schan_imp_session session) DECLSPEC_HIDDEN; +extern unsigned int schan_imp_get_max_message_size(schan_imp_session session) DECLSPEC_HIDDEN; extern SECURITY_STATUS schan_imp_get_connection_info(schan_imp_session session, SecPkgContext_ConnectionInfo *info) DECLSPEC_HIDDEN; extern SECURITY_STATUS schan_imp_get_session_peer_certificate(schan_imp_session session,

1 0

Henri Verbeet : secur32: Return failure if chan_EncryptMessage() can' t encrypt the entire buffer.
by Alexandre Julliard Oct. 3, 2011

Oct. 3, 2011

Module: wine Branch: master Commit: 5004c38dd574de99445584ff0b3e14dbcea63963 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5004c38dd574de99445584ff0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 3 20:22:49 2011 +0200 secur32: Return failure if chan_EncryptMessage() can't encrypt the entire buffer. --- dlls/secur32/schannel.c | 27 ++++++++++----------------- 1 files changed, 10 insertions(+), 17 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 13353a7..69ee0e6 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -925,10 +925,11 @@ static SECURITY_STATUS SEC_ENTRY schan_EncryptMessage(PCtxtHandle context_handle struct schan_transport transport; struct schan_context *ctx; struct schan_buffers *b; + SECURITY_STATUS status; SecBuffer *buffer; SIZE_T data_size; + SIZE_T length; char *data; - SSIZE_T sent = 0; int idx; TRACE("context_handle %p, quality %d, message %p, message_seq_no %d\n", @@ -959,29 +960,21 @@ static SECURITY_STATUS SEC_ENTRY schan_EncryptMessage(PCtxtHandle context_handle init_schan_buffers(&transport.out, message, schan_encrypt_message_get_next_buffer_token); schan_imp_set_session_transport(ctx->session, &transport); - while (sent < data_size) - { - SIZE_T length = data_size - sent; - SECURITY_STATUS status = schan_imp_send(ctx->session, data + sent, &length); - if (status == SEC_I_CONTINUE_NEEDED) - break; - else if (status != SEC_E_OK) - { - HeapFree(GetProcessHeap(), 0, data); - ERR("Returning %d\n", status); - return status; - } + length = data_size; + status = schan_imp_send(ctx->session, data, &length); - sent += length; - } + TRACE("Sent %ld bytes.\n", length); - TRACE("Sent %ld bytes\n", sent); + if (length != data_size) + status = SEC_E_INTERNAL_ERROR; b = &transport.out; b->desc->pBuffers[b->current_buffer_idx].cbBuffer = b->offset; HeapFree(GetProcessHeap(), 0, data); - return SEC_E_OK; + TRACE("Returning %#x.\n", status); + + return status; } static int schan_decrypt_message_get_next_buffer(const struct schan_transport *t, struct schan_buffers *s)

1 0