May 2016 - Wine-commits - list.winehq.org

Hans Leidekker : webservices: Add a stub implementation of WsCall.
by Alexandre Julliard 02 May '16

02 May '16

Module: wine Branch: master Commit: 7ff383e5e2b5a7b9bc8600b6fd00920f39e81160 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ff383e5e2b5a7b9bc8600b6f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 29 20:21:50 2016 +0200 webservices: Add a stub implementation of WsCall. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/proxy.c | 11 +++++++++++ dlls/webservices/webservices.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/proxy.c b/dlls/webservices/proxy.c index 02ae96d..aceaf6b 100644 --- a/dlls/webservices/proxy.c +++ b/dlls/webservices/proxy.c @@ -234,3 +234,14 @@ HRESULT WINAPI WsCloseServiceProxy( WS_SERVICE_PROXY *handle, const WS_ASYNC_CON return close_channel( proxy->channel ); } + +/************************************************************************** + * WsCall [webservices.@] + */ +HRESULT WINAPI WsCall( WS_SERVICE_PROXY *handle, const WS_OPERATION_DESCRIPTION *desc, const void **args, + WS_HEAP *heap, const WS_CALL_PROPERTY *properties, const ULONG count, + const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) +{ + FIXME( "%p %p %p %p %p %u %p %p\n", handle, desc, args, heap, properties, count, ctx, error ); + return E_NOTIMPL; +} diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 5ed9351..3c38864 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -11,7 +11,7 @@ @ stub WsAddressMessage @ stdcall WsAlloc(ptr long ptr ptr) @ stub WsAsyncExecute -@ stub WsCall +@ stdcall WsCall(ptr ptr ptr ptr ptr long ptr ptr) @ stub WsCheckMustUnderstandHeaders @ stdcall WsCloseChannel(ptr ptr ptr) @ stub WsCloseListener

1 0

Hans Leidekker : webservices: Add support for reading date values.
by Alexandre Julliard 02 May '16

02 May '16

Module: wine Branch: master Commit: 3268ceb573c6469d08c97bb2413738303f15eff2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3268ceb573c6469d08c97bb24… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 29 20:21:51 2016 +0200 webservices: Add support for reading date values. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 198 ++++++++++++++++++++++++++++++++++++++++ dlls/webservices/tests/reader.c | 86 +++++++++++++++++ include/webservices.h | 20 ++++ 3 files changed, 304 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3268ceb573c6469d08c97…

1 0

Hans Leidekker : webservices: Implement WsDateTimeToFileTime.
by Alexandre Julliard 02 May '16

02 May '16

Module: wine Branch: master Commit: 2bcff80cda3eb95f2037db32cc5e03883310de89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bcff80cda3eb95f2037db32c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 29 20:21:52 2016 +0200 webservices: Implement WsDateTimeToFileTime. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 21 +++++++++++++++++ dlls/webservices/tests/reader.c | 48 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 3 files changed, 70 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index d4d4dcc..454f4e9 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -2023,6 +2023,27 @@ static HRESULT str_to_datetime( const unsigned char *bytes, ULONG len, WS_DATETI return S_OK; } +#define TICKS_1601_01_01 504911232000000000 + +/************************************************************************** + * WsDateTimeToFileTime [webservices.@] + */ +HRESULT WINAPI WsDateTimeToFileTime( const WS_DATETIME *dt, FILETIME *ft, WS_ERROR *error ) +{ + unsigned __int64 ticks; + + TRACE( "%p %p %p\n", dt, ft, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!dt || !ft) return E_INVALIDARG; + + if (dt->ticks < TICKS_1601_01_01) return WS_E_INVALID_FORMAT; + ticks = dt->ticks - TICKS_1601_01_01; + ft->dwHighDateTime = ticks >> 32; + ft->dwLowDateTime = (DWORD)ticks; + return S_OK; +} + static HRESULT read_get_node_text( struct reader *reader, WS_XML_UTF8_TEXT **ret ) { WS_XML_TEXT_NODE *text; diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index ced8a0f..ac25084 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -3009,6 +3009,53 @@ static void test_datetime(void) WsFreeHeap( heap ); } +static void test_WsDateTimeToFileTime(void) +{ + static const struct + { + WS_DATETIME dt; + HRESULT hr; + FILETIME ft; + } + tests[] = + { + { {0, WS_DATETIME_FORMAT_UTC}, WS_E_INVALID_FORMAT, {0, 0} }, + { {0x701ce172276ffff, WS_DATETIME_FORMAT_UTC}, WS_E_INVALID_FORMAT, {0, 0} }, + { {0x701ce1722770000, WS_DATETIME_FORMAT_UTC}, S_OK, {0, 0} }, + { {0x2bca2875f4373fff, WS_DATETIME_FORMAT_UTC}, S_OK, {0xd1c03fff, 0x24c85a5e} }, + { {0x2bca2875f4374000, WS_DATETIME_FORMAT_UTC}, S_OK, {0xd1c04000, 0x24c85a5e} }, + { {0x2bca2875f4374000, WS_DATETIME_FORMAT_LOCAL}, S_OK, {0xd1c04000, 0x24c85a5e} }, + { {~0, WS_DATETIME_FORMAT_UTC}, S_OK, {0xdd88ffff, 0xf8fe31e8} }, + }; + WS_DATETIME dt; + FILETIME ft; + HRESULT hr; + ULONG i; + + hr = WsDateTimeToFileTime( NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + dt.ticks = 0x701ce172277000; + dt.format = WS_DATETIME_FORMAT_UTC; + hr = WsDateTimeToFileTime( &dt, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsDateTimeToFileTime( NULL, &ft, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + { + memset( &ft, 0, sizeof(ft) ); + hr = WsDateTimeToFileTime( &tests[i].dt, &ft, NULL ); + ok( hr == tests[i].hr, "%u: got %08x\n", i, hr ); + if (hr == S_OK) + { + ok( ft.dwLowDateTime == tests[i].ft.dwLowDateTime, "%u: got %08x\n", i, ft.dwLowDateTime ); + ok( ft.dwHighDateTime == tests[i].ft.dwHighDateTime, "%u: got %08x\n", i, ft.dwHighDateTime ); + } + } +} + START_TEST(reader) { test_WsCreateError(); @@ -3035,4 +3082,5 @@ START_TEST(reader) test_repeating_element(); test_WsResetHeap(); test_datetime(); + test_WsDateTimeToFileTime(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 3c38864..da8adbe 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -37,7 +37,7 @@ @ stdcall WsCreateWriter(ptr long ptr ptr) @ stdcall WsCreateXmlBuffer(ptr ptr long ptr ptr) @ stub WsCreateXmlSecurityToken -@ stub WsDateTimeToFileTime +@ stdcall WsDateTimeToFileTime(ptr ptr ptr) @ stub WsDecodeUrl @ stub WsEncodeUrl @ stub WsEndReaderCanonicalization

1 0

Hans Leidekker : webservices: Implement WsFileTimeToDateTime.
by Alexandre Julliard 02 May '16

02 May '16

Module: wine Branch: master Commit: 49799912c52ee42b27b1bf87bf672c5d5a1387ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=49799912c52ee42b27b1bf87b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 29 20:21:53 2016 +0200 webservices: Implement WsFileTimeToDateTime. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 20 +++++++++++++++++ dlls/webservices/tests/reader.c | 45 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 3 files changed, 66 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 454f4e9..4f2262e 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -2044,6 +2044,26 @@ HRESULT WINAPI WsDateTimeToFileTime( const WS_DATETIME *dt, FILETIME *ft, WS_ERR return S_OK; } +/************************************************************************** + * WsFileTimeToDateTime [webservices.@] + */ +HRESULT WINAPI WsFileTimeToDateTime( const FILETIME *ft, WS_DATETIME *dt, WS_ERROR *error ) +{ + unsigned __int64 ticks; + + TRACE( "%p %p %p\n", ft, dt, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!dt || !ft) return E_INVALIDARG; + + ticks = ((unsigned __int64)ft->dwHighDateTime << 32) | ft->dwLowDateTime; + if (ticks > MAX_UINT64 - TICKS_1601_01_01) return WS_E_NUMERIC_OVERFLOW; + if (ticks + TICKS_1601_01_01 > TICKS_MAX) return WS_E_INVALID_FORMAT; + dt->ticks = ticks + TICKS_1601_01_01; + dt->format = WS_DATETIME_FORMAT_UTC; + return S_OK; +} + static HRESULT read_get_node_text( struct reader *reader, WS_XML_UTF8_TEXT **ret ) { WS_XML_TEXT_NODE *text; diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index ac25084..81b762e 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -3056,6 +3056,50 @@ static void test_WsDateTimeToFileTime(void) } } +static void test_WsFileTimeToDateTime(void) +{ + WS_DATETIME dt; + FILETIME ft; + HRESULT hr; + + hr = WsFileTimeToDateTime( NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + ft.dwLowDateTime = ft.dwHighDateTime = 0; + hr = WsFileTimeToDateTime( &ft, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsFileTimeToDateTime( NULL, &dt, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + dt.ticks = 0xdeadbeef; + dt.format = 0xdeadbeef; + hr = WsFileTimeToDateTime( &ft, &dt, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( dt.ticks == 0x701ce1722770000, "got %x%08x\n", (ULONG)(dt.ticks >> 32), (ULONG)dt.ticks ); + ok( dt.format == WS_DATETIME_FORMAT_UTC, "got %u\n", dt.format ); + + ft.dwLowDateTime = 0xd1c03fff; + ft.dwHighDateTime = 0x24c85a5e; + hr = WsFileTimeToDateTime( &ft, &dt, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( dt.ticks == 0x2bca2875f4373fff, "got %x%08x\n", (ULONG)(dt.ticks >> 32), (ULONG)dt.ticks ); + ok( dt.format == WS_DATETIME_FORMAT_UTC, "got %u\n", dt.format ); + + ft.dwLowDateTime++; + hr = WsFileTimeToDateTime( &ft, &dt, NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + ft.dwLowDateTime = 0xdd88ffff; + ft.dwHighDateTime = 0xf8fe31e8; + hr = WsFileTimeToDateTime( &ft, &dt, NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + ft.dwLowDateTime++; + hr = WsFileTimeToDateTime( &ft, &dt, NULL ); + ok( hr == WS_E_NUMERIC_OVERFLOW, "got %08x\n", hr ); +} + START_TEST(reader) { test_WsCreateError(); @@ -3083,4 +3127,5 @@ START_TEST(reader) test_WsResetHeap(); test_datetime(); test_WsDateTimeToFileTime(); + test_WsFileTimeToDateTime(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index da8adbe..6ff4718 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -42,7 +42,7 @@ @ stub WsEncodeUrl @ stub WsEndReaderCanonicalization @ stub WsEndWriterCanonicalization -@ stub WsFileTimeToDateTime +@ stdcall WsFileTimeToDateTime(ptr ptr ptr) @ stub WsFillBody @ stdcall WsFillReader(ptr long ptr ptr) @ stdcall WsFindAttribute(ptr ptr ptr long ptr ptr)

1 0

Austin English : ntdll: Add NtSetLdtEntries/ZwSetLdtEntries stub.
by Alexandre Julliard 02 May '16

02 May '16

Module: wine Branch: master Commit: fee017c221d11818b608bc0d6abc807aa35ee8fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=fee017c221d11818b608bc0d6… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Apr 29 19:57:00 2016 -0500 ntdll: Add NtSetLdtEntries/ZwSetLdtEntries stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 12 ++++++++++++ dlls/ntdll/ntdll.spec | 4 ++-- include/ddk/wdm.h | 1 + include/winternl.h | 2 +- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 47d7b31..3f5ae2c 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -2782,3 +2782,15 @@ NTSTATUS WINAPI NtSystemDebugControl(SYSDBG_COMMAND command, PVOID inbuffer, ULO return STATUS_NOT_IMPLEMENTED; } + +/****************************************************************************** + * NtSetLdtEntries (NTDLL.@) + * ZwSetLdtEntries (NTDLL.@) + */ +NTSTATUS WINAPI NtSetLdtEntries(ULONG selector1, ULONG entry1_low, ULONG entry1_high, + ULONG selector2, ULONG entry2_low, ULONG entry2_high) +{ + FIXME("(%u, %u, %u, %u, %u, %u): stub\n", selector1, entry1_low, entry1_high, selector2, entry2_low, entry2_high); + + return STATUS_NOT_IMPLEMENTED; +} diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 0a68144..01c84c6 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -340,7 +340,7 @@ @ stdcall NtSetInformationToken(long long ptr long) @ stdcall NtSetIntervalProfile(long long) @ stdcall NtSetIoCompletion(ptr long ptr long long) -@ stub NtSetLdtEntries +@ stdcall NtSetLdtEntries(long long long long long long) @ stub NtSetLowEventPair @ stub NtSetLowWaitHighEventPair @ stub NtSetLowWaitHighThread @@ -1261,7 +1261,7 @@ @ stdcall ZwSetInformationToken(long long ptr long) NtSetInformationToken @ stdcall ZwSetIntervalProfile(long long) NtSetIntervalProfile @ stdcall ZwSetIoCompletion(ptr long ptr long long) NtSetIoCompletion -@ stub ZwSetLdtEntries +@ stdcall ZwSetLdtEntries(long long long long long long) NtSetLdtEntries @ stub ZwSetLowEventPair @ stub ZwSetLowWaitHighEventPair @ stub ZwSetLowWaitHighThread diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index fc296a6..6ad4bb3 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1351,6 +1351,7 @@ NTSTATUS WINAPI ZwSetInformationObject(HANDLE, OBJECT_INFORMATION_CLASS, PVOID, NTSTATUS WINAPI ZwSetInformationProcess(HANDLE,PROCESS_INFORMATION_CLASS,PVOID,ULONG); NTSTATUS WINAPI ZwSetInformationThread(HANDLE,THREADINFOCLASS,LPCVOID,ULONG); NTSTATUS WINAPI ZwSetIoCompletion(HANDLE,ULONG,ULONG,NTSTATUS,ULONG); +NTSTATUS WINAPI ZwSetLdtEntries(ULONG,ULONG,ULONG,ULONG,ULONG,ULONG); NTSTATUS WINAPI ZwSetSecurityObject(HANDLE,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR); NTSTATUS WINAPI ZwSetSystemInformation(SYSTEM_INFORMATION_CLASS,PVOID,ULONG); NTSTATUS WINAPI ZwSetSystemTime(const LARGE_INTEGER*,LARGE_INTEGER*); diff --git a/include/winternl.h b/include/winternl.h index dddf946..0e6cd4b 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2302,7 +2302,7 @@ NTSYSAPI NTSTATUS WINAPI NtSetInformationThread(HANDLE,THREADINFOCLASS,LPCVOID, NTSYSAPI NTSTATUS WINAPI NtSetInformationToken(HANDLE,TOKEN_INFORMATION_CLASS,PVOID,ULONG); NTSYSAPI NTSTATUS WINAPI NtSetIntervalProfile(ULONG,KPROFILE_SOURCE); NTSYSAPI NTSTATUS WINAPI NtSetIoCompletion(HANDLE,ULONG_PTR,ULONG_PTR,NTSTATUS,SIZE_T); -NTSYSAPI NTSTATUS WINAPI NtSetLdtEntries(ULONG,LDT_ENTRY,ULONG,LDT_ENTRY); +NTSYSAPI NTSTATUS WINAPI NtSetLdtEntries(ULONG,ULONG,ULONG,ULONG,ULONG,ULONG); NTSYSAPI NTSTATUS WINAPI NtSetLowEventPair(HANDLE); NTSYSAPI NTSTATUS WINAPI NtSetLowWaitHighEventPair(HANDLE); NTSYSAPI NTSTATUS WINAPI NtSetLowWaitHighThread(VOID);

1 0

Andrey Gusev : setupapi: Fix a typo in comment.
by Alexandre Julliard 02 May '16

02 May '16

Module: wine Branch: master Commit: bf9d01edd6b96ebeaeaa092e62d4b666045d0d9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf9d01edd6b96ebeaeaa092e6… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sun May 1 11:24:05 2016 +0300 setupapi: Fix a typo in comment. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 2669544..02e75b6 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1144,7 +1144,7 @@ SetupDiCreateDeviceInfoListExA(const GUID *ClassGuid, * ClassGuid [I] if not NULL only devices with GUID ClassGuid are associated * with this list. * hwndParent [I] hwnd needed for interface related actions. - * MachineName [I] name of machine to create emtpy DeviceInfoSet list, if NULL + * MachineName [I] name of machine to create empty DeviceInfoSet list, if NULL * local registry will be used. * Reserved [I] must be NULL *

1 0

Andrey Gusev : shell32/tests: Fix a typo in comment.
by Alexandre Julliard 02 May '16

02 May '16

Module: wine Branch: master Commit: 83fee7456de7a0789cc08f12691a17eb36bd6319 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83fee7456de7a0789cc08f126… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sun May 1 11:24:36 2016 +0300 shell32/tests: Fix a typo in comment. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/assoc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/assoc.c b/dlls/shell32/tests/assoc.c index 9cd6aeb..c425038 100644 --- a/dlls/shell32/tests/assoc.c +++ b/dlls/shell32/tests/assoc.c @@ -160,7 +160,7 @@ static void test_IQueryAssociations_GetString(void) r = RegSetValueExW(test_extension_key, NULL, 0, REG_SZ, (PBYTE)test_progidW, sizeof(test_progidW)); ok(r == ERROR_SUCCESS, "RegSetValueExW(HKCR\\.test, NULL, \"testfile\") failed: 0x%lx\n", r); - /* adding progid key with no information shuld fail to return information */ + /* adding progid key with no information should fail to return information */ r = RegCreateKeyExW(HKEY_CLASSES_ROOT, test_progidW, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &test_progid_key, NULL); ok(r == ERROR_SUCCESS, "RegCreateKeyExW(HKCR, \"testfile\") failed: 0x%lx\n", r); getstring_test(test_extensionW, NULL, ASSOCSTR_DEFAULTICON, NULL, __LINE__);

1 0

Andrey Gusev : tools/winapi: Fix a typo in comments.
by Alexandre Julliard 02 May '16

02 May '16

Module: wine Branch: master Commit: fedef6628d7d0ddff1df9fa7d091fd7c144f291a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fedef6628d7d0ddff1df9fa7d… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sun May 1 11:29:10 2016 +0300 tools/winapi: Fix a typo in comments. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winapi/nativeapi.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winapi/nativeapi.pm b/tools/winapi/nativeapi.pm index 78b6ec9..4804486 100644 --- a/tools/winapi/nativeapi.pm +++ b/tools/winapi/nativeapi.pm @@ -98,7 +98,7 @@ sub new($) { # remove leading and trailing whitespace s/^\s*(.*?)\s*$/$1/; - # skip emty lines + # skip empty lines if(/^$/) { next; } # skip comments @@ -147,7 +147,7 @@ sub new($) { # remove leading and trailing whitespace s/^\s*(.*?)\s*$/$1/; - # skip emty lines + # skip empty lines if(/^$/) { next; } if(/^\#undef\s+(\S+)$/) {

1 0

Andrey Gusev : user32/tests: Fix a typo in ok() message.
by Alexandre Julliard 02 May '16

02 May '16

Module: wine Branch: master Commit: 2454bbd5e4dc71362fff9324b7a651b286946f3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2454bbd5e4dc71362fff9324b… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sun May 1 11:25:14 2016 +0300 user32/tests: Fix a typo in ok() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/winstation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 94be4c9..6bebfe9 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -284,7 +284,7 @@ static void test_handles(void) SetLastError( 0xdeadbeef ); d2 = OpenDesktopA( "", 0, TRUE, DESKTOP_ALL_ACCESS ); - ok( !d2, "open mepty desktop succeeded\n" ); + ok( !d2, "open empty desktop succeeded\n" ); ok( GetLastError() == ERROR_INVALID_HANDLE, "wrong error %u\n", GetLastError() ); SetLastError( 0xdeadbeef );

1 0

Andrey Gusev : wintrust/tests: Fix a typo in ok() messages.
by Alexandre Julliard 02 May '16

02 May '16

Module: wine Branch: master Commit: 6e954bd979363becfe5d96b519fc27473aba7772 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e954bd979363becfe5d96b51… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sun May 1 11:28:25 2016 +0300 wintrust/tests: Fix a typo in ok() messages. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/tests/crypt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index d7e76b1..cfed53b 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -1233,21 +1233,21 @@ static void test_sip(void) ok(ret, "CryptSIPRetrieveSubjectGuid failed (%x)\n", GetLastError()); ret = pPutSignedDataMsg(&info, X509_ASN_ENCODING, &index, 4, (BYTE*)"test"); - ok(!ret, "CryptSIPPutSignedDataMsg succeedded\n"); + ok(!ret, "CryptSIPPutSignedDataMsg succeeded\n"); index = GetLastError(); ok(index == ERROR_PATH_NOT_FOUND, "GetLastError returned %x\n", index); info.hFile = file; info.pwsFileName = nameW; ret = pPutSignedDataMsg(&info, X509_ASN_ENCODING, &index, 4, (BYTE*)"test"); - ok(!ret, "CryptSIPPutSignedDataMsg succeedded\n"); + ok(!ret, "CryptSIPPutSignedDataMsg succeeded\n"); index = GetLastError(); todo_wine ok(index == ERROR_INVALID_PARAMETER, "GetLastError returned %x\n", index); info.hFile = INVALID_HANDLE_VALUE; info.pwsFileName = nameW; ret = pPutSignedDataMsg(&info, X509_ASN_ENCODING, &index, 4, (BYTE*)"test"); - ok(!ret, "CryptSIPPutSignedDataMsg succeedded\n"); + ok(!ret, "CryptSIPPutSignedDataMsg succeeded\n"); index = GetLastError(); ok(index == ERROR_SHARING_VIOLATION, "GetLastError returned %x\n", index);

1 0