June 2017 - wine-commits

Daniel Lehman : msvcrt: Clean up registered C++ objects in handler.
by Alexandre Julliard 14 Jun '17

14 Jun '17

Module: wine Branch: master Commit: 57266eec5e6e8f3f064e24fa21b7e0bd92a2f1b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57266eec5e6e8f3f064e24fa2… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Jun 14 11:58:45 2017 +0200 msvcrt: Clean up registered C++ objects in handler. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_x86_64.c | 62 +++++++++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 28 deletions(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index baacc94..fffabbb 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -110,6 +110,12 @@ typedef struct __cxx_function_descr typedef struct { + cxx_frame_info frame_info; + BOOL rethrow; +} cxx_catch_ctx; + +typedef struct +{ ULONG64 dest_frame; ULONG64 orig_frame; DISPATCHER_CONTEXT *dispatch; @@ -318,17 +324,27 @@ static void cxx_local_unwind(ULONG64 frame, DISPATCHER_CONTEXT *dispatch, unwind_help[0] = last_level; } -static LONG CALLBACK cxx_rethrow_filter(PEXCEPTION_POINTERS eptrs) +static LONG CALLBACK cxx_rethrow_filter(PEXCEPTION_POINTERS eptrs, void *c) { EXCEPTION_RECORD *rec = eptrs->ExceptionRecord; + thread_data_t *data = msvcrt_get_thread_data(); + cxx_catch_ctx *ctx = c; if (rec->ExceptionCode != CXX_EXCEPTION) return EXCEPTION_CONTINUE_SEARCH; if (!rec->ExceptionInformation[1] && !rec->ExceptionInformation[2]) return EXCEPTION_EXECUTE_HANDLER; + if (rec->ExceptionInformation[1] == data->exc_record->ExceptionInformation[1]) + ctx->rethrow = TRUE; return EXCEPTION_CONTINUE_SEARCH; } +static void CALLBACK cxx_catch_cleanup(BOOL normal, void *c) +{ + cxx_catch_ctx *ctx = c; + __CxxUnregisterExceptionObject(&ctx->frame_info, ctx->rethrow); +} + static void* WINAPI call_catch_block(EXCEPTION_RECORD *rec) { ULONG64 frame = rec->ExceptionInformation[1]; @@ -336,25 +352,31 @@ static void* WINAPI call_catch_block(EXCEPTION_RECORD *rec) EXCEPTION_RECORD *prev_rec = (void*)rec->ExceptionInformation[4]; void* (__cdecl *handler)(ULONG64 unk, ULONG64 rbp) = (void*)rec->ExceptionInformation[5]; int *unwind_help = rva_to_ptr(descr->unwind_help, frame); - cxx_frame_info frame_info; + cxx_catch_ctx ctx; void *ret_addr = NULL; TRACE("calling handler %p\n", handler); - __CxxRegisterExceptionObject(&prev_rec, &frame_info); + ctx.rethrow = FALSE; + __CxxRegisterExceptionObject(&prev_rec, &ctx.frame_info); __TRY { - ret_addr = handler(0, frame); - } - __EXCEPT(cxx_rethrow_filter) - { - TRACE("detect rethrow: exception code: %x\n", prev_rec->ExceptionCode); + __TRY + { + ret_addr = handler(0, frame); + } + __EXCEPT_CTX(cxx_rethrow_filter, &ctx) + { + TRACE("detect rethrow: exception code: %x\n", prev_rec->ExceptionCode); + ctx.rethrow = TRUE; - RaiseException(prev_rec->ExceptionCode, prev_rec->ExceptionFlags, - prev_rec->NumberParameters, prev_rec->ExceptionInformation); + RaiseException(prev_rec->ExceptionCode, prev_rec->ExceptionFlags, + prev_rec->NumberParameters, prev_rec->ExceptionInformation); + } + __ENDTRY } - __ENDTRY - __CxxUnregisterExceptionObject(&frame_info, FALSE); + __FINALLY_CTX(cxx_catch_cleanup, &ctx) + unwind_help[0] = -2; unwind_help[1] = -1; return ret_addr; @@ -534,10 +556,6 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, { if (cxx_is_consolidate(rec)) { - EXCEPTION_RECORD *new_rec = (void*)rec->ExceptionInformation[4]; - thread_data_t *data = msvcrt_get_thread_data(); - frame_info *cur; - if (rec->ExceptionFlags & EH_TARGET_UNWIND) { const cxx_function_descr *orig_descr = (void*)rec->ExceptionInformation[2]; @@ -548,18 +566,6 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, } else if(frame == orig_frame) cxx_local_unwind(frame, dispatch, descr, -1); - - /* FIXME: we should only unregister frames registered by call_catch_block here */ - for (cur = data->frame_info_head; cur; cur = cur->next) - { - if ((ULONG64)cur <= frame) - { - __CxxUnregisterExceptionObject((cxx_frame_info*)cur, - new_rec->ExceptionCode == CXX_EXCEPTION && - data->exc_record->ExceptionCode == CXX_EXCEPTION && - new_rec->ExceptionInformation[1] == data->exc_record->ExceptionInformation[1]); - } - } return ExceptionContinueSearch; }

1 0

Daniel Lehman : msvcrt: Move exception rethrow handling to call_catch_block.
by Alexandre Julliard 14 Jun '17

14 Jun '17

Module: wine Branch: master Commit: ac9db1138c84dc7a0da05a69366ef5316c28b8aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac9db1138c84dc7a0da05a693… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Jun 14 11:58:20 2017 +0200 msvcrt: Move exception rethrow handling to call_catch_block. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_x86_64.c | 42 +++++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index 57fce93..baacc94 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -318,7 +318,18 @@ static void cxx_local_unwind(ULONG64 frame, DISPATCHER_CONTEXT *dispatch, unwind_help[0] = last_level; } -static inline void* WINAPI call_catch_block(EXCEPTION_RECORD *rec) +static LONG CALLBACK cxx_rethrow_filter(PEXCEPTION_POINTERS eptrs) +{ + EXCEPTION_RECORD *rec = eptrs->ExceptionRecord; + + if (rec->ExceptionCode != CXX_EXCEPTION) + return EXCEPTION_CONTINUE_SEARCH; + if (!rec->ExceptionInformation[1] && !rec->ExceptionInformation[2]) + return EXCEPTION_EXECUTE_HANDLER; + return EXCEPTION_CONTINUE_SEARCH; +} + +static void* WINAPI call_catch_block(EXCEPTION_RECORD *rec) { ULONG64 frame = rec->ExceptionInformation[1]; const cxx_function_descr *descr = (void*)rec->ExceptionInformation[2]; @@ -326,13 +337,23 @@ static inline void* WINAPI call_catch_block(EXCEPTION_RECORD *rec) void* (__cdecl *handler)(ULONG64 unk, ULONG64 rbp) = (void*)rec->ExceptionInformation[5]; int *unwind_help = rva_to_ptr(descr->unwind_help, frame); cxx_frame_info frame_info; - void *ret_addr; + void *ret_addr = NULL; TRACE("calling handler %p\n", handler); - /* FIXME: native does local_unwind here in case of exception rethrow */ __CxxRegisterExceptionObject(&prev_rec, &frame_info); - ret_addr = handler(0, frame); + __TRY + { + ret_addr = handler(0, frame); + } + __EXCEPT(cxx_rethrow_filter) + { + TRACE("detect rethrow: exception code: %x\n", prev_rec->ExceptionCode); + + RaiseException(prev_rec->ExceptionCode, prev_rec->ExceptionFlags, + prev_rec->NumberParameters, prev_rec->ExceptionInformation); + } + __ENDTRY __CxxUnregisterExceptionObject(&frame_info, FALSE); unwind_help[0] = -2; unwind_help[1] = -1; @@ -548,19 +569,6 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, } if (!descr->tryblock_count) return ExceptionContinueSearch; - if (rec->ExceptionCode == CXX_EXCEPTION && - rec->ExceptionInformation[1] == 0 && rec->ExceptionInformation[2] == 0) - { - *rec = *msvcrt_get_thread_data()->exc_record; - rec->ExceptionFlags &= ~EH_UNWINDING; - if (TRACE_ON(seh)) { - TRACE("detect rethrow: exception code: %x\n", rec->ExceptionCode); - if (rec->ExceptionCode == CXX_EXCEPTION) - TRACE("re-propage: obj: %lx, type: %lx\n", - rec->ExceptionInformation[1], rec->ExceptionInformation[2]); - } - } - if (rec->ExceptionCode == CXX_EXCEPTION) { exc_type = (cxx_exception_type *)rec->ExceptionInformation[2];

1 0

Jacek Caban : wininet/tests: Fixed potential buffer overflow (coverity).
by Alexandre Julliard 14 Jun '17

14 Jun '17

Module: wine Branch: master Commit: 19cb65b156a77f0cac09ed755abea50febb2e0a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19cb65b156a77f0cac09ed755… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 14 11:43:51 2017 +0200 wininet/tests: Fixed potential buffer overflow (coverity). Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 8bb925f..a3a0980 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -5212,7 +5212,7 @@ static void test_redirect(int port) "Content-Length: 0\r\n" "\r\n"); - size = server_read_data(buf, sizeof(buf)); + size = server_read_data(buf, sizeof(buf) - 1); buf[size] = 0; p = strstr(buf, "\r\n"); if(p) *p = 0;

1 0

Hans Leidekker : webservices: Store buffer encoding and character set.
by Alexandre Julliard 14 Jun '17

14 Jun '17

Module: wine Branch: master Commit: 1ba18219491aa5a03aceee1d8c2bfecaa7f5f4da URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ba18219491aa5a03aceee1d8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 14 11:07:31 2017 +0200 webservices: Store buffer encoding and character set. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/heap.c | 9 ++++-- dlls/webservices/reader.c | 59 ++++++++++++++-------------------- dlls/webservices/webservices_private.h | 10 +++--- dlls/webservices/writer.c | 42 ++++++++++++++++-------- 4 files changed, 66 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1ba18219491aa5a03acee…

1 0

Hans Leidekker : webservices: Implement WsReadXmlBuffer.
by Alexandre Julliard 14 Jun '17

14 Jun '17

Module: wine Branch: master Commit: 83bdbc1e386afe59c026c1156b77e3bc5797bbf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83bdbc1e386afe59c026c1156… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 14 11:07:30 2017 +0200 webservices: Implement WsReadXmlBuffer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 69 +++++++++++++ dlls/webservices/tests/reader.c | 198 ++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- include/webservices.h | 1 + 4 files changed, 269 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=83bdbc1e386afe59c026c…

1 0

Hans Leidekker : webservices: Restore the current pointer after reading ahead in read_move_to.
by Alexandre Julliard 14 Jun '17

14 Jun '17

Module: wine Branch: master Commit: 087631bbbca574e718d08f09efc451cb9c2482d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=087631bbbca574e718d08f09e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 14 11:07:29 2017 +0200 webservices: Restore the current pointer after reading ahead in read_move_to. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 125c3bd..cb9dd8c 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -2999,8 +2999,10 @@ static HRESULT read_move_to( struct reader *reader, WS_MOVE_TO move, BOOL *found if (!read_end_of_data( reader )) { + struct node *saved_current = reader->current; while (reader->state != READER_STATE_EOF && (hr = read_node( reader )) == S_OK) { /* nothing */ }; if (hr != S_OK) return hr; + reader->current = saved_current; } switch (move) {

1 0

Hans Leidekker : webservices/tests: Add a test for WsCopyNode.
by Alexandre Julliard 14 Jun '17

14 Jun '17

Module: wine Branch: master Commit: f2b399784d65ee849314cff2c0db2783e2fa8db3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2b399784d65ee849314cff2c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 14 11:07:28 2017 +0200 webservices/tests: Add a test for WsCopyNode. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 3bf0886..03a9788 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -136,7 +136,7 @@ static void test_WsCreateWriter(void) bytes.length = 0xdeadbeef; bytes.bytes = (BYTE *)0xdeadbeef; - size = sizeof(buffers); + size = sizeof(bytes); hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_BYTES, &bytes, size, NULL ); ok( hr == S_OK, "got %08x\n", hr ); ok( !bytes.length, "got %u\n", bytes.length ); @@ -1971,17 +1971,9 @@ static void test_WsWriteNode(void) static HRESULT set_input( WS_XML_READER *reader, const char *data, ULONG size ) { - WS_XML_READER_TEXT_ENCODING enc; - WS_XML_READER_BUFFER_INPUT input; - - enc.encoding.encodingType = WS_XML_READER_ENCODING_TYPE_TEXT; - enc.charSet = WS_CHARSET_AUTO; - - input.input.inputType = WS_XML_READER_INPUT_TYPE_BUFFER; - input.encodedData = (void *)data; - input.encodedDataSize = size; - - return WsSetInput( reader, &enc.encoding, &input.input, NULL, 0, NULL ); + WS_XML_READER_TEXT_ENCODING text = {{WS_XML_READER_ENCODING_TYPE_TEXT}, WS_CHARSET_AUTO}; + WS_XML_READER_BUFFER_INPUT buf = {{WS_XML_READER_INPUT_TYPE_BUFFER}, (void *)data, size}; + return WsSetInput( reader, &text.encoding, &buf.input, NULL, 0, NULL ); } static void test_WsCopyNode(void) @@ -2090,6 +2082,20 @@ static void test_WsCopyNode(void) ok( bufs.bufferCount == 1, "got %u\n", bufs.bufferCount ); ok( bufs.buffers != NULL, "buffers not set\n" ); + /* reader positioned at BOF, single text node */ + hr = set_input( reader, "text", sizeof("text") - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_BOF, "got %u\n", node->nodeType ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCopyNode( writer, reader, NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + WsFreeReader( reader ); WsFreeWriter( writer ); WsFreeHeap( heap );

1 0

Hans Leidekker : webservices: Support more text record types in the reader.
by Alexandre Julliard 14 Jun '17

14 Jun '17

Module: wine Branch: master Commit: 14c1cd97e5e6ac9bcf0190bbef891a434b60b8bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=14c1cd97e5e6ac9bcf0190bbe… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 14 11:07:27 2017 +0200 webservices: Support more text record types in the reader. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 334 ++++++++++++++++++++++++++++++--- dlls/webservices/webservices_private.h | 11 ++ dlls/webservices/writer.c | 20 +- 3 files changed, 330 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=14c1cd97e5e6ac9bcf019…

1 0

Hans Leidekker : webservices: Add a static builtin dictionary.
by Alexandre Julliard 14 Jun '17

14 Jun '17

Module: wine Branch: master Commit: 5154290ac0ee8943b0f6295c7885b3b9dd6c976d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5154290ac0ee8943b0f6295c7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 14 11:07:26 2017 +0200 webservices: Add a static builtin dictionary. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/Makefile.in | 1 + dlls/webservices/reader.c | 253 +---------- dlls/webservices/string.c | 767 +++++++++++++++++++++++++++++++++ dlls/webservices/tests/reader.c | 15 +- dlls/webservices/webservices_private.h | 4 + 5 files changed, 795 insertions(+), 245 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5154290ac0ee8943b0f62…

1 0

André Hentschel : ntdll: Add support for relay debugging on ARM64.
by Alexandre Julliard 14 Jun '17

14 Jun '17

Module: wine Branch: master Commit: 58d527ef93c458eed1ac03234e277a4997acb944 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58d527ef93c458eed1ac03234… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jun 14 10:46:32 2017 +0200 ntdll: Add support for relay debugging on ARM64. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/relay.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 62 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index 997de1f..db21872 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(relay); -#if defined(__i386__) || defined(__x86_64__) || defined(__arm__) +#if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) WINE_DECLARE_DEBUG_CHANNEL(timestamp); WINE_DECLARE_DEBUG_CHANNEL(pid); @@ -594,6 +594,65 @@ static void WINAPI relay_call_regs( struct relay_descr *descr, INT_PTR idx, INT_ { assert(0); /* should never be called */ } +#elif defined(__aarch64__) + +extern LONGLONG CDECL call_entry_point( void *func, int nb_args, const INT_PTR *args, int flags ); +__ASM_GLOBAL_FUNC( call_entry_point, + "stp x29, x30, [SP,#-16]!\n\t" + "stp x19, x20, [SP,#-16]!\n\t" + "mov x29, SP\n\t" + "mov x19, x2\n\t" + "ldp x8, x9, [x19, #-32]\n\t" + "mov x9, x0\n\t" + "cbz w1, 2f\n\t" + "mov w10, w1\n\t" + "mov x11, x2\n\t" + "mov x12, #0\n\t" + "ldp x0, x1, [x11], #16\n\t" + "add w12, w12, #2\n\t" + "cmp w12, w10\n\t" + "b.hs 2f\n\t" + "ldp x2, x3, [x11], #16\n\t" + "add w12, w12, #2\n\t" + "cmp w12, w10\n\t" + "b.hs 2f\n\t" + "ldp x4, x5, [x11], #16\n\t" + "add w12, w12, #2\n\t" + "cmp w12, w10\n\t" + "b.hs 2f\n\t" + "ldp x6, x7, [x11], #16\n\t" + "add w12, w12, #2\n\t" + "cmp w12, w10\n\t" + "b.hs 2f\n\t" + "sub w12, w10, #8\n\t" + "lsl w12, w12, #3\n\t" + "sub SP, SP, w12, uxtw\n\t" + "tbz w12, #3, 1f\n\t" + "sub SP, SP, #8\n\t" + "1: sub w12, w12, #8\n\t" + "ldr x13, [x11, x12]\n\t" + "str x13, [SP, x12]\n\t" + "cbnz w12, 1b\n\t" + "2: blr x9\n\t" + "mov SP, x29\n\t" + "ldp x19, x20, [SP], #16\n\t" + "ldp x29, x30, [SP], #16\n\t" + "ret\n" ) + +static LONGLONG WINAPI relay_call( struct relay_descr *descr, unsigned int idx, const INT_PTR *stack ) +{ + BYTE nb_args = LOBYTE(HIWORD(idx)); + BYTE flags = HIBYTE(HIWORD(idx)); + void *func = relay_trace_entry( descr, idx, stack + 3 ); + LONGLONG ret = call_entry_point( func, nb_args, stack + 4, flags ); + relay_trace_exit( descr, idx, stack + 3, ret ); + return ret; +} + +static void WINAPI relay_call_regs( struct relay_descr *descr, INT_PTR idx, INT_PTR *stack ) +{ + assert(0); /* should never be called */ +} #elif defined(__x86_64__) @@ -751,7 +810,7 @@ void RELAY_SetupDLL( HMODULE module ) } } -#else /* __i386__ || __x86_64__ || __arm__ */ +#else /* __i386__ || __x86_64__ || __arm__ || __aarch64__ */ FARPROC RELAY_GetProcAddress( HMODULE module, const IMAGE_EXPORT_DIRECTORY *exports, DWORD exp_size, FARPROC proc, DWORD ordinal, const WCHAR *user ) @@ -763,7 +822,7 @@ void RELAY_SetupDLL( HMODULE module ) { } -#endif /* __i386__ || __x86_64__ || __arm__ */ +#endif /* __i386__ || __x86_64__ || __arm__ || __aarch64__ */ /***********************************************************************/

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 14 Jun '17

14 Jun '17

Module: wine Branch: master Commit: 4d8585c761cdb804e605c214e88228a219b78eb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d8585c761cdb804e605c214e… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Jun 14 08:17:46 2017 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/lt.po b/po/lt.po index 37cd887..846f694 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-06-06 08:51+0300\n" +"PO-Revision-Date: 2017-06-14 08:17+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -12261,7 +12261,7 @@ msgstr "Ar tikrai norite pašalinti registro raktą „%1“ ir visus jo porakč #: regedit.rc:199 msgid "Expands or collapses the selected node" -msgstr "" +msgstr "Išskleidžia arba suskleidžia pasirinktą mazgą" #: regedit.rc:231 msgid "Collapse"

1 0

Paul Gofman : d3dx9: Add const qualifier to regstore_set_values() input data.
by Alexandre Julliard 14 Jun '17

14 Jun '17

Module: wine Branch: master Commit: 607ae76ada6bbf1602341ef9e9702a8eb4859b9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=607ae76ada6bbf1602341ef9e… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Jun 12 14:22:01 2017 +0300 d3dx9: Add const qualifier to regstore_set_values() input data. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 126f3cc..e9c8387 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -368,7 +368,7 @@ static void regstore_set_modified(struct d3dx_regstore *rs, unsigned int table, get_reg_offset(table, start_offset + count - 1)); } -static void regstore_set_values(struct d3dx_regstore *rs, unsigned int table, void *data, +static void regstore_set_values(struct d3dx_regstore *rs, unsigned int table, const void *data, unsigned int start_offset, unsigned int count) { if (!count)

1 0

Paul Gofman : d3dx9: Introduce get_reg_components() helper function and use it instead of get_offset_reg() when appropriate.
by Alexandre Julliard 14 Jun '17

14 Jun '17

Module: wine Branch: master Commit: 45b0add67853a715a4166efc629c212f50b24e9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=45b0add67853a715a4166efc6… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Jun 12 14:22:00 2017 +0300 d3dx9: Introduce get_reg_components() helper function and use it instead of get_offset_reg() when appropriate. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 522d484..126f3cc 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -296,6 +296,11 @@ static unsigned int get_offset_reg(unsigned int table, unsigned int reg_idx) return table == PRES_REGTAB_OBCONST ? reg_idx : reg_idx << 2; } +static unsigned int get_reg_components(unsigned int table) +{ + return get_offset_reg(table, 1); +} + #define PRES_BITMASK_BLOCK_SIZE (sizeof(unsigned int) * 8) static HRESULT init_set_constants(struct d3dx_const_tab *const_tab, ID3DXConstantTable *ctab); @@ -836,10 +841,10 @@ static HRESULT parse_preshader(struct d3dx_preshader *pres, unsigned int *ptr, u if (FAILED(hr)) return hr; - if (const_count % get_offset_reg(PRES_REGTAB_IMMED, 1)) + if (const_count % get_reg_components(PRES_REGTAB_IMMED)) { FIXME("const_count %u is not a multiple of %u.\n", const_count, - get_offset_reg(PRES_REGTAB_IMMED, 1)); + get_reg_components(PRES_REGTAB_IMMED)); return D3DXERR_INVALIDDATA; } pres->regs.table_sizes[PRES_REGTAB_IMMED] = get_reg_offset(PRES_REGTAB_IMMED, const_count); @@ -1026,7 +1031,7 @@ static void get_const_upload_info(struct d3dx_const_param_eval_output *const_set info->major = param->rows; info->minor = param->columns; } - info->major_stride = max(info->minor, get_offset_reg(table, 1)); + info->major_stride = max(info->minor, get_reg_components(table)); info->major_count = min(info->major * info->major_stride, get_offset_reg(table, const_set->register_count) + info->major_stride - 1) / info->major_stride; info->count = info->major_count * info->minor; @@ -1411,7 +1416,7 @@ static double exec_get_arg(struct d3dx_regstore *rs, const struct d3dx_pres_oper if (reg_index >= rs->table_sizes[table]) return 0.0; - offset = get_offset_reg(table, reg_index) + offset % get_offset_reg(table, 1); + offset = get_offset_reg(table, reg_index) + offset % get_reg_components(table); } return exec_get_reg_value(rs, table, offset);

1 0

Francois Gouget : winetest/dissect: Better check the task report.
by Alexandre Julliard 14 Jun '17

14 Jun '17

Module: tools Branch: master Commit: ab725dad3b8b3076847aeaf06e94a89c8fb125e5 URL: http://source.winehq.org/git/tools.git/?a=commit;h=ab725dad3b8b3076847aeaf0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 14 10:47:10 2017 +0200 winetest/dissect: Better check the task report. This makes the dissect analysis match the expected results on the report test. In particular it now leverages the pid traces to detect when a test has no test summary line for its main process. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 437 ++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 334 insertions(+), 103 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=ab725dad3b8b3076847a…

1 0

Francois Gouget : testbot: Update the TestLauncher binaries when updating Wine.
by Alexandre Julliard 14 Jun '17

14 Jun '17

Module: tools Branch: master Commit: 0fd8f624e7a2888d5ba19959405da436053e8ac2 URL: http://source.winehq.org/git/tools.git/?a=commit;h=0fd8f624e7a2888d5ba19959… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 14 09:50:45 2017 +0200 testbot: Update the TestLauncher binaries when updating Wine. And remove the checked-in TestLauncher binaries since we no longer need them. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunReconfig.pl | 13 +++++++++++++ testbot/bin/WineRunTask.pl | 4 ++-- testbot/bin/windows/TestLauncher32.exe | Bin 432844 -> 0 bytes testbot/bin/windows/TestLauncher64.exe | Bin 115348 -> 0 bytes 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index c99c1ab..135a5c3 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -376,6 +376,19 @@ elsif (!defined $TAError) if ($NewStatus eq "completed") { use File::Copy; + for my $Bitness ("32", "64") + { + Debug(Elapsed($Start), " Retrieving the $Bitness bit TestLauncher to '$TaskDir/TestLauncher$Bitness.exe'\n"); + if ($TA->GetFile("../src/TestLauncher/TestLauncher$Bitness.exe", "$TaskDir/TestLauncher$Bitness.exe")) + { + copy "$TaskDir/TestLauncher$Bitness.exe", "$DataDir/latest/TestLauncher$Bitness.exe"; + } + elsif (!defined $TAError) + { + $TAError = "An error occurred while retrieving the $Bitness bit TestLauncher: ". $TA->GetLastError(); + } + } + Debug(Elapsed($Start), " Retrieving the updated test list '$TaskDir/testlist.txt'\n"); if ($TA->GetFile("testlist.txt", "$TaskDir/testlist.txt")) { diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index cd74119..22339b7 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -362,8 +362,8 @@ my $IsWineTest = 1; if ($Step->Type eq "single") { my $TestLauncher = "TestLauncher" . ($FileType eq "exe64" ? "64" : "32") . ".exe"; - Debug(Elapsed($Start), " Sending '$BinDir/windows/$TestLauncher'\n"); - if (!$TA->SendFile("$BinDir/windows/$TestLauncher", $TestLauncher, 0)) + Debug(Elapsed($Start), " Sending 'latest/$TestLauncher'\n"); + if (!$TA->SendFile("$DataDir/latest/$TestLauncher", $TestLauncher, 0)) { FatalTAError($TA, "Could not copy TestLauncher to the VM"); } diff --git a/testbot/bin/windows/TestLauncher32.exe b/testbot/bin/windows/TestLauncher32.exe deleted file mode 100755 index 3272652..0000000 Binary files a/testbot/bin/windows/TestLauncher32.exe and /dev/null differ diff --git a/testbot/bin/windows/TestLauncher64.exe b/testbot/bin/windows/TestLauncher64.exe deleted file mode 100755 index f18a904..0000000 Binary files a/testbot/bin/windows/TestLauncher64.exe and /dev/null differ

1 0

Francois Gouget : testbot/TestLauncher: The str*_s() functions are not portable. Avoid them.
by Alexandre Julliard 14 Jun '17

14 Jun '17

Module: tools Branch: master Commit: 814671cfc719a5980b513bdb61cbe7e012934644 URL: http://source.winehq.org/git/tools.git/?a=commit;h=814671cfc719a5980b513bdb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 14 10:42:43 2017 +0200 testbot/TestLauncher: The str*_s() functions are not portable. Avoid them. They are missing in older versions of msvcrt, on Windows XP for instance. Also, simply mapping strncpy_s() to strncpy() means the string will not be NUL-terminated! The destination buffers are large enough anyway so use the regular string functions. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/TestLauncher/TestLauncher.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index ed7fffb..53590f8 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -19,13 +19,9 @@ */ #include <stdio.h> +#include <errno.h> #include <windows.h> -#ifdef __MINGW32__ -#define strcpy_s(dest, size, src) strcpy((dest), (src)) -#define strncpy_s(dest, size, src, max) strncpy((dest), (src), (max)) -#define strcat_s(dest, size, src) strcat((dest), (src)) -#endif #define countof(Array) (sizeof(Array) / sizeof(Array[0])) static unsigned Failures = 0; @@ -339,9 +335,12 @@ int main(int argc, char *argv[]) if (Suffix == NULL) Suffix = strchr(TestExeFileName, '.'); if (Suffix == NULL) - strcpy_s(TestName, countof(TestName), TestExeFileName); + strcpy(TestName, TestExeFileName); else - strncpy_s(TestName, _MAX_PATH, TestExeFileName, Suffix - TestExeFileName); + { + strncpy(TestName, TestExeFileName, Suffix - TestExeFileName); + TestName[Suffix - TestExeFileName] = '\0'; + } Subtest = (Arg + 1 < argc ? argv[Arg + 1] : ""); CommandLen = strlen(TestExeFullName) + 3; @@ -356,13 +355,13 @@ int main(int argc, char *argv[]) } CommandLine[0] = '"'; - strcpy_s(CommandLine + 1, CommandLen - 1, TestExeFullName); - strcat_s(CommandLine, CommandLen, "\""); + strcpy(CommandLine + 1, TestExeFullName); + strcat(CommandLine, "\""); for (TestArg = Arg + 1; TestArg < argc; TestArg++) { - strcat_s(CommandLine, CommandLen, " \""); - strcat_s(CommandLine, CommandLen, argv[TestArg]); - strcat_s(CommandLine, CommandLen, "\""); + strcat(CommandLine, " \""); + strcat(CommandLine, argv[TestArg]); + strcat(CommandLine, "\""); } Arg = argc;

1 0

Thomas Faber : devenum/tests: Fix return value check for IEnumMoniker_Next.
by Alexandre Julliard 13 Jun '17

13 Jun '17

Module: wine Branch: master Commit: d7eb469d5992f9901b0dd355e5e61709aed31d2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7eb469d5992f9901b0dd355e… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Tue Jun 13 11:50:01 2017 +0200 devenum/tests: Fix return value check for IEnumMoniker_Next. IEnumMoniker::Next returns S_FALSE when there are no (more) items, so checking SUCCEEDED does not make sense. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/tests/devenum.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index c2173fe..5a41183 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -154,8 +154,8 @@ static void test_moniker_isequal(void) ok(SUCCEEDED(res), "Cannot create enum moniker (res = %x)\n", res); if (SUCCEEDED(res)) { - if (SUCCEEDED(IEnumMoniker_Next(enum_moniker0, 1, &moniker0, NULL)) && - SUCCEEDED(IEnumMoniker_Next(enum_moniker0, 1, &moniker1, NULL))) + if (IEnumMoniker_Next(enum_moniker0, 1, &moniker0, NULL) == S_OK && + IEnumMoniker_Next(enum_moniker0, 1, &moniker1, NULL) == S_OK) { res = IMoniker_IsEqual(moniker0, moniker1); ok(res == S_FALSE, "IMoniker_IsEqual should fail (res = %x)\n", res); @@ -177,8 +177,8 @@ static void test_moniker_isequal(void) ok(SUCCEEDED(res), "Cannot create enum moniker (res = %x)\n", res); if (SUCCEEDED(res)) { - if (SUCCEEDED(IEnumMoniker_Next(enum_moniker0, 1, &moniker0, NULL)) && - SUCCEEDED(IEnumMoniker_Next(enum_moniker1, 1, &moniker1, NULL))) + if (IEnumMoniker_Next(enum_moniker0, 1, &moniker0, NULL) == S_OK && + IEnumMoniker_Next(enum_moniker1, 1, &moniker1, NULL) == S_OK) { res = IMoniker_IsEqual(moniker0, moniker1); ok(res == S_FALSE, "IMoniker_IsEqual should failed (res = %x)\n", res); @@ -201,8 +201,8 @@ static void test_moniker_isequal(void) ok(SUCCEEDED(res), "Cannot create enum moniker (res = %x)\n", res); if (SUCCEEDED(res)) { - if (SUCCEEDED(IEnumMoniker_Next(enum_moniker0, 1, &moniker0, NULL)) && - SUCCEEDED(IEnumMoniker_Next(enum_moniker1, 1, &moniker1, NULL))) + if (IEnumMoniker_Next(enum_moniker0, 1, &moniker0, NULL) == S_OK && + IEnumMoniker_Next(enum_moniker1, 1, &moniker1, NULL) == S_OK) { res = IMoniker_IsEqual(moniker0, moniker1); ok(res == S_OK, "IMoniker_IsEqual failed (res = %x)\n", res);

1 0

Zebediah Figura : winemp3.acm: Fix error in acmStreamSize().
by Alexandre Julliard 13 Jun '17

13 Jun '17

Module: wine Branch: master Commit: ffebb919101120feb55cef43bf48e1d142693ebf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffebb919101120feb55cef43b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 12 14:36:36 2017 -0500 winemp3.acm: Fix error in acmStreamSize(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemp3.acm/mpegl3.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c index cc6008d..13a6109 100644 --- a/dlls/winemp3.acm/mpegl3.c +++ b/dlls/winemp3.acm/mpegl3.c @@ -940,11 +940,11 @@ static LRESULT MPEG3_StreamSize(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMSIZE ad adsi->pwfxDst->wFormatTag == WAVE_FORMAT_MPEG)) { nblocks = adss->cbSrcLength / (adsi->pwfxSrc->nBlockAlign * 1152); - if (nblocks == 0) - return ACMERR_NOTPOSSIBLE; if (adss->cbSrcLength % (DWORD)(adsi->pwfxSrc->nBlockAlign * 1152)) /* Round block count up. */ nblocks++; + if (nblocks == 0) + return ACMERR_NOTPOSSIBLE; adss->cbDstLength = 3000 + nblocks * (DWORD)(adsi->pwfxDst->nAvgBytesPerSec * 1152 / adsi->pwfxDst->nSamplesPerSec + 0.5); } else if ((adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEGLAYER3 || @@ -952,11 +952,11 @@ static LRESULT MPEG3_StreamSize(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMSIZE ad adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM) { nblocks = adss->cbSrcLength / (DWORD)(adsi->pwfxSrc->nAvgBytesPerSec * 1152 / adsi->pwfxSrc->nSamplesPerSec); - if (nblocks == 0) - return ACMERR_NOTPOSSIBLE; if (adss->cbSrcLength % (DWORD)(adsi->pwfxSrc->nAvgBytesPerSec * 1152 / adsi->pwfxSrc->nSamplesPerSec)) /* Round block count up. */ nblocks++; + if (nblocks == 0) + return ACMERR_NOTPOSSIBLE; adss->cbDstLength = nblocks * 1152 * adsi->pwfxDst->nBlockAlign; } else

1 0

Zebediah Figura : include: Pack WAVEFORMAT structs.
by Alexandre Julliard 13 Jun '17

13 Jun '17

Module: wine Branch: master Commit: d31d656b6f16572025d297b010eba13390deeb3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d31d656b6f16572025d297b01… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 12 14:36:35 2017 -0500 include: Pack WAVEFORMAT structs. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/tests/msacm.c | 13 +++++++++++++ include/mmreg.h | 4 ++++ 2 files changed, 17 insertions(+) diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index 13494a6..44a6feb 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -1139,6 +1139,18 @@ static void test_acmFormatSuggest(void) ok(rc == MMSYSERR_INVALPARAM, "failed with error 0x%x\n", rc); } +static void test_acmFormatTagDetails(void) +{ + ACMFORMATTAGDETAILSW aftd = {0}; + MMRESULT rc; + + aftd.cbStruct = sizeof(aftd); + aftd.dwFormatTag = WAVE_FORMAT_MPEGLAYER3; + rc = acmFormatTagDetailsW(NULL, &aftd, ACM_FORMATTAGDETAILSF_FORMATTAG); + if (rc == MMSYSERR_NOERROR) + ok(aftd.cbFormatSize == sizeof(MPEGLAYER3WAVEFORMAT), "got %d\n", aftd.cbFormatSize); +} + static struct { struct @@ -1306,6 +1318,7 @@ START_TEST(msacm) driver_tests(); test_prepareheader(); test_acmFormatSuggest(); + test_acmFormatTagDetails(); /* Test acmDriverAdd in the end as it may conflict * with other tests due to codec lookup order */ test_acmDriverAdd(); diff --git a/include/mmreg.h b/include/mmreg.h index 2ee2b00..8bb581d 100644 --- a/include/mmreg.h +++ b/include/mmreg.h @@ -23,6 +23,8 @@ #ifndef __WINE_MMREG_H #define __WINE_MMREG_H +#include <pshpack1.h> + /*********************************************************************** * Defines/Enums */ @@ -512,6 +514,8 @@ typedef struct tagEXBMINFOHEADER { #endif +#include <poppack.h> + #endif /* __WINE_MMREG_H */ #else /* __WIDL__ */

1 0

André Hentschel : winebuild: Emit relay debugging thunks for ARM64.
by Alexandre Julliard 13 Jun '17

13 Jun '17

Module: wine Branch: master Commit: eed3bb6dfd52a4e520bd9e2d86ed186b9f3cc688 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eed3bb6dfd52a4e520bd9e2d8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 12 20:30:43 2017 +0200 winebuild: Emit relay debugging thunks for ARM64. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/spec32.c | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index f3feb0f..39733b2 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -84,7 +84,9 @@ static int has_relays( DLLSPEC *spec ) { int i; - if (target_cpu != CPU_x86 && target_cpu != CPU_x86_64 && target_cpu != CPU_ARM) return 0; + if (target_cpu != CPU_x86 && target_cpu != CPU_x86_64 && + target_cpu != CPU_ARM && target_cpu != CPU_ARM64) + return 0; for (i = spec->base; i <= spec->limit; i++) { @@ -242,6 +244,41 @@ static void output_relay_debug( DLLSPEC *spec ) break; } + case CPU_ARM64: + switch (args) + { + default: + case 8: + case 7: output( "\tstp x6, x7, [SP,#-16]!\n" ); + /* fall through */ + case 6: + case 5: output( "\tstp x4, x5, [SP,#-16]!\n" ); + /* fall through */ + case 4: + case 3: output( "\tstp x2, x3, [SP,#-16]!\n" ); + /* fall through */ + case 2: + case 1: output( "\tstp x0, x1, [SP,#-16]!\n" ); + /* fall through */ + case 0: break; + } + output( "\tstp x29, x30, [SP,#-16]!\n" ); + output( "\tstp x8, x9, [SP,#-16]!\n" ); + output( "\tmov x2, SP\n"); + if (odp->flags & FLAG_RET64) flags |= 1; + output( "\tmov w1, #%u\n", (flags << 24) ); + if (args) output( "\tadd w1, w1, #%u\n", (args << 16) ); + if (i - spec->base) output( "\tadd w1, w1, #%u\n", i - spec->base ); + output( "\tldr x0, 1f\n"); + output( "\tldr x3, [x0, #8]\n"); + output( "\tblr x3\n"); + output( "\tadd SP, SP, #16\n" ); + output( "\tldp x29, x30, [SP], #16\n" ); + if (args) output( "\tadd SP, SP, #%u\n", 8 * ((min(args, 8) + 1) & 0xe) ); + output( "\tret\n"); + output( "\t1: .quad .L__wine_spec_relay_descr\n"); + break; + case CPU_x86_64: output( "\tsubq $40,%%rsp\n" ); output_cfi( ".cfi_adjust_cfa_offset 40" );

1 0

Hugh McMaster : regedit: Add status bar text for the 'Expand'/'Collapse' menu item.
by Alexandre Julliard 13 Jun '17

13 Jun '17

Module: wine Branch: master Commit: a726343fa5a7bb2589dc014ff865fed39bb8f6a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a726343fa5a7bb2589dc014ff… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 13 12:43:10 2017 +0000 regedit: Add status bar text for the 'Expand'/'Collapse' menu item. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 184 ++++++++++++++++++++++---------------------- po/bg.po | 184 ++++++++++++++++++++++---------------------- po/ca.po | 184 ++++++++++++++++++++++---------------------- po/cs.po | 184 ++++++++++++++++++++++---------------------- po/da.po | 184 ++++++++++++++++++++++---------------------- po/de.po | 184 ++++++++++++++++++++++---------------------- po/el.po | 184 ++++++++++++++++++++++---------------------- po/en.po | 184 ++++++++++++++++++++++---------------------- po/en_US.po | 184 ++++++++++++++++++++++---------------------- po/eo.po | 184 ++++++++++++++++++++++---------------------- po/es.po | 184 ++++++++++++++++++++++---------------------- po/fa.po | 184 ++++++++++++++++++++++---------------------- po/fi.po | 184 ++++++++++++++++++++++---------------------- po/fr.po | 184 ++++++++++++++++++++++---------------------- po/he.po | 184 ++++++++++++++++++++++---------------------- po/hi.po | 184 ++++++++++++++++++++++---------------------- po/hr.po | 184 ++++++++++++++++++++++---------------------- po/hu.po | 184 ++++++++++++++++++++++---------------------- po/it.po | 184 ++++++++++++++++++++++---------------------- po/ja.po | 184 ++++++++++++++++++++++---------------------- po/ko.po | 184 ++++++++++++++++++++++---------------------- po/lt.po | 184 ++++++++++++++++++++++---------------------- po/ml.po | 184 ++++++++++++++++++++++---------------------- po/nb_NO.po | 184 ++++++++++++++++++++++---------------------- po/nl.po | 184 ++++++++++++++++++++++---------------------- po/or.po | 184 ++++++++++++++++++++++---------------------- po/pa.po | 184 ++++++++++++++++++++++---------------------- po/pl.po | 184 ++++++++++++++++++++++---------------------- po/pt_BR.po | 184 ++++++++++++++++++++++---------------------- po/pt_PT.po | 184 ++++++++++++++++++++++---------------------- po/rm.po | 184 ++++++++++++++++++++++---------------------- po/ro.po | 184 ++++++++++++++++++++++---------------------- po/ru.po | 184 ++++++++++++++++++++++---------------------- po/sk.po | 184 ++++++++++++++++++++++---------------------- po/sl.po | 184 ++++++++++++++++++++++---------------------- po/sr_RS(a)cyrillic.po | 184 ++++++++++++++++++++++---------------------- po/sr_RS(a)latin.po | 184 ++++++++++++++++++++++---------------------- po/sv.po | 184 ++++++++++++++++++++++---------------------- po/te.po | 184 ++++++++++++++++++++++---------------------- po/th.po | 184 ++++++++++++++++++++++---------------------- po/tr.po | 184 ++++++++++++++++++++++---------------------- po/uk.po | 184 ++++++++++++++++++++++---------------------- po/wa.po | 184 ++++++++++++++++++++++---------------------- po/wine.pot | 184 ++++++++++++++++++++++---------------------- po/zh_CN.po | 184 ++++++++++++++++++++++---------------------- po/zh_TW.po | 184 ++++++++++++++++++++++---------------------- programs/regedit/regedit.rc | 1 + 47 files changed, 4325 insertions(+), 4140 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a726343fa5a7bb2589dc0…

1 0

Hugh McMaster : regedit/tests: Test the accepted range of the hex-based data types.
by Alexandre Julliard 13 Jun '17

13 Jun '17

Module: wine Branch: master Commit: 5058fa70a303072ac0ab0bee097e393c70e75cf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5058fa70a303072ac0ab0bee0… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 13 12:42:58 2017 +0000 regedit/tests: Test the accepted range of the hex-based data types. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index b53023e..b7d6de3 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -445,6 +445,28 @@ static void test_basic_import(void) lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\Subkey/2"); ok(lr == ERROR_SUCCESS, "got %d, expected 0\n", lr); + /* Test the accepted range of the hex-based data types */ + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine13a\"=hex(0):56,61,6c,75,65,00\n" + "\"Wine13b\"=hex(10):56,61,6c,75,65,00\n" + "\"Wine13c\"=hex(100):56,61,6c,75,65,00\n" + "\"Wine13d\"=hex(1000):56,61,6c,75,65,00\n" + "\"Wine13e\"=hex(7fff):56,61,6c,75,65,00\n" + "\"Wine13f\"=hex(ffff):56,61,6c,75,65,00\n" + "\"Wine13g\"=hex(7fffffff):56,61,6c,75,65,00\n" + "\"Wine13h\"=hex(ffffffff):56,61,6c,75,65,00\n" + "\"Wine13i\"=hex(100000000):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); + verify_reg(hkey, "Wine13d", 0x1000, "Value", 6, 0); + verify_reg(hkey, "Wine13e", 0x7fff, "Value", 6, 0); + verify_reg(hkey, "Wine13f", 0xffff, "Value", 6, 0); + verify_reg(hkey, "Wine13g", 0x7fffffff, "Value", 6, 0); + verify_reg(hkey, "Wine13h", 0xffffffff, "Value", 6, 0); + todo_wine verify_reg_nonexist(hkey, "Wine13i"); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Hugh McMaster : regedit/tests: Test case sensitivity when creating and deleting registry keys.
by Alexandre Julliard 13 Jun '17

13 Jun '17

Module: wine Branch: master Commit: 955766a13b9668250d83ef9d22cd11786923f393 URL: http://source.winehq.org/git/wine.git/?a=commit;h=955766a13b9668250d83ef9d2… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 13 12:42:48 2017 +0000 regedit/tests: Test case sensitivity when creating and deleting registry keys. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index b2e65a8..b53023e 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1206,6 +1206,19 @@ static void test_key_creation_and_deletion(void) verify_key_nonexist(hkey, "Subkey2a"); verify_key_nonexist(hkey, "Subkey2b"); + /* Test case sensitivity when creating and deleting registry keys. */ + exec_import_str("REGEDIT4\n\n" + "[hkey_CURRENT_user\\" KEY_BASE "\\Subkey3a]\n\n" + "[HkEy_CuRrEnT_uSeR\\" KEY_BASE "\\SuBkEy3b]\n\n"); + todo_wine verify_key_exist(hkey, "Subkey3a"); + todo_wine verify_key_exist(hkey, "Subkey3b"); + + exec_import_str("REGEDIT4\n\n" + "[-HKEY_current_USER\\" KEY_BASE "\\sUBKEY3A]\n\n" + "[-hKeY_cUrReNt_UsEr\\" KEY_BASE "\\sUbKeY3B]\n\n"); + verify_key_nonexist(hkey, "Subkey3a"); + verify_key_nonexist(hkey, "Subkey3b"); + lr = RegCloseKey(hkey); ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr);

1 0

Hugh McMaster : reg/tests: Test the accepted range of the hex-based data types.
by Alexandre Julliard 13 Jun '17

13 Jun '17

Module: wine Branch: master Commit: 325e672546fc17086c3cbccd3c03f934852bb215 URL: http://source.winehq.org/git/wine.git/?a=commit;h=325e672546fc17086c3cbccd3… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 13 12:42:40 2017 +0000 reg/tests: Test the accepted range of the hex-based data types. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index e574a97..d285910 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1736,6 +1736,29 @@ static void test_import(void) todo_wine verify_reg_nonexist(hkey, "Wine46e"); todo_wine verify_reg(hkey, "Wine46f", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); + /* Test the accepted range of the hex-based data types */ + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine47a\"=hex(0):56,61,6c,75,65,00\n" + "\"Wine47b\"=hex(10):56,61,6c,75,65,00\n" + "\"Wine47c\"=hex(100):56,61,6c,75,65,00\n" + "\"Wine47d\"=hex(1000):56,61,6c,75,65,00\n" + "\"Wine47e\"=hex(7fff):56,61,6c,75,65,00\n" + "\"Wine47f\"=hex(ffff):56,61,6c,75,65,00\n" + "\"Wine47g\"=hex(7fffffff):56,61,6c,75,65,00\n" + "\"Wine47h\"=hex(ffffffff):56,61,6c,75,65,00\n" + "\"Wine47i\"=hex(100000000):56,61,6c,75,65,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Wine47a", REG_NONE, "Value", 6, 0); + todo_wine verify_reg(hkey, "Wine47b", 0x10, "Value", 6, 0); + todo_wine verify_reg(hkey, "Wine47c", 0x100, "Value", 6, 0); + todo_wine verify_reg(hkey, "Wine47d", 0x1000, "Value", 6, 0); + todo_wine verify_reg(hkey, "Wine47e", 0x7fff, "Value", 6, 0); + todo_wine verify_reg(hkey, "Wine47f", 0xffff, "Value", 6, 0); + todo_wine verify_reg(hkey, "Wine47g", 0x7fffffff, "Value", 6, 0); + todo_wine verify_reg(hkey, "Wine47h", 0xffffffff, "Value", 6, 0); + todo_wine verify_reg_nonexist(hkey, "Wine47i"); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -2640,6 +2663,29 @@ static void test_import(void) todo_wine verify_reg_nonexist(hkey, "Wine46e"); todo_wine verify_reg(hkey, "Wine46f", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); + /* Test the accepted range of the hex-based data types */ + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine47a\"=hex(0):56,61,6c,75,65,00\n" + "\"Wine47b\"=hex(10):56,61,6c,75,65,00\n" + "\"Wine47c\"=hex(100):56,61,6c,75,65,00\n" + "\"Wine47d\"=hex(1000):56,61,6c,75,65,00\n" + "\"Wine47e\"=hex(7fff):56,61,6c,75,65,00\n" + "\"Wine47f\"=hex(ffff):56,61,6c,75,65,00\n" + "\"Wine47g\"=hex(7fffffff):56,61,6c,75,65,00\n" + "\"Wine47h\"=hex(ffffffff):56,61,6c,75,65,00\n" + "\"Wine47i\"=hex(100000000):56,61,6c,75,65,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Wine47a", REG_NONE, "Value", 6, 0); + todo_wine verify_reg(hkey, "Wine47b", 0x10, "Value", 6, 0); + todo_wine verify_reg(hkey, "Wine47c", 0x100, "Value", 6, 0); + todo_wine verify_reg(hkey, "Wine47d", 0x1000, "Value", 6, 0); + todo_wine verify_reg(hkey, "Wine47e", 0x7fff, "Value", 6, 0); + todo_wine verify_reg(hkey, "Wine47f", 0xffff, "Value", 6, 0); + todo_wine verify_reg(hkey, "Wine47g", 0x7fffffff, "Value", 6, 0); + todo_wine verify_reg(hkey, "Wine47h", 0xffffffff, "Value", 6, 0); + todo_wine verify_reg_nonexist(hkey, "Wine47i"); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

Hugh McMaster : reg/tests: Test case sensitivity when creating and deleting registry keys.
by Alexandre Julliard 13 Jun '17

13 Jun '17

Module: wine Branch: master Commit: 16b1ab0e92f07752e738e657079edd764fc1fa5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=16b1ab0e92f07752e738e6570… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 13 12:42:31 2017 +0000 reg/tests: Test case sensitivity when creating and deleting registry keys. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index cc8dc10..e574a97 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1687,6 +1687,21 @@ static void test_import(void) todo_wine verify_key_nonexist(hkey, "Subkey2a"); todo_wine verify_key_nonexist(hkey, "Subkey2b"); + /* Test case sensitivity when creating and deleting registry keys. */ + test_import_str("REGEDIT4\n\n" + "[hkey_CURRENT_user\\" KEY_BASE "\\Subkey3a]\n\n" + "[HkEy_CuRrEnT_uSeR\\" KEY_BASE "\\SuBkEy3b]\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key_exist(hkey, "Subkey3a"); + todo_wine verify_key_exist(hkey, "Subkey3b"); + + test_import_str("REGEDIT4\n\n" + "[-HKEY_current_USER\\" KEY_BASE "\\sUBKEY3A]\n\n" + "[-hKeY_cUrReNt_UsEr\\" KEY_BASE "\\sUbKeY3B]\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key_nonexist(hkey, "Subkey3a"); + todo_wine verify_key_nonexist(hkey, "Subkey3b"); + /* Test value deletion. We start by creating some registry values. */ test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -2575,6 +2590,21 @@ static void test_import(void) todo_wine verify_key_nonexist(hkey, "Subkey2a"); todo_wine verify_key_nonexist(hkey, "Subkey2b"); + /* Test case sensitivity when creating and deleting registry keys. */ + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[hkey_CURRENT_user\\" KEY_BASE "\\Subkey3a]\n\n" + "[HkEy_CuRrEnT_uSeR\\" KEY_BASE "\\SuBkEy3b]\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key_exist(hkey, "Subkey3a"); + todo_wine verify_key_exist(hkey, "Subkey3b"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[-HKEY_current_USER\\" KEY_BASE "\\sUBKEY3A]\n\n" + "[-hKeY_cUrReNt_UsEr\\" KEY_BASE "\\sUbKeY3B]\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key_nonexist(hkey, "Subkey3a"); + todo_wine verify_key_nonexist(hkey, "Subkey3b"); + /* Test value deletion. We start by creating some registry values. */ test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"

1 0

Bruno Jesus : dinput: Limit axes while remaping broken devices.
by Alexandre Julliard 13 Jun '17

13 Jun '17

Module: wine Branch: master Commit: b50d1fa3140b7bc9b4749a6bfb411148d45c1a60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b50d1fa3140b7bc9b4749a6bf… Author: Bruno Jesus <bjesus(a)codeweavers.com> Date: Tue Jun 13 10:53:42 2017 -0300 dinput: Limit axes while remaping broken devices. Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_linux.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 1032659..963e62f 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -253,10 +253,14 @@ static INT find_joystick_devices(void) /* If no axes were configured but there are axes assume a 1-to-1 (wii controller) */ if (joydev.axis_count && !found_axes) { + int axes_limit = min(joydev.axis_count, 8); /* generic driver limit */ + ERR("Incoherent joystick data, advertised %d axes, detected 0. Assuming 1-to-1.\n", - joydev.axis_count); - for (j = 0; j < joydev.axis_count; j++) + joydev.axis_count); + for (j = 0; j < axes_limit; j++) joydev.dev_axes_map[j] = j; + + joydev.axis_count = axes_limit; } }

1 0

Hermès Bélusca-Maïto : advapi32/tests: Fix build with MSVC.
by Alexandre Julliard 13 Jun '17

13 Jun '17

Module: wine Branch: master Commit: 2cd8eb39896cb7c0a4d82d0252f627761a08bbf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cd8eb39896cb7c0a4d82d025… Author: Hermès Bélusca-Maïto <hermes.belusca(a)sfr.fr> Date: Tue Jun 13 11:51:15 2017 +0200 advapi32/tests: Fix build with MSVC. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/eventlog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 838454e..8c78dcf 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -1209,7 +1209,7 @@ static void test_start_trace(void) ret = StartTraceA(&handle, sessionname, properties); todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); - properties->Wnode.Guid = (GUID){0}; + memset(&properties->Wnode.Guid, 0, sizeof(properties->Wnode.Guid)); properties->LogFileNameOffset = 0; ret = StartTraceA(&handle, sessionname, properties);

1 0

Józef Kucia : wined3d: Do not declare pixel shader inputs when they are not used.
by Alexandre Julliard 13 Jun '17

13 Jun '17

Module: wine Branch: master Commit: 2b77c00b8ffb0eb36c7e179740f360a9be056960 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b77c00b8ffb0eb36c7e17974… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 13 00:55:55 2017 +0200 wined3d: Do not declare pixel shader inputs when they are not used. This is a workaround for a bug in Mesa GLSL linker. The bug is triggered by GLSL generated for SM3 shaders when shader inputs are not read and interface blocks are used for shader inputs/outputs (core profile code path). Declarations for unused shader inputs are not generated for pixel shaders. We still declare shader outputs in the previous shader stage, but it's allowed by the GLSL 1.50 spec: "Only output variables that are read by the subsequent pipeline stage need to be written; it is allowed to have superfluous declarations of output variables." The table in section 4.3.4 (Input Variables) of the GLSL 4.20 spec even more explicitly allows shader output variables with no matching input variables declared in the consuming shader. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 81b338c..1bd3a66 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7250,7 +7250,7 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context { unsigned int in_count = min(vec4_varyings(version->major, gl_info), shader->limits->packed_input); - if (args->vp_mode == vertexshader) + if (args->vp_mode == vertexshader && reg_maps->input_registers) shader_glsl_declare_shader_inputs(gl_info, buffer, in_count); shader_addline(buffer, "vec4 %s_in[%u];\n", prefix, in_count); }

1 0

Matteo Bruni : advapi32/tests: Allow an additional result on newer Win10.
by Alexandre Julliard 13 Jun '17

13 Jun '17

Module: wine Branch: master Commit: 282168516428cd7593622550e6bbf6899b0cddb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=282168516428cd7593622550e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jun 12 20:34:36 2017 +0200 advapi32/tests: Allow an additional result on newer Win10. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 34bde87..fa3211c 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -5858,7 +5858,8 @@ static void test_process_access(void) case GENERIC_WRITE: ok(access == map[i].mapped || access == (map[i].mapped | PROCESS_TERMINATE) /* before Vista */ || - access == (map[i].mapped | PROCESS_SET_LIMITED_INFORMATION) /* win8 */, + access == (map[i].mapped | PROCESS_SET_LIMITED_INFORMATION) /* win8 */ || + access == (map[i].mapped | PROCESS_QUERY_LIMITED_INFORMATION | PROCESS_SET_LIMITED_INFORMATION) /* Win10 Anniversary Update */, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); break; case GENERIC_EXECUTE:

1 0

Owen Rudge : ws2_32/tests: Test IP address conversion in getaddrinfo.
by Alexandre Julliard 13 Jun '17

13 Jun '17

Module: wine Branch: master Commit: 93323bcf6c124b7681fcb88426efde10633972cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=93323bcf6c124b7681fcb8842… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue Jun 13 02:07:50 2017 -0300 ws2_32/tests: Test IP address conversion in getaddrinfo. Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 108 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 107 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 677a750..23464ac 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7335,11 +7335,35 @@ static void test_GetAddrInfoW(void) ok(result2 == NULL, "got %p\n", result2); } +static void verify_ipv6_addrinfo(ADDRINFOA *result, const char *expectedIp) +{ + SOCKADDR_IN6 *sockaddr6; + char ipBuffer[256]; + const char *ret; + + ok(result->ai_family == AF_INET6, "ai_family == %d\n", result->ai_family); + ok(result->ai_addrlen >= sizeof(struct sockaddr_in6), "ai_addrlen == %d\n", (int)result->ai_addrlen); + ok(result->ai_addr != NULL, "ai_addr == NULL\n"); + + if (result->ai_addr != NULL) + { + sockaddr6 = (SOCKADDR_IN6 *)result->ai_addr; + ok(sockaddr6->sin6_family == AF_INET6, "ai_addr->sin6_family == %d\n", sockaddr6->sin6_family); + ok(sockaddr6->sin6_port == 0, "ai_addr->sin6_port == %d\n", sockaddr6->sin6_port); + + ZeroMemory(ipBuffer, sizeof(ipBuffer)); + ret = pInetNtop(AF_INET6, &sockaddr6->sin6_addr, ipBuffer, sizeof(ipBuffer)); + ok(ret != NULL, "inet_ntop failed (%d)\n", WSAGetLastError()); + ok(strcmp(ipBuffer, expectedIp) == 0, "ai_addr->sin6_addr == '%s' (expected '%s')\n", ipBuffer, expectedIp); + } +} + static void test_getaddrinfo(void) { int i, ret; ADDRINFOA *result, *result2, *p, hint; - CHAR name[256]; + SOCKADDR_IN *sockaddr; + CHAR name[256], *ip; DWORD size = sizeof(name); if (!pgetaddrinfo || !pfreeaddrinfo) @@ -7469,6 +7493,88 @@ static void test_getaddrinfo(void) ok(WSAGetLastError() == WSAHOST_NOT_FOUND, "expected 11001, got %d\n", WSAGetLastError()); ok(result == NULL, "got %p\n", result); + /* Test IPv4 address conversion */ + result = NULL; + ret = pgetaddrinfo("192.168.1.253", NULL, NULL, &result); + ok(!ret, "getaddrinfo failed with %d\n", ret); + ok(result->ai_family == AF_INET, "ai_family == %d\n", result->ai_family); + ok(result->ai_addrlen >= sizeof(struct sockaddr_in), "ai_addrlen == %d\n", (int)result->ai_addrlen); + ok(result->ai_addr != NULL, "ai_addr == NULL\n"); + sockaddr = (SOCKADDR_IN *)result->ai_addr; + ok(sockaddr->sin_family == AF_INET, "ai_addr->sin_family == %d\n", sockaddr->sin_family); + ok(sockaddr->sin_port == 0, "ai_addr->sin_port == %d\n", sockaddr->sin_port); + + ip = inet_ntoa(sockaddr->sin_addr); + ok(strcmp(ip, "192.168.1.253") == 0, "sockaddr->ai_addr == '%s'\n", ip); + pfreeaddrinfo(result); + + /* Test IPv4 address conversion with port */ + result = NULL; + hint.ai_flags = AI_NUMERICHOST; + ret = pgetaddrinfo("192.168.1.253:1024", NULL, &hint, &result); + hint.ai_flags = 0; + ok(ret == WSAHOST_NOT_FOUND, "getaddrinfo returned unexpected result: %d\n", ret); + ok(result == NULL, "expected NULL, got %p\n", result); + + /* Test IPv6 address conversion */ + result = NULL; + SetLastError(0xdeadbeef); + ret = pgetaddrinfo("2a00:2039:dead:beef:cafe::6666", NULL, NULL, &result); + + if (result != NULL) + { + ok(!ret, "getaddrinfo failed with %d\n", ret); + verify_ipv6_addrinfo(result, "2a00:2039:dead:beef:cafe::6666"); + pfreeaddrinfo(result); + + /* Test IPv6 address conversion with brackets */ + result = NULL; + ret = pgetaddrinfo("[beef::cafe]", NULL, NULL, &result); + ok(!ret, "getaddrinfo failed with %d\n", ret); + verify_ipv6_addrinfo(result, "beef::cafe"); + pfreeaddrinfo(result); + + /* Test IPv6 address conversion with brackets and hints */ + memset(&hint, 0, sizeof(ADDRINFOA)); + hint.ai_flags = AI_NUMERICHOST; + hint.ai_family = AF_INET6; + result = NULL; + ret = pgetaddrinfo("[beef::cafe]", NULL, &hint, &result); + ok(!ret, "getaddrinfo failed with %d\n", ret); + verify_ipv6_addrinfo(result, "beef::cafe"); + pfreeaddrinfo(result); + + memset(&hint, 0, sizeof(ADDRINFOA)); + hint.ai_flags = AI_NUMERICHOST; + hint.ai_family = AF_INET; + result = NULL; + ret = pgetaddrinfo("[beef::cafe]", NULL, &hint, &result); + ok(ret == WSAHOST_NOT_FOUND, "getaddrinfo failed with %d\n", ret); + + /* Test IPv6 address conversion with brackets and port */ + result = NULL; + ret = pgetaddrinfo("[beef::cafe]:10239", NULL, NULL, &result); + ok(!ret, "getaddrinfo failed with %d\n", ret); + verify_ipv6_addrinfo(result, "beef::cafe"); + pfreeaddrinfo(result); + + /* Test IPv6 address conversion with unmatched brackets */ + result = NULL; + hint.ai_flags = AI_NUMERICHOST; + ret = pgetaddrinfo("[beef::cafe", NULL, &hint, &result); + ok(ret == WSAHOST_NOT_FOUND, "getaddrinfo failed with %d\n", ret); + + ret = pgetaddrinfo("beef::cafe]", NULL, &hint, &result); + ok(ret == WSAHOST_NOT_FOUND, "getaddrinfo failed with %d\n", ret); + } + else + { + ok(ret == WSAHOST_NOT_FOUND, "getaddrinfo failed with %d\n", ret); + win_skip("getaddrinfo does not support IPV6\n"); + } + + hint.ai_flags = 0; + for (i = 0;i < (sizeof(hinttests) / sizeof(hinttests[0]));i++) { hint.ai_family = hinttests[i].family;

1 0

Owen Rudge : ws2_32: Extract IPv6 address from brackets in getaddrinfo.
by Alexandre Julliard 13 Jun '17

13 Jun '17

Module: wine Branch: master Commit: accf5ef5947591ce6e18f64eebb9dacb9bbfdf3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=accf5ef5947591ce6e18f64ee… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue Jun 13 02:07:49 2017 -0300 ws2_32: Extract IPv6 address from brackets in getaddrinfo. Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 1524192..7a768ac 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6557,7 +6557,7 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr struct addrinfo *unixaires = NULL; int result; struct addrinfo unixhints, *punixhints = NULL; - char *hostname; + char *hostname, *nodeV6 = NULL; const char *node; *res = NULL; @@ -6575,8 +6575,28 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr else if (!nodename[0]) node = hostname; else + { node = nodename; + /* Check for [ipv6] or [ipv6]:portnumber, which are supported by Windows */ + if (!hints || hints->ai_family == WS_AF_UNSPEC || hints->ai_family == WS_AF_INET6) + { + char *close_bracket; + + if (node[0] == '[' && (close_bracket = strchr(node + 1, ']'))) + { + nodeV6 = HeapAlloc(GetProcessHeap(), 0, close_bracket - node); + if (!nodeV6) + { + HeapFree(GetProcessHeap(), 0, hostname); + return WSA_NOT_ENOUGH_MEMORY; + } + lstrcpynA(nodeV6, node + 1, close_bracket - node); + node = nodeV6; + } + } + } + /* servname tweak required by OSX and BSD kernels */ if (servname && !servname[0]) servname = "0"; @@ -6598,6 +6618,7 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr { SetLastError(WSAESOCKTNOSUPPORT); HeapFree(GetProcessHeap(), 0, hostname); + HeapFree(GetProcessHeap(), 0, nodeV6); return SOCKET_ERROR; } @@ -6630,6 +6651,7 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr } TRACE("%s, %s %p -> %p %d\n", debugstr_a(nodename), debugstr_a(servname), hints, res, result); HeapFree(GetProcessHeap(), 0, hostname); + HeapFree(GetProcessHeap(), 0, nodeV6); if (!result) { struct addrinfo *xuai = unixaires;

1 0

Frédéric Delanoy : French translation for release 2.10
by Jeremy Newman 13 Jun '17

13 Jun '17

Module: website Branch: master Commit: 156c17c660d6fe2d34fe107c6f41d885d1725a35 URL: http://source.winehq.org/git/website.git/?a=commit;h=156c17c660d6fe2d34fe10… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jun 13 21:13:25 2017 +0200 French translation for release 2.10 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2017060901.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/fr/2017060901.xml b/news/fr/2017060901.xml new file mode 100644 index 0000000..207a8c6 --- /dev/null +++ b/news/fr/2017060901.xml @@ -0,0 +1,16 @@ +<news> +<date>9 juin 2017</date> +<title>Sortie de Wine 2.10</title> +<body> +La version de développement 2.10 de Wine est disponible. +<a href="{$root}/announce/2.10">Nouveautés</a> de cette version : +<ul> + <li>Version initiale du pilote graphique Android.</li> + <li>Prise en charge des dictionnaires dans WebServices.</li> + <li>Quelques correctifs Direct2D.</li> + <li>Améliorations dans l'interface utilisateur de RegEdit.</li> + <li>Correctifs pour le cache du presse-papiers OLE.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/2.x/wine-2.10.tar.xz">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Frédéric Delanoy : French translation for release 2.9
by Jeremy Newman 13 Jun '17

13 Jun '17

Module: website Branch: master Commit: 3732957f000231ba519426c1ec66b99f848cb050 URL: http://source.winehq.org/git/website.git/?a=commit;h=3732957f000231ba519426… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jun 13 21:13:24 2017 +0200 French translation for release 2.9 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2017052601.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/fr/2017052601.xml b/news/fr/2017052601.xml new file mode 100644 index 0000000..6bf177b --- /dev/null +++ b/news/fr/2017052601.xml @@ -0,0 +1,15 @@ +<news> +<date>26 mai 2017</date> +<title>Sortie de Wine 2.9</title> +<body> +La version de développement 2.9 de Wine est disponible. +<a href="{$root}/announce/2.9">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge des shaders de tesselation dans Direct3D.</li> + <li>Prise en charge du mode binaire dans WebServices.</li> + <li>Modifications du presse-papiers détectés via Xfixes.</li> + <li>Améliorations dans l'interface utilisateur de RegEdit.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/2.x/wine-2.9.tar.xz">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Frédéric Delanoy : French translation for release 2.8
by Jeremy Newman 13 Jun '17

13 Jun '17

Module: website Branch: master Commit: ed00e7e01a8a3af3a95abb96a471da104897b152 URL: http://source.winehq.org/git/website.git/?a=commit;h=ed00e7e01a8a3af3a95abb… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jun 13 21:13:23 2017 +0200 French translation for release 2.8 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2017051201.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/fr/2017051201.xml b/news/fr/2017051201.xml new file mode 100644 index 0000000..03a174a --- /dev/null +++ b/news/fr/2017051201.xml @@ -0,0 +1,15 @@ +<news> +<date>12 mai 2017</date> +<title>Sortie de Wine 2.8</title> +<body> +La version de développement 2.8 de Wine est disponible. +<a href="{$root}/announce/2.8">Nouveautés</a> de cette version : +<ul> + <li>Le flux de commandes Direct3D tourne de façon asynchrone.</li> + <li>Meilleure autodétection des ports série et parallèle.</li> + <li>Correctifs additionnels pour les réglages points par pouce (PPP) élevés.</li> + <li>Notifications dans la zone de notification système sous macOS.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/2.x/wine-2.8.tar.xz">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Frédéric Delanoy : French translation for release 2.7
by Jeremy Newman 13 Jun '17

13 Jun '17

Module: website Branch: master Commit: 51f819ecc37b1e471177384d3750fe2cc3fb9849 URL: http://source.winehq.org/git/website.git/?a=commit;h=51f819ecc37b1e47117738… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jun 13 21:13:22 2017 +0200 French translation for release 2.7 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2017042801.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/fr/2017042801.xml b/news/fr/2017042801.xml new file mode 100644 index 0000000..1afce2c --- /dev/null +++ b/news/fr/2017042801.xml @@ -0,0 +1,17 @@ +<news> +<date>28 avril 2017</date> +<title>Sortie de Wine 2.7</title> +<body> +La version de développement 2.7 de Wine est disponible. +<a href="{$root}/announce/2.7">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge des connections TCP et UDP dans WebServices.</li> + <li>Diverses améliorations des shaders pour Direct3D 11.</li> + <li>Meilleure prise en charge des réglages points par pouce (PPP) élevés.</li> + <li>Réimplémentation partielle de la bibliothèque GLU.</li> + <li>Prise en charge des versions récentes de OSMesa.</li> + <li>Améliorations dans la gestion des fenêtres sous macOS.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/2.x/wine-2.7.tar.xz">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Francois Gouget : winetest: Let dissect detect and report crashes.
by Alexandre Julliard 13 Jun '17

13 Jun '17

Module: tools Branch: master Commit: ee648b52fea5d4d94cb46ffcffd73003cd9525d4 URL: http://source.winehq.org/git/tools.git/?a=commit;h=ee648b52fea5d4d94cb46ffc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 13 10:36:49 2017 +0200 winetest: Let dissect detect and report crashes. A 'failed crash' line in the summary.txt file now identifies tests that crashed. This way gather does not have to duplicate the dissect code to correctly identify crashed tests (except temporarily for backward compatibility with old summary.txt files). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 2 +- winetest/gather | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 4901e97..1ecbd94 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -465,7 +465,7 @@ while (<IN>) { } elsif (/$dll:$unit(?::[0-9a-f]+)? done $(-?\d+)$(?:\r?$| in)/) { chomp; # current test ended if ($lines==0 || $1 < 0) { - $result = "failed $1 - -"; + $result = "failed ". ($1 < 0 ? "crash" : $1) ." - -"; my $reason = "test failed: error $1"; if ($1 == 258) { $reason = "test failed: timed out"; } elsif ($1 < 0) { $reason = "test failed: crash"; } diff --git a/winetest/gather b/winetest/gather index 907b205..fbf0397 100755 --- a/winetest/gather +++ b/winetest/gather @@ -324,7 +324,9 @@ foreach my $file (glob "$builddir/*/summary.txt") { $alltests{$testname} = $source; if ($count eq "failed") { - if ($todos eq "filelimit") { + if ($todos eq "crash") { + $report->{$testname} = { status => "crash" }; + } elsif ($todos eq "filelimit") { $report->{$testname} = { status => "file limit" }; $report->{filelimit} = $testname; } else {

1 0

Francois Gouget : testbot/TestLauncher: Tweak the formats to fix MinGW warnings.
by Alexandre Julliard 13 Jun '17

13 Jun '17

Module: tools Branch: master Commit: b71ad564a5cce053cd26ce193b5a4e272e31fa89 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b71ad564a5cce053cd26ce19… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 13 10:23:21 2017 +0200 testbot/TestLauncher: Tweak the formats to fix MinGW warnings. DWORD equates to an unsigned long. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/TestLauncher/TestLauncher.c | 42 ++++++++++++++++----------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index a790470..ed7fffb 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -114,14 +114,14 @@ static BOOL AllImportedDllsPresent(char *TestExeName) TestExe = CreateFileA(TestExeName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); if (TestExe == INVALID_HANDLE_VALUE) { - ReportError("Can't open test executable %s, error %u\n", TestExeName, GetLastError()); + ReportError("Can't open test executable %s, error %lu\n", TestExeName, GetLastError()); return FALSE; } if (! ReadFile(TestExe, &DosHeader, sizeof(IMAGE_DOS_HEADER), &NR, NULL) || NR != sizeof(IMAGE_DOS_HEADER)) { CloseHandle(TestExe); - ReportError("Can't read DOS header from %s, error %u\n", TestExeName, GetLastError()); + ReportError("Can't read DOS header from %s, error %lu\n", TestExeName, GetLastError()); return FALSE; } if (DosHeader.e_magic != IMAGE_DOS_SIGNATURE) @@ -135,20 +135,20 @@ static BOOL AllImportedDllsPresent(char *TestExeName) if (NewPos == INVALID_SET_FILE_POINTER && GetLastError() != ERROR_SUCCESS) { CloseHandle(TestExe); - ReportError("Can't move to NT headers in %s, error %u\n", TestExeName, GetLastError()); + ReportError("Can't move to NT headers in %s, error %lu\n", TestExeName, GetLastError()); return FALSE; } if (! ReadFile(TestExe, &NTHeaders, sizeof(IMAGE_NT_HEADERS), &NR, NULL) || NR != sizeof(IMAGE_NT_HEADERS)) { CloseHandle(TestExe); - ReportError("Can't read NT headers from %s, error %u\n", TestExeName, GetLastError()); + ReportError("Can't read NT headers from %s, error %lu\n", TestExeName, GetLastError()); return FALSE; } if (NTHeaders.Signature != IMAGE_NT_SIGNATURE || NTHeaders.OptionalHeader.Magic != IMAGE_NT_OPTIONAL_HDR_MAGIC) { CloseHandle(TestExe); - ReportError("%s does not contain valid NT headers expected 0x%08x/0x%04x found 0x%08x/0x%04x\n", TestExeName, + ReportError("%s does not contain valid NT headers expected 0x%08x/0x%04x found 0x%08lx/0x%04x\n", TestExeName, IMAGE_NT_SIGNATURE, IMAGE_NT_OPTIONAL_HDR_MAGIC, NTHeaders.Signature, NTHeaders.OptionalHeader.Magic); return FALSE; } @@ -156,7 +156,7 @@ static BOOL AllImportedDllsPresent(char *TestExeName) if (DataDirectoryImportTable->VirtualAddress == 0 || DataDirectoryImportTable->Size == 0) { CloseHandle(TestExe); - ReportError("%s does not contain valid a valid import table (RVA 0x%x size 0x%x)\n", TestExeName, + ReportError("%s does not contain valid a valid import table (RVA 0x%lx size 0x%lx)\n", TestExeName, DataDirectoryImportTable->VirtualAddress, DataDirectoryImportTable->Size); return FALSE; } @@ -173,7 +173,7 @@ static BOOL AllImportedDllsPresent(char *TestExeName) { free(SectionHeaders); CloseHandle(TestExe); - ReportError("Can't read section headers from %s, error %u\n", TestExeName, GetLastError()); + ReportError("Can't read section headers from %s, error %lu\n", TestExeName, GetLastError()); return FALSE; } @@ -201,7 +201,7 @@ static BOOL AllImportedDllsPresent(char *TestExeName) free(ImportDescriptors); free(SectionHeaders); CloseHandle(TestExe); - ReportError("Can't move to import directory in %s, error %u\n", TestExeName, GetLastError()); + ReportError("Can't move to import directory in %s, error %lu\n", TestExeName, GetLastError()); return FALSE; } @@ -210,7 +210,7 @@ static BOOL AllImportedDllsPresent(char *TestExeName) free(ImportDescriptors); free(SectionHeaders); CloseHandle(TestExe); - ReportError("Can't read import directory from %s, error %u\n", TestExeName, GetLastError()); + ReportError("Can't read import directory from %s, error %lu\n", TestExeName, GetLastError()); return FALSE; } @@ -234,7 +234,7 @@ static BOOL AllImportedDllsPresent(char *TestExeName) free(ImportDescriptors); free(SectionHeaders); CloseHandle(TestExe); - ReportError("Can't move to import module name in %s, error %u\n", TestExeName, GetLastError()); + ReportError("Can't move to import module name in %s, error %lu\n", TestExeName, GetLastError()); return FALSE; } @@ -243,7 +243,7 @@ static BOOL AllImportedDllsPresent(char *TestExeName) free(ImportDescriptors); free(SectionHeaders); CloseHandle(TestExe); - ReportError("Can't read import directory from %s, error %u\n", TestExeName, GetLastError()); + ReportError("Can't read import directory from %s, error %lu\n", TestExeName, GetLastError()); return FALSE; } @@ -329,7 +329,7 @@ int main(int argc, char *argv[]) { if (GetFullPathNameA(argv[Arg], countof(TestExeFullName), TestExeFullName, &TestExeFileName) == 0) { - fprintf(stderr, "Can't determine full path of test executable %s, error %u\n", + fprintf(stderr, "Can't determine full path of test executable %s, error %lu\n", argv[Arg], GetLastError()); exit(1); } @@ -396,7 +396,7 @@ int main(int argc, char *argv[]) if (! CreateProcessA(NULL, CommandLine, NULL, NULL, TRUE, CREATE_DEFAULT_ERROR_MODE, NULL, NULL, &StartupInfo, &ProcessInformation)) { - fprintf(stderr, "CreateProcess failed with error %u\n", GetLastError()); + fprintf(stderr, "CreateProcess failed with error %lu\n", GetLastError()); exit(1); } @@ -407,20 +407,20 @@ int main(int argc, char *argv[]) switch(WaitStatus) { case WAIT_FAILED: - fprintf(stderr, "Wait for child failed, error %u\n", GetLastError()); + fprintf(stderr, "Wait for child failed, error %lu\n", GetLastError()); break; case WAIT_TIMEOUT: break; default: - fprintf(stderr, "Unexpected return value %u from wait for child\n", WaitStatus); + fprintf(stderr, "Unexpected return value %lu from wait for child\n", WaitStatus); break; } ExitCode = WaitStatus; if (! TerminateProcess(ProcessInformation.hProcess, 257)) - fprintf(stderr, "TerminateProcess failed with error %u\n", GetLastError()); + fprintf(stderr, "TerminateProcess failed with error %lu\n", GetLastError()); switch (WaitForSingleObject(ProcessInformation.hProcess, 5000)) { @@ -428,7 +428,7 @@ int main(int argc, char *argv[]) break; case WAIT_FAILED: - fprintf(stderr, "Wait for terminate failed, error %u\n", GetLastError()); + fprintf(stderr, "Wait for terminate failed, error %lu\n", GetLastError()); break; case WAIT_TIMEOUT: @@ -436,7 +436,7 @@ int main(int argc, char *argv[]) break; default: - fprintf(stderr, "Unexpected return value %u from wait for terminate\n", WaitStatus); + fprintf(stderr, "Unexpected return value %lu from wait for terminate\n", WaitStatus); break; } } @@ -445,12 +445,12 @@ int main(int argc, char *argv[]) if (! GetExitCodeProcess(ProcessInformation.hProcess, &ExitCode)) { ExitCode = 259; - fprintf(stderr, "Can't get child exit code, error %u\n", GetLastError()); + fprintf(stderr, "Can't get child exit code, error %lu\n", GetLastError()); } } CloseHandle(ProcessInformation.hProcess); - printf("%s:%s done (%u)\n", TestName, Subtest, ExitCode); + printf("%s:%s done (%lu)\n", TestName, Subtest, ExitCode); - return 0; + return 0; }

1 0

Francois Gouget : testbot/WineRunTask: Better deal with single test unit executables.
by Alexandre Julliard 13 Jun '17

13 Jun '17

Module: tools Branch: master Commit: 440f41dad071bf8007311429e68a980cb0d82245 URL: http://source.winehq.org/git/tools.git/?a=commit;h=440f41dad071bf8007311429… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 13 10:14:55 2017 +0200 testbot/WineRunTask: Better deal with single test unit executables. If a Wine test executable has a single test unit, then one can upload and run it without a parameter. In that case TestLauncher does not the test unit name and thus does not print it on the start line. So WineRunTask ends up with $CurrentUnit="" and must account for it when it compares it to the test unit of skip lines. This should also be factored when determining whether the test output follows the Wine test standards. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 7122c57..cd74119 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -477,7 +477,7 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) sub CheckUnit($$) { my ($Unit, $Type) = @_; - if ($Unit eq $CurrentUnit) + if ($Unit eq $CurrentUnit or $CurrentUnit eq "") { $IsWineTest = 1; } @@ -600,10 +600,14 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) ($CurrentUnit ne "" and $Line =~ /($CurrentUnit)(?:\.c)?:\d+:? Tests? skipped: /)) { + my $Unit = $1; # Don't complain and don't count misplaced skips. Only complain if they # are misreported (see CloseTestUnit). Also TestLauncher uses the wrong # name in its skip message when skipping tests. - $LineSkips++ if ($1 eq $CurrentUnit or $1 eq $CurrentDll); + if ($Unit eq $CurrentUnit or $CurrentUnit eq "" or $Unit eq $CurrentDll) + { + $LineSkips++; + } } elsif ($Line =~ /^Fatal: test '([_a-z0-9]+)' does not exist/) {

1 0

Alexandre Julliard : wineandroid: Store the actual screen DPI on startup.
by Alexandre Julliard 12 Jun '17

12 Jun '17

Module: wine Branch: master Commit: f254aec4498e9926200ea9fd9cd2acf914747d91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f254aec4498e9926200ea9fd9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 12 19:12:30 2017 +0200 wineandroid: Store the actual screen DPI on startup. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/Makefile.in | 2 +- dlls/wineandroid.drv/WineActivity.java | 2 ++ dlls/wineandroid.drv/android.h | 8 ++++++++ dlls/wineandroid.drv/init.c | 18 ++++++++++++++++++ dlls/wineandroid.drv/window.c | 22 ++++++++++++++++++++++ 5 files changed, 51 insertions(+), 1 deletion(-) diff --git a/dlls/wineandroid.drv/Makefile.in b/dlls/wineandroid.drv/Makefile.in index 55eba97..07082dc 100644 --- a/dlls/wineandroid.drv/Makefile.in +++ b/dlls/wineandroid.drv/Makefile.in @@ -1,5 +1,5 @@ MODULE = wineandroid.drv -IMPORTS = user32 gdi32 ntoskrnl +IMPORTS = user32 gdi32 advapi32 ntoskrnl C_SRCS = \ device.c \ diff --git a/dlls/wineandroid.drv/WineActivity.java b/dlls/wineandroid.drv/WineActivity.java index 1b99b18..ea1ab85 100644 --- a/dlls/wineandroid.drv/WineActivity.java +++ b/dlls/wineandroid.drv/WineActivity.java @@ -53,6 +53,7 @@ public class WineActivity extends Activity { private native String wine_init( String[] cmdline, String[] env ); public native void wine_desktop_changed( int width, int height ); + public native void wine_config_changed( int dpi ); public native void wine_surface_changed( int hwnd, Surface surface ); public native boolean wine_motion_event( int hwnd, int action, int x, int y, int state, int vscroll ); public native boolean wine_keyboard_event( int hwnd, int action, int keycode, int state ); @@ -508,6 +509,7 @@ public class WineActivity extends Activity top_view = new TopView( this, hwnd ); setContentView( top_view ); progress_dialog.dismiss(); + wine_config_changed( getResources().getConfiguration().densityDpi ); } public void create_window( int hwnd, int parent, int pid ) diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h index 0c3f35f..5ef7668 100644 --- a/dlls/wineandroid.drv/android.h +++ b/dlls/wineandroid.drv/android.h @@ -81,10 +81,12 @@ enum android_window_messages extern HWND get_capture_window(void) DECLSPEC_HIDDEN; extern void init_monitors( int width, int height ) DECLSPEC_HIDDEN; +extern void set_screen_dpi( DWORD dpi ) DECLSPEC_HIDDEN; extern void update_keyboard_lock_state( WORD vkey, UINT state ) DECLSPEC_HIDDEN; /* JNI entry points */ extern void desktop_changed( JNIEnv *env, jobject obj, jint width, jint height ) DECLSPEC_HIDDEN; +extern void config_changed( JNIEnv *env, jobject obj, jint dpi ) DECLSPEC_HIDDEN; extern void surface_changed( JNIEnv *env, jobject obj, jint win, jobject surface ) DECLSPEC_HIDDEN; extern jboolean motion_event( JNIEnv *env, jobject obj, jint win, jint action, jint x, jint y, jint state, jint vscroll ) DECLSPEC_HIDDEN; @@ -94,6 +96,7 @@ extern jboolean keyboard_event( JNIEnv *env, jobject obj, jint win, jint action, enum event_type { DESKTOP_CHANGED, + CONFIG_CHANGED, SURFACE_CHANGED, MOTION_EVENT, KEYBOARD_EVENT, @@ -111,6 +114,11 @@ union event_data struct { enum event_type type; + unsigned int dpi; + } cfg; + struct + { + enum event_type type; HWND hwnd; ANativeWindow *window; unsigned int width; diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index 14aa239..871e41d 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -28,6 +28,7 @@ #include "windef.h" #include "winbase.h" +#include "winreg.h" #include "android.h" #include "wine/server.h" #include "wine/library.h" @@ -82,6 +83,22 @@ void init_monitors( int width, int height ) } +/****************************************************************************** + * set_screen_dpi + */ +void set_screen_dpi( DWORD dpi ) +{ + static const WCHAR dpi_key_name[] = {'S','o','f','t','w','a','r','e','\\','F','o','n','t','s',0}; + static const WCHAR dpi_value_name[] = {'L','o','g','P','i','x','e','l','s',0}; + HKEY hkey; + + if (!RegCreateKeyW( HKEY_CURRENT_CONFIG, dpi_key_name, &hkey )) + { + RegSetValueExW( hkey, dpi_value_name, 0, REG_DWORD, (void *)&dpi, sizeof(DWORD) ); + RegCloseKey( hkey ); + } +} + /********************************************************************** * fetch_display_metrics */ @@ -390,6 +407,7 @@ const struct gdi_dc_funcs * CDECL ANDROID_get_gdi_driver( unsigned int version ) static const JNINativeMethod methods[] = { { "wine_desktop_changed", "(II)V", desktop_changed }, + { "wine_config_changed", "(I)V", config_changed }, { "wine_surface_changed", "(ILandroid/view/Surface;)V", surface_changed }, { "wine_motion_event", "(IIIIII)Z", motion_event }, { "wine_keyboard_event", "(IIII)Z", keyboard_event }, diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 33f2240..3bde739 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -224,6 +224,23 @@ void desktop_changed( JNIEnv *env, jobject obj, jint width, jint height ) /*********************************************************************** + * config_changed + * + * JNI callback, runs in the context of the Java thread. + */ +void config_changed( JNIEnv *env, jobject obj, jint dpi ) +{ + union event_data data; + + memset( &data, 0, sizeof(data) ); + data.type = CONFIG_CHANGED; + data.cfg.dpi = dpi; + p__android_log_print( ANDROID_LOG_INFO, "wine", "config_changed: %u dpi", dpi ); + send_event( &data ); +} + + +/*********************************************************************** * surface_changed * * JNI callback, runs in the context of the Java thread. @@ -428,6 +445,11 @@ static int process_events( DWORD mask ) SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW ); break; + case CONFIG_CHANGED: + TRACE( "CONFIG_CHANGED dpi %u\n", event->data.cfg.dpi ); + set_screen_dpi( event->data.cfg.dpi ); + break; + case SURFACE_CHANGED: TRACE("SURFACE_CHANGED %p %p size %ux%u\n", event->data.surface.hwnd, event->data.surface.window, event->data.surface.width, event->data.surface.height );

1 0

Alexandre Julliard : wineandroid: Start in landscape mode and don' t restart on config changes.
by Alexandre Julliard 12 Jun '17

12 Jun '17

Module: wine Branch: master Commit: 3179a5da9344c34d7b9b8f51b68e69bda3e662d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3179a5da9344c34d7b9b8f51b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 12 19:12:10 2017 +0200 wineandroid: Start in landscape mode and don't restart on config changes. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/AndroidManifest.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wineandroid.drv/AndroidManifest.xml b/dlls/wineandroid.drv/AndroidManifest.xml index 5eed5ce..631cc1a 100644 --- a/dlls/wineandroid.drv/AndroidManifest.xml +++ b/dlls/wineandroid.drv/AndroidManifest.xml @@ -6,7 +6,10 @@ android:label="Wine" > <activity android:label="Wine" - android:name=".WineActivity" > + android:name=".WineActivity" + android:launchMode="singleInstance" + android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize" + android:screenOrientation="sensorLandscape" > <intent-filter > <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.LAUNCHER" />

1 0

Alistair Leslie-Hughes : windowscodecs: Register WICImagingFactory2 interface.
by Alexandre Julliard 12 Jun '17

12 Jun '17

Module: wine Branch: master Commit: cf1269a525984b32f8713c8f268a9ff72c67837e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf1269a525984b32f8713c8f2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jun 6 01:51:16 2017 +0000 windowscodecs: Register WICImagingFactory2 interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/windowscodecs_wincodec.idl | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/windowscodecs/windowscodecs_wincodec.idl b/dlls/windowscodecs/windowscodecs_wincodec.idl index fd7ff01..33c0d4a 100644 --- a/dlls/windowscodecs/windowscodecs_wincodec.idl +++ b/dlls/windowscodecs/windowscodecs_wincodec.idl @@ -35,6 +35,13 @@ coclass PSFactoryBuffer { interface IFactoryBuffer; } coclass WICImagingFactory { interface IWICImagingFactory; } [ + helpstring("WIC Imaging Factory 2"), + threading(both), + uuid(317d06e8-5f24-433d-bdf7-79ce68d8abc2) +] +coclass WICImagingFactory2 { interface IWICImagingFactory2; } + +[ helpstring("WIC BMP Decoder"), threading(both), uuid(6b462062-7cbf-400d-9fdb-813dd10f2778)

1 0

Alistair Leslie-Hughes : include/windocdec.idl: Add interface IWICImagingFactory2.
by Alexandre Julliard 12 Jun '17

12 Jun '17

Module: wine Branch: master Commit: 28ea560b7a935e9652906d2dbf3460aa0cb927b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28ea560b7a935e9652906d2db… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jun 6 01:51:05 2017 +0000 include/windocdec.idl: Add interface IWICImagingFactory2. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wincodec.idl | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-) diff --git a/include/wincodec.idl b/include/wincodec.idl index 962a6fd..1ea6e0e 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -20,6 +20,8 @@ import "wtypes.idl"; import "propidl.idl"; import "ocidl.idl"; +cpp_quote ("#include \"dcommon.h\"") + cpp_quote("#define WINCODEC_SDK_VERSION 0x0236") #define CODEC_FORCE_DWORD 0x7fffffff @@ -215,6 +217,15 @@ cpp_quote("DEFINE_GUID(GUID_WICPixelFormat64bppPRGBA, 0x6fddc324,0x4e03,0x4bfe,0 cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppCMYK, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x1c);") +cpp_quote("#if 0") +typedef DWORD *ID2D1Device; +typedef DWORD *ID2D1Image; +typedef DWORD *D2D1_PIXEL_FORMAT; +cpp_quote ("#endif") + +cpp_quote ("typedef interface ID2D1Device ID2D1Device;") +cpp_quote ("typedef interface ID2D1Image ID2D1Image;") + typedef struct WICRect { INT X; INT Y; @@ -230,6 +241,17 @@ typedef struct WICBitmapPattern { BOOL EndOfStream; } WICBitmapPattern; +typedef struct WICImageParameters +{ + D2D1_PIXEL_FORMAT PixelFormat; + FLOAT DpiX; + FLOAT DpiY; + FLOAT Top; + FLOAT Left; + UINT32 PixelWidth; + UINT32 PixelHeight; +} WICImageParameters; + typedef UINT32 WICColor; interface IWICPalette; @@ -842,7 +864,32 @@ interface IWICFastMetadataEncoder : IUnknown [out] IWICMetadataQueryWriter **ppIMetadataQueryWriter); } -cpp_quote("DEFINE_GUID(CLSID_WICImagingFactory, 0xcacaf262,0x9370,0x4615,0xa1,0x3b,0x9f,0x55,0x39,0xda,0x4c,0x0a);") +[ + object, + uuid(04c75bf8-3ce1-473b-acc5-3cc4f5e94999), + local +] +interface IWICImageEncoder : IUnknown +{ + HRESULT WriteFrame( + [in] ID2D1Image *image, + [in] IWICBitmapFrameEncode *encode, + [in, unique] const WICImageParameters *parameters); + + HRESULT WriteFrameThumbnail( + [in] ID2D1Image *image, + [in] IWICBitmapFrameEncode *encode, + [in, unique] const WICImageParameters *parameters); + + HRESULT WriteThumbnail( + [in] ID2D1Image *image, + [in] IWICBitmapEncoder *encoder, + [in, unique] const WICImageParameters *parameters); +}; + +cpp_quote("DEFINE_GUID(CLSID_WICImagingFactory, 0xcacaf262,0x9370,0x4615,0xa1,0x3b,0x9f,0x55,0x39,0xda,0x4c,0x0a);") +cpp_quote("DEFINE_GUID(CLSID_WICImagingFactory1, 0xcacaf262,0x9370,0x4615,0xa1,0x3b,0x9f,0x55,0x39,0xda,0x4c,0x0a);") +cpp_quote("DEFINE_GUID(CLSID_WICImagingFactory2, 0x317d06e8,0x5f24,0x433d,0xbd,0xf7,0x79,0xce,0x68,0xd8,0xab,0xc2);") [ object, @@ -971,6 +1018,18 @@ interface IWICImagingFactory : IUnknown } [ + object, + uuid(7b816b45-1996-4476-b132-de9e247c8af0), + local +] +interface IWICImagingFactory2 : IWICImagingFactory +{ + HRESULT CreateImageEncoder( + [in] ID2D1Device *device, + [out] IWICImageEncoder **encoder); +}; + +[ local, object, uuid(dc2bb46d-3f07-481e-8625-220c4aedbb33)

1 0

Henri Verbeet : wined3d: Also check for "Mesa" in GL_VERSION in wined3d_guess_gl_vendor().
by Alexandre Julliard 12 Jun '17

12 Jun '17

Module: wine Branch: master Commit: 1d3a8a5ded30674681c335714bb019a561e88e39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d3a8a5ded30674681c335714… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 12 14:01:43 2017 +0200 wined3d: Also check for "Mesa" in GL_VERSION in wined3d_guess_gl_vendor(). The existing checks should be sufficient, but the GL_VERSION one is potentially more reliable. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7ad944f..9707f81 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1761,7 +1761,7 @@ static DWORD wined3d_parse_gl_version(const char *gl_version) } static enum wined3d_gl_vendor wined3d_guess_gl_vendor(const struct wined3d_gl_info *gl_info, - const char *gl_vendor_string, const char *gl_renderer) + const char *gl_vendor_string, const char *gl_renderer, const char *gl_version) { /* MacOS has various specialities in the extensions it advertises. Some have to be loaded from * the opengl 1.2+ core, while other extensions are advertised, but software emulated. So try to @@ -1792,7 +1792,8 @@ static enum wined3d_gl_vendor wined3d_guess_gl_vendor(const struct wined3d_gl_in || strstr(gl_vendor_string, "Intel") || strstr(gl_renderer, "Mesa") || strstr(gl_renderer, "Gallium") - || strstr(gl_renderer, "Intel")) + || strstr(gl_renderer, "Intel") + || strstr(gl_version, "Mesa")) return GL_VENDOR_MESA; FIXME("Received unrecognized GL_VENDOR %s. Returning GL_VENDOR_UNKNOWN.\n", @@ -4350,7 +4351,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, checkGLcall("creating VAO"); } - gl_vendor = wined3d_guess_gl_vendor(gl_info, gl_vendor_str, gl_renderer_str); + gl_vendor = wined3d_guess_gl_vendor(gl_info, gl_vendor_str, gl_renderer_str, gl_version_str); TRACE("Guessed GL vendor %#x.\n", gl_vendor); if (!(gpu_description = query_gpu_description(gl_info, &vram_bytes)))

1 0

Nikolay Sivov : d3drm: Make it possible to create light objects using CreateObject().
by Alexandre Julliard 12 Jun '17

12 Jun '17

Module: wine Branch: master Commit: f43dfe5c088c8d1ed5428f4571fcafcf7ab0c7b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f43dfe5c088c8d1ed5428f457… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 11 18:52:28 2017 +0300 d3drm: Make it possible to create light objects using CreateObject(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm.c | 34 ++++++++++++++++++++++++++++------ dlls/d3drm/d3drm_private.h | 18 +++++++++++++++++- dlls/d3drm/light.c | 40 ++++++++++++++++++---------------------- dlls/d3drm/tests/d3drm.c | 9 ++++++++- 4 files changed, 71 insertions(+), 30 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index ae08fdf..bf5721c 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -123,6 +123,19 @@ static HRESULT d3drm_create_frame_object(void **object, IDirect3DRM *d3drm) return hr; } +static HRESULT d3drm_create_light_object(void **object, IDirect3DRM *d3drm) +{ + struct d3drm_light *light; + HRESULT hr; + + if (FAILED(hr = d3drm_light_create(&light, d3drm))) + return hr; + + *object = &light->IDirect3DRMLight_iface; + + return hr; +} + struct d3drm { IDirect3DRM IDirect3DRM_iface; @@ -1271,6 +1284,7 @@ static HRESULT WINAPI d3drm3_CreateObject(IDirect3DRM3 *iface, {&CLSID_CDirect3DRMFace, d3drm_create_face_object}, {&CLSID_CDirect3DRMMeshBuilder, d3drm_create_mesh_builder_object}, {&CLSID_CDirect3DRMFrame, d3drm_create_frame_object}, + {&CLSID_CDirect3DRMLight, d3drm_create_light_object}, }; TRACE("iface %p, clsid %s, outer %p, iid %s, out %p.\n", @@ -1419,33 +1433,41 @@ static HRESULT WINAPI d3drm3_CreateTexture(IDirect3DRM3 *iface, static HRESULT WINAPI d3drm3_CreateLight(IDirect3DRM3 *iface, D3DRMLIGHTTYPE type, D3DCOLOR color, IDirect3DRMLight **light) { + struct d3drm *d3drm = impl_from_IDirect3DRM3(iface); + struct d3drm_light *object; HRESULT hr; FIXME("iface %p, type %#x, color 0x%08x, light %p partial stub!\n", iface, type, color, light); - if (SUCCEEDED(hr = Direct3DRMLight_create((IUnknown **)light))) + if (SUCCEEDED(hr = d3drm_light_create(&object, &d3drm->IDirect3DRM_iface))) { - IDirect3DRMLight_SetType(*light, type); - IDirect3DRMLight_SetColor(*light, color); + IDirect3DRMLight_SetType(&object->IDirect3DRMLight_iface, type); + IDirect3DRMLight_SetColor(&object->IDirect3DRMLight_iface, color); } + *light = &object->IDirect3DRMLight_iface; + return hr; } static HRESULT WINAPI d3drm3_CreateLightRGB(IDirect3DRM3 *iface, D3DRMLIGHTTYPE type, D3DVALUE red, D3DVALUE green, D3DVALUE blue, IDirect3DRMLight **light) { + struct d3drm *d3drm = impl_from_IDirect3DRM3(iface); + struct d3drm_light *object; HRESULT hr; FIXME("iface %p, type %#x, red %.8e, green %.8e, blue %.8e, light %p partial stub!\n", iface, type, red, green, blue, light); - if (SUCCEEDED(hr = Direct3DRMLight_create((IUnknown **)light))) + if (SUCCEEDED(hr = d3drm_light_create(&object, &d3drm->IDirect3DRM_iface))) { - IDirect3DRMLight_SetType(*light, type); - IDirect3DRMLight_SetColorRGB(*light, red, green, blue); + IDirect3DRMLight_SetType(&object->IDirect3DRMLight_iface, type); + IDirect3DRMLight_SetColorRGB(&object->IDirect3DRMLight_iface, red, green, blue); } + *light = &object->IDirect3DRMLight_iface; + return hr; } diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index f78200d..41f0c50 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -147,6 +147,22 @@ struct d3drm_mesh_builder DWORD *material_indices; }; +struct d3drm_light +{ + struct d3drm_object obj; + IDirect3DRMLight IDirect3DRMLight_iface; + LONG ref; + IDirect3DRM *d3drm; + D3DRMLIGHTTYPE type; + D3DCOLOR color; + D3DVALUE range; + D3DVALUE cattenuation; + D3DVALUE lattenuation; + D3DVALUE qattenuation; + D3DVALUE umbra; + D3DVALUE penumbra; +}; + HRESULT d3drm_device_create(struct d3drm_device **device, IDirect3DRM *d3drm) DECLSPEC_HIDDEN; HRESULT d3drm_device_create_surfaces_from_clipper(struct d3drm_device *object, IDirectDraw *ddraw, IDirectDrawClipper *clipper, int width, int height, IDirectDrawSurface **surface) DECLSPEC_HIDDEN; @@ -168,7 +184,7 @@ HRESULT d3drm_frame_create(struct d3drm_frame **frame, IUnknown *parent_frame, I HRESULT d3drm_face_create(struct d3drm_face **face) DECLSPEC_HIDDEN; HRESULT d3drm_viewport_create(struct d3drm_viewport **viewport, IDirect3DRM *d3drm) DECLSPEC_HIDDEN; HRESULT d3drm_mesh_builder_create(struct d3drm_mesh_builder **mesh_builder, IDirect3DRM *d3drm) DECLSPEC_HIDDEN; -HRESULT Direct3DRMLight_create(IUnknown** ppObj) DECLSPEC_HIDDEN; +HRESULT d3drm_light_create(struct d3drm_light **light, IDirect3DRM *d3drm) DECLSPEC_HIDDEN; HRESULT Direct3DRMMesh_create(IDirect3DRMMesh** obj) DECLSPEC_HIDDEN; HRESULT Direct3DRMMaterial_create(IDirect3DRMMaterial2** ret_iface) DECLSPEC_HIDDEN; diff --git a/dlls/d3drm/light.c b/dlls/d3drm/light.c index 20430f9..0afd32b 100644 --- a/dlls/d3drm/light.c +++ b/dlls/d3drm/light.c @@ -25,21 +25,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3drm); -struct d3drm_light -{ - struct d3drm_object obj; - IDirect3DRMLight IDirect3DRMLight_iface; - LONG ref; - D3DRMLIGHTTYPE type; - D3DCOLOR color; - D3DVALUE range; - D3DVALUE cattenuation; - D3DVALUE lattenuation; - D3DVALUE qattenuation; - D3DVALUE umbra; - D3DVALUE penumbra; -}; - static inline struct d3drm_light *impl_from_IDirect3DRMLight(IDirect3DRMLight *iface) { return CONTAINING_RECORD(iface, struct d3drm_light, IDirect3DRMLight_iface); @@ -50,6 +35,7 @@ static HRESULT WINAPI d3drm_light_QueryInterface(IDirect3DRMLight *iface, REFIID TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); if (IsEqualGUID(riid, &IID_IDirect3DRMLight) + || IsEqualGUID(riid, &IID_IDirect3DRMObject) || IsEqualGUID(riid, &IID_IUnknown)) { IDirect3DRMLight_AddRef(iface); @@ -81,7 +67,11 @@ static ULONG WINAPI d3drm_light_Release(IDirect3DRMLight *iface) TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) + { + d3drm_object_cleanup((IDirect3DRMObject *)iface, &light->obj); + IDirect3DRM_Release(light->d3drm); HeapFree(GetProcessHeap(), 0, light); + } return refcount; } @@ -97,17 +87,21 @@ static HRESULT WINAPI d3drm_light_Clone(IDirect3DRMLight *iface, static HRESULT WINAPI d3drm_light_AddDestroyCallback(IDirect3DRMLight *iface, D3DRMOBJECTCALLBACK cb, void *ctx) { - FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); + struct d3drm_light *light = impl_from_IDirect3DRMLight(iface); - return E_NOTIMPL; + TRACE("iface %p, cb %p, ctx %p.\n", iface, cb, ctx); + + return d3drm_object_add_destroy_callback(&light->obj, cb, ctx); } static HRESULT WINAPI d3drm_light_DeleteDestroyCallback(IDirect3DRMLight *iface, D3DRMOBJECTCALLBACK cb, void *ctx) { - FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); + struct d3drm_light *light = impl_from_IDirect3DRMLight(iface); - return E_NOTIMPL; + TRACE("iface %p, cb %p, ctx %p.\n", iface, cb, ctx); + + return d3drm_object_delete_destroy_callback(&light->obj, cb, ctx); } static HRESULT WINAPI d3drm_light_SetAppData(IDirect3DRMLight *iface, DWORD data) @@ -367,22 +361,24 @@ static const struct IDirect3DRMLightVtbl d3drm_light_vtbl = d3drm_light_GetEnableFrame, }; -HRESULT Direct3DRMLight_create(IUnknown **out) +HRESULT d3drm_light_create(struct d3drm_light **light, IDirect3DRM *d3drm) { static const char classname[] = "Light"; struct d3drm_light *object; - TRACE("out %p.\n", out); + TRACE("light %p.\n", light); if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; object->IDirect3DRMLight_iface.lpVtbl = &d3drm_light_vtbl; object->ref = 1; + object->d3drm = d3drm; + IDirect3DRM_AddRef(object->d3drm); d3drm_object_init(&object->obj, classname); - *out = (IUnknown *)&object->IDirect3DRMLight_iface; + *light = object; return S_OK; } diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 971e95c..fc19b97 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1403,6 +1403,7 @@ static void test_object(void) { &CLSID_CDirect3DRMFrame, &IID_IDirect3DRMFrame }, { &CLSID_CDirect3DRMFrame, &IID_IDirect3DRMFrame2 }, { &CLSID_CDirect3DRMFrame, &IID_IDirect3DRMFrame3 }, + { &CLSID_CDirect3DRMLight, &IID_IDirect3DRMLight }, }; IDirect3DRM *d3drm1; IDirect3DRM2 *d3drm2; @@ -1427,7 +1428,8 @@ static void test_object(void) for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) { BOOL takes_ref = IsEqualGUID(tests[i].clsid, &CLSID_CDirect3DRMMeshBuilder) || - IsEqualGUID(tests[i].clsid, &CLSID_CDirect3DRMFrame); + IsEqualGUID(tests[i].clsid, &CLSID_CDirect3DRMFrame) || + IsEqualGUID(tests[i].clsid, &CLSID_CDirect3DRMLight); unknown = (IUnknown *)0xdeadbeef; hr = IDirect3DRM_CreateObject(d3drm1, NULL, NULL, tests[i].iid, (void **)&unknown); @@ -2062,6 +2064,7 @@ static void test_Viewport(void) static void test_Light(void) { + IDirect3DRMObject *object; HRESULT hr; IDirect3DRM *d3drm; IDirect3DRMLight *light; @@ -2074,6 +2077,10 @@ static void test_Light(void) hr = IDirect3DRM_CreateLightRGB(d3drm, D3DRMLIGHT_SPOT, 0.5, 0.5, 0.5, &light); ok(hr == D3DRM_OK, "Cannot get IDirect3DRMLight interface (hr = %x)\n", hr); + hr = IDirect3DRMLight_QueryInterface(light, &IID_IDirect3DRMObject, (void **)&object); + ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, hr %#x.\n", hr); + IDirect3DRMObject_Release(object); + test_class_name((IDirect3DRMObject *)light, "Light"); type = IDirect3DRMLight_GetType(light);

1 0

Nikolay Sivov : d3drm: Make it possible to create frames with CreateObject ().
by Alexandre Julliard 12 Jun '17

12 Jun '17

Module: wine Branch: master Commit: 02c085e3133c1df8c198930e7646f6736fb28689 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02c085e3133c1df8c198930e7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 11 18:52:27 2017 +0300 d3drm: Make it possible to create frames with CreateObject(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm.c | 14 ++++++++++++++ dlls/d3drm/frame.c | 40 ++++++++++++++++++++++++++++------------ dlls/d3drm/tests/d3drm.c | 22 ++++++++++++++-------- 3 files changed, 56 insertions(+), 20 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 2b4e87c..ae08fdf 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -110,6 +110,19 @@ static HRESULT d3drm_create_mesh_builder_object(void **object, IDirect3DRM *d3dr return hr; } +static HRESULT d3drm_create_frame_object(void **object, IDirect3DRM *d3drm) +{ + struct d3drm_frame *frame; + HRESULT hr; + + if (FAILED(hr = d3drm_frame_create(&frame, NULL, d3drm))) + return hr; + + *object = &frame->IDirect3DRMFrame_iface; + + return hr; +} + struct d3drm { IDirect3DRM IDirect3DRM_iface; @@ -1257,6 +1270,7 @@ static HRESULT WINAPI d3drm3_CreateObject(IDirect3DRM3 *iface, {&CLSID_CDirect3DRMViewport, d3drm_create_viewport_object}, {&CLSID_CDirect3DRMFace, d3drm_create_face_object}, {&CLSID_CDirect3DRMMeshBuilder, d3drm_create_mesh_builder_object}, + {&CLSID_CDirect3DRMFrame, d3drm_create_frame_object}, }; TRACE("iface %p, clsid %s, outer %p, iid %s, out %p.\n", diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 99b8ce0..eda2c04 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -533,6 +533,7 @@ static ULONG WINAPI d3drm_frame3_Release(IDirect3DRMFrame3 *iface) if (!refcount) { + d3drm_object_cleanup((IDirect3DRMObject *)&frame->IDirect3DRMFrame_iface, &frame->obj); for (i = 0; i < frame->nb_children; ++i) { IDirect3DRMFrame3_Release(frame->children[i]); @@ -548,6 +549,7 @@ static ULONG WINAPI d3drm_frame3_Release(IDirect3DRMFrame3 *iface) IDirect3DRMLight_Release(frame->lights[i]); } HeapFree(GetProcessHeap(), 0, frame->lights); + IDirect3DRM_Release(frame->d3drm); HeapFree(GetProcessHeap(), 0, frame); } @@ -599,49 +601,61 @@ static HRESULT WINAPI d3drm_frame1_Clone(IDirect3DRMFrame *iface, static HRESULT WINAPI d3drm_frame3_AddDestroyCallback(IDirect3DRMFrame3 *iface, D3DRMOBJECTCALLBACK cb, void *ctx) { - FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); - return E_NOTIMPL; + TRACE("iface %p, cb %p, ctx %p.\n", iface, cb, ctx); + + return d3drm_object_add_destroy_callback(&frame->obj, cb, ctx); } static HRESULT WINAPI d3drm_frame2_AddDestroyCallback(IDirect3DRMFrame2 *iface, D3DRMOBJECTCALLBACK cb, void *ctx) { - FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame2(iface); - return E_NOTIMPL; + TRACE("iface %p, cb %p, ctx %p.\n", iface, cb, ctx); + + return IDirect3DRMFrame3_AddDestroyCallback(&frame->IDirect3DRMFrame3_iface, cb, ctx); } static HRESULT WINAPI d3drm_frame1_AddDestroyCallback(IDirect3DRMFrame *iface, D3DRMOBJECTCALLBACK cb, void *ctx) { - FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame(iface); - return E_NOTIMPL; + TRACE("iface %p, cb %p, ctx %p.\n", iface, cb, ctx); + + return IDirect3DRMFrame3_AddDestroyCallback(&frame->IDirect3DRMFrame3_iface, cb, ctx); } static HRESULT WINAPI d3drm_frame3_DeleteDestroyCallback(IDirect3DRMFrame3 *iface, D3DRMOBJECTCALLBACK cb, void *ctx) { - FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); - return E_NOTIMPL; + TRACE("iface %p, cb %p, ctx %p.\n", iface, cb, ctx); + + return d3drm_object_delete_destroy_callback(&frame->obj, cb, ctx); } static HRESULT WINAPI d3drm_frame2_DeleteDestroyCallback(IDirect3DRMFrame2 *iface, D3DRMOBJECTCALLBACK cb, void *ctx) { - FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame2(iface); - return E_NOTIMPL; + TRACE("iface %p, cb %p, ctx %p.\n", iface, cb, ctx); + + return IDirect3DRMFrame3_DeleteDestroyCallback(&frame->IDirect3DRMFrame3_iface, cb, ctx); } static HRESULT WINAPI d3drm_frame1_DeleteDestroyCallback(IDirect3DRMFrame *iface, D3DRMOBJECTCALLBACK cb, void *ctx) { - FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame(iface); - return E_NOTIMPL; + TRACE("iface %p, cb %p, ctx %p.\n", iface, cb, ctx); + + return IDirect3DRMFrame3_DeleteDestroyCallback(&frame->IDirect3DRMFrame3_iface, cb, ctx); } static HRESULT WINAPI d3drm_frame3_SetAppData(IDirect3DRMFrame3 *iface, DWORD data) @@ -2959,6 +2973,8 @@ HRESULT d3drm_frame_create(struct d3drm_frame **frame, IUnknown *parent_frame, I IDirect3DRMFrame3_AddChild(p, &object->IDirect3DRMFrame3_iface); } + IDirect3DRM_AddRef(object->d3drm); + *frame = object; return hr; diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index d5c1bcd..971e95c 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -907,15 +907,19 @@ static void test_Frame(void) IDirect3DRMLight *light1; IDirect3DRMLight *light_tmp; IDirect3DRMLightArray *light_array; + ULONG ref, ref2; D3DCOLOR color; DWORD count; hr = Direct3DRMCreate(&d3drm); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); + ref = get_refcount((IUnknown *)d3drm); hr = IDirect3DRM_CreateFrame(d3drm, NULL, &pFrameC); ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface (hr = %x)\n", hr); CHECK_REFCOUNT(pFrameC, 1); + ref2 = get_refcount((IUnknown *)d3drm); + ok(ref2 > ref, "Expected d3drm object to be referenced.\n"); test_class_name((IDirect3DRMObject *)pFrameC, "Frame"); @@ -1396,6 +1400,9 @@ static void test_object(void) { &CLSID_CDirect3DRMMeshBuilder, &IID_IDirect3DRMMeshBuilder }, { &CLSID_CDirect3DRMMeshBuilder, &IID_IDirect3DRMMeshBuilder2 }, { &CLSID_CDirect3DRMMeshBuilder, &IID_IDirect3DRMMeshBuilder3 }, + { &CLSID_CDirect3DRMFrame, &IID_IDirect3DRMFrame }, + { &CLSID_CDirect3DRMFrame, &IID_IDirect3DRMFrame2 }, + { &CLSID_CDirect3DRMFrame, &IID_IDirect3DRMFrame3 }, }; IDirect3DRM *d3drm1; IDirect3DRM2 *d3drm2; @@ -1419,7 +1426,8 @@ static void test_object(void) for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) { - BOOL takes_ref = IsEqualGUID(tests[i].clsid, &CLSID_CDirect3DRMMeshBuilder); + BOOL takes_ref = IsEqualGUID(tests[i].clsid, &CLSID_CDirect3DRMMeshBuilder) || + IsEqualGUID(tests[i].clsid, &CLSID_CDirect3DRMFrame); unknown = (IUnknown *)0xdeadbeef; hr = IDirect3DRM_CreateObject(d3drm1, NULL, NULL, tests[i].iid, (void **)&unknown); @@ -1439,7 +1447,7 @@ static void test_object(void) { ref2 = get_refcount((IUnknown *)d3drm1); if (takes_ref) - ok(ref2 == ref1 + 1, "Test %u: expected ref2 == ref1 + 1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); else ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); @@ -1462,7 +1470,7 @@ static void test_object(void) ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#x.\n", i, hr); ref2 = get_refcount((IUnknown *)d3drm1); if (takes_ref) - ok(ref2 == ref1 + 1, "Test %u: expected ref2 == ref1 + 1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); else ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); ref3 = get_refcount((IUnknown *)d3drm2); @@ -1481,7 +1489,7 @@ static void test_object(void) ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#x.\n", i, hr); ref2 = get_refcount((IUnknown *)d3drm1); if (takes_ref) - ok(ref2 == ref1 + 1, "Test %u: expected ref2 == ref1 + 1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); else ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); ref3 = get_refcount((IUnknown *)d3drm2); @@ -2019,8 +2027,7 @@ static void test_Viewport(void) IDirect3DRMDevice3_Release(device3); IDirect3DRMDevice_Release(device1); ref4 = get_refcount((IUnknown *)d3drm1); - todo_wine ok(ref4 > initial_ref1, "Expected ref4 > initial_ref1, got initial_ref1 = %u, ref4 = %u.\n", initial_ref1, - ref4); + ok(ref4 > initial_ref1, "Expected ref4 > initial_ref1, got initial_ref1 = %u, ref4 = %u.\n", initial_ref1, ref4); ref4 = get_refcount((IUnknown *)d3drm2); ok(ref4 == initial_ref2, "Expected ref4 == initial_ref2, got initial_ref2 = %u, ref4 = %u.\n", initial_ref2, ref4); ref4 = get_refcount((IUnknown *)d3drm3); @@ -2032,8 +2039,7 @@ static void test_Viewport(void) IDirect3DRMFrame3_Release(frame3); ref4 = get_refcount((IUnknown *)d3drm1); - todo_wine ok(ref4 > initial_ref1, "Expected ref4 > initial_ref1, got initial_ref1 = %u, ref4 = %u.\n", initial_ref1, - ref4); + ok(ref4 > initial_ref1, "Expected ref4 > initial_ref1, got initial_ref1 = %u, ref4 = %u.\n", initial_ref1, ref4); ref4 = get_refcount((IUnknown *)d3drm2); ok(ref4 == initial_ref2, "Expected ref4 == initial_ref2, got initial_ref2 = %u, ref4 = %u.\n", initial_ref2, ref4); ref4 = get_refcount((IUnknown *)d3drm3);

1 0

Nikolay Sivov : include: Fix IDirect3DRMFace*::GetColor() macros.
by Alexandre Julliard 12 Jun '17

12 Jun '17

Module: wine Branch: master Commit: 60c4fbda45f935d1ac1f4f0a0de65a3029c6b35b URL: http://source.winehq.org/git/wine.git/?a=commit;h=60c4fbda45f935d1ac1f4f0a0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 11 18:52:25 2017 +0300 include: Fix IDirect3DRMFace*::GetColor() macros. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3drmobj.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/d3drmobj.h b/include/d3drmobj.h index dc1ba08..5ff33fe 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -2335,7 +2335,7 @@ DECLARE_INTERFACE_(IDirect3DRMFace,IDirect3DRMObject) #define IDirect3DRMFace_GetVertexCount(p) (p)->lpVtbl->GetVertexCount(p) #define IDirect3DRMFace_GetVertexIndex(p,a) (p)->lpVtbl->GetVertexIndex(p,a) #define IDirect3DRMFace_GetTextureCoordinateIndex(p,a) (p)->lpVtbl->GetTextureCoordinateIndex(p,a) -#define IDirect3DRMFace_GetColor(p,a) (p)->lpVtbl->GetColor(p,a) +#define IDirect3DRMFace_GetColor(p) (p)->lpVtbl->GetColor(p) #else /*** IUnknown methods ***/ #define IDirect3DRMFace_QueryInterface(p,a,b) (p)->QueryInterface(a,b) @@ -2368,7 +2368,7 @@ DECLARE_INTERFACE_(IDirect3DRMFace,IDirect3DRMObject) #define IDirect3DRMFace_GetVertexCount(p) (p)->GetVertexCount() #define IDirect3DRMFace_GetVertexIndex(p,a) (p)->GetVertexIndex(a) #define IDirect3DRMFace_GetTextureCoordinateIndex(p,a) (p)->GetTextureCoordinateIndex(a) -#define IDirect3DRMFace_GetColor(p,a) (p)->GetColor(a) +#define IDirect3DRMFace_GetColor(p) (p)->GetColor() #endif /***************************************************************************** @@ -2445,7 +2445,7 @@ DECLARE_INTERFACE_(IDirect3DRMFace2,IDirect3DRMObject) #define IDirect3DRMFace2_GetVertexCount(p) (p)->lpVtbl->GetVertexCount(p) #define IDirect3DRMFace2_GetVertexIndex(p,a) (p)->lpVtbl->GetVertexIndex(p,a) #define IDirect3DRMFace2_GetTextureCoordinateIndex(p,a) (p)->lpVtbl->GetTextureCoordinateIndex(p,a) -#define IDirect3DRMFace2_GetColor(p,a) (p)->lpVtbl->GetColor(p,a) +#define IDirect3DRMFace2_GetColor(p) (p)->lpVtbl->GetColor(p) #else /*** IUnknown methods ***/ #define IDirect3DRMFace2_QueryInterface(p,a,b) (p)->QueryInterface(a,b) @@ -2478,7 +2478,7 @@ DECLARE_INTERFACE_(IDirect3DRMFace2,IDirect3DRMObject) #define IDirect3DRMFace2_GetVertexCount(p) (p)->GetVertexCount() #define IDirect3DRMFace2_GetVertexIndex(p,a) (p)->GetVertexIndex(a) #define IDirect3DRMFace2_GetTextureCoordinateIndex(p,a) (p)->GetTextureCoordinateIndex(a) -#define IDirect3DRMFace2_GetColor(p,a) (p)->GetColor(a) +#define IDirect3DRMFace2_GetColor(p) (p)->GetColor() #endif /*****************************************************************************

1 0

Nikolay Sivov : d3drm/tests: Add helpers to test vectors.
by Alexandre Julliard 12 Jun '17

12 Jun '17

Module: wine Branch: master Commit: ee89ee91ecb60aa93b9d4d0e0706a8acedee84b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee89ee91ecb60aa93b9d4d0e0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 11 18:52:24 2017 +0300 d3drm/tests: Add helpers to test vectors. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 144 +++++++++++++++++++---------------------------- 1 file changed, 57 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ee89ee91ecb60aa93b9d4…

1 0

Andrey Gusev : d3d11/tests: Fix a typo in ok() message.
by Alexandre Julliard 12 Jun '17

12 Jun '17

Module: wine Branch: master Commit: 6905ea5fb273015f36616705d6c2c56a33832708 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6905ea5fb273015f36616705d… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jun 9 17:02:12 2017 +0300 d3d11/tests: Fix a typo in ok() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 5565143..69d8517 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -19808,7 +19808,7 @@ static void test_gather(void) hr = ID3D11Device_CreateTexture2D(device, &texture_desc, &resource_data, &texture); ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)texture, NULL, &srv); - ok(SUCCEEDED(hr), "Fialed to create shader resource view, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to create shader resource view, hr %#x.\n", hr); ID3D11DeviceContext_PSSetShaderResources(context, 0, 1, &srv); constant.width = texture_desc.Width;

1 0

Miklós Máté : quartz: Small readability fix.
by Alexandre Julliard 12 Jun '17

12 Jun '17

Module: wine Branch: master Commit: bf9eaac54409ef149c3da4b083f2dd839101354c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf9eaac54409ef149c3da4b08… Author: Miklós Máté <mtmkls(a)gmail.com> Date: Sun Jun 11 00:22:58 2017 +0200 quartz: Small readability fix. Signed-off-by: Miklós Máté <mtmkls(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 13f0d89..d9e4f46 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -383,7 +383,7 @@ static HRESULT WINAPI VMR9_CheckMediaType(BaseRenderer *iface, const AM_MEDIA_TY ERR("Format type %s not supported\n", debugstr_guid(&pmt->formattype)); return S_FALSE; } - if (This->bmiheader.biCompression) + if (This->bmiheader.biCompression != BI_RGB) return S_FALSE; return S_OK; }

1 0

Jacek Caban : wininet/tests: Silence noisy traces.
by Alexandre Julliard 12 Jun '17

12 Jun '17

Module: wine Branch: master Commit: a0af1eba27f744a2cfc7fd085558ca8cd2431294 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0af1eba27f744a2cfc7fd085… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 12 08:53:53 2017 +0200 wininet/tests: Silence noisy traces. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 147 +++++++++++++++++++++++++++------------------- 1 file changed, 86 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a0af1eba27f744a2cfc7f…

1 0

Fabian Maurer : comctl32/taskdialog: Added support for custom buttons.
by Alexandre Julliard 12 Jun '17

12 Jun '17

Module: wine Branch: master Commit: 5b06498b937c3ab88de32d4cb5cfcffb20f0d6bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b06498b937c3ab88de32d4cb… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Jun 11 22:11:46 2017 +0300 comctl32/taskdialog: Added support for custom buttons. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/taskdialog.c | 249 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 192 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5b06498b937c3ab88de32…

1 0

Matteo Bruni : d3dx9/tests: Avoid SIZE_T in traces.
by Alexandre Julliard 12 Jun '17

12 Jun '17

Module: wine Branch: master Commit: df07533a800266a725224b33ec6aef02bfb0b148 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df07533a800266a725224b33e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jun 9 21:19:39 2017 +0200 d3dx9/tests: Avoid SIZE_T in traces. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 8882907..ff3b098 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -177,17 +177,17 @@ static void expect_matrix_(unsigned int line, const D3DXMATRIX *expected, const } #define expect_vec4_array(count, expected, vector, ulps) expect_vec4_array_(__LINE__, count, expected, vector, ulps) -static void expect_vec4_array_(unsigned int line, SIZE_T count, const D3DXVECTOR4 *expected, +static void expect_vec4_array_(unsigned int line, unsigned int count, const D3DXVECTOR4 *expected, const D3DXVECTOR4 *vector, unsigned int ulps) { BOOL equal; - SIZE_T i; + unsigned int i; for (i = 0; i < count; ++i) { equal = compare_vec4(&expected[i], &vector[i], ulps); ok_(__FILE__, line)(equal, - "Got unexpected vector {%.8e, %.8e, %.8e, %.8e} at index %lu, expected {%.8e, %.8e, %.8e, %.8e}.\n", + "Got unexpected vector {%.8e, %.8e, %.8e, %.8e} at index %u, expected {%.8e, %.8e, %.8e, %.8e}.\n", vector[i].x, vector[i].y, vector[i].z, vector[i].w, i, expected[i].x, expected[i].y, expected[i].z, expected[i].w); if (!equal)

1 0

Matteo Bruni : d3dx9/tests: Add a comment about the negation in boolean constant checks.
by Alexandre Julliard 12 Jun '17

12 Jun '17

Module: wine Branch: master Commit: 82029cba2fcc49c39902f4ba3247c6216fdb9304 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82029cba2fcc49c39902f4ba3… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jun 9 21:19:38 2017 +0200 d3dx9/tests: Add a comment about the negation in boolean constant checks. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 20da3c6..d75c5ce 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -4350,6 +4350,8 @@ static void test_effect_preshader_compare_pbool_consts_(unsigned int line, IDire { for (i = 0; i < ARRAY_SIZE(test_effect_preshader_bconsts); ++i) { + /* The negation on both sides is actually needed, sometimes you + * get 0xffffffff instead of 1 on native. */ ok_(__FILE__, line)(!bdata[i] == !test_effect_preshader_bconsts[i], "Pixel shader boolean constants do not match, expected %#x, got %#x, i %u.\n", test_effect_preshader_bconsts[i], bdata[i], i); @@ -4362,6 +4364,8 @@ static void test_effect_preshader_compare_pbool_consts_(unsigned int line, IDire if (const_updated_mask[i / TEST_EFFECT_BITMASK_BLOCK_SIZE] & (1u << (i % TEST_EFFECT_BITMASK_BLOCK_SIZE))) { + /* The negation on both sides is actually needed, sometimes + * you get 0xffffffff instead of 1 on native. */ ok_(__FILE__, line)(!bdata[i] == !test_effect_preshader_bconsts[i], "Pixel shader boolean constants do not match, expected %#x, got %#x, i %u, parameter %s.\n", test_effect_preshader_bconsts[i], bdata[i], i, updated_param);

1 0

Matteo Bruni : d3dx9/tests: Fix compilation when the NAN macro is not available.
by Alexandre Julliard 12 Jun '17

12 Jun '17

Module: wine Branch: master Commit: 26175489ba7a3f41bd6955e4877a7d6890b9f5cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=26175489ba7a3f41bd6955e48… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jun 9 21:19:36 2017 +0200 d3dx9/tests: Fix compilation when the NAN macro is not available. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 6ec07a2..20da3c6 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -31,6 +31,16 @@ static inline float __port_infinity(void) #define INFINITY __port_infinity() #endif /* INFINITY */ +#ifndef NAN +static float get_nan(void) +{ + DWORD nan = 0x7fc00000; + + return *(float *)&nan; +} +#define NAN get_nan() +#endif + #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(*arr)) /* helper functions */ @@ -4751,7 +4761,7 @@ static const DWORD test_effect_preshader_ops_blob[] = static void test_effect_preshader_ops(IDirect3DDevice9 *device) { static D3DLIGHT9 light; - static const struct + const struct { const char *mnem; unsigned int expected_result[4];

1 0

Matteo Bruni : d3dx9: Move set_number() into d3dx9_private.h.
by Alexandre Julliard 12 Jun '17

12 Jun '17

Module: wine Branch: master Commit: 4569cbe8e98c074398aefea47eaa1d63ec96caae URL: http://source.winehq.org/git/wine.git/?a=commit;h=4569cbe8e98c074398aefea47… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jun 9 21:19:35 2017 +0200 d3dx9: Move set_number() into d3dx9_private.h. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_private.h | 84 +++++++++++++++++++++++++++++++++++++++- dlls/d3dx9_36/util.c | 89 ------------------------------------------- 2 files changed, 82 insertions(+), 91 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h index 8eb12b7..c2f4977 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -123,8 +123,88 @@ const char *debug_d3dxparameter_type(D3DXPARAMETER_TYPE t) DECLSPEC_HIDDEN; const char *debug_d3dxparameter_registerset(D3DXREGISTER_SET r) DECLSPEC_HIDDEN; /* parameter type conversion helpers */ -void set_number(void *outdata, D3DXPARAMETER_TYPE outtype, - const void *indata, D3DXPARAMETER_TYPE intype) DECLSPEC_HIDDEN; +static inline BOOL get_bool(D3DXPARAMETER_TYPE type, const void *data) +{ + switch (type) + { + case D3DXPT_FLOAT: + case D3DXPT_INT: + case D3DXPT_BOOL: + return !!*(DWORD *)data; + + case D3DXPT_VOID: + return *(BOOL *)data; + + default: + return FALSE; + } +} + +static inline int get_int(D3DXPARAMETER_TYPE type, const void *data) +{ + switch (type) + { + case D3DXPT_FLOAT: + return (int)(*(float *)data); + + case D3DXPT_INT: + case D3DXPT_VOID: + return *(int *)data; + + case D3DXPT_BOOL: + return get_bool(type, data); + + default: + return 0; + } +} + +static inline float get_float(D3DXPARAMETER_TYPE type, const void *data) +{ + switch (type) + { + case D3DXPT_FLOAT: + case D3DXPT_VOID: + return *(float *)data; + + case D3DXPT_INT: + return (float)(*(int *)data); + + case D3DXPT_BOOL: + return (float)get_bool(type, data); + + default: + return 0.0f; + } +} + +static inline void set_number(void *outdata, D3DXPARAMETER_TYPE outtype, const void *indata, D3DXPARAMETER_TYPE intype) +{ + if (outtype == intype) + { + *(DWORD *)outdata = *(DWORD *)indata; + return; + } + + switch (outtype) + { + case D3DXPT_FLOAT: + *(float *)outdata = get_float(intype, indata); + break; + + case D3DXPT_BOOL: + *(BOOL *)outdata = get_bool(intype, indata); + break; + + case D3DXPT_INT: + *(int *)outdata = get_int(intype, indata); + break; + + default: + *(DWORD *)outdata = 0; + break; + } +} static inline BOOL is_param_type_sampler(D3DXPARAMETER_TYPE type) { diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index 8f9b0b3..9e4bbbf 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -291,95 +291,6 @@ const char *debug_d3dxparameter_registerset(D3DXREGISTER_SET r) #undef WINE_D3DX_TO_STR -/* parameter type conversion helpers */ -static BOOL get_bool(D3DXPARAMETER_TYPE type, const void *data) -{ - switch (type) - { - case D3DXPT_FLOAT: - case D3DXPT_INT: - case D3DXPT_BOOL: - return *(DWORD *)data != 0; - - case D3DXPT_VOID: - return *(BOOL *)data; - - default: - FIXME("Unhandled type %s.\n", debug_d3dxparameter_type(type)); - return FALSE; - } -} - -static INT get_int(D3DXPARAMETER_TYPE type, const void *data) -{ - switch (type) - { - case D3DXPT_FLOAT: - return (INT)(*(FLOAT *)data); - - case D3DXPT_INT: - case D3DXPT_VOID: - return *(INT *)data; - - case D3DXPT_BOOL: - return get_bool(type, data); - - default: - FIXME("Unhandled type %s.\n", debug_d3dxparameter_type(type)); - return 0; - } -} - -static FLOAT get_float(D3DXPARAMETER_TYPE type, const void *data) -{ - switch (type) - { - case D3DXPT_FLOAT: - case D3DXPT_VOID: - return *(FLOAT *)data; - - case D3DXPT_INT: - return (FLOAT)(*(INT *)data); - - case D3DXPT_BOOL: - return (FLOAT)get_bool(type, data); - - default: - FIXME("Unhandled type %s.\n", debug_d3dxparameter_type(type)); - return 0.0f; - } -} - -void set_number(void *outdata, D3DXPARAMETER_TYPE outtype, const void *indata, D3DXPARAMETER_TYPE intype) -{ - if (outtype == intype) - { - *(DWORD *)outdata = *(DWORD *)indata; - return; - } - - switch (outtype) - { - case D3DXPT_FLOAT: - *(FLOAT *)outdata = get_float(intype, indata); - break; - - case D3DXPT_BOOL: - *(BOOL *)outdata = get_bool(intype, indata); - break; - - case D3DXPT_INT: - *(INT *)outdata = get_int(intype, indata); - break; - - default: - FIXME("Unhandled type %s.\n", debug_d3dxparameter_type(outtype)); - *(DWORD *)outdata = 0; - break; - } -} - - /*********************************************************************** * D3DXDebugMute * Returns always FALSE for us.

1 0

Francois Gouget : testbot/TestLauncher: Compress the TestLauncher binaries.
by Alexandre Julliard 12 Jun '17

12 Jun '17

Module: tools Branch: master Commit: b70fbe6405e0c0d53065bbf67b79079035ff6896 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b70fbe6405e0c0d53065bbf6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 12 18:26:51 2017 +0200 testbot/TestLauncher: Compress the TestLauncher binaries. They are sent to the VMs for every test so we want them to be as small as possible. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/TestLauncher/Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/testbot/src/TestLauncher/Makefile b/testbot/src/TestLauncher/Makefile index 06b3729..6b41e01 100644 --- a/testbot/src/TestLauncher/Makefile +++ b/testbot/src/TestLauncher/Makefile @@ -4,16 +4,25 @@ CROSSCC32 = i686-w64-mingw32-gcc CROSSSTRIP32 = i686-w64-mingw32-strip CROSSCC64 = x86_64-w64-mingw32-gcc CROSSSTRIP64 = x86_64-w64-mingw32-strip +CROSSZIPEXE = upx-ucl all: TestLauncher32.exe TestLauncher64.exe TestLauncher32.exe: TestLauncher.c $(CROSSCC32) -Wall -o $@ $< $(CROSSSTRIP32) $@ + if which $(CROSSZIPEXE); \ + then \ + $(CROSSZIPEXE) --best -q -q $@; \ + fi TestLauncher64.exe: TestLauncher.c $(CROSSCC64) -Wall -o $@ $< $(CROSSSTRIP64) $@ + if which $(CROSSZIPEXE); \ + then \ + $(CROSSZIPEXE) --best -q -q $@; \ + fi clean: rm -f TestLauncher32.exe TestLauncher64.exe

1 0

Francois Gouget : testbot: Rebuild TestLauncher as part of the Reconfig.
by Alexandre Julliard 12 Jun '17

12 Jun '17

Module: tools Branch: master Commit: e1fb1b57a7adacb6c3eb48d9f1ed5b7af70e1acf URL: http://source.winehq.org/git/tools.git/?a=commit;h=e1fb1b57a7adacb6c3eb48d9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 12 18:26:45 2017 +0200 testbot: Rebuild TestLauncher as part of the Reconfig. Currently the TestLauncher binaries are checked into Git which is wrong and means they are effectively never updated. Now that Reconfig.pl rebuilds them the TestBot server will be able to retrive the up-to-date binaries and use them. Modify the TestLauncher makefile so it does not overwrite the checked-in TestLauncher binaries. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Reconfig.pl | 30 +++++++++++++++++++----------- testbot/src/TestLauncher/Makefile | 9 ++++++--- 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index e522e94..dfc338b 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -115,6 +115,20 @@ sub BuildTestAgentd() return 1; } +sub BuildTestLauncher() +{ + system("( cd $::RootDir/src/TestLauncher && set -x && " . + " time make -j$ncpus" . + ") >>$LogDir/Reconfig.log 2>&1"); + if ($? != 0) + { + LogMsg "Build TestLauncher failed\n"; + return !1; + } + + return 1; +} + sub BuildNative() { mkdir "$DataDir/build-native" if (! -d "$DataDir/build-native"); @@ -173,17 +187,11 @@ if (! GitPull()) CountCPUs(); -if (! BuildTestAgentd()) -{ - exit(1); -} - -if (! BuildNative()) -{ - exit(1); -} - -if (! BuildCross(32) || ! BuildCross(64)) +if (!BuildTestAgentd() || + !BuildTestLauncher() || + !BuildNative() || + !BuildCross(32) || + !BuildCross(64)) { exit(1); } diff --git a/testbot/src/TestLauncher/Makefile b/testbot/src/TestLauncher/Makefile index 2bce2a1..06b3729 100644 --- a/testbot/src/TestLauncher/Makefile +++ b/testbot/src/TestLauncher/Makefile @@ -5,12 +5,15 @@ CROSSSTRIP32 = i686-w64-mingw32-strip CROSSCC64 = x86_64-w64-mingw32-gcc CROSSSTRIP64 = x86_64-w64-mingw32-strip -all: $(bindir)/TestLauncher32.exe $(bindir)/TestLauncher64.exe +all: TestLauncher32.exe TestLauncher64.exe -$(bindir)/TestLauncher32.exe: TestLauncher.c +TestLauncher32.exe: TestLauncher.c $(CROSSCC32) -Wall -o $@ $< $(CROSSSTRIP32) $@ -$(bindir)/TestLauncher64.exe: TestLauncher.c +TestLauncher64.exe: TestLauncher.c $(CROSSCC64) -Wall -o $@ $< $(CROSSSTRIP64) $@ + +clean: + rm -f TestLauncher32.exe TestLauncher64.exe

1 0

Francois Gouget : winetest: Add proper command line options.
by Alexandre Julliard 12 Jun '17

12 Jun '17

Module: tools Branch: master Commit: 889251094365fb255d169d47a0d9f50ee93702d4 URL: http://source.winehq.org/git/tools.git/?a=commit;h=889251094365fb255d169d47… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 12 11:41:40 2017 +0200 winetest: Add proper command line options. This makes it possible to specify the workdir or which report or build directory to work on. The latter make it possible to manually update the generated files for the reports. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-errors | 75 +++++++++++++++++++++++++++++++- winetest/build-index | 80 +++++++++++++++++++++++++++++++++- winetest/dissect | 96 +++++++++++++++++++++++++++++++++++++--- winetest/gather | 118 ++++++++++++++++++++++++++++++++++++++++++++------ 4 files changed, 347 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=889251094365fb255d16…

1 0

Francois Gouget : winetest/gather: Don' t issue an error if outdated is already gone.
by Alexandre Julliard 12 Jun '17

12 Jun '17

Module: tools Branch: master Commit: be316759900f806c0cf164df1ea3278a49129578 URL: http://source.winehq.org/git/tools.git/?a=commit;h=be316759900f806c0cf164df… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 12 11:15:12 2017 +0200 winetest/gather: Don't issue an error if outdated is already gone. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/gather | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/winetest/gather b/winetest/gather index 2886bc5..fe1dfb4 100755 --- a/winetest/gather +++ b/winetest/gather @@ -821,7 +821,8 @@ if (!rename "$filename.new", "$filename") write_totals(\@groups); DONE: -if (!unlink $outdated) { +if (!unlink $outdated and !$!{ENOENT}) +{ error("unable to unlink '$outdated': $!\n"); exit 3; }

1 0

Francois Gouget : winetest: Use relative paths in get_build_info().
by Alexandre Julliard 12 Jun '17

12 Jun '17

Module: tools Branch: master Commit: a35fe43d2392f77d8c43e20cef571e702ef5898f URL: http://source.winehq.org/git/tools.git/?a=commit;h=a35fe43d2392f77d8c43e20c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 12 11:14:47 2017 +0200 winetest: Use relative paths in get_build_info(). It is meant to be called from the work directory anyway, just like the rest of the scripts. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-index | 4 ++-- winetest/dissect | 4 ++-- winetest/gather | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index dcd9795..fb949b1 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -62,11 +62,11 @@ sub get_build_info($) { ($date, $subject) = ($1, $2); # Make sure the directory's mtime matches the commit time - utime $date, $date, "$workdir/data/$build"; + utime $date, $date, "data/$build"; } else { - $date = (stat "$workdir/data/$build")[9]; + $date = (stat "data/$build")[9]; $subject = ""; } return ($date, $subject); diff --git a/winetest/dissect b/winetest/dissect index 99e50fb..ae8a0e5 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -81,11 +81,11 @@ sub get_build_info($) { ($date, $subject) = ($1, $2); # Make sure the directory's mtime matches the commit time - utime $date, $date, "$workdir/data/$build"; + utime $date, $date, "data/$build"; } else { - $date = (stat "$workdir/data/$build")[9]; + $date = (stat "data/$build")[9]; $subject = ""; } return ($date, $subject); diff --git a/winetest/gather b/winetest/gather index 94f3541..2886bc5 100755 --- a/winetest/gather +++ b/winetest/gather @@ -76,11 +76,11 @@ sub get_build_info($) { ($date, $subject) = ($1, $2); # Make sure the directory's mtime matches the commit time - utime $date, $date, "$workdir/data/$build"; + utime $date, $date, "data/$build"; } else { - $date = (stat "$workdir/data/$build")[9]; + $date = (stat "data/$build")[9]; $subject = ""; } return ($date, $subject);

1 0

Alexandre Julliard : Wine release 2.10
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: website Branch: master Commit: f98e7a06ca1323a82d96b28433dca54926fea04b URL: http://source.winehq.org/git/website.git/?a=commit;h=f98e7a06ca1323a82d96b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 9 19:44:08 2017 +0200 Wine release 2.10 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2017060901.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2017060901.xml b/news/en/2017060901.xml new file mode 100644 index 0000000..43c515c --- /dev/null +++ b/news/en/2017060901.xml @@ -0,0 +1,17 @@ +<news> +<date>June 9, 2017</date> +<title>Wine 2.10 Released</title> +<body> + The Wine development release 2.10 is now available. + <a href="{$root}/announce/2.10">What's new</a> in this release: +<ul> + <li>Initial version of the Android graphics driver.</li> + <li>Dictionary support in WebServices.</li> + <li>A number of Direct2D fixes.</li> + <li>User interface improvements in RegEdit.</li> + <li>OLE clipboard cache fixes.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/2.x/wine-2.10.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-2.10 : Alexandre Julliard : Release 2.10
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: refs/tags/wine-2.10 Tag: 5c8ee03b9d8823fb03baa4016a52edb0ed55ece4 URL: http://source.winehq.org/git/wine.git/?a=tag;h=5c8ee03b9d8823fb03baa4016a52… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 9 19:41:15 2017 +0200 Release 2.10

1 0

Alexandre Julliard : Release 2.10.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: 74d93d9bc0acadacc97c3dc803ede6ed4b8becb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74d93d9bc0acadacc97c3dc80… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 9 19:41:15 2017 +0200 Release 2.10. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 749 ++++++++++++++++++++++++++++++++------------------------------ VERSION | 2 +- configure | 18 +- 3 files changed, 396 insertions(+), 373 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=74d93d9bc0acadacc97c3…

1 0

Andrey Gusev : uxtheme/tests: Fix a typo in ok() message.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: 1a761379f8742fe79f696ea7c7bbf4aa02e9f764 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a761379f8742fe79f696ea7c… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jun 9 17:48:16 2017 +0300 uxtheme/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/uxtheme/tests/system.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index beba353..6989f44 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -687,7 +687,7 @@ todo_wine hr = pGetBufferedPaintBits(NULL, &bits, &row); ok(hr == E_FAIL, "Unexpected return code %#x\n", hr); ok(row == 10, "Unexpected row count %d\n", row); - ok(bits == (void *)0xdeadbeef, "Unepexpected data pointer %p\n", bits); + ok(bits == (void *)0xdeadbeef, "Unexpected data pointer %p\n", bits); hr = pGetBufferedPaintBits(NULL, NULL, NULL); ok(hr == E_POINTER, "Unexpected return code %#x\n", hr);

1 0

Zebediah Figura : msacm32: Check correct variable.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: 7493364b4bffa3563b4f36124b12a29bc59f4e86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7493364b4bffa3563b4f36124… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 8 17:57:12 2017 -0500 msacm32: Check correct variable. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/format.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c index f3c5155..e7eab56 100644 --- a/dlls/msacm32/format.c +++ b/dlls/msacm32/format.c @@ -424,7 +424,7 @@ MMRESULT WINAPI acmFormatDetailsW(HACMDRIVER had, PACMFORMATDETAILSW pafd, DWORD if (pafd->fdwSupport) return MMSYSERR_INVALPARAM; - if (pafd->pwfx->wFormatTag == WAVE_FORMAT_UNKNOWN) + if (pafd->dwFormatTag == WAVE_FORMAT_UNKNOWN) return MMSYSERR_INVALPARAM; switch (fdwDetails) {

1 0

Zebediah Figura : imaadp32.acm: Fix nibble ordering.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: 0f0fb984985aa08146996e04baf2b3d6e58abf46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f0fb984985aa08146996e04b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 8 10:15:21 2017 -0500 imaadp32.acm: Fix nibble ordering. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imaadp32.acm/imaadp32.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/imaadp32.acm/imaadp32.c b/dlls/imaadp32.acm/imaadp32.c index 7f4c5ea..474f548 100644 --- a/dlls/imaadp32.acm/imaadp32.c +++ b/dlls/imaadp32.acm/imaadp32.c @@ -445,7 +445,7 @@ static void cvtSS16imaK(PACMDRVSTREAMINSTANCE adsi, &stepIndexL, &sampleL); code2 = generate_nibble(R16(src + (4 * i + 2) * 2), &stepIndexL, &sampleL); - *dst++ = (code1 << 4) | code2; + *dst++ = (code2 << 4) | code1; } for (i = 0; i < 4; i++) { @@ -453,7 +453,7 @@ static void cvtSS16imaK(PACMDRVSTREAMINSTANCE adsi, &stepIndexR, &sampleR); code2 = generate_nibble(R16(src + (4 * i + 3) * 2), &stepIndexR, &sampleR); - *dst++ = (code1 << 4) | code2; + *dst++ = (code2 << 4) | code1; } src += 32; } @@ -509,7 +509,7 @@ static void cvtMM16imaK(PACMDRVSTREAMINSTANCE adsi, src += 2; code2 = generate_nibble(R16(src), &stepIndex, &sample); src += 2; - *dst++ = (code1 << 4) | code2; + *dst++ = (code2 << 4) | code1; } dst = in_dst + adsi->pwfxDst->nBlockAlign; }

1 0

Zebediah Figura : imaadp32.acm: Fix block size calculations.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: 2a1c1a4bac6753b0aafc66bdcfa9821a8453c2e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a1c1a4bac6753b0aafc66bdc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 8 10:15:20 2017 -0500 imaadp32.acm: Fix block size calculations. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imaadp32.acm/imaadp32.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/imaadp32.acm/imaadp32.c b/dlls/imaadp32.acm/imaadp32.c index 78a0ac4..7f4c5ea 100644 --- a/dlls/imaadp32.acm/imaadp32.c +++ b/dlls/imaadp32.acm/imaadp32.c @@ -154,7 +154,7 @@ static void init_wfx_ima_adpcm(IMAADPCMWAVEFORMAT* awfx/*, DWORD nba*/) } pwfx->cbSize = sizeof(WORD); - awfx->wSamplesPerBlock = (pwfx->nBlockAlign - (4 * pwfx->nChannels) * 2) / pwfx->nChannels + 1; + awfx->wSamplesPerBlock = (pwfx->nBlockAlign - (4 * pwfx->nChannels)) * (2 / pwfx->nChannels) + 1; pwfx->nAvgBytesPerSec = (pwfx->nSamplesPerSec * pwfx->nBlockAlign) / awfx->wSamplesPerBlock; } @@ -631,14 +631,7 @@ static LRESULT ADPCM_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) afd->pwfx->nChannels = ADPCM_Formats[afd->dwFormatIndex].nChannels; afd->pwfx->nSamplesPerSec = ADPCM_Formats[afd->dwFormatIndex].rate; afd->pwfx->wBitsPerSample = ADPCM_Formats[afd->dwFormatIndex].nBits; - afd->pwfx->nBlockAlign = 1024; - /* we got 4 bits per sample */ - afd->pwfx->nAvgBytesPerSec = - (afd->pwfx->nSamplesPerSec * 4) / 8; - if (afd->cbwfx >= sizeof(WAVEFORMATEX)) - afd->pwfx->cbSize = sizeof(WORD); - if (afd->cbwfx >= sizeof(IMAADPCMWAVEFORMAT)) - ((IMAADPCMWAVEFORMAT*)afd->pwfx)->wSamplesPerBlock = (1024 - 4 * afd->pwfx->nChannels) * (2 / afd->pwfx->nChannels) + 1; + init_wfx_ima_adpcm((IMAADPCMWAVEFORMAT *)afd->pwfx); break; default: WARN("Unsupported tag %08x\n", afd->dwFormatTag);

1 0

Józef Kucia : d3d10core/tests: Port test_pipeline_statistics_query() from d3d11.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: 0c456ac8666cad127d381d6fdcffaf3439b6dc66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c456ac8666cad127d381d6fd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 9 13:00:06 2017 +0200 d3d10core/tests: Port test_pipeline_statistics_query() from d3d11. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 73 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index bd8cf57..5159bad 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -4048,6 +4048,78 @@ static void test_occlusion_query(void) release_test_context(&test_context); } +static void test_pipeline_statistics_query(void) +{ + static const struct vec4 red = {1.0f, 0.0f, 0.0f, 1.0f}; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + + struct d3d10core_test_context test_context; + D3D10_QUERY_DATA_PIPELINE_STATISTICS data; + D3D10_QUERY_DESC query_desc; + ID3D10Asynchronous *query; + unsigned int data_size; + ID3D10Device *device; + HRESULT hr; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, white); + + query_desc.Query = D3D10_QUERY_PIPELINE_STATISTICS; + query_desc.MiscFlags = 0; + hr = ID3D10Device_CreateQuery(device, &query_desc, (ID3D10Query **)&query); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + data_size = ID3D10Asynchronous_GetDataSize(query); + ok(data_size == sizeof(data), "Got unexpected data size %u.\n", data_size); + + hr = ID3D10Asynchronous_GetData(query, NULL, 0, 0); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Asynchronous_GetData(query, &data, sizeof(data), 0); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + ID3D10Asynchronous_End(query); + ID3D10Asynchronous_Begin(query); + ID3D10Asynchronous_Begin(query); + + hr = ID3D10Asynchronous_GetData(query, NULL, 0, 0); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Asynchronous_GetData(query, &data, sizeof(data), 0); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + draw_quad(&test_context); + + ID3D10Asynchronous_End(query); + get_query_data(query, &data, sizeof(data)); + ok(data.IAVertices == 4, "Got unexpected IAVertices count: %u.\n", (unsigned int)data.IAVertices); + ok(data.IAPrimitives == 2, "Got unexpected IAPrimitives count: %u.\n", (unsigned int)data.IAPrimitives); + ok(data.VSInvocations == 4, "Got unexpected VSInvocations count: %u.\n", (unsigned int)data.VSInvocations); + ok(!data.GSInvocations, "Got unexpected GSInvocations count: %u.\n", (unsigned int)data.GSInvocations); + ok(!data.GSPrimitives, "Got unexpected GSPrimitives count: %u.\n", (unsigned int)data.GSPrimitives); + ok(data.CInvocations == 2, "Got unexpected CInvocations count: %u.\n", (unsigned int)data.CInvocations); + ok(data.CPrimitives == 2, "Got unexpected CPrimitives count: %u.\n", (unsigned int)data.CPrimitives); + todo_wine + ok(!data.PSInvocations, "Got unexpected PSInvocations count: %u.\n", (unsigned int)data.PSInvocations); + + ID3D10Asynchronous_Begin(query); + draw_color_quad(&test_context, &red); + ID3D10Asynchronous_End(query); + get_query_data(query, &data, sizeof(data)); + ok(data.IAVertices == 4, "Got unexpected IAVertices count: %u.\n", (unsigned int)data.IAVertices); + ok(data.IAPrimitives == 2, "Got unexpected IAPrimitives count: %u.\n", (unsigned int)data.IAPrimitives); + ok(data.VSInvocations == 4, "Got unexpected VSInvocations count: %u.\n", (unsigned int)data.VSInvocations); + ok(!data.GSInvocations, "Got unexpected GSInvocations count: %u.\n", (unsigned int)data.GSInvocations); + ok(!data.GSPrimitives, "Got unexpected GSPrimitives count: %u.\n", (unsigned int)data.GSPrimitives); + ok(data.CInvocations == 2, "Got unexpected CInvocations count: %u.\n", (unsigned int)data.CInvocations); + ok(data.CPrimitives == 2, "Got unexpected CPrimitives count: %u.\n", (unsigned int)data.CPrimitives); + ok(data.PSInvocations >= 640 * 480, "Got unexpected PSInvocations count: %u.\n", (unsigned int)data.PSInvocations); + + ID3D10Asynchronous_Release(query); + release_test_context(&test_context); +} + static void test_timestamp_query(void) { static const struct vec4 red = {1.0f, 0.0f, 0.0f, 1.0f}; @@ -12525,6 +12597,7 @@ START_TEST(device) test_create_rasterizer_state(); test_create_query(); test_occlusion_query(); + test_pipeline_statistics_query(); test_timestamp_query(); test_device_removed_reason(); test_scissor();

1 0

Józef Kucia : d3d11: Fixup D3D10_QUERY_PIPELINE_STATISTICS data.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: ffb47ee5ec8cdd7826bb220d4c6ec179e820551c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffb47ee5ec8cdd7826bb220d4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 9 13:00:05 2017 +0200 d3d11: Fixup D3D10_QUERY_PIPELINE_STATISTICS data. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/async.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index c92e45f..ef8e63c 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -320,6 +320,8 @@ static void STDMETHODCALLTYPE d3d10_query_End(ID3D10Query *iface) static HRESULT STDMETHODCALLTYPE d3d10_query_GetData(ID3D10Query *iface, void *data, UINT data_size, UINT flags) { struct d3d_query *query = impl_from_ID3D10Query(iface); + D3D11_QUERY_DATA_PIPELINE_STATISTICS d3d11_data; + void *d3d10_data_pointer = NULL; unsigned int wined3d_flags; HRESULT hr; @@ -328,6 +330,17 @@ static HRESULT STDMETHODCALLTYPE d3d10_query_GetData(ID3D10Query *iface, void *d if (!data && data_size) return E_INVALIDARG; + if (query->desc.Query == D3D11_QUERY_PIPELINE_STATISTICS + && data_size == sizeof(D3D10_QUERY_DATA_PIPELINE_STATISTICS)) + { + data_size = sizeof(D3D11_QUERY_DATA_PIPELINE_STATISTICS); + if (data) + { + d3d10_data_pointer = data; + data = &d3d11_data; + } + } + wined3d_flags = wined3d_getdata_flags_from_d3d11_async_getdata_flags(flags); wined3d_mutex_lock(); @@ -344,6 +357,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_query_GetData(ID3D10Query *iface, void *d } wined3d_mutex_unlock(); + if (d3d10_data_pointer && hr == S_OK) + memcpy(d3d10_data_pointer, data, sizeof(D3D10_QUERY_DATA_PIPELINE_STATISTICS)); + return hr; } @@ -358,6 +374,9 @@ static UINT STDMETHODCALLTYPE d3d10_query_GetDataSize(ID3D10Query *iface) data_size = wined3d_query_get_data_size(query->wined3d_query); wined3d_mutex_unlock(); + if (query->desc.Query == D3D11_QUERY_PIPELINE_STATISTICS) + data_size = sizeof(D3D10_QUERY_DATA_PIPELINE_STATISTICS); + return data_size; }

1 0

Józef Kucia : d3d11: Implement d3d10_query_GetDesc().
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: a695cc6caa4c9a2ce9c0da4757ced93ef79c4fae URL: http://source.winehq.org/git/wine.git/?a=commit;h=a695cc6caa4c9a2ce9c0da475… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 9 13:00:04 2017 +0200 d3d11: Implement d3d10_query_GetDesc(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/async.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index 4b290ad..c92e45f 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -1,5 +1,6 @@ /* * Copyright 2009 Henri Verbeet for CodeWeavers + * Copyright 2015-2017 Józef Kucia for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -364,7 +365,11 @@ static UINT STDMETHODCALLTYPE d3d10_query_GetDataSize(ID3D10Query *iface) static void STDMETHODCALLTYPE d3d10_query_GetDesc(ID3D10Query *iface, D3D10_QUERY_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d3d_query *query = impl_from_ID3D10Query(iface); + + TRACE("iface %p, desc %p.\n", iface, desc); + + memcpy(desc, &query->desc, sizeof(*desc)); } static const struct ID3D10QueryVtbl d3d10_query_vtbl =

1 0

Józef Kucia : d3d11: Implement d3d11_query_GetDesc().
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: 2fb2836b45977b7fcf14eddf820895f95b96da62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fb2836b45977b7fcf14eddf8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 9 13:00:03 2017 +0200 d3d11: Implement d3d11_query_GetDesc(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/async.c | 9 ++++++++- dlls/d3d11/d3d11_private.h | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index baa0926..4b290ad 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -159,7 +159,11 @@ static UINT STDMETHODCALLTYPE d3d11_query_GetDataSize(ID3D11Query *iface) static void STDMETHODCALLTYPE d3d11_query_GetDesc(ID3D11Query *iface, D3D11_QUERY_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d3d_query *query = impl_from_ID3D11Query(iface); + + TRACE("iface %p, desc %p.\n", iface, desc); + + *desc = query->desc; } static const struct ID3D11QueryVtbl d3d11_query_vtbl = @@ -428,6 +432,9 @@ static HRESULT d3d_query_init(struct d3d_query *query, struct d3d_device *device query->ID3D11Query_iface.lpVtbl = &d3d11_query_vtbl; query->ID3D10Query_iface.lpVtbl = &d3d10_query_vtbl; query->refcount = 1; + + query->desc = *desc; + wined3d_mutex_lock(); wined3d_private_store_init(&query->private_store); diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 57f1e90..479c84f 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -480,6 +480,7 @@ struct d3d_query struct wined3d_private_store private_store; struct wined3d_query *wined3d_query; BOOL predicate; + D3D11_QUERY_DESC desc; ID3D11Device *device; };

1 0

Józef Kucia : d3d10core/tests: Introduce get_query_data() helper function.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: de7f712ba9a18f308d9d55f1621e1ee18b59e254 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de7f712ba9a18f308d9d55f16… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 9 13:00:02 2017 +0200 d3d10core/tests: Introduce get_query_data() helper function. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 183 ++++++++++++++++-------------------------- 1 file changed, 68 insertions(+), 115 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=de7f712ba9a18f308d9d5…

1 0

Józef Kucia : d3d11/tests: Fix ok() checks in test_timestamp_query().
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: e7cf04be520c76ef4ad10a516fe2ba6dd0d4a203 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7cf04be520c76ef4ad10a516… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 9 13:00:01 2017 +0200 d3d11/tests: Fix ok() checks in test_timestamp_query(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index a3f2c98..5565143 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -5021,7 +5021,7 @@ static void test_timestamp_query(void) ID3D11DeviceContext_End(context, timestamp_disjoint_query); get_query_data(context, timestamp_disjoint_query, &disjoint, sizeof(disjoint)); - ok(disjoint.Frequency != 0xffffffff, "Frequency data was not modified.\n"); + ok(disjoint.Frequency != ~(UINT64)0, "Frequency data was not modified.\n"); ok(disjoint.Disjoint == TRUE || disjoint.Disjoint == FALSE, "Got unexpected disjoint %#x.\n", disjoint.Disjoint); prev_disjoint = disjoint; @@ -5044,7 +5044,8 @@ static void test_timestamp_query(void) hr = ID3D11DeviceContext_GetData(context, timestamp_disjoint_query, &disjoint, sizeof(disjoint), D3D11_ASYNC_GETDATA_DONOTFLUSH); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - ok(!memcmp(&disjoint, &prev_disjoint, sizeof(disjoint)), "Disjoint data mismatch.\n"); + ok(disjoint.Frequency == prev_disjoint.Frequency, "Frequency data mismatch.\n"); + ok(disjoint.Disjoint == prev_disjoint.Disjoint, "Disjoint data mismatch.\n"); memset(&timestamp, 0xff, sizeof(timestamp)); hr = ID3D11DeviceContext_GetData(context, timestamp_query, NULL, 0, 0); @@ -5092,7 +5093,7 @@ static void test_timestamp_query(void) disjoint.Disjoint = 0xff; hr = ID3D11DeviceContext_GetData(context, timestamp_disjoint_query, &disjoint, sizeof(disjoint), 0); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - ok(disjoint.Frequency != 0xffffffff, "Frequency data was not modified.\n"); + ok(disjoint.Frequency != 0xdeadbeef, "Frequency data was not modified.\n"); ok(disjoint.Disjoint == TRUE || disjoint.Disjoint == FALSE, "Got unexpected disjoint %#x.\n", disjoint.Disjoint); /* It's not strictly necessary for the TIMESTAMP query to be inside a TIMESTAMP_DISJOINT query. */

1 0

Nikolay Sivov : d3drm: Make it possible to create mesh builder with CreateObject().
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: a22e4647462a7b4068f8eb180a44bcaccfbf0a7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a22e4647462a7b4068f8eb180… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 9 02:36:49 2017 +0300 d3drm: Make it possible to create mesh builder with CreateObject(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm.c | 40 ++++++++++++++++++++++++++--- dlls/d3drm/d3drm_private.h | 29 ++++++++++++++++++++- dlls/d3drm/meshbuilder.c | 63 +++++++++++++++++----------------------------- dlls/d3drm/tests/d3drm.c | 21 +++++++++++++--- 4 files changed, 106 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a22e4647462a7b4068f8e…

1 0

Nikolay Sivov : d3drm: Make it possible to create faces with CreateObject( ).
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: 499736490500d19670d1212b04ecbdbfc2b362d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=499736490500d19670d1212b0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 9 02:36:48 2017 +0300 d3drm: Make it possible to create faces with CreateObject(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm.c | 40 +++++++++++++++++++++++++++++++++++++--- dlls/d3drm/d3drm_private.h | 10 +++++++++- dlls/d3drm/face.c | 46 +++++++++++++++++++++++----------------------- dlls/d3drm/meshbuilder.c | 20 ++++++++++++++++++-- dlls/d3drm/tests/d3drm.c | 18 ++++++++++++++++++ 5 files changed, 105 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=499736490500d19670d12…

1 0

Alistair Leslie-Hughes : dplayx: Implement IDirectPlayLobby3 EnumAddressTypes.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: 6a6f3365febee1ae35a8cac5f098957a5658cb57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a6f3365febee1ae35a8cac5f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 8 05:55:26 2017 +0000 dplayx: Implement IDirectPlayLobby3 EnumAddressTypes. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dplayx/dplobby.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index 7f9c7a8..944fea9 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -832,8 +832,9 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_EnumAddressTypes( IDirectPlayLobby3 static HRESULT WINAPI IDirectPlayLobby3Impl_EnumAddressTypes( IDirectPlayLobby3 *iface, LPDPLENUMADDRESSTYPESCALLBACK enumaddrtypecb, REFGUID sp, void *context, DWORD flags ) { - FIXME(":stub\n"); - return DPERR_OUTOFMEMORY; + IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3( iface ); + return IDirectPlayLobby_EnumAddressTypes( &This->IDirectPlayLobby3A_iface, enumaddrtypecb, sp, + context, flags ); } /********************************************************************

1 0

Alistair Leslie-Hughes : dplayx: Implement IDirectPlay4 EnumConnections.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: 2ef274b6087feeefdeb2750bf119a58b50c64046 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ef274b6087feeefdeb2750bf… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 8 05:37:40 2017 +0000 dplayx: Implement IDirectPlay4 EnumConnections. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dplayx/dplay.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 4a80f1c..fde0681 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -4490,8 +4490,8 @@ static HRESULT WINAPI IDirectPlay4Impl_EnumConnections( IDirectPlay4 *iface, const GUID *application, LPDPENUMCONNECTIONSCALLBACK enumcb, void *context, DWORD flags ) { IDirectPlayImpl *This = impl_from_IDirectPlay4( iface ); - FIXME( "(%p)->(%p,%p,%p,0x%08x): stub\n", This, application, enumcb, context, flags ); - return DP_OK; + return IDirectPlayX_EnumConnections( &This->IDirectPlay4A_iface, application, enumcb, context, + flags ); } static HRESULT WINAPI IDirectPlay3AImpl_EnumGroupsInGroup( IDirectPlay3A *iface, DPID group,

1 0

Austin English : tdh: Add stub dll.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: b2d4b506b3c92cc93a1144b201e0e96fa14d10d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2d4b506b3c92cc93a1144b20… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jun 8 16:39:41 2017 -0500 tdh: Add stub dll. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/tdh/Makefile.in | 4 ++++ dlls/tdh/tdh.spec | 34 ++++++++++++++++++++++++++++++++++ dlls/tdh/tdh_main.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 84 insertions(+) diff --git a/configure b/configure index 2964b81..51904b5 100755 --- a/configure +++ b/configure @@ -1430,6 +1430,7 @@ enable_sxs enable_t2embed enable_tapi32 enable_taskschd +enable_tdh enable_tdi_sys enable_traffic enable_twain_32 @@ -18509,6 +18510,7 @@ wine_fn_config_test dlls/t2embed/tests t2embed_test wine_fn_config_dll tapi32 enable_tapi32 implib wine_fn_config_dll taskschd enable_taskschd clean wine_fn_config_test dlls/taskschd/tests taskschd_test +wine_fn_config_dll tdh enable_tdh wine_fn_config_dll tdi.sys enable_tdi_sys wine_fn_config_dll toolhelp.dll16 enable_win16 wine_fn_config_dll traffic enable_traffic diff --git a/configure.ac b/configure.ac index 2db5d6a..573d290 100644 --- a/configure.ac +++ b/configure.ac @@ -3452,6 +3452,7 @@ WINE_CONFIG_TEST(dlls/t2embed/tests) WINE_CONFIG_DLL(tapi32,,[implib]) WINE_CONFIG_DLL(taskschd,,[clean]) WINE_CONFIG_TEST(dlls/taskschd/tests) +WINE_CONFIG_DLL(tdh) WINE_CONFIG_DLL(tdi.sys) WINE_CONFIG_DLL(toolhelp.dll16,enable_win16) WINE_CONFIG_DLL(traffic) diff --git a/dlls/tdh/Makefile.in b/dlls/tdh/Makefile.in new file mode 100644 index 0000000..0a4693f --- /dev/null +++ b/dlls/tdh/Makefile.in @@ -0,0 +1,4 @@ +MODULE = tdh.dll + +C_SRCS = \ + tdh_main.c diff --git a/dlls/tdh/tdh.spec b/dlls/tdh/tdh.spec new file mode 100644 index 0000000..8702802 --- /dev/null +++ b/dlls/tdh/tdh.spec @@ -0,0 +1,34 @@ +@ stub TdhAggregatePayloadFilters +@ stub TdhApplyPayloadFilter +@ stub TdhCleanupPayloadEventFilterDescriptor +@ stub TdhCloseDecodingHandle +@ stub TdhCreatePayloadFilter +@ stub TdhDeletePayloadFilter +@ stub TdhEnumerateManifestProviderEvents +@ stub TdhEnumerateProviderFieldInformation +@ stub TdhEnumerateProviderFilters +@ stub TdhEnumerateProviders +@ stub TdhEnumerateRemoteWBEMProviderFieldInformation +@ stub TdhEnumerateRemoteWBEMProviders +@ stub TdhFormatProperty +@ stub TdhGetAllEventsInformation +@ stub TdhGetDecodingParameter +@ stub TdhGetEventInformation +@ stub TdhGetEventMapInformation +@ stub TdhGetManifestEventInformation +@ stub TdhGetProperty +@ stub TdhGetPropertyOffsetAndSize +@ stub TdhGetPropertySize +@ stub TdhGetWppMessage +@ stub TdhGetWppProperty +@ stub TdhLoadManifest +@ stub TdhLoadManifestFromBinary +@ stub TdhOpenDecodingHandle +@ stub TdhQueryProviderFieldInformation +@ stub TdhQueryRemoteWBEMProviderFieldInformation +@ stub TdhSetDecodingParameter +@ stub TdhUnloadManifest +@ stub TdhValidatePayloadFilter +@ stub TdhpFindMatchClassFromWBEM +@ stub TdhpGetBestTraceEventInfoWBEM +@ stub TdhpGetEventMapInfoWBEM diff --git a/dlls/tdh/tdh_main.c b/dlls/tdh/tdh_main.c new file mode 100644 index 0000000..5e10487 --- /dev/null +++ b/dlls/tdh/tdh_main.c @@ -0,0 +1,43 @@ +/* + * Copyright 2017 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(tdh); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +}

1 0

Alex Henrie : adsldpc: Add stub DLL.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: 67db7fe94ee20a95a1f821ff48be391259c4b10c URL: http://source.winehq.org/git/wine.git/?a=commit;h=67db7fe94ee20a95a1f821ff4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jun 8 09:14:10 2017 -0600 adsldpc: Add stub DLL. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/adsldpc/Makefile.in | 4 ++ dlls/adsldpc/adsldpc.spec | 175 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/adsldpc/main.c | 45 ++++++++++++ 5 files changed, 227 insertions(+) diff --git a/configure b/configure index d12d186..2964b81 100755 --- a/configure +++ b/configure @@ -873,6 +873,7 @@ enable_acledit enable_aclui enable_activeds enable_actxprxy +enable_adsldpc enable_advapi32 enable_advpack enable_amstream @@ -17757,6 +17758,7 @@ wine_fn_config_dll aclui enable_aclui implib wine_fn_config_dll activeds enable_activeds implib wine_fn_config_dll actxprxy enable_actxprxy clean wine_fn_config_lib adsiid +wine_fn_config_dll adsldpc enable_adsldpc wine_fn_config_dll advapi32 enable_advapi32 clean,implib wine_fn_config_test dlls/advapi32/tests advapi32_test wine_fn_config_dll advpack enable_advpack implib diff --git a/configure.ac b/configure.ac index d5e9456..2db5d6a 100644 --- a/configure.ac +++ b/configure.ac @@ -2701,6 +2701,7 @@ WINE_CONFIG_DLL(aclui,,[implib]) WINE_CONFIG_DLL(activeds,,[implib]) WINE_CONFIG_DLL(actxprxy,,[clean]) WINE_CONFIG_LIB(adsiid) +WINE_CONFIG_DLL(adsldpc) WINE_CONFIG_DLL(advapi32,,[clean,implib]) WINE_CONFIG_TEST(dlls/advapi32/tests) WINE_CONFIG_DLL(advpack,,[implib]) diff --git a/dlls/adsldpc/Makefile.in b/dlls/adsldpc/Makefile.in new file mode 100644 index 0000000..4dad141 --- /dev/null +++ b/dlls/adsldpc/Makefile.in @@ -0,0 +1,4 @@ +MODULE = adsldpc.dll + +C_SRCS = \ + main.c diff --git a/dlls/adsldpc/adsldpc.spec b/dlls/adsldpc/adsldpc.spec new file mode 100644 index 0000000..6b14e47 --- /dev/null +++ b/dlls/adsldpc/adsldpc.spec @@ -0,0 +1,175 @@ +@ stub ??0CLexer@@QAE@XZ +@ stub ??1CLexer@@QAE@XZ +@ stub ADSIPrint +@ stub ADsAbandonSearch +@ stub ADsCloseSearchHandle +@ stub ADsCreateAttributeDefinition +@ stub ADsCreateClassDefinition +@ stub ADsCreateDSObject +@ stub ADsCreateDSObjectExt +@ stub ADsDeleteAttributeDefinition +@ stub ADsDeleteClassDefinition +@ stub ADsDeleteDSObject +@ stub ADsEnumAttributes +@ stub ADsEnumClasses +@ stub ADsExecuteSearch +@ stub ADsFreeColumn +@ stub ADsGetColumn +@ stub ADsGetFirstRow +@ stub ADsGetNextColumnName +@ stub ADsGetNextRow +@ stub ADsGetObjectAttributes +@ stub ADsGetPreviousRow +@ stub ADsHelperGetCurrentRowMessage +@ stub ADsObject +@ stub ADsSetObjectAttributes +@ stub ADsSetSearchPreference +@ stub ADsWriteAttributeDefinition +@ stub ADsWriteClassDefinition +@ stub AdsTypeToLdapTypeCopyConstruct +@ stub AdsTypeToLdapTypeCopyDNWithBinary +@ stub AdsTypeToLdapTypeCopyDNWithString +@ stub AdsTypeToLdapTypeCopyGeneralizedTime +@ stub AdsTypeToLdapTypeCopyTime +@ stub BerBvFree +@ stub BerEncodingQuotaControl +@ stub BuildADsParentPath +@ stub BuildADsParentPathFromObjectInfo2 +@ stub BuildADsParentPathFromObjectInfo +@ stub BuildADsPathFromLDAPPath2 +@ stub BuildADsPathFromLDAPPath +@ stub BuildADsPathFromParent +@ stub BuildLDAPPathFromADsPath2 +@ stub BuildLDAPPathFromADsPath +@ stub ChangeSeparator +@ stub Component +@ stub ConvertSidToString +@ stub ConvertSidToU2Trustee +@ stub ConvertU2TrusteeToSid +@ stub FindEntryInSearchTable +@ stub FindSearchTableIndex +@ stub FreeObjectInfo +@ stub GetDefaultServer +@ stub GetDisplayName +@ stub GetDomainDNSNameForDomain +@ stub GetLDAPTypeName +@ stub ?GetNextToken@CLexer@@QAEJPAGPAK@Z +@ stub GetServerAndPort +@ stub GetSyntaxOfAttribute +@ stub InitObjectInfo +@ stub ?InitializePath@CLexer@@QAEJPAG@Z +@ stub IsGCNamespace +@ stub LdapAddExtS +@ stub LdapAddS +@ stub LdapAttributeFree +@ stub LdapCacheAddRef +@ stub LdapCloseObject +@ stub LdapCompareExt +@ stub LdapControlFree +@ stub LdapControlsFree +@ stub LdapCountEntries +@ stub LdapCrackUserDNtoNTLMUser2 +@ stub LdapCreatePageControl +@ stub LdapDeleteExtS +@ stub LdapDeleteS +@ stub LdapFirstAttribute +@ stub LdapFirstEntry +@ stub LdapGetDn +@ stub LdapGetNextPageS +@ stub LdapGetSchemaObjectCount +@ stub LdapGetSubSchemaSubEntryPath +@ stub LdapGetSyntaxIdOfAttribute +@ stub LdapGetSyntaxOfAttributeOnServer +@ stub LdapGetValues +@ stub LdapGetValuesLen +@ stub LdapInitializeSearchPreferences +@ stub LdapIsClassNameValidOnServer +@ stub LdapMakeSchemaCacheObsolete +@ stub LdapMemFree +@ stub LdapModDnS +@ stub LdapModifyExtS +@ stub LdapModifyS +@ stub LdapMsgFree +@ stub LdapNextAttribute +@ stub LdapNextEntry +@ stub LdapOpenObject2 +@ stub LdapOpenObject +@ stub LdapParsePageControl +@ stub LdapParseResult +@ stub LdapReadAttribute2 +@ stub LdapReadAttribute +@ stub LdapReadAttributeFast +@ stub LdapRenameExtS +@ stub LdapResult +@ stub LdapSearch +@ stub LdapSearchAbandonPage +@ stub LdapSearchExtS +@ stub LdapSearchInitPage +@ stub LdapSearchS +@ stub LdapSearchST +@ stub LdapTypeBinaryToString +@ stub LdapTypeCopyConstruct +@ stub LdapTypeFreeLdapModList +@ stub LdapTypeFreeLdapModObject +@ stub LdapTypeFreeLdapObjects +@ stub LdapTypeToAdsTypeDNWithBinary +@ stub LdapTypeToAdsTypeDNWithString +@ stub LdapTypeToAdsTypeGeneralizedTime +@ stub LdapTypeToAdsTypeUTCTime +@ stub LdapValueFree +@ stub LdapValueFreeLen +@ stub LdapcKeepHandleAround +@ stub LdapcSetStickyServer +@ stub PathName +@ stub ReadPagingSupportedAttr +@ stub ReadSecurityDescriptorControlType +@ stub ReadServerSupportsIsADAMControl +@ stub ReadServerSupportsIsADControl +@ stub SchemaAddRef +@ stub SchemaClose +@ stub SchemaGetClassInfo +@ stub SchemaGetClassInfoByIndex +@ stub SchemaGetObjectCount +@ stub SchemaGetPropertyInfo +@ stub SchemaGetPropertyInfoByIndex +@ stub SchemaGetStringsFromStringTable +@ stub SchemaGetSyntaxOfAttribute +@ stub SchemaIsClassAContainer +@ stub SchemaOpen +@ stub ?SetAtDisabler@CLexer@@QAEXH@Z +@ stub ?SetExclaimnationDisabler@CLexer@@QAEXH@Z +@ stub ?SetFSlashDisabler@CLexer@@QAEXH@Z +@ stub SortAndRemoveDuplicateOIDs +@ stub UnMarshallLDAPToLDAPSynID +@ stub intcmp +@ stub ADSIAbandonSearch +@ stub ADSICloseDSObject +@ stub ADSICloseSearchHandle +@ stub ADSICreateDSObject +@ stub ADSIDeleteDSObject +@ stub ADSIExecuteSearch +@ stub ADSIFreeColumn +@ stub ADSIGetColumn +@ stub ADSIGetFirstRow +@ stub ADSIGetNextColumnName +@ stub ADSIGetNextRow +@ stub ADSIGetObjectAttributes +@ stub ADSIGetPreviousRow +@ stub ADSIModifyRdn +@ stub ADSIOpenDSObject +@ stub ADSISetObjectAttributes +@ stub ADSISetSearchPreference +@ stub ADsDecodeBinaryData +@ stub ADsEncodeBinaryData +@ stub ADsGetLastError +@ stub ADsSetLastError +@ stub AdsTypeFreeAdsObjects +@ stub AllocADsMem +@ stub AllocADsStr +@ stub FreeADsMem +@ stub FreeADsStr +@ stub LdapTypeToAdsTypeCopyConstruct +@ stub MapADSTypeToLDAPType +@ stub MapLDAPTypeToADSType +@ stub ReallocADsMem +@ stub ReallocADsStr diff --git a/dlls/adsldpc/main.c b/dlls/adsldpc/main.c new file mode 100644 index 0000000..56eff5d --- /dev/null +++ b/dlls/adsldpc/main.c @@ -0,0 +1,45 @@ +/* + * Active Directory Services Lightweight Directory Provider C + * + * Copyright 2017 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(adsldpc); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +}

1 0

Can Taşan : po: Update Turkish translation.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: 1a1850afb8e64d6843a7d09fef9da05070236be5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a1850afb8e64d6843a7d09fe… Author: Can Taşan <betax34(a)hotmail.com> Date: Fri Jun 9 09:25:45 2017 +0200 po: Update Turkish translation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/tr.po | 83 ++++++++++++++++++++++------------------------------------------ 1 file changed, 28 insertions(+), 55 deletions(-) diff --git a/po/tr.po b/po/tr.po index e2dcbb1..c985c23 100644 --- a/po/tr.po +++ b/po/tr.po @@ -508,7 +508,7 @@ msgstr "Yazıcı" #: comdlg32.rc:228 msgid "&Default Printer" -msgstr "&Öntanımlı Yazıcı" +msgstr "&Varsayılan Yazıcı" #: comdlg32.rc:229 msgid "[none]" @@ -1003,7 +1003,7 @@ msgstr "Bir yazıcı hatası oluştu." #: comdlg32.rc:68 msgid "No default printer defined." -msgstr "Öntanımlı yazıcı tanımlanmamış." +msgstr "Varsayılan yazıcı tanımlanmamış." #: comdlg32.rc:69 msgid "Cannot find the printer." @@ -1163,7 +1163,7 @@ msgstr "Güç tasarruf kipi; " #: comdlg32.rc:77 msgid "Default Printer; " -msgstr "Öntanımlı Yazıcı; " +msgstr "Varsayılan Yazıcı; " #: comdlg32.rc:78 msgid "There are %d documents in the queue" @@ -9691,7 +9691,7 @@ msgstr "" "ECHO ON bir toplu işlem dosyasında tüm komutların çalıştırılmadan önce\n" "uçbirim aygıtında görüntülenmesini sağlar\n" "\n" -"ECHO OFF bir önceki ECHO ON (ECHO öntanımlı olarak kapalıdır)komutunun\n" +"ECHO OFF bir önceki ECHO ON (ECHO varsayılan olarak kapalıdır)komutunun\n" "tersini yapar. ECHO OFF çıktısının görüntülenmesini başına @ işareti\n" "getirerek engelleyebilirsiniz.\n" @@ -9874,7 +9874,7 @@ msgstr "" "$q Eşittir işareti $t Geçerli saat $v cmd sürümü\n" "\n" "Sadece PROMPT komutunu girerseniz komut istemi geçerli dizini (sürücü harfi\n" -"dahil) ve onu izleyen büyüktür (>) işareti içeren öntanımlı değerlere\n" +"dahil) ve onu izleyen büyüktür (>) işareti içeren varsayılan değerlere\n" "dönecektir.\n" "(PROMPT $p$g komutu gibi).\n" "\n" @@ -10208,7 +10208,7 @@ msgstr "" "ASSOC\t\tDosya uzantı ilişkilerini göster veya düzenle\n" "ATTRIB\t\tDOS dosya özelliklerini göster veya değiştir\n" "CALL\t\tToplu işlem dosyası içerisinden bir diğerini çalıştır\n" -"CD (CHDIR)\tGeçerli dizini değiştir\n" +"CD (CHDIR)\tŞimdiki dizini değiştir\n" "CHOICE\t\tSeçilebilir listeden bir tuşa basılmasını bekle\n" "CLS\t\tKonsol ekranını temizle\n" "COPY\t\tDosya kopyala\n" @@ -10233,7 +10233,7 @@ msgstr "" "REN (RENAME)\tDosyayı yeniden adlandır\n" "RD (RMDIR)\tAlt dizini sil\n" "SET\t\tÇevre değişkenlerini düzenle veya göster\n" -"SETLOCAL\tOrtam değişiklikleri yerelleştirmesini bir toply dosyada başlat\n" +"SETLOCAL\tOrtam değişiklikleri yerelleştirmesini bir toplu dosyada başlat\n" "START\t\tİlişkili programda bir program başlat veya bir belge aç\n" "TIME\t\tŞimdiki sistem saatini düzenle veya göster\n" "TITLE\t\tKomut istemi oturumu için pencere başlığını belirle\n" @@ -10265,7 +10265,7 @@ msgstr "%1 uzantısı için dosya ilişkilendirmesi eksik\n" #: cmd.rc:357 msgid "No open command associated with file type '%1'\n" -msgstr "'%1' dosya türü için ilişkilendirilmiş bir aç komutu yok\n" +msgstr "'%1' dosya türü için ilişkilendirilmiş bir açma komutu yok\n" #: cmd.rc:358 msgid "Overwrite %1?" @@ -10527,7 +10527,7 @@ msgstr "DHCP etkin" #: ipconfig.rc:49 msgid "Default gateway" -msgstr "Öntanımlı ağ geçidi" +msgstr "Varsayılan ağ geçidi" #: ipconfig.rc:50 msgid "IPv6 address" @@ -11141,7 +11141,7 @@ msgstr "" #: oleview.rc:180 msgid "Default Interface Viewer" -msgstr "Öntanımlı Arayüz Gösterici" +msgstr "Varsayılan Arayüz Gösterici" #: oleview.rc:183 msgid "Interface" @@ -11774,17 +11774,12 @@ msgid "&About Registry Editor" msgstr "Kayıt Defteri Düzenleyicisi &Hakkında" #: regedit.rc:89 regedit.rc:96 regedit.rc:229 -#, fuzzy -#| msgctxt "object state" -#| msgid "expanded" msgid "Expand" -msgstr "genişletilmiş" +msgstr "Genişlet" #: regedit.rc:134 regedit.rc:232 -#, fuzzy -#| msgid "Modify Binary Data..." msgid "Modify &Binary Data..." -msgstr "İkili Değeri Değiştir..." +msgstr "İkili &Değeri Değiştir..." #: regedit.rc:266 msgid "Export registry" @@ -11883,14 +11878,11 @@ msgid "Contains commands for accessing frequently used keys" msgstr "Sık kullanılan anahtarlara erişmek için komutları içerir" #: regedit.rc:163 -#, fuzzy -#| msgid "" -#| "Contains commands for displaying help and information about registry " -#| "editor" msgid "" "Contains commands for displaying Help and information about Registry Editor" msgstr "" -"Kayıt düzenleyici hakkında yardım ve bilgi göstermek için komutları içerir" +"Kayıt Defteri Düzenleyicisi hakkında yardım ve bilgi göstermek için " +"komutları içerir" #: regedit.rc:164 msgid "Contains commands for creating new keys or values" @@ -11902,7 +11894,7 @@ msgstr "Veri" #: regedit.rc:154 msgid "Registry Editor" -msgstr "Kayıt Düzenleyici" +msgstr "Kayıt Defteri Düzenleyicisi" #: regedit.rc:220 msgid "Import Registry File" @@ -12136,16 +12128,12 @@ msgid "regedit: Unable to delete the registry class '%1'.\n" msgstr "regedit: '%1' kayıt sınıfı silinemiyor.\n" #: regedit.rc:430 -#, fuzzy -#| msgid "regedit: The line '%1' was not recognized.\n" msgid "regedit: The line contains invalid syntax.\n" -msgstr "regedit: '%1' satırı bilinmiyor.\n" +msgstr "regedit: Satır sözdizimi geçersiz.\n" #: regedit.rc:187 -#, fuzzy -#| msgid "Quits the registry editor" msgid "Quits the Registry Editor" -msgstr "Kayıt düzenleyicisinden çıkar" +msgstr "Kayıt Defteri Düzenleyicisinden çıkar" #: regedit.rc:188 msgid "Adds keys to the favorites list" @@ -12160,8 +12148,6 @@ msgid "Shows or hides the status bar" msgstr "Durum çubuğunu gösterir veya gizler" #: regedit.rc:191 -#, fuzzy -#| msgid "Change position of split between two panes" msgid "Changes the position of the split between two panes" msgstr "İki panel arasındaki ayracın konumunu değiştirir" @@ -12206,10 +12192,8 @@ msgid "Adds a new binary value" msgstr "Yeni bir ikili değer ekler" #: regedit.rc:174 -#, fuzzy -#| msgid "Adds a new binary value" msgid "Adds a new 32-bit value" -msgstr "Yeni bir ikili değer ekler" +msgstr "Yeni bir 32-bit değer ekler" #: regedit.rc:177 msgid "Imports a text file into the registry" @@ -12224,10 +12208,8 @@ msgid "Prints all or part of the registry" msgstr "Sistem kaydının bir kısmını veya tümünü yazdırır" #: regedit.rc:181 -#, fuzzy -#| msgid "Registry Editor" msgid "Opens Registry Editor Help" -msgstr "Kayıt Düzenleyici" +msgstr "Kayıt Defteri Düzenleyicisi Yardımını açar" #: regedit.rc:182 msgid "Displays program information, version number and copyright" @@ -12270,26 +12252,20 @@ msgid "Unable to query the registry key '%1'." msgstr "'%1' kayıt anahtarı sorgulanamıyor." #: regedit.rc:170 -#, fuzzy -#| msgid "Modifies the value's data" msgid "Modifies the value's data in binary form" -msgstr "Değer verisini değiştirir" +msgstr "Değer verisini ikili biçimde değiştirir" #: regedit.rc:175 msgid "Adds a new multi-string value" msgstr "Yeni bir çoklu dize değeri ekler" #: regedit.rc:198 -#, fuzzy -#| msgid "Exports selected branch of the registry to a text file" msgid "Exports the selected branch of the registry to a text file" msgstr "Sistem kaydının seçilen kısmını metin dosyasına aktarır" #: regedit.rc:176 -#, fuzzy -#| msgid "Adds a new string value" msgid "Adds a new expandable string value" -msgstr "Yeni bir dize değeri ekler" +msgstr "Yeni bir genişletilebilir dize değeri ekler" #: regedit.rc:211 msgid "Confirm Key Delete" @@ -12303,11 +12279,8 @@ msgstr "" "istediğinizden emin misiniz?" #: regedit.rc:230 -#, fuzzy -#| msgctxt "object state" -#| msgid "collapsed" msgid "Collapse" -msgstr "daraltılmış" +msgstr "Daralt" #: regsvr32.rc:32 msgid "" @@ -13744,7 +13717,7 @@ msgstr "devre dışı" #: winecfg.rc:61 msgid "Default Settings" -msgstr "Öntanımlı Ayarlar" +msgstr "Varsayılan Ayarlar" #: winecfg.rc:62 msgid "Wine Programs (*.exe; *.exe.so)" @@ -13787,7 +13760,7 @@ msgstr "" "Daha fazla sürücü ekleyemezsiniz.\n" "\n" "Her sürücünün A-Z aralığında bir harfi olmalıdır. Dolayısıyla 26'dan fazla " -"tanımlayamazsınız." +"sürücü tanımlayamazsınız." #: winecfg.rc:75 msgid "System drive" @@ -14064,7 +14037,7 @@ msgstr "Sadece geçerli oturuma uygula" #: wineconsole.rc:29 msgid "Set &Defaults" -msgstr "&Öntanımlı Ayarlar" +msgstr "&Varsayılan Ayarlar" #: wineconsole.rc:31 msgid "&Mark" @@ -14084,7 +14057,7 @@ msgstr "A&ra" #: wineconsole.rc:39 msgid "Setup - Default settings" -msgstr "Ayarla - Öntanımlı ayarlar" +msgstr "Ayarla - Vatsayılan ayarlar" #: wineconsole.rc:40 msgid "Setup - Current settings" @@ -14200,11 +14173,11 @@ msgstr "" #: winedbg.rc:61 msgid "Show &Details" -msgstr "Detayları &Göster" +msgstr "Ayrıntıları &Göster" #: winedbg.rc:66 msgid "Program Error Details" -msgstr "Program Hata Detayları" +msgstr "Program Hata Ayrıntıları" #: winedbg.rc:73 msgid ""

1 0

Hans Leidekker : wineandroid: Synchronize keyboard lock state.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: 4f4ede56e9f5d97029b37434badd77e80ece2e93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f4ede56e9f5d97029b37434b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 9 09:21:52 2017 +0200 wineandroid: Synchronize keyboard lock state. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/android.h | 2 ++ dlls/wineandroid.drv/keyboard.c | 63 +++++++++++++++++++++++++++++++++++++++++ dlls/wineandroid.drv/window.c | 1 + 3 files changed, 66 insertions(+) diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h index ca026fa..0c3f35f 100644 --- a/dlls/wineandroid.drv/android.h +++ b/dlls/wineandroid.drv/android.h @@ -81,6 +81,7 @@ enum android_window_messages extern HWND get_capture_window(void) DECLSPEC_HIDDEN; extern void init_monitors( int width, int height ) DECLSPEC_HIDDEN; +extern void update_keyboard_lock_state( WORD vkey, UINT state ) DECLSPEC_HIDDEN; /* JNI entry points */ extern void desktop_changed( JNIEnv *env, jobject obj, jint width, jint height ) DECLSPEC_HIDDEN; @@ -125,6 +126,7 @@ union event_data { enum event_type type; HWND hwnd; + UINT lock_state; INPUT input; } kbd; }; diff --git a/dlls/wineandroid.drv/keyboard.c b/dlls/wineandroid.drv/keyboard.c index 741b76a..e6e1d02 100644 --- a/dlls/wineandroid.drv/keyboard.c +++ b/dlls/wineandroid.drv/keyboard.c @@ -33,6 +33,7 @@ #include "android.h" #include "wine/unicode.h" +#include "wine/server.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(keyboard); @@ -653,6 +654,67 @@ static const char* vkey_to_name( UINT vkey ) return NULL; } +static BOOL get_async_key_state( BYTE state[256] ) +{ + BOOL ret; + + SERVER_START_REQ( get_key_state ) + { + req->tid = 0; + req->key = -1; + wine_server_set_reply( req, state, 256 ); + ret = !wine_server_call( req ); + } + SERVER_END_REQ; + return ret; +} + +static void send_keyboard_input( HWND hwnd, WORD vkey, WORD scan, DWORD flags ) +{ + INPUT input; + + input.type = INPUT_KEYBOARD; + input.u.ki.wVk = vkey; + input.u.ki.wScan = scan; + input.u.ki.dwFlags = flags; + input.u.ki.time = 0; + input.u.ki.dwExtraInfo = 0; + + __wine_send_input( hwnd, &input ); +} + +/*********************************************************************** + * update_keyboard_lock_state + */ +void update_keyboard_lock_state( WORD vkey, UINT state ) +{ + BYTE keystate[256]; + + if (!get_async_key_state( keystate )) return; + + if (!(keystate[VK_CAPITAL] & 0x01) != !(state & AMETA_CAPS_LOCK_ON) && vkey != VK_CAPITAL) + { + TRACE( "adjusting CapsLock state (%02x)\n", keystate[VK_CAPITAL] ); + send_keyboard_input( 0, VK_CAPITAL, 0x3a, 0 ); + send_keyboard_input( 0, VK_CAPITAL, 0x3a, KEYEVENTF_KEYUP ); + } + + if (!(keystate[VK_NUMLOCK] & 0x01) != !(state & AMETA_NUM_LOCK_ON) && (vkey & 0xff) != VK_NUMLOCK) + { + TRACE( "adjusting NumLock state (%02x)\n", keystate[VK_NUMLOCK] ); + send_keyboard_input( 0, VK_NUMLOCK, 0x45, KEYEVENTF_EXTENDEDKEY ); + send_keyboard_input( 0, VK_NUMLOCK, 0x45, KEYEVENTF_EXTENDEDKEY | KEYEVENTF_KEYUP ); + } + + if (!(keystate[VK_SCROLL] & 0x01) != !(state & AMETA_SCROLL_LOCK_ON) && vkey != VK_SCROLL) + { + TRACE( "adjusting ScrollLock state (%02x)\n", keystate[VK_SCROLL] ); + send_keyboard_input( 0, VK_SCROLL, 0x46, 0 ); + send_keyboard_input( 0, VK_SCROLL, 0x46, KEYEVENTF_KEYUP ); + } +} + + /*********************************************************************** * keyboard_event * @@ -671,6 +733,7 @@ jboolean keyboard_event( JNIEnv *env, jobject obj, jint win, jint action, jint k } data.type = KEYBOARD_EVENT; data.kbd.hwnd = LongToHandle( win ); + data.kbd.lock_state = state; data.kbd.input.type = INPUT_KEYBOARD; data.kbd.input.u.ki.wVk = keycode_to_vkey[keycode]; data.kbd.input.u.ki.wScan = vkey_to_scancode[data.kbd.input.u.ki.wVk]; diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 2ddcdf1..33f2240 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -482,6 +482,7 @@ static int process_events( DWORD mask ) TRACE("KEYDOWN hwnd %p vkey %x '%c' scancode %x\n", event->data.kbd.hwnd, event->data.kbd.input.u.ki.wVk, event->data.kbd.input.u.ki.wVk, event->data.kbd.input.u.ki.wScan ); + update_keyboard_lock_state( event->data.kbd.input.u.ki.wVk, event->data.kbd.lock_state ); __wine_send_input( 0, &event->data.kbd.input ); break;

1 0

Hans Leidekker : wineandroid: Implement VkKeyScanEx.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: 86b82b8f73f749fe59a007710c52ee0c91375b2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=86b82b8f73f749fe59a007710… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 9 09:21:15 2017 +0200 wineandroid: Implement VkKeyScanEx. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/keyboard.c | 29 +++++++++++++++++++++++++++++ dlls/wineandroid.drv/wineandroid.drv.spec | 1 + 2 files changed, 30 insertions(+) diff --git a/dlls/wineandroid.drv/keyboard.c b/dlls/wineandroid.drv/keyboard.c index 81af8e3..741b76a 100644 --- a/dlls/wineandroid.drv/keyboard.c +++ b/dlls/wineandroid.drv/keyboard.c @@ -616,6 +616,23 @@ static const struct { VK_OEM_PERIOD, "." }, }; +static const SHORT char_vkey_map[] = +{ + 0x332, 0x241, 0x242, 0x003, 0x244, 0x245, 0x246, 0x247, 0x008, 0x009, + 0x20d, 0x24b, 0x24c, 0x00d, 0x24e, 0x24f, 0x250, 0x251, 0x252, 0x253, + 0x254, 0x255, 0x256, 0x257, 0x258, 0x259, 0x25a, 0x01b, 0x2dc, 0x2dd, + 0x336, 0x3bd, 0x020, 0x131, 0x1de, 0x133, 0x134, 0x135, 0x137, 0x0de, + 0x139, 0x130, 0x138, 0x1bb, 0x0bc, 0x0bd, 0x0be, 0x0bf, 0x030, 0x031, + 0x032, 0x033, 0x034, 0x035, 0x036, 0x037, 0x038, 0x039, 0x1ba, 0x0ba, + 0x1bc, 0x0bb, 0x1be, 0x1bf, 0x132, 0x141, 0x142, 0x143, 0x144, 0x145, + 0x146, 0x147, 0x148, 0x149, 0x14a, 0x14b, 0x14c, 0x14d, 0x14e, 0x14f, + 0x150, 0x151, 0x152, 0x153, 0x154, 0x155, 0x156, 0x157, 0x158, 0x159, + 0x15a, 0x0db, 0x0dc, 0x0dd, 0x136, 0x1bd, 0x0c0, 0x041, 0x042, 0x043, + 0x044, 0x045, 0x046, 0x047, 0x048, 0x049, 0x04a, 0x04b, 0x04c, 0x04d, + 0x04e, 0x04f, 0x050, 0x051, 0x052, 0x053, 0x054, 0x055, 0x056, 0x057, + 0x058, 0x059, 0x05a, 0x1db, 0x1dc, 0x1dd, 0x1c0, 0x208 +}; + static UINT scancode_to_vkey( UINT scan ) { UINT j; @@ -904,3 +921,15 @@ HKL CDECL ANDROID_GetKeyboardLayout( DWORD thread_id ) FIXME( "returning %lx\n", layout ); return (HKL)layout; } + + +/*********************************************************************** + * ANDROID_VkKeyScanEx + */ +SHORT CDECL ANDROID_VkKeyScanEx( WCHAR ch, HKL hkl ) +{ + SHORT ret = -1; + if (ch < sizeof(char_vkey_map) / sizeof(char_vkey_map[0])) ret = char_vkey_map[ch]; + TRACE_(key)( "ch %04x hkl %p -> %04x\n", ch, hkl, ret ); + return ret; +} diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec index bd42cb1..918140f 100644 --- a/dlls/wineandroid.drv/wineandroid.drv.spec +++ b/dlls/wineandroid.drv/wineandroid.drv.spec @@ -8,6 +8,7 @@ @ cdecl GetKeyboardLayout(long) ANDROID_GetKeyboardLayout @ cdecl MapVirtualKeyEx(long long long) ANDROID_MapVirtualKeyEx @ cdecl ToUnicodeEx(long long ptr ptr long long long) ANDROID_ToUnicodeEx +@ cdecl VkKeyScanEx(long long) ANDROID_VkKeyScanEx @ cdecl EnumDisplayMonitors(long ptr ptr long) ANDROID_EnumDisplayMonitors @ cdecl GetMonitorInfo(long ptr) ANDROID_GetMonitorInfo @ cdecl CreateWindow(long) ANDROID_CreateWindow

1 0

Hans Leidekker : wineandroid: Implement GetKeyboardLayout.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: e545a85351ad72f9c6c7f9abdfdfebe621b1509b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e545a85351ad72f9c6c7f9abd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 9 09:20:49 2017 +0200 wineandroid: Implement GetKeyboardLayout. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/keyboard.c | 19 +++++++++++++++++++ dlls/wineandroid.drv/wineandroid.drv.spec | 1 + 2 files changed, 20 insertions(+) diff --git a/dlls/wineandroid.drv/keyboard.c b/dlls/wineandroid.drv/keyboard.c index fb70445..81af8e3 100644 --- a/dlls/wineandroid.drv/keyboard.c +++ b/dlls/wineandroid.drv/keyboard.c @@ -885,3 +885,22 @@ UINT CDECL ANDROID_MapVirtualKeyEx( UINT code, UINT maptype, HKL hkl ) TRACE_(key)( "returning 0x%04x\n", ret ); return ret; } + + +/*********************************************************************** + * ANDROID_GetKeyboardLayout + */ +HKL CDECL ANDROID_GetKeyboardLayout( DWORD thread_id ) +{ + ULONG_PTR layout = GetUserDefaultLCID(); + LANGID langid; + + langid = PRIMARYLANGID(LANGIDFROMLCID( layout )); + if (langid == LANG_CHINESE || langid == LANG_JAPANESE || langid == LANG_KOREAN) + layout = MAKELONG( layout, 0xe001 ); /* IME */ + else + layout |= layout << 16; + + FIXME( "returning %lx\n", layout ); + return (HKL)layout; +} diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec index 89ec528..bd42cb1 100644 --- a/dlls/wineandroid.drv/wineandroid.drv.spec +++ b/dlls/wineandroid.drv/wineandroid.drv.spec @@ -5,6 +5,7 @@ # USER driver @ cdecl GetKeyNameText(long ptr long) ANDROID_GetKeyNameText +@ cdecl GetKeyboardLayout(long) ANDROID_GetKeyboardLayout @ cdecl MapVirtualKeyEx(long long long) ANDROID_MapVirtualKeyEx @ cdecl ToUnicodeEx(long long ptr ptr long long long) ANDROID_ToUnicodeEx @ cdecl EnumDisplayMonitors(long ptr ptr long) ANDROID_EnumDisplayMonitors

1 0

Josh DuBois : wineandroid: Implement MapVirtualKeyEx.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: 0d565d0118af1989c57fa27e831ac7815a05fe19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d565d0118af1989c57fa27e8… Author: Josh DuBois <duboisj(a)codeweavers.com> Date: Fri Jun 9 09:20:20 2017 +0200 wineandroid: Implement MapVirtualKeyEx. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/keyboard.c | 64 +++++++++++++++++++++++++++++++ dlls/wineandroid.drv/wineandroid.drv.spec | 1 + 2 files changed, 65 insertions(+) diff --git a/dlls/wineandroid.drv/keyboard.c b/dlls/wineandroid.drv/keyboard.c index 9afb73a..fb70445 100644 --- a/dlls/wineandroid.drv/keyboard.c +++ b/dlls/wineandroid.drv/keyboard.c @@ -36,6 +36,7 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(keyboard); +WINE_DECLARE_DEBUG_CHANNEL(key); static const UINT keycode_to_vkey[] = { @@ -821,3 +822,66 @@ INT CDECL ANDROID_GetKeyNameText( LONG lparam, LPWSTR buffer, INT size ) TRACE( "lparam 0x%08x -> %s\n", lparam, debugstr_w( buffer )); return len; } + + +/*********************************************************************** + * ANDROID_MapVirtualKeyEx + */ +UINT CDECL ANDROID_MapVirtualKeyEx( UINT code, UINT maptype, HKL hkl ) +{ + UINT ret = 0; + const char *s; + + TRACE_(key)( "code=0x%x, maptype=%d, hkl %p\n", code, maptype, hkl ); + + switch (maptype) + { + case MAPVK_VK_TO_VSC_EX: + case MAPVK_VK_TO_VSC: + /* vkey to scancode */ + switch (code) + { + case VK_SHIFT: + code = VK_LSHIFT; + break; + case VK_CONTROL: + code = VK_LCONTROL; + break; + case VK_MENU: + code = VK_LMENU; + break; + } + if (code < sizeof(vkey_to_scancode) / sizeof(vkey_to_scancode[0])) ret = vkey_to_scancode[code]; + break; + case MAPVK_VSC_TO_VK: + case MAPVK_VSC_TO_VK_EX: + /* scancode to vkey */ + ret = scancode_to_vkey( code ); + if (maptype == MAPVK_VSC_TO_VK) + switch (ret) + { + case VK_LSHIFT: + case VK_RSHIFT: + ret = VK_SHIFT; break; + case VK_LCONTROL: + case VK_RCONTROL: + ret = VK_CONTROL; break; + case VK_LMENU: + case VK_RMENU: + ret = VK_MENU; break; + } + break; + case MAPVK_VK_TO_CHAR: + s = vkey_to_name( code ); + if (s && (strlen( s ) == 1)) + ret = s[0]; + else + ret = 0; + break; + default: + FIXME( "Unknown maptype %d\n", maptype ); + break; + } + TRACE_(key)( "returning 0x%04x\n", ret ); + return ret; +} diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec index 4e7815a..89ec528 100644 --- a/dlls/wineandroid.drv/wineandroid.drv.spec +++ b/dlls/wineandroid.drv/wineandroid.drv.spec @@ -5,6 +5,7 @@ # USER driver @ cdecl GetKeyNameText(long ptr long) ANDROID_GetKeyNameText +@ cdecl MapVirtualKeyEx(long long long) ANDROID_MapVirtualKeyEx @ cdecl ToUnicodeEx(long long ptr ptr long long long) ANDROID_ToUnicodeEx @ cdecl EnumDisplayMonitors(long ptr ptr long) ANDROID_EnumDisplayMonitors @ cdecl GetMonitorInfo(long ptr) ANDROID_GetMonitorInfo

1 0

Josh DuBois : wineandroid: Implement GetKeyNameText.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: 86534e0dd55d972b35ccecf2e9a2b3f53059d3a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86534e0dd55d972b35ccecf2e… Author: Josh DuBois <duboisj(a)codeweavers.com> Date: Fri Jun 9 09:19:42 2017 +0200 wineandroid: Implement GetKeyNameText. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/keyboard.c | 172 ++++++++++++++++++++++++++++++ dlls/wineandroid.drv/wineandroid.drv.spec | 1 + 2 files changed, 173 insertions(+) diff --git a/dlls/wineandroid.drv/keyboard.c b/dlls/wineandroid.drv/keyboard.c index b3ac76f..9afb73a 100644 --- a/dlls/wineandroid.drv/keyboard.c +++ b/dlls/wineandroid.drv/keyboard.c @@ -522,6 +522,118 @@ static const WORD vkey_to_scancode[] = 0, /* 0xff undefined */ }; +static const struct +{ + DWORD vkey; + const char *name; +} vkey_names[] = { + { VK_ADD, "Num +" }, + { VK_BACK, "Backspace" }, + { VK_CAPITAL, "Caps Lock" }, + { VK_CONTROL, "Ctrl" }, + { VK_DECIMAL, "Num Del" }, + { VK_DELETE | 0x100, "Delete" }, + { VK_DIVIDE | 0x100, "Num /" }, + { VK_DOWN | 0x100, "Down" }, + { VK_END | 0x100, "End" }, + { VK_ESCAPE, "Esc" }, + { VK_F1, "F1" }, + { VK_F2, "F2" }, + { VK_F3, "F3" }, + { VK_F4, "F4" }, + { VK_F5, "F5" }, + { VK_F6, "F6" }, + { VK_F7, "F7" }, + { VK_F8, "F8" }, + { VK_F9, "F9" }, + { VK_F10, "F10" }, + { VK_F11, "F11" }, + { VK_F12, "F12" }, + { VK_F13, "F13" }, + { VK_F14, "F14" }, + { VK_F15, "F15" }, + { VK_F16, "F16" }, + { VK_F17, "F17" }, + { VK_F18, "F18" }, + { VK_F19, "F19" }, + { VK_F20, "F20" }, + { VK_F21, "F21" }, + { VK_F22, "F22" }, + { VK_F23, "F23" }, + { VK_F24, "F24" }, + { VK_HELP | 0x100, "Help" }, + { VK_HOME | 0x100, "Home" }, + { VK_INSERT | 0x100, "Insert" }, + { VK_LCONTROL, "Ctrl" }, + { VK_LEFT | 0x100, "Left" }, + { VK_LMENU, "Alt" }, + { VK_LSHIFT, "Shift" }, + { VK_LWIN | 0x100, "Win" }, + { VK_MENU, "Alt" }, + { VK_MULTIPLY, "Num *" }, + { VK_NEXT | 0x100, "Page Down" }, + { VK_NUMLOCK | 0x100, "Num Lock" }, + { VK_NUMPAD0, "Num 0" }, + { VK_NUMPAD1, "Num 1" }, + { VK_NUMPAD2, "Num 2" }, + { VK_NUMPAD3, "Num 3" }, + { VK_NUMPAD4, "Num 4" }, + { VK_NUMPAD5, "Num 5" }, + { VK_NUMPAD6, "Num 6" }, + { VK_NUMPAD7, "Num 7" }, + { VK_NUMPAD8, "Num 8" }, + { VK_NUMPAD9, "Num 9" }, + { VK_OEM_CLEAR, "Num Clear" }, + { VK_OEM_NEC_EQUAL | 0x100, "Num =" }, + { VK_PRIOR | 0x100, "Page Up" }, + { VK_RCONTROL | 0x100, "Right Ctrl" }, + { VK_RETURN, "Return" }, + { VK_RETURN | 0x100, "Num Enter" }, + { VK_RIGHT | 0x100, "Right" }, + { VK_RMENU | 0x100, "Right Alt" }, + { VK_RSHIFT, "Right Shift" }, + { VK_RWIN | 0x100, "Right Win" }, + { VK_SEPARATOR, "Num ," }, + { VK_SHIFT, "Shift" }, + { VK_SPACE, "Space" }, + { VK_SUBTRACT, "Num -" }, + { VK_TAB, "Tab" }, + { VK_UP | 0x100, "Up" }, + { VK_VOLUME_DOWN | 0x100, "Volume Down" }, + { VK_VOLUME_MUTE | 0x100, "Mute" }, + { VK_VOLUME_UP | 0x100, "Volume Up" }, + { VK_OEM_MINUS, "-" }, + { VK_OEM_PLUS, "=" }, + { VK_OEM_1, ";" }, + { VK_OEM_2, "/" }, + { VK_OEM_3, "`" }, + { VK_OEM_4, "[" }, + { VK_OEM_5, "\\" }, + { VK_OEM_6, "]" }, + { VK_OEM_7, "'" }, + { VK_OEM_COMMA, "," }, + { VK_OEM_PERIOD, "." }, +}; + +static UINT scancode_to_vkey( UINT scan ) +{ + UINT j; + + for (j = 0; j < sizeof(vkey_to_scancode)/sizeof(vkey_to_scancode[0]); j++) + if (vkey_to_scancode[j] == scan) + return j; + return 0; +} + +static const char* vkey_to_name( UINT vkey ) +{ + UINT j; + + for (j = 0; j < sizeof(vkey_names)/sizeof(vkey_names[0]); j++) + if (vkey_names[j].vkey == vkey) + return vkey_names[j].name; + return NULL; +} /*********************************************************************** * keyboard_event @@ -649,3 +761,63 @@ INT CDECL ANDROID_ToUnicodeEx( UINT virt, UINT scan, const BYTE *state, TRACE( "returning %d / %s\n", strlenW( buffer ), debugstr_wn(buf, strlenW( buffer ))); return strlenW( buffer ); } + + +/*********************************************************************** + * ANDROID_GetKeyNameText + */ +INT CDECL ANDROID_GetKeyNameText( LONG lparam, LPWSTR buffer, INT size ) +{ + int scancode, vkey, len; + const char *name; + char key[2]; + + scancode = (lparam >> 16) & 0x1FF; + vkey = scancode_to_vkey( scancode ); + + if (lparam & (1 << 25)) + { + /* Caller doesn't care about distinctions between left and + right keys. */ + switch (vkey) + { + case VK_LSHIFT: + case VK_RSHIFT: + vkey = VK_SHIFT; break; + case VK_LCONTROL: + case VK_RCONTROL: + vkey = VK_CONTROL; break; + case VK_LMENU: + case VK_RMENU: + vkey = VK_MENU; break; + } + } + + if (scancode & 0x100) vkey |= 0x100; + + if ((vkey >= 0x30 && vkey <= 0x39) || (vkey >= 0x41 && vkey <= 0x5a)) + { + key[0] = vkey; + if (vkey >= 0x41) + key[0] += 0x20; + key[1] = 0; + name = key; + } + else + { + name = vkey_to_name( vkey ); + } + + len = MultiByteToWideChar( CP_UTF8, 0, name, -1, buffer, size ); + if (len) len--; + + if (!len) + { + static const WCHAR format[] = {'K','e','y',' ','0','x','%','0','2','x',0}; + snprintfW( buffer, size, format, vkey ); + len = strlenW( buffer ); + } + + TRACE( "lparam 0x%08x -> %s\n", lparam, debugstr_w( buffer )); + return len; +} diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec index 1a74624..4e7815a 100644 --- a/dlls/wineandroid.drv/wineandroid.drv.spec +++ b/dlls/wineandroid.drv/wineandroid.drv.spec @@ -4,6 +4,7 @@ # USER driver +@ cdecl GetKeyNameText(long ptr long) ANDROID_GetKeyNameText @ cdecl ToUnicodeEx(long long ptr ptr long long long) ANDROID_ToUnicodeEx @ cdecl EnumDisplayMonitors(long ptr ptr long) ANDROID_EnumDisplayMonitors @ cdecl GetMonitorInfo(long ptr) ANDROID_GetMonitorInfo

1 0

Hugh McMaster : regedit/tests: Remove an un-needed tab character from a key in the key deletion tests.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: 8096e2379883ad5f2caf2fdf3cd2088c76f863db URL: http://source.winehq.org/git/wine.git/?a=commit;h=8096e2379883ad5f2caf2fdf3… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 9 00:38:04 2017 +0000 regedit/tests: Remove an un-needed tab character from a key in the key deletion 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 550c22b..b2e65a8 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1197,7 +1197,7 @@ static void test_key_creation_and_deletion(void) verify_key_exist(hkey, "Subkey2a"); exec_import_str("REGEDIT4\n\n" - "[-\tHKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b\t]\n"); + "[-\tHKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n"); verify_key_exist(hkey, "Subkey2b"); exec_import_str("REGEDIT4\n\n"

1 0

Hugh McMaster : reg/tests: Remove un-needed tab characters from some keys in the key deletion tests.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: 8834968d02f9b7c30264623dc4835f17fe934315 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8834968d02f9b7c30264623dc… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 9 00:37:56 2017 +0000 reg/tests: Remove un-needed tab characters from some keys in the key deletion tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 58e003a..cc8dc10 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1676,7 +1676,7 @@ static void test_import(void) todo_wine verify_key_exist(hkey, "Subkey2a"); test_import_str("REGEDIT4\n\n" - "[-\tHKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b\t]\n", &r); + "[-\tHKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); todo_wine verify_key_exist(hkey, "Subkey2b"); @@ -2564,7 +2564,7 @@ static void test_import(void) todo_wine verify_key_exist(hkey, "Subkey2a"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" - "[-\tHKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b\t]\n", &r); + "[-\tHKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); todo_wine verify_key_exist(hkey, "Subkey2b");

1 0

Nikolay Sivov : shell32: Use IS_INTRESOURCE() to test context menu verb kind.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: 8499ace1ffbd3ffc795fb52047cceae6290e78d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8499ace1ffbd3ffc795fb5204… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 9 02:36:16 2017 +0300 shell32: Use IS_INTRESOURCE() to test context menu verb kind. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlmenu.c | 25 ++++++++++++++----------- dlls/shell32/shlview_cmenu.c | 6 +++--- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/shell32/shlmenu.c b/dlls/shell32/shlmenu.c index 7a960ad..39ab4c6 100644 --- a/dlls/shell32/shlmenu.c +++ b/dlls/shell32/shlmenu.c @@ -1114,25 +1114,28 @@ static HRESULT WINAPI CompositeCMenu_GetCommandString(IContextMenu3* iface, UINT static HRESULT WINAPI CompositeCMenu_InvokeCommand(IContextMenu3* iface,LPCMINVOKECOMMANDINFO pici) { CompositeCMenu *This = impl_from_IContextMenu3(iface); - TRACE("(%p)->(%p)\n",iface,pici); - if(HIWORD(pici->lpVerb)) + + TRACE("(%p)->(%p)\n", iface, pici); + + if (IS_INTRESOURCE(pici->lpVerb)) + { + UINT id = (UINT_PTR)pici->lpVerb; + UINT index = CompositeCMenu_GetIndexForCommandId(This, id); + return IContextMenu_InvokeCommand(This->menus[index], pici); + } + else { /*call each handler until one of them succeeds*/ - UINT i=0; - for(;i<This->menu_count;i++) + UINT i; + + for (i = 0; i < This->menu_count; i++) { HRESULT hres; - if(SUCCEEDED(hres=IContextMenu_InvokeCommand(This->menus[i],pici))) + if (SUCCEEDED(hres = IContextMenu_InvokeCommand(This->menus[i], pici))) return hres; } return E_FAIL; } - else - { - UINT id = (UINT_PTR)pici->lpVerb; - UINT index = CompositeCMenu_GetIndexForCommandId(This,id); - return IContextMenu_InvokeCommand(This->menus[index],pici); - } } static HRESULT WINAPI CompositeCMenu_QueryContextMenu(IContextMenu3 *iface, HMENU hmenu,UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 099f5bc..5c5ba1b 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -397,13 +397,13 @@ static HRESULT WINAPI ItemMenu_InvokeCommand( TRACE("(%p)->(invcom=%p verb=%p wnd=%p)\n",This,lpcmi,lpcmi->lpVerb, lpcmi->hwnd); - if( HIWORD(lpcmi->lpVerb)==0 && LOWORD(lpcmi->lpVerb) > FCIDM_SHVIEWLAST) + if (IS_INTRESOURCE(lpcmi->lpVerb) && LOWORD(lpcmi->lpVerb) > FCIDM_SHVIEWLAST) { - TRACE("Invalid Verb %x\n",LOWORD(lpcmi->lpVerb)); + TRACE("Invalid Verb %x\n", LOWORD(lpcmi->lpVerb)); return E_INVALIDARG; } - if (HIWORD(lpcmi->lpVerb) == 0) + if (IS_INTRESOURCE(lpcmi->lpVerb)) { switch(LOWORD(lpcmi->lpVerb)) {

1 0

Andrey Gusev : shell32: Add IApplicationDestinations stub.
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: 8ea9c3382961fa28a84a60e56be22cbfa3571c70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ea9c3382961fa28a84a60e56… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Jun 7 16:20:33 2017 +0300 shell32: Add IApplicationDestinations stub. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32_classes.idl | 6 ++ dlls/shell32/shell32_main.h | 2 + dlls/shell32/shellole.c | 1 + dlls/shell32/shellpath.c | 119 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 128 insertions(+) diff --git a/dlls/shell32/shell32_classes.idl b/dlls/shell32/shell32_classes.idl index cc57b2b..6ed497f 100644 --- a/dlls/shell32/shell32_classes.idl +++ b/dlls/shell32/shell32_classes.idl @@ -69,6 +69,12 @@ coclass KnownFolderManager { interface IKnownFolderManager; } ] coclass ApplicationAssociationRegistration { interface IApplicationAssociationRegistration; } [ + helpstring("Application Destination List"), + threading(apartment), + uuid(86c14003-4d6b-4ef3-a7b4-0506663b2e68) +] coclass ApplicationDestinations { interface IApplicationDestinations; } + +[ helpstring("Shell Drag and Drop Helper"), threading(apartment), uuid(4657278a-411b-11d2-839a-00c04fd918d0) diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index fc2a5ba..368c0e0 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -109,6 +109,8 @@ HRESULT WINAPI CPanel_ExtractIconW(LPITEMIDLIST pidl, LPCWSTR pszFile, UINT nIco HRESULT WINAPI IAutoComplete_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) DECLSPEC_HIDDEN; HRESULT WINAPI ApplicationAssociationRegistration_Constructor(IUnknown *outer, REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; +HRESULT WINAPI ApplicationDestinations_Constructor(IUnknown *outer, REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; + HRESULT IShellLink_ConstructFromFile(IUnknown * pUnkOuter, REFIID riid, LPCITEMIDLIST pidl, IUnknown **ppv) DECLSPEC_HIDDEN; LPEXTRACTICONA IExtractIconA_Constructor(LPCITEMIDLIST) DECLSPEC_HIDDEN; diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index d3d972b..7b6ee92 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -67,6 +67,7 @@ static const struct { } InterfaceTable[] = { {&CLSID_ApplicationAssociationRegistration, ApplicationAssociationRegistration_Constructor}, + {&CLSID_ApplicationDestinations, ApplicationDestinations_Constructor}, {&CLSID_AutoComplete, IAutoComplete_Constructor}, {&CLSID_ControlPanel, IControlPanel_Constructor}, {&CLSID_DragDropHelper, IDropTargetHelper_Constructor}, diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 8569b53..d2ebc66 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -1021,6 +1021,125 @@ typedef enum _CSIDL_Type { typedef struct { + IApplicationDestinations IApplicationDestinations_iface; + LONG ref; +} IApplicationDestinationsImpl; + +static inline IApplicationDestinationsImpl *impl_from_IApplicationDestinations( IApplicationDestinations *iface ) +{ + return CONTAINING_RECORD(iface, IApplicationDestinationsImpl, IApplicationDestinations_iface); +} + +static HRESULT WINAPI ApplicationDestinations_QueryInterface(IApplicationDestinations *iface, REFIID riid, + LPVOID *ppv) +{ + IApplicationDestinationsImpl *This = impl_from_IApplicationDestinations(iface); + + TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppv); + + if (ppv == NULL) + return E_POINTER; + + if (IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IApplicationDestinations, riid)) + { + *ppv = &This->IApplicationDestinations_iface; + IUnknown_AddRef((IUnknown*)*ppv); + + TRACE("Returning IApplicationDestinations: %p\n", *ppv); + return S_OK; + } + + *ppv = NULL; + FIXME("(%p)->(%s, %p) interface not supported.\n", This, debugstr_guid(riid), ppv); + + return E_NOINTERFACE; +} + +static ULONG WINAPI ApplicationDestinations_AddRef(IApplicationDestinations *iface) +{ + IApplicationDestinationsImpl *This = impl_from_IApplicationDestinations(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p), new refcount=%i\n", This, ref); + + return ref; +} + +static ULONG WINAPI ApplicationDestinations_Release(IApplicationDestinations *iface) +{ + IApplicationDestinationsImpl *This = impl_from_IApplicationDestinations(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p), new refcount=%i\n", This, ref); + + if (ref == 0) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +static HRESULT WINAPI ApplicationDestinations_SetAppID(IApplicationDestinations *iface, const WCHAR *appid) +{ + IApplicationDestinationsImpl *This = impl_from_IApplicationDestinations(iface); + + FIXME("(%p, %s) stub!\n", This, debugstr_w(appid)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ApplicationDestinations_RemoveDestination(IApplicationDestinations *iface, IUnknown *punk) +{ + IApplicationDestinationsImpl *This = impl_from_IApplicationDestinations(iface); + + FIXME("(%p, %p) stub!\n", This, punk); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ApplicationDestinations_RemoveAllDestinations(IApplicationDestinations *iface) +{ + IApplicationDestinationsImpl *This = impl_from_IApplicationDestinations(iface); + + FIXME("(%p) stub!\n", This); + + return E_NOTIMPL; +} + +static const IApplicationDestinationsVtbl ApplicationDestinationsVtbl = +{ + ApplicationDestinations_QueryInterface, + ApplicationDestinations_AddRef, + ApplicationDestinations_Release, + ApplicationDestinations_SetAppID, + ApplicationDestinations_RemoveDestination, + ApplicationDestinations_RemoveAllDestinations +}; + +HRESULT WINAPI ApplicationDestinations_Constructor(IUnknown *outer, REFIID riid, LPVOID *ppv) +{ + IApplicationDestinationsImpl *This; + HRESULT hr; + + TRACE("(%p, %s, %p)\n", outer, debugstr_guid(riid), ppv); + + if (outer) + return CLASS_E_NOAGGREGATION; + + if (!(This = SHAlloc(sizeof(*This)))) + return E_OUTOFMEMORY; + + This->IApplicationDestinations_iface.lpVtbl = &ApplicationDestinationsVtbl; + This->ref = 0; + + hr = IUnknown_QueryInterface(&This->IApplicationDestinations_iface, riid, ppv); + if (FAILED(hr)) + SHFree(This); + + return hr; +} + +typedef struct +{ const KNOWNFOLDERID *id; CSIDL_Type type; LPCWSTR szValueName;

1 0

Andrey Gusev : shobjidl.idl: Add IApplicationDestinations declaration.
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: 9f4f9423d6f0dcb51f563884591d9c5d7b4cef2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f4f9423d6f0dcb51f5638845… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Jun 7 16:20:32 2017 +0300 shobjidl.idl: Add IApplicationDestinations declaration. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/shobjidl.idl | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 52d4e4d..571fbab 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -3467,6 +3467,22 @@ interface IApplicationAssociationRegistration : IUnknown } [ + object, + uuid(12337d35-94c6-48a0-bce7-6a9c69d4d600), + pointer_default(unique) +] +interface IApplicationDestinations : IUnknown +{ + HRESULT SetAppID( + [in] LPCWSTR pszAppID); + + HRESULT RemoveDestination( + [in] IUnknown *punk); + + HRESULT RemoveAllDestinations(); +} + +[ uuid(6332debf-87b5-4670-90c0-5e57b408a49e), object, pointer_default(unique) @@ -3739,6 +3755,14 @@ library ShellObjects } [ + uuid(86c14003-4d6b-4ef3-a7b4-0506663b2e68) + ] + coclass ApplicationDestinations + { + interface IApplicationDestinations; + } + + [ uuid(00021401-0000-0000-c000-000000000046) ] coclass ShellLink

1 0

Francois Gouget : configure: Set PKG_CONFIG_PATH to get the right settings for the target host.
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: 20d41d9e2810696ca38598abcef6da8e77f9aae7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20d41d9e2810696ca38598abc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 7 11:25:36 2017 +0200 configure: Set PKG_CONFIG_PATH to get the right settings for the target host. Ideally we would use the right <triplet>-pkg-config tool for the target host. However Red Hat and SUSE respectively add '-redhat' and '-suse' to the triplet which makes it hard to find the right tool. Furthermore on Debian and derivatives a lot of development packages do not support multiarch so that the required .pc files would not be found. Setting PKG_CONFIG_PATH side-steps the non-standard Red Hat and SUSE triplets. It also lets pkg-config fall back to the 'wrong' .pc files on Debian which is fine in most cases, while using the right one in cases where it matters (GStreamer 1.0), assuming they are actually present. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 2 ++ 2 files changed, 4 insertions(+) diff --git a/configure b/configure index d17ff5e..d12d186 100755 --- a/configure +++ b/configure @@ -5138,6 +5138,8 @@ rm -f core conftest.err conftest.$ac_objext \ notice_platform="32-bit " TARGETFLAGS="-m32" + PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib/pkgconfig} + export PKG_CONFIG_PATH enable_win16=${enable_win16:-yes} else if test "x${GCC}" = "xyes" diff --git a/configure.ac b/configure.ac index 129a8f6..d5e9456 100644 --- a/configure.ac +++ b/configure.ac @@ -151,6 +151,8 @@ case $host in host_cpu="i386" notice_platform="32-bit " AC_SUBST(TARGETFLAGS,"-m32") + PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib/pkgconfig} + export PKG_CONFIG_PATH enable_win16=${enable_win16:-yes} else if test "x${GCC}" = "xyes"

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: 2b03d20759ef086c229848a192d071764c59d8aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b03d20759ef086c229848a19… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Jun 8 16:25:46 2017 +0300 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 60 ++++++++++++++++++++---------------------------------------- 1 file changed, 20 insertions(+), 40 deletions(-) diff --git a/po/fi.po b/po/fi.po index b4895b2..b159f47 100644 --- a/po/fi.po +++ b/po/fi.po @@ -350,7 +350,7 @@ msgstr "&Nollaa" #: progman.rc:202 progman.rc:219 regedit.rc:77 taskmgr.rc:87 winefile.rc:82 #: winemine.rc:51 winhlp32.rc:57 wordpad.rc:102 msgid "&Help" -msgstr "&Apua" +msgstr "&Ohje" #: comctl32.rc:97 msgid "Move &Up" @@ -10257,7 +10257,7 @@ msgstr "Syntaksivirhe\n" #: cmd.rc:365 msgid "No help available for %1\n" -msgstr "Apua ei saatavilla %1:lle\n" +msgstr "Ei ohjetta %1:lle\n" #: cmd.rc:366 msgid "Target to GOTO not found\n" @@ -10995,7 +10995,7 @@ msgstr "&Järjestelmän asetukset" #: oleview.rc:36 msgid "&Run the Registry Editor" -msgstr "&Aja rekisterieditori" +msgstr "Aja &Rekisterieditori" #: oleview.rc:42 msgid "&CoCreateInstance Flag" @@ -11502,7 +11502,7 @@ msgstr "" #: progman.rc:77 msgid "Help not available." -msgstr "Apua ei saatavilla." +msgstr "Ohjetta ei saatavilla." #: progman.rc:78 msgid "Unknown feature in %s" @@ -11548,7 +11548,7 @@ msgstr "" "Tuetut toiminnot:\n" " ADD, DELETE, QUERY\n" "\n" -"Tietystä toiminnosta saa apua komennolla\n" +"Ohjeen kustakin toiminnosta saa komennolla\n" " REG [toiminto] /?\n" "\n" @@ -11663,11 +11663,11 @@ msgstr "reg: Valitsin [%1] ei kelpaa. " #: reg.rc:63 msgid "Type \"REG /?\" for help.\n" -msgstr "Komennolla \"REG /?\" saat apua.\n" +msgstr "Komento \"REG /?\" näyttää ohjeen.\n" #: reg.rc:64 msgid "Type \"REG %1 /?\" for help.\n" -msgstr "Komennolla \"REG %1 /?\" saat apua.\n" +msgstr "Komento \"REG %1 /?\" näyttää ohjeen.\n" #: reg.rc:65 regedit.rc:239 msgid "(value not set)" @@ -11739,17 +11739,15 @@ msgstr "&Poista suosikki..." #: regedit.rc:80 msgid "&About Registry Editor" -msgstr "&Tietoja rekisterieditorista" +msgstr "&Tietoja Rekisterieditorista" #: regedit.rc:89 regedit.rc:96 regedit.rc:229 msgid "Expand" msgstr "Laajenna" #: regedit.rc:134 regedit.rc:232 -#, fuzzy -#| msgid "Modify Binary Data..." msgid "Modify &Binary Data..." -msgstr "Muuta binääridataa..." +msgstr "Muuta &binääridataa..." #: regedit.rc:266 msgid "Export registry" @@ -11848,14 +11846,10 @@ msgid "Contains commands for accessing frequently used keys" msgstr "Sisältää komentoja, joilla pääsee usein käytettyihin avaimiin" #: regedit.rc:163 -#, fuzzy -#| msgid "" -#| "Contains commands for displaying help and information about registry " -#| "editor" msgid "" "Contains commands for displaying Help and information about Registry Editor" msgstr "" -"Sisältää komentoja, joilla saa apua ja tietoja koko rekisterieditorista" +"Sisältää komennot, jotka näyttävät ohjeen ja tietoja Rekisterieditorista" #: regedit.rc:164 msgid "Contains commands for creating new keys or values" @@ -12004,7 +11998,7 @@ msgstr "regedit: Virheellinen tai tuntematon valitsin [%1]\n" #: regedit.rc:409 msgid "Type \"regedit /?\" for help.\n" -msgstr "Komennolla \"regedit /?\" saat apua.\n" +msgstr "Komento \"regedit /?\" näyttää ohjeen.\n" #: regedit.rc:410 msgid "regedit: No filename was specified.\n" @@ -12092,10 +12086,8 @@ msgid "regedit: The line contains invalid syntax.\n" msgstr "regedit: Rivin syntaksi on virheellinen.\n" #: regedit.rc:187 -#, fuzzy -#| msgid "Quits the registry editor" msgid "Quits the Registry Editor" -msgstr "Sulkee rekisterieditorin" +msgstr "Sulkee Rekisterieditorin" #: regedit.rc:188 msgid "Adds keys to the favorites list" @@ -12110,10 +12102,8 @@ msgid "Shows or hides the status bar" msgstr "Näyttää tai piilottaa tilapalkin" #: regedit.rc:191 -#, fuzzy -#| msgid "Change position of split between two panes" msgid "Changes the position of the split between two panes" -msgstr "Muuta kahden kehyksen erottimen paikkaa" +msgstr "Muuttaa kahden kehyksen erottimen paikkaa" #: regedit.rc:192 msgid "Refreshes the window" @@ -12156,10 +12146,8 @@ msgid "Adds a new binary value" msgstr "Lisää uuden binääriarvon" #: regedit.rc:174 -#, fuzzy -#| msgid "Adds a new binary value" msgid "Adds a new 32-bit value" -msgstr "Lisää uuden binääriarvon" +msgstr "Lisää uuden 32-bittisen arvon" #: regedit.rc:177 msgid "Imports a text file into the registry" @@ -12174,10 +12162,8 @@ msgid "Prints all or part of the registry" msgstr "Tulostaa koko rekisterin tai osan siitä" #: regedit.rc:181 -#, fuzzy -#| msgid "Registry Editor" msgid "Opens Registry Editor Help" -msgstr "Rekisterieditori" +msgstr "Avaa Rekisterieditorin Ohjeen" #: regedit.rc:182 msgid "Displays program information, version number and copyright" @@ -12220,26 +12206,20 @@ msgid "Unable to query the registry key '%1'." msgstr "Rekisteriavaimen '%1' hakeminen ei onnistu." #: regedit.rc:170 -#, fuzzy -#| msgid "Modifies the value's data" msgid "Modifies the value's data in binary form" -msgstr "Muokkaa arvon dataa" +msgstr "Muokkaa arvon dataa binäärimuodossa" #: regedit.rc:175 msgid "Adds a new multi-string value" msgstr "Lisää uuden monen merkkijonon arvon" #: regedit.rc:198 -#, fuzzy -#| msgid "Exports selected branch of the registry to a text file" msgid "Exports the selected branch of the registry to a text file" msgstr "Vie rekisterin valitun haaran tekstitiedostoon" #: regedit.rc:176 -#, fuzzy -#| msgid "Adds a new string value" msgid "Adds a new expandable string value" -msgstr "Lisää uuden merkkijonon arvon" +msgstr "Lisää uuden laajennettavan merkkijonoarvon" #: regedit.rc:211 msgid "Confirm Key Delete" @@ -14509,7 +14489,7 @@ msgstr "Suuri" #: winhlp32.rc:58 msgid "&Help on help\tF1" -msgstr "Apua &Ohjeeseen\tF1" +msgstr "&Ohjeen ohje\tF1" #: winhlp32.rc:59 msgid "&About Wine Help" @@ -14971,11 +14951,11 @@ msgstr "Wordpadin käynnistys epäonnistui" #: xcopy.rc:30 msgid "Invalid number of parameters - Use xcopy /? for help\n" -msgstr "Parametrien määrä ei kelpaa - Komennolla xcopy /? saat apua\n" +msgstr "Parametrien määrä ei kelpaa - Komento xcopy /? näyttää ohjeen\n" #: xcopy.rc:31 msgid "Invalid parameter '%1' - Use xcopy /? for help\n" -msgstr "Virheellinen parametri '%1' - Komennolla xcopy /? saat apua\n" +msgstr "Virheellinen parametri '%1' - Komento xcopy /? näyttää ohjeen\n" #: xcopy.rc:32 msgid "Press <Enter> to begin copying\n"

1 0

Nikolay Sivov : d3drm: Implement AddNormal() for mesh builder.
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: 79b474425af3a4d99001e994deb99711d423ba80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79b474425af3a4d99001e994d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 8 10:46:18 2017 +0300 d3drm: Implement AddNormal() for mesh builder. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/meshbuilder.c | 57 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 38 insertions(+), 19 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index a2e4b6b..647520d 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -72,8 +72,9 @@ struct d3drm_mesh_builder SIZE_T nb_vertices; SIZE_T vertices_size; D3DVECTOR *vertices; - DWORD nb_normals; - D3DVECTOR* pNormals; + SIZE_T nb_normals; + SIZE_T normals_size; + D3DVECTOR *normals; DWORD nb_faces; DWORD face_data_size; void *pFaceData; @@ -365,9 +366,10 @@ static void clean_mesh_builder_data(struct d3drm_mesh_builder *mesh_builder) mesh_builder->vertices = NULL; mesh_builder->nb_vertices = 0; mesh_builder->vertices_size = 0; - HeapFree(GetProcessHeap(), 0, mesh_builder->pNormals); - mesh_builder->pNormals = NULL; + HeapFree(GetProcessHeap(), 0, mesh_builder->normals); + mesh_builder->normals = NULL; mesh_builder->nb_normals = 0; + mesh_builder->normals_size = 0; HeapFree(GetProcessHeap(), 0, mesh_builder->pFaceData); mesh_builder->pFaceData = NULL; mesh_builder->face_data_size = 0; @@ -776,7 +778,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_GetVertices(IDirect3DRMMeshBuilder2 *i if (normal_count) *normal_count = mesh_builder->nb_normals; if (normals && mesh_builder->nb_normals) - memcpy(normals, mesh_builder->pNormals, mesh_builder->nb_normals * sizeof(*normals)); + memcpy(normals, mesh_builder->normals, mesh_builder->nb_normals * sizeof(*normals)); if (face_data && (!face_data_size || (*face_data_size < mesh_builder->face_data_size))) return D3DRMERR_BADVALUE; @@ -812,9 +814,11 @@ static int WINAPI d3drm_mesh_builder2_AddVertex(IDirect3DRMMeshBuilder2 *iface, static int WINAPI d3drm_mesh_builder2_AddNormal(IDirect3DRMMeshBuilder2 *iface, D3DVALUE x, D3DVALUE y, D3DVALUE z) { - FIXME("iface %p, x %.8e, y %.8e, z %.8e stub!\n", iface, x, y, z); + struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder2(iface); - return 0; + TRACE("iface %p, x %.8e, y %.8e, z %.8e.\n", iface, x, y, z); + + return IDirect3DRMMeshBuilder3_AddNormal(&mesh_builder->IDirect3DRMMeshBuilder3_iface, x, y, z); } static HRESULT WINAPI d3drm_mesh_builder2_CreateFace(IDirect3DRMMeshBuilder2 *iface, IDirect3DRMFace **face) @@ -1164,12 +1168,17 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, mesh_builder->nb_normals = *(DWORD*)ptr; nb_faces_normals = *(DWORD*)(ptr + sizeof(DWORD) + mesh_builder->nb_normals * sizeof(D3DVECTOR)); - TRACE("MeshNormals: nb_normals = %d, nb_faces_normals = %d\n", mesh_builder->nb_normals, nb_faces_normals); + TRACE("MeshNormals: nb_normals = %lu, nb_faces_normals = %d\n", mesh_builder->nb_normals, nb_faces_normals); if (nb_faces_normals != mesh_builder->nb_faces) - WARN("nb_face_normals (%d) != nb_faces (%d)\n", nb_faces_normals, mesh_builder->nb_normals); + WARN("nb_face_normals (%d) != nb_faces (%d)\n", nb_faces_normals, mesh_builder->nb_faces); - mesh_builder->pNormals = HeapAlloc(GetProcessHeap(), 0, mesh_builder->nb_normals * sizeof(D3DVECTOR)); - memcpy(mesh_builder->pNormals, ptr + sizeof(DWORD), mesh_builder->nb_normals * sizeof(D3DVECTOR)); + if (!d3drm_array_reserve((void **)&mesh_builder->normals, &mesh_builder->normals_size, + mesh_builder->nb_normals, sizeof(*mesh_builder->normals))) + { + hr = E_OUTOFMEMORY; + goto end; + } + memcpy(mesh_builder->normals, ptr + sizeof(DWORD), mesh_builder->nb_normals * sizeof(D3DVECTOR)); faces_normal_idx_size = size - (2 * sizeof(DWORD) + mesh_builder->nb_normals * sizeof(D3DVECTOR)); faces_normal_idx_ptr = faces_normal_idx_data = HeapAlloc(GetProcessHeap(), 0, faces_normal_idx_size); @@ -1187,7 +1196,6 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, mesh_builder->pCoords2d = HeapAlloc(GetProcessHeap(), 0, mesh_builder->nb_coords2d * sizeof(*mesh_builder->pCoords2d)); memcpy(mesh_builder->pCoords2d, ptr + sizeof(DWORD), mesh_builder->nb_coords2d * sizeof(*mesh_builder->pCoords2d)); - } else if (IsEqualGUID(guid, &TID_D3DRMMeshMaterialList)) { @@ -1378,9 +1386,10 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, if (!mesh_builder->nb_normals) { /* Allocate normals, one per vertex */ - mesh_builder->pNormals = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mesh_builder->nb_vertices * sizeof(D3DVECTOR)); - if (!mesh_builder->pNormals) + if (!d3drm_array_reserve((void **)&mesh_builder->normals, &mesh_builder->normals_size, + mesh_builder->nb_vertices, sizeof(*mesh_builder->normals))) goto end; + memset(mesh_builder->normals, 0, mesh_builder->nb_vertices * sizeof(*mesh_builder->normals)); } for (i = 0; i < mesh_builder->nb_faces; i++) @@ -1444,7 +1453,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, } *(faces_data_ptr + faces_data_size++) = vertex_idx; /* Add face normal to vertex normal */ - D3DRMVectorAdd(&mesh_builder->pNormals[vertex_idx], &mesh_builder->pNormals[vertex_idx], &face_normal); + D3DRMVectorAdd(&mesh_builder->normals[vertex_idx], &mesh_builder->normals[vertex_idx], &face_normal); } faces_vertex_idx_ptr++; } @@ -1462,7 +1471,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, /* Normalize all normals */ for (i = 0; i < mesh_builder->nb_vertices; i++) { - D3DRMVectorNormalize(&mesh_builder->pNormals[i]); + D3DRMVectorNormalize(&mesh_builder->normals[i]); } mesh_builder->nb_normals = mesh_builder->nb_vertices; } @@ -1907,9 +1916,19 @@ static int WINAPI d3drm_mesh_builder3_AddVertex(IDirect3DRMMeshBuilder3 *iface, static int WINAPI d3drm_mesh_builder3_AddNormal(IDirect3DRMMeshBuilder3 *iface, D3DVALUE x, D3DVALUE y, D3DVALUE z) { - FIXME("iface %p, x %.8e, y %.8e, z %.8e stub!\n", iface, x, y, z); + struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder3(iface); - return 0; + TRACE("iface %p, x %.8e, y %.8e, z %.8e.\n", iface, x, y, z); + + if (!d3drm_array_reserve((void **)&mesh_builder->normals, &mesh_builder->normals_size, + mesh_builder->nb_normals + 1, sizeof(*mesh_builder->normals))) + return 0; + + mesh_builder->normals[mesh_builder->nb_normals].u1.x = x; + mesh_builder->normals[mesh_builder->nb_normals].u2.y = y; + mesh_builder->normals[mesh_builder->nb_normals].u3.z = z; + + return mesh_builder->nb_normals++; } static HRESULT WINAPI d3drm_mesh_builder3_CreateFace(IDirect3DRMMeshBuilder3 *iface, IDirect3DRMFace2 **face) @@ -2263,7 +2282,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_GetNormals(IDirect3DRMMeshBuilder3 *if if (normal_count) *normal_count = count; if (normals && mesh_builder->nb_normals) - memcpy(normals, mesh_builder->pNormals + start_idx, count * sizeof(*normals)); + memcpy(normals, &mesh_builder->normals[start_idx], count * sizeof(*normals)); return D3DRM_OK; }

1 0

Nikolay Sivov : d3drm: Implement AddVertex() for mesh builder.
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: 837ddde132ac5fabc2fd584dbcc9fe97c05d3a4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=837ddde132ac5fabc2fd584db… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 8 10:46:17 2017 +0300 d3drm: Implement AddVertex() for mesh builder. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/meshbuilder.c | 91 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 71 insertions(+), 20 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index deaab1c..a2e4b6b 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -69,8 +69,9 @@ struct d3drm_mesh_builder IDirect3DRMMeshBuilder3 IDirect3DRMMeshBuilder3_iface; LONG ref; char* name; - DWORD nb_vertices; - D3DVECTOR* pVertices; + SIZE_T nb_vertices; + SIZE_T vertices_size; + D3DVECTOR *vertices; DWORD nb_normals; D3DVECTOR* pNormals; DWORD nb_faces; @@ -307,6 +308,38 @@ char templates[] = { "}" }; +static BOOL d3drm_array_reserve(void **elements, SIZE_T *capacity, SIZE_T element_count, SIZE_T element_size) +{ + SIZE_T new_capacity, max_capacity; + void *new_elements; + + if (element_count <= *capacity) + return TRUE; + + max_capacity = ~(SIZE_T)0 / element_size; + if (max_capacity < element_count) + return FALSE; + + new_capacity = max(*capacity, 4); + while (new_capacity < element_count && new_capacity <= max_capacity / 2) + new_capacity *= 2; + + if (new_capacity < element_count) + new_capacity = max_capacity; + + if (*elements) + new_elements = HeapReAlloc(GetProcessHeap(), 0, *elements, new_capacity * element_size); + else + new_elements = HeapAlloc(GetProcessHeap(), 0, new_capacity * element_size); + + if (!new_elements) + return FALSE; + + *elements = new_elements; + *capacity = new_capacity; + return TRUE; +} + static inline struct d3drm_mesh *impl_from_IDirect3DRMMesh(IDirect3DRMMesh *iface) { return CONTAINING_RECORD(iface, struct d3drm_mesh, IDirect3DRMMesh_iface); @@ -328,9 +361,10 @@ static void clean_mesh_builder_data(struct d3drm_mesh_builder *mesh_builder) HeapFree(GetProcessHeap(), 0, mesh_builder->name); mesh_builder->name = NULL; - HeapFree(GetProcessHeap(), 0, mesh_builder->pVertices); - mesh_builder->pVertices = NULL; + HeapFree(GetProcessHeap(), 0, mesh_builder->vertices); + mesh_builder->vertices = NULL; mesh_builder->nb_vertices = 0; + mesh_builder->vertices_size = 0; HeapFree(GetProcessHeap(), 0, mesh_builder->pNormals); mesh_builder->pNormals = NULL; mesh_builder->nb_normals = 0; @@ -735,7 +769,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_GetVertices(IDirect3DRMMeshBuilder2 *i if (vertex_count) *vertex_count = mesh_builder->nb_vertices; if (vertices && mesh_builder->nb_vertices) - memcpy(vertices, mesh_builder->pVertices, mesh_builder->nb_vertices * sizeof(*vertices)); + memcpy(vertices, mesh_builder->vertices, mesh_builder->nb_vertices * sizeof(*vertices)); if (normals && (!normal_count || (*normal_count < mesh_builder->nb_normals))) return D3DRMERR_BADVALUE; @@ -768,9 +802,11 @@ static HRESULT WINAPI d3drm_mesh_builder2_GetTextureCoordinates(IDirect3DRMMeshB static int WINAPI d3drm_mesh_builder2_AddVertex(IDirect3DRMMeshBuilder2 *iface, D3DVALUE x, D3DVALUE y, D3DVALUE z) { - FIXME("iface %p, x %.8e, y %.8e, z %.8e stub!\n", iface, x, y, z); + struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder2(iface); - return 0; + TRACE("iface %p, x %.8e, y %.8e, z %.8e.\n", iface, x, y, z); + + return IDirect3DRMMeshBuilder3_AddVertex(&mesh_builder->IDirect3DRMMeshBuilder3_iface, x, y, z); } static int WINAPI d3drm_mesh_builder2_AddNormal(IDirect3DRMMeshBuilder2 *iface, @@ -1073,11 +1109,16 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, mesh_builder->nb_faces = *(DWORD*)(ptr + sizeof(DWORD) + mesh_builder->nb_vertices * sizeof(D3DVECTOR)); faces_vertex_idx_size = size - sizeof(DWORD) - mesh_builder->nb_vertices * sizeof(D3DVECTOR) - sizeof(DWORD); - TRACE("Mesh: nb_vertices = %d, nb_faces = %d, faces_vertex_idx_size = %d\n", mesh_builder->nb_vertices, + TRACE("Mesh: nb_vertices = %lu, nb_faces = %d, faces_vertex_idx_size = %d\n", mesh_builder->nb_vertices, mesh_builder->nb_faces, faces_vertex_idx_size); - mesh_builder->pVertices = HeapAlloc(GetProcessHeap(), 0, mesh_builder->nb_vertices * sizeof(D3DVECTOR)); - memcpy(mesh_builder->pVertices, ptr + sizeof(DWORD), mesh_builder->nb_vertices * sizeof(D3DVECTOR)); + if (!d3drm_array_reserve((void **)&mesh_builder->vertices, &mesh_builder->vertices_size, mesh_builder->nb_vertices, + sizeof(*mesh_builder->vertices))) + { + hr = E_OUTOFMEMORY; + goto end; + } + memcpy(mesh_builder->vertices, ptr + sizeof(DWORD), mesh_builder->nb_vertices * sizeof(D3DVECTOR)); faces_vertex_idx_ptr = faces_vertex_idx_data = HeapAlloc(GetProcessHeap(), 0, faces_vertex_idx_size); memcpy(faces_vertex_idx_data, ptr + sizeof(DWORD) + mesh_builder->nb_vertices * sizeof(D3DVECTOR) + sizeof(DWORD), @@ -1369,8 +1410,8 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, { D3DVECTOR a, b; - D3DRMVectorSubtract(&a, &mesh_builder->pVertices[faces_vertex_idx_ptr[2]], &mesh_builder->pVertices[faces_vertex_idx_ptr[1]]); - D3DRMVectorSubtract(&b, &mesh_builder->pVertices[faces_vertex_idx_ptr[0]], &mesh_builder->pVertices[faces_vertex_idx_ptr[1]]); + D3DRMVectorSubtract(&a, &mesh_builder->vertices[faces_vertex_idx_ptr[2]], &mesh_builder->vertices[faces_vertex_idx_ptr[1]]); + D3DRMVectorSubtract(&b, &mesh_builder->vertices[faces_vertex_idx_ptr[0]], &mesh_builder->vertices[faces_vertex_idx_ptr[1]]); D3DRMVectorCrossProduct(&face_normal, &a, &b); D3DRMVectorNormalize(&face_normal); } @@ -1397,7 +1438,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, DWORD vertex_idx = *faces_vertex_idx_ptr; if (vertex_idx >= mesh_builder->nb_vertices) { - WARN("Found vertex index %u but only %u vertices available => use index 0\n", vertex_idx, + WARN("Found vertex index %u but only %lu vertices available => use index 0\n", vertex_idx, mesh_builder->nb_vertices); vertex_idx = 0; } @@ -1586,9 +1627,9 @@ static HRESULT WINAPI d3drm_mesh_builder3_Scale(IDirect3DRMMeshBuilder3 *iface, for (i = 0; i < mesh_builder->nb_vertices; ++i) { - mesh_builder->pVertices[i].u1.x *= sx; - mesh_builder->pVertices[i].u2.y *= sy; - mesh_builder->pVertices[i].u3.z *= sz; + mesh_builder->vertices[i].u1.x *= sx; + mesh_builder->vertices[i].u2.y *= sy; + mesh_builder->vertices[i].u3.z *= sz; } /* Normals are not affected by Scale */ @@ -1848,9 +1889,19 @@ static HRESULT WINAPI d3drm_mesh_builder3_GetTextureCoordinates(IDirect3DRMMeshB static int WINAPI d3drm_mesh_builder3_AddVertex(IDirect3DRMMeshBuilder3 *iface, D3DVALUE x, D3DVALUE y, D3DVALUE z) { - FIXME("iface %p, x %.8e, y %.8e, z %.8e stub!\n", iface, x, y, z); + struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder3(iface); - return 0; + TRACE("iface %p, x %.8e, y %.8e, z %.8e.\n", iface, x, y, z); + + if (!d3drm_array_reserve((void **)&mesh_builder->vertices, &mesh_builder->vertices_size, + mesh_builder->nb_vertices + 1, sizeof(*mesh_builder->vertices))) + return 0; + + mesh_builder->vertices[mesh_builder->nb_vertices].u1.x = x; + mesh_builder->vertices[mesh_builder->nb_vertices].u2.y = y; + mesh_builder->vertices[mesh_builder->nb_vertices].u3.z = z; + + return mesh_builder->nb_vertices++; } static int WINAPI d3drm_mesh_builder3_AddNormal(IDirect3DRMMeshBuilder3 *iface, @@ -1937,7 +1988,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_CreateMesh(IDirect3DRMMeshBuilder3 *if return E_OUTOFMEMORY; } for (i = 0; i < mesh_builder->nb_vertices; i++) - vertices[i].position = mesh_builder->pVertices[i]; + vertices[i].position = mesh_builder->vertices[i]; hr = IDirect3DRMMesh_SetVertices(*mesh, 0, 0, mesh_builder->nb_vertices, vertices); HeapFree(GetProcessHeap(), 0, vertices); @@ -2186,7 +2237,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_GetVertices(IDirect3DRMMeshBuilder3 *i if (vertex_count) *vertex_count = count; if (vertices && mesh_builder->nb_vertices) - memcpy(vertices, mesh_builder->pVertices + start_idx, count * sizeof(*vertices)); + memcpy(vertices, mesh_builder->vertices + start_idx, count * sizeof(*vertices)); return D3DRM_OK; }

1 0

Nikolay Sivov : d3drm: Use consistent naming for mesh builder implementation pointers.
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: c0c08a428ecbe1c9f98f23d79ac000cc712346fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0c08a428ecbe1c9f98f23d79… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 8 10:46:16 2017 +0300 d3drm: Use consistent naming for mesh builder implementation pointers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/meshbuilder.c | 186 ++++++++++++++++++++++++----------------------- 1 file changed, 95 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c0c08a428ecbe1c9f98f2…

1 0

Jacek Caban : rpcrt4: Change RPCRT4_ReleaseConnection return type to void.
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: 2cb32b2f3b55fbb3e749da964d828b38cbbdab77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cb32b2f3b55fbb3e749da964… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 8 14:16:56 2017 +0200 rpcrt4: Change RPCRT4_ReleaseConnection return type to void. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_binding.c | 7 +++---- dlls/rpcrt4/rpc_binding.h | 2 +- dlls/rpcrt4/rpc_transport.c | 3 +-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index f2b1d59..ec38b86 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -297,14 +297,13 @@ RPC_STATUS RPCRT4_CloseBinding(RpcBinding* Binding, RpcConnection* Connection) if (!Connection) return RPC_S_OK; if (Binding->server) { /* don't destroy a connection that is cached in the binding */ - if (Binding->FromConn == Connection) - return RPC_S_OK; - return RPCRT4_ReleaseConnection(Connection); + if (Binding->FromConn != Connection) + RPCRT4_ReleaseConnection(Connection); } else { RpcAssoc_ReleaseIdleConnection(Binding->Assoc, Connection); - return RPC_S_OK; } + return RPC_S_OK; } static LPSTR RPCRT4_strconcatA(LPSTR dst, LPCSTR src) diff --git a/dlls/rpcrt4/rpc_binding.h b/dlls/rpcrt4/rpc_binding.h index a679b0e..ca53887 100644 --- a/dlls/rpcrt4/rpc_binding.h +++ b/dlls/rpcrt4/rpc_binding.h @@ -163,7 +163,7 @@ RPC_STATUS RPCRT4_CreateConnection(RpcConnection** Connection, BOOL server, LPCS LPCSTR NetworkAddr, LPCSTR Endpoint, LPCWSTR NetworkOptions, RpcAuthInfo* AuthInfo, RpcQualityOfService *QOS, LPCWSTR CookieAuth) DECLSPEC_HIDDEN; RpcConnection *RPCRT4_GrabConnection( RpcConnection *conn ) DECLSPEC_HIDDEN; -RPC_STATUS RPCRT4_ReleaseConnection(RpcConnection* Connection) DECLSPEC_HIDDEN; +void RPCRT4_ReleaseConnection(RpcConnection* Connection) DECLSPEC_HIDDEN; RPC_STATUS RPCRT4_OpenClientConnection(RpcConnection* Connection) DECLSPEC_HIDDEN; RPC_STATUS RPCRT4_CloseConnection(RpcConnection* Connection) DECLSPEC_HIDDEN; RPC_STATUS RPCRT4_IsServerListening(const char *protseq, const char *endpoint) DECLSPEC_HIDDEN; diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 909fec1..48def49 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -3380,7 +3380,7 @@ RpcConnection *RPCRT4_GrabConnection(RpcConnection *connection) return connection; } -RPC_STATUS RPCRT4_ReleaseConnection(RpcConnection *connection) +void RPCRT4_ReleaseConnection(RpcConnection *connection) { LONG ref = InterlockedDecrement(&connection->ref); @@ -3416,7 +3416,6 @@ RPC_STATUS RPCRT4_ReleaseConnection(RpcConnection *connection) HeapFree(GetProcessHeap(), 0, connection); } - return RPC_S_OK; } RPC_STATUS RPCRT4_IsServerListening(const char *protseq, const char *endpoint)

1 0

Jacek Caban : rpcrt4: Fix a race when server grabs a connection from the list of active connections.
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: e889b027efa99fdc783fcf48c59adfe119e0d65c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e889b027efa99fdc783fcf48c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 8 14:16:50 2017 +0200 rpcrt4: Fix a race when server grabs a connection from the list of active connections. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_transport.c | 58 ++++++++++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 24 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 0ae7125..909fec1 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -3373,40 +3373,50 @@ void rpcrt4_conn_release_and_wait(RpcConnection *connection) } } -RpcConnection *RPCRT4_GrabConnection( RpcConnection *conn ) +RpcConnection *RPCRT4_GrabConnection(RpcConnection *connection) { - InterlockedIncrement( &conn->ref ); - return conn; + LONG ref = InterlockedIncrement(&connection->ref); + TRACE("%p ref=%u\n", connection, ref); + return connection; } -RPC_STATUS RPCRT4_ReleaseConnection(RpcConnection* Connection) +RPC_STATUS RPCRT4_ReleaseConnection(RpcConnection *connection) { - if (InterlockedDecrement( &Connection->ref ) > 0) return RPC_S_OK; + LONG ref = InterlockedDecrement(&connection->ref); - TRACE("destroying connection %p\n", Connection); + if (!ref && connection->protseq) + { + /* protseq stores a list of active connections, but does not own references to them. + * It may need to grab a connection from the list, which could lead to a race if + * connection is being released, but not yet removed from the list. We handle that + * by synchronizing on CS here. */ + EnterCriticalSection(&connection->protseq->cs); + ref = connection->ref; + if (!ref) + list_remove(&connection->protseq_entry); + LeaveCriticalSection(&connection->protseq->cs); + } - RPCRT4_CloseConnection(Connection); - RPCRT4_strfree(Connection->Endpoint); - RPCRT4_strfree(Connection->NetworkAddr); - HeapFree(GetProcessHeap(), 0, Connection->NetworkOptions); - HeapFree(GetProcessHeap(), 0, Connection->CookieAuth); - if (Connection->AuthInfo) RpcAuthInfo_Release(Connection->AuthInfo); - if (Connection->QOS) RpcQualityOfService_Release(Connection->QOS); + TRACE("%p ref=%u\n", connection, ref); - /* server-only */ - if (Connection->server_binding) RPCRT4_ReleaseBinding(Connection->server_binding); + if (!ref) + { + RPCRT4_CloseConnection(connection); + RPCRT4_strfree(connection->Endpoint); + RPCRT4_strfree(connection->NetworkAddr); + HeapFree(GetProcessHeap(), 0, connection->NetworkOptions); + HeapFree(GetProcessHeap(), 0, connection->CookieAuth); + if (connection->AuthInfo) RpcAuthInfo_Release(connection->AuthInfo); + if (connection->QOS) RpcQualityOfService_Release(connection->QOS); - if (Connection->protseq) - { - EnterCriticalSection(&Connection->protseq->cs); - list_remove(&Connection->protseq_entry); - LeaveCriticalSection(&Connection->protseq->cs); - } + /* server-only */ + if (connection->server_binding) RPCRT4_ReleaseBinding(connection->server_binding); - if (Connection->wait_release) SetEvent(Connection->wait_release); + if (connection->wait_release) SetEvent(connection->wait_release); - HeapFree(GetProcessHeap(), 0, Connection); - return RPC_S_OK; + HeapFree(GetProcessHeap(), 0, connection); + } + return RPC_S_OK; } RPC_STATUS RPCRT4_IsServerListening(const char *protseq, const char *endpoint)

1 0

Zebediah Figura : msacm32: Try to suggest PCM to PCM conversion first.
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: ab2760ec339e6499fc31870c5b5862c8acd8c63d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab2760ec339e6499fc31870c5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 7 16:07:53 2017 -0500 msacm32: Try to suggest PCM to PCM conversion first. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/format.c | 16 ++++++++++++++++ dlls/msacm32/tests/msacm.c | 2 -- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c index d7a2cc9..f3c5155 100644 --- a/dlls/msacm32/format.c +++ b/dlls/msacm32/format.c @@ -733,6 +733,22 @@ MMRESULT WINAPI acmFormatSuggest(HACMDRIVER had, PWAVEFORMATEX pwfxSrc, ACM_FORMATSUGGESTF_WBITSPERSAMPLE|ACM_FORMATSUGGESTF_WFORMATTAG)) return MMSYSERR_INVALFLAG; + /* if we were given PCM, try to convert to PCM */ + if (pwfxSrc->wFormatTag == WAVE_FORMAT_PCM && !had && + !(fdwSuggest & ACM_FORMATSUGGESTF_WFORMATTAG)) + { + ACMFORMATDETAILSW afd = {0}; + afd.cbStruct = sizeof(afd); + afd.dwFormatTag = WAVE_FORMAT_PCM; + afd.pwfx = pwfxSrc; + afd.cbwfx = sizeof(PCMWAVEFORMAT); + if (!acmFormatDetailsW(had, &afd, ACM_FORMATDETAILSF_FORMAT)) + { + memcpy(pwfxDst, pwfxSrc, sizeof(PCMWAVEFORMAT)); + return MMSYSERR_NOERROR; + } + } + aftd.cbStruct = sizeof(aftd); if (fdwSuggest & ACM_FORMATSUGGESTF_WFORMATTAG) aftd.dwFormatTag = pwfxDst->wFormatTag; diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index 31262a3..13494a6 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -1062,7 +1062,6 @@ static void test_acmFormatSuggest(void) suggest = 0; memset(&dst, 0, sizeof(dst)); rc = acmFormatSuggest(NULL, &src, &dst, sizeof(PCMWAVEFORMAT), suggest); - todo_wine { ok(rc == MMSYSERR_NOERROR, "failed with error 0x%x\n", rc); ok(src.wFormatTag == dst.wFormatTag, "expected %d, got %d\n", src.wFormatTag, dst.wFormatTag); ok(src.nChannels == dst.nChannels, "expected %d, got %d\n", src.nChannels, dst.nChannels); @@ -1070,7 +1069,6 @@ static void test_acmFormatSuggest(void) ok(src.nAvgBytesPerSec == dst.nAvgBytesPerSec, "expected %d, got %d\n", src.nAvgBytesPerSec, dst.nAvgBytesPerSec); ok(src.nBlockAlign == dst.nBlockAlign, "expected %d, got %d\n", src.nBlockAlign, dst.nBlockAlign); ok(src.wBitsPerSample == dst.wBitsPerSample, "expected %d, got %d\n", src.wBitsPerSample, dst.wBitsPerSample); - } /* All parameters from destination are valid */ suggest = ACM_FORMATSUGGESTF_NCHANNELS

1 0

Zebediah Figura : msacm32: Add more invalid parameter checks for acmFormatSuggest().
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: 8e88af31cd455743991a6e40dddc8fd0c676e783 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e88af31cd455743991a6e40d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 7 16:07:52 2017 -0500 msacm32: Add more invalid parameter checks for acmFormatSuggest(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/format.c | 11 ++ dlls/msacm32/tests/msacm.c | 246 ++++++++++++++++++++++++++++++++++++--------- 2 files changed, 210 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8e88af31cd455743991a6…

1 0

Zebediah Figura : msacm32: Add invalid parameter checks for acmFormatDetails().
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: 1e30f79b70c5717ef9b710bf81e4e12d1cc46534 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e30f79b70c5717ef9b710bf8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 7 16:07:51 2017 -0500 msacm32: Add invalid parameter checks for acmFormatDetails(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/format.c | 37 +++++++++++-- dlls/msacm32/tests/msacm.c | 131 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 165 insertions(+), 3 deletions(-) diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c index 902807c..05d4fbe 100644 --- a/dlls/msacm32/format.c +++ b/dlls/msacm32/format.c @@ -68,7 +68,7 @@ static BOOL CALLBACK MSACM_FillFormatTagsCB(HACMDRIVERID hadid, HACMDRIVER had; if (acmDriverOpen(&had, hadid, 0) == MMSYSERR_NOERROR) { - ACMFORMATDETAILSW afd; + ACMFORMATDETAILSW afd = {0}; unsigned int i, len; MMRESULT mmr; WCHAR buffer[ACMFORMATDETAILS_FORMAT_CHARS+16]; @@ -87,6 +87,7 @@ static BOOL CALLBACK MSACM_FillFormatTagsCB(HACMDRIVERID hadid, int j; afd.dwFormatIndex = i; + afd.fdwSupport = 0; mmr = acmFormatDetailsW(had, &afd, ACM_FORMATDETAILSF_INDEX); if (mmr == MMSYSERR_NOERROR) { lstrcpynW(buffer, afd.szFormat, ACMFORMATTAGDETAILS_FORMATTAG_CHARS + 1); @@ -112,7 +113,7 @@ static BOOL CALLBACK MSACM_FillFormatTagsCB(HACMDRIVERID hadid, HACMDRIVER had; if (acmDriverOpen(&had, hadid, 0) == MMSYSERR_NOERROR) { - ACMFORMATDETAILSW afd; + ACMFORMATDETAILSW afd = {0}; afd.cbStruct = sizeof(afd); afd.dwFormatTag = paftd->dwFormatTag; @@ -376,10 +377,14 @@ MMRESULT WINAPI acmFormatDetailsA(HACMDRIVER had, PACMFORMATDETAILSA pafd, ACMFORMATDETAILSW afdw; MMRESULT mmr; + if (!pafd) + return MMSYSERR_INVALPARAM; + memset(&afdw, 0, sizeof(afdw)); afdw.cbStruct = sizeof(afdw); afdw.dwFormatIndex = pafd->dwFormatIndex; afdw.dwFormatTag = pafd->dwFormatTag; + afdw.fdwSupport = pafd->fdwSupport; afdw.pwfx = pafd->pwfx; afdw.cbwfx = pafd->cbwfx; @@ -401,11 +406,27 @@ MMRESULT WINAPI acmFormatDetailsW(HACMDRIVER had, PACMFORMATDETAILSW pafd, DWORD MMRESULT mmr; static const WCHAR fmt1[] = {'%','d',' ','H','z',0}; static const WCHAR fmt2[] = {';',' ','%','d',' ','b','i','t','s',0}; + ACMFORMATTAGDETAILSW aftd = {0}; TRACE("(%p, %p, %d)\n", had, pafd, fdwDetails); + if (!pafd) + return MMSYSERR_INVALPARAM; + if (pafd->cbStruct < sizeof(*pafd)) return MMSYSERR_INVALPARAM; + if (!pafd->pwfx) + return MMSYSERR_INVALPARAM; + + if (pafd->cbwfx < sizeof(PCMWAVEFORMAT)) + return MMSYSERR_INVALPARAM; + + if (pafd->fdwSupport) + return MMSYSERR_INVALPARAM; + + if (pafd->pwfx->wFormatTag == WAVE_FORMAT_UNKNOWN) + return MMSYSERR_INVALPARAM; + switch (fdwDetails) { case ACM_FORMATDETAILSF_FORMAT: if (pafd->dwFormatTag != pafd->pwfx->wFormatTag) { @@ -430,7 +451,16 @@ MMRESULT WINAPI acmFormatDetailsW(HACMDRIVER had, PACMFORMATDETAILSW pafd, DWORD } break; case ACM_FORMATDETAILSF_INDEX: - /* should check pafd->dwFormatIndex < aftd->cStandardFormats */ + aftd.cbStruct = sizeof(aftd); + aftd.dwFormatTag = pafd->dwFormatTag; + mmr = acmFormatTagDetailsW(had, &aftd, ACM_FORMATTAGDETAILSF_FORMATTAG); + if (mmr != MMSYSERR_NOERROR) + break; + if (pafd->dwFormatIndex >= aftd.cStandardFormats) + { + mmr = MMSYSERR_INVALPARAM; + break; + } mmr = MSACM_Message(had, ACMDM_FORMAT_DETAILS, (LPARAM)pafd, fdwDetails); break; default: @@ -581,6 +611,7 @@ static BOOL MSACM_FormatEnumHelper(PWINE_ACMDRIVERID padid, HACMDRIVER had, for (j = 0; j < aftd.cStandardFormats; j++) { pafd->dwFormatIndex = j; pafd->dwFormatTag = aftd.dwFormatTag; + pafd->fdwSupport = 0; if (acmFormatDetailsW(had, pafd, ACM_FORMATDETAILSF_INDEX) != MMSYSERR_NOERROR) continue; diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index f5ab168..894dd53 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -38,9 +38,109 @@ static BOOL CALLBACK FormatTagEnumProc(HACMDRIVERID hadid, DWORD_PTR dwInstance, DWORD fdwSupport) { + MMRESULT rc; + HACMDRIVER had; + if (winetest_interactive) trace(" Format 0x%04x: %s\n", paftd->dwFormatTag, paftd->szFormatTag); + rc = acmDriverOpen(&had, hadid, 0); + ok(rc == MMSYSERR_NOERROR || rc == MMSYSERR_NODRIVER, + "acmDriverOpen(): rc = %08x, should be %08x\n", + rc, MMSYSERR_NOERROR); + + if (rc == MMSYSERR_NOERROR) + { + ACMFORMATDETAILSA fd = {0}; + WAVEFORMATEX *pwfx; + DWORD i; + + fd.cbStruct = sizeof(fd); + if (paftd->cbFormatSize < sizeof(WAVEFORMATEX)) + pwfx = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WAVEFORMATEX)); + else + pwfx = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, paftd->cbFormatSize); + fd.pwfx = pwfx; + fd.cbwfx = paftd->cbFormatSize; + fd.dwFormatTag = paftd->dwFormatTag; + + /* try bad pwfx */ + fd.pwfx = NULL; + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_FORMAT); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + fd.pwfx = pwfx; + + /* try bad wFormatTag */ + fd.pwfx->wFormatTag = WAVE_FORMAT_UNKNOWN; + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_FORMAT); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + fd.pwfx->wFormatTag = paftd->dwFormatTag; + + /* try bad fdwSupport */ + fd.fdwSupport = 0xdeadbeef; + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_FORMAT); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + fd.fdwSupport = 0; + + /* try bad pwfx structure size */ + fd.cbwfx = sizeof(PCMWAVEFORMAT)-1; + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_FORMAT); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + fd.cbwfx = paftd->cbFormatSize; + + /* test bad parameters (all zero) */ + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_FORMAT); + ok(rc == ACMERR_NOTPOSSIBLE, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, ACMERR_NOTPOSSIBLE); + + /* test index */ + for (i = 0; i < paftd->cStandardFormats; i++) + { + fd.dwFormatIndex = i; + + fd.fdwSupport = 0; + fd.cbwfx = paftd->cbFormatSize; + fd.pwfx->cbSize = 0xbeef; + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_INDEX); + ok(rc == MMSYSERR_NOERROR, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_NOERROR); + + /* Windows will write cbSize (and other data) even if the + * given cbwfx is not large enough */ + fd.fdwSupport = 0; + fd.cbwfx = sizeof(PCMWAVEFORMAT); + fd.pwfx->cbSize = 0xbeef; + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_INDEX); + todo_wine_if(rc != MMSYSERR_NOERROR) /* remove when fixed */ + ok(rc == MMSYSERR_NOERROR, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_NOERROR); + if (paftd->dwFormatTag != WAVE_FORMAT_PCM) + todo_wine_if(fd.pwfx->cbSize != paftd->cbFormatSize - sizeof(WAVEFORMATEX)) /* remove when fixed */ + ok(fd.pwfx->cbSize == paftd->cbFormatSize - sizeof(WAVEFORMATEX), + "got %d\n", fd.pwfx->cbSize); + } + + /* one more */ + fd.dwFormatIndex = paftd->cStandardFormats; + fd.fdwSupport = 0; + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_INDEX); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + + HeapFree(GetProcessHeap(), 0, pwfx); + } return TRUE; } @@ -411,6 +511,37 @@ static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid, "acmFormatTagEnumA(): rc = %08x, should be %08x\n", rc, MMSYSERR_NOERROR); + /* try bad pointer */ + rc = acmFormatDetailsA(had, NULL, ACM_FORMATDETAILSF_INDEX); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + + /* try bad structure size */ + ZeroMemory(&fd, sizeof(fd)); + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_INDEX); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + + fd.cbStruct = sizeof(fd) - 1; + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_INDEX); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + + fd.cbStruct = sizeof(fd); + fd.pwfx = pwfx; + ZeroMemory(fd.pwfx, dwSize); + fd.cbwfx = dwSize; + fd.dwFormatTag = WAVE_FORMAT_UNKNOWN; + + /* try WAVE_FORMAT_UNKNOWN */ + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_INDEX); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + HeapFree(GetProcessHeap(), 0, pwfx); /* try invalid handle */

1 0

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 June 2017