March 2007 - Wine-commits - list.winehq.org

Paul Vriens : msvcrt/tests: Properly remove temporary directory.
by Alexandre Julliard 06 Mar '07

06 Mar '07

Module: wine Branch: master Commit: 8ebcf40043a86bc0ef87f68fb52be33f10b07f6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ebcf40043a86bc0ef87f68fb… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Mar 6 19:15:40 2007 +0100 msvcrt/tests: Properly remove temporary directory. --- dlls/msvcrt/tests/dir.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/dir.c b/dlls/msvcrt/tests/dir.c index dfa4982..009cbdb 100644 --- a/dlls/msvcrt/tests/dir.c +++ b/dlls/msvcrt/tests/dir.c @@ -35,6 +35,7 @@ static void test_fullpath(void) { char full[MAX_PATH]; char tmppath[MAX_PATH]; + char prevpath[MAX_PATH]; char level1[MAX_PATH]; char level2[MAX_PATH]; char teststring[MAX_PATH]; @@ -42,6 +43,7 @@ static void test_fullpath(void) BOOL rc,free1,free2; free1=free2=TRUE; + GetCurrentDirectory(MAX_PATH, prevpath); GetTempPath(MAX_PATH,tmppath); strcpy(level1,tmppath); strcat(level1,"msvcrt-test\\"); @@ -79,6 +81,7 @@ static void test_fullpath(void) ok(strcmp(freeme,teststring)==0,"Invalid Path returned %s\n",freeme); free(freeme); + SetCurrentDirectory(prevpath); if (free2) RemoveDirectory(level2); if (free1)

1 0

Stefan Dösinger : wined3d: Adjust the rhw transformation for offscreen rendering.
by Alexandre Julliard 06 Mar '07

06 Mar '07

Module: wine Branch: master Commit: e0a271ee0cf25a2c7e7da8c6062d361b5eb46f0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0a271ee0cf25a2c7e7da8c60… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 3 13:51:43 2007 +0100 wined3d: Adjust the rhw transformation for offscreen rendering. --- dlls/wined3d/state.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index ba421a1..c56ce67 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2155,7 +2155,7 @@ static void transform_projection(DWORD state, IWineD3DStateBlockImpl *stateblock */ TRACE("Calling glOrtho with %f, %f, %f, %f\n", width, height, -minZ, -maxZ); if(stateblock->wineD3DDevice->render_offscreen) { - glOrtho(X, X + width, Y, Y - height, -minZ, -maxZ); + glOrtho(X, X + width, -Y, -Y - height, -minZ, -maxZ); } else { glOrtho(X, X + width, Y + height, Y, -minZ, -maxZ); } @@ -2169,7 +2169,7 @@ static void transform_projection(DWORD state, IWineD3DStateBlockImpl *stateblock */ TRACE("Calling glOrtho with %f, %f, %f, %f\n", width, height, 1.0, -1.0); if(stateblock->wineD3DDevice->render_offscreen) { - glOrtho(X, X + width, Y, Y - height, 1.0, -1.0); + glOrtho(X, X + width, -Y, -Y - height, 1.0, -1.0); } else { glOrtho(X, X + width, Y + height, Y, 1.0, -1.0); }

1 0

Rob Shearman : secur32: NTLM's AcquireCredentialHandleA/ W should accept domains and usernames with lengths of 0.
by Alexandre Julliard 06 Mar '07

06 Mar '07

Module: wine Branch: master Commit: b814c45f007f46b5bc644684eda247fa07793a18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b814c45f007f46b5bc644684e… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Mar 6 13:32:09 2007 +0000 secur32: NTLM's AcquireCredentialHandleA/W should accept domains and usernames with lengths of 0. Add tests for these cases. --- dlls/secur32/ntlm.c | 6 ---- dlls/secur32/tests/ntlm.c | 69 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 6 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index a75b4b8..5744830 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -163,12 +163,6 @@ static SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW( PSEC_WINNT_AUTH_IDENTITY_W auth_data = (PSEC_WINNT_AUTH_IDENTITY_W)pAuthData; - if (!auth_data->UserLength || !auth_data->DomainLength) - { - ret = SEC_E_NO_CREDENTIALS; - phCredential = NULL; - break; - } /* Get username and domain from pAuthData */ username = HeapAlloc(GetProcessHeap(), 0, (auth_data->UserLength + 1) * sizeof(SEC_WCHAR)); diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index 6d96874..4191bb0 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -1116,6 +1116,74 @@ end: HeapFree(GetProcessHeap(), 0, complex_data[3].pvBuffer); } +static void testAcquireCredentialsHandle(void) +{ + CredHandle cred; + TimeStamp ttl; + static char test_user[] = "testuser", + workgroup[] = "WORKGROUP", + test_pass[] = "testpass", + sec_pkg_name[] = "NTLM"; + SECURITY_STATUS ret; + SEC_WINNT_AUTH_IDENTITY id; + PSecPkgInfo pkg_info = NULL; + + if(pQuerySecurityPackageInfoA(sec_pkg_name, &pkg_info) != SEC_E_OK) + { + skip("NTLM package not installed, skipping test\n"); + return; + } + pFreeContextBuffer(pkg_info); + + id.User = (unsigned char*) test_user; + id.UserLength = strlen((char *) id.User); + id.Domain = (unsigned char *) workgroup; + id.DomainLength = strlen((char *) id.Domain); + id.Password = (unsigned char*) test_pass; + id.PasswordLength = strlen((char *) id.Password); + id.Flags = SEC_WINNT_AUTH_IDENTITY_ANSI; + + ret = pAcquireCredentialsHandleA(NULL, sec_pkg_name, SECPKG_CRED_OUTBOUND, + NULL, &id, NULL, NULL, &cred, &ttl); + ok(ret == SEC_E_OK, "AcquireCredentialsHande() returned %s\n", + getSecError(ret)); + pFreeCredentialsHandle(&cred); + + id.DomainLength = 0; + ret = pAcquireCredentialsHandleA(NULL, sec_pkg_name, SECPKG_CRED_OUTBOUND, + NULL, &id, NULL, NULL, &cred, &ttl); + ok(ret == SEC_E_OK, "AcquireCredentialsHande() returned %s\n", + getSecError(ret)); + pFreeCredentialsHandle(&cred); + + id.Domain = NULL; + ret = pAcquireCredentialsHandleA(NULL, sec_pkg_name, SECPKG_CRED_OUTBOUND, + NULL, &id, NULL, NULL, &cred, &ttl); + ok(ret == SEC_E_OK, "AcquireCredentialsHande() returned %s\n", + getSecError(ret)); + pFreeCredentialsHandle(&cred); + + id.Domain = (unsigned char *) workgroup; + id.DomainLength = strlen((char *) id.Domain); + id.UserLength = 0; + id.User = NULL; + ret = pAcquireCredentialsHandleA(NULL, sec_pkg_name, SECPKG_CRED_OUTBOUND, + NULL, &id, NULL, NULL, &cred, &ttl); + ok(ret == SEC_E_OK, "AcquireCredentialsHande() returned %s\n", + getSecError(ret)); + pFreeCredentialsHandle(&cred); + + id.User = (unsigned char*) test_user; + id.UserLength = strlen((char *) id.User); + id.Password = NULL; + id.PasswordLength = 0; + ret = pAcquireCredentialsHandleA(NULL, sec_pkg_name, SECPKG_CRED_OUTBOUND, + NULL, &id, NULL, NULL, &cred, &ttl); + ok(ret == SEC_E_OK, "AcquireCredentialsHande() returned %s\n", + getSecError(ret)); + pFreeCredentialsHandle(&cred); +} + START_TEST(ntlm) { InitFunctionPtrs(); @@ -1125,6 +1193,7 @@ START_TEST(ntlm) pInitializeSecurityContextA && pCompleteAuthToken && pQuerySecurityPackageInfoA) { + testAcquireCredentialsHandle(); testInitializeSecurityContextFlags(); if(pAcceptSecurityContext) {

1 0

Michael Stefaniuc : snmpapi: Fix printf format warnings.
by Alexandre Julliard 06 Mar '07

06 Mar '07

Module: wine Branch: master Commit: 684d72f25726041c7004621531e46a5ae2b01144 URL: http://source.winehq.org/git/wine.git/?a=commit;h=684d72f25726041c700462153… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 6 15:34:19 2007 +0100 snmpapi: Fix printf format warnings. --- dlls/snmpapi/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/snmpapi/main.c b/dlls/snmpapi/main.c index 11a7b31..34073c3 100644 --- a/dlls/snmpapi/main.c +++ b/dlls/snmpapi/main.c @@ -564,7 +564,7 @@ VOID WINAPI SnmpUtilPrintAsnAny(AsnAny *any) case ASN_TIMETICKS: TRACE("Timeticks %u\n", any->asnValue.ticks); return; case ASN_COUNTER64: { - TRACE("Counter64 %lx%08lx\n", (DWORD)(any->asnValue.counter64.QuadPart>>32),(DWORD)any->asnValue.counter64.QuadPart); + TRACE("Counter64 %x%08x\n", (DWORD)(any->asnValue.counter64.QuadPart>>32),(DWORD)any->asnValue.counter64.QuadPart); return; } case ASN_OCTETSTRING:

1 0

Paul Vriens : winspool.drv/tests: Remove tempfile after running the tests.
by Alexandre Julliard 06 Mar '07

06 Mar '07

Module: wine Branch: master Commit: c23bf488b32fa03df7446ddd0027934425e0828e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c23bf488b32fa03df7446ddd0… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Mar 6 18:40:26 2007 +0100 winspool.drv/tests: Remove tempfile after running the tests. --- dlls/winspool.drv/tests/info.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index e8b50bf..ebfed4b 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2020,4 +2020,7 @@ START_TEST(info) test_SetDefaultPrinter(); test_XcvDataW_MonitorUI(); test_XcvDataW_PortIsValid(); + + /* Cleanup our temporary file */ + DeleteFileA(tempfileA); }

1 0

Paul Vriens : localspl/tests: Remove tempfile after running the tests.
by Alexandre Julliard 06 Mar '07

06 Mar '07

Module: wine Branch: master Commit: 0646dfa58fe05b54e8370c8d4af7df464dc8407f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0646dfa58fe05b54e8370c8d4… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Mar 6 18:47:28 2007 +0100 localspl/tests: Remove tempfile after running the tests. --- dlls/localspl/tests/localmon.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index 7dd808a..4361e71 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -1043,4 +1043,7 @@ START_TEST(localmon) test_XcvDataPort_MonitorUI(); test_XcvDataPort_PortIsValid(); test_XcvOpenPort(); + + /* Cleanup our temporary file */ + DeleteFileW(tempfileW); }

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 06 Mar '07

06 Mar '07

Module: wine Branch: master Commit: 7b0cde8f84088e925d037ce2d7a8d7aad9a7fb94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b0cde8f84088e925d037ce2d… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 6 14:26:24 2007 +0100 Assorted spelling fixes. --- dlls/mshtml/tests/htmldoc.c | 2 +- dlls/msi/tests/install.c | 2 +- dlls/wineps.drv/psdrv.h | 2 +- programs/cmd/batch.c | 8 ++++---- programs/cmd/builtins.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 98c3eae..3872062 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -207,7 +207,7 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, ok(bindinfo.dwOptionsFlags == 0, "bindinfo.dwOptionsFlags=%d\n", bindinfo.dwOptionsFlags); /* TODO: test dwCodePage */ /* TODO: test securityAttributes */ - ok(IsEqualGUID(&IID_NULL, &bindinfo.iid), "unexepected bindinfo.iid\n"); + ok(IsEqualGUID(&IID_NULL, &bindinfo.iid), "unexpected bindinfo.iid\n"); ok(bindinfo.pUnk == NULL, "bindinfo.pUnk=%p\n", bindinfo.pUnk); ok(bindinfo.dwReserved == 0, "bindinfo.dwReserved=%d\n", bindinfo.dwReserved); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 08c7e2e..6e42696 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1195,7 +1195,7 @@ static void test_readonlyfile(void) lstrcat(path, "\\maximus"); file = CreateFile(path, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_NEW, FILE_ATTRIBUTE_READONLY, NULL); - if (file == INVALID_HANDLE_VALUE) printf("didnt work here: %d\n", GetLastError()); + if (file == INVALID_HANDLE_VALUE) printf("didn't work here: %d\n", GetLastError()); WriteFile(file, "readonlyfile", 20, &size, NULL); CloseHandle(file); diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 7794a89..e6b6edc 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -191,7 +191,7 @@ typedef struct _tagDUPLEX { struct _tagDUPLEX *next; } DUPLEX; -/* Many MacOSX based ppd files don't include a *ColorDevice line, so +/* Many Mac OS X based ppd files don't include a *ColorDevice line, so we use a tristate here rather than a boolean. Code that cares is expected to treat these as if they were colour. */ typedef enum { diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index cb09d47..4624ea9 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -495,7 +495,7 @@ void WCMD_HandleTildaModifiers(char **start, char *forVariable) { /* 4. Handle 'z' : File length */ if (exists && memchr(firstModifier, 'z', modifierLen) != NULL) { - /* FIXME: Output full 64 bit size (sprintf not support I64 here) */ + /* FIXME: Output full 64 bit size (sprintf does not support I64 here) */ ULONG/*64*/ fullsize = /*(fileInfo.nFileSizeHigh << 32) +*/ fileInfo.nFileSizeLow; @@ -505,14 +505,14 @@ void WCMD_HandleTildaModifiers(char **start, char *forVariable) { strcat(finaloutput, thisoutput); } - /* 4. Handle 's' : Use short paths (File doesnt have to exist) */ + /* 4. Handle 's' : Use short paths (File doesn't have to exist) */ if (memchr(firstModifier, 's', modifierLen) != NULL) { if (finaloutput[0] != 0x00) strcat(finaloutput, " "); - /* Dont flag as doneModifier - %~s on its own is processed later */ + /* Don't flag as doneModifier - %~s on its own is processed later */ GetShortPathName(outputparam, outputparam, sizeof(outputparam)); } - /* 5. Handle 'f' : Fully qualified path (File doesnt have to exist) */ + /* 5. Handle 'f' : Fully qualified path (File doesn't have to exist) */ /* Note this overrides d,p,n,x */ if (memchr(firstModifier, 'f', modifierLen) != NULL) { doneModifier = TRUE; diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 6f451f8..85f7980 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1504,7 +1504,7 @@ void WCMD_assoc (char *command) { return; } - /* If no paramaters then list all associations */ + /* If no parameters then list all associations */ if (*command == 0x00) { int index = 0;

1 0

Dmitry Timoshkov : gdi32: Add an extensive EnumFontFamilies test, fix some failures when running under Wine.
by Alexandre Julliard 06 Mar '07

06 Mar '07

Module: wine Branch: master Commit: 7f16f21cf709556d920382d49b855ab0e4ce4498 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f16f21cf709556d920382d49… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Mar 6 19:14:25 2007 +0800 gdi32: Add an extensive EnumFontFamilies test, fix some failures when running under Wine. --- dlls/gdi32/font.c | 18 +++- dlls/gdi32/tests/font.c | 273 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 286 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7f16f21cf709556d92038…

1 0

Rob Shearman : secur32: NTLM - don't copy more data from User, Domain and Password
by Alexandre Julliard 06 Mar '07

06 Mar '07

Module: wine Branch: master Commit: 3012038e73d2fdd6f9938fd68291a78b057f08cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3012038e73d2fdd6f9938fd68… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Mar 6 13:30:38 2007 +0000 secur32: NTLM - don't copy more data from User, Domain and Password pointers in the SEC_WINNT_AUTH_IDENTITY structure than the corresponding Length fields say the pointers hold. --- dlls/secur32/ntlm.c | 27 ++++++++++++++++----------- 1 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index af5b3f0..4f21917 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -172,11 +172,15 @@ static SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW( /* Get username and domain from pAuthData */ username = HeapAlloc(GetProcessHeap(), 0, (auth_data->UserLength + 1) * sizeof(SEC_WCHAR)); - lstrcpyW(username, auth_data->User); + memcpy(username, auth_data->User, + auth_data->UserLength * sizeof(SEC_WCHAR)); + username[auth_data->UserLength] = '\0'; domain = HeapAlloc(GetProcessHeap(), 0, (auth_data->DomainLength + 1) * sizeof(SEC_WCHAR)); - lstrcpyW(domain, auth_data->Domain); + memcpy(domain, auth_data->Domain, + auth_data->DomainLength * sizeof(SEC_WCHAR)); + domain[auth_data->DomainLength] = '\0'; } TRACE("Username is %s\n", debugstr_w(username)); unixcp_size = WideCharToMultiByte(CP_UNIXCP, WC_NO_BEST_FIT_CHARS, @@ -222,15 +226,16 @@ static SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW( { helper->pwlen = WideCharToMultiByte(CP_UNIXCP, WC_NO_BEST_FIT_CHARS, auth_data->Password, - auth_data->PasswordLength+1, NULL, 0, NULL, + auth_data->PasswordLength, NULL, 0, NULL, NULL) + 1; helper->password = HeapAlloc(GetProcessHeap(), 0, helper->pwlen); WideCharToMultiByte(CP_UNIXCP, WC_NO_BEST_FIT_CHARS, - auth_data->Password, auth_data->PasswordLength+1, + auth_data->Password, auth_data->PasswordLength, helper->password, helper->pwlen, NULL, NULL); + helper->password[helper->pwlen - 1] = '\0'; } } @@ -304,11 +309,11 @@ static SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleA( if(identity->UserLength != 0) { user_sizeW = MultiByteToWideChar(CP_ACP, 0, - (LPCSTR)identity->User, identity->UserLength+1, NULL, 0); + (LPCSTR)identity->User, identity->UserLength, NULL, 0); user = HeapAlloc(GetProcessHeap(), 0, user_sizeW * sizeof(SEC_WCHAR)); MultiByteToWideChar(CP_ACP, 0, (LPCSTR)identity->User, - identity->UserLength+1, user, user_sizeW); + identity->UserLength, user, user_sizeW); } else { @@ -318,11 +323,11 @@ static SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleA( if(identity->DomainLength != 0) { domain_sizeW = MultiByteToWideChar(CP_ACP, 0, - (LPCSTR)identity->Domain, identity->DomainLength+1, NULL, 0); + (LPCSTR)identity->Domain, identity->DomainLength, NULL, 0); domain = HeapAlloc(GetProcessHeap(), 0, domain_sizeW * sizeof(SEC_WCHAR)); MultiByteToWideChar(CP_ACP, 0, (LPCSTR)identity->Domain, - identity->DomainLength+1, domain, domain_sizeW); + identity->DomainLength, domain, domain_sizeW); } else { @@ -502,11 +507,11 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( { lstrcpynA(buffer, "PW ", max_len-1); if((ret = encodeBase64((unsigned char*)helper->password, - helper->pwlen-2, buffer+3, + helper->pwlen-1, buffer+3, max_len-3, &buffer_len)) != SEC_E_OK) { TRACE("Deleting password!\n"); - memset(helper->password, 0, helper->pwlen-2); + memset(helper->password, 0, helper->pwlen-1); HeapFree(GetProcessHeap(), 0, helper->password); goto isc_end; } @@ -734,7 +739,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( { TRACE("Deleting password!\n"); if(helper->password) - memset(helper->password, 0, helper->pwlen-2); + memset(helper->password, 0, helper->pwlen-1); HeapFree(GetProcessHeap(), 0, helper->password); } isc_end:

1 0

Rob Shearman : secur32: NTLM - don' t bother nul terminating the password string as nothing relies on it being nul terminated .
by Alexandre Julliard 06 Mar '07

06 Mar '07

Module: wine Branch: master Commit: d9229bd1c5df8ed471682f45bc2b57e2e268639d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9229bd1c5df8ed471682f45b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Mar 6 13:31:33 2007 +0000 secur32: NTLM - don't bother nul terminating the password string as nothing relies on it being nul terminated. --- dlls/secur32/ntlm.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 4f21917..a75b4b8 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -227,7 +227,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW( helper->pwlen = WideCharToMultiByte(CP_UNIXCP, WC_NO_BEST_FIT_CHARS, auth_data->Password, auth_data->PasswordLength, NULL, 0, NULL, - NULL) + 1; + NULL); helper->password = HeapAlloc(GetProcessHeap(), 0, helper->pwlen); @@ -235,7 +235,6 @@ static SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW( WideCharToMultiByte(CP_UNIXCP, WC_NO_BEST_FIT_CHARS, auth_data->Password, auth_data->PasswordLength, helper->password, helper->pwlen, NULL, NULL); - helper->password[helper->pwlen - 1] = '\0'; } } @@ -507,11 +506,11 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( { lstrcpynA(buffer, "PW ", max_len-1); if((ret = encodeBase64((unsigned char*)helper->password, - helper->pwlen-1, buffer+3, + helper->pwlen, buffer+3, max_len-3, &buffer_len)) != SEC_E_OK) { TRACE("Deleting password!\n"); - memset(helper->password, 0, helper->pwlen-1); + memset(helper->password, 0, helper->pwlen); HeapFree(GetProcessHeap(), 0, helper->password); goto isc_end; } @@ -695,7 +694,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( helper->pwlen, unicode_password, passwd_lenW); SECUR32_CreateNTLMv1SessionKey((PBYTE)unicode_password, - lstrlenW(unicode_password) * sizeof(SEC_WCHAR), helper->session_key); + passwd_lenW * sizeof(SEC_WCHAR), helper->session_key); HeapFree(GetProcessHeap(), 0, unicode_password); } @@ -739,7 +738,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( { TRACE("Deleting password!\n"); if(helper->password) - memset(helper->password, 0, helper->pwlen-1); + memset(helper->password, 0, helper->pwlen); HeapFree(GetProcessHeap(), 0, helper->password); } isc_end:

1 0