September 2010 - Wine-commits

André Hentschel : server: Add ARM support.
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: ccaeb3ed834f99e5c818c7d3da47abba8d632de8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccaeb3ed834f99e5c818c7d3d… Author: André Hentschel <webmaster(a)dawncrow.de> Date: Sat Sep 18 18:03:56 2010 +0200 server: Add ARM support. --- include/wine/server_protocol.h | 6 ++++-- server/protocol.def | 4 +++- server/thread.c | 6 ++++++ server/trace.c | 8 ++++++++ 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index b699956..4c5bc6e 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -129,7 +129,7 @@ typedef union enum cpu_type { - CPU_x86, CPU_x86_64, CPU_ALPHA, CPU_POWERPC, CPU_SPARC + CPU_x86, CPU_x86_64, CPU_ALPHA, CPU_POWERPC, CPU_ARM, CPU_SPARC }; typedef int cpu_type_t; @@ -146,6 +146,7 @@ typedef struct struct { unsigned __int64 fir; unsigned int psr, __pad; } alpha_regs; struct { unsigned int iar, msr, ctr, lr, dar, dsisr, trap, __pad; } powerpc_regs; + struct { unsigned int sp, lr, pc, cpsr; } arm_regs; struct { unsigned int psr, pc, npc, y, wim, tbr; } sparc_regs; } ctl; union @@ -156,6 +157,7 @@ typedef struct struct { unsigned __int64 v0, t0, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, s0, s1, s2, s3, s4, s5, s6, a0, a1, a2, a3, a4, a5, at; } alpha_regs; struct { unsigned int gpr[32], cr, xer; } powerpc_regs; + struct { unsigned int r[13]; } arm_regs; struct { unsigned int g[8], o[8], l[8], i[8]; } sparc_regs; } integer; union @@ -5515,6 +5517,6 @@ union generic_reply struct set_cursor_reply set_cursor_reply; }; -#define SERVER_PROTOCOL_VERSION 408 +#define SERVER_PROTOCOL_VERSION 409 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index e3e078d..660981f 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -145,7 +145,7 @@ typedef union /* supported CPU types */ enum cpu_type { - CPU_x86, CPU_x86_64, CPU_ALPHA, CPU_POWERPC, CPU_SPARC + CPU_x86, CPU_x86_64, CPU_ALPHA, CPU_POWERPC, CPU_ARM, CPU_SPARC }; typedef int cpu_type_t; @@ -162,6 +162,7 @@ typedef struct struct { unsigned __int64 fir; unsigned int psr, __pad; } alpha_regs; struct { unsigned int iar, msr, ctr, lr, dar, dsisr, trap, __pad; } powerpc_regs; + struct { unsigned int sp, lr, pc, cpsr; } arm_regs; struct { unsigned int psr, pc, npc, y, wim, tbr; } sparc_regs; } ctl; /* selected by SERVER_CTX_CONTROL */ union @@ -172,6 +173,7 @@ typedef struct struct { unsigned __int64 v0, t0, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, s0, s1, s2, s3, s4, s5, s6, a0, a1, a2, a3, a4, a5, at; } alpha_regs; struct { unsigned int gpr[32], cr, xer; } powerpc_regs; + struct { unsigned int r[13]; } arm_regs; struct { unsigned int g[8], o[8], l[8], i[8]; } sparc_regs; } integer; /* selected by SERVER_CTX_INTEGER */ union diff --git a/server/thread.c b/server/thread.c index a1d2d4b..05e4121 100644 --- a/server/thread.c +++ b/server/thread.c @@ -63,6 +63,8 @@ static const unsigned int supported_cpus = CPU_FLAG(CPU_ALPHA); static const unsigned int supported_cpus = CPU_FLAG(CPU_POWERPC); #elif defined(__sparc__) static const unsigned int supported_cpus = CPU_FLAG(CPU_SPARC); +#elif defined(__arm__) +static const unsigned int supported_cpus = CPU_FLAG(CPU_ARM); #else #error Unsupported CPU #endif @@ -1000,6 +1002,7 @@ static unsigned int get_context_system_regs( enum cpu_type cpu ) case CPU_x86_64: return SERVER_CTX_DEBUG_REGISTERS; case CPU_ALPHA: return 0; case CPU_POWERPC: return 0; + case CPU_ARM: return 0; case CPU_SPARC: return 0; } return 0; @@ -1033,6 +1036,9 @@ void break_thread( struct thread *thread ) case CPU_SPARC: data.exception.address = thread->context->ctl.sparc_regs.pc; break; + case CPU_ARM: + data.exception.address = thread->context->ctl.arm_regs.pc; + break; } generate_debug_event( thread, EXCEPTION_DEBUG_EVENT, &data ); thread->debug_break = 0; diff --git a/server/trace.c b/server/trace.c index 6f0e01e..1d8233b 100644 --- a/server/trace.c +++ b/server/trace.c @@ -569,6 +569,14 @@ static void dump_varargs_context( const char *prefix, data_size_t size ) fprintf( stderr, ",fpscr=%g", ctx.fp.powerpc_regs.fpscr ); } break; + case CPU_ARM: + if (ctx.flags & SERVER_CTX_CONTROL) + fprintf( stderr, ",sp=%08x,lr=%08x,pc=%08x,cpsr=%08x", + ctx.ctl.arm_regs.sp, ctx.ctl.arm_regs.lr, + ctx.ctl.arm_regs.pc, ctx.ctl.arm_regs.cpsr ); + if (ctx.flags & SERVER_CTX_INTEGER) + for (i = 0; i < 13; i++) fprintf( stderr, ",r%u=%08x", i, ctx.integer.arm_regs.r[i] ); + break; case CPU_SPARC: if (ctx.flags & SERVER_CTX_CONTROL) fprintf( stderr, ",psr=%08x,pc=%08x,npc=%08x,y=%08x,wim=%08x,tbr=%08x",

1 0

Alexandre Julliard : configure: Regenerate with autoconf 2.67.
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: a53c44a613ed1be0cd61a802123c85f2cbd0d0db URL: http://source.winehq.org/git/wine.git/?a=commit;h=a53c44a613ed1be0cd61a8021… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Sep 19 12:27:24 2010 +0200 configure: Regenerate with autoconf 2.67. --- configure | 598 +++++++++++++++++++++++++++++++------------------------------ 1 files changed, 302 insertions(+), 296 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a53c44a613ed1be0cd61a…

1 0

Alexandre Julliard : makefiles: Add a standard header for all makefiles to replace the common variable initializations .
by Alexandre Julliard 20 Sep '10

20 Sep '10

1 0

Alexandre Julliard : makefiles: Rename the SRCDIR, TOPSRCDIR and TOPOBJDIR variables to follow autoconf conventions.
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: bd9852cd6f9c4080a283a2bee71ea38ae6ea7029 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd9852cd6f9c4080a283a2bee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Sep 19 12:40:12 2010 +0200 makefiles: Rename the SRCDIR, TOPSRCDIR and TOPOBJDIR variables to follow autoconf conventions. --- Make.rules.in | 8 ++-- Make.vars.in | 26 ++++++------ Makefile.in | 14 +++--- Maketest.rules.in | 4 +- aclocal.m4 | 10 ++-- configure | 24 ++++++------ configure.ac | 14 +++--- dlls/Makedll.rules.in | 16 ++++---- dlls/crtdll/Makefile.in | 2 +- dlls/msvcp90/Makefile.in | 2 +- dlls/msvcp90/tests/Makefile.in | 2 +- dlls/msvcr100/Makefile.in | 2 +- dlls/msvcr90/Makefile.in | 2 +- dlls/msvcr90/tests/Makefile.in | 2 +- dlls/msvcrt/tests/Makefile.in | 2 +- dlls/msvcrtd/Makefile.in | 2 +- dlls/msvcrtd/tests/Makefile.in | 2 +- dlls/shell32/Makefile.in | 4 +- dlls/wineps.drv/Makefile.in | 2 +- documentation/Makefile.in | 2 +- fonts/Makefile.in | 80 ++++++++++++++++++++-------------------- include/Makefile.in | 6 +- libs/wine/Makefile.in | 10 ++-- programs/notepad/Makefile.in | 2 +- programs/regedit/Makefile.in | 2 +- programs/taskmgr/Makefile.in | 2 +- programs/winetest/Makefile.in | 2 +- programs/wordpad/Makefile.in | 2 +- programs/xcopy/Makefile.in | 2 +- tools/Makefile.in | 10 ++-- tools/winedump/Makefile.in | 2 +- 31 files changed, 131 insertions(+), 131 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bd9852cd6f9c4080a283a…

1 0

Luca Bennati : shell32: Update Italian translation.
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: f43e1bb3b16d2205ceb52cb28186270e2124cac5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f43e1bb3b16d2205ceb52cb28… Author: Luca Bennati <lucak3(a)gmail.com> Date: Fri Sep 17 22:09:06 2010 +0200 shell32: Update Italian translation. --- dlls/shell32/shell32_It.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32_It.rc b/dlls/shell32/shell32_It.rc index 7ce3e66..169a14e 100644 --- a/dlls/shell32/shell32_It.rc +++ b/dlls/shell32/shell32_It.rc @@ -308,6 +308,7 @@ STRINGTABLE IDS_COMMON_OEM_LINKS "Collegamenti OEM" IDS_DOCUMENTS "Documenti" IDS_DOWNLOADS "Download" + IDS_LOCAL_APPDATA_LOW "Applicazioni\\LocalLow" IDS_NEWFOLDER "Nuova cartella"

1 0

Paul Vriens : user32: Fix a typo.
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: 92643eb0204db4006f454b7859dc2665677e4cf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92643eb0204db4006f454b785… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Sep 18 20:30:20 2010 +0200 user32: Fix a typo. --- dlls/user32/resources/user32_It.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/resources/user32_It.rc b/dlls/user32/resources/user32_It.rc index e8a5f4f..835361b 100644 --- a/dlls/user32/resources/user32_It.rc +++ b/dlls/user32/resources/user32_It.rc @@ -20,7 +20,7 @@ #include "resources.h" /* UTF-8 */ -#pragma codepage(65001) +#pragma code_page(65001) LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL

1 0

Jacek Caban : mshtml: Fixed hash part stripping in GetQuery.
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: 9557f1c52620120689988d52e583f062d5898841 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9557f1c52620120689988d52e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Sep 18 22:14:49 2010 +0200 mshtml: Fixed hash part stripping in GetQuery. Spotted by Joris Huizer. --- dlls/mshtml/nsio.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 35a35f0..02f2d94 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2124,8 +2124,10 @@ static nsresult NSAPI nsURL_GetQuery(nsIURL *iface, nsACString *aQuery) ptr_end = url.lpszExtraInfo+url.dwExtraInfoLength; for(ptr = url.lpszExtraInfo; ptr < ptr_end; ptr++) { - if(*ptr == '#') + if(*ptr == '#') { + ptr_end = ptr; break; + } } ptr = url.lpszExtraInfo;

1 0

Aurimas Fišeras : shell32: Update Lithuanian translation.
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: eaf599074fdcd2f366431425ca72b0859ce0d051 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaf599074fdcd2f366431425c… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Thu Sep 16 22:57:15 2010 +0300 shell32: Update Lithuanian translation. --- dlls/shell32/shell32_Lt.rc | 27 +++++++++++++++++++++++---- 1 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shell32_Lt.rc b/dlls/shell32/shell32_Lt.rc index 504a39f..9ff00d4 100644 --- a/dlls/shell32/shell32_Lt.rc +++ b/dlls/shell32/shell32_Lt.rc @@ -249,7 +249,7 @@ STRINGTABLE IDS_RESTART_TITLE "Paleisti iš naujo" IDS_RESTART_PROMPT "Ar norite simuliuoti Windows paleidimą iš naujo?" IDS_SHUTDOWN_TITLE "Stabdyti" - IDS_SHUTDOWN_PROMPT "Ar norite sustabdyti šią Wine sesiją?" + IDS_SHUTDOWN_PROMPT "Ar norite sustabdyti šį Wine seansą?" /* Run File dialog */ IDS_RUNDLG_ERROR "Nepavyko parodyti failo paleidimo dialogo lango (vidinė klaida)" @@ -283,10 +283,29 @@ STRINGTABLE IDS_PROGRAM_FILES_COMMONX86 "Programų failai (x86)\\Bendrieji failai" IDS_COMMON_DOCUMENTS "Dokumentai" IDS_ADMINTOOLS "Pradžios meniu\\Programos\\Administravimo įrankiai" - IDS_COMMON_MUSIC "Dokumentai\\Muzika" - IDS_COMMON_PICTURES "Dokumentai\\Paveikslai" - IDS_COMMON_VIDEO "Dokumentai\\Vaizdai" + IDS_COMMON_MUSIC "Muzika" + IDS_COMMON_PICTURES "Paveikslai" + IDS_COMMON_VIDEO "Vaizdai" IDS_CDBURN_AREA "Vietinės nuostatos\\Programų duomenys\\Microsoft\\CD rašymas" + IDS_CONTACTS "Kontaktai" + IDS_LINKS "Nuorodos" + IDS_PHOTO_ALBUMS "Paveikslai\\Skaidrių peržiūros" + IDS_PLAYLISTS "Muzika\\Grojaraščiai" + IDS_PUBLIC_DOWNLOADS "Atsiuntimai" + IDS_PUBLIC_GAME_TASKS "Microsoft\\Windows\\GameExplorer" + IDS_PUBLIC_LIBRARIES "Microsoft\\Windows\\Bibliotekos" + IDS_PUBLIC_RINGTONES "Microsoft\\Windows\\Skambučių melodijos" + IDS_SAMPLE_MUSIC "Muzika\\Muzikos pavyzdžiai" + IDS_SAMPLE_PICTURES "Paveikslai\\Paveikslų pavyzdžiai" + IDS_SAMPLE_PLAYLISTS "Muzika\\Grojaraščių pavyzdžiai" + IDS_SAMPLE_VIDEOS "Vaizdai\\Vaizdų pavyzdžiai" + IDS_SAVED_GAMES "Išsaugoti žaidimai" + IDS_SAVED_SEARCHES "Paieškos" + IDS_USER_PROFILES "Naudotojai" + IDS_COMMON_OEM_LINKS "OEM nuorodos" + IDS_DOCUMENTS "Dokumentai" + IDS_DOWNLOADS "Atsiuntimai" + IDS_LOCAL_APPDATA_LOW "Programų duomenys\\LocalLow" IDS_NEWFOLDER "Naujas aplankas"

1 0

Aurimas Fišeras : taskmgr: Update Lithuanian translation.
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: 7960e3c1b76a406092678f9262978f4d0b0f36a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7960e3c1b76a406092678f926… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sun Sep 19 13:30:31 2010 +0300 taskmgr: Update Lithuanian translation. --- programs/taskmgr/Lt.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/taskmgr/Lt.rc b/programs/taskmgr/Lt.rc index 266e0fd..75847d6 100644 --- a/programs/taskmgr/Lt.rc +++ b/programs/taskmgr/Lt.rc @@ -1,7 +1,7 @@ /* * Lithuanian resources for Task Manager * - * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * Copyright 2009-2010 Aurimas Fišeras <aurimas(a)gmail.com> * * * This library is free software; you can redistribute it and/or @@ -386,7 +386,7 @@ BEGIN WS_TABSTOP,7,127,108,10 CONTROL "Į/I perskaityta baitų",IDC_IOREADBYTES,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,138,108,10 - CONTROL "&Sesijos identifikatorius",IDC_SESSIONID,"Button",BS_AUTOCHECKBOX | + CONTROL "&Seanso identifikatorius",IDC_SESSIONID,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,149,108,10 CONTROL "&Naudotojo vardas",IDC_USERNAME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,160,108,10 @@ -513,7 +513,7 @@ BEGIN IDS_USEROBJECTS "USER objektai" IDS_IOREADS "I/O skaitymai" IDS_IOREADBYTES "I/O persk. baitų" - IDS_SESSIONID "Sesijos ID" + IDS_SESSIONID "Seanso ID" IDS_USERNAME "Naudotojas" IDS_PAGEFAULTSDELTA "PK pokytis" IDS_VIRTUALMEMORYSIZE "VA dydis"

1 0

Davide Pizzetti : wineboot: Italian translation update.
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: 16060356eea9349c694b0b088a977970e7251287 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16060356eea9349c694b0b088… Author: Davide Pizzetti <erpizzo(a)alice.it> Date: Sun Sep 19 12:31:44 2010 +0200 wineboot: Italian translation update. --- programs/wineboot/wineboot_It.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wineboot/wineboot_It.rc b/programs/wineboot/wineboot_It.rc index 4ec5e99..f249c14 100644 --- a/programs/wineboot/wineboot_It.rc +++ b/programs/wineboot/wineboot_It.rc @@ -35,7 +35,7 @@ BEGIN PUSHBUTTON "Termina il processo",IDOK,51,49,71,15 LTEXT "Una disconnessione o uno spegnimento simulato sono in corso, ma questo programma non risponde.", IDC_STATIC,7,7,172,19 - LTEXT "Se termini il processo, rischi di perdere tutti i dati non salvati.", + LTEXT "Se termini il processo rischi di perdere tutti i dati non salvati.", IDC_STATIC,7,28,172,15 END

1 0