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

Hans Leidekker : rpcrt4: Remove an unneeded parameter from RPCRT4_BuildHttpConnectHeader.
by Alexandre Julliard 28 Aug '13

28 Aug '13

Module: wine Branch: master Commit: 9d213312f1aad48912e016552208fe1a6aea622d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d213312f1aad48912e016552… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 28 13:30:41 2013 +0200 rpcrt4: Remove an unneeded parameter from RPCRT4_BuildHttpConnectHeader. --- dlls/rpcrt4/rpc_message.c | 4 ++-- dlls/rpcrt4/rpc_message.h | 2 +- dlls/rpcrt4/rpc_transport.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 189f6c4..1c4ffd6 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -340,7 +340,7 @@ RpcPktHdr *RPCRT4_BuildHttpHeader(ULONG DataRepresentation, (payload) += sizeof(UUID); \ } while (0) -RpcPktHdr *RPCRT4_BuildHttpConnectHeader(unsigned short flags, int out_pipe, +RpcPktHdr *RPCRT4_BuildHttpConnectHeader(int out_pipe, const UUID *connection_uuid, const UUID *pipe_uuid, const UUID *association_uuid) @@ -353,7 +353,7 @@ RpcPktHdr *RPCRT4_BuildHttpConnectHeader(unsigned short flags, int out_pipe, if (!out_pipe) size += 8 + 4 + sizeof(UUID); - header = RPCRT4_BuildHttpHeader(NDR_LOCAL_DATA_REPRESENTATION, flags, + header = RPCRT4_BuildHttpHeader(NDR_LOCAL_DATA_REPRESENTATION, 0, out_pipe ? 4 : 6, size); if (!header) return NULL; payload = (char *)(&header->http+1); diff --git a/dlls/rpcrt4/rpc_message.h b/dlls/rpcrt4/rpc_message.h index 3ad8761..a3729cc 100644 --- a/dlls/rpcrt4/rpc_message.h +++ b/dlls/rpcrt4/rpc_message.h @@ -31,7 +31,7 @@ RpcPktHdr *RPCRT4_BuildBindHeader(ULONG DataRepresentation, unsigned short MaxTr RpcPktHdr *RPCRT4_BuildBindNackHeader(ULONG DataRepresentation, unsigned char RpcVersion, unsigned char RpcVersionMinor, unsigned short RejectReason) DECLSPEC_HIDDEN; RpcPktHdr *RPCRT4_BuildBindAckHeader(ULONG DataRepresentation, unsigned short MaxTransmissionSize, unsigned short MaxReceiveSize, ULONG AssocGroupId, LPCSTR ServerAddress, unsigned char ResultCount, const RpcResult *Results) DECLSPEC_HIDDEN; RpcPktHdr *RPCRT4_BuildHttpHeader(ULONG DataRepresentation, unsigned short flags, unsigned short num_data_items, unsigned int payload_size) DECLSPEC_HIDDEN; -RpcPktHdr *RPCRT4_BuildHttpConnectHeader(unsigned short flags, int out_pipe, const UUID *connection_uuid, const UUID *pipe_uuid, const UUID *association_uuid) DECLSPEC_HIDDEN; +RpcPktHdr *RPCRT4_BuildHttpConnectHeader(int out_pipe, const UUID *connection_uuid, const UUID *pipe_uuid, const UUID *association_uuid) DECLSPEC_HIDDEN; RpcPktHdr *RPCRT4_BuildHttpFlowControlHeader(BOOL server, ULONG bytes_transmitted, ULONG flow_control_increment, const UUID *pipe_uuid) DECLSPEC_HIDDEN; VOID RPCRT4_FreeHeader(RpcPktHdr *Header) DECLSPEC_HIDDEN; RPC_STATUS RPCRT4_Send(RpcConnection *Connection, RpcPktHdr *Header, void *Buffer, unsigned int BufferLength) DECLSPEC_HIDDEN; diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 00d03e4..6b808de 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -2232,7 +2232,7 @@ static RPC_STATUS rpcrt4_http_prepare_in_pipe(HINTERNET in_request, RpcHttpAsync if (status != RPC_S_OK) return status; TRACE("sending HTTP connect header to server\n"); - hdr = RPCRT4_BuildHttpConnectHeader(0, FALSE, connection_uuid, in_pipe_uuid, association_uuid); + hdr = RPCRT4_BuildHttpConnectHeader(FALSE, connection_uuid, in_pipe_uuid, association_uuid); if (!hdr) return RPC_S_OUT_OF_RESOURCES; ret = InternetWriteFile(in_request, hdr, hdr->common.frag_len, &bytes_written); RPCRT4_FreeHeader(hdr); @@ -2308,7 +2308,7 @@ static RPC_STATUS rpcrt4_http_prepare_out_pipe(HINTERNET out_request, status = send_echo_request(out_request, async_data, cancel_event); if (status != RPC_S_OK) return status; - hdr = RPCRT4_BuildHttpConnectHeader(0, TRUE, connection_uuid, out_pipe_uuid, NULL); + hdr = RPCRT4_BuildHttpConnectHeader(TRUE, connection_uuid, out_pipe_uuid, NULL); if (!hdr) return RPC_S_OUT_OF_RESOURCES; prepare_async_request(async_data);

1 0

Hans Leidekker : rpcrt4: Don't follow HTTP redirects.
by Alexandre Julliard 28 Aug '13

28 Aug '13

Module: wine Branch: master Commit: 35468903cdb1f5859fb71e638e3b481f0e9ad7b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35468903cdb1f5859fb71e638… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 28 13:31:23 2013 +0200 rpcrt4: Don't follow HTTP redirects. --- dlls/rpcrt4/rpc_transport.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 6b808de..b039959 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -2520,7 +2520,8 @@ static RPC_STATUS rpcrt4_ncacn_http_open(RpcConnection* Connection) (httpc->common.QOS->qos->AdditionalSecurityInfoType == RPC_C_AUTHN_INFO_TYPE_HTTP) && (httpc->common.QOS->qos->u.HttpCredentials->Flags & RPC_C_HTTP_FLAG_USE_SSL); - flags = INTERNET_FLAG_KEEP_CONNECTION | INTERNET_FLAG_PRAGMA_NOCACHE | INTERNET_FLAG_NO_CACHE_WRITE; + flags = INTERNET_FLAG_KEEP_CONNECTION | INTERNET_FLAG_PRAGMA_NOCACHE | INTERNET_FLAG_NO_CACHE_WRITE | + INTERNET_FLAG_NO_AUTO_REDIRECT; if (secure) flags |= INTERNET_FLAG_SECURE; httpc->in_request = HttpOpenRequestW(httpc->session, wszVerbIn, url, NULL, NULL, wszAcceptTypes,

1 0

Alexandre Julliard : server: Store the wait structure in the wait entry and add an accessor function for the thread .
by Alexandre Julliard 28 Aug '13

28 Aug '13

Module: wine Branch: master Commit: de9f5b33b8fb505119eb2b5f1af20dc57ae0a3c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de9f5b33b8fb505119eb2b5f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 22 16:17:54 2013 +0200 server: Store the wait structure in the wait entry and add an accessor function for the thread. --- server/object.h | 6 +++--- server/queue.c | 6 +++--- server/thread.c | 9 +++++++-- server/thread.h | 1 + 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/server/object.h b/server/object.h index 3b401bc..50c279f 100644 --- a/server/object.h +++ b/server/object.h @@ -106,9 +106,9 @@ struct object struct wait_queue_entry { - struct list entry; - struct object *obj; - struct thread *thread; + struct list entry; + struct object *obj; + struct thread_wait *wait; }; extern void *mem_alloc( size_t size ); /* malloc wrapper */ diff --git a/server/queue.c b/server/queue.c index 7aa9b14..0a02798 100644 --- a/server/queue.c +++ b/server/queue.c @@ -866,7 +866,7 @@ static int is_queue_hung( struct msg_queue *queue ) LIST_FOR_EACH_ENTRY( entry, &queue->obj.wait_queue, struct wait_queue_entry, entry ) { - if (entry->thread->queue == queue) + if (get_wait_queue_thread(entry)->queue == queue) return 0; /* thread is waiting on queue -> not hung */ } return 1; @@ -875,10 +875,10 @@ static int is_queue_hung( struct msg_queue *queue ) static int msg_queue_add_queue( struct object *obj, struct wait_queue_entry *entry ) { struct msg_queue *queue = (struct msg_queue *)obj; - struct process *process = entry->thread->process; + struct process *process = get_wait_queue_thread(entry)->process; /* a thread can only wait on its own queue */ - if (entry->thread->queue != queue) + if (get_wait_queue_thread(entry)->queue != queue) { set_error( STATUS_ACCESS_DENIED ); return 0; diff --git a/server/thread.c b/server/thread.c index b5698b3..38a6219 100644 --- a/server/thread.c +++ b/server/thread.c @@ -543,6 +543,11 @@ void remove_queue( struct object *obj, struct wait_queue_entry *entry ) release_object( obj ); } +struct thread *get_wait_queue_thread( struct wait_queue_entry *entry ) +{ + return entry->wait->thread; +} + /* finish waiting */ static void end_wait( struct thread *thread ) { @@ -579,7 +584,7 @@ static int wait_on( const select_op_t *select_op, unsigned int count, struct obj for (i = 0, entry = wait->queues; i < count; i++, entry++) { struct object *obj = objects[i]; - entry->thread = current; + entry->wait = wait; if (!obj->ops->add_queue( obj, entry )) { wait->count = i; @@ -809,7 +814,7 @@ void wake_up( struct object *obj, int max ) LIST_FOR_EACH( ptr, &obj->wait_queue ) { struct wait_queue_entry *entry = LIST_ENTRY( ptr, struct wait_queue_entry, entry ); - if (!wake_thread( entry->thread )) continue; + if (!wake_thread( get_wait_queue_thread( entry ))) continue; if (max && !--max) break; /* restart at the head of the list since a wake up can change the object wait queue */ ptr = &obj->wait_queue; diff --git a/server/thread.h b/server/thread.h index 1c4a74a..c82f780 100644 --- a/server/thread.h +++ b/server/thread.h @@ -105,6 +105,7 @@ extern struct thread *get_thread_from_id( thread_id_t id ); extern struct thread *get_thread_from_handle( obj_handle_t handle, unsigned int access ); extern struct thread *get_thread_from_tid( int tid ); extern struct thread *get_thread_from_pid( int pid ); +extern struct thread *get_wait_queue_thread( struct wait_queue_entry *entry ); extern void stop_thread( struct thread *thread ); extern void stop_thread_if_suspended( struct thread *thread ); extern int wake_thread( struct thread *thread );

1 0

Alexandre Julliard : server: Pass a wait queue entry to the signaled/ satisfied object functions.
by Alexandre Julliard 28 Aug '13

28 Aug '13

Module: wine Branch: master Commit: 39644bb30992744b798e2375d6441df73f4ed751 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39644bb30992744b798e2375d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 26 11:55:04 2013 +0200 server: Pass a wait queue entry to the signaled/satisfied object functions. --- server/completion.c | 4 +- server/console.c | 4 +- server/debugger.c | 8 +++--- server/device.c | 8 +++--- server/event.c | 12 +++++----- server/fd.c | 6 ++-- server/file.h | 2 +- server/mutex.c | 54 +++++++++++++++++++++++++++++--------------------- server/named_pipe.c | 4 +- server/object.c | 2 +- server/object.h | 6 ++-- server/process.c | 8 +++--- server/queue.c | 10 ++++---- server/semaphore.c | 8 +++--- server/sock.c | 4 +- server/thread.c | 16 +++++++------- server/timer.c | 8 +++--- 17 files changed, 86 insertions(+), 78 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=39644bb30992744b798e2…

1 0

Alexandre Julliard : server: Store abandoned state as a flag in the wait structure.
by Alexandre Julliard 28 Aug '13

28 Aug '13

Module: wine Branch: master Commit: d4cd051cef5efc5f2898903fb048678e631920c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4cd051cef5efc5f2898903fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 26 12:56:41 2013 +0200 server: Store abandoned state as a flag in the wait structure. --- server/event.c | 5 ++--- server/mutex.c | 8 +++----- server/object.c | 3 +-- server/object.h | 6 +++--- server/queue.c | 5 ++--- server/semaphore.c | 5 ++--- server/thread.c | 22 +++++++++++++--------- server/thread.h | 1 + server/timer.c | 5 ++--- 9 files changed, 29 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d4cd051cef5efc5f28989…

1 0

Alexandre Julliard : server: Implement waiting on keyed events.
by Alexandre Julliard 28 Aug '13

28 Aug '13

Module: wine Branch: master Commit: 93fbb12e65ca8ecddd889488c71d89a82dc35c08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93fbb12e65ca8ecddd889488c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 22 17:53:15 2013 +0200 server: Implement waiting on keyed events. --- dlls/ntdll/sync.c | 22 ++++++++++++++--- include/wine/server_protocol.h | 12 ++++++++- server/event.c | 33 ++++++++++++++++++++++---- server/object.h | 5 ++++ server/protocol.def | 10 +++++++- server/thread.c | 50 ++++++++++++++++++++++++++++++++++++++++ server/thread.h | 3 ++ server/trace.c | 7 +++++ 8 files changed, 130 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=93fbb12e65ca8ecddd889…

1 0

Alexandre Julliard : ntdll/tests: Add a number of tests for keyed events.
by Alexandre Julliard 28 Aug '13

28 Aug '13

Module: wine Branch: master Commit: 54017b0fac12b04e4c08a95c71ea4db69a95e062 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54017b0fac12b04e4c08a95c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 28 11:04:06 2013 +0200 ntdll/tests: Add a number of tests for keyed events. --- dlls/ntdll/tests/om.c | 200 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 199 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=54017b0fac12b04e4c08a…

1 0

Nikolay Sivov : kernel32: Simplify constant string length calculation.
by Alexandre Julliard 28 Aug '13

28 Aug '13

Module: wine Branch: master Commit: 9bf8a5ec6fca6416952ff17fc678596cbb274183 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bf8a5ec6fca6416952ff17fc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 28 08:36:48 2013 +0400 kernel32: Simplify constant string length calculation. --- dlls/kernel32/volume.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 2e0cc8a..72b04df 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -1031,7 +1031,7 @@ BOOL WINAPI GetVolumeNameForVolumeMountPointA( LPCSTR path, LPSTR volume, DWORD BOOL WINAPI GetVolumeNameForVolumeMountPointW( LPCWSTR path, LPWSTR volume, DWORD size ) { static const WCHAR prefixW[] = {'\\','D','o','s','D','e','v','i','c','e','s','\\',0}; - static const WCHAR volumeW[] = {'\\','?','?','\\','V','o','l','u','m','e','{',0}; + static const WCHAR volumeW[] = {'\\','?','?','\\','V','o','l','u','m','e','{'}; static const WCHAR trailingW[] = {'\\',0}; MOUNTMGR_MOUNT_POINT *input = NULL, *o1; @@ -1133,7 +1133,7 @@ BOOL WINAPI GetVolumeNameForVolumeMountPointW( LPCWSTR path, LPWSTR volume, DWOR debugstr_wn((WCHAR*)((char *)output + o1->DeviceNameOffset), o1->DeviceNameLength/sizeof(WCHAR))); - if (!strncmpW( p, volumeW, (sizeof(volumeW)-1)/sizeof(WCHAR) )) + if (!strncmpW( p, volumeW, sizeof(volumeW)/sizeof(WCHAR) )) { /* is there space in the return variable ?? */ if ((o1->SymbolicLinkNameLength/sizeof(WCHAR))+2 > size)

1 0

Hans Leidekker : wbemprox: Avoid a crash on file or directory queries with an empty WHERE clause.
by Alexandre Julliard 28 Aug '13

28 Aug '13

Module: wine Branch: master Commit: 7da04aab6d0166005beb776f2135707fc57d716e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7da04aab6d0166005beb776f2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 28 09:49:05 2013 +0200 wbemprox: Avoid a crash on file or directory queries with an empty WHERE clause. --- dlls/wbemprox/builtin.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 9e2369a..d310704 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -1085,9 +1085,12 @@ static BOOL seen_dir( struct dirstack *dirstack, const WCHAR *path ) /* optimize queries of the form WHERE Name='...' [OR Name='...']* */ static UINT seed_dirs( struct dirstack *dirstack, const struct expr *cond, WCHAR root, UINT *count ) { - const struct expr *left = cond->u.expr.left, *right = cond->u.expr.right; + const struct expr *left, *right; - if (cond->type != EXPR_COMPLEX) return *count = 0; + if (!cond || cond->type != EXPR_COMPLEX) return *count = 0; + + left = cond->u.expr.left; + right = cond->u.expr.right; if (cond->u.expr.op == OP_EQ) { UINT len;

1 0

Henri Verbeet : wined3d: Get rid of the unused MAX_PALETTES constant.
by Alexandre Julliard 28 Aug '13

28 Aug '13

Module: wine Branch: master Commit: 00ffc0c24ba754063b205b4cfce843048ac551a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00ffc0c24ba754063b205b4cf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 28 10:09:56 2013 +0200 wined3d: Get rid of the unused MAX_PALETTES constant. --- dlls/wined3d/wined3d_private.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a01c3a4..1746417 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -155,7 +155,6 @@ void *wined3d_rb_realloc(void *ptr, size_t size) DECLSPEC_HIDDEN; void wined3d_rb_free(void *ptr) DECLSPEC_HIDDEN; /* Device caps */ -#define MAX_PALETTES 65536 #define MAX_STREAM_OUT 4 #define MAX_STREAMS 16 #define MAX_TEXTURES 8

1 0