November 2006 - Wine-commits

Andrew Talbot : msvcrt: Cast-qual warnings fix.
by Alexandre Julliard 06 Nov '06

06 Nov '06

Module: wine Branch: master Commit: 55f25b712d574308b7999a6a8d4bf9fb279bac65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55f25b712d574308b7999a6a8… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Nov 4 17:51:49 2006 +0000 msvcrt: Cast-qual warnings fix. --- dlls/msvcrt/file.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 1624f84..c842ef8 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1980,7 +1980,8 @@ #endif else { unsigned int i, j, nr_lf; - char *p; + char *p = NULL; + const char *q; const char *s = (const char *)buf, *buf_start = (const char *)buf; /* find number of \n ( without preceding \r ) */ for ( nr_lf=0,i = 0; i <count; i++) @@ -1993,7 +1994,7 @@ #endif } if (nr_lf) { - if ((p = MSVCRT_malloc(count + nr_lf))) + if ((q = p = MSVCRT_malloc(count + nr_lf))) { for (s = (const char *)buf, i = 0, j = 0; i < count; i++) { @@ -2009,13 +2010,13 @@ #endif { FIXME("Malloc failed\n"); nr_lf =0; - p = (char*)buf; + q = buf; } } else - p = (char*)buf; + q = buf; - if ((WriteFile(hand, p, count+nr_lf, &num_written, NULL) == 0 ) || (num_written != count+nr_lf)) + if ((WriteFile(hand, q, count+nr_lf, &num_written, NULL) == 0 ) || (num_written != count+nr_lf)) { TRACE("WriteFile (fd %d, hand %p) failed-last error (%d), num_written %d\n", fd, hand, GetLastError(), num_written);

1 0

Andrew Talbot : msacm32: Cast-qual warnings fix.
by Alexandre Julliard 06 Nov '06

06 Nov '06

Module: wine Branch: master Commit: 0da601fa48c39d9b75ce2b2367f22398cade0929 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0da601fa48c39d9b75ce2b236… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Nov 3 20:56:30 2006 +0000 msacm32: Cast-qual warnings fix. --- dlls/msacm32/driver.c | 33 ++++++++++++++++++++------------- 1 files changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/msacm32/driver.c b/dlls/msacm32/driver.c index f995808..d4ad644 100644 --- a/dlls/msacm32/driver.c +++ b/dlls/msacm32/driver.c @@ -402,6 +402,8 @@ LRESULT WINAPI acmDriverMessage(HACMDRIV PWINE_ACMDRIVERID padid; LRESULT lResult; LPDRVCONFIGINFO pConfigInfo = NULL; + LPWSTR section_name = NULL; + LPWSTR alias_name = NULL; /* Check whether handle is an HACMDRIVERID */ padid = MSACM_GetDriverID((HACMDRIVERID)had); @@ -434,16 +436,19 @@ LRESULT WINAPI acmDriverMessage(HACMDRIV ERR("OOM while supplying DRVCONFIGINFO for DRV_CONFIGURE, using NULL\n"); } else { static const WCHAR drivers32[] = {'D','r','i','v','e','r','s','3','2','\0'}; + pConfigInfo->dwDCISize = iStructSize; - - pConfigInfo->lpszDCISectionName = HeapAlloc(MSACM_hHeap, 0, (strlenW(drivers32) + 1) * sizeof(WCHAR)); - if (pConfigInfo->lpszDCISectionName) strcpyW((WCHAR *)pConfigInfo->lpszDCISectionName, drivers32); - pConfigInfo->lpszDCIAliasName = HeapAlloc(MSACM_hHeap, 0, (strlenW(pAlias) + 1) * sizeof(WCHAR)); - if (pConfigInfo->lpszDCIAliasName) strcpyW((WCHAR *)pConfigInfo->lpszDCIAliasName, pAlias); - + + section_name = HeapAlloc(MSACM_hHeap, 0, (strlenW(drivers32) + 1) * sizeof(WCHAR)); + if (section_name) strcpyW(section_name, drivers32); + pConfigInfo->lpszDCISectionName = section_name; + alias_name = HeapAlloc(MSACM_hHeap, 0, (strlenW(pAlias) + 1) * sizeof(WCHAR)); + if (alias_name) strcpyW(alias_name, pAlias); + pConfigInfo->lpszDCIAliasName = alias_name; + if (pConfigInfo->lpszDCISectionName == NULL || pConfigInfo->lpszDCIAliasName == NULL) { - HeapFree(MSACM_hHeap, 0, (void *)pConfigInfo->lpszDCIAliasName); - HeapFree(MSACM_hHeap, 0, (void *)pConfigInfo->lpszDCISectionName); + HeapFree(MSACM_hHeap, 0, alias_name); + HeapFree(MSACM_hHeap, 0, section_name); HeapFree(MSACM_hHeap, 0, pConfigInfo); pConfigInfo = NULL; ERR("OOM while supplying DRVCONFIGINFO for DRV_CONFIGURE, using NULL\n"); @@ -471,8 +476,8 @@ LRESULT WINAPI acmDriverMessage(HACMDRIV lResult = MSACM_Message(had, uMsg, lParam1, lParam2); } if (pConfigInfo) { - HeapFree(MSACM_hHeap, 0, (void *)pConfigInfo->lpszDCIAliasName); - HeapFree(MSACM_hHeap, 0, (void *)pConfigInfo->lpszDCISectionName); + HeapFree(MSACM_hHeap, 0, alias_name); + HeapFree(MSACM_hHeap, 0, section_name); HeapFree(MSACM_hHeap, 0, pConfigInfo); } return lResult; @@ -523,6 +528,7 @@ MMRESULT WINAPI acmDriverOpen(PHACMDRIVE { ACMDRVOPENDESCW adod; int len; + LPWSTR section_name; /* this is not an externally added driver... need to actually load it */ if (!padid->pszDriverAlias) @@ -538,14 +544,15 @@ MMRESULT WINAPI acmDriverOpen(PHACMDRIVE adod.dwFlags = fdwOpen; adod.dwError = 0; len = strlen("Drivers32") + 1; - adod.pszSectionName = HeapAlloc(MSACM_hHeap, 0, len * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, "Drivers32", -1, (LPWSTR)adod.pszSectionName, len); + section_name = HeapAlloc(MSACM_hHeap, 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, "Drivers32", -1, section_name, len); + adod.pszSectionName = section_name; adod.pszAliasName = padid->pszDriverAlias; adod.dnDevNode = 0; pad->hDrvr = OpenDriver(padid->pszDriverAlias, NULL, (DWORD)&adod); - HeapFree(MSACM_hHeap, 0, (LPWSTR)adod.pszSectionName); + HeapFree(MSACM_hHeap, 0, section_name); if (!pad->hDrvr) { ret = adod.dwError;

1 0

Aric Stewart : shell32: Have SHELL_ArgifyW respect the length of the buffer passed in and report a needed buffer size .
by Alexandre Julliard 06 Nov '06

06 Nov '06

Module: wine Branch: master Commit: 3f9a168f47d5fb27a67550116c2f232d13a6e8c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f9a168f47d5fb27a67550116… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Nov 3 10:24:19 2006 -0600 shell32: Have SHELL_ArgifyW respect the length of the buffer passed in and report a needed buffer size. --- dlls/shell32/shlexec.c | 141 ++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 112 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3f9a168f47d5fb27a6755…

1 0

Andrey Turkin : advapi32: Test for OpenProcessToken with MAXIMUM_ALLOWED access.
by Alexandre Julliard 06 Nov '06

06 Nov '06

Module: wine Branch: master Commit: f15af94db8bc395896d8f4ce24f78f180823fd81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f15af94db8bc395896d8f4ce2… Author: Andrey Turkin <pancha(a)mail.nnov.ru> Date: Mon Nov 6 14:35:37 2006 +0300 advapi32: Test for OpenProcessToken with MAXIMUM_ALLOWED access. --- dlls/advapi32/tests/security.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 54112d2..452f0d2 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -786,6 +786,18 @@ static void test_token_attr(void) DWORD i, GLE; LPSTR SidString; + /* cygwin-like use case */ + ret = OpenProcessToken(GetCurrentProcess(), MAXIMUM_ALLOWED, &Token); + ok(ret, "OpenProcessToken failed with error %d\n", GetLastError()); + if (ret) + { + BYTE buf[1024]; + DWORD bufsize = sizeof(buf); + ret = GetTokenInformation(Token, TokenUser,(void*)buf, bufsize, &bufsize); + todo_wine ok(ret, "GetTokenInformation failed with error %d\n", GetLastError()); + CloseHandle(Token); + } + if(!pConvertSidToStringSidA) return;

1 0

Aric Stewart : shell32: Create dynamic buffers for expanded enviroment strings to allow for parameters and such longer than MAX_PATH .
by Alexandre Julliard 06 Nov '06

06 Nov '06

Module: wine Branch: master Commit: 3490cb81ed88492bae7694099e34de54b2401780 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3490cb81ed88492bae7694099… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Nov 3 09:47:13 2006 -0600 shell32: Create dynamic buffers for expanded enviroment strings to allow for parameters and such longer than MAX_PATH. With help from Michael Moss. --- dlls/shell32/shlexec.c | 48 ++++++++++++++++++++++++++++++++++++----- dlls/shell32/tests/shlexec.c | 32 ++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index f57cb6e..ff1e314 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1198,6 +1198,7 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW WCHAR *wszApplicationName, wszParameters[1024], wszDir[MAX_PATH]; DWORD dwApplicationNameLen = MAX_PATH+2; + DWORD len; SHELLEXECUTEINFOW sei_tmp; /* modifiable copy of SHELLEXECUTEINFO struct */ WCHAR wfileName[MAX_PATH]; WCHAR *env; @@ -1351,16 +1352,51 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW } /* expand environment strings */ - if (ExpandEnvironmentStringsW(sei_tmp.lpFile, buffer, MAX_PATH)) - lstrcpyW(wszApplicationName, buffer); + len = ExpandEnvironmentStringsW(sei_tmp.lpFile, NULL, 0); + if (len>0) + { + LPWSTR buf; + buf = HeapAlloc(GetProcessHeap(),0,(len+1)*sizeof(WCHAR)); + + ExpandEnvironmentStringsW(sei_tmp.lpFile, buf, len+1); + HeapFree(GetProcessHeap(), 0, wszApplicationName); + dwApplicationNameLen = len+1; + wszApplicationName = buf; + + sei_tmp.lpFile = wszApplicationName; + } if (*sei_tmp.lpParameters) - if (ExpandEnvironmentStringsW(sei_tmp.lpParameters, buffer, MAX_PATH)) - lstrcpyW(wszParameters, buffer); + { + len = ExpandEnvironmentStringsW(sei_tmp.lpParameters, NULL, 0); + if (len > 0) + { + LPWSTR buf; + len++; + buf = HeapAlloc(GetProcessHeap(),0,len*sizeof(WCHAR)); + ExpandEnvironmentStringsW(sei_tmp.lpParameters, buf, len); + if (len > 1024) + ERR("Parameters exceeds buffer size (%i > 1024)\n",len); + lstrcpynW(wszParameters, buf, min(1024,len)); + HeapFree(GetProcessHeap(),0,buf); + } + } if (*sei_tmp.lpDirectory) - if (ExpandEnvironmentStringsW(sei_tmp.lpDirectory, buffer, MAX_PATH)) - lstrcpyW(wszDir, buffer); + { + len = ExpandEnvironmentStringsW(sei_tmp.lpDirectory, NULL, 0); + if (len > 0) + { + LPWSTR buf; + len++; + buf = HeapAlloc(GetProcessHeap(),0,len*sizeof(WCHAR)); + ExpandEnvironmentStringsW(sei_tmp.lpDirectory, buf, len); + if (len > 1024) + ERR("Directory exceeds buffer size (%i > 1024)\n",len); + lstrcpynW(wszDir, buf, min(1024,len)); + HeapFree(GetProcessHeap(),0,buf); + } + } /* Else, try to execute the filename */ TRACE("execute:%s,%s,%s\n", debugstr_w(wszApplicationName), debugstr_w(wszParameters), debugstr_w(wszDir)); diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index b22bf2f..bed6fd8 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -813,6 +813,37 @@ static void test_exes(void) } } +static void test_exes_long(void) +{ + char filename[MAX_PATH]; + char params[2024]; + char longparam[MAX_PATH]; + int rc; + + for (rc = 0; rc < MAX_PATH; rc++) + longparam[rc]='a'+rc%26; + longparam[MAX_PATH-1]=0; + + + sprintf(params, "shlexec \"%s\" %s", child_file,longparam); + + /* We need NOZONECHECKS on Win2003 to block a dialog */ + rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, argv0, params, + NULL); + ok(rc>=32, "%s returned %d\n", shell_call, rc); + okChildInt("argcA", 4); + okChildString("argvA3", longparam); + + sprintf(filename, "%s\\test file.noassoc", tmpdir); + if (CopyFile(argv0, filename, FALSE)) + { + rc=shell_execute(NULL, filename, params, NULL); + todo_wine { + ok(rc==SE_ERR_NOASSOC, "%s succeeded: rc=%d\n", shell_call, rc); + } + } +} + static void init_test(void) { @@ -954,6 +985,7 @@ START_TEST(shlexec) test_filename(); test_lnks(); test_exes(); + test_exes_long(); cleanup_test(); }

1 0

Paul Chitescu : mscoree: String returned by GetCORVersion starts with letter 'v'.
by Alexandre Julliard 06 Nov '06

06 Nov '06

Module: wine Branch: master Commit: 9c377f0ed785189532921bc4f6dc931f5404c531 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c377f0ed785189532921bc4f… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Mon Nov 6 13:33:23 2006 +0200 mscoree: String returned by GetCORVersion starts with letter 'v'. --- dlls/mscoree/mscoree_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index d3e522e..8caf2fb 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -100,7 +100,7 @@ DWORD _CorValidateImage(LPCVOID* imageBa HRESULT WINAPI GetCORVersion(LPWSTR pbuffer, DWORD cchBuffer, DWORD *dwLength) { - static const WCHAR version[] = {'1','.','1','.','4','3','2','2',0}; + static const WCHAR version[] = {'v','1','.','1','.','4','3','2','2',0}; FIXME("(%p, %d, %p): semi-stub!\n", pbuffer, cchBuffer, dwLength);

1 0

Mike McCormack : user32: The string passed to ToUnicode(Ex) is for output.
by Alexandre Julliard 06 Nov '06

06 Nov '06

Module: wine Branch: master Commit: f3c0453c34638628e8ca039f972adb0072e11772 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3c0453c34638628e8ca039f9… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Nov 6 20:14:56 2006 +0900 user32: The string passed to ToUnicode(Ex) is for output. --- dlls/user/user32.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user/user32.spec b/dlls/user/user32.spec index 508b6d1..f857105 100644 --- a/dlls/user/user32.spec +++ b/dlls/user/user32.spec @@ -701,8 +701,8 @@ # @ stub SysErrorBox @ stdcall TileWindows(long long ptr long ptr) @ stdcall ToAscii(long long ptr ptr long) @ stdcall ToAsciiEx(long long ptr ptr long long) -@ stdcall ToUnicode(long long ptr wstr long long) -@ stdcall ToUnicodeEx(long long ptr wstr long long long) +@ stdcall ToUnicode(long long ptr ptr long long) +@ stdcall ToUnicodeEx(long long ptr ptr long long long) @ stdcall TrackMouseEvent(ptr) @ stdcall TrackPopupMenu(long long long long long long ptr) @ stdcall TrackPopupMenuEx(long long long long long ptr)

1 0

Mike McCormack : user32: ToUnicodeEx should return 0 for an unknown key.
by Alexandre Julliard 06 Nov '06

06 Nov '06

Module: wine Branch: master Commit: 671e9c065819c7d14770d7a7d934a31cfa0331de URL: http://source.winehq.org/git/wine.git/?a=commit;h=671e9c065819c7d14770d7a7d… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Nov 6 20:11:24 2006 +0900 user32: ToUnicodeEx should return 0 for an unknown key. --- dlls/winex11.drv/keyboard.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 7768151..9b3bdeb 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -2401,7 +2401,7 @@ INT X11DRV_ToUnicodeEx(UINT virtKey, UIN { WARN("Unknown virtual key %X !!!\n", virtKey); wine_tsx11_unlock(); - return virtKey; /* whatever */ + return 0; } else TRACE("Found keycode %d (0x%2X)\n",e.keycode,e.keycode);

1 0

Peter Oberndorfer : dbghelp: Make dwarf2 parser handle file paths relative to working dir better.
by Alexandre Julliard 06 Nov '06

06 Nov '06

Module: wine Branch: master Commit: fd2d43f13171220085ce557e12d50043ca390483 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd2d43f13171220085ce557e1… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Sun Nov 5 23:30:52 2006 +0100 dbghelp: Make dwarf2 parser handle file paths relative to working dir better. --- dlls/dbghelp/dwarf.c | 34 ++++++++++++++++++++++++++++------ 1 files changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 2f22d9e..eab1f04 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1582,6 +1582,7 @@ static void dwarf2_set_line_number(struc static void dwarf2_parse_line_numbers(const dwarf2_section_t* sections, dwarf2_parse_context_t* ctx, + const char* compile_dir, unsigned long offset) { dwarf2_traverse_context_t traverse; @@ -1615,13 +1616,28 @@ static void dwarf2_parse_line_numbers(co vector_init(&dirs, sizeof(const char*), 4); p = vector_add(&dirs, &ctx->pool); - *p = "."; + *p = compile_dir ? compile_dir : "."; while (*traverse.data) { - TRACE("Got include %s\n", (const char*)traverse.data); + const char* rel = (const char*)traverse.data; + unsigned rellen = strlen(rel); + TRACE("Got include %s\n", rel); + traverse.data += rellen + 1; p = vector_add(&dirs, &ctx->pool); - *p = (const char *)traverse.data; - traverse.data += strlen((const char *)traverse.data) + 1; + + if (*rel == '/' || !compile_dir) + *p = rel; + else + { + /* include directory relative to compile directory */ + unsigned baselen = strlen(compile_dir); + char* tmp = pool_alloc(&ctx->pool, baselen + 1 + rellen + 1); + strcpy(tmp, compile_dir); + if (tmp[baselen - 1] != '/') tmp[baselen++] = '/'; + strcpy(&tmp[baselen], rel); + *p = tmp; + } + } traverse.data++; @@ -1788,9 +1804,15 @@ static BOOL dwarf2_parse_compilation_uni struct attribute name; dwarf2_debug_info_t** pdi = NULL; struct attribute stmt_list; + struct attribute comp_dir; dwarf2_find_name(&ctx, di, &name, "compiland"); - di->symt = &symt_new_compiland(module, source_new(module, NULL, name.u.string))->symt; + + /* get working directory of current compilation unit */ + if (!dwarf2_find_attribute(&ctx, di, DW_AT_comp_dir, &comp_dir)) + comp_dir.u.string = NULL; + + di->symt = &symt_new_compiland(module, source_new(module, comp_dir.u.string, name.u.string))->symt; if (di->abbrev->have_child) { @@ -1801,7 +1823,7 @@ static BOOL dwarf2_parse_compilation_uni } if (dwarf2_find_attribute(&ctx, di, DW_AT_stmt_list, &stmt_list)) { - dwarf2_parse_line_numbers(sections, &ctx, stmt_list.u.uvalue); + dwarf2_parse_line_numbers(sections, &ctx, comp_dir.u.string, stmt_list.u.uvalue); } ret = TRUE; }

1 0

Kai Blin : secur32: Test and fix DecryptMessage for multiple data buffers.
by Alexandre Julliard 06 Nov '06

06 Nov '06

Module: wine Branch: master Commit: 3af72bec1eb139e446f157fa0e7d00cd55932612 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3af72bec1eb139e446f157fa0… Author: Kai Blin <kai.blin(a)gmail.com> Date: Sat Nov 4 12:30:30 2006 +0100 secur32: Test and fix DecryptMessage for multiple data buffers. --- dlls/secur32/ntlm.c | 39 ++++++++++++++++++++++++++++----------- dlls/secur32/tests/ntlm.c | 24 ++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 11 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index d1d951f..8cc206d 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -1308,6 +1308,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_Ve ULONG fQOP = 0; UINT i; int token_idx = -1; + SECURITY_STATUS ret; TRACE("%p %p %d %p\n", phContext, pMessage, MessageSeqNo, pfQOP); if(!phContext) @@ -1345,26 +1346,42 @@ static SECURITY_STATUS SEC_ENTRY ntlm_Ve if(helper->neg_flags & NTLMSSP_NEGOTIATE_SIGN) { SecBufferDesc local_desc; - SecBuffer local_buff[2]; + PSecBuffer local_buff; BYTE local_sig[16]; + local_buff = HeapAlloc(GetProcessHeap(), 0, pMessage->cBuffers * sizeof(SecBuffer)); + local_desc.ulVersion = SECBUFFER_VERSION; - local_desc.cBuffers = 2; + local_desc.cBuffers = pMessage->cBuffers; local_desc.pBuffers = local_buff; - local_buff[0].BufferType = SECBUFFER_TOKEN; - local_buff[0].cbBuffer = 16; - local_buff[0].pvBuffer = local_sig; - local_buff[1].BufferType = SECBUFFER_DATA; - local_buff[1].cbBuffer = pMessage->pBuffers[1].cbBuffer; - local_buff[1].pvBuffer = pMessage->pBuffers[1].pvBuffer; + + for(i=0; i < pMessage->cBuffers; ++i) + { + if(pMessage->pBuffers[i].BufferType == SECBUFFER_TOKEN) + { + local_buff[i].BufferType = SECBUFFER_TOKEN; + local_buff[i].cbBuffer = 16; + local_buff[i].pvBuffer = local_sig; + } + else + { + local_buff[i].BufferType = pMessage->pBuffers[i].BufferType; + local_buff[i].cbBuffer = pMessage->pBuffers[i].cbBuffer; + local_buff[i].pvBuffer = pMessage->pBuffers[i].pvBuffer; + } + } ntlm_MakeSignature(phContext, fQOP, &local_desc, MessageSeqNo); - if(memcmp(((PBYTE)local_buff[0].pvBuffer) + 8, + if(memcmp(((PBYTE)local_buff[token_idx].pvBuffer) + 8, ((PBYTE)pMessage->pBuffers[token_idx].pvBuffer) + 8, 8)) - return SEC_E_MESSAGE_ALTERED; + ret = SEC_E_MESSAGE_ALTERED; + else + ret = SEC_E_OK; - return SEC_E_OK; + HeapFree(GetProcessHeap(), 0, local_buff); + + return ret; } if(helper->neg_flags & NTLMSSP_NEGOTIATE_KEY_EXCHANGE) diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index 7e63697..7fa9358 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -137,6 +137,14 @@ static BYTE crypt_message_server[] = {0xf6, 0xb7, 0x92, 0x0c, 0xac, 0xea, 0x98, 0xe6, 0xef, 0xa0, 0x29, 0x66, 0xfd}; +static BYTE crypt_trailer_server2[] = + {0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb1, 0x4e, + 0x46, 0xb7, 0xca, 0xf7, 0x7f, 0xb3}; + +static BYTE crypt_message_server2[] = + {0xc8, 0xf2, 0x39, 0x7f, 0x0c, 0xaf, 0xf5, 0x5d, 0xef, 0x0c, + 0x8b, 0x5f, 0x82}; + static void InitFunctionPtrs(void) { secdll = LoadLibraryA("secur32.dll"); @@ -846,6 +854,12 @@ static void testSignSeal() ok(!memcmp(crypt.pBuffers[3].pvBuffer, message_signature, crypt.pBuffers[3].cbBuffer), "Signature is not as expected.\n"); + /* Being a dummy signature, it will verify right away, as if the server + * sent it */ + sec_status = pVerifySignature(client.ctxt, &crypt, 0, &qop); + ok(sec_status == SEC_E_OK, "VerifySignature returned %s, not SEC_E_OK\n", + getSecError(sec_status)); + sec_status = pEncryptMessage(client.ctxt, 0, &crypt, 0); ok(sec_status == SEC_E_OK, "EncryptMessage returned %s, not SEC_E_OK.\n", getSecError(sec_status)); @@ -856,6 +870,14 @@ static void testSignSeal() ok(!memcmp(crypt.pBuffers[1].pvBuffer, crypt_message_client2, crypt.pBuffers[1].cbBuffer), "Crypt message not as expected.\n"); + memcpy(complex_data[1].pvBuffer, crypt_message_server2, complex_data[1].cbBuffer); + memcpy(complex_data[3].pvBuffer, crypt_trailer_server2, complex_data[3].cbBuffer); + + sec_status = pDecryptMessage(client.ctxt, &crypt, 0, &qop); + ok(sec_status == SEC_E_OK, "DecryptMessage returned %s, not SEC_E_OK.\n", + getSecError(sec_status)); + + end: cleanupBuffers(&client); cleanupBuffers(&server); @@ -867,6 +889,8 @@ end: HeapFree(GetProcessHeap(), 0, fake_data[1].pvBuffer); HeapFree(GetProcessHeap(), 0, data[0].pvBuffer); HeapFree(GetProcessHeap(), 0, data[1].pvBuffer); + HeapFree(GetProcessHeap(), 0, complex_data[1].pvBuffer); + HeapFree(GetProcessHeap(), 0, complex_data[3].pvBuffer); } else {

1 0