Ros-diffs May 2008

ros-diffs@reactos.org

25 participants
586 discussions

[mpiulachs] 33519: - update msiexec version - add iexplorer
by mpiulachs＠svn.reactos.org 14 May '08

14 May '08

Author: mpiulachs Date: Wed May 14 12:32:19 2008 New Revision: 33519 URL: http://svn.reactos.org/svn/reactos?rev=33519&view=rev Log: - update msiexec version - add iexplorer 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 May 14 12:32:19 2008 @@ -117,11 +117,12 @@ reactos/base/applications/regedit # Out of sync reactos/base/applications/cmdutils/xcopy # Synced to Wine-0_9_54 reactos/base/system/expand # Out of sync -reactos/base/system/msiexec # Synced to Wine-20080105 +reactos/base/system/msiexec # Wine 1.0-rc1 reactos/base/applications/winhelp # Synced to Wine-0_9_53 reactos/base/applications/wordpad # Synced to Wine-0_9_53 reactos/modules/rosapps/winefile # Synced to Wine-0_9_53 reactos/base/applications/notepad # Forked at Wine-20041201 +reactos/base/applications/iexplore # Wine 1.0-rc1 In addition the following libs, dlls and source files are mostly based on code ported from Winehq CVS. If you are looking to update something in these files

1 0

[mpiulachs] 33518: - sync msiexec to Wine 1.0-rc1 - change module type to win32cui inset of win32gui
by mpiulachs＠svn.reactos.org 14 May '08

14 May '08

Author: mpiulachs Date: Wed May 14 12:25:57 2008 New Revision: 33518 URL: http://svn.reactos.org/svn/reactos?rev=33518&view=rev Log: - sync msiexec to Wine 1.0-rc1 - change module type to win32cui inset of win32gui Modified: trunk/reactos/base/system/msiexec/msiexec.c trunk/reactos/base/system/msiexec/msiexec.rbuild Modified: trunk/reactos/base/system/msiexec/msiexec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/msiexec/msiexe… ============================================================================== --- trunk/reactos/base/system/msiexec/msiexec.c [iso-8859-1] (original) +++ trunk/reactos/base/system/msiexec/msiexec.c [iso-8859-1] Wed May 14 12:25:57 2008 @@ -139,7 +139,7 @@ for(list = property_list; list; list = list->next) len += lstrlenW(list->str) + 3; - ret = (WCHAR*) HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); + ret = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); /* add a space before each string, and quote the value */ p = ret; @@ -183,7 +183,7 @@ for(list = transform_list; list; list = list->next) len += lstrlenW(list->str) + 1; - ret = (WCHAR*) HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); + ret = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); /* add all the transforms with a semicolon between each one */ p = ret; @@ -215,7 +215,7 @@ static LPWSTR msi_strdup(LPCWSTR str) { DWORD len = lstrlenW(str)+1; - LPWSTR ret = (WCHAR*) HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len); + LPWSTR ret = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len); lstrcpyW(ret, str); return ret; } @@ -231,7 +231,7 @@ return FALSE; if( lstrlenW(str1) != (len-1) ) return FALSE; - strW = (WCHAR*) HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len); + strW = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len); MultiByteToWideChar( CP_ACP, 0, str2, -1, strW, len); ret = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, str1, len, strW, len); HeapFree(GetProcessHeap(), 0, strW); @@ -259,7 +259,7 @@ return FALSE; if( lstrlenW(str1) < (len-1) ) return FALSE; - strW = (WCHAR*) HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len); + strW = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len); MultiByteToWideChar( CP_ACP, 0, str2, -1, strW, len); ret = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, str1, len-1, strW, len-1); HeapFree(GetProcessHeap(), 0, strW); @@ -454,7 +454,7 @@ int i, n; n = chomp( p ); - argv = (WCHAR**) HeapAlloc(GetProcessHeap(), 0, sizeof (WCHAR*)*(n+1)); + argv = HeapAlloc(GetProcessHeap(), 0, sizeof (WCHAR*)*(n+1)); for( i=0; i<n; i++ ) { argv[i] = p; @@ -480,7 +480,7 @@ r = RegQueryValueExW(hkey, ident, 0, &type, 0, &sz); if(r == ERROR_SUCCESS && type == REG_SZ) { - buf = (WCHAR*) HeapAlloc(GetProcessHeap(), 0, sz); + buf = HeapAlloc(GetProcessHeap(), 0, sz); r = RegQueryValueExW(hkey, ident, 0, &type, (LPBYTE)buf, &sz); if( r == ERROR_SUCCESS ) { @@ -663,10 +663,10 @@ PackageName = argvW[i]+2; if (!PackageName[0]) { - i++; - if(i >= argc) - ShowUsage(1); - PackageName = argvW[i]; + i++; + if (i >= argc) + ShowUsage(1); + PackageName = argvW[i]; } WINE_TRACE("PackageName = %s\n", wine_dbgstr_w(PackageName)); StringListAppend(&property_list, RemoveAll); @@ -821,7 +821,7 @@ LogFileName = argvW[i]; if(MsiEnableLogW(LogMode, LogFileName, LogAttributes) != ERROR_SUCCESS) { - fprintf(stderr, "Logging in %s (0x%08lx, %lu) failed\n", + fprintf(stderr, "Logging in %s (0x%08x, %u) failed\n", wine_dbgstr_w(LogFileName), LogMode, LogAttributes); ExitProcess(1); } @@ -852,23 +852,23 @@ } else if(msi_strequal(argvW[i]+2, "f")) { - InstallUILevel = (INSTALLUILEVEL) (INSTALLUILEVEL_FULL|INSTALLUILEVEL_ENDDIALOG); + InstallUILevel = INSTALLUILEVEL_FULL|INSTALLUILEVEL_ENDDIALOG; } else if(msi_strequal(argvW[i]+2, "n+")) { - InstallUILevel = (INSTALLUILEVEL) (INSTALLUILEVEL_NONE|INSTALLUILEVEL_ENDDIALOG); + InstallUILevel = INSTALLUILEVEL_NONE|INSTALLUILEVEL_ENDDIALOG; } else if(msi_strequal(argvW[i]+2, "b+")) { - InstallUILevel = (INSTALLUILEVEL) (INSTALLUILEVEL_BASIC|INSTALLUILEVEL_ENDDIALOG); + InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_ENDDIALOG; } else if(msi_strequal(argvW[i]+2, "b-")) { - InstallUILevel = (INSTALLUILEVEL) (INSTALLUILEVEL_BASIC|INSTALLUILEVEL_PROGRESSONLY); + InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_PROGRESSONLY; } else if(msi_strequal(argvW[i]+2, "b+!")) { - InstallUILevel = (INSTALLUILEVEL) (INSTALLUILEVEL_BASIC|INSTALLUILEVEL_ENDDIALOG); + InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_ENDDIALOG; WINE_FIXME("Unknown modifier: !\n"); } else Modified: trunk/reactos/base/system/msiexec/msiexec.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/msiexec/msiexe… ============================================================================== --- trunk/reactos/base/system/msiexec/msiexec.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/system/msiexec/msiexec.rbuild [iso-8859-1] Wed May 14 12:25:57 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="msiexec" type="win32gui" installbase="system32" installname="msiexec.exe" allowwarnings="true"> +<module name="msiexec" type="win32cui" installbase="system32" installname="msiexec.exe" allowwarnings="true"> <include base="msiexec">.</include> <include base="ReactOS">include/wine</include> <define name="_WIN32_IE">0x501</define>

1 0

[sedwards] 33517: Add iexplore from Wine. (Disabled until shdocvw sync)
by sedwards＠svn.reactos.org 14 May '08

14 May '08

Author: sedwards Date: Wed May 14 12:24:40 2008 New Revision: 33517 URL: http://svn.reactos.org/svn/reactos?rev=33517&view=rev Log: Add iexplore from Wine. (Disabled until shdocvw sync) Added: trunk/reactos/base/applications/iexplore/ trunk/reactos/base/applications/iexplore/iexplore.rbuild (with props) trunk/reactos/base/applications/iexplore/main.c (with props) trunk/reactos/base/applications/iexplore/version.rc (with props) Modified: trunk/reactos/base/applications/applications.rbuild Modified: trunk/reactos/base/applications/applications.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/applicat… ============================================================================== --- trunk/reactos/base/applications/applications.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/applications.rbuild [iso-8859-1] Wed May 14 12:24:40 2008 @@ -25,6 +25,11 @@ <directory name="hh"> <xi:include href="hh/hh.rbuild" /> </directory> + <directory name="kbswitch"> <xi:include href="kbswitch/kbswitch.rbuild" /> </directory> Added: trunk/reactos/base/applications/iexplore/iexplore.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/iexplore… ============================================================================== --- trunk/reactos/base/applications/iexplore/iexplore.rbuild (added) +++ trunk/reactos/base/applications/iexplore/iexplore.rbuild [iso-8859-1] Wed May 14 12:24:40 2008 @@ -1,0 +1,13 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="iexplore" type="win32gui" installbase="system32" installname="iexplore.exe" unicode="no"> + <include base="iexplore">.</include> + <define name="_WIN32_IE">0x0600</define> + <define name="_WIN32_WINNT">0x0501</define> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <library>shdocvw</library> + <file>main.c</file> + <file>version.rc</file> +</module> Propchange: trunk/reactos/base/applications/iexplore/iexplore.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/iexplore/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/iexplore… ============================================================================== --- trunk/reactos/base/applications/iexplore/main.c (added) +++ trunk/reactos/base/applications/iexplore/main.c [iso-8859-1] Wed May 14 12:24:40 2008 @@ -1,0 +1,28 @@ +/* + * Internet Explorer wrapper + * + * Copyright 2006 Mike McCormack + * + * 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 + */ + +#include <windows.h> + +extern DWORD WINAPI IEWinMain(LPSTR, int); + +int PASCAL WinMain (HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) +{ + return IEWinMain(cmdline, show); +} Propchange: trunk/reactos/base/applications/iexplore/main.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/iexplore/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/iexplore… ============================================================================== --- trunk/reactos/base/applications/iexplore/version.rc (added) +++ trunk/reactos/base/applications/iexplore/version.rc [iso-8859-1] Wed May 14 12:24:40 2008 @@ -1,0 +1,27 @@ +/* + * Copyright 2003 Francois Gouget (for CodeWeavers) + * + * 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 + */ + +#define WINE_OLESELFREGISTER +#define WINE_FILEDESCRIPTION_STR "Wine core exe" +#define WINE_FILENAME_STR "iexplore.exe" +#define WINE_FILEVERSION 6,0,2900,2180 +#define WINE_FILEVERSION_STR "6.0.2900.2180" +#define WINE_PRODUCTVERSION 6,0,2900,2180 +#define WINE_PRODUCTVERSION_STR "6.0.2900.2180" + +#include "wine/wine_common_ver.rc" Propchange: trunk/reactos/base/applications/iexplore/version.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[ekohl] 33516: - Check that the user name does not contain any illegal characters. - Check that both passwords are the same. - Limit the maximum user name length to 20 characters.
by ekohl＠svn.reactos.org 14 May '08

14 May '08

Author: ekohl Date: Wed May 14 12:02:17 2008 New Revision: 33516 URL: http://svn.reactos.org/svn/reactos?rev=33516&view=rev Log: - Check that the user name does not contain any illegal characters. - Check that both passwords are the same. - Limit the maximum user name length to 20 characters. Modified: trunk/reactos/dll/cpl/usrmgr/users.c Modified: trunk/reactos/dll/cpl/usrmgr/users.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/users.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/users.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/users.c [iso-8859-1] Wed May 14 12:02:17 2008 @@ -10,8 +10,6 @@ /* * TODO: * - Add new user to the users group. - * - Check a new users name for illegal characters. - * - Check whether both passwords are the same for a new user. * - Remove a user from all groups. * - Implement user property pages. * - Use localized messages. @@ -56,6 +54,31 @@ return TRUE; } + + +static BOOL +CheckUserName(HWND hwndDlg, + INT nIdDlgItem) +{ + TCHAR szUserName[256]; + UINT uLen; + + uLen = GetDlgItemText(hwndDlg, nIdDlgItem, szUserName, 256); + + /* Check the user name */ + if (uLen > 0 && _tcspbrk(szUserName, TEXT("\"*+,/\\:;<=>?[]|")) != NULL) + { + MessageBox(hwndDlg, + TEXT("The user name you entered is invalid! A user name must not contain the following charecters: *+,/:;<=>?[\\]|"), + TEXT("ERROR"), + MB_OK | MB_ICONERROR); + return FALSE; + } + + + return TRUE; +} + INT_PTR CALLBACK @@ -108,6 +131,7 @@ { case WM_INITDIALOG: SetWindowLongPtr(hwndDlg, DWLP_USER, lParam); + SendDlgItemMessage(hwndDlg, IDC_USER_NEW_NAME, EM_SETLIMITTEXT, 20, 0); CheckDlgButton(hwndDlg, IDC_USER_NEW_FORCE_CHANGE, BST_CHECKED); break; @@ -123,6 +147,20 @@ break; case IDOK: + if (!CheckUserName(hwndDlg, IDC_USER_NEW_NAME)) + { + SetFocus(GetDlgItem(hwndDlg, IDC_USER_NEW_NAME)); + SendDlgItemMessage(hwndDlg, IDC_USER_NEW_NAME, EM_SETSEL, 0, -1); + break; + } + + if (!CheckPasswords(hwndDlg, IDC_USER_NEW_PASSWORD1, IDC_USER_NEW_PASSWORD2)) + { + SetDlgItemText(hwndDlg, IDC_USER_NEW_PASSWORD1, TEXT("")); + SetDlgItemText(hwndDlg, IDC_USER_NEW_PASSWORD2, TEXT("")); + break; + } + userInfo = (LPUSER_INFO_3)GetWindowLongPtr(hwndDlg, DWLP_USER); nLength = SendDlgItemMessage(hwndDlg, IDC_USER_NEW_NAME, WM_GETTEXTLENGTH, 0, 0);

1 0

[dchapyshev] 33515: - Implement "Set Default" button - Added checking whether there was already layout
by dchapyshev＠svn.reactos.org 14 May '08

14 May '08

Author: dchapyshev Date: Wed May 14 10:51:53 2008 New Revision: 33515 URL: http://svn.reactos.org/svn/reactos?rev=33515&view=rev Log: - Implement "Set Default" button - Added checking whether there was already layout Modified: trunk/reactos/dll/cpl/input/add.c trunk/reactos/dll/cpl/input/input.h trunk/reactos/dll/cpl/input/lang/bg-BG.rc trunk/reactos/dll/cpl/input/lang/de-DE.rc trunk/reactos/dll/cpl/input/lang/el-GR.rc trunk/reactos/dll/cpl/input/lang/en-US.rc trunk/reactos/dll/cpl/input/lang/es-ES.rc trunk/reactos/dll/cpl/input/lang/fr-FR.rc trunk/reactos/dll/cpl/input/lang/it-IT.rc trunk/reactos/dll/cpl/input/lang/pl-PL.rc trunk/reactos/dll/cpl/input/lang/ru-RU.rc trunk/reactos/dll/cpl/input/lang/sk-SK.rc trunk/reactos/dll/cpl/input/lang/uk-UA.rc trunk/reactos/dll/cpl/input/resource.h trunk/reactos/dll/cpl/input/settings.c Modified: trunk/reactos/dll/cpl/input/add.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/add.c?rev=33… ============================================================================== --- trunk/reactos/dll/cpl/input/add.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/add.c [iso-8859-1] Wed May 14 10:51:53 2008 @@ -74,7 +74,7 @@ { TCHAR NewLayout[CCH_ULONG_DEC + 1], Lang[MAX_PATH], LangID[CCH_LAYOUT_ID + 1], Layout[MAX_PATH], - SubPath[CCH_LAYOUT_ID + 1]; + SubPath[CCH_LAYOUT_ID + 1], szMessage[MAX_PATH]; INT iLayout, iLang; HKEY hKey, hSubKey; DWORD cValues; @@ -92,10 +92,20 @@ iLang = SendMessage(hLangList, CB_GETCURSEL, 0, 0); lcid = SendMessage(hLangList, CB_GETITEMDATA, iLang, 0); + pts = (PTSTR) SendMessage(hLayoutList, CB_GETITEMDATA, iLayout, 0); GetLocaleInfo(MAKELCID(lcid, SORT_DEFAULT), LOCALE_ILANGUAGE, Lang, sizeof(Lang) / sizeof(TCHAR)); wsprintf(LangID, _T("0000%s"), Lang); + if (IsLayoutExists(pts, LangID)) + { + LoadString(hApplet, IDS_LAYOUT_EXISTS2, szMessage, sizeof(szMessage) / sizeof(TCHAR)); + MessageBox(hwndDlg, szMessage, NULL, MB_OK | MB_ICONINFORMATION); + + RegCloseKey(hKey); + return; + } + if (GetLayoutName(LangID, Layout)) { if ((SendMessage(hLayoutList, CB_SELECTSTRING, (WPARAM) -1, (LPARAM)Layout) != CB_ERR)&& @@ -105,8 +115,6 @@ } else SubPath[0] = '\0'; } - - pts = (PTSTR) SendMessage(hLayoutList, CB_GETITEMDATA, iLayout, 0); if (_tcslen(SubPath) != 0) { Modified: trunk/reactos/dll/cpl/input/input.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.h?rev=… ============================================================================== --- trunk/reactos/dll/cpl/input/input.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/input.h [iso-8859-1] Wed May 14 10:51:53 2008 @@ -41,6 +41,8 @@ GetLayoutName(LPCTSTR szLCID, LPTSTR szName); VOID UpdateLayoutsList(VOID); +BOOL +IsLayoutExists(LPTSTR szLayoutID, LPTSTR szLangID); /* keysettings.c */ INT_PTR CALLBACK Modified: trunk/reactos/dll/cpl/input/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/bg-BG.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/bg-BG.rc [iso-8859-1] Wed May 14 10:51:53 2008 @@ -87,6 +87,8 @@ IDS_LAYOUT "Êëàâèàòóðíà ïîäðåäáà" IDS_REM_QUESTION "Do you want to remove selected keyboard layout?" IDS_CONFIRMATION "Confirmation" + IDS_LAYOUT_EXISTS "This layout already exists." + IDS_LAYOUT_EXISTS2 "This layout already exists and can not be added." END STRINGTABLE Modified: trunk/reactos/dll/cpl/input/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/de-DE.rc [iso-8859-1] Wed May 14 10:51:53 2008 @@ -88,6 +88,8 @@ IDS_LAYOUT "Tastaturlayout" IDS_REM_QUESTION "Do you want to remove selected keyboard layout?" IDS_CONFIRMATION "Confirmation" + IDS_LAYOUT_EXISTS "This layout already exists." + IDS_LAYOUT_EXISTS2 "This layout already exists and can not be added." END STRINGTABLE Modified: trunk/reactos/dll/cpl/input/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/el-GR.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/el-GR.rc [iso-8859-1] Wed May 14 10:51:53 2008 @@ -87,6 +87,8 @@ IDS_LAYOUT "ÄéÜôáîç ðëçêôñïëïãßïõ" IDS_REM_QUESTION "Do you want to remove selected keyboard layout?" IDS_CONFIRMATION "Confirmation" + IDS_LAYOUT_EXISTS "This layout already exists." + IDS_LAYOUT_EXISTS2 "This layout already exists and can not be added." END STRINGTABLE Modified: trunk/reactos/dll/cpl/input/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/en-US.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/en-US.rc [iso-8859-1] Wed May 14 10:51:53 2008 @@ -85,8 +85,10 @@ IDS_WHATS_THIS "What's This?" IDS_LANGUAGE "Language" IDS_LAYOUT "Keyboard Layout" - IDS_REM_QUESTION "Do you want to remove selected keyboard layout?" - IDS_CONFIRMATION "Confirmation" + IDS_REM_QUESTION "Do you want to remove selected keyboard layout?" + IDS_CONFIRMATION "Confirmation" + IDS_LAYOUT_EXISTS "This layout already exists." + IDS_LAYOUT_EXISTS2 "This layout already exists and can not be added." END STRINGTABLE Modified: trunk/reactos/dll/cpl/input/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/es-ES.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/es-ES.rc [iso-8859-1] Wed May 14 10:51:53 2008 @@ -92,6 +92,8 @@ IDS_LAYOUT "Distribución del teclado" IDS_REM_QUESTION "¿Quiere eliminar la distribución del teclado seleccionada?" IDS_CONFIRMATION "Confirmación" + IDS_LAYOUT_EXISTS "This layout already exists." + IDS_LAYOUT_EXISTS2 "This layout already exists and can not be added." END STRINGTABLE Modified: trunk/reactos/dll/cpl/input/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/fr-FR.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/fr-FR.rc [iso-8859-1] Wed May 14 10:51:53 2008 @@ -87,6 +87,8 @@ IDS_LAYOUT "Keyboard Layout" IDS_REM_QUESTION "Do you want to remove selected keyboard layout?" IDS_CONFIRMATION "Confirmation" + IDS_LAYOUT_EXISTS "This layout already exists." + IDS_LAYOUT_EXISTS2 "This layout already exists and can not be added." END /* FIXME : To improve/complete */ Modified: trunk/reactos/dll/cpl/input/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/it-IT.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/it-IT.rc [iso-8859-1] Wed May 14 10:51:53 2008 @@ -87,6 +87,8 @@ IDS_LAYOUT "Disposizione tastiera" IDS_REM_QUESTION "Volete rimuovere la disposizione di tastiera selezionata?" IDS_CONFIRMATION "Conferma" + IDS_LAYOUT_EXISTS "This layout already exists." + IDS_LAYOUT_EXISTS2 "This layout already exists and can not be added." END STRINGTABLE Modified: trunk/reactos/dll/cpl/input/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/pl-PL.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/pl-PL.rc [iso-8859-1] Wed May 14 10:51:53 2008 @@ -94,6 +94,8 @@ IDS_LAYOUT "Uk³ad klawiatury" IDS_REM_QUESTION "Do you want to remove selected keyboard layout?" IDS_CONFIRMATION "Confirmation" + IDS_LAYOUT_EXISTS "This layout already exists." + IDS_LAYOUT_EXISTS2 "This layout already exists and can not be added." END STRINGTABLE Modified: trunk/reactos/dll/cpl/input/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/ru-RU.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/ru-RU.rc [iso-8859-1] Wed May 14 10:51:53 2008 @@ -85,8 +85,10 @@ IDS_WHATS_THIS "×òî ýòî?" IDS_LANGUAGE "ßçûê ââîäà" IDS_LAYOUT "Ðàñêëàäêà" - IDS_REM_QUESTION "Âû äåéñòâèòåëüíî õîòèòå óäàëèòü âûáðàííóþ ðàñêëàäêó êëàâèàòóðû?" - IDS_CONFIRMATION "Ïîäòâåðæäåíèå" + IDS_REM_QUESTION "Âû äåéñòâèòåëüíî õîòèòå óäàëèòü âûáðàííóþ ðàñêëàäêó êëàâèàòóðû?" + IDS_CONFIRMATION "Ïîäòâåðæäåíèå" + IDS_LAYOUT_EXISTS "Òàêàÿ ðàñêëàäêà óæå ñóùåñòâóåò." + IDS_LAYOUT_EXISTS2 "Òàêàÿ ðàñêëàäêà óæå ñóùåñòâóåò è íå ìîæåò áûòü äîáàâëåíà." END STRINGTABLE Modified: trunk/reactos/dll/cpl/input/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/sk-SK.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/sk-SK.rc [iso-8859-1] Wed May 14 10:51:53 2008 @@ -91,6 +91,8 @@ IDS_LAYOUT "Rozloenie klávesnice" IDS_REM_QUESTION "Do you want to remove selected keyboard layout?" IDS_CONFIRMATION "Confirmation" + IDS_LAYOUT_EXISTS "This layout already exists." + IDS_LAYOUT_EXISTS2 "This layout already exists and can not be added." END STRINGTABLE Modified: trunk/reactos/dll/cpl/input/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/uk-UA.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/uk-UA.rc [iso-8859-1] Wed May 14 10:51:53 2008 @@ -96,6 +96,8 @@ IDS_LAYOUT "Keyboard Layout" IDS_REM_QUESTION "Do you want to remove selected keyboard layout?" IDS_CONFIRMATION "Confirmation" + IDS_LAYOUT_EXISTS "This layout already exists." + IDS_LAYOUT_EXISTS2 "This layout already exists and can not be added." END STRINGTABLE Modified: trunk/reactos/dll/cpl/input/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/resource.h?r… ============================================================================== --- trunk/reactos/dll/cpl/input/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/resource.h [iso-8859-1] Wed May 14 10:51:53 2008 @@ -52,6 +52,8 @@ #define IDS_LAYOUT 9 #define IDS_REM_QUESTION 10 #define IDS_CONFIRMATION 11 +#define IDS_LAYOUT_EXISTS 12 +#define IDS_LAYOUT_EXISTS2 13 /* Layouts */ #define IDS_US_LAYOUT 5000 Modified: trunk/reactos/dll/cpl/input/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/settings.c?r… ============================================================================== --- trunk/reactos/dll/cpl/input/settings.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/settings.c [iso-8859-1] Wed May 14 10:51:53 2008 @@ -34,6 +34,72 @@ LVM_GETNEXTITEM, -1, LVNI_FOCUSED); return iIndex; +} + +BOOL +IsLayoutExists(LPTSTR szLayoutID, LPTSTR szLangID) +{ + HKEY hKey, hSubKey; + TCHAR szPreload[CCH_LAYOUT_ID + 1], szLayoutNum[3 + 1], + szTmp[CCH_LAYOUT_ID + 1], szOldLangID[CCH_LAYOUT_ID + 1]; + DWORD dwIndex = 0, dwType, dwSize; + BOOL IsLangExists = FALSE; + LANGID langid; + + if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Preload"), + 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) + { + dwSize = sizeof(szLayoutNum); + + while (RegEnumValue(hKey, dwIndex, szLayoutNum, &dwSize, NULL, &dwType, NULL, NULL) == ERROR_SUCCESS) + { + dwSize = sizeof(szPreload); + if (RegQueryValueEx(hKey, szLayoutNum, NULL, NULL, (LPBYTE)szPreload, &dwSize) != ERROR_SUCCESS) + { + RegCloseKey(hKey); + return FALSE; + } + + langid = (LANGID)_tcstoul(szPreload, NULL, 16); + GetLocaleInfo(langid, LOCALE_ILANGUAGE, szTmp, sizeof(szTmp) / sizeof(TCHAR)); + wsprintf(szOldLangID, _T("0000%s"), szTmp); + + if (_tcscmp(szOldLangID, szLangID) == 0) IsLangExists = TRUE; + + if (szPreload[0] == 'd') + { + if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Substitutes"), + 0, KEY_QUERY_VALUE, &hSubKey) == ERROR_SUCCESS) + { + dwSize = sizeof(szTmp); + RegQueryValueEx(hSubKey, szPreload, NULL, NULL, (LPBYTE)szTmp, &dwSize); + + if ((_tcscmp(szTmp, szLayoutID) == 0)&&(IsLangExists)) + { + RegCloseKey(hSubKey); + RegCloseKey(hKey); + return TRUE; + } + } + } + else + { + if (_tcscmp(szPreload, szLayoutID) == 0) + { + RegCloseKey(hKey); + return TRUE; + } + } + + IsLangExists = FALSE; + dwSize = sizeof(szLayoutNum); + dwIndex++; + } + + RegCloseKey(hKey); + } + + return FALSE; } static HICON @@ -314,7 +380,7 @@ LVITEM item; HKEY hKey, hSubKey; HWND hLayoutList = GetDlgItem(MainDlgWnd, IDC_KEYLAYOUT_LIST); - TCHAR szLayoutNum[10 + 1], szTitle[MAX_PATH], + TCHAR szLayoutNum[3 + 1], szTitle[MAX_PATH], szConf[MAX_PATH], szPreload[CCH_LAYOUT_ID + 1]; DWORD dwSize; @@ -369,11 +435,39 @@ } static VOID +SetDefaultLayout() +{ + HKL hKl; + TCHAR szLCID[CCH_LAYOUT_ID + 1], szLayoutNum[CCH_ULONG_DEC + 1]; + LVITEM item; + INT LayoutNum; + + if (IsLayoutSelected() != -1) + { + ZeroMemory(&item, sizeof(LVITEM)); + + item.mask = LVIF_PARAM; + item.iItem = IsLayoutSelected(); + + (VOID) ListView_GetItem(GetDlgItem(MainDlgWnd, IDC_KEYLAYOUT_LIST), &item); + + LayoutNum = (INT) item.lParam; + _ultot(LayoutNum, szLayoutNum, 10); + + if (GetLayoutID(szLayoutNum, szLCID)) + { + hKl = LoadKeyboardLayout(szLCID, KLF_ACTIVATE); + SystemParametersInfo(SPI_SETDEFAULTINPUTLANG, 0, &hKl, SPIF_SENDWININICHANGE); + } + } +} + +static VOID SaveInputLang(HWND hDlg) { HKEY hKey, hSubKey; TCHAR szLayoutID[CCH_LAYOUT_ID + 1], szLayoutNum[CCH_ULONG_DEC + 1], - szPreload[CCH_LAYOUT_ID + 1], LangID[CCH_LAYOUT_ID + 1], + szPreload[CCH_LAYOUT_ID + 1], LangID[CCH_LAYOUT_ID + 1], szMessage[MAX_PATH], Lang[MAX_PATH], SubPath[MAX_PATH]; PTSTR pts; INT iLayout; @@ -404,6 +498,15 @@ langid = (LANGID)_tcstoul(szPreload, NULL, 16); GetLocaleInfo(langid, LOCALE_ILANGUAGE, Lang, sizeof(Lang) / sizeof(TCHAR)); wsprintf(LangID, _T("0000%s"), Lang); + + if (IsLayoutExists(pts, LangID)) + { + LoadString(hApplet, IDS_LAYOUT_EXISTS, szMessage, sizeof(szMessage) / sizeof(TCHAR)); + MessageBox(hDlg, szMessage, NULL, MB_OK | MB_ICONINFORMATION); + + RegCloseKey(hKey); + return; + } if (szPreload[0] == 'd') { @@ -614,7 +717,8 @@ break; case IDC_SET_DEFAULT: - + SetDefaultLayout(); + UpdateLayoutsList(); break; } break;

1 0

[mpiulachs] 33514: - Set catalan default keyboard layout to spanish (no specific catalan kb layout exists) - [FORMATTING] small code indent for LanguageList contents
by mpiulachs＠svn.reactos.org 14 May '08

14 May '08

Author: mpiulachs Date: Wed May 14 09:40:17 2008 New Revision: 33514 URL: http://svn.reactos.org/svn/reactos?rev=33514&view=rev Log: - Set catalan default keyboard layout to spanish (no specific catalan kb layout exists) - [FORMATTING] small code indent for LanguageList contents Modified: trunk/reactos/base/setup/usetup/mui.c Modified: trunk/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/mui.c [iso-8859-1] Wed May 14 09:40:17 2008 @@ -49,59 +49,59 @@ static const MUI_LANGUAGE LanguageList[] = { - /* Lang ID, DefKbdLayout, SecKbLayout, ANSI CP, OEM CP, MAC CP, Language Name, page strgs,error strings, other strings */ - {L"00000409", L"00000409", NULL, L"1252", L"437", L"10000", L"English", enUSPages, enUSErrorEntries, enUSStrings }, - {L"0000041C", L"0000041C", L"00000409", L"1250", L"852", L"10029", L"Albanian", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000401", L"00000401", L"00000409", L"1256", L"720", L"10004", L"Arabic", enUSPages, enUSErrorEntries, enUSStrings }, - {L"0000042B", L"0000042B", L"00000409", L"0", L"1", L"2", L"Armenian Eastern",enUSPages, enUSErrorEntries, enUSStrings }, - {L"0000082C", L"0000082C", L"00000409", L"1251", L"866", L"10007", L"Azeri Cyrillic", enUSPages, enUSErrorEntries, enUSStrings }, - {L"0000042C", L"0000042C", L"00000409", L"1254", L"857", L"10081", L"Azeri Latin", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000423", L"00000423", L"00000409", L"1251", L"866", L"10007", L"Belarusian", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000813", L"00000813", L"00000409", L"1252", L"850", L"10000", L"Belgian (Dutch)", enUSPages, enUSErrorEntries, enUSStrings }, - {L"0000080C", L"0000080C", L"00000409", L"1252", L"850", L"10000", L"Belgian (French)",enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000416", L"00010416", L"00000409", L"1252", L"850", L"10000", L"Brazilian", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000402", L"00000402", L"00000409", L"1251", L"866", L"10007", L"Bulgarian", bgBGPages, bgBGErrorEntries, bgBGStrings }, - {L"00000455", L"00000455", L"00000409", L"0", L"1", L"2", L"Burmese", enUSPages, enUSErrorEntries, enUSStrings },// Unicode only - {L"00000C0C", L"00000C0C", L"00000409", L"1252", L"850", L"10000", L"Canadian (French)",enUSPages,enUSErrorEntries, enUSStrings }, - {L"00000403", L"00000403", L"00000409", L"1252", L"850", L"10000", L"Catalan", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000804", L"00000804", L"00000409", L"936", L"936", L"10008", L"Chinese (PRC)", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000405", L"00000405", L"00000409", L"1250", L"852", L"10029", L"Czech", csCZPages, csCZErrorEntries, csCZStrings }, - {L"00000406", L"00000406", L"00000409", L"1252", L"850", L"10000", L"Danish", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000407", L"00000407", L"00000409", L"1252", L"850", L"10000", L"Deutsch", deDEPages, deDEErrorEntries, deDEStrings }, - {L"00000413", L"00000813", L"00000409", L"1252", L"850", L"10000", L"Dutch", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000425", L"00000425", L"00000409", L"1257", L"775", L"10029", L"Estonian", enUSPages, enUSErrorEntries, enUSStrings }, - {L"0000040B", L"0000040B", L"00000409", L"1252", L"850", L"10000", L"Finnish", enUSPages, enUSErrorEntries, enUSStrings }, - {L"0000040C", L"0000040C", L"00000409", L"1252", L"850", L"10000", L"French", frFRPages, frFRErrorEntries, frFRStrings }, - {L"00000437", L"00000437", L"00000409", L"0", L"1", L"2", L"Georgian", enUSPages, enUSErrorEntries, enUSStrings },// Unicode only - {L"00000408", L"00000408", L"00000409", L"1253", L"737", L"10006", L"Greek", elGRPages, elGRErrorEntries, elGRStrings }, - {L"0000040D", L"0000040D", L"00000409", L"1255", L"862", L"10005", L"Hebrew", enUSPages, enUSErrorEntries, enUSStrings }, - {L"0000040E", L"0000040E", L"00000409", L"1250", L"852", L"10029", L"Hungarian", enUSPages, enUSErrorEntries, enUSStrings }, - {L"0000040F", L"0000040F", L"00000409", L"1252", L"850", L"10079", L"Icelandic", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000410", L"00000410", L"00000409", L"1252", L"850", L"10000", L"Italian", itITPages, itITErrorEntries, itITStrings }, - {L"00000411", L"00000411", L"00000409", L"932", L"932", L"10001", L"Japanese", enUSPages, enUSErrorEntries, enUSStrings }, - {L"0000043F", L"0000043F", L"00000409", L"1251", L"866", L"10007", L"Kazakh", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000412", L"00000412", L"00000409", L"949", L"949", L"10003", L"Korean", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000426", L"00000426", L"00000409", L"1257", L"775", L"10029", L"Latvian", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000427", L"00000427", L"00000409", L"1257", L"775", L"10029", L"Lithuanian", ltLTPages, ltLTErrorEntries, ltLTStrings }, - {L"0000042F", L"0000042F", L"00000409", L"1251", L"866", L"10007", L"Macedonian", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000414", L"00000414", L"00000409", L"1252", L"850", L"10000", L"Norwegian", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000418", L"00000418", L"00000409", L"1250", L"852", L"10029", L"Romanian", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000419", L"00000419", L"00000409", L"1251", L"866", L"10007", L"Russkij", ruRUPages, ruRUErrorEntries, ruRUStrings }, - {L"00000415", L"00000415", L"00000409", L"1250", L"852", L"10029", L"Polski", plPLPages, plPLErrorEntries, plPLStrings }, - {L"00000816", L"00000816", L"00000409", L"1252", L"850", L"10000", L"Portuguese", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000C1A", L"00000C1A", L"00000409", L"1251", L"855", L"10007", L"Serbian (Cyrillic)",enUSPages,enUSErrorEntries,enUSStrings }, - {L"0000081A", L"0000081A", L"00000409", L"1250", L"852", L"10029", L"Serbian (Latin)", enUSPages, enUSErrorEntries, enUSStrings }, - {L"0000041B", L"0000041B", L"00000409", L"1250", L"852", L"10029", L"Slovak", skSKPages, skSKErrorEntries, skSKStrings }, - {L"0000040A", L"0000040A", L"00000409", L"1252", L"850", L"10000", L"Spanish", esESPages, esESErrorEntries, esESStrings }, - {L"00000807", L"00000807", L"00000409", L"1252", L"850", L"10000", L"Swiss (German)", enUSPages, enUSErrorEntries, enUSStrings }, - {L"0000041D", L"0000041D", L"00000409", L"1252", L"850", L"10000", L"Swedish", svSEPages, svSEErrorEntries, svSEStrings }, - {L"00000444", L"00000444", L"00000409", L"1251", L"866", L"10007", L"Tatar", enUSPages, enUSErrorEntries, enUSStrings }, - {L"0000041E", L"0000041E", L"00000409", L"874", L"874", L"10021", L"Thai", enUSPages, enUSErrorEntries, enUSStrings }, - {L"0000041F", L"0000041F", L"00000409", L"1254", L"857", L"10081", L"Turkish", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000422", L"00000422", L"00000409", L"1251", L"866", L"10017", L"Ukrainian", ukUAPages, ukUAErrorEntries, ukUAStrings }, - {L"00000809", L"00000809", L"00000409", L"1252", L"850", L"10000", L"United Kingdom", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000843", L"00000843", L"00000409", L"1251", L"866", L"10007", L"Uzbek", enUSPages, enUSErrorEntries, enUSStrings }, - {L"0000042A", L"0000042A", L"00000409", L"1258", L"1258",L"10000", L"Vietnamese", enUSPages, enUSErrorEntries, enUSStrings }, + /* Lang ID, DefKbdLayout, SecKbLayout, ANSI CP, OEM CP, MAC CP, Language Name, page strgs,error strings, other strings */ + {L"00000409", L"00000409", NULL, L"1252", L"437", L"10000", L"English", enUSPages, enUSErrorEntries, enUSStrings }, + {L"0000041C", L"0000041C", L"00000409", L"1250", L"852", L"10029", L"Albanian", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000401", L"00000401", L"00000409", L"1256", L"720", L"10004", L"Arabic", enUSPages, enUSErrorEntries, enUSStrings }, + {L"0000042B", L"0000042B", L"00000409", L"0", L"1", L"2", L"Armenian Eastern", enUSPages, enUSErrorEntries, enUSStrings }, + {L"0000082C", L"0000082C", L"00000409", L"1251", L"866", L"10007", L"Azeri Cyrillic", enUSPages, enUSErrorEntries, enUSStrings }, + {L"0000042C", L"0000042C", L"00000409", L"1254", L"857", L"10081", L"Azeri Latin", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000423", L"00000423", L"00000409", L"1251", L"866", L"10007", L"Belarusian", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000813", L"00000813", L"00000409", L"1252", L"850", L"10000", L"Belgian (Dutch)", enUSPages, enUSErrorEntries, enUSStrings }, + {L"0000080C", L"0000080C", L"00000409", L"1252", L"850", L"10000", L"Belgian (French)", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000416", L"00010416", L"00000409", L"1252", L"850", L"10000", L"Brazilian", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000402", L"00000402", L"00000409", L"1251", L"866", L"10007", L"Bulgarian", bgBGPages, bgBGErrorEntries, bgBGStrings }, + {L"00000455", L"00000455", L"00000409", L"0", L"1", L"2", L"Burmese", enUSPages, enUSErrorEntries, enUSStrings },// Unicode only + {L"00000C0C", L"00000C0C", L"00000409", L"1252", L"850", L"10000", L"Canadian (French)", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000403", L"0000040A", L"00000409", L"1252", L"850", L"10000", L"Catalan", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000804", L"00000804", L"00000409", L"936", L"936", L"10008", L"Chinese (PRC)", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000405", L"00000405", L"00000409", L"1250", L"852", L"10029", L"Czech", csCZPages, csCZErrorEntries, csCZStrings }, + {L"00000406", L"00000406", L"00000409", L"1252", L"850", L"10000", L"Danish", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000407", L"00000407", L"00000409", L"1252", L"850", L"10000", L"Deutsch", deDEPages, deDEErrorEntries, deDEStrings }, + {L"00000413", L"00000813", L"00000409", L"1252", L"850", L"10000", L"Dutch", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000425", L"00000425", L"00000409", L"1257", L"775", L"10029", L"Estonian", enUSPages, enUSErrorEntries, enUSStrings }, + {L"0000040B", L"0000040B", L"00000409", L"1252", L"850", L"10000", L"Finnish", enUSPages, enUSErrorEntries, enUSStrings }, + {L"0000040C", L"0000040C", L"00000409", L"1252", L"850", L"10000", L"French", frFRPages, frFRErrorEntries, frFRStrings }, + {L"00000437", L"00000437", L"00000409", L"0", L"1", L"2", L"Georgian", enUSPages, enUSErrorEntries, enUSStrings },// Unicode only + {L"00000408", L"00000408", L"00000409", L"1253", L"737", L"10006", L"Greek", elGRPages, elGRErrorEntries, elGRStrings }, + {L"0000040D", L"0000040D", L"00000409", L"1255", L"862", L"10005", L"Hebrew", enUSPages, enUSErrorEntries, enUSStrings }, + {L"0000040E", L"0000040E", L"00000409", L"1250", L"852", L"10029", L"Hungarian", enUSPages, enUSErrorEntries, enUSStrings }, + {L"0000040F", L"0000040F", L"00000409", L"1252", L"850", L"10079", L"Icelandic", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000410", L"00000410", L"00000409", L"1252", L"850", L"10000", L"Italian", itITPages, itITErrorEntries, itITStrings }, + {L"00000411", L"00000411", L"00000409", L"932", L"932", L"10001", L"Japanese", enUSPages, enUSErrorEntries, enUSStrings }, + {L"0000043F", L"0000043F", L"00000409", L"1251", L"866", L"10007", L"Kazakh", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000412", L"00000412", L"00000409", L"949", L"949", L"10003", L"Korean", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000426", L"00000426", L"00000409", L"1257", L"775", L"10029", L"Latvian", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000427", L"00000427", L"00000409", L"1257", L"775", L"10029", L"Lithuanian", ltLTPages, ltLTErrorEntries, ltLTStrings }, + {L"0000042F", L"0000042F", L"00000409", L"1251", L"866", L"10007", L"Macedonian", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000414", L"00000414", L"00000409", L"1252", L"850", L"10000", L"Norwegian", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000418", L"00000418", L"00000409", L"1250", L"852", L"10029", L"Romanian", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000419", L"00000419", L"00000409", L"1251", L"866", L"10007", L"Russkij", ruRUPages, ruRUErrorEntries, ruRUStrings }, + {L"00000415", L"00000415", L"00000409", L"1250", L"852", L"10029", L"Polski", plPLPages, plPLErrorEntries, plPLStrings }, + {L"00000816", L"00000816", L"00000409", L"1252", L"850", L"10000", L"Portuguese", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000C1A", L"00000C1A", L"00000409", L"1251", L"855", L"10007", L"Serbian (Cyrillic)",enUSPages, enUSErrorEntries, enUSStrings }, + {L"0000081A", L"0000081A", L"00000409", L"1250", L"852", L"10029", L"Serbian (Latin)", enUSPages, enUSErrorEntries, enUSStrings }, + {L"0000041B", L"0000041B", L"00000409", L"1250", L"852", L"10029", L"Slovak", skSKPages, skSKErrorEntries, skSKStrings }, + {L"0000040A", L"0000040A", L"00000409", L"1252", L"850", L"10000", L"Spanish", esESPages, esESErrorEntries, esESStrings }, + {L"00000807", L"00000807", L"00000409", L"1252", L"850", L"10000", L"Swiss (German)", enUSPages, enUSErrorEntries, enUSStrings }, + {L"0000041D", L"0000041D", L"00000409", L"1252", L"850", L"10000", L"Swedish", svSEPages, svSEErrorEntries, svSEStrings }, + {L"00000444", L"00000444", L"00000409", L"1251", L"866", L"10007", L"Tatar", enUSPages, enUSErrorEntries, enUSStrings }, + {L"0000041E", L"0000041E", L"00000409", L"874", L"874", L"10021", L"Thai", enUSPages, enUSErrorEntries, enUSStrings }, + {L"0000041F", L"0000041F", L"00000409", L"1254", L"857", L"10081", L"Turkish", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000422", L"00000422", L"00000409", L"1251", L"866", L"10017", L"Ukrainian", ukUAPages, ukUAErrorEntries, ukUAStrings }, + {L"00000809", L"00000809", L"00000409", L"1252", L"850", L"10000", L"United Kingdom", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000843", L"00000843", L"00000409", L"1251", L"866", L"10007", L"Uzbek", enUSPages, enUSErrorEntries, enUSStrings }, + {L"0000042A", L"0000042A", L"00000409", L"1258", L"1258",L"10000", L"Vietnamese", enUSPages, enUSErrorEntries, enUSStrings }, {NULL, NULL, NULL, NULL, NULL, NULL} };

1 0

[cfinck] 33513: Carlo Bramini (carlo DOT bramix AT libero DOT it) - Italian translations and various fixes to Magnify (fixes part of bug #3241 as well) Changes by me: - Shorten the german dialog string a bit, so that it won't be truncated. Strings for Static controls can only be 256 characters long. A french translator should change the text as well, because it's longer than 256 characters. See issue #3245 for more details.
by cfinck＠svn.reactos.org 14 May '08

14 May '08

Author: cfinck Date: Wed May 14 09:18:11 2008 New Revision: 33513 URL: http://svn.reactos.org/svn/reactos?rev=33513&view=rev Log: Carlo Bramini (carlo DOT bramix AT libero DOT it) - Italian translations and various fixes to Magnify (fixes part of bug #3241 as well) Changes by me: - Shorten the german dialog string a bit, so that it won't be truncated. Strings for Static controls can only be 256 characters long. A french translator should change the text as well, because it's longer than 256 characters. See issue #3245 for more details. Added: trunk/rosapps/magnify/lang/it-IT.rc (with props) Modified: trunk/rosapps/magnify/lang/bg-BG.rc trunk/rosapps/magnify/lang/de-DE.rc trunk/rosapps/magnify/lang/en-US.rc trunk/rosapps/magnify/lang/es-ES.rc trunk/rosapps/magnify/lang/fr-FR.rc trunk/rosapps/magnify/lang/pl-PL.rc trunk/rosapps/magnify/lang/ru-RU.rc trunk/rosapps/magnify/lang/sk-SK.rc trunk/rosapps/magnify/lang/uk-UA.rc trunk/rosapps/magnify/magnifier.c trunk/rosapps/magnify/resource.h trunk/rosapps/magnify/rsrc.rc Modified: trunk/rosapps/magnify/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/lang/bg-BG.rc?rev=… ============================================================================== --- trunk/rosapps/magnify/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/rosapps/magnify/lang/bg-BG.rc [iso-8859-1] Wed May 14 09:18:11 2008 @@ -34,7 +34,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Èçõîä",IDOK,96,161,50,14 - PUSHBUTTON "Ïîìîù",IDOK,38,161,50,14 + PUSHBUTTON "Ïîìîù",IDC_BUTTON_HELP,38,161,50,14 LTEXT "Óâåëè÷åíèå:",IDC_STATIC,6,8,68,8 COMBOBOX IDC_ZOOM,72,6,63,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP GROUPBOX "Ïðîñëåäÿâàíå",IDC_STATIC,7,25,195,59 @@ -64,3 +64,4 @@ END + Modified: trunk/rosapps/magnify/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/lang/de-DE.rc?rev=… ============================================================================== --- trunk/rosapps/magnify/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/rosapps/magnify/lang/de-DE.rc [iso-8859-1] Wed May 14 09:18:11 2008 @@ -34,7 +34,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Beenden",IDOK,96,161,50,14 - PUSHBUTTON "Hilfe",IDOK,38,161,50,14 + PUSHBUTTON "Hilfe",IDC_BUTTON_HELP,38,161,50,14 LTEXT "Vergrößerungsgrad:",IDC_STATIC,6,12,68,8 COMBOBOX IDC_ZOOM,72,6,63,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP GROUPBOX "Folgen",IDC_STATIC,7,25,139,59 @@ -54,7 +54,7 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,193,76,50,14 ICON IDI_ICON,IDC_STATIC,7,17,20,20 - LTEXT "Die Bildschirmlupe ist für Personen mit leichten visuellen Einschränkungen gedacht und stellt lediglich Grundfunktionen zur Verfügung. Die meisten Nutzer mit visuellen Einschränkungen werden eine Bildschirm-Lupe mit mehr Funktionen für die alltägliche Nutzung benötigen.",IDC_STATIC,36,7,207,33 + LTEXT "Die Bildschirmlupe ist für Personen mit leichten visuellen Einschränkungen gedacht und stellt lediglich Grundfunktionen zur Verfügung. Die meisten Nutzer werden jedoch eine Bildschirmlupe mit mehr Funktionen für die alltägliche Nutzung benötigen.",IDC_STATIC,36,7,207,33 CONTROL "Diese Nachricht nicht mehr anzeigen",IDC_SHOWWARNINGCHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,43,80,137,10 END Modified: trunk/rosapps/magnify/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/lang/en-US.rc?rev=… ============================================================================== --- trunk/rosapps/magnify/lang/en-US.rc [iso-8859-1] (original) +++ trunk/rosapps/magnify/lang/en-US.rc [iso-8859-1] Wed May 14 09:18:11 2008 @@ -34,7 +34,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Exit",IDOK,96,161,50,14 - PUSHBUTTON "Help",IDOK,38,161,50,14 + PUSHBUTTON "Help",IDC_BUTTON_HELP,38,161,50,14 LTEXT "Magnification level:",IDC_STATIC,6,8,68,8 COMBOBOX IDC_ZOOM,72,6,63,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP GROUPBOX "Tracking",IDC_STATIC,7,25,139,59 Modified: trunk/rosapps/magnify/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/lang/es-ES.rc?rev=… ============================================================================== --- trunk/rosapps/magnify/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/rosapps/magnify/lang/es-ES.rc [iso-8859-1] Wed May 14 09:18:11 2008 @@ -37,7 +37,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Salir",IDOK,96,161,50,14 - PUSHBUTTON "Ayuda",IDOK,38,161,50,14 + PUSHBUTTON "Ayuda",IDC_BUTTON_HELP,38,161,50,14 LTEXT "Nivel de aumento:",IDC_STATIC,6,8,68,8 COMBOBOX IDC_ZOOM,72,6,63,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP GROUPBOX "Rastreando",IDC_STATIC,7,25,139,59 Modified: trunk/rosapps/magnify/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/lang/fr-FR.rc?rev=… ============================================================================== --- trunk/rosapps/magnify/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/rosapps/magnify/lang/fr-FR.rc [iso-8859-1] Wed May 14 09:18:11 2008 @@ -34,7 +34,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Quitter",IDOK,96,161,50,14 - PUSHBUTTON "Aider",IDOK,38,161,50,14 + PUSHBUTTON "Aider",IDC_BUTTON_HELP,38,161,50,14 LTEXT "Coefficient d'agrandissement:",IDC_STATIC,6,8,68,8 COMBOBOX IDC_ZOOM,72,6,63,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP GROUPBOX "Poursuite",IDC_STATIC,7,25,139,59 Added: trunk/rosapps/magnify/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/lang/it-IT.rc?rev=… ============================================================================== --- trunk/rosapps/magnify/lang/it-IT.rc (added) +++ trunk/rosapps/magnify/lang/it-IT.rc [iso-8859-1] Wed May 14 09:18:11 2008 @@ -1,0 +1,64 @@ +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +IDC_MAGNIFIER MENU +BEGIN + POPUP "&File" + BEGIN + MENUITEM "E&sci", IDM_EXIT + MENUITEM "&Opzioni", IDM_OPTIONS + MENUITEM SEPARATOR + MENUITEM "&Informazioni su Magnifier", IDM_ABOUT + END +END + +IDC_MAGNIFIER ACCELERATORS +BEGIN + "?", IDM_ABOUT, ASCII, ALT + "/", IDM_ABOUT, ASCII, ALT +END + +IDD_ABOUTBOX DIALOGEX 22, 17, 220, 75 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_CAPTION | WS_SYSMENU +CAPTION "Informazioni Magnifier" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_ICON,IDC_MYICON,14,9,20,20 + LTEXT "Magnifier Versione 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX + LTEXT "Copyright (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)",IDC_STATIC,48,24,125,22 + PUSHBUTTON "OK",IDOK,162,48,50,14 +END + +IDD_DIALOGOPTIONS DIALOGEX 0, 0, 153, 182 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Impostazioni di Magnifier" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "Uscita",IDOK,96,161,50,14 + PUSHBUTTON "Aiuto",IDC_BUTTON_HELP,38,161,50,14 + LTEXT "Livello d'ingrandimento:",IDC_STATIC,6,8,78,8 + COMBOBOX IDC_ZOOM,96,6,48,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Proseguimento",IDC_STATIC,7,25,139,59 + GROUPBOX "Presentazione",IDC_STATIC,7,87,139,57 + CONTROL "Seguire il cursore del mouse",IDC_FOLLOWMOUSECHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,42,114,10 + CONTROL "Seguire la selezione da tastiera",IDC_FOLLOWKEYBOARDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,54,120,10 + CONTROL "Seguire l'immissione di testo",IDC_FOLLOWTEXTEDITINGCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,66,114,10 + CONTROL "Inverti i colori",IDC_INVERTCOLORSCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,102,114,10 + CONTROL "Avvio in minimizzato",IDC_STARTMINIMIZEDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,114,114,10 + CONTROL "Mostra Magnifier",IDC_SHOWMAGNIFIERCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,126,114,10 +END + +IDD_WARNINGDIALOG DIALOGEX 0, 0, 250, 97 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION +CAPTION "ReactOS Magnifier" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "OK",IDOK,193,76,50,14 + ICON IDI_ICON,IDC_STATIC,7,17,20,20 + LTEXT "Magnifier é stato realizzato per fornire un livello minimo di funzionalità agli utenti affetti da problemi visivi. La maggior parte di questi utenti avrà bisogno di un programma di utilità dotato di maggiori funzioni per l'uso quotidiano.",IDC_STATIC,36,7,207,33 + CONTROL "Non mostrare più questo messaggio",IDC_SHOWWARNINGCHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,43,80,137,10 +END + +STRINGTABLE +BEGIN + IDS_APP_TITLE "Lente d'ingrandimento" +END Propchange: trunk/rosapps/magnify/lang/it-IT.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/magnify/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/lang/pl-PL.rc?rev=… ============================================================================== --- trunk/rosapps/magnify/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/rosapps/magnify/lang/pl-PL.rc [iso-8859-1] Wed May 14 09:18:11 2008 @@ -41,7 +41,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Wyjcie",IDOK,96,161,50,14 - PUSHBUTTON "Pomoc",IDOK,38,161,50,14 + PUSHBUTTON "Pomoc",IDC_BUTTON_HELP,38,161,50,14 LTEXT "Stopieñ powiêkszenia:",IDC_STATIC,6,8,68,8 COMBOBOX IDC_ZOOM,72,6,63,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP GROUPBOX "ledzenia",IDC_STATIC,7,25,139,59 Modified: trunk/rosapps/magnify/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/lang/ru-RU.rc?rev=… ============================================================================== --- trunk/rosapps/magnify/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/rosapps/magnify/lang/ru-RU.rc [iso-8859-1] Wed May 14 09:18:11 2008 @@ -34,7 +34,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Â&ûõîä",IDOK,94,158,50,14 - PUSHBUTTON "&Ñïðàâêà",IDOK,34,158,50,14 + PUSHBUTTON "&Ñïðàâêà",IDC_BUTTON_HELP,34,158,50,14 LTEXT "Óâåëè÷åíèå:",IDC_STATIC,6,8,68,8 COMBOBOX IDC_ZOOM,92,6,85,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP GROUPBOX "Ñëåæåíèå",IDC_STATIC,7,25,170,59 Modified: trunk/rosapps/magnify/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/lang/sk-SK.rc?rev=… ============================================================================== --- trunk/rosapps/magnify/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/rosapps/magnify/lang/sk-SK.rc [iso-8859-1] Wed May 14 09:18:11 2008 @@ -39,7 +39,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Koniec",IDOK,96,161,50,14 - PUSHBUTTON "Pomocník",IDOK,38,161,50,14 + PUSHBUTTON "Pomocník",IDC_BUTTON_HELP,38,161,50,14 LTEXT "Úroveò zväèenia:",IDC_STATIC,6,8,68,8 COMBOBOX IDC_ZOOM,72,6,63,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP GROUPBOX "Sledovanie",IDC_STATIC,7,25,139,59 Modified: trunk/rosapps/magnify/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/lang/uk-UA.rc?rev=… ============================================================================== --- trunk/rosapps/magnify/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/rosapps/magnify/lang/uk-UA.rc [iso-8859-1] Wed May 14 09:18:11 2008 @@ -42,7 +42,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Âèõ³ä",IDOK,96,161,50,14 - PUSHBUTTON "Äîâ³äêà",IDOK,38,161,50,14 + PUSHBUTTON "Äîâ³äêà",IDC_BUTTON_HELP,38,161,50,14 LTEXT "Çá³ëüøåííÿ:",IDC_STATIC,6,8,68,8 COMBOBOX IDC_ZOOM,72,6,63,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP GROUPBOX "Â³äñòåæåííÿ",IDC_STATIC,7,25,139,59 Modified: trunk/rosapps/magnify/magnifier.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/magnifier.c?rev=33… ============================================================================== --- trunk/rosapps/magnify/magnifier.c [iso-8859-1] (original) +++ trunk/rosapps/magnify/magnifier.c [iso-8859-1] Wed May 14 09:18:11 2008 @@ -44,12 +44,12 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) { - UNREFERENCED_PARAMETER(hPrevInstance); - UNREFERENCED_PARAMETER(lpCmdLine); - // TODO: Place code here. MSG msg; HACCEL hAccelTable; + + UNREFERENCED_PARAMETER(hPrevInstance); + UNREFERENCED_PARAMETER(lpCmdLine); // Initialize global strings LoadString(hInstance, IDS_APP_TITLE, szTitle, MAX_LOADSTRING); @@ -143,8 +143,13 @@ return FALSE; } - ShowWindow(hMainWnd, nCmdShow); + ShowWindow(hMainWnd, (bStartMinimized) ? SW_MINIMIZE : nCmdShow); UpdateWindow(hMainWnd); + + if (bShowWarning) + { + DialogBox (hInstance, MAKEINTRESOURCE(IDD_WARNINGDIALOG), hMainWnd, (DLGPROC)WarningProc); + } return TRUE; } @@ -168,18 +173,21 @@ RECT R; RECT appRect; DWORD rop = SRCCOPY; - HCURSOR hCursor; - CURSORINFO info; + CURSORINFO cinfo; + ICONINFO iinfo; + + int Width, Height, AppWidth, AppHeight; + LONG blitAreaWidth, blitAreaHeight, blitAreaX, blitAreaY; desktopHdc = GetWindowDC (hDesktopWindow); GetClientRect(hMainWnd, &appRect); GetWindowRect(hDesktopWindow, &R); - memset(&info, 0, sizeof(info)); - info.cbSize = sizeof(info); - GetCursorInfo(&info); - hCursor = info.hCursor; + memset(&cinfo, 0, sizeof(cinfo)); + cinfo.cbSize = sizeof(cinfo); + GetCursorInfo(&cinfo); + GetIconInfo(cinfo.hCursor, &iinfo); /* Create a memory DC compatible with client area DC.*/ HdcStrech = CreateCompatibleDC(desktopHdc); @@ -208,21 +216,21 @@ /* Draw the mouse pointer in the right position */ DrawIcon( HdcStrech , - pMouse.x - 10, - pMouse.y - 10, - hCursor); - - int Width = (R.right - R.left); - int Height = (R.bottom - R.top); - - int AppWidth = (appRect.right - appRect.left); - int AppHeight = (appRect.bottom - appRect.top); - - LONG blitAreaWidth = AppWidth / iZoom; - LONG blitAreaHeight = AppHeight / iZoom; - - LONG blitAreaX = (cp.x) - (blitAreaWidth /2); - LONG blitAreaY = (cp.y) - (blitAreaHeight /2); + pMouse.x - iinfo.xHotspot, // - 10, + pMouse.y - iinfo.yHotspot, // - 10, + cinfo.hCursor); + + Width = (R.right - R.left); + Height = (R.bottom - R.top); + + AppWidth = (appRect.right - appRect.left); + AppHeight = (appRect.bottom - appRect.top); + + blitAreaWidth = AppWidth / iZoom; + blitAreaHeight = AppHeight / iZoom; + + blitAreaX = (cp.x) - (blitAreaWidth /2); + blitAreaY = (cp.y) - (blitAreaHeight /2); if (blitAreaX < 0) { @@ -302,24 +310,26 @@ POINT pNewMouse; POINT pNewCaret; POINT pNewFocus; + HWND hwnd1, hwnd2, hwnd3; + DWORD a, b; + RECT controlRect; //Get current mouse position GetCursorPos (&pNewMouse); //Get caret position - HWND hwnd1 = GetForegroundWindow (); - DWORD a = GetWindowThreadProcessId(hwnd1, NULL); - DWORD b = GetCurrentThreadId(); + hwnd1 = GetForegroundWindow (); + a = GetWindowThreadProcessId(hwnd1, NULL); + b = GetCurrentThreadId(); AttachThreadInput (a, b, TRUE); - HWND hwnd2 = GetFocus(); + hwnd2 = GetFocus(); GetCaretPos( &pNewCaret); ClientToScreen (hwnd2, (LPPOINT) &pNewCaret); AttachThreadInput (a, b, FALSE); //Get current control focus - HWND hwnd3 = GetFocus (); - RECT controlRect; + hwnd3 = GetFocus (); GetWindowRect (hwnd3 , &controlRect); pNewFocus.x = controlRect.left; pNewFocus.y = controlRect.top; @@ -392,16 +402,6 @@ //Get the desktop window hDesktopWindow = GetDesktopWindow(); - if (bShowWarning) - { - DialogBox (hInst, MAKEINTRESOURCE(IDD_WARNINGDIALOG), hWnd, (DLGPROC)WarningProc); - } - - if (bStartMinimized) - { - ShowWindow (hMainWnd, SW_MINIMIZE ); - } - //Set the timer SetTimer (hWnd , 1, REPAINT_SPEED , NULL); break; @@ -473,20 +473,17 @@ return (INT_PTR)TRUE; } case WM_COMMAND: - if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) - { - EndDialog(hDlg, LOWORD(wParam)); - return (INT_PTR)TRUE; - } - if (LOWORD(wParam) == IDOK) - { - } - if (LOWORD(wParam) == IDHELP) - { - MessageBox(hDlg , TEXT("Magnifier help not available yet!") , TEXT("Help") , MB_OK); - } switch(LOWORD(wParam)) { + case IDOK: + case IDCANCEL: + EndDialog(hDlg, LOWORD(wParam)); + return (INT_PTR)TRUE; + + case IDC_BUTTON_HELP: + /* unimplemented */ + MessageBox(hDlg , TEXT("Magnifier help not available yet!") , TEXT("Help") , MB_OK); + break; case IDC_ZOOM: if(HIWORD(wParam) == CBN_SELCHANGE) { Modified: trunk/rosapps/magnify/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/resource.h?rev=335… ============================================================================== --- trunk/rosapps/magnify/resource.h [iso-8859-1] (original) +++ trunk/rosapps/magnify/resource.h [iso-8859-1] Wed May 14 09:18:11 2008 @@ -12,7 +12,6 @@ #define IDD_DIALOGOPTIONS 129 #define IDD_WARNINGDIALOG 130 #define IDC_ZOOM 1000 -#define IDC_CHECK1 1001 #define IDC_FOLLOWKEYBOARDCHECK 1002 #define IDC_FOLLOWTEXTEDITINGCHECK 1003 #define IDC_INVERTCOLORSCHECK 1004 @@ -20,8 +19,8 @@ #define IDC_SHOWMAGNIFIER 1006 #define IDC_SHOWMAGNIFIERCHECK 1006 #define IDC_FOLLOWMOUSECHECK 1007 +#define IDC_BUTTON_HELP 1008 #define IDC_SHOWWARNINGCHECK 1009 -#define IDC_BUTTON1 1008 #define ID_FILE_OPTIONS 32771 #define ID_OPTIONS 32772 #define IDM_OPTIONS 32773 Modified: trunk/rosapps/magnify/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/rsrc.rc?rev=33513&… ============================================================================== --- trunk/rosapps/magnify/rsrc.rc [iso-8859-1] (original) +++ trunk/rosapps/magnify/rsrc.rc [iso-8859-1] Wed May 14 09:18:11 2008 @@ -6,6 +6,7 @@ #include "lang/es-ES.rc" #include "lang/de-DE.rc" #include "lang/fr-FR.rc" +#include "lang/it-IT.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc"

1 0

[mpiulachs] 33512: - Implement generic list PageUp/PageDown
by mpiulachs＠svn.reactos.org 14 May '08

14 May '08

Author: mpiulachs Date: Wed May 14 09:01:06 2008 New Revision: 33512 URL: http://svn.reactos.org/svn/reactos?rev=33512&view=rev Log: - Implement generic list PageUp/PageDown Modified: trunk/reactos/base/setup/usetup/genlist.c trunk/reactos/base/setup/usetup/genlist.h trunk/reactos/base/setup/usetup/interface/usetup.c Modified: trunk/reactos/base/setup/usetup/genlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/genlist.… ============================================================================== --- trunk/reactos/base/setup/usetup/genlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/genlist.c [iso-8859-1] Wed May 14 09:01:06 2008 @@ -52,6 +52,7 @@ SHORT Top; SHORT Right; SHORT Bottom; + BOOL Redraw; PGENERIC_LIST_ENTRY CurrentEntry; PGENERIC_LIST_ENTRY BackupEntry; @@ -74,6 +75,7 @@ List->Top = 0; List->Right = 0; List->Bottom = 0; + List->Redraw = TRUE; List->CurrentEntry = NULL; @@ -351,6 +353,47 @@ DrawScrollBarGenericList(List); } +VOID +ScrollPageDownGenericList (PGENERIC_LIST List) +{ + SHORT i; + + /* Suspend auto-redraw */ + List->Redraw = FALSE; + + for (i = List->Top + 1; i < List->Bottom - 1; i++) + { + ScrollDownGenericList (List); + } + + /* Update user interface */ + DrawListEntries(List); + DrawScrollBarGenericList(List); + + /* Re enable auto-redraw */ + List->Redraw = TRUE; +} + +VOID +ScrollPageUpGenericList (PGENERIC_LIST List) +{ + SHORT i; + + /* Suspend auto-redraw */ + List->Redraw = FALSE; + + for (i = List->Bottom - 1; i > List->Top + 1; i--) + { + ScrollUpGenericList (List); + } + + /* Update user interface */ + DrawListEntries(List); + DrawScrollBarGenericList(List); + + /* Re enable auto-redraw */ + List->Redraw = TRUE; +} VOID ScrollDownGenericList (PGENERIC_LIST List) @@ -370,8 +413,11 @@ } List->CurrentEntry = CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry); - DrawListEntries(List); - DrawScrollBarGenericList(List); + if (List->Redraw) + { + DrawListEntries(List); + DrawScrollBarGenericList(List); + } } } @@ -394,8 +440,11 @@ } List->CurrentEntry = CONTAINING_RECORD (Entry, GENERIC_LIST_ENTRY, Entry); - DrawListEntries(List); - DrawScrollBarGenericList(List); + if (List->Redraw) + { + DrawListEntries(List); + DrawScrollBarGenericList(List); + } } } Modified: trunk/reactos/base/setup/usetup/genlist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/genlist.… ============================================================================== --- trunk/reactos/base/setup/usetup/genlist.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/genlist.h [iso-8859-1] Wed May 14 09:01:06 2008 @@ -62,6 +62,12 @@ ScrollUpGenericList(PGENERIC_LIST List); VOID +ScrollPageDownGenericList(PGENERIC_LIST List); + +VOID +ScrollPageUpGenericList(PGENERIC_LIST List); + +VOID SetCurrentListEntry(PGENERIC_LIST List, PGENERIC_LIST_ENTRY Entry); PGENERIC_LIST_ENTRY Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Wed May 14 09:01:06 2008 @@ -621,20 +621,36 @@ if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_DOWN)) /* DOWN */ { -#if 0 //Dynamically update user interface - SelectedLanguageId = (PWCHAR)LanguageList->CurrentEntry->UserData; +#if 0 + SelectedLanguageId = (PWCHAR)GetListEntryUserData(GetCurrentListEntry(LanguageList)); + + /* Redraw language selection page in native language */ MUIDisplayPage(LANGUAGE_PAGE); #endif + ScrollDownGenericList (LanguageList); } else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_UP)) /* UP */ { #if 0 - SelectedLanguageId = (PWCHAR)LanguageList->CurrentEntry->UserData; + SelectedLanguageId = (PWCHAR)GetListEntryUserData(GetCurrentListEntry(LanguageList)); + + /* Redraw language selection page in native language */ MUIDisplayPage(LANGUAGE_PAGE); #endif + ScrollUpGenericList (LanguageList); + } + if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && + (Ir->Event.KeyEvent.wVirtualKeyCode == VK_NEXT)) /* PAGE DOWN */ + { + ScrollPageDownGenericList (LanguageList); + } + else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && + (Ir->Event.KeyEvent.wVirtualKeyCode == VK_PRIOR)) /* PAGE UP */ + { + ScrollPageUpGenericList (LanguageList); } else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ @@ -1269,6 +1285,16 @@ { ScrollUpGenericList (LayoutList); } + if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && + (Ir->Event.KeyEvent.wVirtualKeyCode == VK_NEXT)) /* PAGE DOWN */ + { + ScrollPageDownGenericList (LayoutList); + } + else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && + (Ir->Event.KeyEvent.wVirtualKeyCode == VK_PRIOR)) /* PAGE UP */ + { + ScrollPageUpGenericList (LayoutList); + } else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ { @@ -1286,6 +1312,11 @@ else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ { return DEVICE_SETTINGS_PAGE; + } + else if ((Ir->Event.KeyEvent.uChar.AsciiChar > 0x60) && (Ir->Event.KeyEvent.uChar.AsciiChar < 0x7b)) + { + /* a-z */ + GenericListKeyPress (LayoutList , Ir->Event.KeyEvent.uChar.AsciiChar); } }

1 0

[gedmurphy] 33511: A few missing defines I needed
by gedmurphy＠svn.reactos.org 14 May '08

14 May '08

Author: gedmurphy Date: Wed May 14 06:38:10 2008 New Revision: 33511 URL: http://svn.reactos.org/svn/reactos?rev=33511&view=rev Log: A few missing defines I needed Modified: trunk/reactos/include/psdk/winuser.h Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Wed May 14 06:38:10 2008 @@ -1023,6 +1023,10 @@ #if(_WIN32_WINNT >= 0x0501) #define SM_CXFOCUSBORDER 83 #define SM_CYFOCUSBORDER 84 +#define SM_TABLETPC 86 +#define SM_MEDIACENTER 87 +#define SM_STARTER 88 +#define SM_SERVERR2 89 #define SM_SHUTTINGDOWN 0x2000 #define SM_REMOTECONTROL 0x2001 #endif /* _WIN32_WINNT >= 0x0501 */

1 0

[jimtabor] 33510: We have Brush Attributes already define in ntgdihdl.h, its a user space structure.
by jimtabor＠svn.reactos.org 13 May '08

13 May '08

Author: jimtabor Date: Tue May 13 18:54:20 2008 New Revision: 33510 URL: http://svn.reactos.org/svn/reactos?rev=33510&view=rev Log: We have Brush Attributes already define in ntgdihdl.h, its a user space structure. Modified: trunk/reactos/subsystems/win32/win32k/include/brush.h Modified: trunk/reactos/subsystems/win32/win32k/include/brush.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/brush.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/brush.h [iso-8859-1] Tue May 13 18:54:20 2008 @@ -17,12 +17,6 @@ typedef struct { - ULONG AttrFlags; - COLORREF lbColor; -} BRUSHATTR, *PBRUSHATTR; - -typedef struct -{ /* Header for all gdi objects in the handle table. Do not (re)move this. */ BASEOBJECT BaseObject; @@ -33,8 +27,8 @@ ULONG flAttrs; ULONG ulBrushUnique; - BRUSHATTR *pBrushAttr; - BRUSHATTR BrushAttr; + BRUSH_ATTR *pBrushAttr; // Just like DC_ATTR, pointer to user data + BRUSH_ATTR BrushAttr; // " " DCOBJ, internal if pBrushAttr == Zero POINT ptOrigin; ULONG bCacheGrabbed; COLORREF crBack;

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
59
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2008