June 2008 - Wine-Commits - list.winehq.org

Jon Griffiths : dbghelp: Implement SymEnumerateSymbols64.
by Alexandre Julliard June 21, 2008

June 21, 2008

Module: wine Branch: master Commit: c6837531857e71f329aeacb53432309559a0cb3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6837531857e71f329aeacb53… Author: Jon Griffiths <jon_p_griffiths(a)yahoo.com> Date: Thu Jun 19 20:02:44 2008 -0700 dbghelp: Implement SymEnumerateSymbols64. --- dlls/dbghelp/dbghelp.spec | 2 +- dlls/dbghelp/symbol.c | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index d29b880..b95a9e7 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -48,7 +48,7 @@ @ stdcall SymEnumerateModules64(long ptr ptr) @ stdcall SymEnumerateModulesW64(long ptr ptr) @ stdcall SymEnumerateSymbols(long long ptr ptr) -@ stub SymEnumerateSymbols64 +@ stdcall SymEnumerateSymbols64(long double ptr ptr) @ stub SymEnumerateSymbolsW @ stub SymEnumerateSymbolsW64 @ stub SymFindDebugInfoFile diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 1d7edb8..f4f2d11 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1055,6 +1055,33 @@ BOOL WINAPI SymEnumerateSymbols(HANDLE hProcess, DWORD BaseOfDll, return SymEnumSymbols(hProcess, BaseOfDll, NULL, sym_enumerate_cb, &se); } +struct sym_enumerate64 +{ + void* ctx; + PSYM_ENUMSYMBOLS_CALLBACK64 cb; +}; + +static BOOL CALLBACK sym_enumerate_cb64(PSYMBOL_INFO syminfo, ULONG size, void* ctx) +{ + struct sym_enumerate64* se = (struct sym_enumerate64*)ctx; + return (se->cb)(syminfo->Name, syminfo->Address, syminfo->Size, se->ctx); +} + +/*********************************************************************** + * SymEnumerateSymbols64 (DBGHELP.@) + */ +BOOL WINAPI SymEnumerateSymbols64(HANDLE hProcess, DWORD64 BaseOfDll, + PSYM_ENUMSYMBOLS_CALLBACK64 EnumSymbolsCallback, + PVOID UserContext) +{ + struct sym_enumerate64 se; + + se.ctx = UserContext; + se.cb = EnumSymbolsCallback; + + return SymEnumSymbols(hProcess, BaseOfDll, NULL, sym_enumerate_cb64, &se); +} + /****************************************************************** * SymFromAddr (DBGHELP.@) *

1 0

Rob Shearman : widl: Fix generation of the type format string for conformant-varying structures .
by Alexandre Julliard June 21, 2008

June 21, 2008

Module: wine Branch: master Commit: bb647c9b672bf52d67fd768cafffca677f724485 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb647c9b672bf52d67fd768ca… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Jun 20 10:16:06 2008 +0100 widl: Fix generation of the type format string for conformant-varying structures. The conformance needs to be added on to the offset in the buffer so set this before calling each the writer of each class of pointer description in write_pointer_description. Pass the passed in offsets to buffer and memory to write_pointer_description_offsets in write_varying_array_pointer_descriptions. --- tools/widl/typegen.c | 30 +++++++++++++++++++----------- 1 files changed, 19 insertions(+), 11 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 41134d8..e256fa5 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1140,7 +1140,8 @@ static int write_no_repeat_pointer_descriptions( align = 0; *offset_in_memory += type_memsize(type, &align); - /* FIXME: is there a case where these two are different? */ + /* increment these separately as in the case of conformant (varying) + * structures these start at different values */ align = 0; *offset_in_buffer += type_memsize(type, &align); @@ -1159,7 +1160,8 @@ static int write_no_repeat_pointer_descriptions( { align = 0; *offset_in_memory += type_memsize(type, &align); - /* FIXME: is there a case where these two are different? */ + /* increment these separately as in the case of conformant (varying) + * structures these start at different values */ align = 0; *offset_in_buffer += type_memsize(type, &align); } @@ -1224,7 +1226,8 @@ static int write_pointer_description_offsets( align = 0; if (offset_in_memory) *offset_in_memory += type_memsize(type, &align); - /* FIXME: is there a case where these two are different? */ + /* increment these separately as in the case of conformant (varying) + * structures these start at different values */ align = 0; if (offset_in_buffer) *offset_in_buffer += type_memsize(type, &align); @@ -1287,7 +1290,8 @@ static int write_fixed_array_pointer_descriptions( align = 0; if (offset_in_memory) *offset_in_memory += type_memsize(type, &align); - /* FIXME: is there a case where these two are different? */ + /* increment these separately as in the case of conformant (varying) + * structures these start at different values */ align = 0; if (offset_in_buffer) *offset_in_buffer += type_memsize(type, &align); @@ -1350,8 +1354,6 @@ static int write_varying_array_pointer_descriptions( unsigned int align; int pointer_count = 0; - /* FIXME: do varying array searching here, but pointer searching in write_pointer_description_offsets */ - if (is_array(type) && type->length_is) { unsigned int temp = 0; @@ -1362,8 +1364,8 @@ static int write_varying_array_pointer_descriptions( if (pointer_count > 0) { unsigned int increment_size; - size_t offset_of_array_pointer_mem = 0; - size_t offset_of_array_pointer_buf = 0; + size_t offset_of_array_pointer_mem = *offset_in_memory; + size_t offset_of_array_pointer_buf = *offset_in_buffer; align = 0; increment_size = type_memsize(type->ref, &align); @@ -1412,13 +1414,19 @@ static void write_pointer_description(FILE *file, type_t *type, { size_t offset_in_buffer; size_t offset_in_memory; + size_t conformance = 0; + + if (type->type == RPC_FC_CVSTRUCT) + conformance = 8; + else if (type->type == RPC_FC_CSTRUCT || type->type == RPC_FC_CPSTRUCT) + conformance = 4; /* pass 1: search for single instance of a pointer (i.e. don't descend * into arrays) */ if (!is_array(type)) { offset_in_memory = 0; - offset_in_buffer = 0; + offset_in_buffer = conformance; write_no_repeat_pointer_descriptions( file, type, &offset_in_memory, &offset_in_buffer, typestring_offset); @@ -1426,7 +1434,7 @@ static void write_pointer_description(FILE *file, type_t *type, /* pass 2: search for pointers in fixed arrays */ offset_in_memory = 0; - offset_in_buffer = 0; + offset_in_buffer = conformance; write_fixed_array_pointer_descriptions( file, NULL, type, &offset_in_memory, &offset_in_buffer, typestring_offset); @@ -1448,7 +1456,7 @@ static void write_pointer_description(FILE *file, type_t *type, /* pass 4: search for pointers in varying arrays */ offset_in_memory = 0; - offset_in_buffer = 0; + offset_in_buffer = conformance; write_varying_array_pointer_descriptions( file, NULL, type, &offset_in_memory, &offset_in_buffer, typestring_offset);

1 0

Rob Shearman : rpcrt4: Use abrtitrary pointer identifiers when marshalling pointers instead of using pointer values .
by Alexandre Julliard June 21, 2008

June 21, 2008

Module: wine Branch: master Commit: 4bde42aaa20df0492e45a965ce05d4c20d36a62f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bde42aaa20df0492e45a965c… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Jun 20 10:15:17 2008 +0100 rpcrt4: Use abrtitrary pointer identifiers when marshalling pointers instead of using pointer values. This ensures that no information about the server memory layout is leaked to clients. --- dlls/rpcrt4/ndr_marshall.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index bdc5098..15cd292 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -110,6 +110,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); ERR("buffer overflow %d bytes\n", _Msg->Buffer - ((unsigned char *)_Msg->RpcMsg->Buffer + _Msg->BufferLength)); \ } while (0) +#define NDR_POINTER_ID_BASE 0x20000 +#define NDR_POINTER_ID(pStubMsg) (NDR_POINTER_ID_BASE + ((pStubMsg)->UniquePtrCount++) * 4) #define NDR_TABLE_SIZE 128 #define NDR_TABLE_MASK 127 @@ -1221,7 +1223,7 @@ static void PointerMarshall(PMIDL_STUB_MESSAGE pStubMsg, pointer_needs_marshaling = 1; else pointer_needs_marshaling = 0; - pointer_id = (ULONG)Pointer; + pointer_id = Pointer ? NDR_POINTER_ID(pStubMsg) : 0; TRACE("writing 0x%08x to buffer\n", pointer_id); NDR_LOCAL_UINT32_WRITE(Buffer, pointer_id); break;

1 0

Rob Shearman : rpcrt4: Initialise UniquePtrCount in NdrClientInitializeNew.
by Alexandre Julliard June 21, 2008

June 21, 2008

Module: wine Branch: master Commit: 6cf9e441ad6402672185c901dc7b86e874d798f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cf9e441ad6402672185c901d… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Jun 20 10:15:03 2008 +0100 rpcrt4: Initialise UniquePtrCount in NdrClientInitializeNew. --- dlls/rpcrt4/ndr_clientserver.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_clientserver.c b/dlls/rpcrt4/ndr_clientserver.c index 1afab2a..34d6898 100644 --- a/dlls/rpcrt4/ndr_clientserver.c +++ b/dlls/rpcrt4/ndr_clientserver.c @@ -69,6 +69,7 @@ void WINAPI NdrClientInitializeNew( PRPC_MESSAGE pRpcMessage, PMIDL_STUB_MESSAGE pStubMsg->PointerBufferMark = NULL; pStubMsg->fBufferValid = 0; pStubMsg->uFlags = 0; + pStubMsg->UniquePtrCount = 0; pStubMsg->pfnAllocate = pStubDesc->pfnAllocate; pStubMsg->pfnFree = pStubDesc->pfnFree; pStubMsg->StackTop = NULL;

1 0

Alexandre Julliard : server: Move the process pipe hangup handling into kill_process.
by Alexandre Julliard June 21, 2008

June 21, 2008

Module: wine Branch: master Commit: 24ec4a6ed7bf5c7c8edadc7da3bd5f6160a4d53d URL: http://source.winehq.org/git/wine.git/?a=commit;h=24ec4a6ed7bf5c7c8edadc7da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 20 20:42:51 2008 +0200 server: Move the process pipe hangup handling into kill_process. This ensures that it's also done correctly when a read from the pipe returns EOF. --- server/process.c | 27 +++++++++++++++------------ 1 files changed, 15 insertions(+), 12 deletions(-) diff --git a/server/process.c b/server/process.c index f427716..51ada6e 100644 --- a/server/process.c +++ b/server/process.c @@ -459,18 +459,7 @@ static void process_poll_event( struct fd *fd, int event ) struct process *process = get_fd_user( fd ); assert( process->obj.ops == &process_ops ); - if (event & (POLLERR | POLLHUP)) - { - release_object( process->msg_fd ); - process->msg_fd = NULL; - if (process->sigkill_timeout) /* already waiting for it to die */ - { - remove_timeout_user( process->sigkill_timeout ); - process->sigkill_timeout = NULL; - process_died( process ); - } - else kill_process( process, 0 ); - } + if (event & (POLLERR | POLLHUP)) kill_process( process, 0 ); else if (event & POLLIN) receive_fd( process ); } @@ -736,6 +725,20 @@ void resume_process( struct process *process ) /* kill a process on the spot */ void kill_process( struct process *process, int violent_death ) { + if (!violent_death && process->msg_fd) /* normal termination on pipe close */ + { + release_object( process->msg_fd ); + process->msg_fd = NULL; + } + + if (process->sigkill_timeout) /* already waiting for it to die */ + { + remove_timeout_user( process->sigkill_timeout ); + process->sigkill_timeout = NULL; + process_died( process ); + return; + } + if (violent_death) terminate_process( process, NULL, 1 ); else {

1 0

Rob Shearman : wininet: Fix memory leak in HTTP_DeleteCustomHeader.
by Alexandre Julliard June 21, 2008

June 21, 2008

Module: wine Branch: master Commit: 62e0a8ca38a0ab9216b0f232811280918083f1d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62e0a8ca38a0ab9216b0f2328… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Jun 20 10:14:38 2008 +0100 wininet: Fix memory leak in HTTP_DeleteCustomHeader. Free the memory associated with the field and value of the custom header otherwise it will be leaked. Found by Valgrind. --- dlls/wininet/http.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 79e3511..10fa8a5 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4141,6 +4141,9 @@ static BOOL HTTP_DeleteCustomHeader(LPWININETHTTPREQW lpwhr, DWORD index) return FALSE; lpwhr->nCustHeaders--; + HeapFree(GetProcessHeap(), 0, lpwhr->pCustHeaders[index].lpszField); + HeapFree(GetProcessHeap(), 0, lpwhr->pCustHeaders[index].lpszValue); + memmove( &lpwhr->pCustHeaders[index], &lpwhr->pCustHeaders[index+1], (lpwhr->nCustHeaders - index)* sizeof(HTTPHEADERW) ); memset( &lpwhr->pCustHeaders[lpwhr->nCustHeaders], 0, sizeof(HTTPHEADERW) );

1 0

Chris Morgan : Merge branch 'master' of git://winehq.org/git/appdb
by Chris Morgan June 20, 2008

June 20, 2008

Module: appdb Branch: master Commit: acadef265070a152f9055488a34a341cf113928a URL: http://source.winehq.org/git/appdb.git/?a=commit;h=acadef265070a152f9055488… Author: Chris Morgan <cmorgan(a)alum.wpi.edu> Date: Fri Jun 20 18:40:42 2008 -0400 Merge branch 'master' of git://winehq.org/git/appdb ---

1 0

Alexander Nicolaysen Sørnes : db_filter_ui: Show help text when users don't select a filter criterion
by Chris Morgan June 20, 2008

June 20, 2008

Module: appdb Branch: master Commit: 2c49f28671cedcea973566ee62dcfc5615f855c9 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=2c49f28671cedcea973566ee… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Jun 20 21:01:22 2008 +0200 db_filter_ui: Show help text when users don't select a filter criterion --- include/db_filter_ui.php | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/include/db_filter_ui.php b/include/db_filter_ui.php index 7fe459d..cbe69cf 100644 --- a/include/db_filter_ui.php +++ b/include/db_filter_ui.php @@ -105,6 +105,7 @@ class FilterInterface private $oFilterSet; private $aEscapeChars; private $aEscapeCharsWith; + private $sErrors; // Used to inform the user about errors (and to give advice) public function FilterInterface($sTableName = '') { @@ -112,6 +113,7 @@ class FilterInterface $this->oFilterSet = new FilterSet(query_escape_string($sTableName)); $this->aEscapeChars = array('.'); $this->aEscapeCharsWith = array('-'); + $this->sErrors = ''; } public function AddFilterObject(Filter $oFilter) @@ -358,6 +360,11 @@ class FilterInterface } $shNewItemsEditor .= 'Add new filter (You don’t have to fill out all rows.) '; + + /* Show errors, if any */ + if($this->sErrors) + $shNewItemsEditor .= "{$this->sErrors}"; + foreach($this->aFilterInfo as $oOption) { $oDummyFilter = new Filter($oOption->getColumn(), 0, ''); @@ -428,6 +435,11 @@ class FilterInterface { $oFilter = new Filter($oOption->getColumn(), $iOp, $sData); $aReturn[] = $oFilter; + } else if(!$iOp && $sData) + { + /* The user probably meant to add a filter, but forgot to seelect + a filter criterion */ + $this->sErrors .= 'You need to select a filter criterion from the drop-down list '; } }

1 0

Alexander Nicolaysen Sørnes : browse apps: Change 'Tested Wine version' to 'Wine version'
by Chris Morgan June 20, 2008

June 20, 2008

Module: appdb Branch: master Commit: 2e81a3cec6f54caf74a072ac000480a2a10aac9f URL: http://source.winehq.org/git/appdb.git/?a=commit;h=2e81a3cec6f54caf74a072ac… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Jun 20 20:48:54 2008 +0200 browse apps: Change 'Tested Wine version' to 'Wine version' --- include/application.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/application.php b/include/application.php index 6baeeaa..80bbf1b 100644 --- a/include/application.php +++ b/include/application.php @@ -1034,7 +1034,7 @@ class Application { $aWineVersions = get_bugzilla_versions(); $oFilter->AddFilterInfo('appVersion.rating', 'Rating', array(FILTER_EQUALS), FILTER_VALUES_ENUM, array('Platinum', 'Gold', 'Silver', 'Bronze', 'Garbage')); - $oFilter->AddFilterInfo('appVersion.ratingRelease', 'Tested Wine version', array(FILTER_EQUALS), FILTER_VALUES_ENUM, $aWineVersions); + $oFilter->AddFilterInfo('appVersion.ratingRelease', 'Wine version', array(FILTER_EQUALS), FILTER_VALUES_ENUM, $aWineVersions); $oFilter->AddFilterInfo('appFamily.catId', 'Category', array(FILTER_EQUALS), FILTER_VALUES_ENUM, $aCatIds, $aCatNames); $oFilter->AddFilterInfo('appVersion.license', 'License', array(FILTER_EQUALS), FILTER_VALUES_ENUM, $aLicenses); $oFilter->AddFilterInfo('appFamily.appName', 'Name', array(FILTER_CONTAINS, FILTER_STARTS_WITH, FILTER_ENDS_WITH), FILTER_VALUES_NORMAL);

1 0

Zachary Goldberg : Spelling fix in WWN 348
by Jeremy Newman June 20, 2008

June 20, 2008

Module: website Branch: master Commit: e4bff963403ad95ce26c2037d1410d42d2ec0c3b URL: http://source.winehq.org/git/website.git/?a=commit;h=e4bff963403ad95ce26c20… Author: Zachary Goldberg <zgold(a)bluesata.com> Date: Thu Jun 19 18:48:11 2008 -0400 Spelling fix in WWN 348 --Zach >From 518c54ac1dd7624b5d61a76a6524f807deb385f1 Mon Sep 17 00:00:00 2001 From: Zachary Goldberg <zgs(a)seas.upenn.edu> Date: Thu, 19 Jun 2008 18:46:35 -0400 Subject: [WineHQ][WWN] Spelling Fix in WWN 348 To: wine-patches <wine-patches(a)winehq.org>, Jeremy Newman <jnewman(a)codeweavers.com> --- wwn/en/wn20080618_348.xml | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/wwn/en/wn20080618_348.xml b/wwn/en/wn20080618_348.xml index ea1f3c7..f500ac1 100644 --- a/wwn/en/wn20080618_348.xml +++ b/wwn/en/wn20080618_348.xml @@ -684,7 +684,8 @@ Ciao, Marcus > <topic>Wine 1.0 and Bordeaux</topic> -As many of you know Steven Edwards has been a member of both the Wine and ReactOS communities for quiet a while now. He writes in with his thoughts on the Wine 1.0 process most of which are very valid points worth reading. Towards the end he also mentions a new Free Software company, Bordeaux, that he has begun which combines technologies from Wine, ReactOS, IES4Linux, Winetricks and others. +As many of you know Steven Edwards has been a member of both the Wine +and ReactOS communities for quite a while now. He writes in with his thoughts on the Wine 1.0 process most of which are very valid points worth reading. Towards the end he also mentions a new Free Software company, Bordeaux, that he has begun which combines technologies from Wine, ReactOS, IES4Linux, Winetricks and others. <quote>

1 0