Ros-diffs January 2015

ros-diffs@reactos.org

17 participants
207 discussions

[akhaldi] 66005: [NOTEPAD] Fix some comment typos. Tabs => Spaces. Apply consistent formatting. No code changes.
by akhaldi＠svn.reactos.org 08 Jan '15

08 Jan '15

Author: akhaldi Date: Thu Jan 8 13:20:02 2015 New Revision: 66005 URL: http://svn.reactos.org/svn/reactos?rev=66005&view=rev Log: [NOTEPAD] Fix some comment typos. Tabs => Spaces. Apply consistent formatting. No code changes. Modified: trunk/reactos/base/applications/notepad/dialog.c trunk/reactos/base/applications/notepad/license.c trunk/reactos/base/applications/notepad/main.c trunk/reactos/base/applications/notepad/main.h trunk/reactos/base/applications/notepad/settings.c trunk/reactos/base/applications/notepad/text.c Modified: trunk/reactos/base/applications/notepad/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/dialog.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/dialog.c [iso-8859-1] Thu Jan 8 13:20:02 2015 @@ -28,17 +28,17 @@ LRESULT CALLBACK EDIT_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); -static const TCHAR helpfile[] = _T("notepad.hlp"); -static const TCHAR empty_str[] = _T(""); +static const TCHAR helpfile[] = _T("notepad.hlp"); +static const TCHAR empty_str[] = _T(""); static const TCHAR szDefaultExt[] = _T("txt"); -static const TCHAR txt_files[] = _T("*.txt"); +static const TCHAR txt_files[] = _T("*.txt"); static INT_PTR WINAPI DIALOG_PAGESETUP_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam); #ifndef UNICODE static LPSTR ConvertToASCII(LPSTR pszText) { - int sz; + int sz; LPWSTR pszTextW = (LPWSTR)pszText; /* default return value */ @@ -67,7 +67,7 @@ static LPWSTR ConvertToUNICODE(LPSTR pszText, DWORD *pdwSize) { - int sz; + int sz; LPWSTR pszTextW = NULL; do { @@ -77,7 +77,7 @@ break; /* get space for UNICODE buffer */ - pszTextW = HeapAlloc(GetProcessHeap(), 0, sz*sizeof(WCHAR)); + pszTextW = HeapAlloc(GetProcessHeap(), 0, sz * sizeof(WCHAR)); if (pszText == NULL) break; @@ -105,10 +105,15 @@ TCHAR szTitle[MAX_STRING_LEN]; LoadString(Globals.hInstance, STRING_ERROR, szTitle, SIZEOF(szTitle)); - FormatMessage( - FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, - NULL, error, 0, - (LPTSTR) &lpMsgBuf, 0, NULL); + + FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, + NULL, + error, + 0, + (LPTSTR) &lpMsgBuf, + 0, + NULL); + MessageBox(NULL, lpMsgBuf, szTitle, MB_OK | MB_ICONERROR); LocalFree(lpMsgBuf); } @@ -121,58 +126,58 @@ */ static void UpdateWindowCaption(void) { - TCHAR szCaption[MAX_STRING_LEN]; - TCHAR szNotepad[MAX_STRING_LEN]; - - LoadString(Globals.hInstance, STRING_NOTEPAD, szNotepad, SIZEOF(szNotepad)); - - if (Globals.szFileTitle[0] != 0) - { - StringCchCopy(szCaption, SIZEOF(szCaption), Globals.szFileTitle); - } - else - { - LoadString(Globals.hInstance, STRING_UNTITLED, szCaption, SIZEOF(szCaption)); - } - - StringCchCat(szCaption, SIZEOF(szCaption), _T(" - ")); - StringCchCat(szCaption, SIZEOF(szCaption), szNotepad); - SetWindowText(Globals.hMainWnd, szCaption); + TCHAR szCaption[MAX_STRING_LEN]; + TCHAR szNotepad[MAX_STRING_LEN]; + + LoadString(Globals.hInstance, STRING_NOTEPAD, szNotepad, SIZEOF(szNotepad)); + + if (Globals.szFileTitle[0] != 0) + { + StringCchCopy(szCaption, SIZEOF(szCaption), Globals.szFileTitle); + } + else + { + LoadString(Globals.hInstance, STRING_UNTITLED, szCaption, SIZEOF(szCaption)); + } + + StringCchCat(szCaption, SIZEOF(szCaption), _T(" - ")); + StringCchCat(szCaption, SIZEOF(szCaption), szNotepad); + SetWindowText(Globals.hMainWnd, szCaption); } static void AlertFileNotFound(LPCTSTR szFileName) { - TCHAR szMessage[MAX_STRING_LEN]; - TCHAR szResource[MAX_STRING_LEN]; - - /* Load and format szMessage */ - LoadString(Globals.hInstance, STRING_NOTFOUND, szResource, SIZEOF(szResource)); - wsprintf(szMessage, szResource, szFileName); - - /* Load szCaption */ - LoadString(Globals.hInstance, STRING_NOTEPAD, szResource, SIZEOF(szResource)); - - /* Display Modal Dialog */ - MessageBox(Globals.hMainWnd, szMessage, szResource, MB_ICONEXCLAMATION); + TCHAR szMessage[MAX_STRING_LEN]; + TCHAR szResource[MAX_STRING_LEN]; + + /* Load and format szMessage */ + LoadString(Globals.hInstance, STRING_NOTFOUND, szResource, SIZEOF(szResource)); + wsprintf(szMessage, szResource, szFileName); + + /* Load szCaption */ + LoadString(Globals.hInstance, STRING_NOTEPAD, szResource, SIZEOF(szResource)); + + /* Display Modal Dialog */ + MessageBox(Globals.hMainWnd, szMessage, szResource, MB_ICONEXCLAMATION); } static int AlertFileNotSaved(LPCTSTR szFileName) { - TCHAR szMessage[MAX_STRING_LEN]; - TCHAR szResource[MAX_STRING_LEN]; - TCHAR szUntitled[MAX_STRING_LEN]; - - LoadString(Globals.hInstance, STRING_UNTITLED, szUntitled, SIZEOF(szUntitled)); - - /* Load and format Message */ - LoadString(Globals.hInstance, STRING_NOTSAVED, szResource, SIZEOF(szResource)); - wsprintf(szMessage, szResource, szFileName[0] ? szFileName : szUntitled); - - /* Load Caption */ - LoadString(Globals.hInstance, STRING_NOTEPAD, szResource, SIZEOF(szResource)); - - /* Display modal */ - return MessageBox(Globals.hMainWnd, szMessage, szResource, MB_ICONEXCLAMATION|MB_YESNOCANCEL); + TCHAR szMessage[MAX_STRING_LEN]; + TCHAR szResource[MAX_STRING_LEN]; + TCHAR szUntitled[MAX_STRING_LEN]; + + LoadString(Globals.hInstance, STRING_UNTITLED, szUntitled, SIZEOF(szUntitled)); + + /* Load and format Message */ + LoadString(Globals.hInstance, STRING_NOTSAVED, szResource, SIZEOF(szResource)); + wsprintf(szMessage, szResource, szFileName[0] ? szFileName : szUntitled); + + /* Load Caption */ + LoadString(Globals.hInstance, STRING_NOTEPAD, szResource, SIZEOF(szResource)); + + /* Display modal */ + return MessageBox(Globals.hMainWnd, szMessage, szResource, MB_ICONEXCLAMATION|MB_YESNOCANCEL); } /** @@ -182,13 +187,13 @@ */ BOOL FileExists(LPCTSTR szFilename) { - WIN32_FIND_DATA entry; - HANDLE hFile; - - hFile = FindFirstFile(szFilename, &entry); - FindClose(hFile); - - return (hFile != INVALID_HANDLE_VALUE); + WIN32_FIND_DATA entry; + HANDLE hFile; + + hFile = FindFirstFile(szFilename, &entry); + FindClose(hFile); + + return (hFile != INVALID_HANDLE_VALUE); } BOOL HasFileExtension(LPCTSTR szFilename) @@ -378,17 +383,15 @@ else _tcscpy(szPath, Globals.szFileName); - openfilename.lStructSize = sizeof(openfilename); - openfilename.hwndOwner = Globals.hMainWnd; - openfilename.hInstance = Globals.hInstance; - openfilename.lpstrFilter = Globals.szFilter; - openfilename.lpstrFile = szPath; - openfilename.nMaxFile = SIZEOF(szPath); - openfilename.lpstrInitialDir = szDir; - openfilename.Flags = OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | - OFN_HIDEREADONLY; - openfilename.lpstrDefExt = szDefaultExt; - + openfilename.lStructSize = sizeof(openfilename); + openfilename.hwndOwner = Globals.hMainWnd; + openfilename.hInstance = Globals.hInstance; + openfilename.lpstrFilter = Globals.szFilter; + openfilename.lpstrFile = szPath; + openfilename.nMaxFile = SIZEOF(szPath); + openfilename.lpstrInitialDir = szDir; + openfilename.Flags = OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY; + openfilename.lpstrDefExt = szDefaultExt; if (GetOpenFileName(&openfilename)) { if (FileExists(openfilename.lpstrFile)) @@ -398,7 +401,6 @@ } } - BOOL DIALOG_FileSave(VOID) { if (Globals.szFileName[0] == 0) @@ -407,7 +409,9 @@ return DoSaveFile(); } -static UINT_PTR CALLBACK DIALOG_FileSaveAs_Hook(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) +static UINT_PTR +CALLBACK +DIALOG_FileSaveAs_Hook(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) { TCHAR szText[128]; HWND hCombo; @@ -477,24 +481,24 @@ else _tcscpy(szPath, Globals.szFileName); - saveas.lStructSize = sizeof(OPENFILENAME); - saveas.hwndOwner = Globals.hMainWnd; - saveas.hInstance = Globals.hInstance; - saveas.lpstrFilter = Globals.szFilter; - saveas.lpstrFile = szPath; - saveas.nMaxFile = SIZEOF(szPath); - saveas.lpstrInitialDir = szDir; - saveas.Flags = OFN_PATHMUSTEXIST | OFN_OVERWRITEPROMPT | - OFN_HIDEREADONLY | OFN_EXPLORER | OFN_ENABLETEMPLATE | OFN_ENABLEHOOK; - saveas.lpstrDefExt = szDefaultExt; - saveas.lpTemplateName = MAKEINTRESOURCE(DIALOG_ENCODING); - saveas.lpfnHook = DIALOG_FileSaveAs_Hook; + saveas.lStructSize = sizeof(OPENFILENAME); + saveas.hwndOwner = Globals.hMainWnd; + saveas.hInstance = Globals.hInstance; + saveas.lpstrFilter = Globals.szFilter; + saveas.lpstrFile = szPath; + saveas.nMaxFile = SIZEOF(szPath); + saveas.lpstrInitialDir = szDir; + saveas.Flags = OFN_PATHMUSTEXIST | OFN_OVERWRITEPROMPT | OFN_HIDEREADONLY | + OFN_EXPLORER | OFN_ENABLETEMPLATE | OFN_ENABLEHOOK; + saveas.lpstrDefExt = szDefaultExt; + saveas.lpTemplateName = MAKEINTRESOURCE(DIALOG_ENCODING); + saveas.lpfnHook = DIALOG_FileSaveAs_Hook; if (GetSaveFileName(&saveas)) { - // HACK: Because in ROS, Save-As boxes don't check the validity - // of file names and thus, here, szPath can be invalid !! We only - // see its validity when we call DoSaveFile()... + /* HACK: Because in ROS, Save-As boxes don't check the validity + * of file names and thus, here, szPath can be invalid !! We only + * see its validity when we call DoSaveFile()... */ SetFileName(szPath); if (DoSaveFile()) { @@ -542,20 +546,20 @@ /* Get Current Settings */ ZeroMemory(&printer, sizeof(printer)); - printer.lStructSize = sizeof(printer); - printer.hwndOwner = Globals.hMainWnd; - printer.hInstance = Globals.hInstance; + printer.lStructSize = sizeof(printer); + printer.hwndOwner = Globals.hMainWnd; + printer.hInstance = Globals.hInstance; /* Set some default flags */ - printer.Flags = PD_RETURNDC; - printer.nFromPage = 0; - printer.nMinPage = 1; + printer.Flags = PD_RETURNDC; + printer.nFromPage = 0; + printer.nMinPage = 1; /* we really need to calculate number of pages to set nMaxPage and nToPage */ - printer.nToPage = 0; - printer.nMaxPage = (WORD) -1; + printer.nToPage = 0; + printer.nMaxPage = (WORD)-1; /* Let commdlg manage copy settings */ - printer.nCopies = (WORD)PD_USEDEVMODECOPIES; + printer.nCopies = (WORD)PD_USEDEVMODECOPIES; if (!PrintDlg(&printer)) { @@ -628,22 +632,25 @@ /* I don't know what's up with this TextOut command. This comes out kind of mangled. */ - TextOut(printer.hDC, border*2, border+szMetric.cy/2, Globals.szFileTitle, lstrlen(Globals.szFileTitle)); + TextOut(printer.hDC, + border * 2, + border + szMetric.cy / 2, + Globals.szFileTitle, + lstrlen(Globals.szFileTitle)); } /* The starting point for the main text */ - xLeft = border*2; - yTop = border+szMetric.cy*4; + xLeft = border * 2; + yTop = border + szMetric.cy * 4; SelectObject(printer.hDC, old_font); GetTextExtentPoint32(printer.hDC, letterM, 1, &szMetric); /* Since outputting strings is giving me problems, output the main - text one character at a time. - */ + * text one character at a time. */ do { if (pTemp[i] == '\n') { - xLeft = border*2; + xLeft = border * 2; yTop += szMetric.cy; } else if (pTemp[i] != '\r') { @@ -651,12 +658,12 @@ TextOut(printer.hDC, xLeft, yTop, &pTemp[i], 1); xLeft += szMetric.cx; } - } while (i++<size && yTop<(cHeightPels-border*2)); + } while (i++ < size && yTop < (cHeightPels - border * 2)); if (dopage) EndPage(printer.hDC); pagecount++; - } while (i<size); + } while (i < size); } if (old_font != 0) @@ -672,11 +679,11 @@ PRINTDLG printer; ZeroMemory(&printer, sizeof(printer)); - printer.lStructSize = sizeof(printer); - printer.hwndOwner = Globals.hMainWnd; - printer.hInstance = Globals.hInstance; - printer.Flags = PD_PRINTSETUP; - printer.nCopies = 1; + printer.lStructSize = sizeof(printer); + printer.hwndOwner = Globals.hMainWnd; + printer.hInstance = Globals.hInstance; + printer.Flags = PD_PRINTSETUP; + printer.nCopies = 1; PrintDlg(&printer); } @@ -718,9 +725,9 @@ VOID DIALOG_EditTimeDate(VOID) { - SYSTEMTIME st; - TCHAR szDate[MAX_STRING_LEN]; - TCHAR szText[MAX_STRING_LEN * 2 + 2]; + SYSTEMTIME st; + TCHAR szDate[MAX_STRING_LEN]; + TCHAR szText[MAX_STRING_LEN * 2 + 2]; GetLocalTime(&st); @@ -738,15 +745,14 @@ RECT rcstatus; BOOL bStatusBarVisible; - // Check if status bar object already exists. + /* Check if status bar object already exists. */ if (Globals.hStatusBar == NULL) { - // Try to create the status bar - Globals.hStatusBar = CreateStatusWindow( - WS_CHILD | WS_VISIBLE | WS_EX_STATICEDGE, - NULL, - Globals.hMainWnd, - CMD_STATUSBAR_WND_ID); + /* Try to create the status bar */ + Globals.hStatusBar = CreateStatusWindow(WS_CHILD | WS_VISIBLE | WS_EX_STATICEDGE, + NULL, + Globals.hMainWnd, + CMD_STATUSBAR_WND_ID); if (Globals.hStatusBar == NULL) { @@ -754,16 +760,15 @@ return; } - // Load the string for formatting column/row text output - LoadString(Globals.hInstance, STRING_LINE_COLUMN, Globals.szStatusBarLineCol, MAX_PATH-1); - - // Set the status bar for single-text output + /* Load the string for formatting column/row text output */ + LoadString(Globals.hInstance, STRING_LINE_COLUMN, Globals.szStatusBarLineCol, MAX_PATH - 1); + + /* Set the status bar for single-text output */ SendMessage(Globals.hStatusBar, SB_SIMPLE, (WPARAM)TRUE, (LPARAM)0); } - // Set status bar visiblity according to the settings. - if (Globals.bWrapLongLines == TRUE || - Globals.bShowStatusBar == FALSE) + /* Set status bar visiblity according to the settings. */ + if (Globals.bWrapLongLines == TRUE || Globals.bShowStatusBar == FALSE) { bStatusBarVisible = FALSE; ShowWindow(Globals.hStatusBar, SW_HIDE); @@ -775,7 +780,7 @@ SendMessage(Globals.hStatusBar, WM_SIZE, 0, 0); } - // Set check state in show status bar item. + /* Set check state in show status bar item. */ if (bStatusBarVisible) { CheckMenuItem(Globals.hMenu, CMD_STATUSBAR, MF_BYCOMMAND | MF_CHECKED); @@ -785,69 +790,72 @@ CheckMenuItem(Globals.hMenu, CMD_STATUSBAR, MF_BYCOMMAND | MF_UNCHECKED); } - // Update menu mar with the previous changes + /* Update menu mar with the previous changes */ DrawMenuBar(Globals.hMainWnd); - // Sefety test is edit control exists + /* Sefety test is edit control exists */ if (Globals.hEdit != NULL) { - // Retrieve the sizes of the controls + /* Retrieve the sizes of the controls */ GetClientRect(Globals.hMainWnd, &rc); GetClientRect(Globals.hStatusBar, &rcstatus); - // If status bar is currently visible, update dimensions of edir control + /* If status bar is currently visible, update dimensions of edit control */ if (bStatusBarVisible) rc.bottom -= (rcstatus.bottom - rcstatus.top); - // Resize edit control to right size. - MoveWindow(Globals.hEdit, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, TRUE); - } - - // Update content with current row/column text + /* Resize edit control to right size. */ + MoveWindow(Globals.hEdit, + rc.left, + rc.top, + rc.right - rc.left, + rc.bottom - rc.top, + TRUE); + } + + /* Update content with current row/column text */ DIALOG_StatusBarUpdateCaretPos(); } VOID DoCreateEditWindow(VOID) { - DWORD dwStyle; - int iSize; + DWORD dwStyle; + int iSize; LPTSTR pTemp = NULL; - BOOL bModified = FALSE; + BOOL bModified = FALSE; iSize = 0; - // If the edit control already exists, try to save its content + /* If the edit control already exists, try to save its content */ if (Globals.hEdit != NULL) { - // number of chars currently written into the editor. + /* number of chars currently written into the editor. */ iSize = GetWindowTextLength(Globals.hEdit); - if (iSize) { - // Allocates temporary buffer. + /* Allocates temporary buffer. */ pTemp = HeapAlloc(GetProcessHeap(), 0, (iSize + 1) * sizeof(TCHAR)); - if (!pTemp) { ShowLastError(); return; } - // Recover the text into the control. + /* Recover the text into the control. */ GetWindowText(Globals.hEdit, pTemp, iSize + 1); if (SendMessage(Globals.hEdit, EM_GETMODIFY, 0, 0)) bModified = TRUE; } - // Restore original window procedure + /* Restore original window procedure */ SetWindowLongPtr(Globals.hEdit, GWLP_WNDPROC, (LONG_PTR)Globals.EditProc); - // Destroy the edit control + /* Destroy the edit control */ DestroyWindow(Globals.hEdit); } - // Update wrap status into the main menu and recover style flags + /* Update wrap status into the main menu and recover style flags */ if (Globals.bWrapLongLines) { dwStyle = EDIT_STYLE_WRAP; @@ -857,23 +865,22 @@ EnableMenuItem(Globals.hMenu, CMD_STATUSBAR, MF_BYCOMMAND | MF_ENABLED); } - // Update previous changes + /* Update previous changes */ DrawMenuBar(Globals.hMainWnd); - // Create the new edit control - Globals.hEdit = CreateWindowEx( - WS_EX_CLIENTEDGE, - EDIT_CLASS, - NULL, - dwStyle, - CW_USEDEFAULT, - CW_USEDEFAULT, - CW_USEDEFAULT, - CW_USEDEFAULT, - Globals.hMainWnd, - NULL, - Globals.hInstance, - NULL); + /* Create the new edit control */ + Globals.hEdit = CreateWindowEx(WS_EX_CLIENTEDGE, + EDIT_CLASS, + NULL, + dwStyle, + CW_USEDEFAULT, + CW_USEDEFAULT, + CW_USEDEFAULT, + CW_USEDEFAULT, + Globals.hMainWnd, + NULL, + Globals.hInstance, + NULL); if (Globals.hEdit == NULL) { @@ -884,7 +891,7 @@ SendMessage(Globals.hEdit, WM_SETFONT, (WPARAM)Globals.hFont, FALSE); SendMessage(Globals.hEdit, EM_LIMITTEXT, 0, 0); - // If some text was previously saved, restore it. + /* If some text was previously saved, restore it. */ if (iSize != 0) { SetWindowText(Globals.hEdit, pTemp); @@ -894,13 +901,15 @@ SendMessage(Globals.hEdit, EM_SETMODIFY, TRUE, 0); } - // Sub-class a new window callback for row/column detection. - Globals.EditProc = (WNDPROC) SetWindowLongPtr(Globals.hEdit, GWLP_WNDPROC, (LONG_PTR)EDIT_WndProc); - - // Create/update status bar + /* Sub-class a new window callback for row/column detection. */ + Globals.EditProc = (WNDPROC)SetWindowLongPtr(Globals.hEdit, + GWLP_WNDPROC, + (LONG_PTR)EDIT_WndProc); + + /* Create/update status bar */ DoCreateStatusBar(); - // Finally shows new edit control and set focus into it. + /* Finally shows new edit control and set focus into it. */ ShowWindow(Globals.hEdit, SW_SHOW); SetFocus(Globals.hEdit); } @@ -908,30 +917,29 @@ VOID DIALOG_EditWrap(VOID) { Globals.bWrapLongLines = !Globals.bWrapLongLines; - DoCreateEditWindow(); } VOID DIALOG_SelectFont(VOID) { CHOOSEFONT cf; - LOGFONT lf=Globals.lfFont; + LOGFONT lf = Globals.lfFont; ZeroMemory( &cf, sizeof(cf) ); - cf.lStructSize=sizeof(cf); - cf.hwndOwner=Globals.hMainWnd; - cf.lpLogFont=&lf; - cf.Flags=CF_SCREENFONTS | CF_INITTOLOGFONTSTRUCT; - - if( ChooseFont(&cf) ) - { - HFONT currfont=Globals.hFont; - - Globals.hFont=CreateFontIndirect( &lf ); - Globals.lfFont=lf; - SendMessage( Globals.hEdit, WM_SETFONT, (WPARAM)Globals.hFont, (LPARAM)TRUE ); - if( currfont!=NULL ) - DeleteObject( currfont ); + cf.lStructSize = sizeof(cf); + cf.hwndOwner = Globals.hMainWnd; + cf.lpLogFont = &lf; + cf.Flags = CF_SCREENFONTS | CF_INITTOLOGFONTSTRUCT; + + if (ChooseFont(&cf)) + { + HFONT currfont = Globals.hFont; + + Globals.hFont = CreateFontIndirect(&lf); + Globals.lfFont = lf; + SendMessage(Globals.hEdit, WM_SETFONT, (WPARAM)Globals.hFont, (LPARAM)TRUE); + if (currfont != NULL) + DeleteObject(currfont); } } @@ -940,20 +948,20 @@ static VOID DIALOG_SearchDialog(FINDPROC pfnProc) { ZeroMemory(&Globals.find, sizeof(Globals.find)); - Globals.find.lStructSize = sizeof(Globals.find); - Globals.find.hwndOwner = Globals.hMainWnd; - Globals.find.hInstance = Globals.hInstance; - Globals.find.lpstrFindWhat = Globals.szFindText; - Globals.find.wFindWhatLen = SIZEOF(Globals.szFindText); + Globals.find.lStructSize = sizeof(Globals.find); + Globals.find.hwndOwner = Globals.hMainWnd; + Globals.find.hInstance = Globals.hInstance; + Globals.find.lpstrFindWhat = Globals.szFindText; + Globals.find.wFindWhatLen = SIZEOF(Globals.szFindText); Globals.find.lpstrReplaceWith = Globals.szReplaceText; - Globals.find.wReplaceWithLen = SIZEOF(Globals.szReplaceText); - Globals.find.Flags = FR_DOWN; + Globals.find.wReplaceWithLen = SIZEOF(Globals.szReplaceText); + Globals.find.Flags = FR_DOWN; /* We only need to create the modal FindReplace dialog which will */ /* notify us of incoming events using hMainWnd Window Messages */ Globals.hFindReplaceDlg = pfnProc(&Globals.find); - assert(Globals.hFindReplaceDlg !=0); + assert(Globals.hFindReplaceDlg != 0); } VOID DIALOG_Search(VOID) @@ -964,9 +972,9 @@ VOID DIALOG_SearchNext(VOID) { if (Globals.find.lpstrFindWhat != NULL) - NOTEPAD_FindNext(&Globals.find, FALSE, TRUE); + NOTEPAD_FindNext(&Globals.find, FALSE, TRUE); else - DIALOG_Search(); + DIALOG_Search(); } VOID DIALOG_Replace(VOID) @@ -974,7 +982,9 @@ DIALOG_SearchDialog(ReplaceText); } -static INT_PTR CALLBACK DIALOG_GoTo_DialogProc(HWND hwndDialog, UINT uMsg, WPARAM wParam, LPARAM lParam) +static INT_PTR +CALLBACK +DIALOG_GoTo_DialogProc(HWND hwndDialog, UINT uMsg, WPARAM wParam, LPARAM lParam) { BOOL bResult = FALSE; HWND hTextBox; @@ -1031,8 +1041,11 @@ nLine++; } - nLine = DialogBoxParam(Globals.hInstance, MAKEINTRESOURCE(DIALOG_GOTO), - Globals.hMainWnd, DIALOG_GoTo_DialogProc, nLine); + nLine = DialogBoxParam(Globals.hInstance, + MAKEINTRESOURCE(DIALOG_GOTO), + Globals.hMainWnd, + DIALOG_GoTo_DialogProc, + nLine); if (nLine >= 1) { @@ -1055,9 +1068,9 @@ SendMessage(Globals.hEdit, EM_GETSEL, (WPARAM)&dwStart, (LPARAM)&dwSize); line = SendMessage(Globals.hEdit, EM_LINEFROMCHAR, (WPARAM)dwStart, 0); - col = dwStart - SendMessage(Globals.hEdit, EM_LINEINDEX, (WPARAM)line, 0); - - _stprintf(buff, Globals.szStatusBarLineCol, line+1, col+1); + col = dwStart - SendMessage(Globals.hEdit, EM_LINEINDEX, (WPARAM)line, 0); + + _stprintf(buff, Globals.szStatusBarLineCol, line + 1, col + 1); SendMessage(Globals.hStatusBar, SB_SETTEXT, SB_SIMPLEID, (LPARAM)buff); } @@ -1075,7 +1088,7 @@ VOID DIALOG_HelpSearch(VOID) { - /* Search Help */ + /* Search Help */ } VOID DIALOG_HelpHelp(VOID) @@ -1086,11 +1099,12 @@ #ifdef _MSC_VER #pragma warning(disable : 4100) #endif -INT_PTR CALLBACK +INT_PTR +CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { - HWND hLicenseEditWnd; - TCHAR *strLicense; + HWND hLicenseEditWnd; + TCHAR *strLicense; switch (message) { @@ -1098,7 +1112,7 @@ hLicenseEditWnd = GetDlgItem(hDlg, IDC_LICENSE); - /* 0x1000 should be enought */ + /* 0x1000 should be enough */ strLicense = (TCHAR *)_alloca(0x1000); LoadString(GetModuleHandle(NULL), STRING_LICENSE, strLicense, 0x1000); @@ -1120,8 +1134,6 @@ return 0; } - - VOID DIALOG_HelpAboutWine(VOID) { TCHAR szNotepad[MAX_STRING_LEN]; @@ -1131,7 +1143,6 @@ ShellAbout(Globals.hMainWnd, szNotepad, 0, notepadIcon); DeleteObject(notepadIcon); } - /*********************************************************************** * @@ -1139,19 +1150,21 @@ */ VOID DIALOG_FilePageSetup(void) { - DialogBox(Globals.hInstance, MAKEINTRESOURCE(DIALOG_PAGESETUP), - Globals.hMainWnd, DIALOG_PAGESETUP_DlgProc); -} - + DialogBox(Globals.hInstance, + MAKEINTRESOURCE(DIALOG_PAGESETUP), + Globals.hMainWnd, + DIALOG_PAGESETUP_DlgProc); +} /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * DIALOG_PAGESETUP_DlgProc */ -static INT_PTR WINAPI DIALOG_PAGESETUP_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) -{ - +static INT_PTR +WINAPI +DIALOG_PAGESETUP_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) +{ switch (msg) { case WM_COMMAND: Modified: trunk/reactos/base/applications/notepad/license.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/license.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/license.c [iso-8859-1] Thu Jan 8 13:20:02 2015 @@ -22,17 +22,21 @@ VOID WineLicense(HWND Wnd) { - /* FIXME: should load strings from resources */ - LICENSE *License = &WineLicense_En; - MessageBoxA(Wnd, License->License, License->LicenseCaption, - MB_ICONINFORMATION | MB_OK); + /* FIXME: should load strings from resources */ + LICENSE *License = &WineLicense_En; + MessageBoxA(Wnd, + License->License, + License->LicenseCaption, + MB_ICONINFORMATION | MB_OK); } VOID WineWarranty(HWND Wnd) { - /* FIXME: should load strings from resources */ - LICENSE *License = &WineLicense_En; - MessageBoxA(Wnd, License->Warranty, License->WarrantyCaption, - MB_ICONEXCLAMATION | MB_OK); + /* FIXME: should load strings from resources */ + LICENSE *License = &WineLicense_En; + MessageBoxA(Wnd, + License->Warranty, + License->WarrantyCaption, + MB_ICONEXCLAMATION | MB_OK); } Modified: trunk/reactos/base/applications/notepad/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/main.c [iso-8859-1] Thu Jan 8 13:20:02 2015 @@ -58,47 +58,50 @@ { switch (wParam) { - case CMD_NEW: DIALOG_FileNew(); break; - case CMD_OPEN: DIALOG_FileOpen(); break; - case CMD_SAVE: DIALOG_FileSave(); break; - case CMD_SAVE_AS: DIALOG_FileSaveAs(); break; - case CMD_PRINT: DIALOG_FilePrint(); break; - case CMD_PAGE_SETUP: DIALOG_FilePageSetup(); break; - case CMD_PRINTER_SETUP: DIALOG_FilePrinterSetup();break; - case CMD_EXIT: DIALOG_FileExit(); break; - - case CMD_UNDO: DIALOG_EditUndo(); break; - case CMD_CUT: DIALOG_EditCut(); break; - case CMD_COPY: DIALOG_EditCopy(); break; - case CMD_PASTE: DIALOG_EditPaste(); break; - case CMD_DELETE: DIALOG_EditDelete(); break; - case CMD_SELECT_ALL: DIALOG_EditSelectAll(); break; - case CMD_TIME_DATE: DIALOG_EditTimeDate();break; - - case CMD_SEARCH: DIALOG_Search(); break; - case CMD_SEARCH_NEXT: DIALOG_SearchNext(); break; - case CMD_REPLACE: DIALOG_Replace(); break; - case CMD_GOTO: DIALOG_GoTo(); break; - - case CMD_WRAP: DIALOG_EditWrap(); break; - case CMD_FONT: DIALOG_SelectFont(); break; - - case CMD_STATUSBAR: DIALOG_ViewStatusBar(); break; - - case CMD_HELP_CONTENTS: DIALOG_HelpContents(); break; - case CMD_HELP_SEARCH: DIALOG_HelpSearch(); break; - case CMD_HELP_ON_HELP: DIALOG_HelpHelp(); break; - case CMD_ABOUT: DialogBox(GetModuleHandle(NULL), - MAKEINTRESOURCE(IDD_ABOUTBOX), - Globals.hMainWnd, - AboutDialogProc); - break; - case CMD_ABOUT_WINE: DIALOG_HelpAboutWine(); break; + case CMD_NEW: DIALOG_FileNew(); break; + case CMD_OPEN: DIALOG_FileOpen(); break; + case CMD_SAVE: DIALOG_FileSave(); break; + case CMD_SAVE_AS: DIALOG_FileSaveAs(); break; + case CMD_PRINT: DIALOG_FilePrint(); break; + case CMD_PAGE_SETUP: DIALOG_FilePageSetup(); break; + case CMD_PRINTER_SETUP: DIALOG_FilePrinterSetup(); break; + case CMD_EXIT: DIALOG_FileExit(); break; + + case CMD_UNDO: DIALOG_EditUndo(); break; + case CMD_CUT: DIALOG_EditCut(); break; + case CMD_COPY: DIALOG_EditCopy(); break; + case CMD_PASTE: DIALOG_EditPaste(); break; + case CMD_DELETE: DIALOG_EditDelete(); break; + case CMD_SELECT_ALL: DIALOG_EditSelectAll(); break; + case CMD_TIME_DATE: DIALOG_EditTimeDate(); break; + + case CMD_SEARCH: DIALOG_Search(); break; + case CMD_SEARCH_NEXT: DIALOG_SearchNext(); break; + case CMD_REPLACE: DIALOG_Replace(); break; + case CMD_GOTO: DIALOG_GoTo(); break; + + case CMD_WRAP: DIALOG_EditWrap(); break; + case CMD_FONT: DIALOG_SelectFont(); break; + + case CMD_STATUSBAR: DIALOG_ViewStatusBar(); break; + + case CMD_HELP_CONTENTS: DIALOG_HelpContents(); break; + case CMD_HELP_SEARCH: DIALOG_HelpSearch(); break; + case CMD_HELP_ON_HELP: DIALOG_HelpHelp(); break; + + case CMD_ABOUT: + DialogBox(GetModuleHandle(NULL), + MAKEINTRESOURCE(IDD_ABOUTBOX), + Globals.hMainWnd, + AboutDialogProc); + break; + + case CMD_ABOUT_WINE: DIALOG_HelpAboutWine(); break; default: - break; - } - return 0; + break; + } + return 0; } /*********************************************************************** @@ -106,7 +109,8 @@ * NOTEPAD_FindTextAt */ -static BOOL NOTEPAD_FindTextAt(FINDREPLACE *pFindReplace, LPCTSTR pszText, int iTextLength, DWORD dwPosition) +static BOOL +NOTEPAD_FindTextAt(FINDREPLACE *pFindReplace, LPCTSTR pszText, int iTextLength, DWORD dwPosition) { BOOL bMatches; size_t iTargetLength; @@ -256,11 +260,11 @@ static const TCHAR txt_files[] = _T("*.txt"); static const TCHAR all_files[] = _T("*.*"); - p += LoadString(Globals.hInstance, STRING_TEXT_FILES_TXT, p, MAX_STRING_LEN)+1; + p += LoadString(Globals.hInstance, STRING_TEXT_FILES_TXT, p, MAX_STRING_LEN) + 1; _tcscpy(p, txt_files); p += SIZEOF(txt_files); - p += LoadString(Globals.hInstance, STRING_ALL_FILES, p, MAX_STRING_LEN)+1; + p += LoadString(Globals.hInstance, STRING_ALL_FILES, p, MAX_STRING_LEN) + 1; _tcscpy(p, all_files); p += SIZEOF(all_files); *p = '\0'; @@ -328,10 +332,12 @@ * * NOTEPAD_WndProc */ -static LRESULT WINAPI NOTEPAD_WndProc(HWND hWnd, UINT msg, WPARAM wParam, - LPARAM lParam) -{ - switch (msg) { +static LRESULT +WINAPI +NOTEPAD_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch (msg) + { case WM_CREATE: Globals.hMenu = GetMenu(hWnd); @@ -371,8 +377,7 @@ case WM_SIZE: { - if (Globals.bShowStatusBar == TRUE && - Globals.bWrapLongLines == FALSE) + if (Globals.bShowStatusBar == TRUE && Globals.bWrapLongLines == FALSE) { RECT rcStatusBar; HDWP hdwp; @@ -384,24 +389,45 @@ if (hdwp == NULL) break; - hdwp = DeferWindowPos(hdwp, Globals.hEdit, NULL, 0, 0, LOWORD(lParam), HIWORD(lParam) - (rcStatusBar.bottom - rcStatusBar.top), SWP_NOZORDER | SWP_NOMOVE); + hdwp = DeferWindowPos(hdwp, + Globals.hEdit, + NULL, + 0, + 0, + LOWORD(lParam), + HIWORD(lParam) - (rcStatusBar.bottom - rcStatusBar.top), + SWP_NOZORDER | SWP_NOMOVE); + if (hdwp == NULL) break; - hdwp = DeferWindowPos(hdwp, Globals.hStatusBar, NULL, 0, 0, LOWORD(lParam), LOWORD(wParam), SWP_NOZORDER); + hdwp = DeferWindowPos(hdwp, + Globals.hStatusBar, + NULL, + 0, + 0, + LOWORD(lParam), + LOWORD(wParam), + SWP_NOZORDER); if (hdwp != NULL) EndDeferWindowPos(hdwp); } else - SetWindowPos(Globals.hEdit, NULL, 0, 0, LOWORD(lParam), HIWORD(lParam), SWP_NOZORDER | SWP_NOMOVE); - - break; - } - - // The entire client area is covered by edit control and by - // the status bar. So there is no need to erase main background. - // This resolves the horrible fliker effect during windows resizes. + SetWindowPos(Globals.hEdit, + NULL, + 0, + 0, + LOWORD(lParam), + HIWORD(lParam), + SWP_NOZORDER | SWP_NOMOVE); + + break; + } + + /* The entire client area is covered by edit control and by + * the status bar. So there is no need to erase main background. + * This resolves the horrible flicker effect during windows resizes. */ case WM_ERASEBKGND: return 1; @@ -447,19 +473,21 @@ static int AlertFileDoesNotExist(LPCTSTR szFileName) { - int nResult; - TCHAR szMessage[MAX_STRING_LEN]; - TCHAR szResource[MAX_STRING_LEN]; - - LoadString(Globals.hInstance, STRING_DOESNOTEXIST, szResource, SIZEOF(szResource)); - wsprintf(szMessage, szResource, szFileName); - - LoadString(Globals.hInstance, STRING_NOTEPAD, szResource, SIZEOF(szResource)); - - nResult = MessageBox(Globals.hMainWnd, szMessage, szResource, - MB_ICONEXCLAMATION | MB_YESNO); - - return(nResult); + int nResult; + TCHAR szMessage[MAX_STRING_LEN]; + TCHAR szResource[MAX_STRING_LEN]; + + LoadString(Globals.hInstance, STRING_DOESNOTEXIST, szResource, SIZEOF(szResource)); + wsprintf(szMessage, szResource, szFileName); + + LoadString(Globals.hInstance, STRING_NOTEPAD, szResource, SIZEOF(szResource)); + + nResult = MessageBox(Globals.hMainWnd, + szMessage, + szResource, + MB_ICONEXCLAMATION | MB_YESNO); + + return(nResult); } static BOOL HandleCommandLine(LPTSTR cmdline) @@ -553,53 +581,57 @@ */ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE prev, LPTSTR cmdline, int show) { - MSG msg; - HACCEL hAccel; - WNDCLASSEX wndclass; - HMONITOR monitor; + MSG msg; + HACCEL hAccel; + WNDCLASSEX wndclass; + HMONITOR monitor; MONITORINFO info; - INT x, y; + INT x, y; static const TCHAR className[] = _T("NPClass"); - static const TCHAR winName[] = _T("Notepad"); + static const TCHAR winName[] = _T("Notepad"); switch (GetUserDefaultUILanguage()) - { + { case MAKELANGID(LANG_HEBREW, SUBLANG_DEFAULT): - SetProcessDefaultLayout(LAYOUT_RTL); - break; + SetProcessDefaultLayout(LAYOUT_RTL); + break; default: - break; - } + break; + } UNREFERENCED_PARAMETER(prev); - aFINDMSGSTRING = (ATOM) RegisterWindowMessage(FINDMSGSTRING); + aFINDMSGSTRING = (ATOM)RegisterWindowMessage(FINDMSGSTRING); ZeroMemory(&Globals, sizeof(Globals)); - Globals.hInstance = hInstance; + Globals.hInstance = hInstance; LoadSettings(); ZeroMemory(&wndclass, sizeof(wndclass)); - wndclass.cbSize = sizeof(wndclass); - wndclass.lpfnWndProc = NOTEPAD_WndProc; - wndclass.hInstance = Globals.hInstance; - wndclass.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_NPICON)); - wndclass.hCursor = LoadCursor(0, IDC_ARROW); + wndclass.cbSize = sizeof(wndclass); + wndclass.lpfnWndProc = NOTEPAD_WndProc; + wndclass.hInstance = Globals.hInstance; + wndclass.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_NPICON)); + wndclass.hCursor = LoadCursor(0, IDC_ARROW); wndclass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); - wndclass.lpszMenuName = MAKEINTRESOURCE(MAIN_MENU); + wndclass.lpszMenuName = MAKEINTRESOURCE(MAIN_MENU); wndclass.lpszClassName = className; - wndclass.hIconSm = (HICON)LoadImage(hInstance, MAKEINTRESOURCE(IDI_NPICON), - IMAGE_ICON, 16, 16, 0); + wndclass.hIconSm = (HICON)LoadImage(hInstance, + MAKEINTRESOURCE(IDI_NPICON), + IMAGE_ICON, + 16, + 16, + 0); if (!RegisterClassEx(&wndclass)) return FALSE; /* Setup windows */ - monitor = MonitorFromRect( &Globals.main_rect, MONITOR_DEFAULTTOPRIMARY ); + monitor = MonitorFromRect(&Globals.main_rect, MONITOR_DEFAULTTOPRIMARY); info.cbSize = sizeof(info); - GetMonitorInfoW( monitor, &info ); + GetMonitorInfoW(monitor, &info); x = Globals.main_rect.left; y = Globals.main_rect.top; @@ -609,11 +641,17 @@ Globals.main_rect.bottom < info.rcWork.top) x = y = CW_USEDEFAULT; - Globals.hMainWnd = - CreateWindow(className, winName, WS_OVERLAPPEDWINDOW, - x, y, Globals.main_rect.right - Globals.main_rect.left, - Globals.main_rect.bottom - Globals.main_rect.top, - NULL, NULL, Globals.hInstance, NULL); + Globals.hMainWnd = CreateWindow(className, + winName, + WS_OVERLAPPEDWINDOW, + x, + y, + Globals.main_rect.right - Globals.main_rect.left, + Globals.main_rect.bottom - Globals.main_rect.top, + NULL, + NULL, + Globals.hInstance, + NULL); if (!Globals.hMainWnd) { ShowLastError(); @@ -636,7 +674,7 @@ return 0; } - hAccel = LoadAccelerators( hInstance, MAKEINTRESOURCE(ID_ACCEL) ); + hAccel = LoadAccelerators(hInstance, MAKEINTRESOURCE(ID_ACCEL)); while (GetMessage(&msg, 0, 0, 0)) { Modified: trunk/reactos/base/applications/notepad/main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/main.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/main.h [iso-8859-1] Thu Jan 8 13:20:02 2015 @@ -33,10 +33,10 @@ #define MAX_STRING_LEN 255 -#define ENCODING_ANSI 0 -#define ENCODING_UNICODE 1 -#define ENCODING_UNICODE_BE 2 -#define ENCODING_UTF8 3 +#define ENCODING_ANSI 0 +#define ENCODING_UNICODE 1 +#define ENCODING_UNICODE_BE 2 +#define ENCODING_UTF8 3 #define EOLN_CRLF 0 #define EOLN_LF 1 @@ -44,34 +44,34 @@ typedef struct { - HINSTANCE hInstance; - HWND hMainWnd; - HWND hFindReplaceDlg; - HWND hEdit; - HWND hStatusBar; - HFONT hFont; /* Font used by the edit control */ - HMENU hMenu; - LOGFONT lfFont; - BOOL bWrapLongLines; - BOOL bShowStatusBar; - TCHAR szFindText[MAX_PATH]; - TCHAR szReplaceText[MAX_PATH]; - TCHAR szFileName[MAX_PATH]; - TCHAR szFileTitle[MAX_PATH]; - TCHAR szFilter[2 * MAX_STRING_LEN + 100]; - TCHAR szMarginTop[MAX_PATH]; - TCHAR szMarginBottom[MAX_PATH]; - TCHAR szMarginLeft[MAX_PATH]; - TCHAR szMarginRight[MAX_PATH]; - TCHAR szHeader[MAX_PATH]; - TCHAR szFooter[MAX_PATH]; - TCHAR szStatusBarLineCol[MAX_PATH]; - int iEncoding; - int iEoln; + HINSTANCE hInstance; + HWND hMainWnd; + HWND hFindReplaceDlg; + HWND hEdit; + HWND hStatusBar; + HFONT hFont; /* Font used by the edit control */ + HMENU hMenu; + LOGFONT lfFont; + BOOL bWrapLongLines; + BOOL bShowStatusBar; + TCHAR szFindText[MAX_PATH]; + TCHAR szReplaceText[MAX_PATH]; + TCHAR szFileName[MAX_PATH]; + TCHAR szFileTitle[MAX_PATH]; + TCHAR szFilter[2 * MAX_STRING_LEN + 100]; + TCHAR szMarginTop[MAX_PATH]; + TCHAR szMarginBottom[MAX_PATH]; + TCHAR szMarginLeft[MAX_PATH]; + TCHAR szMarginRight[MAX_PATH]; + TCHAR szHeader[MAX_PATH]; + TCHAR szFooter[MAX_PATH]; + TCHAR szStatusBarLineCol[MAX_PATH]; + int iEncoding; + int iEoln; - FINDREPLACE find; - WNDPROC EditProc; - RECT main_rect; + FINDREPLACE find; + WNDPROC EditProc; + RECT main_rect; } NOTEPAD_GLOBALS; extern NOTEPAD_GLOBALS Globals; Modified: trunk/reactos/base/applications/notepad/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/settings.c [iso-8859-1] Thu Jan 8 13:20:02 2015 @@ -29,178 +29,179 @@ static LONG HeightFromPointSize(DWORD dwPointSize) { - LONG lHeight; - HDC hDC; - - hDC = GetDC(NULL); - lHeight = -MulDiv(dwPointSize, GetDeviceCaps(hDC, LOGPIXELSY), 720); - ReleaseDC(NULL, hDC); - - return lHeight; + LONG lHeight; + HDC hDC; + + hDC = GetDC(NULL); + lHeight = -MulDiv(dwPointSize, GetDeviceCaps(hDC, LOGPIXELSY), 720); + ReleaseDC(NULL, hDC); + + return lHeight; } static DWORD PointSizeFromHeight(LONG lHeight) { - DWORD dwPointSize; - HDC hDC; - - hDC = GetDC(NULL); - dwPointSize = -MulDiv(lHeight, 720, GetDeviceCaps(hDC, LOGPIXELSY)); - ReleaseDC(NULL, hDC); - - /* round to nearest multiple of 10 */ - dwPointSize += 5; - dwPointSize -= dwPointSize % 10; - - return dwPointSize; -} - -static BOOL QueryGeneric(HKEY hKey, LPCTSTR pszValueNameT, DWORD dwExpectedType, - LPVOID pvResult, DWORD dwResultSize) -{ - DWORD dwType, cbData; - LPVOID *pTemp = _alloca(dwResultSize); - - ZeroMemory(pTemp, dwResultSize); - - cbData = dwResultSize; - if (RegQueryValueEx(hKey, pszValueNameT, NULL, &dwType, (LPBYTE) pTemp, &cbData) != ERROR_SUCCESS) - return FALSE; - - if (dwType != dwExpectedType) - return FALSE; - - memcpy(pvResult, pTemp, cbData); - return TRUE; + DWORD dwPointSize; + HDC hDC; + + hDC = GetDC(NULL); + dwPointSize = -MulDiv(lHeight, 720, GetDeviceCaps(hDC, LOGPIXELSY)); + ReleaseDC(NULL, hDC); + + /* round to nearest multiple of 10 */ + dwPointSize += 5; + dwPointSize -= dwPointSize % 10; + + return dwPointSize; +} + +static BOOL +QueryGeneric(HKEY hKey, LPCTSTR pszValueNameT, DWORD dwExpectedType, + LPVOID pvResult, DWORD dwResultSize) +{ + DWORD dwType, cbData; + LPVOID *pTemp = _alloca(dwResultSize); + + ZeroMemory(pTemp, dwResultSize); + + cbData = dwResultSize; + if (RegQueryValueEx(hKey, pszValueNameT, NULL, &dwType, (LPBYTE) pTemp, &cbData) != ERROR_SUCCESS) + return FALSE; + + if (dwType != dwExpectedType) + return FALSE; + + memcpy(pvResult, pTemp, cbData); + return TRUE; } static BOOL QueryDword(HKEY hKey, LPCTSTR pszValueName, DWORD *pdwResult) { - return QueryGeneric(hKey, pszValueName, REG_DWORD, pdwResult, sizeof(*pdwResult)); + return QueryGeneric(hKey, pszValueName, REG_DWORD, pdwResult, sizeof(*pdwResult)); } static BOOL QueryByte(HKEY hKey, LPCTSTR pszValueName, BYTE *pbResult) { - DWORD dwResult; - if (!QueryGeneric(hKey, pszValueName, REG_DWORD, &dwResult, sizeof(dwResult))) - return FALSE; - if (dwResult >= 0x100) - return FALSE; - *pbResult = (BYTE) dwResult; - return TRUE; + DWORD dwResult; + if (!QueryGeneric(hKey, pszValueName, REG_DWORD, &dwResult, sizeof(dwResult))) + return FALSE; + if (dwResult >= 0x100) + return FALSE; + *pbResult = (BYTE) dwResult; + return TRUE; } static BOOL QueryBool(HKEY hKey, LPCTSTR pszValueName, BOOL *pbResult) { - DWORD dwResult; - if (!QueryDword(hKey, pszValueName, &dwResult)) - return FALSE; - *pbResult = dwResult ? TRUE : FALSE; - return TRUE; + DWORD dwResult; + if (!QueryDword(hKey, pszValueName, &dwResult)) + return FALSE; + *pbResult = dwResult ? TRUE : FALSE; + return TRUE; } static BOOL QueryString(HKEY hKey, LPCTSTR pszValueName, LPTSTR pszResult, DWORD dwResultSize) { - return QueryGeneric(hKey, pszValueName, REG_SZ, pszResult, dwResultSize * sizeof(TCHAR)); + return QueryGeneric(hKey, pszValueName, REG_SZ, pszResult, dwResultSize * sizeof(TCHAR)); } void LoadSettings(void) { - HKEY hKey = NULL; - HFONT hFont; - DWORD dwPointSize = 0; - INT base_length, dx, dy; - - base_length = (GetSystemMetrics(SM_CXSCREEN) > GetSystemMetrics(SM_CYSCREEN))? - GetSystemMetrics(SM_CYSCREEN) : GetSystemMetrics(SM_CXSCREEN); - - dx = (INT)(base_length * .95); - dy = dx * 3 / 4; - SetRect( &Globals.main_rect, 0, 0, dx, dy ); - - if (RegOpenKey(HKEY_CURRENT_USER, s_szRegistryKey, &hKey) == ERROR_SUCCESS) - { - QueryByte(hKey, _T("lfCharSet"), &Globals.lfFont.lfCharSet); - QueryByte(hKey, _T("lfClipPrecision"), &Globals.lfFont.lfClipPrecision); - QueryDword(hKey, _T("lfEscapement"), (DWORD*)&Globals.lfFont.lfEscapement); - QueryString(hKey, _T("lfFaceName"), Globals.lfFont.lfFaceName, sizeof(Globals.lfFont.lfFaceName) / sizeof(Globals.lfFont.lfFaceName[0])); - QueryByte(hKey, _T("lfItalic"), &Globals.lfFont.lfItalic); - QueryDword(hKey, _T("lfOrientation"), (DWORD*)&Globals.lfFont.lfOrientation); - QueryByte(hKey, _T("lfOutPrecision"), &Globals.lfFont.lfOutPrecision); - QueryByte(hKey, _T("lfPitchAndFamily"), &Globals.lfFont.lfPitchAndFamily); - QueryByte(hKey, _T("lfQuality"), &Globals.lfFont.lfQuality); - QueryByte(hKey, _T("lfStrikeOut"), &Globals.lfFont.lfStrikeOut); - QueryByte(hKey, _T("lfUnderline"), &Globals.lfFont.lfUnderline); - QueryDword(hKey, _T("lfWeight"), (DWORD*)&Globals.lfFont.lfWeight); - QueryDword(hKey, _T("iPointSize"), &dwPointSize); - QueryBool(hKey, _T("fWrap"), &Globals.bWrapLongLines); - QueryBool(hKey, _T("fStatusBar"), &Globals.bShowStatusBar); - - QueryDword(hKey, _T("iWindowPosX"), (DWORD*)&Globals.main_rect.left); - QueryDword(hKey, _T("iWindowPosY"), (DWORD*)&Globals.main_rect.top); - QueryDword(hKey, _T("iWindowPosDX"), (DWORD*)&dx); - QueryDword(hKey, _T("iWindowPosDY"), (DWORD*)&dy); + HKEY hKey = NULL; + HFONT hFont; + DWORD dwPointSize = 0; + INT base_length, dx, dy; + + base_length = (GetSystemMetrics(SM_CXSCREEN) > GetSystemMetrics(SM_CYSCREEN)) ? + GetSystemMetrics(SM_CYSCREEN) : GetSystemMetrics(SM_CXSCREEN); + + dx = (INT)(base_length * .95); + dy = dx * 3 / 4; + SetRect(&Globals.main_rect, 0, 0, dx, dy); + + if (RegOpenKey(HKEY_CURRENT_USER, s_szRegistryKey, &hKey) == ERROR_SUCCESS) + { + QueryByte(hKey, _T("lfCharSet"), &Globals.lfFont.lfCharSet); + QueryByte(hKey, _T("lfClipPrecision"), &Globals.lfFont.lfClipPrecision); + QueryDword(hKey, _T("lfEscapement"), (DWORD*)&Globals.lfFont.lfEscapement); + QueryString(hKey, _T("lfFaceName"), Globals.lfFont.lfFaceName, sizeof(Globals.lfFont.lfFaceName) / sizeof(Globals.lfFont.lfFaceName[0])); + QueryByte(hKey, _T("lfItalic"), &Globals.lfFont.lfItalic); + QueryDword(hKey, _T("lfOrientation"), (DWORD*)&Globals.lfFont.lfOrientation); + QueryByte(hKey, _T("lfOutPrecision"), &Globals.lfFont.lfOutPrecision); + QueryByte(hKey, _T("lfPitchAndFamily"), &Globals.lfFont.lfPitchAndFamily); + QueryByte(hKey, _T("lfQuality"), &Globals.lfFont.lfQuality); + QueryByte(hKey, _T("lfStrikeOut"), &Globals.lfFont.lfStrikeOut); + QueryByte(hKey, _T("lfUnderline"), &Globals.lfFont.lfUnderline); + QueryDword(hKey, _T("lfWeight"), (DWORD*)&Globals.lfFont.lfWeight); + QueryDword(hKey, _T("iPointSize"), &dwPointSize); + QueryBool(hKey, _T("fWrap"), &Globals.bWrapLongLines); + QueryBool(hKey, _T("fStatusBar"), &Globals.bShowStatusBar); + + QueryDword(hKey, _T("iWindowPosX"), (DWORD*)&Globals.main_rect.left); + QueryDword(hKey, _T("iWindowPosY"), (DWORD*)&Globals.main_rect.top); + QueryDword(hKey, _T("iWindowPosDX"), (DWORD*)&dx); + QueryDword(hKey, _T("iWindowPosDY"), (DWORD*)&dy); Globals.main_rect.right = Globals.main_rect.left + dx; Globals.main_rect.bottom = Globals.main_rect.top + dy; - Globals.bShowStatusBar = !Globals.bShowStatusBar; /* invert value becuase DIALOG_ViewStatusBar will be called to show it*/ - - if (dwPointSize != 0) - Globals.lfFont.lfHeight = HeightFromPointSize(dwPointSize); - - RegCloseKey(hKey); - } - - hFont = CreateFontIndirect(&Globals.lfFont); - if (hFont) - { - if (Globals.hFont) - DeleteObject(Globals.hFont); - Globals.hFont = hFont; - } + /* invert value because DIALOG_ViewStatusBar will be called to show it */ + Globals.bShowStatusBar = !Globals.bShowStatusBar; + + if (dwPointSize != 0) + Globals.lfFont.lfHeight = HeightFromPointSize(dwPointSize); + + RegCloseKey(hKey); + } + + hFont = CreateFontIndirect(&Globals.lfFont); + if (hFont) + { + if (Globals.hFont) + DeleteObject(Globals.hFont); + Globals.hFont = hFont; + } } static BOOL SaveDword(HKEY hKey, LPCTSTR pszValueNameT, DWORD dwValue) { - return RegSetValueEx(hKey, pszValueNameT, 0, REG_DWORD, (LPBYTE) &dwValue, sizeof(dwValue)) == ERROR_SUCCESS; + return RegSetValueEx(hKey, pszValueNameT, 0, REG_DWORD, (LPBYTE) &dwValue, sizeof(dwValue)) == ERROR_SUCCESS; } static BOOL SaveString(HKEY hKey, LPCTSTR pszValueNameT, LPCTSTR pszValue) { - return RegSetValueEx(hKey, pszValueNameT, 0, REG_SZ, (LPBYTE) pszValue, (DWORD) _tcslen(pszValue) * sizeof(*pszValue)) == ERROR_SUCCESS; + return RegSetValueEx(hKey, pszValueNameT, 0, REG_SZ, (LPBYTE) pszValue, (DWORD) _tcslen(pszValue) * sizeof(*pszValue)) == ERROR_SUCCESS; } void SaveSettings(void) { - HKEY hKey; - DWORD dwDisposition; + HKEY hKey; + DWORD dwDisposition; GetWindowRect(Globals.hMainWnd, &Globals.main_rect); - if (RegCreateKeyEx(HKEY_CURRENT_USER, s_szRegistryKey, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hKey, &dwDisposition) - == ERROR_SUCCESS) - { - SaveDword(hKey, _T("lfCharSet"), Globals.lfFont.lfCharSet); - SaveDword(hKey, _T("lfClipPrecision"), Globals.lfFont.lfClipPrecision); - SaveDword(hKey, _T("lfEscapement"), Globals.lfFont.lfEscapement); - SaveString(hKey, _T("lfFaceName"), Globals.lfFont.lfFaceName); - SaveDword(hKey, _T("lfItalic"), Globals.lfFont.lfItalic); - SaveDword(hKey, _T("lfOrientation"), Globals.lfFont.lfOrientation); - SaveDword(hKey, _T("lfOutPrecision"), Globals.lfFont.lfOutPrecision); - SaveDword(hKey, _T("lfPitchAndFamily"), Globals.lfFont.lfPitchAndFamily); - SaveDword(hKey, _T("lfQuality"), Globals.lfFont.lfQuality); - SaveDword(hKey, _T("lfStrikeOut"), Globals.lfFont.lfStrikeOut); - SaveDword(hKey, _T("lfUnderline"), Globals.lfFont.lfUnderline); - SaveDword(hKey, _T("lfWeight"), Globals.lfFont.lfWeight); - SaveDword(hKey, _T("iPointSize"), PointSizeFromHeight(Globals.lfFont.lfHeight)); - SaveDword(hKey, _T("fWrap"), Globals.bWrapLongLines ? 1 : 0); - SaveDword(hKey, _T("fStatusBar"), Globals.bShowStatusBar ? 1 : 0); - SaveDword(hKey, _T("iWindowPosX"), Globals.main_rect.left); - SaveDword(hKey, _T("iWindowPosY"), Globals.main_rect.top); - SaveDword(hKey, _T("iWindowPosDX"), Globals.main_rect.right - Globals.main_rect.left); - SaveDword(hKey, _T("iWindowPosDY"), Globals.main_rect.bottom - Globals.main_rect.top); - RegCloseKey(hKey); - } - -} + if (RegCreateKeyEx(HKEY_CURRENT_USER, s_szRegistryKey, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hKey, &dwDisposition) + == ERROR_SUCCESS) + { + SaveDword(hKey, _T("lfCharSet"), Globals.lfFont.lfCharSet); + SaveDword(hKey, _T("lfClipPrecision"), Globals.lfFont.lfClipPrecision); + SaveDword(hKey, _T("lfEscapement"), Globals.lfFont.lfEscapement); + SaveString(hKey, _T("lfFaceName"), Globals.lfFont.lfFaceName); + SaveDword(hKey, _T("lfItalic"), Globals.lfFont.lfItalic); + SaveDword(hKey, _T("lfOrientation"), Globals.lfFont.lfOrientation); + SaveDword(hKey, _T("lfOutPrecision"), Globals.lfFont.lfOutPrecision); + SaveDword(hKey, _T("lfPitchAndFamily"), Globals.lfFont.lfPitchAndFamily); + SaveDword(hKey, _T("lfQuality"), Globals.lfFont.lfQuality); + SaveDword(hKey, _T("lfStrikeOut"), Globals.lfFont.lfStrikeOut); + SaveDword(hKey, _T("lfUnderline"), Globals.lfFont.lfUnderline); + SaveDword(hKey, _T("lfWeight"), Globals.lfFont.lfWeight); + SaveDword(hKey, _T("iPointSize"), PointSizeFromHeight(Globals.lfFont.lfHeight)); + SaveDword(hKey, _T("fWrap"), Globals.bWrapLongLines ? 1 : 0); + SaveDword(hKey, _T("fStatusBar"), Globals.bShowStatusBar ? 1 : 0); + SaveDword(hKey, _T("iWindowPosX"), Globals.main_rect.left); + SaveDword(hKey, _T("iWindowPosY"), Globals.main_rect.top); + SaveDword(hKey, _T("iWindowPosDX"), Globals.main_rect.right - Globals.main_rect.left); + SaveDword(hKey, _T("iWindowPosDY"), Globals.main_rect.bottom - Globals.main_rect.top); + RegCloseKey(hKey); + } +} Modified: trunk/reactos/base/applications/notepad/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/text.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/text.c [iso-8859-1] Thu Jan 8 13:20:02 2015 @@ -24,362 +24,363 @@ static BOOL Append(LPWSTR *ppszText, DWORD *pdwTextLen, LPCWSTR pszAppendText, DWORD dwAppendLen) { - LPWSTR pszNewText; - - if (dwAppendLen > 0) - { - if (*ppszText) - { - pszNewText = (LPWSTR) HeapReAlloc(GetProcessHeap(), 0, *ppszText, (*pdwTextLen + dwAppendLen) * sizeof(WCHAR)); - } - else - { - pszNewText = (LPWSTR) HeapAlloc(GetProcessHeap(), 0, dwAppendLen * sizeof(WCHAR)); - } - - if (!pszNewText) - return FALSE; - - memcpy(pszNewText + *pdwTextLen, pszAppendText, dwAppendLen * sizeof(WCHAR)); - *ppszText = pszNewText; - *pdwTextLen += dwAppendLen; - } - return TRUE; + LPWSTR pszNewText; + + if (dwAppendLen > 0) + { + if (*ppszText) + { + pszNewText = (LPWSTR) HeapReAlloc(GetProcessHeap(), 0, *ppszText, (*pdwTextLen + dwAppendLen) * sizeof(WCHAR)); + } + else + { + pszNewText = (LPWSTR) HeapAlloc(GetProcessHeap(), 0, dwAppendLen * sizeof(WCHAR)); + } + + if (!pszNewText) + return FALSE; + + memcpy(pszNewText + *pdwTextLen, pszAppendText, dwAppendLen * sizeof(WCHAR)); + *ppszText = pszNewText; + *pdwTextLen += dwAppendLen; + } + return TRUE; } -BOOL ReadText(HANDLE hFile, LPWSTR *ppszText, DWORD *pdwTextLen, int *piEncoding, int *piEoln) +BOOL +ReadText(HANDLE hFile, LPWSTR *ppszText, DWORD *pdwTextLen, int *piEncoding, int *piEoln) { - DWORD dwSize; - LPBYTE pBytes = NULL; - LPWSTR pszText; - LPWSTR pszAllocText = NULL; - DWORD dwPos, i; - DWORD dwCharCount; - BOOL bSuccess = FALSE; - BYTE b = 0; - int iEncoding = ENCODING_ANSI; - int iCodePage = 0; - WCHAR szCrlf[2] = { '\r', '\n' }; - DWORD adwEolnCount[3] = { 0, 0, 0 }; - - *ppszText = NULL; - *pdwTextLen = 0; - - dwSize = GetFileSize(hFile, NULL); - if (dwSize == INVALID_FILE_SIZE) - goto done; - - pBytes = HeapAlloc(GetProcessHeap(), 0, dwSize + 2); - if (!pBytes) - goto done; - - if (!ReadFile(hFile, pBytes, dwSize, &dwSize, NULL)) - goto done; - dwPos = 0; - - /* Make sure that there is a NUL character at the end, in any encoding */ - pBytes[dwSize + 0] = '\0'; - pBytes[dwSize + 1] = '\0'; - - /* Look for Byte Order Marks */ - if ((dwSize >= 2) && (pBytes[0] == 0xFF) && (pBytes[1] == 0xFE)) - { - iEncoding = ENCODING_UNICODE; - dwPos += 2; - } - else if ((dwSize >= 2) && (pBytes[0] == 0xFE) && (pBytes[1] == 0xFF)) - { - iEncoding = ENCODING_UNICODE_BE; - dwPos += 2; - } - else if ((dwSize >= 3) && (pBytes[0] == 0xEF) && (pBytes[1] == 0xBB) && (pBytes[2] == 0xBF)) - { - iEncoding = ENCODING_UTF8; - dwPos += 3; - } - - switch(iEncoding) - { - case ENCODING_UNICODE_BE: - for (i = dwPos; i < dwSize-1; i += 2) - { - b = pBytes[i+0]; - pBytes[i+0] = pBytes[i+1]; - pBytes[i+1] = b; - } - /* fall through */ - - case ENCODING_UNICODE: - pszText = (LPWSTR) &pBytes[dwPos]; - dwCharCount = (dwSize - dwPos) / sizeof(WCHAR); - break; - - case ENCODING_ANSI: - case ENCODING_UTF8: - if (iEncoding == ENCODING_ANSI) - iCodePage = CP_ACP; - else if (iEncoding == ENCODING_UTF8) - iCodePage = CP_UTF8; - - if ((dwSize - dwPos) > 0) - { - dwCharCount = MultiByteToWideChar(iCodePage, 0, (LPCSTR)&pBytes[dwPos], dwSize - dwPos, NULL, 0); - if (dwCharCount == 0) - goto done; - } - else - { - /* special case for files with no characters (other than BOMs) */ - dwCharCount = 0; - } - - pszAllocText = (LPWSTR) HeapAlloc(GetProcessHeap(), 0, (dwCharCount + 1) * sizeof(WCHAR)); - if (!pszAllocText) - goto done; - - if ((dwSize - dwPos) > 0) - { - if (!MultiByteToWideChar(iCodePage, 0, (LPCSTR)&pBytes[dwPos], dwSize - dwPos, pszAllocText, dwCharCount)) - goto done; - } - - pszAllocText[dwCharCount] = '\0'; - pszText = pszAllocText; - break; - } - - dwPos = 0; - for (i = 0; i < dwCharCount; i++) - { - switch(pszText[i]) - { - case '\r': - if ((i < dwCharCount-1) && (pszText[i+1] == '\n')) - { - i++; - adwEolnCount[EOLN_CRLF]++; - break; - } - /* fall through */ - - case '\n': - if (!Append(ppszText, pdwTextLen, &pszText[dwPos], i - dwPos)) - return FALSE; - if (!Append(ppszText, pdwTextLen, szCrlf, sizeof(szCrlf) / sizeof(szCrlf[0]))) - return FALSE; - dwPos = i + 1; - - if (pszText[i] == '\r') - adwEolnCount[EOLN_CR]++; - else - adwEolnCount[EOLN_LF]++; - break; - - case '\0': - pszText[i] = ' '; - break; - } - } - - if (!*ppszText && (pszText == pszAllocText)) - { - /* special case; don't need to reallocate */ - *ppszText = pszAllocText; - *pdwTextLen = dwCharCount; - pszAllocText = NULL; - } - else - { - /* append last remaining text */ - if (!Append(ppszText, pdwTextLen, &pszText[dwPos], i - dwPos + 1)) - return FALSE; - } - - /* chose which eoln to use */ - *piEoln = EOLN_CRLF; - if (adwEolnCount[EOLN_LF] > adwEolnCount[*piEoln]) - *piEoln = EOLN_LF; - if (adwEolnCount[EOLN_CR] > adwEolnCount[*piEoln]) - *piEoln = EOLN_CR; - *piEncoding = iEncoding; - - bSuccess = TRUE; + DWORD dwSize; + LPBYTE pBytes = NULL; + LPWSTR pszText; + LPWSTR pszAllocText = NULL; + DWORD dwPos, i; + DWORD dwCharCount; + BOOL bSuccess = FALSE; + BYTE b = 0; + int iEncoding = ENCODING_ANSI; + int iCodePage = 0; + WCHAR szCrlf[2] = {'\r', '\n'}; + DWORD adwEolnCount[3] = {0, 0, 0}; + + *ppszText = NULL; + *pdwTextLen = 0; + + dwSize = GetFileSize(hFile, NULL); + if (dwSize == INVALID_FILE_SIZE) + goto done; + + pBytes = HeapAlloc(GetProcessHeap(), 0, dwSize + 2); + if (!pBytes) + goto done; + + if (!ReadFile(hFile, pBytes, dwSize, &dwSize, NULL)) + goto done; + dwPos = 0; + + /* Make sure that there is a NUL character at the end, in any encoding */ + pBytes[dwSize + 0] = '\0'; + pBytes[dwSize + 1] = '\0'; + + /* Look for Byte Order Marks */ + if ((dwSize >= 2) && (pBytes[0] == 0xFF) && (pBytes[1] == 0xFE)) + { + iEncoding = ENCODING_UNICODE; + dwPos += 2; + } + else if ((dwSize >= 2) && (pBytes[0] == 0xFE) && (pBytes[1] == 0xFF)) + { + iEncoding = ENCODING_UNICODE_BE; + dwPos += 2; + } + else if ((dwSize >= 3) && (pBytes[0] == 0xEF) && (pBytes[1] == 0xBB) && (pBytes[2] == 0xBF)) + { + iEncoding = ENCODING_UTF8; + dwPos += 3; + } + + switch(iEncoding) + { + case ENCODING_UNICODE_BE: + for (i = dwPos; i < dwSize-1; i += 2) + { + b = pBytes[i+0]; + pBytes[i+0] = pBytes[i+1]; + pBytes[i+1] = b; + } + /* fall through */ + + case ENCODING_UNICODE: + pszText = (LPWSTR) &pBytes[dwPos]; + dwCharCount = (dwSize - dwPos) / sizeof(WCHAR); + break; + + case ENCODING_ANSI: + case ENCODING_UTF8: + if (iEncoding == ENCODING_ANSI) + iCodePage = CP_ACP; + else if (iEncoding == ENCODING_UTF8) + iCodePage = CP_UTF8; + + if ((dwSize - dwPos) > 0) + { + dwCharCount = MultiByteToWideChar(iCodePage, 0, (LPCSTR)&pBytes[dwPos], dwSize - dwPos, NULL, 0); + if (dwCharCount == 0) + goto done; + } + else + { + /* special case for files with no characters (other than BOMs) */ + dwCharCount = 0; + } + + pszAllocText = (LPWSTR) HeapAlloc(GetProcessHeap(), 0, (dwCharCount + 1) * sizeof(WCHAR)); + if (!pszAllocText) + goto done; + + if ((dwSize - dwPos) > 0) + { + if (!MultiByteToWideChar(iCodePage, 0, (LPCSTR)&pBytes[dwPos], dwSize - dwPos, pszAllocText, dwCharCount)) + goto done; + } + + pszAllocText[dwCharCount] = '\0'; + pszText = pszAllocText; + break; + } + + dwPos = 0; + for (i = 0; i < dwCharCount; i++) + { + switch(pszText[i]) + { + case '\r': + if ((i < dwCharCount-1) && (pszText[i+1] == '\n')) + { + i++; + adwEolnCount[EOLN_CRLF]++; + break; + } + /* fall through */ + + case '\n': + if (!Append(ppszText, pdwTextLen, &pszText[dwPos], i - dwPos)) + return FALSE; + if (!Append(ppszText, pdwTextLen, szCrlf, sizeof(szCrlf) / sizeof(szCrlf[0]))) + return FALSE; + dwPos = i + 1; + + if (pszText[i] == '\r') + adwEolnCount[EOLN_CR]++; + else + adwEolnCount[EOLN_LF]++; + break; + + case '\0': + pszText[i] = ' '; + break; + } + } + + if (!*ppszText && (pszText == pszAllocText)) + { + /* special case; don't need to reallocate */ + *ppszText = pszAllocText; + *pdwTextLen = dwCharCount; + pszAllocText = NULL; + } + else + { + /* append last remaining text */ + if (!Append(ppszText, pdwTextLen, &pszText[dwPos], i - dwPos + 1)) + return FALSE; + } + + /* chose which eoln to use */ + *piEoln = EOLN_CRLF; + if (adwEolnCount[EOLN_LF] > adwEolnCount[*piEoln]) + *piEoln = EOLN_LF; + if (adwEolnCount[EOLN_CR] > adwEolnCount[*piEoln]) + *piEoln = EOLN_CR; + *piEncoding = iEncoding; + + bSuccess = TRUE; done: - if (pBytes) - HeapFree(GetProcessHeap(), 0, pBytes); - if (pszAllocText) - HeapFree(GetProcessHeap(), 0, pszAllocText); - - if (!bSuccess && *ppszText) - { - HeapFree(GetProcessHeap(), 0, *ppszText); - *ppszText = NULL; - *pdwTextLen = 0; - } - return bSuccess; + if (pBytes) + HeapFree(GetProcessHeap(), 0, pBytes); + if (pszAllocText) + HeapFree(GetProcessHeap(), 0, pszAllocText); + + if (!bSuccess && *ppszText) + { + HeapFree(GetProcessHeap(), 0, *ppszText); + *ppszText = NULL; + *pdwTextLen = 0; + } + return bSuccess; } static BOOL WriteEncodedText(HANDLE hFile, LPCWSTR pszText, DWORD dwTextLen, int iEncoding) { - LPBYTE pBytes = NULL; - LPBYTE pAllocBuffer = NULL; - DWORD dwPos = 0; - DWORD dwByteCount; - BYTE buffer[1024]; - UINT iCodePage = 0; - DWORD dwDummy, i; - BOOL bSuccess = FALSE; - int iBufferSize, iRequiredBytes; - BYTE b; - - while(dwPos < dwTextLen) - { - switch(iEncoding) - { - case ENCODING_UNICODE: - pBytes = (LPBYTE) &pszText[dwPos]; - dwByteCount = (dwTextLen - dwPos) * sizeof(WCHAR); - dwPos = dwTextLen; - break; - - case ENCODING_UNICODE_BE: - dwByteCount = (dwTextLen - dwPos) * sizeof(WCHAR); - if (dwByteCount > sizeof(buffer)) - dwByteCount = sizeof(buffer); - - memcpy(buffer, &pszText[dwPos], dwByteCount); - for (i = 0; i < dwByteCount; i += 2) - { - b = buffer[i+0]; - buffer[i+0] = buffer[i+1]; - buffer[i+1] = b; - } - pBytes = (LPBYTE) &buffer[dwPos]; - dwPos += dwByteCount / sizeof(WCHAR); - break; - - case ENCODING_ANSI: - case ENCODING_UTF8: - if (iEncoding == ENCODING_ANSI) - iCodePage = CP_ACP; - else if (iEncoding == ENCODING_UTF8) - iCodePage = CP_UTF8; - - iRequiredBytes = WideCharToMultiByte(iCodePage, 0, &pszText[dwPos], dwTextLen - dwPos, NULL, 0, NULL, NULL); - if (iRequiredBytes <= 0) - { - goto done; - } - else if (iRequiredBytes < sizeof(buffer)) - { - pBytes = buffer; - iBufferSize = sizeof(buffer); - } - else - { - pAllocBuffer = (LPBYTE) HeapAlloc(GetProcessHeap(), 0, iRequiredBytes); - if (!pAllocBuffer) - return FALSE; - pBytes = pAllocBuffer; - iBufferSize = iRequiredBytes; - } - - dwByteCount = WideCharToMultiByte(iCodePage, 0, &pszText[dwPos], dwTextLen - dwPos, (LPSTR) pBytes, iBufferSize, NULL, NULL); - if (!dwByteCount) - goto done; - - dwPos = dwTextLen; - break; - - default: - goto done; - } - - if (!WriteFile(hFile, pBytes, dwByteCount, &dwDummy, NULL)) - goto done; - - /* free the buffer, if we have allocated one */ - if (pAllocBuffer) - { - HeapFree(GetProcessHeap(), 0, pAllocBuffer); - pAllocBuffer = NULL; - } - } - bSuccess = TRUE; + LPBYTE pBytes = NULL; + LPBYTE pAllocBuffer = NULL; + DWORD dwPos = 0; + DWORD dwByteCount; + BYTE buffer[1024]; + UINT iCodePage = 0; + DWORD dwDummy, i; + BOOL bSuccess = FALSE; + int iBufferSize, iRequiredBytes; + BYTE b; + + while(dwPos < dwTextLen) + { + switch(iEncoding) + { + case ENCODING_UNICODE: + pBytes = (LPBYTE) &pszText[dwPos]; + dwByteCount = (dwTextLen - dwPos) * sizeof(WCHAR); + dwPos = dwTextLen; + break; + + case ENCODING_UNICODE_BE: + dwByteCount = (dwTextLen - dwPos) * sizeof(WCHAR); + if (dwByteCount > sizeof(buffer)) + dwByteCount = sizeof(buffer); + + memcpy(buffer, &pszText[dwPos], dwByteCount); + for (i = 0; i < dwByteCount; i += 2) + { + b = buffer[i+0]; + buffer[i+0] = buffer[i+1]; + buffer[i+1] = b; + } + pBytes = (LPBYTE) &buffer[dwPos]; + dwPos += dwByteCount / sizeof(WCHAR); + break; + + case ENCODING_ANSI: + case ENCODING_UTF8: + if (iEncoding == ENCODING_ANSI) + iCodePage = CP_ACP; + else if (iEncoding == ENCODING_UTF8) + iCodePage = CP_UTF8; + + iRequiredBytes = WideCharToMultiByte(iCodePage, 0, &pszText[dwPos], dwTextLen - dwPos, NULL, 0, NULL, NULL); + if (iRequiredBytes <= 0) + { + goto done; + } + else if (iRequiredBytes < sizeof(buffer)) + { + pBytes = buffer; + iBufferSize = sizeof(buffer); + } + else + { + pAllocBuffer = (LPBYTE) HeapAlloc(GetProcessHeap(), 0, iRequiredBytes); + if (!pAllocBuffer) + return FALSE; + pBytes = pAllocBuffer; + iBufferSize = iRequiredBytes; + } + + dwByteCount = WideCharToMultiByte(iCodePage, 0, &pszText[dwPos], dwTextLen - dwPos, (LPSTR) pBytes, iBufferSize, NULL, NULL); + if (!dwByteCount) + goto done; + + dwPos = dwTextLen; + break; + + default: + goto done; + } + + if (!WriteFile(hFile, pBytes, dwByteCount, &dwDummy, NULL)) + goto done; + + /* free the buffer, if we have allocated one */ + if (pAllocBuffer) + { + HeapFree(GetProcessHeap(), 0, pAllocBuffer); + pAllocBuffer = NULL; + } + } + bSuccess = TRUE; done: - if (pAllocBuffer) - HeapFree(GetProcessHeap(), 0, pAllocBuffer); - return bSuccess; + if (pAllocBuffer) + HeapFree(GetProcessHeap(), 0, pAllocBuffer); + return bSuccess; } BOOL WriteText(HANDLE hFile, LPCWSTR pszText, DWORD dwTextLen, int iEncoding, int iEoln) { - WCHAR wcBom; - LPCWSTR pszLF = L"\n"; - DWORD dwPos, dwNext; - - /* Write the proper byte order marks if not ANSI */ - if (iEncoding != ENCODING_ANSI) - { - wcBom = 0xFEFF; - if (!WriteEncodedText(hFile, &wcBom, 1, iEncoding)) - return FALSE; - } - - dwPos = 0; - - /* pszText eoln are always \r\n */ - - do - { - /* Find the next eoln */ - dwNext = dwPos; - while(dwNext < dwTextLen) - { - if (pszText[dwNext] == '\r' && pszText[dwNext + 1] == '\n') - break; - dwNext++; - } - - if (dwNext != dwTextLen) - { - switch (iEoln) - { - case EOLN_LF: - /* Write text (without eoln) */ - if (!WriteEncodedText(hFile, &pszText[dwPos], dwNext - dwPos, iEncoding)) - return FALSE; - /* Write eoln */ - if (!WriteEncodedText(hFile, pszLF, 1, iEncoding)) - return FALSE; - break; - case EOLN_CR: - /* Write text (including \r as eoln) */ - if (!WriteEncodedText(hFile, &pszText[dwPos], dwNext - dwPos + 1, iEncoding)) - return FALSE; - break; - case EOLN_CRLF: - /* Write text (including \r\n as eoln) */ - if (!WriteEncodedText(hFile, &pszText[dwPos], dwNext - dwPos + 2, iEncoding)) - return FALSE; - break; - default: - return FALSE; - } - } - else - { - /* Write text (without eoln, since this is the end of the file) */ - if (!WriteEncodedText(hFile, &pszText[dwPos], dwNext - dwPos, iEncoding)) - return FALSE; - } - - /* Skip \r\n */ - dwPos = dwNext + 2; - } - while (dwPos < dwTextLen); - - return TRUE; + WCHAR wcBom; + LPCWSTR pszLF = L"\n"; + DWORD dwPos, dwNext; + + /* Write the proper byte order marks if not ANSI */ + if (iEncoding != ENCODING_ANSI) + { + wcBom = 0xFEFF; + if (!WriteEncodedText(hFile, &wcBom, 1, iEncoding)) + return FALSE; + } + + dwPos = 0; + + /* pszText eoln are always \r\n */ + + do + { + /* Find the next eoln */ + dwNext = dwPos; + while(dwNext < dwTextLen) + { + if (pszText[dwNext] == '\r' && pszText[dwNext + 1] == '\n') + break; + dwNext++; + } + + if (dwNext != dwTextLen) + { + switch (iEoln) + { + case EOLN_LF: + /* Write text (without eoln) */ + if (!WriteEncodedText(hFile, &pszText[dwPos], dwNext - dwPos, iEncoding)) + return FALSE; + /* Write eoln */ + if (!WriteEncodedText(hFile, pszLF, 1, iEncoding)) + return FALSE; + break; + case EOLN_CR: + /* Write text (including \r as eoln) */ + if (!WriteEncodedText(hFile, &pszText[dwPos], dwNext - dwPos + 1, iEncoding)) + return FALSE; + break; + case EOLN_CRLF: + /* Write text (including \r\n as eoln) */ + if (!WriteEncodedText(hFile, &pszText[dwPos], dwNext - dwPos + 2, iEncoding)) + return FALSE; + break; + default: + return FALSE; + } + } + else + { + /* Write text (without eoln, since this is the end of the file) */ + if (!WriteEncodedText(hFile, &pszText[dwPos], dwNext - dwPos, iEncoding)) + return FALSE; + } + + /* Skip \r\n */ + dwPos = dwNext + 2; + } + while (dwPos < dwTextLen); + + return TRUE; }

1 0

[akhaldi] 66004: [RAPPS] Romanian update by Ștefan Fulea. CORE-9034
by akhaldi＠svn.reactos.org 08 Jan '15

08 Jan '15

Author: akhaldi Date: Thu Jan 8 11:05:52 2015 New Revision: 66004 URL: http://svn.reactos.org/svn/reactos?rev=66004&view=rev Log: [RAPPS] Romanian update by Ștefan Fulea. CORE-9034 Modified: trunk/reactos/base/applications/rapps/rapps/akelpad.txt Modified: trunk/reactos/base/applications/rapps/rapps/akelpad.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/akelpad.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/akelpad.txt [iso-8859-1] Thu Jan 8 11:05:52 2015 @@ -12,9 +12,9 @@ URLDownload = http://switch.dl.sourceforge.net/project/akelpad/AkelPad%204/4.9.1/AkelPad-… CDPath = none +[Section.0418] +Description = AkelPad - editor de text simplu. Este un program cu sursÄ deschisÄ, conceput pentru a fi mic Èi rapid. +Size = 1,11 Mo + [Section.0419] Description = AkelPad - ÑÐµÐºÑÑÐ¾Ð²ÑÐ¹ ÑÐµÐ´Ð°ÐºÑÐ¾Ñ Ñ Ð¾ÑÐºÑÑÑÑÐ¼ Ð¸ÑÑÐ¾Ð´Ð½ÑÐ¼ ÐºÐ¾Ð´Ð¾Ð¼, ÑÐ¾Ð·Ð´Ð°Ð½Ð½ÑÐ¹, ÑÑÐ¾Ð±Ñ Ð±ÑÑÑ Ð¼Ð°Ð»ÐµÐ½ÑÐºÐ¸Ð¼ Ð¸ Ð±ÑÑÑÑÑÐ¼. -Size = 1.11 MB - - -

1 0

[akhaldi] 66002: [TRANSLATIONS] General maintenance of Romanian resources by Ștefan Fulea. CORE-9034
by akhaldi＠svn.reactos.org 08 Jan '15

08 Jan '15

Author: akhaldi Date: Thu Jan 8 10:54:20 2015 New Revision: 66002 URL: http://svn.reactos.org/svn/reactos?rev=66002&view=rev Log: [TRANSLATIONS] General maintenance of Romanian resources by Ștefan Fulea. CORE-9034 Added: trunk/reactos/base/applications/cmdutils/tree/lang/ro-RO.rc (with props) trunk/reactos/base/applications/cmdutils/whoami/lang/ro-RO.rc (with props) trunk/reactos/base/applications/osk/lang/ro-RO.rc (with props) trunk/reactos/dll/shellext/stobject/lang/ro-RO.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/doskey/lang/ro-RO.rc trunk/reactos/base/applications/cmdutils/tree/tree.rc trunk/reactos/base/applications/cmdutils/whoami/whoami.rc trunk/reactos/base/applications/network/net/lang/ro-RO.rc trunk/reactos/base/applications/osk/rsrc.rc trunk/reactos/base/applications/sndrec32/lang/ro-RO.rc trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc trunk/reactos/base/setup/usetup/lang/ro-RO.h trunk/reactos/base/shell/cmd/lang/ro-RO.rc trunk/reactos/base/shell/explorer/lang/ro-RO.rc trunk/reactos/dll/shellext/netshell/lang/ro-RO.rc trunk/reactos/dll/shellext/stobject/stobject.rc trunk/reactos/dll/win32/browseui/lang/ro-RO.rc trunk/reactos/dll/win32/kernel32/winnls/lang/ro-RO.rc trunk/reactos/dll/win32/msgina/lang/ro-RO.rc trunk/reactos/dll/win32/shell32/lang/ro-RO.rc Modified: trunk/reactos/base/applications/cmdutils/doskey/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/doskey/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/doskey/lang/ro-RO.rc [iso-8859-1] Thu Jan 8 10:54:20 2015 @@ -6,7 +6,7 @@ * 2011-10-17 diacritics change, other minor changes */ -LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL +LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN Added: trunk/reactos/base/applications/cmdutils/tree/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/tree/lang/ro-RO.rc (added) +++ trunk/reactos/base/applications/cmdutils/tree/lang/ro-RO.rc [iso-8859-1] Thu Jan 8 10:54:20 2015 @@ -0,0 +1,12 @@ +LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_USAGE "AfiÈeazÄ o structura de fiÈiere a unui director sau unitÄÈi de stocare.\n\n\ +TREE [unitate:][cale] [/F] [/A]\n\n\ +\t/F AfiÈeazÄ numele fiÈierelor din fiecare director.\n\ +\t/A FoloseÈte ASCII Ã®n loc de caractere extinse.\n" + IDS_NO_SUBDIRECTORIES "Nu existÄ subdirectoare" + IDS_FOLDER_PATH "Enumerarea directorului CALE\n" + IDS_VOL_SERIAL "NumÄrul de serie al volumului este %x:%x\n" +END Propchange: trunk/reactos/base/applications/cmdutils/tree/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/tree/tree.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/tree/tree.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/tree/tree.rc [iso-8859-1] Thu Jan 8 10:54:20 2015 @@ -20,6 +20,9 @@ #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif #ifdef LANGUAGE_RU_RU #include "lang/ru-RU.rc" #endif Added: trunk/reactos/base/applications/cmdutils/whoami/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/whoami/lang/ro-RO.rc (added) +++ trunk/reactos/base/applications/cmdutils/whoami/lang/ro-RO.rc [iso-8859-1] Thu Jan 8 10:54:20 2015 @@ -0,0 +1,57 @@ +LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_USER_HEADER "INFORMAÈII DE UTILIZATOR" + IDS_GROU_HEADER "INFORMAÈII DE GRUP" + IDS_PRIV_HEADER "INFORMAÈII DE PRIVILEGIU" + IDS_COL_USER_NAME "Nume utilizator" + IDS_COL_GROUP_NAME "Nume grup" + IDS_COL_TYPE "Tip" + IDS_COL_SID "SID" + IDS_COL_ATTRIB "Atribute" + IDS_COL_PRIV_NAME "Privilegiu" + IDS_COL_DESCRIPTION "Descriere" + IDS_COL_STATE "Stare" + IDS_TP_WELL_KNOWN_GROUP "Grup binecunoscut" + IDS_TP_ALIAS "Alias" + IDS_TP_LABEL "EtichetÄ" + + /* [!] important note from the programmer: the program tries to remove + the last ', ' after concatenating, so keep than in mind when translating. + + you can test your translation of these attributes by using 'whoami /groups' */ + + IDS_ATTR_GROUP_MANDATORY "Grup obligatoriu, " + IDS_ATTR_GROUP_ENABLED_BY_DEFAULT "Activat implicit, " + IDS_ATTR_GROUP_ENABLED "Grup activat, " + IDS_ATTR_GROUP_OWNER "Posesorul grupului, " + IDS_UNKNOWN_DESCRIPTION "???" + IDS_STATE_ENABLED "Activat" + IDS_STATE_DISABLED "Dezactivat" + IDS_ERROR_UPN "EROARE: Nu se poate obÈine Numele Principal al Utilizatorului (UPN) deoarece\n utilizatorul actualmente autentificat nu este un un utilizator de domeniu.\n" + IDS_ERROR_FQDN "EROARE: Nu se poate obÈine Numele Complet Distinctiv Calificat (FQDN) deoarece\nutilizatorul actualmente autentificat nu este un un utilizator de domeniu.\n" + IDS_ERROR_VALUEXPECTED "EROARE: SintaxÄ eronatÄ. Este aÈteptatÄ o valoare pentru Â«/foÂ».\nTastaÈi ""WHOAMI /?"" pentru informaÈii de utilizare.\n" + IDS_ERROR_VALUENOTALLOWED "EROARE: SintaxÄ eronatÄ. Valoarea Â«%sÂ» nu este permisÄ pentru opÈiunea Â«/foÂ».\nTastaÈi ""WHOAMI /?"" pentru informaÈii de utilizare.\n" + IDS_ERROR_1TIMES "EROARE: SintaxÄ eronatÄ. Utilizarea opÈiunii Â«%sÂ» nu este permisÄ mai mult de o\nsingurÄ datÄ.\nTastaÈi ""WHOAMI /?"" pentru informaÈii de utilizare.\n" + IDS_ERROR_INVALIDSYNTAX "EROARE: SintaxÄ eronatÄ.\nTastaÈi ""WHOAMI /?"" pentru informaÈii de utilizare.\n" + IDS_ERROR_INVALIDARG "EROARE: Argument/opÈiune eronat(Ä) - Â«%sÂ».\nTastaÈi ""WHOAMI /?"" pentru informaÈii de utilizare.\n" + IDS_ERROR_NH_LIST "EROARE: OpÈiunea /NH nu poate fi utilizatÄ Ã®n formatul LIST.\nTastaÈi ""WHOAMI /?"" pentru informaÈii de utilizare.\n" + IDS_HELP "DESCRIERE:\n\ + AfiÈeazÄ informaÈiile de utilizator, de grup, Èi de privilegii pentru un\n\ + utilizator autentificat local. DacÄ nu sunt furnizate argumente, se vor afiÈa\n\ + numele Èi domeniul utilizatorului curent.\n\ + \n\ + Formatele disponibile pentru opÈiunea Â«/foÂ» sunt Â«csvÂ», Â«listÂ», Èi Â«tableÂ».\n\ + Argumentul Â«/nhÂ» ascunde anteturile. Datele sunt implicit afiÈate tabelar.\n\ + \n\ + SINTAXÄ:\n\ + whoami [/upn | /fqdn | /logonid] \n\ + whoami {[/user] [/groups] [/priv]} [/fo <Format>] [/nh] \n\ + whoami /all [/fo <Format>] [/nh] \n\ + \n\ + EXEMPLE: \n\ + whoami /groups /priv /nh /fo csv \n\ + whoami /logonid \n\ + whoami \n" +END Propchange: trunk/reactos/base/applications/cmdutils/whoami/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/whoami/whoami.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/whoami/whoami.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/whoami/whoami.rc [iso-8859-1] Thu Jan 8 10:54:20 2015 @@ -25,6 +25,9 @@ #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif #ifdef LANGUAGE_RU_RU #include "lang/ru-RU.rc" #endif Modified: trunk/reactos/base/applications/network/net/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/lang/ro-RO.rc [iso-8859-1] Thu Jan 8 10:54:20 2015 @@ -24,9 +24,9 @@ IDS_GROUP_HELP "GROUP\n..." IDS_HELPMSG_SYNTAX "Utilizare:\nNET HELPMSG <Error Code>" IDS_HELPMSG_HELP "HELPMSG\n..." - IDS_LOCALGROUP_SYNTAX "Utilizare:\nNET LOCALGROUP [groupname [/COMMENT:""text""]] [/DOMAIN]\n\ - groupname {/ADD [/COMMENT:""text""] | /DELETE} [/DOMAIN]\n\ - groupname name [...] {/ADD | /DELETE} [/DOMAIN]" + IDS_LOCALGROUP_SYNTAX "Utilizare:\nNET LOCALGROUP [nume-de-grup [/COMMENT:""text""]] [/DOMAIN]\n\ + nume-de-grup {/ADD [/COMMENT:""text""] | /DELETE} [/DOMAIN]\n\ + nume-de-grup nume [...] {/ADD | /DELETE} [/DOMAIN]" IDS_LOCALGROUP_HELP "LOCALGROUP\n..." IDS_NAME_SYNTAX "Utilizare:\nNET NAME ..." IDS_NAME_HELP "NAME\n..." @@ -50,9 +50,9 @@ IDS_TIME_HELP "TIME\n..." IDS_USE_SYNTAX "Utilizare:\nNET USE ..." IDS_USE_HELP "USE\n..." - IDS_USER_SYNTAX "Utilizare:\nNET USER [username [password | *] [options]] [/DOMAIN]\n\ - username {password | *} /ADD [options] [/DOMAIN]\n\ - username [/DELETE] [/DOMAIN]" + IDS_USER_SYNTAX "Utilizare:\nNET USER [nume-utilizator [parolÄ | *] [opÈiuni]] [/DOMAIN]\n\ + nume-utilizator {parolÄ | *} /ADD [opÈiuni] [/DOMAIN]\n\ + nume-utilizator [/DELETE] [/DOMAIN]" IDS_USER_HELP "USER\n..." IDS_VIEW_SYNTAX "Utilizare:\nNET VIEW ..." IDS_VIEW_HELP "VIEW\n..." @@ -71,59 +71,59 @@ HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION |\n\ SHARE | START | STATISTICS | STOP | TIME | USE | NET USER | VIEW ]\n" - IDS_ACCOUNTS_FORCE_LOGOFF "Force logoff after" - IDS_ACCOUNTS_LOGOFF_SECONDS "%lu seconds" - IDS_ACCOUNTS_MIN_PW_AGE "Minimum password age (in days)" - IDS_ACCOUNTS_MAX_PW_AGE "Maximum password age (in days)" - IDS_ACCOUNTS_MIN_PW_LENGTH "Minimum password length" - IDS_ACCOUNTS_PW_HIST_LENGTH "Password history length" - IDS_ACCOUNTS_LOCKOUT_THRESHOLD "Lockout threshold" - IDS_ACCOUNTS_LOCKOUT_DURATION "Lockout duration (in minutes)" - IDS_ACCOUNTS_LOCKOUT_WINDOW "Lockout observation window (in minutes)" - IDS_ACCOUNTS_COMPUTER_ROLE "Computer role" - IDS_ACCOUNTS_PRIMARY_SERVER "Primary server" - IDS_ACCOUNTS_BACKUP_SERVER "Backup server" - IDS_ACCOUNTS_STANDALONE_SERVER "Standalone server" - IDS_ACCOUNTS_WORKSTATION "Workstation" + IDS_ACCOUNTS_FORCE_LOGOFF "ForÈeazÄ deautentificarea dupÄ" + IDS_ACCOUNTS_LOGOFF_SECONDS "%lu secunde" + IDS_ACCOUNTS_MIN_PW_AGE "VÃ¢rsta minimÄ a parolei (Ã®n zile)" + IDS_ACCOUNTS_MAX_PW_AGE "VÃ¢rsta maximÄ a parolei (Ã®n zile)" + IDS_ACCOUNTS_MIN_PW_LENGTH "Lungimea minimÄ a parolei" + IDS_ACCOUNTS_PW_HIST_LENGTH "Lungimea istoricului parolei" + IDS_ACCOUNTS_LOCKOUT_THRESHOLD "Pragul de blocare" + IDS_ACCOUNTS_LOCKOUT_DURATION "Durata de blocare (Ã®n minute)" + IDS_ACCOUNTS_LOCKOUT_WINDOW "Fereastra de observare a blocÄrii (Ã®n minute)" + IDS_ACCOUNTS_COMPUTER_ROLE "Rolul calculatorului" + IDS_ACCOUNTS_PRIMARY_SERVER "Server primar" + IDS_ACCOUNTS_BACKUP_SERVER "Server de rezervÄ" + IDS_ACCOUNTS_STANDALONE_SERVER "Server de sine stÄtÄtor" + IDS_ACCOUNTS_WORKSTATION "StaÈie de lucru" - IDS_LOCALGROUP_ALIASES "Aliases for \\\\%s" - IDS_LOCALGROUP_ALIAS_NAME "Alias name" - IDS_LOCALGROUP_COMMENT "Comment" - IDS_LOCALGROUP_MEMBERS "Members" + IDS_LOCALGROUP_ALIASES "Alias pentru \\\\%s" + IDS_LOCALGROUP_ALIAS_NAME "Nume alias" + IDS_LOCALGROUP_COMMENT "Comentariu" + IDS_LOCALGROUP_MEMBERS "Membri" - IDS_USER_ACCOUNTS "User accounts for \\\\%s" - IDS_USER_NAME "User name" - IDS_USER_FULL_NAME "Full name" - IDS_USER_COMMENT "Comment" - IDS_USER_USER_COMMENT "User comment" - IDS_USER_COUNTRY_CODE "Country code" - IDS_USER_ACCOUNT_ACTIVE "Account active" - IDS_USER_ACCOUNT_EXPIRES "Account expires" - IDS_USER_PW_LAST_SET "Password last set" - IDS_USER_PW_EXPIRES "Password expires" - IDS_USER_PW_CHANGEABLE "Password changeable" - IDS_USER_PW_REQUIRED "Password required" - IDS_USER_CHANGE_PW "User may change password" - IDS_USER_WORKSTATIONS "Workstations allowed" - IDS_USER_LOGON_SCRIPT "Logon script" - IDS_USER_PROFILE "User profile" - IDS_USER_HOME_DIR "Home directory" - IDS_USER_LAST_LOGON "Last logon" - IDS_USER_LOGON_HOURS "Logon hours allowed" - IDS_USER_LOCAL_GROUPS "Local group memberships" - IDS_USER_GLOBAL_GROUPS "Global group memberships" + IDS_USER_ACCOUNTS "Conturi de utilizator pentru \\\\%s" + IDS_USER_NAME "Nume utilizator" + IDS_USER_FULL_NAME "Nume complet" + IDS_USER_COMMENT "Comentariu" + IDS_USER_USER_COMMENT "Comentariu de utilizator" + IDS_USER_COUNTRY_CODE "Cod de Å£arÄ" + IDS_USER_ACCOUNT_ACTIVE "Cont activ" + IDS_USER_ACCOUNT_EXPIRES "Cont expirÄ" + IDS_USER_PW_LAST_SET "ParolÄ recent instituitÄ" + IDS_USER_PW_EXPIRES "ParolÄ expirÄ" + IDS_USER_PW_CHANGEABLE "ParolÄ modificabilÄ" + IDS_USER_PW_REQUIRED "ParolÄ necesarÄ" + IDS_USER_CHANGE_PW "Utilizatorul poate schimba parola" + IDS_USER_WORKSTATIONS "StaÅ£ii de lucru permise" + IDS_USER_LOGON_SCRIPT "Script de autentificare" + IDS_USER_PROFILE "Profil de utilizator" + IDS_USER_HOME_DIR "Director personal" + IDS_USER_LAST_LOGON "UltimÄ autentificare" + IDS_USER_LOGON_HOURS "Ore de autentificare permise" + IDS_USER_LOCAL_GROUPS "ApartenenÅ£Ä grup local" + IDS_USER_GLOBAL_GROUPS "ApartenenÅ£Ä grup global" - IDS_USER_ENTER_PASSWORD1 "Enter a new password for the user: " - IDS_USER_ENTER_PASSWORD2 "Enter the password again: " - IDS_USER_NO_PASSWORD_MATCH "The passwords do not match!" + IDS_USER_ENTER_PASSWORD1 "IntroduceÅ£i o parolÄ nouÄ pentru utilizatorul (curent): " + IDS_USER_ENTER_PASSWORD2 "IntroduceÈi din nou parola: " + IDS_USER_NO_PASSWORD_MATCH "Parolele diferÄ!" - IDS_GENERIC_YES "Yes" - IDS_GENERIC_NO "No" - IDS_GENERIC_NEVER "Never" - IDS_GENERIC_NONE "None" - IDS_GENERIC_ALL "All" - IDS_GENERIC_LOCKED "Locked" + IDS_GENERIC_YES "Da" + IDS_GENERIC_NO "Nu" + IDS_GENERIC_NEVER "NiciodatÄ" + IDS_GENERIC_NONE "Nespecificat" + IDS_GENERIC_ALL "Toate" + IDS_GENERIC_LOCKED "Blocat" - IDS_ERROR_OPTION_NOT_SUPPORTED "The %s option is not supported yet.\n" - IDS_ERROR_INVALID_OPTION_VALUE "You entered an invalid value for the %s option.\n" + IDS_ERROR_OPTION_NOT_SUPPORTED "OpÅ£iunea %s Ã®ncÄ nu este admisÄ.\n" + IDS_ERROR_INVALID_OPTION_VALUE "AÅ£i introdus o valoare nevalidÄ pentru opÅ£iunea %s.\n" END Added: trunk/reactos/base/applications/osk/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/osk/lang… ============================================================================== --- trunk/reactos/base/applications/osk/lang/ro-RO.rc (added) +++ trunk/reactos/base/applications/osk/lang/ro-RO.rc [iso-8859-1] Thu Jan 8 10:54:20 2015 @@ -0,0 +1,129 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/osk/lang/ro-RO.rc + * PURPOSE: On screen keyboard (Romanian resources). + * PROGRAMMERS: Denis ROBERT + * TRANSLATORS: Ètefan Fulea (stefan dot fulea at mail dot md) + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT + +MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164 +CAPTION "TastaturÄ virtualÄ" +FONT 8, "MS Shell Dlg" +EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE +BEGIN + PUSHBUTTON "Esc",SCAN_CODE_110,3,3,23,22 + PUSHBUTTON "F1",SCAN_CODE_112,48,3,23,22 + PUSHBUTTON "F2",SCAN_CODE_113,75,3,23,22 + PUSHBUTTON "F3",SCAN_CODE_114,101,3,23,22 + PUSHBUTTON "F4",SCAN_CODE_115,128,3,23,22 + PUSHBUTTON "F5",SCAN_CODE_116,173,3,23,22 + PUSHBUTTON "F6",SCAN_CODE_117,199,3,23,22 + PUSHBUTTON "F7",SCAN_CODE_118,225,3,23,22 + PUSHBUTTON "F8",SCAN_CODE_119,251,3,23,22 + PUSHBUTTON "F9",SCAN_CODE_120,296,3,23,22 + PUSHBUTTON "F10",SCAN_CODE_121,323,3,23,22 + PUSHBUTTON "F11",SCAN_CODE_122,350,3,23,22 + PUSHBUTTON "F12",SCAN_CODE_123,377,3,23,22 + PUSHBUTTON "Prn",SCAN_CODE_124,411,3,23,22 + PUSHBUTTON "Stop",SCAN_CODE_125,438,3,23,22 + PUSHBUTTON "Attn",SCAN_CODE_126,465,3,23,22 + PUSHBUTTON "`",SCAN_CODE_1,3,35,23,22 + PUSHBUTTON "1",SCAN_CODE_2,30,35,23,22 + PUSHBUTTON "2",SCAN_CODE_3,57,35,23,22 + PUSHBUTTON "3",SCAN_CODE_4,84,35,23,22 + PUSHBUTTON "4",SCAN_CODE_5,111,35,23,22 + PUSHBUTTON "5",SCAN_CODE_6,138,35,23,22 + PUSHBUTTON "6",SCAN_CODE_7,165,35,23,22 + PUSHBUTTON "7",SCAN_CODE_8,192,35,23,22 + PUSHBUTTON "8",SCAN_CODE_9,219,35,23,22 + PUSHBUTTON "9",SCAN_CODE_10,246,35,23,22 + PUSHBUTTON "0",SCAN_CODE_11,273,35,23,22 + PUSHBUTTON "-",SCAN_CODE_12,300,35,23,22 + PUSHBUTTON "=",SCAN_CODE_13,327,35,23,22 + PUSHBUTTON "<--",SCAN_CODE_15,354,35,47,22,BS_ICON + PUSHBUTTON "Tab",SCAN_CODE_16,3,61,35,22,BS_ICON + PUSHBUTTON "Q",SCAN_CODE_17,42,61,23,22 + PUSHBUTTON "W",SCAN_CODE_18,69,61,23,22 + PUSHBUTTON "E",SCAN_CODE_19,96,61,23,22 + PUSHBUTTON "R",SCAN_CODE_20,123,61,23,22 + PUSHBUTTON "T",SCAN_CODE_21,150,61,23,22 + PUSHBUTTON "Y",SCAN_CODE_22,177,61,23,22 + PUSHBUTTON "U",SCAN_CODE_23,204,61,23,22 + PUSHBUTTON "I",SCAN_CODE_24,231,61,23,22 + PUSHBUTTON "O",SCAN_CODE_25,258,61,23,22 + PUSHBUTTON "P",SCAN_CODE_26,285,61,23,22 + PUSHBUTTON "[",SCAN_CODE_27,312,61,23,22 + PUSHBUTTON "]",SCAN_CODE_28,339,61,23,22 + PUSHBUTTON "\\",SCAN_CODE_29,366,61,35,22 + PUSHBUTTON "Fix cap",SCAN_CODE_30,3,87,46,22,BS_ICON + PUSHBUTTON "A",SCAN_CODE_31,53,87,23,22 + PUSHBUTTON "S",SCAN_CODE_32,80,87,23,22 + PUSHBUTTON "D",SCAN_CODE_33,107,87,23,22 + PUSHBUTTON "F",SCAN_CODE_34,134,87,23,22 + PUSHBUTTON "G",SCAN_CODE_35,161,87,23,22 + PUSHBUTTON "H",SCAN_CODE_36,188,87,23,22 + PUSHBUTTON "J",SCAN_CODE_37,215,87,23,22 + PUSHBUTTON "K",SCAN_CODE_38,242,87,23,22 + PUSHBUTTON "L",SCAN_CODE_39,269,87,23,22 + PUSHBUTTON ";",SCAN_CODE_40,296,87,23,22 + PUSHBUTTON "'",SCAN_CODE_41,323,87,23,22 + PUSHBUTTON "ret",SCAN_CODE_43,350,87,51,22,BS_ICON + PUSHBUTTON "schimb",SCAN_CODE_44,3,113,57,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "Z",SCAN_CODE_46,64,113,23,22 + PUSHBUTTON "X",SCAN_CODE_47,91,113,23,22 + PUSHBUTTON "C",SCAN_CODE_48,118,113,23,22 + PUSHBUTTON "V",SCAN_CODE_49,145,113,23,22 + PUSHBUTTON "B",SCAN_CODE_50,172,113,23,22 + PUSHBUTTON "N",SCAN_CODE_51,199,113,23,22 + PUSHBUTTON "M",SCAN_CODE_52,226,113,23,22 + PUSHBUTTON ",",SCAN_CODE_53,253,113,23,22 + PUSHBUTTON ".",SCAN_CODE_54,280,113,23,22 + PUSHBUTTON "/",SCAN_CODE_55,307,113,23,22 + PUSHBUTTON "schimb",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ctrl",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON + PUSHBUTTON "alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "",SCAN_CODE_61,116,139,143,22 + PUSHBUTTON "alt gr",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON + PUSHBUTTON "meniu",SCAN_CODE_129,332,139,30,22,BS_ICON + PUSHBUTTON "ctrl",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ins",SCAN_CODE_75,411,35,23,22 + PUSHBUTTON "Ètg",SCAN_CODE_76,411,61,23,22 + PUSHBUTTON "init",SCAN_CODE_80,438,35,23,22,BS_ICON + PUSHBUTTON "fin",SCAN_CODE_81,438,61,23,22 + PUSHBUTTON "pg sus",SCAN_CODE_85,465,35,23,22,BS_ICON + PUSHBUTTON "pg jos",SCAN_CODE_86,465,61,23,22,BS_ICON + PUSHBUTTON "<-",SCAN_CODE_79,411,139,23,22,BS_ICON + PUSHBUTTON "^",SCAN_CODE_83,438,113,23,22,BS_ICON + PUSHBUTTON "v",SCAN_CODE_84,438,139,23,22,BS_ICON + PUSHBUTTON "->",SCAN_CODE_89,465,139,23,22,BS_ICON + PUSHBUTTON "num",SCAN_CODE_90,500,35,23,22 + PUSHBUTTON "7",SCAN_CODE_91,500,61,23,22 + PUSHBUTTON "4",SCAN_CODE_92,500,87,23,22 + PUSHBUTTON "1",SCAN_CODE_93,500,113,23,22 + PUSHBUTTON "/",SCAN_CODE_95,527,35,23,22 + PUSHBUTTON "8",SCAN_CODE_96,527,61,23,22 + PUSHBUTTON "5",SCAN_CODE_97,527,87,23,22 + PUSHBUTTON "2",SCAN_CODE_98,527,113,23,22 + PUSHBUTTON "0",SCAN_CODE_99,500,139,50,22 + PUSHBUTTON "*",SCAN_CODE_100,554,35,23,22 + PUSHBUTTON "9",SCAN_CODE_101,554,61,23,22 + PUSHBUTTON "6",SCAN_CODE_102,554,87,23,22 + PUSHBUTTON "3",SCAN_CODE_103,554,113,23,22 + PUSHBUTTON ".",SCAN_CODE_104,554,139,23,22 + PUSHBUTTON "-",SCAN_CODE_105,581,35,23,22 + PUSHBUTTON "+",SCAN_CODE_106,581,61,23,48 + PUSHBUTTON "intr",SCAN_CODE_108,581,113,23,48 + CTEXT "Num",IDC_STATIC,510,4,21,8 + CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,518,16,4,3 + CTEXT "Cap",IDC_STATIC,540,4,21,8 + CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,548,16,4,3 + CTEXT "Derul",IDC_STATIC,572,4,21,8 + CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3 +END + +/* EOF */ Propchange: trunk/reactos/base/applications/osk/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/osk/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/osk/rsrc… ============================================================================== --- trunk/reactos/base/applications/osk/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/osk/rsrc.rc [iso-8859-1] Thu Jan 8 10:54:20 2015 @@ -70,6 +70,9 @@ #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif #ifdef LANGUAGE_RU_RU #include "lang/ru-RU.rc" #endif Modified: trunk/reactos/base/applications/sndrec32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/ro-RO.rc [iso-8859-1] Thu Jan 8 10:54:20 2015 @@ -14,11 +14,11 @@ IDD_ABOUTBOX DIALOGEX 0, 0, 196, 75 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Despre Ãnregistratorul Audio" +CAPTION "Despre Ãnregistratorul audio" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN ICON IDI_SNDREC32, -1, 19, 14, 21, 20 - LTEXT "Ãnregistrator Audio, versiunea 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX + LTEXT "Ãnregistrator audio, versiunea 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX LTEXT "Drept de autor (C) 2009", IDC_STATIC, 56, 25, 114, 8 DEFPUSHBUTTON "Ã&nchide", IDOK, 139, 54, 50, 14, WS_GROUP END @@ -69,7 +69,7 @@ STRINGTABLE BEGIN - IDS_APP_TITLE "Ãnregistrator Audio" + IDS_APP_TITLE "Ãnregistrator audio" IDC_REACTOS_SNDREC32 "REACTOS_SNDREC32" END Modified: trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc [iso-8859-1] Thu Jan 8 10:54:20 2015 @@ -321,7 +321,7 @@ CONTROL "In/Ex octeÈi scriÈi", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 120, 127, 110, 10 CONTROL "In/Ex altceva", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 120, 138, 110, 10 CONTROL "In/Ex octeÈi din altceva", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 120, 149, 110, 10 - CONTROL "&Linia de comandÄ", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 120, 160, 65, 10 + CONTROL "Linie de comandÄ", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 120, 160, 65, 10 END /* String Tables */ @@ -417,7 +417,7 @@ IDS_TAB_IOREADBYTES "In/Ex octeÈi citiÈi" IDS_TAB_IOWRITESBYTES "In/Ex octeÈi scriÈi" IDS_TAB_IOOTHERBYTES "In/Ex octeÈi din altceva" - IDS_TAB_COMMANDLINE "Command Line" + IDS_TAB_COMMANDLINE "Linie de comandÄ" IDS_MENU_SELECTCOLUMNS "&Selectare coloaneâ¦" IDS_MENU_16BITTASK "AfiÈeazÄ activitÄÈi pe 16 &biÈi" IDS_MENU_WINDOWS "F&erestre" Modified: trunk/reactos/base/setup/usetup/lang/ro-RO.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ro-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] Thu Jan 8 10:54:20 2015 @@ -1571,8 +1571,8 @@ }, { //ERROR_INSUFFICIENT_PARTITION_SIZE, - "The selected partition is not large enough to install ReactOS.\n" - "The install partition must have a size of at least %lu MB.\n" + "Partiîia selectatÇ este prea micÇ pentru a instala ReactOS.\n" + "Partiîia de instalare trebuie sÇ fie de cel puîin %lu Mocteîi.\n" "\n" " * Tastaîi pentru a continua.", NULL Modified: trunk/reactos/base/shell/cmd/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ro-RO.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ro-RO.rc [iso-8859-1] Thu Jan 8 10:54:20 2015 @@ -561,7 +561,7 @@ STRING_REACTOS_VERSION "ReactOS [Versiunea %s-%s]\n" STRING_CMD_SHELLINFO "\nInterpretorul de comenzi ReactOS\nVersiunea %s %s" STRING_VERSION_RUNNING_ON "OperÃ¢nd pe: " - STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" + STRING_VERSION_RUNVER "%s [Versiunea %d.%d.%d] %s" STRING_COPY_FILE " %d fiÈier(e) copiat(e)\n" STRING_DELETE_WIPE "Èters" STRING_FOR_ERROR "specificaÈie de variabilÄ eronatÄ." Modified: trunk/reactos/base/shell/explorer/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/lang/r… ============================================================================== --- trunk/reactos/base/shell/explorer/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/lang/ro-RO.rc [iso-8859-1] Thu Jan 8 10:54:20 2015 @@ -47,7 +47,7 @@ MENUITEM "&Securitateâ¦", IDM_SECURITY, MFT_STRING, MFS_ENABLED MENUITEM "Conexiuni Ã®n &reÈea", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED MENUITEM "&Imprimante Èi faxuri", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED - MENUITEM "&BarÄ de activitÄÈi Èi Meniul Pornire", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED + MENUITEM "&BarÄ de activitÄÈi Èi Meniul âPornireâ", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED END POPUP "&CÄut&are", IDM_SEARCH BEGIN @@ -71,27 +71,27 @@ BEGIN GROUPBOX "Aspectul barei de activitÄÈi", IDC_STATIC, 6, 6, 240, 104 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN, 13, 18, 224, 21 - AUTOCHECKBOX "&FixeazÄ bara de activitÄÈi", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 + AUTOCHECKBOX "Fi&xeazÄ bara de activitÄÈi", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "A&uto-ascunde bara de activitÄÈi", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 - AUTOCHECKBOX "MenÈine bara de ac&tivitÄÈi deasupra celorlalte ferestre", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 + AUTOCHECKBOX "&MenÈine bara de activitÄÈi deasupra celorlalte ferestre", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&GrupeazÄ butoanele similare din bara de activitÄÈi", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 - AUTOCHECKBOX "AratÄ bara &LansÄrilor rapide", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 + AUTOCHECKBOX "AfiÈeazÄ bara â&LansÄri rapideâ", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Meniu Pornire" +CAPTION "Meniul âPornireâ" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - AUTORADIOBUTTON "&Meniu Pornire", IDC_TASKBARPROP_STARTMENU, 7, 7, 105, 10 + AUTORADIOBUTTON "Meniul â&Pornireâ", IDC_TASKBARPROP_STARTMENU, 7, 7, 105, 10 LTEXT "Acest model de meniu oferÄ acces facil la dosare, programele favorite, Èi cÄutare.", IDC_STATIC, 20, 17, 150, 24, WS_DISABLED PUSHBUTTON "P&articularizareâ¦", IDC_TASKBARPROP_STARTMENUCUST, 182, 4, 63, 14, WS_DISABLED - AUTORADIOBUTTON "Meniu Pornire &clasic", IDC_TASKBARPROP_STARTMENUCLASSIC, 7, 47, 105, 10, WS_DISABLED + AUTORADIOBUTTON "Meniul âPornireâ &clasic", IDC_TASKBARPROP_STARTMENUCLASSIC, 7, 47, 105, 10, WS_DISABLED LTEXT "Acest model de meniu vÄ oferÄ aspectul Èi funcÈionalitatea clasicÄ", -1, 20, 57, 150, 24, WS_DISABLED PUSHBUTTON "Pa&rticularizareâ¦", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 182, 44, 63, 14, WS_DISABLED GROUPBOX "Intimitate", IDC_STATIC, 7, 100, 238, 42 - AUTOCHECKBOX "PÄstreazÄ Èi afiÈeazÄ o listÄ a &fiÈierelor deschise recent", IDC_TASKBARPROP_RECENTFILES, 14, 114, 224, 10, WS_DISABLED - AUTOCHECKBOX "PÄstreazÄ Èi afiÈeazÄ o listÄ a &programelor deschise recent", IDC_TASKBARPROP_RECENTFOLDERS, 14, 128, 224, 10, WS_DISABLED + AUTOCHECKBOX "PÄstreazÄ Èi afiÈeazÄ o listÄ a fiÈi&erelor deschise recent", IDC_TASKBARPROP_RECENTFILES, 14, 114, 224, 10, WS_DISABLED + AUTOCHECKBOX "PÄstreazÄ Èi afiÈeazÄ o listÄ a progra&melor deschise recent", IDC_TASKBARPROP_RECENTFOLDERS, 14, 128, 224, 10, WS_DISABLED END IDD_TASKBARPROP_NOTIFICATION DIALOGEX 0, 0, 252, 218 @@ -102,14 +102,14 @@ CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,7, 6, 238, 21, WS_DISABLED GROUPBOX "Pictograme", IDC_STATIC, 6, 33, 240, 58, WS_DISABLED LTEXT "PuteÈi menÈine ordonatÄ zona de notificare prin ascunderea pictogramelor neaccesate recent.", IDC_STATIC, 13, 48, 223, 16, WS_DISABLED - AUTOCHECKBOX "&Ascunde pictogramele neaccesate", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10, WS_DISABLED + AUTOCHECKBOX "Asc&unde pictogramele neaccesate", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10, WS_DISABLED PUSHBUTTON "&Particularizareâ¦", IDC_TASKBARPROP_ICONCUST, 168, 70, 70, 14, WS_DISABLED GROUPBOX "Pictograme de sistem", IDC_STATIC, 6, 97, 240, 84, WS_DISABLED LTEXT "SpecificaÈi care dintre pictogramele de sistem le doriÈi expuse.", IDC_STATIC, 13, 112, 223, 16, WS_DISABLED AUTOCHECKBOX "&Ceas", IDC_TASKBARPROP_CLOCK, 13, 126, 200, 10, WS_DISABLED AUTOCHECKBOX "&Volum", IDC_TASKBARPROP_VOLUME, 13, 139, 200, 10, WS_DISABLED AUTOCHECKBOX "&ReÈea", IDC_TASKBARPROP_NETWORK, 13, 152, 200, 10, WS_DISABLED - AUTOCHECKBOX "A&limentare", IDC_TASKBARPROP_POWER, 13, 164, 200, 10, WS_DISABLED + AUTOCHECKBOX "Ali&mentare", IDC_TASKBARPROP_POWER, 13, 164, 200, 10, WS_DISABLED END IDD_TASKBARPROP_TOOLBARS DIALOGEX 0, 0, 252, 218 @@ -127,7 +127,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "OpÈiuni avansate", IDC_STATIC, 6, 6, 240, 121 - AUTOCHECKBOX "&AfiÈeazÄ secunde", IDC_TASKBARPROP_SECONDS, 13, 18, 200, 10 + AUTOCHECKBOX "AfiÈea&zÄ secunde", IDC_TASKBARPROP_SECONDS, 13, 18, 200, 10 AUTOCHECKBOX "&PrezintÄ miniaturi ale ferestrelor", IDC_TASKBARPROP_WNDPREV, 13, 31, 200, 10 END @@ -135,8 +135,8 @@ BEGIN IDS_START "Pornire" IDS_PROPERTIES "P&referinÈe" - IDS_OPEN_ALL_USERS "&Deschide ToÈi Utilizatorii" - IDS_EXPLORE_ALL_USERS "E&xploreazÄ ToÈi Utilizatorii" + IDS_OPEN_ALL_USERS "&Deschide âToÈi utilizatoriiâ" + IDS_EXPLORE_ALL_USERS "E&xploreazÄ âToÈi utilizatoriiâ" IDS_STARTUP_ERROR "Pornirea exploratorului a eÈuat din cauza informaÈiilor lipsÄ sau corupte din registru." END Modified: trunk/reactos/dll/shellext/netshell/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… ============================================================================== --- trunk/reactos/dll/shellext/netshell/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/netshell/lang/ro-RO.rc [iso-8859-1] Thu Jan 8 10:54:20 2015 @@ -1,4 +1,7 @@ -/* 2011.12.10 - Fulea Ètefan: minor changes */ +/* +Translators: Petru Dumitriu (petrimetri at gmail dot com) + Ètefan Fulea (stefan dot fulea at mail dot md) +*/ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL Added: trunk/reactos/dll/shellext/stobject/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/lang… ============================================================================== --- trunk/reactos/dll/shellext/stobject/lang/ro-RO.rc (added) +++ trunk/reactos/dll/shellext/stobject/lang/ro-RO.rc [iso-8859-1] Thu Jan 8 10:54:20 2015 @@ -0,0 +1,53 @@ +/* Ètefan Fulea (stefan dot fulea at mail dot md) */ +LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT + +IDD_POWER_METER DIALOGEX 0, 0, 252, 218 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Consum de energie" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Stare", 1001, BUTTON, BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 9, 20, 234, 189 + CONTROL "&AfiÈeazÄ pictogramÄ Ã®n bara de activitÄÈi.", 1002, BUTTON, BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 6, 6, 120, 10 + CONTROL "AfiÈeazÄ detalii pentru fiecare &baterie.", 1003, BUTTON, BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 135, 6, 120, 8 + CONTROL "", 1000, STATIC, SS_LEFT | WS_CHILD | WS_GROUP, 11, 29, 229, 178 +END + +STRINGTABLE +BEGIN + //Power related strings + IDS_PWR_PROPERTIES "&Ajustare proprietÄÈi de consum energie" + IDS_PWR_METER "&Deschide Contor de energie" + IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" + IDS_PWR_PERCENT_REMAINING "Au mai rÄmas %1!u!%%" + IDS_PWR_CHARGING " (se Ã®ncarcÄ)" + IDS_PWR_UNKNOWN_REMAINING "Nu se cunoaÈte cÃ¢t a mai rÄmas" + IDS_PWR_AC "Ãn reÈea de CA" + IDS_PWR_HOURS_REMAINING "Au mai rÄmas %1!u!:%2!02u! ore (%3!u!%%)" + IDS_PWR_MINUTES_REMAINING "Au mai rÄmas %1!u! min (%2!u!%%)" + + //Hotplug related strings + IDS_HOTPLUG_REMOVE_1 "Scoate Ã®n siguranÈÄ acest dispozitiv" + IDS_HOTPLUG_REMOVE_2 "&Scoate Ã®n siguranÈÄ acest dispozitiv" + IDS_HOTPLUG_REMOVE_3 "Scoate Ã®n siguranÈÄ %s" + IDS_HOTPLUG_RUN "shell32.dll,Control_RunDLL hotplug.dll" + IDS_HOTPLUG_COMMA ", " + IDS_HOTPLUG_DRIVE " - unitate (%s)" + IDS_HOTPLUG_DRIVES " - unitÄÈi (%s)" + IDS_HOTPLUG_A "A:" + IDS_HOTPLUG_REQUIERES "Acest dispozitiv necesitÄ âScoatere Ã®n siguranÈÄâ" + IDS_HOTPLUG_CLICK "Ãnainte de a scoate acest dispozitiv, apÄsaÈi pe aceastÄ pictogramÄ Èi selectaÈi dispozitivul pe care doriÈi sÄ-l scoateÈi." + + //Volume related strings + IDS_VOL_VOLUME "Volum" + IDS_VOL_ADJUST "&AjusteazÄ proprietÄÈi audio" + IDS_VOL_OPEN "&Deschide control de volum" + IDS_VOL_RUN "SNDVOL32.EXE" + IDS_VOL_MUTED "Volum (mut)" + + //Keyboard-Mouse related strings + IDS_KEYS_STICKY "TasteLipicioase" + IDS_KEYS_MOUSE "TasteÈoricel" + IDS_KEYS_FILTER "FiltruTaste" +END + Propchange: trunk/reactos/dll/shellext/stobject/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/shellext/stobject/stobject.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/stob… ============================================================================== --- trunk/reactos/dll/shellext/stobject/stobject.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/stobject.rc [iso-8859-1] Thu Jan 8 10:54:20 2015 @@ -26,6 +26,9 @@ #ifdef LANGUAGE_ES_ES #include "lang/es-ES.rc" #endif +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif #ifdef LANGUAGE_TR_TR #include "lang/tr-TR.rc" #endif Modified: trunk/reactos/dll/win32/browseui/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/ro… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/ro-RO.rc [iso-8859-1] Thu Jan 8 10:54:20 2015 @@ -8,12 +8,12 @@ BEGIN POPUP "", 264,MFT_STRING,MFS_ENABLED BEGIN - MENUITEM "Butoane &standard", IDM_TOOLBARS_STANDARDBUTTONS, MFT_STRING, MFS_ENABLED - MENUITEM "Bara de &adresÄ", IDM_TOOLBARS_ADDRESSBAR, MFT_STRING, MFS_ENABLED - MENUITEM "Butoane a&drese", IDM_TOOLBARS_LINKSBAR, MFT_STRING, MFS_ENABLED + MENUITEM "Butoane st&andard", IDM_TOOLBARS_STANDARDBUTTONS, MFT_STRING, MFS_ENABLED + MENUITEM "Bara de a&dresÄ", IDM_TOOLBARS_ADDRESSBAR, MFT_STRING, MFS_ENABLED + MENUITEM "Butoane ad&rese", IDM_TOOLBARS_LINKSBAR, MFT_STRING, MFS_ENABLED MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&FixeazÄ panourile de instrumente", IDM_TOOLBARS_LOCKTOOLBARS, MFT_STRING, MFS_ENABLED - MENUITEM "Parti&cularizareâ¦", IDM_TOOLBARS_CUSTOMIZE, MFT_STRING, MFS_ENABLED + MENUITEM "&Particularizareâ¦", IDM_TOOLBARS_CUSTOMIZE, MFT_STRING, MFS_ENABLED MENUITEM "&Etichete de text", IDM_TOOLBARS_TEXTLABELS, MFT_STRING, MFS_ENABLED MENUITEM "Butonul de &navigare", IDM_TOOLBARS_GOBUTTON, MFT_STRING, MFS_ENABLED END @@ -32,11 +32,11 @@ END POPUP "&AfiÈare", FCIDM_MENU_VIEW BEGIN - POPUP "Ins&trumente", IDM_VIEW_TOOLBARS + POPUP "Instru&mente", IDM_VIEW_TOOLBARS BEGIN MENUITEM "", -1, MFT_SEPARATOR END - MENUITEM "BarÄ de &stare", IDM_VIEW_STATUSBAR + MENUITEM "BarÄ de st&are", IDM_VIEW_STATUSBAR POPUP "BarÄ de &explorare", IDM_VIEW_EXPLORERBAR BEGIN MENUITEM "&CÄutare\tCtrl+E", IDM_EXPLORERBAR_SEARCH @@ -55,28 +55,39 @@ MENUITEM "", -1, MFT_SEPARATOR MENUITEM "PaginÄ &iniÈialÄ\tAlt+Home", IDM_GOTO_HOMEPAGE END - MENUITEM "Ã&mprospÄtare", IDM_VIEW_REFRESH + MENUITEM "Ãmp&rospÄtare", IDM_VIEW_REFRESH END POPUP "Fa&vorite", FCIDM_MENU_FAVORITES BEGIN - MENUITEM "&AdÄugare la favoriteâ¦", IDM_FAVORITES_ADDTOFAVORITES - MENUITEM "&Organizare favoriteâ¦", IDM_FAVORITES_ORGANIZEFAVORITES + MENUITEM "&AdÄugare la âFavoriteââ¦", IDM_FAVORITES_ADDTOFAVORITES + MENUITEM "&Organizare âFavoriteââ¦", IDM_FAVORITES_ORGANIZEFAVORITES MENUITEM "", -1, MFT_SEPARATOR MENUITEM "(gol)", IDM_FAVORITES_EMPTY END - POPUP "Ins&trumente", FCIDM_MENU_TOOLS + POPUP "Instru&mente", FCIDM_MENU_TOOLS BEGIN MENUITEM "Creare unitate de &reÈeaâ¦", IDM_TOOLS_MAPNETWORKDRIVE MENUITEM "&DebranÈare unitate de reÈeaâ¦", IDM_TOOLS_DISCONNECTNETWORKDRIVE - MENUITEM "&Sincronizareâ¦", IDM_TOOLS_SYNCHRONIZE + MENUITEM "Sincroni&zareâ¦", IDM_TOOLS_SYNCHRONIZE MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&OpÈiuni de dosarâ¦", IDM_TOOLS_FOLDEROPTIONS END POPUP "&?", FCIDM_MENU_HELP BEGIN - MENUITEM "Este aceastÄ copie a ReactOS &legalÄ?", IDM_HELP_ISTHISCOPYLEGAL + MENUITEM "&Este aceastÄ copie a ReactOS legalÄ?", IDM_HELP_ISTHISCOPYLEGAL MENUITEM "&Despreâ¦", IDM_HELP_ABOUT END +END + +IDM_TASKBAR_TOOLBARS MENUEX +BEGIN + POPUP "&Bare de instrumente", -1, MFT_STRING, MFS_ENABLED, 0 + BEGIN + MENUITEM "&Birou", IDM_TASKBAR_TOOLBARS_DESKTOP, MFT_STRING, MFS_GRAYED + MENUITEM "&LansÄri rapide", IDM_TASKBAR_TOOLBARS_QUICKLAUNCH, MFT_STRING, MFS_GRAYED + MENUITEM "", -1, MFT_SEPARATOR, MFS_ENABLED + MENUITEM "BarÄ de instrumente &nouÄâ¦", IDM_TASKBAR_TOOLBARS_NEW, MFT_STRING, MFS_GRAYED + END END /* Dialogs */ @@ -113,7 +124,7 @@ STRINGTABLE BEGIN - 800 "ConÈine comenzile de selecÈiie." + 800 "ConÈine comenzile de selecÈie." END STRINGTABLE @@ -139,7 +150,7 @@ STRINGTABLE BEGIN 9025 "Ãnchide fereastra." - 9026 "DeplaseazÄ Ã®n sus cu un nivel." + 9026 "Un nivel Ã®n sus." END STRINGTABLE @@ -164,8 +175,8 @@ STRINGTABLE BEGIN - 9362 "Deschide dosarul Favorite." - 9363 "AdaugÄ pagina curentÄ Ã®n lista Favorite." + 9362 "Deschide dosarul âFavoriteâ." + 9363 "AdaugÄ pagina curentÄ Ã®n lista âFavoriteâ." END STRINGTABLE @@ -185,12 +196,12 @@ STRINGTABLE BEGIN - 9552 "AfiÈeazÄ sau ascunde panoul Explorare." - 9553 "AfiÈeazÄ panoul CÄutare." - 9554 "AfiÈeazÄ panoul Favorite." - 9555 "AfiÈeazÄ panoul Istoric." - 9557 "AfiÈeazÄ panoul Dosare." - 9559 "AfiÈeazÄ panoul Media." + 9552 "AfiÈeazÄ sau ascunde panoul âExplorareâ." + 9553 "AfiÈeazÄ panoul âCÄutareâ." + 9554 "AfiÈeazÄ panoul âFavoriteâ." + 9555 "AfiÈeazÄ panoul âIstoricâ." + 9557 "AfiÈeazÄ panoul âDosareâ." + 9559 "AfiÈeazÄ panoul âMediaâ." END STRINGTABLE Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/lang/ro-RO.rc [iso-8859-1] Thu Jan 8 10:54:20 2015 @@ -5,7 +5,7 @@ STRINGTABLE BEGIN /* Names of code pages */ - 1250 "1250 (ANSI - central european)" + 1250 "1250 (ANSI - central-european)" 1251 "1251 (ANSI - chirilic)" 1252 "1252 (ANSI - latin I)" 1253 "1253 (ANSI - grecesc)" @@ -162,7 +162,7 @@ 54936 "54936 (GB18030 chinezesc simplificat)" /* Locations */ - 2+NLSRC_OFFSET "Antigua and Barbuda" + 2+NLSRC_OFFSET "Antigua Èi Barbuda" 3+NLSRC_OFFSET "Afghanistan" 4+NLSRC_OFFSET "Algeria" 5+NLSRC_OFFSET "Azerbaijan" @@ -170,261 +170,261 @@ 7+NLSRC_OFFSET "Armenia" 8+NLSRC_OFFSET "Andorra" 9+NLSRC_OFFSET "Angola" - 10+NLSRC_OFFSET "American Samoa" + 10+NLSRC_OFFSET "Samoa AmericanÄ" 11+NLSRC_OFFSET "Argentina" 12+NLSRC_OFFSET "Australia" 14+NLSRC_OFFSET "Austria" - 17+NLSRC_OFFSET "Bahrain" + 17+NLSRC_OFFSET "Bahrein" 18+NLSRC_OFFSET "Barbados" 19+NLSRC_OFFSET "Botswana" 20+NLSRC_OFFSET "Bermuda" - 21+NLSRC_OFFSET "Belgium" - 22+NLSRC_OFFSET "Bahamas, The" - 23+NLSRC_OFFSET "Bangladesh" + 21+NLSRC_OFFSET "Belgia" + 22+NLSRC_OFFSET "Bahamas" + 23+NLSRC_OFFSET "BangladeÈ" 24+NLSRC_OFFSET "Belize" - 25+NLSRC_OFFSET "Bosnia and Herzegovina" + 25+NLSRC_OFFSET "Bosnia Èi HerÈegovina" 26+NLSRC_OFFSET "Bolivia" - 27+NLSRC_OFFSET "Myanmar" + 27+NLSRC_OFFSET "Birmania" 28+NLSRC_OFFSET "Benin" 29+NLSRC_OFFSET "Belarus" - 30+NLSRC_OFFSET "Solomon Islands" - 32+NLSRC_OFFSET "Brazil" + 30+NLSRC_OFFSET "Solomon, Insulele" + 32+NLSRC_OFFSET "Brazilia" 34+NLSRC_OFFSET "Bhutan" 35+NLSRC_OFFSET "Bulgaria" 38+NLSRC_OFFSET "Burundi" 39+NLSRC_OFFSET "Canada" - 40+NLSRC_OFFSET "Cambodia" - 41+NLSRC_OFFSET "Chad" + 40+NLSRC_OFFSET "Cambodgia" + 41+NLSRC_OFFSET "Ciad" 42+NLSRC_OFFSET "Sri Lanka" 43+NLSRC_OFFSET "Congo" - 44+NLSRC_OFFSET "Congo (DRC)" + 44+NLSRC_OFFSET "Congo (RDC)" 45+NLSRC_OFFSET "China" 46+NLSRC_OFFSET "Chile" - 49+NLSRC_OFFSET "Cameroon" - 50+NLSRC_OFFSET "Comoros" + 49+NLSRC_OFFSET "Camerun" + 50+NLSRC_OFFSET "Comore" 51+NLSRC_OFFSET "Colombia" 54+NLSRC_OFFSET "Costa Rica" - 55+NLSRC_OFFSET "Central African Republic" + 55+NLSRC_OFFSET "Central AfricanÄ, Republica" 56+NLSRC_OFFSET "Cuba" - 57+NLSRC_OFFSET "Cape Verde" - 59+NLSRC_OFFSET "Cyprus" - 61+NLSRC_OFFSET "Denmark" + 57+NLSRC_OFFSET "Capului Verde, Republica" + 59+NLSRC_OFFSET "Cipru" + 61+NLSRC_OFFSET "Danemarca" 62+NLSRC_OFFSET "Djibouti" 63+NLSRC_OFFSET "Dominica" - 65+NLSRC_OFFSET "Dominican Republic" + 65+NLSRC_OFFSET "DominicanÄ, Republica" 66+NLSRC_OFFSET "Ecuador" - 67+NLSRC_OFFSET "Egypt" - 68+NLSRC_OFFSET "Ireland" - 69+NLSRC_OFFSET "Equatorial Guinea" + 67+NLSRC_OFFSET "Egipt" + 68+NLSRC_OFFSET "Irlanda" + 69+NLSRC_OFFSET "Guineea EcuatorialÄ" 70+NLSRC_OFFSET "Estonia" - 71+NLSRC_OFFSET "Eritrea" + 71+NLSRC_OFFSET "Eritreea" 72+NLSRC_OFFSET "El Salvador" - 73+NLSRC_OFFSET "Ethiopia" - 75+NLSRC_OFFSET "Czech Republic" - 77+NLSRC_OFFSET "Finland" - 78+NLSRC_OFFSET "Fiji Islands" - 80+NLSRC_OFFSET "Micronesia" - 81+NLSRC_OFFSET "Faroe Islands" - 84+NLSRC_OFFSET "France" - 86+NLSRC_OFFSET "Gambia, The" + 73+NLSRC_OFFSET "Etiopia" + 75+NLSRC_OFFSET "CehÄ, Republica" + 77+NLSRC_OFFSET "Finlanda" + 78+NLSRC_OFFSET "Fiji" + 80+NLSRC_OFFSET "Micronezia" + 81+NLSRC_OFFSET "Feroe, Insulele" + 84+NLSRC_OFFSET "FranÅ£a" + 86+NLSRC_OFFSET "Gambia" 87+NLSRC_OFFSET "Gabon" 88+NLSRC_OFFSET "Georgia" 89+NLSRC_OFFSET "Ghana" 90+NLSRC_OFFSET "Gibraltar" 91+NLSRC_OFFSET "Grenada" - 93+NLSRC_OFFSET "Greenland" - 94+NLSRC_OFFSET "Germany" - 98+NLSRC_OFFSET "Greece" + 93+NLSRC_OFFSET "Groenlanda" + 94+NLSRC_OFFSET "Germania" + 98+NLSRC_OFFSET "Grecia" 99+NLSRC_OFFSET "Guatemala" - 100+NLSRC_OFFSET "Guinea" + 100+NLSRC_OFFSET "Guineea" 101+NLSRC_OFFSET "Guyana" 103+NLSRC_OFFSET "Haiti" - 104+NLSRC_OFFSET "Hong Kong S.A.R." + 104+NLSRC_OFFSET "Hong Kong, R.A.S." 106+NLSRC_OFFSET "Honduras" - 108+NLSRC_OFFSET "Croatia" - 109+NLSRC_OFFSET "Hungary" - 110+NLSRC_OFFSET "Iceland" - 111+NLSRC_OFFSET "Indonesia" + 108+NLSRC_OFFSET "CroaÅ£ia" + 109+NLSRC_OFFSET "Ungaria" + 110+NLSRC_OFFSET "Islanda" + 111+NLSRC_OFFSET "Indonezia" 113+NLSRC_OFFSET "India" - 114+NLSRC_OFFSET "British Indian Ocean Territory" + 114+NLSRC_OFFSET "Indian, Teritoriul Britanic din Oceanul" 116+NLSRC_OFFSET "Iran" 117+NLSRC_OFFSET "Israel" - 118+NLSRC_OFFSET "Italy" - 119+NLSRC_OFFSET "CÃ´te d'Ivoire" - 121+NLSRC_OFFSET "Iraq" - 122+NLSRC_OFFSET "Japan" + 118+NLSRC_OFFSET "Italia" + 119+NLSRC_OFFSET "Coasta de FildeÈ" + 121+NLSRC_OFFSET "Irak" + 122+NLSRC_OFFSET "Japonia" 124+NLSRC_OFFSET "Jamaica" - 125+NLSRC_OFFSET "Jan Mayen" - 126+NLSRC_OFFSET "Jordan" - 127+NLSRC_OFFSET "Johnston Atoll" + 125+NLSRC_OFFSET "Jan Mayen, Insula" + 126+NLSRC_OFFSET "Iordania" + 127+NLSRC_OFFSET "Johnston, Atolul" 129+NLSRC_OFFSET "Kenya" - 130+NLSRC_OFFSET "Kyrgyzstan" - 131+NLSRC_OFFSET "North Korea" + 130+NLSRC_OFFSET "KÃ¢rgÃ¢zstan" + 131+NLSRC_OFFSET "Coreea de Nord" 133+NLSRC_OFFSET "Kiribati" - 134+NLSRC_OFFSET "Korea" - 136+NLSRC_OFFSET "Kuwait" - 137+NLSRC_OFFSET "Kazakhstan" + 134+NLSRC_OFFSET "Coreea de Sud" + 136+NLSRC_OFFSET "Kuweit" + 137+NLSRC_OFFSET "Kazahstan" 138+NLSRC_OFFSET "Laos" - 139+NLSRC_OFFSET "Lebanon" - 140+NLSRC_OFFSET "Latvia" - 141+NLSRC_OFFSET "Lithuania" + 139+NLSRC_OFFSET "Liban" + 140+NLSRC_OFFSET "Letonia" + 141+NLSRC_OFFSET "Lituania" 142+NLSRC_OFFSET "Liberia" - 143+NLSRC_OFFSET "Slovakia" + 143+NLSRC_OFFSET "Slovacia" 145+NLSRC_OFFSET "Liechtenstein" 146+NLSRC_OFFSET "Lesotho" - 147+NLSRC_OFFSET "Luxembourg" - 148+NLSRC_OFFSET "Libya" + 147+NLSRC_OFFSET "Luxemburg" + 148+NLSRC_OFFSET "Libia" 149+NLSRC_OFFSET "Madagascar" - 151+NLSRC_OFFSET "Macao S.A.R." + 151+NLSRC_OFFSET "Macao R.A.S." 152+NLSRC_OFFSET "Moldova" 154+NLSRC_OFFSET "Mongolia" 156+NLSRC_OFFSET "Malawi" 157+NLSRC_OFFSET "Mali" 158+NLSRC_OFFSET "Monaco" - 159+NLSRC_OFFSET "Morocco" + 159+NLSRC_OFFSET "Moroc" 160+NLSRC_OFFSET "Mauritius" 162+NLSRC_OFFSET "Mauritania" 163+NLSRC_OFFSET "Malta" 164+NLSRC_OFFSET "Oman" - 165+NLSRC_OFFSET "Maldives" - 166+NLSRC_OFFSET "Mexico" - 167+NLSRC_OFFSET "Malaysia" - 168+NLSRC_OFFSET "Mozambique" + 165+NLSRC_OFFSET "Maldive, Insulele" + 166+NLSRC_OFFSET "Mexic" + 167+NLSRC_OFFSET "Malaezia" + 168+NLSRC_OFFSET "Mozambic" 173+NLSRC_OFFSET "Niger" 174+NLSRC_OFFSET "Vanuatu" 175+NLSRC_OFFSET "Nigeria" - 176+NLSRC_OFFSET "Netherlands" - 177+NLSRC_OFFSET "Norway" + 176+NLSRC_OFFSET "Regatul Å¢Ärilor de Jos" + 177+NLSRC_OFFSET "Norvegia" 178+NLSRC_OFFSET "Nepal" 180+NLSRC_OFFSET "Nauru" - 181+NLSRC_OFFSET "Suriname" + 181+NLSRC_OFFSET "Surinam" 182+NLSRC_OFFSET "Nicaragua" - 183+NLSRC_OFFSET "New Zealand" - 184+NLSRC_OFFSET "Palestinian Authority" + 183+NLSRC_OFFSET "Noua ZeelandÄ" + 184+NLSRC_OFFSET "PalestinianÄ, Autoritatea" 185+NLSRC_OFFSET "Paraguay" 187+NLSRC_OFFSET "Peru" 190+NLSRC_OFFSET "Pakistan" - 191+NLSRC_OFFSET "Poland" + 191+NLSRC_OFFSET "Polonia" 192+NLSRC_OFFSET "Panama" - 193+NLSRC_OFFSET "Portugal" - 194+NLSRC_OFFSET "Papua New Guinea" + 193+NLSRC_OFFSET "Portugalia" + 194+NLSRC_OFFSET "Papua Noua Guinee" 195+NLSRC_OFFSET "Palau" - 196+NLSRC_OFFSET "Guinea-Bissau" + 196+NLSRC_OFFSET "Guineea-Bissau" 197+NLSRC_OFFSET "Qatar" 198+NLSRC_OFFSET "Reunion" - 199+NLSRC_OFFSET "Marshall Islands" - 200+NLSRC_OFFSET "Romania" - 201+NLSRC_OFFSET "Philippines" + 199+NLSRC_OFFSET "Marshall, Insulele" + 200+NLSRC_OFFSET "RomÃ¢nia" + 201+NLSRC_OFFSET "Filipine" 202+NLSRC_OFFSET "Puerto Rico" - 203+NLSRC_OFFSET "Russia" + 203+NLSRC_OFFSET "Rusia" 204+NLSRC_OFFSET "Rwanda" - 205+NLSRC_OFFSET "Saudi Arabia" - 206+NLSRC_OFFSET "St. Pierre and Miquelon" - 207+NLSRC_OFFSET "St. Kitts and Nevis" + 205+NLSRC_OFFSET "SauditÄ, Arabia" + 206+NLSRC_OFFSET "St. Pierre Èi Miquelon" + 207+NLSRC_OFFSET "St. Cristofor Èi Nevis" 208+NLSRC_OFFSET "Seychelles" - 209+NLSRC_OFFSET "South Africa" + 209+NLSRC_OFFSET "Sud, Africa de" 210+NLSRC_OFFSET "Senegal" 212+NLSRC_OFFSET "Slovenia" 213+NLSRC_OFFSET "Sierra Leone" 214+NLSRC_OFFSET "San Marino" 215+NLSRC_OFFSET "Singapore" 216+NLSRC_OFFSET "Somalia" - 217+NLSRC_OFFSET "Spain" + 217+NLSRC_OFFSET "Spania" 218+NLSRC_OFFSET "St. Lucia" 219+NLSRC_OFFSET "Sudan" 220+NLSRC_OFFSET "Svalbard" - 221+NLSRC_OFFSET "Sweden" - 222+NLSRC_OFFSET "Syria" - 223+NLSRC_OFFSET "Switzerland" - 224+NLSRC_OFFSET "United Arab Emirates" - 225+NLSRC_OFFSET "Trinidad and Tobago" - 227+NLSRC_OFFSET "Thailand" - 228+NLSRC_OFFSET "Tajikistan" + 221+NLSRC_OFFSET "Suedia" + 222+NLSRC_OFFSET "Siria" + 223+NLSRC_OFFSET "ElveÈia" + 224+NLSRC_OFFSET "Emiratele Arabe Unite" + 225+NLSRC_OFFSET "Trinidad Èi Tobago" + 227+NLSRC_OFFSET "Thailanda" + 228+NLSRC_OFFSET "Tadjikistan" 231+NLSRC_OFFSET "Tonga" 232+NLSRC_OFFSET "Togo" - 233+NLSRC_OFFSET "SÃ£o TomÃ© and PrÃncipe" + 233+NLSRC_OFFSET "SÃ£o TomÃ© Èi PrÃncipe" 234+NLSRC_OFFSET "Tunisia" - 235+NLSRC_OFFSET "Turkey" + 235+NLSRC_OFFSET "Turcia" 236+NLSRC_OFFSET "Tuvalu" 237+NLSRC_OFFSET "Taiwan" 238+NLSRC_OFFSET "Turkmenistan" 239+NLSRC_OFFSET "Tanzania" 240+NLSRC_OFFSET "Uganda" - 241+NLSRC_OFFSET "Ukraine" - 242+NLSRC_OFFSET "United Kingdom" - 244+NLSRC_OFFSET "United States" + 241+NLSRC_OFFSET "Ucraina" + 242+NLSRC_OFFSET "Unit al Marii Britanii, Regatul" + 244+NLSRC_OFFSET "Unite ale Americii, Statele" 245+NLSRC_OFFSET "Burkina Faso" 246+NLSRC_OFFSET "Uruguay" 247+NLSRC_OFFSET "Uzbekistan" - 248+NLSRC_OFFSET "St. Vincent and the Grenadines" - 249+NLSRC_OFFSET "Bolivarian Republic of Venezuela" + 248+NLSRC_OFFSET "St. VicenÈiu Èi Grenadine" + 249+NLSRC_OFFSET "Venezuela" 251+NLSRC_OFFSET "Vietnam" - 252+NLSRC_OFFSET "Virgin Islands" - 253+NLSRC_OFFSET "Vatican City" + 252+NLSRC_OFFSET "Virgine, Insulele" + 253+NLSRC_OFFSET "Vatican" 254+NLSRC_OFFSET "Namibia" - 257+NLSRC_OFFSET "Western Sahara (disputed)" - 258+NLSRC_OFFSET "Wake Island" + 257+NLSRC_OFFSET "Sahara de Vest (Ã®n disputÄ)" + 258+NLSRC_OFFSET "Wake, Insula" 259+NLSRC_OFFSET "Samoa" 260+NLSRC_OFFSET "Swaziland" 261+NLSRC_OFFSET "Yemen" 263+NLSRC_OFFSET "Zambia" 264+NLSRC_OFFSET "Zimbabwe" - 269+NLSRC_OFFSET "Serbia and Montenegro (Former)" - 270+NLSRC_OFFSET "Montenegro" + 269+NLSRC_OFFSET "Serbia Èi Muntenegru (fosta)" + 270+NLSRC_OFFSET "Muntenegru" 271+NLSRC_OFFSET "Serbia" 273+NLSRC_OFFSET "CuraÃ§ao" - 276+NLSRC_OFFSET "South Sudan" + 276+NLSRC_OFFSET "Sudanul de Sud" 300+NLSRC_OFFSET "Anguilla" 301+NLSRC_OFFSET "Antarctica" 302+NLSRC_OFFSET "Aruba" - 303+NLSRC_OFFSET "Ascension Island" - 304+NLSRC_OFFSET "Ashmore and Cartier Islands" - 305+NLSRC_OFFSET "Baker Island" - 306+NLSRC_OFFSET "Bouvet Island" - 307+NLSRC_OFFSET "Cayman Islands" - 308+NLSRC_OFFSET "Channel Islands" - 309+NLSRC_OFFSET "Christmas Island" - 310+NLSRC_OFFSET "Clipperton Island" - 311+NLSRC_OFFSET "Cocos (Keeling) Islands" - 312+NLSRC_OFFSET "Cook Islands" - 313+NLSRC_OFFSET "Coral Sea Islands" + 303+NLSRC_OFFSET "Ascension" + 304+NLSRC_OFFSET "Ashmore Èi Cartier, Insulele" + 305+NLSRC_OFFSET "Baker, Insula" + 306+NLSRC_OFFSET "Bouvet, Insula" + 307+NLSRC_OFFSET "Cayman, Insulele" + 308+NLSRC_OFFSET "Channel, Insulele" + 309+NLSRC_OFFSET "CrÄciunului, Insula" + 310+NLSRC_OFFSET "Clipperton, Insula" + 311+NLSRC_OFFSET "Cocos (Keeling), Insulele" + 312+NLSRC_OFFSET "Cook, Insulele" + 313+NLSRC_OFFSET "Coral, Insulele MÄrii de" 314+NLSRC_OFFSET "Diego Garcia" - 315+NLSRC_OFFSET "Falkland Islands (Islas Malvinas)" - 317+NLSRC_OFFSET "French Guiana" - 318+NLSRC_OFFSET "French Polynesia" - 319+NLSRC_OFFSET "French Southern and Antarctic Lands" - 321+NLSRC_OFFSET "Guadeloupe" + 315+NLSRC_OFFSET "Falkland (Malvine), Insulele" + 317+NLSRC_OFFSET "FrancezÄ, Guyana" + 318+NLSRC_OFFSET "FrancezÄ, Polinezia" + 319+NLSRC_OFFSET "Franceze, Teritoriile australe Èi antarctice" + 321+NLSRC_OFFSET "Guadelupa" 322+NLSRC_OFFSET "Guam" - 323+NLSRC_OFFSET "Guantanamo Bay" + 323+NLSRC_OFFSET "Golful Guantanamo" 324+NLSRC_OFFSET "Guernsey" - 325+NLSRC_OFFSET "Heard Island and McDonald Islands" - 326+NLSRC_OFFSET "Howland Island" - 327+NLSRC_OFFSET "Jarvis Island" - 328+NLSRC_OFFSET "Jersey" - 329+NLSRC_OFFSET "Kingman Reef" - 330+NLSRC_OFFSET "Martinique" + 325+NLSRC_OFFSET "Heard Èi McDonald, Insulele" + 326+NLSRC_OFFSET "Howland, Insula" + 327+NLSRC_OFFSET "Jarvis, Insula" + 328+NLSRC_OFFSET "Jersey, Insula" + 329+NLSRC_OFFSET "Kingman, Reciful" + 330+NLSRC_OFFSET "Martinica" 331+NLSRC_OFFSET "Mayotte" 332+NLSRC_OFFSET "Montserrat" - 333+NLSRC_OFFSET "Netherlands Antilles (Former)" - 334+NLSRC_OFFSET "New Caledonia" - 335+NLSRC_OFFSET "Niue" - 336+NLSRC_OFFSET "Norfolk Island" - 337+NLSRC_OFFSET "Northern Mariana Islands" - 338+NLSRC_OFFSET "Palmyra Atoll" - 339+NLSRC_OFFSET "Pitcairn Islands" - 340+NLSRC_OFFSET "Rota Island" + 333+NLSRC_OFFSET "Antile ale ÈÄrilor de Jos (fostele)" + 334+NLSRC_OFFSET "Noua Caledonie" + 335+NLSRC_OFFSET "Niue, Insula" + 336+NLSRC_OFFSET "Norfolk, Insula" + 337+NLSRC_OFFSET "Mariane de Nord, Insulele" + 338+NLSRC_OFFSET "Palmyra, Atolul" + 339+NLSRC_OFFSET "Pitcairn, Insulele" + 340+NLSRC_OFFSET "Rota, Insula" 341+NLSRC_OFFSET "Saipan" - 342+NLSRC_OFFSET "South Georgia and the South Sandwich Islands" - 343+NLSRC_OFFSET "St. Helena" - 346+NLSRC_OFFSET "Tinian Island" - 347+NLSRC_OFFSET "Tokelau" + 342+NLSRC_OFFSET "Georgia de Sud Èi Insulele Sandwich de Sud" + 343+NLSRC_OFFSET "St. Elena, Insula" + 346+NLSRC_OFFSET "Tinian, Insula" + 347+NLSRC_OFFSET "Tokelau, Atolii" 348+NLSRC_OFFSET "Tristan da Cunha" - 349+NLSRC_OFFSET "Turks and Caicos Islands" - 351+NLSRC_OFFSET "Virgin Islands, British" - 352+NLSRC_OFFSET "Wallis and Futuna" - 15126+NLSRC_OFFSET "Man, Isle of" - 19618+NLSRC_OFFSET "Macedonia, Former Yugoslav Republic of" - 21242+NLSRC_OFFSET "Midway Islands" - 30967+NLSRC_OFFSET "Sint Maarten (Dutch part)" - 31706+NLSRC_OFFSET "Saint Martin (French part)" + 349+NLSRC_OFFSET "Turks Èi Caicos, Insulele" + 351+NLSRC_OFFSET "Virgine Britanice, Insulele" + 352+NLSRC_OFFSET "Wallis Èi Futuna" + 15126+NLSRC_OFFSET "Man, Insula" + 19618+NLSRC_OFFSET "Macedonia" + 21242+NLSRC_OFFSET "Midway, Atolul" + 30967+NLSRC_OFFSET "Sint Maarten (partea ÈÄrilor de Jos)" + 31706+NLSRC_OFFSET "Saint Martin (partea FrancezÄ)" END Modified: trunk/reactos/dll/win32/msgina/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ro-R… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] Thu Jan 8 10:54:20 2015 @@ -188,7 +188,7 @@ /* Shutdown Dialog Strings */ STRINGTABLE BEGIN - IDS_SHUTDOWN_LOGOFF "Deautentificare ""%s""" + IDS_SHUTDOWN_LOGOFF "Deautentificare â%sâ" IDS_SHUTDOWN_SHUTDOWN "Ãnchidere" IDS_SHUTDOWN_RESTART "Repornire" IDS_SHUTDOWN_SLEEP "Stare de veghe" Modified: trunk/reactos/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ro-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] Thu Jan 8 10:54:20 2015 @@ -46,18 +46,18 @@ /* menubar EDIT menu */ MENU_003 MENU BEGIN - MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM "&AnuleazÄ\tCtrl+Z", FCIDM_SHVIEW_UNDO MENUITEM SEPARATOR - MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT - MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY - MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT - MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM "&DecupeazÄ\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copie\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&LipeÈte\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "LipeÈte sc&urtÄturÄ", FCIDM_SHVIEW_INSERTLINK MENUITEM SEPARATOR - MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO - MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM "Copi&ere Ã®n dosarulâ¦", FCIDM_SHVIEW_COPYTO + MENUITEM "&Mutare Ã®n dosarulâ¦", FCIDM_SHVIEW_MOVETO MENUITEM SEPARATOR - MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL - MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION + MENUITEM "SelecteazÄ t&ot\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "Inversea&zÄ selecÈia", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -354,9 +354,9 @@ BEGIN LTEXT "Ce cont de utilizator este folosit pentru a executa?", -1, 10, 20, 220, 20 CHECKBOX "Utilizator curent: %s", 14000, 10, 45, 150, 10 - LTEXT "Protejare computer de activiÄÈi neautorizate", -1, 25, 57, 200, 10, WS_DISABLED + LTEXT "Protejare calculator de activiÄÈi neautorizate", -1, 25, 57, 200, 10, WS_DISABLED CHECKBOX "AceastÄ opÈiune vÄ poate proteja calculatorul de activitÄÈi care pot fi dÄunÄtoare dar poate de asemenea duce la funcÈionarea incorectÄ a programului.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE - CHECKBOX "Utilizator curent:", 14002, 10, 100, 90, 10 + CHECKBOX "UrmÄtorul utilizator:", 14002, 10, 100, 90, 10 LTEXT "Nume utilizator:", -1, 20, 118, 54, 10 COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "â¦", 14004, 180, 115, 30, 14, WS_TABSTOP @@ -627,16 +627,16 @@ IDD_NOOPEN DIALOGEX 0, 0, 240, 75 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Caution" +CAPTION "AtenÈie" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 - LTEXT "This file could either be used by the operating system or by\n\ -another application. Modifying this file might damage your\n\ -system or make it less functional.\n\n\ -Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 - DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 - PUSHBUTTON "No", IDNO, 180, 55, 50, 14 + LTEXT "Acest fiÈier ar putea sÄ fie folosit fie de cÄtre sistemul de\n\ +operare sau de o oarecare aplicaÈie. ModificÃ¢nd acest fiÈier\n\ +riscaÈi sÄ cauzaÈi daune Ã®n sistem.\n\n\ +Sigur doriÈi sÄ deschideÈi acest fiÈier?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "D&a", IDYES, 125, 55, 50, 14 + PUSHBUTTON "N&u", IDNO, 180, 55, 50, 14 END STRINGTABLE @@ -815,5 +815,5 @@ IDS_UNKNOWN_APP "AplicaÈie nespecificatÄ" IDS_EXE_DESCRIPTION "Descriere:" - IDS_MENU_EMPTY "(Empty)" -END + IDS_MENU_EMPTY "(Gol)" +END

1 0

[jimtabor] 66001: - Fix build.
by jimtabor＠svn.reactos.org 08 Jan '15

08 Jan '15

Author: jimtabor Date: Thu Jan 8 01:00:03 2015 New Revision: 66001 URL: http://svn.reactos.org/svn/reactos?rev=66001&view=rev Log: - Fix build. Modified: trunk/reactos/win32ss/user/ntuser/ntuser.c Modified: trunk/reactos/win32ss/user/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntuser… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] Thu Jan 8 01:00:03 2015 @@ -1,4 +1,4 @@ -ATOM AtomQOS;/* +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: ntuser init. and main funcs.

1 0

[jimtabor] 66000: [Win32s] - Implement DDE from wine. Leaving debug errors on the run and later move to trace. See CORE-7447. - Use callbacks to User32 to convert the data and track it in Win32k. -...
by jimtabor＠svn.reactos.org 08 Jan '15

08 Jan '15

Author: jimtabor Date: Thu Jan 8 00:56:51 2015 New Revision: 66000 URL: http://svn.reactos.org/svn/reactos?rev=66000&view=rev Log: [Win32s] - Implement DDE from wine. Leaving debug errors on the run and later move to trace. See CORE-7447. - Use callbacks to User32 to convert the data and track it in Win32k. - Add a new Quality of Service atom. - Add things to class.c. - Shell32 tests run now too, or only 4 run. This might be fixed too, since locating a lParam write back issue. Modified: trunk/reactos/win32ss/include/callback.h trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/ntuser/class.c trunk/reactos/win32ss/user/ntuser/dde.c trunk/reactos/win32ss/user/ntuser/message.c trunk/reactos/win32ss/user/ntuser/ntuser.c trunk/reactos/win32ss/user/ntuser/ntuser.h trunk/reactos/win32ss/user/ntuser/userfuncs.h trunk/reactos/win32ss/user/user32/misc/dde.c trunk/reactos/win32ss/user/user32/misc/dllmain.c trunk/reactos/win32ss/user/user32/windows/message.c Modified: trunk/reactos/win32ss/include/callback.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/callback.h… ============================================================================== --- trunk/reactos/win32ss/include/callback.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/callback.h [iso-8859-1] Thu Jan 8 00:56:51 2015 @@ -14,7 +14,9 @@ #define USER32_CALLBACK_COPYIMAGE (10) #define USER32_CALLBACK_SETWNDICONS (11) #define USER32_CALLBACK_DELIVERUSERAPC (12) -#define USER32_CALLBACK_MAXIMUM (12) +#define USER32_CALLBACK_DDEPOST (13) +#define USER32_CALLBACK_DDEGET (14) +#define USER32_CALLBACK_MAXIMUM (14) typedef struct _WINDOWPROC_CALLBACK_ARGUMENTS { @@ -115,6 +117,14 @@ HICON hIconWindows; } SETWNDICONS_CALLBACK_ARGUMENTS, *PSETWNDICONS_CALLBACK_ARGUMENTS; +typedef struct _DDEPOSTGET_CALLBACK_ARGUMENTS +{ + INT Type; + MSG; + int size; + BYTE buffer[1]; +} DDEPOSTGET_CALLBACK_ARGUMENTS, *PDDEPOSTGET_CALLBACK_ARGUMENTS; + NTSTATUS WINAPI User32CallCopyImageFromKernel(PVOID Arguments, ULONG ArgumentLength); NTSTATUS WINAPI @@ -141,4 +151,8 @@ User32CallGetCharsetInfo(PVOID Arguments, ULONG ArgumentLength); NTSTATUS WINAPI User32DeliverUserAPC(PVOID Arguments, ULONG ArgumentLength); +NTSTATUS WINAPI +User32CallDDEPostFromKernel(PVOID Arguments, ULONG ArgumentLength); +NTSTATUS WINAPI +User32CallDDEGetFromKernel(PVOID Arguments, ULONG ArgumentLength); #endif /* __INCLUDE_USER32_CALLBACK_H */ Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Thu Jan 8 00:56:51 2015 @@ -300,6 +300,12 @@ C_ASSERT(sizeof(CLIENTINFO) <= sizeof(((PTEB)0)->Win32ClientInfo)); #define GetWin32ClientInfo() ((PCLIENTINFO)(NtCurrentTeb()->Win32ClientInfo)) + +typedef struct tagDDEPACK +{ + UINT_PTR uiLo; + UINT_PTR uiHi; +} DDEPACK, *PDDEPACK; #define HRGN_NULL ( (HRGN) 0) // NULL empty region #define HRGN_WINDOW ( (HRGN) 1) // region from window rcWindow @@ -3417,19 +3423,7 @@ NTAPI NtUserYieldTask(VOID); -/* lParam of DDE messages */ -typedef struct tagKMDDEEXECUTEDATA -{ - HWND Sender; - HGLOBAL ClientMem; - /* BYTE Data[DataSize] */ -} KMDDEEXECUTEDATA, *PKMDDEEXECUTEDATA; - -typedef struct tagDDEPACK -{ - UINT_PTR uiLo; - UINT_PTR uiHi; -} DDEPACK, *PDDEPACK; + Modified: trunk/reactos/win32ss/user/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/class.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] Thu Jan 8 00:56:51 2015 @@ -1052,6 +1052,7 @@ /* FIXME: The class was created before being connected to a desktop. It is possible for the desktop window, but should it be allowed for any other case? */ + TRACE("This CLASS has no Desktop to heap from! Atom %d\n",Atom); Class = UserHeapAlloc(ClassSize); } @@ -2367,7 +2368,7 @@ } // -// ??? +// Register System Classes.... // BOOL FASTCALL Modified: trunk/reactos/win32ss/user/ntuser/dde.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/dde.c?… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/dde.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/dde.c [iso-8859-1] Thu Jan 8 00:56:51 2015 @@ -5,14 +5,348 @@ DBG_DEFAULT_CHANNEL(UserMisc); +typedef struct _DDE_DATA +{ + LPARAM lParam; + int cbSize; + PVOID pvBuffer; +} DDE_DATA, *PDDE_DATA; + +typedef struct _DDE_PROP +{ + PWND spwnd; + PWND spwndPartner; +} DDE_PROP, *PDDE_PROP; + + + +int +APIENTRY +IntDDEPostCallback( + IN PWND pWnd, + IN UINT Msg, + IN WPARAM wParam, + IN OUT LPARAM *lParam, + IN PVOID Buffer, + IN int size) +{ + NTSTATUS Status; + ULONG ArgumentLength, ResultLength; + PVOID Argument, ResultPointer; + PDDEPOSTGET_CALLBACK_ARGUMENTS Common; + int origSize = size; + + ResultPointer = NULL; + ResultLength = ArgumentLength = sizeof(DDEPOSTGET_CALLBACK_ARGUMENTS)+size; + + Argument = IntCbAllocateMemory(ArgumentLength); + if (NULL == Argument) + { + return FALSE; + } + + Common = (PDDEPOSTGET_CALLBACK_ARGUMENTS) Argument; + + Common->size = size; + Common->hwnd = UserHMGetHandle(pWnd); + Common->message = Msg; + Common->wParam = wParam; + Common->lParam = *lParam; + RtlCopyMemory(&Common->buffer, Buffer, size); + + UserLeaveCo(); + + Status = KeUserModeCallback(USER32_CALLBACK_DDEPOST, + Argument, + ArgumentLength, + &ResultPointer, + &ResultLength); + + UserEnterCo(); + + if (!NT_SUCCESS(Status) || ResultPointer == NULL ) + { + ERR("DDE Post callback failed!\n"); + IntCbFreeMemory(Argument); + return 0; + } + + RtlCopyMemory(Common, ResultPointer, ArgumentLength); + + if (Common->size != 0 && size <= origSize) + { + RtlCopyMemory(Buffer, &Common->buffer, size); // ResultLength); + } + + size = Common->size; + *lParam = Common->lParam; + + IntCbFreeMemory(Argument); + + return size ? size : -1; +} + +BOOL +APIENTRY +IntDDEGetCallback( + IN PWND pWnd, + IN OUT PMSG pMsg, + IN PVOID Buffer, + IN int size) +{ + NTSTATUS Status; + ULONG ArgumentLength, ResultLength; + PVOID Argument, ResultPointer; + PDDEPOSTGET_CALLBACK_ARGUMENTS Common; + + ResultPointer = NULL; + ResultLength = ArgumentLength = sizeof(DDEPOSTGET_CALLBACK_ARGUMENTS)+size; + + Argument = IntCbAllocateMemory(ArgumentLength); + if (NULL == Argument) + { + return FALSE; + } + + Common = (PDDEPOSTGET_CALLBACK_ARGUMENTS) Argument; + + Common->size = size; + Common->hwnd = pMsg->hwnd; + Common->message = pMsg->message; + Common->wParam = pMsg->wParam; + Common->lParam = pMsg->lParam; + + if (size && Buffer) RtlCopyMemory(&Common->buffer, Buffer, size); + + + UserLeaveCo(); + + Status = KeUserModeCallback(USER32_CALLBACK_DDEGET, + Argument, + ArgumentLength, + &ResultPointer, + &ResultLength); + + UserEnterCo(); + + if (!NT_SUCCESS(Status) || ResultPointer == NULL ) + { + ERR("DDE Get callback failed!\n"); + IntCbFreeMemory(Argument); + return FALSE; + } + + RtlMoveMemory(Common, ResultPointer, ArgumentLength); + + pMsg->lParam = Common->lParam; + + IntCbFreeMemory(Argument); + + return TRUE; +} + + + +BOOL +APIENTRY +IntDdePostMessageHook( + IN PWND pWnd, + IN UINT Msg, + IN WPARAM wParam, + IN OUT LPARAM *lParam, + IN OUT LONG_PTR *ExtraInfo) +{ + PWND pWndClient; + PDDE_DATA pddeData; + HGDIOBJ Object = NULL; + PVOID Buffer = NULL; + int size = 128; + LPARAM lp = *lParam; + + if (pWnd->head.pti->ppi != gptiCurrent->ppi) + { + ERR("Posting long DDE 0x%x\n",Msg); + // Initiate is sent only across borders. + if (Msg == WM_DDE_INITIATE) + { + return FALSE; + } + + pWndClient = UserGetWindowObject((HWND)wParam); + if (pWndClient == NULL) + { + // This is terminating so post it. + if ( Msg == WM_DDE_TERMINATE) + { + ERR("DDE Posted WM_DDE_TERMINATE\n"); + return TRUE; + } + ERR("Invalid DDE Client Window handle\n"); + return FALSE; + } + + if (Msg == WM_DDE_TERMINATE ) + { + //// FIXME Remove Stuff if any... + + // Do not bother to callback. + return TRUE; + } + + Buffer = ExAllocatePoolWithTag(PagedPool, size, USERTAG_DDE); + + if ((size = IntDDEPostCallback(pWnd, Msg, wParam, &lp, Buffer, size)) == 0) + { + ERR("DDE Post Callback return 0 0x%x\n", Msg); + } + + if (size != -1 && size > 128) + { + ERR("FIXME: DDE Post need more bytes %d\n",size); + } + + if (size == -1) + { + size = 0; + ExFreePoolWithTag(Buffer, USERTAG_DDE); + Buffer = NULL; + } + + ERR("DDE Post size %d 0x%x\n",size, Msg); + + switch(Msg) + { + case WM_DDE_POKE: + { + DDEPOKE *pddePoke = Buffer; + switch(pddePoke->cfFormat) + { + case CF_BITMAP: + case CF_DIB: + case CF_PALETTE: + RtlCopyMemory(&Object, pddePoke->Value, sizeof(HGDIOBJ)); + break; + default: + break; + } + break; + } + case WM_DDE_DATA: + { + DDEDATA *pddeData = Buffer; + switch(pddeData->cfFormat) + { + case CF_BITMAP: + case CF_DIB: + case CF_PALETTE: + RtlCopyMemory(&Object, pddeData->Value, sizeof(HGDIOBJ)); + break; + default: + break; + } + break; + + } + default: + break; + } + + if (Object) + { + // Give gdi object to the other process. + GreSetObjectOwner(Object, pWnd->head.pti->ppi->W32Pid); + } + + pddeData = ExAllocatePoolWithTag(PagedPool, sizeof(DDE_DATA), USERTAG_DDE2); + + pddeData->cbSize = size; + pddeData->pvBuffer = Buffer; + pddeData->lParam = lp; + + ERR("DDE Post lParam c=%08lx\n",lp); + *lParam = lp; + + // Attach this data packet to the user message. + *ExtraInfo = (LONG_PTR)pddeData; + } + return TRUE; +} + +VOID APIENTRY +IntDdeGetMessageHook(PMSG pMsg, LONG_PTR ExtraInfo) +{ + PWND pWnd, pWndClient; + PDDE_DATA pddeData; + PDDE_PROP pddeProp; + BOOL Ret; + + pWnd = UserGetWindowObject(pMsg->hwnd); + if (pWnd == NULL) + { + ERR("DDE Get Window is dead. %p\n", pMsg->hwnd); + return; + } + + if (pMsg->message == WM_DDE_TERMINATE) + { + pddeProp = (PDDE_PROP)UserGetProp(pWnd, AtomDDETrack); + if (pddeProp) + { + pWndClient = UserGetWindowObject((HWND)pMsg->wParam); + if (pWndClient == NULL) + { + ERR("DDE Get Client WM_DDE_TERMINATE\n"); + } + + IntRemoveProp(pWnd, AtomDDETrack); + ExFreePoolWithTag(pddeProp, USERTAG_DDE1); + } + return; + } + + ERR("DDE Get Msg 0x%x\n",pMsg->message); + + pddeData = (PDDE_DATA)ExtraInfo; + + if ( pddeData ) + { + ERR("DDE Get 1 size %d lParam c=%08lx lp c=%08lx\n",pddeData->cbSize, pMsg->lParam, pddeData->lParam); + + pMsg->lParam = pddeData->lParam; // This might be a hack... Need to backtrace lParam from post queue. + + Ret = IntDDEGetCallback( pWnd, pMsg, pddeData->pvBuffer, pddeData->cbSize); + if (!Ret) + { + ERR("DDE Get CB failed\n"); + } + + ERR("DDE Get 2 size %d lParam c=%08lx\n",pddeData->cbSize, pMsg->lParam); + + if (pddeData->pvBuffer) ExFreePoolWithTag(pddeData->pvBuffer, USERTAG_DDE); + + ExFreePoolWithTag(pddeData, USERTAG_DDE2); + + return; + } + ERR("DDE Get No DDE Data found!\n"); + return; +} BOOL FASTCALL IntDdeSendMessageHook(PWND pWnd, UINT Msg, WPARAM wParam, LPARAM lParam) { PWND pWndServer; + PDDE_PROP pddeProp; + + if (Msg == WM_DDE_ACK) + { + ERR("Sending WM_DDE_ACK Client hwnd %p\n",pWnd->head.h); + } if (pWnd->head.pti->ppi != gptiCurrent->ppi) { + ERR("Sending long DDE 0x%x\n",Msg); + // Allow only Acknowledge and Initiate to be sent across borders. if (Msg != WM_DDE_ACK ) { @@ -20,52 +354,26 @@ return FALSE; } + ERR("Sending long WM_DDE_ACK\n"); + pWndServer = UserGetWindowObject((HWND)wParam); if (pWndServer == NULL) { ERR("Invalid DDE Server Window handle\n"); return FALSE; } - ERR("Sending DDE 0x%x\n",Msg); + + // Setup property so this conversation can be tracked. + pddeProp = ExAllocatePoolWithTag(PagedPool, sizeof(DDE_PROP), USERTAG_DDE1); + + pddeProp->spwnd = pWndServer; + pddeProp->spwndPartner = pWnd; + + IntSetProp(pWndServer, AtomDDETrack, (HANDLE)pddeProp); } return TRUE; } -BOOL FASTCALL -IntDdePostMessageHook(PWND pWnd, UINT Msg, WPARAM wParam, LPARAM lParam) -{ - PWND pWndClient; - - if (pWnd->head.pti->ppi != gptiCurrent->ppi) - { - // Initiate is sent only across borders. - if (Msg == WM_DDE_INITIATE) - { - return FALSE; - } - - pWndClient = UserGetWindowObject((HWND)wParam); - if (pWndClient == NULL) - { - // This is terminating so post it. - if ( Msg == WM_DDE_TERMINATE) return TRUE; - ERR("Invalid DDE Client Window handle\n"); - return FALSE; - } - ERR("Posting and do CB DDE 0x%x\n",Msg); - } - return TRUE; -} - -VOID FASTCALL -IntDdeGetMessageHook(PMSG pMsg) -{ - if (pMsg->message == WM_DDE_TERMINATE) - { - return; - } - ERR("Do Callback Msg 0x%x\n",pMsg->message); -} BOOL APIENTRY Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Thu Jan 8 00:56:51 2015 @@ -122,8 +122,6 @@ static MSGMEMORY g_MsgMemory[] = { { WM_CREATE, MMS_SIZE_SPECIAL, MMS_FLAG_READWRITE }, - { WM_DDE_ACK, sizeof(DDEPACK), MMS_FLAG_READ }, - { WM_DDE_EXECUTE, MMS_SIZE_WPARAM, MMS_FLAG_READ }, { WM_GETMINMAXINFO, sizeof(MINMAXINFO), MMS_FLAG_READWRITE }, { WM_GETTEXT, MMS_SIZE_WPARAMWCHAR, MMS_FLAG_WRITE }, { WM_NCCALCSIZE, MMS_SIZE_SPECIAL, MMS_FLAG_READWRITE }, @@ -1014,14 +1012,12 @@ bGMSG ); if (Present) { + /* GetMessage or PostMessage must never get messages that contain pointers */ + ASSERT(FindMsgMemory(pMsg->message) == NULL); + if ( pMsg->message >= WM_DDE_FIRST && pMsg->message <= WM_DDE_LAST ) { - IntDdeGetMessageHook(pMsg); - } - else - { - /* GetMessage or PostMessage must never get messages that contain pointers */ - ASSERT(FindMsgMemory(pMsg->message) == NULL); + IntDdeGetMessageHook(pMsg, ExtraInfo); } if (pMsg->message != WM_PAINT && pMsg->message != WM_QUIT) @@ -1206,11 +1202,12 @@ if ( Msg >= WM_DDE_FIRST && Msg <= WM_DDE_LAST ) { - if (!IntDdePostMessageHook(Window, Msg, wParam, lParam)) + if (!IntDdePostMessageHook(Window, Msg, wParam, &lParam, &ExtraInfo)) { ERR("Posting Exit DDE 0x%x\n",Msg); return FALSE; } + ERR("DDE Post lParam c=%08lx\n",lParam); } if (WM_QUIT == Msg) Modified: trunk/reactos/win32ss/user/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntuser… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] Thu Jan 8 00:56:51 2015 @@ -1,4 +1,4 @@ -/* +ATOM AtomQOS;/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: ntuser init. and main funcs. @@ -15,11 +15,12 @@ PTHREADINFO gptiCurrent = NULL; PPROCESSINFO gppiInputProvider = NULL; ERESOURCE UserLock; -ATOM AtomMessage; // Window Message atom. -ATOM AtomWndObj; // Window Object atom. -ATOM AtomLayer; // Window Layer atom. +ATOM AtomMessage; // Window Message atom. +ATOM AtomWndObj; // Window Object atom. +ATOM AtomLayer; // Window Layer atom. ATOM AtomFlashWndState; // Window Flash State atom. -ATOM AtomDDETrack; // Window DDE Tracking atom. +ATOM AtomDDETrack; // Window DDE Tracking atom. +ATOM AtomQOS; // Window DDE Quality of Service atom. HINSTANCE hModClient = NULL; BOOL ClientPfnInit = FALSE; ATOM gaGuiConsoleWndClass; @@ -52,6 +53,7 @@ gpsi->atomFrostedWindowProp = IntAddGlobalAtom(L"SysFrostedWindow", TRUE); AtomDDETrack = IntAddGlobalAtom(L"SysDT", TRUE); + AtomQOS = IntAddGlobalAtom(L"SysQOS", TRUE); /* * FIXME: AddPropW uses the global kernel atom table, thus leading to conflicts if we use Modified: trunk/reactos/win32ss/user/ntuser/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntuser… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntuser.h [iso-8859-1] Thu Jan 8 00:56:51 2015 @@ -15,6 +15,8 @@ extern PPROCESSINFO ppiScrnSaver; extern PPROCESSINFO gppiInputProvider; extern ATOM gaGuiConsoleWndClass; +extern ATOM AtomDDETrack; +extern ATOM AtomQOS; INIT_FUNCTION NTSTATUS NTAPI InitUserImpl(VOID); VOID FASTCALL CleanupUserImpl(VOID); Modified: trunk/reactos/win32ss/user/ntuser/userfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/userfu… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/userfuncs.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/userfuncs.h [iso-8859-1] Thu Jan 8 00:56:51 2015 @@ -43,8 +43,8 @@ /*************** DDE.C ****************/ BOOL FASTCALL IntDdeSendMessageHook(PWND,UINT,WPARAM,LPARAM); -BOOL FASTCALL IntDdePostMessageHook(PWND,UINT,WPARAM,LPARAM); -VOID FASTCALL IntDdeGetMessageHook(PMSG); +BOOL APIENTRY IntDdePostMessageHook(IN PWND,IN UINT,IN WPARAM,IN OUT LPARAM*,IN OUT LONG_PTR*); +VOID APIENTRY IntDdeGetMessageHook(PMSG,LONG_PTR); /*************** MAIN.C ***************/ Modified: trunk/reactos/win32ss/user/user32/misc/dde.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/dde.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/dde.c [iso-8859-1] Thu Jan 8 00:56:51 2015 @@ -3,6 +3,286 @@ #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(ddeml); + + +BOOL FASTCALL DdeAddPair(HGLOBAL ClientMem, HGLOBAL ServerMem); +HGLOBAL FASTCALL DdeGetPair(HGLOBAL ServerMem); + + +/* description of the data fields that need to be packed along with a sent message */ +struct packed_message +{ + //union packed_structs ps; + int count; + const void *data; + int size; +}; + +/* add a data field to a packed message */ +static inline void push_data( struct packed_message *data, const void *ptr, int size ) +{ + data->data = ptr; + data->size = size; + data->count++; +} + +/* pack a pointer into a 32/64 portable format */ +static inline ULONGLONG pack_ptr( const void *ptr ) +{ + return (ULONG_PTR)ptr; +} + +/* unpack a potentially 64-bit pointer, returning 0 when truncated */ +static inline void *unpack_ptr( ULONGLONG ptr64 ) +{ + if ((ULONG_PTR)ptr64 != ptr64) return 0; + return (void *)(ULONG_PTR)ptr64; +} + + +/*********************************************************************** + * post_dde_message + * + * Post a DDE message + */ +BOOL post_dde_message( struct packed_message *data, UINT message, LPARAM lParam , LPARAM *lp) +{ + void* ptr = NULL; + int size = 0; + UINT_PTR uiLo, uiHi; + HGLOBAL hunlock = 0; + ULONGLONG hpack; + + if (!UnpackDDElParam( message, lParam, &uiLo, &uiHi )) + { + ERR("Unpack failed %x\n",message); + return FALSE; + } + + *lp = lParam; + switch (message) + { + /* DDE messages which don't require packing are: + * WM_DDE_INITIATE + * WM_DDE_TERMINATE + * WM_DDE_REQUEST + * WM_DDE_UNADVISE + */ + case WM_DDE_ACK: + if (HIWORD(uiHi)) + { + /* uiHi should contain a hMem from WM_DDE_EXECUTE */ + HGLOBAL h = DdeGetPair( (HANDLE)uiHi ); + if (h) + { + hpack = pack_ptr( h ); + /* send back the value of h on the other side */ + push_data( data, &hpack, sizeof(hpack) ); + *lp = uiLo; + ERR( "send dde-ack %lx %08lx => %p\n", uiLo, uiHi, h ); + } + } + else + { + /* uiHi should contain either an atom or 0 */ + ERR( "send dde-ack %lx atom=%lx\n", uiLo, uiHi ); + *lp = MAKELONG( uiLo, uiHi ); + } + break; + case WM_DDE_ADVISE: + case WM_DDE_DATA: + case WM_DDE_POKE: + size = 0; + if (uiLo) + { + size = GlobalSize( (HGLOBAL)uiLo ) ; + if ( (message == WM_DDE_ADVISE && size < sizeof(DDEADVISE)) || + (message == WM_DDE_DATA && size < FIELD_OFFSET(DDEDATA, Value)) || + (message == WM_DDE_POKE && size < FIELD_OFFSET(DDEPOKE, Value)) ) + return FALSE; + } + else if (message != WM_DDE_DATA) return FALSE; + + *lp = uiHi; + if (uiLo) + { + if ((ptr = GlobalLock( (HGLOBAL)uiLo) )) + { + DDEDATA *dde_data = ptr; + ERR("unused %d, fResponse %d, fRelease %d, fDeferUpd %d, fAckReq %d, cfFormat %d\n", + dde_data->unused, dde_data->fResponse, dde_data->fRelease, + dde_data->reserved, dde_data->fAckReq, dde_data->cfFormat); + push_data( data, ptr, size ); + hunlock = (HGLOBAL)uiLo; + } + } + ERR( "send ddepack %u %lx\n", size, uiHi ); + break; + case WM_DDE_EXECUTE: + if (lParam) + { + if ((ptr = GlobalLock( (HGLOBAL)lParam) )) + { + size = GlobalSize( (HGLOBAL)lParam ); + push_data(data, ptr, size); + /* so that the other side can send it back on ACK */ + *lp = lParam; + hunlock = (HGLOBAL)lParam; + ERR("WM_DDE_EXECUTE text size %d\n",GlobalSize( (HGLOBAL)lParam )); + } + } + break; + } + + FreeDDElParam(message, lParam); + + if (hunlock) GlobalUnlock(hunlock); + + return TRUE; +} + +/*********************************************************************** + * unpack_dde_message + * + * Unpack a posted DDE message received from another process. + */ +BOOL unpack_dde_message( HWND hwnd, UINT message, LPARAM *lparam, PVOID buffer, int size ) +{ + UINT_PTR uiLo, uiHi; + HGLOBAL hMem = 0; + void* ptr; + + ERR("udm : Size %d\n",size); + + switch (message) + { + case WM_DDE_ACK: + if (size) + { + ULONGLONG hpack; + /* hMem is being passed */ + if (size != sizeof(hpack)) return FALSE; + if (!buffer) return FALSE; + uiLo = *lparam; + memcpy( &hpack, buffer, size ); + hMem = unpack_ptr( hpack ); + uiHi = (UINT_PTR)hMem; + ERR("recv dde-ack %lx mem=%lx[%lx]\n", uiLo, uiHi, GlobalSize( hMem )); + } + else + { + uiLo = LOWORD( *lparam ); + uiHi = HIWORD( *lparam ); + ERR("recv dde-ack %lx atom=%lx\n", uiLo, uiHi); + } + *lparam = PackDDElParam( WM_DDE_ACK, uiLo, uiHi ); + break; + case WM_DDE_ADVISE: + case WM_DDE_DATA: + case WM_DDE_POKE: + if ((!buffer) && message != WM_DDE_DATA) return FALSE; + uiHi = *lparam; + if (size) + { + if (!(hMem = GlobalAlloc( GMEM_MOVEABLE|GMEM_DDESHARE, size ))) + return FALSE; + if ((ptr = GlobalLock( hMem ))) + { + memcpy( ptr, buffer, size ); + GlobalUnlock( hMem ); + } + else + { + GlobalFree( hMem ); + return FALSE; + } + } + uiLo = (UINT_PTR)hMem; + + *lparam = PackDDElParam( message, uiLo, uiHi ); + break; + case WM_DDE_EXECUTE: + if (size) + { + if (!buffer) return FALSE; + if (!(hMem = GlobalAlloc( GMEM_MOVEABLE|GMEM_DDESHARE, size ))) return FALSE; + if ((ptr = GlobalLock( hMem ))) + { + memcpy( ptr, buffer, size ); + GlobalUnlock( hMem ); + ERR( "exec: pairing c=%08lx s=%p\n", *lparam, hMem ); + if (!DdeAddPair( (HGLOBAL)*lparam, hMem )) + { + GlobalFree( hMem ); + ERR("udm exec: GF 1\n"); + return FALSE; + } + } + else + { + GlobalFree( hMem ); + ERR("udm exec: GF 2\n"); + return FALSE; + } + } + else + { + ERR("udm exec: No Size\n"); + return FALSE; + } + + ERR( "exec: exit c=%08lx s=%p\n", *lparam, hMem ); + *lparam = (LPARAM)hMem; + break; + } + return TRUE; +} + +NTSTATUS +WINAPI +User32CallDDEPostFromKernel(PVOID Arguments, ULONG ArgumentLength) +{ + struct packed_message data; + BOOL Ret; + PDDEPOSTGET_CALLBACK_ARGUMENTS Common = Arguments; + + data.data = 0; + data.size = 0; + ERR("DDE Post CB\n"); + Ret = post_dde_message( &data, Common->message, Common->lParam, &Common->lParam); + + if (Ret) + { + if (Common->size >= data.size) + { + if (data.data) RtlCopyMemory(&Common->buffer, data.data, data.size); + } + Common->size = data.size; + ERR("DDE Post CB size %d\n",data.size); + } + else + { + ERR("Return bad msg 0x%x Size %d\n",Common->message,Common->size); + } + + return ZwCallbackReturn(Arguments, ArgumentLength, Ret ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL); +} + +NTSTATUS +WINAPI +User32CallDDEGetFromKernel(PVOID Arguments, ULONG ArgumentLength) +{ + BOOL Ret; + PDDEPOSTGET_CALLBACK_ARGUMENTS Common = Arguments; + + ERR("DDE Get CB size %d\n",Common->size); + + Ret = unpack_dde_message( Common->hwnd, Common->message, &Common->lParam, Common->buffer, Common->size ); + + return ZwCallbackReturn(Arguments, ArgumentLength, Ret ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL); +} + + /* * @unimplemented Modified: trunk/reactos/win32ss/user/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] Thu Jan 8 00:56:51 2015 @@ -203,6 +203,8 @@ User32CallCopyImageFromKernel, User32CallSetWndIconsFromKernel, User32DeliverUserAPC, + User32CallDDEPostFromKernel, + User32CallDDEGetFromKernel, }; Modified: trunk/reactos/win32ss/user/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] Thu Jan 8 00:56:51 2015 @@ -163,7 +163,7 @@ static unsigned DdeNumUsed = 0; static CRITICAL_SECTION DdeCrst; -static BOOL FASTCALL +BOOL FASTCALL DdeAddPair(HGLOBAL ClientMem, HGLOBAL ServerMem) { unsigned i; @@ -213,7 +213,7 @@ return TRUE; } -static HGLOBAL FASTCALL +HGLOBAL FASTCALL DdeGetPair(HGLOBAL ServerMem) { unsigned i; @@ -357,67 +357,12 @@ switch (UMMsg->message) { - case WM_DDE_ACK: - { - PDDEPACK DdeLparam; - DdeLparam = HeapAlloc(GetProcessHeap(), 0, sizeof(DDEPACK)); - if (!DdeLparam || - !UnpackDDElParam( UMMsg->message, UMMsg->lParam, &DdeLparam->uiLo, &DdeLparam->uiHi)) - return FALSE; - /* - If this is a reply to WM_DDE_EXECUTE then - uiHi will contain a hMem, hence >= 0x10000. - Otherwise, it will be be an atom, a 16-bit value. - */ - if (!IS_ATOM(DdeLparam->uiHi)) - { - HGLOBAL h = DdeGetPair((HGLOBAL)(ULONG_PTR)DdeLparam->uiHi); - if (h) - { - GlobalFree((HGLOBAL)(ULONG_PTR)DdeLparam->uiHi); - DdeLparam->uiHi = (UINT_PTR) h; - } - } - FreeDDElParam(UMMsg->message, UMMsg->lParam); - KMMsg->lParam = (LPARAM) DdeLparam; - } - break; - - case WM_DDE_EXECUTE: - { - SIZE_T Size; - PKMDDEEXECUTEDATA KMDdeExecuteData; - PVOID Data; - - Size = GlobalSize((HGLOBAL) UMMsg->lParam); - Data = GlobalLock((HGLOBAL) UMMsg->lParam); - if (!Data) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - KMDdeExecuteData = HeapAlloc(GetProcessHeap(), 0, sizeof(KMDDEEXECUTEDATA) + Size); - if (!KMDdeExecuteData) - { - SetLastError(ERROR_OUTOFMEMORY); - return FALSE; - } - KMDdeExecuteData->Sender = (HWND) UMMsg->wParam; - KMDdeExecuteData->ClientMem = (HGLOBAL) UMMsg->lParam; - memcpy((PVOID) (KMDdeExecuteData + 1), Data, Size); - KMMsg->wParam = sizeof(KMDDEEXECUTEDATA) + Size; - KMMsg->lParam = (LPARAM) KMDdeExecuteData; - GlobalUnlock((HGLOBAL) UMMsg->lParam); - } - break; - case WM_COPYDATA: { PCOPYDATASTRUCT pUMCopyData = (PCOPYDATASTRUCT)UMMsg->lParam; PCOPYDATASTRUCT pKMCopyData; - pKMCopyData = HeapAlloc(GetProcessHeap(), 0, - sizeof(COPYDATASTRUCT) + pUMCopyData->cbData); + pKMCopyData = HeapAlloc(GetProcessHeap(), 0, sizeof(COPYDATASTRUCT) + pUMCopyData->cbData); if (!pKMCopyData) { SetLastError(ERROR_OUTOFMEMORY); @@ -428,8 +373,7 @@ pKMCopyData->cbData = pUMCopyData->cbData; pKMCopyData->lpData = pKMCopyData + 1; - RtlCopyMemory(pKMCopyData + 1, pUMCopyData->lpData, - pUMCopyData->cbData); + RtlCopyMemory(pKMCopyData + 1, pUMCopyData->lpData, pUMCopyData->cbData); KMMsg->lParam = (LPARAM)pKMCopyData; } @@ -448,8 +392,6 @@ { switch (KMMsg->message) { - case WM_DDE_ACK: - case WM_DDE_EXECUTE: case WM_COPYDATA: HeapFree(GetProcessHeap(), 0, (LPVOID) KMMsg->lParam); break; @@ -464,6 +406,8 @@ MsgiKMToUMMessage(PMSG KMMsg, PMSG UMMsg) { *UMMsg = *KMMsg; + + if (KMMsg->lParam == 0) return TRUE; switch (UMMsg->message) { @@ -485,43 +429,6 @@ Class += sizeof(WCHAR); Cs->lpszClass = (LPCWSTR) Class; } - } - break; - - case WM_DDE_ACK: - { - PDDEPACK DdeLparam = (PDDEPACK) KMMsg->lParam; - UMMsg->lParam = PackDDElParam(KMMsg->message, DdeLparam->uiLo, DdeLparam->uiHi); - } - break; - - case WM_DDE_EXECUTE: - { - PKMDDEEXECUTEDATA KMDdeExecuteData; - HGLOBAL GlobalData; - PVOID Data; - - KMDdeExecuteData = (PKMDDEEXECUTEDATA) KMMsg->lParam; - GlobalData = GlobalAlloc(GMEM_MOVEABLE, KMMsg->wParam - sizeof(KMDDEEXECUTEDATA)); - if (!GlobalData) - { - return FALSE; - } - Data = GlobalLock(GlobalData); - if (!Data) - { - GlobalFree(GlobalData); - return FALSE; - } - memcpy(Data, (PVOID) (KMDdeExecuteData + 1), KMMsg->wParam - sizeof(KMDDEEXECUTEDATA)); - GlobalUnlock(GlobalData); - if (!DdeAddPair(KMDdeExecuteData->ClientMem, GlobalData)) - { - GlobalFree(GlobalData); - return FALSE; - } - UMMsg->wParam = (WPARAM) KMDdeExecuteData->Sender; - UMMsg->lParam = (LPARAM) GlobalData; } break; @@ -2967,6 +2874,11 @@ KMMsg.lParam = (LPARAM) ((char *) CallbackArgs + sizeof(WINDOWPROC_CALLBACK_ARGUMENTS)); switch(KMMsg.message) { + case WM_SYSTIMER: + { + ERR("WM_SYSTIMER %p\n",KMMsg.hwnd); + break; + } case WM_SIZING: { PRECT prect = (PRECT) KMMsg.lParam;

1 0

[jimtabor] 65999: [User32] - Fix DDE Server Class names to match system Atoms.
by jimtabor＠svn.reactos.org 07 Jan '15

07 Jan '15

Author: jimtabor Date: Wed Jan 7 21:47:33 2015 New Revision: 65999 URL: http://svn.reactos.org/svn/reactos?rev=65999&view=rev Log: [User32] - Fix DDE Server Class names to match system Atoms. Modified: trunk/reactos/win32ss/user/user32/misc/ddeserver.c Modified: trunk/reactos/win32ss/user/user32/misc/ddeserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/ddeserver.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/ddeserver.c [iso-8859-1] Wed Jan 7 21:47:33 2015 @@ -29,9 +29,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddeml); -static const WCHAR szServerNameClass[] = {'D','d','e','S','e','r','v','e','r','N','a','m','e',0}; -const char WDML_szServerConvClassA[] = "DdeServerConvA"; -const WCHAR WDML_szServerConvClassW[] = {'D','d','e','S','e','r','v','e','r','C','o','n','v','W',0}; +static const WCHAR szServerNameClass[] = L"DDEMLMom"; +const char WDML_szServerConvClassA[] = "DDEMLAnsiServer"; +const WCHAR WDML_szServerConvClassW[] = L"DDEMLUnicodeServer"; static LRESULT CALLBACK WDML_ServerNameProc(HWND, UINT, WPARAM, LPARAM); static LRESULT CALLBACK WDML_ServerConvProc(HWND, UINT, WPARAM, LPARAM);

1 0

[hbelusca] 65998: [TOOLS]: Slap some sense in the indentation of some files. Next time: PLEASE CHECK YOUR F*CKING EDITOR's TABS AND SET THEM TO 4 SPACES BEFORE DOING ANYTHING ELSE!!!! (and not to 8...
by hbelusca＠svn.reactos.org 07 Jan '15

07 Jan '15

Author: hbelusca Date: Wed Jan 7 19:26:49 2015 New Revision: 65998 URL: http://svn.reactos.org/svn/reactos?rev=65998&view=rev Log: [TOOLS]: Slap some sense in the indentation of some files. Next time: PLEASE CHECK YOUR F*CKING EDITOR's TABS AND SET THEM TO 4 SPACES BEFORE DOING ANYTHING ELSE!!!! (and not to 8 spaces and then use 4 space indentation and complete with tabs). Removed: trunk/reactos/tools/cabman/makefile.win32 Modified: trunk/reactos/tools/cabman/cabinet.cxx trunk/reactos/tools/cabman/cabinet.h trunk/reactos/tools/cabman/cabman.h trunk/reactos/tools/cabman/dff.txt trunk/reactos/tools/cabman/dfp.h trunk/reactos/tools/cabman/main.cxx trunk/reactos/tools/cabman/mszip.h trunk/reactos/tools/cabman/raw.h trunk/reactos/tools/cdmake/cdmake.c trunk/reactos/tools/cdmake/dirhash.h trunk/reactos/tools/create_nls/Readme trunk/reactos/tools/create_nls/create_nls.c trunk/reactos/tools/log2lines/CMakeLists.txt trunk/reactos/tools/log2lines/cache.c trunk/reactos/tools/log2lines/cmd.c trunk/reactos/tools/log2lines/config.h trunk/reactos/tools/log2lines/list.c trunk/reactos/tools/log2lines/options.c trunk/reactos/tools/log2lines/revision.h trunk/reactos/tools/log2lines/stat.c trunk/reactos/tools/mkhive/binhive.c trunk/reactos/tools/mkhive/binhive.h trunk/reactos/tools/mkhive/cmi.c trunk/reactos/tools/mkhive/cmi.h trunk/reactos/tools/mkhive/mkhive.c trunk/reactos/tools/mkhive/reginf.c trunk/reactos/tools/mkhive/registry.c trunk/reactos/tools/mkhive/registry.h trunk/reactos/tools/mkhive/rtl.c trunk/reactos/tools/mkshelllink/mkshelllink.c trunk/reactos/tools/ms2ps/ms2ps.cpp trunk/reactos/tools/nandflash/main.c trunk/reactos/tools/ofw_interface/calls.ofw trunk/reactos/tools/ofw_interface/ofw_interface.cpp trunk/reactos/tools/pipetools/piperead.cpp trunk/reactos/tools/pipetools/pipespy.cpp trunk/reactos/tools/pipetools/pipetunnel.cpp trunk/reactos/tools/stubgen.c trunk/reactos/tools/utf16le/utf16le.cpp [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/tools/cabman/cabinet.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.cxx?r… Modified: trunk/reactos/tools/cabman/cabinet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.h?rev… Modified: trunk/reactos/tools/cabman/cabman.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabman.h?rev=… Modified: trunk/reactos/tools/cabman/dff.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/dff.txt?rev=6… Modified: trunk/reactos/tools/cabman/dfp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/dfp.h?rev=659… Modified: trunk/reactos/tools/cabman/main.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/main.cxx?rev=… Removed: trunk/reactos/tools/cabman/makefile.win32 URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/makefile.win3… Modified: trunk/reactos/tools/cabman/mszip.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/mszip.h?rev=6… Modified: trunk/reactos/tools/cabman/raw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/raw.h?rev=659… Modified: trunk/reactos/tools/cdmake/cdmake.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/cdmake.c?rev=… Modified: trunk/reactos/tools/cdmake/dirhash.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/dirhash.h?rev… Modified: trunk/reactos/tools/create_nls/Readme URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/create_nls/Readme?re… Modified: trunk/reactos/tools/create_nls/create_nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/create_nls/create_nl… Modified: trunk/reactos/tools/log2lines/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/log2lines/CMakeLists… Modified: trunk/reactos/tools/log2lines/cache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/log2lines/cache.c?re… Modified: trunk/reactos/tools/log2lines/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/log2lines/cmd.c?rev=… Modified: trunk/reactos/tools/log2lines/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/log2lines/config.h?r… Modified: trunk/reactos/tools/log2lines/list.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/log2lines/list.c?rev… Modified: trunk/reactos/tools/log2lines/options.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/log2lines/options.c?… Modified: trunk/reactos/tools/log2lines/revision.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/log2lines/revision.h… Modified: trunk/reactos/tools/log2lines/stat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/log2lines/stat.c?rev… Modified: trunk/reactos/tools/mkhive/binhive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/binhive.c?rev… Modified: trunk/reactos/tools/mkhive/binhive.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/binhive.h?rev… Modified: trunk/reactos/tools/mkhive/cmi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/cmi.c?rev=659… Modified: trunk/reactos/tools/mkhive/cmi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/cmi.h?rev=659… Modified: trunk/reactos/tools/mkhive/mkhive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.c?rev=… Modified: trunk/reactos/tools/mkhive/reginf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/reginf.c?rev=… Modified: trunk/reactos/tools/mkhive/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/registry.c?re… Modified: trunk/reactos/tools/mkhive/registry.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/registry.h?re… Modified: trunk/reactos/tools/mkhive/rtl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/rtl.c?rev=659… Modified: trunk/reactos/tools/mkshelllink/mkshelllink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkshelllink/mkshelll… Modified: trunk/reactos/tools/ms2ps/ms2ps.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/ms2ps/ms2ps.cpp?rev=… Modified: trunk/reactos/tools/nandflash/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nandflash/main.c?rev… Modified: trunk/reactos/tools/ofw_interface/calls.ofw URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/ofw_interface/calls.… Modified: trunk/reactos/tools/ofw_interface/ofw_interface.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/ofw_interface/ofw_in… Modified: trunk/reactos/tools/pipetools/piperead.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/pipetools/piperead.c… Modified: trunk/reactos/tools/pipetools/pipespy.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/pipetools/pipespy.cp… Modified: trunk/reactos/tools/pipetools/pipetunnel.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/pipetools/pipetunnel… Modified: trunk/reactos/tools/stubgen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/stubgen.c?rev=65998&… Modified: trunk/reactos/tools/utf16le/utf16le.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/utf16le/utf16le.cpp?…

1 0

[hbelusca] 65997: [SPEC2DEF]: Turn the tab character into its control code. Timo, is this tab really needed for ARM stubs, or not? (in that case maybe removing it would be better?)
by hbelusca＠svn.reactos.org 07 Jan '15

07 Jan '15

Author: hbelusca Date: Wed Jan 7 18:45:46 2015 New Revision: 65997 URL: http://svn.reactos.org/svn/reactos?rev=65997&view=rev Log: [SPEC2DEF]: Turn the tab character into its control code. Timo, is this tab really needed for ARM stubs, or not? (in that case maybe removing it would be better?) Modified: trunk/reactos/tools/spec2def/spec2def.c Modified: trunk/reactos/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/spec2def/spec2def.c?… ============================================================================== --- trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] Wed Jan 7 18:45:46 2015 @@ -391,7 +391,7 @@ if (giArch == ARCH_ARM) { fprintf(fileDest, - " EXPORT %s [FUNC]\n%s\n", + "\tEXPORT %s [FUNC]\n%s\n", pszSymbolName, pszSymbolName); }

1 0

[hbelusca] 65996: [HPP]: tab2space fixes.
by hbelusca＠svn.reactos.org 07 Jan '15

07 Jan '15

Author: hbelusca Date: Wed Jan 7 18:25:21 2015 New Revision: 65996 URL: http://svn.reactos.org/svn/reactos?rev=65996&view=rev Log: [HPP]: tab2space fixes. Modified: trunk/reactos/tools/hpp/hpp.c Modified: trunk/reactos/tools/hpp/hpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/hpp/hpp.c?rev=65996&… ============================================================================== --- trunk/reactos/tools/hpp/hpp.c [iso-8859-1] (original) +++ trunk/reactos/tools/hpp/hpp.c [iso-8859-1] Wed Jan 7 18:25:21 2015 @@ -38,30 +38,30 @@ char* convert_path(const char* origpath) { - char* newpath; - int i; - - newpath = strdup(origpath); - - i = 0; - while (newpath[i] != 0) - { + char* newpath; + int i; + + newpath = strdup(origpath); + + i = 0; + while (newpath[i] != 0) + { #ifdef UNIX_PATHS - if (newpath[i] == '\\') - { - newpath[i] = '/'; - } + if (newpath[i] == '\\') + { + newpath[i] = '/'; + } #else #ifdef DOS_PATHS - if (newpath[i] == '/') - { - newpath[i] = '\\'; - } + if (newpath[i] == '/') + { + newpath[i] = '\\'; + } #endif #endif - i++; - } - return newpath; + i++; + } + return newpath; } char* @@ -73,18 +73,18 @@ void* LoadFile(const char* pszFileName, size_t* pFileSize) { - FILE* file; - void* pFileData = NULL; - int iFileSize; + FILE* file; + void* pFileData = NULL; + int iFileSize; trace("Loading file..."); - file = fopen(pszFileName, "rb"); - if (!file) - { - trace("Could not open file\n"); - return NULL; - } + file = fopen(pszFileName, "rb"); + if (!file) + { + trace("Could not open file\n"); + return NULL; + } fseek(file, 0L, SEEK_END); iFileSize = ftell(file); @@ -109,7 +109,7 @@ fclose(file); - return pFileData; + return pFileData; }

1 0

[hbelusca] 65995: [KBDTOOL]: Whitespace fixes.
by hbelusca＠svn.reactos.org 07 Jan '15

07 Jan '15

Author: hbelusca Date: Wed Jan 7 18:24:14 2015 New Revision: 65995 URL: http://svn.reactos.org/svn/reactos?rev=65995&view=rev Log: [KBDTOOL]: Whitespace fixes. Modified: trunk/reactos/tools/kbdtool/main.c trunk/reactos/tools/kbdtool/output.c trunk/reactos/tools/kbdtool/parser.c Modified: trunk/reactos/tools/kbdtool/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/main.c?rev=6… ============================================================================== --- trunk/reactos/tools/kbdtool/main.c [iso-8859-1] (original) +++ trunk/reactos/tools/kbdtool/main.c [iso-8859-1] Wed Jan 7 18:24:14 2015 @@ -26,13 +26,13 @@ /* FUNCTIONS ******************************************************************/ -VOID +VOID PrintUsage(VOID) { /* This is who we are */ printf("\nKbdTool v%d.%02d - convert keyboard text file to C file or a keyboard layout DLL\n\n", gVersion, gSubVersion); - + /* This is what we do */ printf("Usage: KbdTool [-v] [-n] [-w] [-k] [-n] [-u|a] [-i|x|m|o|s] FILE\n\n"); printf("\t[-?] display this message\n"); @@ -47,11 +47,11 @@ printf("\t[-o] Builds for WOW64\n"); printf("\t[-s] Generate Source files (no build)\n\n"); printf("\tFILE The source keyboard file (required)\n\n"); - + /* Extra hints */ printf("\t-u/-a are mutually exclusive; kbdutool will use the last one if you specify more than one.\n"); printf("\t-i/-x/-m/-o-s will exhibit the same behavior when than one of them is specified.\n\n"); - + /* Quit */ exit(1); printf("should not be here"); @@ -65,18 +65,18 @@ CHAR Option; PCHAR OpenFlags; CHAR BuildOptions[16] = {0}; - + /* Loop for parameter */ for (i = 1; i < argc; ++i) { if (argv[i][0] != '/' && argv[i][0] != '-') break; - + if (argv[i][1] && !argv[i][2]) Option = argv[i][1]; else Option = 0; - + /* Check supported options */ switch (Option) { @@ -85,74 +85,74 @@ case 'a': UnicodeFile = 0; break; - + /* UNICODE File */ case 'U': case 'u': UnicodeFile = 1; break; - + /* Verbose */ case 'V': case 'v': Verbose = 1; break; - + /* No logo */ case 'N': case 'n': NoLogo = 1; break; - + /* Fallback driver */ case 'K': case 'k': FallbackDriver = 1; break; - + /* Sanity Check */ case 'W': case 'w': SanityCheck = 1; break; - + /* Itanium */ case 'I': case 'i': BuildType = 1; break; - + /* X86 */ case 'X': case 'x': BuildType = 0; break; - + /* AMD64 */ case 'M': case 'm': BuildType = 2; break; - + /* WOW64 */ case 'O': case 'o': BuildType = 3; break; - + /* Source only */ case 'S': case 's': SourceOnly = 1; break; - + default: /* If you got here, the options are invalid or missing */ PrintUsage(); break; } } - + /* Do we have no options? */ if (i == argc) PrintUsage(); @@ -163,14 +163,14 @@ printf("\nKbdTool v%d.%02d - convert keyboard text file to C file or a keyboard layout DLL\n\n", gVersion, gSubVersion); } - + /* Save the file name */ gpszFileName = argv[i]; - + /* Open either as binary or text */ OpenFlags = "rb"; if (!UnicodeFile) OpenFlags = "rt"; - + /* Open a handle to the file */ gfpInput = fopen(gpszFileName, OpenFlags); if (!gfpInput) @@ -179,7 +179,7 @@ printf("Unable to open '%s' for read.\n", gpszFileName); exit(1); } - + /* Should we print out what we're doing? */ if (!NoLogo) { @@ -197,7 +197,7 @@ /* Print the appropriate message depending on what was chosen */ case 0: strcpy(BuildOptions, "i386/x86"); - break; + break; case 1: strcpy(BuildOptions, "ia64"); break; @@ -212,17 +212,17 @@ break; } } - + /* Now inform the user */ printf("Compiling layout information from '%s' for %s.\n", gpszFileName, BuildOptions); } - + /* Now parse the keywords */ FailureCode = DoParsing(); - + /* Should we build? */ if (!(SourceOnly) && !(FallbackDriver)) ErrorCode = 0;//DoBuild(); - + /* Did everything work? */ if (FailureCode == 0) { @@ -234,7 +234,7 @@ /* Print the failure code */ printf("\n %13d\n", FailureCode); } - + /* Return the error code */ return ErrorCode; } Modified: trunk/reactos/tools/kbdtool/output.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/output.c?rev… ============================================================================== --- trunk/reactos/tools/kbdtool/output.c [iso-8859-1] (original) +++ trunk/reactos/tools/kbdtool/output.c [iso-8859-1] Wed Jan 7 18:24:14 2015 @@ -26,7 +26,7 @@ IN BOOLEAN AddZero) { PCHAR p; - + /* Check for invalid character */ if (Char == -1) { @@ -37,19 +37,19 @@ { /* Use our global buffer */ p = gCharName; - + /* Add the first quote unless this was a zero-string */ if (!AddZero) *p++ = '\''; - + /* Now replace any other quote or comment character with a slash */ if ((Char == '\"') || (Char == '\'') || (Char == '\\')) *p++ = '\\'; - + /* Now plug in the character */ *p++ = Char; - + /* And add the terminating quote, unless this was a zero-string */ if (!AddZero) *p++ = '\''; - + /* Terminate the buffer */ *p = '\0'; } @@ -82,7 +82,7 @@ sprintf(gCharName, "\\x%04x", Char); } } - + /* Return the name */ return gCharName; } @@ -93,26 +93,26 @@ BOOL DeadKey) { CHAR CharBuffer[255]; - PKEYNAME NextName; + PKEYNAME NextName; PCHAR Name, Buffer; ULONG i; - + /* Loop all key names */ while (KeyName) { /* Go to the next key name */ NextName = KeyName->Next; - + /* Remember the name and our buffer address */ Name = KeyName->Name; Buffer = CharBuffer; - + /* Check if it's an IDS name */ if (strncmp(Name, "IDS_", 4)) { /* No, so start parsing it. First, handle initial quote */ if (*Name != '\"') *Buffer++ = '\"'; - + /* Next, parse the name */ while (*Name) { @@ -130,7 +130,7 @@ /* Copy 6 characters */ for (i = 0; (*Name) && (i < 6); i++) *Buffer++ = *Name++; } - + /* Check if we still have something at the end */ if (*Name) { @@ -142,10 +142,10 @@ } } } - + /* Check for terminating quote */ if (*(Buffer - 1) != '\"') *Buffer++ = '\"'; - + /* Terminate the buffer */ *Buffer++ = '\0'; } @@ -168,15 +168,15 @@ /* Print the entry */ fprintf(FileHandle, " 0x%02x, L%s,\n", KeyName->Code, CharBuffer); } - + /* Cleanup allocation */ free(KeyName->Name); free(KeyName); - + /* Move on */ KeyName = NextName; } - + /* Is this a dead key? */ if (DeadKey) { @@ -199,11 +199,11 @@ ULONG i; CHAR UndefChar; USHORT SubCode; - + /* Build the keyboard name */ strcpy(OutputFile, gKBDName); strcat(OutputFile, ".H"); - + /* Open it */ FileHandle = fopen(OutputFile, "wt"); if (!FileHandle) @@ -212,7 +212,7 @@ printf(" %12s : can't open for write.\n", OutputFile); return FALSE; } - + /* Print the module header */ fprintf(FileHandle, "/****************************** Module Header ******************************\\\n" @@ -228,7 +228,7 @@ gVersion, gSubVersion, asctime(Now)); - + /* Print out the includes and defines */ fprintf(FileHandle, "/*\n" @@ -239,7 +239,7 @@ "* Include the basis of all keyboard table values\n" "*/\n" "#include \"kbd.h\"\n"); - + /* Now print out the virtual key conversion table */ fprintf(FileHandle, "/***************************************************************************\\\n" @@ -253,7 +253,7 @@ "* | Scan | | kbd | kbd | kbd | kbd | kbd | kbd |\n" "* | code | | type 1 | type 2 | type 3 | type 4 | type 5 | type 6 |\n" "\\****+-------+_+----------+----------+----------+----------+----------+----------+*/\n\n"); - + /* Loop all keys */ for (i = 0; i < 110; i++) { @@ -282,7 +282,7 @@ printf("Weird scancode value %04x: expected xx, E0xx, or E1xx\n", SubCode); exit(1); } - + /* Extended 1 */ UndefChar = 'Y'; } @@ -292,7 +292,7 @@ /* Normal key */ UndefChar = 'T'; } - + /* Print out the virtual key redefinition */ fprintf(FileHandle, "#undef %c%02X\n#define %c%02X _EQ(%43s%23s\n", @@ -302,14 +302,14 @@ Layout->Entry[i].ScanCode, getVKName(Layout->Entry[i].VirtualKey, 0), ")"); - } - } - } - + } + } + } + /* Cleanup and close */ fprintf(FileHandle,"\n"); fclose(FileHandle); - + /* We made it */ return TRUE; } @@ -325,13 +325,13 @@ ULONG Length; PCHAR p; PKEYNAME NextDescription, NextLanguage; - + /* Build the keyboard name and internal name */ strcpy(OutputFile, gKBDName); strcat(OutputFile, ".RC"); strcpy(InternalName, gKBDName); for (p = InternalName; *p; p++) *p = tolower(*p); - + /* Open it */ FileHandle = fopen(OutputFile, "wb"); if (!FileHandle) @@ -340,24 +340,24 @@ printf(" %12s : can't open for write.\n", OutputFile); return FALSE; } - + /* Check if we have copyright */ Length = strlen(gCopyright); if (!Length) { /* Set time string */ strftime(TimeBuffer, 5, "%Y", Now); - + /* Add copyright character */ strcpy(gCopyright, "(C)"); - + /* Add the year */ strcat(gCopyright, TimeBuffer); - + /* Add blank company */ strcat(gCopyright, " "); } - + /* Write the resource file header */ fprintf(FileHandle, "#include \"winver.h\"\r\n" @@ -385,7 +385,7 @@ gDescription, gVersion, gSubVersion); - + /* Continue writing it */ fprintf(FileHandle, " VALUE \"InternalName\", \"%s (%d.%d)\\0\"\r\n" @@ -410,7 +410,7 @@ InternalName, gVersion, gSubVersion); - + /* Now check if we have a locale name */ Length = strlen(gLocaleName); if (Length) @@ -421,7 +421,7 @@ 9, 1); fprintf(FileHandle, "BEGIN\r\n"); - + /* Language or locale? */ if (strchr(gLocaleName, '\"')) { @@ -433,24 +433,24 @@ /* Write the locale name */ fprintf(FileHandle, " %d \"%s\"\r\n", gStringIdForLocaleName, gLocaleName); } - + /* Terminate the entry */ fprintf(FileHandle, "END\r\n\r\n"); } - + /* Check for description information */ while (DescriptionData) { /* Remember the next pointer */ NextDescription = DescriptionData->Next; - + /* Write the header */ fprintf(FileHandle, "\r\nSTRINGTABLE DISCARDABLE\r\nLANGUAGE %d, %d\r\n", DescriptionData->Code & 0x3FF, DescriptionData->Code >> 10); fprintf(FileHandle, "BEGIN\r\n"); - + /* Quoted string or not? */ if (strchr(DescriptionData->Name, '\"')) { @@ -462,31 +462,31 @@ /* Write the description name */ fprintf(FileHandle, " %d \"%s\"\r\n", gStringIdForDescriptions, DescriptionData->Name); } - + /* Terminate the entry */ fprintf(FileHandle, "END\r\n\r\n"); - + /* Free the allocation */ free(DescriptionData->Name); free(DescriptionData); - + /* Move to the next entry */ DescriptionData = NextDescription; } - + /* Check for language information */ while (LanguageData) { /* Remember the next pointer */ NextLanguage = LanguageData->Next; - + /* Write the header */ fprintf(FileHandle, "\r\nSTRINGTABLE DISCARDABLE\r\nLANGUAGE %d, %d\r\n", LanguageData->Code & 0x3FF, LanguageData->Code >> 10); fprintf(FileHandle, "BEGIN\r\n"); - + /* Quoted string or not? */ if (strchr(LanguageData->Name, '\"')) { @@ -498,18 +498,18 @@ /* Write the language name */ fprintf(FileHandle, " %d \"%s\"\r\n", gStringIdForLanguageNames, LanguageData->Name); } - + /* Terminate the entry */ fprintf(FileHandle, "END\r\n\r\n"); - + /* Free the allocation */ free(LanguageData->Name); free(LanguageData); - + /* Move to the next entry */ LanguageData = NextLanguage; } - + /* We're done! */ fclose(FileHandle); return TRUE; @@ -520,11 +520,11 @@ { CHAR OutputFile[13]; FILE *FileHandle; - + /* Build the keyboard name and internal name */ strcpy(OutputFile, gKBDName); strcat(OutputFile, ".DEF"); - + /* Open it */ FileHandle = fopen(OutputFile, "wt"); if (!FileHandle) @@ -533,14 +533,14 @@ printf(" %12s : can't open for write.\n", OutputFile); return FALSE; } - + /* Write the file exports */ fprintf(FileHandle, "LIBRARY %s\n\n" "EXPORTS\n" " KbdLayerDescriptor @1\n", gKBDName); - + /* Clean up */ fclose(FileHandle); return TRUE; @@ -567,11 +567,11 @@ ULONG HighestState; PVKNAME Entry; PCHAR p; - + /* Build the keyboard name and internal name */ strcpy(OutputFile, gKBDName); strcat(OutputFile, ".C"); - + /* Open it */ FileHandle = fopen(OutputFile, "wt"); if (!FileHandle) @@ -580,7 +580,7 @@ printf(" %12s : can't open for write.\n", OutputFile); return FALSE; } - + /* Print the header */ fprintf(FileHandle, "/***************************************************************************\\\n" @@ -595,7 +595,7 @@ gVersion, gSubVersion, asctime(Now)); - + /* What kind of driver is this? */ if (FallbackDriver) { @@ -609,7 +609,7 @@ "#include <windows.h>\n" "#include \"kbd.h\"\n" "#include \"%s.h\"\n\n", - gKBDName); + gKBDName); } /* What kind of driver is this? */ @@ -641,7 +641,7 @@ "/***************************************************************************\\\n" "* ausVK[] - Virtual Scan Code to Virtual Key conversion table\n" "\\***************************************************************************/\n\n"); - + /* Table begin */ fprintf(FileHandle, "static ALLOC_SECTION_LDATA USHORT ausVK[] = {\n" @@ -652,7 +652,7 @@ " T20, T21, T22, T23, T24, T25, T26, T27,\n" " T28, T29, T2A, T2B, T2C, T2D, T2E, T2F,\n" " T30, T31, T32, T33, T34, T35,\n\n"); - + /* Table continue */ fprintf(FileHandle, " /*\n" @@ -662,7 +662,7 @@ " T37 | KBDMULTIVK, // numpad_* + Shift/Alt -> SnapShot\n\n" " T38, T39, T3A, T3B, T3C, T3D, T3E,\n" " T3F, T40, T41, T42, T43, T44,\n\n"); - + /* Table continue */ fprintf(FileHandle, " /*\n" @@ -672,7 +672,7 @@ " */\n" " T45 | KBDEXT | KBDMULTIVK,\n\n" " T46 | KBDMULTIVK,\n\n"); - + /* Numpad table */ fprintf(FileHandle, " /*\n" @@ -693,7 +693,7 @@ " T51 | KBDNUMPAD | KBDSPECIAL, // Numpad 3 (PgDn),\n" " T52 | KBDNUMPAD | KBDSPECIAL, // Numpad 0 (Ins),\n" " T53 | KBDNUMPAD | KBDSPECIAL, // Numpad . (Del),\n\n"); - + /* Table finish */ fprintf(FileHandle, " T54, T55, T56, T57, T58, T59, T5A, T5B,\n" @@ -703,10 +703,10 @@ " T74, T75, T76, T77, T78, T79, T7A, T7B,\n" " T7C, T7D, T7E\n\n" "};\n\n"); - + /* Key name table header */ fprintf(FileHandle, "static ALLOC_SECTION_LDATA VSC_VK aE0VscToVk[] = {\n"); - + /* Loop 110-key table */ for (i = 0; i < 110; i++) { @@ -729,13 +729,13 @@ } } } - + /* Key name table finish */ fprintf(FileHandle, " { 0, 0 }\n};\n\n"); - + /* Extended key name table header */ fprintf(FileHandle, "static ALLOC_SECTION_LDATA VSC_VK aE1VscToVk[] = {\n"); - + /* Loop 110-key table */ for (i = 0; i < 110; i++) { @@ -758,12 +758,12 @@ } } } - + /* Extended key name table finish */ fprintf(FileHandle, " { 0x1D, Y1D }, // Pause\n" " { 0 , 0 }\n};\n\n"); - + /* Modifier table description */ fprintf(FileHandle, "/***************************************************************************\\\n" @@ -776,10 +776,10 @@ "* CTRL (L & R) is used to generate control characters\n" "* ALT (L & R) used for generating characters by number with numpad\n" "\\***************************************************************************/\n"); - + /* Modifier table header */ fprintf(FileHandle, "static ALLOC_SECTION_LDATA VK_TO_BIT aVkToBits[] = {\n"); - + /* Loop modifier table */ i = 0; Entry = &Modifiers[0]; @@ -790,14 +790,14 @@ " { %-12s, %-12s },\n", getVKName(Entry->VirtualKey, 1), Entry->Name); - + /* Move to the next one */ Entry = &Modifiers[++i]; } - + /* Modifier table finish */ fprintf(FileHandle, " { 0, 0 }\n};\n\n"); - + /* Modifier conversion table description */ fprintf(FileHandle, "/***************************************************************************\\\n" @@ -806,10 +806,10 @@ "* See kbd.h for a full description.\n" "*\n" "\\***************************************************************************/\n\n"); - + /* Zero out local state data */ for (i = 0; i < 8; i++) States[i] = -1; - + /* Find the highest set state */ for (HighestState = 1, i = 0; (i < 8) && (ShiftStates[i] != -1); i++) { @@ -817,7 +817,7 @@ States[ShiftStates[i]] = i; if (ShiftStates[i] > HighestState) HighestState = ShiftStates[i]; } - + /* Modifier conversion table header */ fprintf(FileHandle, "static ALLOC_SECTION_LDATA MODIFIERS CharModifiers = {\n" @@ -827,7 +827,7 @@ " // Modification# // Keys Pressed\n" " // ============= // =============\n", HighestState); - + /* Loop states */ for (i = 0; i <= HighestState; i++) { @@ -843,14 +843,14 @@ if (i == HighestState) { /* Last state header */ - fprintf(FileHandle, " %d // ", States[i]); + fprintf(FileHandle, " %d // ", States[i]); } else { /* Normal state header */ - fprintf(FileHandle, " %d, // ", States[i]); + fprintf(FileHandle, " %d, // ", States[i]); } - + /* State 1 or higher? */ if (i >= 1) { @@ -864,34 +864,34 @@ fprintf(FileHandle, "+"); NeedPlus = FALSE; } - + /* Check if it's time to add a modifier */ if (i & k) { /* Get the key state name and copy it into our buffer */ strcpy(KeyNameBuffer, getVKName(Modifiers[j].VirtualKey, 1)); - + /* Go go the 4th char (past the "KBD") and lower name */ for (p = &KeyNameBuffer[4]; *p; p++) *p = tolower(*p); - + /* Print it */ fprintf(FileHandle, "%s", &KeyNameBuffer[3]); - + /* We'll need a plus sign next */ NeedPlus = TRUE; } } } - + /* Terminate the entry */ fprintf(FileHandle, "\n"); } } - - + + /* Modifier conversion table end */ fprintf(FileHandle," }\n" "};\n\n"); - + /* Shift state translation table description */ fprintf(FileHandle, "/***************************************************************************\\\n" @@ -899,7 +899,7 @@ "* aVkToWch2[] - Virtual Key to WCHAR translation for 2 shift states\n" "* aVkToWch3[] - Virtual Key to WCHAR translation for 3 shift states\n" "* aVkToWch4[] - Virtual Key to WCHAR translation for 4 shift states\n"); - + /* Check if there's exta shift states */ for (i = 5; i < HighestState; i++) { @@ -909,7 +909,7 @@ i, i); } - + /* Shift state translation table description continue */ fprintf(FileHandle, "*\n" @@ -931,7 +931,7 @@ "* WCH_LGTR - Ligature (generates multiple characters)\n" "*\n" "\\***************************************************************************/\n\n"); - + /* Loop all the states */ for (i = 2; i <= StateCount; i++) { @@ -945,42 +945,42 @@ if (i == Layout->Entry[j].StateCount) break; } } - + /* Print the table header */ fprintf(FileHandle, "static ALLOC_SECTION_LDATA VK_TO_WCHARS%d aVkToWch%d[] = {\n" "// | | Shift |", i, i); - + /* Print the correct state label */ for (k = 2; k < i; k++) fprintf(FileHandle, "%-9.9s|", StateLabel[ShiftStates[k]]); - + /* Print the next separator */ fprintf(FileHandle, "\n// |=========|=========|"); - + /* Check for extra states and print their separators too */ for (k = 2; k < i; k++) fprintf(FileHandle, "=========|"); - + /* Finalize the separator header */ fprintf(FileHandle, "\n"); - + /* Loop all the scan codes */ for (j = 0; j < 110; j++) { /* Check if this is the state for the entry */ if (i != Layout->Entry[j].StateCount) continue; - + /* Print out the entry for this key */ fprintf(FileHandle, " {%-13s,%-7s", getVKName(Layout->Entry[j].VirtualKey, 1), CapState[Layout->Entry[j].Cap]); - + /* Initialize the buffer for this line */ *LineBuffer = '\0'; - + /* Loop states */ for (k = 0; k < i; k++) { @@ -991,7 +991,7 @@ printf("Dead key data not supported!\n"); exit(1); } - + /* Check if it's a ligature key */ if (Layout->Entry[j].LigatureCharData[k]) { @@ -999,19 +999,19 @@ printf("Ligature key data not supported!\n"); exit(1); } - + /* Print out the WCH_ name */ fprintf(FileHandle, ",%-9s", WChName(Layout->Entry[j].CharData[k], 0)); - + /* If we have something on the line buffer by now, add WCH_NONE */ if (*LineBuffer != '\0') strcpy(LineBuffer, "WCH_NONE "); } - + /* Finish the line */ fprintf(FileHandle, "},\n"); - + /* Do we have any data at all? */ if (*LineBuffer != '\0') { @@ -1019,15 +1019,15 @@ fprintf(FileHandle, "%s},\n", LineBuffer); continue; } - + /* Otherwise, we're done, unless this requires SGCAP data */ if (Layout->Entry[j].Cap != 2) continue; - + /* Not yet supported */ printf("SGCAP not yet supported!\n"); exit(1); } - + /* Did we only have two states? */ if (i == 2) { @@ -1039,7 +1039,7 @@ " {VK_MULTIPLY ,0 ,'*' ,'*' },\n" " {VK_SUBTRACT ,0 ,'-' ,'-' },\n"); } - + /* Terminate the table */ fprintf(FileHandle, " {0 ,0 "); for (k = 0; k < i; k++) fprintf(FileHandle, ",0 "); @@ -1047,7 +1047,7 @@ /* Terminate the structure */ fprintf(FileHandle, "}\n" "};\n\n"); } - + /* Numpad translation table */ fprintf(FileHandle, "// Put this last so that VkKeyScan interprets number characters\n" @@ -1066,10 +1066,10 @@ " { VK_NUMPAD9 , 0 , '9' },\n" " { 0 , 0 , '\\0' }\n" "};\n\n"); - + /* Translation tables header */ fprintf(FileHandle,"static ALLOC_SECTION_LDATA VK_TO_WCHAR_TABLE aVkToWcharTable[] = {\n"); - + /* Loop states higher than 3 */ for (i = 3; i <= StateCount; i++) { @@ -1080,14 +1080,14 @@ i, i); } - + /* Array of translation tables */ fprintf(FileHandle, " { (PVK_TO_WCHARS1)aVkToWch2, 2, sizeof(aVkToWch2[0]) },\n" " { (PVK_TO_WCHARS1)aVkToWch1, 1, sizeof(aVkToWch1[0]) },\n" " { NULL, 0, 0 },\n" "};\n\n"); - + /* Scan code to key name conversion table description */ fprintf(FileHandle, "/***************************************************************************\\\n" @@ -1098,33 +1098,33 @@ "* Only the names of Extended, NumPad, Dead and Non-Printable keys are here.\n" "* (Keys producing printable characters are named by that character)\n" "\\***************************************************************************/\n\n"); - + /* Check for key name data */ if (KeyNameData) { /* Table header */ fprintf(FileHandle, "static ALLOC_SECTION_LDATA VSC_LPWSTR aKeyNames[] = {\n"); - + /* Print table */ PrintNameTable(FileHandle, KeyNameData, FALSE); - + /* Table end */ fprintf(FileHandle, "};\n\n"); } - + /* Check for extended key name data */ if (KeyNameExtData) { /* Table header */ fprintf(FileHandle, "static ALLOC_SECTION_LDATA VSC_LPWSTR aKeyNamesExt[] = {\n"); - + /* Print table */ PrintNameTable(FileHandle, KeyNameExtData, FALSE); - + /* Table end */ fprintf(FileHandle, "};\n\n"); } - + /* Check for dead key name data */ if (KeyNameDeadData) { @@ -1132,7 +1132,7 @@ printf("Dead key name data not supported!\n"); exit(1); } - + /* Check for dead key data */ if (DeadKeyData) { @@ -1140,7 +1140,7 @@ printf("Dead key data not supported!\n"); exit(1); } - + /* Check for ligature data */ if (LigatureData) { @@ -1148,10 +1148,10 @@ printf("Ligature key data not supported!\n"); exit(1); } - + /* Main keyboard table descriptor type */ fprintf(FileHandle, "static "); - + /* FIXME? */ /* Main keyboard table descriptor header */ @@ -1169,7 +1169,7 @@ " * Diacritics\n" " */\n", FallbackDriver ? "Fallback" : "" ); - + /* Descriptor dead key data section */ if (DeadKeyData) { @@ -1179,13 +1179,13 @@ { fprintf(FileHandle, " NULL,\n\n"); } - + /* Descriptor key name comment */ fprintf(FileHandle, " /*\n" " * Names of Keys\n" " */\n"); - + /* Descriptor key name section */ if (KeyNameData) { @@ -1195,7 +1195,7 @@ { fprintf(FileHandle, " NULL,\n"); } - + /* Descriptor extended key name section */ if (KeyNameExtData) { @@ -1205,7 +1205,7 @@ { fprintf(FileHandle, " NULL,\n"); } - + /* Descriptor dead key name section */ if ((DeadKeyData) && (KeyNameDeadData)) { @@ -1215,7 +1215,7 @@ { fprintf(FileHandle, " NULL,\n\n"); } - + /* Descriptor conversion table section */ fprintf(FileHandle, " /*\n" @@ -1228,15 +1228,15 @@ " /*\n" " * Locale-specific special processing\n" " */\n"); - + /* FIXME: AttributeData and KLLF_ALTGR stuff */ - + /* Descriptor locale-specific section */ fprintf(FileHandle, " MAKELONG(%s, KBD_VERSION),\n\n", "0"); /* FIXME */ - + /* Descriptor ligature data comment */ fprintf(FileHandle, " /*\n * Ligatures\n */\n %d,\n", 0); /* FIXME */ - + /* Descriptor ligature data section */ if (!LigatureData) { @@ -1251,7 +1251,7 @@ /* Descriptor finish */ fprintf(FileHandle, "};\n\n"); - + /* Keyboard layout callback function */ if (!FallbackDriver) fprintf(FileHandle, "PKBDTABLES KbdLayerDescriptor(VOID)\n" @@ -1287,11 +1287,11 @@ { /* It's not, create header file */ if (!kbd_h(&g_Layout)) FailureCode = 1; - + /* Create the resource file */ if (!kbd_rc(DescriptionData, LanguageData)) FailureCode = 2; } - + /* Create the C file */ if (!kbd_c(StateCount, ShiftStates, @@ -1306,14 +1306,14 @@ /* Failed in C file generation */ FailureCode = 3; } - + /* Check if this just a fallback driver*/ if (!FallbackDriver) { /* Generate the definition file */ if (!kbd_def()) FailureCode = 4; } - + /* Done */ return FailureCode; } Modified: trunk/reactos/tools/kbdtool/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/parser.c?rev… ============================================================================== --- trunk/reactos/tools/kbdtool/parser.c [iso-8859-1] (original) +++ trunk/reactos/tools/kbdtool/parser.c [iso-8859-1] Wed Jan 7 18:24:14 2015 @@ -53,10 +53,10 @@ isKeyWord(PCHAR p) { ULONG i; - + /* Check if we know this keyword */ for (i = 0; i < KEYWORD_COUNT; i++) if (strcmp(KeyWordList[i], p) == 0) break; - + /* If we didn't find anything, i will be KEYWORD_COUNT, which is invalid */ return i; } @@ -66,7 +66,7 @@ IN BOOLEAN Prefix) { ULONG i; - + /* Loop for standard virtual key */ if (((VirtualKey >= 'A') && (VirtualKey <= 'Z')) || ((VirtualKey >= '0') && (VirtualKey <= '9'))) @@ -78,7 +78,7 @@ gVKeyName[3] = '\0'; return gVKeyName; } - + /* Check if a prefix is required */ if (Prefix) { @@ -90,7 +90,7 @@ /* Otherwise, don't add anything */ strcpy(gVKeyName, ""); } - + /* Loop all virtual keys */ for (i = 0; i < 36; i++) { @@ -102,7 +102,7 @@ return gVKeyName; } } - + /* If we got here, then we failed, so print out an error name */ strcpy(gVKeyName, "#ERROR#"); return gVKeyName; @@ -114,11 +114,11 @@ ULONG Length; ULONG i; ULONG KeyNumber; - + /* Compute the length of the string */ Length = strlen(p); if (!Length) return -1; - + /* Check if this is is a simple key */ if (Length == 1) { @@ -127,10 +127,10 @@ /* Otherwise, convert the letter to upper case */ *p = toupper(*p); - + /* And make sure it's a valid letter */ if ((*p >= 'A') && (*p <='Z')) return *p; - + /* Otherwise, fail */ return -1; } @@ -141,7 +141,7 @@ /* Check if we have a match */ if (!strcmp(VKName[i].Name, p)) return VKName[i].VirtualKey; } - + /* Check if this is a hex string */ if ((*p == '0') && ((*(p + 1) == 'x') || (*(p + 1) == 'X'))) { @@ -163,10 +163,10 @@ ULONG CharInfo = CHAR_NORMAL_KEY; UCHAR StateChar; ULONG CharCode; - + /* Calculate the length of the state */ Length = strlen(State); - + /* Check if this is at least a simple key state */ if (Length > 1) { @@ -183,7 +183,7 @@ CharInfo = CHAR_OTHER_KEY; } } - + /* Check if this is a numerical key state */ if ((Length - 1) >= 2) { @@ -194,7 +194,7 @@ { /* Handle a ligature key */ CharInfo = CHAR_LIGATURE_KEY; - + /* Not yet handled */ printf("Ligatured character entries not yet supported!\n"); exit(1); @@ -225,29 +225,29 @@ /* Return the type of character this is */ return CharInfo; } - + BOOLEAN NextLine(PCHAR LineBuffer, ULONG BufferSize, FILE *File) { PCHAR p, pp; - + /* Scan each line */ while (fgets(LineBuffer, BufferSize, File)) { /* Remember it */ gLineCount++; - + /* Reset the pointer at the beginning of the line */ - p = LineBuffer; + p = LineBuffer; /* Now bypass all whitespace (and tabspace) */ while ((*p) && ((*p == ' ') || (*p == '\t'))) p++; - + /* If this is an old-style comment, skip the line */ if (*p == ';') continue; - + /* Otherwise, check for new-style comment */ pp = strstr(p, "//"); if (pp) @@ -262,11 +262,11 @@ p = strchr(p, '\n'); if (p) *p = '\0'; } - + /* We have a line! */ return TRUE; } - + /* No line found */ return FALSE; } @@ -276,7 +276,7 @@ { ULONG KeyWord; CHAR KeyWordChars[32]; - + /* Scan each line, skipping it if it's not a keyword */ while (NextLine(gBuf, sizeof(gBuf), gfpInput)) { @@ -288,21 +288,21 @@ if (KeyWord < KEYWORD_COUNT) return KeyWord; } } - + /* We skipped all the possible lines, not finding anything */ return KEYWORD_COUNT; } ULONG DoKBD(VOID) -{ +{ /* On Unicode files, we need to find the Unicode marker (FEEF) */ ASSERT(UnicodeFile == FALSE); - + /* Initial values */ *gKBDName = '\0'; *gDescription = '\0'; - + /* Scan for the values */ if (sscanf(gBuf, "KBD %8s \"%40[^\"]\" %d", gKBDName, gDescription, &gID) < 2) { @@ -310,7 +310,7 @@ printf("Unable to read keyboard name or description.\n"); exit(1); } - + /* Debug only */ DPRINT1("KBD Name: [%8s] Description: [%40s] ID: [%d]\n", gKBDName, gDescription, gID); return SkipLines(); @@ -318,14 +318,14 @@ ULONG DoVERSION(VOID) -{ +{ /* Scan for the value */ if (sscanf(gBuf, "VERSION %d", &gKbdLayoutVersion) < 1) { /* Couldn't find them */ printf("Unable to read keyboard version information.\n"); } - + /* Debug only */ DPRINT1("VERSION [%d]\n", gKbdLayoutVersion); return SkipLines(); @@ -333,17 +333,17 @@ ULONG DoCOPYRIGHT(VOID) -{ +{ /* Initial values */ *gCopyright = '\0'; - + /* Scan for the value */ if (sscanf(gBuf, "COPYRIGHT \"%40[^\"]\"", gCopyright) < 1) { /* Couldn't find them */ printf("Unable to read the specified COPYRIGHT string.\n"); } - + /* Debug only */ DPRINT1("COPYRIGHT [%40s]\n", gCopyright); return SkipLines(); @@ -351,17 +351,17 @@ ULONG DoCOMPANY(VOID) -{ +{ /* Initial values */ *gCompany = '\0'; - + /* Scan for the value */ if (sscanf(gBuf, "COMPANY \"%85[^\"]\"", gCompany) < 1) { /* Couldn't find them */ printf("Unable to read the specified COMPANY name.\n"); } - + /* Debug only */ DPRINT1("COMPANY [%85s]\n", gCompany); return SkipLines(); @@ -369,17 +369,17 @@ ULONG DoLOCALENAME(VOID) -{ +{ /* Initial values */ *gLocaleName = '\0'; - + /* Scan for the value */ if (sscanf(gBuf, "LOCALENAME \"%40[^\"]\"", gLocaleName) < 1) { /* Couldn't find them */ printf("Unable to read the specified COPYRIGHT string.\n"); } - + /* Debug only */ DPRINT1("LOCALENAME [%40s]\n", gLocaleName); return SkipLines(); @@ -393,23 +393,23 @@ ULONG LanguageCode; PCHAR p, pp; PKEYNAME Description; - + /* Assume nothing */ *DescriptionData = 0; - + /* Start scanning */ while (NextLine(gBuf, 256, gfpInput)) - { + { /* Search for token */ if (sscanf(gBuf, "%s", Token) != 1) continue; - + /* Make sure it's not just a comment */ if (*Token == ';') continue; - + /* Make sure it's not a keyword */ KeyWord = isKeyWord(Token); if (KeyWord < KEYWORD_COUNT) break; - + /* Now scan for the language code */ if (sscanf(Token, " %4x", &LanguageCode) != 1) { @@ -417,7 +417,7 @@ printf("An invalid LANGID was specified.\n"); continue; } - + /* Now get the actual description */ if (sscanf(gBuf, " %*4x %s[^\n]", Token) != 1) { @@ -425,15 +425,15 @@ printf("A language description is missing.\n"); continue; } - + /* Get the description string and find the ending */ p = strstr(gBuf, Token); pp = strchr(p, '\n'); if (!pp) pp = strchr(p, '\r'); - + /* Terminate the description string here */ if (pp) *pp = 0; - + /* Now allocate the description */ Description = malloc(sizeof(KEYNAME)); if (!Description) @@ -442,15 +442,15 @@ printf("Unable to allocate the KEYNAME struct (out of memory?).\n"); exit(1); } - + /* Fill out the structure */ Description->Code = LanguageCode; Description->Name = strdup(p); Description->Next = NULL; - + /* Debug only */ DPRINT1("LANGID: [%4x] Description: [%s]\n", Description->Code, Description->Name); - + /* Point to it and advance the pointer */ *DescriptionData = Description; DescriptionData = &Description->Next; @@ -468,23 +468,23 @@ ULONG LanguageCode; PCHAR p, pp; PKEYNAME Language; - + /* Assume nothing */ *LanguageData = 0; - + /* Start scanning */ while (NextLine(gBuf, 256, gfpInput)) - { + { /* Search for token */ if (sscanf(gBuf, "%s", Token) != 1) continue; - + /* Make sure it's not just a comment */ if (*Token == ';') continue; - + /* Make sure it's not a keyword */ KeyWord = isKeyWord(Token); if (KeyWord < KEYWORD_COUNT) break; - + /* Now scan for the language code */ if (sscanf(Token, " %4x", &LanguageCode) != 1) { @@ -492,7 +492,7 @@ printf("An invalid LANGID was specified.\n"); continue; } - + /* Now get the actual language */ if (sscanf(gBuf, " %*4x %s[^\n]", Token) != 1) { @@ -500,15 +500,15 @@ printf("A language name is missing\n"); continue; } - + /* Get the language string and find the ending */ p = strstr(gBuf, Token); pp = strchr(p, '\n'); if (!pp) pp = strchr(p, '\r'); - + /* Terminate the language string here */ if (pp) *pp = 0; - + /* Now allocate the language */ Language = malloc(sizeof(KEYNAME)); if (!Language) @@ -517,20 +517,20 @@ printf("Unable to allocate the KEYNAME struct (out of memory?).\n"); exit(1); } - + /* Fill out the structure */ Language->Code = LanguageCode; Language->Name = strdup(p); Language->Next = NULL; - + /* Debug only */ DPRINT1("LANGID: [%4x] Name: [%s]\n", Language->Code, Language->Name); - + /* Point to it and advance the pointer */ *LanguageData = Language; LanguageData = &Language->Next; } - + /* We are done */ return KeyWord; } @@ -543,23 +543,23 @@ ULONG CharacterCode; PCHAR p, pp; PKEYNAME KeyName; - + /* Assume nothing */ *KeyNameData = 0; - + /* Start scanning */ while (NextLine(gBuf, 256, gfpInput)) - { + { /* Search for token */ if (sscanf(gBuf, "%s", Token) != 1) continue; - + /* Make sure it's not just a comment */ if (*Token == ';') continue; - + /* Make sure it's not a keyword */ KeyWord = isKeyWord(Token); if (KeyWord < KEYWORD_COUNT) break; - + /* Now scan for the character code */ if (sscanf(Token, " %4x", &CharacterCode) != 1) { @@ -567,7 +567,7 @@ printf("An invalid character code was specified.\n"); continue; } - + /* Now get the actual key name */ if (sscanf(gBuf, " %*4x %s[^\n]", Token) != 1) { @@ -575,15 +575,15 @@ printf("A key name is missing\n"); continue; } - + /* Get the key name string and find the ending */ p = strstr(gBuf, Token); pp = strchr(p, '\n'); if (!pp) pp = strchr(p, '\r'); - + /* Terminate the key name string here */ if (pp) *pp = 0; - + /* Now allocate the language */ KeyName = malloc(sizeof(KEYNAME)); if (!KeyName) @@ -592,22 +592,22 @@ printf("Unable to allocate the KEYNAME struct (out of memory?).\n"); exit(1); } - + /* Fill out the structure */ KeyName->Code = CharacterCode; KeyName->Name = strdup(p); KeyName->Next = NULL; - + /* Debug only */ DPRINT1("CHARCODE: [%4x] Name: [%s]\n", KeyName->Code, KeyName->Name); - + /* Point to it and advance the pointer */ *KeyNameData = KeyName; KeyNameData = &KeyName->Next; } - + /* We are done */ - return KeyWord; + return KeyWord; } ULONG @@ -618,23 +618,23 @@ ULONG i; ULONG ShiftState; CHAR Token[32]; - + /* Reset the shift states */ for (i = 0; i < 8; i++) ShiftStates[i] = -1; - + /* Start with no states */ *StateCount = 0; - + /* Scan for shift states */ while (NextLine(gBuf, 256, gfpInput)) { /* Search for token */ if (sscanf(gBuf, "%s", Token) != 1) continue; - + /* Make sure it's not a keyword */ KeyWord = isKeyWord(Token); if (KeyWord < KEYWORD_COUNT) break; - + /* Now scan for the shift state */ if (sscanf(gBuf, " %1s[012367]", Token) != 1) { @@ -642,10 +642,10 @@ if (Verbose) printf("An invalid shift state '%s' was found (use 0, 1, 2, 3, 6, or 7.)\n", Token); continue; } - + /* Now read the state */ ShiftState = atoi(Token); - + /* Scan existing states */ for (i = 0; i < *StateCount; i++) { @@ -657,7 +657,7 @@ break; } } - + /* Make sure we won't overflow */ if (*StateCount < 8) { @@ -670,12 +670,12 @@ if (Verbose) printf("There were too many states (you defined %d).\n", *StateCount); } } - + /* Debug only */ DPRINT1("Found %d Shift States: [", *StateCount); for (i = 0; i < *StateCount; i++) DPRINT1("%d ", ShiftStates[i]); DPRINT1("]\n"); - + /* We are done */ return KeyWord; } @@ -727,24 +727,24 @@ ULONG ScanCodeCount = -1; PLAYOUTENTRY Entry; UCHAR CharacterType, LigatureChar; - + /* Zero out the layout */ memset(LayoutData, 0, sizeof(LAYOUT)); - + /* Read each line */ Entry = &LayoutData->Entry[0]; while (NextLine(gBuf, 256, gfpInput)) { /* Search for token */ if (sscanf(gBuf, "%s", Token) != 1) continue; - + /* Make sure it's not just a comment */ if (*Token == ';') continue; - + /* Make sure it's not a keyword */ KeyWord = isKeyWord(Token); if (KeyWord < KEYWORD_COUNT) break; - + /* Now read the entry */ TokenCount = sscanf(gBuf, " %x %s %s", &ScanCode, Token, Cap); if (TokenCount == 3) @@ -763,7 +763,7 @@ /* Simplified layout with no cap */ FullEntry = FALSE; } - + /* One more */ DPRINT1("RAW ENTRY: [%x %s %s]\n", ScanCode, Token, Cap); Entry++; @@ -773,11 +773,11 @@ printf("ScanCode %02x - too many scancodes here to parse.\n", ScanCode); exit(1); } - + /* Fill out this entry */ Entry->ScanCode = ScanCode; Entry->LineCount = gLineCount; - + /* Loop scancode table */ for (i = 0; i < 110; i++) { @@ -787,7 +787,7 @@ { /* New code */ if (Verbose) printf("A new scancode is being defined: 0x%2X, %s\n", Entry->ScanCode, Token); - + /* Fill out the entry */ Entry->VirtualKey = getVKNum(Token); break; @@ -801,7 +801,7 @@ printf("Scancode %X was previously defined.\n", ScanCode); exit(1); } - + /* Check if there is a valid virtual key */ if (ScVk[i].VirtualKey == 0xFFFF) { @@ -809,24 +809,24 @@ printf("The Scancode you tried to use (%X) is reserved.\n", ScanCode); exit(1); } - + /* Fill out the entry */ Entry->OriginalVirtualKey = ScVk[i].VirtualKey; Entry->Name = ScVk[i].Name; break; } } - + /* The entry is now processed */ Entry->Processed = TRUE; ScVk[i].Processed = TRUE; - + /* Get the virtual key from the entry */ VirtualKey = getVKNum(Token); Entry->VirtualKey = VirtualKey; DPRINT1("ENTRY: [%x %x %x %s] with ", Entry->VirtualKey, Entry->OriginalVirtualKey, Entry->ScanCode, Entry->Name); - + /* Make sure it's valid */ if (VirtualKey == 0xFFFF) { @@ -834,13 +834,13 @@ if (Verbose) printf("An invalid Virtual Key '%s' was defined.\n", Token); continue; } - + /* Is this a full entry */ if (FullEntry) { /* Do we have SGCAP data? Set cap mode to 2 */ if (!strcmp(Cap, "SGCAP")) *Cap = '2'; - + /* Read the cap mode */ if (sscanf(Cap, "%1d[012]", &Entry->Cap) != 1) { @@ -849,7 +849,7 @@ exit(1); } } - + /* Read the states */ Count = sscanf(gBuf, " %*s %*s %*s %s %s %s %s %s %s %s %s", @@ -863,7 +863,7 @@ State[7]); Entry->StateCount = Count; DPRINT1("%d STATES: [", Count); - + /* Check if there are less than 2 states */ if ((Count < 2) && (FullEntry)) { @@ -871,7 +871,7 @@ printf("You must have at least 2 characters.\n"); exit(1); } - + /* Loop all states */ for (i = 0; i < Count; i++) { @@ -883,7 +883,7 @@ Entry->CharData[i] = -1; continue; } - + /* Otherwise, check what kind of character this is */ CharacterType = getCharacterInfo(State[i], &Entry->CharData[i], @@ -899,16 +899,16 @@ Entry->OtherCharData[i] = 1; } } - + /* Check for sanity checks */ DPRINT1("]\n"); if (SanityCheck) { /* Not yet handled... */ printf("Sanity checks not yet handled!\n"); - exit(1); - } - + exit(1); + } + /* Check if we had SGCAP data */ if (Entry->Cap & 2) { @@ -917,7 +917,7 @@ exit(1); } } - + /* Process the scan code table */ Entry = &LayoutData->Entry[ScanCodeCount]; for (i = 0; i < 110; i++) @@ -925,7 +925,7 @@ /* Get the scan code */ CurrentCode = ScVk[i].ScanCode; if (CurrentCode == 0xFFFF) break; - + /* Check if this entry had been processed */ if (ScVk[i].Processed) { @@ -939,9 +939,9 @@ { /* Fail */ printf("ScanCode %02x - too many scancodes here to parse.\n", CurrentCode); - exit(1); + exit(1); } - + /* Build an entry for it */ Entry++; Entry->ScanCode = CurrentCode; @@ -954,7 +954,7 @@ Entry->VirtualKey, Entry->ScanCode, Entry->Name); } } - + /* Skip what's left */ return KeyWord; } @@ -969,7 +969,7 @@ PKEYNAME DescriptionData = NULL, LanguageData = NULL; PKEYNAME KeyNameData = NULL, KeyNameExtData = NULL, KeyNameDeadData = NULL; PVOID AttributeData = NULL, LigatureData = NULL, DeadKeyData = NULL; - + /* Parse keywords */ gLineCount = 0; KeyWord = SkipLines(); @@ -986,7 +986,7 @@ { /* Save this keyword */ KeyWords[KeyWord]++; - + /* Check for duplicate entires, other than DEADKEY, which is okay */ if ((KeyWord != 9) && (KeyWords[KeyWord] > 1) && (Verbose)) { @@ -1000,49 +1000,49 @@ { /* KBD */ case 0: - + DPRINT1("Found KBD section\n"); KeyWord = DoKBD(); break; - + /* VERSION */ case 1: - + DPRINT1("Found VERSION section\n"); KeyWord = DoVERSION(); break; - + /* COPYRIGHT */ case 2: - + DPRINT1("Found COPYRIGHT section\n"); KeyWord = DoCOPYRIGHT(); break; - + /* COMPANY */ case 3: - + DPRINT1("Found COMPANY section\n"); KeyWord = DoCOMPANY(); break; - + /* LOCALENAME */ case 4: - + DPRINT1("Found LOCALENAME section\n"); KeyWord = DoLOCALENAME(); break; - + /* MODIFIERS */ case 5: - + DPRINT1("Found MODIFIERS section\n"); KeyWord = DoMODIFIERS(); break; - + /* SHIFTSTATE */ case 6: - + DPRINT1("Found SHIFTSTATE section\n"); KeyWord = DoSHIFTSTATE(&StateCount, ShiftStates); if (StateCount < 2) @@ -1053,89 +1053,89 @@ exit(1); } break; - + /* ATTRIBUTES */ case 7: - + DPRINT1("Found ATTRIBUTES section\n"); KeyWord = DoATTRIBUTES(&AttributeData); break; - + /* LAYOUT */ case 8: - + DPRINT1("Found LAYOUT section\n"); KeyWord = DoLAYOUT(&g_Layout, &LigatureData, ShiftStates, StateCount); break; - + /* DEADKEY */ case 9: - + DPRINT1("Found DEADKEY section\n"); KeyWord = DoDEADKEY(&DeadKeyData); break; - + /* LIGATURE */ case 10: - + DPRINT1("Found LIGATURE section\n"); KeyWord = DoLIGATURE(&LigatureData); break; - + /* KEYNAME */ case 11: - + DPRINT1("Found KEYNAME section\n"); KeyWord = DoKEYNAME(&KeyNameData); break; - + /* KEYNAME_EXT */ case 12: - + DPRINT1("Found KEYNAME_EXT section\n"); KeyWord = DoKEYNAME(&KeyNameExtData); break; - + /* KEYNAME_DEAD */ case 13: - + DPRINT1("Found KEYNAME_DEAD section\n"); KeyWord = DoKEYNAME(&KeyNameDeadData); break; - + /* DESCRIPTIONS */ case 14: - + DPRINT1("Found DESCRIPTIONS section\n"); KeyWord = DoDESCRIPTIONS(&DescriptionData); break; - + /* LANGUAGENAMES */ case 15: - + DPRINT1("Found LANGUAGENAMES section\n"); KeyWord = DoLANGUAGENAMES(&LanguageData); break; - + /* ENDKBD */ case 16: - + DPRINT1("Found ENDKBD section\n"); KeyWord = SkipLines(); break; - - + + default: break; } } - + /* We are done */ fclose(gfpInput); - + /* Now enter the output phase */ return DoOutput(StateCount, ShiftStates,

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
21
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 January 2015