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

Robert Shearman : wcmd: Use PACKAGE_VERSION as the wcmd version.
by Alexandre Julliard March 20, 2006

March 20, 2006

Module: wine Branch: refs/heads/master Commit: 6291ad6ca1883aaa328a0ad14365d7553180c3c7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6291ad6ca1883aaa328a0ad… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Mar 18 16:10:36 2006 +0000 wcmd: Use PACKAGE_VERSION as the wcmd version. --- programs/wcmd/wcmdmain.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/wcmd/wcmdmain.c b/programs/wcmd/wcmdmain.c index 644ebc1..6bc9272 100644 --- a/programs/wcmd/wcmdmain.c +++ b/programs/wcmd/wcmdmain.c @@ -24,6 +24,7 @@ * - Lots of functionality missing from builtins */ +#include "config.h" #include "wcmd.h" const char * const inbuilt[] = {"ATTRIB", "CALL", "CD", "CHDIR", "CLS", "COPY", "CTTY", @@ -38,7 +39,7 @@ DWORD errorlevel; int echo_mode = 1, verify_mode = 0; const char nyi[] = "Not Yet Implemented\n\n"; const char newline[] = "\n"; -const char version_string[] = "WCMD Version 0.17\n\n"; +const char version_string[] = "WCMD Version " PACKAGE_VERSION "\n\n"; const char anykey[] = "Press Return key to continue: "; char quals[MAX_PATH], param1[MAX_PATH], param2[MAX_PATH]; BATCH_CONTEXT *context = NULL;

1 0

Robert Shearman : ole: Use the thread pool for executing RPC calls for better performance
by Alexandre Julliard March 20, 2006

March 20, 2006

Module: wine Branch: refs/heads/master Commit: 650ac14219ea9ee286e9d537e75b0deb77f1b434 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=650ac14219ea9ee286e9d53… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Mar 18 16:09:53 2006 +0000 ole: Use the thread pool for executing RPC calls for better performance (after the thread pool has been improved). --- dlls/ole32/rpc.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 3c5f3ea..6715f72 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -220,12 +220,14 @@ static HRESULT WINAPI ServerRpcChannelBu static DWORD WINAPI rpc_sendreceive_thread(LPVOID param) { struct dispatch_params *data = (struct dispatch_params *) param; - + /* FIXME: trap and rethrow RPC exceptions in app thread */ data->status = I_RpcSendReceive((RPC_MESSAGE *)data->msg); TRACE("completed with status 0x%lx\n", data->status); - + + SetEvent(data->handle); + return 0; } @@ -249,7 +251,6 @@ static HRESULT WINAPI ClientRpcChannelBu RPC_STATUS status; DWORD index; struct dispatch_params *params; - DWORD tid; APARTMENT *apt = NULL; IPID ipid; @@ -279,10 +280,9 @@ static HRESULT WINAPI ClientRpcChannelBu RpcBindingInqObject(msg->Handle, &ipid); hr = ipid_get_dispatch_params(&ipid, &apt, &params->stub, &params->chan); + params->handle = CreateEventW(NULL, FALSE, FALSE, NULL); if ((hr == S_OK) && !apt->multi_threaded) { - params->handle = CreateEventW(NULL, FALSE, FALSE, NULL); - TRACE("Calling apartment thread 0x%08lx...\n", apt->tid); if (!PostMessageW(apartment_getwindow(apt), DM_EXECUTERPC, 0, (LPARAM)params)) @@ -309,10 +309,9 @@ static HRESULT WINAPI ClientRpcChannelBu * and re-enter this STA from an incoming server thread will * deadlock. InstallShield is an example of that. */ - params->handle = CreateThread(NULL, 0, rpc_sendreceive_thread, params, 0, &tid); - if (!params->handle) + if (!QueueUserWorkItem(rpc_sendreceive_thread, params, WT_EXECUTEDEFAULT)) { - ERR("Could not create RpcSendReceive thread, error %lx\n", GetLastError()); + ERR("QueueUserWorkItem failed with error %lx\n", GetLastError()); hr = E_UNEXPECTED; } else

1 0

appdb/include version.php
by WineHQ March 19, 2006

March 19, 2006

ChangeSet ID: 23642 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/03/19 12:06:18 Modified files: include : version.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Print application names correctly when versions are deleted. $this->appId should have been $this->iAppId. Patch: http://cvs.winehq.org/patch.py?id=23642 Old revision New revision Changes Path 1.49 1.50 +1 -1 appdb/include/version.php Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.49 appdb/include/version.php:1.50 --- appdb/include/version.php:1.49 19 Mar 2006 18: 6:18 -0000 +++ appdb/include/version.php 19 Mar 2006 18: 6:18 -0000 @@ -416,7 +416,7 @@ class Version { { if($this->iSubmitterId) { - $oApp = new Application($this->appId); + $oApp = new Application($this->iAppId); $oSubmitter = new User($this->iSubmitterId); switch($sAction) {

1 0

Alexandre Julliard : wineprefixcreate: Autodetect the running from build tree case.
by Alexandre Julliard March 18, 2006

March 18, 2006

Module: wine Branch: refs/heads/master Commit: c33fbc0df8228b062c60294e5de645a9184f87a7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c33fbc0df8228b062c60294… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 17 12:34:50 2006 +0100 wineprefixcreate: Autodetect the running from build tree case. --- tools/wineprefixcreate.in | 66 +++++++++++++++++++++++---------------------- 1 files changed, 33 insertions(+), 33 deletions(-) diff --git a/tools/wineprefixcreate.in b/tools/wineprefixcreate.in index 3effdb5..8a7e6d8 100644 --- a/tools/wineprefixcreate.in +++ b/tools/wineprefixcreate.in @@ -29,7 +29,6 @@ usage() echo " -h, --help Display this message" echo " --prefix <dir> Directory to create (default: \$WINEPREFIX or ~/.wine)" echo " -q, --quiet Don't print status messages" - echo " --use-wine-tree <dir> Run from the Wine build tree <dir>" echo " -w, --wait Wait for the wineserver to exit before returning" echo "" } @@ -65,6 +64,38 @@ datadir="$bindir/@bintodatadir@" do_wait=0 quiet=0 +if [ ! -f "$dlldir/ntdll.dll.so" -a \ + -x "$bindir/../server/wineserver" -a \ + -f "$bindir/../dlls/ntdll/ntdll.dll.so" ] +then + # running from the wine source tree + topdir=`cd "$bindir/.." && pwd` + WINELOADER="$topdir/wine" + WINESERVER="$topdir/server/wineserver" + if [ -n "$LD_LIBRARY_PATH" ] + then + LD_LIBRARY_PATH="$topdir/libs:$LD_LIBRARY_PATH" + else + LD_LIBRARY_PATH="$topdir/libs" + fi + export LD_LIBRARY_PATH + + # find the source directory + link=`readlink "$WINELOADER"` + if [ -z "$link" ] + then + topsrcdir="$topdir" + else + link=`dirname "$link"` + case "$link" in + /*) topsrcdir=`cd "$link/.." && pwd` ;; + *) topsrcdir=`cd "$topdir/$link/.." && pwd` ;; + esac + fi + dlldir="$topdir/programs" + datadir="$topsrcdir/tools" +fi + while [ $# -gt 0 ] do case "$1" in @@ -85,38 +116,7 @@ do shift ;; --use-wine-tree) - topdir=`cd "$2" && pwd` - if [ -x "$topdir/server/wineserver" ] - then - WINELOADER="$topdir/wine" - WINESERVER="$topdir/server/wineserver" - if [ -n "$LD_LIBRARY_PATH" ] - then - LD_LIBRARY_PATH="$topdir/libs:$LD_LIBRARY_PATH" - else - LD_LIBRARY_PATH="$topdir/libs" - fi - export LD_LIBRARY_PATH - - # find the source directory - link=`readlink "$WINELOADER"` - if [ -z "$link" ] - then - topsrcdir="$topdir" - else - link=`dirname "$link"` - case "$link" in - /*) topsrcdir=`cd "$link/.." && pwd` ;; - *) topsrcdir=`cd "$topdir/$link/.." && pwd` ;; - esac - fi - - dlldir="$topdir/programs" - datadir="$topsrcdir/tools" - else - echo "$2 is not a valid Wine build tree" - exit 1 - fi + # ignored, autodetected now shift 2 ;; *)

1 0

Alexandre Julliard : setupapi: Added support for calling executables in a RegisterDlls section.
by Alexandre Julliard March 18, 2006

March 18, 2006

Module: wine Branch: refs/heads/master Commit: c67728f7c67f5b847d4d145aeaf62ba84a0258f2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c67728f7c67f5b847d4d145… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 17 23:08:27 2006 +0100 setupapi: Added support for calling executables in a RegisterDlls section. --- dlls/setupapi/install.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 40 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 4cdfdcf..43544da 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -444,6 +444,7 @@ static BOOL do_register_dll( const struc HMODULE module; HRESULT res; SP_REGISTER_CONTROL_STATUSW status; + IMAGE_NT_HEADERS *nt; status.cbSize = sizeof(status); status.FileName = path; @@ -473,6 +474,45 @@ static BOOL do_register_dll( const struc goto done; } + if ((nt = RtlImageNtHeader( module )) && !(nt->FileHeader.Characteristics & IMAGE_FILE_DLL)) + { + /* file is an executable, not a dll */ + STARTUPINFOW startup; + PROCESS_INFORMATION info; + WCHAR *cmd_line; + BOOL res; + static const WCHAR format[] = {'"','%','s','"',' ','%','s',0}; + static const WCHAR default_args[] = {'/','R','e','g','S','e','r','v','e','r',0}; + + FreeLibrary( module ); + module = NULL; + if (!args) args = default_args; + cmd_line = HeapAlloc( GetProcessHeap(), 0, (strlenW(path) + strlenW(args) + 4) * sizeof(WCHAR) ); + sprintfW( cmd_line, format, path, args ); + memset( &startup, 0, sizeof(startup) ); + startup.cb = sizeof(startup); + TRACE( "executing %s\n", debugstr_w(cmd_line) ); + res = CreateProcessW( NULL, cmd_line, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info ); + HeapFree( GetProcessHeap(), 0, cmd_line ); + if (!res) + { + status.FailureCode = SPREG_LOADLIBRARY; + status.Win32Error = GetLastError(); + goto done; + } + CloseHandle( info.hThread ); + + if (WaitForSingleObject( info.hProcess, timeout*1000 ) == WAIT_TIMEOUT) + { + /* timed out, kill the process */ + TerminateProcess( info.hProcess, 1 ); + status.FailureCode = SPREG_TIMEOUT; + status.Win32Error = ERROR_TIMEOUT; + } + CloseHandle( info.hProcess ); + goto done; + } + if (flags & FLG_REGSVR_DLLREGISTER) { const char *entry_point = info->unregister ? "DllUnregisterServer" : "DllRegisterServer";

1 0

Alexandre Julliard : ntdll: In MODULE_FlushModrefs, also free dlls that haven't been initialized yet.
by Alexandre Julliard March 18, 2006

March 18, 2006

Module: wine Branch: refs/heads/master Commit: ac6025131263c9317f775513ab9b5ebcd250e7e6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ac6025131263c9317f77551… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 18 18:41:21 2006 +0100 ntdll: In MODULE_FlushModrefs, also free dlls that haven't been initialized yet. --- dlls/ntdll/loader.c | 71 ++++++++++++++++++++++++++++++++------------------- 1 files changed, 44 insertions(+), 27 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index cdd860c..efc2bed 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1877,6 +1877,39 @@ void WINAPI LdrShutdownThread(void) RtlLeaveCriticalSection( &loader_section ); } + +/*********************************************************************** + * free_modref + * + */ +static void free_modref( WINE_MODREF *wm ) +{ + RemoveEntryList(&wm->ldr.InLoadOrderModuleList); + RemoveEntryList(&wm->ldr.InMemoryOrderModuleList); + if (wm->ldr.InInitializationOrderModuleList.Flink) + RemoveEntryList(&wm->ldr.InInitializationOrderModuleList); + + TRACE(" unloading %s\n", debugstr_w(wm->ldr.FullDllName.Buffer)); + if (!TRACE_ON(module)) + TRACE_(loaddll)("Unloaded module %s : %s\n", + debugstr_w(wm->ldr.FullDllName.Buffer), + (wm->ldr.Flags & LDR_WINE_INTERNAL) ? "builtin" : "native" ); + + SERVER_START_REQ( unload_dll ) + { + req->base = wm->ldr.BaseAddress; + wine_server_call( req ); + } + SERVER_END_REQ; + + NtUnmapViewOfSection( NtCurrentProcess(), wm->ldr.BaseAddress ); + if (wm->ldr.Flags & LDR_WINE_INTERNAL) wine_dll_unload( wm->ldr.SectionHandle ); + if (cached_modref == wm) cached_modref = NULL; + RtlFreeUnicodeString( &wm->ldr.FullDllName ); + RtlFreeHeap( GetProcessHeap(), 0, wm->deps ); + RtlFreeHeap( GetProcessHeap(), 0, wm ); +} + /*********************************************************************** * MODULE_FlushModrefs * @@ -1894,36 +1927,20 @@ static void MODULE_FlushModrefs(void) mark = &NtCurrentTeb()->Peb->LdrData->InInitializationOrderModuleList; for (entry = mark->Blink; entry != mark; entry = prev) { - mod = CONTAINING_RECORD(entry, LDR_MODULE, - InInitializationOrderModuleList); + mod = CONTAINING_RECORD(entry, LDR_MODULE, InInitializationOrderModuleList); wm = CONTAINING_RECORD(mod, WINE_MODREF, ldr); - prev = entry->Blink; - if (mod->LoadCount) continue; - - RemoveEntryList(&mod->InLoadOrderModuleList); - RemoveEntryList(&mod->InMemoryOrderModuleList); - RemoveEntryList(&mod->InInitializationOrderModuleList); - - TRACE(" unloading %s\n", debugstr_w(mod->FullDllName.Buffer)); - if (!TRACE_ON(module)) - TRACE_(loaddll)("Unloaded module %s : %s\n", - debugstr_w(mod->FullDllName.Buffer), - (wm->ldr.Flags & LDR_WINE_INTERNAL) ? "builtin" : "native" ); - - SERVER_START_REQ( unload_dll ) - { - req->base = mod->BaseAddress; - wine_server_call( req ); - } - SERVER_END_REQ; + if (!mod->LoadCount) free_modref( wm ); + } - NtUnmapViewOfSection( NtCurrentProcess(), mod->BaseAddress ); - if (wm->ldr.Flags & LDR_WINE_INTERNAL) wine_dll_unload( wm->ldr.SectionHandle ); - if (cached_modref == wm) cached_modref = NULL; - RtlFreeUnicodeString( &mod->FullDllName ); - RtlFreeHeap( GetProcessHeap(), 0, wm->deps ); - RtlFreeHeap( GetProcessHeap(), 0, wm ); + /* check load order list too for modules that haven't been initialized yet */ + mark = &NtCurrentTeb()->Peb->LdrData->InLoadOrderModuleList; + for (entry = mark->Blink; entry != mark; entry = prev) + { + mod = CONTAINING_RECORD(entry, LDR_MODULE, InLoadOrderModuleList); + wm = CONTAINING_RECORD(mod, WINE_MODREF, ldr); + prev = entry->Blink; + if (!mod->LoadCount) free_modref( wm ); } }

1 0

Mike McCormack : Prevent the use of windowsx.h with Wine source.
by Alexandre Julliard March 18, 2006

March 18, 2006

Module: wine Branch: refs/heads/master Commit: 9d9bb6a81054322acdd11ea2f10e983500a70803 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9d9bb6a81054322acdd11ea… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sat Mar 18 10:18:04 2006 +0900 Prevent the use of windowsx.h with Wine source. --- include/windowsx.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/windowsx.h b/include/windowsx.h index 6bd3a2a..57074e5 100644 --- a/include/windowsx.h +++ b/include/windowsx.h @@ -22,6 +22,11 @@ extern "C" { #endif +#ifdef __WINESRC__ +/* This file contains macros that cause warnings on gcc 4.1, so avoid it. */ +#error Please avoid use of windowsx.h in Wine source code. +#endif + #ifndef SNDMSG #ifdef __cplusplus #define SNDMSG ::SendMessage

1 0

Mike McCormack : winefile: Eliminate use of windowsx.h.
by Alexandre Julliard March 18, 2006

March 18, 2006

Module: wine Branch: refs/heads/master Commit: 3b397e507955b01d8d324800e4e7aafada02443b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3b397e507955b01d8d32480… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sat Mar 18 00:57:16 2006 +0900 winefile: Eliminate use of windowsx.h. --- programs/winefile/winefile.c | 157 ++++++++++++++++++++++-------------------- programs/winefile/winefile.h | 3 - 2 files changed, 85 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=3b397e507955b01d8d3…

1 0

Eric Pouech : dbghelp: MSC fixes.
by Alexandre Julliard March 18, 2006

March 18, 2006

Module: wine Branch: refs/heads/master Commit: 12eb665402a13e91e2a91b431ca287311743d724 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=12eb665402a13e91e2a91b4… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Mar 18 13:33:20 2006 +0100 dbghelp: MSC fixes. - wrong cut & paste across versions of a given record type - wrong definition for register_v2 --- dlls/dbghelp/msc.c | 2 +- dlls/dbghelp/mscvpdb.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 734cb5f..4862e24 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -629,7 +629,7 @@ static int codeview_add_type_struct_fiel leaf_len = numeric_leaf(&value, &type->member_v3.offset); c_name = (const char*)&type->member_v3.offset + leaf_len; - codeview_add_udt_element(ctp, symt, c_name, value, type->member_v2.type); + codeview_add_udt_element(ctp, symt, c_name, value, type->member_v3.type); ptr += 2 + 2 + 4 + leaf_len + (strlen(c_name) + 1); break; diff --git a/dlls/dbghelp/mscvpdb.h b/dlls/dbghelp/mscvpdb.h index 01796dd..a63918a 100644 --- a/dlls/dbghelp/mscvpdb.h +++ b/dlls/dbghelp/mscvpdb.h @@ -1000,7 +1000,7 @@ union codeview_symbol short int len; /* Total length of this entry */ short int id; /* Always S_REGISTER_V2 */ unsigned int type; /* check whether type & reg are correct */ - unsigned int reg; + unsigned short reg; struct p_string p_name; /* don't handle register tracking */ } register_v2;

1 0

Eric Pouech : dbghelp: Support for LF_VTSHAPE in MSC.
by Alexandre Julliard March 18, 2006

March 18, 2006

Module: wine Branch: refs/heads/master Commit: 7eefc9eb0d853ad8d513ae5d66bff9afd83f515e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7eefc9eb0d853ad8d513ae5… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Mar 18 13:33:16 2006 +0100 dbghelp: Support for LF_VTSHAPE in MSC. - added preliminary support for VT (virtual table) shape type record - as we don't do C++, it's just a hack to get rid of some errors --- dlls/dbghelp/msc.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index b181af2..734cb5f 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1009,6 +1009,15 @@ static struct symt* codeview_parse_one_t type->mfunction_v2.call); break; + case LF_VTSHAPE_V1: + /* this is an ugly hack... FIXME when we have C++ support */ + if (!(symt = existing)) + { + char buf[128]; + snprintf(buf, sizeof(buf), "__internal_vt_shape_%x\n", curr_type); + symt = &symt_new_udt(ctp->module, buf, 0, UdtStruct)->symt; + } + break; default: FIXME("Unsupported type-id leaf %x\n", type->generic.id); dump(type, 2 + type->generic.len);

1 0