Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 29615: fixing few compiling issue.
by greatlrd＠svn.reactos.org 15 Oct '07

15 Oct '07

Author: greatlrd Date: Tue Oct 16 00:55:06 2007 New Revision: 29615 URL: http://svn.reactos.org/svn/reactos?rev=29615&view=rev Log: fixing few compiling issue. Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/mocomp.c Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/mocomp.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/mocomp.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/mocomp.c Tue Oct 16 00:55:06 2007 @@ -100,7 +100,7 @@ } DPRINT1("Calling on dxg.sys pfnDdEndMoCompFrame"); - return pfnDdEndMoCompFrame(hMoComp, puBeginFrameData); + return pfnDdEndMoCompFrame(hMoComp, puEndFrameData); } /************************************************************************/

1 0

[fireball] 29614: Dmitry Chapyshev <lentind@yandex.ru> - Get rid of hardcoded path to downloader.xml, it properly gets the path now. Also changed the logic slightly: now the file is firstly being searched in the local folder, and only then in system32. - Do a Settings dialog (choose a directory where to download files to, if a user wants to remove installation files after the app has been installed), all options are stored / loaded from the registry. Only the "Update server" option does not work
by fireball＠svn.reactos.org 15 Oct '07

15 Oct '07

Author: fireball Date: Tue Oct 16 00:45:06 2007 New Revision: 29614 URL: http://svn.reactos.org/svn/reactos?rev=29614&view=rev Log: Dmitry Chapyshev <lentind(a)yandex.ru> - Get rid of hardcoded path to downloader.xml, it properly gets the path now. Also changed the logic slightly: now the file is firstly being searched in the local folder, and only then in system32. - Do a Settings dialog (choose a directory where to download files to, if a user wants to remove installation files after the app has been installed), all options are stored / loaded from the registry. Only the "Update server" option does not work now. - A few GUI/designs fixes and improvements, now it looks better. - Add a button for Settings in the main waindow. - Fixed code formatting in a few places. - Change bitmap to icons on the Update and Help buttons, imho it's the proper way. - Add 3 new categories to the list. - Other misc fixes. - All translated resources are updated, so no translations are lost! Added: trunk/rosapps/downloader/resources/11.bmp (with props) trunk/rosapps/downloader/resources/12.bmp (with props) trunk/rosapps/downloader/resources/13.bmp (with props) trunk/rosapps/downloader/resources/help.ico (with props) trunk/rosapps/downloader/resources/preferences.ico (with props) trunk/rosapps/downloader/resources/update.ico (with props) Removed: trunk/rosapps/downloader/resources/help.bmp trunk/rosapps/downloader/resources/update.bmp Modified: trunk/rosapps/downloader/download.c trunk/rosapps/downloader/downloader.xml trunk/rosapps/downloader/lang/de-DE.rc trunk/rosapps/downloader/lang/en-US.rc trunk/rosapps/downloader/lang/es-ES.rc trunk/rosapps/downloader/lang/fr-FR.rc trunk/rosapps/downloader/lang/id-ID.rc trunk/rosapps/downloader/lang/it-IT.rc trunk/rosapps/downloader/lang/ru-RU.rc trunk/rosapps/downloader/lang/uk-UA.rc trunk/rosapps/downloader/main.c trunk/rosapps/downloader/resources.h trunk/rosapps/downloader/rsrc.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 Tue Oct 16 00:45:06 2007 @@ -5,6 +5,7 @@ * COPYRIGHT: Copyright 2001 John R. Sheets (for CodeWeavers) * Copyright 2004 Mike McCormack (for CodeWeavers) * Copyright 2005 Ge van Geldorp (gvg(a)reactos.org) + * Copyright 2007 Dmitry Chapyshev ()lentind(a)yandex.ru) */ /* * Based on Wine dlls/shdocvw/shdocvw_main.c @@ -52,17 +53,16 @@ static HRESULT WINAPI dlQueryInterface(IBindStatusCallback* This, REFIID riid, void** ppvObject) { - if (NULL == ppvObject) - { - return E_POINTER; + if (NULL == ppvObject) + { + return E_POINTER; } - if (IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IBindStatusCallback)) - { - IBindStatusCallback_AddRef( This ); - *ppvObject = This; - return S_OK; + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IBindStatusCallback)) + { + IBindStatusCallback_AddRef( This ); + *ppvObject = This; + return S_OK; } return E_NOINTERFACE; @@ -71,120 +71,119 @@ static ULONG WINAPI dlAddRef(IBindStatusCallback* iface) { - IBindStatusCallbackImpl *This = (IBindStatusCallbackImpl *) iface; + IBindStatusCallbackImpl *This = (IBindStatusCallbackImpl *) iface; - return InterlockedIncrement(&This->ref); + return InterlockedIncrement(&This->ref); } static ULONG WINAPI dlRelease(IBindStatusCallback* iface) { - IBindStatusCallbackImpl *This = (IBindStatusCallbackImpl *) iface; - DWORD ref = InterlockedDecrement(&This->ref); + IBindStatusCallbackImpl *This = (IBindStatusCallbackImpl *) iface; + DWORD ref = InterlockedDecrement(&This->ref); - if( !ref ) - { - DestroyWindow( This->hDialog ); - HeapFree(GetProcessHeap(), 0, This); + if( !ref ) + { + DestroyWindow( This->hDialog ); + HeapFree(GetProcessHeap(), 0, This); } - return ref; + return ref; } static HRESULT WINAPI dlOnStartBinding(IBindStatusCallback* iface, DWORD dwReserved, IBinding* pib) { - DPRINT1("OnStartBinding not implemented\n"); - - return S_OK; + DPRINT1("OnStartBinding not implemented\n"); + + return S_OK; } static HRESULT WINAPI dlGetPriority(IBindStatusCallback* iface, LONG* pnPriority) { - DPRINT1("GetPriority not implemented\n"); - - return S_OK; + DPRINT1("GetPriority not implemented\n"); + + return S_OK; } static HRESULT WINAPI dlOnLowResource( IBindStatusCallback* iface, DWORD reserved) { - DPRINT1("OnLowResource not implemented\n"); - - return S_OK; + DPRINT1("OnLowResource not implemented\n"); + + return S_OK; } static HRESULT WINAPI dlOnProgress(IBindStatusCallback* iface, ULONG ulProgress, ULONG ulProgressMax, ULONG ulStatusCode, LPCWSTR szStatusText) { - IBindStatusCallbackImpl *This = (IBindStatusCallbackImpl *) iface; - HWND Item; - LONG r; - WCHAR OldText[100]; - - Item = GetDlgItem(This->hDialog, IDC_PROGRESS); - if (NULL != Item && 0 != ulProgressMax) - { - SendMessageW(Item, PBM_SETPOS, (ulProgress * 100) / ulProgressMax, 0); - } - - Item = GetDlgItem(This->hDialog, IDC_STATUS); - if (NULL != Item && NULL != szStatusText) - { - SendMessageW(Item, WM_GETTEXT, sizeof(OldText) / sizeof(OldText[0]), - (LPARAM) OldText); - if (sizeof(OldText) / sizeof(OldText[0]) - 1 <= wcslen(OldText) || - 0 != wcscmp(OldText, szStatusText)) + IBindStatusCallbackImpl *This = (IBindStatusCallbackImpl *) iface; + HWND Item; + LONG r; + WCHAR OldText[100]; + + Item = GetDlgItem(This->hDialog, IDC_PROGRESS); + if (NULL != Item && 0 != ulProgressMax) + { + SendMessageW(Item, PBM_SETPOS, (ulProgress * 100) / ulProgressMax, 0); + } + + Item = GetDlgItem(This->hDialog, IDC_STATUS); + if (NULL != Item && NULL != szStatusText) + { + SendMessageW(Item, WM_GETTEXT, sizeof(OldText) / sizeof(OldText[0]), + (LPARAM) OldText); + if (sizeof(OldText) / sizeof(OldText[0]) - 1 <= wcslen(OldText) || 0 != wcscmp(OldText, szStatusText)) { - SendMessageW(Item, WM_SETTEXT, 0, (LPARAM) szStatusText); + SendMessageW(Item, WM_SETTEXT, 0, (LPARAM) szStatusText); } } - SetLastError(0); - r = GetWindowLongPtrW(This->hDialog, GWLP_USERDATA); - if (0 != r || 0 != GetLastError()) - { - *This->pbCancelled = TRUE; - DPRINT("Cancelled\n"); - return E_ABORT; - } - - return S_OK; + SetLastError(0); + r = GetWindowLongPtrW(This->hDialog, GWLP_USERDATA); + if (0 != r || 0 != GetLastError()) + { + *This->pbCancelled = TRUE; + DPRINT("Cancelled\n"); + return E_ABORT; + } + + return S_OK; } static HRESULT WINAPI dlOnStopBinding(IBindStatusCallback* iface, HRESULT hresult, LPCWSTR szError) { - DPRINT1("OnStopBinding not implemented\n"); - - return S_OK; + DPRINT1("OnStopBinding not implemented\n"); + + return S_OK; } static HRESULT WINAPI dlGetBindInfo(IBindStatusCallback* iface, DWORD* grfBINDF, BINDINFO* pbindinfo) { - DPRINT1("GetBindInfo not implemented\n"); - - return S_OK; + DPRINT1("GetBindInfo not implemented\n"); + + return S_OK; } static HRESULT WINAPI dlOnDataAvailable(IBindStatusCallback* iface, DWORD grfBSCF, DWORD dwSize, FORMATETC* pformatetc, STGMEDIUM* pstgmed) { - DPRINT1("OnDataAvailable implemented\n"); - - return S_OK; + DPRINT1("OnDataAvailable implemented\n"); + + return S_OK; } static HRESULT WINAPI dlOnObjectAvailable(IBindStatusCallback* iface, REFIID riid, IUnknown* punk) { - DPRINT1("OnObjectAvailable implemented\n"); - - return S_OK; + DPRINT1("OnObjectAvailable implemented\n"); + + return S_OK; } static const IBindStatusCallbackVtbl dlVtbl = @@ -205,93 +204,124 @@ static IBindStatusCallback* CreateDl(HWND Dlg, BOOL *pbCancelled) { - IBindStatusCallbackImpl *This; - - This = HeapAlloc(GetProcessHeap(), 0, sizeof(IBindStatusCallbackImpl)); - This->vtbl = &dlVtbl; - This->ref = 1; - This->hDialog = Dlg; - This->pbCancelled = pbCancelled; - - return (IBindStatusCallback*) This; + IBindStatusCallbackImpl *This; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(IBindStatusCallbackImpl)); + This->vtbl = &dlVtbl; + This->ref = 1; + This->hDialog = Dlg; + This->pbCancelled = pbCancelled; + + return (IBindStatusCallback*) This; } static DWORD WINAPI ThreadFunc(LPVOID Context) { - //static const WCHAR szUrl[] = DownloadUrl; - IBindStatusCallback *dl; - WCHAR path[MAX_PATH]; - LPWSTR p; - STARTUPINFOW si; - PROCESS_INFORMATION pi; - HWND Dlg = (HWND) Context; - DWORD r; - BOOL bCancelled = FALSE; - 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); - } - 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; + //static const WCHAR szUrl[] = DownloadUrl; + IBindStatusCallback *dl; + WCHAR path[MAX_PATH]; + LPWSTR p; + STARTUPINFOW si; + PROCESS_INFORMATION pi; + HWND Dlg = (HWND) Context; + DWORD r; + BOOL bCancelled = FALSE; + BOOL bTempfile = FALSE; + HKEY hKey; + + /* built the path for the download */ + p = wcsrchr(SelectedApplication->Location, L'/'); + if (NULL == p) + { + goto end; + } + if (RegOpenKey(HKEY_LOCAL_MACHINE, + TEXT("Software\\ReactOS\\Download!"), + &hKey) != ERROR_SUCCESS) + { + goto end; + } + + DWORD dwSize = MAX_PATH; + if (RegQueryValueEx(hKey, + L"DownloadFolder", + NULL, + NULL, + (LPBYTE)&path, + &dwSize) != ERROR_SUCCESS) + { + goto end; + } + + if (GetFileAttributes(path) == 0xFFFFFFFF) + if (!CreateDirectory((LPCTSTR)path,NULL)) + { + goto end; + } + wcscat(path, L"\\"); + 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); + } + 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) + { + DWORD dwSize = sizeof(DWORD); + DWORD dwValue, dwType = REG_DWORD; + if (RegQueryValueEx(hKey, + L"DeleteInstaller", + NULL, + &dwType, + (LPBYTE)&dwValue, + &dwSize) == ERROR_SUCCESS) + if (dwValue == 0x1) + DeleteFileW(path); + RegCloseKey(hKey); + } + EndDialog(Dlg, 0); + return 0; } INT_PTR CALLBACK DownloadProc(HWND Dlg, UINT Msg, WPARAM wParam, LPARAM lParam) { - HANDLE Thread; - DWORD ThreadId; - HWND Item; - - switch (Msg) - { - case WM_INITDIALOG:/* + HANDLE Thread; + DWORD ThreadId; + HWND Item; + + switch (Msg) + { + case WM_INITDIALOG:/* Icon = LoadIconW((HINSTANCE) GetWindowLongPtr(Dlg, GWLP_HINSTANCE), MAKEINTRESOURCEW(IDI_ICON_MAIN)); if (NULL != Icon) @@ -299,12 +329,12 @@ SendMessageW(Dlg, WM_SETICON, ICON_BIG, (LPARAM) Icon); SendMessageW(Dlg, WM_SETICON, ICON_SMALL, (LPARAM) Icon); }*/ - SetWindowLongPtrW(Dlg, GWLP_USERDATA, 0); - Item = GetDlgItem(Dlg, IDC_PROGRESS); - if (NULL != Item) + SetWindowLongPtrW(Dlg, GWLP_USERDATA, 0); + Item = GetDlgItem(Dlg, IDC_PROGRESS); + if (NULL != Item) { - SendMessageW(Item, PBM_SETRANGE, 0, MAKELPARAM(0,100)); - SendMessageW(Item, PBM_SETPOS, 0, 0); + SendMessageW(Item, PBM_SETRANGE, 0, MAKELPARAM(0,100)); + SendMessageW(Item, PBM_SETPOS, 0, 0); }/* Item = GetDlgItem(Dlg, IDC_REMOVE); if (NULL != Item) @@ -320,27 +350,27 @@ ShowWindow(Item, SW_HIDE); } }*/ - Thread = CreateThread(NULL, 0, ThreadFunc, Dlg, 0, &ThreadId); - if (NULL == Thread) - { - return FALSE; - } - CloseHandle(Thread); - return TRUE; + Thread = CreateThread(NULL, 0, ThreadFunc, Dlg, 0, &ThreadId); + if (NULL == Thread) + { + return FALSE; + } + CloseHandle(Thread); + return TRUE; case WM_COMMAND: - if (wParam == IDCANCEL) - { - SetWindowLongPtrW(Dlg, GWLP_USERDATA, 1); - PostMessage(Dlg, WM_CLOSE, 0, 0); - } - return FALSE; + if (wParam == IDCANCEL) + { + SetWindowLongPtrW(Dlg, GWLP_USERDATA, 1); + PostMessage(Dlg, WM_CLOSE, 0, 0); + } + return FALSE; case WM_CLOSE: EndDialog(Dlg, 0); return TRUE; default: - return FALSE; - } -} + return FALSE; + } +} Modified: trunk/rosapps/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/downloader.xml?… ============================================================================== --- trunk/rosapps/downloader/downloader.xml (original) +++ trunk/rosapps/downloader/downloader.xml Tue Oct 16 00:45:06 2007 @@ -161,6 +161,12 @@ <location>http://ovh.dl.sourceforge.net/sourceforge/lgames/lmarbles-1.0.6-win32.exe</location> </application> </category> + <category name="Science" icon="11"> + </category> + <category name="Edutainment" icon="12"> + </category> + <category name="Engineering" icon="13"> + </category> <category name="Tools" icon="7"> <application name="7-Zip"> <regname>7-Zip 4.52</regname> Modified: trunk/rosapps/downloader/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/lang/de-DE.rc?r… ============================================================================== --- trunk/rosapps/downloader/lang/de-DE.rc (original) +++ trunk/rosapps/downloader/lang/de-DE.rc Tue Oct 16 00:45:06 2007 @@ -10,28 +10,48 @@ PUSHBUTTON "Abbrechen", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP } +IDD_PROF DIALOGEX 6, 6, 267, 95 +STYLE WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Proferences" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Download folder:", -1, 6, 10, 140, 8 + EDITTEXT IDC_DOWNLOAD_FOLDER_EDIT, 6, 20, 205, 14, WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "C&hoose...", IDC_CHOOSE_BUTTON, 216, 20, 45, 14 + AUTOCHECKBOX "&Delete installation files after setup", IDC_DELINST_FILES_CHECKBOX, 8, 40, 210, 10, WS_GROUP + LTEXT "Update server:", -1, 6, 55, 140, 8 + EDITTEXT IDC_UPDATE_SERVER_EDIT, 6, 65, 255, 14, WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "&OK", IDOK, 147, 90, 54, 15 + PUSHBUTTON "&Cancel", IDCANCEL, 207, 90, 54, 15 +END + STRINGTABLE DISCARDABLE 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 links eine Kategorie. Dies ist Version 1.1." 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" IDS_UPDATE "Diese Funktion wurde noch nicht implementiert." IDS_HELP_TITLE "Hilfe" - IDS_HELP "Wählen Sie links eine Kategorie, wählen Sie eine Anwendung und drücken Sie die Download-Schaltfläche. Um die Anwendungsinformationen zu aktualisieren, drücken Sie die Schaltfläche neben der Hilfe-Schaltfläche." + IDS_HELP "Wählen Sie links eine Kategorie, wählen Sie eine Anwendung und drücken Sie die Download-Schaltfläche. Um die Anwendungsinformationen zu aktualisieren, drücken Sie die Schaltfläche neben der Hilfe-Schaltfläche." IDS_NO_APPS "In dieser Kategorie sind bisher noch keine Anwendungen. Sie können helfen, indem Sie Anwendungen hinzufügen." IDS_CHOOSE_APP "Bitte wählen Sie eine Anwendung." IDS_CHOOSE_SUB "Bitte wählen Sie eine Unterkategorie." - IDS_CHOOSE_CATEGORY "Bitte wählen Sie eine Kategorie." + IDS_CHOOSE_CATEGORY "Bitte wählen Sie eine Kategorie." IDS_CHOOSE_BOTH "Bitte wählen Sie eine Unterkategorie oder eine Anwendung." 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_DOWNLOAD_ERROR "Die Datei konnte nicht runtergeladen werden.\nBitte prüfen sie, ob eine Verbindung zum Internet besteht." IDS_VERSION "Version: " IDS_LICENCE "Lizenz: " IDS_MAINTAINER "Maintainer: " IDS_APPS_TITLE "Anwendungen" IDS_CATS_TITLE "Kategorien" + IDS_CHOOSE_FOLDER "Please, choose the folder..." + IDS_NOTCREATE_REGKEY "Could not create the registry key." + IDS_DOWNLOAD_FOLDER "Download!" + IDS_UNABLECREATE_FOLDER "Unable to create a folder with this name!" + IDS_UPDATE_URL "http://svn.reactos.org" END Modified: trunk/rosapps/downloader/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/lang/en-US.rc?r… ============================================================================== --- trunk/rosapps/downloader/lang/en-US.rc (original) +++ trunk/rosapps/downloader/lang/en-US.rc Tue Oct 16 00:45:06 2007 @@ -10,28 +10,48 @@ PUSHBUTTON "Cancel", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP } +IDD_PROF DIALOGEX 6, 6, 267, 110 +STYLE WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Proferences" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Download folder:", -1, 6, 10, 140, 8 + EDITTEXT IDC_DOWNLOAD_FOLDER_EDIT, 6, 20, 205, 14, WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "C&hoose...", IDC_CHOOSE_BUTTON, 216, 20, 45, 14 + AUTOCHECKBOX "&Delete installation files after setup", IDC_DELINST_FILES_CHECKBOX, 8, 40, 210, 10, WS_GROUP + LTEXT "Update server:", -1, 6, 55, 140, 8 + EDITTEXT IDC_UPDATE_SERVER_EDIT, 6, 65, 255, 14, WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "&OK", IDOK, 147, 90, 54, 15 + PUSHBUTTON "&Cancel", IDCANCEL, 207, 90, 54, 15 +END + STRINGTABLE DISCARDABLE 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 left. This is version 1.1." 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" IDS_UPDATE "Sorry this feature is not implemented yet." IDS_HELP_TITLE "Help" - IDS_HELP "Choose a category on the left, then choose a application and click the download button. To update the application information click the button next to the help button." + IDS_HELP "Choose a category on the left, then choose a application and click the download button. To update the application information click the button next to the help button." IDS_NO_APPS "Sorry, there no applications in this category yet. You can help and add more applications." IDS_CHOOSE_APP "Please choose an application." IDS_CHOOSE_SUB "Please choose a subcategory." - IDS_CHOOSE_CATEGORY "Please choose a category." + IDS_CHOOSE_CATEGORY "Please choose a category." IDS_CHOOSE_BOTH "Please choose a subcategory or an application." 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 your internet connection." + IDS_DOWNLOAD_ERROR "Unable to download the file.\nPlease check your internet connection." IDS_VERSION "Version: " IDS_LICENCE "Licence: " IDS_MAINTAINER "Maintainer: " IDS_APPS_TITLE "Applications" IDS_CATS_TITLE "Categories" + IDS_CHOOSE_FOLDER "Please, choose the folder..." + IDS_NOTCREATE_REGKEY "Could not create the registry key." + IDS_DOWNLOAD_FOLDER "Download!" + IDS_UNABLECREATE_FOLDER "Unable to create a folder with this name!" + IDS_UPDATE_URL "http://svn.reactos.org" END Modified: trunk/rosapps/downloader/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/lang/es-ES.rc?r… ============================================================================== --- trunk/rosapps/downloader/lang/es-ES.rc (original) +++ trunk/rosapps/downloader/lang/es-ES.rc Tue Oct 16 00:45:06 2007 @@ -10,28 +10,48 @@ PUSHBUTTON "Cancel", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP } +IDD_PROF DIALOGEX 6, 6, 267, 95 +STYLE WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Proferences" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Download folder:", -1, 6, 10, 140, 8 + EDITTEXT IDC_DOWNLOAD_FOLDER_EDIT, 6, 20, 205, 14, WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "C&hoose...", IDC_CHOOSE_BUTTON, 216, 20, 45, 14 + AUTOCHECKBOX "&Delete installation files after setup", IDC_DELINST_FILES_CHECKBOX, 8, 40, 210, 10, WS_GROUP + LTEXT "Update server:", -1, 6, 55, 140, 8 + EDITTEXT IDC_UPDATE_SERVER_EDIT, 6, 65, 255, 14, WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "&OK", IDOK, 147, 90, 54, 15 + PUSHBUTTON "&Cancel", IDCANCEL, 207, 90, 54, 15 +END + STRINGTABLE DISCARDABLE BEGIN IDS_WINDOW_TITLE "¡Descargar! - Descargador de ReactOS" IDS_WELCOME_TITLE "Bienvenido al descargador de ReactOS" - IDS_WELCOME "Por favor selecciona una categoría de la izquierda. Esta es la versión 1.0." + IDS_WELCOME "Por favor selecciona una categoría de la izquierda. Esta es la versión 1.1." IDS_NO_APP_TITLE "Ninguna aplicación seleccionada" 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 "Actualizar" IDS_UPDATE "Perdona esta característica no a sido implementada todavía." IDS_HELP_TITLE "Ayuda" - IDS_HELP "Selecciona una categoría de la izquierda, entonces selecciona una aplicación y pulda el botón de descargar. Para actualizar la información de la aplicación pulsa el botón junto al botón de ayuda." + IDS_HELP "Selecciona una categoría de la izquierda, entonces selecciona una aplicación y pulda el botón de descargar. Para actualizar la información de la aplicación pulsa el botón junto al botón de ayuda." IDS_NO_APPS "Perdón, aun no hay ninguna aplicación en esta categoría. Puedes ayudar y añadir más aplicaciones." IDS_CHOOSE_APP "Por favor selecciona una aplicación." IDS_CHOOSE_SUB "Por favor selecciona una subcategoría." - IDS_CHOOSE_CATEGORY "Por favor selecciona una categoría." + IDS_CHOOSE_CATEGORY "Por favor selecciona una categoría." IDS_CHOOSE_BOTH "Por favor selecciona una subcategoria o una aplicación." IDS_XMLERROR_1 "¡No se a encontrado el archivo xml!" IDS_XMLERROR_2 "¡No se ha podido analizar el archivo xml!" - IDS_DOWNLOAD_ERROR "Imposible descargar el archivo.\nPor favor verifica tu conexión a internet." + IDS_DOWNLOAD_ERROR "Imposible descargar el archivo.\nPor favor verifica tu conexión a internet." IDS_VERSION "Version: " IDS_LICENCE "Licence: " IDS_MAINTAINER "Maintainer: " IDS_APPS_TITLE "Applications" IDS_CATS_TITLE "Categories" + IDS_CHOOSE_FOLDER "Please, choose the folder..." + IDS_NOTCREATE_REGKEY "Could not create the registry key." + IDS_DOWNLOAD_FOLDER "Download!" + IDS_UNABLECREATE_FOLDER "Unable to create a folder with this name!" + IDS_UPDATE_URL "http://svn.reactos.org" END Modified: trunk/rosapps/downloader/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/lang/fr-FR.rc?r… ============================================================================== --- trunk/rosapps/downloader/lang/fr-FR.rc (original) +++ trunk/rosapps/downloader/lang/fr-FR.rc Tue Oct 16 00:45:06 2007 @@ -10,28 +10,48 @@ PUSHBUTTON "Annuler", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP } +IDD_PROF DIALOGEX 6, 6, 267, 95 +STYLE WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Proferences" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Download folder:", -1, 6, 10, 140, 8 + EDITTEXT IDC_DOWNLOAD_FOLDER_EDIT, 6, 20, 205, 14, WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "C&hoose...", IDC_CHOOSE_BUTTON, 216, 20, 45, 14 + AUTOCHECKBOX "&Delete installation files after setup", IDC_DELINST_FILES_CHECKBOX, 8, 40, 210, 10, WS_GROUP + LTEXT "Update server:", -1, 6, 55, 140, 8 + EDITTEXT IDC_UPDATE_SERVER_EDIT, 6, 65, 255, 14, WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "&OK", IDOK, 147, 90, 54, 15 + PUSHBUTTON "&Cancel", IDCANCEL, 207, 90, 54, 15 +END + STRINGTABLE DISCARDABLE BEGIN IDS_WINDOW_TITLE "Télécharger ! - Téléchargeur de ReactOS" IDS_WELCOME_TITLE "Bienvenue dans le Téléchargeur de ReactOS" - IDS_WELCOME "Veuillez choisir une catégorie sur la gauche. C'est la version 1.0." + IDS_WELCOME "Veuillez choisir une catégorie sur la gauche. C'est la version 1.1." IDS_NO_APP_TITLE "Aucune application selectionnée" IDS_NO_APP "Veuillez sélectionner une application avant de cliquer sur le bouton Télécharger, si vous avez besoin d'aide, veuillez cliquer sur le point d'interrogation dans le coin supérieur droit." IDS_UPDATE_TITLE "Mise à jour" IDS_UPDATE "Désolé, cette fonctionnalité n'est pas encore implémentée." IDS_HELP_TITLE "Aide" - IDS_HELP "Choisissez une catégorie sur la gauche, puis choisissez une application et cliquez sur le bouton Télécharger. Pour mettre à jour les informations sur l'application, cliquez sur le bouton à côté du bouton d'aide." + IDS_HELP "Choisissez une catégorie sur la gauche, puis choisissez une application et cliquez sur le bouton Télécharger. Pour mettre à jour les informations sur l'application, cliquez sur le bouton à côté du bouton d'aide." IDS_NO_APPS "Désolé, il n'y a pas encore d'application dans cette catégorie. Vous pouvez contribuer et ajouter plus d'applications." IDS_CHOOSE_APP "Veuillez choisir une application." IDS_CHOOSE_SUB "Veuillez choisir une sous-catégorie." - IDS_CHOOSE_CATEGORY "Veuillez choisir une catégorie." + IDS_CHOOSE_CATEGORY "Veuillez choisir une catégorie." IDS_CHOOSE_BOTH "Veuillez choisir une sous-catégorie ou une application." 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_DOWNLOAD_ERROR "Impossible de télécharger le fichier.\nVeuillez vérifier votre connexion Internet." IDS_VERSION "Version: " IDS_LICENCE "Licence: " IDS_MAINTAINER "Maintainer: " IDS_APPS_TITLE "Applications" IDS_CATS_TITLE "Catégories" + IDS_CHOOSE_FOLDER "Please, choose the folder..." + IDS_NOTCREATE_REGKEY "Could not create the registry key." + IDS_DOWNLOAD_FOLDER "Download!" + IDS_UNABLECREATE_FOLDER "Unable to create a folder with this name!" + IDS_UPDATE_URL "http://svn.reactos.org" END Modified: trunk/rosapps/downloader/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/lang/id-ID.rc?r… ============================================================================== --- trunk/rosapps/downloader/lang/id-ID.rc (original) +++ trunk/rosapps/downloader/lang/id-ID.rc Tue Oct 16 00:45:06 2007 @@ -10,28 +10,48 @@ PUSHBUTTON "Batal", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP } +IDD_PROF DIALOGEX 6, 6, 267, 95 +STYLE WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Proferences" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Download folder:", -1, 6, 10, 140, 8 + EDITTEXT IDC_DOWNLOAD_FOLDER_EDIT, 6, 20, 205, 14, WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "C&hoose...", IDC_CHOOSE_BUTTON, 216, 20, 45, 14 + AUTOCHECKBOX "&Delete installation files after setup", IDC_DELINST_FILES_CHECKBOX, 8, 40, 210, 10, WS_GROUP + LTEXT "Update server:", -1, 6, 55, 140, 8 + EDITTEXT IDC_UPDATE_SERVER_EDIT, 6, 65, 255, 14, WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "&OK", IDOK, 147, 90, 54, 15 + PUSHBUTTON "&Cancel", IDCANCEL, 207, 90, 54, 15 +END + STRINGTABLE DISCARDABLE BEGIN IDS_WINDOW_TITLE "Download ! - ReactOS Downloader" IDS_WELCOME_TITLE "Selamat datang di ReactOS Downloader" - IDS_WELCOME "Silahkan pilih kategori di sebelah kiri. Ini versi 1.0." + IDS_WELCOME "Silahkan pilih kategori di sebelah kiri. Ini versi 1.1." IDS_NO_APP_TITLE "Tidak ada aplikasi yang dipilih" IDS_NO_APP "Silahkan pilih Aplikasi sebelum anda mengklik tombol download, jika anda membutuhkan asistensi silahkan klik pada tombol di sudut kanan atas." IDS_UPDATE_TITLE "Mutakhirkan" IDS_UPDATE "Maaf fitur ini belum diimplementasikan." IDS_HELP_TITLE "Bantuan" - IDS_HELP "Pilih kategori di sisi kiri, lalu pilih aplikasi dan klik tombol download. Untuk memutakhirkan informasi aplikasi klik tombol disebelah tombol bantuan." + IDS_HELP "Pilih kategori di sisi kiri, lalu pilih aplikasi dan klik tombol download. Untuk memutakhirkan informasi aplikasi klik tombol disebelah tombol bantuan." IDS_NO_APPS "Maaf, belum ada aplikasi dalam kategori ini. Anda dapat membantu dan menambahkan aplikasi lebih banyak." IDS_CHOOSE_APP "Silahkan pilih aplikasi." IDS_CHOOSE_SUB "Silahkan pilih subkategori." - IDS_CHOOSE_CATEGORY "Silahkan pilih kategori." + IDS_CHOOSE_CATEGORY "Silahkan pilih kategori." IDS_CHOOSE_BOTH "Silahkan pilih subkategori atau aplikasi." 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_DOWNLOAD_ERROR "Tidak bisa mendownload file.\nSilahkan periksa koneksi internet anda." IDS_VERSION "Versi: " IDS_LICENCE "Lisensi: " IDS_MAINTAINER "Pemelihara: " IDS_APPS_TITLE "Applications" IDS_CATS_TITLE "Categories" + IDS_CHOOSE_FOLDER "Please, choose the folder..." + IDS_NOTCREATE_REGKEY "Could not create the registry key." + IDS_DOWNLOAD_FOLDER "Download!" + IDS_UNABLECREATE_FOLDER "Unable to create a folder with this name!" + IDS_UPDATE_URL "http://svn.reactos.org" END Modified: trunk/rosapps/downloader/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/lang/it-IT.rc?r… ============================================================================== --- trunk/rosapps/downloader/lang/it-IT.rc (original) +++ trunk/rosapps/downloader/lang/it-IT.rc Tue Oct 16 00:45:06 2007 @@ -10,28 +10,48 @@ PUSHBUTTON "Cancel", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP } +IDD_PROF DIALOGEX 6, 6, 267, 95 +STYLE WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Proferences" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Download folder:", -1, 6, 10, 140, 8 + EDITTEXT IDC_DOWNLOAD_FOLDER_EDIT, 6, 20, 205, 14, WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "C&hoose...", IDC_CHOOSE_BUTTON, 216, 20, 45, 14 + AUTOCHECKBOX "&Delete installation files after setup", IDC_DELINST_FILES_CHECKBOX, 8, 40, 210, 10, WS_GROUP + LTEXT "Update server:", -1, 6, 55, 140, 8 + EDITTEXT IDC_UPDATE_SERVER_EDIT, 6, 65, 255, 14, WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "&OK", IDOK, 147, 90, 54, 15 + PUSHBUTTON "&Cancel", IDCANCEL, 207, 90, 54, 15 +END + STRINGTABLE DISCARDABLE BEGIN IDS_WINDOW_TITLE "Download ! - ReactOS Downloader" IDS_WELCOME_TITLE "Benvenuto al ReactOS Downloader" - IDS_WELCOME "Scegli una categoria a sinistra. Questa è la versione 1.0." + IDS_WELCOME "Scegli una categoria a sinistra. Questa è la versione 1.1." IDS_NO_APP_TITLE "Nessuna applicazione selezionata" IDS_NO_APP "Scegli una Applicazione prima di premere il bottone di download, se serve assistenza clicca sul punto di domanda nell'angolo in alto a destra." IDS_UPDATE_TITLE "Aggiorna" IDS_UPDATE "Funzione non ancora implementata." IDS_HELP_TITLE "Aiuto" - IDS_HELP "Scegli una categoria a sinistra, poi scegli una applicazione e clicca il bottone download. Per aggiornare le informazioni sulla applicazione clicca il bottone accanto a quello di aiuto." + IDS_HELP "Scegli una categoria a sinistra, poi scegli una applicazione e clicca il bottone download. Per aggiornare le informazioni sulla applicazione clicca il bottone accanto a quello di aiuto." IDS_NO_APPS "Non ci sono ancora applicazioni in questa categoria. Puoi aiutare aggiungendone altre." IDS_CHOOSE_APP "Scegli una applicazione." IDS_CHOOSE_SUB "Scegli una sottocategoria." - IDS_CHOOSE_CATEGORY "Scegli una categoria." + IDS_CHOOSE_CATEGORY "Scegli una categoria." IDS_CHOOSE_BOTH "Scegli una sottocategoria o una applicazione." 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_DOWNLOAD_ERROR "Download del file impossibile.\nVerifica la connessione a Internet." IDS_VERSION "Versione: " IDS_LICENCE "Licenza: " IDS_MAINTAINER "Manutentore: " IDS_APPS_TITLE "Applications" IDS_CATS_TITLE "Categories" + IDS_CHOOSE_FOLDER "Please, choose the folder..." + IDS_NOTCREATE_REGKEY "Could not create the registry key." + IDS_DOWNLOAD_FOLDER "Download!" + IDS_UNABLECREATE_FOLDER "Unable to create a folder with this name!" + IDS_UPDATE_URL "http://svn.reactos.org" END Modified: trunk/rosapps/downloader/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/lang/ru-RU.rc?r… ============================================================================== --- trunk/rosapps/downloader/lang/ru-RU.rc (original) +++ trunk/rosapps/downloader/lang/ru-RU.rc Tue Oct 16 00:45:06 2007 @@ -8,32 +8,52 @@ FONT 8, "MS Shell Dlg" { CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 - LTEXT "", IDC_STATUS, 10, 30, 200, 10, SS_CENTER + LTEXT "", IDC_STATUS, 10, 30, 200, 17, SS_CENTER PUSHBUTTON "Îòìåíà", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP } +IDD_PROF DIALOGEX 6, 6, 267, 110 +STYLE WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Íàñòðîéêè" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Ïàïêà äëÿ çàêà÷êè:", -1, 6, 10, 140, 8 + EDITTEXT IDC_DOWNLOAD_FOLDER_EDIT, 6, 20, 205, 14, WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Âûáðàòü...", IDC_CHOOSE_BUTTON, 216, 20, 45, 14 + AUTOCHECKBOX "&Óäàëÿòü óñòàíîâî÷íûå ôàéëû ïîñëå óñòàíîâêè", IDC_DELINST_FILES_CHECKBOX, 8, 40, 210, 10, WS_GROUP + LTEXT "Ñåðâåð îáíîâëåíèé:", -1, 6, 55, 140, 8 + EDITTEXT IDC_UPDATE_SERVER_EDIT, 6, 65, 255, 14, WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "&OK", IDOK, 147, 90, 54, 15 + PUSHBUTTON "Î&òìåíà", IDCANCEL, 207, 90, 54, 15 +END + STRINGTABLE DISCARDABLE BEGIN - IDS_WINDOW_TITLE "Ñêà÷àòü! - ReactOS Downloader" - IDS_WELCOME_TITLE "Äîáðî ïîæàëîâàòü â ReactOS Downloader" - IDS_WELCOME "Ïîæàëóéñòà âûáåðèòå êàòåãîðèþ ñïðàâà. Âåðñèÿ 1.0." + IDS_WINDOW_TITLE "Ñêà÷àòü! - Ìåíåäæåð çàêà÷åê ReactOS" + IDS_WELCOME_TITLE "Äîáðî ïîæàëîâàòü â Ìåíåäæåð çàêà÷åê ReactOS" + IDS_WELCOME "Ïîæàëóéñòà âûáåðèòå êàòåãîðèþ ñïðàâà. Âåðñèÿ 1.1" IDS_NO_APP_TITLE "Ïðèëîæåíèå íå âûáðàíî" IDS_NO_APP "Ïîæàëóéñòà, âûáåðèòå ïðèëîæåíèå ïðåæäå, ÷åì íàæàòü êíîïêó çàãðóçêè. Åñëè âàì íóæíà ñïðàâêà, òî íàæìèòå êíîïêó ñî çíàêîì âîïðîñà â âåðõíåì ïðàâîì óãëó." IDS_UPDATE_TITLE "Îáíîâèòü" IDS_UPDATE "Èçâåíèòå, äàííàÿ âîçìîæíîñòü íà äàííûì ìîìåíò íåäîñòóïíà." IDS_HELP_TITLE "Ñïðàâêà" - IDS_HELP "Âûáåðèòå êàòåãîðèþ ñëåâà, çàòåì âûáåðèòå ïðèëîæåíèå è íàæìèòå êíîïêó çàãðóçêè. Äëÿ ïîëó÷åíèÿ èíôîðìàöèè îá îáíîâëåíèÿõ íàæìèòå êíîïêó ðÿäîì ñ êíîïêîé ñïðàâêè." + IDS_HELP "Âûáåðèòå êàòåãîðèþ ñëåâà, çàòåì âûáåðèòå ïðèëîæåíèå è íàæìèòå êíîïêó çàãðóçêè. Äëÿ ïîëó÷åíèÿ èíôîðìàöèè îá îáíîâëåíèÿõ íàæìèòå êíîïêó ðÿäîì ñ êíîïêîé ñïðàâêè." IDS_NO_APPS "Èçâåíèòå, íà äàííûé ìîìåíò â ýòîé êàòåãîðèè ïðèëîæåíèé íåò, íî âû ìîæåòå ïîìî÷ü äîáàâèòü èõ." IDS_CHOOSE_APP "Ïîæàëóéñòà âûáåðèòå ïðèëîæåíèå." IDS_CHOOSE_SUB "Ïîæàëóéñòà âûáåðèòå ïîäêàòåãîðèþ." - IDS_CHOOSE_CATEGORY "Ïîæàëóéñòà âûáåðèòå êàòåãîðèþ." + IDS_CHOOSE_CATEGORY "Ïîæàëóéñòà âûáåðèòå êàòåãîðèþ." IDS_CHOOSE_BOTH "Ïîæàëóéñòà âûáåðèòå ïîäêàòåãîðèþ èëè ïðèëîæåíèå." IDS_XMLERROR_1 "Íå óäàëîñü íàéòè xml-ôàéë!" IDS_XMLERROR_2 "Íå óäàëîñü îáðàáîòàòü xml-ôàéë!" - IDS_DOWNLOAD_ERROR "Íå óäàåòñÿ çàãðóçèòü ôàéë.\nÏîæàëóéñòà ïðîâåðüòå âàøå ïîäêëþ÷åíèå ê èíòåðíåò." + IDS_DOWNLOAD_ERROR "Íå óäàåòñÿ çàãðóçèòü ôàéë.\nÏîæàëóéñòà ïðîâåðüòå âàøå ïîäêëþ÷åíèå ê èíòåðíåò." IDS_VERSION "Âåðñèÿ: " IDS_LICENCE "Ëèöåíçèÿ: " IDS_MAINTAINER "Ïðîèçâîäèòåëü: " - IDS_APPS_TITLE "Applications" - IDS_CATS_TITLE "Categories" + IDS_APPS_TITLE "Ïðèëîæåíèÿ" + IDS_CATS_TITLE "Êàòåãîðèè" + IDS_CHOOSE_FOLDER "Ïîæàëóéñòâà âûáåðèòå ïàïêó..." + IDS_NOTCREATE_REGKEY "Íå óäàëîñü ñîçäàòü êëþ÷ â ðååñòðå." + IDS_DOWNLOAD_FOLDER "Ñêà÷àòü!" + IDS_UNABLECREATE_FOLDER "Íå óäàëîñü ñîçäàòü ïàïêó ñ òàêèì èìåíåì!" + IDS_UPDATE_URL "http://svn.reactos.org" END Modified: trunk/rosapps/downloader/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/lang/uk-UA.rc?r… ============================================================================== --- trunk/rosapps/downloader/lang/uk-UA.rc (original) +++ trunk/rosapps/downloader/lang/uk-UA.rc Tue Oct 16 00:45:06 2007 @@ -18,28 +18,48 @@ PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP } +IDD_PROF DIALOGEX 6, 6, 267, 95 +STYLE WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Proferences" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Download folder:", -1, 6, 10, 140, 8 + EDITTEXT IDC_DOWNLOAD_FOLDER_EDIT, 6, 20, 205, 14, WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "C&hoose...", IDC_CHOOSE_BUTTON, 216, 20, 45, 14 + AUTOCHECKBOX "&Delete installation files after setup", IDC_DELINST_FILES_CHECKBOX, 8, 40, 210, 10, WS_GROUP + LTEXT "Update server:", -1, 6, 55, 140, 8 + EDITTEXT IDC_UPDATE_SERVER_EDIT, 6, 65, 255, 14, WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "&OK", IDOK, 147, 90, 54, 15 + PUSHBUTTON "&Cancel", IDCANCEL, 207, 90, 54, 15 +END + STRINGTABLE DISCARDABLE BEGIN IDS_WINDOW_TITLE "Çàâàíòàæèòè ! - Çàâàíòàæóâà÷ ReactOS" IDS_WELCOME_TITLE "Ëàñêàâî ïðîñèìî ó Çàâàíòàæóâà÷ ReactOS" - IDS_WELCOME "Áóäü ëàñêà âèáåð³òü êàòåãîð³þ çë³âà. Öå âåðñ³ÿ 1.0." + IDS_WELCOME "Áóäü ëàñêà âèáåð³òü êàòåãîð³þ çë³âà. Öå âåðñ³ÿ 1.1." IDS_NO_APP_TITLE "Äîäàòîê íå âèáðàíèé" IDS_NO_APP "Áóäü ëàñêà, âèáåð³òü äîäàòîê ïåðø í³æ íàòèñíóòè êíîïêó çàâàíòàæåííÿ. ßêùî Âàì ïîòð³áíà äîïîìîãà, íàòèñí³òü êíîïêó ç³ çíàêîì ïèòàííÿ ó âåðõíüîìó ïðàâîìó êóòêó." IDS_UPDATE_TITLE "Îíîâèòè" IDS_UPDATE "Âèáà÷òå, äàíà ìîæëèâ³ñòü ùå íåäîñòóïíà." IDS_HELP_TITLE "Äîâ³äêà" - IDS_HELP "Âèáåð³òü êàòåãîð³þ çë³âà, ïîò³ì âèáåð³òü äîäàòîê ³ íàòèñí³òü êíîïêó çàâàíòàæåííÿ. Äëÿ îòðèìàííÿ ³íôîðìàö³¿ ïðî îíîâëåííÿ íàòèñí³òü êíîïêó ïîðÿä ç êíîïêîþ äîâ³äêè." + IDS_HELP "Âèáåð³òü êàòåãîð³þ çë³âà, ïîò³ì âèáåð³òü äîäàòîê ³ íàòèñí³òü êíîïêó çàâàíòàæåííÿ. Äëÿ îòðèìàííÿ ³íôîðìàö³¿ ïðî îíîâëåííÿ íàòèñí³òü êíîïêó ïîðÿä ç êíîïêîþ äîâ³äêè." IDS_NO_APPS "Âèáà÷òå, â ö³é êàòåãîð³¿ ùå íåìàº äîäàòê³â. Âè ìîæåòå äîïîìîãòè ³ äîäàòè á³ëüøå äîäàòê³â." IDS_CHOOSE_APP "Áóäü ëàñêà âèáåð³òü äîäàòîê." IDS_CHOOSE_SUB "Áóäü ëàñêà âèáåð³òü ï³äêàòåãîð³þ." - IDS_CHOOSE_CATEGORY "Áóäü ëàñêà âèáåð³òü êàòåãîð³þ." + IDS_CHOOSE_CATEGORY "Áóäü ëàñêà âèáåð³òü êàòåãîð³þ." IDS_CHOOSE_BOTH "Áóäü ëàñêà âèáåð³òü ï³äêàòåãîð³þ àáî äîäàòîê." IDS_XMLERROR_1 "Íå âäàëîñÿ çíàéòè ôàéë xml !" IDS_XMLERROR_2 "Íå âäàëîñÿ îáðîáèòè ôàéë xml !" - IDS_DOWNLOAD_ERROR "Íåìîæëèâî çàâàíòàæèòè ôàéë.\nÁóäü ëàñêà ïåðåâ³ðòå âàøå ³íòåðíåò-ç'ºäíàííÿ." + IDS_DOWNLOAD_ERROR "Íåìîæëèâî çàâàíòàæèòè ôàéë.\nÁóäü ëàñêà ïåðåâ³ðòå âàøå ³íòåðíåò-ç'ºäíàííÿ." IDS_VERSION "Âåðñ³ÿ: " IDS_LICENCE "Ë³öåíç³ÿ: " IDS_MAINTAINER "Âèðîáíèê: " IDS_APPS_TITLE "Applications" IDS_CATS_TITLE "Categories" + IDS_CHOOSE_FOLDER "Please, choose the folder..." + IDS_NOTCREATE_REGKEY "Could not create the registry key." + IDS_DOWNLOAD_FOLDER "Download!" + IDS_UNABLECREATE_FOLDER "Unable to create a folder with this name!" + IDS_UPDATE_URL "http://svn.reactos.org" END Modified: trunk/rosapps/downloader/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/main.c?rev=2961… ============================================================================== --- trunk/rosapps/downloader/main.c (original) +++ trunk/rosapps/downloader/main.c Tue Oct 16 00:45:06 2007 @@ -8,14 +8,14 @@ #include <windows.h> #include <commctrl.h> #include <richedit.h> +#include <tchar.h> #include <stdio.h> #include <shlwapi.h> +#include <shlobj.h> #include "resources.h" #include "structures.h" -#define XML_PATH "C:\\ReactOS\\system32\\downloader.xml" - -HWND hwnd, hCategories, hApps, hDownloadButton, hUninstallButton, hUpdateButton, hHelpButton; +HWND hwnd, hCategories, hApps, hDownloadButton, hUninstallButton, hUpdateButton, hHelpButton, hProfButton; HBITMAP hLogo, hUnderline; WCHAR* DescriptionHeadline = L""; WCHAR* DescriptionText = L""; @@ -30,7 +30,8 @@ WCHAR Strings [STRING_COUNT][MAX_STRING_LENGHT]; -BOOL getUninstaller(WCHAR* RegName, WCHAR* Uninstaller) { +BOOL +getUninstaller(WCHAR* RegName, WCHAR* Uninstaller) { const DWORD ArraySize = 200; @@ -69,7 +70,8 @@ return FALSE; } -void ShowMessage (WCHAR* title, WCHAR* message) +void +ShowMessage (WCHAR* title, WCHAR* message) { DescriptionHeadline = title; DescriptionText = message; @@ -77,7 +79,8 @@ UpdateWindow(hwnd); } -void AddItems (HWND hwnd, struct Category* Category, struct Category* Parent) +void +AddItems(HWND hwnd, struct Category* Category, struct Category* Parent) { TV_INSERTSTRUCTW Insert; @@ -99,7 +102,8 @@ AddItems (hwnd,Category->Children,Category); } -void CategoryChoosen (HWND hwnd, struct Category* Category) +void +CategoryChoosen(HWND hwnd, struct Category* Category) { struct Application* CurrentApplication; TV_INSERTSTRUCTW Insert; @@ -139,39 +143,84 @@ } } -BOOL SetupControls (HWND hwnd) +BOOL +SetupControls (HWND hwnd) { TV_INSERTSTRUCTW Insert = {0}; HIMAGELIST hImageList; HINSTANCE hInstance = GetModuleHandle(NULL); WCHAR Cats[MAX_STRING_LENGHT], Apps[MAX_STRING_LENGHT]; - + TCHAR Buf[MAX_PATH]; + char Tmp[MAX_PATH]; + int i; + + // Getting downloader.xml path + if(!GetSystemDirectory(Buf,sizeof(Buf)/sizeof(char))) return FALSE; + lstrcat((LPTSTR)Buf, L"\\downloader.xml"); + for (i = 0; i < _tcslen(Buf) + 1; i++) Tmp[i] = Buf[i]; + // Parse the XML file - if (ProcessXML (XML_PATH, &Root) == FALSE) + if (!ProcessXML(Tmp, &Root)) return FALSE; - LoadStringW(hInstance, IDS_CATS_TITLE, Cats, MAX_STRING_LENGHT); - LoadStringW(hInstance, IDS_APPS_TITLE, Apps, MAX_STRING_LENGHT); + LoadStringW(hInstance, IDS_CATS_TITLE, Cats, MAX_STRING_LENGHT); + LoadStringW(hInstance, IDS_APPS_TITLE, Apps, MAX_STRING_LENGHT); // Set up the controls - hCategories = CreateWindowExW(0, WC_TREEVIEWW, Cats, WS_CHILD|WS_VISIBLE|WS_BORDER|TVS_HASLINES|TVS_LINESATROOT|TVS_HASBUTTONS|TVS_SHOWSELALWAYS, + hCategories = CreateWindowExW(0, WC_TREEVIEWW, Cats, + WS_CHILD|WS_VISIBLE|WS_BORDER|TVS_HASLINES|TVS_LINESATROOT|TVS_HASBUTTONS|TVS_SHOWSELALWAYS, + 0, 0, 0, 0, hwnd, NULL, hInstance, NULL); + + hApps = CreateWindowExW(0, WC_TREEVIEWW, Apps, + WS_CHILD|WS_VISIBLE|WS_BORDER|TVS_HASLINES|TVS_LINESATROOT|TVS_HASBUTTONS|TVS_SHOWSELALWAYS, 0, 0, 0, 0, hwnd, NULL, hInstance, NULL); - hApps = CreateWindowExW(0, WC_TREEVIEWW, Apps, WS_CHILD|WS_VISIBLE|WS_BORDER|TVS_HASLINES|TVS_LINESATROOT|TVS_HASBUTTONS|TVS_SHOWSELALWAYS, - 0, 0, 0, 0, hwnd, NULL, hInstance, NULL); - - hLogo = LoadBitmap(GetModuleHandle(NULL), MAKEINTRESOURCE(IDB_LOGO)); - hUnderline = LoadBitmap(GetModuleHandle(NULL), MAKEINTRESOURCE(IDB_UNDERLINE)); - - 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, 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))); - SendMessageW(hDownloadButton, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP,(LPARAM)(HANDLE)LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_DOWNLOAD))); - SendMessageW(hUninstallButton, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP,(LPARAM)(HANDLE)LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_UNINSTALL))); + hLogo = LoadBitmap(GetModuleHandle(NULL), + MAKEINTRESOURCE(IDB_LOGO)); + hUnderline = LoadBitmap(GetModuleHandle(NULL), + MAKEINTRESOURCE(IDB_UNDERLINE)); + + hHelpButton = CreateWindowW(L"Button", L"", + WS_CHILD | WS_VISIBLE | BS_ICON, + 550, 10, 40, 40, + hwnd, 0, hInstance, NULL); + hUpdateButton = CreateWindowW(L"Button", L"", + WS_CHILD | WS_VISIBLE | BS_ICON, + 450, 10, 40, 40, + hwnd, 0, hInstance, NULL); + hProfButton = CreateWindowW(L"Button", L"", + WS_CHILD | WS_VISIBLE | BS_ICON, + 500, 10, 40, 40, + 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(hProfButton, + BM_SETIMAGE, + (WPARAM)IMAGE_ICON, + (LPARAM)(HANDLE)LoadIcon(hInstance,MAKEINTRESOURCE(IDI_PROF))); + SendMessageW(hHelpButton, + BM_SETIMAGE, + (WPARAM)IMAGE_ICON, + (LPARAM)(HANDLE)LoadIcon(hInstance, MAKEINTRESOURCE(IDI_HELP))); + SendMessageW(hUpdateButton, + BM_SETIMAGE, + (WPARAM)IMAGE_ICON, + (LPARAM)(HANDLE)LoadIcon(hInstance, MAKEINTRESOURCE(IDI_UPDATE))); + SendMessageW(hDownloadButton, + BM_SETIMAGE, + (WPARAM)IMAGE_BITMAP, + (LPARAM)(HANDLE)LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_DOWNLOAD))); + SendMessageW(hUninstallButton, + BM_SETIMAGE, + (WPARAM)IMAGE_BITMAP, + (LPARAM)(HANDLE)LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_UNINSTALL))); ShowWindow(hUninstallButton, SW_HIDE); // Set deflaut entry for hApps @@ -186,17 +235,34 @@ SendMessageW(hCategories, TVM_SETIMAGELIST, TVSIL_NORMAL, (LPARAM)(HIMAGELIST)hImageList); SendMessageW(hApps, TVM_SETIMAGELIST, TVSIL_NORMAL, (LPARAM)(HIMAGELIST)hImageList); - ImageList_Add(hImageList, LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_0)), NULL); - ImageList_Add(hImageList, LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_1)), NULL); - ImageList_Add(hImageList, LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_2)), NULL); - ImageList_Add(hImageList, LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_3)), NULL); - ImageList_Add(hImageList, LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_4)), NULL); - ImageList_Add(hImageList, LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_5)), NULL); - ImageList_Add(hImageList, LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_6)), NULL); - ImageList_Add(hImageList, LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_7)), NULL); - ImageList_Add(hImageList, LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_8)), NULL); - ImageList_Add(hImageList, LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_9)), NULL); - ImageList_Add(hImageList, LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_10)), NULL); + ImageList_Add(hImageList, + LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_0)), NULL); + ImageList_Add(hImageList, + LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_1)), NULL); + ImageList_Add(hImageList, + LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_2)), NULL); + ImageList_Add(hImageList, + LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_3)), NULL); + ImageList_Add(hImageList, + LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_4)), NULL); + ImageList_Add(hImageList, + LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_5)), NULL); + ImageList_Add(hImageList, + LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_6)), NULL); + ImageList_Add(hImageList, + LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_7)), NULL); + ImageList_Add(hImageList, + LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_8)), NULL); + ImageList_Add(hImageList, + LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_9)), NULL); + ImageList_Add(hImageList, + LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_10)), NULL); + ImageList_Add(hImageList, + LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_11)), NULL); + ImageList_Add(hImageList, + LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_12)), NULL); + ImageList_Add(hImageList, + LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_13)), NULL); // Fill the TreeViews AddItems (hCategories, Root.Children, NULL); @@ -204,13 +270,15 @@ return TRUE; } -static void ResizeControl (HWND hwnd, int x1, int y1, int x2, int y2) +static void +ResizeControl (HWND hwnd, int x1, int y1, int x2, int y2) { // Make resizing a little easier MoveWindow(hwnd, x1, y1, x2-x1, y2-y1, TRUE); } -static void DrawBitmap (HDC hdc, int x, int y, HBITMAP hBmp) +static void +DrawBitmap (HDC hdc, int x, int y, HBITMAP hBmp) { BITMAP bm; HDC hdcMem = CreateCompatibleDC(hdc); @@ -222,7 +290,8 @@ DeleteDC(hdcMem); } -static void DrawDescription (HDC hdc, RECT DescriptionRect) +static void +DrawDescription (HDC hdc, RECT DescriptionRect) { int i; HFONT Font; @@ -237,16 +306,16 @@ // Headline Font = CreateFont(-16 , 0, 0, 0, FW_EXTRABOLD, FALSE, FALSE, FALSE, ANSI_CHARSET, - OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, FF_DONTCARE, L"Arial"); + OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, FF_DONTCARE, L"Arial"); SelectObject(hdc, Font); DrawTextW(hdc, DescriptionHeadline, lstrlenW(DescriptionHeadline), &Rect, DT_SINGLELINE|DT_NOPREFIX); DeleteObject(Font); // Description Font = CreateFont(-13 , 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, - OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, FF_DONTCARE, L"Arial"); + OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, FF_DONTCARE, L"Arial"); SelectObject(hdc, Font); - Rect.top += 40; + Rect.top += 50; Rect.bottom = DescriptionRect.bottom-2; DrawTextW(hdc, DescriptionText, lstrlenW(DescriptionText), &Rect, DT_WORDBREAK|DT_NOPREFIX); // ToDo: Call TabbedTextOut to draw a nice table DeleteObject(Font); @@ -257,7 +326,7 @@ int Split_Vertical = 200; RECT Rect; - GetClientRect(hwnd,&Rect); + GetClientRect(hwnd,&Rect); ShowWindow(hUninstallButton,SW_SHOW); MoveWindow(hDownloadButton,(Split_Vertical+Rect.right-Rect.left)/2,Rect.bottom-Rect.top-45,140,35,TRUE);; } @@ -266,7 +335,7 @@ int Split_Vertical = 200; RECT Rect; - GetClientRect(hwnd,&Rect); + GetClientRect(hwnd,&Rect); ShowWindow(hUninstallButton,SW_HIDE); MoveWindow(hDownloadButton,(Split_Vertical+Rect.right-Rect.left)/2-70,Rect.bottom-Rect.top-45,140,35,TRUE); } @@ -281,10 +350,257 @@ 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) + hideUninstaller(); +} + +BOOL +SaveSettings(HWND hwnd) +{ + HKEY hKey; + TCHAR szBuf[MAX_PATH]; + + if (RegOpenKey(HKEY_LOCAL_MACHINE, + TEXT("Software\\ReactOS\\Download!"), + &hKey) != ERROR_SUCCESS) + return FALSE; + + SendMessage(GetDlgItem(hwnd, IDC_DOWNLOAD_FOLDER_EDIT), WM_GETTEXT, sizeof(szBuf)/sizeof(TCHAR), (LPARAM)szBuf); + if (GetFileAttributes(szBuf) == 0xFFFFFFFF) + if (!CreateDirectory((LPCTSTR)szBuf,NULL)) + { + LoadString(GetModuleHandle(NULL), IDS_UNABLECREATE_FOLDER, szBuf, sizeof(szBuf) / sizeof(TCHAR)); + MessageBox(hwnd, (LPCTSTR)szBuf, NULL, MB_ICONSTOP); + return FALSE; + } + if (RegSetValueEx(hKey, + L"DownloadFolder", + 0, + REG_SZ, + (LPBYTE)szBuf, + (DWORD)(sizeof(szBuf) / sizeof(TCHAR)))) + return FALSE; + + SendMessage(GetDlgItem(hwnd, IDC_UPDATE_SERVER_EDIT), WM_GETTEXT, sizeof(szBuf)/sizeof(TCHAR), (LPARAM)szBuf); + if (RegSetValueEx(hKey, + L"UpdateServer", + 0, + REG_SZ, + (LPBYTE)szBuf, + (DWORD)(sizeof(szBuf) / sizeof(TCHAR)))) + return FALSE; + + DWORD dwValue; + if (SendMessage(GetDlgItem(hwnd, IDC_DELINST_FILES_CHECKBOX), BM_GETCHECK, 0, 0) == BST_CHECKED) + dwValue = 0x1; + else + dwValue = 0x0; + if (RegSetValueEx(hKey, + L"DeleteInstaller", + 0, + REG_DWORD, + (LPBYTE)&dwValue, + sizeof(DWORD))) + return FALSE; + + RegCloseKey(hKey); + + return TRUE; +} + +BOOL +InitProfDlg(HWND hwnd) +{ + HKEY hKey; + TCHAR Buf[MAX_PATH]; + DWORD dwDisp, dwSize; + + if (RegOpenKey(HKEY_LOCAL_MACHINE, + TEXT("Software\\ReactOS\\Download!"), + &hKey) != ERROR_SUCCESS) + { + if (RegCreateKeyEx(HKEY_LOCAL_MACHINE, L"Software\\ReactOS\\Download!", + 0, NULL, REG_OPTION_NON_VOLATILE, + KEY_WRITE, NULL, &hKey, &dwDisp)) + { + LoadString(GetModuleHandle(NULL), IDS_NOTCREATE_REGKEY, Buf, sizeof(Buf) / sizeof(TCHAR)); + MessageBox(hwnd, (LPCTSTR)Buf, NULL, MB_ICONSTOP); + return FALSE; + } + } + + dwSize = MAX_PATH; + if (RegQueryValueEx(hKey, + L"DownloadFolder", + NULL, + NULL, + (LPBYTE)&Buf, + &dwSize) == ERROR_SUCCESS) + { + SendMessage(GetDlgItem(hwnd, IDC_DOWNLOAD_FOLDER_EDIT), WM_SETTEXT, -1, (LPARAM)Buf); + } + else + { + if (!GetWindowsDirectory(Buf, sizeof(Buf) / sizeof(TCHAR))) return FALSE; + + TCHAR DPath[256]; + int i; + for (i = 0; i < 4; i++) + { + if (i == 3) + { + DPath[i] = '\0'; + break; + } + DPath[i] = Buf[i]; + } + LoadString(GetModuleHandle(NULL), IDS_DOWNLOAD_FOLDER, Buf, sizeof(Buf) / sizeof(TCHAR)); + lstrcat((LPTSTR)DPath, Buf); + if (RegSetValueEx(hKey, + L"DownloadFolder", + 0, + REG_SZ, + (LPBYTE)DPath, + (DWORD)(sizeof(DPath) / sizeof(TCHAR)))) + return FALSE; + else + { + if (GetFileAttributes(DPath) == 0xFFFFFFFF) + if (!CreateDirectory((LPCTSTR)DPath,NULL)) return FALSE; + SendMessage(GetDlgItem(hwnd, IDC_DOWNLOAD_FOLDER_EDIT), WM_SETTEXT, -1, (LPARAM)DPath); + } + } + + dwSize = MAX_PATH; + if (RegQueryValueEx(hKey, + L"UpdateServer", + NULL, + NULL, + (LPBYTE)&Buf, + &dwSize) == ERROR_SUCCESS) + { + SendMessage(GetDlgItem(hwnd, IDC_UPDATE_SERVER_EDIT), WM_SETTEXT, -1, (LPARAM)Buf); + } + else + { + LoadString(GetModuleHandle(NULL), IDS_UPDATE_URL, Buf, sizeof(Buf) / sizeof(TCHAR)); + if (RegSetValueEx(hKey, + L"UpdateServer", + 0, + REG_SZ, + (LPBYTE)Buf, + (DWORD)(sizeof(Buf) / sizeof(TCHAR)))) + return FALSE; + else + { + SendMessage(GetDlgItem(hwnd, IDC_UPDATE_SERVER_EDIT), WM_SETTEXT, -1, (LPARAM)Buf); + } + } + + DWORD dwValue, dwType = REG_DWORD; + dwSize = sizeof(DWORD); + if (RegQueryValueEx(hKey, + L"DeleteInstaller", + NULL, + &dwType, + (LPBYTE)&dwValue, + &dwSize) == ERROR_SUCCESS) + { + if (dwValue == 0x1) + SendMessage(GetDlgItem(hwnd, IDC_DELINST_FILES_CHECKBOX), BM_SETCHECK, 1, 1); + } + else + { + dwValue = 0x0; + if (RegSetValueEx(hKey, + L"DeleteInstaller", + 0, + REG_DWORD, + (LPBYTE)&dwValue, + sizeof(DWORD))) + return FALSE; + } + + RegCloseKey(hKey); + + return TRUE; +} + +BOOL +ChooseFolder(HWND hwnd) +{ + BROWSEINFO fi; + LPCITEMIDLIST lpItemList; + TCHAR szPath[MAX_PATH],Buf[256]; + + ZeroMemory(&fi, sizeof(BROWSEINFO)); + fi.hwndOwner = hwnd; + LoadString(GetModuleHandle(NULL), IDS_CHOOSE_FOLDER, Buf, sizeof(Buf) / sizeof(TCHAR)); + fi.lpszTitle = (LPCTSTR)Buf; + fi.ulFlags = BIF_DONTGOBELOWDOMAIN | BIF_RETURNONLYFSDIRS | BIF_BROWSEFORCOMPUTER | BIF_NEWDIALOGSTYLE; + fi.lpfn = NULL; + fi.lParam = -1; + fi.iImage = 0; + + if(!(lpItemList = SHBrowseForFolder(&fi))) return FALSE; + SHGetPathFromIDList(lpItemList, szPath); + + if (_tcslen(szPath) == 0) return FALSE; + SendMessage(GetDlgItem(hwnd, IDC_DOWNLOAD_FOLDER_EDIT), WM_SETTEXT, -1, (LPARAM)szPath); + + return TRUE; +} + +INT_PTR CALLBACK +ProfDlgProc(HWND hDlg, + UINT message, + WPARAM wParam, + LPARAM lParam) +{ + static HICON hIcon; + UNREFERENCED_PARAMETER(lParam); + + switch (message) + { + case WM_INITDIALOG: + { + hIcon = LoadImage(GetModuleHandle(NULL),MAKEINTRESOURCE(IDI_MAIN),IMAGE_ICON,16,16,0); + SendMessage(hDlg,WM_SETICON,ICON_SMALL,(LPARAM)hIcon); + InitProfDlg(hDlg); + } + break; + + case WM_COMMAND: + { + switch (wParam) + { + case IDC_CHOOSE_BUTTON: + ChooseFolder(hDlg); + break; + case IDOK: + { + SaveSettings(hDlg); + DestroyIcon(hIcon); + EndDialog(hDlg,LOWORD(wParam)); + return TRUE; + } + break; + case IDCANCEL: + { + DestroyIcon(hIcon); + EndDialog(hDlg,LOWORD(wParam)); + return TRUE; + } + break; + } + } + break; + } + + return FALSE; +} + +LRESULT CALLBACK +WndProc (HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) { static RECT DescriptionRect; @@ -321,6 +637,13 @@ { if(HIWORD(wParam) == BN_CLICKED) { + if (lParam == (LPARAM)hProfButton) + { + DialogBox(GetModuleHandle(NULL), + MAKEINTRESOURCE(IDD_PROF), + hwnd, + ProfDlgProc); + } if (lParam == (LPARAM)hDownloadButton) { if(SelectedApplication) @@ -425,7 +748,8 @@ DescriptionRect = Rect; MoveWindow(hHelpButton, LOWORD(lParam)-50, 10, 40, 40, TRUE); - MoveWindow(hUpdateButton, LOWORD(lParam)-100, 10, 40, 40, TRUE); + MoveWindow(hUpdateButton, LOWORD(lParam)-150, 10, 40, 40, TRUE); + MoveWindow(hProfButton, LOWORD(lParam)-100, 10, 40, 40, TRUE); if(IsWindowVisible(hUninstallButton)) MoveWindow(hDownloadButton, (Split_Vertical+LOWORD(lParam))/2, HIWORD(lParam)-45, 140, 35, TRUE); else @@ -448,8 +772,11 @@ return DefWindowProc (hwnd, Message, wParam, lParam); } -INT WINAPI wWinMain (HINSTANCE hInstance, HINSTANCE hPrevInst, - LPTSTR lpCmdLine, INT nCmdShow) +INT WINAPI +wWinMain (HINSTANCE hInstance, + HINSTANCE hPrevInst, + LPTSTR lpCmdLine, + INT nCmdShow) { int i; WNDCLASSEXW WndClass = {0}; @@ -477,7 +804,7 @@ WS_OVERLAPPEDWINDOW|WS_CLIPCHILDREN, CW_USEDEFAULT, CW_USEDEFAULT, - 600, 550, + 650, 550, NULL, NULL, hInstance, NULL); 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 Tue Oct 16 00:45:06 2007 @@ -1,11 +1,12 @@ #define IDI_MAIN 0x0 +#define IDI_UPDATE 5000 +#define IDI_HELP 5001 +#define IDI_PROF 5002 #define IDB_UNDERLINE 0x100 #define IDB_LOGO 0x101 -#define IDB_HELP 0x102 -#define IDB_UPDATE 0x103 -#define IDB_DOWNLOAD 0x104 -#define IDB_UNINSTALL 0x105 +#define IDB_DOWNLOAD 0x102 +#define IDB_UNINSTALL 0x103 #define IDB_TREEVIEW_ICON_0 0x900 #define IDB_TREEVIEW_ICON_1 0x901 #define IDB_TREEVIEW_ICON_2 0x902 @@ -17,33 +18,47 @@ #define IDB_TREEVIEW_ICON_8 0x908 #define IDB_TREEVIEW_ICON_9 0x909 #define IDB_TREEVIEW_ICON_10 0x910 +#define IDB_TREEVIEW_ICON_11 0x911 +#define IDB_TREEVIEW_ICON_12 0x912 +#define IDB_TREEVIEW_ICON_13 0x913 #define IDD_DOWNLOAD 0x100 #define IDC_PROGRESS 0x1000 #define IDC_STATUS 0x1001 #define IDC_REMOVE 0x1002 +#define IDC_DOWNLOAD_FOLDER_EDIT 0x1003 +#define IDC_CHOOSE_BUTTON 0x1004 +#define IDC_UPDATE_SERVER_EDIT 0x1005 +#define IDC_DELINST_FILES_CHECKBOX 0x1006 -#define IDS_WINDOW_TITLE 0 -#define IDS_WELCOME_TITLE 1 -#define IDS_WELCOME 2 -#define IDS_NO_APP_TITLE 3 -#define IDS_NO_APP 4 -#define IDS_UPDATE_TITLE 5 -#define IDS_UPDATE 6 -#define IDS_HELP_TITLE 7 -#define IDS_HELP 8 -#define IDS_NO_APPS 9 -#define IDS_CHOOSE_APP 10 -#define IDS_CHOOSE_SUB 11 -#define IDS_CHOOSE_CATEGORY 12 -#define IDS_CHOOSE_BOTH 13 -#define IDS_XMLERROR_1 14 -#define IDS_XMLERROR_2 15 -#define IDS_DOWNLOAD_ERROR 16 -#define IDS_VERSION 17 -#define IDS_LICENCE 18 -#define IDS_MAINTAINER 19 -#define IDS_APPS_TITLE 20 -#define IDS_CATS_TITLE 21 +#define IDS_WINDOW_TITLE 0 +#define IDS_WELCOME_TITLE 1 +#define IDS_WELCOME 2 +#define IDS_NO_APP_TITLE 3 +#define IDS_NO_APP 4 +#define IDS_UPDATE_TITLE 5 +#define IDS_UPDATE 6 +#define IDS_HELP_TITLE 7 +#define IDS_HELP 8 +#define IDS_NO_APPS 9 +#define IDS_CHOOSE_APP 10 +#define IDS_CHOOSE_SUB 11 +#define IDS_CHOOSE_CATEGORY 12 +#define IDS_CHOOSE_BOTH 13 +#define IDS_XMLERROR_1 14 +#define IDS_XMLERROR_2 15 +#define IDS_DOWNLOAD_ERROR 16 +#define IDS_VERSION 17 +#define IDS_LICENCE 18 +#define IDS_MAINTAINER 19 +#define IDS_APPS_TITLE 20 +#define IDS_CATS_TITLE 21 +#define IDS_CHOOSE_FOLDER 22 +#define IDS_NOTCREATE_REGKEY 23 +#define IDS_DOWNLOAD_FOLDER 24 +#define IDS_UNABLECREATE_FOLDER 25 +#define IDS_UPDATE_URL 26 + +#define IDD_PROF 6000 #define STRING_COUNT 20 Added: trunk/rosapps/downloader/resources/11.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/resources/11.bm… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/downloader/resources/11.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/downloader/resources/12.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/resources/12.bm… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/downloader/resources/12.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/downloader/resources/13.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/resources/13.bm… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/downloader/resources/13.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Removed: trunk/rosapps/downloader/resources/help.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/resources/help.… ============================================================================== Binary file - no diff available. Added: trunk/rosapps/downloader/resources/help.ico URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/resources/help.… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/downloader/resources/help.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/downloader/resources/preferences.ico URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/resources/prefe… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/downloader/resources/preferences.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Removed: trunk/rosapps/downloader/resources/update.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/resources/updat… ============================================================================== Binary file - no diff available. Added: trunk/rosapps/downloader/resources/update.ico URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/resources/updat… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/downloader/resources/update.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/rosapps/downloader/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/rsrc.rc?rev=296… ============================================================================== --- trunk/rosapps/downloader/rsrc.rc (original) +++ trunk/rosapps/downloader/rsrc.rc Tue Oct 16 00:45:06 2007 @@ -1,9 +1,12 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDI_MAIN ICON DISCARDABLE "resources/main.ico" +IDI_UPDATE ICON DISCARDABLE "resources/update.ico" +IDI_HELP ICON DISCARDABLE "resources/help.ico" +IDI_PROF ICON DISCARDABLE "resources/preferences.ico" IDB_LOGO BITMAP DISCARDABLE "resources/logo.bmp" -IDB_HELP BITMAP DISCARDABLE "resources/help.bmp" -IDB_UPDATE BITMAP DISCARDABLE "resources/update.bmp" +//IDB_HELP BITMAP DISCARDABLE "resources/help.bmp" +//IDB_UPDATE BITMAP DISCARDABLE "resources/update.bmp" IDB_DOWNLOAD BITMAP DISCARDABLE "resources/download.bmp" IDB_UNINSTALL BITMAP DISCARDABLE "resources/uninstall.bmp" IDB_UNDERLINE BITMAP DISCARDABLE "resources/underline.bmp" @@ -18,6 +21,9 @@ IDB_TREEVIEW_ICON_8 BITMAP DISCARDABLE "resources/8.bmp" IDB_TREEVIEW_ICON_9 BITMAP DISCARDABLE "resources/9.bmp" IDB_TREEVIEW_ICON_10 BITMAP DISCARDABLE "resources/10.bmp" +IDB_TREEVIEW_ICON_11 BITMAP DISCARDABLE "resources/11.bmp" +IDB_TREEVIEW_ICON_12 BITMAP DISCARDABLE "resources/12.bmp" +IDB_TREEVIEW_ICON_13 BITMAP DISCARDABLE "resources/13.bmp" #include "lang/de-DE.rc" Modified: trunk/rosapps/downloader/xml.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/xml.c?rev=29614… ============================================================================== --- trunk/rosapps/downloader/xml.c (original) +++ trunk/rosapps/downloader/xml.c Tue Oct 16 00:45:06 2007 @@ -170,10 +170,10 @@ Current = Root; TagOpen = TRUE; - file = fopen(filename, "r"); + file = fopen("downloader.xml", "r"); if(!file) { - file = fopen("downloader.xml", "r"); + file = fopen(filename, "r"); if(!file) { MessageBoxW(0,Strings[IDS_XMLERROR_1],0,0);

1 0

[fireball] 29613: Dmitry Chapyshev <lentind@yandex.ru> - Add russian translation for evenvwr. - Slightly improve eventvwr.ico (as I did with other icons).
by fireball＠svn.reactos.org 15 Oct '07

15 Oct '07

Author: fireball Date: Tue Oct 16 00:36:20 2007 New Revision: 29613 URL: http://svn.reactos.org/svn/reactos?rev=29613&view=rev Log: Dmitry Chapyshev <lentind(a)yandex.ru> - Add russian translation for evenvwr. - Slightly improve eventvwr.ico (as I did with other icons). Added: trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc (with props) Modified: trunk/reactos/base/applications/mscutils/eventvwr/res/eventvwr.ico trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc Added: trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc (added) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc Tue Oct 16 00:36:20 2007 @@ -1,0 +1,89 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDC_EVENTVWR MENU +BEGIN + POPUP "&Ëîãè" + BEGIN + MENUITEM "&Ïðèëîæåíèé", ID_LOG_APPLICATION, CHECKED + MENUITEM "&Áåçîïàñíîñòè", ID_LOG_SECURITY + MENUITEM "&Ñèñòåìû", ID_LOG_SYSTEM + MENUITEM SEPARATOR + MENUITEM "Â&ûõîä", IDM_EXIT + END + POPUP "&Âèä" + BEGIN + MENUITEM "&Îáíîâèòü", IDM_REFRESH + END + MENUITEM "&Íàñòðîéêè", ID_OPTIONS + POPUP "&Ñïðàâêà" + BEGIN + MENUITEM "&Ïîìîùü", IDM_HELP + MENUITEM SEPARATOR + MENUITEM "&Î ïðîãðàììå", IDM_ABOUT + END +END + +IDC_EVENTVWR ACCELERATORS +BEGIN + "?", IDM_ABOUT, ASCII, ALT + "/", IDM_ABOUT, ASCII, ALT +END + +IDD_ABOUTBOX DIALOGEX 0, 0, 200, 75 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_CAPTION | WS_SYSMENU +CAPTION "Î ïðîãðàììå" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_EVENTVWR,IDC_MYICON,14,9,21,20 + LTEXT "Ïðîñìîòð ñîáûòèé ReactOS. Âåðñèÿ 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX + LTEXT "Àâòîðñêèå ïðàâà (Ñ) 2007 Ìàðê Ïèóëà÷ñ (marc.piulachs(a)codexchange.net)",IDC_STATIC,49,20,140,22 + DEFPUSHBUTTON "OK",IDOK,80,48,42,16,WS_GROUP +END + +IDD_PROGRESSBOX DIALOGEX 0, 0, 230, 40 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER +CAPTION "Ïîäîæäèòå.." +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Èäåò çàãðóçêà. Ïîäîæäèòå ...",IDC_STATIC,49,15,119,8,SS_NOPREFIX +END + +IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 276, 282 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Ñâîéñòâà ñîáûòèÿ" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "&Çàêðûòü",IDOK,14,258,55,14 + PUSHBUTTON "&Ïðåäûäóùåå",IDPREVIOUS,78,258,55,14 + PUSHBUTTON "Ñ&ëåäóþùåå",IDNEXT,142,258,55,14 + PUSHBUTTON "Ï&îìîùü",IDHELP,206,258,55,14 + EDITTEXT IDC_EVENTTEXTEDIT,14,81,247,108,ES_MULTILINE | ES_READONLY + LTEXT "Îïèñàíèå:",IDC_STATIC,15,70,39,8 + LTEXT "Äàòà:",IDC_STATIC,14,14,36,8 + LTEXT "",IDC_EVENTDATESTATIC,68,14,72,8 + LTEXT "Âðåìÿ:",IDC_STATIC,14,27,36,8 + LTEXT "",IDC_EVENTTIMESTATIC,68,27,72,8 + LTEXT "Ïîëüçîâàòåëü:",IDC_STATIC,14,41,50,8 + LTEXT "",IDC_EVENTUSERSTATIC,68,41,72,8 + LTEXT "Êîìïüþòåð:",IDC_STATIC,14,54,45,8 + LTEXT "",IDC_EVENTCOMPUTERSTATIC,68,54,72,8 + LTEXT "Êîä (ID):",IDC_STATIC,143,15,45,8 + LTEXT "",IDC_EVENTIDSTATIC,190,15,87,8 + LTEXT "Èñòî÷íèê:",IDC_STATIC,143,28,36,8 + LTEXT "",IDC_EVENTSOURCESTATIC,190,28,127,8 + LTEXT "Òèï:",IDC_STATIC,143,42,36,8 + LTEXT "",IDC_EVENTTYPESTATIC,190,42,87,8 + LTEXT "Êàòåãîðèÿ:",IDC_STATIC,143,55,38,8 + LTEXT "",IDC_EVENTCATEGORYSTATIC,190,55,87,8 + EDITTEXT IDC_EVENTDATAEDIT,14,204,247,44,ES_MULTILINE | ES_READONLY + LTEXT "Äàííûå:",IDC_STATIC,14,192,30,8 + CONTROL "&Áàéòû",IDC_BYTESRADIO,"Button",BS_AUTORADIOBUTTON,49,192,34,10 + CONTROL "&Ñëîâà",IDC_WORDRADIO,"Button",BS_AUTORADIOBUTTON,87,192,33,10 +END + +STRINGTABLE +BEGIN + IDS_APP_TITLE "Ïðîñìîòð ñîáûòèé" + IDC_EVENTSTRINGIDNOTFOUND "The description for Event ID ( %lu ) in Source ( %s ) cannot be found. The local computer may not have the necessary registry information or message DLL files to display messages from a remote computer." +END Propchange: trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mscutils/eventvwr/res/eventvwr.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc Tue Oct 16 00:36:20 2007 @@ -12,3 +12,4 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/fr-FR.rc" +#include "lang/ru-RU.rc"

1 0

[greatlrd] 29612: fixing few compiling issue.
by greatlrd＠svn.reactos.org 15 Oct '07

15 Oct '07

Author: greatlrd Date: Tue Oct 16 00:28:06 2007 New Revision: 29612 URL: http://svn.reactos.org/svn/reactos?rev=29612&view=rev Log: fixing few compiling issue. Modified: branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.c branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dvp.c Modified: branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h (original) +++ branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h Tue Oct 16 00:28:06 2007 @@ -47,7 +47,7 @@ /* From dvp.c */ typedef DWORD (NTAPI* PGD_DVPCANCREATEVIDEOPORT)(HANDLE, PDD_CANCREATEVPORTDATA); typedef DWORD (NTAPI* PGD_DVPCOLORCONTROL)(HANDLE, PDD_VPORTCOLORDATA); -typedef DWORD (NTAPI* PGD_DVPCREATEVIDEOPORT)(HANDLE, PDD_CREATEVPORTDATA); +typedef HANDLE (NTAPI* PGD_DVPCREATEVIDEOPORT)(HANDLE, PDD_CREATEVPORTDATA); typedef DWORD (NTAPI* PGD_DVPDESTROYVIDEOPORT)(HANDLE, PDD_DESTROYVPORTDATA); typedef DWORD (NTAPI* PGD_DVPFLIPVIDEOPORT)(HANDLE,HANDLE,HANDLE,PDD_FLIPVPORTDATA); typedef DWORD (NTAPI* PGD_DVPGETVIDEOPORTBANDWITH)(HANDLE, PDD_GETVPORTBANDWIDTHDATA); Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/d3d.c Tue Oct 16 00:28:06 2007 @@ -205,7 +205,7 @@ DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdLockD3D, pfnDdLockD3D); - if (pfnD3dValidateTextureStageState == NULL) + if (pfnDdLockD3D == NULL) { DPRINT1("Warring no pfnDdLockD3D"); return DDHAL_DRIVER_NOTHANDLED; @@ -250,7 +250,7 @@ DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdUnlockD3D, pfnDdUnlockD3D); - if (pfnD3dValidateTextureStageState == NULL) + if (pfnDdUnlockD3D == NULL) { DPRINT1("Warring no pfnDdUnlockD3D"); return DDHAL_DRIVER_NOTHANDLED; Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dvp.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dvp.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dvp.c Tue Oct 16 00:28:06 2007 @@ -151,7 +151,7 @@ } DPRINT1("Calling on dxg.sys pfnDvpGetVideoPortBandwidth"); - return pfnDvpGetVideoPortBandwidth(hVideoPort, pfnDvpGetVideoPortBandwidth); + return pfnDvpGetVideoPortBandwidth(hVideoPort, puGetVPortBandwidthData); } @@ -223,7 +223,7 @@ } DPRINT1("Calling on dxg.sys pfnDvpGetVideoPortLine"); - return pfnDvpGetVideoSignalStatus(hVideoPort, puGetVPortLineData); + return pfnDvpGetVideoPortLine(hVideoPort, puGetVPortLineData); } @@ -240,7 +240,7 @@ DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpGetVideoPortOutputFormats, puGetVPortOutputFormatData); - if (pfnDvpGetVideoSignalStatus == NULL) + if (pfnDvpGetVideoPortOutputFormats == NULL) { DPRINT1("Warring no pfnDvpGetVideoPortOutputFormats"); return DDHAL_DRIVER_NOTHANDLED; @@ -272,7 +272,7 @@ } DPRINT1("Calling on dxg.sys pfnDvpGetVideoPortConnectInfo"); - return pfnDvpGetVideoPortConnectInfo(hVideoPort, puGetVPortConnectData); + return pfnDvpGetVideoPortConnectInfo(hDirectDraw, puGetVPortConnectData); }

1 0

[greatlrd] 29611: fixing few compiling issue.
by greatlrd＠svn.reactos.org 15 Oct '07

15 Oct '07

Author: greatlrd Date: Mon Oct 15 23:48:41 2007 New Revision: 29611 URL: http://svn.reactos.org/svn/reactos?rev=29611&view=rev Log: fixing few compiling issue. Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddsurf.c Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddsurf.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddsurf.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddsurf.c Mon Oct 15 23:48:41 2007 @@ -44,7 +44,7 @@ HANDLE hSurfaceTargetLeft, PDD_FLIPDATA puFlipData) { - PGD_DXDDDESTROYSURFACE pfnDdDdFlip = NULL; + PGD_DXDDFLIP pfnDdDdFlip = NULL; INT i; DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdFlip, pfnDdDdFlip); @@ -96,7 +96,7 @@ DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdUnlock, pfnDdUnlock); - if (pfnDdLock == NULL) + if (pfnDdUnlock == NULL) { DPRINT1("Warring no pfnDdUnlock"); return DDHAL_DRIVER_NOTHANDLED; @@ -138,7 +138,7 @@ NtGdiDdSetColorKey(HANDLE hSurface, PDD_SETCOLORKEYDATA puSetColorKeyData) { - PGD_DXDDSETCOLORKEY pfnDdSetColorKey; + PGD_DXDDSETCOLORKEY pfnDdSetColorKey = NULL; INT i; DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdSetColorKey, pfnDdSetColorKey); @@ -259,7 +259,7 @@ HANDLE hSurfaceDestination, PDD_SETOVERLAYPOSITIONDATA puSetOverlayPositionData) { - PGD_DXDDUPDATEOVERLAY pfnDdSetOverlayPosition = NULL; + PGD_DXDDSETOVERLAYPOSITION pfnDdSetOverlayPosition = NULL; INT i; DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdSetOverlayPosition, pfnDdSetOverlayPosition); @@ -331,7 +331,11 @@ /************************************************************************/ /* NtGdiDdUnattachSurface */ /************************************************************************/ -VOID +/* Note : msdn protypes is VOID APIENTRY NtGdiDdUnattachSurface(HANDLE hSurface, HANDLE hSurfaceAttached) + But it say it return either DDHAL_DRIVER_NOTHANDLED or DDHAL_DRIVER_HANDLED + so I guess it is a typo in MSDN for this protypes for the info talk against it self +*/ +DWORD STDCALL NtGdiDdUnattachSurface(HANDLE hSurface, HANDLE hSurfaceAttached)

1 0

[greatlrd] 29610: smaller cleanup in thuse two new header
by greatlrd＠svn.reactos.org 15 Oct '07

15 Oct '07

Author: greatlrd Date: Mon Oct 15 23:45:48 2007 New Revision: 29610 URL: http://svn.reactos.org/svn/reactos?rev=29610&view=rev Log: smaller cleanup in thuse two new header Modified: branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h branches/reactx/reactos/include/reactos/drivers/directx/dxg.h Modified: branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/reactos/… ============================================================================== --- branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h (original) +++ branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h Mon Oct 15 23:45:48 2007 @@ -66,7 +66,9 @@ HDEV * DxEngEnumerateHdev(HDEV *hdev); - +/* same protypes NtGdiEngGetDeviceGammaRamp, diffent is we skipp the user mode checks and seh */ +BOOL +DxEngGetDeviceGammaRamp(HDC hDC, LPVOID lpRamp); /* prototypes are not done yet, I need gather all my notes @@ -101,8 +103,7 @@ DWORD DxEngUnreferenceHdev(x); -DWORD -DxEngGetDeviceGammaRamp(x,x); + DWORD DxEngSetDeviceGammaRamp(x,x,x); Modified: branches/reactx/reactos/include/reactos/drivers/directx/dxg.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/reactos/… ============================================================================== --- branches/reactx/reactos/include/reactos/drivers/directx/dxg.h (original) +++ branches/reactx/reactos/include/reactos/drivers/directx/dxg.h Mon Oct 15 23:45:48 2007 @@ -53,13 +53,12 @@ #define DXG_INDEX_DxDdQueryDirectDrawObject 0x29 #define DXG_INDEX_DxDdQueryMoCompStatus 0x2A #define DXG_INDEX_DxDdReenableDirectDrawObject 0x2B - +#define DXG_INDEX_DxDdReleaseDC 0x2C #define DXG_INDEX_DxDdRenderMoComp 0x2D - +#define DXG_INDEX_DxDdResetVisrgn 0x2E #define DXG_INDEX_DxDdSetColorKey 0x2F - #define DXG_INDEX_DxDdSetExclusiveMode 0x30 - +#define DXG_INDEX_DxDdSetGammaRamp 0x31 #define DXG_INDEX_DxDdCreateSurfaceEx 0x32 #define DXG_INDEX_DxDdSetOverlayPosition 0x33 #define DXG_INDEX_DxDdUnattachSurface 0x34 @@ -85,12 +84,6 @@ #define DXG_INDEX_DxDvpWaitForVideoPortSync 0x47 #define DXG_INDEX_DxDvpAcquireNotification 0x48 #define DXG_INDEX_DxDvpReleaseNotification 0x49 - -/* not addedd yet */ -#define DXG_INDEX_DxDdReleaseDC 0x2C -#define DXG_INDEX_DxDdResetVisrgn 0x2E -#define DXG_INDEX_DxDdSetGammaRamp 0x31 - /***********************************************************************************/ /* This driver functions are exported raw from Eng* it only exists in the def file */

1 0

[greatlrd] 29609: wrong protype in MSDN, the protypes is VOID APIENTRY NtGdiDdUnattachSurface(HANDLE hSurface, HANDLE hSurfaceAttached); and the text in msdn talk it can return either DDHAL_DRIVER_HANDLED or DDHAL_DRIVER_NOTHANDLED, see http://msdn2.microsoft.com/en-us/library/ms648703.aspx, so I change the protype to DWORD APIENTRY NtGdiDdUnattachSurface(HANDLE hSurface, HANDLE hSurfaceAttached);
by greatlrd＠svn.reactos.org 15 Oct '07

15 Oct '07

Author: greatlrd Date: Mon Oct 15 23:43:58 2007 New Revision: 29609 URL: http://svn.reactos.org/svn/reactos?rev=29609&view=rev Log: wrong protype in MSDN, the protypes is VOID APIENTRY NtGdiDdUnattachSurface(HANDLE hSurface, HANDLE hSurfaceAttached); and the text in msdn talk it can return either DDHAL_DRIVER_HANDLED or DDHAL_DRIVER_NOTHANDLED, see http://msdn2.microsoft.com/en-us/library/ms648703.aspx, so I change the protype to DWORD APIENTRY NtGdiDdUnattachSurface(HANDLE hSurface, HANDLE hSurfaceAttached); Modified: branches/reactx/reactos/include/psdk/ntgdi.h Modified: branches/reactx/reactos/include/psdk/ntgdi.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/psdk/ntg… ============================================================================== --- branches/reactx/reactos/include/psdk/ntgdi.h (original) +++ branches/reactx/reactos/include/psdk/ntgdi.h Mon Oct 15 23:43:58 2007 @@ -698,7 +698,7 @@ ); W32KAPI -VOID +DWORD APIENTRY NtGdiDdUnattachSurface( IN HANDLE hSurface,

1 0

[dreimer] 29608: Bug 2753, 2754 Ukrainian translation update (rstzab@yandex.ru) Bug 2728 Bulgarian language update for ReactOS. Fix for the Patch (sstpr@narod.ru)
by dreimer＠svn.reactos.org 15 Oct '07

15 Oct '07

Author: dreimer Date: Mon Oct 15 23:33:14 2007 New Revision: 29608 URL: http://svn.reactos.org/svn/reactos?rev=29608&view=rev Log: Bug 2753, 2754 Ukrainian translation update (rstzab(a)yandex.ru) Bug 2728 Bulgarian language update for ReactOS. Fix for the Patch (sstpr(a)narod.ru) Added: trunk/reactos/base/applications/cmdutils/more/lang/uk-UA.rc (with props) trunk/reactos/base/applications/network/ipconfig/lang/uk-UA.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/more/rsrc.rc trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc trunk/reactos/base/applications/network/ipconfig/ipconfig.rc trunk/reactos/dll/cpl/desk/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/shell32_Bg.rc Added: trunk/reactos/base/applications/cmdutils/more/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/lang/uk-UA.rc (added) +++ trunk/reactos/base/applications/cmdutils/more/lang/uk-UA.rc Mon Oct 15 23:33:14 2007 @@ -1,0 +1,23 @@ +/* + * PROJECT: ReactOS Console Command More + * LICENSE: GPL - See COPYING in the top level directory + * FILE: /base/applications/cmdutils/more/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for ReactOS Console Command More + * PROGRAMMERS: Rostislav Zabolotny + */ +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_USAGE, "Âèâîäèòü ³íôðìàö³þ ïîåêðàííî. Âèêîðèñòàííÿ:\n\n\ + MORE < [Drive:][Path]²ì'ÿ_ôàéëó\n\ + Command | MORE \n\ + MORE [Drive:][Path]²ì'ÿ_ôàéëó\n\n\ + Äå: \n\ + [Drive:][Path]²ì'ÿ_ôàéëó Ôàéë, âì³ñò ÿêîãî òðåáà âèâåñòè íà åêðàí.\n\ + Command\t\t Êîìàíäà, ðåçóëüòàò ðîáîòè ÿêî¿ òðåáà âèâåñòè íà åêðàí.\n\n\ + Íà çàïðîøåííÿ ""-- Äàë³ --"" Âè ìîæåòå íàòèñíóòè áóäü-ÿêó êëàâ³øó ùîá ïîáà÷èòè íàñòóïíó ñòîð³íêó.\n" + + IDS_CONTINUE, " -- Äàë³ (100%) -- " + IDS_FILE_ACCESS, "Íå ìîæó îòðèìàòè äîñòóï äî ôàéëà %s." +} Propchange: trunk/reactos/base/applications/cmdutils/more/lang/uk-UA.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/more/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/rsrc.rc (original) +++ trunk/reactos/base/applications/cmdutils/more/rsrc.rc Mon Oct 15 23:33:14 2007 @@ -8,3 +8,4 @@ #include "lang/it-IT.rc" #include "lang/fr-FR.rc" #include "lang/lt-LT.rc" +#include "lang/uk-UA.rc" Modified: trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc Mon Oct 15 23:33:14 2007 @@ -21,19 +21,19 @@ MENUITEM "Îïðåñíÿâàíå", ID_REFRESH MENUITEM SEPARATOR MENUITEM "Îáðàáîòêà...", ID_EDIT, GRAYED - MENUITEM "Ñúçäàâàíå...", ID_CREATE, GRAYED + MENUITEM "Ñúçäàâàíå...", ID_CREATE MENUITEM "Èçòðèâàíå...", ID_DELETE, GRAYED MENUITEM SEPARATOR MENUITEM "Ñâîéñòâà...", ID_PROP, GRAYED END POPUP "Èçãëåä" BEGIN - MENUITEM "Ãîëåìè çíà÷êè", ID_VIEW_LARGE - MENUITEM "Ìàëêè çíà÷êè", ID_VIEW_SMALL + MENUITEM "Ãîëåìè çíà÷åòà", ID_VIEW_LARGE + MENUITEM "Ìàëêè çíà÷åòà", ID_VIEW_SMALL MENUITEM "Ñïèñúê", ID_VIEW_LIST MENUITEM "Ïîäðîáåí", ID_VIEW_DETAILS MENUITEM SEPARATOR - MENUITEM "Íàãàæäàíå...",ID_VIEW_CUST, GRAYED + MENUITEM "Íàãëàñÿâàíå...",ID_VIEW_CUST, GRAYED END POPUP "Ïîìîù" BEGIN @@ -68,39 +68,38 @@ FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Service Manager v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 135, 26 + LTEXT "Service Manager v0.5.1\nCopyright (C) 2005-2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 PUSHBUTTON "Close", IDOK, 75, 162, 44, 15 ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE END -IDD_DLG_GENERAL DIALOGEX 6,6,253,232 -CAPTION "Îáùî" +IDD_DLG_GENERAL DIALOGEX 6,6,300,225 +CAPTION "Îáùè" FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP BEGIN - LTEXT "", IDC_SERV_NAME, 70,11,176,11, WS_CHILD | WS_VISIBLE - EDITTEXT IDC_DISP_NAME, 70, 29, 176, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY - EDITTEXT IDC_DESCRIPTION, 70, 46, 176, 24, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_MULTILINE | ES_READONLY + LTEXT "", IDC_SERV_NAME, 120,11,176,11, WS_CHILD | WS_VISIBLE + EDITTEXT IDC_DISP_NAME, 120, 29, 176, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY + EDITTEXT IDC_DESCRIPTION, 120, 46, 176, 24, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_MULTILINE | ES_READONLY EDITTEXT IDC_EXEPATH, 6, 86, 240, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY - COMBOBOX IDC_START_TYPE, 70, 107, 176, 40, WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST + COMBOBOX IDC_START_TYPE, 120, 107, 176, 40, WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST PUSHBUTTON "Ïóñêàíå", IDC_START, 6, 155, 54, 15, WS_DISABLED PUSHBUTTON "Ñïèðàíå", IDC_STOP, 68, 155, 54, 15, WS_DISABLED PUSHBUTTON "Çàäúðæàíå", IDC_PAUSE , 130, 155, 54, 15, WS_DISABLED PUSHBUTTON "Ïðîäúëæàâàíå", IDC_RESUME, 192, 155, 54, 15, WS_DISABLED - LTEXT "Èìå íà èñëóãàòà:", IDC_STATIC, 4, 11, 53, 11 - LTEXT "Ïîêàçâàíî èìå:", IDC_STATIC, 4, 29, 53, 11 - LTEXT "Îïèñàíèå:", IDC_STATIC, 4, 51, 53, 11 - LTEXT "Ïúò äî èçïúëíèìèÿ:", IDC_STATIC, 6, 73, 82, 9 + LTEXT "Èìå íà óñëóãàòà:", IDC_STATIC, 4, 11, 110, 11 + LTEXT "Ïîêàçâàíî èìå:", IDC_STATIC, 4, 29, 110, 11 + LTEXT "Îïèñàíèå:", IDC_STATIC, 4, 51, 110, 11 + LTEXT "Ïúò äî èçïúëíèìèÿ:", IDC_STATIC, 6, 73, 110, 9 /* startup type*/ - LTEXT "Âèä íà ïóñêàíå:", IDC_STATIC, 6, 108, 53, 11 - LTEXT "Ñúñòîÿíèå íà óñëóãàòà:", IDC_STATIC, 4, 138, 53, 11 - LTEXT "", IDC_SERV_STATUS, 70, 138, 176, 11, WS_CHILD | WS_VISIBLE + LTEXT "Âèä íà ïóñêàíå:", IDC_STATIC, 6, 108, 110, 11 + LTEXT "Ñúñòîÿíèå íà óñëóãàòà:", IDC_STATIC, 4, 138, 110, 11 + LTEXT "", IDC_SERV_STATUS, 120, 138, 176, 11, WS_CHILD | WS_VISIBLE /* LTEXT "You can specify the start parameters that apply when you start the service from here.",IDC_STATIC, 6,177,240,15 */ - LTEXT "Ìîæåòå äà çàäàäåòå ïóñêîâè óêàçàíèÿ, êîèòî äà ñå ïðèëîæàò ïðè ïóñêàíå íà óñëóãàòà îò òóê.",IDC_STATIC, 6,177,240,15 - LTEXT "Ïóñêîâè óêàçàòåëè:", IDC_STATIC, 6, 200, 58, 11 - EDITTEXT IDC_START_PARAM, 68, 199, 178, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Edit", IDC_EDIT, 192, 215, 54, 15, WS_DISABLED + LTEXT "Ìîæåòå äà çàäàäåòå ïóñêîâè êëþ÷îâå, êîèòî äà ñå ïðèëîæàò ïðè ïóñêàíå íà óñëóãàòà îò òóê.",IDC_STATIC, 6,177,290,18 + LTEXT "Ïóñêîâè êëþ÷îâå:", IDC_STATIC, 6, 200, 110, 11 + EDITTEXT IDC_START_PARAM, 120, 199, 178, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END IDD_DLG_DEPEND DIALOGEX 6,6,253,225 @@ -111,7 +110,7 @@ CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" ,0x50010007, 8, 70, 236, 68, 0x00000200 CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", 0x50010007, 8, 151, 234, 67, 0x00000200 /* LTEXT "Some services depend on other services, system drivers and load order groups. If a system component is stopped or it is not running properly, dependant services can be affected.", IDC_STATIC,8, 7, 238, 26 */ - LTEXT "Íÿêîè óñëóãè çàâèñÿò îò äðóãè óñëóãè, âîäà÷è (driver), è çàðåæäàò äðóãè ãðóïè. Àêî íÿêîÿ ñèñòåìíà ñúñòàâêà å ñïðàíÿ èëè íå ðàáîòè ïðàâèëíî, çàâèñèìèòå îò íåÿ óñëóãè ìîæå äà áúäàò çàñåãíàòè.", IDC_STATIC,8, 7, 238, 26 + LTEXT "Íÿêîè óñëóãè çàâèñÿò îò äðóãè óñëóãè, âîäà÷è (driver) è çàðåæäàò äðóãè ãðóïè. Àêî íÿêîÿ ñèñòåìíà ñúñòàâêà å ñïðÿíà èëè íå ðàáîòè ïðàâèëíî, çàâèñèìèòå îò íåÿ óñëóãè ìîæå äà áúäàò çàñåãíàòè.", IDC_STATIC,8, 7, 238, 26 LTEXT "Òàçè óñëóãà çàâèñè îò ñëåäíèòå ñúñòàâêè", IDC_STATIC, 8, 57, 236, 9 LTEXT "", IDC_DEPEND_SERVICE, 8, 38, 236, 13 END @@ -142,12 +141,12 @@ STYLE WS_BORDER | WS_DLGFRAME | DS_MODALFRAME BEGIN ICON IDI_WARNING, IDC_STATIC, 10, 8, 24, 22 - LTEXT "Ñèãóðåí ëè ñòå, ÷å èçêàòå äà èçòðèåòå òàçè óñëóãà? Èçòðèâàíåòî å íåîáðàòèìî!", IDC_STATIC, 50, 6, 125, 25 + LTEXT "Ñèãóðåí ëè ñòå, ÷å èñêàòå äà èçòðèåòå òàçè óñëóãà? Èçòðèâàíåòî å íåîáðàòèìî!", IDC_STATIC, 50, 6, 125, 25 LTEXT "Èìå íà óñëóãàòà:",IDC_STATIC, 6, 40, 80, 9 LTEXT "", IDC_DEL_NAME, 15, 53, 160, 15 EDITTEXT IDC_DEL_DESC, 6, 73, 174, 48, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_EX_STATICEDGE | ES_MULTILINE | ES_READONLY PUSHBUTTON "Äà", IDOK, 26, 129, 54, 13 - DEFPUSHBUTTON "Íå", IDCANCEL, 102, 129, 54, 13 + PUSHBUTTON "Íå", IDCANCEL, 102, 129, 54, 13 END IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150 @@ -162,7 +161,7 @@ IDD_DLG_PROGRESS DIALOGEX 6,6,255,89 CAPTION "Óïðàâëåíèå íà óñëóãèòå" FONT 8, "MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME +STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 @@ -215,18 +214,12 @@ BEGIN IDS_PROGRESS_INFO_START "ÐåàêòÎÑ ñå îïèòâà äà ïóñíå ñëåäíàòà óñëóãà" IDS_PROGRESS_INFO_STOP "ÐåàêòÎÑ ñå îïèòâà äà ñïðå ñëåäíàòà óñëóãà" - IDS_PROGRESS_INFO_PAUSE "ReactOS is attempting to pause the following service" - IDS_PROGRESS_INFO_RESUME "ReactOS is attempting to resume the following service" + IDS_PROGRESS_INFO_PAUSE "ÐåàêòÎÑ ñå îïèòâà äà çàäúðæè ñëåäíàòà óñëóãà" + IDS_PROGRESS_INFO_RESUME "ÐåàêòÎÑ ñå îïèòâà äà ïðîäúëæè ñëåäíàòà óñëóãà" IDS_CREATE_SUCCESS "Óñëóãàòà å óñïåøíî ñúçäàäåíà" - IDS_DELETE_SUCCESS "Service Deleted Succesfully" - IDS_CREATE_REQ "Ïîëåòàòà, îòáåëÿçàíè ñúñ \nçâåçäè÷êà ñà íåàçàäúëæèòåëíè" + IDS_DELETE_SUCCESS "Óñëóãàòà å óñïåøíî èçòðèòà" + IDS_CREATE_REQ "Ïîëåòàòà, îòáåëÿçàíè ñúñ \nçâåçäè÷êà ñà çàäúëæèòåëíè" IDS_DELETE_STOP "Òðÿáâà ðú÷íî äà ñïðåòå óñëóãàòà, ïðåäè äà ÿ èçòðèåòå!" -END - -STRINGTABLE DISCARDABLE -BEGIN -/* IDS_HELP_OPTIONS "CREATE OPTIONS:\r\nNOTE: The option name includes the equal sign.\r\n type= <own|share|interact|kernel|filesys|rec>\r\n (default = own)\r\n start= <boot|system|auto|demand|disabled>\r\n (default = demand) \r\n error= <normal|severe|critical|ignore>\r\n (default = normal)\r\n group= <LoadOrderGroup>\r\n tag= <yes|no>\r\n depend= <Dependencies(separated by / (forward slash))>\r\n obj= <AccountName|ObjectName>\r\n (default = LocalSystem)\r\n password= <password>\r\n" */ - IDS_HELP_OPTIONS "ÍÀÑÒÐÎÉÊÈ ÇÀ ÑÚÇÄÀÂÀÍÅ:\r\nÇÀÁÅËÅÆÊÀ: Èìåíàòà íà íàñòðîéêèòå âêëþ÷âàò çíàê çà ðàâåíñòâî.\r\n type= <own|share|interact|kernel|filesys|rec>\r\n (default = own)\r\n start= <boot|system|auto|demand|disabled>\r\n (default = demand) \r\n error= <normal|severe|critical|ignore>\r\n (default = normal)\r\n group= <LoadOrderGroup>\r\n tag= <yes|no>\r\n depend= <Dependencies(separated by / (forward slash))>\r\n obj= <AccountName|ObjectName>\r\n (default = LocalSystem)\r\n password= <password>\r\n" END /* Hints */ @@ -246,10 +239,10 @@ IDS_HINT_EDIT " Ïðîìÿíà íà ñâîéñòâàòà íà èçáðàíàòà óñëóãà." IDS_HINT_CREATE " Ñúçäàâàíå íà íîâà óñëóãà." IDS_HINT_DELETE " Èçòðèâàíå íà èçáðàíàòà óñëóãà." - IDS_HINT_PROP " Open property sheet for the current selection." - - IDS_HINT_LARGE " Ïîêàçâàíå íà ïðåäìåòèòå ñ ìàëêè çíà÷êè." - IDS_HINT_SMALL " Ïîêàçâàíå íà ïðåäìåòèòå ñ ãîëåìè çíà÷êè." + IDS_HINT_PROP " Îòâàðÿíå íà ëèñò çà ñâîéñòâà çà òåêóùèÿ èçáîð." + + IDS_HINT_LARGE " Ïîêàçâàíå íà ïðåäìåòèòå ñ ìàëêè çíà÷åòà." + IDS_HINT_SMALL " Ïîêàçâàíå íà ïðåäìåòèòå ñ ãîëåìè çíà÷åòà." IDS_HINT_LIST " Ïîêàçâàíå íà ïðåäìåòèòå â ñïèñúê." IDS_HINT_DETAILS " Ïîêàçâàíå íà ñâåäåíèÿ çà âñåêè ïðåäìåò â ïðîçîðåöà." IDS_HINT_CUST " Íàãàæäàíå íà èçãëåäà." @@ -268,6 +261,7 @@ /* Application title */ STRINGTABLE DISCARDABLE BEGIN - IDS_APPNAME "ReactOS Service Manager" -END - + IDS_APPNAME "Óïðàâëåíèå íà óñëóãèòå íà ÐåàêòÎÑ" +END + + Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ipconfig/ipconfig.rc (original) +++ trunk/reactos/base/applications/network/ipconfig/ipconfig.rc Mon Oct 15 23:33:14 2007 @@ -15,4 +15,5 @@ #include "lang/it-IT.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" +#include "lang/uk-UA.rc" Added: trunk/reactos/base/applications/network/ipconfig/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ipconfig/lang/uk-UA.rc (added) +++ trunk/reactos/base/applications/network/ipconfig/lang/uk-UA.rc Mon Oct 15 23:33:14 2007 @@ -1,0 +1,73 @@ +/* + * PROJECT: ReactOS IpConfig Network Command + * LICENSE: GPL - See COPYING in the top level directory + * FILE: /base/applications/network/ipconfig/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for IpConfig Network Command + * PROGRAMMERS: Rostislav Zabolotny + */ +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_BCAST "Broadcast" + IDS_P2P "Peer To Peer" + IDS_MIXED "Mixed" + IDS_HYBRID "Hybrid" + IDS_UNKNOWN "Íåâ³äîìèé" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_OTHER "²íøèé òèï àäàïòåðà" + IDS_ETH "Ethernet àäàïòåð" + IDS_TOKEN "Token Ring àäàïòåð" + IDS_FDDI "FDDI àäàïòåð" + IDS_PPP "PPP àäàïòåð" + IDS_LOOP "Loopback àäàïòåð" + IDS_SLIP "SLIP àäàïòåð" +END + +STRINGTABLE DISCARDABLE +BEGIN +/* Please keep the spacing/formatting as per En.rc when translating */ + IDS_USAGE + "\nÂÈÊÎÐÈÑÒÀÍÍß:\n \ + ipconfig [/? | /all | /renew [àäàïòåð] | /release [àäàïòåð] |\n \ + /flushdns | /displaydns | /registerdns |\n \ + /showclassid àäïòåð |\n \ + /setclassid àäàïòåð [âñòàíîâëþâàíèé_classid] ]\n \ + \n \ + äå\n \ + àäàïòåð Íàçâà ç'ºäíàííÿ\n \ + (äîçâîëåí³ ñèìâîëè ìàñêóâàííÿ -- *(áóäü-ÿêà ê³ëüê³ñòü çíàê³â) ³ ?(îäèí ñèìâîë)\n \ + \n \ + Êëþ÷³:\n \ + /? Âèâåñòè öå ïîâ³äîìëåííÿ\n \ + /all Ïîêàçàòè ïîâíó ³íôîðìàö³þ ïðî ìåðåæí³ íàëàøòóâàííÿ.\n \ + /release Çâ³ëüíèòè IP-àäðåñó âêàçàíîãî àäàïòåðà.\n \ + /renew Îáíîâèòè IP-àäðåñó âêàçàíîãî àäàïòåðà.\n \ + /flushdns Î÷èñòèòè êåø DNS çàïèñ³â.\n \ + /registerdns Îíîâèòè âñ³ ðåºñòðàö³¿ DHCP ³ ïåðåðåºñòóâàòè ³ìåíà DNS.\n \ + /displaydns Ïîêàçàòè âì³ñò êåøó DNS.\n \ + /showclassid Ïîêàçàòè âñ³ äîâçîëåí³ äëÿ âêàçàíîãî àäàïòåðà êîäè(Class ID) DHCP.\n \ + /setclassid Çì³íòèòè êîä DHCP (Class ID).\n \ + \n \ + Ïî çàìîâ÷óâàííþ â³äîáðàæàºòüñÿ ò³ëüêè IP-àäðåñà, ìàñêà ï³äìåðåæ³ ³ øëþç\n \ + äëÿ êîæíîãî àäàïòåðà çâ'ÿçàíîãî ç TCP/IP.\n \ + \n \ + Ïðè âèêîðèñòàíí³ êëþ÷³â Release ³ Renew, ÿêùî íå áóëî âêàçàíî ³ì'ÿ àäàïòåðà,òî\n \ + IP-àäðåñà çâ³ëüíÿºòüñÿ ÷è îíîâëþºòüñÿ äëÿ âñ³õ àäàïåòð³â çâ'ÿçàíèõ ç TCP/IP.\n \ + \n \ + Ïðè âèêîðèñòàíí³ êëþ÷à Setclassid, ÿêùî íå áóëî âêàçàíî ID êëàñó (ClassId), òî ³ñíóþ÷èé êîä êëàñó áóäå âèäàëåíî.\n \ + \n \ + Ïðèêëàäè:\n \ + > ipconfig ... Âèâåñòè çàãàëüíó ³íôîðìàö³þ.\n \ + > ipconfig /all ... Âèâåñòè ïîâíó ³íôîðìàö³þ.\n \ + > ipconfig /renew ... Îíîâèòè ñòàí âñ³õ àäàïåòð³â\n \ + > ipconfig /renew EL* ... Îíîâèòè ñòàí âñ³õ ç'ºäíàíü, \n \ + ³ì'ÿ ÿêèõ ïî÷èíàºòüñÿ íà EL\n \ + > ipconfig /release *Con* ... Çâ³ëüíèòè (ñêèíóòè äèíàì³÷íó êîíô³ãóðàö³þ)\n \ + âñ³ ç'ºäíàííÿ, ÿê³ ì³ñòÿòü ó íàçâ³ ""Ñon""\n \ + íàïð.""Local Area Connection 1"" ÷è\n \ + ""Local Area Connection 2""\n" +END Propchange: trunk/reactos/base/applications/network/ipconfig/lang/uk-UA.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/desk/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/bg-BG.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/bg-BG.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/bg-BG.rc Mon Oct 15 23:33:14 2007 @@ -42,7 +42,7 @@ CONTROL "Èñêàíå íà ïàðîëà ïðè èçõîä.",IDC_SCREENS_USEPASSCHK,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 126, 19 GROUPBOX "&Åíåðãîñïåñòÿâàùè âúçìîæíîñòè íà ìîíèòîðà", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 - LTEXT "To adjust the power settings for your monitor, click on Power Settings.", + LTEXT "Çà íàñòðîéêà çàõðàíâàíåòî íà ìîíèòîðà ñè, íàòèñíåòå 'Çàõðàíâàíå...'", IDC_STATIC, 14, 166, 146 ,20 PUSHBUTTON "Çàõðàíâàíå...", IDC_SCREENS_POWER_BUTTON, 176, 171, 60, 13 END @@ -55,7 +55,7 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Öâåòîâè íàáîð", IDC_STATIC, 7, 140, 64, 9 + LTEXT "Ðàçöâåòêà", IDC_STATIC, 7, 140, 64, 9 COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Îùå", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 END @@ -103,7 +103,7 @@ CAPTION "Íàñòðîéêè" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Drag the monitor icons to match the physical arrangement of your monitors.",-1,3,3,240,10 + LTEXT "Çàâëà÷åòå çíà÷åòàòà íà ìîíèòîðèòå òàêà, ÷å äà îòãîâàðÿò íà äåéñòâèòåëíîòî ðàçïîëîæåíèå íà ìîíèòîðèòå âè.",-1,3,3,240,10 CONTROL "",IDC_SETTINGS_MONSEL,"MONITORSELWNDCLASS",WS_CHILD|WS_VISIBLE|WS_TABSTOP,3,16,240,82,WS_EX_CLIENTEDGE LTEXT "&Åêðàí:",1820,3,100,30,8 LTEXT "<íÿìà>",IDC_SETTINGS_DEVICE,9,109,224,8 @@ -118,12 +118,12 @@ WS_VSCROLL | WS_TABSTOP CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, 131,148,103,9 - PUSHBUTTON "Ðàç&øèðåíè...",IDC_SETTINGS_ADVANCED,170,165,70,14 + PUSHBUTTON "Ðàç&øèðåíè...",IDC_SETTINGS_ADVANCED,306,165,56,14 END IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "General" +CAPTION "Îáùè" FONT 8, "MS Shell Dlg" BEGIN END @@ -139,19 +139,19 @@ BEGIN POPUP "" BEGIN - MENUITEM "&Attached", ID_MENU_ATTACHED - MENUITEM "&Primary", ID_MENU_PRIMARY + MENUITEM "Ïðè&êðåïåí", ID_MENU_ATTACHED + MENUITEM "&Ïúðâè÷åí", ID_MENU_PRIMARY MENUITEM SEPARATOR - MENUITEM "&Identify", ID_MENU_IDENTIFY - MENUITEM "P&roperties", ID_MENU_PROPERTIES + MENUITEM "&Ðàçïîçíàâàíå", ID_MENU_IDENTIFY + MENUITEM "&Ñâîéñòâà", ID_MENU_PROPERTIES END END STRINGTABLE BEGIN - IDS_MULTIPLEMONITORS "(Multiple Monitors)" - IDS_UNKNOWNMONITOR "(Unknown Monitor)" - IDS_ADVANCEDTITLEFMT "%s and %s" + IDS_MULTIPLEMONITORS "(Ìíîãî ìîíèòîðè)" + IDS_UNKNOWNMONITOR "(Íåèçâåñòåí ìîíèòîð)" + IDS_ADVANCEDTITLEFMT "%s è %s" END STRINGTABLE @@ -205,9 +205,9 @@ IDS_ELEMENT_11 "Öâÿò íà çàãëàâèÿòà" IDS_ELEMENT_12 "Ñèìâîëíî çàãëàâèå" IDS_ELEMENT_13 "Íàäïèñíà ëåíòà" - IDS_ELEMENT_14 "Deactivated menu elements" + IDS_ELEMENT_14 "Íåòåêóùè ÷àñòè îò ìåíþòî" IDS_ELEMENT_15 "Âúïðîñèòåëåí ïðîçîðåö" - IDS_ELEMENT_16 "Scrollbar controls" + IDS_ELEMENT_16 "Óïðàâëÿâàùè ïëúçãà÷è" IDS_ELEMENT_17 "Ïîäêðàñêà íà ïðèëîæåíèÿòà" IDS_ELEMENT_18 "Ïîäçàãëàâèÿ" IDS_ELEMENT_19 "Âîäîðàâíà ðàçðåäêà" Modified: trunk/reactos/dll/win32/shell32/shell32_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_Bg.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_Bg.rc Mon Oct 15 23:33:14 2007 @@ -20,8 +20,8 @@ MENU_001 MENU DISCARDABLE BEGIN - MENUITEM "&Ãîëåìè çíà÷êè", FCIDM_SHVIEW_BIGICON - MENUITEM "&Ìàëêè çíà÷êè", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Ãîëåìè çíà÷åòà", FCIDM_SHVIEW_BIGICON + MENUITEM "&Ìàëêè çíà÷åòà", FCIDM_SHVIEW_SMALLICON MENUITEM "&Ñïèñúê", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Ïîäðîáåí", FCIDM_SHVIEW_REPORTVIEW END @@ -35,13 +35,13 @@ BEGIN POPUP "Èç&ãëåä" BEGIN - MENUITEM "&Ãîëåìè çíà÷êè", FCIDM_SHVIEW_BIGICON - MENUITEM "&Ìàëêè çíà÷êè", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Ãîëåìè çíà÷åòà", FCIDM_SHVIEW_BIGICON + MENUITEM "&Ìàëêè çíà÷åòà", FCIDM_SHVIEW_SMALLICON MENUITEM "&Ñïèñúê", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Ïîäðîáåí", FCIDM_SHVIEW_REPORTVIEW END MENUITEM SEPARATOR - POPUP "Ïîäðåæäàíå íà çíà÷êèòå" + POPUP "Ïîäðåæäàíå íà &çíà÷åòàòà" BEGIN MENUITEM "Ïî &èìå", 0x30 /* column 0 */ MENUITEM "Ïî &âèä", 0x32 /* column 2 */ @@ -50,7 +50,7 @@ MENUITEM SEPARATOR MENUITEM "&Ñàìîïîäðåæäàíå", FCIDM_SHVIEW_AUTOARRANGE END - MENUITEM "Ïîäðàâíåíè çíà÷êè", FCIDM_SHVIEW_SNAPTOGRID + MENUITEM "Ïîäðàâíåíè çíà÷åòà", FCIDM_SHVIEW_SNAPTOGRID MENUITEM SEPARATOR MENUITEM "Îïðåñíÿâàíå", FCIDM_SHVIEW_REFRESH MENUITEM SEPARATOR @@ -91,7 +91,7 @@ SHBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 188, 192 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK -CAPTION "Browse for Folder" +CAPTION "Òúðñåíå íà ïàïêà" FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "Äîáðå", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP @@ -114,7 +114,7 @@ ICON "", 1088, 10, 10, 14, 16 LTEXT "", 100, 30, 10, 137, 10 LTEXT "", 101, 30, 22, 137, 10 - LTEXT "ReactOS was brought to you by:", 98, 8, 55, 137, 10 + LTEXT "ÐåàêòÎÑ âè áå äîñòàâåí îò:", 98, 8, 55, 137, 10 } SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -124,79 +124,93 @@ { ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE LTEXT "Íàïèøåòå èìåòî íà ïðèëîæåíèå, ïàïêà, äîêóìåíò èëè èíòåðíåò èçòî÷íèê è ÐåàêòÎÑ ùå ãî îòâîðè.", 12289, 36, 11, 182, 18 - LTEXT "&Îòâàðÿíå:", 12305, 7, 39, 24, 10 - CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 + LTEXT "&Îòâàðÿíå:", 12305, 7, 39, 40, 10 + CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 46, 37, 180, 100 DEFPUSHBUTTON "Äîáðå", IDOK, 62, 63, 50, 14, WS_TABSTOP PUSHBUTTON "Îòêàç", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP PUSHBUTTON "&Îáçîð...", 12288, 170, 63, 50, 14, WS_TABSTOP } + SHELL_GENERAL_SHORTCUT_DLG DIALOGEX 0, 0, 240, 130 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Shortcut" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { ICON "", 14000, 10, 5, 30, 30, WS_VISIBLE - LTEXT "Target type:", 14004, 10, 30, 50, 10 + LTEXT "Âèä íà öåëòà:", 14004, 10, 30, 50, 10 LTEXT "", 14005, 70, 30, 150, 10 - LTEXT "Target location:", 14006, 10, 40, 70, 10 + LTEXT "Ìåñòîïîëîæåíèå íà öåëòà:", 14006, 10, 40, 70, 10 LTEXT "", 14007, 70, 40, 150, 10 - LTEXT "Target:", 14008, 10, 55, 45, 10 + LTEXT "Öåë:", 14008, 10, 55, 45, 10 EDITTEXT 14009, 70, 55, 150, 10, ES_LEFT - LTEXT "&Start in:",14010, 10, 65, 45, 10 + LTEXT "Èçïúëíÿâàíå â:",14010, 10, 65, 45, 10 EDITTEXT 14011, 70, 65, 150, 10, ES_LEFT - LTEXT "Shortcut &key:", 14014, 10, 80, 45, 10 + LTEXT "Áúðç &êëàâèø:", 14014, 10, 80, 45, 10 EDITTEXT 14015, 70, 80, 150, 10, ES_LEFT - LTEXT "Run:", 14016, 10, 90, 45, 10 + LTEXT "Èçïúëíÿâàíå:", 14016, 10, 90, 45, 10 EDITTEXT 14017, 70, 90, 150, 10 - LTEXT "C&omment:", 14018, 10, 100, 45, 10 + LTEXT "Çàáåëåæêà:", 14018, 10, 100, 45, 10 EDITTEXT 14019, 70, 100, 150, 10, ES_LEFT - PUSHBUTTON "&Find Target...", 14020, 10, 115, 60, 14, ES_LEFT - PUSHBUTTON "&Change Icon...", 14021, 80, 115, 60, 14, ES_LEFT - PUSHBUTTON "A&dvanced...", 14022, 150, 115, 60, 14, ES_LEFT + PUSHBUTTON "&Íàìèðàíå íà öåëòà", 14020, 10, 115, 70, 14, ES_LEFT + PUSHBUTTON "&Ñìÿíà íà çíà÷åòî:", 14021, 80, 115, 67, 14, ES_LEFT + PUSHBUTTON "Ðàç&øèðåíè...", 14022, 150, 115, 60, 14, ES_LEFT +} + +SHELL_EXTENDED_SHORTCUT_DLG DIALOGEX 0, 0, 260, 150 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION +CAPTION "Äîïúëíèòåëíè ñâîéñòâà" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +{ + LTEXT "Óêàæåòå æåëàíèòå äîïúëíèòåëíè ñâîéñòâà çà ïðåïðàòêàòà.", -1, 5, 30, 246, 10 + CHECKBOX "Èçïúëíÿâàíå ñ ðàçëè÷íè ïðàâîìîùèÿ", 14000, 30, 50, 150, 10 + LTEXT "Òàçè âúçìîæíîñò âè ïîçâîëÿâà äà èçïúëíèòå ïðåïðàòêàòà êàòî äðóã ïîòðåáèòåë èëè äà ïðîäúëæèòå êàòî ñåáå ñè, êàòî ïðåäïàçâàòå êîìïþòúðà è äàííèòå îò íåóïúëíîìîùåíà äåéíîñò íà ïðèëîæåíèÿòà.", -1, 50, 60, 200, 40 + CHECKBOX "Èçïúëíÿâàíå â îòäåëåí äÿë îò ïàìåòòà", 14001, 30, 100, 170, 10, WS_DISABLED + PUSHBUTTON "Äîáðå", IDOK, 25, 120, 40, 15, WS_VISIBLE + PUSHBUTTON "Ïðåêúñâàíå", IDCANCEL, 120, 120, 50, 15, WS_VISIBLE } SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 130 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "General" +CAPTION "Îáùè" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { ICON "", 14000, 10, 5, 30, 30, WS_VISIBLE EDITTEXT 14001, 70, 5, 100, 10, ES_LEFT | ES_READONLY - LTEXT "Type of file:", 14004, 10, 30, 50, 10 - LTEXT "%s File", 14005, 70, 30, 150, 10 - LTEXT "Opens with:", 14006, 10, 40, 50, 10 + LTEXT "Âèä ôàéë:", 14004, 10, 30, 50, 10 + LTEXT "Ôàéë:", 14005, 70, 30, 150, 10 + LTEXT "Îòâàðÿíå ñ:", 14006, 10, 40, 50, 10 LTEXT "", 14007, 70, 40, 150, 10 - LTEXT "Location:", 14008, 10, 55, 45, 10 + LTEXT "Ìåñòîïîëîæåíèå:", 14008, 10, 55, 60, 10 LTEXT "", 14009, 70, 55, 200, 10 - LTEXT "Size:",14010, 10, 65, 45, 10 + LTEXT "Ðàçìåð:",14010, 10, 65, 45, 10 LTEXT "", 14011, 70, 65, 150, 10 - LTEXT "Created:", 14014, 10, 80, 45, 10 + LTEXT "Ñúçäàäåí", 14014, 10, 80, 45, 10 LTEXT "", 14015, 70, 80, 150, 10 - LTEXT "Modied:", 14016, 10, 90, 45, 10 + LTEXT "Ïðîìåíåí:", 14016, 10, 90, 45, 10 LTEXT "", 14017, 70, 90, 150, 10 - LTEXT "Accessed:", 14018, 10, 100, 45, 10 + LTEXT "Èçïîëçâàí", 14018, 10, 100, 45, 10 LTEXT "", 14019, 70, 100, 150, 10 - LTEXT "Attributes:", 14020, 10, 115, 45, 10 - CHECKBOX "&Read-only", 14021, 70, 115, 45, 10 - CHECKBOX "&Hidden", 14022, 130, 115, 50, 10 - CHECKBOX "&Archive", 14023, 180, 115, 45, 10 -} - -SHELL_FILE_VERSION_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ - LTEXT "File version: ", 14000, 10, 10, 45, 10 - LTEXT "", 14001, 70, 10, 150, 10 - LTEXT "Description: ", 14002, 10, 20, 45, 10 + LTEXT "Ïðèíàäëåæíîñòè", 14020, 10, 115, 60, 10 + CHECKBOX "Ñàìî çà &÷åòåíå", 14021, 70, 115, 65, 10 + CHECKBOX "Ñ&êðèò", 14022, 140, 115, 40, 10 + CHECKBOX "&Ñáèò", 14023, 180, 115, 45, 10 +} + +SHELL_FILE_VERSION_DLG DIALOGEX 0, 0, 240, 136 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Èçäàíèå" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +{ + LTEXT "Èçäàíèå íà ôàéëà:", 14000, 10, 10, 67, 10 + LTEXT "", 14001, 80, 10, 150, 10 + LTEXT "Îïèñàíèå:", 14002, 10, 20, 45, 10 LTEXT "", 14003, 70, 20, 150, 10 - LTEXT "Copyright: ", 14004, 10, 30, 45, 10 - LTEXT "", 14005, 70, 30, 150, 10 - GROUPBOX "Other version information: ", 14006, 10, 45, 220, 90 - LTEXT "Item name: ", 14007, 20, 55, 50, 10 - LTEXT "Value: ", 14008, 130, 55, 45, 10 + LTEXT "Âúçïðîèçâîäñòâåíî ïðàâî", 14004, 10, 30, 93, 10 + LTEXT "", 14005, 105, 30, 150, 10 + GROUPBOX "Äðóãè ñâåäåíèÿ çà èçäàíèåòî", 14006, 10, 45, 220, 90 + LTEXT "Èìå íà ïðåäìåòà", 14007, 20, 55, 90, 10 + LTEXT "Ñòîéíîñò:", 14008, 130, 55, 45, 10 LISTBOX 14009,20,65,95,60, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY EDITTEXT 14010, 130, 65, 95, 60, ES_LEFT|WS_BORDER|WS_VSCROLL|WS_GROUP|ES_MULTILINE|ES_READONLY @@ -204,19 +218,19 @@ DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 230 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "General" +CAPTION "Îáùè" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { EDITTEXT 14001, 40, 20, 190, 10, ES_LEFT|WS_BORDER|WS_GROUP - LTEXT "Type:", -1, 15, 55, 40, 10 + LTEXT "Âèä:", -1, 15, 55, 40, 10 LTEXT "", 14002, 110, 55, 100, 10 - LTEXT "File system:", -1, 15, 70, 100, 10 + LTEXT "Ôàéëîâà óðåäáà:", -1, 15, 70, 100, 10 LTEXT "", 14003, 110, 70, 100, 10 CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 - LTEXT "Used space:", -1, 25, 90, 120, 10 + LTEXT "Èçïîëçâàíî ìÿñòî:", -1, 25, 90, 120, 10 LTEXT "", 14004, 110, 90, 120, 10 LTEXT "", 14005, 200, 90, 40, 10 @@ -225,42 +239,71 @@ LTEXT "", 14006, 110, 105, 120, 10 LTEXT "", 14007, 200, 105, 40, 10 - LTEXT "Capacity:", -1, 25, 125, 80, 10 + LTEXT "Îáåì:", -1, 25, 125, 80, 10 LTEXT "", 14008, 110, 125, 120, 10 LTEXT "", 14009, 200, 125, 40, 10 CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - LTEXT "Drive %s", 14010, 100, 170, 40, 10 - PUSHBUTTON "Disk Cleanup", 14011, 180, 175, 50, 15, WS_TABSTOP - CHECKBOX "Compress drive to save disk space", 14012, 15, 205, 165, 10, WS_DISABLED - CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED + LTEXT "Óñòðîéñòâî %s", 14010, 100, 170, 40, 10 + PUSHBUTTON "Ïî÷èñòâàíå íà äèñêà", 14011, 150, 175, 80, 15, WS_TABSTOP + CHECKBOX "Óïëúòíÿâàíå íà óñòðîéñòâîòî çà ñïåñòÿâàíå íà ìÿñòî", 14012, 1, 205, 238, 10, WS_DISABLED + CHECKBOX "Èíäåêñèðàùàòà óñëóãà äà èíäåêñèðà äèñêà çà ïî- áúðçî òúðñåíå", 14012, 1, 220, 238, 10, WS_DISABLED } DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Tools" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ - GROUPBOX "Error-checking", -1, 5, 5, 230, 60 - LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 - PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP - GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 - LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 - PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP - GROUPBOX "Backup", -1, 5, 130, 230, 60 - LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 - PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP -} +CAPTION "Ñðåäñòâà" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +{ + GROUPBOX "Ïðîâåðêà çà ãðåøêè", -1, 5, 5, 230, 60 + LTEXT "Òîçè èçáîð ùå ïðîâåðè òîìà çà ãðåøêè.", -1, 40, 25, 160, 20 + PUSHBUTTON "Ïðîâåðè âåäíàãà...", 14000, 130, 45, 90, 15, WS_TABSTOP + GROUPBOX "Ïîäðåæäàíå", -1, 5, 65, 230, 60 + LTEXT "Òîçè èçáîð ùå ïîäðåäè (äåôðàãìåíòèðà) ôàéëîâåòå íà òîìà", -1, 40, 85, 160, 20 + PUSHBUTTON "Ïîäðåäè âåäíàãà...", 14001, 130, 105, 90, 15, WS_TABSTOP + GROUPBOX "Çàïàñÿâàíå", -1, 5, 130, 230, 60 + LTEXT "Òîçè èçáîð ùå íàïðàâè çàïàñíî ñúõðàíåíèå íà ôàéëîâåòå íà äèñêà.", -1, 40, 150, 160, 20 + PUSHBUTTON "Çàïàñè âåäíàãà", 14002, 130, 170, 90, 15, WS_TABSTOP +} + DRIVE_HARDWARE_DLG DIALOGEX 0, 0, 240, 130 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Hardware" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - +CAPTION "Îáîðóäâàíå" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +{ +} + +RUN_AS_DIALOG DIALOGEX 0, 0, 240, 190 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Èçïúëíÿâàíå êàòî" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +{ +/* LTEXT "Îò ÷èÿ ïîòðåáèòåëñêà ñìåòêà èñêàòå äà èçïúëíèòå ïðèëîæåíèåòî?", -1, 5, 30, 235, 16 + CHECKBOX "Ñåãàøåí ïîòðåáèòåë %s", 14000, 5, 45, 150, 10 + LTEXT "Protect my computer and data from unauthorized program activity", -1, 40, 65, 150, 10, WS_DISABLED + CHECKBOX ""Òîçè èçáîð ìîæå äà ïîïðå÷è íà âèðóñèòå äà ïîâðåäÿò êîìïþòúðà\nèëè äàííèòå âè, íî ìîæå è äà ïîïðå÷è\níà ðåäîâíaòà ðàáîòà íà ïðèëîæåíèåòî.", 14001, 40, 80, 150, 20, WS_DISABLED + CHECKBOX "Ñëåäíèÿò ïîòðåáèòåë:", 14002, 5, 100, 90, 10 + LTEXT "Ïîòðåáèòåëñêî èìå:", -1, 15, 115, 80, 10 + COMBOBOX 14003, 90, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP +*/ + LTEXT "Which user account do you want to use to run this program?", -1, 30, 30, 170, 10 + CHECKBOX "Ñåãàøåí ïîòðåáèòåë %s", 14000, 5, 45, 150, 10 + LTEXT "Protect my computer and data from unauthorized program activity", -1, 40, 65, 150, 10, WS_DISABLED + CHECKBOX "This option can prevent computer viruses from harming your\ncomputer or personal data, but selecting it might cause the\nprogram to function improperly.", 14001, 40, 80, 150, 10, WS_DISABLED + CHECKBOX "Ñëåäíèÿò ïîòðåáèòåë:", 14002, 5, 100, 90, 10 + LTEXT "Ïîòðåáèòåëñêî èìå:", -1, 15, 115, 80, 10 + COMBOBOX 14003, 70, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + PUSHBUTTON "...", 14004, 200, 115, 30, 10, WS_TABSTOP + LTEXT "Ïàðîëà:", -1, 15, 140, 60, 10 + EDITTEXT 14005, 90, 140, 100, 10, ES_LEFT | WS_BORDER | WS_GROUP + PUSHBUTTON "...", 14006, 200, 140, 30, 10, WS_TABSTOP + PUSHBUTTON "Äîáðå", 14007, 70, 170, 60, 15, WS_TABSTOP + PUSHBUTTON "Îòêàç", 14008, 140, 170, 60, 15, WS_TABSTOP +} STRINGTABLE DISCARDABLE { @@ -271,26 +314,26 @@ IDS_SHV_COLUMN4 "Ïðîìåíåí" IDS_SHV_COLUMN5 "Ïðèçíàê" IDS_SHV_COLUMN6 "Ðàçìåð" - IDS_SHV_COLUMN7 "Size available" + IDS_SHV_COLUMN7 "Íàëè÷åí ðàçìåð" IDS_SHV_COLUMN8 "Èìå" IDS_SHV_COLUMN9 "Çàáåëåæêè" IDS_SHV_COLUMN10 "Ñîáñòâåíèê" IDS_SHV_COLUMN11 "Ãðóïà" /* special folders */ - IDS_DESKTOP "Desktop" - IDS_MYCOMPUTER "My Computer" + IDS_DESKTOP "Ðàáîòíà ïëîù" + IDS_MYCOMPUTER "Ìîÿò êîìïþòúð" /* context menus */ - IDS_VIEW_LARGE "&Ãîëåìè çíà÷êè" - IDS_VIEW_SMALL "&Ìàëêè çíà÷êè" + IDS_VIEW_LARGE "&Ãîëåìè çíà÷åòà" + IDS_VIEW_SMALL "&Ìàëêè çíà÷åòà" IDS_VIEW_LIST "&Ñïèñúê" IDS_VIEW_DETAILS "&Ïîäðîáåí" IDS_SELECT "Èçáîð" IDS_OPEN "Îòâàðÿíå" IDS_CREATEFOLDER_DENIED "Ñúçäàâàíåòî íà íîâà ïàïêà å íåâúçìîæíî: íåäîñòàòú÷íè ïðàâà." - IDS_CREATEFOLDER_CAPTION "Ãðåøêà ïðè ñúñäàâàíå íà íîâà ïàïêà" + IDS_CREATEFOLDER_CAPTION "Ãðåøêà ïðè ñúçäàâàíå íà íîâà ïàïêà" IDS_DELETEITEM_CAPTION "Ïîòâúðäåòå èçòðèâàíå íà ôàéëà" IDS_DELETEFOLDER_CAPTION "Ïîòâúðäåòå èçòðèâàíå íà ïàïêàòà" IDS_DELETEITEM_TEXT "Ñèãóðåí ëè ñòå, ÷å èñêàòå äà èçòðèåòå '%1'?" @@ -332,7 +375,4 @@ IDS_COMMON_PICTURES "Documents\\My Pictures" IDS_COMMON_VIDEO "Documents\\My Video" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" - IDS_DRIVE_FIXED "Lokal Disk" - IDS_DRIVE_CDROM "CDROM" - IDS_DRIVE_NETWORK "Network Disk" -} +}

1 0

[greatlrd] 29607: fixing few compiling issue with this new header. add few more redirect in ddraw.c to dxg.sys
by greatlrd＠svn.reactos.org 15 Oct '07

15 Oct '07

Author: greatlrd Date: Mon Oct 15 23:04:50 2007 New Revision: 29607 URL: http://svn.reactos.org/svn/reactos?rev=29607&view=rev Log: fixing few compiling issue with this new header. add few more redirect in ddraw.c to dxg.sys Modified: branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dd.c branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h (original) +++ branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h Mon Oct 15 23:04:50 2007 @@ -9,6 +9,9 @@ /* From ddraw.c */ extern PDRVFN gpDxFuncs; +typedef BOOL (NTAPI* PGD_DDSETGAMMARAMP)(HANDLE, HDC, LPVOID); +typedef BOOL (NTAPI* PGD_DDRELEASEDC)(HANDLE); +typedef BOOL (NTAPI* PGD_DDRESTVISRGN)(HANDLE, HWND); typedef HANDLE (NTAPI* PGD_DDGETDXHANDLE)(HANDLE, HANDLE, BOOL); typedef HDC (NTAPI *PGD_DDGETDC)(HANDLE, PALETTEENTRY *); typedef DWORD (NTAPI *PGD_DXGENERICTRUNK)(ULONG_PTR, ULONG_PTR, SIZE_T*, PVOID, SIZE_T*, PVOID); Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dd.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dd.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dd.c Mon Oct 15 23:04:50 2007 @@ -137,7 +137,7 @@ } DPRINT1("Calling on dxg.sys pfnDdCreateSurfaceEx"); - return pfnDdCreateSurfaceEx(hDirectDrawLocal,puGetScanLineData); + return pfnDdCreateSurfaceEx(hDirectDraw,hSurface,dwSurfaceHandle); } Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Mon Oct 15 23:04:50 2007 @@ -456,7 +456,7 @@ } DPRINT1("Calling on dxg.sys pfnDdFlipToGDISurface"); - return pfnDdFlipToGDISurface(hDirectDrawLocal, puFlipToGDISurfaceData); + return pfnDdFlipToGDISurface(hDirectDraw, puFlipToGDISurfaceData); } @@ -493,7 +493,7 @@ BOOL bRelease) { - PGD_DDGETDXHANDLE pfnDdGetDxHandle = NULL; + PGD_DDGETDXHANDLE pfnDdGetDxHandle = NULL; INT i; DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdGetDxHandle, pfnDdGetDxHandle); @@ -516,7 +516,19 @@ STDCALL NtGdiDdReleaseDC(HANDLE hSurface) { - + PGD_DDRELEASEDC pfnDdReleaseDC = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdReleaseDC, pfnDdReleaseDC); + + if (pfnDdReleaseDC == NULL) + { + DPRINT1("Warring no pfnDdReleaseDC"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDdReleaseDC"); + return pfnDdReleaseDC(hSurface); } /************************************************************************/ @@ -528,6 +540,19 @@ HWND hwnd) { + PGD_DDRESTVISRGN pfnDdResetVisrgn = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdResetVisrgn, pfnDdResetVisrgn); + + if (pfnDdResetVisrgn == NULL) + { + DPRINT1("Warring no pfnDdResetVisrgn"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDdResetVisrgn"); + return pfnDdResetVisrgn(hSurface, hwnd); } /************************************************************************/ @@ -539,7 +564,19 @@ HDC hdc, LPVOID lpGammaRamp) { - + PGD_DDSETGAMMARAMP pfnDdSetGammaRamp = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdSetGammaRamp, pfnDdSetGammaRamp); + + if (pfnDdSetGammaRamp == NULL) + { + DPRINT1("Warring no pfnDdSetGammaRamp"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDdSetGammaRamp"); + return pfnDdSetGammaRamp(hDirectDraw, hdc, lpGammaRamp); }

1 0

[greatlrd] 29606: fixing few compiling issue with this new header.
by greatlrd＠svn.reactos.org 15 Oct '07

15 Oct '07

Author: greatlrd Date: Mon Oct 15 22:40:01 2007 New Revision: 29606 URL: http://svn.reactos.org/svn/reactos?rev=29606&view=rev Log: fixing few compiling issue with this new header. Modified: branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h (original) +++ branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h Mon Oct 15 22:40:01 2007 @@ -9,10 +9,10 @@ /* From ddraw.c */ extern PDRVFN gpDxFuncs; -typedef HANDLE (NTAPI* PGD_PGD_DDGETDXHANDLE)(HANDLE, HANDLE, BOOL); +typedef HANDLE (NTAPI* PGD_DDGETDXHANDLE)(HANDLE, HANDLE, BOOL); typedef HDC (NTAPI *PGD_DDGETDC)(HANDLE, PALETTEENTRY *); typedef DWORD (NTAPI *PGD_DXGENERICTRUNK)(ULONG_PTR, ULONG_PTR, SIZE_T*, PVOID, SIZE_T*, PVOID); -typedef DWORD (NTAPI *PGD_DXDDREENABLEDIRECTDRAWOBJECT)(HANDLE, BOOL); +typedef DWORD (NTAPI *PGD_DXDDREENABLEDIRECTDRAWOBJECT)(HANDLE, BOOL*); typedef DWORD (NTAPI *PGD_DXDDGETDRIVERINFO)(HANDLE, PDD_GETDRIVERINFODATA); typedef DWORD (NTAPI *PGD_DXDDSETEXCLUSIVEMODE)(HANDLE, PDD_SETEXCLUSIVEMODEDATA); typedef NTSTATUS (NTAPI *PGD_DXDDSTARTUPDXGRAPHICS) (ULONG, PDRVENABLEDATA, ULONG, PDRVENABLEDATA, PULONG, PEPROCESS); Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Mon Oct 15 22:40:01 2007 @@ -97,8 +97,7 @@ INTERNAL_CALL DD_Cleanup(PVOID ObjectBody) { - PDD_DIRECTDRAW pDirectDraw = (PDD_DIRECTDRAW) ObjectBody; - + // FIXME remove this line PDD_DIRECTDRAW pDirectDraw = (PDD_DIRECTDRAW) ObjectBody; DPRINT1("DD_Cleanup\n"); /* Do not known what the new cleanup code should do at moment */ @@ -175,9 +174,9 @@ PGD_DXGENERICTRUNK pfnDxgGenericThunk = NULL; INT i; - DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdGetDriverState, pfnDxgGenericThunk); - - if (pfnDdGetDriverState == NULL) + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDxgGenericThunk, pfnDxgGenericThunk); + + if (pfnDxgGenericThunk == NULL) { DPRINT1("Warring no pfnDxgGenericThunk"); return DDHAL_DRIVER_NOTHANDLED; @@ -432,7 +431,7 @@ } DPRINT1("Calling on dxg.sys pfnDdSetExclusiveMode"); - return pfnDdSetExclusiveMode(hDirectDrawLocal, puGetAvailDriverMemoryData); + return pfnDdSetExclusiveMode(hDirectDraw, puSetExclusiveModeData); }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs