wine-commits March 2017

wine-commits@winehq.org

2 participants
717 discussions

Henri Verbeet : usp10: Double the languages array size when growing it in GPOS_expand_language_cache ().
by Alexandre Julliard 28 Mar '17

28 Mar '17

Module: wine Branch: master Commit: 0ffd5b45ea610ffe9c0c4c7803cb3d98d64760ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ffd5b45ea610ffe9c0c4c780… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 27 22:57:02 2017 +0200 usp10: Double the languages array size when growing it in GPOS_expand_language_cache(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 15 ++++++++++----- dlls/usp10/usp10_internal.h | 3 ++- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 3786473..2731c44 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -2646,7 +2646,7 @@ static void GSUB_initialize_language_cache(LoadedScript *script) if (script->language_count) { - TRACE("Deflang %p, LangCount %i\n",script->default_language.gsub_table, script->language_count); + TRACE("Deflang %p, LangCount %li\n",script->default_language.gsub_table, script->language_count); script->languages = heap_alloc_zero(script->language_count * sizeof(*script->languages)); @@ -2705,10 +2705,15 @@ static void GPOS_expand_language_cache(LoadedScript *script) if (!(language = usp10_script_get_language(script, tag))) { - script->language_count++; - script->languages = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - script->languages, script->language_count * sizeof(*script->languages)); - language = &script->languages[script->language_count - 1]; + if (!usp10_array_reserve((void **)&script->languages, &script->languages_size, + script->language_count + 1, sizeof(*script->languages))) + { + ERR("Failed grow languages array.\n"); + return; + } + + language = &script->languages[script->language_count]; + ++script->language_count; language->tag = tag; } language->gpos_table = (const BYTE *)table + offset; diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 9a8b5131..2dfca86 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -164,8 +164,9 @@ typedef struct { const void *gpos_table; LoadedLanguage default_language; BOOL languages_initialized; - INT language_count; LoadedLanguage *languages; + SIZE_T languages_size; + SIZE_T language_count; } LoadedScript; typedef struct {

1 0

Henri Verbeet : usp10: Double the scripts array size when growing it in GPOS_expand_script_cache ().
by Alexandre Julliard 28 Mar '17

28 Mar '17

Module: wine Branch: master Commit: 218be443b66518b265f266c02d2e89d6e2fad092 URL: http://source.winehq.org/git/wine.git/?a=commit;h=218be443b66518b265f266c02… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 27 22:57:01 2017 +0200 usp10: Double the scripts array size when growing it in GPOS_expand_script_cache(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 17 +++++++++++------ dlls/usp10/usp10.c | 30 ++++++++++++++++++++++++++++++ dlls/usp10/usp10_internal.h | 4 +++- 3 files changed, 44 insertions(+), 7 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index b58731a..3786473 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -2504,7 +2504,7 @@ static void GSUB_initialize_script_cache(ScriptCache *psc) const GSUB_Header* header = (const GSUB_Header*)psc->GSUB_Table; script = (const OT_ScriptList*)((const BYTE*)header + GET_BE_WORD(header->ScriptList)); psc->script_count = GET_BE_WORD(script->ScriptCount); - TRACE("initializing %i scripts in this font\n",psc->script_count); + TRACE("initializing %li scripts in this font\n",psc->script_count); if (psc->script_count) { psc->scripts = heap_alloc_zero(psc->script_count * sizeof(*psc->scripts)); @@ -2537,7 +2537,7 @@ static void GPOS_expand_script_cache(ScriptCache *psc) if (!psc->script_count) { psc->script_count = count; - TRACE("initializing %i scripts in this font\n",psc->script_count); + TRACE("initializing %li scripts in this font\n",psc->script_count); if (psc->script_count) { psc->scripts = heap_alloc_zero(psc->script_count * sizeof(*psc->scripts)); @@ -2558,10 +2558,15 @@ static void GPOS_expand_script_cache(ScriptCache *psc) if (!(loaded_script = usp10_script_cache_get_script(psc, tag))) { - psc->script_count++; - psc->scripts = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - psc->scripts, psc->script_count * sizeof(*psc->scripts)); - loaded_script = &psc->scripts[psc->script_count - 1]; + if (!usp10_array_reserve((void **)&psc->scripts, &psc->scripts_size, + psc->script_count + 1, sizeof(*psc->scripts))) + { + ERR("Failed grow scripts array.\n"); + return; + } + + loaded_script = &psc->scripts[psc->script_count]; + ++psc->script_count; loaded_script->tag = tag; } loaded_script->gpos_table = (const BYTE *)script + offset; diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index d7b7d9a..2df27be 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -708,6 +708,36 @@ typedef struct { WORD target; } FindGlyph_struct; +BOOL usp10_array_reserve(void **elements, SIZE_T *capacity, SIZE_T count, SIZE_T size) +{ + SIZE_T max_capacity, new_capacity; + void *new_elements; + + if (count <= *capacity) + return TRUE; + + max_capacity = ~(SIZE_T)0 / size; + if (count > max_capacity) + return FALSE; + + new_capacity = max(1, *capacity); + while (new_capacity < count && new_capacity <= max_capacity / 2) + new_capacity *= 2; + if (new_capacity < count) + new_capacity = count; + + if (!*elements) + new_elements = heap_alloc_zero(new_capacity * size); + else + new_elements = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, *elements, new_capacity * size); + if (!new_elements) + return FALSE; + + *elements = new_elements; + *capacity = new_capacity; + return TRUE; +} + /* TODO Fix font properties on Arabic locale */ static inline BOOL set_cache_font_properties(const HDC hdc, ScriptCache *sc) { diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index f906885..9a8b5131 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -186,8 +186,9 @@ typedef struct { void *CMAP_format12_Table; void *GPOS_Table; BOOL scripts_initialized; - INT script_count; LoadedScript *scripts; + SIZE_T scripts_size; + SIZE_T script_count; OPENTYPE_TAG userScript; OPENTYPE_TAG userLang; @@ -245,6 +246,7 @@ typedef void (*reorder_function)(WCHAR *chars, IndicSyllable *syllable, lexical_ #define BIDI_WEAK 2 #define BIDI_NEUTRAL 0 +BOOL usp10_array_reserve(void **elements, SIZE_T *capacity, SIZE_T count, SIZE_T size) DECLSPEC_HIDDEN; int USP10_FindGlyphInLogClust(const WORD* pwLogClust, int cChars, WORD target) DECLSPEC_HIDDEN; BOOL BIDI_DetermineLevels(const WCHAR *string, unsigned int count, const SCRIPT_STATE *s,

1 0

Henri Verbeet : usp10: Introduce a helper function to lookup a language in a LoadedScript structure.
by Alexandre Julliard 28 Mar '17

28 Mar '17

Module: wine Branch: master Commit: 9a15753d40f7dbd90eadb270b03bb0ddb8411ad3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a15753d40f7dbd90eadb270b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 27 22:57:00 2017 +0200 usp10: Introduce a helper function to lookup a language in a LoadedScript structure. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index e5e7ece..b58731a 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -2610,6 +2610,19 @@ HRESULT OpenType_GetFontScriptTags(ScriptCache *psc, OPENTYPE_TAG searchingFor, return rc; } +static LoadedLanguage *usp10_script_get_language(LoadedScript *script, OPENTYPE_TAG tag) +{ + size_t i; + + for (i = 0; i < script->language_count; ++i) + { + if (script->languages[i].tag == tag) + return &script->languages[i]; + } + + return NULL; +} + static void GSUB_initialize_language_cache(LoadedScript *script) { int i; @@ -2646,6 +2659,7 @@ static void GPOS_expand_language_cache(LoadedScript *script) { int count; const OT_Script* table = script->gpos_table; + LoadedLanguage *language; DWORD offset; if (!table) @@ -2678,27 +2692,21 @@ static void GPOS_expand_language_cache(LoadedScript *script) } else if (count) { - int i,j; + int i; for (i = 0; i < count; i++) { int offset = GET_BE_WORD(table->LangSysRecord[i].LangSys); OPENTYPE_TAG tag = MS_MAKE_TAG(table->LangSysRecord[i].LangSysTag[0], table->LangSysRecord[i].LangSysTag[1], table->LangSysRecord[i].LangSysTag[2], table->LangSysRecord[i].LangSysTag[3]); - for (j = 0; j < script->language_count; j++) - { - if (script->languages[j].tag == tag) - { - script->languages[j].gpos_table = ((const BYTE*)table + offset); - break; - } - } - if (j == script->language_count) + if (!(language = usp10_script_get_language(script, tag))) { script->language_count++; - script->languages = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,script->languages, sizeof(LoadedLanguage) * script->language_count); - script->languages[j].tag = tag; - script->languages[j].gpos_table = ((const BYTE*)table + offset); + script->languages = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + script->languages, script->language_count * sizeof(*script->languages)); + language = &script->languages[script->language_count - 1]; + language->tag = tag; } + language->gpos_table = (const BYTE *)table + offset; } } } @@ -2919,16 +2927,7 @@ HRESULT OpenType_GetFontFeatureTags(ScriptCache *psc, OPENTYPE_TAG script_tag, O if ((script->default_language.gsub_table || script->default_language.gpos_table) && script->default_language.tag == language_tag) language = &script->default_language; else - { - for (i = 0; i < script->language_count; i++) - { - if (script->languages[i].tag == language_tag) - { - language = &script->languages[i]; - break; - } - } - } + language = usp10_script_get_language(script, language_tag); if (!language) {

1 0

Jacek Caban : ntdll/tests: Moved pipe read tests to pipe.c.
by Alexandre Julliard 28 Mar '17

28 Mar '17

Module: wine Branch: master Commit: 7c26ebfc994d4f884c41e2d0bdf6fb2bf3267a48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c26ebfc994d4f884c41e2d0b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 28 13:19:25 2017 +0200 ntdll/tests: Moved pipe read tests to pipe.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 271 +-------------------------------------------- dlls/ntdll/tests/pipe.c | 287 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 289 insertions(+), 269 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7c26ebfc994d4f884c41e…

1 0

Jacek Caban : kernel32/tests: Added tests of pipe write cancelled on process termintation.
by Alexandre Julliard 28 Mar '17

28 Mar '17

Module: wine Branch: master Commit: 95988a9fefda1719fa38d0ec7f4e757ea41262c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95988a9fefda1719fa38d0ec7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 28 12:29:44 2017 +0200 kernel32/tests: Added tests of pipe write cancelled on process termintation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 64 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 63 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index cf2a3a3..fb6d3c0 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -2807,6 +2807,34 @@ static void test_blocking_rw(HANDLE writer, HANDLE reader, DWORD buf_size, BOOL test_flush_done(flush_thread); } +static void child_process_write_pipe(HANDLE pipe) +{ + OVERLAPPED overlapped; + char buf[10000]; + + memset(buf, 'x', sizeof(buf)); + overlapped_write_async(pipe, buf, sizeof(buf), &overlapped); + + /* sleep until parent process terminates this process */ + Sleep(INFINITE); +} + +static HANDLE create_writepipe_process(HANDLE pipe) +{ + STARTUPINFOA si = { sizeof(si) }; + PROCESS_INFORMATION info; + char **argv, buf[MAX_PATH]; + BOOL res; + + winetest_get_mainargs(&argv); + sprintf(buf, "\"%s\" pipe writepipe %lx", argv[0], (UINT_PTR)pipe); + res = CreateProcessA(NULL, buf, NULL, NULL, TRUE, 0L, NULL, NULL, &si, &info); + ok(res, "CreateProcess failed: %u\n", GetLastError()); + CloseHandle(info.hThread); + + return info.hProcess; +} + static void create_overlapped_pipe(DWORD mode, HANDLE *client, HANDLE *server) { SECURITY_ATTRIBUTES sec_attr = { sizeof(sec_attr), NULL, TRUE }; @@ -2826,7 +2854,7 @@ static void create_overlapped_pipe(DWORD mode, HANDLE *client, HANDLE *server) test_not_signaled(*server); test_not_signaled(overlapped.hEvent); - *client = CreateFileA(PIPENAME, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL); + *client = CreateFileA(PIPENAME, GENERIC_READ | GENERIC_WRITE, 0, &sec_attr, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL); ok(*server != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); res = SetNamedPipeHandleState(*client, &read_mode, NULL, NULL); @@ -2841,6 +2869,8 @@ static void test_overlapped_transport(BOOL msg_mode, BOOL msg_read_mode) { OVERLAPPED overlapped, overlapped2; HANDLE server, client, flush; + DWORD read_bytes; + HANDLE process; char buf[60000]; BOOL res; @@ -2890,10 +2920,32 @@ static void test_overlapped_transport(BOOL msg_mode, BOOL msg_read_mode) test_flush_done(flush); CloseHandle(server); CloseHandle(client); + + /* terminate process with pending write */ + create_overlapped_pipe(create_flags, &client, &server); + process = create_writepipe_process(client); + /* succesfully read part of write that is pending in child process */ + res = ReadFile(server, buf, 10, &read_bytes, NULL); + if(!msg_read_mode) + ok(res, "ReadFile failed: %u\n", GetLastError()); + else + ok(!res && GetLastError() == ERROR_MORE_DATA, "ReadFile returned: %x %u\n", res, GetLastError()); + ok(read_bytes == 10, "read_bytes = %u\n", read_bytes); + TerminateProcess(process, 0); + winetest_wait_child_process(process); + /* after terminating process, there is no pending write and pipe buffer is empty */ + overlapped_read_async(server, buf, 10, &overlapped); + overlapped_write_sync(client, buf, 1); + test_overlapped_result(server, &overlapped, 1, FALSE); + CloseHandle(process); + CloseHandle(server); + CloseHandle(client); } START_TEST(pipe) { + char **argv; + int argc; HMODULE hmod; hmod = GetModuleHandleA("advapi32.dll"); @@ -2902,6 +2954,16 @@ START_TEST(pipe) pQueueUserAPC = (void *) GetProcAddress(hmod, "QueueUserAPC"); pCancelIoEx = (void *) GetProcAddress(hmod, "CancelIoEx"); + argc = winetest_get_mainargs(&argv); + + if (argc > 3 && !strcmp(argv[2], "writepipe")) + { + UINT_PTR handle; + sscanf(argv[3], "%lx", &handle); + child_process_write_pipe((HANDLE)handle); + return; + } + if (test_DisconnectNamedPipe()) return; test_CreateNamedPipe_instances_must_match();

1 0

Hans Leidekker : msi: Avoid zero size allocations (Valgrind).
by Alexandre Julliard 28 Mar '17

28 Mar '17

Module: wine Branch: master Commit: d12728a872b03a537ee6d92789fb6cbd2d86ba1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d12728a872b03a537ee6d9278… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 28 10:45:56 2017 +0200 msi: Avoid zero size allocations (Valgrind). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/table.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 2b36091..b364d97 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -422,13 +422,11 @@ static UINT read_table_from_storage( MSIDATABASE *db, MSITABLE *t, IStorage *stg goto err; } - t->row_count = rawsize / row_size; - t->data = msi_alloc_zero( t->row_count * sizeof (USHORT*) ); - if( !t->data ) - goto err; - t->data_persistent = msi_alloc_zero( t->row_count * sizeof(BOOL)); - if ( !t->data_persistent ) - goto err; + if ((t->row_count = rawsize / row_size)) + { + if (!(t->data = msi_alloc_zero( t->row_count * sizeof(USHORT *) ))) goto err; + if (!(t->data_persistent = msi_alloc_zero( t->row_count * sizeof(BOOL) ))) goto err; + } /* transpose all the data */ TRACE("Transposing data from %d rows\n", t->row_count );

1 0

Alex Henrie : kernel32: Check for invalid flags in codepage conversion functions.
by Alexandre Julliard 28 Mar '17

28 Mar '17

Module: wine Branch: master Commit: 0b95ebd283986fa179c7ec6d2ea3f34c977c3aaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b95ebd283986fa179c7ec6d2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Mar 27 21:59:05 2017 -0600 kernel32: Check for invalid flags in codepage conversion functions. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 23 +++++++++++++++++++++++ dlls/kernel32/tests/codepage.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index ca59751..e14aedb 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -54,6 +54,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(nls); #define LOCALE_LOCALEINFOFLAGSMASK (LOCALE_NOUSEROVERRIDE|LOCALE_USE_CP_ACP|\ LOCALE_RETURN_NUMBER|LOCALE_RETURN_GENITIVE_NAMES) +#define MB_FLAGSMASK (MB_PRECOMPOSED|MB_COMPOSITE|MB_USEGLYPHCHARS|MB_ERR_INVALID_CHARS) +#define WC_FLAGSMASK (WC_DISCARDNS|WC_SEPCHARS|WC_DEFAULTCHAR|WC_ERR_INVALID_CHARS|\ + WC_COMPOSITECHECK|WC_NO_BEST_FIT_CHARS) /* current code pages */ static const union cptable *ansi_cptable; @@ -2422,6 +2425,11 @@ INT WINAPI MultiByteToWideChar( UINT page, DWORD flags, LPCSTR src, INT srclen, #endif /* fall through */ case CP_UTF8: + if (flags & ~MB_FLAGSMASK) + { + SetLastError( ERROR_INVALID_FLAGS ); + return 0; + } ret = wine_utf8_mbstowcs( flags, src, srclen, dst, dstlen ); break; default: @@ -2430,6 +2438,11 @@ INT WINAPI MultiByteToWideChar( UINT page, DWORD flags, LPCSTR src, INT srclen, SetLastError( ERROR_INVALID_PARAMETER ); return 0; } + if (flags & ~MB_FLAGSMASK) + { + SetLastError( ERROR_INVALID_FLAGS ); + return 0; + } ret = wine_cp_mbstowcs( table, flags, src, srclen, dst, dstlen ); break; } @@ -2653,6 +2666,11 @@ INT WINAPI WideCharToMultiByte( UINT page, DWORD flags, LPCWSTR src, INT srclen, SetLastError( ERROR_INVALID_PARAMETER ); return 0; } + if (flags & ~WC_FLAGSMASK) + { + SetLastError( ERROR_INVALID_FLAGS ); + return 0; + } ret = wine_utf8_wcstombs( flags, src, srclen, dst, dstlen ); break; default: @@ -2661,6 +2679,11 @@ INT WINAPI WideCharToMultiByte( UINT page, DWORD flags, LPCWSTR src, INT srclen, SetLastError( ERROR_INVALID_PARAMETER ); return 0; } + if (flags & ~WC_FLAGSMASK) + { + SetLastError( ERROR_INVALID_FLAGS ); + return 0; + } ret = wine_cp_wcstombs( table, flags, src, srclen, dst, dstlen, defchar, used ? &used_tmp : NULL ); if (used) *used = used_tmp; diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index 8eccf99..7389d93 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -209,6 +209,40 @@ static void test_other_invalid_parameters(void) BOOL used; INT len; + /* Unrecognized flag => ERROR_INVALID_FLAGS */ + SetLastError(0xdeadbeef); + len = WideCharToMultiByte(CP_ACP, 0x100, w_string, -1, c_string, c_string_len, NULL, NULL); + ok(len == 0 && GetLastError() == ERROR_INVALID_FLAGS, "len=%d error=%x\n", len, GetLastError()); + + SetLastError(0xdeadbeef); + len = WideCharToMultiByte(CP_ACP, 0x800, w_string, -1, c_string, c_string_len, NULL, NULL); + ok(len == 0 && GetLastError() == ERROR_INVALID_FLAGS, "len=%d error=%x\n", len, GetLastError()); + + SetLastError(0xdeadbeef); + len = MultiByteToWideChar(CP_ACP, 0x10, c_string, -1, w_string, w_string_len); + ok(len == 0 && GetLastError() == ERROR_INVALID_FLAGS, "len=%d error=%x\n", len, GetLastError()); + + + /* Unrecognized flag and invalid codepage => ERROR_INVALID_PARAMETER */ + SetLastError(0xdeadbeef); + len = WideCharToMultiByte(0xdeadbeef, 0x100, w_string, w_string_len, c_string, c_string_len, NULL, NULL); + ok(len == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "len=%d error=%x\n", len, GetLastError()); + + SetLastError(0xdeadbeef); + len = MultiByteToWideChar(0xdeadbeef, 0x10, c_string, c_string_len, w_string, w_string_len); + ok(len == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "len=%d error=%x\n", len, GetLastError()); + + + /* Unrecognized flag and src is NULL => ERROR_INVALID_PARAMETER */ + SetLastError(0xdeadbeef); + len = WideCharToMultiByte(CP_ACP, 0x100, NULL, -1, c_string, c_string_len, NULL, NULL); + ok(len == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "len=%d error=%x\n", len, GetLastError()); + + SetLastError(0xdeadbeef); + len = MultiByteToWideChar(CP_ACP, 0x10, NULL, -1, w_string, w_string_len); + ok(len == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "len=%d error=%x\n", len, GetLastError()); + + /* srclen=0 => ERROR_INVALID_PARAMETER */ SetLastError(0xdeadbeef); len = WideCharToMultiByte(CP_ACP, 0, w_string, 0, c_string, c_string_len, NULL, NULL); @@ -266,6 +300,11 @@ static void test_other_invalid_parameters(void) SetLastError(0xdeadbeef); len = WideCharToMultiByte(CP_UTF7, 1, w_string, w_string_len, c_string, c_string_len, NULL, &used); ok(len == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "len=%d error=%x\n", len, GetLastError()); + + /* CP_UTF8, unrecognized flag and used not NULL => ERROR_INVALID_PARAMETER */ + SetLastError(0xdeadbeef); + len = WideCharToMultiByte(CP_UTF8, 0x100, w_string, w_string_len, c_string, c_string_len, NULL, &used); + ok(len == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "len=%d error=%x\n", len, GetLastError()); } static void test_overlapped_buffers(void)

1 0

Austin English : advapi32: Sync spec file to Windows 10.
by Alexandre Julliard 28 Mar '17

28 Mar '17

Module: wine Branch: master Commit: be6008d2eb8f5c50061eb44628cd4c65a1cc0e10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be6008d2eb8f5c50061eb4462… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Mar 27 16:27:35 2017 -0500 advapi32: Sync spec file to Windows 10. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 90 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 68 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=be6008d2eb8f5c50061eb…

1 0

Alistair Leslie-Hughes : ole32: Add CoRegisterSurrogate/Ex stubs.
by Alexandre Julliard 28 Mar '17

28 Mar '17

Module: wine Branch: master Commit: b399bafa121aa9358d03c55d6eed1e762b3c535d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b399bafa121aa9358d03c55d6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Mar 28 08:37:11 2017 +0100 ole32: Add CoRegisterSurrogate/Ex stubs. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-com-l1-1-0.spec | 2 +- .../api-ms-win-core-com-l1-1-1.spec | 2 +- .../api-ms-win-core-com-private-l1-1-0.spec | 2 +- dlls/combase/combase.spec | 4 ++-- dlls/ole32/compobj.c | 20 ++++++++++++++++++++ dlls/ole32/ole32.spec | 4 ++-- 6 files changed, 27 insertions(+), 7 deletions(-) diff --git a/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec b/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec index f645c9d..954d6da 100644 --- a/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec +++ b/dlls/api-ms-win-core-com-l1-1-0/api-ms-win-core-com-l1-1-0.spec @@ -49,7 +49,7 @@ @ stdcall CoQueryProxyBlanket(ptr ptr ptr ptr ptr ptr ptr ptr) ole32.CoQueryProxyBlanket @ stdcall CoRegisterClassObject(ptr ptr long long ptr) ole32.CoRegisterClassObject @ stdcall CoRegisterPSClsid(ptr ptr) ole32.CoRegisterPSClsid -@ stub CoRegisterSurrogate +@ stdcall CoRegisterSurrogate(ptr) ole32.CoRegisterSurrogate @ stdcall CoReleaseMarshalData(ptr) ole32.CoReleaseMarshalData @ stdcall CoReleaseServerProcess() ole32.CoReleaseServerProcess @ stdcall CoResumeClassObjects() ole32.CoResumeClassObjects diff --git a/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec b/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec index d2914f0..a124d34 100644 --- a/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec +++ b/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec @@ -50,7 +50,7 @@ @ stub CoRegisterActivationFilter @ stdcall CoRegisterClassObject(ptr ptr long long ptr) ole32.CoRegisterClassObject @ stdcall CoRegisterPSClsid(ptr ptr) ole32.CoRegisterPSClsid -@ stub CoRegisterSurrogate +@ stdcall CoRegisterSurrogate(ptr) ole32.CoRegisterSurrogate @ stdcall CoReleaseMarshalData(ptr) ole32.CoReleaseMarshalData @ stdcall CoReleaseServerProcess() ole32.CoReleaseServerProcess @ stdcall CoResumeClassObjects() ole32.CoResumeClassObjects diff --git a/dlls/api-ms-win-core-com-private-l1-1-0/api-ms-win-core-com-private-l1-1-0.spec b/dlls/api-ms-win-core-com-private-l1-1-0/api-ms-win-core-com-private-l1-1-0.spec index 14d3b27..13ee601 100644 --- a/dlls/api-ms-win-core-com-private-l1-1-0/api-ms-win-core-com-private-l1-1-0.spec +++ b/dlls/api-ms-win-core-com-private-l1-1-0/api-ms-win-core-com-private-l1-1-0.spec @@ -22,7 +22,7 @@ @ stdcall CoRegisterInitializeSpy(ptr ptr) ole32.CoRegisterInitializeSpy @ stdcall CoRegisterMallocSpy(ptr) ole32.CoRegisterMallocSpy @ stdcall CoRegisterMessageFilter(ptr ptr) ole32.CoRegisterMessageFilter -@ stub CoRegisterSurrogateEx +@ stdcall CoRegisterSurrogateEx(ptr ptr) ole32.CoRegisterSurrogateEx @ stub CoRetireServer @ stdcall CoRevokeInitializeSpy(int64) ole32.CoRevokeInitializeSpy @ stdcall CoRevokeMallocSpy() ole32.CoRevokeMallocSpy diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index b612bef..493e796 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -138,8 +138,8 @@ @ stdcall CoRegisterMallocSpy(ptr) ole32.CoRegisterMallocSpy @ stdcall CoRegisterMessageFilter(ptr ptr) ole32.CoRegisterMessageFilter @ stdcall CoRegisterPSClsid(ptr ptr) ole32.CoRegisterPSClsid -@ stub CoRegisterSurrogate -@ stub CoRegisterSurrogateEx +@ stdcall CoRegisterSurrogate(ptr) ole32.CoRegisterSurrogate +@ stdcall CoRegisterSurrogateEx(ptr ptr) ole32.CoRegisterSurrogateEx @ stdcall CoReleaseMarshalData(ptr) ole32.CoReleaseMarshalData @ stdcall CoReleaseServerProcess() ole32.CoReleaseServerProcess @ stdcall CoResumeClassObjects() ole32.CoResumeClassObjects diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 7dd10a7..1ce9cec 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -5074,6 +5074,26 @@ HRESULT WINAPI CoGetApartmentType(APTTYPE *type, APTTYPEQUALIFIER *qualifier) return info->apt ? S_OK : CO_E_NOTINITIALIZED; } +/*********************************************************************** + * CoRegisterSurrogate [OLE32.@] + */ +HRESULT WINAPI CoRegisterSurrogate(ISurrogate *surrogate) +{ + FIXME("(%p): stub\n", surrogate); + + return E_NOTIMPL; +} + +/*********************************************************************** + * CoRegisterSurrogateEx [OLE32.@] + */ +HRESULT WINAPI CoRegisterSurrogateEx(REFGUID guid, void *reserved) +{ + FIXME("(%s %p): stub\n", debugstr_guid(guid), reserved); + + return E_NOTIMPL; +} + typedef struct { IGlobalOptions IGlobalOptions_iface; LONG ref; diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index eab8664..58bdd22 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -66,8 +66,8 @@ @ stdcall CoRegisterMallocSpy (ptr) @ stdcall CoRegisterMessageFilter(ptr ptr) @ stdcall CoRegisterPSClsid(ptr ptr) -@ stub CoRegisterSurrogate -@ stub CoRegisterSurrogateEx +@ stdcall CoRegisterSurrogate(ptr) +@ stdcall CoRegisterSurrogateEx(ptr ptr) @ stdcall CoReleaseMarshalData(ptr) @ stdcall CoReleaseServerProcess() @ stdcall CoResumeClassObjects()

1 0

Nikolay Sivov : msxml3: Added support for setting IResponse as xsl processor output.
by Alexandre Julliard 28 Mar '17

28 Mar '17

Module: wine Branch: master Commit: cebed397c335490c57389245b6e365b651a2f796 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cebed397c335490c57389245b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 28 00:04:33 2017 +0300 msxml3: Added support for setting IResponse as xsl processor output. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/stylesheet.c | 72 ++++++++++++++++++++++++++++++++++++++++------ dlls/msxml3/tests/domdoc.c | 22 ++++++++++++-- 2 files changed, 84 insertions(+), 10 deletions(-) diff --git a/dlls/msxml3/stylesheet.c b/dlls/msxml3/stylesheet.c index 74a9180..4c4f60e 100644 --- a/dlls/msxml3/stylesheet.c +++ b/dlls/msxml3/stylesheet.c @@ -36,6 +36,9 @@ #include "msxml_private.h" +#include "initguid.h" +#include "asptlb.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msxml); @@ -54,6 +57,7 @@ enum output_type PROCESSOR_OUTPUT_NOT_SET, PROCESSOR_OUTPUT_STREAM, /* IStream or ISequentialStream */ PROCESSOR_OUTPUT_PERSISTSTREAM, /* IPersistStream or IPersistStreamInit */ + PROCESSOR_OUTPUT_RESPONSE, /* IResponse */ }; typedef struct @@ -70,6 +74,7 @@ typedef struct IUnknown *unk; ISequentialStream *stream; IPersistStream *persiststream; + IResponse *response; } output; enum output_type output_type; BSTR outstr; @@ -493,7 +498,11 @@ static HRESULT WINAPI xslprocessor_put_output( hr = IUnknown_QueryInterface(V_UNKNOWN(&var), &IID_IStream, (void **)&output); if (FAILED(hr)) hr = IUnknown_QueryInterface(V_UNKNOWN(&var), &IID_ISequentialStream, (void **)&output); - /* FIXME: try IResponse */ + if (FAILED(hr)) + { + output_type = PROCESSOR_OUTPUT_RESPONSE; + hr = IUnknown_QueryInterface(V_UNKNOWN(&var), &IID_IResponse, (void **)&output); + } if (FAILED(hr)) { output_type = PROCESSOR_OUTPUT_PERSISTSTREAM; @@ -570,20 +579,67 @@ static HRESULT WINAPI xslprocessor_transform( stream = This->output.stream; ISequentialStream_AddRef(stream); } - else if (This->output_type == PROCESSOR_OUTPUT_PERSISTSTREAM) + else if (This->output_type == PROCESSOR_OUTPUT_PERSISTSTREAM || + This->output_type == PROCESSOR_OUTPUT_RESPONSE) + { CreateStreamOnHGlobal(NULL, TRUE, (IStream **)&stream); + } hr = node_transform_node_params(get_node_obj(This->input), This->stylesheet->node, &This->outstr, stream, &This->params); - if (SUCCEEDED(hr) && This->output_type == PROCESSOR_OUTPUT_PERSISTSTREAM) + if (SUCCEEDED(hr)) { IStream *src = (IStream *)stream; - LARGE_INTEGER zero; - /* for IPersistStream* output seekable stream is used */ - zero.QuadPart = 0; - IStream_Seek(src, zero, STREAM_SEEK_SET, NULL); - hr = IPersistStream_Load(This->output.persiststream, src); + switch (This->output_type) + { + case PROCESSOR_OUTPUT_PERSISTSTREAM: + { + LARGE_INTEGER zero; + + /* for IPersistStream* output seekable stream is used */ + zero.QuadPart = 0; + IStream_Seek(src, zero, STREAM_SEEK_SET, NULL); + hr = IPersistStream_Load(This->output.persiststream, src); + break; + } + case PROCESSOR_OUTPUT_RESPONSE: + { + SAFEARRAYBOUND bound; + SAFEARRAY *array; + HGLOBAL hglobal; + VARIANT bin; + DWORD size; + void *dest; + + GetHGlobalFromStream(src, &hglobal); + size = GlobalSize(hglobal); + + bound.lLbound = 0; + bound.cElements = size; + if (!(array = SafeArrayCreate(VT_UI1, 1, &bound))) + break; + + V_VT(&bin) = VT_ARRAY | VT_UI1; + V_ARRAY(&bin) = array; + + hr = SafeArrayAccessData(array, &dest); + if (hr == S_OK) + { + void *data = GlobalLock(hglobal); + memcpy(dest, data, size); + GlobalUnlock(hglobal); + SafeArrayUnaccessData(array); + + IResponse_BinaryWrite(This->output.response, bin); + } + + VariantClear(&bin); + break; + } + default: + ; + } } if (stream) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 3713490..4bac5a1 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -361,7 +361,6 @@ static HRESULT WINAPI response_QI(IResponse *iface, REFIID riid, void **obj) } if (!IsEqualIID(&IID_IStream, riid) && !IsEqualIID(&IID_ISequentialStream, riid)) -todo_wine ok(0, "unexpected call\n"); return E_NOINTERFACE; } @@ -488,7 +487,25 @@ static HRESULT WINAPI response_AppendToLog(IResponse *iface, BSTR bstrLogEntry) static HRESULT WINAPI response_BinaryWrite(IResponse *iface, VARIANT input) { + HRESULT hr; + LONG bound; + UINT dim; + ok(V_VT(&input) == (VT_ARRAY | VT_UI1), "got wrong input type %x\n", V_VT(&input)); + + dim = SafeArrayGetDim(V_ARRAY(&input)); + ok(dim == 1, "got wrong array dimensions %u\n", dim); + + bound = 1; + hr = SafeArrayGetLBound(V_ARRAY(&input), 1, &bound); + ok(hr == S_OK, "got %#x\n", hr); + ok(bound == 0, "wrong array low bound %d\n", bound); + + bound = 0; + hr = SafeArrayGetUBound(V_ARRAY(&input), 1, &bound); + ok(hr == S_OK, "got %#x\n", hr); + ok(bound > 0, "wrong array high bound %d\n", bound); + return E_NOTIMPL; } @@ -8977,11 +8994,12 @@ todo_wine { V_VT(&v) = VT_UNKNOWN; V_UNKNOWN(&v) = (IUnknown *)&testresponse; hr = IXSLProcessor_put_output(processor, v); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + b = VARIANT_FALSE; hr = IXSLProcessor_transform(processor, &b); ok(hr == S_OK, "got 0x%08x\n", hr); + ok(b == VARIANT_TRUE, "got %x\n", b); IXSLProcessor_Release(processor); IXMLDOMDocument_Release(doc2);

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2017