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

Dmitry Timoshkov : wine: Switch to using 'long' for INT_PTR type for 64-bit compatibility.
by Alexandre Julliard May 25, 2007

May 25, 2007

1 0

Huw Davies : winex11.drv: Use XRenderCompositeText instead of XRenderCompositeString.
by Alexandre Julliard May 25, 2007

May 25, 2007

Module: wine Branch: master Commit: e0150c357d390c5f8edee9d6f5a55ff8939ee3a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0150c357d390c5f8edee9d6f… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 24 15:06:44 2007 +0100 winex11.drv: Use XRenderCompositeText instead of XRenderCompositeString. --- dlls/winex11.drv/xrender.c | 87 +++++++++++++++++++++++++++----------------- 1 files changed, 54 insertions(+), 33 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index c8bd7ad..b11ed14 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -118,6 +118,7 @@ MAKE_FUNCPTR(XRenderComposite) MAKE_FUNCPTR(XRenderCompositeString8) MAKE_FUNCPTR(XRenderCompositeString16) MAKE_FUNCPTR(XRenderCompositeString32) +MAKE_FUNCPTR(XRenderCompositeText16) MAKE_FUNCPTR(XRenderCreateGlyphSet) MAKE_FUNCPTR(XRenderCreatePicture) MAKE_FUNCPTR(XRenderFillRectangle) @@ -181,6 +182,7 @@ LOAD_FUNCPTR(XRenderComposite) LOAD_FUNCPTR(XRenderCompositeString8) LOAD_FUNCPTR(XRenderCompositeString16) LOAD_FUNCPTR(XRenderCompositeString32) +LOAD_FUNCPTR(XRenderCompositeText16) LOAD_FUNCPTR(XRenderCreateGlyphSet) LOAD_FUNCPTR(XRenderCreatePicture) LOAD_FUNCPTR(XRenderFillRectangle) @@ -346,9 +348,9 @@ static void FreeEntry(int entry) HeapFree(GetProcessHeap(), 0, formatEntry->bitmaps[i]); HeapFree(GetProcessHeap(), 0, formatEntry->bitmaps); formatEntry->bitmaps = NULL; - HeapFree(GetProcessHeap(), 0, formatEntry->gis); - formatEntry->gis = NULL; } + HeapFree(GetProcessHeap(), 0, formatEntry->gis); + formatEntry->gis = NULL; formatEntry->nrealized = 0; } @@ -694,17 +696,16 @@ static BOOL UploadGlyph(X11DRV_PDEVICE *physDev, int glyph, AA_Type format) formatEntry->bitmaps = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, formatEntry->nrealized * sizeof(formatEntry->bitmaps[0])); - - if (formatEntry->gis) + } + if (formatEntry->gis) formatEntry->gis = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, formatEntry->gis, formatEntry->nrealized * sizeof(formatEntry->gis[0])); - else + else formatEntry->gis = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - formatEntry->nrealized * sizeof(formatEntry->gis[0])); - } + formatEntry->nrealized * sizeof(formatEntry->gis[0])); } @@ -790,6 +791,8 @@ static BOOL UploadGlyph(X11DRV_PDEVICE *physDev, int glyph, AA_Type format) } } + memcpy(&formatEntry->gis[glyph], &gi, sizeof(gi)); + if(formatEntry->glyphset) { if(format == AA_None && BitmapBitOrder(gdi_display) != MSBFirst) { unsigned char *byte = (unsigned char*) buf, c; @@ -814,7 +817,6 @@ static BOOL UploadGlyph(X11DRV_PDEVICE *physDev, int glyph, AA_Type format) HeapFree(GetProcessHeap(), 0, buf); } else { formatEntry->bitmaps[glyph] = buf; - memcpy(&formatEntry->gis[glyph], &gi, sizeof(gi)); } return TRUE; } @@ -1270,32 +1272,51 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag TRACE("Writing %s at %d,%d\n", debugstr_wn(wstr,count), physDev->dc_rect.left + x, physDev->dc_rect.top + y); - if(X11DRV_XRender_Installed) { - wine_tsx11_lock(); - if(!lpDx) - pXRenderCompositeString16(gdi_display, render_op, - physDev->xrender->tile_pict, - physDev->xrender->pict, - formatEntry->font_format, formatEntry->glyphset, - 0, 0, physDev->dc_rect.left + x, physDev->dc_rect.top + y, - wstr, count); - else { - INT offset = 0, xoff = 0, yoff = 0; - for(idx = 0; idx < count; idx++) { - pXRenderCompositeString16(gdi_display, render_op, - physDev->xrender->tile_pict, - physDev->xrender->pict, - formatEntry->font_format, formatEntry->glyphset, - 0, 0, physDev->dc_rect.left + x + xoff, - physDev->dc_rect.top + y + yoff, - wstr + idx, 1); - offset += lpDx[idx]; - xoff = offset * cosEsc; - yoff = offset * -sinEsc; - } - } - wine_tsx11_unlock(); + if(X11DRV_XRender_Installed) + { + XGlyphElt16 *elts = HeapAlloc(GetProcessHeap(), 0, sizeof(XGlyphElt16) * count); + INT offset = 0; + POINT desired, current; + /* There's a bug in XRenderCompositeText that ignores the xDst and yDst parameters. + So we pass zeros to the function and move to our starting position using the first + element of the elts array. */ + + desired.x = physDev->dc_rect.left + x; + desired.y = physDev->dc_rect.top + y; + current.x = current.y = 0; + + for(idx = 0; idx < count; idx++) + { + elts[idx].glyphset = formatEntry->glyphset; + elts[idx].chars = wstr + idx; + elts[idx].nchars = 1; + elts[idx].xOff = desired.x - current.x; + elts[idx].yOff = desired.y - current.y; + + current.x += (elts[idx].xOff + formatEntry->gis[wstr[idx]].xOff); + current.y += (elts[idx].yOff + formatEntry->gis[wstr[idx]].yOff); + + if(!lpDx) + { + desired.x += formatEntry->gis[wstr[idx]].xOff; + desired.y += formatEntry->gis[wstr[idx]].yOff; + } + else + { + offset += lpDx[idx]; + desired.x = physDev->dc_rect.left + x + offset * cosEsc; + desired.y = physDev->dc_rect.top + y - offset * sinEsc; + } + } + wine_tsx11_lock(); + pXRenderCompositeText16(gdi_display, render_op, + physDev->xrender->tile_pict, + physDev->xrender->pict, + formatEntry->font_format, + 0, 0, 0, 0, elts, count); + wine_tsx11_unlock(); + HeapFree(GetProcessHeap(), 0, elts); } else { INT offset = 0, xoff = 0, yoff = 0; wine_tsx11_lock();

1 0

Huw Davies : winex11.drv: Merge some common code.
by Alexandre Julliard May 25, 2007

May 25, 2007

Module: wine Branch: master Commit: 4edc46cbdbd1f5eacd78a82ff32b27bb7181663e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4edc46cbdbd1f5eacd78a82ff… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 24 16:32:06 2007 +0100 winex11.drv: Merge some common code. --- dlls/winex11.drv/xrender.c | 28 ++++++++++------------------ 1 files changed, 10 insertions(+), 18 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index e03540e..c8bd7ad 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1301,24 +1301,17 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag wine_tsx11_lock(); XSetForeground( gdi_display, physDev->gc, textPixel ); - if(aa_type == AA_None) { - for(idx = 0; idx < count; idx++) { - SharpGlyphMono(physDev, physDev->dc_rect.left + x + xoff, - physDev->dc_rect.top + y + yoff, - formatEntry->bitmaps[wstr[idx]], - &formatEntry->gis[wstr[idx]]); - if(lpDx) { - offset += lpDx[idx]; - xoff = offset * cosEsc; - yoff = offset * -sinEsc; - } else { - xoff += formatEntry->gis[wstr[idx]].xOff; - yoff += formatEntry->gis[wstr[idx]].yOff; - } - } - } else if(physDev->depth == 1) { + if(aa_type == AA_None || physDev->depth == 1) + { + void (* sharp_glyph_fn)(X11DRV_PDEVICE *, INT, INT, void *, XGlyphInfo *); + + if(aa_type == AA_None) + sharp_glyph_fn = SharpGlyphMono; + else + sharp_glyph_fn = SharpGlyphGray; + for(idx = 0; idx < count; idx++) { - SharpGlyphGray(physDev, physDev->dc_rect.left + x + xoff, + sharp_glyph_fn(physDev, physDev->dc_rect.left + x + xoff, physDev->dc_rect.top + y + yoff, formatEntry->bitmaps[wstr[idx]], &formatEntry->gis[wstr[idx]]); @@ -1330,7 +1323,6 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag xoff += formatEntry->gis[wstr[idx]].xOff; yoff += formatEntry->gis[wstr[idx]].yOff; } - } } else { XImage *image;

1 0

Damjan Jovanovic : ws2_32: Simplify some socket tests by adding a function that generates a pair of connected sockets .
by Alexandre Julliard May 25, 2007

May 25, 2007

Module: wine Branch: master Commit: 8178f8fc8815c3ad013ef635fdd8d6ec5ea51bd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8178f8fc8815c3ad013ef635f… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri May 25 13:51:21 2007 +0200 ws2_32: Simplify some socket tests by adding a function that generates a pair of connected sockets. --- dlls/ws2_32/tests/sock.c | 168 ++++++++++++++++------------------------------ 1 files changed, 57 insertions(+), 111 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index da0dda9..d0b9750 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -146,6 +146,57 @@ static int client_id; /**************** General utility functions ***************/ +static int tcp_socketpair(SOCKET *src, SOCKET *dst) +{ + SOCKET server = INVALID_SOCKET; + struct sockaddr_in addr; + int len; + int ret; + + *src = INVALID_SOCKET; + *dst = INVALID_SOCKET; + + *src = socket(AF_INET, SOCK_STREAM, 0); + if (*src == INVALID_SOCKET) + goto end; + + server = socket(AF_INET, SOCK_STREAM, 0); + if (server == INVALID_SOCKET) + goto end; + + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; + addr.sin_addr.s_addr = inet_addr("127.0.0.1"); + ret = bind(server, (struct sockaddr*)&addr, sizeof(addr)); + if (ret != 0) + goto end; + + len = sizeof(addr); + ret = getsockname(server, (struct sockaddr*)&addr, &len); + if (ret != 0) + goto end; + + ret = listen(server, 1); + if (ret != 0) + goto end; + + ret = connect(*src, (struct sockaddr*)&addr, sizeof(addr)); + if (ret != 0) + goto end; + + len = sizeof(addr); + *dst = accept(server, (struct sockaddr*)&addr, &len); + +end: + if (server != INVALID_SOCKET) + closesocket(server); + if (*src != INVALID_SOCKET && *dst != INVALID_SOCKET) + return 0; + closesocket(*src); + closesocket(*dst); + return -1; +} + static void set_so_opentype ( BOOL overlapped ) { int optval = !overlapped, newval, len = sizeof (int); @@ -1635,68 +1686,17 @@ static DWORD WINAPI drain_socket_thread(LPVOID arg) static void test_send(void) { SOCKET src = INVALID_SOCKET; - SOCKET server = INVALID_SOCKET; SOCKET dst = INVALID_SOCKET; HANDLE hThread = NULL; - struct sockaddr_in addr; - int len; const int buflen = 1024*1024; char *buffer = NULL; int ret; DWORD id; - src = socket(AF_INET, SOCK_STREAM, 0); - if (src == INVALID_SOCKET) - { - ok(0, "socket failed, error %d\n", WSAGetLastError()); - goto end; - } - - server = socket(AF_INET, SOCK_STREAM, 0); - if (server == INVALID_SOCKET) - { - ok(0, "socket failed, error %d\n", WSAGetLastError()); - goto end; - } - - memset(&addr, 0, sizeof(addr)); - addr.sin_family = AF_INET; - addr.sin_addr.s_addr = inet_addr("127.0.0.1"); - ret = bind(server, (struct sockaddr*)&addr, sizeof(addr)); - if (ret != 0) - { - ok(0, "bind failed, error %d\n", WSAGetLastError()); - goto end; - } - - len = sizeof(addr); - ret = getsockname(server, (struct sockaddr*)&addr, &len); - if (ret != 0) - { - ok(0, "getsockname failed, error %d\n", WSAGetLastError()); - goto end; - } - - ret = listen(server, 1); - if (ret != 0) - { - ok(0, "listen failed, error %d\n", WSAGetLastError()); - goto end; - } - - ret = connect(src, (struct sockaddr*)&addr, sizeof(addr)); - if (ret != 0) - { - ok(0, "connect failed, error %d\n", WSAGetLastError()); - goto end; - } - - len = sizeof(addr); - dst = accept(server, (struct sockaddr*)&addr, &len); - if (dst == INVALID_SOCKET) + if (tcp_socketpair(&src, &dst) != 0) { - ok(0, "accept failed, error %d\n", WSAGetLastError()); - goto end; + ok(0, "creating socket pair failed, skipping test\n"); + return; } hThread = CreateThread(NULL, 0, drain_socket_thread, &dst, 0, &id); @@ -1722,8 +1722,6 @@ static void test_send(void) end: if (src != INVALID_SOCKET) closesocket(src); - if (server != INVALID_SOCKET) - closesocket(server); if (dst != INVALID_SOCKET) closesocket(dst); if (hThread != NULL) @@ -1734,68 +1732,18 @@ end: static void test_write_events(void) { SOCKET src = INVALID_SOCKET; - SOCKET server = INVALID_SOCKET; SOCKET dst = INVALID_SOCKET; HANDLE hThread = NULL; HANDLE hEvent = INVALID_HANDLE_VALUE; - struct sockaddr_in addr; int len; u_long one = 1; int ret; DWORD id; - src = socket(AF_INET, SOCK_STREAM, 0); - if (src == INVALID_SOCKET) - { - ok(0, "socket failed, error %d\n", WSAGetLastError()); - goto end; - } - - server = socket(AF_INET, SOCK_STREAM, 0); - if (server == INVALID_SOCKET) - { - ok(0, "socket failed, error %d\n", WSAGetLastError()); - goto end; - } - - memset(&addr, 0, sizeof(addr)); - addr.sin_family = AF_INET; - addr.sin_addr.s_addr = inet_addr("127.0.0.1"); - ret = bind(server, (struct sockaddr*)&addr, sizeof(addr)); - if (ret != 0) - { - ok(0, "bind failed, error %d\n", WSAGetLastError()); - goto end; - } - - len = sizeof(addr); - ret = getsockname(server, (struct sockaddr*)&addr, &len); - if (ret != 0) - { - ok(0, "getsockname failed, error %d\n", WSAGetLastError()); - goto end; - } - - ret = listen(server, 1); - if (ret != 0) - { - ok(0, "listen failed, error %d\n", WSAGetLastError()); - goto end; - } - - ret = connect(src, (struct sockaddr*)&addr, sizeof(addr)); - if (ret != 0) - { - ok(0, "connect failed, error %d\n", WSAGetLastError()); - goto end; - } - - len = sizeof(addr); - dst = accept(server, (struct sockaddr*)&addr, &len); - if (dst == INVALID_SOCKET) + if (tcp_socketpair(&src, &dst) != 0) { - ok(0, "accept failed, error %d\n", WSAGetLastError()); - goto end; + ok(0, "creating socket pair failed, skipping test\n"); + return; } hThread = CreateThread(NULL, 0, drain_socket_thread, &dst, 0, &id); @@ -1863,8 +1811,6 @@ static void test_write_events(void) end: if (src != INVALID_SOCKET) closesocket(src); - if (server != INVALID_SOCKET) - closesocket(server); if (dst != INVALID_SOCKET) closesocket(dst); if (hThread != NULL)

1 0

Ralf Beck : winealsa.drv: Add missing offset of pitch bender in midi input.
by Alexandre Julliard May 25, 2007

May 25, 2007

Module: wine Branch: master Commit: 622bad5d3f4457395f13e619316b2b5c6ef24d9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=622bad5d3f4457395f13e6193… Author: Ralf Beck <musical_snake(a)gmx.de> Date: Wed May 23 19:11:21 2007 +0200 winealsa.drv: Add missing offset of pitch bender in midi input. --- dlls/winealsa.drv/midi.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index fb7a6fc..84f1940 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -319,6 +319,7 @@ static DWORD WINAPI midRecThread(LPVOID arg) FIXME("Unexpected event received, type = %x from %d:%d\n", ev->type, ev->source.client, ev->source.port); else { DWORD dwTime, toSend = 0; + int value = 0; /* FIXME: Should use ev->time instead for better accuracy */ dwTime = GetTickCount() - MidiInDev[wDevID].startTime; TRACE("Event received, type = %x, device = %d\n", ev->type, wDevID); @@ -337,7 +338,8 @@ static DWORD WINAPI midRecThread(LPVOID arg) toSend = (ev->data.control.value << 16) | (ev->data.control.param << 8) | MIDI_CMD_CONTROL | ev->data.control.channel; break; case SND_SEQ_EVENT_PITCHBEND: - toSend = (ev->data.control.value << 16) | (ev->data.control.param << 8) | MIDI_CMD_BENDER | ev->data.control.channel; + value = ev->data.control.value + 0x2000; + toSend = (((value >> 7) & 0x7f) << 16) | ((value & 0x7f) << 8) | MIDI_CMD_BENDER | ev->data.control.channel; break; case SND_SEQ_EVENT_PGMCHANGE: toSend = (ev->data.control.value << 16) | (ev->data.control.param << 8) | MIDI_CMD_PGM_CHANGE | ev->data.control.channel;

1 0

Ralf Beck : winealsa.drv: Add midi realtime and midi common messages on midi input.
by Alexandre Julliard May 25, 2007

May 25, 2007

Module: wine Branch: master Commit: e1d7365f3d1ee546a5074b5655af3099308a8da6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1d7365f3d1ee546a5074b565… Author: Ralf Beck <musical_snake(a)gmx.de> Date: Wed May 23 19:13:11 2007 +0200 winealsa.drv: Add midi realtime and midi common messages on midi input. --- dlls/winealsa.drv/midi.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 90d52e6..fb7a6fc 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -345,6 +345,27 @@ static DWORD WINAPI midRecThread(LPVOID arg) case SND_SEQ_EVENT_CHANPRESS: toSend = (ev->data.control.value << 16) | (ev->data.control.param << 8) | MIDI_CMD_CHANNEL_PRESSURE | ev->data.control.channel; break; + case SND_SEQ_EVENT_CLOCK: + toSend = 0xF8; + break; + case SND_SEQ_EVENT_START: + toSend = 0xFA; + break; + case SND_SEQ_EVENT_CONTINUE: + toSend = 0xFB; + break; + case SND_SEQ_EVENT_STOP: + toSend = 0xFC; + break; + case SND_SEQ_EVENT_SONGPOS: + toSend = (((ev->data.control.value >> 7) & 0x7f) << 16) | ((ev->data.control.value & 0x7f) << 8) | 0xF2; + break; + case SND_SEQ_EVENT_SONGSEL: + toSend = ((ev->data.control.value & 0x7f) << 8) | 0xF3; + break; + case SND_SEQ_EVENT_RESET: + toSend = 0xFF; + break; case SND_SEQ_EVENT_SYSEX: { int len = ev->data.ext.len;

1 0

Rob Shearman : secur32: Fix NTLM's InitializeSecurityContextA/ W to be flexible with the index of the token buffer in both the input and output buffer descriptions .
by Alexandre Julliard May 25, 2007

May 25, 2007

Module: wine Branch: master Commit: aa1be492cd16e646c8641d5c87777e48ea4bfb21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa1be492cd16e646c8641d5c8… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu May 24 20:04:47 2007 +0100 secur32: Fix NTLM's InitializeSecurityContextA/W to be flexible with the index of the token buffer in both the input and output buffer descriptions. --- dlls/secur32/ntlm.c | 81 ++++++++++++++++++++++++--------------------- dlls/secur32/tests/ntlm.c | 10 +++++ 2 files changed, 53 insertions(+), 38 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 9a1fa3b..5a00c7a 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -370,6 +370,26 @@ static SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleA( return ret; } +/************************************************************************* + * ntlm_GetTokenBufferIndex + * Calculates the index of the secbuffer with BufferType == SECBUFFER_TOKEN + * Returns index if found or -1 if not found. + */ +static int ntlm_GetTokenBufferIndex(PSecBufferDesc pMessage) +{ + UINT i; + + TRACE("%p\n", pMessage); + + for( i = 0; i < pMessage->cBuffers; ++i ) + { + if(pMessage->pBuffers[i].BufferType == SECBUFFER_TOKEN) + return i; + } + + return -1; +} + /*********************************************************************** * InitializeSecurityContextW */ @@ -385,6 +405,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( char* buffer, *want_flags = NULL; PBYTE bin; int buffer_len, bin_len, max_len = NTLM_MAX_BUF; + int token_idx; TRACE("%p %p %s %d %d %d %p %d %p %p %p %p\n", phCredential, phContext, debugstr_w(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput, @@ -556,11 +577,13 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( } else { + int input_token_idx; + /* handle second call here */ /* encode server data to base64 */ - if (!pInput || !pInput->cBuffers) + if (!pInput || ((input_token_idx = ntlm_GetTokenBufferIndex(pInput)) == -1)) { - ret = SEC_E_INCOMPLETE_MESSAGE; + ret = SEC_E_INVALID_TOKEN; goto isc_end; } @@ -577,23 +600,23 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( return SEC_E_INVALID_HANDLE; } - if (!pInput->pBuffers[0].pvBuffer) + if (!pInput->pBuffers[input_token_idx].pvBuffer) { ret = SEC_E_INTERNAL_ERROR; goto isc_end; } - if(pInput->pBuffers[0].cbBuffer > max_len) + if(pInput->pBuffers[input_token_idx].cbBuffer > max_len) { TRACE("pInput->pBuffers[0].cbBuffer is: %ld\n", - pInput->pBuffers[0].cbBuffer); + pInput->pBuffers[input_token_idx].cbBuffer); ret = SEC_E_INVALID_TOKEN; goto isc_end; } else - bin_len = pInput->pBuffers[0].cbBuffer; + bin_len = pInput->pBuffers[input_token_idx].cbBuffer; - memcpy(bin, pInput->pBuffers[0].pvBuffer, bin_len); + memcpy(bin, pInput->pBuffers[input_token_idx].pvBuffer, bin_len); lstrcpynA(buffer, "TT ", max_len-1); @@ -632,32 +655,34 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( /* put the decoded client blob into the out buffer */ - if (fContextReq & ISC_REQ_ALLOCATE_MEMORY) + if (!pOutput || ((token_idx = ntlm_GetTokenBufferIndex(pOutput)) == -1)) { - if (pOutput) - { - pOutput->cBuffers = 1; - pOutput->pBuffers[0].pvBuffer = SECUR32_ALLOC(bin_len); - pOutput->pBuffers[0].cbBuffer = bin_len; - } + WARN("no SECBUFFER_TOKEN buffer could be found\n"); + ret = SEC_E_BUFFER_TOO_SMALL; + goto isc_end; } - if (!pOutput || !pOutput->cBuffers || pOutput->pBuffers[0].cbBuffer < bin_len) + if (fContextReq & ISC_REQ_ALLOCATE_MEMORY) + { + pOutput->pBuffers[token_idx].pvBuffer = SECUR32_ALLOC(bin_len); + pOutput->pBuffers[token_idx].cbBuffer = bin_len; + } + else if (pOutput->pBuffers[token_idx].cbBuffer < bin_len) { TRACE("out buffer is NULL or has not enough space\n"); ret = SEC_E_BUFFER_TOO_SMALL; goto isc_end; } - if (!pOutput->pBuffers[0].pvBuffer) + if (!pOutput->pBuffers[token_idx].pvBuffer) { TRACE("out buffer is NULL\n"); ret = SEC_E_INTERNAL_ERROR; goto isc_end; } - pOutput->pBuffers[0].cbBuffer = bin_len; - memcpy(pOutput->pBuffers[0].pvBuffer, bin, bin_len); + pOutput->pBuffers[token_idx].cbBuffer = bin_len; + memcpy(pOutput->pBuffers[token_idx].pvBuffer, bin, bin_len); if(ret == SEC_E_OK) { @@ -1237,26 +1262,6 @@ static SECURITY_STATUS SEC_ENTRY ntlm_RevertSecurityContext(PCtxtHandle phContex return ret; } -/************************************************************************* - * ntlm_GetTokenBufferIndex - * Calculates the index of the secbuffer with BufferType == SECBUFFER_TOKEN - * Returns index if found or -1 if not found. - */ -static int ntlm_GetTokenBufferIndex(PSecBufferDesc pMessage) -{ - UINT i; - - TRACE("%p\n", pMessage); - - for( i = 0; i < pMessage->cBuffers; ++i ) - { - if(pMessage->pBuffers[i].BufferType == SECBUFFER_TOKEN) - return i; - } - - return -1; -} - /*********************************************************************** * ntlm_CreateSignature * As both MakeSignature and VerifySignature need this, but different keys diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index e25749f..de6bd7f 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -448,6 +448,16 @@ static SECURITY_STATUS runClient(SspiData *sspi_data, BOOL first, ULONG data_rep ok(out_buf->pBuffers[0].cbBuffer == 0, "InitializeSecurityContext set buffer size to %lu\n", out_buf->pBuffers[0].cbBuffer); + + out_buf->pBuffers[0].cbBuffer = sspi_data->max_token; + out_buf->pBuffers[0].BufferType = SECBUFFER_DATA; + + ret = pInitializeSecurityContextA(sspi_data->cred, NULL, NULL, req_attr, + 0, data_rep, NULL, 0, sspi_data->ctxt, out_buf, + &ctxt_attr, &ttl); + + ok(ret == SEC_E_BUFFER_TOO_SMALL, "expected SEC_E_BUFFER_TOO_SMALL, got %s\n", getSecError(ret)); + out_buf->pBuffers[0].BufferType = SECBUFFER_TOKEN; } out_buf->pBuffers[0].cbBuffer = sspi_data->max_token;

1 0

Rob Shearman : secur32: Don't set the output buffer type in NTLM' s IntializeSecurityContextA/W.
by Alexandre Julliard May 25, 2007

May 25, 2007

Module: wine Branch: master Commit: 4d275bcf10e06facfe2e76089cac9947edc4a711 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d275bcf10e06facfe2e76089… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu May 24 20:04:10 2007 +0100 secur32: Don't set the output buffer type in NTLM's IntializeSecurityContextA/W. --- dlls/secur32/ntlm.c | 1 - dlls/secur32/tests/ntlm.c | 2 ++ 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 5da4488..9a1fa3b 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -657,7 +657,6 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( } pOutput->pBuffers[0].cbBuffer = bin_len; - pOutput->pBuffers[0].BufferType = SECBUFFER_DATA; memcpy(pOutput->pBuffers[0].pvBuffer, bin, bin_len); if(ret == SEC_E_OK) diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index 6b8f5a8..e25749f 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -465,6 +465,8 @@ static SECURITY_STATUS runClient(SspiData *sspi_data, BOOL first, ULONG data_rep ret = SEC_E_OK; } + ok(out_buf->pBuffers[0].BufferType == SECBUFFER_TOKEN, + "buffer type was changed from SECBUFFER_TOKEN to %ld\n", out_buf->pBuffers[0].BufferType); ok(out_buf->pBuffers[0].cbBuffer < sspi_data->max_token, "InitializeSecurityContext set buffer size to %lu\n", out_buf->pBuffers[0].cbBuffer);

1 0

Rob Shearman : secur32: Make the NTLM SSP cope with a NULL phCredential parameter when InitializeSecurityContext is called more than once .
by Alexandre Julliard May 25, 2007

May 25, 2007

Module: wine Branch: master Commit: 661b49785e3e6c523004dc8e719be721857eb193 URL: http://source.winehq.org/git/wine.git/?a=commit;h=661b49785e3e6c523004dc8e7… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu May 24 20:03:32 2007 +0100 secur32: Make the NTLM SSP cope with a NULL phCredential parameter when InitializeSecurityContext is called more than once. --- dlls/secur32/ntlm.c | 80 +++++++++++++++++++++++++------------------- dlls/secur32/tests/ntlm.c | 4 +- 2 files changed, 47 insertions(+), 37 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 6768bab..5da4488 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -390,19 +390,6 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( debugstr_w(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput, Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry); - if(!phCredential) - return SEC_E_INVALID_HANDLE; - - /* As the server side of sspi never calls this, make sure that - * the handler is a client handler. - */ - helper = (PNegoHelper)phCredential->dwLower; - if(helper->mode != NTLM_CLIENT) - { - TRACE("Helper mode = %d\n", helper->mode); - return SEC_E_INVALID_HANDLE; - } - /**************************************** * When communicating with the client, there can be the * following reply packets: @@ -432,6 +419,20 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( if((phContext == NULL) && (pInput == NULL)) { TRACE("First time in ISC()\n"); + + if(!phCredential) + return SEC_E_INVALID_HANDLE; + + /* As the server side of sspi never calls this, make sure that + * the handler is a client handler. + */ + helper = (PNegoHelper)phCredential->dwLower; + if(helper->mode != NTLM_CLIENT) + { + TRACE("Helper mode = %d\n", helper->mode); + return SEC_E_INVALID_HANDLE; + } + /* Allocate space for a maximal string of * "SF NTLMSSP_FEATURE_SIGN NTLMSSP_FEATURE_SEAL * NTLMSSP_FEATURE_SESSION_KEY" @@ -548,6 +549,9 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( /* put the decoded client blob into the out buffer */ + phNewContext->dwUpper = ctxt_attr; + phNewContext->dwLower = (ULONG_PTR)helper; + ret = SEC_I_CONTINUE_NEEDED; } else @@ -560,6 +564,19 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( goto isc_end; } + if(!phContext) + return SEC_E_INVALID_HANDLE; + + /* As the server side of sspi never calls this, make sure that + * the handler is a client handler. + */ + helper = (PNegoHelper)phContext->dwLower; + if(helper->mode != NTLM_CLIENT) + { + TRACE("Helper mode = %d\n", helper->mode); + return SEC_E_INVALID_HANDLE; + } + if (!pInput->pBuffers[0].pvBuffer) { ret = SEC_E_INTERNAL_ERROR; @@ -752,34 +769,27 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextA( PSecBufferDesc pOutput, ULONG *pfContextAttr, PTimeStamp ptsExpiry) { SECURITY_STATUS ret; + SEC_WCHAR *target = NULL; TRACE("%p %p %s %d %d %d %p %d %p %p %p %p\n", phCredential, phContext, debugstr_a(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput, Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry); - - if (phCredential) - { - SEC_WCHAR *target = NULL; - if(pszTargetName != NULL) - { - int target_size = MultiByteToWideChar(CP_ACP, 0, pszTargetName, - strlen(pszTargetName)+1, NULL, 0); - target = HeapAlloc(GetProcessHeap(), 0, target_size * - sizeof(SEC_WCHAR)); - MultiByteToWideChar(CP_ACP, 0, pszTargetName, strlen(pszTargetName)+1, - target, target_size); - } - - ret = ntlm_InitializeSecurityContextW(phCredential, phContext, target, - fContextReq, Reserved1, TargetDataRep, pInput, Reserved2, - phNewContext, pOutput, pfContextAttr, ptsExpiry); - - HeapFree(GetProcessHeap(), 0, target); - } - else + + if(pszTargetName != NULL) { - ret = SEC_E_INVALID_HANDLE; + int target_size = MultiByteToWideChar(CP_ACP, 0, pszTargetName, + strlen(pszTargetName)+1, NULL, 0); + target = HeapAlloc(GetProcessHeap(), 0, target_size * + sizeof(SEC_WCHAR)); + MultiByteToWideChar(CP_ACP, 0, pszTargetName, strlen(pszTargetName)+1, + target, target_size); } + + ret = ntlm_InitializeSecurityContextW(phCredential, phContext, target, + fContextReq, Reserved1, TargetDataRep, pInput, Reserved2, + phNewContext, pOutput, pfContextAttr, ptsExpiry); + + HeapFree(GetProcessHeap(), 0, target); return ret; } diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index 9163f88..6b8f5a8 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -452,7 +452,7 @@ static SECURITY_STATUS runClient(SspiData *sspi_data, BOOL first, ULONG data_rep out_buf->pBuffers[0].cbBuffer = sspi_data->max_token; - ret = pInitializeSecurityContextA(sspi_data->cred, first?NULL:sspi_data->ctxt, NULL, req_attr, + ret = pInitializeSecurityContextA(first?sspi_data->cred:NULL, first?NULL:sspi_data->ctxt, NULL, req_attr, 0, data_rep, first?NULL:in_buf, 0, sspi_data->ctxt, out_buf, &ctxt_attr, &ttl); @@ -463,7 +463,7 @@ static SECURITY_STATUS runClient(SspiData *sspi_data, BOOL first, ULONG data_rep ret = SEC_I_CONTINUE_NEEDED; else if(ret == SEC_I_COMPLETE_NEEDED) ret = SEC_E_OK; - } + } ok(out_buf->pBuffers[0].cbBuffer < sspi_data->max_token, "InitializeSecurityContext set buffer size to %lu\n", out_buf->pBuffers[0].cbBuffer);

1 0

Rob Shearman : secur32: Fix the wrapper InitializeSecurityContextA/ W functions to handle phContext and phNewContext parameters being optional for some SSPs .
by Alexandre Julliard May 25, 2007

May 25, 2007

Module: wine Branch: master Commit: ee47c5a23a83516c0e1734f2dfcc0f0c8729f838 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee47c5a23a83516c0e1734f2d… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu May 24 20:01:21 2007 +0100 secur32: Fix the wrapper InitializeSecurityContextA/W functions to handle phContext and phNewContext parameters being optional for some SSPs. --- dlls/secur32/wrapper.c | 116 ++++++++++++++++++++++++++--------------------- 1 files changed, 64 insertions(+), 52 deletions(-) diff --git a/dlls/secur32/wrapper.c b/dlls/secur32/wrapper.c index 60203e2..0b2d6dd 100644 --- a/dlls/secur32/wrapper.c +++ b/dlls/secur32/wrapper.c @@ -247,46 +247,52 @@ SECURITY_STATUS WINAPI InitializeSecurityContextA( ULONG *pfContextAttr, PTimeStamp ptsExpiry) { SECURITY_STATUS ret; + SecurePackage *package = NULL; + PCredHandle cred = NULL; + PCredHandle ctxt = NULL; TRACE("%p %p %s %d %d %d %p %d %p %p %p %p\n", phCredential, phContext, debugstr_a(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput, Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry); + + if (phContext) + { + package = (SecurePackage *)phContext->dwUpper; + ctxt = (PCtxtHandle)phContext->dwLower; + } if (phCredential) { - SecurePackage *package = (SecurePackage *)phCredential->dwUpper; - PCredHandle cred = (PCredHandle)phCredential->dwLower; + package = (SecurePackage *)phCredential->dwUpper; + cred = (PCredHandle)phCredential->dwLower; + } - if (package && package->provider) + if (package && package->provider) + { + if (package->provider->fnTableA.InitializeSecurityContextA) { - if (package->provider->fnTableA.InitializeSecurityContextA) - { - CtxtHandle myCtxt; + CtxtHandle myCtxt; - if(phContext) - { - PCtxtHandle realCtxt = (PCtxtHandle)phContext->dwLower; - myCtxt.dwUpper = realCtxt->dwUpper; - myCtxt.dwLower = realCtxt->dwLower; - } + if (phContext) + { + PCtxtHandle realCtxt = (PCtxtHandle)phContext->dwLower; + myCtxt.dwUpper = realCtxt->dwUpper; + myCtxt.dwLower = realCtxt->dwLower; + } - ret = package->provider->fnTableA.InitializeSecurityContextA( - cred, phContext ? &myCtxt : NULL, pszTargetName, fContextReq, - Reserved1, TargetDataRep, pInput, Reserved2, &myCtxt, + ret = package->provider->fnTableA.InitializeSecurityContextA( + cred, ctxt, pszTargetName, fContextReq, + Reserved1, TargetDataRep, pInput, Reserved2, phNewContext ? &myCtxt : NULL, pOutput, pfContextAttr, ptsExpiry); - if (ret == SEC_E_OK || ret == SEC_I_CONTINUE_NEEDED) - { - SECURITY_STATUS ret2; - ret2 = SECUR32_makeSecHandle(phNewContext, package, &myCtxt); - if (ret2 != SEC_E_OK) - package->provider->fnTableW.DeleteSecurityContext( - &myCtxt); - } + if ((ret == SEC_E_OK || ret == SEC_I_CONTINUE_NEEDED) && phNewContext) + { + SECURITY_STATUS ret2; + ret2 = SECUR32_makeSecHandle(phNewContext, package, &myCtxt); + if (ret2 != SEC_E_OK) + package->provider->fnTableA.DeleteSecurityContext(&myCtxt); } - else - ret = SEC_E_UNSUPPORTED_FUNCTION; } else - ret = SEC_E_INVALID_HANDLE; + ret = SEC_E_UNSUPPORTED_FUNCTION; } else ret = SEC_E_INVALID_HANDLE; @@ -304,46 +310,52 @@ SECURITY_STATUS WINAPI InitializeSecurityContextW( ULONG *pfContextAttr, PTimeStamp ptsExpiry) { SECURITY_STATUS ret; + SecurePackage *package = NULL; + PCredHandle cred = NULL; + PCredHandle ctxt = NULL; TRACE("%p %p %s %d %d %d %p %d %p %p %p %p\n", phCredential, phContext, debugstr_w(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput, Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry); + + if (phContext) + { + package = (SecurePackage *)phContext->dwUpper; + ctxt = (PCtxtHandle)phContext->dwLower; + } if (phCredential) { - SecurePackage *package = (SecurePackage *)phCredential->dwUpper; - PCredHandle cred = (PCredHandle)phCredential->dwLower; + package = (SecurePackage *)phCredential->dwUpper; + cred = (PCredHandle)phCredential->dwLower; + } - if (package && package->provider) + if (package && package->provider) + { + if (package->provider->fnTableW.InitializeSecurityContextW) { - if (package->provider->fnTableW.QueryCredentialsAttributesW) - { - CtxtHandle myCtxt; + CtxtHandle myCtxt; - if(phContext) - { - PCtxtHandle realCtxt = (PCtxtHandle)phContext->dwLower; - myCtxt.dwUpper = realCtxt->dwUpper; - myCtxt.dwLower = realCtxt->dwLower; - } + if (phContext) + { + PCtxtHandle realCtxt = (PCtxtHandle)phContext->dwLower; + myCtxt.dwUpper = realCtxt->dwUpper; + myCtxt.dwLower = realCtxt->dwLower; + } - ret = package->provider->fnTableW.InitializeSecurityContextW( - cred, phContext ? &myCtxt : NULL, pszTargetName, fContextReq, - Reserved1, TargetDataRep, pInput, Reserved2, &myCtxt, + ret = package->provider->fnTableW.InitializeSecurityContextW( + cred, ctxt, pszTargetName, fContextReq, + Reserved1, TargetDataRep, pInput, Reserved2, phNewContext ? &myCtxt : NULL, pOutput, pfContextAttr, ptsExpiry); - if (ret == SEC_E_OK || ret == SEC_I_CONTINUE_NEEDED) - { - SECURITY_STATUS ret2; - ret2 = SECUR32_makeSecHandle(phNewContext, package, &myCtxt); - if (ret2 != SEC_E_OK) - package->provider->fnTableW.DeleteSecurityContext( - &myCtxt); - } + if ((ret == SEC_E_OK || ret == SEC_I_CONTINUE_NEEDED) && phNewContext) + { + SECURITY_STATUS ret2; + ret2 = SECUR32_makeSecHandle(phNewContext, package, &myCtxt); + if (ret2 != SEC_E_OK) + package->provider->fnTableW.DeleteSecurityContext(&myCtxt); } - else - ret = SEC_E_UNSUPPORTED_FUNCTION; } else - ret = SEC_E_INVALID_HANDLE; + ret = SEC_E_UNSUPPORTED_FUNCTION; } else ret = SEC_E_INVALID_HANDLE;

1 0