March 2013 - Wine-commits - list.winehq.org

Francois Gouget : testbot/testagentd: Fix the zero / infinite timeouts in the wait2 RPC.
by Alexandre Julliard 26 Mar '13

26 Mar '13

Module: tools Branch: master Commit: 6c6aa897db13a20ca4bd8c93b8f44361916d0dae URL: http://source.winehq.org/git/tools.git/?a=commit;h=6c6aa897db13a20ca4bd8c93… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 26 13:12:53 2013 +0100 testbot/testagentd: Fix the zero / infinite timeouts in the wait2 RPC. --- testbot/lib/WineTestBot/TestAgent.pm | 2 +- testbot/src/testagentd/platform.h | 2 ++ testbot/src/testagentd/platform_unix.c | 6 +++--- testbot/src/testagentd/platform_windows.c | 2 +- testbot/src/testagentd/testagentd.c | 3 ++- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 645a18c..bce1a78 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -1122,7 +1122,7 @@ sub Wait($$$) if (!$self->_StartRPC($RPC_WAIT2) or !$self->_SendListSize(2) or !$self->_SendUInt64($Pid) or - !$self->_SendUInt32($Timeout)) + !$self->_SendUInt32(defined $Timeout ? $Timeout : 0xffffffff)) { return undef; } diff --git a/testbot/src/testagentd/platform.h b/testbot/src/testagentd/platform.h index 621ce98..fffaa4b 100644 --- a/testbot/src/testagentd/platform.h +++ b/testbot/src/testagentd/platform.h @@ -64,6 +64,8 @@ enum run_flags_t { RUN_DNTRUNC_ERR = 4, }; +#define RUN_NOTIMEOUT ((uint32_t)0xffffffff) + /* Starts the specified command in the background and reports the status to * the client. */ diff --git a/testbot/src/testagentd/platform_unix.c b/testbot/src/testagentd/platform_unix.c index 48eef73..e003135 100644 --- a/testbot/src/testagentd/platform_unix.c +++ b/testbot/src/testagentd/platform_unix.c @@ -154,7 +154,7 @@ int platform_wait(SOCKET client, uint64_t pid, uint32_t timeout, uint32_t *child return 0; } - if (timeout) + if (timeout != RUN_NOTIMEOUT) deadline = time(NULL) + timeout; while (!child->reaped) { @@ -170,14 +170,14 @@ int platform_wait(SOCKET client, uint64_t pid, uint32_t timeout, uint32_t *child debug("Waiting for " U64FMT "\n", pid); FD_ZERO(&rfds); FD_SET(client, &rfds); - if (timeout) + if (timeout != RUN_NOTIMEOUT) { tv.tv_sec = deadline - time(NULL); if (tv.tv_sec < 0) tv.tv_sec = 0; tv.tv_usec = 0; } - ready = select(client+1, &rfds, NULL, NULL, timeout ? &tv : NULL); + ready = select(client+1, &rfds, NULL, NULL, timeout != RUN_NOTIMEOUT ? &tv : NULL); if (ready == 0) { /* This is the timeout */ diff --git a/testbot/src/testagentd/platform_windows.c b/testbot/src/testagentd/platform_windows.c index 92fc9aa..a0dccfa 100644 --- a/testbot/src/testagentd/platform_windows.c +++ b/testbot/src/testagentd/platform_windows.c @@ -177,7 +177,7 @@ int platform_wait(SOCKET client, uint64_t pid, uint32_t timeout, uint32_t *child handles[0] = WSACreateEvent(); WSAEventSelect(client, handles[0], FD_CLOSE); handles[1] = child->handle; - r = WaitForMultipleObjects(2, handles, FALSE, timeout * 1000); + r = WaitForMultipleObjects(2, handles, FALSE, timeout == RUN_NOTIMEOUT ? INFINITE : timeout * 1000); success = 0; switch (r) diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index 534495d..75782c4 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -34,8 +34,9 @@ * 1.0: Initial release. * 1.1: Added the wait2 RPC. * 1.2: Add more redirection options to the run RPC. + * 1.3: Fix the zero / infinite timeouts in the wait2 RPC. */ -#define PROTOCOL_VERSION "testagentd 1.2" +#define PROTOCOL_VERSION "testagentd 1.3" #define BLOCK_SIZE 65536

1 0

Francois Gouget : testbot/TestAgent: Fix Wait() to not depend on other RPCs to retrieve the server version.
by Alexandre Julliard 26 Mar '13

26 Mar '13

Module: tools Branch: master Commit: 6032b11f0b005fcd489445ff0f66ef7b4e67ca3f URL: http://source.winehq.org/git/tools.git/?a=commit;h=6032b11f0b005fcd489445ff… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 26 13:14:12 2013 +0100 testbot/TestAgent: Fix Wait() to not depend on other RPCs to retrieve the server version. --- testbot/lib/WineTestBot/TestAgent.pm | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index bce1a78..4aaaea0 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -1107,6 +1107,9 @@ sub Wait($$$) # Add 1 second for the reply to come back my $OldTimeout = $self->SetTimeout($Timeout + 1) if ($Timeout); + # Make sure we have the server version + return undef if (!$self->{agentversion} and !$self->_Connect()); + # Send the command if ($self->{agentversion} =~ / 1\.0$/) {

1 0

Francois Gouget : testbot/TestAgent: Optimize GetVersion().
by Alexandre Julliard 26 Mar '13

26 Mar '13

Module: tools Branch: master Commit: f6535406115e2e158b032acd7e8fde55c1264f1a URL: http://source.winehq.org/git/tools.git/?a=commit;h=f6535406115e2e158b032acd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 26 13:14:41 2013 +0100 testbot/TestAgent: Optimize GetVersion(). To get the server version we just need to connect, we don't need to send a full RPC. --- testbot/lib/WineTestBot/TestAgent.pm | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 4aaaea0..f542991 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -987,8 +987,8 @@ sub GetVersion($) if (!$self->{agentversion}) { - # Force a connection - $self->Ping(); + # Retrieve the server version + $self->_Connect(); } # And return the version we got. # If the connection failed it will be undef as expected.

1 0

Hans Leidekker : winhttp: Remove support for MSG_PEEK.
by Alexandre Julliard 25 Mar '13

25 Mar '13

Module: wine Branch: master Commit: a55e3d4f57d5585ce0cd4f239d01794751bf45ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=a55e3d4f57d5585ce0cd4f239… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 25 13:27:15 2013 +0100 winhttp: Remove support for MSG_PEEK. --- dlls/winhttp/net.c | 22 ++-------------------- 1 files changed, 2 insertions(+), 20 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 9fca4b5..631939a 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -667,17 +667,7 @@ BOOL netconn_recv( netconn_t *conn, void *buf, size_t len, int flags, int *recvd SIZE_T size, cread; BOOL res, eof; - if (flags & ~(MSG_PEEK | MSG_WAITALL)) - FIXME("SSL_read does not support the following flags: %08x\n", flags); - - if (flags & MSG_PEEK && conn->peek_msg) - { - if (len < conn->peek_len) FIXME("buffer isn't big enough, should we wrap?\n"); - *recvd = min( len, conn->peek_len ); - memcpy( buf, conn->peek_msg, *recvd ); - return TRUE; - } - else if (conn->peek_msg) + if (conn->peek_msg) { *recvd = min( len, conn->peek_len ); memcpy( buf, conn->peek_msg, *recvd ); @@ -691,7 +681,7 @@ BOOL netconn_recv( netconn_t *conn, void *buf, size_t len, int flags, int *recvd conn->peek_msg = NULL; } /* check if we have enough data from the peek buffer */ - if (!(flags & MSG_WAITALL) || (*recvd == len)) return TRUE; + if (!(flags & MSG_WAITALL) || *recvd == len) return TRUE; } size = *recvd; @@ -712,14 +702,6 @@ BOOL netconn_recv( netconn_t *conn, void *buf, size_t len, int flags, int *recvd size += cread; }while(!size || ((flags & MSG_WAITALL) && size < len)); - if(size && (flags & MSG_PEEK)) { - conn->peek_msg_mem = conn->peek_msg = heap_alloc(size); - if(!conn->peek_msg) - return FALSE; - - memcpy(conn->peek_msg, buf, size); - } - TRACE("received %ld bytes\n", size); *recvd = size; return TRUE;

1 0

Piotr Caban : msvcrt: Fixed copied buffer size in _ui64tow_s.
by Alexandre Julliard 25 Mar '13

25 Mar '13

Module: wine Branch: master Commit: 737bb1bb1800e727024096f231b8777a24fa4ea9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=737bb1bb1800e727024096f23… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 25 13:37:29 2013 +0100 msvcrt: Fixed copied buffer size in _ui64tow_s. --- dlls/msvcrt/string.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index e4e94ff..1b2dea8 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1187,7 +1187,7 @@ int CDECL MSVCRT__ui64tow_s( unsigned __int64 value, MSVCRT_wchar_t *str, return MSVCRT_EINVAL; } - memcpy(str, pos, buffer-pos+65); + memcpy(str, pos, (buffer-pos+65)*sizeof(MSVCRT_wchar_t)); return 0; } @@ -1248,7 +1248,7 @@ int CDECL _ultoa_s(MSVCRT_ulong value, char *str, MSVCRT_size_t size, int radix) /********************************************************************* * _ultow_s (MSVCRT.@) */ -int CDECL _ultow_s(MSVCRT_ulong value, WCHAR *str, MSVCRT_size_t size, int radix) +int CDECL _ultow_s(MSVCRT_ulong value, MSVCRT_wchar_t *str, MSVCRT_size_t size, int radix) { MSVCRT_ulong digit; WCHAR buffer[33], *pos; @@ -1295,7 +1295,7 @@ int CDECL _ultow_s(MSVCRT_ulong value, WCHAR *str, MSVCRT_size_t size, int radix return MSVCRT_ERANGE; } - memcpy(str, pos, len * sizeof(WCHAR)); + memcpy(str, pos, len * sizeof(MSVCRT_wchar_t)); return 0; }

1 0

Jacek Caban : secur32: Pass whole schan_credentials struct to schannel backend implementations.
by Alexandre Julliard 25 Mar '13

25 Mar '13

Module: wine Branch: master Commit: b7a75b468ab57d4e03304e587f1f74b3f4167ae2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7a75b468ab57d4e03304e587… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 25 13:55:20 2013 +0100 secur32: Pass whole schan_credentials struct to schannel backend implementations. --- dlls/secur32/schannel.c | 14 ++++---------- dlls/secur32/schannel_gnutls.c | 15 +++++++-------- dlls/secur32/schannel_macosx.c | 13 ++++++------- dlls/secur32/secur32_priv.h | 14 +++++++++----- 4 files changed, 26 insertions(+), 30 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index bf64fcd..387eaad 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -50,12 +50,6 @@ struct schan_handle enum schan_handle_type type; }; -struct schan_credentials -{ - ULONG credential_use; - schan_imp_certificate_credentials credentials; -}; - struct schan_context { schan_imp_session session; @@ -316,7 +310,7 @@ static SECURITY_STATUS schan_AcquireClientCredentials(const SCHANNEL_CRED *schan if (handle == SCHAN_INVALID_HANDLE) goto fail; creds->credential_use = SECPKG_CRED_OUTBOUND; - if (!schan_imp_allocate_certificate_credentials(&creds->credentials)) + if (!schan_imp_allocate_certificate_credentials(creds)) { schan_free_handle(handle, SCHAN_HANDLE_CRED); goto fail; @@ -424,7 +418,7 @@ static SECURITY_STATUS SEC_ENTRY schan_FreeCredentialsHandle( if (!creds) return SEC_E_INVALID_HANDLE; if (creds->credential_use == SECPKG_CRED_OUTBOUND) - schan_imp_free_certificate_credentials(creds->credentials); + schan_imp_free_certificate_credentials(creds); HeapFree(GetProcessHeap(), 0, creds); return SEC_E_OK; @@ -705,7 +699,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( return SEC_E_INTERNAL_ERROR; } - if (!schan_imp_create_session(&ctx->session, FALSE, cred->credentials)) + if (!schan_imp_create_session(&ctx->session, cred)) { schan_free_handle(handle, SCHAN_HANDLE_CTX); HeapFree(GetProcessHeap(), 0, ctx); @@ -1329,7 +1323,7 @@ void SECUR32_deinitSchannelSP(void) { struct schan_credentials *cred; cred = schan_free_handle(i, SCHAN_HANDLE_CRED); - schan_imp_free_certificate_credentials(cred->credentials); + schan_imp_free_certificate_credentials(cred); HeapFree(GetProcessHeap(), 0, cred); } } diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index b273e96..8975b2d 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -106,12 +106,11 @@ static ssize_t schan_push_adapter(gnutls_transport_ptr_t transport, return buff_len; } -BOOL schan_imp_create_session(schan_imp_session *session, BOOL is_server, - schan_imp_certificate_credentials cred) +BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cred) { gnutls_session_t *s = (gnutls_session_t*)session; - int err = pgnutls_init(s, is_server ? GNUTLS_SERVER : GNUTLS_CLIENT); + int err = pgnutls_init(s, cred->credential_use == SECPKG_CRED_INBOUND ? GNUTLS_SERVER : GNUTLS_CLIENT); if (err != GNUTLS_E_SUCCESS) { pgnutls_perror(err); @@ -129,7 +128,7 @@ BOOL schan_imp_create_session(schan_imp_session *session, BOOL is_server, } err = pgnutls_credentials_set(*s, GNUTLS_CRD_CERTIFICATE, - (gnutls_certificate_credentials_t)cred); + (gnutls_certificate_credentials_t)cred->credentials); if (err != GNUTLS_E_SUCCESS) { pgnutls_perror(err); @@ -405,17 +404,17 @@ again: return SEC_E_OK; } -BOOL schan_imp_allocate_certificate_credentials(schan_imp_certificate_credentials *c) +BOOL schan_imp_allocate_certificate_credentials(schan_credentials *c) { - int ret = pgnutls_certificate_allocate_credentials((gnutls_certificate_credentials*)c); + int ret = pgnutls_certificate_allocate_credentials((gnutls_certificate_credentials*)&c->credentials); if (ret != GNUTLS_E_SUCCESS) pgnutls_perror(ret); return (ret == GNUTLS_E_SUCCESS); } -void schan_imp_free_certificate_credentials(schan_imp_certificate_credentials c) +void schan_imp_free_certificate_credentials(schan_credentials *c) { - pgnutls_certificate_free_credentials((gnutls_certificate_credentials_t)c); + pgnutls_certificate_free_credentials(c->credentials); } static void schan_gnutls_log(int level, const char *msg) diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index 05b0a5e..2acb6ca 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -631,19 +631,18 @@ static OSStatus schan_push_adapter(SSLConnectionRef transport, const void *buff, } -BOOL schan_imp_create_session(schan_imp_session *session, BOOL is_server, - schan_imp_certificate_credentials cred) +BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cred) { struct mac_session *s; OSStatus status; - TRACE("(%p, %d)\n", session, is_server); + TRACE("(%p)\n", session); s = HeapAlloc(GetProcessHeap(), 0, sizeof(*s)); if (!s) return FALSE; - status = SSLNewContext(is_server, &s->context); + status = SSLNewContext(cred->credential_use == SECPKG_CRED_INBOUND, &s->context); if (status != noErr) { ERR("Failed to create session context: %ld\n", (long)status); @@ -966,14 +965,14 @@ SECURITY_STATUS schan_imp_recv(schan_imp_session session, void *buffer, return SEC_E_OK; } -BOOL schan_imp_allocate_certificate_credentials(schan_imp_certificate_credentials *c) +BOOL schan_imp_allocate_certificate_credentials(schan_credentials *c) { /* The certificate is never really used for anything. */ - *c = NULL; + c->credentials = NULL; return TRUE; } -void schan_imp_free_certificate_credentials(schan_imp_certificate_credentials c) +void schan_imp_free_certificate_credentials(schan_credentials *c) { } diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 164a2eb..bc4b74b 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -209,7 +209,12 @@ SecPkgInfoA *ntlm_package_infoA; /* schannel internal interface */ typedef struct schan_imp_session_opaque *schan_imp_session; -typedef struct schan_imp_certificate_credentials_opaque *schan_imp_certificate_credentials; + +typedef struct schan_credentials +{ + ULONG credential_use; + void *credentials; +} schan_credentials; struct schan_transport; @@ -237,8 +242,7 @@ extern int schan_push(struct schan_transport *t, const void *buff, size_t *buff_ extern schan_imp_session schan_session_for_transport(struct schan_transport* t) DECLSPEC_HIDDEN; /* schannel implementation interface */ -extern BOOL schan_imp_create_session(schan_imp_session *session, BOOL is_server, - schan_imp_certificate_credentials cred) DECLSPEC_HIDDEN; +extern BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cred) DECLSPEC_HIDDEN; extern void schan_imp_dispose_session(schan_imp_session session) DECLSPEC_HIDDEN; extern void schan_imp_set_session_transport(schan_imp_session session, struct schan_transport *t) DECLSPEC_HIDDEN; @@ -253,8 +257,8 @@ extern SECURITY_STATUS schan_imp_send(schan_imp_session session, const void *buf SIZE_T *length) DECLSPEC_HIDDEN; extern SECURITY_STATUS schan_imp_recv(schan_imp_session session, void *buffer, SIZE_T *length) DECLSPEC_HIDDEN; -extern BOOL schan_imp_allocate_certificate_credentials(schan_imp_certificate_credentials *c) DECLSPEC_HIDDEN; -extern void schan_imp_free_certificate_credentials(schan_imp_certificate_credentials c) DECLSPEC_HIDDEN; +extern BOOL schan_imp_allocate_certificate_credentials(schan_credentials*) DECLSPEC_HIDDEN; +extern void schan_imp_free_certificate_credentials(schan_credentials*) DECLSPEC_HIDDEN; extern BOOL schan_imp_init(void) DECLSPEC_HIDDEN; extern void schan_imp_deinit(void) DECLSPEC_HIDDEN;

1 0

André Hentschel : ntdll: Implement RtlLookupFunctionEntry on ARM.
by Alexandre Julliard 25 Mar '13

25 Mar '13

Module: wine Branch: master Commit: 3c04958b8a47f56a6dfc9ac067ca88f34a4e29a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c04958b8a47f56a6dfc9ac06… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Mar 23 17:24:04 2013 +0100 ntdll: Implement RtlLookupFunctionEntry on ARM. --- dlls/kernel32/kernel32.spec | 2 +- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/signal_arm.c | 68 +++++++++++++++++++++++++++++++++++++++++++ include/winnt.h | 1 + 4 files changed, 71 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index a07a9ff..72c1697 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1034,7 +1034,7 @@ @ stdcall -arch=x86_64 RtlCompareMemory(ptr ptr long) ntdll.RtlCompareMemory @ cdecl -arch=arm,x86_64 RtlDeleteFunctionTable(ptr) ntdll.RtlDeleteFunctionTable @ stdcall RtlFillMemory(ptr long long) ntdll.RtlFillMemory -@ stdcall -arch=x86_64 RtlLookupFunctionEntry(long ptr ptr) ntdll.RtlLookupFunctionEntry +@ stdcall -arch=arm,x86_64 RtlLookupFunctionEntry(long ptr ptr) ntdll.RtlLookupFunctionEntry @ stdcall RtlMoveMemory(ptr ptr long) ntdll.RtlMoveMemory @ stdcall -arch=x86_64,arm RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader @ stdcall -arch=arm -register RtlRaiseException(ptr) ntdll.RtlRaiseException diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index d67c85e..b0cb43a 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -738,7 +738,7 @@ @ stdcall RtlLookupAtomInAtomTable(ptr wstr ptr) @ stub RtlLookupElementGenericTable # @ stub RtlLookupElementGenericTableAvl -@ stdcall -arch=x86_64 RtlLookupFunctionEntry(long ptr ptr) +@ stdcall -arch=arm,x86_64 RtlLookupFunctionEntry(long ptr ptr) @ stdcall RtlMakeSelfRelativeSD(ptr ptr ptr) @ stdcall RtlMapGenericMask(long ptr) # @ stub RtlMapSecurityErrorToNtStatus diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index f9cde38..bf144a0 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -47,6 +47,8 @@ # include <sys/signal.h> #endif +#define NONAMELESSUNION +#define NONAMELESSSTRUCT #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -100,6 +102,15 @@ typedef int (*wine_signal_handler)(unsigned int sig); static wine_signal_handler handlers[256]; + +struct UNWIND_INFO +{ + WORD function_length; + WORD unknown1 : 7; + WORD count : 5; + WORD unknown2 : 4; +}; + /*********************************************************************** * dispatch_signal */ @@ -933,6 +944,63 @@ BOOLEAN CDECL RtlDeleteFunctionTable( RUNTIME_FUNCTION *table ) return TRUE; } +/********************************************************************** + * find_function_info + */ +static RUNTIME_FUNCTION *find_function_info( ULONG_PTR pc, HMODULE module, + RUNTIME_FUNCTION *func, ULONG size ) +{ + int min = 0; + int max = size/sizeof(*func) - 1; + + while (min <= max) + { + int pos = (min + max) / 2; + DWORD begin = (func[pos].BeginAddress & ~1), end; + if (func[pos].u.s.Flag) + end = begin + func[pos].u.s.FunctionLength * 2; + else + { + struct UNWIND_INFO *info; + info = (struct UNWIND_INFO *)((char *)module + func[pos].u.UnwindData); + end = begin + info->function_length * 2; + } + + if ((char *)pc < (char *)module + begin) max = pos - 1; + else if ((char *)pc >= (char *)module + end) min = pos + 1; + else return func + pos; + } + return NULL; +} + +/********************************************************************** + * RtlLookupFunctionEntry (NTDLL.@) + */ +PRUNTIME_FUNCTION WINAPI RtlLookupFunctionEntry( ULONG_PTR pc, DWORD *base, + UNWIND_HISTORY_TABLE *table ) +{ + LDR_MODULE *module; + RUNTIME_FUNCTION *func; + ULONG size; + + /* FIXME: should use the history table to make things faster */ + + if (LdrFindEntryForAddress( (void *)pc, &module )) + { + WARN( "module not found for %lx\n", pc ); + return NULL; + } + if (!(func = RtlImageDirectoryEntryToData( module->BaseAddress, TRUE, + IMAGE_DIRECTORY_ENTRY_EXCEPTION, &size ))) + { + WARN( "no exception table found in module %p pc %lx\n", module->BaseAddress, pc ); + return NULL; + } + func = find_function_info( pc, module->BaseAddress, func, size ); + if (func) *base = (DWORD)module->BaseAddress; + return func; +} + /*********************************************************************** * RtlUnwind (NTDLL.@) */ diff --git a/include/winnt.h b/include/winnt.h index a40ff75..79e91c0 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -1710,6 +1710,7 @@ typedef struct _CONTEXT { BOOLEAN CDECL RtlAddFunctionTable(RUNTIME_FUNCTION*,DWORD,DWORD); BOOLEAN CDECL RtlDeleteFunctionTable(RUNTIME_FUNCTION*); +PRUNTIME_FUNCTION WINAPI RtlLookupFunctionEntry(ULONG_PTR,DWORD*,UNWIND_HISTORY_TABLE*); #endif /* __arm__ */

1 0

Ken Thomases : winemac: Don't read an array at index -1 in debugstr_pf().
by Alexandre Julliard 25 Mar '13

25 Mar '13

Module: wine Branch: master Commit: 3158fd764d5f765ad8701a48ab883e62c18cc621 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3158fd764d5f765ad8701a48a… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Mar 25 00:34:32 2013 -0500 winemac: Don't read an array at index -1 in debugstr_pf(). --- dlls/winemac.drv/opengl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index e3e9aa4..8627b70 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -366,7 +366,7 @@ static const char *debugstr_pf(const pixel_format *pf) color_modes[pf->color_mode].alpha_bits, pf->depth_bits, pf->stencil_bits, - color_modes[pf->accum_mode - 1].color_bits, + pf->accum_mode ? color_modes[pf->accum_mode - 1].color_bits : 0, pf->aux_buffers, pf->backing_store, pf->double_buffer,

1 0

Huw Davies : riched20: We don' t need to special case the PARAFORMAT2 fields since the masks have already been correctly sanitised . This fixes setting PFE_RTLPARA.
by Alexandre Julliard 25 Mar '13

25 Mar '13

Module: wine Branch: master Commit: 503c6caba647d94035e421f8641fb22dbdd79712 URL: http://source.winehq.org/git/wine.git/?a=commit;h=503c6caba647d94035e421f86… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 25 11:05:54 2013 +0000 riched20: We don't need to special case the PARAFORMAT2 fields since the masks have already been correctly sanitised. This fixes setting PFE_RTLPARA. --- dlls/riched20/para.c | 44 ++++++++++++++++++++------------------------ 1 files changed, 20 insertions(+), 24 deletions(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index ebe7eda..8cf3d24 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -154,35 +154,31 @@ static BOOL ME_SetParaFormat(ME_TextEditor *editor, ME_DisplayItem *para, const memcpy(para->member.para.pFmt->rgxTabs, pFmt->rgxTabs, pFmt->cTabCount*sizeof(LONG)); } - if (dwMask & (PFM_ALL2 & ~PFM_ALL)) - { - /* PARAFORMAT2 fields */ - #define EFFECTS_MASK (PFM_RTLPARA|PFM_KEEP|PFM_KEEPNEXT|PFM_PAGEBREAKBEFORE| \ PFM_NOLINENUMBER|PFM_NOWIDOWCONTROL|PFM_DONOTHYPHEN|PFM_SIDEBYSIDE| \ PFM_TABLE) - /* we take for granted that PFE_xxx is the hiword of the corresponding PFM_xxx */ - if (dwMask & EFFECTS_MASK) { - para->member.para.pFmt->dwMask |= dwMask & EFFECTS_MASK; - para->member.para.pFmt->wEffects &= ~HIWORD(dwMask); - para->member.para.pFmt->wEffects |= pFmt->wEffects & HIWORD(dwMask); - } + /* we take for granted that PFE_xxx is the hiword of the corresponding PFM_xxx */ + if (dwMask & EFFECTS_MASK) + { + para->member.para.pFmt->dwMask |= dwMask & EFFECTS_MASK; + para->member.para.pFmt->wEffects &= ~HIWORD(dwMask); + para->member.para.pFmt->wEffects |= pFmt->wEffects & HIWORD(dwMask); + } #undef EFFECTS_MASK - COPY_FIELD(PFM_SPACEBEFORE, dySpaceBefore); - COPY_FIELD(PFM_SPACEAFTER, dySpaceAfter); - COPY_FIELD(PFM_LINESPACING, dyLineSpacing); - COPY_FIELD(PFM_STYLE, sStyle); - COPY_FIELD(PFM_LINESPACING, bLineSpacingRule); - COPY_FIELD(PFM_SHADING, wShadingWeight); - COPY_FIELD(PFM_SHADING, wShadingStyle); - COPY_FIELD(PFM_NUMBERINGSTART, wNumberingStart); - COPY_FIELD(PFM_NUMBERINGSTYLE, wNumberingStyle); - COPY_FIELD(PFM_NUMBERINGTAB, wNumberingTab); - COPY_FIELD(PFM_BORDER, wBorderSpace); - COPY_FIELD(PFM_BORDER, wBorderWidth); - COPY_FIELD(PFM_BORDER, wBorders); - } + COPY_FIELD(PFM_SPACEBEFORE, dySpaceBefore); + COPY_FIELD(PFM_SPACEAFTER, dySpaceAfter); + COPY_FIELD(PFM_LINESPACING, dyLineSpacing); + COPY_FIELD(PFM_STYLE, sStyle); + COPY_FIELD(PFM_LINESPACING, bLineSpacingRule); + COPY_FIELD(PFM_SHADING, wShadingWeight); + COPY_FIELD(PFM_SHADING, wShadingStyle); + COPY_FIELD(PFM_NUMBERINGSTART, wNumberingStart); + COPY_FIELD(PFM_NUMBERINGSTYLE, wNumberingStyle); + COPY_FIELD(PFM_NUMBERINGTAB, wNumberingTab); + COPY_FIELD(PFM_BORDER, wBorderSpace); + COPY_FIELD(PFM_BORDER, wBorderWidth); + COPY_FIELD(PFM_BORDER, wBorders); para->member.para.pFmt->dwMask |= dwMask; #undef COPY_FIELD

1 0

Huw Davies : riched20: Set the bidi base embedding level.
by Alexandre Julliard 25 Mar '13

25 Mar '13

Module: wine Branch: master Commit: c409fc13fda7da2b60cd5ab04ad64bf21a0b5806 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c409fc13fda7da2b60cd5ab04… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 25 11:05:55 2013 +0000 riched20: Set the bidi base embedding level. --- dlls/riched20/editor.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a19ceec..f490799 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -840,6 +840,14 @@ void ME_RTFParAttrHook(RTF_Info *info) } break; } + case rtfRTLPar: + fmt.dwMask = PFM_RTLPARA; + fmt.wEffects = PFE_RTLPARA; + break; + case rtfLTRPar: + fmt.dwMask = PFM_RTLPARA; + fmt.wEffects = 0; + break; } if (fmt.dwMask) { RTFFlushOutputBuffer(info);

1 0