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

Austin English : ntdll: Add signal context function definitions for FreeBSD .
by Alexandre Julliard June 1, 2010

June 1, 2010

Module: wine Branch: master Commit: da77e7456bd90dd7621deba1d97764f31c6af7d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da77e7456bd90dd7621deba1d… Author: Austin English <austinenglish(a)gmail.com> Date: Mon May 31 15:19:38 2010 -0500 ntdll: Add signal context function definitions for FreeBSD. --- dlls/ntdll/signal_x86_64.c | 53 ++++++++++++++++++++++++++++++++++++++----- 1 files changed, 46 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index ccea6df..f509006 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -29,6 +29,10 @@ #include <stdarg.h> #include <stdio.h> +#ifdef HAVE_UCONTEXT_H +# include <ucontext.h> +#endif + #ifdef HAVE_UNISTD_H # include <unistd.h> #endif @@ -132,12 +136,45 @@ extern int arch_prctl(int func, void *ptr); #define FPU_sig(context) ((XMM_SAVE_AREA32 *)((context)->uc_mcontext.fpregs)) -#endif /* linux */ - -#if defined(__NetBSD__) -# include <sys/ucontext.h> -# include <sys/types.h> -# include <signal.h> +#elif defined(__FreeBSD__) +#include <sys/ucontext.h> + +#define RAX_sig(context) ((context)->uc_mcontext.mc_rax) +#define RBX_sig(context) ((context)->uc_mcontext.mc_rbx) +#define RCX_sig(context) ((context)->uc_mcontext.mc_rcx) +#define RDX_sig(context) ((context)->uc_mcontext.mc_rdx) +#define RSI_sig(context) ((context)->uc_mcontext.mc_rsi) +#define RDI_sig(context) ((context)->uc_mcontext.mc_rdi) +#define RBP_sig(context) ((context)->uc_mcontext.mc_rbp) +#define R8_sig(context) ((context)->uc_mcontext.mc_r8) +#define R9_sig(context) ((context)->uc_mcontext.mc_r9) +#define R10_sig(context) ((context)->uc_mcontext.mc_r10) +#define R11_sig(context) ((context)->uc_mcontext.mc_r11) +#define R12_sig(context) ((context)->uc_mcontext.mc_r12) +#define R13_sig(context) ((context)->uc_mcontext.mc_r13) +#define R14_sig(context) ((context)->uc_mcontext.mc_r14) +#define R15_sig(context) ((context)->uc_mcontext.mc_r15) + +#define CS_sig(context) ((context)->uc_mcontext.mc_cs) +#define DS_sig(context) ((context)->uc_mcontext.mc_ds) +#define ES_sig(context) ((context)->uc_mcontext.mc_es) +#define FS_sig(context) ((context)->uc_mcontext.mc_fs) +#define GS_sig(context) ((context)->uc_mcontext.mc_gs) +#define SS_sig(context) ((context)->uc_mcontext.mc_ss) + +#define EFL_sig(context) ((context)->uc_mcontext.mc_rflags) + +#define RIP_sig(context) ((context)->uc_mcontext.mc_rip) +#define RSP_sig(context) ((context)->uc_mcontext.mc_rsp) +#define TRAP_sig(context) ((context)->uc_mcontext.mc_trapno) +#define ERROR_sig(context) ((context)->uc_mcontext.mc_err) + +#define FPU_sig(context) ((XMM_SAVE_AREA32 *)((context)->uc_mcontext.mc_fpstate)) + +#elif defined(__NetBSD__) +#include <sys/ucontext.h> +#include <sys/types.h> +#include <signal.h> #define RAX_sig(context) ((context)->uc_mcontext.__gregs[_REG_RAX]) #define RBX_sig(context) ((context)->uc_mcontext.__gregs[_REG_RBX]) @@ -171,7 +208,9 @@ extern int arch_prctl(int func, void *ptr); #define ERROR_sig(context) ((context)->uc_mcontext.__gregs[_REG_ERR]) #define FPU_sig(context) ((XMM_SAVE_AREA32 *)((context)->uc_mcontext.__fpregs)) -#endif /* __NetBSD__ */ +#else +#error You must define the signal context functions for your platform +#endif enum i386_trap_code {

1 0

Sven Baars : regedit: Fix Dutch translation.
by Alexandre Julliard June 1, 2010

June 1, 2010

Module: wine Branch: master Commit: ce1be8f82770f346bfe30f650eb34f4684918844 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce1be8f82770f346bfe30f650… Author: Sven Baars <sven.wine(a)gmail.com> Date: Mon May 31 22:57:39 2010 +0200 regedit: Fix Dutch translation. --- programs/regedit/Nl.rc | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/programs/regedit/Nl.rc b/programs/regedit/Nl.rc index f02ab65..4336de2 100644 --- a/programs/regedit/Nl.rc +++ b/programs/regedit/Nl.rc @@ -22,6 +22,7 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL +#pragma code_page(65001) /* * Menu @@ -56,9 +57,9 @@ BEGIN END MENUITEM SEPARATOR MENUITEM "&Verwijderen\tDel", ID_EDIT_DELETE - MENUITEM "&Naam wijzigen\tF2" ID_EDIT_RENAME + MENUITEM "N&aam wijzigen\tF2" ID_EDIT_RENAME MENUITEM SEPARATOR - MENUITEM "&Sleutelnaam kopi�ren", ID_EDIT_COPYKEYNAME + MENUITEM "&Sleutelnaam kopiëren", ID_EDIT_COPYKEYNAME MENUITEM SEPARATOR MENUITEM "&Zoeken\tCtrl+F", ID_EDIT_FIND, GRAYED MENUITEM "Volgende Zoeken\tF3", ID_EDIT_FINDNEXT, GRAYED @@ -110,7 +111,7 @@ BEGIN MENUITEM "&Naam wijzigen\tF2", ID_EDIT_RENAME MENUITEM SEPARATOR MENUITEM "&Exporteren...", ID_EDIT_EXPORT - MENUITEM "&Sleutelnaam kopi�ren", ID_EDIT_COPYKEYNAME + MENUITEM "&Sleutelnaam kopiëren", ID_EDIT_COPYKEYNAME MENUITEM SEPARATOR MENUITEM "&Zoeken\tCtrl+F", ID_EDIT_FIND, GRAYED END @@ -281,7 +282,7 @@ BEGIN ID_VIEW_REFRESH "Het venster vernieuwen" ID_EDIT_DELETE "De selectie verwijderen" ID_EDIT_RENAME "De naam van de selectie wijzigen" - ID_EDIT_COPYKEYNAME "De naam van de geselecteerde sleutel naar het Klembord kopi�ren" + ID_EDIT_COPYKEYNAME "De naam van de geselecteerde sleutel naar het Klembord kopiëren" ID_EDIT_FIND "Een tekenreeks zoeken in een sleutel, een waarde of gegevens" ID_EDIT_FINDNEXT "De opgegeven tekst nogmaals zoeken" ID_EDIT_EXPORT "Exporteert de geselecteerde subsleutel van het register naar een tekst bestand"

1 0

André Hentschel : wineusr: Sync the WINEDLLOVERRIDES examples with the manpage.
by Alexandre Julliard June 1, 2010

June 1, 2010

Module: docs Branch: master Commit: 77e40b7fec8d419cf4ab38db85b0eaea0ce0828f URL: http://source.winehq.org/git/docs.git/?a=commit;h=77e40b7fec8d419cf4ab38db8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 31 19:09:56 2010 +0200 wineusr: Sync the WINEDLLOVERRIDES examples with the manpage. --- en/wineusr-running.sgml | 25 ++++++++++++++++++++++--- 1 files changed, 22 insertions(+), 3 deletions(-) diff --git a/en/wineusr-running.sgml b/en/wineusr-running.sgml index dd3d090..9c5ae2f 100644 --- a/en/wineusr-running.sgml +++ b/en/wineusr-running.sgml @@ -248,13 +248,32 @@ Path="c:\windows;c:\windows\system;e:\;e:\test;f:\" to use the WINEDLLOVERRIDES environment variable to set them. </para> <para> - For example, if you wanted wine to use native ole32.dll, - oleaut32.dll and rpcrt4 you could run <command>wine</command> like this: + Examples: </para> <screen> -<prompt>$</prompt> <userinput>WINEDLLOVERRIDES="ole32,oleaut32,rpcrt4=n" wine <replaceable>program_name</replaceable></userinput> +<prompt>$</prompt> <userinput>WINEDLLOVERRIDES="comdlg32,shell32=n,b" wine <replaceable>program_name</replaceable></userinput> </screen> <para> + Try to load comdlg32 and shell32 as native windows dll first and try + the builtin version if the native load fails. + </para> + <screen> +<prompt>$</prompt> <userinput>WINEDLLOVERRIDES="comdlg32,shell32=n;c:\\foo\\bar\\baz=b" wine <replaceable>program_name</replaceable></userinput> + </screen> + <para> + Try to load the libraries comdlg32 and shell32 as native windows dlls. + Furthermore, if an application request to load c:\foo\bar\baz.dll load + the builtin library baz. + </para> + <screen> +<prompt>$</prompt> <userinput>WINEDLLOVERRIDES="comdlg32=b,n;shell32=b;comctl32=n;oleaut32=" wine <replaceable>program_name</replaceable></userinput> + </screen> + <para> + Try to load comdlg32 as builtin first and try the native version if + the builtin load fails; load shell32 always as builtin and comctl32 + always as native. Oleaut32 will be disabled. + </para> + <para> For more information about DLL overrides, please refer to the <link linkend="winecfg-dll-overrides">DLL overrides</link> section of this guide. </para>

1 0