Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 61220: [EXTRAC32] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 04 Dec '13

04 Dec '13

Author: akhaldi Date: Wed Dec 4 16:18:44 2013 New Revision: 61220 URL: http://svn.reactos.org/svn/reactos?rev=61220&view=rev Log: [EXTRAC32] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/base/applications/extrac32/CMakeLists.txt trunk/reactos/base/applications/extrac32/extrac32.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/base/applications/extrac32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/extrac32… ============================================================================== --- trunk/reactos/base/applications/extrac32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/extrac32/CMakeLists.txt [iso-8859-1] Wed Dec 4 16:18:44 2013 @@ -1,9 +1,6 @@ - add_executable(extrac32 extrac32.c) - target_link_libraries(extrac32 wine) - set_module_type(extrac32 win32gui UNICODE) add_importlibs(extrac32 shell32 setupapi shlwapi user32 msvcrt kernel32 ntdll) add_cd_file(TARGET extrac32 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/extrac32/extrac32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/extrac32… ============================================================================== --- trunk/reactos/base/applications/extrac32/extrac32.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/extrac32/extrac32.c [iso-8859-1] Wed Dec 4 16:18:44 2013 @@ -24,12 +24,29 @@ #include <shellapi.h> #include <setupapi.h> #include <shlwapi.h> +#include <shlobj.h> #include <wine/unicode.h> #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(extrac32); static BOOL force_mode; +static BOOL show_content; + +static void create_target_directory(LPWSTR Target) +{ + WCHAR dir[MAX_PATH]; + int res; + + strcpyW(dir, Target); + *PathFindFileNameW(dir) = 0; /* Truncate file name */ + if(!PathIsDirectoryW(dir)) + { + res = SHCreateDirectoryExW(NULL, dir, NULL); + if(res != ERROR_SUCCESS && res != ERROR_ALREADY_EXISTS) + WINE_ERR("Can't create directory: %s\n", wine_dbgstr_w(dir)); + } +} static UINT WINAPI ExtCabCallback(PVOID Context, UINT Notification, UINT_PTR Param1, UINT_PTR Param2) { @@ -40,9 +57,37 @@ { case SPFILENOTIFY_FILEINCABINET: pInfo = (FILE_IN_CABINET_INFO_W*)Param1; - lstrcpyW(pInfo->FullTargetName, (LPCWSTR)Context); - lstrcatW(pInfo->FullTargetName, pInfo->NameInCabinet); - return FILEOP_DOIT; + if(show_content) + { + FILETIME ft; + SYSTEMTIME st; + CHAR date[12], time[12], buf[2 * MAX_PATH]; + int count; + DWORD dummy; + + /* DosDate and DosTime already represented at local time */ + DosDateTimeToFileTime(pInfo->DosDate, pInfo->DosTime, &ft); + FileTimeToSystemTime(&ft, &st); + GetDateFormatA(0, 0, &st, "MM'-'dd'-'yyyy", date, sizeof date); + GetTimeFormatA(0, 0, &st, "HH':'mm':'ss", time, sizeof time); + count = wsprintfA(buf, "%s %s %c%c%c%c %15u %S\n", date, time, + pInfo->DosAttribs & FILE_ATTRIBUTE_ARCHIVE ? 'A' : '-', + pInfo->DosAttribs & FILE_ATTRIBUTE_HIDDEN ? 'H' : '-', + pInfo->DosAttribs & FILE_ATTRIBUTE_READONLY ? 'R' : '-', + pInfo->DosAttribs & FILE_ATTRIBUTE_SYSTEM ? 'S' : '-', + pInfo->FileSize, pInfo->NameInCabinet); + WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), buf, count, &dummy, NULL); + return FILEOP_SKIP; + } + else + { + lstrcpyW(pInfo->FullTargetName, (LPCWSTR)Context); + lstrcatW(pInfo->FullTargetName, pInfo->NameInCabinet); + /* SetupIterateCabinet() doesn't create full path to target by itself, + so we should do it manually */ + create_target_directory(pInfo->FullTargetName); + return FILEOP_DOIT; + } case SPFILENOTIFY_FILEEXTRACTED: pFilePaths = (FILEPATHS_W*)Param1; WINE_TRACE("Extracted %s\n", wine_dbgstr_w(pFilePaths->Target)); @@ -82,6 +127,98 @@ CopyFileW(source, destination, FALSE); } +static LPWSTR *get_extrac_args(LPWSTR cmdline, int *pargc) +{ + enum {OUTSIDE_ARG, INSIDE_ARG, INSIDE_QUOTED_ARG} state; + LPWSTR str; + int argc; + LPWSTR *argv; + int max_argc = 16; + BOOL new_arg; + + WINE_TRACE("cmdline: %s\n", wine_dbgstr_w(cmdline)); + str = HeapAlloc(GetProcessHeap(), 0, (strlenW(cmdline) + 1) * sizeof(WCHAR)); + if(!str) return NULL; + strcpyW(str, cmdline); + argv = HeapAlloc(GetProcessHeap(), 0, (max_argc + 1) * sizeof(LPWSTR)); + if(!argv) + { + HeapFree(GetProcessHeap(), 0, str); + return NULL; + } + + /* Split command line to separate arg-strings and fill argv */ + state = OUTSIDE_ARG; + argc = 0; + while(*str) + { + new_arg = FALSE; + /* Check character */ + if(isspaceW(*str)) /* white space */ + { + if(state == INSIDE_ARG) + { + state = OUTSIDE_ARG; + *str = 0; + } + } + else if(*str == '"') /* double quote */ + switch(state) + { + case INSIDE_QUOTED_ARG: + state = OUTSIDE_ARG; + *str = 0; + break; + case INSIDE_ARG: + *str = 0; + /* Fall through */ + case OUTSIDE_ARG: + if(!*++str) continue; + state = INSIDE_QUOTED_ARG; + new_arg = TRUE; + break; + } + else /* regular character */ + if(state == OUTSIDE_ARG) + { + state = INSIDE_ARG; + new_arg = TRUE; + } + + /* Add new argv entry, if need */ + if(new_arg) + { + if(argc >= max_argc - 1) + { + /* Realloc argv here because there always should be + at least one reserved cell for terminating NULL */ + max_argc *= 2; + argv = HeapReAlloc(GetProcessHeap(), 0, argv, + (max_argc + 1) * sizeof(LPWSTR)); + if(!argv) + { + HeapFree(GetProcessHeap(), 0, str); + return NULL; + } + } + argv[argc++] = str; + } + + str++; + } + + argv[argc] = NULL; + *pargc = argc; + + if(TRACE_ON(extrac32)) + { + int i; + for(i = 0; i < argc; i++) + WINE_TRACE("arg %d: %s\n", i, wine_dbgstr_w(argv[i])); + } + return argv; +} + int PASCAL wWinMain(HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int show) { LPWSTR *argv; @@ -89,15 +226,20 @@ int i; WCHAR check, cmd = 0; WCHAR path[MAX_PATH]; - WCHAR backslash[] = {'\\',0}; LPCWSTR cabfile = NULL; path[0] = 0; - argv = CommandLineToArgvW(cmdline, &argc); + + /* Do not use CommandLineToArgvW() or __wgetmainargs() to parse + * command line for this program. It should treat each quote as argument + * delimiter. This doesn't match with behavior of mentioned functions. + * Do not use args provided by wmain() for the same reason. + */ + argv = get_extrac_args(cmdline, &argc); if(!argv) { - WINE_ERR("Bad command line arguments\n"); + WINE_ERR("Command line parsing failed\n"); return 0; } @@ -105,7 +247,7 @@ for(i = 0; i < argc; i++) { /* Get cabfile */ - if (argv[i][0] != '/') + if (argv[i][0] != '/' && argv[i][0] != '-') { if (!cabfile) { @@ -130,9 +272,6 @@ return 0; break; case 'C': - if (cmd) return 0; - cmd = check; - break; case 'E': case 'D': if (cmd) return 0; @@ -152,11 +291,14 @@ if (!GetFullPathNameW(argv[i], MAX_PATH, path, NULL)) return 0; } - - if (!path[0]) + else if (!cmd) + /* Use extraction by default if names of required files presents */ + cmd = i < argc ? 'E' : 'D'; + + if (cmd == 'E' && !path[0]) GetCurrentDirectoryW(MAX_PATH, path); - lstrcatW(path, backslash); + PathAddBackslashW(path); /* Execute the specified command */ switch(cmd) @@ -165,15 +307,14 @@ /* Copy file */ copy_file(cabfile, path); break; + case 'D': + /* Display CAB archive */ + show_content = TRUE; + /* Fall through */ case 'E': /* Extract CAB archive */ extract(cabfile, path); break; - case 0: - case 'D': - /* Display CAB archive */ - WINE_FIXME("/D not implemented\n"); - break; } return 0; } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Dec 4 16:18:44 2013 @@ -230,7 +230,7 @@ reactos/base/applications/cmdutils/wmic # Synced to Wine-1.7.1 reactos/base/applications/cmdutils/xcopy # Synced to Wine-1.7.1 reactos/base/applications/games/winmine # Forked at Wine-1_3_5 -reactos/base/applications/extrac32 # Autosync +reactos/base/applications/extrac32 # Synced to Wine-1.7.1 reactos/base/applications/iexplore # Synced to Wine-1.5.26 reactos/base/applications/notepad # Forked at Wine-20041201 reactos/base/applications/regedit # Out of sync

1 0

[akhaldi] 61219: [XCOPY] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 04 Dec '13

04 Dec '13

Author: akhaldi Date: Wed Dec 4 16:17:23 2013 New Revision: 61219 URL: http://svn.reactos.org/svn/reactos?rev=61219&view=rev Log: [XCOPY] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c [iso-8859-1] Wed Dec 4 16:17:23 2013 @@ -41,8 +41,6 @@ #include <stdio.h> #include <stdlib.h> -//#include <tchar.h> -//#include <malloc.h> #include <windef.h> #include <winbase.h> @@ -298,6 +296,7 @@ if (!feof(inFile)) { XCOPY_wprintf(XCOPY_LoadMessage(STRING_READFAIL), filename); *endOfName = endChar; + fclose(inFile); return TRUE; } @@ -634,6 +633,7 @@ /* Find next one */ findres = FindNextFileW(h, finddata); } + FindClose(h); } cleanup: @@ -768,7 +768,7 @@ case 'E': if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, &word[1], 8, - EXCLUDE, -1) == 2) { + EXCLUDE, -1) == CSTR_EQUAL) { if (XCOPY_ProcessExcludeList(&word[9])) { XCOPY_FailMessage(ERROR_INVALID_PARAMETER); goto out; @@ -827,7 +827,8 @@ break; case '-': if (toupper(word[2])=='Y') - flags &= ~OPT_NOPROMPT; break; + flags &= ~OPT_NOPROMPT; + break; case '?': XCOPY_wprintf(XCOPY_LoadMessage(STRING_HELP)); rc = RC_HELP; goto out; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Dec 4 16:17:23 2013 @@ -228,7 +228,7 @@ reactos/base/applications/cmdutils/reg # Synced to Wine-1.7.1 reactos/base/applications/cmdutils/taskkill # Synced to Wine-1.7.1 reactos/base/applications/cmdutils/wmic # Synced to Wine-1.7.1 -reactos/base/applications/cmdutils/xcopy # Synced to Wine-1.3.37 +reactos/base/applications/cmdutils/xcopy # Synced to Wine-1.7.1 reactos/base/applications/games/winmine # Forked at Wine-1_3_5 reactos/base/applications/extrac32 # Autosync reactos/base/applications/iexplore # Synced to Wine-1.5.26

1 0

[akhaldi] 61218: [REG] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 04 Dec '13

04 Dec '13

Author: akhaldi Date: Wed Dec 4 16:16:01 2013 New Revision: 61218 URL: http://svn.reactos.org/svn/reactos?rev=61218&view=rev Log: [REG] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/base/applications/cmdutils/reg/reg.c trunk/reactos/base/applications/cmdutils/reg/reg.rc trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/base/applications/cmdutils/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/reg.c [iso-8859-1] Wed Dec 4 16:16:01 2013 @@ -44,6 +44,10 @@ DWORD len; char *msgA; + /* On Windows WriteConsoleW() fails if the output is redirected. So fall + * back to WriteFile(), assuming the console encoding is still the right + * one in that case. + */ len = WideCharToMultiByte(GetConsoleOutputCP(), 0, msg_buffer, wlen, NULL, 0, NULL, NULL); msgA = HeapAlloc(GetProcessHeap(), 0, len * sizeof(char)); @@ -72,20 +76,30 @@ static HKEY get_rootkey(LPWSTR key) { static const WCHAR szHKLM[] = {'H','K','L','M',0}; + static const WCHAR szHKEY_LOCAL_MACHINE[] = {'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E',0}; static const WCHAR szHKCU[] = {'H','K','C','U',0}; + static const WCHAR szHKEY_CURRENT_USER[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R',0}; static const WCHAR szHKCR[] = {'H','K','C','R',0}; + static const WCHAR szHKEY_CLASSES_ROOT[] = {'H','K','E','Y','_','C','L','A','S','S','E','S','_','R','O','O','T',0}; static const WCHAR szHKU[] = {'H','K','U',0}; + static const WCHAR szHKEY_USERS[] = {'H','K','E','Y','_','U','S','E','R','S',0}; static const WCHAR szHKCC[] = {'H','K','C','C',0}; - - if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKLM,4)==2) + static const WCHAR szHKEY_CURRENT_CONFIG[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','C','O','N','F','I','G',0}; + + if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKLM,4)==CSTR_EQUAL || + CompareStringW(CP_ACP,NORM_IGNORECASE,key,18,szHKEY_LOCAL_MACHINE,18)==CSTR_EQUAL) return HKEY_LOCAL_MACHINE; - else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCU,4)==2) + else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCU,4)==CSTR_EQUAL || + CompareStringW(CP_ACP,NORM_IGNORECASE,key,17,szHKEY_CURRENT_USER,17)==CSTR_EQUAL) return HKEY_CURRENT_USER; - else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCR,4)==2) + else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCR,4)==CSTR_EQUAL || + CompareStringW(CP_ACP,NORM_IGNORECASE,key,17,szHKEY_CLASSES_ROOT,17)==CSTR_EQUAL) return HKEY_CLASSES_ROOT; - else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,3,szHKU,3)==2) + else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,3,szHKU,3)==CSTR_EQUAL || + CompareStringW(CP_ACP,NORM_IGNORECASE,key,10,szHKEY_USERS,10)==CSTR_EQUAL) return HKEY_USERS; - else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCC,4)==2) + else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCC,4)==CSTR_EQUAL || + CompareStringW(CP_ACP,NORM_IGNORECASE,key,19,szHKEY_CURRENT_CONFIG,19)==CSTR_EQUAL) return HKEY_CURRENT_CONFIG; else return NULL; } Modified: trunk/reactos/base/applications/cmdutils/reg/reg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/reg.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/reg.rc [iso-8859-1] Wed Dec 4 16:16:01 2013 @@ -11,6 +11,7 @@ /* UTF-8 */ #pragma code_page(65001) + #ifdef LANGUAGE_BG_BG #include "lang/bg-BG.rc" #endif Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Dec 4 16:16:01 2013 @@ -225,7 +225,7 @@ ReactOS shares the following programs with Winehq. -reactos/base/applications/cmdutils/reg # Synced to Wine-1.1.40 +reactos/base/applications/cmdutils/reg # Synced to Wine-1.7.1 reactos/base/applications/cmdutils/taskkill # Synced to Wine-1.7.1 reactos/base/applications/cmdutils/wmic # Synced to Wine-1.7.1 reactos/base/applications/cmdutils/xcopy # Synced to Wine-1.3.37

1 0

[akhaldi] 61217: [ODBC32] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 04 Dec '13

04 Dec '13

Author: akhaldi Date: Wed Dec 4 16:13:32 2013 New Revision: 61217 URL: http://svn.reactos.org/svn/reactos?rev=61217&view=rev Log: [ODBC32] * Sync with Wine 1.7.1. CORE-7469 Removed: trunk/reactos/dll/win32/odbc32/proxyodbc.h Modified: trunk/reactos/dll/win32/odbc32/CMakeLists.txt trunk/reactos/dll/win32/odbc32/odbc32.spec trunk/reactos/dll/win32/odbc32/proxyodbc.c trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/odbc32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/odbc32/CMakeList… Modified: trunk/reactos/dll/win32/odbc32/odbc32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/odbc32/odbc32.sp… Modified: trunk/reactos/dll/win32/odbc32/proxyodbc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/odbc32/proxyodbc… Removed: trunk/reactos/dll/win32/odbc32/proxyodbc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/odbc32/proxyodbc… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

[akhaldi] 61216: [README.WINE] * Update the status of expand, msiexec and taskkill. CORE-7469
by akhaldi＠svn.reactos.org 04 Dec '13

04 Dec '13

Author: akhaldi Date: Wed Dec 4 16:11:26 2013 New Revision: 61216 URL: http://svn.reactos.org/svn/reactos?rev=61216&view=rev Log: [README.WINE] * Update the status of expand, msiexec and taskkill. CORE-7469 Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Dec 4 16:11:26 2013 @@ -226,7 +226,7 @@ ReactOS shares the following programs with Winehq. reactos/base/applications/cmdutils/reg # Synced to Wine-1.1.40 -reactos/base/applications/cmdutils/taskkill # Synced to Wine-1.5.25 +reactos/base/applications/cmdutils/taskkill # Synced to Wine-1.7.1 reactos/base/applications/cmdutils/wmic # Synced to Wine-1.7.1 reactos/base/applications/cmdutils/xcopy # Synced to Wine-1.3.37 reactos/base/applications/games/winmine # Forked at Wine-1_3_5 @@ -237,8 +237,8 @@ reactos/base/applications/winhlp32 # Synced to Wine-1.5.26 reactos/base/applications/wordpad # Synced to Wine-1.5.26 reactos/base/services/rpcss # Synced to Wine-1.7.1 -reactos/base/system/expand # Synced to Wine-1.5.26 -reactos/base/system/msiexec # Synced to Wine-1.5.26 +reactos/base/system/expand # Synced to Wine-1.7.1 +reactos/base/system/msiexec # Synced to Wine-1.7.1 reactos/modules/rosapps/winfile # Autosync In addition the following libs, dlls and source files are mostly based on code ported

1 0

[aandrejevic] 61215: [NTVDM] Also serialize access to KeyboardQueueEmpty.
by aandrejevic＠svn.reactos.org 04 Dec '13

04 Dec '13

Author: aandrejevic Date: Wed Dec 4 00:43:11 2013 New Revision: 61215 URL: http://svn.reactos.org/svn/reactos?rev=61215&view=rev Log: [NTVDM] Also serialize access to KeyboardQueueEmpty. Modified: branches/ntvdm/subsystems/ntvdm/ps2.c Modified: branches/ntvdm/subsystems/ntvdm/ps2.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ps2.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ps2.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ps2.c [iso-8859-1] Wed Dec 4 00:43:11 2013 @@ -93,8 +93,12 @@ { BYTE Status = 0; + WaitForSingleObject(QueueMutex, INFINITE); + /* Set the first bit if the data can be read */ if (KeyboardReadResponse || !KeyboardQueueEmpty) Status |= 1 << 0; + + ReleaseMutex(QueueMutex); /* Always set bit 2 */ Status |= 1 << 2;

1 0

[aandrejevic] 61214: [NTVDM] Fix the VGA refresh rate. Serialize access to the PS/2 keyboard queue.
by aandrejevic＠svn.reactos.org 04 Dec '13

04 Dec '13

Author: aandrejevic Date: Wed Dec 4 00:38:52 2013 New Revision: 61214 URL: http://svn.reactos.org/svn/reactos?rev=61214&view=rev Log: [NTVDM] Fix the VGA refresh rate. Serialize access to the PS/2 keyboard queue. Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c branches/ntvdm/subsystems/ntvdm/ps2.c Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] Wed Dec 4 00:38:52 2013 @@ -221,7 +221,7 @@ } /* Check for vertical retrace */ - if ((CurrentTickCount - LastVerticalRefresh) >= 16) + if ((CurrentTickCount - LastVerticalRefresh) >= 15) { VgaRefreshDisplay(); LastVerticalRefresh = CurrentTickCount; Modified: branches/ntvdm/subsystems/ntvdm/ps2.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ps2.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ps2.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ps2.c [iso-8859-1] Wed Dec 4 00:38:52 2013 @@ -24,6 +24,7 @@ static BYTE KeyboardData = 0, KeyboardResponse = 0; static BOOLEAN KeyboardReadResponse = FALSE, KeyboardWriteResponse = FALSE; static BYTE KeyboardConfig = PS2_DEFAULT_CONFIG; +static HANDLE QueueMutex = NULL; static HANDLE InputThread = NULL; @@ -31,10 +32,15 @@ static BOOLEAN KeyboardQueuePush(BYTE ScanCode) { + BOOLEAN Result = TRUE; + + WaitForSingleObject(QueueMutex, INFINITE); + /* Check if the keyboard queue is full */ if (!KeyboardQueueEmpty && (KeyboardQueueStart == KeyboardQueueEnd)) { - return FALSE; + Result = FALSE; + goto Done; } /* Insert the value in the queue */ @@ -45,13 +51,23 @@ /* Since we inserted a value, it's not empty anymore */ KeyboardQueueEmpty = FALSE; - return TRUE; +Done: + ReleaseMutex(QueueMutex); + return Result; } static BOOLEAN KeyboardQueuePop(BYTE *ScanCode) { + BOOLEAN Result = TRUE; + + WaitForSingleObject(QueueMutex, INFINITE); + /* Make sure the keyboard queue is not empty */ - if (KeyboardQueueEmpty) return FALSE; + if (KeyboardQueueEmpty) + { + Result = FALSE; + goto Done; + } /* Get the scan code */ *ScanCode = KeyboardQueue[KeyboardQueueStart]; @@ -66,7 +82,9 @@ KeyboardQueueEmpty = TRUE; } - return TRUE; +Done: + ReleaseMutex(QueueMutex); + return Result; } /* PUBLIC FUNCTIONS ***********************************************************/ @@ -338,6 +356,9 @@ BOOLEAN PS2Initialize(HANDLE ConsoleInput) { + /* Create the mutex */ + QueueMutex = CreateMutex(NULL, FALSE, NULL); + /* Start the input thread */ InputThread = CreateThread(NULL, 0, &InputThreadProc, ConsoleInput, 0, NULL); @@ -355,6 +376,8 @@ /* Close the input thread handle */ if (InputThread != NULL) CloseHandle(InputThread); InputThread = NULL; + + CloseHandle(QueueMutex); } /* EOF */

1 0

[dreimer] 61213: [WIN32] Update all German RC files of non Wine DLLs except the missing one in BROWSEUI.
by dreimer＠svn.reactos.org 04 Dec '13

04 Dec '13

Author: dreimer Date: Wed Dec 4 00:02:47 2013 New Revision: 61213 URL: http://svn.reactos.org/svn/reactos?rev=61213&view=rev Log: [WIN32] Update all German RC files of non Wine DLLs except the missing one in BROWSEUI. Added: trunk/reactos/dll/win32/lsasrv/lang/de-DE.rc (with props) Modified: trunk/reactos/dll/win32/devmgr/lang/de-DE.rc trunk/reactos/dll/win32/devmgr/lang/en-US.rc trunk/reactos/dll/win32/lsasrv/lsasrv.rc trunk/reactos/dll/win32/modemui/lang/de-DE.rc trunk/reactos/dll/win32/msgina/lang/de-DE.rc trunk/reactos/dll/win32/netcfgx/lang/de-DE.rc trunk/reactos/dll/win32/netid/lang/de-DE.rc trunk/reactos/dll/win32/netshell/lang/de-DE.rc trunk/reactos/dll/win32/newdev/lang/de-DE.rc trunk/reactos/dll/win32/rasdlg/lang/de-DE.rc trunk/reactos/dll/win32/rasdlg/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/syssetup/lang/de-DE.rc trunk/reactos/dll/win32/tapiui/lang/de-DE.rc Modified: trunk/reactos/dll/win32/devmgr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/de-D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/de-DE.rc [iso-8859-1] Wed Dec 4 00:02:47 2013 @@ -27,12 +27,12 @@ IDS_NOTAVAILABLE "Nicht verfÃ¼gbar" IDS_NOTDIGITALLYSIGNED "Nicht digital signiert" IDS_NODRIVERS "Es werden keine Treiber fÃ¼r dieses GerÃ¤t benÃ¶tigt oder es wurden keine Treiber geladen." - IDS_RESOURCE_COLUMN "Resource type" - IDS_SETTING_COLUMN "Setting" - IDS_RESOURCE_MEMORY_RANGE "Memory range" + IDS_RESOURCE_COLUMN "Ressourcentyp" + IDS_SETTING_COLUMN "Einstellung" + IDS_RESOURCE_MEMORY_RANGE "Speicherbereich" IDS_RESOURCE_INTERRUPT "IRQ" IDS_RESOURCE_DMA "DMA" - IDS_RESOURCE_PORT "E/A range" + IDS_RESOURCE_PORT "E/A-Bereich" END /* error messages, source: http://www.z123.org/techsupport/medm.htm */ @@ -59,7 +59,7 @@ IDS_DEV_NEED_RESTART "Dieses GerÃ¤t wird erst korrekt funktionieren, wenn Sie den Computer neugestartet haben." IDS_DEV_REENUMERATION "Dieses GerÃ¤t verursacht einen Ressourcenkonflikt." IDS_DEV_PARTIAL_LOG_CONF "ReactOS konnte nicht alle Ressourcen identifizieren, die dieses GerÃ¤t benutzt." - IDS_DEV_UNKNOWN_RESOURCE "The driver information file %1 is telling this child device to use a resource that the parent device does not have or recognize." + IDS_DEV_UNKNOWN_RESOURCE "Die Treiberinformationsdatei %1 lÃ¤sst dieses Kind-GerÃ¤t auf eine Ressource zugreifen, welche dem Eltern-GerÃ¤t nicht zur VerfÃ¼gung steht oder bekannt ist." IDS_DEV_REINSTALL "Die Treiber fÃ¼r dieses GerÃ¤t mÃ¼ssen neuinstalliert werden." IDS_DEV_REGISTRY "Die Registrierungsdatenbank kÃ¶nnte beschÃ¤digt sein." IDS_DEV_WILL_BE_REMOVED "ReactOS wird dieses GerÃ¤t entfernen." @@ -136,7 +136,7 @@ LTEXT "", IDC_MANUFACTURER, 14, 88, 183, 10, SS_ENDELLIPSIS LTEXT "", IDC_LOCATION, 14, 100, 183, 10, SS_ENDELLIPSIS LTEXT "", IDC_STATUS, 14, 112, 183, 30 - PUSHBUTTON "Problem &lÃ¶sen...", IDC_TROUBLESHOOT, 85, 140, 54, 14, BS_PUSHBUTTON | WS_CHILD | WS_DISABLED | WS_TABSTOP + PUSHBUTTON "Problem &lÃ¶sen...", IDC_TROUBLESHOOT, 80, 140, 60, 14, BS_PUSHBUTTON | WS_CHILD | WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Eigenschaften", IDC_PROPERTIES, 146, 140, 50, 14 END @@ -175,9 +175,9 @@ EDITTEXT IDC_DRVVERSION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY LTEXT "Signaturgeber:", -1, 37, 81, 60, 8, SS_NOPREFIX EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - PUSHBUTTON "&Treiberdetails...", IDC_DRIVERDETAILS, 7, 106, 75, 15 + PUSHBUTTON "&Treiberdetails...", IDC_DRIVERDETAILS, 7, 106, 80, 15 LTEXT "Einzelheiten Ã¼ber die Treiberdateien anzeigen.", -1, 91, 110, 154, 17, SS_NOPREFIX - PUSHBUTTON "Treiber &aktualisieren...", IDC_UPDATEDRIVER, 7, 126, 75, 15 + PUSHBUTTON "Treiber &aktualisieren...", IDC_UPDATEDRIVER, 7, 126, 80, 15 LTEXT "Aktualisiert den GerÃ¤tetreiber.", -1, 91, 130, 154, 17, SS_NOPREFIX END @@ -218,12 +218,12 @@ IDD_DEVICERESOURCES DIALOGEX 0, 0, 252, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Resources" -FONT 8, "MS Shell Dlg" -BEGIN - ICON "", IDC_DEVICON, 7, 7, 20, 20 - LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX - LTEXT "Resource settings:", -1, 7, 36, 204, 8 +CAPTION "Ressourcen" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "Ressourcen-Einstellungen:", -1, 7, 36, 204, 8 CONTROL "", IDC_DRIVERRESOURCES, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 Modified: trunk/reactos/dll/win32/devmgr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/en-U… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/en-US.rc [iso-8859-1] Wed Dec 4 00:02:47 2013 @@ -134,7 +134,7 @@ LTEXT "", IDC_MANUFACTURER, 14, 88, 183, 10, SS_ENDELLIPSIS LTEXT "", IDC_LOCATION, 14, 100, 183, 10, SS_ENDELLIPSIS LTEXT "", IDC_STATUS, 14, 112, 183, 30 - PUSHBUTTON "&Troubleshoot...", IDC_TROUBLESHOOT, 85, 140, 54, 14, BS_PUSHBUTTON | WS_CHILD | WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Troubleshoot...", IDC_TROUBLESHOOT, 80, 140, 60, 14, BS_PUSHBUTTON | WS_CHILD | WS_DISABLED | WS_TABSTOP PUSHBUTTON "P&roperties", IDC_PROPERTIES, 146, 140, 50, 14 END Added: trunk/reactos/dll/win32/lsasrv/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lang/de-D… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lang/de-DE.rc (added) +++ trunk/reactos/dll/win32/lsasrv/lang/de-DE.rc [iso-8859-1] Wed Dec 4 00:02:47 2013 @@ -0,0 +1,44 @@ +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_NT_AUTHORITY "NT-AUTORITÃT" + IDS_NULL_RID "NULL SID" + IDS_WORLD_RID "Jeder" + IDS_LOCAL_RID "LOKAL" + IDS_CREATOR_OWNER_RID "ERSTELLER-BESITZER" + IDS_CREATOR_GROUP_RID "ERSTELLERGRUPPE" + IDS_CREATOR_OWNER_SERVER_RID "ERSTELLER-BESITZER-SERVER" + IDS_CREATOR_GROUP_SERVER_RID "ERSTELLER-GRUPPEN-SERVER" + IDS_DIALUP_RID "DIALUP" + IDS_NETWORK_RID "NETZWERK" + IDS_BATCH_RID "BATCH" + IDS_INTERACTIVE_RID "INTERAKTIV" + IDS_SERVICE_RID "DIENST" + IDS_ANONYMOUS_LOGON_RID "ANONYMOUS-ANMELDUNG" + IDS_PROXY_RID "PROXY" + IDS_ENTERPRISE_CONTROLLERS_RID "DOMÃNENCONTROLLER DER ORGANISATION" + IDS_PRINCIPAL_SELF_RID "SELBST" + IDS_AUTHENTICATED_USER_RID "Authentifizierte Benutzer" + IDS_RESTRICTED_CODE_RID "EINGESCHRÃNKTER ZUGRIFF" + IDS_TERMINAL_SERVER_RID "TERMINALSERVERBENUTZER" + IDS_REMOTE_LOGON_RID "INTERAKTIVE REMOTEANMELDUNG" + IDS_THIS_ORGANIZATION_RID "Diese Organisation" + IDS_LOCAL_SYSTEM_RID "SYSTEM" + IDS_LOCAL_SERVICE_RID "LOKALER DIENST" + IDS_NETWORK_SERVICE_RID "NETZWERKDIENST" + IDS_BUILTIN_DOMAIN_RID "VORDEFINIERT" + IDS_ALIAS_RID_ADMINS "Administratoren" + IDS_ALIAS_RID_USERS "Benutzer" + IDS_ALIAS_RID_GUESTS "GÃ¤ste" + IDS_ALIAS_RID_POWER_USERS "Hauptbenutzer" + IDS_ALIAS_RID_ACCOUNT_OPS "Konten-Operatoren" + IDS_ALIAS_RID_SYSTEM_OPS "Server-Operatoren" + IDS_ALIAS_RID_PRINT_OPS "Druck-Operatoren" + IDS_ALIAS_RID_BACKUP_OPS "Sicherungs-Operatoren" + IDS_ALIAS_RID_REPLICATOR "Replikations-Operatoren" + IDS_ALIAS_RID_RAS_SERVERS "RAS- und IAS-Server" + IDS_ALIAS_RID_PREW2KCOMPACCESS "PrÃ¤-Windows 2000 kompatibler Zugriff" + IDS_ALIAS_RID_REMOTE_DESKTOP_USERS "Remotedesktopbenutzer" + IDS_ALIAS_RID_NETWORK_CONFIGURATION_OPS "Netzwerkkonfigurations-Operatoren" +END Propchange: trunk/reactos/dll/win32/lsasrv/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.rc… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.rc [iso-8859-1] Wed Dec 4 00:02:47 2013 @@ -21,6 +21,9 @@ /* UTF-8 */ #pragma code_page(65001) +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif Modified: trunk/reactos/dll/win32/modemui/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/modemui/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/modemui/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/modemui/lang/de-DE.rc [iso-8859-1] Wed Dec 4 00:02:47 2013 @@ -84,7 +84,7 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "", 1068, 10, 7, 218, 87 - AUTOCHECKBOX "&Telefonleitung verfÃ¼gt Ã¼ber verschiedene Rufsignale", 1069, 19, 7, 177, 10 + AUTOCHECKBOX "&Telefonleitung verfÃ¼gt Ã¼ber verschiedene Rufsignale", 1069, 19, 7, 181, 10 CTEXT "Rufsignalfolge", -1, 20, 21, 74, 8 CTEXT "Art des Anrufs", -1, 96, 21, 65, 8 LTEXT "&Einfaches Klingeln:", 1088, 20, 37, 65, 8 @@ -124,7 +124,7 @@ CAPTION "Allgemein" FONT 8, "MS Shell Dlg" BEGIN - AUTOCHECKBOX "&VermittlungsunterstÃ¼tztes (manuelles) WÃ¤hlen", 1002, 19, 22, 155, 10 + AUTOCHECKBOX "&VermittlungsunterstÃ¼tztes (manuelles) WÃ¤hlen", 1002, 19, 22, 160, 10 AUTOCHECKBOX "&Trennen nach Leerlauf von:", 1042, 19, 38, 143, 10 EDITTEXT 1043, 168, 35, 25, 13, ES_AUTOHSCROLL | ES_NUMBER LTEXT "&WÃ¤hlvorgang abbrechen nach:", -1, 19, 56, 147, 10 @@ -358,7 +358,7 @@ 2010 "Der Computer muss neu gestartet werden, um die Modeminstallation abzuschlieÃen.\n\nSoll der Computer jetzt neu gestartet werden?" 2011 "Das Modem ist nicht korrekt installiert." 2012 "Unbekannter Anschluss" - 3000 "Modem Setup" + 3000 "Modem Installation" 3018 "Modems" 3019 "Installiert ein neues Modem und Ã¤ndert Modemeigenschaften." 3053 "Die Modemeigenschaften kÃ¶nnen nicht angezeigt werden, da das Modem nicht verfÃ¼gbar ist.\n\nStarten Sie das System neu und wiederholen Sie den Vorgang." Modified: trunk/reactos/dll/win32/msgina/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/de-D… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/de-DE.rc [iso-8859-1] Wed Dec 4 00:02:47 2013 @@ -20,7 +20,7 @@ IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Logon" +CAPTION "Anmeldung" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 @@ -47,7 +47,7 @@ PUSHBUTTON "Abmelden", IDC_LOGOFF, 100, 135, 75, 14 PUSHBUTTON "Herunterfahren", IDC_SHUTDOWN, 189, 135, 76, 14 PUSHBUTTON "Password Ã¤ndern", IDC_CHANGEPWD, 10, 154, 76, 14, WS_DISABLED - PUSHBUTTON "Task manager", IDC_TASKMGR, 100, 154, 75, 14 + PUSHBUTTON "Task-Manager", IDC_TASKMGR, 100, 154, 75, 14 PUSHBUTTON "Abbrechen", IDCANCEL, 189, 154, 76, 14 END @@ -65,7 +65,7 @@ IDD_UNLOCK_DLG DIALOGEX 0, 0, 275, 179 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Unlock Computer" +CAPTION "Computer entsperren" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 @@ -82,22 +82,22 @@ IDD_CHANGE_PASSWORD DIALOGEX 0, 0, 275, 166 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Change Password" +CAPTION "Passwort Ã¤ndern" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "User name:", IDC_STATIC, 7, 61, 78, 8 + LTEXT "Benutzername:", IDC_STATIC, 7, 61, 78, 8 EDITTEXT IDC_CHANGEPWD_USERNAME, 90, 59, 127, 12, ES_AUTOHSCROLL - LTEXT "Log on to:", IDC_STATIC, 7, 78, 78, 8 + LTEXT "Anmelden an:", IDC_STATIC, 7, 78, 78, 8 COMBOBOX IDC_CHANGEPWD_DOMAIN, 90, 75, 127, 144, CBS_DROPDOWNLIST | CBS_SORT - LTEXT "Old Password:", IDC_STATIC, 7, 95, 78, 8 + LTEXT "Aktuelles Passwort:", IDC_STATIC, 7, 95, 78, 8 EDITTEXT IDC_CHANGEPWD_OLDPWD, 90, 92, 127, 12, ES_AUTOHSCROLL | ES_PASSWORD - LTEXT "New Password:", IDC_STATIC, 7, 111, 78, 8 + LTEXT "Neues Passwort:", IDC_STATIC, 7, 111, 78, 8 EDITTEXT IDC_CHANGEPWD_NEWPWD1, 90, 109, 127, 12, ES_AUTOHSCROLL | ES_PASSWORD - LTEXT "Confirm new Password:", IDC_STATIC, 7, 127, 78, 8 + LTEXT "Passwort wiederholen:", IDC_STATIC, 7, 127, 78, 8 EDITTEXT IDC_CHANGEPWD_NEWPWD2, 90, 125, 127, 12, ES_AUTOHSCROLL | ES_PASSWORD PUSHBUTTON "OK", IDOK, 164, 145, 50, 14, BS_DEFPUSHBUTTON - PUSHBUTTON "Cancel", IDCANCEL, 218, 145, 50, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 218, 145, 50, 14 END STRINGTABLE @@ -109,6 +109,6 @@ IDS_ASKFORPASSWORD "Passwort: " IDS_FORCELOGOFF "Dies wird den derzeitigen Benutzer abmelden. Alle ungespeicherten Daten gehen verloren. Fortsetzen?" IDS_LOCKMSG "Nur %s oder ein Administrator kann den Computer entsperren." - IDS_LOGONMSG "You are logged on as %s." + IDS_LOGONMSG "Sie sind angemeldet als %s." IDS_LOGONDATE "Anmeldedatum: %s %s" END Modified: trunk/reactos/dll/win32/netcfgx/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/de-DE.rc [iso-8859-1] Wed Dec 4 00:02:47 2013 @@ -220,7 +220,7 @@ IDS_DUP_NUMBER "Die Nummer, die Sie hinzufÃ¼gen mÃ¶chten ist bereits in der Liste. Geben Sie eine andere Nummer ein." IDS_DISABLE_FILTER "Das Deaktivieren dieser globalen TCP/IP-Einstellung wird alle Adapter betreffen." IDS_NO_SUFFIX "Die aktuelle Sucheinstellung der Suchmethode erfordert mindestens ein DNS-Suffix. Geben Sie ein Suffix ein, oder Ã¤ndern Sie die Einstellung." - IDS_DOMAIN_SUFFIX "Das DomÃ¤nensuffix ist kein gÃ¼ltiges SÃ¼ffix." + IDS_DOMAIN_SUFFIX "Das DomÃ¤nensuffix ist kein gÃ¼ltiges Suffix." IDS_DNS_SUFFIX "Der DNS-DomÃ¤nensuffix ""%s"" ist kein gÃ¼ltiger DNS-Name." IDS_DUP_SUFFIX "Das DNS-Suffix ist bereits in der Liste vorhanden." IDS_DUP_IPADDR "Die IP-Adresse ist bereits in der Liste vorhanden." Modified: trunk/reactos/dll/win32/netid/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/de-DE… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/de-DE.rc [iso-8859-1] Wed Dec 4 00:02:47 2013 @@ -61,7 +61,7 @@ EDITTEXT 1013, 7, 69, 150, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_READONLY DEFPUSHBUTTON "OK", 1, 153, 104, 50, 14 PUSHBUTTON "Abbrechen", 2, 209, 104, 50, 14 - LTEXT "Dieser Name wird zur InteroperabilitÃ¤t mit Ã¤lteren Computern und Diensten verwendet.", 13, 7, 88, 253, 8 + LTEXT "Dieser Name dient der InteroperatibilitÃ¤t mit Ã¤lteren Computern und Diensten.", 13, 7, 88, 253, 8 END STRINGTABLE Modified: trunk/reactos/dll/win32/netshell/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/de… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/de-DE.rc [iso-8859-1] Wed Dec 4 00:02:47 2013 @@ -16,7 +16,7 @@ GROUPBOX "Beschreibung", -1, 9, 153, 230, 46, BS_GROUPBOX LTEXT "Hier wird die Beschreibung des Elementes stehen....", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP CHECKBOX "&Symbol bei Verbindung im Infobereich anzeigen", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "&Benachrichtigen, wenn diese Verbindung eingeschrÃ¤nkte oder keine KonnektivitÃ¤t besitzt", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 24, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "&Benachrichtigen bei eingeschrÃ¤nkter oder keiner KonnektivitÃ¤t", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 24, BS_AUTOCHECKBOX | WS_TABSTOP END IDD_STATUS DIALOGEX 0, 0, 200, 280 @@ -83,8 +83,8 @@ IDS_SUBNET_MASK "Subnetzmaske" IDS_DEF_GATEWAY "Standardgateway" IDS_DHCP_SERVER "DHCP-Server" - IDS_LEASE_OBTAINED "Lease Obtained" - IDS_LEASE_EXPIRES "Lease Expires" + IDS_LEASE_OBTAINED "Lease erhalten" + IDS_LEASE_EXPIRES "Lease lÃ¤uft ab" IDS_DNS_SERVERS "DNS-Server" IDS_WINS_SERVERS "WINS-Server" IDS_PROPERTY "Eigenschaft" Modified: trunk/reactos/dll/win32/newdev/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/de-D… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/de-DE.rc [iso-8859-1] Wed Dec 4 00:02:47 2013 @@ -11,7 +11,7 @@ LTEXT "UNKNOWN DEVICE", IDC_DEVICE, 134, 36, 164, 11 LTEXT "WARNUNG! DAS INSTALLIEREN VON TREIBERN KANN IHREN PC ZUM ABSTURZ BRINGEN ODER AM BOOTEN HINDERN!", IDC_STATIC, 120, 59, 195, 16 CONTROL "Treiber automatisch installieren", IDC_RADIO_AUTO, "Button", BS_AUTORADIOBUTTON, 120, 112, 178, 13 - CONTROL "Treiber von einer bestimmten Position installieren", IDC_RADIO_MANUAL, "Button", BS_AUTORADIOBUTTON, 120, 133, 164, 14 + CONTROL "Treiber von einer bestimmten Position installieren", IDC_RADIO_MANUAL, "Button", BS_AUTORADIOBUTTON, 120, 133, 178, 13 END IDD_NODRIVER DIALOGEX 0, 0, 317, 193 @@ -40,12 +40,12 @@ CAPTION "Hardwareinstallation" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Diese Pfade durchsuchen", IDC_RADIO_SEARCHHERE, "Button", BS_AUTORADIOBUTTON, 30, 11, 239, 13 - CONTROL "Treiber manuell auswÃ¤hlen", IDC_RADIO_CHOOSE, "Button", BS_AUTORADIOBUTTON, 30, 98, 171, 12 - CONTROL "WechseldatentrÃ¤ger durchsuchen", IDC_CHECK_MEDIA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 47, 33, 163, 9 - CONTROL "Diesen Pfad ebenfalls durchsuchen", IDC_CHECK_PATH, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 50, 54, 162, 10 + CONTROL "Diese Pfade durchsuchen", IDC_RADIO_SEARCHHERE, "Button", BS_AUTORADIOBUTTON, 27, 11, 239, 13 + CONTROL "Treiber manuell auswÃ¤hlen", IDC_RADIO_CHOOSE, "Button", BS_AUTORADIOBUTTON, 27, 98, 171, 13 + CONTROL "WechseldatentrÃ¤ger durchsuchen", IDC_CHECK_MEDIA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 47, 33, 162, 10 + CONTROL "Diesen Pfad ebenfalls durchsuchen", IDC_CHECK_PATH, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 47, 54, 162, 10 PUSHBUTTON "Durchsuchen", IDC_BROWSE, 248, 69, 50, 14 - COMBOBOX IDC_COMBO_PATH, 64, 71, 176, 12, CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_AUTOHSCROLL + COMBOBOX IDC_COMBO_PATH, 61, 71, 176, 12, CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_AUTOHSCROLL END IDD_SEARCHDRV DIALOGEX 0, 0, 317, 143 Modified: trunk/reactos/dll/win32/rasdlg/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/lang/de-D… ============================================================================== --- trunk/reactos/dll/win32/rasdlg/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rasdlg/lang/de-DE.rc [iso-8859-1] Wed Dec 4 00:02:47 2013 @@ -320,7 +320,7 @@ COMBOBOX 1153, 76, 7, 148, 42, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP AUTOCHECKBOX "Leitungstyp a&ushandeln", 1150, 23, 26, 199, 10, BS_TOP | BS_MULTILINE | WS_GROUP GROUPBOX " ", 1152, 8, 48, 214, 51, WS_GROUP - AUTOCHECKBOX "&Altes, proprietÃ¤res Protokoll verwenden", 1149, 17, 48, 102, 10, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "&Altes, proprietÃ¤res Protokoll verwenden", 1149, 17, 48, 141, 10, BS_TOP | BS_MULTILINE LTEXT "&Zu verwendende KanÃ¤le:", 1154, 16, 65, 100, 8, NOT WS_GROUP EDITTEXT 1151, 119, 61, 94, 14, ES_AUTOHSCROLL AUTOCHECKBOX "&Hardwarekompression aktivieren", 1148, 16, 82, 198, 10, BS_TOP | BS_MULTILINE @@ -528,7 +528,7 @@ LTEXT "Geben Sie einen Namen fÃ¼r diese Verbindung ein:", -1, 8, 4, 190, 8 EDITTEXT 1114, 8, 17, 190, 12, ES_AUTOHSCROLL LTEXT "Klicken Sie auf Fertig stellen, um die Verbindung in Netzwerkverbindungen zu speichern", -1, 8, 38, 193, 16 - LTEXT "Um diese Verbindung spÃ¤ter zu beareiten, markieren Sie diese Verbindung, und klicken Sie auf Datei und anschlieÃend auf Eigenschaften, .", -1, 8, 58, 193, 16 + LTEXT "Um diese Verbindung spÃ¤ter zu beareiten, markieren Sie diese Verbindung, und klicken Sie auf Datei und anschlieÃend auf Eigenschaften.", -1, 8, 58, 193, 24 END 155 DIALOGEX 0, 0, 231, 215 @@ -681,8 +681,8 @@ GROUPBOX "WÃ¤hloptionen", 1289, 7, 2, 213, 64 AUTOCHECKBOX "&Fortschritt wÃ¤hrend des WÃ¤hlens anzeigen", 1284, 16, 14, 201, 10 AUTOCHECKBOX "Na&me, Passwort, Zertifikat usw. abfragen", 1554, 16, 27, 201, 10 - AUTOCHECKBOX "&ReactOS-AnmeldedomÃ¤ne einbeziehen", 1555, 16, 39, 201, 10 - AUTOCHECKBOX "&Telefonnummer abfragen", 1285, 16, 52, 200, 10, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "&ReactOS-AnmeldedomÃ¤ne einbeziehen", 1555, 16, 40, 201, 10 + AUTOCHECKBOX "&Telefonnummer abfragen", 1285, 16, 53, 200, 10, BS_TOP | BS_MULTILINE GROUPBOX "Wahlwiederholungsoptionen", 1290, 6, 72, 213, 79 LTEXT "&Anzahl der Wahlwiederholungen:", 1300, 16, 87, 123, 8 EDITTEXT 1287, 141, 84, 69, 14, ES_AUTOHSCROLL | ES_NUMBER @@ -767,7 +767,7 @@ LTEXT "&Sekunden zwischen Wahlwiederholungen:", 1351, 16, 38, 140, 8, NOT WS_GROUP EDITTEXT 1342, 158, 36, 56, 14, ES_AUTOHSCROLL GROUPBOX "Verbindungstyp", 1343, 9, 63, 213, 56, WS_GROUP - LTEXT "&Leerlaufzeit, nach der aufgelegt wird:", 1350, 28, 88, 124, 8, NOT WS_GROUP + LTEXT "&Leerlauf, bevor aufgelegt wird:", 1350, 28, 88, 124, 8, NOT WS_GROUP AUTORADIOBUTTON "&WÃ¤hlverbindung beantragen", 1347, 16, 78, 135, 10, WS_GROUP AUTORADIOBUTTON "&Persistente Verbindung", 1348, 16, 103, 199, 10, NOT WS_TABSTOP, WS_EX_TRANSPARENT EDITTEXT 1341, 159, 85, 56, 14, ES_AUTOHSCROLL @@ -834,7 +834,7 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Richtlinien fÃ¼r die Authentifizierung und VerschlÃ¼sselung", 1367, 7, 8, 200, 98, WS_GROUP - AUTORADIOBUTTON "&Beliebige Authentifizierung einschl. Klartext akzeptieren", 1370, 14, 24, 185, 10 + AUTORADIOBUTTON "&Beliebige Authentifizierung incl. Klartext akzeptieren", 1370, 14, 24, 185, 10 AUTORADIOBUTTON "Nur &verschlÃ¼sselte Authentifizierung akzeptieren", 1373, 14, 39, 183, 10 AUTORADIOBUTTON "Nur &MS-verschlÃ¼sselte Authentifizierung akzeptieren", 1374, 14, 53, 184, 10 AUTOCHECKBOX "&DatenverschlÃ¼sselung benÃ¶tigt", 1363, 33, 67, 165, 10, WS_GROUP @@ -929,7 +929,7 @@ LTEXT "WÃ¤hlen Sie die Rolle fÃ¼r diesen Computer:", -1, 10, 5, 275, 9 AUTORADIOBUTTON "&Host", 1483, 31, 20, 265, 10, BS_TOP | BS_MULTILINE | WS_GROUP AUTORADIOBUTTON "&Gast", 1484, 31, 44, 265, 10, BS_TOP | BS_MULTILINE - LTEXT "Auf diesem Computer befinden sich die Informationen, auf die Sie zugreifen mÃ¶chten.", -1, 45, 31, 270, 13, NOT WS_GROUP | WS_TABSTOP + LTEXT "Dieser Computer hat die Informationen, auf die Sie zugreifen mÃ¶chten.", -1, 43, 31, 270, 13, NOT WS_GROUP | WS_TABSTOP LTEXT "Dieser Computer wird verwendet, um auf Informationen auf dem Hostcomputer zuzugreifen.", -1, 43, 56, 270, 23, NOT WS_GROUP END @@ -1028,13 +1028,13 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL 1678, 1100, "STATIC", SS_BITMAP, 0, 0, 265, 50 - LTEXT "Be&nutzername:", 1413, 12, 67, 87, 8 + LTEXT "Be&nutzername:", 1413, 10, 67, 87, 8 EDITTEXT 1104, 103, 63, 154, 14, ES_AUTOHSCROLL CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 9, 84, 248, 1 LTEXT "WÃ¤&hlen:", 1412, 10, 96, 48, 8 COMBOBOX 1416, 103, 92, 154, 112, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | NOT WS_TABSTOP LTEXT "WÃ¤hlen &von:", 1415, 10, 114, 46, 8 - COMBOBOX 1414, 102, 110, 87, 112, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | NOT WS_TABSTOP + COMBOBOX 1414, 103, 110, 87, 112, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | NOT WS_TABSTOP PUSHBUTTON "WÃ¤hl&regeln", 1108, 193, 110, 64, 14 CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 7, 130, 250, 1 DEFPUSHBUTTON "&WÃ¤hlen", 1590, 6, 136, 60, 14 @@ -1050,7 +1050,7 @@ BEGIN LTEXT "Durch Internetverbindungsfreigabe kÃ¶nnen andere Computer des lokalen Netzwerks auf externe Ressourcen Ã¼ber diese Verbindung zugreifen.", -1, 10, 5, 300, 22 AUTOCHECKBOX "&Internetverbindungsfreigabe fÃ¼r diese Verbindung aktivieren", 1512, 21, 31, 272, 10 - LTEXT "Aktivieren Sie das folgende KontrollkÃ¤stchen, um die Verbindung automatisch herzustellen, wenn ein Computer des lokalen Netzwerks versucht auf eine externe Ressource zuzugreifen.", 1514, 10, 56, 294, 22 + LTEXT "Aktivieren, um die Verbindung automatisch herzustellen, wenn ein Computer des lokalen Netzwerks versucht auf eine externe Ressource zuzugreifen.", 1514, 10, 56, 294, 22 AUTOCHECKBOX "WÃ¤hlen bei Bedarf &aktivieren", 1513, 21, 86, 260, 10 END @@ -1126,7 +1126,7 @@ CONTROL 1678, 1100, "STATIC", SS_BITMAP, 0, 0, 265, 50 LTEXT "Be&nutzername:", 1413, 10, 67, 91, 10 EDITTEXT 1104, 104, 64, 154, 14, ES_AUTOHSCROLL - LTEXT "Do&mÃ¤ne", 1110, 11, 86, 91, 8 + LTEXT "Do&mÃ¤ne", 1110, 10, 86, 91, 8 EDITTEXT 1102, 104, 83, 154, 14, ES_UPPERCASE | ES_AUTOHSCROLL CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 10, 103, 248, 1 LTEXT "WÃ¤&hlen:", 1412, 10, 115, 91, 8 @@ -1208,7 +1208,7 @@ LTEXT "T&CP:", -1, 7, 100, 28, 8 EDITTEXT 1569, 50, 97, 162, 14, ES_AUTOHSCROLL LTEXT "UD&P:", -1, 7, 121, 30, 8 - EDITTEXT 1551, 51, 117, 162, 14, ES_AUTOHSCROLL + EDITTEXT 1551, 50, 117, 162, 14, ES_AUTOHSCROLL DEFPUSHBUTTON "OK", 1, 90, 144, 60, 14 PUSHBUTTON "Abbrechen", 2, 154, 144, 60, 14 END @@ -1583,8 +1583,8 @@ FONT 8, "MS Shell Dlg" BEGIN AUTORADIOBUTTON "&In ein privates Netzwerk einwÃ¤hlen", 1488, 24, 9, 126, 10, NOT WS_TABSTOP - AUTORADIOBUTTON "&Verbindung mit einem privaten Netz durch das Internet herstellen", 1489, 24, 34, 216, 10, NOT WS_TABSTOP - AUTORADIOBUTTON "&Direkte Verbindung mit anderem Computer herstellen", 1490, 24, 59, 177, 10, NOT WS_TABSTOP + AUTORADIOBUTTON "&Verbindung mit einem privaten Netz durch das Internet herstellen", 1489, 24, 34, 225, 10, NOT WS_TABSTOP + AUTORADIOBUTTON "&Direkte Verbindung mit anderem Computer herstellen", 1490, 24, 59, 185, 10, NOT WS_TABSTOP AUTORADIOBUTTON "&Breitbandverbindung mit dem Netzwerk herstellen", 1491, 24, 83, 273, 10, NOT WS_TABSTOP LTEXT "Verbindung Ã¼ber eine Telefonleitung (Modem oder ISDN) herstellen.", -1, 45, 21, 216, 8 LTEXT "VPN-Verbindung oder Tunnel durch das Internet (oder ein anderes Netz) herstellen.", -1, 45, 46, 266, 8 @@ -1757,7 +1757,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Aktivieren Sie das KontrollkÃ¤stchen neben den Benutzernamen, die eine Verbindung mit diesem Computer herstellen dÃ¼rfen. Bedenken Sie, dass andere Faktoren, wie z. B. deaktivierte Benutzerkonten, das Herstellen von Verbindungen beeinflussen kÃ¶nnen.", -1, 10, 1, 275, 27 + LTEXT "Aktivieren Sie das KontrollkÃ¤stchen neben den Benutzernamen, die eine Verbindung mit diesem Computer herstellen dÃ¼rfen. Bedenken Sie, dass andere Faktoren, wie deaktivierte Benutzerkonten, das Herstellen von Verbindungen beeinflussen kÃ¶nnen.", -1, 10, 1, 275, 27 LTEXT "Benutzern, denen die &Verbindung gestattet ist:", -1, 10, 28, 275, 8 CONTROL "", 7043, "SYSLISTVIEW32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x0000440D, 10, 42, 275, 73 PUSHBUTTON "&HinzufÃ¼gen...", 7044, 10, 122, 65, 14, WS_GROUP Modified: trunk/reactos/dll/win32/rasdlg/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/lang/en-U… ============================================================================== --- trunk/reactos/dll/win32/rasdlg/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rasdlg/lang/en-US.rc [iso-8859-1] Wed Dec 4 00:02:47 2013 @@ -929,7 +929,7 @@ LTEXT "Choose the role you want for this computer:", -1, 10, 5, 275, 9 AUTORADIOBUTTON "&Host", 1483, 31, 20, 265, 10, BS_TOP | BS_MULTILINE | WS_GROUP AUTORADIOBUTTON "&Guest", 1484, 31, 44, 265, 10, BS_TOP | BS_MULTILINE - LTEXT "This computer has the information you want to access.", -1, 45, 31, 253, 13, NOT WS_GROUP | WS_TABSTOP + LTEXT "This computer has the information you want to access.", -1, 43, 31, 253, 13, NOT WS_GROUP | WS_TABSTOP LTEXT "This computer is used to access information on the host computer.", -1, 43, 56, 253, 23, NOT WS_GROUP END @@ -1028,13 +1028,13 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL 1678, 1100, "STATIC", SS_BITMAP, 0, 0, 265, 50 - LTEXT "&User name:", 1413, 12, 67, 87, 8 + LTEXT "&User name:", 1413, 10, 67, 87, 8 EDITTEXT 1104, 103, 63, 154, 14, ES_AUTOHSCROLL CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 9, 84, 248, 1 LTEXT "D&ial:", 1412, 11, 96, 48, 8 COMBOBOX 1416, 103, 92, 154, 112, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | NOT WS_TABSTOP LTEXT "Dialing &from:", 1415, 10, 114, 46, 8 - COMBOBOX 1414, 102, 110, 87, 112, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | NOT WS_TABSTOP + COMBOBOX 1414, 103, 110, 87, 112, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | NOT WS_TABSTOP PUSHBUTTON "Dialing &Rules", 1108, 193, 110, 64, 14 CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 7, 130, 250, 1 DEFPUSHBUTTON "&Dial", 1590, 6, 136, 60, 14 @@ -1126,7 +1126,7 @@ CONTROL 1678, 1100, "STATIC", SS_BITMAP, 0, 0, 265, 50 LTEXT "&User name:", 1413, 10, 67, 91, 10 EDITTEXT 1104, 104, 64, 154, 14, ES_AUTOHSCROLL - LTEXT "Do&main:", 1110, 11, 86, 91, 8 + LTEXT "Do&main:", 1110, 10, 86, 91, 8 EDITTEXT 1102, 104, 83, 154, 14, ES_UPPERCASE | ES_AUTOHSCROLL CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 10, 103, 248, 1 LTEXT "D&ial:", 1412, 10, 115, 91, 8 @@ -1208,7 +1208,7 @@ LTEXT "T&CP:", -1, 7, 100, 28, 8 EDITTEXT 1569, 50, 97, 162, 14, ES_AUTOHSCROLL LTEXT "UD&P:", -1, 7, 121, 30, 8 - EDITTEXT 1551, 51, 117, 162, 14, ES_AUTOHSCROLL + EDITTEXT 1551, 50, 117, 162, 14, ES_AUTOHSCROLL DEFPUSHBUTTON "OK", 1, 90, 144, 60, 14 PUSHBUTTON "Cancel", 2, 154, 144, 60, 14 END Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Wed Dec 4 00:02:47 2013 @@ -437,7 +437,7 @@ GROUPBOX "Details zum Dateityp '%s'", 14003, 7, 130, 249, 70 LTEXT "Ãffnen mit:", -1, 12, 140, 40, 10 //ICON - LTEXT "Anwendungsname", 14005, 100, 140, 40, 10 + LTEXT "Name", 14005, 100, 140, 40, 10 PUSHBUTTON "Ãn&dern...", 14006, 180, 140, 50, 14, WS_TABSTOP LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "&Erweitert", 14008, 180, 175, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/de… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/de-DE.rc [iso-8859-1] Wed Dec 4 00:02:47 2013 @@ -61,11 +61,11 @@ ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20 LTEXT "Die lokalen Systemeinstellungen sollten mit der Sprache der Anwendungen, die Sie nutzen wollen Ã¼bereinstimmen. Die lokalen Nutzereinstellungen geben vor, wie Nummern, WÃ¤hrungen und Datumsangaben dargestellt werden.", IDC_STATIC, 53, 6, 253, 30 LTEXT "", IDC_LOCALETEXT, 54, 34, 250, 16 - LTEXT "Um die lokalen Nutzer- oder Systemeinstellungen zu Ã¤ndern, klicken Sie auf Einstellen.", IDC_STATIC, 53, 57, 188, 15 + LTEXT "Um die lokalen Nutzer- oder Systemeinstellungen zu Ã¤ndern, klicken Sie auf Einstellen.", IDC_STATIC, 53, 57, 188, 16 PUSHBUTTON "&Einstellen...", IDC_CUSTOMLOCALE, 245, 57, 50, 14 LTEXT "Das Tastaturlayout gibt vor, welches Zeichen ein Tastendruck bewirkt.", IDC_STATIC, 53, 86, 253, 8 LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16 - LTEXT "Um das Tastaturlayout zu Ã¤ndern, klicken Sie auf Einstellen.", IDC_STATIC, 53, 126, 189, 8 + LTEXT "Um das Tastaturlayout zu Ã¤ndern, klicken Sie auf Einstellen.", IDC_STATIC, 53, 122, 188, 16 PUSHBUTTON "&Einstellen...", IDC_CUSTOMLAYOUT, 245, 122, 50, 14 END Modified: trunk/reactos/dll/win32/tapiui/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/lang/de-D… ============================================================================== --- trunk/reactos/dll/win32/tapiui/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/tapiui/lang/de-DE.rc [iso-8859-1] Wed Dec 4 00:02:47 2013 @@ -114,7 +114,7 @@ LTEXT "Zugriffsnummer &fÃ¼r FerngesprÃ¤che:", -1, 7, 7, 238, 8 EDITTEXT 1044, 7, 18, 116, 14, ES_AUTOHSCROLL LTEXT "Klicken Sie auf die SchaltflÃ¤chen unten, um WÃ¤hlschritte fÃ¼r FerngesprÃ¤che einzugeben. Geben Sie diese Schritte in der fÃ¼r die Callingcard gÃ¼ltigen Reihenfolge ein.", 2000, 7, 40, 238, 24 - LTEXT "&WÃ¤hlschritte fÃ¼r die Callingcard:", -1, 7, 72, 100, 8 + LTEXT "&WÃ¤hlschritte fÃ¼r die Callingcard:", -1, 7, 72, 105, 8 CONTROL "List1", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000400D, 7, 83, 184, 74, WS_EX_CLIENTEDGE PUSHBUTTON "Nach &oben", 1022, 195, 83, 50, 14 PUSHBUTTON "Nach &unten", 1023, 195, 101, 50, 14 @@ -123,7 +123,7 @@ PUSHBUTTON "&Kontonummer", 1018, 101, 161, 90, 14 PUSHBUTTON "&PIN", 1019, 7, 179, 90, 14 PUSHBUTTON "Z&ielnummer...", 1020, 101, 179, 90, 14 - PUSHBUTTON "&Auf Aufforderung warten...", 1017, 7, 197, 90, 14 + PUSHBUTTON "&Auf BestÃ¤tigung warten...", 1017, 7, 197, 90, 14 PUSHBUTTON "Ziffern a&ngeben...", 1021, 101, 197, 90, 14 END @@ -135,7 +135,7 @@ LTEXT "Zugriffsnummer &fÃ¼r AuslandsgesprÃ¤che:", -1, 7, 7, 238, 8 EDITTEXT 1045, 7, 18, 116, 14, ES_AUTOHSCROLL LTEXT "Klicken Sie auf die SchaltflÃ¤chen unten, um WÃ¤hlschritte fÃ¼r Auslands- gesprÃ¤che einzugeben. Geben Sie diese Schritte in der fÃ¼r die Callingcard gÃ¼ltigen Reihenfolge ein.", 2000, 7, 40, 244, 24 - LTEXT "&WÃ¤hlschritte fÃ¼r die Callingcard:", -1, 7, 72, 100, 8 + LTEXT "&WÃ¤hlschritte fÃ¼r die Callingcard:", -1, 7, 72, 105, 8 CONTROL "List1", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000400D, 7, 83, 184, 74, WS_EX_CLIENTEDGE PUSHBUTTON "Nach &oben", 1022, 195, 83, 50, 14 PUSHBUTTON "Nach &unten", 1023, 195, 101, 50, 14 @@ -144,7 +144,7 @@ PUSHBUTTON "&Kontonummer", 1018, 101, 161, 90, 14 PUSHBUTTON "&PIN", 1019, 7, 179, 90, 14 PUSHBUTTON "Z&ielnummer...", 1020, 101, 179, 90, 14 - PUSHBUTTON "&Auf Aufforderung warten...", 1017, 7, 197, 90, 14 + PUSHBUTTON "&Auf BestÃ¤tigung warten...", 1017, 7, 197, 90, 14 PUSHBUTTON "Ziffern a&ngeben...", 1021, 101, 197, 90, 14 END @@ -156,7 +156,7 @@ LTEXT "Zugriffsnummer &fÃ¼r OrtsgesprÃ¤che:", -1, 7, 7, 238, 8 EDITTEXT 1008, 7, 18, 116, 14, ES_AUTOHSCROLL LTEXT "Klicken Sie auf die SchaltflÃ¤chen unten, um WÃ¤hlschritte fÃ¼r OrtsgesprÃ¤che einzugeben. Geben Sie diese Schritte in der fÃ¼r die Callingcard gÃ¼ltigen Reihenfolge ein.", 2000, 7, 40, 238, 24 - LTEXT "&WÃ¤hlschritte fÃ¼r die Callingcard:", -1, 7, 72, 100, 8 + LTEXT "&WÃ¤hlschritte fÃ¼r die Callingcard:", -1, 7, 72, 105, 8 CONTROL "List1", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000400D, 7, 83, 184, 74, WS_EX_CLIENTEDGE PUSHBUTTON "Nach &oben", 1022, 195, 83, 50, 14 PUSHBUTTON "Nach &unten", 1023, 195, 101, 50, 14 @@ -165,7 +165,7 @@ PUSHBUTTON "&Kontonummer", 1018, 101, 161, 90, 14 PUSHBUTTON "&PIN", 1019, 7, 179, 90, 14 PUSHBUTTON "Z&ielnummer...", 1020, 101, 179, 90, 14 - PUSHBUTTON "&Auf Aufforderung warten...", 1017, 7, 197, 90, 14 + PUSHBUTTON "&Auf BestÃ¤tigung warten...", 1017, 7, 197, 90, 14 PUSHBUTTON "Ziffern a&ngeben...", 1021, 101, 197, 90, 14 END @@ -283,7 +283,7 @@ LTEXT "Welche &Vorwahl haben Sie?", -1, 107, 73, 189, 10 EDITTEXT 1034, 107, 87, 40, 12, ES_AUTOHSCROLL LTEXT "Falls eine &Netzkennzahl erforderlich ist, wie lautet sie?", -1, 107, 104, 189, 10 - EDITTEXT 1058, 106, 118, 40, 12, ES_UPPERCASE | ES_AUTOHSCROLL + EDITTEXT 1058, 107, 118, 40, 12, ES_UPPERCASE | ES_AUTOHSCROLL LTEXT "Falls eine &Amtskennziffer erforderlich ist, wie lautet sie?", -1, 107, 136, 189, 10 EDITTEXT 1010, 107, 149, 40, 12, ES_UPPERCASE | ES_AUTOHSCROLL LTEXT "An diesem Standort angewandtes WÃ¤hlverfahren:", -1, 107, 167, 189, 10 @@ -305,7 +305,7 @@ EDITTEXT 1034, 95, 73, 40, 14, ES_AUTOHSCROLL LTEXT "Falls eine &Amtskennziffer erforderlich ist, wie lautet sie?", -1, 95, 96, 188, 10 EDITTEXT 1010, 95, 107, 40, 14, ES_UPPERCASE | ES_AUTOHSCROLL - LTEXT "An diesem Standort angewandtes WÃ¤hlverfahren:", -1, 95, 129, 159, 10 + LTEXT "An diesem Standort angewandtes WÃ¤hlverfahren:", -1, 95, 129, 169, 10 AUTORADIOBUTTON "&Tonwahl", 1036, 95, 139, 55, 12, WS_GROUP | NOT WS_TABSTOP AUTORADIOBUTTON "&Impulswahl", 1037, 155, 139, 55, 12, NOT WS_TABSTOP END

1 0

[hbelusca] 61212: [KERNEL32]: Fix QueryPerformanceFrequency: it's when NtQueryPerformanceCounter returns a frequency of zero, that HW perf counters are not implemented.
by hbelusca＠svn.reactos.org 03 Dec '13

03 Dec '13

Author: hbelusca Date: Tue Dec 3 23:57:16 2013 New Revision: 61212 URL: http://svn.reactos.org/svn/reactos?rev=61212&view=rev Log: [KERNEL32]: Fix QueryPerformanceFrequency: it's when NtQueryPerformanceCounter returns a frequency of zero, that HW perf counters are not implemented. Modified: trunk/reactos/dll/win32/kernel32/client/perfcnt.c Modified: trunk/reactos/dll/win32/kernel32/client/perfcnt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/perfcnt.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/perfcnt.c [iso-8859-1] Tue Dec 3 23:57:16 2013 @@ -26,7 +26,7 @@ NTSTATUS Status; Status = NtQueryPerformanceCounter(lpPerformanceCount, &Frequency); - if (!Frequency.QuadPart) Status = STATUS_NOT_IMPLEMENTED; + if (Frequency.QuadPart == 0) Status = STATUS_NOT_IMPLEMENTED; if (!NT_SUCCESS(Status)) { @@ -48,7 +48,7 @@ NTSTATUS Status; Status = NtQueryPerformanceCounter(&Count, lpFrequency); - if (!Count.QuadPart) Status = STATUS_NOT_IMPLEMENTED; + if (lpFrequency->QuadPart == 0) Status = STATUS_NOT_IMPLEMENTED; if (!NT_SUCCESS(Status)) {

1 0

[hbelusca] 61211: [FAST486] - Call Fast486GetCurrentPrivLevel only when needed. - Fix a type.
by hbelusca＠svn.reactos.org 03 Dec '13

03 Dec '13

Author: hbelusca Date: Tue Dec 3 23:51:51 2013 New Revision: 61211 URL: http://svn.reactos.org/svn/reactos?rev=61211&view=rev Log: [FAST486] - Call Fast486GetCurrentPrivLevel only when needed. - Fix a type. Modified: branches/ntvdm/lib/fast486/common.c branches/ntvdm/lib/fast486/common.h branches/ntvdm/lib/fast486/common.inl branches/ntvdm/lib/fast486/opgroups.c Modified: branches/ntvdm/lib/fast486/common.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/common.c?rev=… ============================================================================== --- branches/ntvdm/lib/fast486/common.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/common.c [iso-8859-1] Tue Dec 3 23:51:51 2013 @@ -118,7 +118,6 @@ { /* Write beyond limit */ Fast486Exception(State, FAST486_EXCEPTION_GP); - return FALSE; } Modified: branches/ntvdm/lib/fast486/common.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/common.h?rev=… ============================================================================== --- branches/ntvdm/lib/fast486/common.h [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/common.h [iso-8859-1] Tue Dec 3 23:51:51 2013 @@ -40,19 +40,19 @@ #define SEGMENT_TABLE_INDICATOR (1 << 2) #define EXCEPTION_HAS_ERROR_CODE(x) (((x) == 8) || ((x) >= 10 && (x) <= 14)) -#define NO_LOCK_PREFIX() if (State->PrefixFlags & FAST486_PREFIX_LOCK)\ +#define NO_LOCK_PREFIX()\ +if (State->PrefixFlags & FAST486_PREFIX_LOCK)\ {\ Fast486Exception(State, FAST486_EXCEPTION_UD);\ return FALSE;\ } -#define TOGGLE_OPSIZE(x) if (State->PrefixFlags & FAST486_PREFIX_OPSIZE)\ -{\ - x = !x;\ -} -#define TOGGLE_ADSIZE(x) if (State->PrefixFlags & FAST486_PREFIX_ADSIZE)\ -{\ - x = !x;\ -} + +#define TOGGLE_OPSIZE(x)\ + if (State->PrefixFlags & FAST486_PREFIX_OPSIZE) x = !x; + +#define TOGGLE_ADSIZE(x)\ + if (State->PrefixFlags & FAST486_PREFIX_ADSIZE) x = !x; + #define SWAP(x, y) { (x) ^= (y); (y) ^= (x); (x) ^= (y); } #define PAGE_ALIGN(x) ((x) & 0xFFFFF000) Modified: branches/ntvdm/lib/fast486/common.inl URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/common.inl?re… ============================================================================== --- branches/ntvdm/lib/fast486/common.inl [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/common.inl [iso-8859-1] Tue Dec 3 23:51:51 2013 @@ -122,13 +122,12 @@ PVOID Buffer, ULONG Size) { - INT Cpl = Fast486GetCurrentPrivLevel(State); - /* Check if paging is enabled */ if (State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_PG) { ULONG Page; FAST486_PAGE_TABLE TableEntry; + INT Cpl = Fast486GetCurrentPrivLevel(State); for (Page = PAGE_ALIGN(LinearAddress); Page <= PAGE_ALIGN(LinearAddress + Size - 1); @@ -151,14 +150,14 @@ /* Check if this is the first page */ if (Page == PAGE_ALIGN(LinearAddress)) { - /* Start copying from the offset from the beginning of the page */ + /* Start reading from the offset from the beginning of the page */ PageOffset = PAGE_OFFSET(LinearAddress); } /* Check if this is the last page */ if (Page == PAGE_ALIGN(LinearAddress + Size - 1)) { - /* Copy only a part of the page */ + /* Read only a part of the page */ PageLength = PAGE_OFFSET(LinearAddress) + Size - PageOffset; } @@ -185,13 +184,12 @@ PVOID Buffer, ULONG Size) { - INT Cpl = Fast486GetCurrentPrivLevel(State); - /* Check if paging is enabled */ if (State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_PG) { ULONG Page; FAST486_PAGE_TABLE TableEntry; + INT Cpl = Fast486GetCurrentPrivLevel(State); for (Page = PAGE_ALIGN(LinearAddress); Page <= PAGE_ALIGN(LinearAddress + Size - 1); @@ -216,14 +214,14 @@ /* Check if this is the first page */ if (Page == PAGE_ALIGN(LinearAddress)) { - /* Start copying from the offset from the beginning of the page */ + /* Start writing from the offset from the beginning of the page */ PageOffset = PAGE_OFFSET(LinearAddress); } /* Check if this is the last page */ if (Page == PAGE_ALIGN(LinearAddress + Size - 1)) { - /* Copy only a part of the page */ + /* Write only a part of the page */ PageLength = PAGE_OFFSET(LinearAddress) + Size - PageOffset; } @@ -385,7 +383,7 @@ FORCEINLINE BOOLEAN Fast486LoadSegment(PFAST486_STATE State, - INT Segment, + FAST486_SEG_REGS Segment, USHORT Selector) { PFAST486_SEG_REG CachedDescriptor; Modified: branches/ntvdm/lib/fast486/opgroups.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opgroups.c?re… ============================================================================== --- branches/ntvdm/lib/fast486/opgroups.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/opgroups.c [iso-8859-1] Tue Dec 3 23:51:51 2013 @@ -1434,7 +1434,7 @@ else if (ModRegRm.Register == 3) { USHORT Selector; - INT Segment = FAST486_REG_DS; + FAST486_SEG_REGS Segment = FAST486_REG_DS; /* Check for the segment override */ if (State->PrefixFlags & FAST486_PREFIX_SEG) @@ -1487,7 +1487,7 @@ else if (ModRegRm.Register == 5) { USHORT Selector; - INT Segment = FAST486_REG_DS; + FAST486_SEG_REGS Segment = FAST486_REG_DS; /* Check for the segment override */ if (State->PrefixFlags & FAST486_PREFIX_SEG) @@ -1580,7 +1580,7 @@ else if (ModRegRm.Register == 3) { USHORT Selector; - INT Segment = FAST486_REG_DS; + FAST486_SEG_REGS Segment = FAST486_REG_DS; /* Check for the segment override */ if (State->PrefixFlags & FAST486_PREFIX_SEG) @@ -1636,7 +1636,7 @@ else if (ModRegRm.Register == 5) { USHORT Selector; - INT Segment = FAST486_REG_DS; + FAST486_SEG_REGS Segment = FAST486_REG_DS; /* Check for the segment override */ if (State->PrefixFlags & FAST486_PREFIX_SEG)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs