Ros-diffs November 2008

ros-diffs@reactos.org

28 participants
657 discussions

[cfinck] 37178: Merge r37177 This should be the very final now, no more bugs accepted ; -)

by cfinck＠svn.reactos.org

Author: cfinck Date: Mon Nov 3 16:01:11 2008 New Revision: 37178 URL: http://svn.reactos.org/svn/reactos?rev=37178&view=rev Log: Merge r37177 This should be the very final now, no more bugs accepted ;-) Modified: branches/ros-branch-0_3_7/reactos/dll/win32/shell32/shfldr_cpanel.c branches/ros-branch-0_3_7/reactos/dll/win32/shell32/shlview.c Modified: branches/ros-branch-0_3_7/reactos/dll/win32/shell32/shfldr_cpanel.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_7/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_7/reactos/dll/win32/shell32/shfldr_cpanel.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_7/reactos/dll/win32/shell32/shfldr_cpanel.c [iso-8859-1] Mon Nov 3 16:01:11 2008 @@ -1212,7 +1212,7 @@ if (LoadStringW(shell32_hInstance, IDS_OPEN, szBuffer, sizeof(szBuffer)/sizeof(WCHAR))) { szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0'; - _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + Count, MFT_STRING, szBuffer, MFS_DEFAULT); + _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_OPEN, MFT_STRING, szBuffer, MFS_DEFAULT); //FIXME identifier Count++; } @@ -1224,7 +1224,7 @@ } szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0'; - _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + Count, MFT_STRING, szBuffer, MFS_ENABLED); + _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_CREATELINK, MFT_STRING, szBuffer, MFS_ENABLED); //FIXME identifier Count++; } return MAKE_HRESULT(SEVERITY_SUCCESS, 0, Count); @@ -1251,7 +1251,7 @@ TRACE("(%p)->(invcom=%p verb=%p wnd=%p)\n",This,lpcmi,lpcmi->lpVerb, lpcmi->hwnd); - if (lpcmi->lpVerb == MAKEINTRESOURCEA(1)) + if (lpcmi->lpVerb == MAKEINTRESOURCEA(IDS_OPEN)) //FIXME { ZeroMemory(&sei, sizeof(sei)); sei.cbSize = sizeof(sei); @@ -1264,7 +1264,7 @@ if (sei.hInstApp <= (HINSTANCE)32) return E_FAIL; } - else if (lpcmi->lpVerb == MAKEINTRESOURCEA(2)) + else if (lpcmi->lpVerb == MAKEINTRESOURCEA(IDS_CREATELINK)) //FIXME { if (!SHGetSpecialFolderPathW(NULL, szPath, CSIDL_DESKTOPDIRECTORY, FALSE)) return E_FAIL; Modified: branches/ros-branch-0_3_7/reactos/dll/win32/shell32/shlview.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_7/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_7/reactos/dll/win32/shell32/shlview.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_7/reactos/dll/win32/shell32/shlview.c [iso-8859-1] Mon Nov 3 16:01:11 2008 @@ -887,10 +887,12 @@ ici.lpVerb = MAKEINTRESOURCEA( def ); ici.hwnd = This->hWnd; - IContextMenu_InvokeCommand(cm, (LPCMINVOKECOMMANDINFO) &ici ); - IContextMenu_Release(cm); - DestroyMenu( hmenu ); - return S_OK; + if (IContextMenu_InvokeCommand(cm, (LPCMINVOKECOMMANDINFO) &ici ) == S_OK) + { + IContextMenu_Release(cm); + DestroyMenu( hmenu ); + return S_OK; + } } }

15 years, 10 months

[janderwald] 37177: - Check if IContextMenu_InvokeCommand succeeded - Pass the identifiers of string as id to _InsertMenuItem function - Should fix invoking control panel items

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Nov 3 15:44:34 2008 New Revision: 37177 URL: http://svn.reactos.org/svn/reactos?rev=37177&view=rev Log: - Check if IContextMenu_InvokeCommand succeeded - Pass the identifiers of string as id to _InsertMenuItem function - Should fix invoking control panel items Modified: trunk/reactos/dll/win32/shell32/shfldr_cpanel.c trunk/reactos/dll/win32/shell32/shlview.c Modified: trunk/reactos/dll/win32/shell32/shfldr_cpanel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_c… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_cpanel.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr_cpanel.c [iso-8859-1] Mon Nov 3 15:44:34 2008 @@ -1212,7 +1212,7 @@ if (LoadStringW(shell32_hInstance, IDS_OPEN, szBuffer, sizeof(szBuffer)/sizeof(WCHAR))) { szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0'; - _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + Count, MFT_STRING, szBuffer, MFS_DEFAULT); + _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_OPEN, MFT_STRING, szBuffer, MFS_DEFAULT); //FIXME identifier Count++; } @@ -1224,7 +1224,7 @@ } szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0'; - _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + Count, MFT_STRING, szBuffer, MFS_ENABLED); + _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_CREATELINK, MFT_STRING, szBuffer, MFS_ENABLED); //FIXME identifier Count++; } return MAKE_HRESULT(SEVERITY_SUCCESS, 0, Count); @@ -1251,7 +1251,7 @@ TRACE("(%p)->(invcom=%p verb=%p wnd=%p)\n",This,lpcmi,lpcmi->lpVerb, lpcmi->hwnd); - if (lpcmi->lpVerb == MAKEINTRESOURCEA(1)) + if (lpcmi->lpVerb == MAKEINTRESOURCEA(IDS_OPEN)) //FIXME { ZeroMemory(&sei, sizeof(sei)); sei.cbSize = sizeof(sei); @@ -1264,7 +1264,7 @@ if (sei.hInstApp <= (HINSTANCE)32) return E_FAIL; } - else if (lpcmi->lpVerb == MAKEINTRESOURCEA(2)) + else if (lpcmi->lpVerb == MAKEINTRESOURCEA(IDS_CREATELINK)) //FIXME { if (!SHGetSpecialFolderPathW(NULL, szPath, CSIDL_DESKTOPDIRECTORY, FALSE)) return E_FAIL; Modified: trunk/reactos/dll/win32/shell32/shlview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlview.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlview.c [iso-8859-1] Mon Nov 3 15:44:34 2008 @@ -887,10 +887,12 @@ ici.lpVerb = MAKEINTRESOURCEA( def ); ici.hwnd = This->hWnd; - IContextMenu_InvokeCommand(cm, (LPCMINVOKECOMMANDINFO) &ici ); - IContextMenu_Release(cm); - DestroyMenu( hmenu ); - return S_OK; + if (IContextMenu_InvokeCommand(cm, (LPCMINVOKECOMMANDINFO) &ici ) == S_OK) + { + IContextMenu_Release(cm); + DestroyMenu( hmenu ); + return S_OK; + } } }

15 years, 10 months

[cfinck] 37176: Carlo Bramini (carlo.bramix@libero.it) - Fix the display of Line and Column in the Status Bar and add language resources for this Patch was slightly modified by me to also react on WM_KEYDOWN messages, so that the line/column is already updated, when you're holding down the buttons. (like Windows' notepad does by the way) We still have to keep WM_KEYUP though, otherwise this doesn't work properly when being used with Page Up/Page Down. See issue #3702 for more details.

by cfinck＠svn.reactos.org

Author: cfinck Date: Mon Nov 3 15:23:57 2008 New Revision: 37176 URL: http://svn.reactos.org/svn/reactos?rev=37176&view=rev Log: Carlo Bramini (carlo.bramix(a)libero.it) - Fix the display of Line and Column in the Status Bar and add language resources for this Patch was slightly modified by me to also react on WM_KEYDOWN messages, so that the line/column is already updated, when you're holding down the buttons. (like Windows' notepad does by the way) We still have to keep WM_KEYUP though, otherwise this doesn't work properly when being used with Page Up/Page Down. See issue #3702 for more details. Modified: trunk/reactos/base/applications/notepad/dialog.c 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/hu-HU.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-PT.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/sv-SE.rc trunk/reactos/base/applications/notepad/lang/th-TH.rc trunk/reactos/base/applications/notepad/lang/uk-UA.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 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] Mon Nov 3 15:23:57 2008 @@ -871,19 +871,15 @@ VOID DIALOG_StatusBarUpdateCaretPos(VOID) { - int line; - int col; - int ccol; - POINT point; + int line, col; TCHAR buff[MAX_PATH]; - - GetCaretPos(&point); - line = (int) SendMessage(Globals.hEdit, EM_LINEFROMCHAR, (WPARAM)-1, (LPARAM)0); - ccol = (int) SendMessage(Globals.hEdit, EM_CHARFROMPOS, (WPARAM)0, (LPARAM)MAKELPARAM(point.x, point.y)); - ccol = LOWORD(ccol); - col = ccol - (int) SendMessage(Globals.hEdit, EM_LINEINDEX, (WPARAM)line, (LPARAM)0); - - _stprintf(buff, TEXT("%S %d, %S %d"), Globals.szStatusBarLine, line+1, Globals.szStatusBarCol, col+1); + DWORD dwStart, dwSize; + + 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); SendMessage(Globals.hStatusBar, SB_SETTEXT, (WPARAM) SB_SIMPLEID, (LPARAM)buff); } @@ -896,8 +892,7 @@ if ( !Globals.hStatusBar ) { Globals.hStatusBar = CreateStatusWindow(WS_CHILD | WS_VISIBLE | WS_EX_STATICEDGE, TEXT("test"), Globals.hMainWnd, CMD_STATUSBAR_WND_ID ); - LoadString(Globals.hInstance, STRING_LINE, Globals.szStatusBarLine, MAX_PATH-1); - LoadString(Globals.hInstance, STRING_COLUMN, Globals.szStatusBarCol, MAX_PATH-1); + LoadString(Globals.hInstance, STRING_LINE_COLUMN, Globals.szStatusBarLineCol, MAX_PATH-1); SendMessage(Globals.hStatusBar, SB_SIMPLE, (WPARAM)TRUE, (LPARAM)0); } CheckMenuItem(GetMenu(Globals.hMainWnd), CMD_STATUSBAR, 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] Mon Nov 3 15:23:57 2008 @@ -201,4 +201,5 @@ STRING_CRLF, "Óüèíäîóüñ" STRING_LF, "Þíèêñ" STRING_CR, "Ìàê" -END +STRING_LINE_COLUMN, "Line %d, column %d" +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] Mon Nov 3 15:23:57 2008 @@ -203,4 +203,5 @@ STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" -END +STRING_LINE_COLUMN, "Line %d, column %d" +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] Mon Nov 3 15:23:57 2008 @@ -200,4 +200,5 @@ STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" -END +STRING_LINE_COLUMN, "Line %d, column %d" +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] Mon Nov 3 15:23:57 2008 @@ -202,4 +202,5 @@ STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" -END +STRING_LINE_COLUMN, "Zeile %d, Spalte %d" +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] Mon Nov 3 15:23:57 2008 @@ -199,4 +199,5 @@ STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" -END +STRING_LINE_COLUMN, "Line %d, column %d" +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] Mon Nov 3 15:23:57 2008 @@ -201,4 +201,5 @@ STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" -END +STRING_LINE_COLUMN, "Line %d, column %d" +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] Mon Nov 3 15:23:57 2008 @@ -203,5 +203,6 @@ STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" - -END +STRING_LINE_COLUMN, "Line %d, column %d" + +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] Mon Nov 3 15:23:57 2008 @@ -179,5 +179,5 @@ STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" - +STRING_LINE_COLUMN, "Line %d, column %d" 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] Mon Nov 3 15:23:57 2008 @@ -200,4 +200,5 @@ STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" -END +STRING_LINE_COLUMN, "Line %d, column %d" +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] Mon Nov 3 15:23:57 2008 @@ -201,4 +201,5 @@ STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" -END +STRING_LINE_COLUMN, "Ligne %d, colonne %d" +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] Mon Nov 3 15:23:57 2008 @@ -202,4 +202,5 @@ STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" -END +STRING_LINE_COLUMN, "Line %d, column %d" +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] Mon Nov 3 15:23:57 2008 @@ -202,4 +202,5 @@ STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" -END +STRING_LINE_COLUMN, "Line %d, column %d" +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] Mon Nov 3 15:23:57 2008 @@ -204,4 +204,5 @@ STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" -END +STRING_LINE_COLUMN, "Linea %d, colonna %d" +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] Mon Nov 3 15:23:57 2008 @@ -201,4 +201,5 @@ STRING_CRLF, "Windows (CR+LF)" STRING_LF, "Unix (LF)" STRING_CR, "Mac (CR)" -END +STRING_LINE_COLUMN, "Line %d, column %d" +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] Mon Nov 3 15:23:57 2008 @@ -202,4 +202,5 @@ STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" -END +STRING_LINE_COLUMN, "Line %d, column %d" +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] Mon Nov 3 15:23:57 2008 @@ -198,4 +198,5 @@ STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" -END +STRING_LINE_COLUMN, "Line %d, column %d" +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] Mon Nov 3 15:23:57 2008 @@ -201,4 +201,5 @@ STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" -END +STRING_LINE_COLUMN, "Line %d, column %d" +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] Mon Nov 3 15:23:57 2008 @@ -207,4 +207,5 @@ STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" -END +STRING_LINE_COLUMN, "Line %d, column %d" +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] Mon Nov 3 15:23:57 2008 @@ -200,4 +200,5 @@ STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" -END +STRING_LINE_COLUMN, "Line %d, column %d" +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] Mon Nov 3 15:23:57 2008 @@ -200,4 +200,5 @@ STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Ìàêèíòîø" -END +STRING_LINE_COLUMN, "Line %d, column %d" +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] Mon Nov 3 15:23:57 2008 @@ -189,4 +189,5 @@ STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" +STRING_LINE_COLUMN, "Line %d, column %d" 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] Mon Nov 3 15:23:57 2008 @@ -198,4 +198,5 @@ STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" -END +STRING_LINE_COLUMN, "Line %d, column %d" +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] Mon Nov 3 15:23:57 2008 @@ -201,4 +201,5 @@ STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" -END +STRING_LINE_COLUMN, "Line %d, column %d" +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] Mon Nov 3 15:23:57 2008 @@ -193,4 +193,5 @@ STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" +STRING_LINE_COLUMN, "Line %d, column %d" 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] Mon Nov 3 15:23:57 2008 @@ -198,4 +198,5 @@ STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" -END +STRING_LINE_COLUMN, "Line %d, column %d" +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] Mon Nov 3 15:23:57 2008 @@ -199,4 +199,5 @@ STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" -END +STRING_LINE_COLUMN, "Line %d, column %d" +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] Mon Nov 3 15:23:57 2008 @@ -302,6 +302,7 @@ { switch (msg) { + case WM_KEYDOWN: case WM_KEYUP: { switch (wParam) 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] Mon Nov 3 15:23:57 2008 @@ -61,8 +61,7 @@ TCHAR szMarginRight[MAX_PATH]; TCHAR szHeader[MAX_PATH]; TCHAR szFooter[MAX_PATH]; - TCHAR szStatusBarLine[MAX_PATH]; - TCHAR szStatusBarCol[MAX_PATH]; + TCHAR szStatusBarLineCol[MAX_PATH]; int iEncoding; int iEoln; 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] Mon Nov 3 15:23:57 2008 @@ -101,5 +101,4 @@ #define STRING_CR 0x184 #define STRING_LICENSE 0x185 -#define STRING_LINE 0x186 -#define STRING_COLUMN 0x187 +#define STRING_LINE_COLUMN 0x186 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] Mon Nov 3 15:23:57 2008 @@ -112,7 +112,7 @@ base_length = (GetSystemMetrics(SM_CXSCREEN) > GetSystemMetrics(SM_CYSCREEN))? GetSystemMetrics(SM_CYSCREEN) : GetSystemMetrics(SM_CXSCREEN); - dx = base_length * .95; + dx = (INT)(base_length * .95); dy = dx * 3 / 4; SetRect( &Globals.main_rect, 0, 0, dx, dy );

15 years, 10 months

[cfinck] 37175: Edit the Downloader list based on the Wiki page about 0.3.7 tests If nothing serious happens, this will be the final commit to the 0.3.7 branch :-)

by cfinck＠svn.reactos.org

Author: cfinck Date: Mon Nov 3 14:12:20 2008 New Revision: 37175 URL: http://svn.reactos.org/svn/reactos?rev=37175&view=rev Log: Edit the Downloader list based on the Wiki page about 0.3.7 tests If nothing serious happens, this will be the final commit to the 0.3.7 branch :-) Modified: branches/ros-branch-0_3_7/rosapps/applications/downloader/downloader.xml Modified: branches/ros-branch-0_3_7/rosapps/applications/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_7/rosapps/applic… ============================================================================== --- branches/ros-branch-0_3_7/rosapps/applications/downloader/downloader.xml [iso-8859-1] (original) +++ branches/ros-branch-0_3_7/rosapps/applications/downloader/downloader.xml [iso-8859-1] Mon Nov 3 14:12:20 2008 @@ -14,13 +14,6 @@ <description>The most popular and one of the best free Web Browsers out there.</description> <location>http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.17/win32…</location> </application> - <application name="Opera"> - <regname>Opera</regname> - <licence>Freeware</licence> - <version>9.26</version> - <description>The popular Opera Browser with many advanced features and including a Mail and BitTorrent client.</description> - <location>http://mirror.nwps.ws/opera/win/926/en/Opera_9.26_Classic_Setup.exe</location> - </application> <application name="Thunderbird 1.5"> <regname>Mozilla Thunderbird (1.5)</regname> <licence>MPL/GPL/LGPL</licence> @@ -34,12 +27,6 @@ <version>2.0.0.16</version> <description>The most popular and one of the best free Mail Clients out there.</description> <location>http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.17/w…</location> - </application> - <application name="SeaMonkey"> - <regname>SeaMonkey (1.1.9)</regname> - <version>1.1.9</version> - <description>Mozilla Suite is alive. This is the one and only Browser, Mail, Chat, and Composer bundle you will ever need.</description> - <location>http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/1.1.12/seamo…</location> </application> <application name="Mozilla ActiveX Control"> <regname>Mozilla ActiveX Control v1.7.12 (ReactOS special)</regname> @@ -63,12 +50,6 @@ <description>This tool allows you to access your Windows shared folders/printers with ReactOS.</description> <location>http://svn.reactos.org/packages/samba-tng.exe</location> </application> - <application name="Miranda IM"> - <regname>Miranda IM</regname> - <version>0.7.4</version> - <description>Open source multiprotocol instant messaging application - May not work completely.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/miranda/miranda-im-v0.7.4-unicode…</location> - </application> <application name="Putty"> <regname>PuTTY version 0.60</regname> <licence>MIT</licence> @@ -84,25 +65,8 @@ <description>Word processor.</description> <location>http://www.abiword.org/downloads/abiword/2.6.4/Windows/abiword-setup-2.6.4.…</location> </application> - <application name="OpenOffice"> - <regname>OpenOffice.org 2.4</regname> - <version>2.4.0</version> - <description>THE Open Source Office Suite.</description> - <location>http://ftp.tu-chemnitz.de/pub/openoffice-extended/stable/2.4.0/OOo_2.4.0_Wi…</location> - </application> </category> <category name="Graphics" icon="3"> - <application name="IrfanView"> - <regname>IrfanView (remove only)</regname> - <version>4.10</version> - <description>Viewer for all kinds of graphics/audio files/video files.</description> - <location>http://gd.tuwien.ac.at/graphics/irfanview/iview410_setup.exe</location> - </application> - <application name="IrfanView Plugins"> - <version>4.10</version> - <description>Additional Plugins for supporting more file types.</description> - <location>http://irfanview.tuwien.ac.at/plugins/irfanview_plugins_410_setup.exe</location> - </application> <application name="TuxPaint"> <regname>Tux Paint 0.9.19</regname> <version>0.9.19</version> @@ -116,91 +80,7 @@ <location>http://www.zeckensack.de/glide/archive/GlideWrapper084c.exe</location> </application> </category> - <category name="Libraries" icon="4"> - <application name="Microsoft XML 3"> - <regname>msxml3</regname> - <version>3.0</version> - <description>MSXML3 is needed for some MSI Installers.</description> - <location>http://download.microsoft.com/download/8/8/8/888f34b7-4f54-4f06-8dac-fa29b1…</location> - </application> - <application name="OLE Viewer and Microsoft Foundation Classes version 4"> - <regname>mfc40</regname> - <version>4.0</version> - <description>MFC 4 is needed by some applications</description> - <location>http://download.microsoft.com/download/ole/ole2v/3.5/w351/en-us/ole2v.exe</location> - </application> - - <application name="Visual Basic 3 Runtime"> - <regname>vb3run</regname> - <version>3.0</version> - <description>Visual Basic 3 Runtime</description> - <location>http://download.microsoft.com/download/vb30/utility/1/w9xnt4/en-us/vb3run.e…</location> - </application> - - <application name="Visual Basic 4 Runtime"> - <regname>vb4run</regname> - <version>4.0</version> - <description>Visual Basic 4 Runtime</description> - <location>http://download.microsoft.com/download/vb40ent/sample27/1/w9xnt4/en-us/vb4r…</location> - </application> - - <application name="Visual Basic 5 Runtime"> - <regname>vb5run</regname> - <version>5.0</version> - <description>Visual Basic 5 Runtime</description> - <location>http://download.microsoft.com/download/vb50pro/utility/1/win98/en-us/msvbvm…</location> - </application> - - <application name="Visual Basic 6 Runtime"> - <regname>vb6run</regname> - <version>6.0</version> - <description>Visual Basic 6 Runtime</description> - <location>http://download.microsoft.com/download/vb60pro/install/6/win98me/en-us/vbru…</location> - </application> - - <application name="Visual Studio 6 Runtime"> - <regname>vc6run</regname> - <version>6.0</version> - <description>Visual Studio 6 Runtime</description> - <location>http://download.microsoft.com/download/vc60pro/update/1/w9xnt4/en-us/vc6red…</location> - </application> - - <application name="Visual Studio 2005 Runtime"> - <regname>vc2005run</regname> - <version>7.0</version> - <description>Visual Studio 2005 Runtime</description> - <location>http://download.microsoft.com/download/d/3/4/d342efa6-3266-4157-a2ec-517486…</location> - </application> - - <application name="Visual Studio 2005 Runtime SP1"> - <regname>vc2005sp1run</regname> - <version>7.1</version> - <description>Visual Studio 2005 Runtime SP1</description> - <location>http://download.microsoft.com/download/e/1/c/e1c773de-73ba-494a-a5ba-f24906…</location> - </application> - - <application name="Visual Studio 2008 Runtime"> - <regname>vc2008run</regname> - <version>8.0</version> - <description>Visual Studio 2008 Runtime</description> - <location>http://download.microsoft.com/download/1/1/1/1116b75a-9ec3-481a-a3c8-1777b5…</location> - </application> - </category> - <category name="Multimedia" icon="4"> - </category> <category name="Development" icon="5"> - <application name="ReactOS Build Environment"> - <regname>ReactOS Build Environment 1.2</regname> - <version>1.2</version> - <description>Allows you to build the ReactOS Source. For more instructions see ReactOS wiki.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-1.2.exe</location> - </application> - <application name="MinGW"> - <regname>MinGW 5.1.3</regname> - <version>5.1.3</version> - <description>A Port of the GNU toolchain with GCC, GDB, GNU make, etc.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/mingw/MinGW-5.1.3.exe</location> - </application> <application name="FreeBASIC"> <regname>FreeBASIC 0.18.4b</regname> <version>0.18.4b</version> @@ -209,12 +89,6 @@ </application> </category> <category name="Games & Fun" icon="6"> - <application name="ScummVM"> - <regname>ScummVM 0.11.1</regname> - <version>0.11.1</version> - <description>SamNMax, Day of Tentacle, etc on ReactOS</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/scummvm/scummvm-0.11.1-win32.exe</location> - </application> <application name="Diablo 2 Shareware"> <regname>Diablo II Shareware</regname> <version>1.4</version> @@ -222,10 +96,6 @@ <location>http://ftp.freenet.de./pub/filepilot/windows/spiele/diabloiidemo.exe</location> <depends>GlidewrapZbag</depends> <postinstallaction>http://svn.reactos.org/downloads/d2fix.exe</postinstallaction> - </application> - <application name="Tile World"> - <description>Nice Clone of Chip's Challenge originally made for the Atari Lynx. Includes free CCLP2 Graphics Pack, so you dont need the copyrighted Original.</description> - <location>http://www.muppetlabs.com/~breadbox/pub/software/tworld/tworld-1.3.0-win32-…</location> </application> <application name="OpenTTD"> <regname>OpenTTD 0.6.0</regname> @@ -251,19 +121,6 @@ <description>Atomix Clone using SDL libs.</description> <location>http://ovh.dl.sourceforge.net/sourceforge/lgames/lmarbles-1.0.6-win32.exe</location> </application> - <application name="WinBoard"> - <regname>WinBoard 4.2.7b</regname> - <version>4.2.7b</version> - <licence>GPL 3</licence> - <description>WinBoard is a graphical chessboard for the Windows/ReactOS that can serve as a user interface for GNU Chess, Crafty, and other chess engines, for the Internet Chess Servers, and for electronic mail correspondence chess.</description> - <location>http://ftp.gnu.org/gnu/winboard/winboard-4_2_7b.exe</location> - </application> - </category> - <category name="Science" icon="11"> - </category> - <category name="Edutainment" icon="12"> - </category> - <category name="Engineering" icon="13"> </category> <category name="Tools" icon="7"> <application name="7-Zip"> @@ -271,12 +128,6 @@ <version>4.57</version> <description>Utility to create and open 7zip, zip, tar, rar and other archive files.</description> <location>http://ovh.dl.sourceforge.net/sourceforge/sevenzip/7z457.exe</location> - </application> - <application name="uTorrent"> - <regname>µTorrent</regname> - <version>1.8</version> - <description>Small and fast BitTorrent Client.</description> - <location>http://download.utorrent.com/1.8/utorrent.exe</location> </application> <application name="Audio Grabber"> <regname>Audiograbber 1.83 SE</regname>

15 years, 10 months

[cfinck] 37174: Merge r37097, r37173

by cfinck＠svn.reactos.org

Author: cfinck Date: Mon Nov 3 13:05:14 2008 New Revision: 37174 URL: http://svn.reactos.org/svn/reactos?rev=37174&view=rev Log: Merge r37097, r37173 Modified: branches/ros-branch-0_3_7/reactos/base/shell/explorer/res/shutdown.ico branches/ros-branch-0_3_7/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c Modified: branches/ros-branch-0_3_7/reactos/base/shell/explorer/res/shutdown.ico URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_7/reactos/base/s… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_7/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_7/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_7/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_7/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c [iso-8859-1] Mon Nov 3 13:05:14 2008 @@ -442,9 +442,10 @@ hr = CreateNotificationObject(This,iface, pUnk); if (FAILED(hr)) return hr; - if (dwFlags == NCRP_QUERY_PROPERTY_UI) - return S_OK; - } + } + + if (dwFlags == NCRP_QUERY_PROPERTY_UI) + return S_OK; dwDefPages = 0; Pages = 0;

15 years, 10 months

[janderwald] 37173: - Dont display NCRP_QUERY_PROPERTY_UI when the notification object has already been created

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Nov 3 12:42:56 2008 New Revision: 37173 URL: http://svn.reactos.org/svn/reactos?rev=37173&view=rev Log: - Dont display NCRP_QUERY_PROPERTY_UI when the notification object has already been created Modified: trunk/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c Modified: trunk/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/inetcfgc… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c [iso-8859-1] Mon Nov 3 12:42:56 2008 @@ -442,9 +442,10 @@ hr = CreateNotificationObject(This,iface, pUnk); if (FAILED(hr)) return hr; - if (dwFlags == NCRP_QUERY_PROPERTY_UI) - return S_OK; - } + } + + if (dwFlags == NCRP_QUERY_PROPERTY_UI) + return S_OK; dwDefPages = 0; Pages = 0;

15 years, 10 months

[cfinck] 37172: Merge in r37155

by cfinck＠svn.reactos.org

Author: cfinck Date: Mon Nov 3 11:45:54 2008 New Revision: 37172 URL: http://svn.reactos.org/svn/reactos?rev=37172&view=rev Log: Merge in r37155 Modified: branches/ros-branch-0_3_7/reactos/base/shell/cmd/batch.c Modified: branches/ros-branch-0_3_7/reactos/base/shell/cmd/batch.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_7/reactos/base/s… ============================================================================== --- branches/ros-branch-0_3_7/reactos/base/shell/cmd/batch.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_7/reactos/base/shell/cmd/batch.c [iso-8859-1] Mon Nov 3 11:45:54 2008 @@ -427,7 +427,7 @@ return textline; } - if (!FileGetString (bc->hBatchFile, textline, sizeof (textline) / sizeof (textline[0]))) + if (!FileGetString (bc->hBatchFile, textline, sizeof (textline) / sizeof (textline[0]) - 1)) { TRACE ("ReadBatchLine(): Reached EOF!\n"); /* End of file.... */ @@ -439,6 +439,9 @@ continue; } TRACE ("ReadBatchLine(): textline: \'%s\'\n", debugstr_aw(textline)); + + if (textline[_tcslen(textline) - 1] != _T('\n')) + _tcscat(textline, _T("\n")); first = textline;

15 years, 10 months

[cwittich] 37171: ExFreePool -> ExFreePoolWithTag Status != STATUS_SUCCESS -> !NT_SUCCESS(Status)

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon Nov 3 10:22:44 2008 New Revision: 37171 URL: http://svn.reactos.org/svn/reactos?rev=37171&view=rev Log: ExFreePool -> ExFreePoolWithTag Status != STATUS_SUCCESS -> !NT_SUCCESS(Status) Modified: trunk/reactos/subsystems/win32/win32k/eng/event.c trunk/reactos/subsystems/win32/win32k/eng/float.c trunk/reactos/subsystems/win32/win32k/eng/semaphor.c trunk/reactos/subsystems/win32/win32k/ntuser/callback.c Modified: trunk/reactos/subsystems/win32/win32k/eng/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/event.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/event.c [iso-8859-1] Mon Nov 3 10:22:44 2008 @@ -30,7 +30,7 @@ STDCALL EngDeleteEvent ( IN PEVENT Event) { - ExFreePool(Event); + ExFreePoolWithTag(Event, TAG_DFSM); return TRUE; } @@ -79,7 +79,7 @@ EngUnmapEvent ( IN PEVENT Event ) { ObDereferenceObject((PVOID)Event); - ExFreePool(Event); + ExFreePoolWithTag(Event, TAG_DFSM); return TRUE; } @@ -97,7 +97,7 @@ KernelMode, FALSE, TimeOut); - if (Status != STATUS_SUCCESS) + if (!NT_SUCCESS(Status)) { return FALSE; } Modified: trunk/reactos/subsystems/win32/win32k/eng/float.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/float.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/float.c [iso-8859-1] Mon Nov 3 10:22:44 2008 @@ -41,7 +41,7 @@ { NTSTATUS Status; Status = KeRestoreFloatingPointState((PKFLOATING_SAVE)Buffer); - if (Status != STATUS_SUCCESS) + if (!NT_SUCCESS(Status)) { return FALSE; } Modified: trunk/reactos/subsystems/win32/win32k/eng/semaphor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/semaphor.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/semaphor.c [iso-8859-1] Mon Nov 3 10:22:44 2008 @@ -81,7 +81,7 @@ ExDeleteResourceLite((PERESOURCE)hsem); - ExFreePool ( (PVOID)hsem ); + ExFreePoolWithTag( (PVOID)hsem, TAG_GSEM); } /* Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] Mon Nov 3 10:22:44 2008 @@ -86,7 +86,7 @@ RemoveEntryList(&Mem->ListEntry); /* free memory */ - ExFreePool(Mem); + ExFreePoolWithTag(Mem, TAG_CALLBACK); } VOID FASTCALL

15 years, 10 months

[cwittich] 37170: some translations: GreatLordish -> English

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon Nov 3 08:39:03 2008 New Revision: 37170 URL: http://svn.reactos.org/svn/reactos?rev=37170&view=rev Log: some translations: GreatLordish -> English Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/d3d.c trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c trunk/reactos/subsystems/win32/win32k/ntddraw/dvp.c trunk/reactos/subsystems/win32/win32k/ntddraw/mocomp.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/d3d.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/d3d.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/d3d.c [iso-8859-1] Mon Nov 3 08:39:03 2008 @@ -123,11 +123,11 @@ if (pfnD3dContextCreate == NULL) { - DPRINT1("Warring no pfnD3dContextCreate"); + DPRINT1("Warning: no pfnD3dContextCreate"); return FALSE; } - DPRINT1("Calling on dxg.sys D3dContextCreate"); + DPRINT1("Calling dxg.sys D3dContextCreate"); return pfnD3dContextCreate(hDirectDrawLocal, hSurfColor, hSurfZ, pdcci); } @@ -158,11 +158,11 @@ if ( pfnD3dContextDestroy == NULL) { - DPRINT1("Warring no pfnD3dContextDestroy"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys D3dContextDestroy"); + DPRINT1("Warning: no pfnD3dContextDestroy"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys D3dContextDestroy"); return pfnD3dContextDestroy(pContextDestroyData); } @@ -196,11 +196,11 @@ if (pfnD3dContextDestroyAll == NULL) { - DPRINT1("Warring no pfnD3dContextDestroyAll"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys D3dContextDestroyAll"); + DPRINT1("Warning: no pfnD3dContextDestroyAll"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys D3dContextDestroyAll"); return pfnD3dContextDestroyAll(pdcad); } @@ -271,11 +271,11 @@ if (pfnDdCreateD3DBuffer == NULL) { - DPRINT1("Warring no pfnDdCreateD3DBuffer"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys DdCreateD3DBuffer"); + DPRINT1("Warning no pfnDdCreateD3DBuffer"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys DdCreateD3DBuffer"); return pfnDdCreateD3DBuffer(hDirectDraw, hSurface, puSurfaceDescription, puSurfaceGlobalData, puSurfaceLocalData, puSurfaceMoreData, @@ -293,11 +293,11 @@ if (pfnDdDestroyD3DBuffer == NULL) { - DPRINT1("Warring no pfnDdDestroyD3DBuffer"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDdDestroyD3DBuffer"); + DPRINT1("Warning no pfnDdDestroyD3DBuffer"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDdDestroyD3DBuffer"); return pfnDdDestroyD3DBuffer(hSurface); } @@ -318,11 +318,11 @@ if (pfnD3dDrawPrimitives2 == NULL) { - DPRINT1("Warring no pfnD3dDrawPrimitives2"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys D3dDrawPrimitives2"); + DPRINT1("Warning: no pfnD3dDrawPrimitives2"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys D3dDrawPrimitives2"); return pfnD3dDrawPrimitives2(hCmdBuf,hVBuf,pded,pfpVidMemCmd,pdwSizeCmd,pfpVidMemVtx,pdwSizeVtx); } @@ -339,11 +339,11 @@ if (pfnDdLockD3D == NULL) { - DPRINT1("Warring no pfnDdLockD3D"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDdLockD3D"); + DPRINT1("Warning: no pfnDdLockD3D"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDdLockD3D"); return pfnDdLockD3D(hSurface, puLockData); } @@ -358,11 +358,11 @@ if (pfnD3dValidateTextureStageState == NULL) { - DPRINT1("Warring no pfnD3dValidateTextureStageState"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys D3dValidateTextureStageState"); + DPRINT1("Warning: no pfnD3dValidateTextureStageState"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys D3dValidateTextureStageState"); return pfnD3dValidateTextureStageState(pData); } @@ -378,11 +378,11 @@ if (pfnDdUnlockD3D == NULL) { - DPRINT1("Warring no pfnDdUnlockD3D"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDdUnlockD3D"); + DPRINT1("Warning: no pfnDdUnlockD3D"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDdUnlockD3D"); return pfnDdUnlockD3D(hSurface, puUnlockData); } Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c [iso-8859-1] Mon Nov 3 08:39:03 2008 @@ -29,11 +29,11 @@ if (pfnDdCreateSurface == NULL) { - DPRINT1("Warring no pfnDdCreateSurface\n"); + DPRINT1("Warning: no pfnDdCreateSurface\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDdCreateSurface\n"); + DPRINT1("Calling dxg.sys pfnDdCreateSurface\n"); return pfnDdCreateSurface(hDirectDrawLocal,hSurface,puSurfaceDescription,puSurfaceGlobalData, puSurfaceLocalData,puSurfaceMoreData,puCreateSurfaceData,puhSurface); } @@ -50,11 +50,11 @@ if (pfnDdWaitForVerticalBlank == NULL) { - DPRINT1("Warring no pfnDdWaitForVerticalBlank\n"); + DPRINT1("Warning: no pfnDdWaitForVerticalBlank\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDdWaitForVerticalBlank\n"); + DPRINT1("Calling dxg.sys pfnDdWaitForVerticalBlank\n"); return pfnDdWaitForVerticalBlank(hDirectDraw, puWaitForVerticalBlankData); } @@ -70,11 +70,11 @@ if (pfnDdCanCreateSurface == NULL) { - DPRINT1("Warring no pfnDdCanCreateSurface\n"); + DPRINT1("Warning: no pfnDdCanCreateSurface\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys DdCanCreateSurface\n"); + DPRINT1("Calling dxg.sys DdCanCreateSurface\n"); return pfnDdCanCreateSurface(hDirectDrawLocal,puCanCreateSurfaceData); } @@ -91,11 +91,11 @@ if (pfnDdGetScanLine == NULL) { - DPRINT1("Warring no pfnDdGetScanLine\n"); + DPRINT1("Warning: no pfnDdGetScanLine\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDdGetScanLine\n"); + DPRINT1("Calling dxg.sys pfnDdGetScanLine\n"); return pfnDdGetScanLine(hDirectDrawLocal,puGetScanLineData); } @@ -119,11 +119,11 @@ if (pfnDdCreateSurfaceEx == NULL) { - DPRINT1("Warring no pfnDdCreateSurfaceEx\n"); + DPRINT1("Warning: no pfnDdCreateSurfaceEx\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDdCreateSurfaceEx\n"); + DPRINT1("Calling dxg.sys pfnDdCreateSurfaceEx\n"); return pfnDdCreateSurfaceEx(hDirectDraw,hSurface,dwSurfaceHandle); } Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] Mon Nov 3 08:39:03 2008 @@ -94,7 +94,7 @@ } else { - DPRINT1(" The dxg.sys and graphic card driver interface is enable \n "); + DPRINT1(" The dxg.sys and graphic card driver interface is enabled \n "); success = TRUE; } } Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dvp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dvp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dvp.c [iso-8859-1] Mon Nov 3 08:39:03 2008 @@ -24,11 +24,11 @@ if (pfnDvpCanCreateVideoPort == NULL) { - DPRINT1("Warring no pfnDvpCanCreateVideoPort"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDvpCanCreateVideoPort"); + DPRINT1("Warning: no pfnDvpCanCreateVideoPort"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDvpCanCreateVideoPort"); return pfnDvpCanCreateVideoPort(hDirectDraw, puCanCreateVPortData); } @@ -44,11 +44,11 @@ if (pfnDvpColorControl == NULL) { - DPRINT1("Warring no pfnDvpColorControl"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDvpColorControl"); + DPRINT1("Warning: no pfnDvpColorControl"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDvpColorControl"); return pfnDvpColorControl(hVideoPort, puVPortColorData); } @@ -64,11 +64,11 @@ if (pfnDvpCreateVideoPort == NULL) { - DPRINT1("Warring no pfnDvpCreateVideoPort"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDvpCreateVideoPort"); + DPRINT1("Warning: no pfnDvpCreateVideoPort"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDvpCreateVideoPort"); return pfnDvpCreateVideoPort(hDirectDraw, puCreateVPortData); } @@ -84,11 +84,11 @@ if (pfnDvpDestroyVideoPort == NULL) { - DPRINT1("Warring no pfnDvpDestroyVideoPort"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDvpDestroyVideoPort"); + DPRINT1("Warning: no pfnDvpDestroyVideoPort"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDvpDestroyVideoPort"); return pfnDvpDestroyVideoPort(hVideoPort, puDestroyVPortData); } @@ -106,11 +106,11 @@ if (pfnDvpFlipVideoPort == NULL) { - DPRINT1("Warring no pfnDvpFlipVideoPort"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDvpFlipVideoPort"); + DPRINT1("Warning: no pfnDvpFlipVideoPort"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDvpFlipVideoPort"); return pfnDvpFlipVideoPort(hVideoPort, hDDSurfaceCurrent, hDDSurfaceTarget, puFlipVPortData); } @@ -127,11 +127,11 @@ if (pfnDvpGetVideoPortBandwidth == NULL) { - DPRINT1("Warring no pfnDvpGetVideoPortBandwidth"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDvpGetVideoPortBandwidth"); + DPRINT1("Warning: no pfnDvpGetVideoPortBandwidth"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDvpGetVideoPortBandwidth"); return pfnDvpGetVideoPortBandwidth(hVideoPort, puGetVPortBandwidthData); } @@ -148,11 +148,11 @@ if (pfnDvpGetVideoPortFlipStatus == NULL) { - DPRINT1("Warring no pfnDvpGetVideoPortFlipStatus"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDvpGetVideoPortFlipStatus"); + DPRINT1("Warning: no pfnDvpGetVideoPortFlipStatus"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDvpGetVideoPortFlipStatus"); return pfnDvpGetVideoPortFlipStatus(hDirectDraw, puGetVPortFlipStatusData); } @@ -169,11 +169,11 @@ if (pfnDvpGetVideoPortInputFormats == NULL) { - DPRINT1("Warring no pfnDvpGetVideoPortInputFormats"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDvpGetVideoPortInputFormats"); + DPRINT1("Warning: no pfnDvpGetVideoPortInputFormats"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDvpGetVideoPortInputFormats"); return pfnDvpGetVideoPortInputFormats(hVideoPort, puGetVPortInputFormatData); } @@ -190,11 +190,11 @@ if (pfnDvpGetVideoPortLine == NULL) { - DPRINT1("Warring no pfnDvpGetVideoPortLine"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDvpGetVideoPortLine"); + DPRINT1("Warning: no pfnDvpGetVideoPortLine"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDvpGetVideoPortLine"); return pfnDvpGetVideoPortLine(hVideoPort, puGetVPortLineData); } @@ -211,11 +211,11 @@ if (pfnDvpGetVideoPortOutputFormats == NULL) { - DPRINT1("Warring no pfnDvpGetVideoPortOutputFormats"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDvpGetVideoPortOutputFormats"); + DPRINT1("Warning: no pfnDvpGetVideoPortOutputFormats"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDvpGetVideoPortOutputFormats"); return pfnDvpGetVideoPortOutputFormats(hVideoPort, puGetVPortOutputFormatData); } @@ -233,11 +233,11 @@ if (pfnDvpGetVideoPortConnectInfo == NULL) { - DPRINT1("Warring no pfnDvpGetVideoPortConnectInfo"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDvpGetVideoPortConnectInfo"); + DPRINT1("Warning: no pfnDvpGetVideoPortConnectInfo"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDvpGetVideoPortConnectInfo"); return pfnDvpGetVideoPortConnectInfo(hDirectDraw, puGetVPortConnectData); } @@ -254,11 +254,11 @@ if (pfnDvpGetVideoSignalStatus == NULL) { - DPRINT1("Warring no pfnDvpGetVideoSignalStatus"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDvpGetVideoSignalStatus"); + DPRINT1("Warning: no pfnDvpGetVideoSignalStatus"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDvpGetVideoSignalStatus"); return pfnDvpGetVideoSignalStatus(hVideoPort, puGetVPortSignalData); } @@ -278,11 +278,11 @@ if (pfnDvpUpdateVideoPort == NULL) { - DPRINT1("Warring no pfnDvpUpdateVideoPort"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDvpUpdateVideoPort"); + DPRINT1("Warning: no pfnDvpUpdateVideoPort"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDvpUpdateVideoPort"); return pfnDvpUpdateVideoPort(hVideoPort, phSurfaceVideo, phSurfaceVbi, puUpdateVPortData); } @@ -300,11 +300,11 @@ if (pfnDvpWaitForVideoPortSync == NULL) { - DPRINT1("Warring no pfnDvpWaitForVideoPortSync"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDvpWaitForVideoPortSync"); + DPRINT1("Warning: no pfnDvpWaitForVideoPortSync"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDvpWaitForVideoPortSync"); return pfnDvpWaitForVideoPortSync(hVideoPort, puWaitForVPortSyncData); } @@ -322,11 +322,11 @@ if (pfnDvpAcquireNotification == NULL) { - DPRINT1("Warring no pfnDvpAcquireNotification"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDvpAcquireNotification"); + DPRINT1("Warning: no pfnDvpAcquireNotification"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDvpAcquireNotification"); return pfnDvpAcquireNotification(hVideoPort, hEvent, pNotify); } @@ -343,11 +343,11 @@ if (pfnDvpReleaseNotification == NULL) { - DPRINT1("Warring no pfnDvpReleaseNotification"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDvpReleaseNotification"); + DPRINT1("Warning: no pfnDvpReleaseNotification"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDvpReleaseNotification"); return pfnDvpReleaseNotification(hVideoPort, hEvent); } @@ -365,11 +365,11 @@ if (pfnDvpGetVideoPortField == NULL) { - DPRINT1("Warring no pfnDvpGetVideoPortField"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDvpGetVideoPortField"); + DPRINT1("Warning: no pfnDvpGetVideoPortField"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDvpGetVideoPortField"); return pfnDvpGetVideoPortField(hVideoPort, puGetVPortFieldData); } Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/mocomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/mocomp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/mocomp.c [iso-8859-1] Mon Nov 3 08:39:03 2008 @@ -24,11 +24,11 @@ if (pfnDdBeginMoCompFrame == NULL) { - DPRINT1("Warring no pfnDdBeginMoCompFrame"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys DdBeginMoCompFrame"); + DPRINT1("Warning: no pfnDdBeginMoCompFrame"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys DdBeginMoCompFrame"); return pfnDdBeginMoCompFrame(hMoComp,puBeginFrameData); } @@ -43,11 +43,11 @@ if (pfnDdCreateMoComp == NULL) { - DPRINT1("Warring no pfnDdCreateMoComp"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys DdCreateMoComp"); + DPRINT1("Warning: no pfnDdCreateMoComp"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys DdCreateMoComp"); return pfnDdCreateMoComp(hDirectDraw, puCreateMoCompData); } @@ -63,11 +63,11 @@ if (pfnDxDdDestroyMoComp == NULL) { - DPRINT1("Warring no pfnDxDdDestroyMoComp"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys DxDdDestroyMoComp"); + DPRINT1("Warning: no pfnDxDdDestroyMoComp"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys DxDdDestroyMoComp"); return pfnDxDdDestroyMoComp(hMoComp, puBeginFrameData); } @@ -83,11 +83,11 @@ if (pfnDdEndMoCompFrame == NULL) { - DPRINT1("Warring no pfnDdEndMoCompFrame"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDdEndMoCompFrame"); + DPRINT1("Warning: no pfnDdEndMoCompFrame"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDdEndMoCompFrame"); return pfnDdEndMoCompFrame(hMoComp, puEndFrameData); } @@ -103,11 +103,11 @@ if (pfnDdGetInternalMoCompInfo == NULL) { - DPRINT1("Warring no pfnDdGetInternalMoCompInfo"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDdGetInternalMoCompInfo"); + DPRINT1("Warning: no pfnDdGetInternalMoCompInfo"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDdGetInternalMoCompInfo"); return pfnDdGetInternalMoCompInfo(hDirectDraw, puGetInternalData); } @@ -124,11 +124,11 @@ if (pfnDdGetMoCompBuffInfo == NULL) { - DPRINT1("Warring no pfnDdGetMoCompBuffInfo"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDdGetMoCompBuffInfo"); + DPRINT1("Warning: no pfnDdGetMoCompBuffInfo"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDdGetMoCompBuffInfo"); return pfnDdGetMoCompBuffInfo(hDirectDraw, puGetBuffData); } @@ -144,11 +144,11 @@ if (pfnDdGetMoCompFormats == NULL) { - DPRINT1("Warring no pfnDdGetMoCompFormats"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDdGetMoCompFormats"); + DPRINT1("Warning: no pfnDdGetMoCompFormats"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDdGetMoCompFormats"); return pfnDdGetMoCompFormats(hDirectDraw, puGetMoCompFormatsData); } @@ -165,11 +165,11 @@ if (pfnDdGetMoCompGuids == NULL) { - DPRINT1("Warring no pfnDdGetMoCompGuids"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDdGetMoCompGuids"); + DPRINT1("Warning: no pfnDdGetMoCompGuids"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDdGetMoCompGuids"); return pfnDdGetMoCompGuids(hDirectDraw, puGetMoCompGuidsData); } @@ -187,11 +187,11 @@ if (pfnDdQueryMoCompStatus == NULL) { - DPRINT1("Warring no pfnDdQueryMoCompStatus"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDdQueryMoCompStatus"); + DPRINT1("Warning: no pfnDdQueryMoCompStatus"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDdQueryMoCompStatus"); return pfnDdQueryMoCompStatus(hMoComp, puQueryMoCompStatusData); } @@ -208,11 +208,11 @@ if (pfnDdRenderMoComp == NULL) { - DPRINT1("Warring no pfnDdRenderMoComp"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDdRenderMoComp"); + DPRINT1("Warning: no pfnDdRenderMoComp"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDdRenderMoComp"); return pfnDdRenderMoComp(hMoComp, puRenderMoCompData); }

15 years, 10 months

[gschneider] 37169: - Several ExFreePool -> ExFreePoolWithTag changes (local allocations) - Tested for ~2 weeks now, no BAD_POOL_CALLER's so far

by gschneider＠svn.reactos.org

Author: gschneider Date: Mon Nov 3 07:26:03 2008 New Revision: 37169 URL: http://svn.reactos.org/svn/reactos?rev=37169&view=rev Log: - Several ExFreePool -> ExFreePoolWithTag changes (local allocations) - Tested for ~2 weeks now, no BAD_POOL_CALLER's so far Modified: trunk/reactos/subsystems/win32/win32k/eng/event.c trunk/reactos/subsystems/win32/win32k/eng/semaphor.c trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c trunk/reactos/subsystems/win32/win32k/ntuser/caret.c trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c trunk/reactos/subsystems/win32/win32k/objects/bitblt.c trunk/reactos/subsystems/win32/win32k/objects/coord.c trunk/reactos/subsystems/win32/win32k/objects/pen.c Modified: trunk/reactos/subsystems/win32/win32k/eng/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/event.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/event.c [iso-8859-1] Mon Nov 3 07:26:03 2008 @@ -56,7 +56,7 @@ NULL); if (!NT_SUCCESS(Status)) { - ExFreePool(Event); + ExFreePoolWithTag(Event, TAG_DFSM); return NULL; } else Modified: trunk/reactos/subsystems/win32/win32k/eng/semaphor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/semaphor.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/semaphor.c [iso-8859-1] Mon Nov 3 07:26:03 2008 @@ -16,7 +16,7 @@ return NULL; if ( !NT_SUCCESS(ExInitializeResourceLite ( psem )) ) { - ExFreePool ( psem ); + ExFreePoolWithTag ( psem, TAG_GSEM ); return NULL; } return (HSEMAPHORE)psem; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c [iso-8859-1] Mon Nov 3 07:26:03 2008 @@ -371,7 +371,7 @@ Status = MmCopyFromCaller(Accel->Table, Entries, EntriesCount * sizeof(ACCEL)); if (!NT_SUCCESS(Status)) { - ExFreePool(Accel->Table); + ExFreePoolWithTag(Accel->Table, TAG_ACCEL); UserDereferenceObject(Accel); UserDeleteObject(hAccel, otAccel); SetLastNtError(Status); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/caret.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/caret.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/caret.c [iso-8859-1] Mon Nov 3 07:26:03 2008 @@ -123,7 +123,7 @@ if(!NT_SUCCESS(Status) || (KeyValuePartialInfo->Type != REG_SZ)) { NtClose(KeyHandle); - ExFreePool(KeyValuePartialInfo); + ExFreePoolWithTag(KeyValuePartialInfo, TAG_STRING); return 0; } @@ -137,7 +137,7 @@ Val = 0; } - ExFreePool(KeyValuePartialInfo); + ExFreePoolWithTag(KeyValuePartialInfo, TAG_STRING); NtClose(KeyHandle); return (UINT)Val; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] Mon Nov 3 07:26:03 2008 @@ -1259,7 +1259,7 @@ FALSE, &Context, NULL)) { /* Something went wrong, maybe someone added a directory entry? Just give up. */ - ExFreePool(Buffer); + ExFreePoolWithTag(Buffer, TAG_WINSTA); ObDereferenceObject(DirectoryHandle); return NT_SUCCESS(Status) ? STATUS_INTERNAL_ERROR : Status; } @@ -1287,7 +1287,7 @@ { if (Buffer != InitialBuffer) { - ExFreePool(Buffer); + ExFreePoolWithTag(Buffer, TAG_WINSTA); } return STATUS_BUFFER_TOO_SMALL; } @@ -1300,7 +1300,7 @@ { if (Buffer != InitialBuffer) { - ExFreePool(Buffer); + ExFreePoolWithTag(Buffer, TAG_WINSTA); } return STATUS_BUFFER_TOO_SMALL; } Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Mon Nov 3 07:26:03 2008 @@ -1143,7 +1143,7 @@ if (!NT_SUCCESS(Status)) { - ExFreePool(rb); + ExFreePoolWithTag(rb, TAG_PATBLT); SetLastNtError(Status); return FALSE; } @@ -1152,7 +1152,7 @@ Ret = IntGdiPolyPatBlt(hDC, dwRop, rb, cRects, Mode); if (cRects > 0) - ExFreePool(rb); + ExFreePoolWithTag(rb, TAG_PATBLT); return Ret; } Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] Mon Nov 3 07:26:03 2008 @@ -285,7 +285,7 @@ if(!NT_SUCCESS(Status)) { DC_UnlockDc(dc); - ExFreePool(Points); + ExFreePoolWithTag(Points, TAG_COORD); SetLastNtError(Status); return FALSE; } @@ -302,7 +302,7 @@ default: { DC_UnlockDc(dc); - ExFreePool(Points); + ExFreePoolWithTag(Points, TAG_COORD); SetLastWin32Error(ERROR_INVALID_PARAMETER); return FALSE; } @@ -324,7 +324,7 @@ if(!NT_SUCCESS(Status)) { DC_UnlockDc(dc); - ExFreePool(Points); + ExFreePoolWithTag(Points, TAG_COORD); SetLastNtError(Status); return FALSE; } @@ -332,7 +332,7 @@ // If we are getting called that means User XForms is a mess! // DC_UnlockDc(dc); - ExFreePool(Points); + ExFreePoolWithTag(Points, TAG_COORD); return TRUE; } Modified: trunk/reactos/subsystems/win32/win32k/objects/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/pen.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/pen.c [iso-8859-1] Mon Nov 3 07:26:03 2008 @@ -323,7 +323,7 @@ if(!NT_SUCCESS(Status)) { SetLastNtError(Status); - ExFreePool(pSafeStyle); + ExFreePoolWithTag(pSafeStyle, TAG_PENSTYLES); return 0; } } @@ -341,7 +341,7 @@ hBrush); if (!hPen && pSafeStyle) { - ExFreePool(pSafeStyle); + ExFreePoolWithTag(pSafeStyle, TAG_PENSTYLES); } return hPen; }

15 years, 10 months

← Newer
1
...
58
59
60
61
62
63
64
65
66
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 November 2008