October 2006 - Wine-Commits

Eric Pouech : winedbg: Added a few more cases where we inspect if i386 instructions
by Alexandre Julliard Oct. 23, 2006

Oct. 23, 2006

Module: wine Branch: master Commit: ec087dac4ff9eac712aeaa1f54d22415b1886c97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec087dac4ff9eac712aeaa1f5… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Oct 21 09:40:11 2006 +0200 winedbg: Added a few more cases where we inspect if i386 instructions are actually calls (based on previous work by Jeff Latimer). --- programs/winedbg/be_i386.c | 155 ++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 141 insertions(+), 14 deletions(-) diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index 696e125..dc8f824 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -379,30 +379,157 @@ static unsigned be_i386_is_break_insn(co return c == 0xCC; } +static unsigned get_size(ADDRESS_MODE am) +{ + if (am == AddrModeReal || am == AddrMode1616) return 16; + return 32; +} + +static BOOL fetch_value(const char* addr, unsigned sz, int* value) +{ + char value8; + short value16; + + switch (sz) + { + case 8: + if (!dbg_read_memory(addr, &value8, sizeof(value8))) + return FALSE; + *value = value8; + break; + case 16: + if (!dbg_read_memory(addr, &value16, sizeof(value16))) + return FALSE; + *value = value16; + case 32: + if (!dbg_read_memory(addr, value, sizeof(*value))) + return FALSE; + break; + default: return FALSE; + } + return TRUE; +} + static unsigned be_i386_is_func_call(const void* insn, ADDRESS64* callee) { - BYTE ch; - int delta; + BYTE ch; + int delta; + short segment; + unsigned dst = 0; + unsigned operand_size; + ADDRESS_MODE cs_addr_mode; + + cs_addr_mode = get_selector_type(dbg_curr_thread->handle, &dbg_context, + dbg_context.SegCs); + operand_size = get_size(cs_addr_mode); + + /* get operand_size (also getting rid of the various prefixes */ + do + { + if (!dbg_read_memory(insn, &ch, sizeof(ch))) return FALSE; + if (ch == 0x66) + { + operand_size = 48 - operand_size; /* 16 => 32, 32 => 16 */ + insn = (const char*)insn + 1; + } + } while (ch == 0x66 || ch == 0x67); - if (!dbg_read_memory(insn, &ch, sizeof(ch))) return FALSE; switch (ch) { - case 0xe8: - dbg_read_memory((const char*)insn + 1, &delta, sizeof(delta)); - - callee->Mode = AddrModeFlat; - callee->Offset = (DWORD)insn; - be_i386_disasm_one_insn(callee, FALSE); - callee->Offset += delta; + case 0xe8: /* relative near call */ + callee->Mode = cs_addr_mode; + if (!fetch_value((const char*)insn + 1, operand_size, &delta)) + return FALSE; + callee->Segment = dbg_context.SegCs; + callee->Offset = (DWORD)insn + 1 + (operand_size / 8) + delta; + return TRUE; + case 0x9a: /* absolute far call */ + if (!dbg_read_memory((const char*)insn + 1 + operand_size / 8, + &segment, sizeof(segment))) + return FALSE; + callee->Mode = get_selector_type(dbg_curr_thread->handle, &dbg_context, + segment); + if (!fetch_value((const char*)insn + 1, operand_size, &delta)) + return FALSE; + callee->Segment = segment; + callee->Offset = delta; return TRUE; + case 0xff: if (!dbg_read_memory((const char*)insn + 1, &ch, sizeof(ch))) return FALSE; - ch &= 0x38; - if (ch != 0x10 && ch != 0x18) return FALSE; - /* fall through */ - case 0x9a: + /* keep only the CALL and LCALL insn:s */ + switch ((ch >> 3) & 0x07) + { + case 0x02: + segment = dbg_context.SegCs; + break; + case 0x03: + if (!dbg_read_memory((const char*)insn + 1 + operand_size / 8, + &segment, sizeof(segment))) + return FALSE; + break; + default: return FALSE; + } + /* FIXME: we only support the 32 bit far calls for now */ + if (operand_size != 32) + { + WINE_FIXME("Unsupported yet call insn (0xFF 0x%02x) with 16 bit operand-size at %p\n", ch, insn); + return FALSE; + } + switch (ch & 0xC7) /* keep Mod R/M only (skip reg) */ + { + case 0x04: + case 0x44: + case 0x84: + WINE_FIXME("Unsupported yet call insn (0xFF 0x%02x) (SIB bytes) at %p\n", ch, insn); + return FALSE; + case 0x05: /* addr32 */ + WINE_FIXME("Unsupported yet call insn (0xFF 0x%02x) (addr32) at %p\n", ch, insn); + return FALSE; + default: + switch (ch & 0x07) + { + case 0x00: dst = dbg_context.Eax; break; + case 0x01: dst = dbg_context.Ecx; break; + case 0x02: dst = dbg_context.Edx; break; + case 0x03: dst = dbg_context.Ebx; break; + case 0x04: dst = dbg_context.Esp; break; + case 0x05: dst = dbg_context.Ebp; break; + case 0x06: dst = dbg_context.Esi; break; + case 0x07: dst = dbg_context.Edi; break; + } + if ((ch >> 6) != 0x03) /* indirect address */ + { + if (ch >> 6) /* we got a displacement */ + { + if (!fetch_value((const char*)insn + 2, (ch >> 6) == 0x01 ? 8 : 32, &delta)) + return FALSE; + dst += delta; + } + if (((ch >> 3) & 0x07) == 0x03) /* LCALL */ + { + if (!dbg_read_memory((const char*)dst + operand_size, &segment, sizeof(segment))) + return FALSE; + } + else segment = dbg_context.SegCs; + if (!dbg_read_memory((const char*)dst, &delta, sizeof(delta))) + return FALSE; + callee->Mode = get_selector_type(dbg_curr_thread->handle, &dbg_context, + segment); + callee->Segment = segment; + callee->Offset = delta; + } + else + { + callee->Mode = cs_addr_mode; + callee->Segment = dbg_context.SegCs; + callee->Offset = dst; + } + } + return TRUE; + case 0xCD: WINE_FIXME("Unsupported yet call insn (0x%02x) at %p\n", ch, insn); /* fall through */

1 0

Eric Pouech : winsock: Clear the held mask with the requested events so that they can be signaled .
by Alexandre Julliard Oct. 23, 2006

Oct. 23, 2006

Module: wine Branch: master Commit: e0477ce92a89ea92d184a606f74b5d2ba3043ff3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0477ce92a89ea92d184a606f… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Oct 21 08:49:40 2006 +0200 winsock: Clear the held mask with the requested events so that they can be signaled. --- server/sock.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/server/sock.c b/server/sock.c index ce63932..c1a7a8d 100644 --- a/server/sock.c +++ b/server/sock.c @@ -814,6 +814,7 @@ DECL_HANDLER(set_socket_event) FILE_WRITE_ATTRIBUTES, &sock_ops))) return; old_event = sock->event; sock->mask = req->mask; + sock->hmask &= ~req->mask; /* re-enable held events */ sock->event = NULL; sock->window = req->window; sock->message = req->msg;

1 0

Eric Pouech : advpack: Plug a couple of memory leaks.
by Alexandre Julliard Oct. 23, 2006

Oct. 23, 2006

Module: wine Branch: master Commit: ea2f60160c98456daf81b60119feecdc676d2bbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea2f60160c98456daf81b6011… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Oct 21 08:49:10 2006 +0200 advpack: Plug a couple of memory leaks. --- dlls/advpack/advpack.c | 9 +++++---- dlls/advpack/files.c | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index 154f234..4f37fad 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -710,6 +710,7 @@ HRESULT WINAPI TranslateInfStringW(LPCWS DWORD dwBufferSize, PDWORD pdwRequiredSize, PVOID pvReserved) { HINF hInf; + HRESULT hret = S_OK; TRACE("(%s, %s, %s, %s, %p, %d, %p, %p)\n", debugstr_w(pszInfFilename), debugstr_w(pszInstallSection), @@ -730,13 +731,13 @@ HRESULT WINAPI TranslateInfStringW(LPCWS pszBuffer, dwBufferSize, pdwRequiredSize)) { if (dwBufferSize < *pdwRequiredSize) - return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); - - return SPAPI_E_LINE_NOT_FOUND; + hret = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + else + hret = SPAPI_E_LINE_NOT_FOUND; } SetupCloseInfFile(hInf); - return S_OK; + return hret; } /*********************************************************************** diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c index de39bba..df7b06d 100644 --- a/dlls/advpack/files.c +++ b/dlls/advpack/files.c @@ -573,7 +573,10 @@ static LPSTR convert_file_list(LPCSTR Fi /* empty list */ if (!lstrlenA(szConvertedList)) + { + HeapFree(GetProcessHeap(), 0, szConvertedList); return NULL; + } *dwNumFiles = 1; @@ -744,6 +747,19 @@ HRESULT WINAPI ExtractFilesA(LPCSTR CabN extractDest.flags |= EXTRACT_EXTRACTFILES; res = pExtract(&extractDest, CabName); + if (extractDest.filelist) + { + struct ExtractFileList* curr = extractDest.filelist; + struct ExtractFileList* next; + + while (curr) + { + next = curr->next; + free_file_node(curr); + curr = next; + } + } + done: FreeLibrary(hCabinet); HeapFree(GetProcessHeap(), 0, szConvertedList);

1 0

Alexandre Julliard : dnsapi: Avoid non-portable types.
by Alexandre Julliard Oct. 20, 2006

Oct. 20, 2006

Module: wine Branch: master Commit: 2cb378d498b7525eb34bd163fcc77d00fe595335 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cb378d498b7525eb34bd163f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 20 14:51:44 2006 +0200 dnsapi: Avoid non-portable types. --- dlls/dnsapi/ns_parse.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/dnsapi/ns_parse.c b/dlls/dnsapi/ns_parse.c index 9580b72..6786909 100644 --- a/dlls/dnsapi/ns_parse.c +++ b/dlls/dnsapi/ns_parse.c @@ -34,6 +34,8 @@ # include <resolv.h> #endif #include <string.h> +#include "windef.h" + /* Forward. */ static void setsection(ns_msg *msg, ns_sect sect); @@ -50,18 +52,18 @@ #endif #define DNS_NS_GET16(s, cp) do { \ register const u_char *t_cp = (const u_char *)(cp); \ - (s) = ((u_int16_t)t_cp[0] << 8) \ - | ((u_int16_t)t_cp[1]) \ + (s) = ((WORD)t_cp[0] << 8) \ + | ((WORD)t_cp[1]) \ ; \ (cp) += NS_INT16SZ; \ } while (0) #define DNS_NS_GET32(l, cp) do { \ register const u_char *t_cp = (const u_char *)(cp); \ - (l) = ((u_int32_t)t_cp[0] << 24) \ - | ((u_int32_t)t_cp[1] << 16) \ - | ((u_int32_t)t_cp[2] << 8) \ - | ((u_int32_t)t_cp[3]) \ + (l) = ((DWORD)t_cp[0] << 24) \ + | ((DWORD)t_cp[1] << 16) \ + | ((DWORD)t_cp[2] << 8) \ + | ((DWORD)t_cp[3]) \ ; \ (cp) += NS_INT32SZ; \ } while (0)

1 0

Francois Gouget : wininet: HttpSendRequestW() returns ERROR_IO_PENDING when called on an async socket. But that does not mean that it failed.
by Alexandre Julliard Oct. 20, 2006

Oct. 20, 2006

Module: wine Branch: master Commit: 0a20f18a8014f3fe3b2a2a396084ad109ee47fb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a20f18a8014f3fe3b2a2a396… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 18 21:22:21 2006 +0200 wininet: HttpSendRequestW() returns ERROR_IO_PENDING when called on an async socket. But that does not mean that it failed. --- dlls/wininet/internet.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 3fe852a..92d961d 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2939,7 +2939,8 @@ HINTERNET WINAPI INTERNET_InternetOpenUr break; } HttpAddRequestHeadersW(client1, lpszHeaders, dwHeadersLength, HTTP_ADDREQ_FLAG_ADD); - if (!HttpSendRequestW(client1, NULL, 0, NULL, 0)) { + if (!HttpSendRequestW(client1, NULL, 0, NULL, 0) && + GetLastError() != ERROR_IO_PENDING) { InternetCloseHandle(client1); client1 = NULL; break;

1 0

Damjan Jovanovic : rpcrt4: Added support for RPC TCP servers.
by Alexandre Julliard Oct. 20, 2006

Oct. 20, 2006

Module: wine Branch: master Commit: 48ca62185b6606401a427db3a0ab4e718582dc76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48ca62185b6606401a427db3a… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Oct 18 18:14:11 2006 +0200 rpcrt4: Added support for RPC TCP servers. --- dlls/rpcrt4/rpc_transport.c | 164 ++++++++++++++++++++++++++++++++++++++----- 1 files changed, 146 insertions(+), 18 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 0f11bfa..f9bd4b4 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -5,6 +5,7 @@ * Copyright 2003 Mike Hearn * Copyright 2004 Filip Navara * Copyright 2006 Mike McCormack + * Copyright 2006 Damjan Jovanovic * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -48,6 +49,9 @@ #endif #ifdef HAVE_NETDB_H #include <netdb.h> #endif +#ifdef HAVE_SYS_POLL_H +#include <sys/poll.h> +#endif #include "windef.h" #include "winbase.h" @@ -448,14 +452,52 @@ typedef struct _RpcConnection_tcp { RpcConnection common; int sock; + HANDLE onEventAvailable; + HANDLE onEventHandled; + BOOL quit; } RpcConnection_tcp; +static DWORD WINAPI rpcrt4_tcp_poll_thread(LPVOID arg) +{ + RpcConnection_tcp *tcpc; + int ret; + struct pollfd pollInfo; + + tcpc = (RpcConnection_tcp*) arg; + pollInfo.fd = tcpc->sock; + pollInfo.events = POLLIN; + + while (!tcpc->quit) + { + ret = poll(&pollInfo, 1, 1000); + if (ret < 0) + ERR("poll failed with error %d\n", ret); + else + { + if (pollInfo.revents & POLLIN) + { + SignalObjectAndWait(tcpc->onEventAvailable, + tcpc->onEventHandled, INFINITE, FALSE); + } + } + } + + /* This avoids the tcpc being destroyed before we are done with it */ + SetEvent(tcpc->onEventAvailable); + + return 0; +} + static RpcConnection *rpcrt4_conn_tcp_alloc(void) { RpcConnection_tcp *tcpc; tcpc = HeapAlloc(GetProcessHeap(), 0, sizeof(RpcConnection_tcp)); - if (tcpc) - tcpc->sock = -1; + if (tcpc == NULL) + return NULL; + tcpc->sock = -1; + tcpc->onEventAvailable = NULL; + tcpc->onEventHandled = NULL; + tcpc->quit = FALSE; return &tcpc->common; } @@ -470,12 +512,6 @@ static RPC_STATUS rpcrt4_ncacn_ip_tcp_op TRACE("(%s, %s)\n", Connection->NetworkAddr, Connection->Endpoint); - if (Connection->server) - { - ERR("ncacn_ip_tcp servers not supported yet\n"); - return RPC_S_SERVER_UNAVAILABLE; - } - if (tcpc->sock != -1) return RPC_S_OK; @@ -514,14 +550,81 @@ static RPC_STATUS rpcrt4_ncacn_ip_tcp_op continue; } - if (0>connect(sock, ai_cur->ai_addr, ai_cur->ai_addrlen)) + if (Connection->server) { - WARN("connect() failed\n"); - close(sock); - continue; + HANDLE thread = NULL; + ret = bind(sock, ai_cur->ai_addr, ai_cur->ai_addrlen); + if (ret < 0) + { + WARN("bind failed, error %d\n", ret); + goto done; + } + ret = listen(sock, 10); + if (ret < 0) + { + WARN("listen failed, error %d\n", ret); + goto done; + } + /* need a non-blocking socket, otherwise accept() has a potential + * race-condition (poll() says it is readable, connection drops, + * and accept() blocks until the next connection comes...) + */ + ret = fcntl(sock, F_SETFL, O_NONBLOCK); + if (ret < 0) + { + WARN("couldn't make socket non-blocking, error %d\n", ret); + goto done; + } + tcpc->onEventAvailable = CreateEventW(NULL, FALSE, FALSE, NULL); + if (tcpc->onEventAvailable == NULL) + { + WARN("creating available event failed, error %lu\n", GetLastError()); + goto done; + } + tcpc->onEventHandled = CreateEventW(NULL, FALSE, FALSE, NULL); + if (tcpc->onEventHandled == NULL) + { + WARN("creating handled event failed, error %lu\n", GetLastError()); + goto done; + } + tcpc->sock = sock; + thread = CreateThread(NULL, 0, rpcrt4_tcp_poll_thread, tcpc, 0, NULL); + if (thread == NULL) + { + WARN("creating server polling thread failed, error %lu\n", + GetLastError()); + tcpc->sock = -1; + goto done; + } + CloseHandle(thread); + + done: + if (thread == NULL) /* ie. we failed somewhere */ + { + close(sock); + if (tcpc->onEventAvailable != NULL) + { + CloseHandle(tcpc->onEventAvailable); + tcpc->onEventAvailable = NULL; + } + if (tcpc->onEventHandled != NULL) + { + CloseHandle(tcpc->onEventHandled); + tcpc->onEventHandled = NULL; + } + continue; + } + } + else /* it's a client */ + { + if (0>connect(sock, ai_cur->ai_addr, ai_cur->ai_addrlen)) + { + WARN("connect() failed\n"); + close(sock); + continue; + } + tcpc->sock = sock; } - - tcpc->sock = sock; freeaddrinfo(ai); TRACE("connected\n"); @@ -535,14 +638,29 @@ static RPC_STATUS rpcrt4_ncacn_ip_tcp_op static HANDLE rpcrt4_conn_tcp_get_wait_handle(RpcConnection *Connection) { - assert(0); - return 0; + RpcConnection_tcp *tcpc = (RpcConnection_tcp*) Connection; + return tcpc->onEventAvailable; } static RPC_STATUS rpcrt4_conn_tcp_handoff(RpcConnection *old_conn, RpcConnection *new_conn) { - assert(0); - return RPC_S_SERVER_UNAVAILABLE; + int ret; + struct sockaddr_in address; + socklen_t addrsize; + RpcConnection_tcp *server = (RpcConnection_tcp*) old_conn; + RpcConnection_tcp *client = (RpcConnection_tcp*) new_conn; + + addrsize = sizeof(address); + ret = accept(server->sock, (struct sockaddr*) &address, &addrsize); + SetEvent(server->onEventHandled); + if (ret < 0) + { + ERR("Failed to accept a TCP connection: error %d\n", ret); + return RPC_S_SERVER_UNAVAILABLE; + } + client->sock = ret; + TRACE("Accepted a new TCP connection\n"); + return RPC_S_OK; } static int rpcrt4_conn_tcp_read(RpcConnection *Connection, @@ -568,6 +686,16 @@ static int rpcrt4_conn_tcp_close(RpcConn RpcConnection_tcp *tcpc = (RpcConnection_tcp *) Connection; TRACE("%d\n", tcpc->sock); + + if (tcpc->onEventAvailable != NULL) + { + /* it's a server connection */ + tcpc->quit = TRUE; + WaitForSingleObject(tcpc->onEventAvailable, INFINITE); + CloseHandle(tcpc->onEventAvailable); + CloseHandle(tcpc->onEventHandled); + } + if (tcpc->sock != -1) close(tcpc->sock); tcpc->sock = -1;

1 0

Eric Pouech : ntdll: Added debug support for notifying block allocation / freeing.
by Alexandre Julliard Oct. 20, 2006

Oct. 20, 2006

Module: wine Branch: master Commit: f36fb2369eb74f396e5d16c2c035fc6039279b72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f36fb2369eb74f396e5d16c2c… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Thu Oct 19 21:49:11 2006 +0200 ntdll: Added debug support for notifying block allocation / freeing. --- dlls/ntdll/heap.c | 36 +++++++++++++++++++++++++++++++++++- 1 files changed, 35 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 1c673d2..53f2695 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -174,6 +174,22 @@ static inline void clear_block( void *pt memset( ptr, 0, size ); } +/* notify that a new block of memory has been allocated for debugging purposes */ +static inline void notify_alloc( void *ptr, SIZE_T size, BOOL init ) +{ +#ifdef VALGRIND_MALLOCLIKE_BLOCK + VALGRIND_MALLOCLIKE_BLOCK( ptr, size, 0, init ); +#endif +} + +/* notify that a block of memory has been freed for debugging purposes */ +static inline void notify_free( void *ptr ) +{ +#ifdef VALGRIND_FREELIKE_BLOCK + VALGRIND_FREELIKE_BLOCK( ptr, 0 ); +#endif +} + /* locate a free list entry of the appropriate size */ /* size is the size of the whole block including the arena header */ static inline unsigned int get_freelist_index( SIZE_T size ) @@ -1181,6 +1197,8 @@ PVOID WINAPI RtlAllocateHeap( HANDLE hea HEAP_ShrinkBlock( subheap, pInUse, rounded_size ); pInUse->unused_bytes = (pInUse->size & ARENA_SIZE_MASK) - size; + notify_alloc( pInUse + 1, size, flags & HEAP_ZERO_MEMORY ); + if (flags & HEAP_ZERO_MEMORY) clear_block( pInUse + 1, pInUse->size & ARENA_SIZE_MASK ); else @@ -1237,6 +1255,8 @@ BOOLEAN WINAPI RtlFreeHeap( HANDLE heap, /* Turn the block into a free block */ + notify_free( ptr ); + HEAP_MakeInUseBlockFree( subheap, pInUse ); if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveCriticalSection( &heapPtr->critSection ); @@ -1317,7 +1337,11 @@ PVOID WINAPI RtlReAllocateHeap( HANDLE h RtlSetLastWin32ErrorAndNtStatusFromNtStatus( STATUS_NO_MEMORY ); return NULL; } + notify_free( pArena + 1 ); HEAP_ShrinkBlock( subheap, pArena, rounded_size ); + notify_alloc( pArena + 1, size, FALSE ); + /* FIXME: this is wrong as we may lose old VBits settings */ + mark_block_initialized( pArena + 1, oldSize ); } else /* Do it the hard way */ { @@ -1343,16 +1367,26 @@ PVOID WINAPI RtlReAllocateHeap( HANDLE h pInUse->magic = ARENA_INUSE_MAGIC; HEAP_ShrinkBlock( newsubheap, pInUse, rounded_size ); mark_block_initialized( pInUse + 1, oldSize ); + notify_alloc( pInUse + 1, size, FALSE ); memcpy( pInUse + 1, pArena + 1, oldSize ); /* Free the previous block */ + notify_free( pArena + 1 ); HEAP_MakeInUseBlockFree( subheap, pArena ); subheap = newsubheap; pArena = pInUse; } } - else HEAP_ShrinkBlock( subheap, pArena, rounded_size ); /* Shrink the block */ + else + { + /* Shrink the block */ + notify_free( pArena + 1 ); + HEAP_ShrinkBlock( subheap, pArena, rounded_size ); + notify_alloc( pArena + 1, size, FALSE ); + /* FIXME: this is wrong as we may lose old VBits settings */ + mark_block_initialized( pArena + 1, size ); + } pArena->unused_bytes = (pArena->size & ARENA_SIZE_MASK) - size;

1 0

Francois Gouget : Add '\n's to Wine traces.
by Alexandre Julliard Oct. 20, 2006

Oct. 20, 2006

Module: wine Branch: master Commit: 1f67fa0acff38f1da1433ccb798d759fc4b758ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f67fa0acff38f1da1433ccb7… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Oct 18 21:21:57 2006 +0200 Add '\n's to Wine traces. --- dlls/dinput/joystick_linuxinput.c | 2 +- dlls/oleaut32/tmarshal.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 04ec9d3..85d1fdf 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -1770,7 +1770,7 @@ static HRESULT WINAPI JoystickAImpl_Enum return DIERR_INVALIDPARAM; if (dwFlags != 0) - FIXME("Flags specified, but no flags exist yet (DX9)!"); + FIXME("Flags specified, but no flags exist yet (DX9)!\n"); while (itr) { (*lpCallback)(itr->ref, pvRef); diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 872f7fd..ac4d407 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -539,7 +539,7 @@ serialize_param( case VT_UI8: case VT_CY: hres = S_OK; - if (debugout) TRACE_(olerelay)("%x%x",arg[0],arg[1]); + if (debugout) TRACE_(olerelay)("%x%x\n",arg[0],arg[1]); if (writeit) hres = xbuf_add(buf,(LPBYTE)arg,8); return hres; @@ -551,27 +551,27 @@ serialize_param( case VT_R4: case VT_UI4: hres = S_OK; - if (debugout) TRACE_(olerelay)("%x",*arg); + if (debugout) TRACE_(olerelay)("%x\n",*arg); if (writeit) hres = xbuf_add(buf,(LPBYTE)arg,sizeof(DWORD)); return hres; case VT_I2: case VT_UI2: hres = S_OK; - if (debugout) TRACE_(olerelay)("%04x",*arg & 0xffff); + if (debugout) TRACE_(olerelay)("%04x\n",*arg & 0xffff); if (writeit) hres = xbuf_add(buf,(LPBYTE)arg,sizeof(DWORD)); return hres; case VT_I1: case VT_UI1: hres = S_OK; - if (debugout) TRACE_(olerelay)("%02x",*arg & 0xff); + if (debugout) TRACE_(olerelay)("%02x\n",*arg & 0xff); if (writeit) hres = xbuf_add(buf,(LPBYTE)arg,sizeof(DWORD)); return hres; case VT_I4|VT_BYREF: hres = S_OK; - if (debugout) TRACE_(olerelay)("&0x%x",*arg); + if (debugout) TRACE_(olerelay)("&0x%x\n",*arg); if (writeit) hres = xbuf_add(buf,(LPBYTE)(DWORD*)*arg,sizeof(DWORD)); /* do not dealloc at this time */ @@ -841,10 +841,10 @@ deserialize_param( while (1) { switch (tdesc->vt) { case VT_EMPTY: - if (debugout) TRACE_(olerelay)("<empty>"); + if (debugout) TRACE_(olerelay)("<empty>\n"); return S_OK; case VT_NULL: - if (debugout) TRACE_(olerelay)("<null>"); + if (debugout) TRACE_(olerelay)("<null>\n"); return S_OK; case VT_VARIANT: { VARIANT *vt = (VARIANT*)arg;

1 0

Eric Pouech : advapi32: Plug a couple of memory leaks.
by Alexandre Julliard Oct. 20, 2006

Oct. 20, 2006

Module: wine Branch: master Commit: 4dfd319dbf65537a4c58dc62eef0c7e58828edf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dfd319dbf65537a4c58dc62e… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Tue Oct 17 21:32:00 2006 +0200 advapi32: Plug a couple of memory leaks. --- dlls/advapi32/lsa.c | 72 ++++++++++++++++++++++------------------ dlls/advapi32/registry.c | 24 +++++++++---- dlls/advapi32/tests/security.c | 4 ++ 3 files changed, 60 insertions(+), 40 deletions(-) diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index 1d4323f..8c58334 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -56,15 +56,22 @@ static void dumpLsaAttributes(PLSA_OBJEC } } -static void ADVAPI_GetDomainName(UNICODE_STRING * name) +static void* ADVAPI_GetDomainName(unsigned sz, unsigned ofs) { HKEY key; BOOL useDefault = TRUE; LONG ret; + BYTE* ptr; + UNICODE_STRING* ustr; - if ((ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, - "System\\CurrentControlSet\\Services\\VxD\\VNETSUP", 0, - KEY_READ, &key)) == ERROR_SUCCESS) + static const WCHAR wVNETSUP[] = { + 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'S','e','r','v','i','c','e','s','\\', + 'V','x','D','\\','V','N','E','T','S','U','P','\0'}; + + ret = RegOpenKeyExW(HKEY_LOCAL_MACHINE, wVNETSUP, 0, KEY_READ, &key); + if (ret == ERROR_SUCCESS) { DWORD size = 0; static const WCHAR wg[] = { 'W','o','r','k','g','r','o','u','p',0 }; @@ -72,26 +79,34 @@ static void ADVAPI_GetDomainName(UNICODE ret = RegQueryValueExW(key, wg, NULL, NULL, NULL, &size); if (ret == ERROR_MORE_DATA || ret == ERROR_SUCCESS) { - name->Buffer = HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, size); - + ptr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sz + size); + if (!ptr) return NULL; + ustr = (UNICODE_STRING*)(ptr + ofs); + ustr->MaximumLength = size; + ustr->Buffer = (WCHAR*)(ptr + sz); if ((ret = RegQueryValueExW(key, wg, NULL, NULL, - (LPBYTE)name->Buffer, &size)) == ERROR_SUCCESS) + (LPBYTE)ustr->Buffer, &size)) == ERROR_SUCCESS) { - name->Length = (USHORT)(size - sizeof(WCHAR)); - name->MaximumLength = (USHORT)size; + ustr->Length = (USHORT)(size - sizeof(WCHAR)); useDefault = FALSE; } else - { - HeapFree(GetProcessHeap(), 0, name->Buffer); - name->Buffer = NULL; - } + HeapFree(GetProcessHeap(), 0, ptr); } RegCloseKey(key); } if (useDefault) - RtlCreateUnicodeStringFromAsciiz(name, "DOMAIN"); + { + static const WCHAR wDomain[] = {'D','O','M','A','I','N','\0'}; + ptr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sz + sizeof(wDomain)); + ustr = (UNICODE_STRING*)(ptr + ofs); + ustr->MaximumLength = sizeof(wDomain); + ustr->Buffer = (WCHAR*)(ptr + sz); + ustr->Length = (USHORT)(sizeof(wDomain) - sizeof(WCHAR)); + memcpy(ustr->Buffer, wDomain, sizeof(wDomain)); + } + return ptr; } /****************************************************************************** @@ -431,10 +446,8 @@ NTSTATUS WINAPI LsaQueryInformationPolic /* Only the domain name is valid for the local computer. * All other fields are zero. */ - PPOLICY_PRIMARY_DOMAIN_INFO pinfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(POLICY_PRIMARY_DOMAIN_INFO)); - - ADVAPI_GetDomainName(&pinfo->Name); + PPOLICY_PRIMARY_DOMAIN_INFO pinfo; + pinfo = ADVAPI_GetDomainName(sizeof(*pinfo), (char*)&pinfo->Name - (char*)pinfo); TRACE("setting domain to %s\n", debugstr_w(pinfo->Name.Buffer)); @@ -448,28 +461,24 @@ NTSTATUS WINAPI LsaQueryInformationPolic POLICY_ACCOUNT_DOMAIN_INFO info; SID sid; DWORD padding[3]; + WCHAR domain[MAX_COMPUTERNAME_LENGTH + 1]; }; - struct di * xdi = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*xdi)); DWORD dwSize = MAX_COMPUTERNAME_LENGTH + 1; - LPWSTR buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwSize * sizeof(WCHAR)); + struct di * xdi = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*xdi)); xdi->info.DomainName.MaximumLength = dwSize * sizeof(WCHAR); - - if (GetComputerNameW(buf, &dwSize)) - { - xdi->info.DomainName.Buffer = buf; + xdi->info.DomainName.Buffer = xdi->domain; + if (GetComputerNameW(xdi->info.DomainName.Buffer, &dwSize)) xdi->info.DomainName.Length = dwSize * sizeof(WCHAR); - } TRACE("setting name to %s\n", debugstr_w(xdi->info.DomainName.Buffer)); - xdi->info.DomainSid = &(xdi->sid); + xdi->info.DomainSid = &xdi->sid; /* read the computer SID from the registry */ - if (!ADVAPI_GetComputerSid(&(xdi->sid))) + if (!ADVAPI_GetComputerSid(&xdi->sid)) { - HeapFree(GetProcessHeap(), 0, buf); HeapFree(GetProcessHeap(), 0, xdi); WARN("Computer SID not found\n"); @@ -487,10 +496,9 @@ NTSTATUS WINAPI LsaQueryInformationPolic /* Only the domain name is valid for the local computer. * All other fields are zero. */ - PPOLICY_DNS_DOMAIN_INFO pinfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(POLICY_DNS_DOMAIN_INFO)); + PPOLICY_DNS_DOMAIN_INFO pinfo; - ADVAPI_GetDomainName(&pinfo->Name); + pinfo = ADVAPI_GetDomainName(sizeof(*pinfo), (char*)&pinfo->Name - (char*)pinfo); TRACE("setting domain to %s\n", debugstr_w(pinfo->Name.Buffer)); diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 74b3f77..162a9c3 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1887,6 +1887,7 @@ LONG WINAPI RegLoadKeyW( HKEY hkey, LPCW { OBJECT_ATTRIBUTES destkey, file; UNICODE_STRING subkeyW, filenameW; + NTSTATUS status; if (!(hkey = get_special_root_hkey(hkey))) return ERROR_INVALID_HANDLE; @@ -1906,7 +1907,9 @@ LONG WINAPI RegLoadKeyW( HKEY hkey, LPCW file.SecurityQualityOfService = NULL; RtlDosPathNameToNtPathName_U(filename, &filenameW, NULL, NULL); - return RtlNtStatusToDosError( NtLoadKey(&destkey, &file) ); + status = NtLoadKey(&destkey, &file); + RtlFreeUnicodeString(&filenameW); + return RtlNtStatusToDosError( status ); } @@ -1920,17 +1923,22 @@ LONG WINAPI RegLoadKeyA( HKEY hkey, LPCS UNICODE_STRING subkeyW, filenameW; STRING subkeyA, filenameA; NTSTATUS status; + LONG ret; RtlInitAnsiString(&subkeyA, subkey); RtlInitAnsiString(&filenameA, filename); - if ((status = RtlAnsiStringToUnicodeString(&subkeyW, &subkeyA, TRUE))) - return RtlNtStatusToDosError(status); - - if ((status = RtlAnsiStringToUnicodeString(&filenameW, &filenameA, TRUE))) - return RtlNtStatusToDosError(status); - - return RegLoadKeyW(hkey, subkeyW.Buffer, filenameW.Buffer); + RtlInitUnicodeString(&subkeyW, NULL); + RtlInitUnicodeString(&filenameW, NULL); + if (!(status = RtlAnsiStringToUnicodeString(&subkeyW, &subkeyA, TRUE)) && + !(status = RtlAnsiStringToUnicodeString(&filenameW, &filenameA, TRUE))) + { + ret = RegLoadKeyW(hkey, subkeyW.Buffer, filenameW.Buffer); + } + else ret = RtlNtStatusToDosError(status); + RtlFreeUnicodeString(&subkeyW); + RtlFreeUnicodeString(&filenameW); + return ret; } diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index e0891ad..54112d2 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -100,6 +100,7 @@ static void test_str_sid(const char *str trace(" %s: %s\n", str_sid, temp); LocalFree(temp); } + LocalFree(psid); } else { @@ -833,6 +834,7 @@ static void test_token_attr(void) pConvertSidToStringSidA(User->User.Sid, &SidString); trace("TokenUser: %s attr: 0x%08x\n", SidString, User->User.Attributes); LocalFree(SidString); + HeapFree(GetProcessHeap(), 0, User); /* privileges */ ret = GetTokenInformation(Token, TokenPrivileges, NULL, 0, &Size); @@ -1044,6 +1046,8 @@ static void test_LookupAccountSid(void) "LookupAccountSidW() Expected dom_size = %u, got %u\n", real_dom_sizeW + 1, dom_sizeW); + FreeSid(pUsersSid); + pCreateWellKnownSid = (fnCreateWellKnownSid)GetProcAddress( hmod, "CreateWellKnownSid" ); if (pCreateWellKnownSid && pConvertSidToStringSidA)

1 0

Mikołaj Zalewski : wineconsole: WM_RBUTTONDOWN lParam is in client coordinates not window coordinates.
by Alexandre Julliard Oct. 20, 2006

Oct. 20, 2006

Module: wine Branch: master Commit: a5e92410da33558e516f090f8ffafce6ae8aab7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5e92410da33558e516f090f8… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Oct 19 19:38:01 2006 +0200 wineconsole: WM_RBUTTONDOWN lParam is in client coordinates not window coordinates. --- programs/wineconsole/user.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index 7477ce4..fbb1b98 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -1175,12 +1175,14 @@ static LRESULT CALLBACK WCUSER_Proc(HWND case WM_RBUTTONDOWN: if ((wParam & (MK_CONTROL|MK_SHIFT)) == data->curcfg.menu_mask) { - RECT r; + POINT pt; - GetWindowRect(hWnd, &r); + pt.x = LOWORD(lParam); + pt.y = HIWORD(lParam); + ClientToScreen(hWnd, &pt); WCUSER_SetMenuDetails(data, PRIVATE(data)->hPopMenu); TrackPopupMenu(PRIVATE(data)->hPopMenu, TPM_LEFTALIGN|TPM_TOPALIGN, - r.left + LOWORD(lParam), r.top + HIWORD(lParam), 0, hWnd, NULL); + pt.x, pt.y, 0, hWnd, NULL); } else {

1 0