January 2007 - Wine-commits

Alexandre Julliard : wineoss: Renamed the dlls/winmm/ wineoss directory to dlls/wineoss.drv.
by Alexandre Julliard 10 Jan '07

10 Jan '07

Module: wine Branch: master Commit: dc3961bc784b4a4d0f90d523a191be9b24c835c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc3961bc784b4a4d0f90d523a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 10 13:46:14 2007 +0100 wineoss: Renamed the dlls/winmm/wineoss directory to dlls/wineoss.drv. --- Makefile.in | 4 ++-- configure | 4 ++-- configure.ac | 2 +- dlls/Makefile.in | 8 ++------ dlls/{winmm/wineoss => wineoss.drv}/Makefile.in | 2 +- dlls/{winmm/wineoss => wineoss.drv}/audio.c | 0 dlls/{winmm/wineoss => wineoss.drv}/audio.h | 0 dlls/{winmm/wineoss => wineoss.drv}/dscapture.c | 0 dlls/{winmm/wineoss => wineoss.drv}/dsrender.c | 0 dlls/{winmm/wineoss => wineoss.drv}/midi.c | 0 dlls/{winmm/wineoss => wineoss.drv}/midipatch.c | 0 dlls/{winmm/wineoss => wineoss.drv}/mixer.c | 0 dlls/{winmm/wineoss => wineoss.drv}/mmaux.c | 0 dlls/{winmm/wineoss => wineoss.drv}/oss.c | 0 dlls/{winmm/wineoss => wineoss.drv}/oss.h | 0 .../wineoss => wineoss.drv}/wineoss.drv.spec | 0 16 files changed, 8 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dc3961bc784b4a4d0f90d…

1 0

Alexandre Julliard : wineesd: Renamed the dlls/winmm/ wineesd directory to dlls/wineesd.drv.
by Alexandre Julliard 10 Jan '07

10 Jan '07

Module: wine Branch: master Commit: 851e6d7c4f7cacf47b4184ed44b8e0b456a48118 URL: http://source.winehq.org/git/wine.git/?a=commit;h=851e6d7c4f7cacf47b4184ed4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 10 13:44:20 2007 +0100 wineesd: Renamed the dlls/winmm/wineesd directory to dlls/wineesd.drv. --- Makefile.in | 4 ++-- configure | 4 ++-- configure.ac | 2 +- dlls/Makefile.in | 7 +------ dlls/{winmm/wineesd => wineesd.drv}/Makefile.in | 2 +- dlls/{winmm/wineesd => wineesd.drv}/audio.c | 0 dlls/{winmm/wineesd => wineesd.drv}/esound.c | 0 dlls/{winmm/wineesd => wineesd.drv}/esound.h | 0 .../wineesd => wineesd.drv}/wineesd.drv.spec | 0 9 files changed, 7 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=851e6d7c4f7cacf47b418…

1 0

Alexandre Julliard : winejack: Renamed the dlls/winmm/ winejack directory to dlls/winejack.drv.
by Alexandre Julliard 10 Jan '07

10 Jan '07

Module: wine Branch: master Commit: 7fc151d6120acea6026eddf46349fe1690128df9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fc151d6120acea6026eddf46… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 10 13:45:03 2007 +0100 winejack: Renamed the dlls/winmm/winejack directory to dlls/winejack.drv. --- Makefile.in | 4 ++-- configure | 4 ++-- configure.ac | 2 +- dlls/Makefile.in | 7 +------ dlls/{winmm/winejack => winejack.drv}/Makefile.in | 2 +- dlls/{winmm/winejack => winejack.drv}/audio.c | 0 dlls/{winmm/winejack => winejack.drv}/jack.c | 0 dlls/{winmm/winejack => winejack.drv}/jack.h | 0 .../winejack => winejack.drv}/winejack.drv.spec | 0 9 files changed, 7 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7fc151d6120acea6026ed…

1 0

Alexandre Julliard : winearts: Renamed the dlls/winmm/ winearts directory to dlls/winearts.drv.
by Alexandre Julliard 10 Jan '07

10 Jan '07

Module: wine Branch: master Commit: 5f0241fd9136ccdd9613127e0999e5c15779d7c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f0241fd9136ccdd9613127e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 10 13:41:40 2007 +0100 winearts: Renamed the dlls/winmm/winearts directory to dlls/winearts.drv. --- Makefile.in | 4 ++-- configure | 4 ++-- configure.ac | 2 +- dlls/Makefile.in | 7 +------ dlls/{winmm/winearts => winearts.drv}/Makefile.in | 2 +- dlls/{winmm/winearts => winearts.drv}/arts.c | 0 dlls/{winmm/winearts => winearts.drv}/arts.h | 0 dlls/{winmm/winearts => winearts.drv}/audio.c | 0 .../winearts => winearts.drv}/winearts.drv.spec | 0 9 files changed, 7 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5f0241fd9136ccdd96131…

1 0

Alexandre Julliard : wineaudioio: Renamed the dlls/winmm/ wineaudioio directory to dlls/wineaudioio.drv.
by Alexandre Julliard 10 Jan '07

10 Jan '07

Module: wine Branch: master Commit: f972d6626333dd9967722cdebc2c2802a9145f8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f972d6626333dd9967722cdeb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 10 13:42:34 2007 +0100 wineaudioio: Renamed the dlls/winmm/wineaudioio directory to dlls/wineaudioio.drv. --- Makefile.in | 4 ++-- configure | 4 ++-- configure.ac | 2 +- dlls/Makefile.in | 7 +------ .../wineaudioio => wineaudioio.drv}/Makefile.in | 2 +- .../{winmm/wineaudioio => wineaudioio.drv}/audio.c | 0 .../wineaudioio => wineaudioio.drv}/audioio.c | 0 .../wineaudioio.drv.spec | 0 8 files changed, 7 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f972d6626333dd9967722…

1 0

Alexandre Julliard : winecoreaudio: Renamed the dlls/winmm/ winecoreaudio directory to dlls/winecoreaudio.drv.
by Alexandre Julliard 10 Jan '07

10 Jan '07

Module: wine Branch: master Commit: 9402089ea91bbde0fb6f700fb79099d7d5b55357 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9402089ea91bbde0fb6f700fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 10 13:43:27 2007 +0100 winecoreaudio: Renamed the dlls/winmm/winecoreaudio directory to dlls/winecoreaudio.drv. --- Makefile.in | 4 ++-- configure | 4 ++-- configure.ac | 2 +- dlls/Makefile.in | 7 +------ .../Makefile.in | 2 +- .../winecoreaudio => winecoreaudio.drv}/audio.c | 0 .../audiounit.c | 0 .../coreaudio.c | 0 .../coreaudio.h | 0 .../winecoreaudio.drv.spec | 0 10 files changed, 7 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9402089ea91bbde0fb6f7…

1 0

Alexandre Julliard : winealsa: Renamed the dlls/winmm/ winealsa directory to dlls/winealsa.drv.
by Alexandre Julliard 10 Jan '07

10 Jan '07

Module: wine Branch: master Commit: 01905338ea2057a51d7c9b26184bfaa519443120 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01905338ea2057a51d7c9b261… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 10 13:40:39 2007 +0100 winealsa: Renamed the dlls/winmm/winealsa directory to dlls/winealsa.drv. --- Makefile.in | 4 ++-- configure | 4 ++-- configure.ac | 2 +- dlls/Makefile.in | 7 +------ dlls/{winmm/winealsa => winealsa.drv}/Makefile.in | 2 +- dlls/{winmm/winealsa => winealsa.drv}/alsa.c | 0 dlls/{winmm/winealsa => winealsa.drv}/alsa.h | 0 dlls/{winmm/winealsa => winealsa.drv}/audio.c | 0 dlls/{winmm/winealsa => winealsa.drv}/midi.c | 0 .../winealsa => winealsa.drv}/winealsa.drv.spec | 0 10 files changed, 7 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=01905338ea2057a51d7c9…

1 0

Michael Stefaniuc : janitorial: Use the C standard for multiline strings.
by Alexandre Julliard 10 Jan '07

10 Jan '07

Module: wine Branch: master Commit: 33af3c5c8381d7a9b6c147be21a3d405fea382f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33af3c5c8381d7a9b6c147be2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 9 23:42:26 2007 +0100 janitorial: Use the C standard for multiline strings. --- dlls/cabinet/fdi.c | 8 ++++---- dlls/ddraw/ddraw.c | 8 ++++---- dlls/user32/misc.c | 4 ++-- dlls/wined3d/device.c | 14 +++++++------- dlls/wined3d/state.c | 6 +++--- programs/winetest/main.c | 18 +++++++++--------- 6 files changed, 29 insertions(+), 29 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 70db803..8ffc0f4 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -363,8 +363,8 @@ HFDI __cdecl FDICreate( { HFDI rv; - TRACE("(pfnalloc == ^%p, pfnfree == ^%p, pfnopen == ^%p, pfnread == ^%p, pfnwrite == ^%p, \ - pfnclose == ^%p, pfnseek == ^%p, cpuType == %d, perf == ^%p)\n", + TRACE("(pfnalloc == ^%p, pfnfree == ^%p, pfnopen == ^%p, pfnread == ^%p, pfnwrite == ^%p, " + "pfnclose == ^%p, pfnseek == ^%p, cpuType == %d, perf == ^%p)\n", pfnalloc, pfnfree, pfnopen, pfnread, pfnwrite, pfnclose, pfnseek, cpuType, perf); @@ -2450,8 +2450,8 @@ BOOL __cdecl FDICopy( fdi_decomp_state _decomp_state; fdi_decomp_state *decomp_state = &_decomp_state; - TRACE("(hfdi == ^%p, pszCabinet == ^%p, pszCabPath == ^%p, flags == %0d, \ - pfnfdin == ^%p, pfnfdid == ^%p, pvUser == ^%p)\n", + TRACE("(hfdi == ^%p, pszCabinet == ^%p, pszCabPath == ^%p, flags == %0d, " + "pfnfdin == ^%p, pfnfdid == ^%p, pvUser == ^%p)\n", hfdi, pszCabinet, pszCabPath, flags, pfnfdin, pfnfdid, pvUser); if (!REALLY_IS_FDI(hfdi)) { diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index bb7243d..d1bef24 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -322,8 +322,8 @@ IDirectDrawImpl_SetupFullscreenWindow(ID TRACE("(%p): Setting up window %p for exclusive mode\n", This, window); if( (This->style != 0) && (This->exStyle != 0) ) { - ERR("(%p) Want to change the window parameters of HWND %p, but \ - another style is stored for restauration afterwards\n", This, window); + ERR("(%p) Want to change the window parameters of HWND %p, but " + "another style is stored for restauration afterwards\n", This, window); } /* Get the parameters and save them */ @@ -2259,8 +2259,8 @@ IDirectDrawImpl_CreateSurface(IDirectDra if( (rect.right - rect.left) <= 1 || (rect.bottom - rect.top) <= 1 ) { - FIXME("Wanted to get surface dimensions from window %p, but it has only \ - a size of %dx%d. Using full screen dimensions\n", + FIXME("Wanted to get surface dimensions from window %p, but it has only " + "a size of %dx%d. Using full screen dimensions\n", window, rect.right - rect.left, rect.bottom - rect.top); } else diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 842819b..bd1c9f7 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -526,8 +526,8 @@ DWORD WINAPI RegisterTasklist (DWORD x) */ HDEVNOTIFY WINAPI RegisterDeviceNotificationA(HANDLE hnd, LPVOID notifyfilter, DWORD flags) { - FIXME("(hwnd=%p, filter=%p,flags=0x%08x),\n\ - returns a fake device notification handle!\n", hnd,notifyfilter,flags ); + FIXME("(hwnd=%p, filter=%p,flags=0x%08x),\n" + "\treturns a fake device notification handle!\n", hnd,notifyfilter,flags ); return (HDEVNOTIFY) 0xcafecafe; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d997292..3300cdd 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -860,17 +860,17 @@ static HRESULT WINAPI IWineD3DDeviceImp switch(Pool) { case WINED3DPOOL_SCRATCH: if(!Lockable) - FIXME("Create surface called with a pool of SCRATCH and a Lockable of FALSE \ - which are mutually exclusive, setting lockable to true\n"); + FIXME("Create surface called with a pool of SCRATCH and a Lockable of FALSE " + "which are mutually exclusive, setting lockable to TRUE\n"); Lockable = TRUE; break; case WINED3DPOOL_SYSTEMMEM: - if(!Lockable) FIXME("Create surface called with a pool of SYSTEMMEM and a Lockable of FALSE, \ - this is acceptable but unexpected (I can't know how the surface can be usable!)\n"); + if(!Lockable) FIXME("Create surface called with a pool of SYSTEMMEM and a Lockable of FALSE, " + "this is acceptable but unexpected (I can't know how the surface can be usable!)\n"); case WINED3DPOOL_MANAGED: - if(Usage == WINED3DUSAGE_DYNAMIC) FIXME("Create surface called with a pool of MANAGED and a \ - Usage of DYNAMIC which are mutually exclusive, not doing \ - anything just telling you.\n"); + if(Usage == WINED3DUSAGE_DYNAMIC) FIXME("Create surface called with a pool of MANAGED and a " + "Usage of DYNAMIC which are mutually exclusive, not doing " + "anything just telling you.\n"); break; case WINED3DPOOL_DEFAULT: /*TODO: Create offscreen plain can cause this check to fail..., find out if it should */ if(!(Usage & WINED3DUSAGE_DYNAMIC) && !(Usage & WINED3DUSAGE_RENDERTARGET) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index af899e5..8cdd758 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -601,9 +601,9 @@ state_stencil(DWORD state, IWineD3DState if( stateblock->set.renderState[WINED3DRS_CCW_STENCILPASS] ) stencilPass_ccw = StencilOp(stateblock->renderState[WINED3DRS_CCW_STENCILPASS]); - TRACE("(onesided %d, twosided %d, ref %x, mask %x, \ - GL_FRONT: func: %x, fail %x, zfail %x, zpass %x \ - GL_BACK: func: %x, fail %x, zfail %x, zpass %x )\n", + TRACE("(onesided %d, twosided %d, ref %x, mask %x, " + "GL_FRONT: func: %x, fail %x, zfail %x, zpass %x " + "GL_BACK: func: %x, fail %x, zfail %x, zpass %x )\n", onesided_enable, twosided_enable, ref, mask, func, stencilFail, depthFail, stencilPass, func_ccw, stencilFail_ccw, depthFail_ccw, stencilPass_ccw); diff --git a/programs/winetest/main.c b/programs/winetest/main.c index c2f6881..2488e30 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -555,15 +555,15 @@ run_tests (char *logname) static void usage (void) { - fprintf (stderr, "\ -Usage: winetest [OPTION]...\n\n\ - -c console mode, no GUI\n\ - -e preserve the environment\n\ - -h print this message and exit\n\ - -q quiet mode, no output at all\n\ - -o FILE put report into FILE, do not submit\n\ - -s FILE submit FILE, do not run tests\n\ - -t TAG include TAG of characters [-.0-9a-zA-Z] in the report\n"); + fprintf (stderr, +"Usage: winetest [OPTION]...\n\n" +" -c console mode, no GUI\n" +" -e preserve the environment\n" +" -h print this message and exit\n" +" -q quiet mode, no output at all\n" +" -o FILE put report into FILE, do not submit\n" +" -s FILE submit FILE, do not run tests\n" +" -t TAG include TAG of characters [-.0-9a-zA-Z] in the report\n"); } int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrevInst,

1 0

Dmitry Timoshkov : wineconsole: Fix a typo in the help message about correct backend names.
by Alexandre Julliard 10 Jan '07

10 Jan '07

Module: wine Branch: master Commit: 31215ae85aa5a9529d0f11c4022e2a60d3d1ae9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=31215ae85aa5a9529d0f11c40… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jan 10 15:26:51 2007 +0800 wineconsole: Fix a typo in the help message about correct backend names. --- programs/wineconsole/wineconsole_De.rc | 4 ++-- programs/wineconsole/wineconsole_En.rc | 2 +- programs/wineconsole/wineconsole_Fr.rc | 2 +- programs/wineconsole/wineconsole_Ko.rc | 4 ++-- programs/wineconsole/wineconsole_No.rc | 2 +- programs/wineconsole/wineconsole_Pl.rc | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/wineconsole/wineconsole_De.rc b/programs/wineconsole/wineconsole_De.rc index b0855ad..0ae54dc 100644 --- a/programs/wineconsole/wineconsole_De.rc +++ b/programs/wineconsole/wineconsole_De.rc @@ -45,8 +45,8 @@ IDS_CMD_LAUNCH_FAILED "wineconsole: "Der Befehl ist ung�ltig.\n" IDS_USAGE_HEADER "\nAufruf:\n wineconsole [Optionen] <Befehl>\n\nOptionen:\n" -IDS_USAGE_BACKEND " --backend={user|ncurses} Auswahl von �user� erstellt ein neues Fenster,\n"\ - " �ncurses� versucht das aktuelle Terminal als Wine-\n"\ +IDS_USAGE_BACKEND " --backend={user|curses} Auswahl von �user� erstellt ein neues Fenster,\n"\ + " �curses� versucht das aktuelle Terminal als Wine-\n"\ " Konsole einzurichten\n" IDS_USAGE_COMMAND " <Befehl> Das in der Konsole zu startende Wine-Programm\n" IDS_USAGE_FOOTER "\nBespiel:\n wineconsole cmd\nStartet die Wine-Befehlszeile in einer Wine-Konsole\n\n" diff --git a/programs/wineconsole/wineconsole_En.rc b/programs/wineconsole/wineconsole_En.rc index 20b7a9e..624d0fa 100644 --- a/programs/wineconsole/wineconsole_En.rc +++ b/programs/wineconsole/wineconsole_En.rc @@ -45,7 +45,7 @@ IDS_CMD_LAUNCH_FAILED "wineconsole: "The command is invalid.\n" IDS_USAGE_HEADER "\nUsage:\n wineconsole [options] <command>\n\nOptions:\n" -IDS_USAGE_BACKEND " --backend={user|ncurses} Choosing user will spawn a new window, ncurses will\n"\ +IDS_USAGE_BACKEND " --backend={user|curses} Choosing user will spawn a new window, curses will\n"\ " try to setup the current terminal as a Wine console\n" IDS_USAGE_COMMAND " <command> The Wine program to launch in the console\n" IDS_USAGE_FOOTER "\nExample:\n wineconsole cmd\nStarts the Wine command prompt in a Wine console\n\n" diff --git a/programs/wineconsole/wineconsole_Fr.rc b/programs/wineconsole/wineconsole_Fr.rc index 22bd901..85d2432 100644 --- a/programs/wineconsole/wineconsole_Fr.rc +++ b/programs/wineconsole/wineconsole_Fr.rc @@ -46,7 +46,7 @@ IDS_CMD_LAUNCH_FAILED "wineconsole "La commande est invalide.\n" IDS_USAGE_HEADER "\nUsage :\n wineconsole [options] <commande>\n\nOptions :\n" -IDS_USAGE_BACKEND " --backend={user|ncurses} En choisissant � user � une nouvelle fen�tre sera cr��e, � ncurses �\n"\ +IDS_USAGE_BACKEND " --backend={user|curses} En choisissant � user � une nouvelle fen�tre sera cr��e, � curses �\n"\ " essaiera de convertir le terminal courant en console Wine\n" IDS_USAGE_COMMAND " <command> Le programme Wine � ex�cuter dans la console\n" IDS_USAGE_FOOTER "\nExemple :\n wineconsole cmd\nD�marre l'interpr�teur de commandes de Wine dans une console Wine\n\n" diff --git a/programs/wineconsole/wineconsole_Ko.rc b/programs/wineconsole/wineconsole_Ko.rc index 5a43141..76595b3 100644 --- a/programs/wineconsole/wineconsole_Ko.rc +++ b/programs/wineconsole/wineconsole_Ko.rc @@ -46,8 +46,8 @@ IDS_CMD_LAUNCH_FAILED "wineconsole: "�� ùٸ�� ʽ��ϴ�.\n" IDS_USAGE_HEADER "\n��:\n wineconsole [�ɼ�] <��>\n\n�ɼ�:\n" -IDS_USAGE_BACKEND " --backend={user|ncurses} ��ڰ� �� â�� ,\n"\ - " ncurses�� Wine �ܼ�ó�� ͹̳ο� ��Ÿ�� \n" +IDS_USAGE_BACKEND " --backend={user|curses} ��ڰ� �� â�� ,\n"\ + " curses�� Wine �ܼ�ó�� ͹̳ο� ��Ÿ�� \n" IDS_USAGE_COMMAND " <��> The Wine ��α׷�� ܼ�� ؼ� ��۵�\n" IDS_USAGE_FOOTER "\n��:\n wineconsole cmd\nWine �ֿܼ�� Wine �� Ʈ ��\n\n" diff --git a/programs/wineconsole/wineconsole_No.rc b/programs/wineconsole/wineconsole_No.rc index e0f5a0e..6bf5fb3 100644 --- a/programs/wineconsole/wineconsole_No.rc +++ b/programs/wineconsole/wineconsole_No.rc @@ -45,7 +45,7 @@ IDS_CMD_LAUNCH_FAILED "wineconsole: "Kommandoen er ugyldig.\n" IDS_USAGE_HEADER "\nBruk:\n wineconsole [alternativer] <kommando>\n\nAlternativer:\n" -IDS_USAGE_BACKEND " --backend={user|ncurses} �user� lager et nyttt vindu, mens �ncurses�\n"\ +IDS_USAGE_BACKEND " --backend={user|curses} �user� lager et nyttt vindu, mens �curses�\n"\ " pr�ve � bruke gjeldende terminal som Wine-konsoll\n" IDS_USAGE_COMMAND " <kommando> Wine-programmet som skal kj�res i konsollet\n" IDS_USAGE_FOOTER "\nEksempel:\n wineconsole cmd\nStarter Wine-ledeteksten i et Wine-konsoll\n\n" diff --git a/programs/wineconsole/wineconsole_Pl.rc b/programs/wineconsole/wineconsole_Pl.rc index f12c22b..c19d73b 100644 --- a/programs/wineconsole/wineconsole_Pl.rc +++ b/programs/wineconsole/wineconsole_Pl.rc @@ -46,7 +46,7 @@ IDS_CMD_LAUNCH_FAILED "wineconsole: "Polecenie jest niew�a�ciwe.\n" IDS_USAGE_HEADER "\nU�ycie:\n wineconsole [opcje] <polecenie>\n\nOpcje:\n" -IDS_USAGE_BACKEND " --backend={user|ncurses} Wyb�r 'user' spowoduje wy�wietlenie nowego okna, 'ncurses'\n"\ +IDS_USAGE_BACKEND " --backend={user|curses} Wyb�r 'user' spowoduje wy�wietlenie nowego okna, 'curses'\n"\ " spr�buje przerobi� aktualnie u�ywany terminal na konsol� Wine\n" IDS_USAGE_COMMAND " <polecenie> Program Wine kt�ry nale�y uruchomi�\n" IDS_USAGE_FOOTER "\nPrzyk�ad:\n wineconsole cmd\nUruchamia wiersz polece� Wine w konsoli Wine\n\n"

1 0

Dmitry Timoshkov : wineconsole: Use CP_UNIXCP to translate strings to the system encoding.
by Alexandre Julliard 10 Jan '07

10 Jan '07

Module: wine Branch: master Commit: bdc52c4777acece650528d344403890c0e6036f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdc52c4777acece650528d344… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jan 10 15:27:13 2007 +0800 wineconsole: Use CP_UNIXCP to translate strings to the system encoding. --- programs/wineconsole/curses.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/wineconsole/curses.c b/programs/wineconsole/curses.c index fcda4ec..14637b1 100644 --- a/programs/wineconsole/curses.c +++ b/programs/wineconsole/curses.c @@ -335,8 +335,8 @@ static void WCCURSES_SetTitle(const stru if (WINECON_GetConsoleTitle(data->hConIn, wbuf, sizeof(wbuf)/sizeof(WCHAR))) { char buffer[256]; - - WideCharToMultiByte(CP_ACP, 0, wbuf, -1, buffer, sizeof(buffer), + + WideCharToMultiByte(CP_UNIXCP, 0, wbuf, -1, buffer, sizeof(buffer), NULL, NULL); fputs("\033]2;", stdout); fputs(buffer, stdout); @@ -363,7 +363,7 @@ static void WCCURSES_Refresh(const struc cell = &data->cells[y * data->curcfg.sb_width]; for (x = 0; x < data->curcfg.sb_width; x++) { - WideCharToMultiByte(CP_ACP, 0, &cell[x].Char.UnicodeChar, 1, + WideCharToMultiByte(CP_UNIXCP, 0, &cell[x].Char.UnicodeChar, 1, &ch, 1, NULL, NULL); attr = ((BYTE)ch < 32 || (BYTE)ch > 127) ? 32 : (BYTE)ch;

1 0