Ros-diffs July 2006

ros-diffs@reactos.org

19 participants
662 discussions

[hpoussin] 23027: Implement the 'You need to reboot' wizard page, and use it instead of the network message box. Main advantage is that the message box doesn't appear anymore during second stage setup.
by hpoussin＠svn.reactos.org 12 Jul '06

12 Jul '06

Author: hpoussin Date: Wed Jul 12 19:30:09 2006 New Revision: 23027 URL: http://svn.reactos.org/svn/reactos?rev=23027&view=rev Log: Implement the 'You need to reboot' wizard page, and use it instead of the network message box. Main advantage is that the message box doesn't appear anymore during second stage setup. Modified: trunk/reactos/dll/win32/netcfgx/netcfgx.c trunk/reactos/dll/win32/newdev/De.rc trunk/reactos/dll/win32/newdev/En.rc trunk/reactos/dll/win32/newdev/Es.rc trunk/reactos/dll/win32/newdev/Fr.rc trunk/reactos/dll/win32/newdev/Hu.rc trunk/reactos/dll/win32/newdev/Ru.rc trunk/reactos/dll/win32/newdev/newdev.c trunk/reactos/dll/win32/newdev/resource.h trunk/reactos/dll/win32/newdev/wizard.c Modified: trunk/reactos/dll/win32/netcfgx/netcfgx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/netcfgx.… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/netcfgx.c (original) +++ trunk/reactos/dll/win32/netcfgx/netcfgx.c Wed Jul 12 19:30:09 2006 @@ -188,6 +188,7 @@ HKEY hLinkageKey = NULL; HKEY hNetworkKey = NULL; HKEY hConnectionKey = NULL; + SP_DEVINSTALL_PARAMS_W installParams; if (InstallFunction != DIF_INSTALLDEVICE) return ERROR_DI_DO_DEFAULT; @@ -437,7 +438,27 @@ * which are installed after its startup. So, we have to reboot to take * this new netcard into account. */ - MessageBox(NULL, TEXT("You need to reboot to finish the installation of your network card."), TEXT("Reboot required"), MB_OK | MB_ICONWARNING); + /* Should we reboot? */ + installParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS_W); + if (!SetupDiGetDeviceInstallParamsW( + DeviceInfoSet, + DeviceInfoData, + &installParams)) + { + rc = GetLastError(); + DPRINT("SetupDiGetDeviceInstallParams() failed with error 0x%lx\n", rc); + goto cleanup; + } + installParams.Flags |= DI_NEEDRESTART; + if (!SetupDiSetDeviceInstallParamsW( + DeviceInfoSet, + DeviceInfoData, + &installParams)) + { + rc = GetLastError(); + DPRINT("SetupDiSetDeviceInstallParams() failed with error 0x%lx\n", rc); + goto cleanup; + } rc = ERROR_SUCCESS; cleanup: Modified: trunk/reactos/dll/win32/newdev/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/De.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/newdev/De.rc (original) +++ trunk/reactos/dll/win32/newdev/De.rc Wed Jul 12 19:30:09 2006 @@ -79,6 +79,20 @@ LTEXT "UNKNOWN DEVICE",IDC_DEVICE,51,20,169,16 END +IDD_NEEDREBOOT DIALOG DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "Device installation" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Installation complete",IDC_FINISHTITLE,120,8,195,11 + LTEXT "You need to reboot to finish the install of:", + IDC_STATIC,120,32,195,19 + LTEXT "Click Finish to close the wizard.",IDC_STATIC,120,174, + 179,11 + LTEXT "UNKNOWN DEVICE",IDC_DEVICE,148,53,147,12 +END + IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU Modified: trunk/reactos/dll/win32/newdev/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/En.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/newdev/En.rc (original) +++ trunk/reactos/dll/win32/newdev/En.rc Wed Jul 12 19:30:09 2006 @@ -79,6 +79,20 @@ LTEXT "UNKNOWN DEVICE",IDC_DEVICE,51,20,169,16 END +IDD_NEEDREBOOT DIALOG DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "Device installation" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Installation complete",IDC_FINISHTITLE,120,8,195,11 + LTEXT "You need to reboot to finish the install of:", + IDC_STATIC,120,32,195,19 + LTEXT "Click Finish to close the wizard.",IDC_STATIC,120,174, + 179,11 + LTEXT "UNKNOWN DEVICE",IDC_DEVICE,148,53,147,12 +END + IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU Modified: trunk/reactos/dll/win32/newdev/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/Es.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/newdev/Es.rc (original) +++ trunk/reactos/dll/win32/newdev/Es.rc Wed Jul 12 19:30:09 2006 @@ -79,6 +79,20 @@ LTEXT "DISPOSITIVO DESCONOCIDO",IDC_DEVICE,51,20,169,16 END +IDD_NEEDREBOOT DIALOG DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "Device installation" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Installation complete",IDC_FINISHTITLE,120,8,195,11 + LTEXT "You need to reboot to finish the install of:", + IDC_STATIC,120,32,195,19 + LTEXT "Click Finish to close the wizard.",IDC_STATIC,120,174, + 179,11 + LTEXT "UNKNOWN DEVICE",IDC_DEVICE,148,53,147,12 +END + IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU Modified: trunk/reactos/dll/win32/newdev/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/Fr.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/newdev/Fr.rc (original) +++ trunk/reactos/dll/win32/newdev/Fr.rc Wed Jul 12 19:30:09 2006 @@ -7,7 +7,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Bienvenue",IDC_WELCOMETITLE,115,8,195,24 - LTEXT "Cet assistant installe un nouveau pilote pour:", + LTEXT "Cet assistant installe un nouveau pilote pour :", IDC_STATIC,115,21,195,16 LTEXT "Cliquer sur Suivant pour continuer.",IDC_STATIC,115,169,195,17 LTEXT "MATERIEL INCONNU",IDC_DEVICE,129,36,164,11 @@ -79,6 +79,20 @@ LTEXT "MATERIEL INCONNU",IDC_DEVICE,51,20,169,16 END +IDD_NEEDREBOOT DIALOG DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "Device installation" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Installation terminée",IDC_FINISHTITLE,120,8,195,11 + LTEXT "Vous devez redémarrer l'ordinateur avant d'utiliser :", + IDC_STATIC,120,32,195,19 + LTEXT "Cliquer sur Terminer pour fermer l'assistant.",IDC_STATIC,120,174, + 179,11 + LTEXT "UNKNOWN DEVICE",IDC_DEVICE,148,53,147,12 +END + IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU @@ -86,7 +100,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Installation terminée",IDC_FINISHTITLE,115,8,195,11 - LTEXT "L'assistant a fini d'installer le pilote pour:", + LTEXT "L'assistant a fini d'installer le pilote pour :", IDC_STATIC,115,32,195,19 LTEXT "Cliquer sur Terminer pour fermer l'assistant.",IDC_STATIC,115,174, 179,11 Modified: trunk/reactos/dll/win32/newdev/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/Hu.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/newdev/Hu.rc (original) +++ trunk/reactos/dll/win32/newdev/Hu.rc Wed Jul 12 19:30:09 2006 @@ -80,6 +80,20 @@ LTEXT "Ismeretlen eszköz!",IDC_DEVICE,51,20,169,16 END +IDD_NEEDREBOOT DIALOG DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "Device installation" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Installation complete",IDC_FINISHTITLE,120,8,195,11 + LTEXT "You need to reboot to finish the install of:", + IDC_STATIC,120,32,195,19 + LTEXT "Click Finish to close the wizard.",IDC_STATIC,120,174, + 179,11 + LTEXT "UNKNOWN DEVICE",IDC_DEVICE,148,53,147,12 +END + IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU Modified: trunk/reactos/dll/win32/newdev/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/Ru.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/newdev/Ru.rc (original) +++ trunk/reactos/dll/win32/newdev/Ru.rc Wed Jul 12 19:30:09 2006 @@ -79,6 +79,20 @@ LTEXT "Íåèçâåñòíîå óñòðîéñòâî",IDC_DEVICE,51,20,169,16 END +IDD_NEEDREBOOT DIALOG DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "Device installation" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Installation complete",IDC_FINISHTITLE,120,8,195,11 + LTEXT "You need to reboot to finish the install of:", + IDC_STATIC,120,32,195,19 + LTEXT "Click Finish to close the wizard.",IDC_STATIC,120,174, + 179,11 + LTEXT "UNKNOWN DEVICE",IDC_DEVICE,148,53,147,12 +END + IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU Modified: trunk/reactos/dll/win32/newdev/newdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/newdev.c?… ============================================================================== --- trunk/reactos/dll/win32/newdev/newdev.c (original) +++ trunk/reactos/dll/win32/newdev/newdev.c Wed Jul 12 19:30:09 2006 @@ -457,9 +457,6 @@ DWORD LengthNeeded = 0; LPTSTR Buffer; - TRACE("Include removable devices: %s\n", IncludeRemovableDevices ? "yes" : "no"); - TRACE("Include custom path : %s\n", IncludeCustomPath ? "yes" : "no"); - /* Calculate length needed to store the search paths */ if (IncludeRemovableDevices) { @@ -748,6 +745,20 @@ { /* Driver found ; install it */ retval = InstallCurrentDriver(DevInstData); + if (retval && Show != SW_HIDE) + { + /* Should we display the 'Need to reboot' page? */ + SP_DEVINSTALL_PARAMS installParams; + installParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS); + if (SetupDiGetDeviceInstallParams( + DevInstData->hDevInfo, + &DevInstData->devInfoData, + &installParams)) + { + if (installParams.Flags & (DI_NEEDRESTART | DI_NEEDREBOOT)) + retval = DisplayWizard(DevInstData, hWndParent, IDD_NEEDREBOOT); + } + } goto cleanup; } else if (Show == SW_HIDE) Modified: trunk/reactos/dll/win32/newdev/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/resource.… ============================================================================== --- trunk/reactos/dll/win32/newdev/resource.h (original) +++ trunk/reactos/dll/win32/newdev/resource.h Wed Jul 12 19:30:09 2006 @@ -25,6 +25,8 @@ #define IDD_INSTALLDRV 3 #define IDD_NODRIVER 4 #define IDD_INSTALLFAILED 5 -#define IDD_FINISHPAGE 6 +#define IDD_NEEDREBOOT 6 +#define IDD_FINISHPAGE 7 +#define IDD_MAXIMUMPAGE IDD_FINISHPAGE #endif /* RESOURCE_H */ Modified: trunk/reactos/dll/win32/newdev/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/wizard.c?… ============================================================================== --- trunk/reactos/dll/win32/newdev/wizard.c (original) +++ trunk/reactos/dll/win32/newdev/wizard.c Wed Jul 12 19:30:09 2006 @@ -502,7 +502,7 @@ break; } - return FALSE; + return DefWindowProc(hwndDlg, uMsg, wParam, lParam); } static void @@ -664,7 +664,7 @@ break; } - return FALSE; + return DefWindowProc(hwndDlg, uMsg, wParam, lParam); } static INT_PTR CALLBACK @@ -759,7 +759,7 @@ break; } - return FALSE; + return DefWindowProc(hwndDlg, uMsg, wParam, lParam); } static INT_PTR CALLBACK @@ -810,9 +810,25 @@ CloseHandle(hThread); hThread = 0; if (wParam == 0) - PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_FINISHPAGE); - else - PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_INSTALLFAILED); + { + /* Should we reboot? */ + SP_DEVINSTALL_PARAMS installParams; + installParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS); + if (SetupDiGetDeviceInstallParams( + DevInstData->hDevInfo, + &DevInstData->devInfoData, + &installParams)) + { + if (installParams.Flags & (DI_NEEDRESTART | DI_NEEDREBOOT)) + { + PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_NEEDREBOOT); + } + else + PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_FINISHPAGE); + break; + } + } + PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_INSTALLFAILED); break; } @@ -849,7 +865,7 @@ break; } - return FALSE; + return DefWindowProc(hwndDlg, uMsg, wParam, lParam); } static INT_PTR CALLBACK @@ -873,8 +889,12 @@ { BOOL DisableableDevice = FALSE; + /* Get pointer to the global setup data */ DevInstData = (PDEVINSTDATA)((LPPROPSHEETPAGE)lParam)->lParam; SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)DevInstData); + + /* Center the wizard window */ + CenterWindow(GetParent(hwndDlg)); hwndControl = GetDlgItem(GetParent(hwndDlg), IDCANCEL); ShowWindow(hwndControl, SW_HIDE); @@ -960,7 +980,7 @@ break; } - return FALSE; + return DefWindowProc(hwndDlg, uMsg, wParam, lParam); } static INT_PTR CALLBACK @@ -985,6 +1005,9 @@ /* Get pointer to the global setup data */ DevInstData = (PDEVINSTDATA)((LPPROPSHEETPAGE)lParam)->lParam; SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)DevInstData); + + /* Center the wizard window */ + CenterWindow(GetParent(hwndDlg)); hwndControl = GetDlgItem(GetParent(hwndDlg), IDCANCEL); ShowWindow(hwndControl, SW_HIDE); @@ -1036,11 +1059,11 @@ break; } - return FALSE; + return DefWindowProc(hwndDlg, uMsg, wParam, lParam); } static INT_PTR CALLBACK -FinishDlgProc( +NeedRebootDlgProc( IN HWND hwndDlg, IN UINT uMsg, IN WPARAM wParam, @@ -1061,6 +1084,9 @@ /* Get pointer to the global setup data */ DevInstData = (PDEVINSTDATA)((LPPROPSHEETPAGE)lParam)->lParam; SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)DevInstData); + + /* Center the wizard window */ + CenterWindow(GetParent(hwndDlg)); hwndControl = GetDlgItem(GetParent(hwndDlg), IDCANCEL); ShowWindow(hwndControl, SW_HIDE); @@ -1112,7 +1138,86 @@ break; } - return FALSE; + return DefWindowProc(hwndDlg, uMsg, wParam, lParam); +} + +static INT_PTR CALLBACK +FinishDlgProc( + IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + PDEVINSTDATA DevInstData; + UNREFERENCED_PARAMETER(wParam); + + /* Retrieve pointer to the global setup data */ + DevInstData = (PDEVINSTDATA)GetWindowLongPtr(hwndDlg, GWL_USERDATA); + + switch (uMsg) + { + case WM_INITDIALOG: + { + HWND hwndControl; + + /* Get pointer to the global setup data */ + DevInstData = (PDEVINSTDATA)((LPPROPSHEETPAGE)lParam)->lParam; + SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)DevInstData); + + /* Center the wizard window */ + CenterWindow(GetParent(hwndDlg)); + + hwndControl = GetDlgItem(GetParent(hwndDlg), IDCANCEL); + ShowWindow(hwndControl, SW_HIDE); + EnableWindow(hwndControl, FALSE); + + SendDlgItemMessage( + hwndDlg, + IDC_DEVICE, + WM_SETTEXT, + 0, + (LPARAM)DevInstData->drvInfoData.Description); + + /* Set title font */ + SendDlgItemMessage( + hwndDlg, + IDC_FINISHTITLE, + WM_SETFONT, + (WPARAM)DevInstData->hTitleFont, + (LPARAM)TRUE); + break; + } + + case WM_NOTIFY: + { + LPNMHDR lpnm = (LPNMHDR)lParam; + + switch (lpnm->code) + { + case PSN_SETACTIVE: + /* Enable the correct buttons on for the active page */ + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_FINISH); + break; + + case PSN_WIZBACK: + /* Handle a Back button click, if necessary */ + break; + + case PSN_WIZFINISH: + /* Handle a Finish button click, if necessary */ + break; + + default: + break; + } + break; + } + + default: + break; + } + + return DefWindowProc(hwndDlg, uMsg, wParam, lParam); } static HFONT @@ -1147,7 +1252,7 @@ IN UINT startPage) { PROPSHEETHEADER psh; - HPROPSHEETPAGE ahpsp[IDD_FINISHPAGE + 1]; + HPROPSHEETPAGE ahpsp[IDD_MAXIMUMPAGE + 1]; PROPSHEETPAGE psp; /* Create the Welcome page */ @@ -1190,6 +1295,12 @@ psp.pszTemplate = MAKEINTRESOURCE(IDD_INSTALLFAILED); ahpsp[IDD_INSTALLFAILED] = CreatePropertySheetPage(&psp); + /* Create the Need reboot page */ + psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER; + psp.pfnDlgProc = (DLGPROC) NeedRebootDlgProc; + psp.pszTemplate = MAKEINTRESOURCE(IDD_NEEDREBOOT); + ahpsp[IDD_NEEDREBOOT] = CreatePropertySheetPage(&psp); + /* Create the Finish page */ psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER; psp.pfnDlgProc = (DLGPROC) FinishDlgProc; @@ -1201,7 +1312,7 @@ psh.dwFlags = PSH_WIZARD97 | PSH_WATERMARK | PSH_HEADER; psh.hInstance = hDllInstance; psh.hwndParent = hwndParent; - psh.nPages = IDD_FINISHPAGE + 1; + psh.nPages = IDD_MAXIMUMPAGE + 1; psh.nStartPage = startPage; psh.phpage = ahpsp; psh.pszbmWatermark = MAKEINTRESOURCE(IDB_WATERMARK);

1 0

[fireball] 23026: Stub one more WMI api used by drivers. Kernel just ignores WMI information for now, but drivers are happy since they successfully submit it.
by fireball＠svn.reactos.org 12 Jul '06

12 Jul '06

Author: fireball Date: Wed Jul 12 18:00:21 2006 New Revision: 23026 URL: http://svn.reactos.org/svn/reactos?rev=23026&view=rev Log: Stub one more WMI api used by drivers. Kernel just ignores WMI information for now, but drivers are happy since they successfully submit it. Modified: trunk/reactos/ntoskrnl/wmi/wmi.c Modified: trunk/reactos/ntoskrnl/wmi/wmi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/wmi/wmi.c?rev=230… ============================================================================== --- trunk/reactos/ntoskrnl/wmi/wmi.c (original) +++ trunk/reactos/ntoskrnl/wmi/wmi.c Wed Jul 12 18:00:21 2006 @@ -62,8 +62,10 @@ NTAPI IoWMIWriteEvent(IN PVOID WnodeEventItem) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + DPRINT1("IoWMIWriteEvent() called for WnodeEventItem %p, returning success\n", + WnodeEventItem); + + return STATUS_SUCCESS; } /*

1 0

[hpoussin] 23025: Add commit step (disabled by default)
by hpoussin＠svn.reactos.org 12 Jul '06

12 Jul '06

Author: hpoussin Date: Wed Jul 12 16:57:17 2006 New Revision: 23025 URL: http://svn.reactos.org/svn/reactos?rev=23025&view=rev Log: Add commit step (disabled by default) Modified: trunk/tools/wineimport.cmd Modified: trunk/tools/wineimport.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/wineimport.cmd?rev=23025&r1=… ============================================================================== --- trunk/tools/wineimport.cmd (original) +++ trunk/tools/wineimport.cmd Wed Jul 12 16:57:17 2006 @@ -222,6 +222,9 @@ IF ERRORLEVEL 1 GOTO :eof ECHO Compilation successful. You should try to run ReactOS to see if ECHO no visible regressions appeared before committing the changes. +FOR %%m IN (%WINE_LIST%) DO ( + REM svn.exe commit "%WINE_ROS_DIR%\dll\win32\%%m" -m "Autosyncing with Wine HEAD" --username LOGIN --password PASSWORD --non-interactive +) GOTO :eof :internal_analyseline

1 0

[winesync] 23024: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 12 Jul '06

12 Jul '06

Author: winesync Date: Wed Jul 12 16:40:40 2006 New Revision: 23024 URL: http://svn.reactos.org/svn/reactos?rev=23024&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/crypt32/cert.c trunk/reactos/dll/win32/crypt32/crypt32.spec trunk/reactos/dll/win32/crypt32/decode.c trunk/reactos/dll/win32/riched32/richedit.c Modified: trunk/reactos/dll/win32/crypt32/cert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/cert.c?r… ============================================================================== --- trunk/reactos/dll/win32/crypt32/cert.c (original) +++ trunk/reactos/dll/win32/crypt32/cert.c Wed Jul 12 16:40:40 2006 @@ -307,6 +307,40 @@ ret = TRUE; } break; + case CERT_KEY_IDENTIFIER_PROP_ID: + ret = CertContext_GetProperty((void *)pCertContext, dwPropId, + pvData, pcbData); + if (!ret) + SetLastError(ERROR_INVALID_DATA); + break; + case CERT_KEY_PROV_HANDLE_PROP_ID: + { + CERT_KEY_CONTEXT keyContext; + DWORD size = sizeof(keyContext); + + ret = CertContext_GetProperty((void *)pCertContext, + CERT_KEY_CONTEXT_PROP_ID, &keyContext, &size); + if (ret) + { + if (!pvData) + { + *pcbData = sizeof(HCRYPTPROV); + ret = TRUE; + } + else if (*pcbData < sizeof(HCRYPTPROV)) + { + SetLastError(ERROR_MORE_DATA); + *pcbData = sizeof(HCRYPTPROV); + ret = FALSE; + } + else + { + *(HCRYPTPROV *)pvData = keyContext.hCryptProv; + ret = TRUE; + } + } + break; + } case CERT_KEY_PROV_INFO_PROP_ID: ret = CertContext_GetProperty((void *)pCertContext, dwPropId, pvData, pcbData); @@ -397,11 +431,6 @@ if (!properties) ret = FALSE; - else if (!pvData) - { - ContextPropertyList_RemoveProperty(properties, dwPropId); - ret = TRUE; - } else { switch (dwPropId) @@ -424,20 +453,76 @@ case CERT_CROSS_CERT_DIST_POINTS_PROP_ID: case CERT_RENEWAL_PROP_ID: { - PCRYPT_DATA_BLOB blob = (PCRYPT_DATA_BLOB)pvData; - - ret = ContextPropertyList_SetProperty(properties, dwPropId, - blob->pbData, blob->cbData); + if (pvData) + { + PCRYPT_DATA_BLOB blob = (PCRYPT_DATA_BLOB)pvData; + + ret = ContextPropertyList_SetProperty(properties, dwPropId, + blob->pbData, blob->cbData); + } + else + { + ContextPropertyList_RemoveProperty(properties, dwPropId); + ret = TRUE; + } break; } case CERT_DATE_STAMP_PROP_ID: - ret = ContextPropertyList_SetProperty(properties, dwPropId, - (LPBYTE)pvData, sizeof(FILETIME)); + if (pvData) + ret = ContextPropertyList_SetProperty(properties, dwPropId, + (LPBYTE)pvData, sizeof(FILETIME)); + else + { + ContextPropertyList_RemoveProperty(properties, dwPropId); + ret = TRUE; + } break; + case CERT_KEY_CONTEXT_PROP_ID: + { + if (pvData) + { + PCERT_KEY_CONTEXT keyContext = (PCERT_KEY_CONTEXT)pvData; + + ret = ContextPropertyList_SetProperty(properties, dwPropId, + (const BYTE *)keyContext, keyContext->cbSize); + } + else + { + ContextPropertyList_RemoveProperty(properties, dwPropId); + ret = TRUE; + } + break; + } case CERT_KEY_PROV_INFO_PROP_ID: - ret = CertContext_SetKeyProvInfoProperty(properties, - (PCRYPT_KEY_PROV_INFO)pvData); + if (pvData) + ret = CertContext_SetKeyProvInfoProperty(properties, + (PCRYPT_KEY_PROV_INFO)pvData); + else + { + ContextPropertyList_RemoveProperty(properties, dwPropId); + ret = TRUE; + } break; + case CERT_KEY_PROV_HANDLE_PROP_ID: + { + CERT_KEY_CONTEXT keyContext; + DWORD size = sizeof(keyContext); + + ret = CertContext_GetProperty(context, CERT_KEY_CONTEXT_PROP_ID, + &keyContext, &size); + if (ret) + { + if (!(dwFlags & CERT_STORE_NO_CRYPT_RELEASE_FLAG)) + CryptReleaseContext(keyContext.hCryptProv, 0); + if (pvData) + keyContext.hCryptProv = *(HCRYPTPROV *)pvData; + else + keyContext.hCryptProv = 0; + ret = CertContext_SetProperty(context, CERT_KEY_CONTEXT_PROP_ID, + 0, &keyContext); + } + break; + } default: FIXME("%ld: stub\n", dwPropId); ret = FALSE; @@ -470,6 +555,132 @@ ret = CertContext_SetProperty((void *)pCertContext, dwPropId, dwFlags, pvData); TRACE("returning %d\n", ret); + return ret; +} + +/* Acquires the private key using the key provider info, retrieving info from + * the certificate if info is NULL. The acquired provider is returned in + * *phCryptProv, and the key spec for the provider is returned in *pdwKeySpec. + */ +static BOOL CRYPT_AcquirePrivateKeyFromProvInfo(PCCERT_CONTEXT pCert, + PCRYPT_KEY_PROV_INFO info, HCRYPTPROV *phCryptProv, DWORD *pdwKeySpec) +{ + DWORD size = 0; + BOOL allocated = FALSE, ret = TRUE; + + if (!info) + { + ret = CertGetCertificateContextProperty(pCert, + CERT_KEY_PROV_INFO_PROP_ID, 0, &size); + if (ret) + { + info = (PCRYPT_KEY_PROV_INFO)HeapAlloc(GetProcessHeap(), 0, size); + if (info) + { + ret = CertGetCertificateContextProperty(pCert, + CERT_KEY_PROV_INFO_PROP_ID, info, &size); + allocated = TRUE; + } + } + else + SetLastError(CRYPT_E_NO_KEY_PROPERTY); + } + if (ret) + { + ret = CryptAcquireContextW(phCryptProv, info->pwszContainerName, + info->pwszProvName, info->dwProvType, 0); + if (ret) + { + DWORD i; + + for (i = 0; i < info->cProvParam; i++) + { + CryptSetProvParam(*phCryptProv, + info->rgProvParam[i].dwParam, info->rgProvParam[i].pbData, + info->rgProvParam[i].dwFlags); + } + *pdwKeySpec = info->dwKeySpec; + } + else + SetLastError(CRYPT_E_NO_KEY_PROPERTY); + } + if (allocated) + HeapFree(GetProcessHeap(), 0, info); + return ret; +} + +BOOL WINAPI CryptAcquireCertificatePrivateKey(PCCERT_CONTEXT pCert, + DWORD dwFlags, void *pvReserved, HCRYPTPROV *phCryptProv, DWORD *pdwKeySpec, + BOOL *pfCallerFreeProv) +{ + BOOL ret = FALSE, cache = FALSE; + PCRYPT_KEY_PROV_INFO info = NULL; + CERT_KEY_CONTEXT keyContext; + DWORD size; + + TRACE("(%p, %08lx, %p, %p, %p, %p)\n", pCert, dwFlags, pvReserved, + phCryptProv, pdwKeySpec, pfCallerFreeProv); + + if (dwFlags & CRYPT_ACQUIRE_USE_PROV_INFO_FLAG) + { + DWORD size = 0; + + ret = CertGetCertificateContextProperty(pCert, + CERT_KEY_PROV_INFO_PROP_ID, 0, &size); + if (ret) + { + info = (PCRYPT_KEY_PROV_INFO)HeapAlloc( + GetProcessHeap(), 0, size); + ret = CertGetCertificateContextProperty(pCert, + CERT_KEY_PROV_INFO_PROP_ID, info, &size); + if (ret) + cache = info->dwFlags & CERT_SET_KEY_CONTEXT_PROP_ID; + } + } + else if (dwFlags & CRYPT_ACQUIRE_CACHE_FLAG) + cache = TRUE; + *phCryptProv = 0; + if (cache) + { + size = sizeof(keyContext); + ret = CertGetCertificateContextProperty(pCert, CERT_KEY_CONTEXT_PROP_ID, + &keyContext, &size); + if (ret) + { + *phCryptProv = keyContext.hCryptProv; + if (pdwKeySpec) + *pdwKeySpec = keyContext.dwKeySpec; + if (pfCallerFreeProv) + *pfCallerFreeProv = !cache; + } + } + if (!*phCryptProv) + { + ret = CRYPT_AcquirePrivateKeyFromProvInfo(pCert, info, + &keyContext.hCryptProv, &keyContext.dwKeySpec); + if (ret) + { + *phCryptProv = keyContext.hCryptProv; + if (pdwKeySpec) + *pdwKeySpec = keyContext.dwKeySpec; + if (cache) + { + keyContext.cbSize = sizeof(keyContext); + if (CertSetCertificateContextProperty(pCert, + CERT_KEY_CONTEXT_PROP_ID, 0, &keyContext)) + { + if (pfCallerFreeProv) + *pfCallerFreeProv = FALSE; + } + } + else + { + if (pfCallerFreeProv) + *pfCallerFreeProv = TRUE; + } + } + } + HeapFree(GetProcessHeap(), 0, info); return ret; } @@ -1658,7 +1869,7 @@ else GetSystemTimeAsFileTime(&info->NotBefore); if (pEndTime) - SystemTimeToFileTime(pStartTime, &info->NotAfter); + SystemTimeToFileTime(pEndTime, &info->NotAfter); else { SYSTEMTIME endTime; Modified: trunk/reactos/dll/win32/crypt32/crypt32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32.… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crypt32.spec (original) +++ trunk/reactos/dll/win32/crypt32/crypt32.spec Wed Jul 12 16:40:40 2006 @@ -95,6 +95,7 @@ @ stdcall CryptStringToBinaryA(str long long ptr ptr ptr ptr) @ stub CryptStringToBinaryW # (wstr long long ptr ptr ptr ptr) @ stub CryptAcquireContextU +@ stdcall CryptAcquireCertificatePrivateKey(ptr long ptr ptr ptr ptr) @ stub CryptCloseAsyncHandle @ stub CryptCreateAsyncHandle @ stub CryptDecodeMessage Modified: trunk/reactos/dll/win32/crypt32/decode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/decode.c… ============================================================================== --- trunk/reactos/dll/win32/crypt32/decode.c (original) +++ trunk/reactos/dll/win32/crypt32/decode.c Wed Jul 12 16:40:40 2006 @@ -561,7 +561,8 @@ itemSizes = CryptMemAlloc( cItems * sizeof(struct AsnArrayItemSize)); - memcpy(itemSizes, &itemSize, sizeof(itemSize)); + if (itemSizes) + memcpy(itemSizes, &itemSize, sizeof(itemSize)); } if (itemSizes) { Modified: trunk/reactos/dll/win32/riched32/richedit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched32/richedi… ============================================================================== --- trunk/reactos/dll/win32/riched32/richedit.c (original) +++ trunk/reactos/dll/win32/riched32/richedit.c Wed Jul 12 16:40:40 2006 @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdarg.h>

1 0

[janderwald] 23023: revert prev commit
by janderwald＠svn.reactos.org 12 Jul '06

12 Jul '06

Author: janderwald Date: Wed Jul 12 16:36:31 2006 New Revision: 23023 URL: http://svn.reactos.org/svn/reactos?rev=23023&view=rev Log: revert prev commit Added: trunk/reactos/base/applications/regedit/clb/ (props changed) - copied from r23020, trunk/reactos/base/applications/regedit/clb/ Modified: trunk/reactos/base/applications/regedit/regedit.rbuild Propchange: trunk/reactos/base/applications/regedit/clb/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Wed Jul 12 16:36:31 2006 @@ -1,0 +1,2 @@ +GNUmakefile +*.vcproj Modified: trunk/reactos/base/applications/regedit/regedit.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regedit.rbuild (original) +++ trunk/reactos/base/applications/regedit/regedit.rbuild Wed Jul 12 16:36:31 2006 @@ -31,3 +31,6 @@ <file>regedit.rc</file> <pch>regedit.h</pch> </module> +<directory name="clb"> + <xi:include href="clb/clb.rbuild" /> +</directory>

1 0

[fireball] 23022: Add flags for CryptAcquireCertificatePrivateKey() API
by fireball＠svn.reactos.org 12 Jul '06

12 Jul '06

Author: fireball Date: Wed Jul 12 16:27:46 2006 New Revision: 23022 URL: http://svn.reactos.org/svn/reactos?rev=23022&view=rev Log: Add flags for CryptAcquireCertificatePrivateKey() API Modified: trunk/reactos/include/psdk/wincrypt.h Modified: trunk/reactos/include/psdk/wincrypt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincrypt.h?re… ============================================================================== --- trunk/reactos/include/psdk/wincrypt.h (original) +++ trunk/reactos/include/psdk/wincrypt.h Wed Jul 12 16:27:46 2006 @@ -2560,6 +2560,12 @@ #define CERT_CREATE_SELFSIGN_NO_SIGN 1 #define CERT_CREATE_SELFSIGN_NO_KEY_INFO 2 +/* flags for CryptAcquireCertificatePrivateKey */ +#define CRYPT_ACQUIRE_CACHE_FLAG 0x00000001 +#define CRYPT_ACQUIRE_USE_PROV_INFO_FLAG 0x00000002 +#define CRYPT_ACQUIRE_COMPARE_KEY_FLAG 0x00000004 +#define CRYPT_ACQUIRE_SILENT_FLAG 0x00000040 + /* function declarations */ /* advapi32.dll */ BOOL WINAPI CryptAcquireContextA(HCRYPTPROV *phProv, LPCSTR pszContainer, @@ -2982,6 +2988,10 @@ DWORD dwCertEncodingType, PCERT_PUBLIC_KEY_INFO pInfo, ALG_ID aiKeyAlg, DWORD dwFlags, void *pvAuxInfo, HCRYPTKEY *phKey); +BOOL WINAPI CryptAcquireCertificatePrivateKey(PCCERT_CONTEXT pCert, + DWORD dwFlags, void *pvReserved, HCRYPTPROV *phCryptProv, DWORD *pdwKeySpec, + BOOL *pfCallerFreeProv); + BOOL WINAPI CryptProtectData( DATA_BLOB* pDataIn, LPCWSTR szDataDescr, DATA_BLOB* pOptionalEntropy, PVOID pvReserved, CRYPTPROTECT_PROMPTSTRUCT* pPromptStruct, DWORD dwFlags, DATA_BLOB* pDataOut );

1 0

[janderwald] 23021: * remove unused/unimplemented clb library * you need to delete Makefile.auto after this commit
by janderwald＠svn.reactos.org 12 Jul '06

12 Jul '06

Author: janderwald Date: Wed Jul 12 16:27:26 2006 New Revision: 23021 URL: http://svn.reactos.org/svn/reactos?rev=23021&view=rev Log: * remove unused/unimplemented clb library * you need to delete Makefile.auto after this commit Removed: trunk/reactos/base/applications/regedit/clb/ Modified: trunk/reactos/base/applications/regedit/regedit.rbuild Modified: trunk/reactos/base/applications/regedit/regedit.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regedit.rbuild (original) +++ trunk/reactos/base/applications/regedit/regedit.rbuild Wed Jul 12 16:27:26 2006 @@ -31,6 +31,3 @@ <file>regedit.rc</file> <pch>regedit.h</pch> </module> -<directory name="clb"> - <xi:include href="clb/clb.rbuild" /> -</directory>

1 0

[janderwald] 23020: * norwegian translation by LMH1 from bug(1645)
by janderwald＠svn.reactos.org 12 Jul '06

12 Jul '06

Author: janderwald Date: Wed Jul 12 16:08:39 2006 New Revision: 23020 URL: http://svn.reactos.org/svn/reactos?rev=23020&view=rev Log: * norwegian translation by LMH1 from bug(1645) Added: trunk/reactos/base/applications/control/No.rc (with props) Modified: trunk/reactos/base/applications/control/control.rc Added: trunk/reactos/base/applications/control/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… ============================================================================== --- trunk/reactos/base/applications/control/No.rc (added) +++ trunk/reactos/base/applications/control/No.rc Wed Jul 12 16:08:39 2006 @@ -1,0 +1,33 @@ +/* + * PROJECT: ReactOS Control Application + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/control/No.rc + * PURPOSE: Norwegian translation + * TRANSLATOR: LMH1 + * + */ +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +///////////////////////////////////////////////////////////////////////////// +// +// Menu +// + +IDM_MAINMENU MENU DISCARDABLE +BEGIN + POPUP "&Fil" + BEGIN + MENUITEM "&Avslutt", IDM_CLOSE + END + POPUP "&Vis" + BEGIN + MENUITEM "Større Ikoner", IDM_LARGEICONS + MENUITEM "Mindre Ikoner", IDM_SMALLICONS + MENUITEM "Liste", IDM_LIST + MENUITEM "Detaljer", IDM_DETAILS + END + POPUP "Hjelp" + BEGIN + MENUITEM "Om", IDM_ABOUT + END +END Propchange: trunk/reactos/base/applications/control/No.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/control/control.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… ============================================================================== --- trunk/reactos/base/applications/control/control.rc (original) +++ trunk/reactos/base/applications/control/control.rc Wed Jul 12 16:08:39 2006 @@ -45,3 +45,4 @@ #include "Hu.rc" #include "Fi.rc" #include "Uk.rc" +#include "No.rc"

1 0

[janderwald] 23019: * set svn:eolstyle native
by janderwald＠svn.reactos.org 12 Jul '06

12 Jul '06

Author: janderwald Date: Wed Jul 12 16:00:34 2006 New Revision: 23019 URL: http://svn.reactos.org/svn/reactos?rev=23019&view=rev Log: * set svn:eolstyle native Modified: trunk/reactos/base/applications/calc/Cz.rc (contents, props changed) trunk/reactos/base/applications/calc/Hu.rc (contents, props changed) trunk/reactos/base/applications/calc/Sv.rc (contents, props changed) Modified: trunk/reactos/base/applications/calc/Cz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/Cz.… ============================================================================== --- trunk/reactos/base/applications/calc/Cz.rc (original) +++ trunk/reactos/base/applications/calc/Cz.rc Wed Jul 12 16:00:34 2006 @@ -1,157 +1,157 @@ -/* - * Czech language support - * - * WineCalc (En.rc) - * - * Copyright 2005 Denzil <d3nzil(a)gmail.com> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "windows.h" -#include "resource.h" -#include "winecalc.h" - -LANGUAGE LANG_CZECH, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -{ - IDS_APPNAME, "Kalkulátor" - - IDS_COPYRIGHT1, "Kalkulátor 5.0. Licencován pod LGPL 2" - IDS_COPYRIGHT2 "Copyright 2003, James Briggs" - IDS_COPYRIGHT3 "San Jose, California, USA" - IDS_COPYRIGHT4 "james(a)ActionMessage.com" - IDS_COPYRIGHT5 "http://www.ActionMessage.com/winecalc/" - - IDS_BTN_BACKSPACE, "Zpìt" - IDS_BTN_CLEAR_ENTRY, "CE" - IDS_BTN_CLEAR_ALL, "C" - IDS_BTN_MEM_CLEAR, "MC" - IDS_BTN_MEM_RECALL, "MR" - IDS_BTN_MEM_STORE, "MS" - IDS_BTN_MEM_PLUS, "M+" - IDS_BTN_MEM_STATUS_M, "M" - IDS_BTN_SQRT, "sqrt" - IDS_ERR_INVALID_INPUT, "Neplatný vstup pro funkci." - IDS_ERR_DIVIDE_BY_ZERO, "Nelze dìlit nulou." - IDS_ERR_UNDEFINED, "Výsledek funkce není definován." -} - -MAIN_MENU MENU DISCARDABLE -{ - POPUP "&Editace" { - MENUITEM "&Kopírovat Ctrl+C", IDM_COPY - MENUITEM "&Vloit Ctrl+V", IDM_PASTE - } - POPUP "&Zobrazení" { - MENUITEM "Standartní", IDM_MODE_STANDARD - MENUITEM "Vìdecké", IDM_MODE_SCIENTIFIC - MENUITEM SEPARATOR - MENUITEM "Seskupování èíslic", IDM_DIGIT_GROUPING - } - POPUP "&Pomoc" { - MENUITEM "Témata nápovìdy", IDM_HELP_TOPICS - MENUITEM SEPARATOR - MENUITEM "O Kalkulátoru", IDM_ABOUT - } -} - -SCIMS_MENU MENU DISCARDABLE -{ - POPUP "&Editace" { - MENUITEM "&Kopírovat Ctrl+C", IDM_COPY - MENUITEM "&Vloit Ctrl+V", IDM_PASTE - } - POPUP "&Zobrazení" { - MENUITEM "Standartní", IDM_MODE_STANDARD - MENUITEM "Vìdecké", IDM_MODE_SCIENTIFIC - MENUITEM SEPARATOR - MENUITEM "estnáctkové\tF5", ID_CALC_NS_HEX - MENUITEM "Desítkové\tF6", ID_CALC_NS_DEC - MENUITEM "Osmièkové\tF7", ID_CALC_NS_OCT - MENUITEM "Dvojkové\tF8", ID_CALC_NS_BIN - MENUITEM SEPARATOR - MENUITEM "Stupnì\tF2", ID_CALC_MS_DEGREES - MENUITEM "Radiány\tF3", ID_CALC_MS_RADIANS - MENUITEM "Grady\tF4", ID_CALC_MS_GRADS - MENUITEM SEPARATOR - MENUITEM "Seskupování èíslic", IDM_DIGIT_GROUPING - } - POPUP "&Pomoc" { - MENUITEM "Témata nápovìdy", IDM_HELP_TOPICS - MENUITEM SEPARATOR - MENUITEM "O Kalkulátoru", IDM_ABOUT - } -} - -SCIWS_MENU MENU DISCARDABLE -{ - POPUP "&Editace" { - MENUITEM "&Kopírovat Ctrl+C", IDM_COPY - MENUITEM "&Vloit Ctrl+V", IDM_PASTE - } - POPUP "&Zobrazení" { - MENUITEM "Standartní", IDM_MODE_STANDARD - MENUITEM "Vìdecké", IDM_MODE_SCIENTIFIC - MENUITEM SEPARATOR - MENUITEM "estnáctkové\tF5", ID_CALC_NS_HEX - MENUITEM "Desítkové\tF6", ID_CALC_NS_DEC - MENUITEM "Osmièkové\tF7", ID_CALC_NS_OCT - MENUITEM "Dvojkové\tF8", ID_CALC_NS_BIN - MENUITEM SEPARATOR - MENUITEM "Qword\tF12", ID_CALC_WS_QWORD - MENUITEM "Dword\tF2", ID_CALC_WS_DWORD - MENUITEM "Word\tF3", ID_CALC_WS_WORD - MENUITEM "Byte\tF4", ID_CALC_WS_BYTE - MENUITEM SEPARATOR - MENUITEM "Seskupování èíslic", IDM_DIGIT_GROUPING - } - POPUP "&Pomoc" { - MENUITEM "Témata nápovìdy", IDM_HELP_TOPICS - MENUITEM SEPARATOR - MENUITEM "O Kalkulátoru", IDM_ABOUT - } -} - -MAIN_MENU ACCELERATORS -BEGIN - VK_F1, IDV_HELP, VIRTKEY -END - -DLG_ABOUT DIALOG 12,0,120,82 -CAPTION "O GNU winecalc" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -BEGIN - DEFPUSHBUTTON "OK", IDOK, 42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP -END - -WHATS_THIS_MENU MENU DISCARDABLE -{ - POPUP "" { - MENUITEM "Co je toto?", IDM_WHATS_THIS - } -} - -DLG_STATS DIALOG 12,0,125,78 -CAPTION "Statistics Box" -FONT 9, "Tahoma" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -BEGIN - DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 25, 13, WS_TABSTOP | WS_GROUP - PUSHBUTTON "&LOAD", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP - PUSHBUTTON "&CD" ID_STATS_CD, 64, 52, 25, 13, WS_TABSTOP | WS_GROUP - PUSHBUTTON "C&AD", ID_STATS_CAD, 94, 52, 25, 13, WS_TABSTOP | WS_GROUP -END +/* + * Czech language support + * + * WineCalc (En.rc) + * + * Copyright 2005 Denzil <d3nzil(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "windows.h" +#include "resource.h" +#include "winecalc.h" + +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_APPNAME, "Kalkulátor" + + IDS_COPYRIGHT1, "Kalkulátor 5.0. Licencován pod LGPL 2" + IDS_COPYRIGHT2 "Copyright 2003, James Briggs" + IDS_COPYRIGHT3 "San Jose, California, USA" + IDS_COPYRIGHT4 "james(a)ActionMessage.com" + IDS_COPYRIGHT5 "http://www.ActionMessage.com/winecalc/" + + IDS_BTN_BACKSPACE, "Zpìt" + IDS_BTN_CLEAR_ENTRY, "CE" + IDS_BTN_CLEAR_ALL, "C" + IDS_BTN_MEM_CLEAR, "MC" + IDS_BTN_MEM_RECALL, "MR" + IDS_BTN_MEM_STORE, "MS" + IDS_BTN_MEM_PLUS, "M+" + IDS_BTN_MEM_STATUS_M, "M" + IDS_BTN_SQRT, "sqrt" + IDS_ERR_INVALID_INPUT, "Neplatný vstup pro funkci." + IDS_ERR_DIVIDE_BY_ZERO, "Nelze dìlit nulou." + IDS_ERR_UNDEFINED, "Výsledek funkce není definován." +} + +MAIN_MENU MENU DISCARDABLE +{ + POPUP "&Editace" { + MENUITEM "&Kopírovat Ctrl+C", IDM_COPY + MENUITEM "&Vloit Ctrl+V", IDM_PASTE + } + POPUP "&Zobrazení" { + MENUITEM "Standartní", IDM_MODE_STANDARD + MENUITEM "Vìdecké", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "Seskupování èíslic", IDM_DIGIT_GROUPING + } + POPUP "&Pomoc" { + MENUITEM "Témata nápovìdy", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "O Kalkulátoru", IDM_ABOUT + } +} + +SCIMS_MENU MENU DISCARDABLE +{ + POPUP "&Editace" { + MENUITEM "&Kopírovat Ctrl+C", IDM_COPY + MENUITEM "&Vloit Ctrl+V", IDM_PASTE + } + POPUP "&Zobrazení" { + MENUITEM "Standartní", IDM_MODE_STANDARD + MENUITEM "Vìdecké", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "estnáctkové\tF5", ID_CALC_NS_HEX + MENUITEM "Desítkové\tF6", ID_CALC_NS_DEC + MENUITEM "Osmièkové\tF7", ID_CALC_NS_OCT + MENUITEM "Dvojkové\tF8", ID_CALC_NS_BIN + MENUITEM SEPARATOR + MENUITEM "Stupnì\tF2", ID_CALC_MS_DEGREES + MENUITEM "Radiány\tF3", ID_CALC_MS_RADIANS + MENUITEM "Grady\tF4", ID_CALC_MS_GRADS + MENUITEM SEPARATOR + MENUITEM "Seskupování èíslic", IDM_DIGIT_GROUPING + } + POPUP "&Pomoc" { + MENUITEM "Témata nápovìdy", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "O Kalkulátoru", IDM_ABOUT + } +} + +SCIWS_MENU MENU DISCARDABLE +{ + POPUP "&Editace" { + MENUITEM "&Kopírovat Ctrl+C", IDM_COPY + MENUITEM "&Vloit Ctrl+V", IDM_PASTE + } + POPUP "&Zobrazení" { + MENUITEM "Standartní", IDM_MODE_STANDARD + MENUITEM "Vìdecké", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "estnáctkové\tF5", ID_CALC_NS_HEX + MENUITEM "Desítkové\tF6", ID_CALC_NS_DEC + MENUITEM "Osmièkové\tF7", ID_CALC_NS_OCT + MENUITEM "Dvojkové\tF8", ID_CALC_NS_BIN + MENUITEM SEPARATOR + MENUITEM "Qword\tF12", ID_CALC_WS_QWORD + MENUITEM "Dword\tF2", ID_CALC_WS_DWORD + MENUITEM "Word\tF3", ID_CALC_WS_WORD + MENUITEM "Byte\tF4", ID_CALC_WS_BYTE + MENUITEM SEPARATOR + MENUITEM "Seskupování èíslic", IDM_DIGIT_GROUPING + } + POPUP "&Pomoc" { + MENUITEM "Témata nápovìdy", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "O Kalkulátoru", IDM_ABOUT + } +} + +MAIN_MENU ACCELERATORS +BEGIN + VK_F1, IDV_HELP, VIRTKEY +END + +DLG_ABOUT DIALOG 12,0,120,82 +CAPTION "O GNU winecalc" +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +BEGIN + DEFPUSHBUTTON "OK", IDOK, 42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +WHATS_THIS_MENU MENU DISCARDABLE +{ + POPUP "" { + MENUITEM "Co je toto?", IDM_WHATS_THIS + } +} + +DLG_STATS DIALOG 12,0,125,78 +CAPTION "Statistics Box" +FONT 9, "Tahoma" +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +BEGIN + DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "&LOAD", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "&CD" ID_STATS_CD, 64, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "C&AD", ID_STATS_CAD, 94, 52, 25, 13, WS_TABSTOP | WS_GROUP +END Propchange: trunk/reactos/base/applications/calc/Cz.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/calc/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/Hu.… ============================================================================== --- trunk/reactos/base/applications/calc/Hu.rc (original) +++ trunk/reactos/base/applications/calc/Hu.rc Wed Jul 12 16:00:34 2006 @@ -1,156 +1,156 @@ -/* - * WineCalc (Hu.rc) - * - * Copyright 2003 James Briggs - * Hungarian translation by Adam Medveczky - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "windows.h" -#include "resource.h" -#include "winecalc.h" - -LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -{ - IDS_APPNAME, "Számológép" - - IDS_COPYRIGHT1, "Calculator 5.0. Licensed under LGPL 2" - IDS_COPYRIGHT2 "Copyright 2003, James Briggs" - IDS_COPYRIGHT3 "San Jose, California, USA" - IDS_COPYRIGHT4 "james(a)ActionMessage.com" - IDS_COPYRIGHT5 "http://www.ActionMessage.com/winecalc/" - - IDS_BTN_BACKSPACE, "Backspace" - IDS_BTN_CLEAR_ENTRY, "CE" - IDS_BTN_CLEAR_ALL, "C" - IDS_BTN_MEM_CLEAR, "MC" - IDS_BTN_MEM_RECALL, "MR" - IDS_BTN_MEM_STORE, "MS" - IDS_BTN_MEM_PLUS, "M+" - IDS_BTN_MEM_STATUS_M, "M" - IDS_BTN_SQRT, "gyök" - IDS_ERR_INVALID_INPUT, "Hibás bemenet." - IDS_ERR_DIVIDE_BY_ZERO, "Nem tudok nullával osztani." - IDS_ERR_UNDEFINED, "Result of function is undefined." -} - -MAIN_MENU MENU DISCARDABLE -{ - POPUP "&Szerkesztés" { - MENUITEM "&Másolás Ctrl+C", IDM_COPY - MENUITEM "&Beillesztés Ctrl+V", IDM_PASTE - } - POPUP "&Nézet" { - MENUITEM "Alap", IDM_MODE_STANDARD - MENUITEM "Tudományos", IDM_MODE_SCIENTIFIC - MENUITEM SEPARATOR - MENUITEM "Számjegyek csoportosítása", IDM_DIGIT_GROUPING - } - POPUP "Sú&gó" { - MENUITEM "&Témakörök", IDM_HELP_TOPICS - MENUITEM SEPARATOR - MENUITEM "Számológép névjegye", IDM_ABOUT - } -} - -SCIMS_MENU MENU DISCARDABLE -{ - POPUP "&Szerkesztés" { - MENUITEM "&Másolás Ctrl+C", IDM_COPY - MENUITEM "&Beillesztés Ctrl+V", IDM_PASTE - } - POPUP "&Nézet" { - MENUITEM "Alap", IDM_MODE_STANDARD - MENUITEM "Tudományos", IDM_MODE_SCIENTIFIC - MENUITEM SEPARATOR - MENUITEM "Hexadecimális\tF5", ID_CALC_NS_HEX - MENUITEM "Decimális\tF6", ID_CALC_NS_DEC - MENUITEM "Oktális\tF7", ID_CALC_NS_OCT - MENUITEM "Bináris\tF8", ID_CALC_NS_BIN - MENUITEM SEPARATOR - MENUITEM "Fok\tF2", ID_CALC_MS_DEGREES - MENUITEM "Radián\tF3", ID_CALC_MS_RADIANS - MENUITEM "Újfok\tF4", ID_CALC_MS_GRADS - MENUITEM SEPARATOR - MENUITEM "Számjegyek csoportosítása", IDM_DIGIT_GROUPING - } - POPUP "Sú&gó" { - MENUITEM "&Témakörök", IDM_HELP_TOPICS - MENUITEM SEPARATOR - MENUITEM "Számológép névjegye", IDM_ABOUT - } -} - -SCIWS_MENU MENU DISCARDABLE -{ - POPUP "&Szerkesztés" { - MENUITEM "&Másolás Ctrl+C", IDM_COPY - MENUITEM "&Beillesztés Ctrl+V", IDM_PASTE - } - POPUP "&Nézet" { - MENUITEM "Alap", IDM_MODE_STANDARD - MENUITEM "Tudományos", IDM_MODE_SCIENTIFIC - MENUITEM SEPARATOR - MENUITEM "Hexadecimális\tF5", ID_CALC_NS_HEX - MENUITEM "Decimális\tF6", ID_CALC_NS_DEC - MENUITEM "Oktális\tF7", ID_CALC_NS_OCT - MENUITEM "Bináris\tF8", ID_CALC_NS_BIN - MENUITEM SEPARATOR - MENUITEM "Négyszeres szó\tF12", ID_CALC_WS_QWORD - MENUITEM "Duplaszó\tF2", ID_CALC_WS_DWORD - MENUITEM "Szó\tF3", ID_CALC_WS_WORD - MENUITEM "Bájt\tF4", ID_CALC_WS_BYTE - MENUITEM SEPARATOR - MENUITEM "Számjegyek csoportosítása", IDM_DIGIT_GROUPING - } - POPUP "Sú&gó" { - MENUITEM "&Témakörök", IDM_HELP_TOPICS - MENUITEM SEPARATOR - MENUITEM "Számológép névjegye", IDM_ABOUT - } -} - -MAIN_MENU ACCELERATORS -BEGIN - VK_F1, IDV_HELP, VIRTKEY -END - -DLG_ABOUT DIALOG 12,0,120,82 -CAPTION "GNU winecalc (számológép) névjegye" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -BEGIN - DEFPUSHBUTTON "OK", IDOK, 42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP -END - -WHATS_THIS_MENU MENU DISCARDABLE -{ - POPUP "" { - MENUITEM "Mi ez?", IDM_WHATS_THIS - } -} - -DLG_STATS DIALOG 12,0,125,78 -CAPTION "Statisztika" -FONT 9, "Tahoma" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -BEGIN - DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 25, 13, WS_TABSTOP | WS_GROUP - PUSHBUTTON "&LOAD", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP - PUSHBUTTON "&CD" ID_STATS_CD, 64, 52, 25, 13, WS_TABSTOP | WS_GROUP - PUSHBUTTON "C&AD", ID_STATS_CAD, 94, 52, 25, 13, WS_TABSTOP | WS_GROUP -END +/* + * WineCalc (Hu.rc) + * + * Copyright 2003 James Briggs + * Hungarian translation by Adam Medveczky + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "windows.h" +#include "resource.h" +#include "winecalc.h" + +LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_APPNAME, "Számológép" + + IDS_COPYRIGHT1, "Calculator 5.0. Licensed under LGPL 2" + IDS_COPYRIGHT2 "Copyright 2003, James Briggs" + IDS_COPYRIGHT3 "San Jose, California, USA" + IDS_COPYRIGHT4 "james(a)ActionMessage.com" + IDS_COPYRIGHT5 "http://www.ActionMessage.com/winecalc/" + + IDS_BTN_BACKSPACE, "Backspace" + IDS_BTN_CLEAR_ENTRY, "CE" + IDS_BTN_CLEAR_ALL, "C" + IDS_BTN_MEM_CLEAR, "MC" + IDS_BTN_MEM_RECALL, "MR" + IDS_BTN_MEM_STORE, "MS" + IDS_BTN_MEM_PLUS, "M+" + IDS_BTN_MEM_STATUS_M, "M" + IDS_BTN_SQRT, "gyök" + IDS_ERR_INVALID_INPUT, "Hibás bemenet." + IDS_ERR_DIVIDE_BY_ZERO, "Nem tudok nullával osztani." + IDS_ERR_UNDEFINED, "Result of function is undefined." +} + +MAIN_MENU MENU DISCARDABLE +{ + POPUP "&Szerkesztés" { + MENUITEM "&Másolás Ctrl+C", IDM_COPY + MENUITEM "&Beillesztés Ctrl+V", IDM_PASTE + } + POPUP "&Nézet" { + MENUITEM "Alap", IDM_MODE_STANDARD + MENUITEM "Tudományos", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "Számjegyek csoportosítása", IDM_DIGIT_GROUPING + } + POPUP "Sú&gó" { + MENUITEM "&Témakörök", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "Számológép névjegye", IDM_ABOUT + } +} + +SCIMS_MENU MENU DISCARDABLE +{ + POPUP "&Szerkesztés" { + MENUITEM "&Másolás Ctrl+C", IDM_COPY + MENUITEM "&Beillesztés Ctrl+V", IDM_PASTE + } + POPUP "&Nézet" { + MENUITEM "Alap", IDM_MODE_STANDARD + MENUITEM "Tudományos", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "Hexadecimális\tF5", ID_CALC_NS_HEX + MENUITEM "Decimális\tF6", ID_CALC_NS_DEC + MENUITEM "Oktális\tF7", ID_CALC_NS_OCT + MENUITEM "Bináris\tF8", ID_CALC_NS_BIN + MENUITEM SEPARATOR + MENUITEM "Fok\tF2", ID_CALC_MS_DEGREES + MENUITEM "Radián\tF3", ID_CALC_MS_RADIANS + MENUITEM "Újfok\tF4", ID_CALC_MS_GRADS + MENUITEM SEPARATOR + MENUITEM "Számjegyek csoportosítása", IDM_DIGIT_GROUPING + } + POPUP "Sú&gó" { + MENUITEM "&Témakörök", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "Számológép névjegye", IDM_ABOUT + } +} + +SCIWS_MENU MENU DISCARDABLE +{ + POPUP "&Szerkesztés" { + MENUITEM "&Másolás Ctrl+C", IDM_COPY + MENUITEM "&Beillesztés Ctrl+V", IDM_PASTE + } + POPUP "&Nézet" { + MENUITEM "Alap", IDM_MODE_STANDARD + MENUITEM "Tudományos", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "Hexadecimális\tF5", ID_CALC_NS_HEX + MENUITEM "Decimális\tF6", ID_CALC_NS_DEC + MENUITEM "Oktális\tF7", ID_CALC_NS_OCT + MENUITEM "Bináris\tF8", ID_CALC_NS_BIN + MENUITEM SEPARATOR + MENUITEM "Négyszeres szó\tF12", ID_CALC_WS_QWORD + MENUITEM "Duplaszó\tF2", ID_CALC_WS_DWORD + MENUITEM "Szó\tF3", ID_CALC_WS_WORD + MENUITEM "Bájt\tF4", ID_CALC_WS_BYTE + MENUITEM SEPARATOR + MENUITEM "Számjegyek csoportosítása", IDM_DIGIT_GROUPING + } + POPUP "Sú&gó" { + MENUITEM "&Témakörök", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "Számológép névjegye", IDM_ABOUT + } +} + +MAIN_MENU ACCELERATORS +BEGIN + VK_F1, IDV_HELP, VIRTKEY +END + +DLG_ABOUT DIALOG 12,0,120,82 +CAPTION "GNU winecalc (számológép) névjegye" +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +BEGIN + DEFPUSHBUTTON "OK", IDOK, 42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +WHATS_THIS_MENU MENU DISCARDABLE +{ + POPUP "" { + MENUITEM "Mi ez?", IDM_WHATS_THIS + } +} + +DLG_STATS DIALOG 12,0,125,78 +CAPTION "Statisztika" +FONT 9, "Tahoma" +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +BEGIN + DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "&LOAD", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "&CD" ID_STATS_CD, 64, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "C&AD", ID_STATS_CAD, 94, 52, 25, 13, WS_TABSTOP | WS_GROUP +END Propchange: trunk/reactos/base/applications/calc/Hu.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/calc/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/Sv.… ============================================================================== --- trunk/reactos/base/applications/calc/Sv.rc (original) +++ trunk/reactos/base/applications/calc/Sv.rc Wed Jul 12 16:00:34 2006 @@ -1,155 +1,155 @@ -/* - * WineCalc (En.rc) - * - * Copyright 2005 David Nordenberg - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "windows.h" -#include "resource.h" -#include "winecalc.h" - -LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL - -STRINGTABLE DISCARDABLE -{ - IDS_APPNAME, "Kalkylatorn" - - IDS_COPYRIGHT1, "Kalkylatorn 5.0. Licenserad under LGPL 2" - IDS_COPYRIGHT2 "Copyright 2003, James Briggs" - IDS_COPYRIGHT3 "San Jose, California, USA" - IDS_COPYRIGHT4 "james(a)ActionMessage.com" - IDS_COPYRIGHT5 "http://www.ActionMessage.com/winecalc/" - - IDS_BTN_BACKSPACE, "Backsteg" - IDS_BTN_CLEAR_ENTRY, "CE" - IDS_BTN_CLEAR_ALL, "C" - IDS_BTN_MEM_CLEAR, "MC" - IDS_BTN_MEM_RECALL, "MR" - IDS_BTN_MEM_STORE, "MS" - IDS_BTN_MEM_PLUS, "M+" - IDS_BTN_MEM_STATUS_M, "M" - IDS_BTN_SQRT, "sqrt" - IDS_ERR_INVALID_INPUT, "Felaktig indata för funktion." - IDS_ERR_DIVIDE_BY_ZERO, "Kan inte dividera med noll." - IDS_ERR_UNDEFINED, "Funktionens resultat är odefinerat." -} - -MAIN_MENU MENU DISCARDABLE -{ - POPUP "&Redigera" { - MENUITEM "&Kopiera\tCtrl+C", IDM_COPY - MENUITEM "K&listra in\tCtrl+V", IDM_PASTE - } - POPUP "&Visa" { - MENUITEM "Standard", IDM_MODE_STANDARD - MENUITEM "Vetenskaplig", IDM_MODE_SCIENTIFIC - MENUITEM SEPARATOR - MENUITEM "Siffergruppering", IDM_DIGIT_GROUPING - } - POPUP "&Hjälp" { - MENUITEM "Hjälpavsnitt", IDM_HELP_TOPICS - MENUITEM SEPARATOR - MENUITEM "Om Kalkylatorn", IDM_ABOUT - } -} - -SCIMS_MENU MENU DISCARDABLE -{ - POPUP "&Redigera" { - MENUITEM "&Kopiera\tCtrl+C", IDM_COPY - MENUITEM "K&listra in\tCtrl+V", IDM_PASTE - } - POPUP "&Visa" { - MENUITEM "Standard", IDM_MODE_STANDARD - MENUITEM "Vetenskaplig", IDM_MODE_SCIENTIFIC - MENUITEM SEPARATOR - MENUITEM "Hex\tF5", ID_CALC_NS_HEX - MENUITEM "Decimal\tF6", ID_CALC_NS_DEC - MENUITEM "Oktal\tF7", ID_CALC_NS_OCT - MENUITEM "Binär\tF8", ID_CALC_NS_BIN - MENUITEM SEPARATOR - MENUITEM "Grader\tF2", ID_CALC_MS_DEGREES - MENUITEM "Radianer\tF3", ID_CALC_MS_RADIANS - MENUITEM "Gradienter\tF4", ID_CALC_MS_GRADS - MENUITEM SEPARATOR - MENUITEM "Siffergruppering", IDM_DIGIT_GROUPING - } - POPUP "&Hjälp" { - MENUITEM "Hjälpavsnitt", IDM_HELP_TOPICS - MENUITEM SEPARATOR - MENUITEM "Om Kalkylatorn", IDM_ABOUT - } -} - -SCIWS_MENU MENU DISCARDABLE -{ - POPUP "&Redigera" { - MENUITEM "&Kopiera\tCtrl+C", IDM_COPY - MENUITEM "K&listra in\tCtrl+V", IDM_PASTE - } - POPUP "&Visa" { - MENUITEM "Standard", IDM_MODE_STANDARD - MENUITEM "Vetenskaplig", IDM_MODE_SCIENTIFIC - MENUITEM SEPARATOR - MENUITEM "Hex\tF5", ID_CALC_NS_HEX - MENUITEM "Decimal\tF6", ID_CALC_NS_DEC - MENUITEM "Oktal\tF7", ID_CALC_NS_OCT - MENUITEM "Binär\tF8", ID_CALC_NS_BIN - MENUITEM SEPARATOR - MENUITEM "Qword\tF12", ID_CALC_WS_QWORD - MENUITEM "Dword\tF2", ID_CALC_WS_DWORD - MENUITEM "Word\tF3", ID_CALC_WS_WORD - MENUITEM "Byte\tF4", ID_CALC_WS_BYTE - MENUITEM SEPARATOR - MENUITEM "Siffergruppering", IDM_DIGIT_GROUPING - } - POPUP "&Hjälp" { - MENUITEM "Hjälpavsnitt", IDM_HELP_TOPICS - MENUITEM SEPARATOR - MENUITEM "Om Kalkylatorn", IDM_ABOUT - } -} - -MAIN_MENU ACCELERATORS -BEGIN - VK_F1, IDV_HELP, VIRTKEY -END - -DLG_ABOUT DIALOG 12,0,120,82 -CAPTION "Om GNU Kalkylatorn (winecalc)" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -BEGIN - DEFPUSHBUTTON "OK", IDOK, 42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP -END - -WHATS_THIS_MENU MENU DISCARDABLE -{ - POPUP "" { - MENUITEM "Vad är det här?", IDM_WHATS_THIS - } -} - -DLG_STATS DIALOG 12,0,125,78 -CAPTION "Statistikruta" -FONT 9, "Tahoma" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -BEGIN - DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 25, 13, WS_TABSTOP | WS_GROUP - PUSHBUTTON "&LOAD", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP - PUSHBUTTON "&CD" ID_STATS_CD, 64, 52, 25, 13, WS_TABSTOP | WS_GROUP - PUSHBUTTON "C&AD", ID_STATS_CAD, 94, 52, 25, 13, WS_TABSTOP | WS_GROUP -END +/* + * WineCalc (En.rc) + * + * Copyright 2005 David Nordenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "windows.h" +#include "resource.h" +#include "winecalc.h" + +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_APPNAME, "Kalkylatorn" + + IDS_COPYRIGHT1, "Kalkylatorn 5.0. Licenserad under LGPL 2" + IDS_COPYRIGHT2 "Copyright 2003, James Briggs" + IDS_COPYRIGHT3 "San Jose, California, USA" + IDS_COPYRIGHT4 "james(a)ActionMessage.com" + IDS_COPYRIGHT5 "http://www.ActionMessage.com/winecalc/" + + IDS_BTN_BACKSPACE, "Backsteg" + IDS_BTN_CLEAR_ENTRY, "CE" + IDS_BTN_CLEAR_ALL, "C" + IDS_BTN_MEM_CLEAR, "MC" + IDS_BTN_MEM_RECALL, "MR" + IDS_BTN_MEM_STORE, "MS" + IDS_BTN_MEM_PLUS, "M+" + IDS_BTN_MEM_STATUS_M, "M" + IDS_BTN_SQRT, "sqrt" + IDS_ERR_INVALID_INPUT, "Felaktig indata för funktion." + IDS_ERR_DIVIDE_BY_ZERO, "Kan inte dividera med noll." + IDS_ERR_UNDEFINED, "Funktionens resultat är odefinerat." +} + +MAIN_MENU MENU DISCARDABLE +{ + POPUP "&Redigera" { + MENUITEM "&Kopiera\tCtrl+C", IDM_COPY + MENUITEM "K&listra in\tCtrl+V", IDM_PASTE + } + POPUP "&Visa" { + MENUITEM "Standard", IDM_MODE_STANDARD + MENUITEM "Vetenskaplig", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "Siffergruppering", IDM_DIGIT_GROUPING + } + POPUP "&Hjälp" { + MENUITEM "Hjälpavsnitt", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "Om Kalkylatorn", IDM_ABOUT + } +} + +SCIMS_MENU MENU DISCARDABLE +{ + POPUP "&Redigera" { + MENUITEM "&Kopiera\tCtrl+C", IDM_COPY + MENUITEM "K&listra in\tCtrl+V", IDM_PASTE + } + POPUP "&Visa" { + MENUITEM "Standard", IDM_MODE_STANDARD + MENUITEM "Vetenskaplig", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "Hex\tF5", ID_CALC_NS_HEX + MENUITEM "Decimal\tF6", ID_CALC_NS_DEC + MENUITEM "Oktal\tF7", ID_CALC_NS_OCT + MENUITEM "Binär\tF8", ID_CALC_NS_BIN + MENUITEM SEPARATOR + MENUITEM "Grader\tF2", ID_CALC_MS_DEGREES + MENUITEM "Radianer\tF3", ID_CALC_MS_RADIANS + MENUITEM "Gradienter\tF4", ID_CALC_MS_GRADS + MENUITEM SEPARATOR + MENUITEM "Siffergruppering", IDM_DIGIT_GROUPING + } + POPUP "&Hjälp" { + MENUITEM "Hjälpavsnitt", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "Om Kalkylatorn", IDM_ABOUT + } +} + +SCIWS_MENU MENU DISCARDABLE +{ + POPUP "&Redigera" { + MENUITEM "&Kopiera\tCtrl+C", IDM_COPY + MENUITEM "K&listra in\tCtrl+V", IDM_PASTE + } + POPUP "&Visa" { + MENUITEM "Standard", IDM_MODE_STANDARD + MENUITEM "Vetenskaplig", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "Hex\tF5", ID_CALC_NS_HEX + MENUITEM "Decimal\tF6", ID_CALC_NS_DEC + MENUITEM "Oktal\tF7", ID_CALC_NS_OCT + MENUITEM "Binär\tF8", ID_CALC_NS_BIN + MENUITEM SEPARATOR + MENUITEM "Qword\tF12", ID_CALC_WS_QWORD + MENUITEM "Dword\tF2", ID_CALC_WS_DWORD + MENUITEM "Word\tF3", ID_CALC_WS_WORD + MENUITEM "Byte\tF4", ID_CALC_WS_BYTE + MENUITEM SEPARATOR + MENUITEM "Siffergruppering", IDM_DIGIT_GROUPING + } + POPUP "&Hjälp" { + MENUITEM "Hjälpavsnitt", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "Om Kalkylatorn", IDM_ABOUT + } +} + +MAIN_MENU ACCELERATORS +BEGIN + VK_F1, IDV_HELP, VIRTKEY +END + +DLG_ABOUT DIALOG 12,0,120,82 +CAPTION "Om GNU Kalkylatorn (winecalc)" +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +BEGIN + DEFPUSHBUTTON "OK", IDOK, 42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +WHATS_THIS_MENU MENU DISCARDABLE +{ + POPUP "" { + MENUITEM "Vad är det här?", IDM_WHATS_THIS + } +} + +DLG_STATS DIALOG 12,0,125,78 +CAPTION "Statistikruta" +FONT 9, "Tahoma" +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +BEGIN + DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "&LOAD", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "&CD" ID_STATS_CD, 64, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "C&AD", ID_STATS_CAD, 94, 52, 25, 13, WS_TABSTOP | WS_GROUP +END Propchange: trunk/reactos/base/applications/calc/Sv.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 23018: * fix a typo * fix identation * bugreport & patch by Jones111 * fixes bug 1656
by janderwald＠svn.reactos.org 12 Jul '06

12 Jul '06

Author: janderwald Date: Wed Jul 12 15:55:14 2006 New Revision: 23018 URL: http://svn.reactos.org/svn/reactos?rev=23018&view=rev Log: * fix a typo * fix identation * bugreport & patch by Jones111 * fixes bug 1656 Modified: trunk/reactos/base/applications/calc/De.rc Modified: trunk/reactos/base/applications/calc/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/De.… ============================================================================== --- trunk/reactos/base/applications/calc/De.rc (original) +++ trunk/reactos/base/applications/calc/De.rc Wed Jul 12 15:55:14 2006 @@ -45,7 +45,7 @@ IDS_BTN_SQRT, "sqrt" IDS_ERR_INVALID_INPUT, "Ungültige Eingabe für Funktion." IDS_ERR_DIVIDE_BY_ZERO, "Teilen durch 0 unmöglich." - IDS_ERR_UNDEFINED, "Das Ergebnis der Funktion is undefiniert." + IDS_ERR_UNDEFINED, "Das Ergebnis der Funktion ist undefiniert." } MAIN_MENU MENU DISCARDABLE @@ -77,14 +77,14 @@ MENUITEM "&Standard", IDM_MODE_STANDARD MENUITEM "&Wissenschaftlich", IDM_MODE_SCIENTIFIC MENUITEM SEPARATOR - MENUITEM "&Hex\tF5", ID_CALC_NS_HEX - MENUITEM "De&zimal\tF6", ID_CALC_NS_DEC - MENUITEM "O&ktal\tF7", ID_CALC_NS_OCT - MENUITEM "&Binär\tF8", ID_CALC_NS_BIN + MENUITEM "&Hex\tF5", ID_CALC_NS_HEX + MENUITEM "De&zimal\tF6", ID_CALC_NS_DEC + MENUITEM "O&ktal\tF7", ID_CALC_NS_OCT + MENUITEM "&Binär\tF8", ID_CALC_NS_BIN MENUITEM SEPARATOR MENUITEM "&Deg\tF2", ID_CALC_MS_DEGREES MENUITEM "&Rad\tF3", ID_CALC_MS_RADIANS - MENUITEM "&Grad\tF4", ID_CALC_MS_GRADS + MENUITEM "&Grad\tF4", ID_CALC_MS_GRADS MENUITEM SEPARATOR MENUITEM "Zifferngr&uppierung", IDM_DIGIT_GROUPING } @@ -105,15 +105,15 @@ MENUITEM "&Standard", IDM_MODE_STANDARD MENUITEM "&Wissenschaftlich", IDM_MODE_SCIENTIFIC MENUITEM SEPARATOR - MENUITEM "&Hex\tF5", ID_CALC_NS_HEX - MENUITEM "De&zimal\tF6", ID_CALC_NS_DEC - MENUITEM "O&ktal\tF7", ID_CALC_NS_OCT - MENUITEM "&Binär\tF8", ID_CALC_NS_BIN + MENUITEM "&Hex\tF5", ID_CALC_NS_HEX + MENUITEM "De&zimal\tF6", ID_CALC_NS_DEC + MENUITEM "O&ktal\tF7", ID_CALC_NS_OCT + MENUITEM "&Binär\tF8", ID_CALC_NS_BIN MENUITEM SEPARATOR - MENUITEM "&Qword\tF12", ID_CALC_WS_QWORD - MENUITEM "Dw&ord\tF2", ID_CALC_WS_DWORD - MENUITEM "Wo&rd\tF3", ID_CALC_WS_WORD - MENUITEM "&Byte\tF4", ID_CALC_WS_BYTE + MENUITEM "&Qword\tF12", ID_CALC_WS_QWORD + MENUITEM "Dw&ord\tF2", ID_CALC_WS_DWORD + MENUITEM "Wo&rd\tF3", ID_CALC_WS_WORD + MENUITEM "&Byte\tF4", ID_CALC_WS_BYTE MENUITEM SEPARATOR MENUITEM "&Zifferngruppierung", IDM_DIGIT_GROUPING }

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
67
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2006