May 2008 - Wine-commits - list.winehq.org

Andrew Talbot : cabinet: Remove order-of-evaluation dependencies.
by Alexandre Julliard 14 May '08

14 May '08

Module: wine Branch: master Commit: 4046075462c00f4479f185d1c0514584ff851223 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4046075462c00f4479f185d1c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue May 13 22:41:58 2008 +0100 cabinet: Remove order-of-evaluation dependencies. --- dlls/cabinet/fdi.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 8b7500f..3194d67 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -1034,7 +1034,8 @@ struct Ziphuft **t, cab_LONG *m, fdi_decomp_state *decomp_state) w += l[h++]; /* add bits already decoded */ /* compute minimum size table less than or equal to *m bits */ - z = (z = g - w) > (cab_ULONG)*m ? *m : z; /* upper limit */ + if ((z = g - w) > (cab_ULONG)*m) /* upper limit */ + z = *m; if ((f = 1 << (j = k - w)) > a + 1) /* try a k-w bit table */ { /* too few codes for k-w bit table */ f -= a + 1; /* deduct codes from patterns left */ @@ -1177,7 +1178,9 @@ static cab_LONG fdi_Zipinflate_codes(const struct Ziphuft *tl, const struct Ziph ZIPDUMPBITS(e) do { - n -= (e = (e = ZIPWSIZE - ((d &= ZIPWSIZE-1) > w ? d : w)) > n ?n:e); + d = max(d & (ZIPWSIZE - 1), w); + e = min(ZIPWSIZE - d, n); + n -= e; do { CAB(outbuf)[w++] = CAB(outbuf)[d++];

1 0

James Hawkins : ntdll: Fix a few failing tests in win2k3.
by Alexandre Julliard 13 May '08

13 May '08

Module: wine Branch: master Commit: c72f318aaa44c875e49657644f70478852fe9e3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c72f318aaa44c875e49657644… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue May 13 13:35:36 2008 -0500 ntdll: Fix a few failing tests in win2k3. --- dlls/ntdll/tests/file.c | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 7b88b01..d824530 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -402,7 +402,8 @@ static void nt_mailslot_test(void) pRtlInitUnicodeString(&str, buffer1); InitializeObjectAttributes(&attr, &str, OBJ_CASE_INSENSITIVE, 0, NULL); - DesiredAccess = CreateOptions = MailslotQuota = MaxMessageSize = 0; + CreateOptions = MailslotQuota = MaxMessageSize = 0; + DesiredAccess = GENERIC_READ; /* * Check for NULL pointer handling @@ -410,15 +411,20 @@ static void nt_mailslot_test(void) rc = pNtCreateMailslotFile(NULL, DesiredAccess, &attr, &IoStatusBlock, CreateOptions, MailslotQuota, MaxMessageSize, &TimeOut); - ok( rc == STATUS_ACCESS_VIOLATION, "rc = %x not c0000005 STATUS_ACCESS_VIOLATION\n", rc); + ok( rc == STATUS_ACCESS_VIOLATION || + rc == STATUS_INVALID_PARAMETER, /* win2k3 */ + "rc = %x not STATUS_ACCESS_VIOLATION or STATUS_INVALID_PARAMETER\n", rc); /* * Test to see if the Timeout can be NULL */ + hslot = (HANDLE)0xdeadbeef; rc = pNtCreateMailslotFile(&hslot, DesiredAccess, &attr, &IoStatusBlock, CreateOptions, MailslotQuota, MaxMessageSize, NULL); - ok( rc == STATUS_SUCCESS, "rc = %x not STATUS_SUCCESS\n", rc); + ok( rc == STATUS_SUCCESS || + rc == STATUS_INVALID_PARAMETER, /* win2k3 */ + "rc = %x not STATUS_SUCCESS or STATUS_INVALID_PARAMETER\n", rc); ok( hslot != 0, "Handle is invalid\n"); if ( rc == STATUS_SUCCESS ) rc = pNtClose(hslot); @@ -450,7 +456,9 @@ static void nt_mailslot_test(void) rc = pNtCreateMailslotFile(&hslot, DesiredAccess, &attr, &IoStatusBlock, CreateOptions, MailslotQuota, MaxMessageSize, &TimeOut); - ok( rc == STATUS_OBJECT_PATH_SYNTAX_BAD, "rc = %x not c000003b STATUS_OBJECT_PATH_SYNTAX_BAD\n", rc); + ok( rc == STATUS_OBJECT_PATH_SYNTAX_BAD || + rc == STATUS_INVALID_PARAMETER, + "rc = %x not STATUS_OBJECT_PATH_SYNTAX_BAD or STATUS_INVALID_PARAMETER\n", rc); if (rc == STATUS_SUCCESS) pNtClose(hslot); @@ -461,7 +469,7 @@ static void nt_mailslot_test(void) rc = pNtCreateMailslotFile(&hslot, DesiredAccess, &attr, &IoStatusBlock, CreateOptions, MailslotQuota, MaxMessageSize, &TimeOut); - ok( rc == STATUS_SUCCESS, "Create MailslotFile failed rc = %x %u\n", rc, GetLastError()); + ok( rc == STATUS_SUCCESS, "Create MailslotFile failed rc = %x\n", rc); ok( hslot != 0, "Handle is invalid\n"); rc = pNtClose(hslot);

1 0

Alexandre Julliard : winemenubuilder: Copy the icon data before modifying it, resources are read-only.
by Alexandre Julliard 13 May '08

13 May '08

Module: wine Branch: master Commit: 520d1bc5e458a90e821afa764cf8d1cbe32b111d URL: http://source.winehq.org/git/wine.git/?a=commit;h=520d1bc5e458a90e821afa764… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 13 20:26:57 2008 +0200 winemenubuilder: Copy the icon data before modifying it, resources are read-only. --- programs/winemenubuilder/winemenubuilder.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 7d9632d..cbdb154 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -201,8 +201,8 @@ static BOOL SaveIconResAsPNG(const BITMAPINFO *pIcon, const char *png_filename, png_infop info_ptr; png_text comment; int nXORWidthBytes, nANDWidthBytes, color_type = 0, i, j; - BYTE *pXOR, *row; - const BYTE *pAND = NULL; + BYTE *row, *copy = NULL; + const BYTE *pXOR, *pAND = NULL; int nWidth = pIcon->bmiHeader.biWidth; int nHeight = pIcon->bmiHeader.biHeight; int nBpp = pIcon->bmiHeader.biBitCount; @@ -233,21 +233,26 @@ static BOOL SaveIconResAsPNG(const BITMAPINFO *pIcon, const char *png_filename, nXORWidthBytes = 4 * ((nWidth * nBpp + 31) / 32); nANDWidthBytes = 4 * ((nWidth + 31 ) / 32); - pXOR = (BYTE*) pIcon + sizeof(BITMAPINFOHEADER) + pIcon->bmiHeader.biClrUsed * sizeof(RGBQUAD); + pXOR = (const BYTE*) pIcon + sizeof(BITMAPINFOHEADER) + pIcon->bmiHeader.biClrUsed * sizeof(RGBQUAD); if (nHeight > nWidth) { nHeight /= 2; pAND = pXOR + nHeight * nXORWidthBytes; } - /* image and mask are upside down reversed */ - row = pXOR + (nHeight - 1) * nXORWidthBytes; - /* Apply mask if present */ if (pAND) { RGBQUAD bgColor; + /* copy bytes before modifying them */ + copy = HeapAlloc( GetProcessHeap(), 0, nHeight * nXORWidthBytes ); + memcpy( copy, pXOR, nHeight * nXORWidthBytes ); + pXOR = copy; + + /* image and mask are upside down reversed */ + row = copy + (nHeight - 1) * nXORWidthBytes; + /* top left corner */ bgColor.rgbRed = row[0]; bgColor.rgbGreen = row[1]; @@ -306,6 +311,7 @@ static BOOL SaveIconResAsPNG(const BITMAPINFO *pIcon, const char *png_filename, ppng_destroy_write_struct(&png_ptr, &info_ptr); if (png_ptr) ppng_destroy_write_struct(&png_ptr, NULL); fclose(fp); + HeapFree(GetProcessHeap(), 0, copy); HeapFree(GetProcessHeap(), 0, comment.text); return TRUE; @@ -313,6 +319,7 @@ static BOOL SaveIconResAsPNG(const BITMAPINFO *pIcon, const char *png_filename, if (png_ptr) ppng_destroy_write_struct(&png_ptr, NULL); fclose(fp); unlink(png_filename); + HeapFree(GetProcessHeap(), 0, copy); HeapFree(GetProcessHeap(), 0, comment.text); return FALSE; }

1 0

Alexandre Julliard : regedit: Fix editing and exporting of zero-size strings.
by Alexandre Julliard 13 May '08

13 May '08

Module: wine Branch: master Commit: e5685804471c7a600e5b775fb4676e095d62d2bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5685804471c7a600e5b775fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 13 20:27:11 2008 +0200 regedit: Fix editing and exporting of zero-size strings. --- programs/regedit/edit.c | 4 ++-- programs/regedit/regproc.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 31645a7..40a0834 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -224,7 +224,7 @@ static LPTSTR read_value(HWND hwnd, HKEY hKey, LPCTSTR valueName, DWORD *lpType, goto done; } if ( *lpType == REG_DWORD ) valueDataLen = sizeof(DWORD); - if (!(buffer = HeapAlloc(GetProcessHeap(), 0, valueDataLen))) { + if (!(buffer = HeapAlloc(GetProcessHeap(), 0, valueDataLen+1))) { error(hwnd, IDS_TOO_BIG_VALUE, valueDataLen); goto done; } @@ -233,7 +233,7 @@ static LPTSTR read_value(HWND hwnd, HKEY hKey, LPCTSTR valueName, DWORD *lpType, error(hwnd, IDS_BAD_VALUE, valueName); goto done; } - + buffer[valueDataLen] = 0; if(len) *len = valueDataLen; return buffer; diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 85ab36b..b91cbf5 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -764,7 +764,7 @@ static void export_hkey(FILE *file, HKEY key, case REG_SZ: case REG_EXPAND_SZ: fputs("\"", file); - REGPROC_export_string(file, (char*) *val_buf); + if (val_size1) REGPROC_export_string(file, (char*) *val_buf); fputs("\"\n", file); break;

1 0

Alexandre Julliard : explorer: Use a different return value to indicate that the x11 system tray is not available , so that x11drv can return errors too.
by Alexandre Julliard 13 May '08

13 May '08

Module: wine Branch: master Commit: 26e566b91f0ba2d8ab9dd5537ad40480d72556e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26e566b91f0ba2d8ab9dd5537… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 13 20:56:25 2008 +0200 explorer: Use a different return value to indicate that the x11 system tray is not available, so that x11drv can return errors too. --- dlls/winex11.drv/systray.c | 6 ++++-- programs/explorer/systray.c | 9 +++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index d2a07fc..dffacf5 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -415,7 +415,7 @@ static BOOL delete_icon( struct tray_icon *icon ) * * Driver-side implementation of Shell_NotifyIcon. */ -BOOL wine_notify_icon( DWORD msg, NOTIFYICONDATAW *data ) +int wine_notify_icon( DWORD msg, NOTIFYICONDATAW *data ) { BOOL ret = FALSE; struct tray_icon *icon; @@ -423,7 +423,9 @@ BOOL wine_notify_icon( DWORD msg, NOTIFYICONDATAW *data ) switch (msg) { case NIM_ADD: - if (get_systray_selection_owner( thread_display() )) ret = add_icon( data ); + if (!get_systray_selection_owner( thread_display() )) + return -1; /* fall back to default handling */ + ret = add_icon( data ); break; case NIM_DELETE: if ((icon = get_icon( data->hWnd, data->uID ))) ret = delete_icon( icon ); diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index b259b81..8b82d9a 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -35,7 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(systray); #define IS_OPTION_FALSE(ch) \ ((ch) == 'n' || (ch) == 'N' || (ch) == 'f' || (ch) == 'F' || (ch) == '0') -static BOOL (*wine_notify_icon)(DWORD,NOTIFYICONDATAW *); +static int (*wine_notify_icon)(DWORD,NOTIFYICONDATAW *); /* an individual systray icon, unpacked from the NOTIFYICONDATA and always in unicode */ struct icon @@ -348,7 +348,7 @@ static BOOL handle_incoming(HWND hwndSource, COPYDATASTRUCT *cds) struct icon *icon = NULL; NOTIFYICONDATAW nid; DWORD cbSize; - BOOL ret = FALSE; + int ret = FALSE; if (cds->cbData < NOTIFYICONDATAW_V1_SIZE) return FALSE; cbSize = ((PNOTIFYICONDATA)cds->lpData)->cbSize; @@ -398,11 +398,12 @@ static BOOL handle_incoming(HWND hwndSource, COPYDATASTRUCT *cds) /* try forward to x11drv first */ if (cds->dwData == NIM_ADD || !(icon = get_icon( nid.hWnd, nid.uID ))) { - if (wine_notify_icon && wine_notify_icon( cds->dwData, &nid )) + if (wine_notify_icon && ((ret = wine_notify_icon( cds->dwData, &nid )) != -1)) { if (nid.uFlags & NIF_ICON) DestroyIcon( nid.hIcon ); - return TRUE; + return ret; } + ret = FALSE; } switch (cds->dwData)

1 0

Alexandre Julliard : kernel32: Move the wineboot event wait so that 16-bit processes wait too.
by Alexandre Julliard 13 May '08

13 May '08

Module: wine Branch: master Commit: 12de7d7591aeb92e06ee8a8ba11876864f7d1c13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12de7d7591aeb92e06ee8a8ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 13 20:26:37 2008 +0200 kernel32: Move the wineboot event wait so that 16-bit processes wait too. --- dlls/kernel32/process.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 2118511..868cc04 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1022,6 +1022,18 @@ void __wine_kernel_init(void) RtlInitUnicodeString( &NtCurrentTeb()->Peb->ProcessParameters->DllPath, MODULE_get_dll_load_path(main_exe_name) ); + if (boot_event) + { + if (WaitForSingleObject( boot_event, 30000 )) WARN( "boot event wait timed out\n" ); + CloseHandle( boot_event ); + /* if we didn't find environment section, try again now that wineboot has run */ + if (!got_environment) + { + set_registry_environment(); + set_additional_environment(); + } + } + if (!(peb->ImageBaseAddress = LoadLibraryExW( main_exe_name, 0, DONT_RESOLVE_DLL_REFERENCES ))) { char msg[1024]; @@ -1041,18 +1053,6 @@ void __wine_kernel_init(void) ExitProcess( error ); } - if (boot_event) - { - if (WaitForSingleObject( boot_event, 30000 )) WARN( "boot event wait timed out\n" ); - CloseHandle( boot_event ); - /* if we didn't find environment section, try again now that wineboot has run */ - if (!got_environment) - { - set_registry_environment(); - set_additional_environment(); - } - } - LdrInitializeThunk( 0, 0, 0, 0 ); /* switch to the new stack */ wine_switch_to_stack( start_process, NULL, NtCurrentTeb()->Tib.StackBase );

1 0

Andrej Sinicyn : wineconsole: German translation.
by Alexandre Julliard 13 May '08

13 May '08

Module: wine Branch: master Commit: c596ba39af97595ef015edac96afe4f5465551ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=c596ba39af97595ef015edac9… Author: Andrej Sinicyn <Andrej.Sinicyn(a)gmx.de> Date: Tue May 13 15:59:13 2008 +0200 wineconsole: German translation. --- programs/wineconsole/wineconsole_De.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wineconsole/wineconsole_De.rc b/programs/wineconsole/wineconsole_De.rc index 0ae54dc..e6a2157 100644 --- a/programs/wineconsole/wineconsole_De.rc +++ b/programs/wineconsole/wineconsole_De.rc @@ -40,7 +40,7 @@ IDS_DLG_ERR_SBWINSIZE, "Die Bildschirmgr IDS_CMD_INVALID_EVENT_ID "wineconsole: Kann Event-ID nicht parsen\n" IDS_CMD_INVALID_BACKEND "wineconsole: Ung�ltiges backend\n" IDS_CMD_INVALID_OPTION "wineconsole: Nicht erkannte Befehlszeilenoption\n" -IDS_CMD_ABOUT "Started ein Programm in einer Wine-Console.\n" +IDS_CMD_ABOUT "Startet ein Programm in einer Wine-Konsole.\n" IDS_CMD_LAUNCH_FAILED "wineconsole: Starten des Programms %s fehlgeschlagen.\n"\ "Der Befehl ist ung�ltig.\n"

1 0

Andrej Sinicyn : reg: German translation.
by Alexandre Julliard 13 May '08

13 May '08

Module: wine Branch: master Commit: ee3ed054d092e9ae66a144e29c935bb012bd2f11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee3ed054d092e9ae66a144e29… Author: Andrej Sinicyn <Andrej.Sinicyn(a)gmx.de> Date: Tue May 13 15:56:59 2008 +0200 reg: German translation. --- programs/reg/De.rc | 30 ++++++++++++++++++++++++++++++ programs/reg/rsrc.rc | 1 + 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/programs/reg/De.rc b/programs/reg/De.rc new file mode 100644 index 0000000..1d6aa57 --- /dev/null +++ b/programs/reg/De.rc @@ -0,0 +1,30 @@ +/* + * REG.EXE - Wine-compatible reg program. + * German language support + * + * Copyright 2008 Andrej Sinicyn + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE +{ + STRING_USAGE, "Die Syntax von diesem Befehl ist:\n\nREG [ ADD | DELETE | QUERY ]\nREG Befehl /?\n" + STRING_ADD_USAGE, "REG ADD Schl�ssel [/v Wert | /ve] [/t Typ] [/s Trenner] [/d Daten] [/f]\n" + STRING_DELETE_USAGE, "REG DELETE Schl�ssel [/v Wert | /ve | /va] [/f]\n" + STRING_QUERY_USAGE, "REG QUERY Schl�ssel [/v Wert | /ve] [/s]\n" +} diff --git a/programs/reg/rsrc.rc b/programs/reg/rsrc.rc index 44c55c5..dfeee04 100644 --- a/programs/reg/rsrc.rc +++ b/programs/reg/rsrc.rc @@ -23,6 +23,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "Da.rc" +#include "De.rc" #include "En.rc" #include "Ko.rc" #include "Nl.rc"

1 0

Andrej Sinicyn : uninstaller: German translation.
by Alexandre Julliard 13 May '08

13 May '08

Module: wine Branch: master Commit: 8fe38e8043768f003700bef03620c0e41a75e6de URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fe38e8043768f003700bef03… Author: Andrej Sinicyn <Andrej.Sinicyn(a)gmx.de> Date: Tue May 13 15:58:41 2008 +0200 uninstaller: German translation. --- programs/uninstaller/De.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/uninstaller/De.rc b/programs/uninstaller/De.rc index 51f8274..83b17f2 100644 --- a/programs/uninstaller/De.rc +++ b/programs/uninstaller/De.rc @@ -39,5 +39,5 @@ STRINGTABLE DISCARDABLE { IDS_ABOUT, "Wine Anwendungsentferner (C) 2005 durch Andreas Mohr, Hannu Valtonen und Jonathan Ernst." IDS_ABOUTTITLE, "�ber den Anwendungsentferner" IDS_REGISTRYKEYNOTAVAILABLE, "Der Registry-Schl�ssel f�r zu entfernende Anwendung(en) ist (noch) nicht verf�gbar, es kann nichts gemacht werden." - IDS_UNINSTALLFAILED, "Die Ausf�hrung des Entfernungsbefehls '%s' ist fehlgeschlagen, wahrscheinlich durch eine fehlende, ausf�hrbare Datei.\r\nM�chten Sie, dass der Anwendungseintrag aus der Registry entfernt wird ?" + IDS_UNINSTALLFAILED, "Die Ausf�hrung des Entfernungsbefehls '%s' ist fehlgeschlagen, wahrscheinlich durch eine fehlende, ausf�hrbare Datei.\r\nM�chten Sie, dass der Anwendungseintrag aus der Registry entfernt wird?" }

1 0

Andrej Sinicyn : cmd: German translation.
by Alexandre Julliard 13 May '08

13 May '08

Module: wine Branch: master Commit: 89651351f30ae1703fdb882d1f392831aa2c0d3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=89651351f30ae1703fdb882d1… Author: Andrej Sinicyn <Andrej.Sinicyn(a)gmx.de> Date: Tue May 13 15:56:18 2008 +0200 cmd: German translation. --- programs/cmd/De.rc | 62 ++++++++++++++++++++++++++-------------------------- 1 files changed, 31 insertions(+), 31 deletions(-) diff --git a/programs/cmd/De.rc b/programs/cmd/De.rc index ef72531..8da041d 100644 --- a/programs/cmd/De.rc +++ b/programs/cmd/De.rc @@ -126,10 +126,10 @@ modifizieren. Zum Beispiel:\n\ WCMD_PAUSE, "PAUSE l�sst eine Meldung auf dem Bildschirm erscheinen\n\ -'Press Return key to continue' und wartet darauf, dass der Nutzer die\n\ -Return/Enter-Taste dr�ckt. Es wird haupts�chlich in Batchdateien genutzt,\n\ -um dem Nutzer zu erlauben, die Ausgabe eines vorherigen Befehls zu lesen,\n\ -bevor es durch Scrollen vom Bildschirm verschwindet.\n" +'Dr�cken Sie die Eingabetaste um fortzufahren' und wartet darauf, dass der\n\ +Benutzer die Eingabetaste/Enter-Taste dr�ckt. Es wird haupts�chlich in\n\ +Batchdateien genutzt, um dem Beutzer zu erlauben, die Ausgabe eines vorherigen\n\ +Befehls zu lesen, bevor es durch Scrollen vom Bildschirm verschwindet.\n" WCMD_PROMPT, "PROMPT setzt den Befehlszeilenprompt.\n\ @@ -242,7 +242,7 @@ DIR\t\tListet den Inhalt eines Verzeichnisses\n\ ECHO\t\tKopiert den Text direkt zur Konsolenausgabe\n\ HELP\t\tZeigt detalierte Informationen zu einen Thema\n\ MD (MKDIR)\tErzeugt ein Unterverzeichnis\n\ -MORE\t\tDisplay output in pages\n\ +MORE\t\tZeigt die Ausgabe seitenweise an\n\ MOVE\t\tBewegt eine oder mehrere Dateien oder einen Verzeichnisbaum\n\ PATH\t\tSetzt oder zeigt den Suchpfad an\n\ PROMPT\t\t�ndert den Befehlszeilenprompt\n\ @@ -263,33 +263,33 @@ obigen Befehle erhalten.\n" WCMD_NO, "N" WCMD_NOASSOC, "Verkn�pfung f�r Dateiendung %s fehlt\n" WCMD_NOFTYPE, "Kein Befehl zum �ffnen f�r Dateityp '%s'\n" - WCMD_OVERWRITE, "Overwrite %s" - WCMD_MORESTR, "More..." - WCMD_TRUNCATEDLINE, "Line in Batch processing possibly truncated. Using:\n" - WCMD_NYI, "Not Yet Implemented\n\n" - WCMD_NOARG, "Argument missing\n" - WCMD_SYNTAXERR, "Syntax error\n" - WCMD_FILENOTFOUND, "%s : File Not Found\n" - WCMD_NOCMDHELP, "No help available for %s\n" - WCMD_NOTARGET, "Target to GOTO not found\n" - WCMD_CURRENTDATE, "Current Date is %s\n" - WCMD_CURRENTTIME, "Current Time is %s\n" - WCMD_NEWDATE, "Enter new date: " - WCMD_NEWTIME, "Enter new time: " - WCMD_MISSINGENV, "Environment variable %s not defined\n" - WCMD_READFAIL, "Failed to open '%s'\n" + WCMD_OVERWRITE, "%s �berschreiben" + WCMD_MORESTR, "Mehr..." + WCMD_TRUNCATEDLINE, "Die Zeile bei der Batchverarbeitung ist m�glicherweise abgeschnitten. Benutze:\n" + WCMD_NYI, "Noch nicht implementiert\n\n" + WCMD_NOARG, "Argument fehlt\n" + WCMD_SYNTAXERR, "Syntaxfehler\n" + WCMD_FILENOTFOUND, "%s : Datei nicht gefunden\n" + WCMD_NOCMDHELP, "Hilfe f�r %s ist nicht verf�gbar\n" + WCMD_NOTARGET, "Das Sprungziel von GOTO wurde nicht gefunden\n" + WCMD_CURRENTDATE, "Aktuelles Datum ist %s\n" + WCMD_CURRENTTIME, "Aktuelle Zeit ist %s\n" + WCMD_NEWDATE, "Geben Sie das neue Datum ein: " + WCMD_NEWTIME, "Geben Sie die neue Zeit ein: " + WCMD_MISSINGENV, "Die Umgebungsvariable %s ist nicht definiert\n" + WCMD_READFAIL, "'%s' konnte nicht ge�ffnet werden\n" WCMD_CALLINSCRIPT, "Cannot call batch label outside of a batch script\n" WCMD_ALL, "A" - WCMD_DELPROMPT, "%s, Delete" - WCMD_ECHOPROMPT, "Echo is %s\n" - WCMD_VERIFYPROMPT, "Verify is %s\n" - WCMD_VERIFYERR, "Verify must be ON or OFF\n"; - WCMD_ARGERR, "Parameter error\n" - WCMD_VOLUMEDETAIL, "Volume in drive %c is %s\nVolume Serial Number is %04x-%04x\n\n" - WCMD_VOLUMEPROMPT, "Volume label (11 characters, ENTER for none)?" - WCMD_NOPATH, "PATH not found\n" - WCMD_ANYKEY,"Press Return key to continue: " - WCMD_CONSTITLE,"Wine Command Prompt" + WCMD_DELPROMPT, "%s, l�schen" + WCMD_ECHOPROMPT, "Echo ist %s\n" + WCMD_VERIFYPROMPT, "Verify ist %s\n" + WCMD_VERIFYERR, "Verify mu� ON oder OFF sein\n"; + WCMD_ARGERR, "Parameterfehler\n" + WCMD_VOLUMEDETAIL, "Volume in Laufwerk %c ist %s\nVolumeseriennummer ist %04x-%04x\n\n" + WCMD_VOLUMEPROMPT, "Volumebezeichnung (11 Zeichen, EINGABETASTE f�r keine)?" + WCMD_NOPATH, "PATH nicht gefunden\n" + WCMD_ANYKEY,"Dr�cken Sie die Eingabetaste um fortzufahren: " + WCMD_CONSTITLE,"Wine Befehlsprozessor" WCMD_VERSION,"CMD Version %s\n\n" - WCMD_MOREPROMPT, "More? " + WCMD_MOREPROMPT, "Mehr? " }

1 0