February 2016 - Wine-Commits

Charles Davis : winemac.drv: Don't print 32-bit values as long integers ( Clang).
by Alexandre Julliard Feb. 19, 2016

Feb. 19, 2016

Module: wine Branch: master Commit: d2f7becc0f1394a8369f667f97096ceaa0db2122 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2f7becc0f1394a8369f667f9… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Thu Feb 18 13:17:03 2016 -0700 winemac.drv: Don't print 32-bit values as long integers (Clang). Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/keyboard.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index 6f38885..6680e6b 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -1545,7 +1545,7 @@ INT CDECL macdrv_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState INT ret = 0; int keyc; BOOL is_menu = (flags & 0x1); - OSStatus status; + int status; const UCKeyboardLayout *uchr; UInt16 keyAction; UInt32 modifierKeyState; @@ -1664,7 +1664,7 @@ INT CDECL macdrv_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState &len, bufW); if (status != noErr) { - ERR_(key)("Couldn't translate keycode 0x%04x, status %ld\n", keyc, status); + ERR_(key)("Couldn't translate keycode 0x%04x, status %d\n", keyc, status); goto done; } if (!is_menu) @@ -1687,7 +1687,7 @@ INT CDECL macdrv_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState &savedDeadKeyState, bufW_size, &len, bufW); if (status != noErr) { - ERR_(key)("Couldn't translate keycode 0x%04x, status %ld\n", keyc, status); + ERR_(key)("Couldn't translate keycode 0x%04x, status %d\n", keyc, status); goto done; }

1 0

Charles Davis : secur32: Don't print 32-bit values as long integers (Clang ).
by Alexandre Julliard Feb. 19, 2016

Feb. 19, 2016

Module: wine Branch: master Commit: c1d61f649d9c7fc6b6d6a78adebbe68c4b4a88af URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1d61f649d9c7fc6b6d6a78ad… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Thu Feb 18 15:08:02 2016 -0700 secur32: Don't print 32-bit values as long integers (Clang). Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_macosx.c | 44 +++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index cfd2371..1c9b35d 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -362,14 +362,14 @@ static const struct cipher_suite* get_cipher_suite(SSLCipherSuite cipher_suite) static DWORD schan_get_session_protocol(struct mac_session* s) { SSLProtocol protocol; - OSStatus status; + int status; TRACE("(%p/%p)\n", s, s->context); status = SSLGetNegotiatedProtocolVersion(s->context, &protocol); if (status != noErr) { - ERR("Failed to get session protocol: %ld\n", status); + ERR("Failed to get session protocol: %d\n", status); return 0; } @@ -652,7 +652,7 @@ BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cre { struct mac_session *s; unsigned i; - OSStatus status; + int status; TRACE("(%p)\n", session); @@ -663,21 +663,21 @@ BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cre status = SSLNewContext(cred->credential_use == SECPKG_CRED_INBOUND, &s->context); if (status != noErr) { - ERR("Failed to create session context: %ld\n", (long)status); + ERR("Failed to create session context: %d\n", status); goto fail; } status = SSLSetConnection(s->context, s); if (status != noErr) { - ERR("Failed to set session connection: %ld\n", (long)status); + ERR("Failed to set session connection: %d\n", status); goto fail; } status = SSLSetEnableCertVerify(s->context, FALSE); if (status != noErr) { - ERR("Failed to disable certificate verification: %ld\n", (long)status); + ERR("Failed to disable certificate verification: %d\n", status); goto fail; } @@ -689,7 +689,7 @@ BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cre (cred->enabled_protocols & protocol_priority_flags[i].enable_flag) != 0); if (status != noErr) { - ERR("Failed to set SSL version %d: %ld\n", protocol_priority_flags[i].mac_version, (long)status); + ERR("Failed to set SSL version %d: %d\n", protocol_priority_flags[i].mac_version, status); goto fail; } } @@ -697,7 +697,7 @@ BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cre status = SSLSetIOFuncs(s->context, schan_pull_adapter, schan_push_adapter); if (status != noErr) { - ERR("Failed to set session I/O funcs: %ld\n", (long)status); + ERR("Failed to set session I/O funcs: %d\n", status); goto fail; } @@ -714,13 +714,13 @@ fail: void schan_imp_dispose_session(schan_imp_session session) { struct mac_session *s = (struct mac_session*)session; - OSStatus status; + int status; TRACE("(%p/%p)\n", s, s->context); status = SSLDisposeContext(s->context); if (status != noErr) - ERR("Failed to dispose of session context: %ld\n", status); + ERR("Failed to dispose of session context: %d\n", status); HeapFree(GetProcessHeap(), 0, s); } @@ -746,7 +746,7 @@ void schan_imp_set_session_target(schan_imp_session session, const char *target) SECURITY_STATUS schan_imp_handshake(schan_imp_session session) { struct mac_session *s = (struct mac_session*)session; - OSStatus status; + int status; TRACE("(%p/%p)\n", s, s->context); @@ -768,7 +768,7 @@ SECURITY_STATUS schan_imp_handshake(schan_imp_session session) } else { - ERR("Handshake failed: %ld\n", (long)status); + ERR("Handshake failed: %d\n", status); cssmPerror("SSLHandshake", status); return SEC_E_INTERNAL_ERROR; } @@ -782,14 +782,14 @@ unsigned int schan_imp_get_session_cipher_block_size(schan_imp_session session) struct mac_session* s = (struct mac_session*)session; SSLCipherSuite cipherSuite; const struct cipher_suite* c; - OSStatus status; + int status; TRACE("(%p/%p)\n", s, s->context); status = SSLGetNegotiatedCipher(s->context, &cipherSuite); if (status != noErr) { - ERR("Failed to get session cipher suite: %ld\n", status); + ERR("Failed to get session cipher suite: %d\n", status); return 0; } @@ -838,14 +838,14 @@ SECURITY_STATUS schan_imp_get_connection_info(schan_imp_session session, struct mac_session* s = (struct mac_session*)session; SSLCipherSuite cipherSuite; const struct cipher_suite* c; - OSStatus status; + int status; TRACE("(%p/%p, %p)\n", s, s->context, info); status = SSLGetNegotiatedCipher(s->context, &cipherSuite); if (status != noErr) { - ERR("Failed to get session cipher suite: %ld\n", status); + ERR("Failed to get session cipher suite: %d\n", status); return SEC_E_INTERNAL_ERROR; } @@ -883,7 +883,7 @@ SECURITY_STATUS schan_imp_get_session_peer_certificate(schan_imp_session session PCCERT_CONTEXT cert = NULL; SecCertificateRef mac_cert; CFArrayRef cert_array; - OSStatus status; + int status; CFIndex cnt, i; CFDataRef data; BOOL res; @@ -897,7 +897,7 @@ SECURITY_STATUS schan_imp_get_session_peer_certificate(schan_imp_session session #endif if (status != noErr || !cert_array) { - WARN("SSLCopyPeerCertificates failed: %ld\n", (long)status); + WARN("SSLCopyPeerCertificates failed: %d\n", status); return SEC_E_INTERNAL_ERROR; } @@ -942,7 +942,7 @@ SECURITY_STATUS schan_imp_send(schan_imp_session session, const void *buffer, SIZE_T *length) { struct mac_session* s = (struct mac_session*)session; - OSStatus status; + int status; TRACE("(%p/%p, %p, %p/%lu)\n", s, s->context, buffer, length, *length); @@ -961,7 +961,7 @@ SECURITY_STATUS schan_imp_send(schan_imp_session session, const void *buffer, } else { - WARN("SSLWrite failed: %ld\n", (long)status); + WARN("SSLWrite failed: %d\n", status); return SEC_E_INTERNAL_ERROR; } @@ -972,7 +972,7 @@ SECURITY_STATUS schan_imp_recv(schan_imp_session session, void *buffer, SIZE_T *length) { struct mac_session* s = (struct mac_session*)session; - OSStatus status; + int status; TRACE("(%p/%p, %p, %p/%lu)\n", s, s->context, buffer, length, *length); @@ -991,7 +991,7 @@ SECURITY_STATUS schan_imp_recv(schan_imp_session session, void *buffer, } else { - WARN("SSLRead failed: %ld\n", (long)status); + WARN("SSLRead failed: %d\n", status); return SEC_E_INTERNAL_ERROR; }

1 0

Charles Davis : quartz: Remove unused variable (Clang).
by Alexandre Julliard Feb. 19, 2016

Feb. 19, 2016

Module: wine Branch: master Commit: 51ed908467ecd8299333456ef8b2fcfb7a13ea56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51ed908467ecd8299333456ef… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Thu Feb 18 13:22:34 2016 -0700 quartz: Remove unused variable (Clang). Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/pin.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 0a2c507..7212807 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -844,25 +844,3 @@ HRESULT WINAPI PullPin_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFERENCE return SendFurther( iface, deliver_newsegment, &args, NULL ); } - -static const IPinVtbl PullPin_Vtbl = -{ - PullPin_QueryInterface, - BasePinImpl_AddRef, - PullPin_Release, - BaseInputPinImpl_Connect, - PullPin_ReceiveConnection, - PullPin_Disconnect, - BasePinImpl_ConnectedTo, - BasePinImpl_ConnectionMediaType, - BasePinImpl_QueryPinInfo, - BasePinImpl_QueryDirection, - BasePinImpl_QueryId, - PullPin_QueryAccept, - BasePinImpl_EnumMediaTypes, - BasePinImpl_QueryInternalConnections, - PullPin_EndOfStream, - PullPin_BeginFlush, - PullPin_EndFlush, - PullPin_NewSegment -};

1 0

Sebastian Lackner : ntdll: Implement handling of int $0x2d for x86_64.
by Alexandre Julliard Feb. 18, 2016

Feb. 18, 2016

Module: wine Branch: master Commit: e1d68b2e169580be8dc6f8927e01a19c60f79d65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1d68b2e169580be8dc6f8927… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 18 09:58:36 2016 +0100 ntdll: Implement handling of int $0x2d for x86_64. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 53 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 51 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 0c64541..be5a342 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2170,6 +2170,17 @@ static EXCEPTION_RECORD *setup_exception( ucontext_t *sigcontext, raise_func fun } +/*********************************************************************** + * get_exception_context + * + * Get a pointer to the context built by setup_exception. + */ +static inline CONTEXT *get_exception_context( EXCEPTION_RECORD *rec ) +{ + return (CONTEXT *)rec - 1; /* cf. stack_layout structure */ +} + + /********************************************************************** * find_function_info */ @@ -2513,9 +2524,20 @@ static void raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) set_cpu_context( context ); } break; + case EXCEPTION_BREAKPOINT: + switch (rec->ExceptionInformation[0]) + { + case 1: /* BREAKPOINT_PRINT */ + case 3: /* BREAKPOINT_LOAD_SYMBOLS */ + case 4: /* BREAKPOINT_UNLOAD_SYMBOLS */ + case 5: /* BREAKPOINT_COMMAND_STRING (>= Win2003) */ + goto done; + } + break; } status = raise_exception( rec, context, TRUE ); if (status) raise_status( status, rec ); +done: set_cpu_context( context ); } @@ -2533,6 +2555,28 @@ static void raise_generic_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) } +/*********************************************************************** + * handle_interrupt + * + * Handle an interrupt. + */ +static inline BOOL handle_interrupt( unsigned int interrupt, EXCEPTION_RECORD *rec, CONTEXT *context ) +{ + switch(interrupt) + { + case 0x2d: + context->Rip += 3; + rec->ExceptionCode = EXCEPTION_BREAKPOINT; + rec->ExceptionAddress = (void *)context->Rip; + rec->NumberParameters = 1; + rec->ExceptionInformation[0] = context->Rax; + return TRUE; + default: + return FALSE; + } +} + + /********************************************************************** * segv_handler * @@ -2560,8 +2604,13 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) case TRAP_x86_SEGNPFLT: /* Segment not present exception */ case TRAP_x86_PROTFLT: /* General protection fault */ case TRAP_x86_UNKNOWN: /* Unknown fault code */ - rec->ExceptionCode = ERROR_sig(ucontext) ? EXCEPTION_ACCESS_VIOLATION : EXCEPTION_PRIV_INSTRUCTION; - rec->ExceptionCode = EXCEPTION_ACCESS_VIOLATION; + { + CONTEXT *win_context = get_exception_context( rec ); + WORD err = ERROR_sig(ucontext); + if ((err & 7) == 2 && handle_interrupt( err >> 3, rec, win_context )) break; + rec->ExceptionCode = err ? EXCEPTION_ACCESS_VIOLATION : EXCEPTION_PRIV_INSTRUCTION; + rec->ExceptionCode = EXCEPTION_ACCESS_VIOLATION; + } break; case TRAP_x86_PAGEFLT: /* Page fault */ rec->ExceptionCode = EXCEPTION_ACCESS_VIOLATION;

1 0

Austin English : rasapi32: Add RasGetLinkStatistics stub.
by Alexandre Julliard Feb. 18, 2016

Feb. 18, 2016

Module: wine Branch: master Commit: b0e122f41179363dfaca4b437fb2b2ff3844233d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0e122f41179363dfaca4b437… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 18 12:01:40 2016 +0100 rasapi32: Add RasGetLinkStatistics stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rasapi32/rasapi.c | 6 ++++++ dlls/rasapi32/rasapi32.spec | 1 + include/ras.h | 18 ++++++++++++++++++ 3 files changed, 25 insertions(+) diff --git a/dlls/rasapi32/rasapi.c b/dlls/rasapi32/rasapi.c index 15061c5..fcd0cb8 100644 --- a/dlls/rasapi32/rasapi.c +++ b/dlls/rasapi32/rasapi.c @@ -539,3 +539,9 @@ DWORD WINAPI RasSetSubEntryPropertiesW(LPCWSTR lpszPhonebook, LPCWSTR lpszEntry, dwcbDeviceConfig); return 0; } + +DWORD WINAPI RasGetLinkStatistics(HRASCONN connection, DWORD entry, RAS_STATS *statistics) +{ + FIXME("(%p,%u,%p), stub!\n", connection, entry, statistics); + return 0; +} diff --git a/dlls/rasapi32/rasapi32.spec b/dlls/rasapi32/rasapi32.spec index f2ce65e..66b21a6 100644 --- a/dlls/rasapi32/rasapi32.spec +++ b/dlls/rasapi32/rasapi32.spec @@ -45,6 +45,7 @@ @ stdcall RasGetErrorStringW(long ptr long) @ stub RasGetErrorStringWow @ stub RasGetHport +@ stdcall RasGetLinkStatistics(ptr long ptr) @ stdcall RasGetProjectionInfoA(ptr ptr ptr ptr) @ stdcall RasGetProjectionInfoW(ptr ptr ptr ptr) @ stub RasGetSubEntryHandleA diff --git a/include/ras.h b/include/ras.h index 9e5d564..a8c04da 100644 --- a/include/ras.h +++ b/include/ras.h @@ -426,6 +426,24 @@ typedef struct tagRASAUTODIALENTRYW WCHAR szEntry[ RAS_MaxEntryName + 1 ]; } RASAUTODIALENTRYW, *LPRASAUTODIALENTRYW; +typedef struct _RAS_STATS +{ + DWORD dwSize; + DWORD dwBytesXmited; + DWORD dwBytesRcved; + DWORD dwFramesXmited; + DWORD dwFramesRcved; + DWORD dwCrcErr; + DWORD dwTimeoutErr; + DWORD dwAlignmentErr; + DWORD dwHardwareOverrunErr; + DWORD dwFramingErr; + DWORD dwBufferOverrunErr; + DWORD dwCompressionRatioIn; + DWORD dwCompressionRatioOut; + DWORD dwBps; + DWORD dwConnectDuration; +} RAS_STATS, *PRAS_STATS; DWORD WINAPI RasConnectionNotificationA(HRASCONN,HANDLE,DWORD); DWORD WINAPI RasConnectionNotificationW(HRASCONN,HANDLE,DWORD);

1 0

Sebastian Lackner : ntdll/tests: Add more tests for calling int $0x2d on x86 and x86_64.
by Alexandre Julliard Feb. 18, 2016

Feb. 18, 2016

Module: wine Branch: master Commit: d0b88e7454b72afa5c8317b46ea0d924edff9411 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0b88e7454b72afa5c8317b46… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 18 10:34:01 2016 +0100 ntdll/tests: Add more tests for calling int $0x2d on x86 and x86_64. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 190 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 190 insertions(+) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 8ec7408..94ccd7a 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -945,6 +945,13 @@ static void test_debugger(void) /* here we handle exception */ } } + else if (stage == 7 || stage == 8) + { + ok(de.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT, + "expected EXCEPTION_BREAKPOINT, got %08x\n", de.u.Exception.ExceptionRecord.ExceptionCode); + + if (stage == 8) continuestatus = DBG_EXCEPTION_NOT_HANDLED; + } else ok(FALSE, "unexpected stage %x\n", stage); @@ -1339,6 +1346,8 @@ static void test_dpe_exceptions(void) #elif defined(__x86_64__) +#define is_wow64 0 + #define UNW_FLAG_NHANDLER 0 #define UNW_FLAG_EHANDLER 1 #define UNW_FLAG_UHANDLER 2 @@ -1865,6 +1874,181 @@ static void test_ripevent(DWORD numexc) pRtlRemoveVectoredExceptionHandler(vectored_handler); } +static DWORD debug_service_exceptions; + +static LONG CALLBACK debug_service_handler(EXCEPTION_POINTERS *ExceptionInfo) +{ + EXCEPTION_RECORD *rec = ExceptionInfo->ExceptionRecord; + trace("vect. handler %08x addr:%p\n", rec->ExceptionCode, rec->ExceptionAddress); + + ok(rec->ExceptionCode == EXCEPTION_BREAKPOINT, "ExceptionCode is %08x instead of %08x\n", + rec->ExceptionCode, EXCEPTION_BREAKPOINT); + +#ifdef __i386__ + ok(rec->NumberParameters == (is_wow64 ? 1 : 3), + "ExceptionParameters is %d instead of %d\n", rec->NumberParameters, is_wow64 ? 1 : 3); + ok(rec->ExceptionInformation[0] == ExceptionInfo->ContextRecord->Eax, + "expected ExceptionInformation[0] = %x, got %lx\n", + ExceptionInfo->ContextRecord->Eax, rec->ExceptionInformation[0]); + if (!is_wow64) + { + ok(rec->ExceptionInformation[1] == 0x11111111, + "got ExceptionInformation[1] = %lx\n", rec->ExceptionInformation[1]); + ok(rec->ExceptionInformation[2] == 0x22222222, + "got ExceptionInformation[2] = %lx\n", rec->ExceptionInformation[2]); + } +#else + ok(rec->NumberParameters == 1, + "ExceptionParameters is %d instead of 1\n", rec->NumberParameters); + ok(rec->ExceptionInformation[0] == ExceptionInfo->ContextRecord->Rax, + "expected ExceptionInformation[0] = %lx, got %lx\n", + ExceptionInfo->ContextRecord->Rax, rec->ExceptionInformation[0]); +#endif + + debug_service_exceptions++; + return (rec->ExceptionCode == EXCEPTION_BREAKPOINT) ? EXCEPTION_CONTINUE_EXECUTION : EXCEPTION_CONTINUE_SEARCH; +} + +#ifdef __i386__ + +static const BYTE call_debug_service_code[] = { + 0x53, /* pushl %ebx */ + 0x57, /* pushl %edi */ + 0x8b, 0x44, 0x24, 0x0c, /* movl 12(%esp),%eax */ + 0xb9, 0x11, 0x11, 0x11, 0x11, /* movl $0x11111111,%ecx */ + 0xba, 0x22, 0x22, 0x22, 0x22, /* movl $0x22222222,%edx */ + 0xbb, 0x33, 0x33, 0x33, 0x33, /* movl $0x33333333,%ebx */ + 0xbf, 0x44, 0x44, 0x44, 0x44, /* movl $0x44444444,%edi */ + 0xcd, 0x2d, /* int $0x2d */ + 0xeb, /* jmp $+17 */ + 0x0f, 0x1f, 0x00, /* nop */ + 0x31, 0xc0, /* xorl %eax,%eax */ + 0xeb, 0x0c, /* jmp $+14 */ + 0x90, 0x90, 0x90, 0x90, /* nop */ + 0x90, 0x90, 0x90, 0x90, + 0x90, + 0x31, 0xc0, /* xorl %eax,%eax */ + 0x40, /* incl %eax */ + 0x5f, /* popl %edi */ + 0x5b, /* popl %ebx */ + 0xc3, /* ret */ +}; + +#else + +static const BYTE call_debug_service_code[] = { + 0x53, /* push %rbx */ + 0x57, /* push %rdi */ + 0x48, 0x89, 0xc8, /* movl %rcx,%rax */ + 0x48, 0xb9, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, /* movabs $0x1111111111111111,%rcx */ + 0x48, 0xba, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, /* movabs $0x2222222222222222,%rdx */ + 0x48, 0xbb, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, /* movabs $0x3333333333333333,%rbx */ + 0x48, 0xbf, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, /* movabs $0x4444444444444444,%rdi */ + 0xcd, 0x2d, /* int $0x2d */ + 0xeb, /* jmp $+17 */ + 0x0f, 0x1f, 0x00, /* nop */ + 0x48, 0x31, 0xc0, /* xor %rax,%rax */ + 0xeb, 0x0e, /* jmp $+16 */ + 0x90, 0x90, 0x90, 0x90, /* nop */ + 0x90, 0x90, 0x90, 0x90, + 0x48, 0x31, 0xc0, /* xor %rax,%rax */ + 0x48, 0xff, 0xc0, /* inc %rax */ + 0x5f, /* pop %rdi */ + 0x5b, /* pop %rbx */ + 0xc3, /* ret */ +}; + +#endif + +static void test_debug_service(DWORD numexc) +{ + const BOOL is_win64 = (sizeof(void *) > sizeof(int)); + DWORD (CDECL *func)(DWORD_PTR) = code_mem; + DWORD expected_exc, expected_ret; + void *vectored_handler; + DWORD ret; + + /* code will return 0 if execution resumes immediately after "int $0x2d", otherwise 1 */ + memcpy(code_mem, call_debug_service_code, sizeof(call_debug_service_code)); + + vectored_handler = pRtlAddVectoredExceptionHandler(TRUE, &debug_service_handler); + ok(vectored_handler != 0, "RtlAddVectoredExceptionHandler failed\n"); + + expected_exc = numexc; + expected_ret = (numexc != 0); + + /* BREAKPOINT_BREAK */ + debug_service_exceptions = 0; + ret = func(0); + ok(debug_service_exceptions == expected_exc, + "BREAKPOINT_BREAK generated %u exceptions, expected %u\n", + debug_service_exceptions, expected_exc); + todo_wine_if(is_win64) + ok(ret == expected_ret, + "BREAKPOINT_BREAK returned %u, expected %u\n", ret, expected_ret); + + /* BREAKPOINT_PROMPT */ + debug_service_exceptions = 0; + ret = func(2); + ok(debug_service_exceptions == expected_exc, + "BREAKPOINT_PROMPT generated %u exceptions, expected %u\n", + debug_service_exceptions, expected_exc); + todo_wine_if(is_win64) + ok(ret == expected_ret, + "BREAKPOINT_PROMPT returned %u, expected %u\n", ret, expected_ret); + + /* invalid debug service */ + debug_service_exceptions = 0; + ret = func(6); + ok(debug_service_exceptions == expected_exc, + "invalid debug service generated %u exceptions, expected %u\n", + debug_service_exceptions, expected_exc); + todo_wine_if(is_win64) + ok(ret == expected_ret, + "invalid debug service returned %u, expected %u\n", ret, expected_ret); + + expected_exc = (is_wow64 ? numexc : 0); + expected_ret = (is_wow64 && numexc); + + /* BREAKPOINT_PRINT */ + debug_service_exceptions = 0; + ret = func(1); + ok(debug_service_exceptions == expected_exc, + "BREAKPOINT_PRINT generated %u exceptions, expected %u\n", + debug_service_exceptions, expected_exc); + ok(ret == expected_ret, + "BREAKPOINT_PRINT returned %u, expected %u\n", ret, expected_ret); + + /* BREAKPOINT_LOAD_SYMBOLS */ + debug_service_exceptions = 0; + ret = func(3); + ok(debug_service_exceptions == expected_exc, + "BREAKPOINT_LOAD_SYMBOLS generated %u exceptions, expected %u\n", + debug_service_exceptions, expected_exc); + ok(ret == expected_ret, + "BREAKPOINT_LOAD_SYMBOLS returned %u, expected %u\n", ret, expected_ret); + + /* BREAKPOINT_UNLOAD_SYMBOLS */ + debug_service_exceptions = 0; + ret = func(4); + ok(debug_service_exceptions == expected_exc, + "BREAKPOINT_UNLOAD_SYMBOLS generated %u exceptions, expected %u\n", + debug_service_exceptions, expected_exc); + ok(ret == expected_ret, + "BREAKPOINT_UNLOAD_SYMBOLS returned %u, expected %u\n", ret, expected_ret); + + /* BREAKPOINT_COMMAND_STRING */ + debug_service_exceptions = 0; + ret = func(5); + ok(debug_service_exceptions == expected_exc || broken(debug_service_exceptions == numexc), + "BREAKPOINT_COMMAND_STRING generated %u exceptions, expected %u\n", + debug_service_exceptions, expected_exc); + ok(ret == expected_ret || broken(ret == (numexc != 0)), + "BREAKPOINT_COMMAND_STRING returned %u, expected %u\n", ret, expected_ret); + + pRtlRemoveVectoredExceptionHandler(vectored_handler); +} + static void test_vectored_continue_handler(void) { PVOID handler1, handler2; @@ -1984,6 +2168,10 @@ START_TEST(exception) test_ripevent(0); test_stage = 6; test_ripevent(1); + test_stage = 7; + test_debug_service(0); + test_stage = 8; + test_debug_service(1); } else skip( "RtlRaiseException not found\n" ); @@ -1998,6 +2186,7 @@ START_TEST(exception) test_debug_registers(); test_outputdebugstring(1, FALSE); test_ripevent(1); + test_debug_service(1); test_vectored_continue_handler(); test_debugger(); test_simd_exceptions(); @@ -2018,6 +2207,7 @@ START_TEST(exception) test_debug_registers(); test_outputdebugstring(1, FALSE); test_ripevent(1); + test_debug_service(1); test_vectored_continue_handler(); test_virtual_unwind();

1 0

Sebastian Lackner : ntdll: Mimic Windows behaviour when calling debug service.
by Alexandre Julliard Feb. 18, 2016

Feb. 18, 2016

Module: wine Branch: master Commit: 218bc84e03eaa807caca58027334e9b173dcfa7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=218bc84e03eaa807caca58027… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 18 09:58:13 2016 +0100 ntdll: Mimic Windows behaviour when calling debug service. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 10235fe..5708aae 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1940,6 +1940,21 @@ static void WINAPI raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context goto done; } break; + case EXCEPTION_BREAKPOINT: + if (!is_wow64) + { + /* On Wow64, the upper DWORD of Rax contains garbage, and the debug + * service is usually not recognized when called from usermode. */ + switch (rec->ExceptionInformation[0]) + { + case 1: /* BREAKPOINT_PRINT */ + case 3: /* BREAKPOINT_LOAD_SYMBOLS */ + case 4: /* BREAKPOINT_UNLOAD_SYMBOLS */ + case 5: /* BREAKPOINT_COMMAND_STRING (>= Win2003) */ + goto done; + } + } + break; } status = NtRaiseException( rec, context, TRUE ); raise_status( status, rec );

1 0

Austin English : wlanapi: Add a stub for WlanEnumInterfaces.
by Alexandre Julliard Feb. 18, 2016

Feb. 18, 2016

Module: wine Branch: master Commit: d92dc216f29223b63be086d1262c1a78ef1416a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d92dc216f29223b63be086d12… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Jan 24 21:32:20 2016 -0600 wlanapi: Add a stub for WlanEnumInterfaces. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wlanapi/main.c | 8 ++++++++ dlls/wlanapi/wlanapi.spec | 2 +- include/Makefile.in | 1 + include/wlanapi.h | 51 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 61 insertions(+), 1 deletion(-) diff --git a/dlls/wlanapi/main.c b/dlls/wlanapi/main.c index 0b0d100..3674f79 100644 --- a/dlls/wlanapi/main.c +++ b/dlls/wlanapi/main.c @@ -24,8 +24,16 @@ #include "winbase.h" #include "wine/debug.h" +#include "wlanapi.h" + WINE_DEFAULT_DEBUG_CHANNEL(wlanapi); +DWORD WINAPI WlanEnumInterfaces(HANDLE client, void *reserved, WLAN_INTERFACE_INFO_LIST **interface_list) +{ + FIXME("(%p, %p, %p) stub\n", client, reserved, interface_list); + return ERROR_CALL_NOT_IMPLEMENTED; +} + DWORD WINAPI WlanOpenHandle(DWORD clientVersion, PVOID reserved, PDWORD negotiatedVersion, PHANDLE clientHandle) { diff --git a/dlls/wlanapi/wlanapi.spec b/dlls/wlanapi/wlanapi.spec index 79f9e43..e55bf06 100644 --- a/dlls/wlanapi/wlanapi.spec +++ b/dlls/wlanapi/wlanapi.spec @@ -3,7 +3,7 @@ @ stub WlanConnect @ stub WlanDeleteProfile @ stub WlanDisconnect -@ stub WlanEnumInterfaces +@ stdcall WlanEnumInterfaces(long ptr ptr) @ stub WlanExtractPsdIEDataList @ stub WlanFreeMemory @ stub WlanGetAvailableNetworkList diff --git a/include/Makefile.in b/include/Makefile.in index 8224e28..ff1f5a6 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -655,6 +655,7 @@ HEADER_SRCS = \ winuser.h \ winuser.rh \ winver.h \ + wlanapi.h \ wmistr.h \ wnaspi32.h \ wownt32.h \ diff --git a/include/wlanapi.h b/include/wlanapi.h new file mode 100644 index 0000000..63922be --- /dev/null +++ b/include/wlanapi.h @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2016 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 + */ + +#ifndef _WLAN_WLANAPI_H +#define _WLAN_WLANAPI_H + +typedef enum _WLAN_INTERFACE_STATE +{ + wlan_interface_state_not_ready, + wlan_interface_state_connected, + wlan_interface_state_ad_hoc_network_formed, + wlan_interface_state_disconnecting, + wlan_interface_state_disconnected, + wlan_interface_state_associating, + wlan_interface_state_discovering, + wlan_interface_state_authenticating +} WLAN_INTERFACE_STATE, *PWLAN_INTERFACE_STATE; + +typedef struct _WLAN_INTERFACE_INFO +{ + GUID InterfaceGuid; + WCHAR strInterfaceDescription[256]; + WLAN_INTERFACE_STATE isState; +} WLAN_INTERFACE_INFO, *PWLAN_INTERFACE_INFO; + +typedef struct _WLAN_INTERFACE_INFO_LIST +{ + DWORD dwNumberOfItems; + DWORD dwIndex; + WLAN_INTERFACE_INFO InterfaceInfo[1]; +} WLAN_INTERFACE_INFO_LIST, *PWLAN_INTERFACE_INFO_LIST; + +DWORD WINAPI WlanEnumInterfaces(HANDLE, void *, WLAN_INTERFACE_INFO_LIST **); +DWORD WINAPI WlanOpenHandle(DWORD, void *, DWORD *, HANDLE *); + +#endif /* _WLAN_WLANAPI_H */

1 0

Sebastian Lackner : mshtml/tests: Fix operator priority in ok() condition.
by Alexandre Julliard Feb. 18, 2016

Feb. 18, 2016

Module: wine Branch: master Commit: 11c2f370b6b7ca0d41236eb8b3b0e82c0b717f2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=11c2f370b6b7ca0d41236eb8b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 18 06:36:14 2016 +0100 mshtml/tests: Fix operator priority in ok() condition. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/htmldoc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 71519ed..904322e 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -6355,7 +6355,7 @@ static void _test_QueryStatus(unsigned line, IUnknown *unk, REFIID cgid, ULONG c return; hres = IOleCommandTarget_QueryStatus(cmdtrg, cgid, 1, &olecmd, NULL); - ok(hres == cmdf ? S_OK : OLECMDERR_E_NOTSUPPORTED, "QueryStatus(%u) failed: %08x\n", cmdid, hres); + ok(hres == (cmdf ? S_OK : OLECMDERR_E_NOTSUPPORTED), "QueryStatus(%u) failed: %08x\n", cmdid, hres); IOleCommandTarget_Release(cmdtrg);

1 0

Alexandre Julliard : user32/tests: Add another test for dialog creation messages without DefDlgProc.
by Alexandre Julliard Feb. 18, 2016

Feb. 18, 2016

Module: wine Branch: master Commit: c1ed920e151c4ecc06bd64a8df1139815e47ac47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1ed920e151c4ecc06bd64a8d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 22:18:56 2016 +0900 user32/tests: Add another test for dialog creation messages without DefDlgProc. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 74 +++++++++++++++++++++++++++++++++++++++++++ dlls/user32/tests/resource.rc | 9 ++++++ 2 files changed, 83 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 1ef7841..3d4bea5 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -11942,6 +11942,35 @@ static INT_PTR WINAPI test_dlg_proc2(HWND hwnd, UINT message, WPARAM wParam, LPA return 1; } +static INT_PTR WINAPI test_dlg_proc3(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + ok( 0, "should not be called since DefDlgProc is not used\n" ); + return 0; +} + +static LRESULT WINAPI test_dlg_proc4(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + struct recvd_message msg; + + if (!ignore_message( message )) + { + msg.hwnd = hwnd; + msg.message = message; + msg.flags = sent|wparam|lparam|parent; + msg.wParam = wParam; + msg.lParam = lParam; + msg.descr = "dialog"; + add_message(&msg); + } + if (message == WM_INITDIALOG) + { + orig_edit_proc = (WNDPROC)SetWindowLongPtrW(GetDlgItem(hwnd, 200), + GWLP_WNDPROC, (LONG_PTR)dlg_creation_edit_proc); + return 1; + } + return DefWindowProcW( hwnd, message, wParam, lParam ); +} + static const struct message WmDefDlgSetFocus_1[] = { { WM_GETDLGCODE, sent|wparam|lparam, 0, 0 }, { WM_GETTEXTLENGTH, sent|wparam|lparam|optional, 0, 0 }, /* XP */ @@ -12024,6 +12053,41 @@ static const struct message WmCreateDialogParamSeq_3[] = { { 0 } }; +static const struct message WmCreateDialogParamSeq_4[] = { + { HCBT_CREATEWND, hook }, + { WM_NCCREATE, sent|parent }, + { WM_NCCALCSIZE, sent|parent|wparam, 0 }, + { WM_CREATE, sent|parent }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam, 0, 0 }, + { WM_SIZE, sent|parent|wparam, SIZE_RESTORED }, + { WM_MOVE, sent|parent }, + { WM_SETFONT, sent|parent }, + { WM_INITDIALOG, sent|parent }, + { WM_GETDLGCODE, sent|wparam|lparam, 0, 0 }, + { EM_SETSEL, sent|wparam|lparam, 0, INT_MAX }, + { EM_SETSEL, sent|wparam|lparam|optional, 0, INT_MAX }, + { EM_SETSEL, sent|wparam|lparam|optional, 0, INT_MAX }, + { EM_SETSEL, sent|wparam|lparam|optional, 0, INT_MAX }, + { HCBT_ACTIVATE, hook }, + { WM_QUERYNEWPALETTE, sent|parent|optional }, /* TODO: this message should not be sent */ + { WM_WINDOWPOSCHANGING, sent|parent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGING, sent|parent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, + { WM_ACTIVATEAPP, sent|parent|wparam, 1 }, + { WM_NCACTIVATE, sent|parent }, + { WM_ACTIVATE, sent|parent|wparam, 1 }, + { HCBT_SETFOCUS, hook }, + { WM_SETFOCUS, sent|parent }, + { WM_KILLFOCUS, sent|parent }, + { WM_SETFOCUS, sent }, + { WM_COMMAND, sent|parent|wparam, MAKELONG(200, EN_SETFOCUS) }, + { WM_GETDLGCODE, sent|wparam|lparam, 0, 0 }, + { WM_USER, sent|parent }, + { WM_CHANGEUISTATE, sent|parent|optional }, + { WM_UPDATEUISTATE, sent|parent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { 0 } +}; + static void test_dialog_messages(void) { WNDCLASSA cls; @@ -12133,6 +12197,16 @@ static void test_dialog_messages(void) DestroyWindow(hdlg); flush_sequence(); + UnregisterClassA( cls.lpszClassName, cls.hInstance ); + cls.lpfnWndProc = test_dlg_proc4; + ok( RegisterClassA(&cls), "failed to register class again\n" ); + hdlg = CreateDialogParamA(0, "FOCUS_TEST_DIALOG_4", 0, test_dlg_proc3, 0); + ok(IsWindow(hdlg), "CreateDialogParam failed\n"); + ok_sequence(WmCreateDialogParamSeq_4, "CreateDialogParam_4", TRUE); + EndDialog(hdlg, 0); + DestroyWindow(hdlg); + flush_sequence(); + UnregisterClassA(cls.lpszClassName, cls.hInstance); } diff --git a/dlls/user32/tests/resource.rc b/dlls/user32/tests/resource.rc index fdef5a9..f116b85 100644 --- a/dlls/user32/tests/resource.rc +++ b/dlls/user32/tests/resource.rc @@ -115,6 +115,15 @@ FONT 8, "MS Shell Dlg" EDITTEXT 200,4,4,50,14 } +FOCUS_TEST_DIALOG_4 DIALOG 0, 0, 60, 30 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Test dialog" +CLASS "MyDialogClass" +FONT 8, "MS Shell Dlg" +{ + EDITTEXT 200,4,4,50,14 +} + IDD_DIALOG DIALOG 0, 0, 186, 95 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Dialog"

1 0