January 2008 - Wine-commits

Alexandre Julliard : kernel32: Fix the system affinity returned by GetProcessAffinityMask.
by Alexandre Julliard 17 Jan '08

17 Jan '08

Module: wine Branch: master Commit: 9261c63ab307e82b3f9033f0eef22bffbf2d8bff URL: http://source.winehq.org/git/wine.git/?a=commit;h=9261c63ab307e82b3f9033f0e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 16 21:01:33 2008 +0100 kernel32: Fix the system affinity returned by GetProcessAffinityMask. --- dlls/kernel32/process.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 0cfd749..4b4d3cd 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2719,8 +2719,7 @@ BOOL WINAPI GetProcessAffinityMask( HANDLE hProcess, return FALSE; } if (lpProcessAffinityMask) *lpProcessAffinityMask = pbi.AffinityMask; - /* FIXME */ - if (lpSystemAffinityMask) *lpSystemAffinityMask = 1; + if (lpSystemAffinityMask) *lpSystemAffinityMask = (1 << NtCurrentTeb()->Peb->NumberOfProcessors) - 1; return TRUE; }

1 0

Francois Gouget : Assorted spelling fixes.
by Jeremy Newman 16 Jan '08

16 Jan '08

1 0

Lei Zhang : update link for the FAQ
by Jeremy Newman 16 Jan '08

16 Jan '08

Module: bugzilla Branch: master Commit: 25a928f3e32d774b2ee56bac81e5b62f38784abf URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=25a928f3e32d774b2ee56… Author: Lei Zhang <thestig(a)google.com> Date: Mon Jan 14 16:36:09 2008 -0800 update link for the FAQ >From 1527acc782f6b9b02bbc0b7fdd95035b0019f836 Mon Sep 17 00:00:00 2001 From: Lei Zhang <thestig(a)google.com> Date: Mon, 14 Jan 2008 16:34:29 -0800 Subject: [PATCH] [bugzilla] update link for the FAQ --- template/en/default/index.html.tmpl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl index bfff44e..ce0b867 100644 --- a/template/en/default/index.html.tmpl +++ b/template/en/default/index.html.tmpl @@ -153,7 +153,7 @@ function addSidebar() { and support</a>. </li> <li>Read the - <a href="http://www.winehq.org/site/docs/wine-faq/index">FAQ</a> to be + <a href="http://wiki.winehq.org/FAQ">FAQ</a> to be sure your issue is not listed there. </li> <li>

1 0

Luke Bratch : Add no reply warning to email template
by Jeremy Newman 16 Jan '08

16 Jan '08

Module: bugzilla Branch: master Commit: 7ab6d56123440995e124f6d3bad33e7f5f412a88 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=7ab6d56123440995e124f… Author: Luke Bratch <l_bratch(a)yahoo.co.uk> Date: Tue Jan 15 16:14:59 2008 +0000 Add no reply warning to email template --- template/en/default/email/newchangedmail.txt.tmpl | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/template/en/default/email/newchangedmail.txt.tmpl b/template/en/default/email/newchangedmail.txt.tmpl index ecdf426..7cdd4ff 100644 --- a/template/en/default/email/newchangedmail.txt.tmpl +++ b/template/en/default/email/newchangedmail.txt.tmpl @@ -44,6 +44,8 @@ X-Bugzilla-Changed-Fields: [% changedfields %] -- Configure [% terms.bug %]mail: [% Param('urlbase') %]userprefs.cgi?tab=email +Do not reply to this email, post in Bugzilla using the +above URL to reply. ------- You are receiving this mail because: ------- [% FOREACH relationship = reasons %] [% SWITCH relationship %]

1 0

Alexandre Julliard : winebuild: Don't try to use the . init section on Mac OS.
by Alexandre Julliard 16 Jan '08

16 Jan '08

Module: wine Branch: master Commit: aaf02c6f4a6105f8186b5e6b1c3179e80f213c88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaf02c6f4a6105f8186b5e6b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 16 20:27:35 2008 +0100 winebuild: Don't try to use the .init section on Mac OS. --- tools/winebuild/spec32.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 912e194..32a8299 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -358,14 +358,21 @@ void BuildSpec32File( DLLSPEC *spec ) /* Reserve some space for the PE header */ - output( "\n\t.section \".init\",\"ax\"\n" ); - output( "\tjmp 1f\n" ); - output( "__wine_spec_pe_header:\n" ); if (target_platform == PLATFORM_APPLE) - output( "\t.space %u\n", 65536 + page_size ); + { + output( "\t.text\n" ); + output( "\t.align %d\n", get_alignment(page_size) ); + output( "__wine_spec_pe_header:\n" ); + output( "\t.space 65536\n" ); + } else + { + output( "\n\t.section \".init\",\"ax\"\n" ); + output( "\tjmp 1f\n" ); + output( "__wine_spec_pe_header:\n" ); output( "\t.skip %u\n", 65536 + page_size ); - output( "1:\n" ); + output( "1:\n" ); + } /* Output the NT header */

1 0

Sin-ta Hsiea : gdi32: Fix Traditional Chinese font mapping to "PMingLiU", " MingLiU".
by Alexandre Julliard 16 Jan '08

16 Jan '08

Module: wine Branch: master Commit: e61abafbb5c45392d6b9f17760819127a8569b6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e61abafbb5c45392d6b9f1776… Author: Sin-ta Hsiea <ibmibmibm.tw(a)gmail.com> Date: Fri Jan 11 03:05:41 2008 +0800 gdi32: Fix Traditional Chinese font mapping to "PMingLiU", "MingLiU". --- dlls/gdi32/freetype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b48cbcc..3e21a45 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1998,7 +1998,7 @@ static const struct nls_update_font_list /* Chinese Traditional */ { 950, 950, "vga950.fon", "cvgafix.fon", "cvgasys.fon", "coure.fon", "serife.fon", "smalle.fon", "sserife.fon", - "Tahoma", "Times New Roman", /* FIXME unverified */ + "PMingLiU", "MingLiU", } };

1 0

Sin-ta Hsiea : winecfg: Add Traditional Chinese translation.
by Alexandre Julliard 16 Jan '08

16 Jan '08

Module: wine Branch: master Commit: 6d2e6cd6b3bb78c72e508225ab93a54d02c5e00a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d2e6cd6b3bb78c72e508225a… Author: Sin-ta Hsiea <ibmibmibm.tw(a)gmail.com> Date: Fri Jan 11 03:03:10 2008 +0800 winecfg: Add Traditional Chinese translation. --- programs/winecfg/Zh.rc | 309 +++++++++++++++++++++++++++++++++++++++++++ programs/winecfg/winecfg.rc | 1 + 2 files changed, 310 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6d2e6cd6b3bb78c72e508…

1 0

Alexandre Julliard : winmm: Load only one sound driver at a time.
by Alexandre Julliard 16 Jan '08

16 Jan '08

Module: wine Branch: master Commit: 9d3dcae1fbc2a93831928adc2dc823a76fd6015b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d3dcae1fbc2a93831928adc2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 16 19:15:25 2008 +0100 winmm: Load only one sound driver at a time. --- dlls/winmm/lolvldrv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c index f508395..22f333a 100644 --- a/dlls/winmm/lolvldrv.c +++ b/dlls/winmm/lolvldrv.c @@ -687,7 +687,7 @@ BOOL MMDRV_Init(void) char *next = strchr(p, ','); if (next) *next++ = 0; sprintf( filename, "wine%s.drv", p ); - ret |= MMDRV_Install( filename, filename, FALSE ); + if ((ret = MMDRV_Install( filename, filename, FALSE ))) break; p = next; }

1 0

Alexandre Julliard : wineboot: Add a --init option used when launched automatically at startup.
by Alexandre Julliard 16 Jan '08

16 Jan '08

Module: wine Branch: master Commit: 1d6d080d4b2dc0afbc65e3b64c8f13086dfdce48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d6d080d4b2dc0afbc65e3b64… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 16 19:23:09 2008 +0100 wineboot: Add a --init option used when launched automatically at startup. Don't execute Run entries in that case. --- dlls/kernel32/process.c | 2 +- programs/wineboot/wineboot.c | 18 +++++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 691e0a7..0cfd749 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -790,7 +790,7 @@ static HANDLE start_wineboot(void) } if (GetLastError() != ERROR_ALREADY_EXISTS) /* we created it */ { - static const WCHAR command_line[] = {'\\','w','i','n','e','b','o','o','t','.','e','x','e',0}; + static const WCHAR command_line[] = {'\\','w','i','n','e','b','o','o','t','.','e','x','e',' ','-','-','i','n','i','t',0}; STARTUPINFOW si; PROCESS_INFORMATION pi; WCHAR cmdline[MAX_PATH + sizeof(command_line)/sizeof(WCHAR)]; diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 843bfaa..23735dc 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -666,18 +666,20 @@ static void usage(void) WINE_MESSAGE( " -h,--help Display this help message\n" ); WINE_MESSAGE( " -e,--end-session End the current session cleanly\n" ); WINE_MESSAGE( " -f,--force Force exit for processes that don't exit cleanly\n" ); + WINE_MESSAGE( " -i,--init Perform initialization for first Wine instance\n" ); WINE_MESSAGE( " -k,--kill Kill running processes without any cleanup\n" ); WINE_MESSAGE( " -r,--restart Restart only, don't do normal startup operations\n" ); WINE_MESSAGE( " -s,--shutdown Shutdown only, don't reboot\n" ); } -static const char short_options[] = "efhkrs"; +static const char short_options[] = "efhikrs"; static const struct option long_options[] = { { "help", 0, 0, 'h' }, { "end-session", 0, 0, 'e' }, { "force", 0, 0, 'f' }, + { "init" , 0, 0, 'i' }, { "kill", 0, 0, 'k' }, { "restart", 0, 0, 'r' }, { "shutdown", 0, 0, 's' }, @@ -691,7 +693,7 @@ int main( int argc, char *argv[] ) /* First, set the current directory to SystemRoot */ int optc; - int end_session = 0, force = 0, kill = 0, restart = 0, shutdown = 0; + int end_session = 0, force = 0, init = 0, kill = 0, restart = 0, shutdown = 0; HANDLE event; GetWindowsDirectoryW( windowsdir, MAX_PATH ); @@ -705,8 +707,9 @@ int main( int argc, char *argv[] ) { switch(optc) { - case 'e': end_session = 1; break; + case 'e': end_session = kill = 1; break; case 'f': force = 1; break; + case 'i': init = 1; break; case 'k': kill = 1; break; case 'r': restart = 1; break; case 's': shutdown = 1; break; @@ -720,7 +723,7 @@ int main( int argc, char *argv[] ) if (!shutdown_close_windows( force )) return 1; } - if (end_session || kill) kill_processes( shutdown ); + if (kill) kill_processes( shutdown ); if (shutdown) return 0; @@ -732,13 +735,14 @@ int main( int argc, char *argv[] ) ProcessWindowsFileProtection(); ProcessRunKeys( HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUNSERVICESONCE], TRUE, FALSE ); - if (!restart) + if (init || (kill && !restart)) { ProcessRunKeys( HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUNSERVICES], FALSE, FALSE ); start_services(); } ProcessRunKeys( HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUNONCE], TRUE, TRUE ); - if (!restart) + + if (!init && !restart) { ProcessRunKeys( HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUN], FALSE, FALSE ); ProcessRunKeys( HKEY_CURRENT_USER, runkeys_names[RUNKEY_RUN], FALSE, FALSE ); @@ -751,6 +755,6 @@ int main( int argc, char *argv[] ) /* FIXME: the wait is needed to keep services running */ /* it should be removed once we have a proper services.exe */ - WaitForSingleObject( __wine_make_process_system(), INFINITE ); + if (!restart) WaitForSingleObject( __wine_make_process_system(), INFINITE ); return 0; }

1 0

Alexandre Julliard : wineboot: Delay import the dlls that are not needed for the default initialisation.
by Alexandre Julliard 16 Jan '08

16 Jan '08

Module: wine Branch: master Commit: 8c06ba6fd8e3845e3b92239168a529c2f4b0e96d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c06ba6fd8e3845e3b9223916… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 16 19:51:20 2008 +0100 wineboot: Delay import the dlls that are not needed for the default initialisation. --- programs/wineboot/Makefile.in | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/wineboot/Makefile.in b/programs/wineboot/Makefile.in index 8d69026..a9db582 100644 --- a/programs/wineboot/Makefile.in +++ b/programs/wineboot/Makefile.in @@ -4,7 +4,8 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = wineboot.exe APPMODE = -mconsole -IMPORTS = shell32 shlwapi version user32 advapi32 kernel32 ntdll +IMPORTS = advapi32 kernel32 ntdll +DELAYIMPORTS = shell32 shlwapi version user32 EXTRALIBS = -luuid C_SRCS = \

1 0