September 2006 - Wine-Commits

Francois Gouget : ole32: Fix spelling of a couple of local variables.
by Alexandre Julliard Sept. 8, 2006

Sept. 8, 2006

Module: wine Branch: master Commit: 19be7545e5f326287b3656694b02607b421d63af URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=19be7545e5f326287b36566… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 7 20:00:30 2006 +0200 ole32: Fix spelling of a couple of local variables. --- dlls/ole32/stg_stream.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index f866491..48ae9f8 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -187,7 +187,7 @@ static void StgStreamImpl_OpenBlockChain StgStreamImpl* This) { StgProperty curProperty; - BOOL readSucessful; + BOOL readSuccessful; /* * Make sure no old object is left over. @@ -207,11 +207,11 @@ static void StgStreamImpl_OpenBlockChain /* * Read the information from the property. */ - readSucessful = StorageImpl_ReadProperty(This->parentStorage->ancestorStorage, + readSuccessful = StorageImpl_ReadProperty(This->parentStorage->ancestorStorage, This->ownerProperty, &curProperty); - if (readSucessful) + if (readSuccessful) { This->streamSize = curProperty.size; @@ -803,7 +803,7 @@ static HRESULT WINAPI StgStreamImpl_Stat StgStreamImpl* const This=(StgStreamImpl*)iface; StgProperty curProperty; - BOOL readSucessful; + BOOL readSuccessful; TRACE("%p %p %ld\n", This, pstatstg, grfStatFlag); @@ -817,11 +817,11 @@ static HRESULT WINAPI StgStreamImpl_Stat /* * Read the information from the property. */ - readSucessful = StorageImpl_ReadProperty(This->parentStorage->ancestorStorage, + readSuccessful = StorageImpl_ReadProperty(This->parentStorage->ancestorStorage, This->ownerProperty, &curProperty); - if (readSucessful) + if (readSuccessful) { StorageUtl_CopyPropertyToSTATSTG(pstatstg, &curProperty,

1 0

Francois Gouget : include: Fix the name of a MODEMSETTINGS field.
by Alexandre Julliard Sept. 8, 2006

Sept. 8, 2006

Module: wine Branch: master Commit: 357f579eb0adeb6b9248ff33ef73e1212d39be98 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=357f579eb0adeb6b9248ff3… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 7 19:55:34 2006 +0200 include: Fix the name of a MODEMSETTINGS field. --- include/mcx.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/mcx.h b/include/mcx.h index ab2389e..a03e5f3 100644 --- a/include/mcx.h +++ b/include/mcx.h @@ -51,7 +51,7 @@ typedef struct tagMODEMSETTINGS { DWORD dwInactivityTimeout; DWORD dwSpeakerVolume; DWORD dwSpeakerMode; - DWORD dwPreferedModemOptions; + DWORD dwPreferredModemOptions; DWORD dwNegotiatedModemOptions; DWORD dwNegotiatedDCERate; BYTE abVariablePortion[1];

1 0

Francois Gouget : oleaut32: Fix spelling of VARIANT_NUMBER_CHARS' s separator fields.
by Alexandre Julliard Sept. 8, 2006

Sept. 8, 2006

Module: wine Branch: master Commit: 3eda8da2bd7b4bc0b850456ec4a9b646e6cbeab7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3eda8da2bd7b4bc0b850456… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 7 20:00:02 2006 +0200 oleaut32: Fix spelling of VARIANT_NUMBER_CHARS's separator fields. --- dlls/oleaut32/variant.c | 10 +++++----- dlls/oleaut32/variant.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 05fb764..60bb807 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1475,9 +1475,9 @@ void VARIANT_GetLocalisedNumberChars(VAR GET_NUMBER_TEXT(LOCALE_SNEGATIVESIGN, cNegativeSymbol); GET_NUMBER_TEXT(LOCALE_SPOSITIVESIGN, cPositiveSymbol); GET_NUMBER_TEXT(LOCALE_SDECIMAL, cDecimalPoint); - GET_NUMBER_TEXT(LOCALE_STHOUSAND, cDigitSeperator); + GET_NUMBER_TEXT(LOCALE_STHOUSAND, cDigitSeparator); GET_NUMBER_TEXT(LOCALE_SMONDECIMALSEP, cCurrencyDecimalPoint); - GET_NUMBER_TEXT(LOCALE_SMONTHOUSANDSEP, cCurrencyDigitSeperator); + GET_NUMBER_TEXT(LOCALE_SMONTHOUSANDSEP, cCurrencyDigitSeparator); /* Local currency symbols are often 2 characters */ lpChars->cCurrencyLocal2 = '\0'; @@ -1597,7 +1597,7 @@ HRESULT WINAPI VarParseNumFromStr(OLECHA lpszStr++; /* Only accept currency characters */ chars.cDecimalPoint = chars.cCurrencyDecimalPoint; - chars.cDigitSeperator = chars.cCurrencyDigitSeperator; + chars.cDigitSeparator = chars.cCurrencyDigitSeparator; } else if (pNumprs->dwInFlags & NUMPRS_PARENS && *lpszStr == '(' && !(pNumprs->dwOutFlags & NUMPRS_PARENS)) @@ -1614,7 +1614,7 @@ HRESULT WINAPI VarParseNumFromStr(OLECHA { /* Only accept non-currency characters */ chars.cCurrencyDecimalPoint = chars.cDecimalPoint; - chars.cCurrencyDigitSeperator = chars.cDigitSeperator; + chars.cCurrencyDigitSeparator = chars.cDigitSeparator; } if ((*lpszStr == '&' && (*(lpszStr+1) == 'H' || *(lpszStr+1) == 'h')) && @@ -1706,7 +1706,7 @@ HRESULT WINAPI VarParseNumFromStr(OLECHA cchUsed++; } } - else if (*lpszStr == chars.cDigitSeperator && pNumprs->dwInFlags & NUMPRS_THOUSANDS) + else if (*lpszStr == chars.cDigitSeparator && pNumprs->dwInFlags & NUMPRS_THOUSANDS) { pNumprs->dwOutFlags |= NUMPRS_THOUSANDS; cchUsed++; diff --git a/dlls/oleaut32/variant.h b/dlls/oleaut32/variant.h index ec7fb76..6015df5 100644 --- a/dlls/oleaut32/variant.h +++ b/dlls/oleaut32/variant.h @@ -117,11 +117,11 @@ typedef struct tagVARIANT_NUMBER_CHARS WCHAR cNegativeSymbol; WCHAR cPositiveSymbol; WCHAR cDecimalPoint; - WCHAR cDigitSeperator; + WCHAR cDigitSeparator; WCHAR cCurrencyLocal; WCHAR cCurrencyLocal2; WCHAR cCurrencyDecimalPoint; - WCHAR cCurrencyDigitSeperator; + WCHAR cCurrencyDigitSeparator; } VARIANT_NUMBER_CHARS; void VARIANT_GetLocalisedNumberChars(VARIANT_NUMBER_CHARS*,LCID,DWORD);

1 0

Francois Gouget : include: Document some Microsoft spelling mistakes so we know they are not to be fixed .
by Alexandre Julliard Sept. 8, 2006

Sept. 8, 2006

Module: wine Branch: master Commit: 735a51046f7d25485147e50cbec0e8daa0122353 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=735a51046f7d25485147e50… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 7 19:59:35 2006 +0200 include: Document some Microsoft spelling mistakes so we know they are not to be fixed. --- include/ntstatus.h | 1 + include/sddl.h | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/ntstatus.h b/include/ntstatus.h index 97527a0..8d2ceae 100644 --- a/include/ntstatus.h +++ b/include/ntstatus.h @@ -861,6 +861,7 @@ #define STATUS_DEVICE_ENUMERATION_ERROR #define STATUS_WAIT_FOR_OPLOCK ((NTSTATUS) 0x00000367) #define STATUS_MOUNT_POINT_NOT_RESOLVED ((NTSTATUS) 0xC0000368) #define STATUS_INVALID_DEVICE_OBJECT_PARAMETER ((NTSTATUS) 0xC0000369) +/* STATUS_MCA_OCCURED is not a typo, as per Microsoft's headers */ #define STATUS_MCA_OCCURED ((NTSTATUS) 0xC000036A) #define STATUS_DRIVER_BLOCKED_CRITICAL ((NTSTATUS) 0xC000036B) #define STATUS_DRIVER_BLOCKED ((NTSTATUS) 0xC000036C) diff --git a/include/sddl.h b/include/sddl.h index 3218323..5c586a3 100644 --- a/include/sddl.h +++ b/include/sddl.h @@ -41,6 +41,7 @@ #define SDDL_SACL /* * SDDL Separators - character version */ +/* SDDL_SEPERATORC is not a typo, as per Microsoft's headers */ #define SDDL_SEPERATORC TEXT(";") #define SDDL_DELIMINATORC TEXT(":") #define SDDL_ACE_BEGINC TEXT("(") @@ -49,6 +50,7 @@ #define SDDL_ACE_ENDC /* * SDDL Separators - string version */ +/* SDDL_SEPERATOR is not a typo, as per Microsoft's headers */ #define SDDL_SEPERATOR TEXT(";") #define SDDL_DELIMINATOR TEXT(":") #define SDDL_ACE_BEGIN TEXT("(")

1 0

Francois Gouget : shell32: Fix name of a constant.
by Alexandre Julliard Sept. 8, 2006

Sept. 8, 2006

Module: wine Branch: master Commit: 468f00edddafdec2b42ddc8c182c378c26ddd0df URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=468f00edddafdec2b42ddc8… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 7 19:58:08 2006 +0200 shell32: Fix name of a constant. --- include/shlobj.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/shlobj.h b/include/shlobj.h index 20182ed..ee8e58c 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -897,7 +897,7 @@ typedef enum { SLDF_UNICODE = 0x00000080, SLDF_FORCE_NO_LINKINFO = 0x00000100, SLDF_HAS_EXP_SZ = 0x00000200, - SLDF_RUN_IN_SEPERATE = 0x00000400, + SLDF_RUN_IN_SEPARATE = 0x00000400, SLDF_HAS_LOGO3ID = 0x00000800, SLDF_HAS_DARWINID = 0x00001000, SLDF_RUNAS_USER = 0x00002000,

1 0

Francois Gouget : imagehlp: Fix the name of the ADDRESS_MODE enum.
by Alexandre Julliard Sept. 8, 2006

Sept. 8, 2006

Module: wine Branch: master Commit: 766611b7a07ab899662459a88f9a6f8c6186cc95 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=766611b7a07ab899662459a… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 7 19:54:54 2006 +0200 imagehlp: Fix the name of the ADDRESS_MODE enum. --- include/imagehlp.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/imagehlp.h b/include/imagehlp.h index 26f6628..e37d921 100644 --- a/include/imagehlp.h +++ b/include/imagehlp.h @@ -90,7 +90,7 @@ #define CHECKSUM_MAP_FAILURE 2 #define CHECKSUM_MAPVIEW_FAILURE 3 #define CHECKSUM_UNICODE_FAILURE 4 -typedef enum _ADRESS_MODE { +typedef enum _ADDRESS_MODE { AddrMode1616, AddrMode1632, AddrModeReal,

1 0

Andrew Talbot : advpack: Cast-qual warnings fix.
by Alexandre Julliard Sept. 8, 2006

Sept. 8, 2006

Module: wine Branch: master Commit: 570aad50d25e2df0385a6b1249bd8ab79820e390 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=570aad50d25e2df0385a6b1… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Sep 7 22:25:14 2006 +0100 advpack: Cast-qual warnings fix. --- dlls/advpack/files.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c index 0e3637e..1d02443 100644 --- a/dlls/advpack/files.c +++ b/dlls/advpack/files.c @@ -548,8 +548,8 @@ static HRESULT (WINAPI *pExtract)(EXTRAC static LPSTR convert_file_list(LPCSTR FileList, DWORD *dwNumFiles) { DWORD dwLen; - char *first = (char *)FileList; - char *last = (char *)FileList + strlen(FileList) - 1; + const char *first = FileList; + const char *last = FileList + strlen(FileList) - 1; LPSTR szConvertedList, temp; /* any number of these chars before the list is OK */

1 0

Paul Vriens : crypt32: Add some documentation.
by Alexandre Julliard Sept. 8, 2006

Sept. 8, 2006

Module: wine Branch: master Commit: 9592a8886081375e44615370379e5fa9282272a9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9592a8886081375e4461537… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Thu Sep 7 15:07:40 2006 +0200 crypt32: Add some documentation. --- dlls/crypt32/oid.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index a993478..c88d85f 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -413,6 +413,26 @@ BOOL WINAPI CryptGetDefaultOIDFunctionAd return FALSE; } +/*********************************************************************** + * CryptRegisterOIDFunction (CRYPT32.@) + * + * Register the DLL and the functions it uses to cover the combination + * of encoding type, functionname and OID. + * + * PARAMS + * dwEncodingType [I] Encoding type to be used. + * pszFuncName [I] Name of the function to be registered. + * pszOID [I] OID of the function (numeric or string). + * pwszDll [I] The DLL that is to be registered. + * pszOverrideFuncName [I] Name of the function in the DLL. + * + * RETURNS + * Success: TRUE. + * Failure: FALSE. (Look at GetLastError()). + * + * NOTES + * Registry errors are always reported via SetLastError(). + */ BOOL WINAPI CryptRegisterOIDFunction(DWORD dwEncodingType, LPCSTR pszFuncName, LPCSTR pszOID, LPCWSTR pwszDll, LPCSTR pszOverrideFuncName) {

1 0

Paul Vriens : crypt32: Don' t crash when tracing is on and a numeric identifier is passed.
by Alexandre Julliard Sept. 8, 2006

Sept. 8, 2006

Module: wine Branch: master Commit: 822e6af604cf0bbdc1bd00bec707823648c7f6f7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=822e6af604cf0bbdc1bd00b… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Thu Sep 7 15:08:14 2006 +0200 crypt32: Don't crash when tracing is on and a numeric identifier is passed. --- dlls/crypt32/oid.c | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index c88d85f..ca4d40f 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -440,8 +440,8 @@ BOOL WINAPI CryptRegisterOIDFunction(DWO HKEY hKey; LPSTR szKey; - TRACE("(%lx, %s, %s, %s, %s)\n", dwEncodingType, pszFuncName, pszOID, - debugstr_w(pwszDll), pszOverrideFuncName); + TRACE("(%lx, %s, %s, %s, %s)\n", dwEncodingType, pszFuncName, + debugstr_a(pszOID), debugstr_w(pwszDll), pszOverrideFuncName); /* This only registers functions for encoding certs, not messages */ if (!GET_CERT_ENCODING_TYPE(dwEncodingType)) @@ -470,25 +470,28 @@ BOOL WINAPI CryptRegisterOIDFunction(DWO r = RegCreateKeyA(HKEY_LOCAL_MACHINE, szKey, &hKey); CryptMemFree(szKey); - /* Testing on native shows that registry errors are reported */ - if(r != ERROR_SUCCESS) - { - SetLastError(r); - return FALSE; - } + if (r != ERROR_SUCCESS) goto error_close_key; /* write the values */ if (pszOverrideFuncName) { r = RegSetValueExA(hKey, "FuncName", 0, REG_SZ, (const BYTE*)pszOverrideFuncName, lstrlenA(pszOverrideFuncName) + 1); - if (r != ERROR_SUCCESS) SetLastError(r); + if (r != ERROR_SUCCESS) goto error_close_key; } r = RegSetValueExW(hKey, DllW, 0, REG_SZ, (const BYTE*) pwszDll, (lstrlenW(pwszDll) + 1) * sizeof (WCHAR)); - if (r != ERROR_SUCCESS) SetLastError(r); + +error_close_key: RegCloseKey(hKey); + + if (r != ERROR_SUCCESS) + { + SetLastError(r); + return FALSE; + } + return TRUE; }

1 0

Kai Blin : secur32: Fix generation of the session key.
by Alexandre Julliard Sept. 8, 2006

Sept. 8, 2006

Module: wine Branch: master Commit: 85655db106c125c6541c63945a1108da4588ba3c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=85655db106c125c6541c639… Author: Kai Blin <kai.blin(a)gmail.com> Date: Thu Sep 7 16:17:06 2006 +0200 secur32: Fix generation of the session key. --- dlls/secur32/ntlm.c | 19 ++++++++++++++++++- dlls/secur32/secur32_priv.h | 2 +- dlls/secur32/tests/ntlm.c | 5 ++--- dlls/secur32/util.c | 4 ++-- 4 files changed, 23 insertions(+), 7 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index ce8da6f..a3f584f 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -648,7 +648,24 @@ static SECURITY_STATUS SEC_ENTRY ntlm_In helper->session_key = HeapAlloc(GetProcessHeap(), 0, 16); /*Generate the dummy session key = MD4(MD4(password))*/ if(helper->password) - SECUR32_CreateNTLMv1SessionKey(helper->password, helper->session_key); + { + SEC_WCHAR *unicode_password; + int passwd_lenW; + + TRACE("Converting password to unicode.\n"); + passwd_lenW = MultiByteToWideChar(CP_ACP, 0, + (LPCSTR)helper->password, helper->pwlen, + NULL, 0); + unicode_password = HeapAlloc(GetProcessHeap(), 0, + passwd_lenW * sizeof(SEC_WCHAR)); + MultiByteToWideChar(CP_ACP, 0, (LPCSTR)helper->password, + helper->pwlen, unicode_password, passwd_lenW); + + SECUR32_CreateNTLMv1SessionKey((PBYTE)unicode_password, + lstrlenW(unicode_password) * sizeof(SEC_WCHAR), helper->session_key); + + HeapFree(GetProcessHeap(), 0, unicode_password); + } else memset(helper->session_key, 0, 16); } diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 007a14b..1ad62c5 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -137,7 +137,7 @@ SECURITY_STATUS decodeBase64(char *in_bu /* Functions from util.c */ ULONG ComputeCrc32(const BYTE *pData, INT iLen); -SECURITY_STATUS SECUR32_CreateNTLMv1SessionKey(const char* password, PBYTE session_key); +SECURITY_STATUS SECUR32_CreateNTLMv1SessionKey(PBYTE password, int len, PBYTE session_key); arc4_info *SECUR32_arc4Alloc(void); void SECUR32_arc4Init(arc4_info *a4i, const BYTE *key, unsigned int keyLen); void SECUR32_arc4Process(arc4_info *a4i, BYTE *inoutString, unsigned int length); diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index 9128620..1b13948 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -807,12 +807,11 @@ static void testSignSeal() 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)); - todo_wine{ + ok(!memcmp(crypt->pBuffers[0].pvBuffer, crypt_trailer_client, crypt->pBuffers[0].cbBuffer), "Crypt trailer not as expected.\n"); ok(!memcmp(crypt->pBuffers[1].pvBuffer, crypt_message_client, crypt->pBuffers[1].cbBuffer), "Crypt message not as expected.\n"); - } data[0].cbBuffer = sizeof(crypt_trailer_server); data[1].cbBuffer = sizeof(crypt_message_server); @@ -823,10 +822,10 @@ static void testSignSeal() todo_wine { ok(sec_status == SEC_E_OK, "DecryptMessage returned %s, not SEC_E_OK.\n", getSecError(sec_status)); + } ok(!memcmp(crypt->pBuffers[1].pvBuffer, message_binary, crypt->pBuffers[1].cbBuffer), "Failed to decrypt message correctly.\n"); - } end: cleanupBuffers(&client); diff --git a/dlls/secur32/util.c b/dlls/secur32/util.c index e762c8c..4462ae9 100644 --- a/dlls/secur32/util.c +++ b/dlls/secur32/util.c @@ -106,7 +106,7 @@ ULONG ComputeCrc32(const BYTE *pData, IN return ~crc; } -SECURITY_STATUS SECUR32_CreateNTLMv1SessionKey(const char* password, PBYTE session_key) +SECURITY_STATUS SECUR32_CreateNTLMv1SessionKey(PBYTE password, int len, PBYTE session_key) { MD4_CTX ctx; BYTE ntlm_hash[16]; @@ -114,7 +114,7 @@ SECURITY_STATUS SECUR32_CreateNTLMv1Sess TRACE("(%p, %p)\n", password, session_key); MD4Init(&ctx); - MD4Update(&ctx, (const unsigned char*) password, lstrlenA(password)); + MD4Update(&ctx, (const unsigned char*) password, len); MD4Final(&ctx); memcpy(ntlm_hash, ctx.digest, 0x10);

1 0