Ros-diffs December 2008

ros-diffs@reactos.org

31 participants
710 discussions

[gbrunmar] 38174: Implemented IDirect3DDevice9::CreateAdditionalSwapChain()

by gbrunmar＠svn.reactos.org

Author: gbrunmar Date: Thu Dec 18 13:08:17 2008 New Revision: 38174 URL: http://svn.reactos.org/svn/reactos?rev=38174&view=rev Log: Implemented IDirect3DDevice9::CreateAdditionalSwapChain() Modified: trunk/reactos/dll/directx/d3d9/d3d9_device.c Modified: trunk/reactos/dll/directx/d3d9/d3d9_device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_devi… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_device.c [iso-8859-1] Thu Dec 18 13:08:17 2008 @@ -316,10 +316,64 @@ return TRUE; } +/*++ +* @name IDirect3DDevice9::CreateAdditionalSwapChain +* @implemented +* +* The function IDirect3DDevice9Base_CreateAdditionalSwapChain creates a swap chain object, +* useful when rendering multiple views. +* +* @param LPDIRECT3D iface +* Pointer to the IDirect3DDevice9 object returned from IDirect3D9::CreateDevice() +* +* @param D3DPRESENT_PARAMETERS* pPresentationParameters +* Pointer to a D3DPRESENT_PARAMETERS structure describing the parameters for the swap chain +* to be created. +* +* @param IDirect3DSwapChain9** ppSwapChain +* Pointer to a IDirect3DSwapChain9* to receive the swap chain object pointer. +* +* @return HRESULT +* If the method successfully fills the ppSwapChain structure, the return value is D3D_OK. +* If iSwapChain is out of range or ppSwapChain is a bad pointer, the return value +* will be D3DERR_INVALIDCALL. Also D3DERR_OUTOFVIDEOMEMORY can be returned if allocation +* of the new swap chain object failed. +* +*/ HRESULT WINAPI IDirect3DDevice9Base_CreateAdditionalSwapChain(LPDIRECT3DDEVICE9 iface, D3DPRESENT_PARAMETERS* pPresentationParameters, IDirect3DSwapChain9** ppSwapChain) { - UNIMPLEMENTED - + UINT iSwapChain; + IDirect3DSwapChain9* pSwapChain; + Direct3DSwapChain9_INT* pSwapChain_INT; + LPDIRECT3DDEVICE9_INT This = IDirect3DDevice9ToImpl(iface); + LOCK_D3DDEVICE9(); + + if (NULL == ppSwapChain) + { + DPRINT1("Invalid ppSwapChain parameter specified"); + UNLOCK_D3DDEVICE9(); + return D3DERR_INVALIDCALL; + } + + *ppSwapChain = NULL; + iSwapChain = IDirect3DDevice9_GetNumberOfSwapChains(iface) + 1; + + pSwapChain_INT = CreateDirect3DSwapChain9(RT_EXTERNAL, This, iSwapChain); + if (NULL == pSwapChain_INT) + { + DPRINT1("Out of memory"); + UNLOCK_D3DDEVICE9(); + return D3DERR_OUTOFVIDEOMEMORY; + } + + Direct3DSwapChain9_Init(pSwapChain_INT, pPresentationParameters); + + This->pSwapChains[iSwapChain] = pSwapChain_INT; + pSwapChain = (IDirect3DSwapChain9*)&pSwapChain_INT->lpVtbl; + IDirect3DSwapChain9_AddRef(pSwapChain); + *ppSwapChain = pSwapChain; + + UNLOCK_D3DDEVICE9(); return D3D_OK; }

16 years

[gschneider] 38173: - Remove duplicate harcoded _mbctype, rename MSVCRT_mbctype to fit the new role - Update related functions _ismbblead, _ismbslead, _ismbbtrail, _ismbstrail to use Wine _mbctype indexing - Fixes 28 msvcrt string tests, 33 left - Minor header updates

by gschneider＠svn.reactos.org

Author: gschneider Date: Thu Dec 18 12:58:43 2008 New Revision: 38173 URL: http://svn.reactos.org/svn/reactos?rev=38173&view=rev Log: - Remove duplicate harcoded _mbctype, rename MSVCRT_mbctype to fit the new role - Update related functions _ismbblead, _ismbslead, _ismbbtrail, _ismbstrail to use Wine _mbctype indexing - Fixes 28 msvcrt string tests, 33 left - Minor header updates Modified: trunk/reactos/lib/sdk/crt/locale/locale.c trunk/reactos/lib/sdk/crt/mbstring/ismbc.c trunk/reactos/lib/sdk/crt/mbstring/ismblead.c trunk/reactos/lib/sdk/crt/mbstring/ismbtrl.c Modified: trunk/reactos/lib/sdk/crt/locale/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/locale/locale.… ============================================================================== --- trunk/reactos/lib/sdk/crt/locale/locale.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/locale/locale.c [iso-8859-1] Thu Dec 18 12:58:43 2008 @@ -27,7 +27,7 @@ */ #define MAX_ELEM_LEN 64 /* Max length of country/language/CP string */ -unsigned char MSVCRT_mbctype[257] = { 0 }; +unsigned char _mbctype[257] = { 0 }; static int g_mbcp_is_multibyte = 0; /* It seems that the data about valid trail bytes is not available from kernel32 @@ -671,13 +671,13 @@ } /* setup the _mbctype */ - memset(MSVCRT_mbctype, 0, sizeof(MSVCRT_mbctype)); + memset(_mbctype, 0, sizeof(_mbctype)); bytes = cpi.LeadByte; while (bytes[0] || bytes[1]) { for (i = bytes[0]; i <= bytes[1]; i++) - MSVCRT_mbctype[i + 1] |= _M1; + _mbctype[i + 1] |= _M1; bytes += 2; } @@ -698,7 +698,7 @@ while (bytes[0] || bytes[1]) { for (i = bytes[0]; i <= bytes[1]; i++) - MSVCRT_mbctype[i + 1] |= _M2; + _mbctype[i + 1] |= _M2; bytes += 2; } break; @@ -713,7 +713,7 @@ */ charcount = 0; for (i = 0; i < 256; i++) - if (!(MSVCRT_mbctype[i + 1] & _M1)) + if (!(_mbctype[i + 1] & _M1)) bufA[charcount++] = i; ret = MultiByteToWideChar(newcp, 0, bufA, charcount, bufW, charcount); @@ -724,12 +724,12 @@ curr_type = chartypes; for (i = 0; i < 256; i++) - if (!(MSVCRT_mbctype[i + 1] & _M1)) + if (!(_mbctype[i + 1] & _M1)) { if ((*curr_type) & C1_UPPER) - MSVCRT_mbctype[i + 1] |= _SBUP; + _mbctype[i + 1] |= _SBUP; if ((*curr_type) & C1_LOWER) - MSVCRT_mbctype[i + 1] |= _SBLOW; + _mbctype[i + 1] |= _SBLOW; curr_type++; } @@ -741,9 +741,9 @@ * also faster execution. */ for (i = 161; i <= 165; i++) - MSVCRT_mbctype[i + 1] |= _MP; + _mbctype[i + 1] |= _MP; for (i = 166; i <= 223; i++) - MSVCRT_mbctype[i + 1] |= _MS; + _mbctype[i + 1] |= _MS; } MSVCRT___lc_collate_cp = MSVCRT___lc_codepage = newcp; Modified: trunk/reactos/lib/sdk/crt/mbstring/ismbc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mbstring/ismbc… ============================================================================== --- trunk/reactos/lib/sdk/crt/mbstring/ismbc.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/mbstring/ismbc.c [iso-8859-1] Thu Dec 18 12:58:43 2008 @@ -13,26 +13,6 @@ #include <precomp.h> #include <mbstring.h> #include <mbctype.h> - -unsigned char _mbctype[257] = { - 0, /* EOF */ - 0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 , /* 0 */ - 0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 , /* 1 */ - B ,P ,P ,P ,P ,P ,P ,P ,P ,P ,P ,P ,P ,P ,P ,P , /* 2 */ - D ,D ,D ,P ,D ,D ,D ,D ,D ,D ,P ,P ,P ,P ,P ,P , /* 3 */ - PT,AT,AT,AT,AT,AT,AT,AT,AT,AT,AT,AT,AT,AT,AT,AT, /* 4 */ - AT,AT,AT,AT,AT,AT,AT,AT,AT,AT,AT,PT,PT,PT,PT,PT, /* 5 */ - PT,AT,AT,AT,AT,AT,AT,AT,AT,AT,AT,AT,AT,AT,AT,AT, /* 6 */ - AT,AT,AT,AT,AT,AT,AT,AT,AT,AT,AT,PT,PT,PT,PT,0 , /* 7 */ - T ,LT,LT,LT,LT,LT,LT,LT,LT,LT,LT,LT,LT,LT,LT,LT, /* 8 */ - LT,LT,LT,LT,LT,LT,LT,LT,LT,LT,LT,LT,LT,LT,LT,LT, /* 9 */ - T ,GT,GT,GT,GT,GT,KT,KT,KT,KT,KT,KT,KT,KT,KT,KT, /* A */ - KT,KT,KT,KT,KT,KT,KT,KT,KT,KT,KT,KT,KT,KT,KT,KT, /* B */ - KT,KT,KT,KT,KT,KT,KT,KT,KT,KT,KT,KT,KT,KT,KT,KT, /* C */ - KT,KT,KT,KT,KT,KT,KT,KT,KT,KT,KT,KT,KT,KT,GT,GT, /* D */ - LT,LT,LT,LT,LT,LT,LT,LT,LT,LT,LT,LT,LT,LT,LT,LT, /* E */ - LT,LT,LT,LT,LT,LT,LT,LT,LT,LT,LT,LT,LT,0 ,0 ,0 , /* F */ -}; /* * @implemented Modified: trunk/reactos/lib/sdk/crt/mbstring/ismblead.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mbstring/ismbl… ============================================================================== --- trunk/reactos/lib/sdk/crt/mbstring/ismblead.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/mbstring/ismblead.c [iso-8859-1] Thu Dec 18 12:58:43 2008 @@ -1,16 +1,18 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries - * FILE: lib/sdk/crt/mbstring/iskana.c - * PURPOSE: - * PROGRAMER: - * UPDATE HISTORY: - * 12/04/99: Ariadne, Taiji Yamada Created - * 05/30/08: Samuel Serapion adapted from PROJECT C Library + * FILE: lib/sdk/crt/mbstring/ismblead.c + * PURPOSE: Checks for a leading byte + * PROGRAMERS: + * Copyright 1999 Ariadne, Taiji Yamada + * Copyright 1999 Alexandre Julliard + * Copyright 2000 Jon Griffths + * Copyright 2008 Samuel Serapion adapted from PROJECT C Library * */ #include <precomp.h> +#include <mbctype.h> size_t _mbclen2(const unsigned int s); @@ -19,21 +21,27 @@ */ int _ismbblead(unsigned int c) { - return (_mbctype[c & 0xff] & _MLEAD); + return (_mbctype[(c&0xff) + 1] & _M1) != 0; } /* * @implemented */ -int _ismbslead( const unsigned char *str, const unsigned char *t) +int _ismbslead( const unsigned char *start, const unsigned char *str) { - unsigned char *s = (unsigned char *)str; - while(*s != 0 && s != t) - { + int lead = 0; - s+= _mbclen2(*s); - } - return _ismbblead( *s); + /* Lead bytes can also be trail bytes so we need to analyse the string + */ + while (start <= str) + { + if (!*start) + return 0; + lead = !lead && _ismbblead(*start); + start++; + } + + return lead ? -1 : 0; } /* @@ -41,7 +49,7 @@ */ const unsigned char *__p__mbctype(void) { - return _mbctype; + return _mbctype; } Modified: trunk/reactos/lib/sdk/crt/mbstring/ismbtrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mbstring/ismbt… ============================================================================== --- trunk/reactos/lib/sdk/crt/mbstring/ismbtrl.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/mbstring/ismbtrl.c [iso-8859-1] Thu Dec 18 12:58:43 2008 @@ -1,14 +1,17 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries - * FILE: lib/msvcrt/mbstring/ismbtrl.c + * FILE: lib/sdk/crt/mbstring/ismbtrl.c * PURPOSE: Checks for a trailing byte - * PROGRAMER: Ariadne - * UPDATE HISTORY: - * 12/04/99: Created + * PROGRAMERS: + * Copyright 1999 Ariadne + * Copyright 1999 Alexandre Julliard + * Copyright 2000 Jon Griffths + * */ #include <precomp.h> +#include <mbctype.h> size_t _mbclen2(const unsigned int s); @@ -19,21 +22,18 @@ */ int _ismbbtrail(unsigned int c) { - return (_mbctype[c & 0xff] & _MTRAIL); + return (_mbctype[(c&0xff) + 1] & _M2) != 0; } /* * @implemented */ -int _ismbstrail( const unsigned char *str, const unsigned char *t) +int _ismbstrail( const unsigned char *start, const unsigned char *str) { - unsigned char *s = (unsigned char *)str; - while(*s != 0 && s != t) - { - - s+= _mbclen2(*s); - } - - return _ismbbtrail(*s); + /* Note: this function doesn't check _ismbbtrail */ + if ((str > start) && _ismbslead(start, str-1)) + return -1; + else + return 0; }

16 years

[dchapyshev] 38172: - Revert r37085. It fix work kbswitch, but I think, that somewhere (in kbswitch) there is a memory leak. Help somebody to find it

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Thu Dec 18 06:32:46 2008 New Revision: 38172 URL: http://svn.reactos.org/svn/reactos?rev=38172&view=rev Log: - Revert r37085. It fix work kbswitch, but I think, that somewhere (in kbswitch) there is a memory leak. Help somebody to find it Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] Thu Dec 18 06:32:46 2008 @@ -24,8 +24,6 @@ HANDLE hProcessHeap; HMODULE hDllLib; ULONG ulCurrentLayoutNum = 1; -UINT cxSmIcon, cySmIcon; - static HICON CreateTrayIcon(LPTSTR szLCID) @@ -51,18 +49,18 @@ hdcsrc = GetDC(NULL); hdc = CreateCompatibleDC(hdcsrc); - hBitmap = CreateCompatibleBitmap(hdcsrc, cxSmIcon, cySmIcon); + hBitmap = CreateCompatibleBitmap(hdcsrc, 16, 16); ReleaseDC(NULL, hdcsrc); if (hdc && hBitmap) { - hBmpNew = CreateBitmap(cxSmIcon, cySmIcon, 1, 1, NULL); + hBmpNew = CreateBitmap(16, 16, 1, 1, NULL); if (hBmpNew) { hBmpOld = SelectObject(hdc, hBitmap); - rect.right = cxSmIcon; + rect.right = 16; rect.left = 0; - rect.bottom = cySmIcon; + rect.bottom = 16; rect.top = 0; bkColor = SetBkColor(hdc, GetSysColor(COLOR_HIGHLIGHT)); @@ -70,14 +68,14 @@ ExtTextOut(hdc, rect.left, rect.top, ETO_OPAQUE, &rect, _T(""), 0, NULL); - hFont = (HFONT) GetStockObject(DEFAULT_GUI_FONT); - if (!hFont) - goto End; + hFont = CreateFont(-11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, + OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, + DEFAULT_QUALITY, FF_DONTCARE, _T("Tahoma")); hFontOld = SelectObject(hdc, hFont); DrawText(hdc, _tcsupr(szBuf), 2, &rect, DT_SINGLELINE|DT_CENTER|DT_VCENTER); SelectObject(hdc, hBmpNew); - PatBlt(hdc, 0, 0, cxSmIcon, cySmIcon, BLACKNESS); + PatBlt(hdc, 0, 0, 16, 16, BLACKNESS); SelectObject(hdc, hBmpOld); SelectObject(hdc, hFontOld); @@ -86,15 +84,15 @@ IconInfo.fIcon = TRUE; hIcon = CreateIconIndirect(&IconInfo); -End: - if (hBmpNew) DeleteObject(hBmpNew); - if (hBmpOld) DeleteObject(hBmpOld); - if (hFont) DeleteObject(hFont); - } - } - - if (hdc) DeleteDC(hdc); - if (hBitmap) DeleteObject(hBitmap); + + DeleteObject(hBmpNew); + DeleteObject(hBmpOld); + DeleteObject(hFont); + } + } + + DeleteDC(hdc); + DeleteObject(hBitmap); return hIcon; } @@ -386,23 +384,6 @@ return -1; } -static VOID -SettingsChanging(HWND hwnd) -{ - UINT cxSmIconCur = 0, cySmIconCur = 0; - - cxSmIconCur = GetSystemMetrics(SM_CXSMICON); - cySmIconCur = GetSystemMetrics(SM_CYSMICON); - - if ((cxSmIcon != cxSmIconCur) || (cySmIcon != cySmIconCur)) - { - cxSmIcon = cxSmIconCur; - cySmIcon = cySmIconCur; - } - - ActivateLayout(hwnd, ulCurrentLayoutNum); -} - LRESULT CALLBACK WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) { @@ -413,9 +394,6 @@ { case WM_CREATE: { - cxSmIcon = GetSystemMetrics(SM_CXSMICON); - cySmIcon = GetSystemMetrics(SM_CYSMICON); - SetHooks(); AddTrayIcon(hwnd); hRightPopupMenu = GetSubMenu(LoadMenu(hInst, MAKEINTRESOURCE(IDR_POPUP)), 0); @@ -511,8 +489,6 @@ case WM_SETTINGCHANGE: { - SettingsChanging(hwnd); - if (wParam == SPI_SETDEFAULTINPUTLANG) { //FIXME: Should detect default language changes by CPL applet or by other tools and update UI

16 years

[cwittich] 38171: GENERIC_WRITE is required to flush the input buffer

by cwittich＠svn.reactos.org

Author: cwittich Date: Thu Dec 18 06:32:32 2008 New Revision: 38171 URL: http://svn.reactos.org/svn/reactos?rev=38171&view=rev Log: GENERIC_WRITE is required to flush the input buffer Modified: trunk/reactos/base/applications/cmdutils/more/more.c Modified: trunk/reactos/base/applications/cmdutils/more/more.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/more.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/more/more.c [iso-8859-1] Thu Dec 18 06:32:32 2008 @@ -124,7 +124,7 @@ return 0; } - hKeyboard = CreateFile (_T("CONIN$"), GENERIC_READ, + hKeyboard = CreateFile (_T("CONIN$"), GENERIC_READ|GENERIC_WRITE, 0,NULL,OPEN_ALWAYS,0,0); GetScreenSize(&maxx,&maxy);

16 years

[dgorbachev] 38170: Add a hack which allows to boot with Armenian language.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Thu Dec 18 06:26:52 2008 New Revision: 38170 URL: http://svn.reactos.org/svn/reactos?rev=38170&view=rev Log: Add a hack which allows to boot with Armenian language. Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c [iso-8859-1] Thu Dec 18 06:26:52 2008 @@ -262,8 +262,11 @@ rc = RegQueryValue(hKey, szIdBuffer, NULL, (PUCHAR)szNameBuffer, &BufferSize); if (rc != ERROR_SUCCESS) { - strcpy(szErrorOut, "ACP NLS Setting exists, but isn't readable"); - return(FALSE); + //strcpy(szErrorOut, "ACP NLS Setting exists, but isn't readable"); + //return(FALSE); + + /* HACK */ + wcscpy(szNameBuffer, L"c_1252.nls"); } /* load ANSI codepage table */ @@ -288,8 +291,11 @@ rc = RegQueryValue(hKey, szIdBuffer, NULL, (PUCHAR)szNameBuffer, &BufferSize); if (rc != ERROR_SUCCESS) { - strcpy(szErrorOut, "OEMCP NLS setting exists, but isn't readable"); - return(FALSE); + //strcpy(szErrorOut, "OEMCP NLS setting exists, but isn't readable"); + //return(FALSE); + + /* HACK */ + wcscpy(szNameBuffer, L"c_437.nls"); } /* load OEM codepage table */

16 years

[dgorbachev] 38169: Fix some keyboard layout related stuff in USetup.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Thu Dec 18 06:26:47 2008 New Revision: 38169 URL: http://svn.reactos.org/svn/reactos?rev=38169&view=rev Log: Fix some keyboard layout related stuff in USetup. Added: trunk/reactos/base/setup/usetup/lang/my-MM.h (with props) Modified: trunk/reactos/base/setup/usetup/lang/hy-AM.h trunk/reactos/base/setup/usetup/mui.c trunk/reactos/base/setup/usetup/muilanguages.h trunk/reactos/base/setup/usetup/settings.c Modified: trunk/reactos/base/setup/usetup/lang/hy-AM.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/hy-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/hy-AM.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/hy-AM.h [iso-8859-1] Thu Dec 18 06:26:47 2008 @@ -3,9 +3,10 @@ MUI_LAYOUTS hyAMLayouts[] = { - { L"042b", L"0000042b" }, + { L"042B", L"0000042B" }, + { L"042B", L"0001042B" }, + { L"0419", L"00000419" }, { L"0409", L"00000409" }, - { L"0419", L"00000419" }, { NULL, NULL } }; Added: trunk/reactos/base/setup/usetup/lang/my-MM.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/my-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/my-MM.h (added) +++ trunk/reactos/base/setup/usetup/lang/my-MM.h [iso-8859-1] Thu Dec 18 06:26:47 2008 @@ -1,0 +1,11 @@ +#ifndef LANG_MY_MM_H__ +#define LANG_MY_MM_H__ + +MUI_LAYOUTS myMMLayouts[] = +{ + { L"0455", L"00000455" }, + { L"0409", L"00000409" }, + { NULL, NULL } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/my-MM.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/mui.c [iso-8859-1] Thu Dec 18 06:26:47 2008 @@ -391,12 +391,12 @@ { if (uIndex > 19) break; - swprintf(szValueName, L"%d", uIndex + 1); + swprintf(szValueName, L"%u", uIndex + 1); RtlInitUnicodeString(&ValueName, szValueName); swprintf(szLangID, L"0000%s", MuiLayouts[uIndex].LangID); - if (wcscmp(szLangID, MuiLayouts[uIndex].LayoutID) == 0) + if (_wcsicmp(szLangID, MuiLayouts[uIndex].LayoutID) == 0) { Status = NtSetValueKey(KeyHandle, &ValueName, @@ -414,7 +414,7 @@ } else { - swprintf(szLangID, L"d%03d%s", uCount, MuiLayouts[uIndex].LangID); + swprintf(szLangID, L"d%03u%s", uCount, MuiLayouts[uIndex].LangID); Status = NtSetValueKey(KeyHandle, &ValueName, 0, @@ -439,7 +439,7 @@ (wcslen(MuiLayouts[uIndex].LayoutID)+1) * sizeof(WCHAR)); if (!NT_SUCCESS(Status)) { - DPRINT1("NtSetValueKey() failed (Status = %lx, uIndex = %d)\n", Status, uIndex); + DPRINT1("NtSetValueKey() failed (Status = %lx, uIndex = %u)\n", Status, uIndex); NtClose(SubKeyHandle); NtClose(KeyHandle); return FALSE; Modified: trunk/reactos/base/setup/usetup/muilanguages.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/muilangu… ============================================================================== --- trunk/reactos/base/setup/usetup/muilanguages.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/muilanguages.h [iso-8859-1] Thu Dec 18 06:26:47 2008 @@ -99,6 +99,7 @@ #include "lang/mr-IN.h" #include "lang/ms-BN.h" #include "lang/ms-MY.h" +#include "lang/my-MM.h" #include "lang/nl-BE.h" #include "lang/nl-NL.h" #include "lang/nn-NO.h" @@ -159,7 +160,7 @@ {L"0000042D", L"1252", L"850", L"10000", L"Basque", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, euESLayouts }, {L"00000423", L"1251", L"866", L"10007", L"Belarusian", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, beBYLayouts }, {L"00000402", L"1251", L"866", L"10007", L"Bulgarian", bgBGPages, bgBGErrorEntries, bgBGStrings, CyrillicFonts, bgBGLayouts }, - {L"00000455", L"0", L"1", L"2", L"Burmese", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, enUSLayouts }, + {L"00000455", L"0", L"1", L"2", L"Burmese", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, myMMLayouts }, {L"00000403", L"1252", L"850", L"10000", L"Catalan", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, caESLayouts }, {L"00000404", L"950", L"950", L"10008", L"Chinese (Taiwan)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, zhTWLayouts }, {L"00000804", L"936", L"936", L"10008", L"Chinese (PRC)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, zhCNLayouts }, Modified: trunk/reactos/base/setup/usetup/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/settings… ============================================================================== --- trunk/reactos/base/setup/usetup/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/settings.c [iso-8859-1] Thu Dec 18 06:26:47 2008 @@ -895,7 +895,7 @@ PWCHAR LayoutId; const MUI_LAYOUTS * LayoutsList; MUI_LAYOUTS NewLayoutsList[20]; - ULONG uIndex = 0; + ULONG uIndex; ULONG uOldPos = 0; Entry = GetCurrentListEntry(List); @@ -910,16 +910,17 @@ if (_wcsicmp(LayoutsList[0].LayoutID, LayoutId) != 0) { - do + for (uIndex = 1; LayoutsList[uIndex].LangID != NULL; uIndex++) { if (_wcsicmp(LayoutsList[uIndex].LayoutID, LayoutId) == 0) { uOldPos = uIndex; + continue; } - uIndex++; - - } while (LayoutsList[uIndex].LangID != NULL); + NewLayoutsList[uIndex].LangID = LayoutsList[uIndex].LangID; + NewLayoutsList[uIndex].LayoutID = LayoutsList[uIndex].LayoutID; + } NewLayoutsList[uIndex].LangID = NULL; NewLayoutsList[uIndex].LayoutID = NULL;

16 years

[dgorbachev] 38168: Armenian registry settings.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Thu Dec 18 06:26:42 2008 New Revision: 38168 URL: http://svn.reactos.org/svn/reactos?rev=38168&view=rev Log: Armenian registry settings. Modified: trunk/reactos/boot/bootdata/hivecls_arm.inf trunk/reactos/boot/bootdata/hivecls_i386.inf trunk/reactos/boot/bootdata/hivesft_arm.inf trunk/reactos/boot/bootdata/hivesft_i386.inf trunk/reactos/boot/bootdata/hivesys_arm.inf trunk/reactos/boot/bootdata/hivesys_i386.inf Modified: trunk/reactos/boot/bootdata/hivecls_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls_arm.inf [iso-8859-1] Thu Dec 18 06:26:42 2008 @@ -662,6 +662,7 @@ HKCR,"MIME\Database\Rfc1766","040D",0x00000000,"he;Hebrew" HKCR,"MIME\Database\Rfc1766","0439",0x00000000,"hi;Hindi" HKCR,"MIME\Database\Rfc1766","040E",0x00000000,"hu;Hungarian" +HKCR,"MIME\Database\Rfc1766","042B",0x00000000,"hy;Armenian" HKCR,"MIME\Database\Rfc1766","040F",0x00000000,"is;Icelandic" HKCR,"MIME\Database\Rfc1766","0421",0x00000000,"in;Indonesian" HKCR,"MIME\Database\Rfc1766","0410",0x00000000,"it;Italian (Italy)" Modified: trunk/reactos/boot/bootdata/hivecls_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls_i386.inf [iso-8859-1] Thu Dec 18 06:26:42 2008 @@ -662,6 +662,7 @@ HKCR,"MIME\Database\Rfc1766","040D",0x00000000,"he;Hebrew" HKCR,"MIME\Database\Rfc1766","0439",0x00000000,"hi;Hindi" HKCR,"MIME\Database\Rfc1766","040E",0x00000000,"hu;Hungarian" +HKCR,"MIME\Database\Rfc1766","042B",0x00000000,"hy;Armenian" HKCR,"MIME\Database\Rfc1766","040F",0x00000000,"is;Icelandic" HKCR,"MIME\Database\Rfc1766","0421",0x00000000,"in;Indonesian" HKCR,"MIME\Database\Rfc1766","0410",0x00000000,"it;Italian (Italy)" Modified: trunk/reactos/boot/bootdata/hivesft_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] Thu Dec 18 06:26:42 2008 @@ -178,6 +178,7 @@ "429", "160",\ "2001", "165",\ "3801", "165",\ + "42b", "170",\ "420", "185",\ "439", "190",\ "421", "205",\ Modified: trunk/reactos/boot/bootdata/hivesft_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft_i386.inf [iso-8859-1] Thu Dec 18 06:26:42 2008 @@ -184,6 +184,7 @@ "429", "160",\ "2001", "165",\ "3801", "165",\ + "42b", "170",\ "420", "185",\ "439", "190",\ "421", "205",\ Modified: trunk/reactos/boot/bootdata/hivesys_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] Thu Dec 18 06:26:42 2008 @@ -277,7 +277,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000042b","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5120" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0001042b","Layout File",0x00000000,"kbdarmw.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0001042b","Layout Text",0x00000000,"Armenian Eastern" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0001042b","Layout Text",0x00000000,"Armenian Western" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0001042b","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5121" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000042c","Layout File",0x00000000,"kbdazel.dll" Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Thu Dec 18 06:26:42 2008 @@ -277,7 +277,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000042b","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5120" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0001042b","Layout File",0x00000000,"kbdarmw.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0001042b","Layout Text",0x00000000,"Armenian Eastern" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0001042b","Layout Text",0x00000000,"Armenian Western" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0001042b","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5121" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000042c","Layout File",0x00000000,"kbdazel.dll"

16 years

[dgorbachev] 38167: Add these two old translations: - Armenian (Notepad) by Andranik Haroyan (andranik_haroyan at yahoo), - Thai (Calculator) by Sumath Aowsakulsutthi (punth1 at gmail).

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Thu Dec 18 06:26:33 2008 New Revision: 38167 URL: http://svn.reactos.org/svn/reactos?rev=38167&view=rev Log: Add these two old translations: - Armenian (Notepad) by Andranik Haroyan (andranik_haroyan at yahoo), - Thai (Calculator) by Sumath Aowsakulsutthi (punth1 at gmail). Added: trunk/reactos/base/applications/calc/lang/th-TH.rc (with props) trunk/reactos/base/applications/notepad/lang/hy-AM.rc (with props) Modified: trunk/reactos/base/applications/calc/resource.rc trunk/reactos/base/applications/notepad/rsrc.rc Added: trunk/reactos/base/applications/calc/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/th-TH.rc (added) +++ trunk/reactos/base/applications/calc/lang/th-TH.rc [iso-8859-1] Thu Dec 18 06:26:33 2008 @@ -1,0 +1,699 @@ +/* + * ReactOS Calc (Thai resource file) + * Last modified: 2008-12-18 + */ + +LANGUAGE LANG_THAI, SUBLANG_DEFAULT + +// Dialog + +IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 161 +STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "à¤Ã×èÍ§¤Ô´àÅ¢ ReactOS" +MENU IDR_MENU_SCIENTIFIC_1 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "",IDC_STATIC,4,16,132,21 + CONTROL "ÊÔºË¡",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29,10 + CONTROL "ÊÔº",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29,10 + CONTROL "á»´",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27,10 + CONTROL "ÊÍ§",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24,26,10 + GROUPBOX "",IDC_STATIC,4,36,76,21 + CONTROL "Inv",IDC_CHECK_INV,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,8,44,26,10 + CONTROL "Hyp",IDC_CHECK_HYP,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,40,44,29,10 + CTEXT "",IDC_TEXT_PARENT,84,40,24,17,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + CTEXT "",IDC_TEXT_MEMORY,112,40,24,17,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + PUSHBUTTON "Sta",IDC_BUTTON_STA,4,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Ave",IDC_BUTTON_AVE,4,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Sum",IDC_BUTTON_SUM,4,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "s",IDC_BUTTON_S,4,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Dat",IDC_BUTTON_DAT,4,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "F-E",IDC_BUTTON_FE,38,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "dms",IDC_BUTTON_DMS,38,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "sin",IDC_BUTTON_SIN,38,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "cos",IDC_BUTTON_COS,38,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "tan",IDC_BUTTON_TAN,38,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "(",IDC_BUTTON_LEFTPAR,64,64,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Exp",IDC_BUTTON_EXP,64,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "x^y",IDC_BUTTON_XeY,64,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "x^2",IDC_BUTTON_Xe2,64,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "x^3",IDC_BUTTON_Xe3,64,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON ")",IDC_BUTTON_RIGHTPAR,90,64,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "ln",IDC_BUTTON_LN,90,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "log",IDC_BUTTON_LOG,90,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "n!",IDC_BUTTON_NF,90,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1/x",IDC_BUTTON_RX,90,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MC",IDC_BUTTON_MC,124,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MR",IDC_BUTTON_MR,124,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MS",IDC_BUTTON_MS,124,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "M+",IDC_BUTTON_MP,124,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "pi",IDC_BUTTON_PI,124,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "7",IDC_BUTTON_7,158,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "4",IDC_BUTTON_4,158,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1",IDC_BUTTON_1,158,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "0",IDC_BUTTON_0,158,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "A",IDC_BUTTON_A,158,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "8",IDC_BUTTON_8,184,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "5",IDC_BUTTON_5,184,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "2",IDC_BUTTON_2,184,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+/-",IDC_BUTTON_SIGN,184,121,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "B",IDC_BUTTON_B,184,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "9",IDC_BUTTON_9,210,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "6",IDC_BUTTON_6,210,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "3",IDC_BUTTON_3,210,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON ",",IDC_BUTTON_DOT,210,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "C",IDC_BUTTON_C,210,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "/",IDC_BUTTON_DIV,236,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "*",IDC_BUTTON_MULT,236,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "-",IDC_BUTTON_SUB,236,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+",IDC_BUTTON_ADD,236,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "D",IDC_BUTTON_D,236,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Mod",IDC_BUTTON_MOD,262,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Or",IDC_BUTTON_OR,262,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Lsh",IDC_BUTTON_LSH,262,102,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "=",IDC_BUTTON_EQU,262,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "E",IDC_BUTTON_E,262,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "And",IDC_BUTTON_AND,288,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Xor",IDC_BUTTON_XOR,288,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Not",IDC_BUTTON_NOT,288,102,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Int",IDC_BUTTON_INT,288,121,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "F",IDC_BUTTON_F,288,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + GROUPBOX "",IDC_STATIC,140,16,172,21 + CONTROL "ÊÕèàÇÔÃì´",IDC_RADIO_QWORD,"Button",BS_AUTORADIOBUTTON | + NOT WS_VISIBLE,148,24,37,10 + CONTROL "ÊÍ§àÇÔÃì´",IDC_RADIO_DWORD,"Button",BS_AUTORADIOBUTTON | + NOT WS_VISIBLE,188,24,37,10 + CONTROL "àÇÔÃì´",IDC_RADIO_WORD,"Button",BS_AUTORADIOBUTTON | NOT + WS_VISIBLE,232,24,33,10 + CONTROL "äºµì",IDC_RADIO_BYTE,"Button",BS_AUTORADIOBUTTON | NOT + WS_VISIBLE,272,24,30,10 + CONTROL "Í§ÈÒ",IDC_RADIO_DEG,"Button",BS_AUTORADIOBUTTON,148,24, + 42,10 + CONTROL "àÃà´ÕÂ¹",IDC_RADIO_RAD,"Button",BS_AUTORADIOBUTTON,192, + 24,42,10 + CONTROL "à¡Ãà´ÕÂ¹",IDC_RADIO_GRAD,"Button",BS_AUTORADIOBUTTON, + 236,24,44,10 + PUSHBUTTON "C",IDC_BUTTON_CANC,272,40,40,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "CE",IDC_BUTTON_CE,228,40,40,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "áºç¡Êà»«",IDC_BUTTON_BACK,184,40,40,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + RTEXT "",IDC_TEXT_OUTPUT,4,4,308,12,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + DEFPUSHBUTTON "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE +END + +IDD_DIALOG_STANDARD DIALOGEX 0, 0, 172, 127 +STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Ê¶Ò¹ÀÒ¾·ÑèÇä»" +MENU IDR_MENU_STANDARD +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + PUSHBUTTON "C",IDC_BUTTON_CANC,128,24,40,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "CE",IDC_BUTTON_CE,84,24,40,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "áºç¡Êà»«",IDC_BUTTON_BACK,40,24,40,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + RTEXT "",IDC_TEXT_OUTPUT,4,4,164,12,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + PUSHBUTTON "7",IDC_BUTTON_7,40,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "4",IDC_BUTTON_4,40,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1",IDC_BUTTON_1,40,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "0",IDC_BUTTON_0,40,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "8",IDC_BUTTON_8,66,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "5",IDC_BUTTON_5,66,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "2",IDC_BUTTON_2,66,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+/-",IDC_BUTTON_SIGN,66,105,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "9",IDC_BUTTON_9,92,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "6",IDC_BUTTON_6,92,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "3",IDC_BUTTON_3,92,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON ",",IDC_BUTTON_DOT,92,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "/",IDC_BUTTON_DIV,118,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "*",IDC_BUTTON_MULT,118,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "-",IDC_BUTTON_SUB,118,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+",IDC_BUTTON_ADD,118,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "ÃÒ¡",IDC_BUTTON_SQRT,144,48,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "%",IDC_BUTTON_PERCENT,144,67,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1/x",IDC_BUTTON_RX,144,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "=",IDC_BUTTON_EQU,144,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + CTEXT "",IDC_TEXT_MEMORY,4,24,24,17,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + PUSHBUTTON "MC",IDC_BUTTON_MC,4,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MR",IDC_BUTTON_MR,4,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MS",IDC_BUTTON_MS,4,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "M+",IDC_BUTTON_MP,4,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + DEFPUSHBUTTON "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE +END + +IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 +STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "à¤Ã×èÍ§¤Ô´àÅ¢ ReactOS" +MENU IDR_MENU_STANDARD +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Convert",IDC_BUTTON_CONVERT,35,105,76,17 + COMBOBOX IDC_COMBO_CATEGORY,4,31,140,168,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP | CBS_SORT + LTEXT "Category:",IDC_STATIC,4,20,56,8 + COMBOBOX IDC_COMBO_FROM,4,60,140,168,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP | CBS_SORT + LTEXT "Convert from:",IDC_STATIC,4,49,56,8 + COMBOBOX IDC_COMBO_TO,4,87,140,168,CBS_DROPDOWNLIST | WS_VSCROLL | + WS_TABSTOP | CBS_SORT + LTEXT "Convert to:",IDC_STATIC,4,76,56,8 + CONTROL "C",IDC_BUTTON_CANC,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,276,24,40,17 + CONTROL "CE",IDC_BUTTON_CE,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,232,24,40,17 + CONTROL "áºç¡Êà»«",IDC_BUTTON_BACK,"Button",BS_OWNERDRAW | + BS_CENTER | BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,24, + 40,17 + RTEXT "",IDC_TEXT_OUTPUT,4,4,312,12,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + CONTROL "7",IDC_BUTTON_7,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,48,24,17 + CONTROL "4",IDC_BUTTON_4,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,67,24,17 + CONTROL "1",IDC_BUTTON_1,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,86,24,17 + CONTROL "0",IDC_BUTTON_0,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,105,24,17 + CONTROL "8",IDC_BUTTON_8,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,48,24,17 + CONTROL "5",IDC_BUTTON_5,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,67,24,17 + CONTROL "2",IDC_BUTTON_2,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,86,24,17 + CONTROL "+/-",IDC_BUTTON_SIGN,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,105,24,17 + CONTROL "9",IDC_BUTTON_9,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,48,24,17 + CONTROL "6",IDC_BUTTON_6,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,67,24,17 + CONTROL "3",IDC_BUTTON_3,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,86,24,17 + CONTROL ",",IDC_BUTTON_DOT,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,105,24,17 + CONTROL "/",IDC_BUTTON_DIV,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,48,24,17 + CONTROL "*",IDC_BUTTON_MULT,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,67,24,17 + CONTROL "-",IDC_BUTTON_SUB,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,86,24,17 + CONTROL "+",IDC_BUTTON_ADD,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,105,24,17 + CONTROL "ÃÒ¡",IDC_BUTTON_SQRT,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,48,24,17 + CONTROL "%",IDC_BUTTON_PERCENT,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,67,24,17 + CONTROL "1/x",IDC_BUTTON_RX,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,86,24,17 + CONTROL "=",IDC_BUTTON_EQU,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,105,24,17 + CTEXT "",IDC_TEXT_MEMORY,152,24,24,17,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + CONTROL "MC",IDC_BUTTON_MC,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,48,24,17 + CONTROL "MR",IDC_BUTTON_MR,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,67,24,17 + CONTROL "MS",IDC_BUTTON_MS,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,86,24,17 + CONTROL "M+",IDC_BUTTON_MP,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,105,24,17 + DEFPUSHBUTTON "",IDC_BUTTON_FOCUS,0,0,5,5,NOT WS_VISIBLE +END + +IDD_DIALOG_ABOUT DIALOGEX DISCARDABLE 0, 0, 264, 169 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "à¡ÕèÂÇ¡Ñº ReactOS Calc" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "µ¡Å§",IDOK,105,148,52,16 + CONTROL IDB_BITMAP_ROS,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE | + SS_REALSIZEIMAGE | WS_BORDER,4,4,104,48 + LTEXT "à¤Ã×èÍ§¤Ô´àÅ¢ ReactOS",IDC_STATIC,120,12,132,8, + SS_CENTERIMAGE + LTEXT "ÃØè¹ ",IDC_TEXT_VERSION,120,20,132,8,SS_CENTERIMAGE + LTEXT "Written by Carlo Bramini",IDC_STATIC,120,32,132,8, + SS_CENTERIMAGE + GROUPBOX "",IDC_STATIC,112,0,148,52 + GROUPBOX "",IDC_STATIC,4,56,256,88 + EDITTEXT IDC_EDIT_LICENSE,12,68,240,68,ES_MULTILINE | ES_READONLY | + WS_VSCROLL +END + +IDD_DIALOG_STAT DIALOGEX DISCARDABLE 0, 0, 163, 85 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "¡ÅèÍ§Ê¶Ò¹Ð" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX IDC_LIST_STAT,4,4,156,40,LBS_NOINTEGRALHEIGHT | + WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "RET",IDC_BUTTON_RET,4,48,36,16 + PUSHBUTTON "LOAD",IDC_BUTTON_LOAD,44,48,36,16 + PUSHBUTTON "CD",IDC_BUTTON_CD,84,48,36,16 + PUSHBUTTON "CAD",IDC_BUTTON_CAD,124,48,36,16 + CTEXT "n=0",IDC_TEXT_NITEMS,4,68,156,12,SS_CENTERIMAGE | + SS_SUNKEN +END + +// Menus + +IDR_MENU_SCIENTIFIC_1 MENU DISCARDABLE +BEGIN + POPUP "á&¡éä¢" + BEGIN + MENUITEM "¤Ñ´ÅÍ¡\tCTRL-C", IDM_EDIT_COPY + MENUITEM "ÇÒ§\tCTRL-V", IDM_EDIT_PASTE + END + POPUP "&ÁØÁÁÍ§" + BEGIN + MENUITEM "áººÁÒµÃ°Ò¹", IDM_VIEW_STANDARD, CHECKED + MENUITEM "áººÇÔ·ÂÒÈÒÊµÃì", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "¤ÇÒÁà»ÅÕèÂ¹á»Å§", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "°Ò¹ÊÔºË¡\tF5", IDM_VIEW_HEX, CHECKED + MENUITEM "°Ò¹ÊÔº\tF6", IDM_VIEW_DEC, CHECKED + MENUITEM "°Ò¹á»´\tF7", IDM_VIEW_OCT, CHECKED + MENUITEM "°Ò¹ÊÍ§\tF8", IDM_VIEW_BIN, CHECKED + MENUITEM SEPARATOR + MENUITEM "Í§ÈÒ\tF2", IDM_VIEW_DEG, CHECKED + MENUITEM "àÃà´ÕÂ¹\tF3", IDM_VIEW_RAD, CHECKED + MENUITEM "à¡Ãà´ÕÂ¹\tF4", IDM_VIEW_GRAD, CHECKED + MENUITEM SEPARATOR + MENUITEM "áÊ´§ËÅÑ¡µÑÇàÅ¢", IDM_VIEW_GROUP, CHECKED + END + POPUP "&ªèÇÂàËÅ×Í" + BEGIN + MENUITEM "¢éÍÁÙÅªèÇÂàËÅ×Í", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "à¡ÕèÂÇ¡Ñº ReactOS Calc", IDM_HELP_ABOUT + END +END + +IDR_MENU_SCIENTIFIC_2 MENU DISCARDABLE +BEGIN + POPUP "á&¡éä¢" + BEGIN + MENUITEM "¤Ñ´ÅÍ¡\tCTRL-C", IDM_EDIT_COPY + MENUITEM "ÇÒ§\tCTRL-V", IDM_EDIT_PASTE + END + POPUP "&ÁØÁÁÍ§" + BEGIN + MENUITEM "áººÁÒµÃ°Ò¹", IDM_VIEW_STANDARD, CHECKED + MENUITEM "áººÇÔ·ÂÒÈÒÊµÃì", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "¤ÇÒÁà»ÅÕèÂ¹á»Å§", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "°Ò¹ÊÔºË¡\tF5", IDM_VIEW_HEX, CHECKED + MENUITEM "°Ò¹ÊÔº\tF6", IDM_VIEW_DEC, CHECKED + MENUITEM "°Ò¹á»´\tF7", IDM_VIEW_OCT, CHECKED + MENUITEM "°Ò¹ÊÍ§\tF8", IDM_VIEW_BIN, CHECKED + MENUITEM SEPARATOR + MENUITEM "¤ÇÍ·àÇÔÃì´\tF12", IDM_VIEW_QWORD, CHECKED + MENUITEM "´ÑºàºÔÅàÇÔÃì´\tF2", IDM_VIEW_DWORD, CHECKED + MENUITEM "àÇÔÃì´\tF3", IDM_VIEW_WORD, CHECKED + MENUITEM "äºµì\tF4", IDM_VIEW_BYTE, CHECKED + MENUITEM SEPARATOR + MENUITEM "áÊ´§ËÅÑ¡µÑÇàÅ¢", IDM_VIEW_GROUP, CHECKED + END + POPUP "&ªèÇÂàËÅ×Í" + BEGIN + MENUITEM "¢éÍÁÙÅªèÇÂàËÅ×Í", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "à¡ÕèÂÇ¡Ñº ReactOS Calc", IDM_HELP_ABOUT + END +END + +IDR_MENU_STANDARD MENU DISCARDABLE +BEGIN + POPUP "á&¡éä¢" + BEGIN + MENUITEM "¤Ñ´ÅÍ¡\tCTRL-C", IDM_EDIT_COPY + MENUITEM "ÇÒ§\tCTRL-V", IDM_EDIT_PASTE + END + POPUP "&ÁØÁÁÍ§" + BEGIN + MENUITEM "áººÁÒµÃ°Ò¹", IDM_VIEW_STANDARD, CHECKED + MENUITEM "áººÇÔ·ÂÒÈÒÊµÃì", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "¤ÇÒÁà»ÅÕèÂ¹á»Å§", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "áÊ´§ËÅÑ¡µÑÇàÅ¢", IDM_VIEW_GROUP, CHECKED + END + POPUP "&ªèÇÂàËÅ×Í" + BEGIN + MENUITEM "¢éÍÁÙÅªèÇÂàËÅ×Í", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "à¡ÕèÂÇ¡Ñº ReactOS Calc", IDM_HELP_ABOUT + END +END + +// String Tables + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STRING_LICENSE "ReactOS Calc is free software released under GNU GPL license.\r\n\r\nYou can get a copy of GNU GPL license here:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nYou can also get a translation of GNU GPL license here:\r\nhttp://www.gnu.org/licenses/translations.html" + IDS_MATH_ERROR "¼Ô´¾ÅÒ´" + IDS_QUICKHELP "ÊÔè§¹Õé¤×ÍÍÐäÃ ?" +END + +// types of conversion +STRINGTABLE DISCARDABLE +BEGIN + IDS_CONV_AREA "¾×é¹·Õè" + IDS_CONV_CONSUMPTION "Consumption (engines)" + IDS_CONV_CURRENCY "Currencies" + IDS_CONV_ENERGY "Energy" + IDS_CONV_LENGTH "Lenghts" + IDS_CONV_POWER "Power" + IDS_CONV_PRESSURE "Pressure" + IDS_CONV_TEMPERATURE "Temperature" + IDS_CONV_VELOCITY "Velocity" + IDS_CONV_VOLUME "Volume" + IDS_CONV_WEIGHT "Weights" +END + +// TYPES OF AREAS +STRINGTABLE DISCARDABLE +BEGIN + IDS_AREA_ACRES "Acres" + IDS_AREA_ACRES_BRAZIL "Acres (Brazil)" + IDS_AREA_ACRES_FRANCE "Acres (France)" + IDS_AREA_ACRES_SCOTS "Acres (Scots)" + IDS_AREA_ACRES_US "Acres (US)" + IDS_AREA_ARES "Ares" + IDS_AREA_CHOU "Chou" + IDS_AREA_DANBO "Danbo" + IDS_AREA_HECTARES "Hectares" + IDS_AREA_JEONGBO "Jeongbo" + IDS_AREA_MORGEN_HUNGARY "Morgen (Hungary)" + IDS_AREA_MU "Mu" + IDS_AREA_PING "Ping" + IDS_AREA_PYEONG "Pyeong" + IDS_AREA_PYEONGBANGJA "Pyeongbangja" + IDS_AREA_RAI "Rai" + IDS_AREA_SE "Se" + IDS_AREA_SQUARE_CENTIMETERS "Square centimeters" + IDS_AREA_SQUARE_CHR "Square chr" + IDS_AREA_SQUARE_FATHOMS "Square fathoms" + IDS_AREA_SQUARE_FATHOMS_HUNGARY "Square fathoms (Hungary)" + IDS_AREA_SQUARE_FEET "Square feet" + IDS_AREA_SQUARE_INCHES "Square inches" + IDS_AREA_SQUARE_KILOMETERS "Square kilometers" + IDS_AREA_SQUARE_LAR "Square lar" + IDS_AREA_SQUARE_METER "Square meter" + IDS_AREA_SQUARE_MILES "Square miles" + IDS_AREA_SQUARE_MILLIMETERS "Square millimeters" + IDS_AREA_SQUARE_SHAKU "Square shaku" + IDS_AREA_SQUARE_TSUEN "Square tsuen" + IDS_AREA_SQUARE_VA "Square va" + IDS_AREA_SQUARE_YARD "Square yard" + IDS_AREA_TAN "Tan" + IDS_AREA_TSUBO "Tsubo" +END + +// TYPES OF COMSUMPTIONS +STRINGTABLE DISCARDABLE +BEGIN + IDS_CONSUMPTION_KM_PER_L "Kilometer/liter" + IDS_CONSUMPTION_L_PER_100_KM "Liters/100 kilometers" + IDS_CONSUMPTION_MILES_GALLON_UK "Miles/gallon (UK)" + IDS_CONSUMPTION_MILES_GALLON_US "Miles/gallon (US)" +END + +// TYPES OF CURRENCIES +STRINGTABLE DISCARDABLE +BEGIN + IDS_CURRENCY_AUSTRIAN_SCHILLING "Austrian schilling" + IDS_CURRENCY_BELGIAN_FRANC "Belgian franc" + IDS_CURRENCY_CYPRIOT_POUND "Cypriot pound" + IDS_CURRENCY_DEUTSCHE_MARK "Deutsche Mark" + IDS_CURRENCY_DUTCH_GUILDER "Dutch guilder" + IDS_CURRENCY_EURO "Euro" + IDS_CURRENCY_FINNISH_MARKKA "Finnish markka" + IDS_CURRENCY_FRENCH_FRANC "French franc" + IDS_CURRENCY_GREEK_DRACHMA "Greek Drachma" + IDS_CURRENCY_IRISH_POUND "Irish pound" + IDS_CURRENCY_ITALIAN_LIRA "Italian lira" + IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc" + IDS_CURRENCY_MALTESE_LIRA "Maltese lira" + IDS_CURRENCY_PORTOGUESE_ESCUDO "Portoguese escudo" + IDS_CURRENCY_SLOVENIAN_TOLAR "Slovenian tolar" + IDS_CURRENCY_SPANISH_PESETA "Spanish peseta" +END + +// TYPES OF ENERGIES +STRINGTABLE DISCARDABLE +BEGIN + IDS_ENERGY_15_C_CALORIES "15 ^C calories" + IDS_ENERGY_ERGS "Ergs" + IDS_ENERGY_IT_CALORIES "International Table calories" + IDS_ENERGY_JOULES "Joules" + IDS_ENERGY_KILOJOULES "Kilojoules" + IDS_ENERGY_KILOWATT_HOURS "Kilowatt hours" + IDS_ENERGY_NUTRITION_CALORIES "Nutrition calories" + IDS_ENERGY_TH_CALORIES "Thermochemical calorie" +END + +// TYPES OF LENGTHS +STRINGTABLE DISCARDABLE +BEGIN + IDS_LENGTH_ANGSTROMS "Angstroms" + IDS_LENGTH_ASTRONOMILA_UNITS "Astronomila units" + IDS_LENGTH_BARLEYCORNS "Barleycorns" + IDS_LENGTH_CENTIMETERS "Centimeters" + IDS_LENGTH_CHAINS_UK "Chains (UK)" + IDS_LENGTH_CHI "Chi" + IDS_LENGTH_CHOU "Chou" + IDS_LENGTH_CHR "Chr" + IDS_LENGTH_CUN "Cun" + IDS_LENGTH_FATHOMS "Fathoms" + IDS_LENGTH_FATHOMS_HUNGARY "Fathoms (Hungary)" + IDS_LENGTH_FEET "Feet" + IDS_LENGTH_FURLONGS "Furlongs" + IDS_LENGTH_GAN "Gan" + IDS_LENGTH_HANDS "Hands" + IDS_LENGTH_HUNH "Hunh" + IDS_LENGTH_INCHES "Inches" + IDS_LENGTH_JA "Ja" + IDS_LENGTH_JEONG "Jeong" + IDS_LENGTH_KABIET "Kabiet" + IDS_LENGTH_KEN "Ken" + IDS_LENGTH_KEUB "Keub" + IDS_LENGTH_KILOMETERS "Kilometers" + IDS_LENGTH_LAR "Lar" + IDS_LENGTH_LIGHT_YEARS "Light years" + IDS_LENGTH_LINKS_UK "Links (UK)" + IDS_LENGTH_METERS "Meters" + IDS_LENGTH_MILES "Miles" + IDS_LENGTH_MILLIMETERS "Millimeters" + IDS_LENGTH_NAUTICAL_MILES "Nautical miles" + IDS_LENGTH_NIEU "Nieu" + IDS_LENGTH_PARSECS "Parsecs" + IDS_LENGTH_PICAS "Picas" + IDS_LENGTH_RI_JAPAN "Ri (Japan)" + IDS_LENGTH_RI_KOREA "Ri (Korea)" + IDS_LENGTH_SAWK "Sawk" + IDS_LENGTH_SEN "Sen" + IDS_LENGTH_SHAKU "Shaku" + IDS_LENGTH_SPAN "Span" + IDS_LENGTH_SUN "Sun" + IDS_LENGTH_TSUEN "Tsuen" + IDS_LENGTH_VA "Va" + IDS_LENGTH_YARDS "Yards" + IDS_LENGTH_YOTE "Yote" + IDS_LENGTH_ZHANG "Zhang" +END + +// TYPES OF POWERS +STRINGTABLE DISCARDABLE +BEGIN + IDS_POWER_HORSEPOWER "Horsepower" + IDS_POWER_KILOWATTS "Kilowatts" + IDS_POWER_MEGAWATTS "Megawatts" + IDS_POWER_WATTS "Watts" +END + +// TYPE OF PRESSURES +STRINGTABLE DISCARDABLE +BEGIN + IDS_PRESSURE_ATMOSPHERES "Atmospheres" + IDS_PRESSURE_BARS "Bars" + IDS_PRESSURE_MM_OF_MERCURY "Millimeters of mercury" + IDS_PRESSURE_PASCALS "Pascals" + IDS_PRESSURE_PSI "Pounds-force per square inch" +END + +// TYPES OF TEMPERATURES +STRINGTABLE DISCARDABLE +BEGIN + IDS_TEMPERATURE_CELSIUS "Celsius" + IDS_TEMPERATURE_FAHRENHEIT "Fahrenheit" + IDS_TEMPERATURE_KELVIN "Kelvin" + IDS_TEMPERATURE_RANKINE "Rankine" +END + +// TYPES OF VELOCITIES +STRINGTABLE DISCARDABLE +BEGIN + IDS_VELOCITY_FEET_HOUR "Feet/hour" + IDS_VELOCITY_KILOMETERS_HOUR "Kilometers/hour" + IDS_VELOCITY_KNOTS "Knots" + IDS_VELOCITY_MACH "Mach" + IDS_VELOCITY_METERS_SECOND "Meters/second" + IDS_VELOCITY_MILES_HOUR "Miles/hour" +END + +// TYPES OF VOLUMES +STRINGTABLE DISCARDABLE +BEGIN + IDS_VOLUME_BARRELS_UK "Barrels (UK)" + IDS_VOLUME_BARRELS_OIL "Barrels oil" + IDS_VOLUME_BUN "Bun" + IDS_VOLUME_BUSHELS_UK "Bushels (UK)" + IDS_VOLUME_BUSHELS_US "Bushels (US)" + IDS_VOLUME_CUBIC_CENTIMETERS "Cubic centimeters" + IDS_VOLUME_CUBIC_FEET "Cubic feet" + IDS_VOLUME_CUBIC_INCHES "Cubic inches" + IDS_VOLUME_CUBIC_METERS "Cubic meters" + IDS_VOLUME_CUBIC_YARDS "Cubic yards" + IDS_VOLUME_DOE "Doe" + IDS_VOLUME_FLUID_OUNCES_UK "Fluid ounces (UK)" + IDS_VOLUME_FLUID_OUNCES_US "Fluid ounces (US)" + IDS_VOLUME_GALLONS_UK "Gallons (UK)" + IDS_VOLUME_GALLONS_DRY_US "Gallons, dry (US)" + IDS_VOLUME_GALLONS_LIQUID_US "Gallons, liquid (US)" + IDS_VOLUME_GOU "Gou" + IDS_VOLUME_HOP "Hop" + IDS_VOLUME_ICCE "Icce" + IDS_VOLUME_KWIAN "Kwian" + IDS_VOLUME_LITERS "Liters" + IDS_VOLUME_MAL "Mal" + IDS_VOLUME_MILLILITERS "Milliliters" + IDS_VOLUME_PINTS_UK "Pints (UK)" + IDS_VOLUME_PINTS_DRY_US "Pints, dry (US)" + IDS_VOLUME_PINTS_LIQUID_US "Pints, liquid (US)" + IDS_VOLUME_QUARTS_UK "Quarts (UK)" + IDS_VOLUME_QUARTS_DRY_US "Quarts, dry (US)" + IDS_VOLUME_QUARTS_LIQUID_US "Quarts, liquid (US)" + IDS_VOLUME_SEKI "Seki" + IDS_VOLUME_SYOU "Syou" + IDS_VOLUME_TANANLOUNG "Tananloung" + IDS_VOLUME_TANG "Tang" + IDS_VOLUME_TO "To" +END + +// TYPES OF WEIGHTS +STRINGTABLE DISCARDABLE +BEGIN + IDS_WEIGHT_BAHT "Baht" + IDS_WEIGHT_CARATS "Carats" + IDS_WEIGHT_CHUNG "Chung" + IDS_WEIGHT_DON "Don" + IDS_WEIGHT_GEUN "Geun" + IDS_WEIGHT_GRAMS "Grams" + IDS_WEIGHT_GWAN "Gwan" + IDS_WEIGHT_HARB "Harb" + IDS_WEIGHT_JIN_CHINA "Jin (China)" + IDS_WEIGHT_JIN_TAIWAN "Jin (Taiwan)" + IDS_WEIGHT_KAN "Kan" + IDS_WEIGHT_KILOGRAMS "Kilograms" + IDS_WEIGHT_KIN "Kin" + IDS_WEIGHT_LIANG_CHINA "Liang (China)" + IDS_WEIGHT_LIANG_TAIWAN "Liang (Taiwan)" + IDS_WEIGHT_MONME "Monme" + IDS_WEIGHT_OUNCES_AVOIRDUPOIS "Ounces, avoirdupois" + IDS_WEIGHT_OUNCES_TROY "Ounces, troy" + IDS_WEIGHT_POUNDS "Pounds" + IDS_WEIGHT_QUINTAL_METRIC "Quintal (metric)" + IDS_WEIGHT_SALOUNG "Saloung" + IDS_WEIGHT_STONES "Stones" + IDS_WEIGHT_TAMLUNG "Tamlung" + IDS_WEIGHT_TONNES "Tonnes" + IDS_WEIGHT_TONS_UK "Tons (UK)" + IDS_WEIGHT_TONS_US "Tons (US)" +END Propchange: trunk/reactos/base/applications/calc/lang/th-TH.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/calc/resource.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/res… ============================================================================== --- trunk/reactos/base/applications/calc/resource.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/resource.rc [iso-8859-1] Thu Dec 18 06:26:33 2008 @@ -40,16 +40,17 @@ IDB_BITMAP_ROS BITMAP DISCARDABLE "res/ROS_logo.bmp" -#include "lang/en-US.rc" #include "lang/bg-BG.rc" #include "lang/cs-CZ.rc" #include "lang/de-DE.rc" +#include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/it-IT.rc" #include "lang/ko-KR.rc" +#include "lang/nl-NL.rc" #include "lang/no-NO.rc" -#include "lang/nl-NL.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" +#include "lang/th-TH.rc" #include "lang/uk-UA.rc" Added: trunk/reactos/base/applications/notepad/lang/hy-AM.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/hy-AM.rc (added) +++ trunk/reactos/base/applications/notepad/lang/hy-AM.rc [iso-8859-1] Thu Dec 18 06:26:33 2008 @@ -1,0 +1,190 @@ +/* + * Notepad (Armenian resources) + */ + +#pragma code_page(65001) /* Unicode only */ + +LANGUAGE LANG_ARMENIAN, SUBLANG_DEFAULT + +ID_ACCEL ACCELERATORS +BEGIN + "^A", CMD_SELECT_ALL + "^C", CMD_COPY + "^F", CMD_SEARCH + "^G", CMD_GOTO + "H", CMD_REPLACE, VIRTKEY, CONTROL + "^O", CMD_OPEN + "^S", CMD_SAVE + "^V", CMD_PASTE + "^X", CMD_CUT + "^Z", CMD_UNDO + VK_F3, CMD_SEARCH_NEXT, VIRTKEY + VK_F5, CMD_TIME_DATE, VIRTKEY +END + +MAIN_MENU MENU +BEGIN + POPUP "&ÕÕ¡ÕµÕ¬" + BEGIN + MENUITEM "&ÕÕ¿Õ¥Õ²Õ®Õ¥Õ¬", CMD_NEW + MENUITEM "&Ô²Õ¡ÖÕ¥Õ¬...", CMD_OPEN + MENUITEM "&ÕÕ¡Õ°ÕºÕ¡Õ¶Õ¥Õ¬", CMD_SAVE + MENUITEM "ÕÕ¡Õ°ÕºÕ¡Õ¶Õ¥Õ¬ &Õ«Õ¶Õ¹ÕºÕ¥Õ½...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "Ô·Õ»Õ«& ÕºÕ¡ÖÕ¡Õ´Õ¥Õ¿ÖÕ¥ÖÕ¨...", CMD_PAGE_SETUP + MENUITEM "&ÕÕºÕ¥Õ¬", CMD_PRINT + MENUITEM "&ÕÕºÕ«Õ¹Õ« Õ¯Õ¡ÖÕ£Õ¡Õ¾Õ¸ÖÕ¸ÖÕ´...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "Ôµ&Õ¬Ö", CMD_EXIT + END + POPUP "&Ô½Õ´Õ¢Õ¡Õ£ÖÕ¥Õ¬" + BEGIN + MENUITEM "&ÕÕ¥ÖÕªÕ¥Õ¬\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "&Ô¿Õ¿ÖÕ¥Õ¬\tCtrl+X", CMD_CUT + MENUITEM "&ÕÕ¡Õ¿Õ¹Õ³Õ¥Õ¶Õ¡Õ°Õ¡Õ¶Õ¥Õ¬\tCtrl+C", CMD_COPY + MENUITEM "ÕÕ¥Õ²Õ¡&Õ¤ÖÕ¥Õ¬\tCtrl+V", CMD_PASTE + MENUITEM "&ÕÕ¶Õ»Õ¥Õ¬\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "&Ô³Õ¿Õ¶Õ¥Õ¬", CMD_SEARCH + MENUITEM "Ô³Õ¿Õ¶Õ¥Õ¬ &Õ°Õ¡Õ»Õ¸ÖÕ¤Õ¨\tF3", CMD_SEARCH_NEXT + MENUITEM "ÕÕ¸ÕÕ¡ÖÕ«Õ¶Õ¥Õ¬\tCtrl+H", CMD_REPLACE + MENUITEM "ÕÕ¥Õ²Õ¡ÖÕ¸ÕÕ¾Õ¥Õ¬...\tCtrl+G", CMD_GOTO + MENUITEM SEPARATOR + MENUITEM "ÕÕ·Õ¥Õ¬ Õ¢Õ¥Õ¬Õ¥ÖÕ¨", CMD_SELECT_ALL + MENUITEM "ÔºÕ¡Õ´Õ¨& Ö Õ¡Õ´Õ½Õ¡Õ©Õ«Õ¾Õ¨\tF5", CMD_TIME_DATE + END + POPUP "ÕÕ¸Ö&Õ´Õ¡Õ¿Õ¡Õ¾Õ¸ÖÕ¸ÖÕ´" + BEGIN + MENUITEM "&ÕÕ¸Õ²Õ¡Õ¤Õ¡ÖÕ± Õ¢Õ¡Õ¼Õ¥ÖÕ¸Õ¾", CMD_WRAP + MENUITEM "&ÕÕ¡Õ¼Õ¡Õ¿Õ¥Õ½Õ¡Õ¯...", CMD_FONT + END + POPUP "&ÕÕ¥Õ½Ö" + BEGIN + MENUITEM "ÕÕ«Õ³Õ¡Õ¯Õ« &Õ¿Õ¥Õ²Õ¥Õ¯Õ¸ÖÕ©ÕµÕ¸ÖÕ¶", CMD_STATUSBAR + END + POPUP "ÕÕ¥Õ²Õ¥&Õ¯Õ¸ÖÕ©ÕµÕ¸ÖÕ¶" + BEGIN + MENUITEM "&Ô²Õ¸Õ¾Õ¡Õ¶Õ¤Õ¡Õ¯Õ¸ÖÕ©ÕµÕ¸ÖÕ¶", CMD_HELP_CONTENTS + MENUITEM "&ÕÕ¶Õ¿ÖÕ¥Õ¬...", CMD_HELP_SEARCH + MENUITEM "&ÕÕ£Õ¶Õ¸ÖÕ©ÕµÕ¸Õ¶ ÖÕ£Õ¿Õ¡Õ£Õ¸ÖÕ®Õ¸ÖÕ´", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "&Ô¾ÖÕ¡Õ£ÖÕ« Õ´Õ¡Õ½Õ«Õ¶" CMD_ABOUT + MENUITEM "&ÕÕ¥Õ²Õ¥Õ¯Õ¸ÖÕ©ÕµÕ¸ÖÕ¶...", CMD_ABOUT_WINE + END +END + +/* Dialog `Page setup' */ + +DIALOG_PAGESETUP DIALOGEX 0, 0, 225, 95 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Ô·Õ»Õ« ÕºÕ¡ÖÕ¡Õ´Õ¥Õ¿ÖÕ¥ÖÕ¨" +BEGIN +LTEXT "ÕÕ¥ÖÕ¥Õ¾Õ«Ö Õ½Õ¡Õ°Õ´Õ¡Õ¶Õ¡ÖÕ¡Õ¯Õ¸ÖÕ´:", 0x140, 10, 07, 40, 15 +EDITTEXT 0x141, 60, 05, 110, 12, WS_BORDER | WS_TABSTOP +LTEXT "ÕÕ¥ÖÖÖÕ«Ö Õ½Õ¡Õ°Õ´Õ¡Õ¶Õ¡ÖÕ¡Õ¯Õ¸ÖÕ´:", 0x142, 10, 24, 40, 15 +EDITTEXT 0x143, 60, 22, 110, 12, WS_BORDER | WS_TABSTOP + +GROUPBOX "Ô´Õ¡Õ®Õ¿Õ¥Ö:", 0x144, 10, 43,160, 45 +LTEXT "&ÕÕ¡Õ:", 0x145, 20, 55, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "&ÕÕ¸ÖÖÕ«:", 0x148, 20, 73, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "&Ô±Õ»:", 0x14B, 100, 55, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "&ÕÕ¥ÖÖÖÕ«:", 0x14E, 100, 73, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP + +DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP +PUSHBUTTON "ÕÕ¶Õ¤Õ¸ÖÕ¶Õ¥Õ¬", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP +PUSHBUTTON "&ÕÕ¥Õ²Õ¥Õ¯Õ¸ÖÕ©ÕµÕ¸ÖÕ¶", IDHELP, 180, 39, 40, 15, WS_TABSTOP +END + +/* Dialog `Encoding' */ +DIALOG_ENCODING DIALOGEX 0, 0, 256, 44 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | + WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "ÕÕ«Õ´Õ¾Õ¸Õ¬Õ¶Õ¥ÖÕ« Õ¯Õ¸Õ¤Õ¡Õ¾Õ¸ÖÕ¸ÖÕ´" +BEGIN +COMBOBOX ID_ENCODING,54,0,156,80,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP +LTEXT "Ô¿Õ¸Õ¤Õ¡Õ¾Õ¸ÖÕ¸ÖÕ´:",0x155,5,2,41,12 +COMBOBOX ID_EOLN,54,18,156,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +LTEXT "ÕÕ¡ÖÕ¢Õ¥ÖÕ¡Õ¯Õ¶Õ¥Ö:",0x156,5,20,41,12 +END + +/* Dialog 'Go To' */ +DIALOG_GOTO DIALOGEX 0,0,165,50 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Ô±Õ¶ÖÕ¶Õ¥Õ¬ Õ¿Õ¸Õ²..." +BEGIN +EDITTEXT ID_LINENUMBER,54,10,106,12,WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "ÕÕ¸Õ²Õ« Õ°Õ¡Õ´Õ¡ÖÕ¨:",0x155,5,12,41,12,WS_CHILD | WS_TABSTOP | ES_NUMBER +DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP +PUSHBUTTON "ÕÕ¶Õ¤Õ¸ÖÕ¶Õ¥Õ¬", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP +END + +IDD_ABOUTBOX DIALOGEX DISCARDABLE 22,16,284,170 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "About ReactOS Notepad" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch>\r\nCopyright 2000 Mike McCormack <Mike_McCormack(a)looksmart.com.au>\r\nCopyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr>\r\nCopyright 2002 Andriy Palamarchuk\r\n", + -1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,46,7,232,39 + CONTROL " ", + -1,"Static",0x50000000,8,48,272,11 + DEFPUSHBUTTON "Ô¾Õ¡Õ®Õ¯Õ¥Õ¬",IDOK,114,149,44,15,WS_GROUP + ICON IDI_NPICON,-1,12,9,20,30 + EDITTEXT IDC_LICENSE,8,64,272,81,ES_MULTILINE | + ES_READONLY | WS_VSCROLL +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_LICENSE, "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." +END + +STRINGTABLE DISCARDABLE +BEGIN +STRING_PAGESETUP_HEADERVALUE, "&n" /* FIXME */ +STRING_PAGESETUP_FOOTERVALUE, "Ô·Õ» &s" /* FIXME */ +STRING_PAGESETUP_LEFTVALUE, "20 mm" /* FIXME */ +STRING_PAGESETUP_RIGHTVALUE, "20 mm" /* FIXME */ +STRING_PAGESETUP_TOPVALUE, "25 mm" /* FIXME */ +STRING_PAGESETUP_BOTTOMVALUE, "25 mm" /* FIXME */ + +STRING_NOTEPAD, "Ô²Õ¬Õ¸Õ¯Õ¶Õ¸Õ¿" +STRING_ERROR, "ÕÔ½Ô±Ô¼" +STRING_WARNING, "ÕÔ»ÕÔ±Ô´ÕÕÕÔ¹ÕÕÕÕ" +STRING_INFO, "ÕÕ¸Õ²Õ¥Õ¯Õ¸ÖÕ©ÕµÕ¸ÖÕ¶" + +STRING_UNTITLED, "(Ô±Õ¼Õ¡Õ¶Ö Õ¾Õ¥ÖÕ¶Õ¡Õ£ÖÕ«)" + +STRING_ALL_FILES, "Ô²Õ¸Õ¬Õ¸Ö ÖÕ¡ÕµÕ¬Õ¥ÖÕ¨ (*.*)" +STRING_TEXT_FILES_TXT, "ÕÕ¥ÖÕ½Õ¿Õ¡ÕµÕ«Õ¶ ÖÕ¡ÕµÕ¬Õ¥ÖÕ¨ (*.txt)" + +STRING_TOOLARGE, "ÕÕ¡ÕµÕ¬Õ¨ '%s' Õ¢Õ¡Õ¾Õ¡Õ¯Õ¡Õ¶Õ«Õ¶ Õ´Õ¥Õ® Õ§ Õ¢Õ¬Õ¸Õ¯Õ¶Õ¸Õ¿Õ« Õ°Õ¡Õ´Õ¡Ö. \n \ +Please use a different editor." +STRING_NOTEXT, "Ô´Õ¸ÖÖ Õ¿Õ¥ÖÕ½Õ¿ Õ¹Õ¥Ö Õ¶Õ¥ÖÕ´Õ¸ÖÕ®Õ¥Õ¬ \ +\nPlease type something and try again" +STRING_DOESNOTEXIST, "ÕÕ¡ÕµÕ¬Õ¨ '%s'\n Õ£Õ¸ÕµÕ¸ÖÕ©Õ¶Õ¸ÖÕ¶ Õ¹Õ¸ÖÕ¶Õ«\n\n \ +Do you want to create a new file ?" +STRING_NOTSAVED, "ÕÕ¡ÕµÕ¬Õ¨ '%s'\n Õ¥Õ¶Õ©Õ¡ÖÕ¯Õ¾Õ¥Õ¬ Õ§ ÖÕ¸ÖÕ¸ÕÕ´Õ¡Õ¶\n\n \ +Would you like to save the changes ?" +STRING_NOTFOUND, "'%s' Õ¹Õ« Õ£Õ¿Õ¶Õ¾Õ¥Õ¬." +STRING_OUT_OF_MEMORY, "Ô¿Õ¡ Õ°Õ«Õ®Õ¸Õ²Õ¸ÖÕ©ÕµÕ¸Õ¶ Õ¡Õ¶Õ¢Õ¡Õ¾Õ¡ÖÕ¡ÖÕ¾Õ¡ÕÕ¸ÖÕµÕ¸ÖÕ¶. \ +\nÕÕ¡Õ¯Õ¥Ö Õ´Õ« Õ¯Õ¡Õ´ Õ´Õ« ÖÕ¡Õ¶Õ« Õ®ÖÕ¡Õ£Õ«Ö." +STRING_CANNOTFIND "ÕÕ« Õ£Õ¿Õ¶Õ¾Õ¥Õ¬ '%s'" +STRING_ANSI, "ANSI" +STRING_UNICODE, "ÕÕ¸ÖÕ¶Õ«Õ¯Õ¸Õ¤" +STRING_UNICODE_BE, "ÕÕ¸ÖÕ¶Õ«Õ¯Õ¸Õ¤ (big endian)" +STRING_UTF8, "UTF-8" +STRING_CRLF, "ÕÕ¡Õ¿ÖÕ¸Õ°Õ¡Õ¶Õ¶Õ¥Ö" +STRING_LF, "ÕÕ¸ÖÕ¶Õ«ÖÕ½" +STRING_CR, "ÕÕ¡Õ¯Õ«Õ¶Õ¿Õ¸Õ·" +STRING_LINE_COLUMN, "Line %d, column %d" +END + +#pragma code_page(default) Propchange: trunk/reactos/base/applications/notepad/lang/hy-AM.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/notepad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/rsrc.rc [iso-8859-1] Thu Dec 18 06:26:33 2008 @@ -45,12 +45,13 @@ #include "lang/fi-FI.rc" #include "lang/fr-FR.rc" #include "lang/hu-HU.rc" +#include "lang/hy-AM.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" #include "lang/ja-JP.rc" #include "lang/lt-LT.rc" +#include "lang/nl-NL.rc" #include "lang/no-NO.rc" -#include "lang/nl-NL.rc" #include "lang/pl-PL.rc" #include "lang/pt-PT.rc" #include "lang/ru-RU.rc"

16 years

[janderwald] 38166: - Add GUID_DEVCLASS_SOUND

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Dec 18 03:16:13 2008 New Revision: 38166 URL: http://svn.reactos.org/svn/reactos?rev=38166&view=rev Log: - Add GUID_DEVCLASS_SOUND Modified: trunk/reactos/include/psdk/devguid.h Modified: trunk/reactos/include/psdk/devguid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/devguid.h?rev… ============================================================================== --- trunk/reactos/include/psdk/devguid.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/devguid.h [iso-8859-1] Thu Dec 18 03:16:13 2008 @@ -25,3 +25,4 @@ DEFINE_GUID(GUID_DEVCLASS_NETSERVICE, 0x4D36E974, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); DEFINE_GUID(GUID_DEVCLASS_NETTRANS, 0x4D36E975, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); DEFINE_GUID(GUID_DEVCLASS_DISKDRIVE, 0x4D36E967, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); +DEFINE_GUID(GUID_DEVCLASS_SOUND, 0x4d36e97C, 0xe325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18);

16 years

[cwittich] 38165: fix some crashes

by cwittich＠svn.reactos.org

Author: cwittich Date: Thu Dec 18 02:25:33 2008 New Revision: 38165 URL: http://svn.reactos.org/svn/reactos?rev=38165&view=rev Log: fix some crashes Modified: trunk/tools/sysreg2/raddr2line.c Modified: trunk/tools/sysreg2/raddr2line.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/raddr2line.c?rev=381… ============================================================================== --- trunk/tools/sysreg2/raddr2line.c [iso-8859-1] (original) +++ trunk/tools/sysreg2/raddr2line.c [iso-8859-1] Thu Dec 18 02:25:33 2008 @@ -42,7 +42,7 @@ char PkgData[80]; char emptystr[] = ""; - if ((strchr(Data, '>')) && (!strchr(Data, ')'))) + if ((strstr(Data, ":>")) && (!strchr(Data, ')'))) { sep = strchr(Data, ':'); if (sep) @@ -57,7 +57,7 @@ } sep = strchr(Data, '+'); - if ((sep) && strchr(Data, ':')) + if ((sep) && strstr(Data, ":\\")) { sep2 = strchr(Data + (sep - Data), ' '); strncpy(Addr, Data + (sep - Data + 1), (int) (sep2 - sep) - 1);

16 years

← Newer
1
...
30
31
32
33
34
35
36
...
71
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 December 2008