Ros-diffs March 2015

ros-diffs@reactos.org

18 participants
496 discussions

[tkreuzer] 66713: [PSDK] winnt.h: Improve Rtl*Memory defines, add missing RtlEqualMemory

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Mar 14 22:11:20 2015 New Revision: 66713 URL: http://svn.reactos.org/svn/reactos?rev=66713&view=rev Log: [PSDK] winnt.h: Improve Rtl*Memory defines, add missing RtlEqualMemory Modified: trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/include/psdk/winnt.h trunk/reactos/include/xdk/winnt_old.h Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Sat Mar 14 22:11:20 2015 @@ -2084,8 +2084,10 @@ _In_ ULONG Pattern ); +#ifndef RtlEqualMemory #define RtlEqualMemory(Destination, Source, Length) \ (!memcmp(Destination, Source, Length)) +#endif #define RtlCopyBytes RtlCopyMemory #define RtlFillBytes RtlFillMemory Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=6… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sat Mar 14 22:11:20 2015 @@ -5861,10 +5861,11 @@ _In_ const VOID *Source2, _In_ SIZE_T Length); -#define RtlMoveMemory memmove -#define RtlCopyMemory memcpy -#define RtlFillMemory(d,l,f) memset((d), (f), (l)) -#define RtlZeroMemory(d,l) RtlFillMemory((d),(l),0) +#define RtlMoveMemory(Dest,Source,Length) memmove((Dest),(Source),(Length)) +#define RtlCopyMemory(Dest,Source,Length) memcpy((Dest),(Source),(Length)) +#define RtlFillMemory(Dest,Length,Fill) memset((Dest),(Fill),(Length)) +#define RtlZeroMemory(Dest,Length) RtlFillMemory((Dest),(Length),0) +#define RtlEqualMemory(Dest,Source,Length) (!memcmp((Dest),(Source),(Length))) FORCEINLINE PVOID Modified: trunk/reactos/include/xdk/winnt_old.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/winnt_old.h?re… ============================================================================== --- trunk/reactos/include/xdk/winnt_old.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/winnt_old.h [iso-8859-1] Sat Mar 14 22:11:20 2015 @@ -4506,10 +4506,11 @@ _In_ const VOID *Source2, _In_ SIZE_T Length); -#define RtlMoveMemory memmove -#define RtlCopyMemory memcpy -#define RtlFillMemory(d,l,f) memset((d), (f), (l)) -#define RtlZeroMemory(d,l) RtlFillMemory((d),(l),0) +#define RtlMoveMemory(Dest,Source,Length) memmove((Dest),(Source),(Length)) +#define RtlCopyMemory(Dest,Source,Length) memcpy((Dest),(Source),(Length)) +#define RtlFillMemory(Dest,Length,Fill) memset((Dest),(Fill),(Length)) +#define RtlZeroMemory(Dest,Length) RtlFillMemory((Dest),(Length),0) +#define RtlEqualMemory(Dest,Source,Length) (!memcmp((Dest),(Source),(Length))) FORCEINLINE PVOID

9 years, 9 months

[hbelusca] 66712: [NOTEPAD] - Remove unneeded ChangeLog file (we have SVN) - Partial wine resync of notepad (part 1/x): it's just to bring back some of their fixes and improvements. CORE-9371

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Mar 14 20:00:39 2015 New Revision: 66712 URL: http://svn.reactos.org/svn/reactos?rev=66712&view=rev Log: [NOTEPAD] - Remove unneeded ChangeLog file (we have SVN) - Partial wine resync of notepad (part 1/x): it's just to bring back some of their fixes and improvements. CORE-9371 Removed: trunk/reactos/base/applications/notepad/ChangeLog Modified: trunk/reactos/base/applications/notepad/dialog.c trunk/reactos/base/applications/notepad/dialog.h trunk/reactos/base/applications/notepad/lang/bg-BG.rc trunk/reactos/base/applications/notepad/lang/cs-CZ.rc trunk/reactos/base/applications/notepad/lang/da-DK.rc trunk/reactos/base/applications/notepad/lang/de-DE.rc trunk/reactos/base/applications/notepad/lang/el-GR.rc trunk/reactos/base/applications/notepad/lang/en-US.rc trunk/reactos/base/applications/notepad/lang/es-ES.rc trunk/reactos/base/applications/notepad/lang/eu-ES.rc trunk/reactos/base/applications/notepad/lang/fi-FI.rc trunk/reactos/base/applications/notepad/lang/fr-FR.rc trunk/reactos/base/applications/notepad/lang/he-IL.rc trunk/reactos/base/applications/notepad/lang/hu-HU.rc trunk/reactos/base/applications/notepad/lang/hy-AM.rc trunk/reactos/base/applications/notepad/lang/id-ID.rc trunk/reactos/base/applications/notepad/lang/it-IT.rc trunk/reactos/base/applications/notepad/lang/ja-JP.rc trunk/reactos/base/applications/notepad/lang/lt-LT.rc trunk/reactos/base/applications/notepad/lang/nl-NL.rc trunk/reactos/base/applications/notepad/lang/no-NO.rc trunk/reactos/base/applications/notepad/lang/pl-PL.rc trunk/reactos/base/applications/notepad/lang/pt-BR.rc trunk/reactos/base/applications/notepad/lang/pt-PT.rc trunk/reactos/base/applications/notepad/lang/ro-RO.rc trunk/reactos/base/applications/notepad/lang/ru-RU.rc trunk/reactos/base/applications/notepad/lang/sk-SK.rc trunk/reactos/base/applications/notepad/lang/sl-SI.rc trunk/reactos/base/applications/notepad/lang/sq-AL.rc trunk/reactos/base/applications/notepad/lang/sv-SE.rc trunk/reactos/base/applications/notepad/lang/th-TH.rc trunk/reactos/base/applications/notepad/lang/tr-TR.rc trunk/reactos/base/applications/notepad/lang/uk-UA.rc trunk/reactos/base/applications/notepad/lang/uz-UZ.rc trunk/reactos/base/applications/notepad/lang/zh-CN.rc trunk/reactos/base/applications/notepad/main.c trunk/reactos/base/applications/notepad/main.h trunk/reactos/base/applications/notepad/notepad_res.h trunk/reactos/base/applications/notepad/settings.c trunk/reactos/base/applications/notepad/text.c Removed: trunk/reactos/base/applications/notepad/ChangeLog URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/ChangeLog [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/ChangeLog (removed) @@ -1,56 +0,0 @@ - *** This file is obsolete. Changes are listed in the main - *** ChangeLog now. Please do not edit. - -Fri Jun 12 23:29:44 1998 Marcel Baur <mbaur(a)g26.ethz.ch> - - Fixed GetDateFormat()->GetTimeFormat() for locale time. - -Mon May 25 14:30:00 1998 Henrik Olsen <henrik(a)iaeste.dk> - * [Da.rc] - - Added Danish language support. - -Fri May 15 23:59:22 1998 Marcel Baur <mbaur(a)g26.ethz.ch> - - Date/Time now uses locale-specific formats - - Language-specific window caption, displays file being edited. - - Started with parsing of command line settings - - Started with DoOpenFile, DoCloseFile, DoSaveFile logics - - Prompt user to save settings when closing a file - -> Introduced a new message box (not yet finished) - - Fixed minor features (missing IDS in main.h, ...) - -Sun Mar 29 20:29:41 1998 Laurent Buffler <laurent(a)bluewin.ch> - * [Fr.rc] - - Added French language support. - -Fri Feb 27 21:03:37 1998 Karl Backström <karl_b(a)geocities.com> - - Fixed some minor features. - -Sat Feb 14 17:42:29 1998 Karl Backström <karl_b(a)geocities.com> - * NEW [language.c] [language.h] - - Takes care of all language related stuff. - - A new [programs] in .winerc is in use. - -Tue Feb 10 23:34:08 1998 Marcel Baur <mbaur(a)g26.ethz.ch> - - Fixed broken language menus - -Fri Feb 06 23.54.35 1998 Karl Backström <karl_b(a)geocities.com> - * [main.c] [main.h] [notepad.rc] - - Fixed language support for menus. - * NEW [dialog.c] [dialog.h] - - Moved all menu and dialog related stuff here. - -Sun Jan 18 23:05:04 1998 Karl Backström <karl_b(a)geocities.com> - * [Sw.rc] - - Added/updated Swedish language support. - -Tue Dec 23 23:35:04 1997 Marcel Baur <mbaur(a)g26.ethz.ch> - - Fixed lots of bugs w/ resources in *.rc - - moved [notepad.c] into [main.c] - - moved [notepad.h] into [main.h] - -Fri Dec 05 20:51:55 1997 Marcel Baur <mbaur(a)g26.ethz.ch> - * [notepad.c] [notepad.h] [notepad.rc] [En.rc] [De.rc] - [license.c] [license.h] [License_En.c] - [README] [TODO] [ChangeLog] - - Originals by Marcel Baur - - 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] Sat Mar 14 20:00:39 2015 @@ -35,67 +35,6 @@ static UINT_PTR CALLBACK DIALOG_PAGESETUP_Hook(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam); -#ifndef UNICODE -static LPSTR ConvertToASCII(LPSTR pszText) -{ - int sz; - LPWSTR pszTextW = (LPWSTR)pszText; - - /* default return value */ - pszText = NULL; - do { - /* query about requested size for conversion */ - sz = WideCharToMultiByte(CP_ACP, 0, pszTextW, -1, NULL, 0, NULL, NULL); - if (!sz) - break; - - /* get space for ASCII buffer */ - pszText = (LPSTR)HeapAlloc(GetProcessHeap(), 0, sz); - if (pszText == NULL) - break; - - /* if previous diagnostic call worked fine, - * then this one will work too, - * so no need to test return value here - */ - WideCharToMultiByte(CP_ACP, 0, pszTextW, -1, pszText, sz, NULL, NULL); - } while (0); - - HeapFree(GetProcessHeap(), 0, pszTextW); - return pszText; -} - -static LPWSTR ConvertToUNICODE(LPSTR pszText, DWORD *pdwSize) -{ - int sz; - LPWSTR pszTextW = NULL; - - do { - /* query about requested size for conversion */ - sz = MultiByteToWideChar(CP_ACP, 0, pszText, -1, NULL, 0); - if (!sz) - break; - - /* get space for UNICODE buffer */ - pszTextW = HeapAlloc(GetProcessHeap(), 0, sz * sizeof(WCHAR)); - if (pszText == NULL) - break; - - /* if previous diagnostic call worked fine, - * then this one will work too, - * so no need to test return value here - */ - MultiByteToWideChar(CP_ACP, 0, pszText, -1, pszTextW, sz); - - /* report the new size of the text to the caller */ - *pdwSize = sz; - } while (0); - - HeapFree(GetProcessHeap(), 0, pszText); - return pszTextW; -} -#endif - VOID ShowLastError(VOID) { DWORD error = GetLastError(); @@ -104,7 +43,7 @@ LPTSTR lpMsgBuf = NULL; TCHAR szTitle[MAX_STRING_LEN]; - LoadString(Globals.hInstance, STRING_ERROR, szTitle, SIZEOF(szTitle)); + LoadString(Globals.hInstance, STRING_ERROR, szTitle, ARRAY_SIZE(szTitle)); FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, @@ -129,74 +68,68 @@ TCHAR szCaption[MAX_STRING_LEN]; TCHAR szNotepad[MAX_STRING_LEN]; - LoadString(Globals.hInstance, STRING_NOTEPAD, szNotepad, SIZEOF(szNotepad)); + LoadString(Globals.hInstance, STRING_NOTEPAD, szNotepad, ARRAY_SIZE(szNotepad)); if (Globals.szFileTitle[0] != 0) { - StringCchCopy(szCaption, SIZEOF(szCaption), Globals.szFileTitle); + StringCchCopy(szCaption, ARRAY_SIZE(szCaption), Globals.szFileTitle); } else { - LoadString(Globals.hInstance, STRING_UNTITLED, szCaption, SIZEOF(szCaption)); - } - - StringCchCat(szCaption, SIZEOF(szCaption), _T(" - ")); - StringCchCat(szCaption, SIZEOF(szCaption), szNotepad); + LoadString(Globals.hInstance, STRING_UNTITLED, szCaption, ARRAY_SIZE(szCaption)); + } + + StringCchCat(szCaption, ARRAY_SIZE(szCaption), _T(" - ")); + StringCchCat(szCaption, ARRAY_SIZE(szCaption), szNotepad); SetWindowText(Globals.hMainWnd, szCaption); } -static void AlertFileNotFound(LPCTSTR szFileName) +int DIALOG_StringMsgBox(HWND hParent, int formatId, LPCTSTR szString, DWORD dwFlags) { 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); + LoadString(Globals.hInstance, formatId, szResource, ARRAY_SIZE(szResource)); + _sntprintf(szMessage, ARRAY_SIZE(szMessage), szResource, szString); /* Load szCaption */ - LoadString(Globals.hInstance, STRING_NOTEPAD, szResource, SIZEOF(szResource)); + if ((dwFlags & MB_ICONMASK) == MB_ICONEXCLAMATION) + LoadString(Globals.hInstance, STRING_ERROR, szResource, ARRAY_SIZE(szResource)); + else + LoadString(Globals.hInstance, STRING_NOTEPAD, szResource, ARRAY_SIZE(szResource)); /* Display Modal Dialog */ - MessageBox(Globals.hMainWnd, szMessage, szResource, MB_ICONEXCLAMATION); + // if (hParent == NULL) + // hParent = Globals.hMainWnd; + return MessageBox(hParent, szMessage, szResource, dwFlags); +} + +static void AlertFileNotFound(LPCTSTR szFileName) +{ + DIALOG_StringMsgBox(Globals.hMainWnd, STRING_NOTFOUND, szFileName, MB_ICONEXCLAMATION | MB_OK); } 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); + LoadString(Globals.hInstance, STRING_UNTITLED, szUntitled, ARRAY_SIZE(szUntitled)); + + return DIALOG_StringMsgBox(Globals.hMainWnd, STRING_NOTSAVED, + szFileName[0] ? szFileName : szUntitled, + MB_ICONQUESTION | MB_YESNOCANCEL); } static void AlertPrintError(void) { - 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_PRINTERROR, szResource, SIZEOF(szResource)); - wsprintf(szMessage, szResource, Globals.szFileName[0] ? Globals.szFileName : szUntitled); - - /* Load Caption */ - LoadString(Globals.hInstance, STRING_NOTEPAD, szResource, SIZEOF(szResource)); - - /* Display modal */ - MessageBox(Globals.hMainWnd, szMessage, szResource, MB_ICONEXCLAMATION); + LoadString(Globals.hInstance, STRING_UNTITLED, szUntitled, ARRAY_SIZE(szUntitled)); + + DIALOG_StringMsgBox(Globals.hMainWnd, STRING_NOTSAVED, + Globals.szFileName[0] ? Globals.szFileName : szUntitled, + MB_ICONEXCLAMATION | MB_OK); } /** @@ -317,20 +250,9 @@ } size = GetWindowText(Globals.hEdit, pTemp, size); -#ifndef UNICODE - pTemp = (LPTSTR)ConvertToUNICODE(pTemp, &size); - if (!pTemp) - { - /* original "pTemp" already freed */ - CloseHandle(hFile); - ShowLastError(); - return FALSE; - } -#endif - if (size) { - if (!WriteText(hFile, (LPWSTR)pTemp, size, Globals.iEncoding, Globals.iEoln)) + if (!WriteText(hFile, (LPWSTR)pTemp, size, Globals.encFile, Globals.iEoln)) { ShowLastError(); bRet = FALSE; @@ -404,18 +326,11 @@ goto done; } - if (!ReadText(hFile, (LPWSTR *)&pszText, &dwTextLen, &Globals.iEncoding, &Globals.iEoln)) + if (!ReadText(hFile, (LPWSTR *)&pszText, &dwTextLen, &Globals.encFile, &Globals.iEoln)) { ShowLastError(); goto done; } -#ifndef UNICODE - pszText = ConvertToASCII(pszText); - if (pszText == NULL) { - ShowLastError(); - goto done; - } -#endif SetWindowText(Globals.hEdit, pszText); SendMessage(Globals.hEdit, EM_SETMODIFY, FALSE, 0); @@ -425,7 +340,7 @@ /* If the file starts with .LOG, add a time/date at the end and set cursor after * See http://support.microsoft.com/?kbid=260563 */ - if (GetWindowText(Globals.hEdit, log, SIZEOF(log)) && !_tcscmp(log, dotlog)) + if (GetWindowText(Globals.hEdit, log, ARRAY_SIZE(log)) && !_tcscmp(log, dotlog)) { static const TCHAR lf[] = _T("\r\n"); SendMessage(Globals.hEdit, EM_SETSEL, GetWindowTextLength(Globals.hEdit), -1); @@ -463,7 +378,7 @@ ZeroMemory(&openfilename, sizeof(openfilename)); - GetCurrentDirectory(SIZEOF(szDir), szDir); + GetCurrentDirectory(ARRAY_SIZE(szDir), szDir); if (Globals.szFileName[0] == 0) _tcscpy(szPath, txt_files); else @@ -474,7 +389,7 @@ openfilename.hInstance = Globals.hInstance; openfilename.lpstrFilter = Globals.szFilter; openfilename.lpstrFile = szPath; - openfilename.nMaxFile = SIZEOF(szPath); + openfilename.nMaxFile = ARRAY_SIZE(szPath); openfilename.lpstrInitialDir = szDir; openfilename.Flags = OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY; openfilename.lpstrDefExt = szDefaultExt; @@ -509,29 +424,29 @@ case WM_INITDIALOG: hCombo = GetDlgItem(hDlg, ID_ENCODING); - LoadString(Globals.hInstance, STRING_ANSI, szText, SIZEOF(szText)); + LoadString(Globals.hInstance, STRING_ANSI, szText, ARRAY_SIZE(szText)); SendMessage(hCombo, CB_ADDSTRING, 0, (LPARAM) szText); - LoadString(Globals.hInstance, STRING_UNICODE, szText, SIZEOF(szText)); + LoadString(Globals.hInstance, STRING_UNICODE, szText, ARRAY_SIZE(szText)); SendMessage(hCombo, CB_ADDSTRING, 0, (LPARAM) szText); - LoadString(Globals.hInstance, STRING_UNICODE_BE, szText, SIZEOF(szText)); + LoadString(Globals.hInstance, STRING_UNICODE_BE, szText, ARRAY_SIZE(szText)); SendMessage(hCombo, CB_ADDSTRING, 0, (LPARAM) szText); - LoadString(Globals.hInstance, STRING_UTF8, szText, SIZEOF(szText)); + LoadString(Globals.hInstance, STRING_UTF8, szText, ARRAY_SIZE(szText)); SendMessage(hCombo, CB_ADDSTRING, 0, (LPARAM) szText); - SendMessage(hCombo, CB_SETCURSEL, Globals.iEncoding, 0); + SendMessage(hCombo, CB_SETCURSEL, Globals.encFile, 0); hCombo = GetDlgItem(hDlg, ID_EOLN); - LoadString(Globals.hInstance, STRING_CRLF, szText, SIZEOF(szText)); + LoadString(Globals.hInstance, STRING_CRLF, szText, ARRAY_SIZE(szText)); SendMessage(hCombo, CB_ADDSTRING, 0, (LPARAM) szText); - LoadString(Globals.hInstance, STRING_LF, szText, SIZEOF(szText)); + LoadString(Globals.hInstance, STRING_LF, szText, ARRAY_SIZE(szText)); SendMessage(hCombo, CB_ADDSTRING, 0, (LPARAM) szText); - LoadString(Globals.hInstance, STRING_CR, szText, SIZEOF(szText)); + LoadString(Globals.hInstance, STRING_CR, szText, ARRAY_SIZE(szText)); SendMessage(hCombo, CB_ADDSTRING, 0, (LPARAM) szText); SendMessage(hCombo, CB_SETCURSEL, Globals.iEoln, 0); @@ -542,7 +457,7 @@ { hCombo = GetDlgItem(hDlg, ID_ENCODING); if (hCombo) - Globals.iEncoding = (int) SendMessage(hCombo, CB_GETCURSEL, 0, 0); + Globals.encFile = (int) SendMessage(hCombo, CB_GETCURSEL, 0, 0); hCombo = GetDlgItem(hDlg, ID_EOLN); if (hCombo) @@ -561,7 +476,7 @@ ZeroMemory(&saveas, sizeof(saveas)); - GetCurrentDirectory(SIZEOF(szDir), szDir); + GetCurrentDirectory(ARRAY_SIZE(szDir), szDir); if (Globals.szFileName[0] == 0) _tcscpy(szPath, txt_files); else @@ -572,7 +487,7 @@ saveas.hInstance = Globals.hInstance; saveas.lpstrFilter = Globals.szFilter; saveas.lpstrFile = szPath; - saveas.nMaxFile = SIZEOF(szPath); + saveas.nMaxFile = ARRAY_SIZE(szPath); saveas.lpstrInitialDir = szDir; saveas.Flags = OFN_PATHMUSTEXIST | OFN_OVERWRITEPROMPT | OFN_HIDEREADONLY | OFN_EXPLORER | OFN_ENABLETEMPLATE | OFN_ENABLEHOOK; @@ -1056,9 +971,9 @@ Globals.find.hwndOwner = Globals.hMainWnd; Globals.find.hInstance = Globals.hInstance; Globals.find.lpstrFindWhat = Globals.szFindText; - Globals.find.wFindWhatLen = SIZEOF(Globals.szFindText); + Globals.find.wFindWhatLen = ARRAY_SIZE(Globals.szFindText); Globals.find.lpstrReplaceWith = Globals.szReplaceText; - Globals.find.wReplaceWithLen = SIZEOF(Globals.szReplaceText); + Globals.find.wReplaceWithLen = ARRAY_SIZE(Globals.szReplaceText); Globals.find.Flags = FR_DOWN; /* We only need to create the modal FindReplace dialog which will */ @@ -1097,7 +1012,7 @@ switch(uMsg) { case WM_INITDIALOG: hTextBox = GetDlgItem(hwndDialog, ID_LINENUMBER); - _sntprintf(szText, SIZEOF(szText), _T("%ld"), lParam); + _sntprintf(szText, ARRAY_SIZE(szText), _T("%ld"), lParam); SetWindowText(hTextBox, szText); break; case WM_COMMAND: @@ -1106,7 +1021,7 @@ if (LOWORD(wParam) == IDOK) { hTextBox = GetDlgItem(hwndDialog, ID_LINENUMBER); - GetWindowText(hTextBox, szText, SIZEOF(szText)); + GetWindowText(hTextBox, szText, ARRAY_SIZE(szText)); EndDialog(hwndDialog, _ttoi(szText)); bResult = TRUE; } @@ -1200,9 +1115,16 @@ WinHelp(Globals.hMainWnd, helpfile, HELP_HELPONHELP, 0); } -#ifdef _MSC_VER -#pragma warning(disable : 4100) -#endif +VOID DIALOG_HelpAboutNotepad(VOID) +{ + TCHAR szNotepad[MAX_STRING_LEN]; + HICON notepadIcon = LoadIcon(Globals.hInstance, MAKEINTRESOURCE(IDI_NPICON)); + + LoadString(Globals.hInstance, STRING_NOTEPAD, szNotepad, ARRAY_SIZE(szNotepad)); + ShellAbout(Globals.hMainWnd, szNotepad, 0, notepadIcon); + DeleteObject(notepadIcon); +} + INT_PTR CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) @@ -1236,16 +1158,6 @@ } return 0; -} - -VOID DIALOG_HelpAboutWine(VOID) -{ - TCHAR szNotepad[MAX_STRING_LEN]; - HICON notepadIcon = LoadIcon(Globals.hInstance, MAKEINTRESOURCE(IDI_NPICON)); - - LoadString(Globals.hInstance, STRING_NOTEPAD, szNotepad, SIZEOF(szNotepad)); - ShellAbout(Globals.hMainWnd, szNotepad, 0, notepadIcon); - DeleteObject(notepadIcon); } /*********************************************************************** @@ -1296,8 +1208,8 @@ { case IDOK: /* save user input and close dialog */ - GetDlgItemText(hDlg, 0x141, Globals.szHeader, SIZEOF(Globals.szHeader)); - GetDlgItemText(hDlg, 0x143, Globals.szFooter, SIZEOF(Globals.szFooter)); + GetDlgItemText(hDlg, 0x141, Globals.szHeader, ARRAY_SIZE(Globals.szHeader)); + GetDlgItemText(hDlg, 0x143, Globals.szFooter, ARRAY_SIZE(Globals.szFooter)); return FALSE; case IDCANCEL: Modified: trunk/reactos/base/applications/notepad/dialog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/dialog.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/dialog.h [iso-8859-1] Sat Mar 14 20:00:39 2015 @@ -52,9 +52,11 @@ VOID DIALOG_HelpHelp(VOID); VOID DIALOG_HelpLicense(VOID); VOID DIALOG_HelpNoWarranty(VOID); -VOID DIALOG_HelpAboutWine(VOID); +VOID DIALOG_HelpAboutNotepad(VOID); VOID DIALOG_TimeDate(VOID); + +int DIALOG_StringMsgBox(HWND hParent, int formatId, LPCTSTR szString, DWORD dwFlags); INT_PTR CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); Modified: trunk/reactos/base/applications/notepad/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/bg-BG.rc [iso-8859-1] Sat Mar 14 20:00:39 2015 @@ -65,7 +65,7 @@ MENUITEM "&ÐÐ¾Ð¼Ð¾Ñ Ð·Ð° Ð¿Ð¾Ð¼Ð¾ÑÑÐ°", CMD_HELP_ON_HELP MENUITEM SEPARATOR MENUITEM "&ÐÐ°", CMD_ABOUT - MENUITEM "Ð¡&Ð²ÐµÐ´ÐµÐ½Ð¸Ñ", CMD_ABOUT_WINE + MENUITEM "Ð¡&Ð²ÐµÐ´ÐµÐ½Ð¸Ñ", CMD_HELP_ABOUT_NOTEPAD END END Modified: trunk/reactos/base/applications/notepad/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/cs-CZ.rc [iso-8859-1] Sat Mar 14 20:00:39 2015 @@ -65,7 +65,7 @@ MENUITEM "Pomoc k nÃ¡&povÄdÄ", CMD_HELP_ON_HELP MENUITEM SEPARATOR MENUITEM "&O programu...", CMD_ABOUT - MENUITEM "In&fo...", CMD_ABOUT_WINE + MENUITEM "In&fo...", CMD_HELP_ABOUT_NOTEPAD END END Modified: trunk/reactos/base/applications/notepad/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/da-DK.rc [iso-8859-1] Sat Mar 14 20:00:39 2015 @@ -65,7 +65,7 @@ MENUITEM "&Brug af HjÃ¦lp", CMD_HELP_ON_HELP MENUITEM SEPARATOR MENUITEM "&About", CMD_ABOUT - MENUITEM "&Om Notesblok", CMD_ABOUT_WINE + MENUITEM "&Om Notesblok", CMD_HELP_ABOUT_NOTEPAD END END Modified: trunk/reactos/base/applications/notepad/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/de-DE.rc [iso-8859-1] Sat Mar 14 20:00:39 2015 @@ -65,7 +65,7 @@ MENUITEM "&Hilfe benutzen", CMD_HELP_ON_HELP MENUITEM SEPARATOR MENUITEM "&Ãber", CMD_ABOUT - MENUITEM "Inf&o", CMD_ABOUT_WINE + MENUITEM "Inf&o", CMD_HELP_ABOUT_NOTEPAD END END Modified: trunk/reactos/base/applications/notepad/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/el-GR.rc [iso-8859-1] Sat Mar 14 20:00:39 2015 @@ -65,7 +65,7 @@ MENUITEM "&ÎÎ¿Î®Î¸ÎµÎ¹Î± ÏÏÎ· Î²Î¿Î®Î¸ÎµÎ¹Î±", CMD_HELP_ON_HELP MENUITEM SEPARATOR MENUITEM "&About", CMD_ABOUT - MENUITEM "Î Î»Î·ÏÎ¿&ÏÎ¿ÏÎ¯ÎµÏ", CMD_ABOUT_WINE + MENUITEM "Î Î»Î·ÏÎ¿&ÏÎ¿ÏÎ¯ÎµÏ", CMD_HELP_ABOUT_NOTEPAD END END Modified: trunk/reactos/base/applications/notepad/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/en-US.rc [iso-8859-1] Sat Mar 14 20:00:39 2015 @@ -65,7 +65,7 @@ MENUITEM "&Help on help", CMD_HELP_ON_HELP MENUITEM SEPARATOR MENUITEM "&About", CMD_ABOUT - MENUITEM "Inf&o", CMD_ABOUT_WINE + MENUITEM "Inf&o", CMD_HELP_ABOUT_NOTEPAD END END Modified: trunk/reactos/base/applications/notepad/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/es-ES.rc [iso-8859-1] Sat Mar 14 20:00:39 2015 @@ -65,7 +65,7 @@ MENUITEM "A&yuda sobre la ayuda", CMD_HELP_ON_HELP MENUITEM SEPARATOR MENUITEM "&Acerca de", CMD_ABOUT - MENUITEM "&InformaciÃ³n...", CMD_ABOUT_WINE + MENUITEM "&InformaciÃ³n...", CMD_HELP_ABOUT_NOTEPAD END END Modified: trunk/reactos/base/applications/notepad/lang/eu-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/eu-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/eu-ES.rc [iso-8859-1] Sat Mar 14 20:00:39 2015 @@ -65,7 +65,7 @@ MENUITEM "Laguntzari buruz laguntza", CMD_HELP_ON_HELP MENUITEM SEPARATOR MENUITEM "&Ohar-blokari buruz", CMD_ABOUT - MENUITEM "&Informazioa...", CMD_ABOUT_WINE + MENUITEM "&Informazioa...", CMD_HELP_ABOUT_NOTEPAD END END Modified: trunk/reactos/base/applications/notepad/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/fi-FI.rc [iso-8859-1] Sat Mar 14 20:00:39 2015 @@ -65,7 +65,7 @@ MENUITEM "Apua &Opastuksesta", CMD_HELP_ON_HELP MENUITEM SEPARATOR MENUITEM "&About", CMD_ABOUT - MENUITEM "Inf&o...", CMD_ABOUT_WINE + MENUITEM "Inf&o...", CMD_HELP_ABOUT_NOTEPAD END END Modified: trunk/reactos/base/applications/notepad/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/fr-FR.rc [iso-8859-1] Sat Mar 14 20:00:39 2015 @@ -65,7 +65,7 @@ MENUITEM "&Utiliser l'aide", CMD_HELP_ON_HELP MENUITEM SEPARATOR MENUITEM "&Ã propos", CMD_ABOUT - MENUITEM "Inf&o...", CMD_ABOUT_WINE + MENUITEM "Inf&o...", CMD_HELP_ABOUT_NOTEPAD END END Modified: trunk/reactos/base/applications/notepad/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/he-IL.rc [iso-8859-1] Sat Mar 14 20:00:39 2015 @@ -65,7 +65,7 @@ MENUITEM "×¢××¨× ××¢××¨×", CMD_HELP_ON_HELP MENUITEM SEPARATOR MENUITEM "×××××ª", CMD_ABOUT - MENUITEM "××××¢", CMD_ABOUT_WINE + MENUITEM "××××¢", CMD_HELP_ABOUT_NOTEPAD END END Modified: trunk/reactos/base/applications/notepad/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/hu-HU.rc [iso-8859-1] Sat Mar 14 20:00:39 2015 @@ -65,7 +65,7 @@ MENUITEM "&HasznÃ¡lat", CMD_HELP_ON_HELP MENUITEM SEPARATOR MENUITEM "&About", CMD_ABOUT - MENUITEM "Inf&ormÃ¡ciÃ³...", CMD_ABOUT_WINE + MENUITEM "Inf&ormÃ¡ciÃ³...", CMD_HELP_ABOUT_NOTEPAD END END Modified: trunk/reactos/base/applications/notepad/lang/hy-AM.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/hy-AM.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/hy-AM.rc [iso-8859-1] Sat Mar 14 20:00:39 2015 @@ -65,7 +65,7 @@ MENUITEM "&ÕÕ£Õ¶Õ¸ÖÕ©ÕµÕ¸Õ¶ ÖÕ£Õ¿Õ¡Õ£Õ¸ÖÕ®Õ¸ÖÕ´", CMD_HELP_ON_HELP MENUITEM SEPARATOR MENUITEM "&Ô¾ÖÕ¡Õ£ÖÕ« Õ´Õ¡Õ½Õ«Õ¶", CMD_ABOUT - MENUITEM "&ÕÕ¥Õ²Õ¥Õ¯Õ¸ÖÕ©ÕµÕ¸ÖÕ¶...", CMD_ABOUT_WINE + MENUITEM "&ÕÕ¥Õ²Õ¥Õ¯Õ¸ÖÕ©ÕµÕ¸ÖÕ¶...", CMD_HELP_ABOUT_NOTEPAD END END Modified: trunk/reactos/base/applications/notepad/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/id-ID.rc [iso-8859-1] Sat Mar 14 20:00:39 2015 @@ -65,7 +65,7 @@ MENUITEM "&Bantuan pada bantuan", CMD_HELP_ON_HELP MENUITEM SEPARATOR MENUITEM "&Tentang", CMD_ABOUT - MENUITEM "Inf&o", CMD_ABOUT_WINE + MENUITEM "Inf&o", CMD_HELP_ABOUT_NOTEPAD END END Modified: trunk/reactos/base/applications/notepad/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/it-IT.rc [iso-8859-1] Sat Mar 14 20:00:39 2015 @@ -65,7 +65,7 @@ MENUITEM "&Aiuto sulla Guida", CMD_HELP_ON_HELP MENUITEM SEPARATOR MENUITEM "Informazioni &su blocco note", CMD_ABOUT - MENUITEM "Inf&o...", CMD_ABOUT_WINE + MENUITEM "Inf&o...", CMD_HELP_ABOUT_NOTEPAD END END Modified: trunk/reactos/base/applications/notepad/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/ja-JP.rc [iso-8859-1] Sat Mar 14 20:00:39 2015 @@ -65,7 +65,7 @@ MENUITEM "ãã«ãã®ä½¿ãæ¹(&H)", CMD_HELP_ON_HELP MENUITEM SEPARATOR MENUITEM "ãã¼ã¸ã§ã³æå ±(&A)", CMD_ABOUT - MENUITEM "æå ±(&O)", CMD_ABOUT_WINE + MENUITEM "æå ±(&O)", CMD_HELP_ABOUT_NOTEPAD END END Modified: trunk/reactos/base/applications/notepad/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/lt-LT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/lt-LT.rc [iso-8859-1] Sat Mar 14 20:00:39 2015 @@ -65,7 +65,7 @@ MENUITEM "&Pagalba", CMD_HELP_ON_HELP MENUITEM SEPARATOR MENUITEM "&Apie Notepad", CMD_ABOUT - MENUITEM "Apie &ReactOS", CMD_ABOUT_WINE + MENUITEM "Apie &ReactOS", CMD_HELP_ABOUT_NOTEPAD END END Modified: trunk/reactos/base/applications/notepad/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/nl-NL.rc [iso-8859-1] Sat Mar 14 20:00:39 2015 @@ -65,7 +65,7 @@ MENUITEM "&Hulp bij Help", CMD_HELP_ON_HELP MENUITEM SEPARATOR MENUITEM "&About", CMD_ABOUT - MENUITEM "Inf&o...", CMD_ABOUT_WINE + MENUITEM "Inf&o...", CMD_HELP_ABOUT_NOTEPAD END END Modified: trunk/reactos/base/applications/notepad/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/no-NO.rc [iso-8859-1] Sat Mar 14 20:00:39 2015 @@ -65,7 +65,7 @@ MENUITEM "&Hjelp om hjelp", CMD_HELP_ON_HELP MENUITEM SEPARATOR MENUITEM "&Om", CMD_ABOUT - MENUITEM "&Infomasjon", CMD_ABOUT_WINE + MENUITEM "&Infomasjon", CMD_HELP_ABOUT_NOTEPAD END END Modified: trunk/reactos/base/applications/notepad/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/pl-PL.rc [iso-8859-1] Sat Mar 14 20:00:39 2015 @@ -65,7 +65,7 @@ MENUITEM "Pomo&c", CMD_HELP_ON_HELP MENUITEM SEPARATOR MENUITEM "&Notatnik - informacje", CMD_ABOUT - MENUITEM "&ReactOS - informacje", CMD_ABOUT_WINE + MENUITEM "&ReactOS - informacje", CMD_HELP_ABOUT_NOTEPAD END END Modified: trunk/reactos/base/applications/notepad/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/pt-BR.rc [iso-8859-1] Sat Mar 14 20:00:39 2015 @@ -65,7 +65,7 @@ MENUITEM "&Ajuda na ajuda", CMD_HELP_ON_HELP MENUITEM SEPARATOR MENUITEM "&Sobre", CMD_ABOUT - MENUITEM "&InformaÃ§Ãµes...", CMD_ABOUT_WINE + MENUITEM "&InformaÃ§Ãµes...", CMD_HELP_ABOUT_NOTEPAD END END Modified: trunk/reactos/base/applications/notepad/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/pt-PT.rc [iso-8859-1] Sat Mar 14 20:00:39 2015 @@ -65,7 +65,7 @@ MENUITEM "&Ajuda na ajuda", CMD_HELP_ON_HELP MENUITEM SEPARATOR MENUITEM "&Sobre", CMD_ABOUT - MENUITEM "&InformaÃ§Ãµes...", CMD_ABOUT_WINE + MENUITEM "&InformaÃ§Ãµes...", CMD_HELP_ABOUT_NOTEPAD END END Modified: trunk/reactos/base/applications/notepad/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/ro-RO.rc [iso-8859-1] Sat Mar 14 20:00:39 2015 @@ -70,7 +70,7 @@ MENUITEM "M&anualul manualului", CMD_HELP_ON_HELP MENUITEM SEPARATOR MENUITEM "&Despreâ¦", CMD_ABOUT - MENUITEM "&Infoâ¦", CMD_ABOUT_WINE + MENUITEM "&Infoâ¦", CMD_HELP_ABOUT_NOTEPAD END END Modified: trunk/reactos/base/applications/notepad/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/ru-RU.rc [iso-8859-1] Sat Mar 14 20:00:39 2015 @@ -65,7 +65,7 @@ MENUITEM "&ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ ÑÐ¿ÑÐ°Ð²ÐºÐ¸", CMD_HELP_ON_HELP MENUITEM SEPARATOR MENUITEM "&Ð Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ", CMD_ABOUT - MENUITEM "&Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ...", CMD_ABOUT_WINE + MENUITEM "&Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ...", CMD_HELP_ABOUT_NOTEPAD END END Modified: trunk/reactos/base/applications/notepad/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/sk-SK.rc [iso-8859-1] Sat Mar 14 20:00:39 2015 @@ -73,7 +73,7 @@ MENUITEM "&Pomoc", CMD_HELP_ON_HELP MENUITEM SEPARATOR MENUITEM "Ä&o je PoznÃ¡mkovÃ½ blok", CMD_ABOUT - MENUITEM "Äo je &VÃno (Wine)", CMD_ABOUT_WINE + MENUITEM "Äo je &VÃno (Wine)", CMD_HELP_ABOUT_NOTEPAD END END Modified: trunk/reactos/base/applications/notepad/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/sl-SI.rc [iso-8859-1] Sat Mar 14 20:00:39 2015 @@ -65,7 +65,7 @@ MENUITEM "&O pomoÃ¨i", CMD_HELP_ON_HELP MENUITEM SEPARATOR MENUITEM "&About", CMD_ABOUT - MENUITEM "Inf&ormacije ...", CMD_ABOUT_WINE + MENUITEM "Inf&ormacije ...", CMD_HELP_ABOUT_NOTEPAD END END Modified: trunk/reactos/base/applications/notepad/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/sq-AL.rc [iso-8859-1] Sat Mar 14 20:00:39 2015 @@ -69,7 +69,7 @@ MENUITEM "NdihmÃ« pÃ«r ndihmÃ«", CMD_HELP_ON_HELP MENUITEM SEPARATOR MENUITEM "Rreth", CMD_ABOUT - MENUITEM "Inf&o", CMD_ABOUT_WINE + MENUITEM "Inf&o", CMD_HELP_ABOUT_NOTEPAD END END Modified: trunk/reactos/base/applications/notepad/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/sv-SE.rc [iso-8859-1] Sat Mar 14 20:00:39 2015 @@ -65,7 +65,7 @@ MENUITEM "Anvisningar fÃ¶r hjÃ¤lpen", CMD_HELP_ON_HELP MENUITEM SEPARATOR MENUITEM "Om &Anteckningar", CMD_ABOUT - MENUITEM "Inf&ormation...", CMD_ABOUT_WINE + MENUITEM "Inf&ormation...", CMD_HELP_ABOUT_NOTEPAD END END Modified: trunk/reactos/base/applications/notepad/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/th-TH.rc [iso-8859-1] Sat Mar 14 20:00:39 2015 @@ -65,7 +65,7 @@ MENUITEM "à¹à¸à¸µà¹à¸¢à¸§à¸à¸±à¸à¸à¹à¸§à¸¢à¹à¸«à¸¥à¸µà¸", CMD_HELP_ON_HELP MENUITEM SEPARATOR MENUITEM "&About", CMD_ABOUT - MENUITEM "à¸£à¸²à¸¢à¸¥à¸°à¹à¸à¸µà¸¢à¸...", CMD_ABOUT_WINE + MENUITEM "à¸£à¸²à¸¢à¸¥à¸°à¹à¸à¸µà¸¢à¸...", CMD_HELP_ABOUT_NOTEPAD END END Modified: trunk/reactos/base/applications/notepad/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/tr-TR.rc [iso-8859-1] Sat Mar 14 20:00:39 2015 @@ -67,7 +67,7 @@ MENUITEM "&YardÄ±m Ä°Ã§in YardÄ±m", CMD_HELP_ON_HELP MENUITEM SEPARATOR MENUITEM "&Bilgi...", CMD_ABOUT - MENUITEM "&Ãzerine...", CMD_ABOUT_WINE + MENUITEM "&Ãzerine...", CMD_HELP_ABOUT_NOTEPAD END END Modified: trunk/reactos/base/applications/notepad/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/uk-UA.rc [iso-8859-1] Sat Mar 14 20:00:39 2015 @@ -65,7 +65,7 @@ MENUITEM "ÐÐ¸ÐºÐ¾ÑÐ¸ÑÑ&Ð°Ð½Ð½Ñ Ð´Ð¾Ð²ÑÐ´ÐºÐ¸", CMD_HELP_ON_HELP MENUITEM SEPARATOR MENUITEM "&ÐÑÐ¾", CMD_ABOUT - MENUITEM "ÐÑÐ¾ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼&Ñ", CMD_ABOUT_WINE + MENUITEM "ÐÑÐ¾ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼&Ñ", CMD_HELP_ABOUT_NOTEPAD END END Modified: trunk/reactos/base/applications/notepad/lang/uz-UZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/uz-UZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/uz-UZ.rc [iso-8859-1] Sat Mar 14 20:00:39 2015 @@ -65,7 +65,7 @@ MENUITEM "&ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ ÑÐ¿ÑÐ°Ð²ÐºÐ¸", CMD_HELP_ON_HELP MENUITEM SEPARATOR MENUITEM "Bloknot h&aqida", CMD_ABOUT - MENUITEM "&Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ...", CMD_ABOUT_WINE + MENUITEM "&Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ...", CMD_HELP_ABOUT_NOTEPAD END END Modified: trunk/reactos/base/applications/notepad/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/zh-CN.rc [iso-8859-1] Sat Mar 14 20:00:39 2015 @@ -65,7 +65,7 @@ MENUITEM "å¦ä½ä½¿ç¨å¸®å©(&H)", CMD_HELP_ON_HELP MENUITEM SEPARATOR MENUITEM "å³äº(&A)", CMD_ABOUT - MENUITEM "èµæä¿¡æ¯(&O)...", CMD_ABOUT_WINE + MENUITEM "èµæä¿¡æ¯(&O)...", CMD_HELP_ABOUT_NOTEPAD END END 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] Sat Mar 14 20:00:39 2015 @@ -45,9 +45,9 @@ */ VOID SetFileName(LPCTSTR szFileName) { - StringCchCopy(Globals.szFileName, SIZEOF(Globals.szFileName), szFileName); + StringCchCopy(Globals.szFileName, ARRAY_SIZE(Globals.szFileName), szFileName); Globals.szFileTitle[0] = 0; - GetFileTitle(szFileName, Globals.szFileTitle, SIZEOF(Globals.szFileTitle)); + GetFileTitle(szFileName, Globals.szFileTitle, ARRAY_SIZE(Globals.szFileTitle)); } /*********************************************************************** @@ -60,26 +60,26 @@ { 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_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_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_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_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_REPLACE: DIALOG_Replace(); break; + case CMD_GOTO: DIALOG_GoTo(); break; case CMD_WRAP: DIALOG_EditWrap(); break; case CMD_FONT: DIALOG_SelectFont(); break; @@ -87,8 +87,8 @@ 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_HELP_SEARCH: DIALOG_HelpSearch(); break; + case CMD_HELP_ON_HELP: DIALOG_HelpHelp(); break; case CMD_ABOUT: DialogBox(GetModuleHandle(NULL), @@ -97,7 +97,7 @@ AboutDialogProc); break; - case CMD_ABOUT_WINE: DIALOG_HelpAboutWine(); break; + case CMD_HELP_ABOUT_NOTEPAD: DIALOG_HelpAboutNotepad(); break; default: break; @@ -217,9 +217,9 @@ /* Can't find target */ if (bShowAlert) { - LoadString(Globals.hInstance, STRING_CANNOTFIND, szResource, SIZEOF(szResource)); - _sntprintf(szText, SIZEOF(szText), szResource, pFindReplace->lpstrFindWhat); - LoadString(Globals.hInstance, STRING_NOTEPAD, szResource, SIZEOF(szResource)); + LoadString(Globals.hInstance, STRING_CANNOTFIND, szResource, ARRAY_SIZE(szResource)); + _sntprintf(szText, ARRAY_SIZE(szText), szResource, pFindReplace->lpstrFindWhat); + LoadString(Globals.hInstance, STRING_NOTEPAD, szResource, ARRAY_SIZE(szResource)); MessageBox(Globals.hFindReplaceDlg, szText, szResource, MB_OK); } bSuccess = FALSE; @@ -268,13 +268,16 @@ p += LoadString(Globals.hInstance, STRING_TEXT_FILES_TXT, p, MAX_STRING_LEN) + 1; _tcscpy(p, txt_files); - p += SIZEOF(txt_files); + p += ARRAY_SIZE(txt_files); p += LoadString(Globals.hInstance, STRING_ALL_FILES, p, MAX_STRING_LEN) + 1; _tcscpy(p, all_files); - p += SIZEOF(all_files); + p += ARRAY_SIZE(all_files); *p = '\0'; Globals.find.lpstrFindWhat = NULL; + + Globals.hDevMode = NULL; + Globals.hDevNames = NULL; } /*********************************************************************** @@ -288,7 +291,7 @@ CheckMenuItem(GetMenu(Globals.hMainWnd), CMD_WRAP, MF_BYCOMMAND | (Globals.bWrapLongLines ? MF_CHECKED : MF_UNCHECKED)); - if ( !Globals.bWrapLongLines ) + if (!Globals.bWrapLongLines) { CheckMenuItem(GetMenu(Globals.hMainWnd), CMD_STATUSBAR, MF_BYCOMMAND | (Globals.bShowStatusBar ? MF_CHECKED : MF_UNCHECKED)); @@ -381,7 +384,7 @@ case WM_DESTROY: SetWindowLongPtr(Globals.hEdit, GWLP_WNDPROC, (LONG_PTR)Globals.EditProc); - SaveSettings(); + NOTEPAD_SaveSettingsToRegistry(); PostQuitMessage(0); break; @@ -450,7 +453,7 @@ TCHAR szFileName[MAX_PATH]; HDROP hDrop = (HDROP) wParam; - DragQueryFile(hDrop, 0, szFileName, SIZEOF(szFileName)); + DragQueryFile(hDrop, 0, szFileName, ARRAY_SIZE(szFileName)); DragFinish(hDrop); DoOpenFile(szFileName); break; @@ -483,21 +486,9 @@ 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); + return DIALOG_StringMsgBox(Globals.hMainWnd, STRING_DOESNOTEXIST, + szFileName, + MB_ICONEXCLAMATION | MB_YESNO); } static BOOL HandleCommandLine(LPTSTR cmdline) @@ -617,7 +608,7 @@ ZeroMemory(&Globals, sizeof(Globals)); Globals.hInstance = hInstance; - LoadSettings(); + NOTEPAD_LoadSettingsFromRegistry(); ZeroMemory(&wndclass, sizeof(wndclass)); wndclass.cbSize = sizeof(wndclass); 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] Sat Mar 14 20:00:39 2015 @@ -21,7 +21,7 @@ #pragma once -#define SIZEOF(a) (sizeof(a)/sizeof((a)[0])) +#define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) #include "notepad_res.h" @@ -33,10 +33,22 @@ #define MAX_STRING_LEN 255 -#define ENCODING_ANSI 0 +/* Values are indexes of the items in the Encoding combobox. */ +typedef enum +{ + ENCODING_AUTO = -1, + ENCODING_ANSI = 0, + ENCODING_UTF16LE = 1, + ENCODING_UTF16BE = 2, + ENCODING_UTF8 = 3 +} ENCODING; +// #define ENCODING_ANSI 0 #define ENCODING_UNICODE 1 #define ENCODING_UNICODE_BE 2 -#define ENCODING_UTF8 3 +// #define ENCODING_UTF8 3 + +// #define MIN_ENCODING 0 +// #define MAX_ENCODING 3 #define EOLN_CRLF 0 #define EOLN_LF 1 @@ -68,7 +80,8 @@ TCHAR szHeader[MAX_PATH]; TCHAR szFooter[MAX_PATH]; TCHAR szStatusBarLineCol[MAX_PATH]; - int iEncoding; + + ENCODING encFile; int iEoln; FINDREPLACE find; @@ -81,12 +94,12 @@ VOID SetFileName(LPCTSTR szFileName); /* from text.c */ -BOOL ReadText(HANDLE hFile, LPWSTR *ppszText, DWORD *pdwTextLen, int *piEncoding, int *piEoln); -BOOL WriteText(HANDLE hFile, LPCWSTR pszText, DWORD dwTextLen, int iEncoding, int iEoln); +BOOL ReadText(HANDLE hFile, LPWSTR *ppszText, DWORD *pdwTextLen, int *pencFile, int *piEoln); +BOOL WriteText(HANDLE hFile, LPCWSTR pszText, DWORD dwTextLen, int encFile, int iEoln); /* from settings.c */ -void LoadSettings(void); -void SaveSettings(void); +void NOTEPAD_LoadSettingsFromRegistry(void); +void NOTEPAD_SaveSettingsToRegistry(void); /* from main.c */ BOOL NOTEPAD_FindNext(FINDREPLACE *, BOOL , BOOL ); Modified: trunk/reactos/base/applications/notepad/notepad_res.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/notepad_res.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/notepad_res.h [iso-8859-1] Sat Mar 14 20:00:39 2015 @@ -65,7 +65,7 @@ #define CMD_HELP_SEARCH 0x131 #define CMD_HELP_ON_HELP 0x132 #define CMD_ABOUT 0x135 -#define CMD_ABOUT_WINE 0x137 +#define CMD_HELP_ABOUT_NOTEPAD 0x137 /* Strings */ #define STRING_PAGESETUP_HEADERVALUE 0x160 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] Sat Mar 14 20:00:39 2015 @@ -105,7 +105,13 @@ return QueryGeneric(hKey, pszValueName, REG_SZ, pszResult, dwResultSize * sizeof(TCHAR)); } -void LoadSettings(void) +/*********************************************************************** + * + * NOTEPAD_LoadSettingsFromRegistry + * + * Load settings from registry HKCU\Software\Microsoft\Notepad. + */ +void NOTEPAD_LoadSettingsFromRegistry(void) { HKEY hKey = NULL; HFONT hFont; @@ -124,7 +130,7 @@ 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])); + QueryString(hKey, _T("lfFaceName"), Globals.lfFont.lfFaceName, ARRAY_SIZE(Globals.lfFont.lfFaceName)); QueryByte(hKey, _T("lfItalic"), &Globals.lfFont.lfItalic); QueryDword(hKey, _T("lfOrientation"), (DWORD*)&Globals.lfFont.lfOrientation); QueryByte(hKey, _T("lfOutPrecision"), &Globals.lfFont.lfOutPrecision); @@ -136,8 +142,8 @@ QueryDword(hKey, _T("iPointSize"), &dwPointSize); QueryBool(hKey, _T("fWrap"), &Globals.bWrapLongLines); QueryBool(hKey, _T("fStatusBar"), &Globals.bShowStatusBar); - QueryString(hKey, _T("szHeader"), Globals.szHeader, sizeof(Globals.szHeader) / sizeof(Globals.szHeader[0])); - QueryString(hKey, _T("szTrailer"), Globals.szFooter, sizeof(Globals.szFooter) / sizeof(Globals.szFooter[0])); + QueryString(hKey, _T("szHeader"), Globals.szHeader, ARRAY_SIZE(Globals.szHeader)); + QueryString(hKey, _T("szTrailer"), Globals.szFooter, ARRAY_SIZE(Globals.szFooter)); QueryDword(hKey, _T("iMarginLeft"), (DWORD*)&Globals.lMarginLeft); QueryDword(hKey, _T("iMarginTop"), (DWORD*)&Globals.lMarginTop); QueryDword(hKey, _T("iMarginRight"), (DWORD*)&Globals.lMarginRight); @@ -179,15 +185,22 @@ return RegSetValueEx(hKey, pszValueNameT, 0, REG_SZ, (LPBYTE) pszValue, (DWORD) _tcslen(pszValue) * sizeof(*pszValue)) == ERROR_SUCCESS; } -void SaveSettings(void) +/*********************************************************************** + * + * NOTEPAD_SaveSettingsToRegistry + * + * Save settings to registry HKCU\Software\Microsoft\Notepad. + */ +void NOTEPAD_SaveSettingsToRegistry(void) { 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) + 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); @@ -214,6 +227,7 @@ 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] Sat Mar 14 20:00:39 2015 @@ -48,7 +48,7 @@ } BOOL -ReadText(HANDLE hFile, LPWSTR *ppszText, DWORD *pdwTextLen, int *piEncoding, int *piEoln) +ReadText(HANDLE hFile, LPWSTR *ppszText, DWORD *pdwTextLen, int *pencFile, int *piEoln) { DWORD dwSize; LPBYTE pBytes = NULL; @@ -58,7 +58,7 @@ DWORD dwCharCount; BOOL bSuccess = FALSE; BYTE b = 0; - int iEncoding = ENCODING_ANSI; + int encFile = ENCODING_ANSI; int iCodePage = 0; WCHAR szCrlf[2] = {'\r', '\n'}; DWORD adwEolnCount[3] = {0, 0, 0}; @@ -85,21 +85,21 @@ /* Look for Byte Order Marks */ if ((dwSize >= 2) && (pBytes[0] == 0xFF) && (pBytes[1] == 0xFE)) { - iEncoding = ENCODING_UNICODE; + encFile = ENCODING_UNICODE; dwPos += 2; } else if ((dwSize >= 2) && (pBytes[0] == 0xFE) && (pBytes[1] == 0xFF)) { - iEncoding = ENCODING_UNICODE_BE; + encFile = ENCODING_UNICODE_BE; dwPos += 2; } else if ((dwSize >= 3) && (pBytes[0] == 0xEF) && (pBytes[1] == 0xBB) && (pBytes[2] == 0xBF)) { - iEncoding = ENCODING_UTF8; + encFile = ENCODING_UTF8; dwPos += 3; } - switch(iEncoding) + switch(encFile) { case ENCODING_UNICODE_BE: for (i = dwPos; i < dwSize-1; i += 2) @@ -117,9 +117,9 @@ case ENCODING_ANSI: case ENCODING_UTF8: - if (iEncoding == ENCODING_ANSI) + if (encFile == ENCODING_ANSI) iCodePage = CP_ACP; - else if (iEncoding == ENCODING_UTF8) + else if (encFile == ENCODING_UTF8) iCodePage = CP_UTF8; if ((dwSize - dwPos) > 0) @@ -166,7 +166,7 @@ case '\n': if (!Append(ppszText, pdwTextLen, &pszText[dwPos], i - dwPos)) return FALSE; - if (!Append(ppszText, pdwTextLen, szCrlf, sizeof(szCrlf) / sizeof(szCrlf[0]))) + if (!Append(ppszText, pdwTextLen, szCrlf, ARRAY_SIZE(szCrlf))) return FALSE; dwPos = i + 1; @@ -202,7 +202,7 @@ *piEoln = EOLN_LF; if (adwEolnCount[EOLN_CR] > adwEolnCount[*piEoln]) *piEoln = EOLN_CR; - *piEncoding = iEncoding; + *pencFile = encFile; bSuccess = TRUE; @@ -221,7 +221,7 @@ return bSuccess; } -static BOOL WriteEncodedText(HANDLE hFile, LPCWSTR pszText, DWORD dwTextLen, int iEncoding) +static BOOL WriteEncodedText(HANDLE hFile, LPCWSTR pszText, DWORD dwTextLen, int encFile) { LPBYTE pBytes = NULL; LPBYTE pAllocBuffer = NULL; @@ -236,7 +236,7 @@ while(dwPos < dwTextLen) { - switch(iEncoding) + switch(encFile) { case ENCODING_UNICODE: pBytes = (LPBYTE) &pszText[dwPos]; @@ -262,9 +262,9 @@ case ENCODING_ANSI: case ENCODING_UTF8: - if (iEncoding == ENCODING_ANSI) + if (encFile == ENCODING_ANSI) iCodePage = CP_ACP; - else if (iEncoding == ENCODING_UTF8) + else if (encFile == ENCODING_UTF8) iCodePage = CP_UTF8; iRequiredBytes = WideCharToMultiByte(iCodePage, 0, &pszText[dwPos], dwTextLen - dwPos, NULL, 0, NULL, NULL); @@ -315,17 +315,17 @@ return bSuccess; } -BOOL WriteText(HANDLE hFile, LPCWSTR pszText, DWORD dwTextLen, int iEncoding, int iEoln) +BOOL WriteText(HANDLE hFile, LPCWSTR pszText, DWORD dwTextLen, int encFile, int iEoln) { WCHAR wcBom; LPCWSTR pszLF = L"\n"; DWORD dwPos, dwNext; /* Write the proper byte order marks if not ANSI */ - if (iEncoding != ENCODING_ANSI) + if (encFile != ENCODING_ANSI) { wcBom = 0xFEFF; - if (!WriteEncodedText(hFile, &wcBom, 1, iEncoding)) + if (!WriteEncodedText(hFile, &wcBom, 1, encFile)) return FALSE; } @@ -350,20 +350,20 @@ { case EOLN_LF: /* Write text (without eoln) */ - if (!WriteEncodedText(hFile, &pszText[dwPos], dwNext - dwPos, iEncoding)) + if (!WriteEncodedText(hFile, &pszText[dwPos], dwNext - dwPos, encFile)) return FALSE; /* Write eoln */ - if (!WriteEncodedText(hFile, pszLF, 1, iEncoding)) + if (!WriteEncodedText(hFile, pszLF, 1, encFile)) return FALSE; break; case EOLN_CR: /* Write text (including \r as eoln) */ - if (!WriteEncodedText(hFile, &pszText[dwPos], dwNext - dwPos + 1, iEncoding)) + if (!WriteEncodedText(hFile, &pszText[dwPos], dwNext - dwPos + 1, encFile)) return FALSE; break; case EOLN_CRLF: /* Write text (including \r\n as eoln) */ - if (!WriteEncodedText(hFile, &pszText[dwPos], dwNext - dwPos + 2, iEncoding)) + if (!WriteEncodedText(hFile, &pszText[dwPos], dwNext - dwPos + 2, encFile)) return FALSE; break; default: @@ -373,7 +373,7 @@ else { /* Write text (without eoln, since this is the end of the file) */ - if (!WriteEncodedText(hFile, &pszText[dwPos], dwNext - dwPos, iEncoding)) + if (!WriteEncodedText(hFile, &pszText[dwPos], dwNext - dwPos, encFile)) return FALSE; }

9 years, 9 months

[tkreuzer] 66711: [PSDK] Add missing _Enum_is_bitflag_ and _Strict_type_match_ annotations. remove a wrong annotation

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Mar 14 18:12:50 2015 New Revision: 66711 URL: http://svn.reactos.org/svn/reactos?rev=66711&view=rev Log: [PSDK] Add missing _Enum_is_bitflag_ and _Strict_type_match_ annotations. remove a wrong annotation Modified: trunk/reactos/include/ndk/no_sal2.h trunk/reactos/include/psdk/sal.h Modified: trunk/reactos/include/ndk/no_sal2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/no_sal2.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/no_sal2.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/no_sal2.h [iso-8859-1] Sat Mar 14 18:12:50 2015 @@ -183,6 +183,7 @@ #define _Deref_ret_range_(lb,ub) #define _Deref_ret_z_ #define _Deref2_pre_readonly_ +#define _Enum_is_bitflag_ #define _Field_range_(min,max) #define _Field_size_(size) #define _Field_size_bytes_(size) @@ -308,7 +309,7 @@ #define _Literal_ #define _Maybenull_ #define _Maybevalid_ -#define _Maybe_raises_SEH_exception +#define _Maybe_raises_SEH_exception_ #define _Must_inspect_result_ #define _Notliteral_ #define _Notnull_ @@ -566,7 +567,6 @@ #define _Prepost_z_ #define _Printf_format_string_ #define _Raises_SEH_exception_ -#define _Maybe_raises_SEH_exception_ #define _Readable_bytes_(size) #define _Readable_elements_(size) #define _Reserved_ @@ -629,6 +629,7 @@ #define _Return_type_success_(expr) #define _Scanf_format_string_ #define _Scanf_s_format_string_ +#define _Strict_type_match_ #define _Struct_size_bytes_(size) #define _Success_(expr) #define _Unchanged_(e) Modified: trunk/reactos/include/psdk/sal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sal.h?rev=667… ============================================================================== --- trunk/reactos/include/psdk/sal.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/sal.h [iso-8859-1] Sat Mar 14 18:12:50 2015 @@ -599,6 +599,7 @@ //#define _Deref_ret_range_(lb,ub) //#define _Deref_ret_z_ //#define _Deref2_pre_readonly_ +//#define _Enum_is_bitflag_ #define _Field_range_(min,max) _SAL2_NAME(_Field_range_) _Group_(_SA_annotes2(SAL_range,min,max)) #define _Field_size_(size) _SAL2_NAME(_Field_size_) _Group_(_Notnull_ _Writable_elements_(size)) #define _Field_size_opt_(size) _SAL2_NAME(_Field_size_opt_) _Group_(_Maybenull_ _Writable_elements_(size)) @@ -723,7 +724,7 @@ #define _Literal_ _SAL2_NAME(_Literal_) _Group_([SAL_pre] [SAL_annotes(Name="SAL_constant", p1="__yes")]) #define _Maybenull_ [SAL_annotes(Name="SAL_null", p1="__maybe")] #define _Maybevalid_ [SAL_annotes(Name="SAL_valid", p1="__maybe")] -//#define _Maybe_raises_SEH_exception +#define _Maybe_raises_SEH_exception_ _SAL2_NAME(_Maybe_raises_SEH_exception_) _Group_(_Pre_ [SAL_annotes(Name="SAL_inTry", p1="__yes")]) #define _Must_inspect_result_ _SAL2_NAME(_Must_inspect_result_) _Group_(_Post_ [SAL_annotes(Name="SAL_mustInspect")] [SA_Post(MustCheck=SA_Yes)]) #define _Notliteral_ _SAL2_NAME(_Notliteral_) _Group_([SAL_pre] [SAL_annotes(Name="SAL_constant", p1="__no")] ) #define _Notnull_ [SAL_annotes(Name="SAL_null", p1="__no")] @@ -979,7 +980,6 @@ #define _Prepost_z_ _SAL2_NAME(_Prepost_z_) _Group_(_Pre_z_ _Post_z_) #define _Printf_format_string_ _SAL2_NAME(_Printf_format_string_) _Group_([SA_FormatString(Style="printf")] ) //#define _Raises_SEH_exception_ -#define _Maybe_raises_SEH_exception_ _SAL2_NAME(_Maybe_raises_SEH_exception_) _Group_(_Pre_ [SAL_annotes(Name="SAL_inTry", p1="__yes")]) #define _Readable_bytes_(size) _SAL2_NAME(_Readable_bytes_) _Group_(_SA_annotes1(SAL_readableTo, byteCount(size))) #define _Readable_elements_(size) _SAL2_NAME(_Readable_elements_) _Group_([SAL_annotes(Name="SAL_readableTo", p1="elementCount(size)")]) #define _Reserved_ _SAL2_NAME(_Reserved_) _Group_([SA_Pre(Null=SA_Yes)]) @@ -1043,6 +1043,7 @@ #define _Return_type_success_(expr) _SAL2_NAME(_Return_type_success_) _Group_([SA_Success(Condition=_SA_SPECSTRIZE(expr))]) #define _Scanf_format_string_ _SAL2_NAME(_Scanf_format_string_) _Group_([SA_FormatString(Style="scanf")]) #define _Scanf_s_format_string_ _SAL2_NAME(_Scanf_s_format_string_) _Group_([SA_FormatString(Style="scanf_s")]) +#define _Strict_type_match_ _SAL2_NAME(_Strict_type_match_) _Group_([SAL_annotes(Name="SAL_strictType2")]) #define _Struct_size_bytes_(size) _SAL2_NAME(_Struct_size_bytes_) _Group_(_Writable_bytes_(byteCount(size))) #define _Success_(expr) _SAL2_NAME(_Success_) _Group_([SA_Success(Condition=_SA_SPECSTRIZE(expr))]) #define _Unchanged_(expr) _SAL2_NAME(_Unchanged_) _Group_([SAL_at(p1=_SA_SPECSTRIZE(expr))] _Group_(_Post_equal_to_(expr) _Const_)) @@ -1402,7 +1403,7 @@ #define _Literal_ #define _Maybenull_ #define _Maybevalid_ -#define _Maybe_raises_SEH_exception +#define _Maybe_raises_SEH_exception_ #define _Must_inspect_result_ #define _Notliteral_ #define _Notnull_ @@ -1660,7 +1661,6 @@ #define _Prepost_z_ #define _Printf_format_string_ #define _Raises_SEH_exception_ -#define _Maybe_raises_SEH_exception_ #define _Readable_bytes_(size) #define _Readable_elements_(size) #define _Reserved_ @@ -1724,6 +1724,7 @@ #define _Return_type_success_(expr) #define _Scanf_format_string_ #define _Scanf_s_format_string_ +#define _Strict_type_match_ #define _Struct_size_bytes_(size) #define _Success_(expr) #define _Unchanged_(e)

9 years, 9 months

[janderwald] 66710: - fix build

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Mar 14 17:53:52 2015 New Revision: 66710 URL: http://svn.reactos.org/svn/reactos?rev=66710&view=rev Log: - fix build Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c [iso-8859-1] Sat Mar 14 17:53:52 2015 @@ -74,7 +74,6 @@ IN PVOID Context) { PWDMAUD_DEVICE_EXTENSION DeviceExtension; - NTSTATUS Status; /* get device extension */ DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; @@ -92,8 +91,6 @@ IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT PhysicalDeviceObject) { - UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\wdmaud"); - UNICODE_STRING SymlinkName = RTL_CONSTANT_STRING(L"\\DosDevices\\wdmaud"); PDEVICE_OBJECT DeviceObject; NTSTATUS Status; PWDMAUD_DEVICE_EXTENSION DeviceExtension;

9 years, 9 months

[janderwald] 66709: [WDMAUD] - convert wdmaud to a software pnp device - register device interface [WDMAUD.DRV] - open wdmaud via device interface

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Mar 14 17:50:30 2015 New Revision: 66709 URL: http://svn.reactos.org/svn/reactos?rev=66709&view=rev Log: [WDMAUD] - convert wdmaud to a software pnp device - register device interface [WDMAUD.DRV] - open wdmaud via device interface Modified: trunk/reactos/dll/win32/wdmaud.drv/legacy.c trunk/reactos/dll/win32/wdmaud.drv/wdmaud.h trunk/reactos/drivers/ksfilter/ks/misc.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/deviface.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/sup.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h trunk/reactos/media/inf/wdmaudio.inf Modified: trunk/reactos/dll/win32/wdmaud.drv/legacy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/legac… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/legacy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/legacy.c [iso-8859-1] Sat Mar 14 17:50:30 2015 @@ -255,25 +255,64 @@ IN PSOUND_DEVICE SoundDevice, OUT PVOID *Handle) { - /* Only open this if it's not already open */ + HDEVINFO hDevInfo; + SP_DEVICE_INTERFACE_DATA DeviceInterfaceData; + GUID SWBusGuid = {STATIC_KSCATEGORY_WDMAUD}; + PSP_DEVICE_INTERFACE_DETAIL_DATA_W DeviceInterfaceDetailData; + if ( KernelHandle == INVALID_HANDLE_VALUE ) { - SND_TRACE(L"Opening wdmaud device\n"); - KernelHandle = CreateFileW(KERNEL_DEVICE_NAME, - GENERIC_READ | GENERIC_WRITE, - 0, - NULL, - OPEN_EXISTING, - FILE_FLAG_OVERLAPPED, - NULL); - } + hDevInfo = SetupDiGetClassDevsW(&SWBusGuid, NULL, NULL, DIGCF_DEVICEINTERFACE| DIGCF_PRESENT); + if (!hDevInfo) + { + // failed + return MMSYSERR_ERROR; + } + + DeviceInterfaceData.cbSize = sizeof(SP_DEVICE_INTERFACE_DATA); + if (!SetupDiEnumDeviceInterfaces(hDevInfo, NULL, &SWBusGuid, 0, &DeviceInterfaceData)) + { + // failed + SetupDiDestroyDeviceInfoList(hDevInfo); + return MMSYSERR_ERROR; + } + + DeviceInterfaceDetailData = (PSP_DEVICE_INTERFACE_DETAIL_DATA_W)HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR) + sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W)); + if (!DeviceInterfaceDetailData) + { + // failed + SetupDiDestroyDeviceInfoList(hDevInfo); + return MMSYSERR_ERROR; + } + + DeviceInterfaceDetailData->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W); + if (!SetupDiGetDeviceInterfaceDetailW(hDevInfo, &DeviceInterfaceData, DeviceInterfaceDetailData,MAX_PATH * sizeof(WCHAR) + sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W), NULL, NULL)) + { + // failed + HeapFree(GetProcessHeap(), 0, DeviceInterfaceDetailData); + SetupDiDestroyDeviceInfoList(hDevInfo); + return MMSYSERR_ERROR; + } + SND_TRACE(L"Opening wdmaud device '%s'\n",DeviceInterfaceDetailData->DevicePath); + KernelHandle = CreateFileW(DeviceInterfaceDetailData->DevicePath, + GENERIC_READ | GENERIC_WRITE, + 0, + NULL, + OPEN_EXISTING, + FILE_FLAG_OVERLAPPED, + NULL); + + HeapFree(GetProcessHeap(), 0, DeviceInterfaceDetailData); + SetupDiDestroyDeviceInfoList(hDevInfo); + } + if ( KernelHandle == INVALID_HANDLE_VALUE ) return MMSYSERR_ERROR; ++ OpenCount; - - return MMSYSERR_NOERROR; + return MMSYSERR_NOERROR; + } MMRESULT Modified: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/wdmau… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/wdmaud.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/wdmaud.h [iso-8859-1] Sat Mar 14 17:50:30 2015 @@ -8,12 +8,16 @@ #define COM_NO_WINDOWS_H #include <windef.h> +#include <winbase.h> +#include <winreg.h> + #include <winuser.h> #include <mmddk.h> #include <mmebuddy.h> #include <ksmedia.h> #include <interface.h> #include <devioctl.h> +#include <setupapi.h> BOOL WdmAudInitUserModeMixer(VOID); Modified: trunk/reactos/drivers/ksfilter/ks/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/misc.c… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/misc.c [iso-8859-1] Sat Mar 14 17:50:30 2015 @@ -11,6 +11,8 @@ #define NDEBUG #include <debug.h> +#define TAG_KS 'ssKK' + VOID CompleteRequest( PIRP Irp, @@ -29,7 +31,7 @@ IN POOL_TYPE PoolType, IN SIZE_T NumberOfBytes) { - PVOID Item = ExAllocatePool(PoolType, NumberOfBytes); + PVOID Item = ExAllocatePoolWithTag(PoolType, NumberOfBytes, TAG_KS); if (!Item) return Item; Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] Sat Mar 14 17:50:30 2015 @@ -49,9 +49,6 @@ { ULONG Result = 0; NTSTATUS Status = STATUS_SUCCESS; - //PWDMAUD_DEVICE_EXTENSION DeviceExtension; - - //DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; if (DeviceInfo->DeviceType == MIXER_DEVICE_TYPE) { @@ -231,13 +228,9 @@ IN PIRP Irp, IN PWDMAUD_DEVICE_INFO DeviceInfo) { - //PWDMAUD_DEVICE_EXTENSION DeviceExtension; NTSTATUS Status; LPWSTR Device; ULONG Size, Length; - - /* get device extension */ - //DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; /* get device interface string input length */ Size = DeviceInfo->u.Interface.DeviceInterfaceStringSize; @@ -420,19 +413,11 @@ /* grab next mdl */ Mdl = NextMdl; } - + //IoFreeMdl(Mdl); /* clear mdl list */ - Irp->MdlAddress = NULL; - - /* check if mdl is locked */ - if (Context->Mdl->MdlFlags & MDL_PAGES_LOCKED) - { - /* unlock pages */ - MmUnlockPages(Context->Mdl); - } - - /* now free the mdl */ - IoFreeMdl(Context->Mdl); + Irp->MdlAddress = Context->Mdl; + + DPRINT("IoCompletion Irp %p IoStatus %lx Information %lx Length %lu\n", Irp, Irp->IoStatus.Status, Irp->IoStatus.Information, Length); @@ -441,6 +426,9 @@ /* failed */ Irp->IoStatus.Information = 0; } + + /* dereference file object */ + ObDereferenceObject(Context->FileObject); /* free context */ FreeItem(Context); @@ -502,8 +490,6 @@ /* remove mdladdress as KsProbeStreamIrp will interprete it as an already probed audio buffer */ Irp->MdlAddress = NULL; - /* check for success */ - if (IoStack->MajorFunction == IRP_MJ_WRITE) { /* probe the write stream irp */ @@ -520,6 +506,7 @@ { DPRINT1("KsProbeStreamIrp failed with Status %x Cancel %u\n", Status, Irp->Cancel); Irp->MdlAddress = Mdl; + FreeItem(Context); return SetIrpIoStatus(Irp, Status, 0); } @@ -532,8 +519,13 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Invalid pin handle %p\n", DeviceInfo->hDevice); + Irp->MdlAddress = Mdl; + FreeItem(Context); return SetIrpIoStatus(Irp, Status, 0); } + + /* store file object whose reference is released in the completion callback */ + Context->FileObject = FileObject; /* skip current irp stack location */ IoSkipCurrentIrpStackLocation(Irp); @@ -541,30 +533,16 @@ /* get next stack location */ IoStack = IoGetNextIrpStackLocation(Irp); - if (Read) - { - IoStack->Parameters.DeviceIoControl.IoControlCode = IOCTL_KS_READ_STREAM; - } - else - { - IoStack->Parameters.DeviceIoControl.IoControlCode = IOCTL_KS_WRITE_STREAM; - } - - /* attach file object */ + /* prepare stack location */ IoStack->FileObject = FileObject; IoStack->Parameters.Write.Length = Length; IoStack->MajorFunction = IRP_MJ_WRITE; - + IoStack->Parameters.DeviceIoControl.IoControlCode = (Read ? IOCTL_KS_READ_STREAM : IOCTL_KS_WRITE_STREAM); IoSetCompletionRoutine(Irp, IoCompletion, (PVOID)Context, TRUE, TRUE, TRUE); - /* mark irp as pending */ // IoMarkIrpPending(Irp); /* call the driver */ Status = IoCallDriver(IoGetRelatedDeviceObject(FileObject), Irp); - - /* dereference file object */ - ObDereferenceObject(FileObject); - return Status; } Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/deviface.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/deviface.c [iso-8859-1] Sat Mar 14 17:50:30 2015 @@ -153,16 +153,18 @@ return Status; } - InsertTailList(&DeviceExtension->SysAudioDeviceList, &Entry->Entry); - DeviceExtension->NumSysAudioDevices++; - DPRINT("Opening device %S\n", Entry->SymbolicLink.Buffer); Status = WdmAudOpenSysAudioDevice(Entry->SymbolicLink.Buffer, &hSysAudio); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to open sysaudio %x\n", Status); + FreeItem(Entry->SymbolicLink.Buffer); + FreeItem(Entry); return Status; } + + InsertTailList(&DeviceExtension->SysAudioDeviceList, &Entry->Entry); + DeviceExtension->NumSysAudioDevices++; /* get the file object */ Status = ObReferenceObjectByHandle(hSysAudio, FILE_READ_DATA | FILE_WRITE_DATA, *IoFileObjectType, KernelMode, (PVOID*)&FileObject, NULL); @@ -186,8 +188,6 @@ IN PWDMAUD_DEVICE_EXTENSION DeviceExtension) { NTSTATUS Status; - UNICODE_STRING SymlinkName = RTL_CONSTANT_STRING(L"\\DosDevices\\wdmaud"); - UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\wdmaud"); UNICODE_STRING SymbolicLinkName; Status = IoRegisterDeviceInterface(PhysicalDeviceObject, &KSCATEGORY_WDMAUD, NULL, &SymbolicLinkName); @@ -195,20 +195,7 @@ { IoSetDeviceInterfaceState(&SymbolicLinkName, TRUE); RtlFreeUnicodeString(&SymbolicLinkName); - DeviceExtension->DeviceInterfaceSupport = TRUE; - return Status; - } - - /* failed to register device interface - * create a symbolic link instead - */ - DeviceExtension->DeviceInterfaceSupport = FALSE; - - Status = IoCreateSymbolicLink(&SymlinkName, &DeviceName); - if (!NT_SUCCESS(Status)) - { - IoDeleteDevice(PhysicalDeviceObject); //FIXME - DPRINT("Failed to create wdmaud symlink!\n"); + //DeviceExtension->DeviceInterfaceSupport = TRUE; return Status; } Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c [iso-8859-1] Sat Mar 14 17:50:30 2015 @@ -31,6 +31,19 @@ /* get device extension */ DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + if (DeviceExtension->FileObject == NULL) + { + /* find available sysaudio devices */ + Status = WdmAudOpenSysAudioDevices(DeviceObject, DeviceExtension); + if (!NT_SUCCESS(Status)) + { + DPRINT1("WdmAudOpenSysAudioDevices failed with %x\n", Status); + return; + } + } + + /* get device count */ DeviceCount = GetSysAudioDeviceCount(DeviceObject); @@ -61,6 +74,7 @@ IN PVOID Context) { PWDMAUD_DEVICE_EXTENSION DeviceExtension; + NTSTATUS Status; /* get device extension */ DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; @@ -74,8 +88,9 @@ NTSTATUS NTAPI -WdmAudInstallDevice( - IN PDRIVER_OBJECT DriverObject) +WdmaudAddDevice( + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT PhysicalDeviceObject) { UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\wdmaud"); UNICODE_STRING SymlinkName = RTL_CONSTANT_STRING(L"\\DosDevices\\wdmaud"); @@ -83,11 +98,11 @@ NTSTATUS Status; PWDMAUD_DEVICE_EXTENSION DeviceExtension; - DPRINT("WdmAudInstallDevice called\n"); + DPRINT("WdmaudAddDevice called\n"); Status = IoCreateDevice(DriverObject, sizeof(WDMAUD_DEVICE_EXTENSION), - &DeviceName, + NULL, FILE_DEVICE_KS, 0, FALSE, @@ -113,7 +128,7 @@ } /* register device interfaces */ - Status = WdmAudRegisterDeviceInterface(DeviceObject, DeviceExtension); + Status = WdmAudRegisterDeviceInterface(PhysicalDeviceObject, DeviceExtension); if (!NT_SUCCESS(Status)) { DPRINT1("WdmRegisterDeviceInterface failed with %x\n", Status); @@ -136,25 +151,19 @@ /* initialize timer */ IoInitializeTimer(DeviceObject, WdmAudTimerRoutine, (PVOID)WdmAudTimerRoutine); - /* find available sysaudio devices */ - Status = WdmAudOpenSysAudioDevices(DeviceObject, DeviceExtension); - if (!NT_SUCCESS(Status)) - { - DPRINT1("WdmAudOpenSysAudioDevices failed with %x\n", Status); - IoDeleteSymbolicLink(&SymlinkName); + /* allocate ks device header */ + Status = KsAllocateDeviceHeader(&DeviceExtension->DeviceHeader, 0, NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("KsAllocateDeviceHeader failed with %x\n", Status); IoDeleteDevice(DeviceObject); return Status; } - /* allocate ks device header */ - Status = KsAllocateDeviceHeader(&DeviceExtension->DeviceHeader, 0, NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("KsAllocateDeviceHeader failed with %x\n", Status); - IoDeleteSymbolicLink(&SymlinkName); - IoDeleteDevice(DeviceObject); - return Status; - } + /* attach to device stack */ + DeviceExtension->NextDeviceObject = IoAttachDeviceToDeviceStack(DeviceObject, PhysicalDeviceObject); + KsSetDevicePnpAndBaseObject(DeviceExtension->DeviceHeader, DeviceExtension->NextDeviceObject, DeviceObject); + /* start the timer */ IoStartTimer(DeviceObject); @@ -203,10 +212,10 @@ NTSTATUS Status; PIO_STACK_LOCATION IoStack; PWDMAUD_CLIENT pClient; - //PWDMAUD_DEVICE_EXTENSION DeviceExtension; - - /* get device extension */ - //DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + PWDMAUD_DEVICE_EXTENSION DeviceExtension; + + /* get device extension */ + DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; #if KS_IMPLEMENTED Status = KsReferenceSoftwareBusObject((KSDEVICE_HEADER)DeviceObject->DeviceExtension); @@ -216,6 +225,13 @@ return Status; } #endif + + if (DeviceExtension->FileObject == NULL) + { + /* initialize */ + WdmAudInitWorkerRoutine(DeviceObject, NULL); + } + Status = WdmAudOpenSysaudio(DeviceObject, &pClient); if (!NT_SUCCESS(Status)) @@ -354,6 +370,7 @@ Driver->MajorFunction[IRP_MJ_WRITE] = WdmAudReadWrite; Driver->MajorFunction[IRP_MJ_READ] = WdmAudReadWrite; Driver->MajorFunction[IRP_MJ_POWER] = KsDefaultDispatchPower; - - return WdmAudInstallDevice(Driver); -} + Driver->DriverExtension->AddDevice = WdmaudAddDevice; + + return STATUS_SUCCESS; +} Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/sup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/sup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/sup.c [iso-8859-1] Sat Mar 14 17:50:30 2015 @@ -14,12 +14,14 @@ #define NDEBUG #include <debug.h> +#define TAG_WDMAUD 'DMDW' + PVOID AllocateItem( IN POOL_TYPE PoolType, IN SIZE_T NumberOfBytes) { - PVOID Item = ExAllocatePool(PoolType, NumberOfBytes); + PVOID Item = ExAllocatePoolWithTag(PoolType, NumberOfBytes, TAG_WDMAUD); if (!Item) return Item; Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h [iso-8859-1] Sat Mar 14 17:50:30 2015 @@ -11,6 +11,7 @@ PMDL Mdl; ULONG Length; ULONG Function; + PFILE_OBJECT FileObject; }WDMAUD_COMPLETION_CONTEXT, *PWDMAUD_COMPLETION_CONTEXT; @@ -66,6 +67,7 @@ KEVENT InitializationCompletionEvent; ULONG WorkItemActive; + PDEVICE_OBJECT NextDeviceObject; }WDMAUD_DEVICE_EXTENSION, *PWDMAUD_DEVICE_EXTENSION; typedef struct Modified: trunk/reactos/media/inf/wdmaudio.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/wdmaudio.inf?rev… ============================================================================== --- trunk/reactos/media/inf/wdmaudio.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/wdmaudio.inf [iso-8859-1] Sat Mar 14 17:50:30 2015 @@ -30,8 +30,6 @@ %WDM_WDMAUD.DeviceDesc% = WDM_WDMAUD, SW\{CD171DE3-69E5-11D2-B56D-0000F8754380} ;%WDM_DRMKAUD.DeviceDesc% = WDM_DRMKAUD, SW\{EEC12DB6-AD9C-4168-8658-B03DAEF417FE} -%WDMAUDIO_CopyFilesOnlyId.DeviceDesc% = WDMAUDIO.CopyFilesOnly, WDMAUDIO_CopyFilesOnlyId - [WDMAUDIO.CopyFilesOnly] CopyFiles=WDM.CopyFiles, FX.CopyList @@ -45,6 +43,12 @@ AddReg = DeviceRegistration CopyFiles = WDM.CopyFiles +;; copied to system32\drivers +[WDM.CopyFiles] +drmk.sys,,,0x0100 +portcls.sys,,,0x0100 + + [DeviceRegistration] ; Kmixer swenum install ;HKLM,%RunOnce%,"WDM_KMIXER0",,"rundll32.exe streamci.dll,StreamingDeviceSetup %WDM_KMIXER.DeviceId%,%KSNAME_Filter%,%KSCATEGORY_MIXER%,%17%\WDMAUDIO.inf,WDM_KMIXER.Interface.Install" @@ -160,10 +164,6 @@ ErrorControl = 1 ; SERVICE_ERROR_NORMAL ServiceBinary = %10%\system32\drivers\drmkaud.sys -;; copied to system32\drivers -[WDM.CopyFiles] -drmk.sys,,,0x0100 -portcls.sys,,,0x0100 ;; Destination Directory List [DestinationDirs]

9 years, 9 months

[hbelusca] 66708: [NTOS]: Do not assert if we haven't shut down ReactOS yet, in 99.99% cases it's because you asked it to go into a non-yet implemented power state. CORE-8537 #resolve #comment Repl...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Mar 14 16:40:26 2015 New Revision: 66708 URL: http://svn.reactos.org/svn/reactos?rev=66708&view=rev Log: [NTOS]: Do not assert if we haven't shut down ReactOS yet, in 99.99% cases it's because you asked it to go into a non-yet implemented power state. CORE-8537 #resolve #comment Replaced the ASSERT by an informative message when the power action is not implemented. r66708. Modified: trunk/reactos/ntoskrnl/po/power.c Modified: trunk/reactos/ntoskrnl/po/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/power.c?rev=66… ============================================================================== --- trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] Sat Mar 14 16:40:26 2015 @@ -926,7 +926,8 @@ } /* You should not have made it this far */ - ASSERTMSG("System is still up and running?!", FALSE); + // ASSERTMSG("System is still up and running?!", FALSE); + DPRINT1("System is still up and running, you may not have chosen a yet supported power option: %u\n", PopAction.Action); break; }

9 years, 9 months

[akhaldi] 66707: [CMAKE/GCC] Prevent GCC from searching any of the default directories, except when we're dealing with set_cpp. Now GCC build is on par with the MSVC build in terms of header inclus...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Mar 14 15:47:04 2015 New Revision: 66707 URL: http://svn.reactos.org/svn/reactos?rev=66707&view=rev Log: [CMAKE/GCC] Prevent GCC from searching any of the default directories, except when we're dealing with set_cpp. Now GCC build is on par with the MSVC build in terms of header inclusions. Modified: trunk/reactos/cmake/CMakeMacros.cmake trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Sat Mar 14 15:47:04 2015 @@ -72,6 +72,8 @@ if(MSVC) add_definitions(-DNATIVE_CPP_INCLUDE=${REACTOS_SOURCE_DIR}/include/c++) include_directories(${REACTOS_SOURCE_DIR}/include/c++/stlport) + else() + replace_compile_flags("-nostdinc" " ") endif() endif() Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=66707&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sat Mar 14 15:47:04 2015 @@ -38,6 +38,10 @@ # Compiler Core add_compile_flags("-pipe -fms-extensions -fno-strict-aliasing") + +# Prevent GCC from searching any of the default directories +add_compile_flags("-nostdinc") + if(GCC_VERSION VERSION_GREATER 4.7) add_compile_flags("-mstackrealign") endif()

9 years, 9 months

[akhaldi] 66706: [WS2_32_WINETEST] Fix MSVC build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Mar 14 15:45:07 2015 New Revision: 66706 URL: http://svn.reactos.org/svn/reactos?rev=66706&view=rev Log: [WS2_32_WINETEST] Fix MSVC build. Modified: trunk/rostests/winetests/ws2_32/sock.c Modified: trunk/rostests/winetests/ws2_32/sock.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ws2_32/sock.c?r… ============================================================================== --- trunk/rostests/winetests/ws2_32/sock.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ws2_32/sock.c [iso-8859-1] Sat Mar 14 15:45:07 2015 @@ -27,7 +27,7 @@ #define WIN32_NO_STATUS #include <wine/test.h> #include <winsock2.h> -#include <winternl.h> +#include <wine/winternl.h> #include <ws2tcpip.h> #include <wsipx.h> #include <wsnwlink.h>

9 years, 9 months

[hbelusca] 66705: [FMIFS]: Reorganize a bit the inclusions, and always compile the DLL in UNICODE.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Mar 14 15:37:00 2015 New Revision: 66705 URL: http://svn.reactos.org/svn/reactos?rev=66705&view=rev Log: [FMIFS]: Reorganize a bit the inclusions, and always compile the DLL in UNICODE. Modified: trunk/reactos/dll/win32/fmifs/CMakeLists.txt trunk/reactos/dll/win32/fmifs/init.c trunk/reactos/dll/win32/fmifs/precomp.h Modified: trunk/reactos/dll/win32/fmifs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fmifs/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/fmifs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fmifs/CMakeLists.txt [iso-8859-1] Sat Mar 14 15:37:00 2015 @@ -18,7 +18,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/fmifs_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/fmifs.def) -set_module_type(fmifs win32dll ENTRYPOINT InitializeFmIfs 12) +set_module_type(fmifs win32dll UNICODE ENTRYPOINT InitializeFmIfs 12) add_importlibs(fmifs kernel32 ntdll) add_pch(fmifs precomp.h SOURCE) add_dependencies(fmifs psdk) Modified: trunk/reactos/dll/win32/fmifs/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fmifs/init.c?rev… ============================================================================== --- trunk/reactos/dll/win32/fmifs/init.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fmifs/init.c [iso-8859-1] Sat Mar 14 15:37:00 2015 @@ -11,6 +11,8 @@ #include "precomp.h" #include <winreg.h> + +#define NTOS_MODE_USER #include <ndk/cmfuncs.h> #include <ndk/obfuncs.h> Modified: trunk/reactos/dll/win32/fmifs/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fmifs/precomp.h?… ============================================================================== --- trunk/reactos/dll/win32/fmifs/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fmifs/precomp.h [iso-8859-1] Sat Mar 14 15:37:00 2015 @@ -13,16 +13,15 @@ /* INCLUDES ******************************************************************/ +#include <stdio.h> + #define WIN32_NO_STATUS -#define NTOS_MODE_USER -#define UNICODE -#define _UNICODE - -#include <stdio.h> /* PSDK/NDK Headers */ #include <windef.h> #include <winbase.h> + +#define NTOS_MODE_USER #include <ndk/rtlfuncs.h> /* FMIFS Public Header */

9 years, 9 months

[tkreuzer] 66704: [PSDK] Avoid redefinition of FILE_DEVICE_SMARTCARD in winsmcrd.h, when combined with wine/winioctl.h. A similar #ifdef exists in the MS header.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Mar 14 15:34:48 2015 New Revision: 66704 URL: http://svn.reactos.org/svn/reactos?rev=66704&view=rev Log: [PSDK] Avoid redefinition of FILE_DEVICE_SMARTCARD in winsmcrd.h, when combined with wine/winioctl.h. A similar #ifdef exists in the MS header. Modified: trunk/reactos/include/psdk/winsmcrd.h Modified: trunk/reactos/include/psdk/winsmcrd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winsmcrd.h?re… ============================================================================== --- trunk/reactos/include/psdk/winsmcrd.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winsmcrd.h [iso-8859-1] Sat Mar 14 15:34:48 2015 @@ -60,7 +60,11 @@ SCARD_IO_REQUEST ioRequest; } SCARD_T1_REQUEST, *PSCARD_T1_REQUEST, *LPSCARD_T1_REQUEST; +#ifndef FILE_DEVICE_SMARTCARD #define FILE_DEVICE_SMARTCARD 49 +#elif FILE_DEVICE_SMARTCARD != 49 +#error "Incorrect Smart Card Device Definition" +#endif #define SCARD_ATR_LENGTH (0x21)

9 years, 9 months

← Newer
1
...
27
28
29
30
31
32
33
...
50
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2015