July 2017 - Wine-Commits - list.winehq.org

Hugh McMaster : regedit/tests: Check if regedit.exe has elevated privileges before starting some tests.
by Alexandre Julliard July 6, 2017

July 6, 2017

Module: wine Branch: master Commit: 499733f400d0400577f7c4e4aba3fcbdf363fe00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=499733f400d0400577f7c4e4a… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 6 11:17:54 2017 +0000 regedit/tests: Check if regedit.exe has elevated privileges before starting some tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 2b33bc9..dad482e 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -513,11 +513,19 @@ static void test_basic_import_31(void) ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, "RegDeleteKeyA failed: %d\n", lr); + /* Check if regedit.exe is running with elevated privileges */ + lr = RegCreateKeyExA(HKEY_CLASSES_ROOT, KEY_BASE, 0, NULL, REG_OPTION_NON_VOLATILE, + KEY_READ, NULL, &hkey, NULL); + if (lr == ERROR_ACCESS_DENIED) + { + win_skip("regedit.exe is not running with elevated privileges; " + "skipping Windows 3.1 import tests\n"); + return; + } + /* Test simple value */ exec_import_str("REGEDIT\r\n" "HKEY_CLASSES_ROOT\\" KEY_BASE " = Value0\r\n"); - lr = RegOpenKeyExA(HKEY_CLASSES_ROOT, KEY_BASE, 0, KEY_READ, &hkey); - ok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: %d\n", lr); verify_reg(hkey, "", REG_SZ, "Value0", 7, 0); /* Test proper handling of spaces and equals signs */ @@ -1058,9 +1066,15 @@ static void test_invalid_import_31(void) HKEY hkey; LONG lr; + /* Check if regedit.exe is running with elevated privileges */ lr = RegCreateKeyExA(HKEY_CLASSES_ROOT, KEY_BASE, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_READ, NULL, &hkey, NULL); - ok(lr == ERROR_SUCCESS, "RegCreateKeyExA failed: %d\n", lr); + if (lr == ERROR_ACCESS_DENIED) + { + win_skip("regedit.exe is not running with elevated privileges; " + "skipping Windows 3.1 invalid import tests\n"); + return; + } /* Test character validity at the start of the line */ exec_import_str("REGEDIT\r\n"

1 0

Francois Gouget : msi/tests: Add a trailing linefeed to an ok() call.
by Alexandre Julliard July 6, 2017

July 6, 2017

Module: wine Branch: master Commit: e2e94d1c9327c892928bda5a347cd6b0c9ba11f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2e94d1c9327c892928bda5a3… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 6 12:24:03 2017 +0200 msi/tests: Add a trailing linefeed to an ok() call. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/package.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index a46bb20..58e932f 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -9376,7 +9376,7 @@ static void test_externalui_message(void) create_file_data("forcecodepage.idt", "\r\n\r\n1252\t_ForceCodepage\r\n"); r = MsiDatabaseImportA(hdb, CURR_DIR, "forcecodepage.idt"); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d", r); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); r = MsiOpenPackageA(NULL, &hpkg); ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r);

1 0

Francois Gouget : rpcrt4: Spelling fixes in comments.
by Alexandre Julliard July 6, 2017

July 6, 2017

Module: wine Branch: master Commit: bea5c0ce2b81722db136685a8ba9784630c4f34f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bea5c0ce2b81722db136685a8… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 6 12:22:29 2017 +0200 rpcrt4: Spelling fixes in comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_marshall.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 5414329..ee58b60 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -2947,7 +2947,7 @@ static unsigned char * ComplexMarshall(PMIDL_STUB_MESSAGE pStubMsg, { /* for some reason interface pointers aren't generated as * RPC_FC_POINTER, but instead as RPC_FC_EMBEDDED_COMPLEX, yet - * they still need the derefencing treatment that pointers are + * they still need the dereferencing treatment that pointers are * given */ if (*desc == RPC_FC_IP) m(pStubMsg, *(unsigned char **)pMemory, desc); @@ -3123,7 +3123,7 @@ static unsigned char * ComplexUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, { /* for some reason interface pointers aren't generated as * RPC_FC_POINTER, but instead as RPC_FC_EMBEDDED_COMPLEX, yet - * they still need the derefencing treatment that pointers are + * they still need the dereferencing treatment that pointers are * given */ if (*desc == RPC_FC_IP) m(pStubMsg, (unsigned char **)pMemory, desc, FALSE); @@ -3247,7 +3247,7 @@ static unsigned char * ComplexBufferSize(PMIDL_STUB_MESSAGE pStubMsg, { /* for some reason interface pointers aren't generated as * RPC_FC_POINTER, but instead as RPC_FC_EMBEDDED_COMPLEX, yet - * they still need the derefencing treatment that pointers are + * they still need the dereferencing treatment that pointers are * given */ if (*desc == RPC_FC_IP) m(pStubMsg, *(unsigned char **)pMemory, desc); @@ -3348,7 +3348,7 @@ static unsigned char * ComplexFree(PMIDL_STUB_MESSAGE pStubMsg, { /* for some reason interface pointers aren't generated as * RPC_FC_POINTER, but instead as RPC_FC_EMBEDDED_COMPLEX, yet - * they still need the derefencing treatment that pointers are + * they still need the dereferencing treatment that pointers are * given */ if (*desc == RPC_FC_IP) m(pStubMsg, *(unsigned char **)pMemory, desc);

1 0

Alex Henrie : ole32: Avoid null pointer dereferences in CoGetTreatAsClass.
by Alexandre Julliard July 6, 2017

July 6, 2017

Module: wine Branch: master Commit: 5a3b87a0fd3d643106dbc3cbd6ebef69b61401e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a3b87a0fd3d643106dbc3cbd… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jul 5 23:01:22 2017 -0600 ole32: Avoid null pointer dereferences in CoGetTreatAsClass. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 4 ++++ dlls/ole32/tests/compobj.c | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 1ce9cec..6024448 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3825,6 +3825,10 @@ HRESULT WINAPI CoGetTreatAsClass(REFCLSID clsidOld, LPCLSID clsidNew) LONG len = sizeof(szClsidNew); TRACE("(%s,%p)\n", debugstr_guid(clsidOld), clsidNew); + + if (!clsidOld || !clsidNew) + return E_INVALIDARG; + *clsidNew = *clsidOld; /* copy over old value */ res = COM_OpenKeyForCLSID(clsidOld, wszTreatAs, KEY_READ, &hkey); diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index e585a46..feb1d72 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -2176,10 +2176,18 @@ static void test_TreatAsClass(void) win_skip("CoGetTreatAsClass not present\n"); return; } + hr = pCoGetTreatAsClass(&deadbeef,&out); ok (hr == S_FALSE, "expected S_FALSE got %x\n",hr); ok (IsEqualGUID(&out,&deadbeef), "expected to get same clsid back\n"); + hr = pCoGetTreatAsClass(NULL, &out); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG got %08x\n", hr); + ok(IsEqualGUID(&out, &deadbeef), "expected no change to the clsid\n"); + + hr = pCoGetTreatAsClass(&deadbeef, NULL); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG got %08x\n", hr); + lr = RegOpenKeyExA(HKEY_CLASSES_ROOT, "CLSID", 0, KEY_READ, &clsidkey); ok(!lr, "Couldn't open CLSID key, error %d\n", lr);

1 0

Jacek Caban : rsaenh: Implement duplicate_hash_impl for bcrypt-based hashes.
by Alexandre Julliard July 6, 2017

July 6, 2017

Module: wine Branch: master Commit: 4c917e95327dff18b3598c81b486f464b581f549 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c917e95327dff18b3598c81b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 6 13:44:48 2017 +0200 rsaenh: Implement duplicate_hash_impl for bcrypt-based hashes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/implglue.c | 14 +++++++++++--- include/bcrypt.h | 1 + 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/rsaenh/implglue.c b/dlls/rsaenh/implglue.c index 4ac2767..69c7f80 100644 --- a/dlls/rsaenh/implglue.c +++ b/dlls/rsaenh/implglue.c @@ -160,9 +160,17 @@ BOOL finalize_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext, BYTE *pbHash BOOL duplicate_hash_impl(ALG_ID aiAlgid, const HASH_CONTEXT *pSrcHashContext, HASH_CONTEXT *pDestHashContext) { - *pDestHashContext = *pSrcHashContext; - - return TRUE; + switch (aiAlgid) + { + case CALG_MD2: + case CALG_MD4: + case CALG_MD5: + case CALG_SHA: + *pDestHashContext = *pSrcHashContext; + return TRUE; + default: + return !BCryptDuplicateHash(pSrcHashContext->bcrypt_hash, &pDestHashContext->bcrypt_hash, NULL, 0, 0); + } } BOOL new_key_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen) diff --git a/include/bcrypt.h b/include/bcrypt.h index 05d0691..9e193da 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -113,5 +113,6 @@ NTSTATUS WINAPI BCryptHash(BCRYPT_ALG_HANDLE, PUCHAR, ULONG, PUCHAR, ULONG, PUCH NTSTATUS WINAPI BCryptHashData(BCRYPT_HASH_HANDLE, PUCHAR, ULONG, ULONG); NTSTATUS WINAPI BCryptOpenAlgorithmProvider(BCRYPT_ALG_HANDLE *, LPCWSTR, LPCWSTR, ULONG); NTSTATUS WINAPI BCryptSetProperty(BCRYPT_HANDLE, LPCWSTR, PUCHAR, ULONG, ULONG); +NTSTATUS WINAPI BCryptDuplicateHash(BCRYPT_HASH_HANDLE, BCRYPT_HASH_HANDLE *, UCHAR *, ULONG, ULONG); #endif /* __WINE_BCRYPT_H */

1 0

Hugh McMaster : regedit/tests: Add another test for "0x" prefixes in the hex data type.
by Alexandre Julliard July 6, 2017

July 6, 2017

Module: wine Branch: master Commit: 3afa0e42c847cdf61b4b98eaeb4cf6b5418939d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3afa0e42c847cdf61b4b98eae… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 6 11:18:10 2017 +0000 regedit/tests: Add another test for "0x" prefixes in the hex data type. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index dad482e..c1dc01a 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -457,7 +457,8 @@ static void test_basic_import(void) "\"Wine13h\"=hex(ffffffff):56,61,6c,75,65,00\n" "\"Wine13i\"=hex(100000000):56,61,6c,75,65,00\n" "\"Wine13j\"=hex(0x2):56,61,6c,75,65,00\n" - "\"Wine13k\"=hex(x2):56,61,6c,75,65,00\n\n"); + "\"Wine13k\"=hex(0X2):56,61,6c,75,65,00\n" + "\"Wine13l\"=hex(x2):56,61,6c,75,65,00\n\n"); verify_reg(hkey, "Wine13a", REG_NONE, "Value", 6, 0); verify_reg(hkey, "Wine13b", 0x10, "Value", 6, 0); verify_reg(hkey, "Wine13c", 0x100, "Value", 6, 0); @@ -469,6 +470,7 @@ static void test_basic_import(void) verify_reg_nonexist(hkey, "Wine13i"); verify_reg_nonexist(hkey, "Wine13j"); verify_reg_nonexist(hkey, "Wine13k"); + verify_reg_nonexist(hkey, "Wine13l"); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"

1 0

Francois Gouget : msvcp90: Spelling fixes in comments.
by Alexandre Julliard July 6, 2017

July 6, 2017

Module: wine Branch: master Commit: d8463067c93b67874c8079d3cedec7fd7a401237 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8463067c93b67874c8079d3c… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 6 12:23:27 2017 +0200 msvcp90: Spelling fixes in comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/locale.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 8847ac2..f7a9294 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -7555,7 +7555,7 @@ DEFINE_THISCALL_WRAPPER(num_put_char_do_put_long, 32) ostreambuf_iterator_char* __thiscall num_put_char_do_put_long(const num_put *this, ostreambuf_iterator_char *ret, ostreambuf_iterator_char dest, ios_base *base, char fill, LONG v) { - char tmp[48]; /* 22(8^22>2^64)*2(separators beetwen every digit) + 3(strlen("+0x"))+1 */ + char tmp[48]; /* 22(8^22>2^64)*2(separators between every digit) + 3(strlen("+0x"))+1 */ char fmt[7]; /* strlen("%+#lld")+1 */ TRACE("(%p %p %p %d %d)\n", this, ret, base, fill, v); @@ -7597,7 +7597,7 @@ DEFINE_THISCALL_WRAPPER(num_put_char_do_put_ulong, 32) ostreambuf_iterator_char* __thiscall num_put_char_do_put_ulong(const num_put *this, ostreambuf_iterator_char *ret, ostreambuf_iterator_char dest, ios_base *base, char fill, ULONG v) { - char tmp[48]; /* 22(8^22>2^64)*2(separators beetwen every digit) + 3(strlen("+0x"))+1 */ + char tmp[48]; /* 22(8^22>2^64)*2(separators between every digit) + 3(strlen("+0x"))+1 */ char fmt[7]; /* strlen("%+#lld")+1 */ TRACE("(%p %p %p %d %d)\n", this, ret, base, fill, v); @@ -7724,7 +7724,7 @@ DEFINE_THISCALL_WRAPPER(num_put_char_do_put_ptr, 32) ostreambuf_iterator_char* __thiscall num_put_char_do_put_ptr(const num_put *this, ostreambuf_iterator_char *ret, ostreambuf_iterator_char dest, ios_base *base, char fill, const void *v) { - char tmp[17]; /* 8(16^8==2^64)*2(separators beetwen every digit) + 1 */ + char tmp[17]; /* 8(16^8==2^64)*2(separators between every digit) + 1 */ TRACE("(%p %p %p %d %p)\n", this, ret, base, fill, v); @@ -7764,7 +7764,7 @@ DEFINE_THISCALL_WRAPPER(num_put_char_do_put_int64, 36) ostreambuf_iterator_char* __thiscall num_put_char_do_put_int64(const num_put *this, ostreambuf_iterator_char *ret, ostreambuf_iterator_char dest, ios_base *base, char fill, __int64 v) { - char tmp[48]; /* 22(8^22>2^64)*2(separators beetwen every digit) + 3(strlen("+0x"))+1 */ + char tmp[48]; /* 22(8^22>2^64)*2(separators between every digit) + 3(strlen("+0x"))+1 */ char fmt[7]; /* strlen("%+#lld")+1 */ TRACE("(%p %p %p %d)\n", this, ret, base, fill); @@ -7806,7 +7806,7 @@ DEFINE_THISCALL_WRAPPER(num_put_char_do_put_uint64, 36) ostreambuf_iterator_char* __thiscall num_put_char_do_put_uint64(const num_put *this, ostreambuf_iterator_char *ret, ostreambuf_iterator_char dest, ios_base *base, char fill, unsigned __int64 v) { - char tmp[48]; /* 22(8^22>2^64)*2(separators beetwen every digit) + 3(strlen("+0x"))+1 */ + char tmp[48]; /* 22(8^22>2^64)*2(separators between every digit) + 3(strlen("+0x"))+1 */ char fmt[7]; /* strlen("%+#lld")+1 */ TRACE("(%p %p %p %d)\n", this, ret, base, fill); @@ -8470,7 +8470,7 @@ DEFINE_THISCALL_WRAPPER(num_put_wchar_do_put_long, 32) ostreambuf_iterator_wchar* __thiscall num_put_wchar_do_put_long(const num_put *this, ostreambuf_iterator_wchar *ret, ostreambuf_iterator_wchar dest, ios_base *base, wchar_t fill, LONG v) { - char tmp[48]; /* 22(8^22>2^64)*2(separators beetwen every digit) + 3(strlen("+0x"))+1 */ + char tmp[48]; /* 22(8^22>2^64)*2(separators between every digit) + 3(strlen("+0x"))+1 */ char fmt[7]; /* strlen("%+#lld")+1 */ TRACE("(%p %p %p %d %d)\n", this, ret, base, fill, v); @@ -8489,7 +8489,7 @@ DEFINE_THISCALL_WRAPPER(num_put_short_do_put_long, 32) ostreambuf_iterator_wchar* __thiscall num_put_short_do_put_long(const num_put *this, ostreambuf_iterator_wchar *ret, ostreambuf_iterator_wchar dest, ios_base *base, wchar_t fill, LONG v) { - char tmp[48]; /* 22(8^22>2^64)*2(separators beetwen every digit) + 3(strlen("+0x"))+1 */ + char tmp[48]; /* 22(8^22>2^64)*2(separators between every digit) + 3(strlen("+0x"))+1 */ char fmt[7]; /* strlen("%+#lld")+1 */ TRACE("(%p %p %p %d %d)\n", this, ret, base, fill, v); @@ -8533,7 +8533,7 @@ DEFINE_THISCALL_WRAPPER(num_put_wchar_do_put_ulong, 32) ostreambuf_iterator_wchar* __thiscall num_put_wchar_do_put_ulong(const num_put *this, ostreambuf_iterator_wchar *ret, ostreambuf_iterator_wchar dest, ios_base *base, wchar_t fill, ULONG v) { - char tmp[48]; /* 22(8^22>2^64)*2(separators beetwen every digit) + 3(strlen("+0x"))+1 */ + char tmp[48]; /* 22(8^22>2^64)*2(separators between every digit) + 3(strlen("+0x"))+1 */ char fmt[7]; /* strlen("%+#lld")+1 */ TRACE("(%p %p %p %d %d)\n", this, ret, base, fill, v); @@ -8552,7 +8552,7 @@ DEFINE_THISCALL_WRAPPER(num_put_short_do_put_ulong, 32) ostreambuf_iterator_wchar* __thiscall num_put_short_do_put_ulong(const num_put *this, ostreambuf_iterator_wchar *ret, ostreambuf_iterator_wchar dest, ios_base *base, wchar_t fill, ULONG v) { - char tmp[48]; /* 22(8^22>2^64)*2(separators beetwen every digit) + 3(strlen("+0x"))+1 */ + char tmp[48]; /* 22(8^22>2^64)*2(separators between every digit) + 3(strlen("+0x"))+1 */ char fmt[7]; /* strlen("%+#lld")+1 */ TRACE("(%p %p %p %d %d)\n", this, ret, base, fill, v); @@ -8713,7 +8713,7 @@ DEFINE_THISCALL_WRAPPER(num_put_wchar_do_put_ptr, 32) ostreambuf_iterator_wchar* __thiscall num_put_wchar_do_put_ptr(const num_put *this, ostreambuf_iterator_wchar *ret, ostreambuf_iterator_wchar dest, ios_base *base, wchar_t fill, const void *v) { - char tmp[17]; /* 8(16^8==2^64)*2(separators beetwen every digit) + 1 */ + char tmp[17]; /* 8(16^8==2^64)*2(separators between every digit) + 1 */ TRACE("(%p %p %p %d %p)\n", this, ret, base, fill, v); @@ -8730,7 +8730,7 @@ DEFINE_THISCALL_WRAPPER(num_put_short_do_put_ptr, 32) ostreambuf_iterator_wchar* __thiscall num_put_short_do_put_ptr(const num_put *this, ostreambuf_iterator_wchar *ret, ostreambuf_iterator_wchar dest, ios_base *base, wchar_t fill, const void *v) { - char tmp[17]; /* 8(16^8==2^64)*2(separators beetwen every digit) + 1 */ + char tmp[17]; /* 8(16^8==2^64)*2(separators between every digit) + 1 */ TRACE("(%p %p %p %d %p)\n", this, ret, base, fill, v); @@ -8772,7 +8772,7 @@ DEFINE_THISCALL_WRAPPER(num_put_wchar_do_put_int64, 36) ostreambuf_iterator_wchar* __thiscall num_put_wchar_do_put_int64(const num_put *this, ostreambuf_iterator_wchar *ret, ostreambuf_iterator_wchar dest, ios_base *base, wchar_t fill, __int64 v) { - char tmp[48]; /* 22(8^22>2^64)*2(separators beetwen every digit) + 3(strlen("+0x"))+1 */ + char tmp[48]; /* 22(8^22>2^64)*2(separators between every digit) + 3(strlen("+0x"))+1 */ char fmt[7]; /* strlen("%+#lld")+1 */ TRACE("(%p %p %p %d)\n", this, ret, base, fill); @@ -8791,7 +8791,7 @@ DEFINE_THISCALL_WRAPPER(num_put_short_do_put_int64, 36) ostreambuf_iterator_wchar* __thiscall num_put_short_do_put_int64(const num_put *this, ostreambuf_iterator_wchar *ret, ostreambuf_iterator_wchar dest, ios_base *base, wchar_t fill, __int64 v) { - char tmp[48]; /* 22(8^22>2^64)*2(separators beetwen every digit) + 3(strlen("+0x"))+1 */ + char tmp[48]; /* 22(8^22>2^64)*2(separators between every digit) + 3(strlen("+0x"))+1 */ char fmt[7]; /* strlen("%+#lld")+1 */ TRACE("(%p %p %p %d)\n", this, ret, base, fill); @@ -8835,7 +8835,7 @@ DEFINE_THISCALL_WRAPPER(num_put_wchar_do_put_uint64, 36) ostreambuf_iterator_wchar* __thiscall num_put_wchar_do_put_uint64(const num_put *this, ostreambuf_iterator_wchar *ret, ostreambuf_iterator_wchar dest, ios_base *base, wchar_t fill, unsigned __int64 v) { - char tmp[48]; /* 22(8^22>2^64)*2(separators beetwen every digit) + 3(strlen("+0x"))+1 */ + char tmp[48]; /* 22(8^22>2^64)*2(separators between every digit) + 3(strlen("+0x"))+1 */ char fmt[7]; /* strlen("%+#lld")+1 */ TRACE("(%p %p %p %d)\n", this, ret, base, fill); @@ -8854,7 +8854,7 @@ DEFINE_THISCALL_WRAPPER(num_put_short_do_put_uint64, 36) ostreambuf_iterator_wchar* __thiscall num_put_short_do_put_uint64(const num_put *this, ostreambuf_iterator_wchar *ret, ostreambuf_iterator_wchar dest, ios_base *base, wchar_t fill, unsigned __int64 v) { - char tmp[48]; /* 22(8^22>2^64)*2(separators beetwen every digit) + 3(strlen("+0x"))+1 */ + char tmp[48]; /* 22(8^22>2^64)*2(separators between every digit) + 3(strlen("+0x"))+1 */ char fmt[7]; /* strlen("%+#lld")+1 */ TRACE("(%p %p %p %d)\n", this, ret, base, fill);

1 0

Francois Gouget : msvcrt/tests: A couple of spelling fixes in ok() messages.
by Alexandre Julliard July 6, 2017

July 6, 2017

Module: wine Branch: master Commit: 2dada6990926c4e2d076cb5e09c5b7f41fee66fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dada6990926c4e2d076cb5e0… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 6 12:22:47 2017 +0200 msvcrt/tests: A couple of spelling fixes in ok() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/heap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/heap.c b/dlls/msvcrt/tests/heap.c index 3d75cf1..4a3c7a8 100644 --- a/dlls/msvcrt/tests/heap.c +++ b/dlls/msvcrt/tests/heap.c @@ -443,11 +443,11 @@ static void test_sbheap(void) mem = malloc(1); ok(mem != NULL, "malloc failed\n"); - ok(!((UINT_PTR)mem & 0xf), "incorrect alignement (%p)\n", mem); + ok(!((UINT_PTR)mem & 0xf), "incorrect alignment (%p)\n", mem); mem = realloc(mem, 10); ok(mem != NULL, "realloc failed\n"); - ok(!((UINT_PTR)mem & 0xf), "incorrect alignement (%p)\n", mem); + ok(!((UINT_PTR)mem & 0xf), "incorrect alignment (%p)\n", mem); ok(_set_sbh_threshold(0), "_set_sbh_threshold failed\n"); threshold = _get_sbh_threshold();

1 0

Francois Gouget : ntdll/tests: A spelling fix in a comment.
by Alexandre Julliard July 6, 2017

July 6, 2017

Module: wine Branch: master Commit: e3b1437e1b7db7d85f2967075924572c0872c6f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3b1437e1b7db7d85f2967075… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 6 12:22:39 2017 +0200 ntdll/tests: A spelling fix in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/rtl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 7176e44..a8412c5 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -2121,7 +2121,7 @@ static void test_RtlLeaveCriticalSection(void) ok(!cs.OwningThread, "unexpected OwningThread %p\n", cs.OwningThread); /* - * Trying to leave a section that wasn't acquired modifies RecusionCount to an invalid value, + * Trying to leave a section that wasn't acquired modifies RecursionCount to an invalid value, * but doesn't modify LockCount so that an attempt to enter the section later will work. */ status = RtlLeaveCriticalSection(&cs);

1 0

Francois Gouget : mapi32: A spelling fix in a comment.
by Alexandre Julliard July 6, 2017

July 6, 2017

Module: wine Branch: master Commit: b0a31c3a3b65c38d36b4a1208f74a38a819771c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0a31c3a3b65c38d36b4a1208… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 6 12:23:15 2017 +0200 mapi32: A spelling fix in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mapi32/prop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mapi32/prop.c b/dlls/mapi32/prop.c index ce8ed80..0700e5c 100644 --- a/dlls/mapi32/prop.c +++ b/dlls/mapi32/prop.c @@ -1635,7 +1635,7 @@ static HRESULT WINAPI IPropData_fnSaveChanges(LPPROPDATA iface, ULONG ulFlags) * * PARAMS * iface [I] IMAPIProp object to get the property values from - * lpTags [I] Property tage of property values to be retrieved + * lpTags [I] Property tags of property values to be retrieved * ulFlags [I] Return 0=Ascii MAPI_UNICODE=Unicode strings for * unspecified types * lpCount [O] Destination for number of properties returned

1 0