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

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

March 26, 2013

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/testagentd: Fix the zero / infinite timeouts in the wait2 RPC.
by Alexandre Julliard March 26, 2013

March 26, 2013

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/scripts: The WineTestBot does not support SIGHUP so emulate 'initd reload' through try-restart.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: tools Branch: master Commit: 0a7915b95b3279c5dd1df4bf8f300c24cbc025f8 URL: http://source.winehq.org/git/tools.git/?a=commit;h=0a7915b95b3279c5dd1df4bf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 26 11:49:09 2013 +0100 testbot/scripts: The WineTestBot does not support SIGHUP so emulate 'initd reload' through try-restart. --- testbot/scripts/initd | 19 ++----------------- 1 files changed, 2 insertions(+), 17 deletions(-) diff --git a/testbot/scripts/initd b/testbot/scripts/initd index 8853f6c..d782cbc 100755 --- a/testbot/scripts/initd +++ b/testbot/scripts/initd @@ -86,7 +86,7 @@ then $0 start ;; - try-restart) + try-restart|reload) ## Do a restart only if the service was active before. if $0 status then @@ -94,12 +94,6 @@ then fi ;; - reload) - log_daemon_msg "Reloading the WineTestBot configuration" - killproc -p $PIDFILE $DAEMON -HUP - log_end_msg $? - ;; - status) status="0" pidofproc -p $PIDFILE $DAEMON >/dev/null || status="$?" @@ -184,7 +178,7 @@ then # Remember status and be verbose rc_status -v ;; - try-restart|condrestart) + try-restart|condrestart|reload) ## Do a restart only if the service was active before. ## Note: try-restart is now part of LSB (as of 1.9). ## RH has a similar command named condrestart. @@ -209,15 +203,6 @@ then # Remember status and be quiet rc_status ;; - reload) - log_daemon_msg "Reloading service WineTestBot" - killproc -HUP $DAEMON - log_end_msg $? - - ## Otherwise if it does not support reload: - #rc_failed 3 - #rc_status -v - ;; status) status_of_proc $DAEMON echo -n "Checking for service WineTestBot "

1 0

Piotr Caban : msvcrt: Fixed copied buffer size in _ui64tow_s.
by Alexandre Julliard March 25, 2013

March 25, 2013

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 March 25, 2013

March 25, 2013

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

Hans Leidekker : winhttp: Remove support for MSG_PEEK.
by Alexandre Julliard March 25, 2013

March 25, 2013

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

Hans Leidekker : winhttp: Add a read-ahead buffer to allow WinHttpQueryDataAvailable to return the right values in chunked mode .
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: bb3097f01e532583c8c78c9daf64ff29f8eb255c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb3097f01e532583c8c78c9da… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 25 13:26:37 2013 +0100 winhttp: Add a read-ahead buffer to allow WinHttpQueryDataAvailable to return the right values in chunked mode. This is a port of wininet commit 3d02c42b39c7346a97c41974418a6d01a29f9b81. --- dlls/winhttp/request.c | 381 +++++++++++++++++++++++++--------------- dlls/winhttp/tests/winhttp.c | 78 ++++++++ dlls/winhttp/winhttp_private.h | 5 + 3 files changed, 318 insertions(+), 146 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bb3097f01e532583c8c78…

1 0

Piotr Caban : msvcrt: Remove incorrect cast in fgetws function.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: cde73251d818afdb135b722889d6f083fdb6c45a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cde73251d818afdb135b72288… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 20 10:39:37 2013 +0100 msvcrt: Remove incorrect cast in fgetws function. --- dlls/msvcrt/file.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 28aefc1..6e8b324 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3315,7 +3315,7 @@ MSVCRT_wint_t CDECL MSVCRT_getwchar(void) */ MSVCRT_wchar_t * CDECL MSVCRT_fgetws(MSVCRT_wchar_t *s, int size, MSVCRT_FILE* file) { - int cc = MSVCRT_WEOF; + MSVCRT_wint_t cc = MSVCRT_WEOF; MSVCRT_wchar_t * buf_start = s; TRACE(":file(%p) fd (%d) str (%p) len (%d)\n", @@ -3325,7 +3325,7 @@ MSVCRT_wchar_t * CDECL MSVCRT_fgetws(MSVCRT_wchar_t *s, int size, MSVCRT_FILE* f while ((size >1) && (cc = MSVCRT_fgetwc(file)) != MSVCRT_WEOF && cc != '\n') { - *s++ = (char)cc; + *s++ = cc; size --; } if ((cc == MSVCRT_WEOF) && (s == buf_start)) /* If nothing read, return 0*/

1 0

Qian Hong : atl100: Fixed register class types in AtlAxWinInit.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: ed62fcb70085c8228e2ad16953dc66a16bde73d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed62fcb70085c8228e2ad1695… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri Mar 15 22:14:01 2013 +0800 atl100: Fixed register class types in AtlAxWinInit. --- dlls/atl100/atl_ax.c | 2 +- dlls/atl100/tests/atl.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/atl100/atl_ax.c b/dlls/atl100/atl_ax.c index cdefbea..319b3e8 100644 --- a/dlls/atl100/atl_ax.c +++ b/dlls/atl100/atl_ax.c @@ -95,7 +95,7 @@ BOOL WINAPI AtlAxWinInit(void) return FALSE; wcex.cbSize = sizeof(wcex); - wcex.style = 0; + wcex.style = CS_GLOBALCLASS | CS_DBLCLKS; wcex.cbClsExtra = 0; wcex.cbWndExtra = 0; wcex.hInstance = GetModuleHandleW( NULL ); diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index 76fa9c4..1304ac1 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -583,11 +583,13 @@ static void test_ax_win(void) wcex.cbSize = sizeof(wcex); ret = GetClassInfoExW(hinstance, AtlAxWin100, &wcex); ok(ret, "AtlAxWin100 has not registered\n"); + ok(wcex.style == (CS_GLOBALCLASS | CS_DBLCLKS), "wcex.style %08x\n", wcex.style); memset(&wcex, 0, sizeof(wcex)); wcex.cbSize = sizeof(wcex); ret = GetClassInfoExW(hinstance, AtlAxWinLic100, &wcex); ok(ret, "AtlAxWinLic100 has not registered\n"); + ok(wcex.style == (CS_GLOBALCLASS | CS_DBLCLKS), "wcex.style %08x\n", wcex.style); } START_TEST(atl)

1 0

Jacek Caban : jscript: Return buffer pointer separately from jsstr_t from jsstr_alloc_len.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: 4ece40f86bf6d7cd52ad2958a645ec162813dd8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ece40f86bf6d7cd52ad2958a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 25 12:28:38 2013 +0100 jscript: Return buffer pointer separately from jsstr_t from jsstr_alloc_len. --- dlls/jscript/array.c | 34 ++++++++++++------------ dlls/jscript/date.c | 64 +++++++++++++++++++++++++++++----------------- dlls/jscript/engine.c | 4 +- dlls/jscript/error.c | 16 +++++++---- dlls/jscript/function.c | 11 ++++--- dlls/jscript/global.c | 59 +++++++++++++++++++----------------------- dlls/jscript/jsstr.c | 21 +++++++++------ dlls/jscript/jsstr.h | 2 +- dlls/jscript/number.c | 6 +--- dlls/jscript/object.c | 7 +++-- dlls/jscript/string.c | 40 ++++++++++++++-------------- 11 files changed, 141 insertions(+), 123 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4ece40f86bf6d7cd52ad2…

1 0