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

Andrey Gusev : ext-ms-win-ntuser-windowclass-l1-1-1: Add dll.
by Alexandre Julliard 06 Jul '17

06 Jul '17

Module: wine Branch: master Commit: 4c0b4706189c32db0e31c126866290da37cd0776 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c0b4706189c32db0e31c1268… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Jul 6 15:15:19 2017 +0300 ext-ms-win-ntuser-windowclass-l1-1-1: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-ntuser-windowclass-l1-1-1/Makefile.in | 1 + .../ext-ms-win-ntuser-windowclass-l1-1-1.spec | 19 +++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 24 insertions(+) diff --git a/configure b/configure index 43f4331..8ce432d 100755 --- a/configure +++ b/configure @@ -1201,6 +1201,7 @@ enable_ext_ms_win_ntuser_private_l1_1_1 enable_ext_ms_win_ntuser_rectangle_ext_l1_1_0 enable_ext_ms_win_ntuser_uicontext_ext_l1_1_0 enable_ext_ms_win_ntuser_window_l1_1_1 +enable_ext_ms_win_ntuser_windowclass_l1_1_1 enable_ext_ms_win_rtcore_gdi_object_l1_1_0 enable_ext_ms_win_rtcore_gdi_rgn_l1_1_0 enable_ext_ms_win_rtcore_ntuser_dc_access_l1_1_0 @@ -18269,6 +18270,7 @@ wine_fn_config_dll ext-ms-win-ntuser-private-l1-1-1 enable_ext_ms_win_ntuser_pri wine_fn_config_dll ext-ms-win-ntuser-rectangle-ext-l1-1-0 enable_ext_ms_win_ntuser_rectangle_ext_l1_1_0 wine_fn_config_dll ext-ms-win-ntuser-uicontext-ext-l1-1-0 enable_ext_ms_win_ntuser_uicontext_ext_l1_1_0 wine_fn_config_dll ext-ms-win-ntuser-window-l1-1-1 enable_ext_ms_win_ntuser_window_l1_1_1 +wine_fn_config_dll ext-ms-win-ntuser-windowclass-l1-1-1 enable_ext_ms_win_ntuser_windowclass_l1_1_1 wine_fn_config_dll ext-ms-win-rtcore-gdi-object-l1-1-0 enable_ext_ms_win_rtcore_gdi_object_l1_1_0 wine_fn_config_dll ext-ms-win-rtcore-gdi-rgn-l1-1-0 enable_ext_ms_win_rtcore_gdi_rgn_l1_1_0 wine_fn_config_dll ext-ms-win-rtcore-ntuser-dc-access-l1-1-0 enable_ext_ms_win_rtcore_ntuser_dc_access_l1_1_0 diff --git a/configure.ac b/configure.ac index c22370f..154f6bf 100644 --- a/configure.ac +++ b/configure.ac @@ -3103,6 +3103,7 @@ WINE_CONFIG_DLL(ext-ms-win-ntuser-private-l1-1-1) WINE_CONFIG_DLL(ext-ms-win-ntuser-rectangle-ext-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-ntuser-uicontext-ext-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-ntuser-window-l1-1-1) +WINE_CONFIG_DLL(ext-ms-win-ntuser-windowclass-l1-1-1) WINE_CONFIG_DLL(ext-ms-win-rtcore-gdi-object-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-rtcore-gdi-rgn-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dc-access-l1-1-0) diff --git a/dlls/ext-ms-win-ntuser-windowclass-l1-1-1/Makefile.in b/dlls/ext-ms-win-ntuser-windowclass-l1-1-1/Makefile.in new file mode 100644 index 0000000..bc4e4b0 --- /dev/null +++ b/dlls/ext-ms-win-ntuser-windowclass-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-ntuser-windowclass-l1-1-1.dll diff --git a/dlls/ext-ms-win-ntuser-windowclass-l1-1-1/ext-ms-win-ntuser-windowclass-l1-1-1.spec b/dlls/ext-ms-win-ntuser-windowclass-l1-1-1/ext-ms-win-ntuser-windowclass-l1-1-1.spec new file mode 100644 index 0000000..f405cd7 --- /dev/null +++ b/dlls/ext-ms-win-ntuser-windowclass-l1-1-1/ext-ms-win-ntuser-windowclass-l1-1-1.spec @@ -0,0 +1,19 @@ +@ stdcall GetClassInfoA(long str ptr) user32.GetClassInfoA +@ stdcall GetClassInfoExA(long str ptr) user32.GetClassInfoExA +@ stdcall GetClassInfoExW(long wstr ptr) user32.GetClassInfoExW +@ stdcall GetClassInfoW(long wstr ptr) user32.GetClassInfoW +@ stdcall GetClassLongA(long long) user32.GetClassLongA +@ stdcall GetClassLongW(long long) user32.GetClassLongW +@ stdcall GetClassNameA(long ptr long) user32.GetClassNameA +@ stdcall GetClassNameW(long ptr long) user32.GetClassNameW +@ stdcall GetWindowLongA(long long) user32.GetWindowLongA +@ stdcall GetWindowLongW(long long) user32.GetWindowLongW +@ stdcall RealGetWindowClassA(long ptr long) user32.RealGetWindowClassA +@ stdcall RealGetWindowClassW(long ptr long) user32.RealGetWindowClassW +@ stdcall RegisterClassA(ptr) user32.RegisterClassA +@ stdcall RegisterClassExW(ptr) user32.RegisterClassExW +@ stdcall RegisterClassW(ptr) user32.RegisterClassW +@ stdcall SetWindowLongA(long long long) user32.SetWindowLongA +@ stdcall SetWindowLongW(long long long) user32.SetWindowLongW +@ stdcall UnregisterClassA(str long) user32.UnregisterClassA +@ stdcall UnregisterClassW(wstr long) user32.UnregisterClassW diff --git a/tools/make_specfiles b/tools/make_specfiles index 0cacd45..eac1091 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -308,6 +308,7 @@ my @dll_groups = "ext-ms-win-ntuser-private-l1-1-1", "ext-ms-win-ntuser-rectangle-ext-l1-1-0", "ext-ms-win-ntuser-uicontext-ext-l1-1-0", + "ext-ms-win-ntuser-windowclass-l1-1-1", "ext-ms-win-ntuser-window-l1-1-1", "ext-ms-win-rtcore-ntuser-dc-access-l1-1-0", "ext-ms-win-rtcore-ntuser-dpi-l1-1-0",

1 0

Andrey Gusev : ext-ms-win-ras-rasapi32-l1-1-0: Add dll.
by Alexandre Julliard 06 Jul '17

06 Jul '17

Module: wine Branch: master Commit: c05df86b5fd20d13e6fcb5eb6d41f348c37cd7c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c05df86b5fd20d13e6fcb5eb6… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Jul 6 15:15:20 2017 +0300 ext-ms-win-ras-rasapi32-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-ras-rasapi32-l1-1-0/Makefile.in | 1 + .../ext-ms-win-ras-rasapi32-l1-1-0.spec | 19 +++++++++++++++++++ tools/make_specfiles | 4 ++++ 5 files changed, 27 insertions(+) diff --git a/configure b/configure index 8ce432d..2998e0f 100755 --- a/configure +++ b/configure @@ -1202,6 +1202,7 @@ enable_ext_ms_win_ntuser_rectangle_ext_l1_1_0 enable_ext_ms_win_ntuser_uicontext_ext_l1_1_0 enable_ext_ms_win_ntuser_window_l1_1_1 enable_ext_ms_win_ntuser_windowclass_l1_1_1 +enable_ext_ms_win_ras_rasapi32_l1_1_0 enable_ext_ms_win_rtcore_gdi_object_l1_1_0 enable_ext_ms_win_rtcore_gdi_rgn_l1_1_0 enable_ext_ms_win_rtcore_ntuser_dc_access_l1_1_0 @@ -18271,6 +18272,7 @@ wine_fn_config_dll ext-ms-win-ntuser-rectangle-ext-l1-1-0 enable_ext_ms_win_ntus wine_fn_config_dll ext-ms-win-ntuser-uicontext-ext-l1-1-0 enable_ext_ms_win_ntuser_uicontext_ext_l1_1_0 wine_fn_config_dll ext-ms-win-ntuser-window-l1-1-1 enable_ext_ms_win_ntuser_window_l1_1_1 wine_fn_config_dll ext-ms-win-ntuser-windowclass-l1-1-1 enable_ext_ms_win_ntuser_windowclass_l1_1_1 +wine_fn_config_dll ext-ms-win-ras-rasapi32-l1-1-0 enable_ext_ms_win_ras_rasapi32_l1_1_0 wine_fn_config_dll ext-ms-win-rtcore-gdi-object-l1-1-0 enable_ext_ms_win_rtcore_gdi_object_l1_1_0 wine_fn_config_dll ext-ms-win-rtcore-gdi-rgn-l1-1-0 enable_ext_ms_win_rtcore_gdi_rgn_l1_1_0 wine_fn_config_dll ext-ms-win-rtcore-ntuser-dc-access-l1-1-0 enable_ext_ms_win_rtcore_ntuser_dc_access_l1_1_0 diff --git a/configure.ac b/configure.ac index 154f6bf..374a380 100644 --- a/configure.ac +++ b/configure.ac @@ -3104,6 +3104,7 @@ WINE_CONFIG_DLL(ext-ms-win-ntuser-rectangle-ext-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-ntuser-uicontext-ext-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-ntuser-window-l1-1-1) WINE_CONFIG_DLL(ext-ms-win-ntuser-windowclass-l1-1-1) +WINE_CONFIG_DLL(ext-ms-win-ras-rasapi32-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-rtcore-gdi-object-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-rtcore-gdi-rgn-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dc-access-l1-1-0) diff --git a/dlls/ext-ms-win-ras-rasapi32-l1-1-0/Makefile.in b/dlls/ext-ms-win-ras-rasapi32-l1-1-0/Makefile.in new file mode 100644 index 0000000..29ebb93 --- /dev/null +++ b/dlls/ext-ms-win-ras-rasapi32-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-ras-rasapi32-l1-1-0.dll diff --git a/dlls/ext-ms-win-ras-rasapi32-l1-1-0/ext-ms-win-ras-rasapi32-l1-1-0.spec b/dlls/ext-ms-win-ras-rasapi32-l1-1-0/ext-ms-win-ras-rasapi32-l1-1-0.spec new file mode 100644 index 0000000..bb73c8a --- /dev/null +++ b/dlls/ext-ms-win-ras-rasapi32-l1-1-0/ext-ms-win-ras-rasapi32-l1-1-0.spec @@ -0,0 +1,19 @@ +@ stub RasAutoDialSharedConnection +@ stdcall RasConnectionNotificationW(ptr long long) rasapi32.RasConnectionNotificationW +@ stdcall RasDialW(ptr wstr ptr long ptr ptr) rasapi32.RasDialW +@ stdcall RasEnumConnectionsW(ptr ptr ptr) rasapi32.RasEnumConnectionsW +@ stdcall RasEnumEntriesW(wstr wstr ptr ptr ptr) rasapi32.RasEnumEntriesW +@ stdcall RasGetAutodialAddressA(str ptr ptr ptr ptr) rasapi32.RasGetAutodialAddressA +@ stdcall RasGetAutodialAddressW(wstr ptr ptr ptr ptr) rasapi32.RasGetAutodialAddressW +@ stub RasGetConnectionStatistics +@ stdcall RasGetConnectStatusW(ptr ptr) rasapi32.RasGetConnectStatusW +@ stub RasGetCredentialsW +@ stdcall RasGetEntryDialParamsW(wstr ptr ptr) rasapi32.RasGetEntryDialParamsW +@ stub RasGetEntryHrasconnW +@ stdcall RasGetEntryPropertiesW(wstr wstr ptr ptr ptr ptr) rasapi32.RasGetEntryPropertiesW +@ stdcall RasGetProjectionInfoA(ptr ptr ptr ptr) rasapi32.RasGetProjectionInfoA +@ stdcall RasHangUpW(long) rasapi32.RasHangUpW +@ stub RasQuerySharedAutoDial +@ stub RasQuerySharedConnection +@ stdcall RasSetAutodialAddressW(wstr long ptr long long) rasapi32.RasSetAutodialAddressW +@ stdcall RasSetEntryDialParamsW(wstr ptr long) rasapi32.RasSetEntryDialParamsW diff --git a/tools/make_specfiles b/tools/make_specfiles index eac1091..d8ee762 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -162,6 +162,10 @@ my @dll_groups = "api-ms-win-security-activedirectoryclient-l1-1-0", ], [ + "rasapi32", + "ext-ms-win-ras-rasapi32-l1-1-0", + ], + [ "kernel32", "api-ms-win-appmodel-identity-l1-1-0", "api-ms-win-appmodel-runtime-l1-1-1",

1 0

Francois Gouget : rpcrt4: Spelling fixes in comments.
by Alexandre Julliard 06 Jul '17

06 Jul '17

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

Francois Gouget : msvcrt/tests: A couple of spelling fixes in ok() messages.
by Alexandre Julliard 06 Jul '17

06 Jul '17

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 : msvcp90: Spelling fixes in comments.
by Alexandre Julliard 06 Jul '17

06 Jul '17

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 : ws2_32/tests: A spelling fix in a comment.
by Alexandre Julliard 06 Jul '17

06 Jul '17

Module: wine Branch: master Commit: 32c6d8729588339f44eca4f67a48add0c2be4204 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32c6d8729588339f44eca4f67… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 6 12:21:57 2017 +0200 ws2_32/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/ws2_32/tests/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f3ba11c..2790fea 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1643,7 +1643,7 @@ todo_wine ok(k == 99, "Expected 99, got %d\n", k); } } - else /* <= 2003 the tests differ between TCP and UDP, UDP silenty accepts */ + else /* <= 2003 the tests differ between TCP and UDP, UDP silently accepts */ { SetLastError(0xdeadbeef); k = 99;

1 0

Francois Gouget : msi/tests: Add a trailing linefeed to an ok() call.
by Alexandre Julliard 06 Jul '17

06 Jul '17

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

Hugh McMaster : regedit/tests: Check if regedit.exe has elevated privileges before starting some tests.
by Alexandre Julliard 06 Jul '17

06 Jul '17

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

Hugh McMaster : regedit/tests: Add another test for "0x" prefixes in the hex data type.
by Alexandre Julliard 06 Jul '17

06 Jul '17

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

Hugh McMaster : regedit/tests: Add some more tests for importing hex data.
by Alexandre Julliard 06 Jul '17

06 Jul '17

Module: wine Branch: master Commit: 23c93d30263c6ac23b69d4ffbce07a71e3d153a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23c93d30263c6ac23b69d4ffb… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 6 11:18:27 2017 +0000 regedit/tests: Add some more tests for importing hex data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 67 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index c1dc01a..1b3efc8 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -500,6 +500,73 @@ static void test_basic_import(void) if (lr == ERROR_SUCCESS) verify_reg(hkey, "Wine17", REG_MULTI_SZ, "Line ", 6, TODO_REG_SIZE | TODO_REG_DATA); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine18a\"=hex(7):4c,69,6e,65,00,00\n" + "\"Wine18b\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n" + "\"Wine18c\"=hex(7):4c,69,6e,65,20,\\;comment\n" + " 63,6f,6e,63,61,74,\\\n" + " 65,6e,61,74,69,6f,6e,00,00\n" + "\"Wine18d\"=hex(7):4c,69,6e,65,20,\\;comment\n" + " 63,6f,6e,63,61,74,\n" + " 65,6e,61,74,69,6f,6e,00,00\n" + "\"Wine18e\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,63,61,74,;comment\n" + " 65,6e,61,74,69,6f,6e,00,00\n\n"); + verify_reg(hkey, "Wine18a", REG_MULTI_SZ, "Line\0", 6, 0); + verify_reg(hkey, "Wine18b", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + verify_reg(hkey, "Wine18c", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + verify_reg(hkey, "Wine18d", REG_MULTI_SZ, "Line concat", 12, TODO_REG_SIZE); + todo_wine verify_reg(hkey, "Wine18e", REG_MULTI_SZ, "Line concat", 12, 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine19a\"=hex(100):25,50,41,54,48,25,00\n" + "\"Wine19b\"=hex(100):25,50,41,\\\n" + " 54,48,25,00\n" + "\"Wine19c\"=hex(100):25,50,41,\\;comment\n" + " 54,48,\\\n" + " 25,00\n" + "\"Wine19d\"=hex(100):25,50,41,\\;comment\n" + " 54,48,\n" + " 25,00\n" + "\"Wine19e\"=hex(100):25,50,41,\\;comment\n" + " 54,48,;comment\n" + " 25,00\n"); + verify_reg(hkey, "Wine19a", 0x100, "%PATH%", 7, 0); + verify_reg(hkey, "Wine19b", 0x100, "%PATH%", 7, 0); + verify_reg(hkey, "Wine19c", 0x100, "%PATH%", 7, 0); + verify_reg(hkey, "Wine19d", 0x100, "%PATH", 5, 0); + todo_wine verify_reg(hkey, "Wine19e", 0x100, "%PATH", 5, 0); + + /* Test null-termination of REG_EXPAND_SZ and REG_MULTI_SZ data*/ + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine20a\"=hex(7):4c,69,6e,65\n" + "\"Wine20b\"=hex(7):4c,69,6e,65,\n" + "\"Wine20c\"=hex(7):4c,69,6e,65,00\n" + "\"Wine20d\"=hex(7):4c,69,6e,65,00,\n" + "\"Wine20e\"=hex(7):4c,69,6e,65,00,00\n" + "\"Wine20f\"=hex(7):4c,69,6e,65,00,00,\n\n"); + verify_reg(hkey, "Wine20a", REG_MULTI_SZ, "Line", 5, TODO_REG_SIZE); + verify_reg(hkey, "Wine20b", REG_MULTI_SZ, "Line", 5, TODO_REG_SIZE); + verify_reg(hkey, "Wine20c", REG_MULTI_SZ, "Line", 5, 0); + verify_reg(hkey, "Wine20d", REG_MULTI_SZ, "Line", 5, 0); + verify_reg(hkey, "Wine20e", REG_MULTI_SZ, "Line\0", 6, 0); + verify_reg(hkey, "Wine20f", REG_MULTI_SZ, "Line\0", 6, 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine21a\"=hex(2):25,50,41,54,48,25\n" + "\"Wine21b\"=hex(2):25,50,41,54,48,25,\n" + "\"Wine21c\"=hex(2):25,50,41,54,48,25,00\n" + "\"Wine21d\"=hex(2):25,50,41,54,48,25,00,\n\n"); + verify_reg(hkey, "Wine21a", REG_EXPAND_SZ, "%PATH%", 7, TODO_REG_SIZE); + verify_reg(hkey, "Wine21b", REG_EXPAND_SZ, "%PATH%", 7, TODO_REG_SIZE); + verify_reg(hkey, "Wine21c", REG_EXPAND_SZ, "%PATH%", 7, 0); + verify_reg(hkey, "Wine21d", REG_EXPAND_SZ, "%PATH%", 7, 0); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0