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

Austin English : ncrypt: Add some stub functions.
by Alexandre Julliard 15 Jul '16

15 Jul '16

Module: wine Branch: master Commit: 789c4c45ce2731d1b886e52160bce032da0190b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=789c4c45ce2731d1b886e5216… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jul 13 18:18:29 2016 +0200 ncrypt: Add some stub functions. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ncrypt/main.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ncrypt/ncrypt.spec | 14 +++++++------- 2 files changed, 58 insertions(+), 7 deletions(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 9c09600..6e79eeb 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -24,6 +24,7 @@ #include "windef.h" #include "winbase.h" +#include "ncrypt.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ncrypt); @@ -43,3 +44,53 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) return TRUE; } + +SECURITY_STATUS WINAPI NCryptCreatePersistedKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HANDLE *key, + const WCHAR *algid, const WCHAR *name, DWORD keyspec, + DWORD flags) +{ + FIXME("(0x%lx, %p, %s, %s, 0x%08x, 0x%08x): stub\n", provider, key, wine_dbgstr_w(algid), + wine_dbgstr_w(name), keyspec, flags); + return NTE_NOT_SUPPORTED; +} + +SECURITY_STATUS WINAPI NCryptDecrypt(NCRYPT_KEY_HANDLE key, BYTE *input, DWORD insize, void *padding, + BYTE *output, DWORD outsize, DWORD *result, DWORD flags) +{ + FIXME("(0x%lx, %p, %u, %p, %p, %u, %p, 0x%08x): stub\n", key, input, insize, padding, + output, outsize, result, flags); + return NTE_NOT_SUPPORTED; +} + +SECURITY_STATUS WINAPI NCryptEncrypt(NCRYPT_KEY_HANDLE key, BYTE *input, DWORD insize, void *padding, + BYTE *output, DWORD outsize, DWORD *result, DWORD flags) +{ + FIXME("(0x%lx, %p, %u, %p, %p, %u, %p, 0x%08x): stub\n", key, input, insize, padding, + output, outsize, result, flags); + return NTE_NOT_SUPPORTED; +} + +SECURITY_STATUS WINAPI NCryptFinalizeKey(NCRYPT_KEY_HANDLE key, DWORD flags) +{ + FIXME("(0x%lx, 0x%08x): stub\n", key, flags); + return NTE_NOT_SUPPORTED; +} + +SECURITY_STATUS WINAPI NCryptFreeObject(NCRYPT_HANDLE object) +{ + FIXME("(0x%lx): stub\n", object); + return NTE_NOT_SUPPORTED; +} + +SECURITY_STATUS WINAPI NCryptOpenKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HANDLE *key, + const WCHAR *name, DWORD keyspec, DWORD flags) +{ + FIXME("(0x%lx, %p, %s, 0x%08x, 0x%08x): stub\n", provider, key, wine_dbgstr_w(name), keyspec, flags); + return NTE_NOT_SUPPORTED; +} + +SECURITY_STATUS WINAPI NCryptOpenStorageProvider(NCRYPT_PROV_HANDLE *provider, const WCHAR *name, DWORD flags) +{ + FIXME("(%p, %s, %u): stub\n", provider, wine_dbgstr_w(name), flags); + return NTE_NOT_SUPPORTED; +} diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index 1322f1e..0412760 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -60,20 +60,20 @@ @ stub NCryptCloseKeyProtector @ stub NCryptCloseProtectionDescriptor @ stub NCryptCreateClaim -@ stub NCryptCreatePersistedKey +@ stdcall NCryptCreatePersistedKey(long ptr wstr wstr long long) @ stub NCryptCreateProtectionDescriptor -@ stub NCryptDecrypt +@ stdcall NCryptDecrypt(long ptr long ptr ptr long ptr long) @ stub NCryptDeleteKey @ stub NCryptDeriveKey @ stub NCryptDuplicateKeyProtectorHandle -@ stub NCryptEncrypt +@ stdcall NCryptEncrypt(long ptr long ptr ptr long ptr long) @ stub NCryptEnumAlgorithms @ stub NCryptEnumKeys @ stub NCryptEnumStorageProviders @ stub NCryptExportKey -@ stub NCryptFinalizeKey +@ stdcall NCryptFinalizeKey(long long) @ stub NCryptFreeBuffer -@ stub NCryptFreeObject +@ stdcall NCryptFreeObject(long) @ stub NCryptGetProperty @ stub NCryptGetProtectionDescriptorInfo @ stub NCryptImportKey @@ -81,9 +81,9 @@ @ stub NCryptIsKeyHandle @ stub NCryptKeyDerivation @ stub NCryptNotifyChangeKey -@ stub NCryptOpenKey +@ stdcall NCryptOpenKey(long ptr wstr long long) @ stub NCryptOpenKeyProtector -@ stub NCryptOpenStorageProvider +@ stdcall NCryptOpenStorageProvider(ptr wstr long) @ stub NCryptProtectKey @ stub NCryptProtectSecret @ stub NCryptQueryProtectionDescriptorName

1 0

Ken Thomases : kernel32: Overhaul the handling of argv in set_process_name ().
by Alexandre Julliard 15 Jul '16

15 Jul '16

Module: wine Branch: master Commit: a73045d6a018f5b8012ef53f53d3ea7786da8a0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a73045d6a018f5b8012ef53f5… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jul 11 23:44:20 2016 -0500 kernel32: Overhaul the handling of argv in set_process_name(). This fixes several problems with the code: * The code had been assuming that the argument strings pointed to by the argv array are contiguous iff certain process-name-setting functions are available. This doesn't seem reliable. Instead, test if it's true and shift the strings if so. However, setproctitle() is specifically documented as a preferred alternative to the technique of overwriting the arg strings, so don't shift the strings if that's available. * Use the last path component, recognizing backslash as a path separator, for setprogname() in addition to prctl(). First, setprogname() is documented as searching for the last component itself, but it doesn't understand Windows- style paths, so we need to help it. Second, on some platforms (e.g. macOS), setprogname(), like prctl(), has a fairly small internal length limit (e.g. 32 characters). So, concentrate on the most meaningful part of the path. * Remove argv[0] from argv whether or not there are any process-name-setting functions available. This is necessary for the proper functioning of Wine, so it must be done on all platforms. This part of the logic was lost with commit 5a4576ee0. * Call all available process-name-setting functions instead of treating them as mutually exclusive alternatives. This is also logic that was lost with commit 5a4576ee0. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 63 +++++++++++++++++++++++++++++-------------------- 1 file changed, 37 insertions(+), 26 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 4771108..5b584ac 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1116,39 +1116,36 @@ static DWORD WINAPI start_process( PEB *peb ) */ static void set_process_name( int argc, char *argv[] ) { + BOOL shift_strings; + char *p, *name; + int i; + #ifdef HAVE_SETPROCTITLE setproctitle("-%s", argv[1]); - /* remove argv[0] */ - memmove( argv, argv + 1, argc * sizeof(argv[0]) ); -#elif defined(HAVE_SETPROGNAME) - int i, offset; - char *end = argv[argc-1] + strlen(argv[argc-1]) + 1; - - offset = argv[1] - argv[0]; - memmove( argv[1] - offset, argv[1], end - argv[1] ); - memset( end - offset, 0, offset ); - for (i = 1; i < argc; i++) argv[i-1] = argv[i] - offset; - argv[i-1] = NULL; - - setprogname( argv[0] ); -#elif defined(HAVE_PRCTL) - int i, offset; - char *p, *prctl_name = argv[1]; - char *end = argv[argc-1] + strlen(argv[argc-1]) + 1; + shift_strings = FALSE; +#else + p = argv[0]; -#ifndef PR_SET_NAME -# define PR_SET_NAME 15 + shift_strings = (argc >= 2); + for (i = 1; i < argc; i++) + { + p += strlen(p) + 1; + if (p != argv[i]) + { + shift_strings = FALSE; + break; + } + } #endif - if ((p = strrchr( prctl_name, '\\' ))) prctl_name = p + 1; - if ((p = strrchr( prctl_name, '/' ))) prctl_name = p + 1; - - if (prctl( PR_SET_NAME, prctl_name ) != -1) + if (shift_strings) { - offset = argv[1] - argv[0]; - memmove( argv[1] - offset, argv[1], end - argv[1] ); + int offset = argv[1] - argv[0]; + char *end = argv[argc-1] + strlen(argv[argc-1]) + 1; + memmove( argv[0], argv[1], end - argv[1] ); memset( end - offset, 0, offset ); - for (i = 1; i < argc; i++) argv[i-1] = argv[i] - offset; + for (i = 1; i < argc; i++) + argv[i-1] = argv[i] - offset; argv[i-1] = NULL; } else @@ -1156,6 +1153,20 @@ static void set_process_name( int argc, char *argv[] ) /* remove argv[0] */ memmove( argv, argv + 1, argc * sizeof(argv[0]) ); } + + name = argv[0]; + if ((p = strrchr( name, '\\' ))) name = p + 1; + if ((p = strrchr( name, '/' ))) name = p + 1; + +#if defined(HAVE_SETPROGNAME) + setprogname( name ); +#endif + +#ifdef HAVE_PRCTL +#ifndef PR_SET_NAME +# define PR_SET_NAME 15 +#endif + prctl( PR_SET_NAME, name ); #endif /* HAVE_PRCTL */ }

1 0

Dmitry Timoshkov : ntdll: Add support for fs segment in ThreadDescriptorTableEntry query.
by Alexandre Julliard 15 Jul '16

15 Jul '16

Module: wine Branch: master Commit: d039d188f49d97b92694dbebcbbc72a8b30f29e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d039d188f49d97b92694dbebc… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jul 14 00:17:59 2016 +0200 ntdll: Add support for fs segment in ThreadDescriptorTableEntry query. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index f6a5fbe..6127c8f 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -1051,6 +1051,16 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, { if (sel == (wine_get_cs() & ~3)) tdi->Entry.HighWord.Bits.Type |= 8; /* code segment */ + else if (sel == (ntdll_get_thread_data()->fs & ~3)) + { + ULONG_PTR fs_base = (ULONG_PTR)NtCurrentTeb(); + tdi->Entry.BaseLow = fs_base & 0xffff; + tdi->Entry.HighWord.Bits.BaseMid = (fs_base >> 16) & 0xff; + tdi->Entry.HighWord.Bits.BaseHi = (fs_base >> 24) & 0xff; + tdi->Entry.LimitLow = 0x0fff; + tdi->Entry.HighWord.Bits.LimitHi = 0; + tdi->Entry.HighWord.Bits.Granularity = 0; + } else status = STATUS_ACCESS_DENIED; } }

1 0

Dmitry Timoshkov : kernel32/tests: Add tests for GetThreadSelectorEntry.
by Alexandre Julliard 15 Jul '16

15 Jul '16

Module: wine Branch: master Commit: 6870f3c0494876d2845d17ae164df82090a3d392 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6870f3c0494876d2845d17ae1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jul 14 00:18:18 2016 +0200 kernel32/tests: Add tests for GetThreadSelectorEntry. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/thread.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 034bdaa..b5ad1da 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1100,6 +1100,46 @@ static void test_SetThreadContext(void) CloseHandle( thread ); } +static void test_GetThreadSelectorEntry(void) +{ + LDT_ENTRY entry; + CONTEXT ctx; + DWORD limit; + void *base; + BOOL ret; + + memset(&ctx, 0x11, sizeof(ctx)); + ctx.ContextFlags = CONTEXT_SEGMENTS | CONTEXT_CONTROL; + ret = GetThreadContext(GetCurrentThread(), &ctx); + ok(ret, "GetThreadContext error %u\n", GetLastError()); + ok(!HIWORD(ctx.SegCs), "expected HIWORD(SegCs) == 0, got %u\n", ctx.SegCs); + ok(!HIWORD(ctx.SegDs), "expected HIWORD(SegDs) == 0, got %u\n", ctx.SegDs); + ok(!HIWORD(ctx.SegFs), "expected HIWORD(SegFs) == 0, got %u\n", ctx.SegFs); + + ret = GetThreadSelectorEntry(GetCurrentThread(), ctx.SegCs, &entry); + ok(ret, "GetThreadSelectorEntry(SegCs) error %u\n", GetLastError()); + ret = GetThreadSelectorEntry(GetCurrentThread(), ctx.SegDs, &entry); + ok(ret, "GetThreadSelectorEntry(SegDs) error %u\n", GetLastError()); + + memset(&entry, 0x11, sizeof(entry)); + ret = GetThreadSelectorEntry(GetCurrentThread(), ctx.SegFs, &entry); + ok(ret, "GetThreadSelectorEntry(SegFs) error %u\n", GetLastError()); + entry.HighWord.Bits.Type &= ~1; /* ignore accessed bit */ + + base = (void *)((entry.HighWord.Bits.BaseHi << 24) | (entry.HighWord.Bits.BaseMid << 16) | entry.BaseLow); + limit = (entry.HighWord.Bits.LimitHi << 16) | entry.LimitLow; + + ok(base == NtCurrentTeb(), "expected %p, got %p\n", NtCurrentTeb(), base); + ok(limit == 0x0fff || limit == 0x4000, "expected 0x0fff or 0x4000, got %#x\n", limit); + ok(entry.HighWord.Bits.Type == 0x12, "expected 0x12, got %#x\n", entry.HighWord.Bits.Type); + ok(entry.HighWord.Bits.Dpl == 3, "expected 3, got %u\n", entry.HighWord.Bits.Dpl); + ok(entry.HighWord.Bits.Pres == 1, "expected 1, got %u\n", entry.HighWord.Bits.Pres); + ok(entry.HighWord.Bits.Sys == 0, "expected 0, got %u\n", entry.HighWord.Bits.Sys); + ok(entry.HighWord.Bits.Reserved_0 == 0, "expected 0, got %u\n", entry.HighWord.Bits.Reserved_0); + ok(entry.HighWord.Bits.Default_Big == 1, "expected 1, got %u\n", entry.HighWord.Bits.Default_Big); + ok(entry.HighWord.Bits.Granularity == 0, "expected 0, got %u\n", entry.HighWord.Bits.Granularity); +} + #endif /* __i386__ */ static HANDLE finish_event; @@ -1965,6 +2005,7 @@ START_TEST(thread) test_GetThreadExitCode(); #ifdef __i386__ test_SetThreadContext(); + test_GetThreadSelectorEntry(); #endif test_QueueUserWorkItem(); test_RegisterWaitForSingleObject();

1 0

Nikolay Sivov : xmllite/writer: Close open tag with WriteFullEndElement().
by Alexandre Julliard 15 Jul '16

15 Jul '16

Module: wine Branch: master Commit: 8b2b455bd0f475333dc2b4b641aa4b871708bafd URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b2b455bd0f475333dc2b4b64… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 14 12:43:30 2016 +0300 xmllite/writer: Close open tag with WriteFullEndElement(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/writer.c | 75 +++++++++++++++++++++++++++++++++++++++++++++ dlls/xmllite/writer.c | 4 ++- 2 files changed, 78 insertions(+), 1 deletion(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 5e6769c..12433fa 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -1143,6 +1143,80 @@ todo_wine IStream_Release(stream); } +static void test_WriteFullEndElement(void) +{ + static const WCHAR aW[] = {'a',0}; + IXmlWriter *writer; + IStream *stream; + HRESULT hr; + + hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + /* standalone element */ + stream = writer_set_output(writer); + + hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_OmitXmlDeclaration, TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_Indent, TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteFullEndElement(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteEndDocument(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + CHECK_OUTPUT(stream, + "<a></a>"); + IStream_Release(stream); + + /* nested elements */ + stream = writer_set_output(writer); + + hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_OmitXmlDeclaration, TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_Indent, TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteFullEndElement(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteEndDocument(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + CHECK_OUTPUT(stream, + "<a>\r\n" + " <a></a>\r\n" + "</a>"); + + IXmlWriter_Release(writer); + IStream_Release(stream); +} + START_TEST(writer) { test_writer_create(); @@ -1160,4 +1234,5 @@ START_TEST(writer) test_WriteRaw(); test_indentation(); test_WriteAttributeString(); + test_WriteFullEndElement(); } diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index be5f0e1..2e630ee 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -947,11 +947,13 @@ static HRESULT WINAPI xmlwriter_WriteFullEndElement(IXmlWriter *iface) if (!element) return WR_E_INVALIDACTION; + writer_close_starttag(This); + writer_dec_indent(This); + /* write full end tag */ write_output_buffer(This->output, closeelementW, ARRAY_SIZE(closeelementW)); write_output_buffer(This->output, element->qname, element->len); write_output_buffer(This->output, gtW, ARRAY_SIZE(gtW)); - This->starttagopen = FALSE; return S_OK; }

1 0

Nikolay Sivov : xmllite/writer: Implement WriteCharEntity().
by Alexandre Julliard 15 Jul '16

15 Jul '16

Module: wine Branch: master Commit: 0fd4fae7c574dbfd710732485f3e96718da67a24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fd4fae7c574dbfd710732485… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 14 12:43:31 2016 +0300 xmllite/writer: Implement WriteCharEntity(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/writer.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/xmllite/writer.c | 12 ++++++++++-- 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 12433fa..661b837 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -1217,6 +1217,47 @@ static void test_WriteFullEndElement(void) IStream_Release(stream); } +static void test_WriteCharEntity(void) +{ + static const WCHAR aW[] = {'a',0}; + IXmlWriter *writer; + IStream *stream; + HRESULT hr; + + hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + /* without indentation */ + stream = writer_set_output(writer); + + hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_OmitXmlDeclaration, TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteCharEntity(writer, 0x100); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteEndDocument(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + CHECK_OUTPUT(stream, + "<a>Ā<a /></a>"); + + IXmlWriter_Release(writer); + IStream_Release(stream); +} + START_TEST(writer) { test_writer_create(); @@ -1235,4 +1276,5 @@ START_TEST(writer) test_indentation(); test_WriteAttributeString(); test_WriteFullEndElement(); + test_WriteCharEntity(); } diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 2e630ee..699095b 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -704,21 +704,29 @@ static HRESULT WINAPI xmlwriter_WriteCData(IXmlWriter *iface, LPCWSTR data) static HRESULT WINAPI xmlwriter_WriteCharEntity(IXmlWriter *iface, WCHAR ch) { + static const WCHAR fmtW[] = {'&','#','x','%','x',';',0}; xmlwriter *This = impl_from_IXmlWriter(iface); + WCHAR bufW[16]; - FIXME("%p %x\n", This, ch); + TRACE("%p %#x\n", This, ch); switch (This->state) { case XmlWriterState_Initial: return E_UNEXPECTED; + case XmlWriterState_ElemStarted: + writer_close_starttag(This); + break; case XmlWriterState_DocClosed: return WR_E_INVALIDACTION; default: ; } - return E_NOTIMPL; + sprintfW(bufW, fmtW, ch); + write_output_buffer(This->output, bufW, -1); + + return S_OK; } static HRESULT WINAPI xmlwriter_WriteChars(IXmlWriter *iface, const WCHAR *pwch, UINT cwch)

1 0

Nikolay Sivov : xmllite/writer: Fix formatted output with WriteFullEndElement().
by Alexandre Julliard 15 Jul '16

15 Jul '16

Module: wine Branch: master Commit: 099eda8eadfb9e7ee55aabb4dc5ef9913a929be2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=099eda8eadfb9e7ee55aabb4d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 14 12:43:32 2016 +0300 xmllite/writer: Fix formatted output with WriteFullEndElement(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/writer.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 699095b..bcc0e85 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -414,7 +414,6 @@ static HRESULT writer_close_starttag(xmlwriter *writer) if (!writer->starttagopen) return S_OK; hr = write_output_buffer(writer->output, gtW, ARRAY_SIZE(gtW)); writer->starttagopen = FALSE; - writer->state = XmlWriterState_Content; return hr; } @@ -958,6 +957,12 @@ static HRESULT WINAPI xmlwriter_WriteFullEndElement(IXmlWriter *iface) writer_close_starttag(This); writer_dec_indent(This); + /* don't force full end tag to the next line */ + if (This->state == XmlWriterState_ElemStarted) + This->state = XmlWriterState_Content; + else + write_node_indent(This); + /* write full end tag */ write_output_buffer(This->output, closeelementW, ARRAY_SIZE(closeelementW)); write_output_buffer(This->output, element->qname, element->len);

1 0

Nikolay Sivov : comctl32/trackbar: Update thumb on range change.
by Alexandre Julliard 15 Jul '16

15 Jul '16

Module: wine Branch: master Commit: cd55d747429980dea37295d0d6ce68e7b3c01686 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd55d747429980dea37295d0d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 14 23:39:53 2016 +0300 comctl32/trackbar: Update thumb on range change. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/trackbar.c | 23 +++++++++++++++++++++++ dlls/comctl32/trackbar.c | 16 ++++++++-------- 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index adb1b12..918cf1a 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -687,6 +687,7 @@ static void test_position(void) static void test_range(void) { HWND hWndTrackbar; + RECT rect1, rect2; int r; hWndTrackbar = create_trackbar(defaultstyle, hWndParent); @@ -752,6 +753,28 @@ static void test_range(void) ok_sequence(sequences, TRACKBAR_SEQ_INDEX, range_test_seq, "range test sequence", TRUE); ok_sequence(sequences, PARENT_SEQ_INDEX, parent_range_test_seq, "parent range test sequence", TRUE); + /* TBM_SETRANGE updates thumb visual position (rectangle) if needed */ + r = SendMessageA(hWndTrackbar, TBM_SETRANGE, TRUE, MAKELONG(-10, 0)); + ok(r == 0, "got %d\n", r); + SendMessageA(hWndTrackbar, TBM_SETPOS, TRUE, 0); + + RedrawWindow(hWndTrackbar, NULL, 0, RDW_UPDATENOW); + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect1); + + r = SendMessageA(hWndTrackbar, TBM_SETRANGE, TRUE, MAKELONG(-10, 10)); + ok(r == 0, "got %d\n", r); + RedrawWindow(hWndTrackbar, NULL, 0, RDW_UPDATENOW); + + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect2); + ok(!EqualRect(&rect1, &rect2), "thumb rectangle not updated\n"); + + /* change range back, don't force repaint */ + r = SendMessageA(hWndTrackbar, TBM_SETRANGE, FALSE, MAKELONG(-10, 0)); + ok(r == 0, "got %d\n", r); + + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect1); + ok(EqualRect(&rect1, &rect2), "thumb rectangle not updated\n"); + DestroyWindow(hWndTrackbar); } diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 8c99ad0..f79cc67 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1245,21 +1245,21 @@ TRACKBAR_SetRange (TRACKBAR_INFO *infoPtr, BOOL redraw, LONG range) infoPtr->lRangeMin = (SHORT)LOWORD(range); infoPtr->lRangeMax = (SHORT)HIWORD(range); - if (infoPtr->lPos < infoPtr->lRangeMin) { + /* clip position to new min/max limit */ + if (infoPtr->lPos < infoPtr->lRangeMin) infoPtr->lPos = infoPtr->lRangeMin; - infoPtr->flags |= TB_THUMBPOSCHANGED; - } - if (infoPtr->lPos > infoPtr->lRangeMax) { + if (infoPtr->lPos > infoPtr->lRangeMax) infoPtr->lPos = infoPtr->lRangeMax; - infoPtr->flags |= TB_THUMBPOSCHANGED; - } infoPtr->lPageSize = (infoPtr->lRangeMax - infoPtr->lRangeMin) / 5; if (infoPtr->lPageSize == 0) infoPtr->lPageSize = 1; - if (changed && (infoPtr->dwStyle & TBS_AUTOTICKS)) - TRACKBAR_RecalculateTics (infoPtr); + if (changed) { + if (infoPtr->dwStyle & TBS_AUTOTICKS) + TRACKBAR_RecalculateTics (infoPtr); + infoPtr->flags |= TB_THUMBPOSCHANGED; + } if (redraw) TRACKBAR_InvalidateAll(infoPtr);

1 0

Nikolay Sivov : comctl32/trackbar: Fix mouse position to thumb position conversion rounding.
by Alexandre Julliard 15 Jul '16

15 Jul '16

Module: wine Branch: master Commit: 6a237bdb603b36550abb57502d0fa1c27a57d7f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a237bdb603b36550abb57502… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 15 00:37:35 2016 +0300 comctl32/trackbar: Fix mouse position to thumb position conversion rounding. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/trackbar.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index f79cc67..43131ab 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -34,6 +34,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <math.h> #include "windef.h" #include "winbase.h" @@ -203,7 +204,7 @@ TRACKBAR_ConvertPlaceToPosition (const TRACKBAR_INFO *infoPtr, int place) pos = infoPtr->lRangeMin; TRACE("%.2f\n", pos); - return (LONG)(pos + 0.5); + return (LONG)floor(pos + 0.5); }

1 0

Jacek Caban : gdi32: Make CreateDIBSection hotpatchable.
by Alexandre Julliard 15 Jul '16

15 Jul '16

Module: wine Branch: master Commit: 585f6074b0650d2bde9e3acc7d40c553223ee543 URL: http://source.winehq.org/git/wine.git/?a=commit;h=585f6074b0650d2bde9e3acc7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 14 15:29:37 2016 +0200 gdi32: Make CreateDIBSection hotpatchable. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index c3009a2..fbeeb5b 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1478,8 +1478,8 @@ HBITMAP WINAPI CreateDIBitmap( HDC hdc, const BITMAPINFOHEADER *header, /*********************************************************************** * CreateDIBSection (GDI32.@) */ -HBITMAP WINAPI CreateDIBSection(HDC hdc, const BITMAPINFO *bmi, UINT usage, - VOID **bits, HANDLE section, DWORD offset) +HBITMAP WINAPI DECLSPEC_HOTPATCH CreateDIBSection(HDC hdc, const BITMAPINFO *bmi, UINT usage, + void **bits, HANDLE section, DWORD offset) { char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *info = (BITMAPINFO *)buffer;

1 0