Ros-diffs May 2007

ros-diffs@reactos.org

17 participants
322 discussions

[mbosma] 26807: Revert r25952 for now.
by mbosma＠svn.reactos.org 16 May '07

16 May '07

Author: mbosma Date: Wed May 16 22:05:03 2007 New Revision: 26807 URL: http://svn.reactos.org/svn/reactos?rev=26807&view=rev Log: Revert r25952 for now. Added: trunk/rosapps/downloader/downloader.xml - copied unchanged from r25951, trunk/reactos/base/applications/downloader/downloader.xml Removed: trunk/rosapps/downloader/packagetree/ trunk/rosapps/downloader/script.c Modified: trunk/rosapps/downloader/download.c trunk/rosapps/downloader/downloader.rbuild trunk/rosapps/downloader/main.c trunk/rosapps/downloader/resources.h trunk/rosapps/downloader/structures.h trunk/rosapps/downloader/translations/de.rc trunk/rosapps/downloader/translations/en.rc trunk/rosapps/downloader/translations/fr.rc trunk/rosapps/downloader/translations/id.rc trunk/rosapps/downloader/translations/it.rc trunk/rosapps/downloader/xml.c Modified: trunk/rosapps/downloader/download.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/download.c?rev=… ============================================================================== --- trunk/rosapps/downloader/download.c (original) +++ trunk/rosapps/downloader/download.c Wed May 16 22:05:03 2007 @@ -221,11 +221,31 @@ { //static const WCHAR szUrl[] = DownloadUrl; IBindStatusCallback *dl; - HWND Dlg = ((struct lParamDownload*)Context)->Dlg; + WCHAR path[MAX_PATH]; + LPWSTR p; + STARTUPINFOW si; + PROCESS_INFORMATION pi; + HWND Dlg = (HWND) Context; DWORD r; BOOL bCancelled = FALSE; - dl = CreateDl(Dlg, &bCancelled); - r = URLDownloadToFileW(NULL, ((struct lParamDownload*)Context)->URL, ((struct lParamDownload*)Context)->File, 0, dl); + BOOL bTempfile = FALSE; + + /* built the path for the download */ + p = wcsrchr(SelectedApplication->Location, L'/'); + if (NULL == p) + { + goto end; + } + if (! GetTempPathW(MAX_PATH, path)) + { + goto end; + } + wcscat(path, p + 1); + + /* download it */ + bTempfile = TRUE; + dl = CreateDl(Context, &bCancelled); + r = URLDownloadToFileW(NULL, SelectedApplication->Location, path, 0, dl); if (NULL != dl) { IBindStatusCallback_Release(dl); @@ -233,6 +253,30 @@ if (S_OK != r) { MessageBoxW(0,Strings[IDS_DOWNLOAD_ERROR],0,0); + goto end; + } + else if (bCancelled) + { + goto end; + } + ShowWindow(Dlg, SW_HIDE); + + /* run it */ + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + r = CreateProcessW(path, NULL, NULL, NULL, 0, 0, NULL, NULL, &si, &pi); + if (0 == r) + { + goto end; + } + CloseHandle(pi.hThread); + WaitForSingleObject(pi.hProcess, INFINITE); + CloseHandle(pi.hProcess); + +end: + if (bTempfile) + { + DeleteFileW(path); } EndDialog(Dlg, 0); return 0; @@ -243,7 +287,7 @@ { HANDLE Thread; DWORD ThreadId; - HWND Item;; + HWND Item; switch (Msg) { @@ -276,8 +320,7 @@ ShowWindow(Item, SW_HIDE); } }*/ - ((struct lParamDownload*)lParam)->Dlg = Dlg; - Thread = CreateThread(NULL, 0, ThreadFunc, (LPVOID)lParam, 0, &ThreadId); + Thread = CreateThread(NULL, 0, ThreadFunc, Dlg, 0, &ThreadId); if (NULL == Thread) { return FALSE; Modified: trunk/rosapps/downloader/downloader.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/downloader.rbui… ============================================================================== --- trunk/rosapps/downloader/downloader.rbuild (original) +++ trunk/rosapps/downloader/downloader.rbuild Wed May 16 22:05:03 2007 @@ -1,8 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> -<directory name="packagetree"> - <xi:include href="packagetree/packagetree.rbuild" /> -</directory> +<installfile base="system32">downloader.xml</installfile> <module name="downloader" type="win32gui" installbase="system32" installname="downloader.exe"> <include base="downloader">.</include> <include base="expat">.</include> @@ -29,6 +27,5 @@ <file>main.c</file> <file>xml.c</file> <file>download.c</file> - <file>script.c</file> <file>downloader.rc</file> </module> Modified: trunk/rosapps/downloader/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/main.c?rev=2680… ============================================================================== --- trunk/rosapps/downloader/main.c (original) +++ trunk/rosapps/downloader/main.c Wed May 16 22:05:03 2007 @@ -10,65 +10,46 @@ #include <richedit.h> #include <stdio.h> #include <shlwapi.h> -#include <wchar.h> #include "resources.h" #include "structures.h" -#define XML_PATH "tree.xml" +#define XML_PATH "C:\\ReactOS\\system32\\downloader.xml" HWND hwnd, hCategories, hApps, hDownloadButton, hUninstallButton, hUpdateButton, hHelpButton; HBITMAP hLogo, hUnderline; -CHAR* CmdLine; WCHAR* DescriptionHeadline = L""; WCHAR* DescriptionText = L""; -WCHAR ApplicationText[0xA04]; // MAX_STRING_LENGHT + Version + \n + MAX_STRING_LENGHT + Licence + \n + MAX_STRING_LENGHT + Maintainer + \n\n + Description - // 0x100 + 0x100 + 1 + 0x100 + 0x100 + 1 + 0x100 + 0x100 + 2 + 0x400 = 0xA04 +WCHAR ApplicationText[700]; + struct Category Root; struct Application* SelectedApplication; INT_PTR CALLBACK DownloadProc (HWND, UINT, WPARAM, LPARAM); -DWORD WINAPI InstallThreadFunc(LPVOID); -DWORD WINAPI UninstallThreadFunc(LPVOID); BOOL ProcessXML (const char* filename, struct Category* Root); -char* addDML (const char*); VOID FreeTree (struct Category* Node); WCHAR Strings [STRING_COUNT][MAX_STRING_LENGHT]; -BOOL getUninstaller(struct Application* CurrentApplication, WCHAR* Uninstaller) { - - DWORD ArraySize = 0x100; + +BOOL getUninstaller(WCHAR* RegName, WCHAR* Uninstaller) { + + const DWORD ArraySize = 200; HKEY hKey1; HKEY hKey2; DWORD Type = 0; + DWORD Size = ArraySize; WCHAR Value[ArraySize]; WCHAR KeyName[ArraySize]; - DWORD Size = ArraySize; LONG i = 0; - if (CurrentApplication->RegName[0] == L'\0') { - return FALSE; - } - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall",0,KEY_READ,&hKey1) == ERROR_SUCCESS) { - if (RegOpenKeyExW(hKey1,CurrentApplication->RegName,0,KEY_READ,&hKey2) == ERROR_SUCCESS) { - if (RegQueryValueExW(hKey2,L"UninstallString",0,&Type,(LPBYTE)Uninstaller,&Size) == ERROR_SUCCESS) { - RegCloseKey(hKey2); - RegCloseKey(hKey1); - return TRUE; - } else { - RegCloseKey(hKey2); - RegCloseKey(hKey1); - return FALSE; - } - } while (RegEnumKeyExW(hKey1,i,KeyName,&Size,NULL,NULL,NULL,NULL) == ERROR_SUCCESS) { ++i; RegOpenKeyExW(hKey1,KeyName,0,KEY_READ,&hKey2); - Size = sizeof(Value); + Size = ArraySize; if (RegQueryValueExW(hKey2,L"DisplayName",0,&Type,(LPBYTE)Value,&Size) == ERROR_SUCCESS) { Size = ArraySize; - if (!wcscmp(Value,CurrentApplication->RegName)) { + if (StrCmpW(Value,RegName) == 0) { if (RegQueryValueExW(hKey2,L"UninstallString",0,&Type,(LPBYTE)Uninstaller,&Size) == ERROR_SUCCESS) { RegCloseKey(hKey2); RegCloseKey(hKey1); @@ -142,16 +123,17 @@ CurrentApplication = Category->Apps; + WCHAR Uninstaller[200]; while(CurrentApplication) { Insert.item.lParam = (UINT)CurrentApplication; Insert.item.pszText = CurrentApplication->Name; Insert.item.cchTextMax = lstrlenW(CurrentApplication->Name); - if(getUninstaller(CurrentApplication, NULL)) { - Insert.item.iImage = 9; - } else { - Insert.item.iImage = 10; - } + Insert.item.iImage = 10; + if(StrCmpW(CurrentApplication->RegName,L"")) { + if(getUninstaller(CurrentApplication->RegName, Uninstaller)) + Insert.item.iImage = 9; + } SendMessage(hwnd, TVM_INSERTITEM, 0, (LPARAM)&Insert); CurrentApplication = CurrentApplication->Next; } @@ -179,8 +161,8 @@ hHelpButton = CreateWindowW (L"Button", L"", WS_CHILD|WS_VISIBLE|BS_BITMAP, 550, 10, 40, 40, hwnd, 0, hInstance, NULL); hUpdateButton = CreateWindowW (L"Button", L"", WS_CHILD|WS_VISIBLE|BS_BITMAP, 500, 10, 40, 40, hwnd, 0, hInstance, NULL); - hDownloadButton = CreateWindowW (L"Button", L"", WS_CHILD|WS_VISIBLE|BS_BITMAP, 330, 505, 140, 35, hwnd, 0, hInstance, NULL); - hUninstallButton = CreateWindowW (L"Button", L"", WS_CHILD|WS_VISIBLE|BS_BITMAP, 260, 505, 140, 35, hwnd, 0, hInstance, NULL); + hDownloadButton = CreateWindowW (L"Button", L"", WS_CHILD|WS_VISIBLE|BS_BITMAP, 330, 505, 140, 33, hwnd, 0, hInstance, NULL); + hUninstallButton = CreateWindowW (L"Button", L"", WS_CHILD|WS_VISIBLE|BS_BITMAP, 260, 505, 140, 33, hwnd, 0, hInstance, NULL); SendMessageW(hHelpButton, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)(HANDLE)LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_HELP))); SendMessageW(hUpdateButton, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP,(LPARAM)(HANDLE)LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_UPDATE))); @@ -285,41 +267,17 @@ MoveWindow(hDownloadButton,(Split_Vertical+Rect.right-Rect.left)/2-70,Rect.bottom-Rect.top-45,140,35,TRUE); } -void searchApp(const WCHAR* AppName, struct Category* Node) { - struct Application* CurrentApplication; - if (Node->Children) - searchApp(AppName, Node->Children); - if (Node->Next) - searchApp(AppName, Node->Next); - CurrentApplication = Node->Apps; - while((SelectedApplication == NULL) && (CurrentApplication != NULL)) { - if(wcscmp(CurrentApplication->Name,AppName)==0) - SelectedApplication = CurrentApplication; - CurrentApplication = CurrentApplication->Next; - } -} - -void ShowSelectedApplication() { - ApplicationText[0]=L'\0'; - if(SelectedApplication->Version[0] != L'\0') { - StrCatW(ApplicationText, Strings[IDS_VERSION]); - StrCatW(ApplicationText, SelectedApplication->Version); - StrCatW(ApplicationText, L"\n"); - } - if(SelectedApplication->Licence[0] != L'\0') { - StrCatW(ApplicationText, Strings[IDS_LICENCE]); - StrCatW(ApplicationText, SelectedApplication->Licence); - StrCatW(ApplicationText, L"\n"); - } - if(SelectedApplication->Maintainer[0] != L'\0') { - StrCatW(ApplicationText, Strings[IDS_MAINTAINER]); - StrCatW(ApplicationText, SelectedApplication->Maintainer); - StrCatW(ApplicationText, L"\n"); - } - if((SelectedApplication->Licence[0] != L'\0') || (SelectedApplication->Version[0] != L'\0') || (SelectedApplication->Maintainer[0] != L'\0')) - StrCatW(ApplicationText, L"\n"); - StrCatW(ApplicationText, SelectedApplication->Description); - ShowMessage(SelectedApplication->Name, ApplicationText); +void startUninstaller(WCHAR* Uninstaller) { + STARTUPINFOW si; + PROCESS_INFORMATION pi; + + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + CreateProcessW(NULL,Uninstaller,NULL,NULL,FALSE,0,NULL,NULL,&si,&pi); + CloseHandle(pi.hThread); + // WaitForSingleObject(pi.hProcess, INFINITE); // If you want to wait for the Unistaller + CloseHandle(pi.hProcess); + hideUninstaller(); } LRESULT CALLBACK WndProc (HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) @@ -330,34 +288,9 @@ { case WM_CREATE: { - WCHAR wAppName[0x100] = L""; - if (strncmp(CmdLine,"add ",4)==0) { - CmdLine = CmdLine+4; - if(CmdLine[0]==L'\"') { - CmdLine++; - CmdLine[strlen(CmdLine)-1]=L'\0'; - } - char* aAppName = addDML(CmdLine); - MultiByteToWideChar(CP_UTF8, 0, aAppName, -1, wAppName, 0x100); - } else if (strncmp(CmdLine,"show ",5)==0) { - MultiByteToWideChar(CP_UTF8, 0, CmdLine+5, -1, wAppName, 0x100); - } - if(!SetupControls(hwnd)) return -1; - - if(wAppName[0]!=L'\0') - searchApp(wAppName, &Root); - - if(SelectedApplication == NULL) { - ShowMessage(Strings[IDS_WELCOME_TITLE], Strings[IDS_WELCOME]); - } else { - ShowSelectedApplication(); - if(getUninstaller(SelectedApplication, NULL)) - showUninstaller(); - else - hideUninstaller(); - } + ShowMessage(Strings[IDS_WELCOME_TITLE], Strings[IDS_WELCOME]); } break; @@ -386,20 +319,21 @@ { if (lParam == (LPARAM)hDownloadButton) { - if(SelectedApplication) { - DWORD ThreadId; - CreateThread(NULL, 0, InstallThreadFunc, SelectedApplication, 0, &ThreadId); - } else + if(SelectedApplication) + DialogBoxW(GetModuleHandle(NULL), MAKEINTRESOURCEW(IDD_DOWNLOAD), 0, DownloadProc); + else ShowMessage(Strings[IDS_NO_APP_TITLE], Strings[IDS_NO_APP]); } else if (lParam == (LPARAM)hUninstallButton) { - if(SelectedApplication) { - DWORD ThreadId; - CreateThread(NULL, 0, UninstallThreadFunc, SelectedApplication, 0, &ThreadId); - hideUninstaller(); - } else - ShowMessage(Strings[IDS_NO_APP_TITLE], Strings[IDS_NO_APP]); + if(SelectedApplication) + { + WCHAR Uninstaller[200]; + if(StrCmpW(SelectedApplication->RegName, L"")) { + if(getUninstaller(SelectedApplication->RegName, Uninstaller)) + startUninstaller(Uninstaller); + } + } } else if (lParam == (LPARAM)hUpdateButton) { @@ -429,9 +363,31 @@ SelectedApplication = (struct Application*) ((LPNMTREEVIEW)lParam)->itemNew.lParam; if(SelectedApplication) { - ShowSelectedApplication(); - if(getUninstaller(SelectedApplication, NULL)) { - bShowUninstaller = TRUE; + ApplicationText[0]=L'\0'; + if(StrCmpW(SelectedApplication->Version, L"")) { + StrCatW(ApplicationText, Strings[IDS_VERSION]); + StrCatW(ApplicationText, SelectedApplication->Version); + StrCatW(ApplicationText, L"\n"); + } + if(StrCmpW(SelectedApplication->Licence, L"")) { + StrCatW(ApplicationText, Strings[IDS_LICENCE]); + StrCatW(ApplicationText, SelectedApplication->Licence); + StrCatW(ApplicationText, L"\n"); + } + if(StrCmpW(SelectedApplication->Maintainer, L"")) { + StrCatW(ApplicationText, Strings[IDS_MAINTAINER]); + StrCatW(ApplicationText, SelectedApplication->Maintainer); + StrCatW(ApplicationText, L"\n"); + } + if(StrCmpW(SelectedApplication->Licence, L"") || StrCmpW(SelectedApplication->Version, L"") || StrCmpW(SelectedApplication->Maintainer, L"")) + StrCatW(ApplicationText, L"\n"); + StrCatW(ApplicationText, SelectedApplication->Description); + ShowMessage(SelectedApplication->Name, ApplicationText); + WCHAR Uninstaller[200]; + if(StrCmpW(SelectedApplication->RegName, L"")) { + if(getUninstaller(SelectedApplication->RegName, Uninstaller)) { + bShowUninstaller = TRUE; + } } } } @@ -496,8 +452,7 @@ MSG msg; InitCommonControls(); - CmdLine = lpCmdLine; - + // Load strings for(i=0; i<STRING_COUNT; i++) LoadStringW(hInstance, i, Strings[i], MAX_STRING_LENGHT); // if you know a better method please tell me. Modified: trunk/rosapps/downloader/resources.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/resources.h?rev… ============================================================================== --- trunk/rosapps/downloader/resources.h (original) +++ trunk/rosapps/downloader/resources.h Wed May 16 22:05:03 2007 @@ -39,10 +39,9 @@ #define IDS_XMLERROR_1 14 #define IDS_XMLERROR_2 15 #define IDS_DOWNLOAD_ERROR 16 -#define IDS_UNZIP_ERROR 17 -#define IDS_VERSION 18 -#define IDS_LICENCE 19 -#define IDS_MAINTAINER 20 +#define IDS_VERSION 17 +#define IDS_LICENCE 18 +#define IDS_MAINTAINER 19 -#define STRING_COUNT 21 +#define STRING_COUNT 20 #define MAX_STRING_LENGHT 0x100 Removed: trunk/rosapps/downloader/script.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/script.c?rev=26… ============================================================================== --- trunk/rosapps/downloader/script.c (original) +++ trunk/rosapps/downloader/script.c (removed) @@ -1,246 +1,0 @@ -/* PROJECT: ReactOS Downloader - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/downloader/script.c - * PURPOSE: Run (un/)installscript - * PROGRAMMERS: Lester Kortenhoeven - */ - -#include <windows.h> - -#include "resources.h" -#include "structures.h" - -extern BOOL getUninstaller(struct Application*, WCHAR*); -extern INT_PTR CALLBACK DownloadProc (HWND, UINT, WPARAM, LPARAM); -extern WCHAR Strings [STRING_COUNT][MAX_STRING_LENGHT]; - -static void DownloadScriptFunc (WCHAR* URL, WCHAR* File) { - struct lParamDownload* lParam; - lParam = malloc(sizeof(struct lParamDownload)); - lParam->URL = URL; - lParam->File = File; - DialogBoxParamW(GetModuleHandle(NULL), MAKEINTRESOURCEW(IDD_DOWNLOAD), 0, DownloadProc, (LPARAM)lParam); - free(lParam); -} - -static void ExecScriptFunc(WCHAR* Arg) { - STARTUPINFOW si; - PROCESS_INFORMATION pi; - - memset(&si, 0, sizeof(si)); - si.cb=sizeof(si); - CreateProcessW(NULL,Arg,NULL,NULL,FALSE,0,NULL,NULL,&si,&pi); - CloseHandle(pi.hThread); - WaitForSingleObject(pi.hProcess, INFINITE); - CloseHandle(pi.hProcess); -} - - -static void DelScriptFunc(WCHAR* Arg) { - DeleteFileW(Arg); -} - -static BOOL UnzipScriptFunc(WCHAR* File, WCHAR* Outdir) { - HKEY hKey; - DWORD Type = 0; - WCHAR ExecStr[0x100]; - DWORD currentlengt = 0x100; - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,L"SOFTWARE\\7-Zip",0,KEY_READ,&hKey) == ERROR_SUCCESS) { - if (RegQueryValueExW(hKey,L"Path",0,&Type,(LPBYTE)ExecStr,&currentlengt) == ERROR_SUCCESS) { - if (File[0] != L'\0') { - wcsncat(ExecStr,L"\\7z.exe x ",0x100-currentlengt); - currentlengt = lstrlenW(ExecStr); - wcsncat(ExecStr,File,0x100-currentlengt); - currentlengt = lstrlenW(ExecStr); - wcsncat(ExecStr,L" -o",0x100-currentlengt); - currentlengt = lstrlenW(ExecStr); - wcsncat(ExecStr,Outdir,0x100-currentlengt); - ExecScriptFunc(ExecStr); - RegCloseKey(hKey); - } - return TRUE; - } - RegCloseKey(hKey); - } - MessageBoxW(0,Strings[IDS_UNZIP_ERROR],0,0); - return FALSE; -} - -static void AddUninstallerScriptFunc(WCHAR* RegName, WCHAR* File) { - HKEY hKey1; - HKEY hKey2; - LPDWORD dispos = NULL; - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall",0,KEY_WRITE,&hKey1) == ERROR_SUCCESS) - if (RegCreateKeyEx(hKey1,RegName,0,NULL,REG_OPTION_NON_VOLATILE,KEY_WRITE,NULL,&hKey2,dispos) == ERROR_SUCCESS) { - RegSetValueExW(hKey2,L"DisplayName",0,REG_SZ,(BYTE*)RegName,(lstrlen(RegName)+1)*sizeof(WCHAR)); - RegSetValueExW(hKey2,L"UninstallString",0,REG_SZ,(BYTE*)File,(lstrlen(File)+1)*sizeof(WCHAR)); - } - RegCloseKey(hKey2); - RegCloseKey(hKey1); -} - -static void RemoveUninstallerScriptFunc(WCHAR* RegName) { - HKEY hKey1; - HKEY hKey2; - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall",0,KEY_WRITE,&hKey1) == ERROR_SUCCESS) { - if (RegOpenKeyExW(hKey1,RegName,0,KEY_WRITE,&hKey2) == ERROR_SUCCESS) { - RegDeleteValueW(hKey2,L"DisplayName"); - RegDeleteValueW(hKey2,L"UninstallString"); - RegCloseKey(hKey2); - } - // RegDeleteKeyW(hKey1,RegName); - } - RegCloseKey(hKey1); -} - -static void MessageScriptFunc(WCHAR* Text) { - MessageBoxW(0,Text,Strings[IDS_WINDOW_TITLE],0); -} - -extern void LoadScriptFunc(WCHAR*, struct ScriptElement*); - -static void RunScript(struct Application* App, struct ScriptElement* Script) { - BOOL bRun = TRUE; - struct ScriptElement* p = Script; - INT SizeB = 0x100; - INT SizeA = sizeof(p->Arg)/sizeof(*(p->Arg)); - INT i; - int currentlengt = 0; - WCHAR ArgBuffer[SizeA][SizeB]; - WCHAR BufferA[SizeB]; - WCHAR BufferB[SizeB]; - WCHAR BufferC[SizeB]; - WCHAR* Pos1; - WCHAR* Pos2; - WCHAR* Pos3 = NULL; - BOOL bNext; - while(bRun && (p != NULL)) { - - for(i=0; i<SizeA; i++) { - bNext = TRUE; - wcscpy(BufferA, p->Arg[i]); - Pos1 = BufferA; - Pos2 = wcschr(Pos1, L'%'); - if(!Pos2) { - wcscpy(ArgBuffer[i], Pos1); - break; - } - Pos2[0] = L'\0'; - wcscpy(BufferB, Pos1); - Pos1 = Pos2 + 1; - Pos2 = wcschr(Pos1, L'%'); - while (Pos2) { - Pos2[0] = L'\0'; - if(bNext) { - if (wcscmp(Pos1, L"name") == 0) { - Pos3 = App->Name; - } else if (wcscmp(Pos1, L"regname") == 0) { - Pos3 = App->RegName; - } else if (wcscmp(Pos1, L"version") == 0) { - Pos3 = App->Version; - } else if (wcscmp(Pos1, L"maintainer") == 0) { - Pos3 = App->Maintainer; - } else if (wcscmp(Pos1, L"licence") == 0) { - Pos3 = App->Licence; - } else if (wcscmp(Pos1, L"description") == 0) { - Pos3 = App->Description; - } else if (wcscmp(Pos1, L"location") == 0) { - Pos3 = App->Location; - } else if (wcscmp(Pos1, L"regname_uninstaller") == 0) { - if (!getUninstaller(App, BufferC)) { - BufferC[0] = '\0'; - } - Pos3 = BufferC; - } else if (wcscmp(Pos1, L"location_file") == 0) { - Pos3 = wcsrchr(App->Location, L'/'); - if(Pos3 == NULL) { - BufferC[0] = '\0'; - Pos3 = BufferC; - } else { - Pos3++; - } - } else { - Pos3 = _wgetenv(Pos1); - } - bNext = !(Pos3); - if (bNext) { - Pos3 = Pos1; - currentlengt = lstrlenW(BufferB); - wcsncat(BufferB, L"%", SizeB-currentlengt); - } - } else { - Pos3 = Pos1; - bNext = TRUE; - } - currentlengt = lstrlenW(BufferB); - wcsncat(BufferB, Pos3, SizeB-currentlengt); - Pos1 = Pos2 + 1; - Pos2 = wcschr(Pos1, L'%'); - } - if (bNext) { - wcsncat(BufferB, L"%", SizeB-currentlengt); - } - currentlengt = lstrlenW(BufferB); - wcsncat(BufferB, Pos1, SizeB-currentlengt); - wcscpy(ArgBuffer[i], BufferB); - } - - if (wcscmp(p->Func, L"download") == 0) { - DownloadScriptFunc(ArgBuffer[0], ArgBuffer[1]); - } else if (wcscmp(p->Func, L"exec") == 0) { - ExecScriptFunc(ArgBuffer[0]); - } else if (wcscmp(p->Func, L"del") == 0) { - DelScriptFunc(ArgBuffer[0]); - } else if (wcscmp(p->Func, L"unzip") == 0) { - bRun = UnzipScriptFunc(ArgBuffer[0], ArgBuffer[1]); - } else if (wcscmp(p->Func, L"adduninstaller") == 0) { - AddUninstallerScriptFunc(ArgBuffer[0], ArgBuffer[1]); - } else if (wcscmp(p->Func, L"removeuninstaller") == 0) { - RemoveUninstallerScriptFunc(ArgBuffer[0]); - } else if (wcscmp(p->Func, L"message") == 0) { - MessageScriptFunc(ArgBuffer[0]); - } else if (wcscmp(p->Func, L"load") == 0) { - LoadScriptFunc(ArgBuffer[0],p); - } - p = p->Next; - } -} - -DWORD WINAPI InstallThreadFunc(LPVOID Context) { - struct Application* App = (struct Application*)Context; - - if(App->InstallScript == NULL){ - /* Default UninstallScript */ - struct ScriptElement* Current; - Current = malloc(sizeof(struct ScriptElement)); - App->InstallScript = Current; - memset(Current, 0, sizeof(struct ScriptElement)); - wcscpy(Current->Func, L"load"); - wcscpy(Current->Arg[0], L"script/default.install.xml"); - } - - RunScript(App, App->InstallScript); - - return 0; -} - - - -DWORD WINAPI UninstallThreadFunc(LPVOID Context){ - struct Application* App = (struct Application*)Context; - - if(App->UninstallScript == NULL){ - /* Default UninstallScript */ - struct ScriptElement* Current; - Current = malloc(sizeof(struct ScriptElement)); - App->UninstallScript = Current; - memset(Current, 0, sizeof(struct ScriptElement)); - wcscpy(Current->Func, L"load"); - wcscpy(Current->Arg[0], L"script/default.uninstall.xml"); - } - - RunScript(App, App->UninstallScript); - - return 0; -} - Modified: trunk/rosapps/downloader/structures.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/structures.h?re… ============================================================================== --- trunk/rosapps/downloader/structures.h (original) +++ trunk/rosapps/downloader/structures.h Wed May 16 22:05:03 2007 @@ -9,8 +9,6 @@ WCHAR Description[0x400]; WCHAR Location[0x100]; struct Application* Next; - struct ScriptElement* InstallScript; - struct ScriptElement* UninstallScript; }; struct Category @@ -24,17 +22,3 @@ struct Category* Children; struct Category* Parent; }; - -struct ScriptElement -{ - WCHAR Func[0x100]; - WCHAR Arg[2][0x100]; - struct ScriptElement* Next; -}; - -struct lParamDownload -{ - HWND Dlg; - WCHAR* URL; - WCHAR* File; -}; Modified: trunk/rosapps/downloader/translations/de.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/translations/de… ============================================================================== --- trunk/rosapps/downloader/translations/de.rc (original) +++ trunk/rosapps/downloader/translations/de.rc Wed May 16 22:05:03 2007 @@ -14,7 +14,7 @@ BEGIN IDS_WINDOW_TITLE "Download ! - ReactOS Downloader" IDS_WELCOME_TITLE "Willkommen im ReactOS Downloader" - IDS_WELCOME "Bitte wählen Sie links eine Kategorie. Dies ist Version 1.0." + IDS_WELCOME "Bitte wählen Sie rechts eine Kategorie. Dies ist Version 1.0." IDS_NO_APP_TITLE "Keine Anwendung ausgewählt" IDS_NO_APP "Bitte wählen Sie eine Anwendung, bevor Sie die Download-Schaltfläche betätigen. Wenn Sie Hilfe benötigen, drücken Sie die Hilfe-Schaltfläche in der oberen rechten Ecke." IDS_UPDATE_TITLE "Update" @@ -29,7 +29,6 @@ IDS_XMLERROR_1 "XML Datei nicht gefunden!" IDS_XMLERROR_2 "XML Datei kann nicht verarbeitet werden!" IDS_DOWNLOAD_ERROR "Die Datei konnte nicht runtergeladen werden.\nBitte prüfen sie, ob eine Verbindung zum Internet besteht." - IDS_UNZIP_ERROR "7-Zip nicht gefunden.\nBitte installieren Sie 7-Zip." IDS_VERSION "Version: " IDS_LICENCE "Lizenz: " IDS_MAINTAINER "Maintainer: " Modified: trunk/rosapps/downloader/translations/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/translations/en… ============================================================================== --- trunk/rosapps/downloader/translations/en.rc (original) +++ trunk/rosapps/downloader/translations/en.rc Wed May 16 22:05:03 2007 @@ -14,7 +14,7 @@ BEGIN IDS_WINDOW_TITLE "Download ! - ReactOS Downloader" IDS_WELCOME_TITLE "Welcome to the ReactOS Downloader" - IDS_WELCOME "Please choose a category on the left. This is version 1.0." + IDS_WELCOME "Please choose a category on the right. This is version 1.0." IDS_NO_APP_TITLE "No application selected" IDS_NO_APP "Please select a Application before you click the download button, if you need assistance please click on the question mark button on the top right corner." IDS_UPDATE_TITLE "Update" @@ -29,7 +29,6 @@ IDS_XMLERROR_1 "Could not find the xml file !" IDS_XMLERROR_2 "Could not parse the xml file !" IDS_DOWNLOAD_ERROR "Unable to download the file.\nPlease check you internet connection." - IDS_UNZIP_ERROR "7-Zip not found.\nPlease install 7-Zip" IDS_VERSION "Version: " IDS_LICENCE "Licence: " IDS_MAINTAINER "Maintainer: " Modified: trunk/rosapps/downloader/translations/fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/translations/fr… ============================================================================== --- trunk/rosapps/downloader/translations/fr.rc (original) +++ trunk/rosapps/downloader/translations/fr.rc Wed May 16 22:05:03 2007 @@ -29,7 +29,6 @@ IDS_XMLERROR_1 "Impossible de trouver le fichier xml !" IDS_XMLERROR_2 "Impossible d'analyser le fichier xml !" IDS_DOWNLOAD_ERROR "Impossible de télécharger le fichier.\nVeuillez vérifier votre connexion Internet." - IDS_UNZIP_ERROR "7-Zip not found.\nPlease install 7-Zip" IDS_VERSION "Version: " IDS_LICENCE "Licence: " IDS_MAINTAINER "Maintainer: " Modified: trunk/rosapps/downloader/translations/id.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/translations/id… ============================================================================== --- trunk/rosapps/downloader/translations/id.rc (original) +++ trunk/rosapps/downloader/translations/id.rc Wed May 16 22:05:03 2007 @@ -29,7 +29,6 @@ IDS_XMLERROR_1 "Tidak dapat menemukan file xml !" IDS_XMLERROR_2 "Tidak dapat mengurai file xml !" IDS_DOWNLOAD_ERROR "Tidak bisa mendownload file.\nSilahkan periksa koneksi internet anda." - IDS_UNZIP_ERROR "7-Zip not found.\nPlease install 7-Zip" IDS_VERSION "Versi: " IDS_LICENCE "Lisensi: " IDS_MAINTAINER "Pemelihara: " Modified: trunk/rosapps/downloader/translations/it.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/translations/it… ============================================================================== --- trunk/rosapps/downloader/translations/it.rc (original) +++ trunk/rosapps/downloader/translations/it.rc Wed May 16 22:05:03 2007 @@ -29,7 +29,6 @@ IDS_XMLERROR_1 "File xml non trovato !" IDS_XMLERROR_2 "Impossibile trattare il contenuto del file xml !" IDS_DOWNLOAD_ERROR "Download del file impossibile.\nVerifica la connessione a Internet." - IDS_UNZIP_ERROR "7-Zip not found.\nPlease install 7-Zip" IDS_VERSION "Version: " IDS_LICENCE "Licence: " IDS_MAINTAINER "Maintainer: " Modified: trunk/rosapps/downloader/xml.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/xml.c?rev=26807… ============================================================================== --- trunk/rosapps/downloader/xml.c (original) +++ trunk/rosapps/downloader/xml.c Wed May 16 22:05:03 2007 @@ -10,153 +10,20 @@ #include <stdio.h> #include <windows.h> #include <shlwapi.h> -#include <io.h> #include "structures.h" #include "resources.h" BOOL TagOpen; -BOOL InstallScriptOpen; -BOOL UninstallScriptOpen; struct Category* Current; struct Application* CurrentApplication; -struct ScriptElement* CurrentScript; -char DML_Name[0x100]; -char DML_Target[0x100]; -char Path [0x100]; char CurrentTag [0x100]; - extern WCHAR Strings [STRING_COUNT][MAX_STRING_LENGHT]; -BOOL ImportXML (const char*); - -void ImportFolder (const char* folder) -{ - WCHAR buffer[0x100]; - char buffer2[0x100]; - struct _wfinddata_t Finddata; - DWORD Findhandle; - buffer[0]='\0'; - strcpy(buffer2, Path); - strncat(buffer2, folder, 0x100-strlen(buffer2)); - strncat(buffer2, "\\*.dml", 0x100-strlen(buffer2)); - MultiByteToWideChar(CP_UTF8, 0, buffer2, -1, buffer, 0x100); - if((Findhandle=_wfindfirst(buffer, &Finddata)) == -1) - return; - do { - buffer[0]='\0'; - MultiByteToWideChar(CP_UTF8, 0, folder, -1, buffer, 0x100); - wcsncat(buffer, L"\\", 0x100-wcslen(buffer)); - wcsncat(buffer, Finddata.name, 0x100-wcslen(buffer)); - WideCharToMultiByte(CP_UTF8, 0, buffer, -1, buffer2, 0x100, NULL, FALSE); - ImportXML(buffer2); - } while(_wfindnext(Findhandle, &Finddata)==0); - _findclose(Findhandle); -} - - -void Script_tag_opened (void* usrdata, const char* tag, const char** arg) + +void tag_opened (void* usrdata, const char* tag, const char** arg) { int i; - if (!strcmp(tag, "script")) { - return; - } else if (InstallScriptOpen && (CurrentScript == NULL)) { - CurrentApplication->InstallScript = malloc(sizeof(struct ScriptElement)); - CurrentScript = CurrentApplication->InstallScript; - } else if (UninstallScriptOpen && (CurrentScript == NULL)) { - CurrentApplication->UninstallScript = malloc(sizeof(struct ScriptElement)); - CurrentScript = CurrentApplication->UninstallScript; - } else if (CurrentScript != NULL) { - CurrentScript->Next = malloc(sizeof(struct ScriptElement)); - CurrentScript = CurrentScript->Next; - } else { - return; - } - memset(CurrentScript, 0, sizeof(struct ScriptElement)); - if (!strcmp(tag, "download")) { - wcscpy(CurrentScript->Func, L"download"); - for (i=0; arg[i]; i+=2) { - if(!strcmp(arg[i], "file")) { - MultiByteToWideChar(CP_UTF8, 0, arg[i+1], -1, CurrentScript->Arg[1], 0x100); - } else if(!strcmp(arg[i], "url")) { - MultiByteToWideChar(CP_UTF8, 0, arg[i+1], -1, CurrentScript->Arg[0], 0x100); - } - } - } else if (!strcmp(tag, "exec")) { - wcscpy(CurrentScript->Func, L"exec"); - for (i=0; arg[i]; i+=2) { - if(!strcmp(arg[i], "file")) { - MultiByteToWideChar(CP_UTF8, 0, arg[i+1], -1, CurrentScript->Arg[0], 0x100); - } - } - } else if (!strcmp(tag, "del")) { - wcscpy(CurrentScript->Func, L"del"); - for (i=0; arg[i]; i+=2) { - if(!strcmp(arg[i], "file")) { - MultiByteToWideChar(CP_UTF8, 0, arg[i+1], -1, CurrentScript->Arg[0], 0x100); - } - } - } else if (!strcmp(tag, "unzip")) { - wcscpy(CurrentScript->Func, L"unzip"); - for (i=0; arg[i]; i+=2) { - if(!strcmp(arg[i], "file")) { - MultiByteToWideChar(CP_UTF8, 0, arg[i+1], -1, CurrentScript->Arg[0], 0x100); - } else if(!strcmp(arg[i], "outdir")) { - MultiByteToWideChar(CP_UTF8, 0, arg[i+1], -1, CurrentScript->Arg[1], 0x100); - } - } - } else if (!strcmp(tag, "adduninstaller")) { - wcscpy(CurrentScript->Func, L"adduninstaller"); - for (i=0; arg[i]; i+=2) { - if(!strcmp(arg[i], "regname")) { - MultiByteToWideChar(CP_UTF8, 0, arg[i+1], -1, CurrentScript->Arg[0], 0x100); - } else if(!strcmp(arg[i], "file")) { - MultiByteToWideChar(CP_UTF8, 0, arg[i+1], -1, CurrentScript->Arg[1], 0x100); - } - } - } else if (!strcmp(tag, "removeuninstaller")) { - wcscpy(CurrentScript->Func, L"removeuninstaller"); - for (i=0; arg[i]; i+=2) { - if(!strcmp(arg[i], "regname")) { - MultiByteToWideChar(CP_UTF8, 0, arg[i+1], -1, CurrentScript->Arg[0], 0x100); - } - } - } else if (!strcmp(tag, "message")) { - wcscpy(CurrentScript->Func, L"message"); - for (i=0; arg[i]; i+=2) { - if(!strcmp(arg[i], "text")) { - MultiByteToWideChar(CP_UTF8, 0, arg[i+1], -1, CurrentScript->Arg[0], 0x100); - } - } - } else if (!strcmp(tag, "load")) { - wcscpy(CurrentScript->Func, L"load"); - for (i=0; arg[i]; i+=2) { - if(!strcmp(arg[i], "file")) { - MultiByteToWideChar(CP_UTF8, 0, arg[i+1], -1, CurrentScript->Arg[0], 0x100); - } - } - } else - MessageBoxW(0,Strings[IDS_XMLERROR_2],0,0); -} - - -void tag_opened (void* usrdata, const char* tag, const char** arg) -{ - int i; - - if(!strcmp(tag, "import")) - { - for (i=0; arg[i]; i+=2) - { - if(!strcmp(arg[i], "file")) - { - ImportXML(arg[i+1]); - } - else if(!strcmp(arg[i], "folder")) - { - ImportFolder(arg[i+1]); - } - } - } - else if(!strcmp(tag, "tree") && !CurrentApplication) + + if(!strcmp(tag, "tree") && !CurrentApplication) { // check version } @@ -225,16 +92,7 @@ } else if (CurrentApplication) { - if (!strcmp(tag, "installscript")) { - InstallScriptOpen = TRUE; - } else if (!strcmp(tag, "uninstallscript")) { - UninstallScriptOpen = TRUE; - } else { - Script_tag_opened(usrdata, tag, arg); - if (CurrentScript == NULL) { - strncpy(CurrentTag, tag, 0x100); - } - } + strncpy(CurrentTag, tag, 0x100); } else MessageBoxW(0,Strings[IDS_XMLERROR_2],0,0); @@ -297,27 +155,30 @@ { CurrentApplication = NULL; } - else if(!strcmp(tag, "installscript") || !strcmp(tag, "uninstallscript")) - { - CurrentScript = NULL; - InstallScriptOpen = FALSE; - UninstallScriptOpen = FALSE; - } -} - -BOOL ImportXML (const char* filename) +} + +BOOL ProcessXML (const char* filename, struct Category* Root) { int done = 0; - char buffer[0x100]; + char buffer[255]; FILE* file; XML_Parser parser; - strcpy(buffer, Path); - strncat(buffer, filename, 0x100-strlen(buffer)); - file = fopen(buffer, "r"); + + if(Current) + return FALSE; + + Current = Root; + TagOpen = TRUE; + + file = fopen(filename, "r"); if(!file) { - MessageBoxW(0,Strings[IDS_XMLERROR_1],0,0); - return FALSE; + file = fopen("downloader.xml", "r"); + if(!file) + { + MessageBoxW(0,Strings[IDS_XMLERROR_1],0,0); + return FALSE; + } } parser = XML_ParserCreate(NULL); @@ -343,169 +204,10 @@ return TRUE; } -BOOL ProcessXML (const char* filename, struct Category* Root) -{ - FILE* file; - file = fopen(filename, "r"); - if(file) - { - Path[0]='\0'; - fclose(file); - } - else - { - strncpy(Path, getenv("SystemRoot"), 0x100-13); - strcat(Path, "\\packagetree\\"); - } - - if(Current) - return FALSE; - - Current = Root; - CurrentApplication = NULL; - CurrentScript = NULL; - TagOpen = TRUE; - InstallScriptOpen = FALSE; - UninstallScriptOpen = FALSE; - - return ImportXML(filename); -} - -void DML_tag_opened (void* usrdata, const char* tag, const char** arg) -{ - int i; - - if(!strcmp(tag, "application")) - { - for (i=0; arg[i]; i+=2) - { - if(!strcmp(arg[i], "name")) - { - strncpy(DML_Name, arg[i+1], 0x100); - } - else if(!strcmp(arg[i], "target")) - { - strncpy(DML_Target, arg[i+1], 0x100); - } - } - } -} - -void NOP_text (void* usrdata, const char* data, int len) -{ -} - -void NOP_tag_closed (void* tree, const char* tag) -{ -} - -char* addDML (const char* filename) -{ - int done = 0; - char buffer[0x100]; - FILE* file; - XML_Parser parser; - DML_Target[0] = '\0'; - file = fopen(filename, "r"); - if(!file) - { - MessageBoxW(0,Strings[IDS_XMLERROR_1],0,0); - return NULL; - } - - parser = XML_ParserCreate(NULL); - XML_SetElementHandler(parser, DML_tag_opened, NOP_tag_closed); - XML_SetCharacterDataHandler(parser, NOP_text); - - while (!done) - { - size_t len = fread (buffer, 1, sizeof(buffer), file); - done = len < sizeof(buffer); - - buffer[len] = 0; - if(!XML_Parse(parser, buffer, len, done)) - { - MessageBoxW(0,Strings[IDS_XMLERROR_2],0,0); - return NULL; - } - } - - XML_ParserFree(parser); - fclose(file); - - if(DML_Target[0]=='\0') - { - MessageBoxW(0,Strings[IDS_XMLERROR_2],0,0); - return NULL; - } - - strcpy(buffer, getenv("SystemRoot")); - strncat(buffer, "\\packagetree\\", 0x100-strlen(buffer)); - strncat(buffer, DML_Target, 0x100-strlen(buffer)); - - CopyFileA(filename, buffer, FALSE); - return DML_Name; -} - -void LoadScriptFunc(WCHAR* filenameW, struct ScriptElement* Script) -{ - int done = 0; - char buffer[0x100]; - char filenameA[0x100]; - FILE* file; - XML_Parser parser; - struct ScriptElement* NextElement = Script->Next; - wcscpy(Script->Func,L"NOP"); - CurrentScript = Script; - WideCharToMultiByte(CP_UTF8, 0, filenameW, -1, filenameA, 0x100, NULL, FALSE); - strcpy(buffer, Path); - strncat(buffer, filenameA, 0x100-strlen(buffer)); - file = fopen(buffer, "r"); - if(!file) - { - MessageBoxW(0,Strings[IDS_XMLERROR_1],0,0); - return; - } - - parser = XML_ParserCreate(NULL); - XML_SetElementHandler(parser, Script_tag_opened, NOP_tag_closed); - XML_SetCharacterDataHandler(parser, NOP_text); - - while (!done) - { - size_t len = fread (buffer, 1, sizeof(buffer), file); - done = len < sizeof(buffer); - - buffer[len] = 0; - if(!XML_Parse(parser, buffer, len, done)) - { - MessageBoxW(0,Strings[IDS_XMLERROR_2],0,0); - CurrentScript->Next = NextElement; - return; - } - } - - XML_ParserFree(parser); - fclose(file); - CurrentScript->Next = NextElement; - return; -} - -void FreeScript (struct ScriptElement* Script) -{ - if (Script->Next != NULL) - FreeScript(Script->Next); - free(Script); -} - void FreeApps (struct Application* Apps) { if (Apps->Next) FreeApps(Apps->Next); - if (Apps->InstallScript) - FreeScript(Apps->InstallScript); - if (Apps->UninstallScript) - FreeScript(Apps->UninstallScript); free(Apps); }

1 0

[dgorbachev] 26806: Fix WinSock mapping data.
by dgorbachev＠svn.reactos.org 16 May '07

16 May '07

Author: dgorbachev Date: Wed May 16 19:52:50 2007 New Revision: 26806 URL: http://svn.reactos.org/svn/reactos?rev=26806&view=rev Log: Fix WinSock mapping data. Modified: trunk/reactos/media/inf/nettcpip.inf Modified: trunk/reactos/media/inf/nettcpip.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/nettcpip.inf?rev… ============================================================================== --- trunk/reactos/media/inf/nettcpip.inf (original) +++ trunk/reactos/media/inf/nettcpip.inf Wed May 16 19:52:50 2007 @@ -51,7 +51,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","MaxSockAddrLength",0x00010001,0x00000010 HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","MinSockAddrLength",0x00010001,0x00000010 HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","HelperDllName",0x00000000,"%SystemRoot%\System32\wshtcpip.dll" -HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","Mapping",0x00000001,0c,00,00,00,03,00,00,00,02,00,00,00,01,00,00,00,06,00,00,00,02,00,00,00,01,00,00,00,00,00,00,00,02,00,00,00,00,00,00,00,06,00,00,00,00,00,00,00,00,00,00,00,06,00,00,00,00,00,00,00,01,00,00,00,06,00,00,00,02,00,00,00,02,00,00,00,11,00,00,00,02,00,00,00,02,00,00,00,00,00,00,00,02,00,00,00,00,00,00,00,11,00,00,00,00,00,00,00,00,00,00,00,11,00,00,00,00,00,00,00,02,00,00,00,11,00,00,00,02,00,00,00,03,00,00,00,00,00,00,00,02,00,00,00,03,00,00,00,01,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","Mapping",0x00000001,0c,00,00,00,03,00,00,00,02,00,00,00,01,00,00,00,06,00,00,00,02,00,00,00,01,00,00,00,00,00,00,00,02,00,00,00,00,00,00,00,06,00,00,00,00,00,00,00,00,00,00,00,06,00,00,00,00,00,00,00,01,00,00,00,06,00,00,00,02,00,00,00,02,00,00,00,11,00,00,00,02,00,00,00,02,00,00,00,00,00,00,00,02,00,00,00,00,00,00,00,11,00,00,00,00,00,00,00,00,00,00,00,11,00,00,00,00,00,00,00,02,00,00,00,11,00,00,00,02,00,00,00,03,00,00,00,00,00,00,00,02,00,00,00,03,00,00,00,01,00,00,00 HKLM,"SYSTEM\CurrentControlSet\Services\Winsock\Parameters","Transports",0x00010000,"Tcpip" ;-------------------------------- STRINGS -------------------------------

1 0

[dgorbachev] 26805: Do not divide by zero.
by dgorbachev＠svn.reactos.org 16 May '07

16 May '07

Author: dgorbachev Date: Wed May 16 19:52:27 2007 New Revision: 26805 URL: http://svn.reactos.org/svn/reactos?rev=26805&view=rev Log: Do not divide by zero. Modified: trunk/reactos/base/applications/network/ping/ping.c Modified: trunk/reactos/base/applications/network/ping/ping.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/ping.c (original) +++ trunk/reactos/base/applications/network/ping/ping.c Wed May 16 19:52:27 2007 @@ -606,7 +606,7 @@ } /* Calculate loss percent */ - Count = (LostCount * 100) / SentCount; + Count = SentCount ? (LostCount * 100) / SentCount : 0; if (!MinRTTSet) MinRTT = MaxRTT;

1 0

[dgorbachev] 26804: Polish translation update by Olaf Siejka. BugZilla report #2254.
by dgorbachev＠svn.reactos.org 16 May '07

16 May '07

Author: dgorbachev Date: Wed May 16 13:55:37 2007 New Revision: 26804 URL: http://svn.reactos.org/svn/reactos?rev=26804&view=rev Log: Polish translation update by Olaf Siejka. BugZilla report #2254. Modified: trunk/reactos/dll/cpl/access/lang/pl-PL.rc Modified: trunk/reactos/dll/cpl/access/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/pl-PL.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/access/lang/pl-PL.rc Wed May 16 13:55:37 2007 @@ -113,8 +113,8 @@ IDS_CPLSYSTEMNAME "U³atwienia dostêpu" IDS_CPLSYSTEMDESCRIPTION "Personalizuje funkcje u³atwieñ dostêpu na twoim komputerze." - IDS_SENTRY_NONE "[None]" - IDS_SENTRY_TITLE "Flash the titlebar" - IDS_SENTRY_WINDOW "Flash the active window" - IDS_SENTRY_DISPLAY "Flash the desktop" + IDS_SENTRY_NONE "[Brak]" + IDS_SENTRY_TITLE "Migaj¹cy pasek tytu³u" + IDS_SENTRY_WINDOW "Migaj¹ce okno aktywne" + IDS_SENTRY_DISPLAY "Migaj¹cy pulpit" END

1 0

[gedmurphy] 26803: a better winmine icon
by gedmurphy＠svn.reactos.org 15 May '07

15 May '07

Author: gedmurphy Date: Wed May 16 02:27:34 2007 New Revision: 26803 URL: http://svn.reactos.org/svn/reactos?rev=26803&view=rev Log: a better winmine icon Modified: trunk/reactos/base/applications/games/winemine/rc/winemine.ico Modified: trunk/reactos/base/applications/games/winemine/rc/winemine.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== Binary files - no diff available.

1 0

[gedmurphy] 26802: add a regedit icon, made for ReactOS by Taliesin Penfound (tpenfound at gmail!com)
by gedmurphy＠svn.reactos.org 15 May '07

15 May '07

Author: gedmurphy Date: Wed May 16 02:20:35 2007 New Revision: 26802 URL: http://svn.reactos.org/svn/reactos?rev=26802&view=rev Log: add a regedit icon, made for ReactOS by Taliesin Penfound (tpenfound at gmail!com) Modified: trunk/reactos/base/applications/regedit/res/regedit.ico Modified: trunk/reactos/base/applications/regedit/res/regedit.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== Binary files - no diff available.

1 0

[ekohl] 26801: Implement sound acessibility settings.
by ekohl＠svn.reactos.org 15 May '07

15 May '07

Author: ekohl Date: Wed May 16 01:59:14 2007 New Revision: 26801 URL: http://svn.reactos.org/svn/reactos?rev=26801&view=rev Log: Implement sound acessibility settings. Modified: trunk/reactos/dll/cpl/access/lang/cs-CZ.rc trunk/reactos/dll/cpl/access/lang/de-DE.rc trunk/reactos/dll/cpl/access/lang/en-US.rc trunk/reactos/dll/cpl/access/lang/es-ES.rc trunk/reactos/dll/cpl/access/lang/fr-FR.rc trunk/reactos/dll/cpl/access/lang/hu-HU.rc trunk/reactos/dll/cpl/access/lang/id-ID.rc trunk/reactos/dll/cpl/access/lang/it-IT.rc trunk/reactos/dll/cpl/access/lang/ja-JP.rc trunk/reactos/dll/cpl/access/lang/nl-NL.rc trunk/reactos/dll/cpl/access/lang/pl-PL.rc trunk/reactos/dll/cpl/access/lang/ru-RU.rc trunk/reactos/dll/cpl/access/resource.h trunk/reactos/dll/cpl/access/sound.c Modified: trunk/reactos/dll/cpl/access/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/cs-CZ.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/cpl/access/lang/cs-CZ.rc Wed May 16 01:59:14 2007 @@ -27,14 +27,15 @@ CAPTION "Zvuk" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Funkce Popis zvuku",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + GROUPBOX "Funkce Popis zvuku",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10)+PROPSHEETPADDING(1) LTEXT "Pouijte funkci Zobrazení zvuku, pokud chcete aby ReactOS vizuálnì upozoròoval na kadý zvuk vydaný systémem.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "&Pouívat funkci Popis zvuku",IDC_SENTRY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20),14 - PUSHBUTTON "&Nastavení",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + AUTOCHECKBOX "&Pouívat funkci Popis zvuku",IDC_SENTRY_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETPADDING(20),14 + LTEXT "User the following warning:", IDC_SENTRY_TEXT, PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + COMBOBOX IDC_SENTRY_COMBO, PROPSHEETPADDING(2), LABELLINE(9), PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - GROUPBOX "Funkce Zobrazení zvuku",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 - LTEXT "Pouijte Zobrazení zvuku, aby programy zobrazovaly textový popis zároveò se zvukem.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "Pouívat funkci &Zobrazení zvuku",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + GROUPBOX "Funkce Zobrazení zvuku",-1,PROPSHEETPADDING(1),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 + LTEXT "Pouijte Zobrazení zvuku, aby programy zobrazovaly textový popis zároveò se zvukem.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "Pouívat funkci &Zobrazení zvuku",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 END @@ -97,7 +98,7 @@ BEGIN GROUPBOX "Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Press the SHIFT-Key 5 times in order to activate the Sticky Keys feature.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 + AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -108,4 +109,9 @@ BEGIN IDS_CPLSYSTEMNAME "Monosti usnadnìní" IDS_CPLSYSTEMDESCRIPTION "Upraví monosti usnadnìní pro tento poèítaè." + + IDS_SENTRY_NONE "[None]" + IDS_SENTRY_TITLE "Flash the titlebar" + IDS_SENTRY_WINDOW "Flash the active window" + IDS_SENTRY_DISPLAY "Flash the desktop" END Modified: trunk/reactos/dll/cpl/access/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/de-DE.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/access/lang/de-DE.rc Wed May 16 01:59:14 2007 @@ -29,14 +29,16 @@ CAPTION "Sound" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Darstellungsoption",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "Benutzen Sie die Sounddarstellung, wenn ReactOS Sounds visuell darstellen soll.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "&Darstellungsoption aktivieren",IDC_SENTRY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15)+15,14 - PUSHBUTTON "&Einstellungen",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + GROUPBOX "Darstellungsoptionen",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10)+PROPSHEETPADDING(1) + LTEXT "Benutzen Sie die Sounddarstellung, wenn ReactOS Sounds visuell darstellen soll.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "&Darstellungsoption aktivieren",IDC_SENTRY_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETPADDING(15)+15,14 + LTEXT "Zu verwendende Warnsignale:", IDC_SENTRY_TEXT, PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + COMBOBOX IDC_SENTRY_COMBO, PROPSHEETPADDING(2), LABELLINE(9), PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - GROUPBOX "Sounddarstellung",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 - LTEXT "Benutzen Sie die Sounddarstellung, damit die Programme Sprachausgaben und Sounds schriftlich darstellen.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "&Sounddarstellung aktivieren",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + GROUPBOX "Sounddarstellung",-1,PROPSHEETPADDING(1),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+2 + LTEXT "Benutzen Sie die Sounddarstellung, damit die Programme Sprachausgaben und Sounds schriftlich darstellen.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "&Sounddarstellung aktivieren",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 END @@ -50,7 +52,6 @@ AUTOCHECKBOX "&Hohen Kontrast aktivieren",IDC_CONTRAST_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15)+5,14 PUSHBUTTON "&Einstellungen",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 END - IDD_PROPPAGEMOUSE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT @@ -99,7 +100,7 @@ BEGIN GROUPBOX "Tastenkombination",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Drücken Sie fünfmal die Umschalttaste um die Einrastfunktion zu aktivieren.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "Tastenkombination a&ktivieren",IDC_STICKY_ACTVATE,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(17)+4,14 + AUTOCHECKBOX "Tastenkombination a&ktivieren",IDC_STICKY_ACTVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(17)+4,14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Abbrechen", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -110,4 +111,9 @@ BEGIN IDS_CPLSYSTEMNAME "Bedienbarkeit" IDS_CPLSYSTEMDESCRIPTION "Stellen sie die Bedienbarkeitsfunktionen für ihren Computer ein." + + IDS_SENTRY_NONE "[Keine]" + IDS_SENTRY_TITLE "Aktive Titelleiste blinkt" + IDS_SENTRY_WINDOW "Aktives Fenster blinkt" + IDS_SENTRY_DISPLAY "Desktop blinkt" END Modified: trunk/reactos/dll/cpl/access/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/en-US.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/access/lang/en-US.rc Wed May 16 01:59:14 2007 @@ -27,14 +27,15 @@ CAPTION "Sound" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "SoundSentry",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + GROUPBOX "SoundSentry",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10)+PROPSHEETPADDING(1) LTEXT "Use SoundSentry if you want Reactos to generate visual warnings when your system makes a sound.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "Use &SoundSentry",IDC_SENTRY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14 - PUSHBUTTON "&Settings",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + AUTOCHECKBOX "Use &SoundSentry",IDC_SENTRY_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + LTEXT "User the following warning:", IDC_SENTRY_TEXT, PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + COMBOBOX IDC_SENTRY_COMBO, PROPSHEETPADDING(2), LABELLINE(9), PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - GROUPBOX "ShowSounds",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 - LTEXT "Use ShowSounds to tell your programs to display captions for the speech and sounds they make.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "Use S&howSounds",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + GROUPBOX "ShowSounds",-1,PROPSHEETPADDING(1),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 + LTEXT "Use ShowSounds to tell your programs to display captions for the speech and sounds they make.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "Use S&howSounds",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 END @@ -96,7 +97,7 @@ BEGIN GROUPBOX "Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Press the SHIFT-Key 5 times in order to activate the Sticky Keys feature.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 + AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -107,4 +108,9 @@ BEGIN IDS_CPLSYSTEMNAME "Accessibility" IDS_CPLSYSTEMDESCRIPTION "Customizes accessibility features for your computer." + + IDS_SENTRY_NONE "[None]" + IDS_SENTRY_TITLE "Flash the titlebar" + IDS_SENTRY_WINDOW "Flash the active window" + IDS_SENTRY_DISPLAY "Flash the desktop" END Modified: trunk/reactos/dll/cpl/access/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/es-ES.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/es-ES.rc (original) +++ trunk/reactos/dll/cpl/access/lang/es-ES.rc Wed May 16 01:59:14 2007 @@ -30,14 +30,15 @@ CAPTION "Sonidos" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Vigilante Auditivo",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + GROUPBOX "Vigilante Auditivo",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10)+PROPSHEETPADDING(1) LTEXT "Use el Vigilante Auditivo si desea que Reactos genere avisos visuales cuando sus systema haga un sonido.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "Usar Vigilante Auditivo",IDC_SENTRY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14 - PUSHBUTTON "Opcione&s",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + AUTOCHECKBOX "Usar Vigilante Auditivo",IDC_SENTRY_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + LTEXT "User the following warning:", IDC_SENTRY_TEXT, PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + COMBOBOX IDC_SENTRY_COMBO, PROPSHEETPADDING(2), LABELLINE(9), PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - GROUPBOX "Despliegue Sonidos",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 - LTEXT "Use el Despliegue de Sonidos para decirle a sus programas que enseñen texto por las voces y sonidos que utilizen.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "Usar Despliegue de Sonidos",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + GROUPBOX "Despliegue Sonidos",-1,PROPSHEETPADDING(1),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 + LTEXT "Use el Despliegue de Sonidos para decirle a sus programas que enseñen texto por las voces y sonidos que utilizen.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "Usar Despliegue de Sonidos",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 END @@ -100,7 +101,7 @@ BEGIN GROUPBOX "Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Press the SHIFT-Key 5 times in order to activate the Sticky Keys feature.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 + AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -111,4 +112,9 @@ BEGIN IDS_CPLSYSTEMNAME "Accessibilidad" IDS_CPLSYSTEMDESCRIPTION "Cambia las características de accesibilidad disponibles para su computadora." + + IDS_SENTRY_NONE "[None]" + IDS_SENTRY_TITLE "Flash the titlebar" + IDS_SENTRY_WINDOW "Flash the active window" + IDS_SENTRY_DISPLAY "Flash the desktop" END Modified: trunk/reactos/dll/cpl/access/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/fr-FR.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/access/lang/fr-FR.rc Wed May 16 01:59:14 2007 @@ -28,14 +28,15 @@ CAPTION "Son" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Sons visuels",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + GROUPBOX "Sons visuels",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10)+PROPSHEETPADDING(1) LTEXT "Utilisez les sons visuels si vous voulez que Reactos génère un avertissement visuel lorsque votre système émet un son.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "Utiliser les &sons visuels",IDC_SENTRY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14 - PUSHBUTTON "&Paramètres",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + AUTOCHECKBOX "Utiliser les &sons visuels",IDC_SENTRY_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + LTEXT "User the following warning:", IDC_SENTRY_TEXT, PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + COMBOBOX IDC_SENTRY_COMBO, PROPSHEETPADDING(2), LABELLINE(9), PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - GROUPBOX "Sons texte",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 - LTEXT "Utilisez les sons texte pour que vos programmes affichent le texte des paroles et des sons qu'il génèrent.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "Utiliser les sons &texte",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + GROUPBOX "Sons texte",-1,PROPSHEETPADDING(1),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 + LTEXT "Utilisez les sons texte pour que vos programmes affichent le texte des paroles et des sons qu'il génèrent.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "Utiliser les sons &texte",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 END @@ -98,7 +99,7 @@ BEGIN GROUPBOX "Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Press the SHIFT-Key 5 times in order to activate the Sticky Keys feature.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 + AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -109,4 +110,9 @@ BEGIN IDS_CPLSYSTEMNAME "Accessibilité" IDS_CPLSYSTEMDESCRIPTION "Adapte les fonctionnalités d'accessibilité pour votre ordinateur." + + IDS_SENTRY_NONE "[None]" + IDS_SENTRY_TITLE "Flash the titlebar" + IDS_SENTRY_WINDOW "Flash the active window" + IDS_SENTRY_DISPLAY "Flash the desktop" END Modified: trunk/reactos/dll/cpl/access/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/hu-HU.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/hu-HU.rc (original) +++ trunk/reactos/dll/cpl/access/lang/hu-HU.rc Wed May 16 01:59:14 2007 @@ -28,14 +28,15 @@ CAPTION "Hang" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "HangFigyelõ",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + GROUPBOX "HangFigyelõ",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10)+PROPSHEETPADDING(1) LTEXT "Ezt a funkciót akkor használja, ha szeretné, hogy a Reactos látható figyelmeztetéseket küldjön olyankor, amikor a rendszer hangjelzést ad.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "&HangFigyelõ használata",IDC_SENTRY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14 - PUSHBUTTON "&Beállítások",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(8),14 + AUTOCHECKBOX "&HangFigyelõ használata",IDC_SENTRY_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + LTEXT "User the following warning:", IDC_SENTRY_TEXT, PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + COMBOBOX IDC_SENTRY_COMBO, PROPSHEETPADDING(2), LABELLINE(9), PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - GROUPBOX "HangFeliratok",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 - LTEXT "Ezzel a funkcióval adhatja meg programjainak, hogy a hangokhoz jelenítsenek meg feliratokat is.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "Hang&Feliratok használata",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + GROUPBOX "HangFeliratok",-1,PROPSHEETPADDING(1),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 + LTEXT "Ezzel a funkcióval adhatja meg programjainak, hogy a hangokhoz jelenítsenek meg feliratokat is.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "Hang&Feliratok használata",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 END @@ -98,7 +99,7 @@ BEGIN GROUPBOX "Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Press the SHIFT-Key 5 times in order to activate the Sticky Keys feature.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 + AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -109,4 +110,9 @@ BEGIN IDS_CPLSYSTEMNAME "Kisegítõ lehetõségek" IDS_CPLSYSTEMDESCRIPTION "A kisegítõ lehetõségek testreszabása a számítógépén." + + IDS_SENTRY_NONE "[None]" + IDS_SENTRY_TITLE "Flash the titlebar" + IDS_SENTRY_WINDOW "Flash the active window" + IDS_SENTRY_DISPLAY "Flash the desktop" END Modified: trunk/reactos/dll/cpl/access/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/id-ID.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/id-ID.rc (original) +++ trunk/reactos/dll/cpl/access/lang/id-ID.rc Wed May 16 01:59:14 2007 @@ -29,14 +29,15 @@ CAPTION "Suara" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "SoundSentry",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + GROUPBOX "SoundSentry",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10)+PROPSHEETPADDING(1) LTEXT "Gunakan SoundSentry jika anda ingin Reactos untuk membuat peringatan visual ketika sistem anda membuat suara.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "Gunakan &SoundSentry",IDC_SENTRY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14 - PUSHBUTTON "&Setelan",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + AUTOCHECKBOX "Gunakan &SoundSentry",IDC_SENTRY_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + LTEXT "User the following warning:", IDC_SENTRY_TEXT, PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + COMBOBOX IDC_SENTRY_COMBO, PROPSHEETPADDING(2), LABELLINE(9), PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - GROUPBOX "ShowSounds",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 - LTEXT "Gunakan ShowSounds untuk memberitahu program anda untuk menampilkan judul untuk speech dan suara yang dibuatnya.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "Gunakan S&howSounds",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + GROUPBOX "ShowSounds",-1,PROPSHEETPADDING(1),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 + LTEXT "Gunakan ShowSounds untuk memberitahu program anda untuk menampilkan judul untuk speech dan suara yang dibuatnya.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "Gunakan S&howSounds",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 END @@ -99,7 +100,7 @@ BEGIN GROUPBOX "Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Press the SHIFT-Key 5 times in order to activate the Sticky Keys feature.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 + AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -110,4 +111,9 @@ BEGIN IDS_CPLSYSTEMNAME "Aksesibilitas" IDS_CPLSYSTEMDESCRIPTION "Mengkustomisasi fitur aksesibilitas untuk komputer anda." + + IDS_SENTRY_NONE "[None]" + IDS_SENTRY_TITLE "Flash the titlebar" + IDS_SENTRY_WINDOW "Flash the active window" + IDS_SENTRY_DISPLAY "Flash the desktop" END Modified: trunk/reactos/dll/cpl/access/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/it-IT.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/access/lang/it-IT.rc Wed May 16 01:59:14 2007 @@ -27,14 +27,15 @@ CAPTION "Suoni" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Visuale",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + GROUPBOX "Visuale",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10)+PROPSHEETPADDING(1) LTEXT "Usa questa opzione se vuoi una segnalazione visiva in corrispondenza delle segnalazioni acustiche.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "Use &Visuale",IDC_SENTRY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14 - PUSHBUTTON "&Impostazioni",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + AUTOCHECKBOX "Use &Visuale",IDC_SENTRY_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + LTEXT "User the following warning:", IDC_SENTRY_TEXT, PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + COMBOBOX IDC_SENTRY_COMBO, PROPSHEETPADDING(2), LABELLINE(9), PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - GROUPBOX "Titoli",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 - LTEXT "Usa Titoli per informare i programmi che devono mostrare del testo corrispondente a suoni e parlato.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "Usa &Titoli",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + GROUPBOX "Titoli",-1,PROPSHEETPADDING(1),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 + LTEXT "Usa Titoli per informare i programmi che devono mostrare del testo corrispondente a suoni e parlato.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "Usa &Titoli",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 END @@ -97,7 +98,7 @@ BEGIN GROUPBOX "Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Press the SHIFT-Key 5 times in order to activate the Sticky Keys feature.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 + AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -108,4 +109,9 @@ BEGIN IDS_CPLSYSTEMNAME "Accessibility" IDS_CPLSYSTEMDESCRIPTION "Customizes accessibility features for your computer." + + IDS_SENTRY_NONE "[None]" + IDS_SENTRY_TITLE "Flash the titlebar" + IDS_SENTRY_WINDOW "Flash the active window" + IDS_SENTRY_DISPLAY "Flash the desktop" END Modified: trunk/reactos/dll/cpl/access/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/ja-JP.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/ja-JP.rc (original) +++ trunk/reactos/dll/cpl/access/lang/ja-JP.rc Wed May 16 01:59:14 2007 @@ -27,14 +27,15 @@ CAPTION "TEh" FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN - GROUPBOX "TEhÊm",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + GROUPBOX "TEhÊm",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10)+PROPSHEETPADDING(1) LTEXT "VXeª¹ðÂç·Æ«AoIÉÊmðoµÜ·B",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "TEhÊmðg¤(&S)",IDC_SENTRY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14 - PUSHBUTTON "Ýè(&S)",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + AUTOCHECKBOX "TEhÊmðg¤(&S)",IDC_SENTRY_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + LTEXT "User the following warning:", IDC_SENTRY_TEXT, PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + COMBOBOX IDC_SENTRY_COMBO, PROPSHEETPADDING(2), LABELLINE(9), PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - GROUPBOX "TEhðà",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 - LTEXT "vOª¹ðÂç·Æ«AÂç·¹ÉÂ¢Äðàð\\¦µÜ·B",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "TEhðà(&H)",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + GROUPBOX "TEhðà",-1,PROPSHEETPADDING(1),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 + LTEXT "vOª¹ðÂç·Æ«AÂç·¹ÉÂ¢Äðàð\\¦µÜ·B",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "TEhðà(&H)",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 END @@ -97,7 +98,7 @@ BEGIN GROUPBOX "Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Press the SHIFT-Key 5 times in order to activate the Sticky Keys feature.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 + AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -108,4 +109,9 @@ BEGIN IDS_CPLSYSTEMNAME "[U[â" IDS_CPLSYSTEMDESCRIPTION "oA®oAlÌóÔÉí¹ÄA[U[ðâ·é@\\ð²®µÜ·B" + + IDS_SENTRY_NONE "[None]" + IDS_SENTRY_TITLE "Flash the titlebar" + IDS_SENTRY_WINDOW "Flash the active window" + IDS_SENTRY_DISPLAY "Flash the desktop" END Modified: trunk/reactos/dll/cpl/access/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/nl-NL.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/nl-NL.rc (original) +++ trunk/reactos/dll/cpl/access/lang/nl-NL.rc Wed May 16 01:59:14 2007 @@ -29,14 +29,15 @@ CAPTION "Geluid" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Geluidswaarschuwingen",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + GROUPBOX "Geluidswaarschuwingen",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10)+PROPSHEETPADDING(1) LTEXT "U kunt Geluidswaarschuwingen gebruiken als u wilt dat Reactos visuele visuele waarschuwingen weergeeft wanneer het systeem een geluid laat horen.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "&Geluidswaarschuwingen gebruiken",IDC_SENTRY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14 - PUSHBUTTON "Inst&ellingen...",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + AUTOCHECKBOX "&Geluidswaarschuwingen gebruiken",IDC_SENTRY_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + LTEXT "User the following warning:", IDC_SENTRY_TEXT, PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + COMBOBOX IDC_SENTRY_COMBO, PROPSHEETPADDING(2), LABELLINE(9), PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - GROUPBOX "Geluidsbeschrijving",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 - LTEXT "U kunt geluidsbeschrijving gebruiken als u uw programma's bijschriften wilt laten weergeven voor spraak en andere geluiden.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "Geluids&beschrijving gebruiken",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + GROUPBOX "Geluidsbeschrijving",-1,PROPSHEETPADDING(1),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 + LTEXT "U kunt geluidsbeschrijving gebruiken als u uw programma's bijschriften wilt laten weergeven voor spraak en andere geluiden.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "Geluids&beschrijving gebruiken",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 END @@ -99,7 +100,7 @@ BEGIN GROUPBOX "Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Press the SHIFT-Key 5 times in order to activate the Sticky Keys feature.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 + AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -110,4 +111,9 @@ BEGIN IDS_CPLSYSTEMNAME "Toegankelijkheidsopties" IDS_CPLSYSTEMDESCRIPTION "Toehangelijkheidsopties voor deze computer aanpassen." + + IDS_SENTRY_NONE "[None]" + IDS_SENTRY_TITLE "Flash the titlebar" + IDS_SENTRY_WINDOW "Flash the active window" + IDS_SENTRY_DISPLAY "Flash the desktop" END Modified: trunk/reactos/dll/cpl/access/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/pl-PL.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/access/lang/pl-PL.rc Wed May 16 01:59:14 2007 @@ -30,14 +30,15 @@ CAPTION "Dwiêk" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Wartownik Dwiêku",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + GROUPBOX "Wartownik Dwiêku",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10)+PROPSHEETPADDING(1) LTEXT "U¿yj funkcji Wartownik Dwiêku jeli chcesz, ¿eby ReactOS pokazywa³ wizualne ostrze¿enia w chwili generacji dwiêku.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "U¿yj funkcji &Wartownik Dwiêku",IDC_SENTRY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14 - PUSHBUTTON "&Ustawienia",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + AUTOCHECKBOX "U¿yj funkcji &Wartownik Dwiêku",IDC_SENTRY_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + LTEXT "User the following warning:", IDC_SENTRY_TEXT, PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + COMBOBOX IDC_SENTRY_COMBO, PROPSHEETPADDING(2), LABELLINE(9), PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - GROUPBOX "Poka¿ Dwiêki",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 - LTEXT "U¿yj funkcji Poka¿ Dwiêki, aby nakazaæ swoim programom wywietlanie napisów w chwili generacji dwiêku lub mowy.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "U¿yj funkcji &Poka Dwiêki",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + GROUPBOX "Poka¿ Dwiêki",-1,PROPSHEETPADDING(1),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 + LTEXT "U¿yj funkcji Poka¿ Dwiêki, aby nakazaæ swoim programom wywietlanie napisów w chwili generacji dwiêku lub mowy.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "U¿yj funkcji &Poka Dwiêki",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 END @@ -100,7 +101,7 @@ BEGIN GROUPBOX "Klawisze",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Nacinij klawisz SHIFT 5 razy by aktywowaæ funkcjê KlawiszeTrwa³e.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "A&ktywuj Klawisze Trwa³e",IDC_STICKY_ACTVATE,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 + AUTOCHECKBOX "A&ktywuj Klawisze Trwa³e",IDC_STICKY_ACTVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Anuluj", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -111,4 +112,9 @@ BEGIN IDS_CPLSYSTEMNAME "U³atwienia dostêpu" IDS_CPLSYSTEMDESCRIPTION "Personalizuje funkcje u³atwieñ dostêpu na twoim komputerze." + + IDS_SENTRY_NONE "[None]" + IDS_SENTRY_TITLE "Flash the titlebar" + IDS_SENTRY_WINDOW "Flash the active window" + IDS_SENTRY_DISPLAY "Flash the desktop" END Modified: trunk/reactos/dll/cpl/access/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/ru-RU.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/access/lang/ru-RU.rc Wed May 16 01:59:14 2007 @@ -27,14 +27,15 @@ CAPTION "Çâóê" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Âèçóàëüíîå îïîâåùåíèå",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + GROUPBOX "Âèçóàëüíîå îïîâåùåíèå",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10)+PROPSHEETPADDING(1) LTEXT "Ñîïðîâîæäåíèå çâóêîâûõ ñèãíàëîâ âèçóàëüíûì îïîâåùåíèåì.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "Â&èçóàëüíîå îïîâåùåíèå",IDC_SENTRY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14 - PUSHBUTTON "&Íàñòðîéêà",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + AUTOCHECKBOX "Â&èçóàëüíîå îïîâåùåíèå",IDC_SENTRY_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + LTEXT "User the following warning:", IDC_SENTRY_TEXT, PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + COMBOBOX IDC_SENTRY_COMBO, PROPSHEETPADDING(2), LABELLINE(9), PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - GROUPBOX "Ñóáòèòðû",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 - LTEXT "Ñîïðîâîæäåíèå çâóêîâ è ðå÷è ñóáòèòðàìè.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "Ñ&óáòèòðû",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + GROUPBOX "Ñóáòèòðû",-1,PROPSHEETPADDING(1),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 + LTEXT "Ñîïðîâîæäåíèå çâóêîâ è ðå÷è ñóáòèòðàìè.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "Ñ&óáòèòðû",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 END @@ -97,7 +98,7 @@ BEGIN GROUPBOX "Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Press the SHIFT-Key 5 times in order to activate the Sticky Keys feature.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 + AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 @@ -108,4 +109,9 @@ BEGIN IDS_CPLSYSTEMNAME "Ñïåöèàëüíûå âîçìîæíîñòè" IDS_CPLSYSTEMDESCRIPTION "Íàñòðîéêà ñïåöèàëüíûõ âîçìîæíîñòåé Âàøåãî êîìïüþòåðà." + + IDS_SENTRY_NONE "[None]" + IDS_SENTRY_TITLE "Flash the titlebar" + IDS_SENTRY_WINDOW "Flash the active window" + IDS_SENTRY_DISPLAY "Flash the desktop" END Modified: trunk/reactos/dll/cpl/access/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/resource.h?… ============================================================================== --- trunk/reactos/dll/cpl/access/resource.h (original) +++ trunk/reactos/dll/cpl/access/resource.h Wed May 16 01:59:14 2007 @@ -25,6 +25,12 @@ #define IDS_CPLSYSTEMNAME 1001 #define IDS_CPLSYSTEMDESCRIPTION 2001 +#define IDS_SENTRY_NONE 1501 +#define IDS_SENTRY_TITLE 1502 +#define IDS_SENTRY_WINDOW 1503 +#define IDS_SENTRY_DISPLAY 1504 + + /* controls */ #define IDC_STICKY_BOX 200 #define IDC_STICKY_BUTTON 201 @@ -32,23 +38,30 @@ #define IDC_FILTER_BUTTON 203 #define IDC_TOGGLE_BOX 204 #define IDC_TOGGLE_BUTTON 205 + #define IDC_SENTRY_BOX 206 -#define IDC_SENTRY_BUTTON 207 -#define IDC_SSHOW_BOX 208 -#define IDC_CONTRAST_BOX 209 -#define IDC_CONTRAST_BUTTON 210 -#define IDC_MOUSE_BOX 211 -#define IDC_MOUSE_BUTTON 212 -#define IDC_RESET_BOX 213 -#define IDC_RESET_COMBO 214 -#define IDC_NOTIFICATION_MESSAGE 215 -#define IDC_NOTIFICATION_SOUND 216 -#define IDC_SERIAL_BOX 217 -#define IDC_SERIAL_BUTTON 218 -#define IDC_ADMIN_LOGON_BOX 219 -#define IDC_ADMIN_USERS_BOX 220 +#define IDC_SENTRY_TEXT 207 +#define IDC_SENTRY_COMBO 208 +#define IDC_SSHOW_BOX 209 -#define IDC_STICKY_ACTVATE 221 +#define IDC_CONTRAST_BOX 211 +#define IDC_CONTRAST_BUTTON 212 +#define IDC_MOUSE_BOX 213 +#define IDC_MOUSE_BUTTON 214 +#define IDC_RESET_BOX 215 +#define IDC_RESET_COMBO 216 +#define IDC_NOTIFICATION_MESSAGE 217 +#define IDC_NOTIFICATION_SOUND 218 +#define IDC_SERIAL_BOX 219 +#define IDC_SERIAL_BUTTON 220 +#define IDC_ADMIN_LOGON_BOX 221 +#define IDC_ADMIN_USERS_BOX 222 + +#define IDC_STICKY_ACTVATE_CHECK 221 +#define IDC_STICKY_LOCK_CHECK 222 +#define IDC_STICKY_UNLOCK_CHECK 223 +#define IDC_STICKY_SIGNAL_CHECK 224 +#define IDC_STICKY_STATUS_CHECK 225 #endif /* __CPL_RESOURCE_H */ Modified: trunk/reactos/dll/cpl/access/sound.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/sound.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/access/sound.c (original) +++ trunk/reactos/dll/cpl/access/sound.c Wed May 16 01:59:14 2007 @@ -2,16 +2,78 @@ * * PROJECT: ReactOS System Control Panel * LICENSE: GPL - See COPYING in the top level directory - * FILE: lib/cpl/system/advanced.c - * PURPOSE: Memory, start-up and profiles settings + * FILE: dll/cpl/access/sound.c + * PURPOSE: Sound-related acessibility settings * COPYRIGHT: Copyright 2004 Johannes Anderwald (j_anderw(a)sbox.tugraz.at) - * UPDATE HISTORY: - * 03-04-2004 Created + * Copyright 2007 Eric Kohl */ #include <windows.h> +#include <commctrl.h> +#include <prsht.h> #include <stdlib.h> #include "resource.h" #include "access.h" + + +typedef struct _SOUNDDATA +{ + SOUNDSENTRY ssSoundSentry; + BOOL bShowSounds; +} SOUNDDATA, *PSOUNDDATA; + + +static VOID +OnInitDialog(HWND hwndDlg, PSOUNDDATA pSoundData) +{ + TCHAR szBuffer[256]; + UINT i; + + pSoundData->ssSoundSentry.cbSize = sizeof(SOUNDSENTRY); + SystemParametersInfo(SPI_GETSOUNDSENTRY, + sizeof(SOUNDSENTRY), + &pSoundData->ssSoundSentry, + 0); + + SystemParametersInfo(SPI_GETSHOWSOUNDS, + 0, + &pSoundData->bShowSounds, + 0); + + /* Add strings to the combo-box */ + for (i = 0; i < 4; i++) + { + LoadString(hApplet, IDS_SENTRY_NONE + i, szBuffer, 256); + SendDlgItemMessage(hwndDlg, IDC_SENTRY_COMBO, CB_ADDSTRING, 0, (LPARAM)szBuffer); + } + + /* Select a combo-box item */ + SendDlgItemMessage(hwndDlg, IDC_SENTRY_COMBO, CB_SETCURSEL, pSoundData->ssSoundSentry.iWindowsEffect, 0); + + /* Initialize SoundSentry settings */ + if (!(pSoundData->ssSoundSentry.dwFlags & SSF_AVAILABLE)) + { + EnableWindow(GetDlgItem(hwndDlg, IDC_SENTRY_BOX), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_SENTRY_TEXT), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_SENTRY_COMBO), FALSE); + } + else + { + if (pSoundData->ssSoundSentry.dwFlags & SSF_SOUNDSENTRYON) + { + CheckDlgButton(hwndDlg, IDC_SENTRY_BOX, BST_CHECKED); + } + else + { + EnableWindow(GetDlgItem(hwndDlg, IDC_SENTRY_TEXT), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_SENTRY_COMBO), FALSE); + } + } + + /* Initialize ShowSounds settings */ + if (pSoundData->bShowSounds) + CheckDlgButton(hwndDlg, IDC_SSHOW_BOX, BST_CHECKED); +} + /* Property page dialog callback */ INT_PTR CALLBACK @@ -20,29 +82,70 @@ WPARAM wParam, LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(hwndDlg); + PSOUNDDATA pSoundData; + + pSoundData = (PSOUNDDATA)GetWindowLongPtr(hwndDlg, DWLP_USER); switch (uMsg) { case WM_INITDIALOG: + pSoundData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SOUNDDATA)); + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pSoundData); + + OnInitDialog(hwndDlg, pSoundData); break; + case WM_COMMAND: switch (LOWORD(wParam)) { case IDC_SENTRY_BOX: + pSoundData->ssSoundSentry.dwFlags ^= SSF_SOUNDSENTRYON; + EnableWindow(GetDlgItem(hwndDlg, IDC_SENTRY_TEXT), (pSoundData->ssSoundSentry.dwFlags & SSF_SOUNDSENTRYON)?TRUE:FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_SENTRY_COMBO), (pSoundData->ssSoundSentry.dwFlags & SSF_SOUNDSENTRYON)?TRUE:FALSE); + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; - case IDC_SENTRY_BUTTON: + case IDC_SENTRY_COMBO: + if (HIWORD(wParam) == CBN_SELENDOK) + { + pSoundData->ssSoundSentry.iWindowsEffect = + (DWORD)SendMessage((HWND)lParam, CB_GETCURSEL, 0, 0); + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } break; case IDC_SSHOW_BOX: + pSoundData->bShowSounds = !pSoundData->bShowSounds; + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; default: break; } break; + + case WM_NOTIFY: + switch (((LPNMHDR)lParam)->code) + { + case PSN_APPLY: + SystemParametersInfo(SPI_SETSOUNDSENTRY, + sizeof(SOUNDSENTRY), + &pSoundData->ssSoundSentry, + SPIF_UPDATEINIFILE | SPIF_SENDCHANGE); + SystemParametersInfo(SPI_SETSHOWSOUNDS, + pSoundData->bShowSounds, + 0, + SPIF_UPDATEINIFILE | SPIF_SENDCHANGE); + return TRUE; + + default: + break; + } + break; + + case WM_DESTROY: + HeapFree(GetProcessHeap(), 0, pSoundData); + break; } return FALSE;

1 0

[gedmurphy] 26800: a couple of simple aesthetic changes
by gedmurphy＠svn.reactos.org 15 May '07

15 May '07

Author: gedmurphy Date: Wed May 16 01:37:55 2007 New Revision: 26800 URL: http://svn.reactos.org/svn/reactos?rev=26800&view=rev Log: a couple of simple aesthetic changes Modified: trunk/tools/RosTE/GUI/MainForm.Designer.cs trunk/tools/RosTE/GUI/MainForm.cs trunk/tools/RosTE/GUI/MainForm.resx trunk/tools/RosTE/GUI/Resources/snapshot.png Modified: trunk/tools/RosTE/GUI/MainForm.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainForm.Designer.… ============================================================================== --- trunk/tools/RosTE/GUI/MainForm.Designer.cs (original) +++ trunk/tools/RosTE/GUI/MainForm.Designer.cs Wed May 16 01:37:55 2007 @@ -25,7 +25,7 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.ListViewItem listViewItem2 = new System.Windows.Forms.ListViewItem("ReactOS", 0); + System.Windows.Forms.ListViewItem listViewItem1 = new System.Windows.Forms.ListViewItem("ReactOS", 0); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm)); this.ImageListView = new System.Windows.Forms.ListView(); this.columnName = new System.Windows.Forms.ColumnHeader(); @@ -45,18 +45,22 @@ this.toolbarImageDel = new System.Windows.Forms.ToolStripButton(); this.toolbarSep2 = new System.Windows.Forms.ToolStripSeparator(); this.toolbarHelpContents = new System.Windows.Forms.ToolStripButton(); - this.toolbarSep3 = new System.Windows.Forms.ToolStripSeparator(); + this.toolbarSep4 = new System.Windows.Forms.ToolStripSeparator(); this.toolbarExit = new System.Windows.Forms.ToolStripButton(); this.mainToolbar = new System.Windows.Forms.ToolStrip(); - this.MainMenu = new System.Windows.Forms.MenuStrip(); + this.toolbarSnapShot = new System.Windows.Forms.ToolStripButton(); + this.toolbarScreenShot = new System.Windows.Forms.ToolStripButton(); + this.toolbarSep3 = new System.Windows.Forms.ToolStripSeparator(); + this.mainMenu = new System.Windows.Forms.MenuStrip(); this.mainmenuFile = new System.Windows.Forms.ToolStripMenuItem(); this.mainmenuFileExit = new System.Windows.Forms.ToolStripMenuItem(); + this.mainmenuOptions = new System.Windows.Forms.ToolStripMenuItem(); this.mainmenuHelp = new System.Windows.Forms.ToolStripMenuItem(); this.mainmenuHelpContent = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.MainMenuHelpAbout = new System.Windows.Forms.ToolStripMenuItem(); this.mainToolbar.SuspendLayout(); - this.MainMenu.SuspendLayout(); + this.mainMenu.SuspendLayout(); this.SuspendLayout(); // // ImageListView @@ -71,7 +75,7 @@ this.columnDebug}); this.ImageListView.FullRowSelect = true; this.ImageListView.Items.AddRange(new System.Windows.Forms.ListViewItem[] { - listViewItem2}); + listViewItem1}); this.ImageListView.Location = new System.Drawing.Point(12, 52); this.ImageListView.Name = "ImageListView"; this.ImageListView.Size = new System.Drawing.Size(516, 237); @@ -130,6 +134,7 @@ this.toolbarLaunch.Name = "toolbarLaunch"; this.toolbarLaunch.Size = new System.Drawing.Size(61, 22); this.toolbarLaunch.Text = "Launch"; + this.toolbarLaunch.ToolTipText = "Starts the virtual machine"; // // toolbarStop // @@ -138,6 +143,7 @@ this.toolbarStop.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolbarStop.Name = "toolbarStop"; this.toolbarStop.Size = new System.Drawing.Size(23, 22); + this.toolbarStop.ToolTipText = "Stops the virtual machine"; // // toolbarSep1 // @@ -151,6 +157,7 @@ this.toolbarImageAdd.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolbarImageAdd.Name = "toolbarImageAdd"; this.toolbarImageAdd.Size = new System.Drawing.Size(23, 22); + this.toolbarImageAdd.ToolTipText = "Adds a new image"; // // toolbarImageDel // @@ -159,6 +166,7 @@ this.toolbarImageDel.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolbarImageDel.Name = "toolbarImageDel"; this.toolbarImageDel.Size = new System.Drawing.Size(23, 22); + this.toolbarImageDel.ToolTipText = "Deletes an existing image"; // // toolbarSep2 // @@ -172,11 +180,12 @@ this.toolbarHelpContents.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolbarHelpContents.Name = "toolbarHelpContents"; this.toolbarHelpContents.Size = new System.Drawing.Size(23, 22); - // - // toolbarSep3 - // - this.toolbarSep3.Name = "toolbarSep3"; - this.toolbarSep3.Size = new System.Drawing.Size(6, 25); + this.toolbarHelpContents.ToolTipText = "Opens help file"; + // + // toolbarSep4 + // + this.toolbarSep4.Name = "toolbarSep4"; + this.toolbarSep4.Size = new System.Drawing.Size(6, 25); // // toolbarExit // @@ -185,6 +194,7 @@ this.toolbarExit.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolbarExit.Name = "toolbarExit"; this.toolbarExit.Size = new System.Drawing.Size(23, 22); + this.toolbarExit.ToolTipText = "Exits application"; // // mainToolbar // @@ -195,23 +205,52 @@ this.toolbarImageAdd, this.toolbarImageDel, this.toolbarSep2, + this.toolbarSnapShot, + this.toolbarScreenShot, + this.toolbarSep3, this.toolbarHelpContents, - this.toolbarSep3, + this.toolbarSep4, this.toolbarExit}); this.mainToolbar.Location = new System.Drawing.Point(0, 24); this.mainToolbar.Name = "mainToolbar"; this.mainToolbar.Size = new System.Drawing.Size(540, 25); this.mainToolbar.TabIndex = 10; // - // MainMenu - // - this.MainMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + // toolbarSnapShot + // + this.toolbarSnapShot.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolbarSnapShot.Image = ((System.Drawing.Image)(resources.GetObject("toolbarSnapShot.Image"))); + this.toolbarSnapShot.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolbarSnapShot.Name = "toolbarSnapShot"; + this.toolbarSnapShot.Size = new System.Drawing.Size(23, 22); + this.toolbarSnapShot.Text = "toolStripButton1"; + this.toolbarSnapShot.ToolTipText = "Create a snap shot of the current status"; + // + // toolbarScreenShot + // + this.toolbarScreenShot.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolbarScreenShot.Image = ((System.Drawing.Image)(resources.GetObject("toolbarScreenShot.Image"))); + this.toolbarScreenShot.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolbarScreenShot.Name = "toolbarScreenShot"; + this.toolbarScreenShot.Size = new System.Drawing.Size(23, 22); + this.toolbarScreenShot.Text = "toolStripButton2"; + this.toolbarScreenShot.ToolTipText = "Grab a screenshot of the display"; + // + // toolbarSep3 + // + this.toolbarSep3.Name = "toolbarSep3"; + this.toolbarSep3.Size = new System.Drawing.Size(6, 25); + // + // mainMenu + // + this.mainMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mainmenuFile, + this.mainmenuOptions, this.mainmenuHelp}); - this.MainMenu.Location = new System.Drawing.Point(0, 0); - this.MainMenu.Name = "MainMenu"; - this.MainMenu.Size = new System.Drawing.Size(540, 24); - this.MainMenu.TabIndex = 11; + this.mainMenu.Location = new System.Drawing.Point(0, 0); + this.mainMenu.Name = "mainMenu"; + this.mainMenu.Size = new System.Drawing.Size(540, 24); + this.mainMenu.TabIndex = 11; // // mainmenuFile // @@ -224,9 +263,15 @@ // mainmenuFileExit // this.mainmenuFileExit.Name = "mainmenuFileExit"; - this.mainmenuFileExit.Size = new System.Drawing.Size(152, 22); + this.mainmenuFileExit.Size = new System.Drawing.Size(103, 22); this.mainmenuFileExit.Text = "Exit"; this.mainmenuFileExit.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); + // + // mainmenuOptions + // + this.mainmenuOptions.Name = "mainmenuOptions"; + this.mainmenuOptions.Size = new System.Drawing.Size(56, 20); + this.mainmenuOptions.Text = "Options"; // // mainmenuHelp // @@ -254,7 +299,7 @@ this.MainMenuHelpAbout.Name = "MainMenuHelpAbout"; this.MainMenuHelpAbout.Size = new System.Drawing.Size(152, 22); this.MainMenuHelpAbout.Text = "About"; - this.MainMenuHelpAbout.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click); + this.MainMenuHelpAbout.Click += new System.EventHandler(this.MainMenuHelpAbout_Click); // // MainForm // @@ -263,21 +308,22 @@ this.ClientSize = new System.Drawing.Size(540, 301); this.Controls.Add(this.ImageListView); this.Controls.Add(this.mainToolbar); - this.Controls.Add(this.MainMenu); + this.Controls.Add(this.mainMenu); this.DoubleBuffered = true; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.ImeMode = System.Windows.Forms.ImeMode.On; - this.MainMenuStrip = this.MainMenu; + this.MainMenuStrip = this.mainMenu; this.MaximizeBox = false; this.Name = "MainForm"; this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "ReactOS Test Environment"; + this.Load += new System.EventHandler(this.MainForm_Load); this.mainToolbar.ResumeLayout(false); this.mainToolbar.PerformLayout(); - this.MainMenu.ResumeLayout(false); - this.MainMenu.PerformLayout(); + this.mainMenu.ResumeLayout(false); + this.mainMenu.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -303,16 +349,20 @@ private System.Windows.Forms.ToolStripButton toolbarImageDel; private System.Windows.Forms.ToolStripSeparator toolbarSep2; private System.Windows.Forms.ToolStripButton toolbarHelpContents; - private System.Windows.Forms.ToolStripSeparator toolbarSep3; + private System.Windows.Forms.ToolStripSeparator toolbarSep4; private System.Windows.Forms.ToolStripButton toolbarExit; private System.Windows.Forms.ToolStrip mainToolbar; - private System.Windows.Forms.MenuStrip MainMenu; + private System.Windows.Forms.MenuStrip mainMenu; private System.Windows.Forms.ToolStripMenuItem mainmenuFile; private System.Windows.Forms.ToolStripMenuItem mainmenuFileExit; private System.Windows.Forms.ToolStripMenuItem mainmenuHelp; private System.Windows.Forms.ToolStripMenuItem mainmenuHelpContent; private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; private System.Windows.Forms.ToolStripMenuItem MainMenuHelpAbout; + private System.Windows.Forms.ToolStripButton toolbarSnapShot; + private System.Windows.Forms.ToolStripButton toolbarScreenShot; + private System.Windows.Forms.ToolStripSeparator toolbarSep3; + private System.Windows.Forms.ToolStripMenuItem mainmenuOptions; } } Modified: trunk/tools/RosTE/GUI/MainForm.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainForm.cs?rev=26… ============================================================================== --- trunk/tools/RosTE/GUI/MainForm.cs (original) +++ trunk/tools/RosTE/GUI/MainForm.cs Wed May 16 01:37:55 2007 @@ -18,16 +18,20 @@ InitializeComponent(); } - private void aboutToolStripMenuItem_Click(object sender, EventArgs e) + private void exitToolStripMenuItem_Click(object sender, EventArgs e) + { + Close(); + } + + private void MainForm_Load(object sender, EventArgs e) + { + } + + private void MainMenuHelpAbout_Click(object sender, EventArgs e) { AboutForm Dlg = new AboutForm(); Dlg.StartPosition = FormStartPosition.CenterParent; Dlg.Show(); } - - private void exitToolStripMenuItem_Click(object sender, EventArgs e) - { - Close(); - } } } Modified: trunk/tools/RosTE/GUI/MainForm.resx URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainForm.resx?rev=… ============================================================================== --- trunk/tools/RosTE/GUI/MainForm.resx (original) +++ trunk/tools/RosTE/GUI/MainForm.resx Wed May 16 01:37:55 2007 @@ -190,12 +190,12 @@ <data name="toolbarImageAdd.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAP5JREFUOE9jYKAV - 8PDwYE9LS2Otr69nIscOxtDw4P/+gb5/gfQ/EDs+Pp6DJIPCInz/3L5z6/+u3Tv/h0WE/Pbx8eEiyQCQ - 7Xfu3v6/e8+u/wFBfr9CQ0N5CBoA8q+9vT0LUDEbyOkwAyKiwn5GR0fz4TUA5E8o/geyPTg08O/de3fA - LoiMDv+DJA9Wh2EYSPDO3VtAfPs/SCOIBuEDB/ej4IOHDuA2ABRoR44e/n/4yCG8GKcL0J155uzp/yAc - GOwPik6YF7G7AN1PIA1Xrl4G4/BIvz8kpwOQAddvXANjsg24fOXSfxAmywBgVP4Kjwz9DcIgNihvEExI - A6IAAEeU4GteB9UDAAAAAElFTkSuQmCC + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAP9JREFUOE9jYKAV + 8PDwYE9LS2Otr69nIscOxtDw4P8+fl5/gfQ/EDs+Pp6DJIPCIrz+3L5z6/+u3Tv/h0WE/Pbx8eEiyQCQ + 7Xfu3v6/e8+u/77+Pr9CQ0N5CBoA8q+9vT0LUDEbyOkwAyKiwn5GR0fz4TUA5E8o/geyPSDI7+/de3fA + LoiMDv+DJA9Wh2EYSPDO3VtAfPs/SCOIBuEDB/ej4IOHDuA2ABRoR44e/n/4yCG8GKcL0J155uzp/yDs + F+ADik6YF7G7AN1PIA1Xrl4G4/BI7z8kpwOQAddvXANjsg24fOXSfxAmywAfP59f4ZGhv0EYxAblDYIJ + aUAUAACfo+AcMbeNIAAAAABJRU5ErkJggg== </value> </data> <data name="toolbarImageDel.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> @@ -209,20 +209,20 @@ <data name="toolbarHelpContents.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAuJJREFUOE99U11I - U2EYXllBF3VjW91JklGUmCnCxBIVR9Ml/RCYN4JKpghezFwQdCRdZi5N259DaZBTmlAX/hJWElNmiDdm - QYFkM+cPuvM3z87ZOXvbe8zIBR14ON/5zvs83/s+7/vtUcQ8lmtFOULquWLp4KFLEYV4DH/vVexbieOY - sf2fv7yo6R/wxHLkb4IgDjguqr39p09JnybeSyzLgCAIwPM8kGQAZt6MSX0nkySMwdhdIm63O86RkuJ/ - Z7gjCn4/cNNeoCgSAoENGRQVgOCkB7bm5mCs8paIscj5I+K4kDkxVFMdFhYWgKqoADI7Gyj/T1mEpkmg - VpaBzMsDylAP3OwsvC4tDSNHFrBeL0rtSTwucvPzQJWWApWbCxvFxTB8WRd++KgphBi+UhQOlJcDXVgI - lF4P7NQk9CQkiParuvOKNmODxet+GWGHh4DMyoLNkhJwqZQRmzbfSnQQhxGO6Np1VBUJVFfLmTCjI+B5 - NSCZHtyzKdrbTd83NtajRm0CveKHEZ1OsOdlP4112qrJefK2QCuy66ty7Eq0LOQqGo0NoWCQlc3CN6aM - p8YK4B7+47it38aSgFxZAFuGreK44H8FmluMIZ4PybFosCyAaaytrUbdpoFjaBi8XcnbtfmtsRnYNblt - o3p9iI9mQNMULC8vbZeARnhdvRLb3Q10VRWQ4+PQm5go2bUay46JtgKN2ZV0QmK+fQXa2ASM+Rl8sFkl - bIACW9GnVEZYgwFItRpYggBqchIG7xqETnNLCDFKEELwxyIEnU4gMzKALisDV3x8BEdAztSpzvB409Mh - WFcHZGYmMPX1gKmKYjgKEcICD0xnh0xmovMwlZwMyPlTJo7l87Nn1r1pacDU1gLTZZfrxCncBgWMxSyf - jGSM3TXKO5fJqVbP9KlUkY92q7i05JPdRvh8Ppi2msU+5ZEIxvxzmf523HzzRlZ74/0uk6l18bGpmUfg - Gvfwqsd25xc2LTFmPv5ltQAAAABJRU5ErkJggg== + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAuJJREFUOE99U21I + U2EUXllBP+qPbfVPkoyixEwRJpaouDKX9EFg/hmoZErgj5kLgq75FeTS1H05hIbzAzSC1FLCssDJjBBC + LCiQbOamMne/5t29u3ennWtKLujCw33ve8/zvOc857y7FDGP+VpRjpB6pljaf+BiRCEewd+7FXt8cRwz + vvfLV+edgaGpWI78TRDEPvt5tXvg5Anp8+SkxLIMCIIAPM8DSQZg5s241H88ScIYjN0hMjg4GGdPSfG+ + M9wVBa8XuBk3UBQJgYBfBkUFIOiago25ORivuCViLHK2ReznMt+/rKwICwsLQJWXA5mdDZT3lyxC0yRQ + vmUg8/KAMtQCNzsLz3W6MHJkAcv1olR74lGRm58HSqcDKjcX/MXFMHxZG25oehhCDF8pCgfKyoAuLARK + rwd22gX2hATRdlV7VtHaVGd2DfRH2FejQGZlwXpJCfSolBFrQb6FaCcOIuzRdc9hVSRQVSVnwoy9hg8v + hiRj/X2roq3N+MPvX4satQ60zwsjWq1gy8t+Guu0RZPz5O0FjciurcixvmhZyFXU1ROhYJCVzcI3poyn + xgrgHv7juI0/xpKAXFkAW4at4rjgfwUam+tDPB+SY9FgWQDTWF1dibpNA8fQMHK7grcV5LfEZmDT5LaO + 6fUhPpoBTVOwvLy0WQIa4errldjubqArK4GcmIDexETJVqAxb5lovaQx9SUdk5jv34BuagTG1AmTVouE + DVBgK5xKZYQ1GIBUq4ElCKBcLhi+ZxA6TM0hxChBCMGfixB0OIDMyAC6tBR64uMjOAJypg51xpQ7PR2C + NTVAZmYCU1sLmKoohqMQISzwwHS0y2QmOg/TycmAnO0ycSyfnT615k5LA6a6Gpgum1wnTuEmKGDMJvlk + JGPsjlHeukwOtfqTU6WKfDR3iktLHtlthMfjgZnOdtGpPBTBmH8u09+Om27eyGpreNBlNLYsPjY+4hG4 + xj286rHd+Q2z5jCy9K4XCQAAAABJRU5ErkJggg== </value> </data> <data name="toolbarExit.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> @@ -240,8 +240,40 @@ <metadata name="mainToolbar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>358, 23</value> </metadata> - <metadata name="MainMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> - <value>602, 20</value> + <data name="toolbarSnapShot.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAhRJREFUOE+lU0tr + E1EYvVFxpXtXQn6AImKjoIhokP4F22K6UHTvUhcutGhBqyDaiEKgLkrpAxUSLUjSphjbNGmoycwkM5lH + MonGjQuplFo5zrmQ0Bm768CBO/c758z3mpAIPPkhcXo/xLAIiQvbEGGGD4SEJSAyf0Mi0fdGLAc1vffi + oHixfu0g2g/C+JU4ia3pcxI8844xcnY1KA6IlH3niCc4i83nYfy+dwgbt/dJ8Mw7xsgh12dCVwb+TEY8 + 8mGoY5eRSowg+X4G72YnMTd+F6XRqIyRI026mbBmpkZ3EnLjN1BYy2Njog/u/aMSqlZBOvMJi8+uSw65 + 1FAr6MT6mKLyOIqVfA7HT0WwPXde4mf8GDo/vsFpmPjwMYnSw0uSS43MojgkVDaJdX6eGYPlGHBbTs+E + Bt87LbTaDShaGfMTI5JLDbViZVBsstNsVjadhO3U4bgW3LaDgdiwhOuJm64N09GRXUhJLjXU+gyWFlOo + 2zWZhdM0ceVqTOJE5IxnFINp61j9kvYb7Cwh//YpanXVM6lKMo2shiG/TGPD1KDMx/0l7Gyi8STqTWAZ + Vb0C3SMbVtUTERpqpopqvYJOvN/fxOAYC69uYimXwdr6KrRaWZpphgf9K5qzt/4fIzcquEjKo4vITo2i + VFiAUs6hnnmNzsv+3Repu5J7WuWeyV5+pq4Je8KSOB3OmeCZd3J1A88/Nus6r/DgkxoAAAAASUVORK5C + YII= +</value> + </data> + <data name="toolbarScreenShot.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAkJJREFUOE+1U21P + klEY1n5ArwsZ2eYH4sV4qCk9tJWZBFqb4Cv4ssTQJEViiPIQKDEY70g5a+tT5QR8zcqtb/2NPuVPgD/A + B3Z1zpHcnuWX1jrbtefZfZ/ruu/rPuc0NPyH1ZjOxqPpbAIipOPrpNaler3G0+qeJcHzBJ2UWKlUUC6X + GarVKhPjdHonyUtOI5/hdPw7TRv/Q6vj2eZarXYCkEVjNKfV6UdFAto2/vtxgofb48LB1z1EomH4A4tY + 9C/At+SF1+eBx+vGZuljXeR4P+U20J/Db5/x5XCfIZNLIf86h9J2EcVSAQWKYgErL0NYDgexUXiP4tYG + A+Uygb2DbTimJzE6bsO8ew65fBr3OjsgkTZBKpOh64GBWEhibt4J68gQkuk4sqspscCTKTv6By1YW3+F + DkI+d+EiLjdJIb3SjCZZM4w9JqQyCQxZBxBPxkinSbHApGOCdUGVJYRIyT+PjoiVHbTIFZArlGyQttFh + vAgJfwpQsss9yxK0bVp5i5BV3A2oNFooNRxr/X5XJxuqyMLupxKohZExK3KrGRiMBiJwFS3XFFBzN7H2 + 5i16LWaEIyHob/OYeTYt7mBnvwRqgQoElwU2MFNPN+RKFavc22dGIhXD3Y47aL2uxlPnFLNxcgpbu5uY + dTkZhm2DeGwfg19YIMOKMkzYx8HrdVC3qlie7hMJUPVYPILQSgBLgg/zz+cwPeNA34AFln4zHj7qhtFk + YPFAUCD3JItsvn6MXDsv/L6Jf/1tv/Xhnx/zLz/3rRNK6BfzAAAAAElFTkSuQmCC +</value> + </data> + <metadata name="mainMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>242, 22</value> </metadata> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> Modified: trunk/tools/RosTE/GUI/Resources/snapshot.png URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/Resources/snapshot… ============================================================================== Binary files - no diff available.

1 0

[jimtabor] 26799: Finish up float.c, hopfully the div and sub math is right.
by jimtabor＠svn.reactos.org 15 May '07

15 May '07

Author: jimtabor Date: Wed May 16 00:48:58 2007 New Revision: 26799 URL: http://svn.reactos.org/svn/reactos?rev=26799&view=rev Log: Finish up float.c, hopfully the div and sub math is right. Modified: trunk/reactos/subsystems/win32/win32k/eng/float.c Modified: trunk/reactos/subsystems/win32/win32k/eng/float.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/float.c (original) +++ trunk/reactos/subsystems/win32/win32k/eng/float.c Wed May 16 00:48:58 2007 @@ -70,7 +70,7 @@ ULONG STDCALL EngSaveFloatingPointState(OUT VOID *Buffer, - IN ULONG BufferSize) + IN ULONG BufferSize) { KFLOATING_SAVE TempBuffer; NTSTATUS Status; @@ -79,9 +79,9 @@ /* Check for floating point support. */ Status = KeSaveFloatingPointState(&TempBuffer); if (Status != STATUS_SUCCESS) - { - return(0); - } + { + return(0); + } KeRestoreFloatingPointState(&TempBuffer); return(sizeof(KFLOATING_SAVE)); } @@ -153,90 +153,165 @@ VOID STDCALL FLOATOBJ_Add ( - IN OUT PFLOATOBJ pf, - IN PFLOATOBJ pf1 - ) + IN OUT PFLOATOBJ pf, + IN PFLOATOBJ pf1 + ) { // www.osr.com/ddk/graphics/gdifncs_2i3r.htm - UNIMPLEMENTED; + EFLOAT_S * efp = (EFLOAT_S *)pf; + EFLOAT_S * efp1 = (EFLOAT_S *)pf1; + gxf_long f; + gxf_long f1; + f.l = EFtoF(efp); + f1.l = EFtoF(efp1); + f.f = f.f + f1.f; +#ifdef _X86_ + FtoEF( efp, f.l ); +#else + FtoEF( efp, f.f ); +#endif } VOID STDCALL FLOATOBJ_AddFloat( - IN OUT PFLOATOBJ pf, - IN FLOATL f - ) + IN OUT PFLOATOBJ pf, + IN FLOATL f + ) { // www.osr.com/ddk/graphics/gdifncs_0ip3.htm - UNIMPLEMENTED; + EFLOAT_S * efp = (EFLOAT_S *)pf; + gxf_long fe; + gxf_long f1; + fe.l = EFtoF(efp); +#ifdef _X86_ + f1.l = f; +#else + f1.f = f; +#endif + fe.f = fe.f + f1.f; +#ifdef _X86_ + FtoEF( efp, fe.l ); +#else + FtoEF( efp, fe.f ); +#endif } VOID STDCALL FLOATOBJ_AddLong( - IN OUT PFLOATOBJ pf, - IN LONG l - ) + IN OUT PFLOATOBJ pf, + IN LONG l + ) { // www.osr.com/ddk/graphics/gdifncs_12jr.htm - UNIMPLEMENTED; + EFLOAT_S * efp = (EFLOAT_S *)pf; + gxf_long f; + f.l = EFtoF(efp); + f.f = f.f + l; +#ifdef _X86_ + FtoEF( efp, f.l ); +#else + FtoEF( efp, f.f ); +#endif } VOID STDCALL FLOATOBJ_Div( - IN OUT PFLOATOBJ pf, - IN PFLOATOBJ pf1 - ) + IN OUT PFLOATOBJ pf, + IN PFLOATOBJ pf1 + ) { // www.osr.com/ddk/graphics/gdifncs_3ndz.htm - UNIMPLEMENTED; + EFLOAT_S * efp = (EFLOAT_S *)pf; + EFLOAT_S * efp1 = (EFLOAT_S *)pf1; + gxf_long f; + gxf_long f1; + f.l = EFtoF(efp); + f1.l = EFtoF(efp1); + f.f = f.f / f1.f; +#ifdef _X86_ + FtoEF( efp, f.l ); +#else + FtoEF( efp, f.f ); +#endif } VOID STDCALL FLOATOBJ_DivFloat( - IN OUT PFLOATOBJ pf, - IN FLOATL f - ) + IN OUT PFLOATOBJ pf, + IN FLOATL f + ) { // www.osr.com/ddk/graphics/gdifncs_0gfb.htm - UNIMPLEMENTED; + EFLOAT_S * efp = (EFLOAT_S *)pf; + gxf_long fe; + gxf_long f1; + fe.l = EFtoF(efp); +#ifdef _X86_ + f1.l = f; +#else + f1.f = f; +#endif + fe.f = fe.f / f1.f; +#ifdef _X86_ + FtoEF( efp, fe.l ); +#else + FtoEF( efp, fe.f ); +#endif } VOID STDCALL FLOATOBJ_DivLong( - IN OUT PFLOATOBJ pf, - IN LONG l - ) + IN OUT PFLOATOBJ pf, + IN LONG l + ) { // www.osr.com/ddk/graphics/gdifncs_6jdz.htm - UNIMPLEMENTED; + EFLOAT_S * efp = (EFLOAT_S *)pf; + gxf_long f; + f.l = EFtoF(efp); + f.f = f.f / l; +#ifdef _X86_ + FtoEF( efp, f.l ); +#else + FtoEF( efp, f.f ); +#endif } BOOL STDCALL FLOATOBJ_Equal( - IN PFLOATOBJ pf, - IN PFLOATOBJ pf1 - ) + IN PFLOATOBJ pf, + IN PFLOATOBJ pf1 + ) { // www.osr.com/ddk/graphics/gdifncs_6ysn.htm - UNIMPLEMENTED; + EFLOAT_S * efp = (EFLOAT_S *)pf; + EFLOAT_S * efp1 = (EFLOAT_S *)pf1; + gxf_long f; + gxf_long f1; + f.l = EFtoF(efp); + f1.l = EFtoF(efp1); + if (f.f == f1.f) return TRUE; return FALSE; } BOOL STDCALL FLOATOBJ_EqualLong( - IN PFLOATOBJ pf, - IN LONG l - ) + IN PFLOATOBJ pf, + IN LONG l + ) { // www.osr.com/ddk/graphics/gdifncs_1pgn.htm - UNIMPLEMENTED; + EFLOAT_S * efp = (EFLOAT_S *)pf; + gxf_long f; + f.l = EFtoF(efp); + if (f.f == l) return TRUE; return FALSE; } @@ -267,82 +342,133 @@ BOOL STDCALL FLOATOBJ_GreaterThan( - IN PFLOATOBJ pf, - IN PFLOATOBJ pf1 - ) + IN PFLOATOBJ pf, + IN PFLOATOBJ pf1 + ) { // www.osr.com/ddk/graphics/gdifncs_8n53.htm - UNIMPLEMENTED; + EFLOAT_S * efp = (EFLOAT_S *)pf; + EFLOAT_S * efp1 = (EFLOAT_S *)pf1; + gxf_long f; + gxf_long f1; + f.l = EFtoF(efp); + f1.l = EFtoF(efp1); + if(f.f > f1.f) return TRUE; return FALSE; } BOOL STDCALL FLOATOBJ_GreaterThanLong( - IN PFLOATOBJ pf, - IN LONG l - ) + IN PFLOATOBJ pf, + IN LONG l + ) { // www.osr.com/ddk/graphics/gdifncs_6gx3.htm - UNIMPLEMENTED; + EFLOAT_S * efp = (EFLOAT_S *)pf; + gxf_long f; + f.l = EFtoF(efp); + if (f.f > l) return TRUE; return FALSE; } BOOL STDCALL FLOATOBJ_LessThan( - IN PFLOATOBJ pf, - IN PFLOATOBJ pf1 - ) + IN PFLOATOBJ pf, + IN PFLOATOBJ pf1 + ) { // www.osr.com/ddk/graphics/gdifncs_1ynb.htm - UNIMPLEMENTED; + EFLOAT_S * efp = (EFLOAT_S *)pf; + EFLOAT_S * efp1 = (EFLOAT_S *)pf1; + gxf_long f; + gxf_long f1; + f.l = EFtoF(efp); + f1.l = EFtoF(efp1); + if(f.f < f1.f) return TRUE; return FALSE; } BOOL STDCALL FLOATOBJ_LessThanLong( - IN PFLOATOBJ pf, - IN LONG l - ) + IN PFLOATOBJ pf, + IN LONG l + ) { // www.osr.com/ddk/graphics/gdifncs_9nzb.htm - UNIMPLEMENTED; + EFLOAT_S * efp = (EFLOAT_S *)pf; + gxf_long f; + f.l = EFtoF(efp); + if (f.f < l) return TRUE; return FALSE; } VOID STDCALL FLOATOBJ_Mul( - IN OUT PFLOATOBJ pf, - IN PFLOATOBJ pf1 - ) + IN OUT PFLOATOBJ pf, + IN PFLOATOBJ pf1 + ) { // www.osr.com/ddk/graphics/gdifncs_8ppj.htm - UNIMPLEMENTED; + EFLOAT_S * efp = (EFLOAT_S *)pf; + EFLOAT_S * efp1 = (EFLOAT_S *)pf1; + gxf_long f; + gxf_long f1; + f.l = EFtoF(efp); + f1.l = EFtoF(efp1); + f.f = f1.f * f.f; +#ifdef _X86_ + FtoEF( efp, f.l ); +#else + FtoEF( efp, f.f ); +#endif } VOID STDCALL FLOATOBJ_MulFloat( - IN OUT PFLOATOBJ pf, - IN FLOATL f - ) + IN OUT PFLOATOBJ pf, + IN FLOATL f + ) { // www.osr.com/ddk/graphics/gdifncs_3puv.htm - UNIMPLEMENTED; + EFLOAT_S * efp = (EFLOAT_S *)pf; + gxf_long fe; + gxf_long f1; + fe.l = EFtoF(efp); +#ifdef _X86_ + f1.l = f; +#else + f1.f = f; +#endif + fe.f = f1.f * fe.f; +#ifdef _X86_ + FtoEF( efp, fe.l ); +#else + FtoEF( efp, fe.f ); +#endif } VOID STDCALL FLOATOBJ_MulLong( - IN OUT PFLOATOBJ pf, - IN LONG l - ) + IN OUT PFLOATOBJ pf, + IN LONG l + ) { // www.osr.com/ddk/graphics/gdifncs_56lj.htm - UNIMPLEMENTED; + EFLOAT_S * efp = (EFLOAT_S *)pf; + gxf_long f; + f.l = EFtoF(efp); + f.f = f.f * l; +#ifdef _X86_ + FtoEF( efp, f.l ); +#else + FtoEF( efp, f.f ); +#endif } VOID @@ -357,9 +483,9 @@ VOID STDCALL FLOATOBJ_SetFloat( - OUT PFLOATOBJ pf, - IN FLOATL f - ) + OUT PFLOATOBJ pf, + IN FLOATL f + ) { // www.osr.com/ddk/graphics/gdifncs_1prb.htm EFLOAT_S * efp = (EFLOAT_S *)pf; @@ -369,9 +495,9 @@ VOID STDCALL FLOATOBJ_SetLong( - OUT PFLOATOBJ pf, - IN LONG l - ) + OUT PFLOATOBJ pf, + IN LONG l + ) { // www.osr.com/ddk/graphics/gdifncs_0gpz.htm EFLOAT_S * efp = (EFLOAT_S *)pf; @@ -387,32 +513,65 @@ VOID STDCALL FLOATOBJ_Sub( - IN OUT PFLOATOBJ pf, - IN PFLOATOBJ pf1 - ) + IN OUT PFLOATOBJ pf, + IN PFLOATOBJ pf1 + ) { // www.osr.com/ddk/graphics/gdifncs_6lyf.htm - UNIMPLEMENTED; + EFLOAT_S * efp = (EFLOAT_S *)pf; + EFLOAT_S * efp1 = (EFLOAT_S *)pf1; + gxf_long f; + gxf_long f1; + f.l = EFtoF(efp); + f1.l = EFtoF(efp1); + f.f = f.f - f1.f; +#ifdef _X86_ + FtoEF( efp, f.l ); +#else + FtoEF( efp, f.f ); +#endif } VOID STDCALL FLOATOBJ_SubFloat( - IN OUT PFLOATOBJ pf, - IN FLOATL f - ) + IN OUT PFLOATOBJ pf, + IN FLOATL f + ) { // www.osr.com/ddk/graphics/gdifncs_2zvr.htm - UNIMPLEMENTED; + EFLOAT_S * efp = (EFLOAT_S *)pf; + gxf_long fe; + gxf_long f1; + fe.l = EFtoF(efp); +#ifdef _X86_ + f1.l = f; +#else + f1.f = f; +#endif + fe.f = fe.f - f1.f; +#ifdef _X86_ + FtoEF( efp, fe.l ); +#else + FtoEF( efp, fe.f ); +#endif } VOID STDCALL FLOATOBJ_SubLong( - IN OUT PFLOATOBJ pf, - IN LONG l - ) + IN OUT PFLOATOBJ pf, + IN LONG l + ) { // www.osr.com/ddk/graphics/gdifncs_852f.htm - UNIMPLEMENTED; -} + EFLOAT_S * efp = (EFLOAT_S *)pf; + gxf_long f; + f.l = EFtoF(efp); + f.f = f.f - l; +#ifdef _X86_ + FtoEF( efp, f.l ); +#else + FtoEF( efp, f.f ); +#endif +}

1 0

[dgorbachev] 26798: Fix Italian rc file. Bug report #2253. From Paolo Devoti.
by dgorbachev＠svn.reactos.org 15 May '07

15 May '07

Author: dgorbachev Date: Wed May 16 00:16:08 2007 New Revision: 26798 URL: http://svn.reactos.org/svn/reactos?rev=26798&view=rev Log: Fix Italian rc file. Bug report #2253. From Paolo Devoti. Modified: trunk/reactos/dll/win32/syssetup/lang/it-IT.rc Modified: trunk/reactos/dll/win32/syssetup/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/it… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/it-IT.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/it-IT.rc Wed May 16 00:16:08 2007 @@ -17,10 +17,10 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Benvenuti alla configurazione guidata di ReactOS.", IDC_WELCOMETITLE, 115, 8, 195, 24 - LTEXT "Questa procedura guidata installa ReactOS su questo computer. La procedura "\ + LTEXT "Questa procedura guidata installa ReactOS su questo computer.\nLa procedura "\ "deve raccogliere alcune informazioni sull'utente e sul computer "\ "per configurare ReactOS adeguatamente.", IDC_STATIC, 115, 40, 195, 100 - LTEXT "Selezionare Continua per proseguire con la configurazione.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "Selezionare Avanti per proseguire con la configurazione.", IDC_STATIC, 115, 169, 195, 17 END @@ -38,7 +38,7 @@ "(in tutto o in parte) è necessario rispettare la GPL", IDC_STATIC,15,110,227,19 PUSHBUTTON "&Mostra la GPL...",IDC_VIEWGPL,251,110,50,19 - LTEXT "Selezionare Continua per proseguire con la configurazione.",IDC_STATIC,15,136, + LTEXT "Selezionare Avanti per proseguire con la configurazione.",IDC_STATIC,15,136, 195,17 END @@ -49,10 +49,10 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Scrivere il proprio nome completo e il nome della propria ditta o organizzazione.", - IDC_STATIC, 54, 7, 242, 21 - LTEXT "No&me:", IDC_STATIC, 54, 37, 44, 8 + IDC_STATIC, 44, 7, 242, 21 + LTEXT "No&me:", IDC_STATIC, 44, 37, 120, 8 EDITTEXT IDC_OWNERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Organizzazione:", IDC_STATIC, 54, 57, 44, 8 + LTEXT "&Organizzazione:", IDC_STATIC, 44, 57, 120, 8 EDITTEXT IDC_OWNERORGANIZATION, 132, 55, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL END @@ -62,19 +62,19 @@ CAPTION "Installazione di ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Scrivere un nome per il computer che sia lungo al massimo 63 caratteri. "\ + LTEXT "Scrivere un nome per il computer che sia lungo al massimo 63 caratteri.\n"\ "Se si è in rete, il nome del computer deve essere univoco.", - IDC_STATIC, 54, 7, 250, 24 - LTEXT "Nome del &computer:", IDC_STATIC, 54, 38, 75, 8 + IDC_STATIC, 44, 7, 250, 24 + LTEXT "Nome del &computer:", IDC_STATIC, 44, 38, 75, 8 EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE LTEXT "Questa procedura creerà su questo computer un account utente chiamato Administrator. "\ "Si potrà usare questo account se si necessita l'accesso completo al computer.", - IDC_STATIC, 54, 57, 250, 25 + IDC_STATIC, 44, 57, 250, 25 LTEXT "Scrivere una password per Administrator che sia lunga al massimo 14 caratteri.", - IDC_STATIC, 54, 87, 250, 8 - LTEXT "Password per &Administrator:", IDC_STATIC, 54, 104, 75, 8 + IDC_STATIC, 44, 87, 250, 8 + LTEXT "Password per &Administrator:", IDC_STATIC, 44, 104, 95, 8 EDITTEXT IDC_ADMINPASSWORD1, 132, 101, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD - LTEXT "C&onfermare la password:", IDC_STATIC, 54, 123, 75, 8 + LTEXT "C&onfermare la password:", IDC_STATIC, 44, 123, 95, 8 EDITTEXT IDC_ADMINPASSWORD2, 132, 120, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD END @@ -89,14 +89,14 @@ "i numeri, i valori monetari e le date.", IDC_STATIC, 53, 7, 253, 20 LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 LTEXT "Per cambiare le impostazioni linguistiche del sistema o dell'utente, selezionare Personalizza.", - IDC_STATIC, 53, 60, 184, 8 - PUSHBUTTON "&Personalizza...", IDC_CUSTOMLOCALE, 245, 57, 50, 14 + IDC_STATIC, 53, 50, 184, 8 + PUSHBUTTON "&Personalizza...", IDC_CUSTOMLOCALE, 245, 47, 50, 14 LTEXT "Il formato della tastiera stabilisce i caratteri che appaiono quando si preme un tasto.", IDC_STATIC, 53, 86, 253, 8 LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16 LTEXT "Per cambiare il formato della tastiera, selezionare Personalizza.", - IDC_STATIC, 53, 126, 184, 8 - PUSHBUTTON "P&ersonalizza...", IDC_CUSTOMLAYOUT, 245, 122, 50, 14 + IDC_STATIC, 53, 106, 184, 8 + PUSHBUTTON "P&ersonalizza...", IDC_CUSTOMLAYOUT, 245, 102, 50, 14 END @@ -193,21 +193,21 @@ STRINGTABLE BEGIN - IDS_GAMES "Giochi" + IDS_GAMES "Giochi" IDS_CMT_SOLITAIRE "Solitario" IDS_CMT_WINEMINE "Campo minato" END STRINGTABLE BEGIN -IDS_REACTOS_SETUP "Installazione di ReactOS" +IDS_REACTOS_SETUP "Installazione di ReactOS" IDS_UNKNOWN_ERROR "Errore sconosciuto" IDS_REGISTERING_COMPONENTS "Registrazione dei componenti..." - IDS_LOADLIBRARY_FAILED "LoadLibrary fallito: " - IDS_GETPROCADDR_FAILED "GetProcAddr fallito: " + IDS_LOADLIBRARY_FAILED "LoadLibrary fallito: " + IDS_GETPROCADDR_FAILED "GetProcAddr fallito: " IDS_REGSVR_FAILED "DllRegisterServer fallito: " - IDS_DLLINSTALL_FAILED "DllInstall fallito: " - IDS_TIMEOUT "Tempo scaduto durante la registrazione" + IDS_DLLINSTALL_FAILED "DllInstall fallito: " + IDS_TIMEOUT "Tempo scaduto durante la registrazione" IDS_REASON_UNKNOWN "" END

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
33
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 2007