Ros-diffs August 2014

ros-diffs@reactos.org

16 participants
226 discussions

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Aug 24 14:15:07 2014 New Revision: 63937 URL: http://svn.reactos.org/svn/reactos?rev=63937&view=rev Log: Null HWNDs are NULL. Modified: trunk/reactos/base/applications/mplay32/mplay32.c Modified: trunk/reactos/base/applications/mplay32/mplay32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] Sun Aug 24 14:15:07 2014 @@ -756,7 +756,7 @@ if (!RegisterClassEx(&WndClass)) { - ShowLastWin32Error(0); + ShowLastWin32Error(NULL); return 0; } @@ -773,7 +773,7 @@ NULL); if (!hwnd) { - ShowLastWin32Error(0); + ShowLastWin32Error(NULL); return 0; }

10 years

[hbelusca] 63936: [MPLAY32] - Display formatted system messages in case of diverse failues. - Add an error check for RegisterClassEx() and CreateWindow() in _tWinMain(). Patch by Ricardo Hanke. COR...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Aug 24 14:10:49 2014 New Revision: 63936 URL: http://svn.reactos.org/svn/reactos?rev=63936&view=rev Log: [MPLAY32] - Display formatted system messages in case of diverse failues. - Add an error check for RegisterClassEx() and CreateWindow() in _tWinMain(). Patch by Ricardo Hanke. CORE-7880 #resolve #comment Committed, thanks! Modified: trunk/reactos/base/applications/mplay32/mplay32.c Modified: trunk/reactos/base/applications/mplay32/mplay32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] Sun Aug 24 14:10:49 2014 @@ -55,15 +55,26 @@ } static VOID +ShowLastWin32Error(HWND hwnd) +{ + DWORD dwError; + LPTSTR lpMessageBuffer; + + dwError = GetLastError(); + FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, dwError, 0, (LPWSTR)&lpMessageBuffer, 0, NULL); + MessageBox(hwnd, lpMessageBuffer, szAppTitle, MB_OK | MB_ICONERROR); + LocalFree(lpMessageBuffer); +} + +static VOID SetImageList(HWND hwnd) { HIMAGELIST hImageList; hImageList = ImageList_Create(16, 16, ILC_MASK | ILC_COLOR24, 1, 1); - if (!hImageList) { - MessageBox(hwnd, _T("ImageList it is not created!"), NULL, MB_OK); + ShowLastWin32Error(hwnd); return; } @@ -106,7 +117,7 @@ { TCHAR szErrorMessage[256]; TCHAR szTempMessage[300]; - + if (mciGetErrorString(dwError, szErrorMessage, sizeof(szErrorMessage) / sizeof(TCHAR)) == FALSE) { LoadString(hInstance, IDS_DEFAULTMCIERRMSG, szErrorMessage, sizeof(szErrorMessage) / sizeof(TCHAR)); @@ -138,7 +149,7 @@ NULL); if (!hTrackBar) { - MessageBox(hwnd, _T("TrackBar it is not created!"), NULL, MB_OK); + ShowLastWin32Error(hwnd); return; } @@ -158,7 +169,7 @@ NULL); if (!hToolBar) { - MessageBox(hwnd, _T("ToolBar it is not created!"), NULL, MB_OK); + ShowLastWin32Error(hwnd); return; } @@ -194,7 +205,7 @@ return TRUE; } - + RegCloseKey(hKey); } @@ -545,7 +556,7 @@ { HDROP drophandle; TCHAR droppedfile[MAX_PATH]; - + drophandle = (HDROP)wParam; DragQueryFile(drophandle, 0, droppedfile, sizeof(droppedfile) / sizeof(TCHAR)); DragFinish(drophandle); @@ -693,7 +704,7 @@ case IDM_DEVPROPS: ShowDeviceProperties(hwnd); break; - + case IDM_VOLUMECTL: ShellExecute(hwnd, NULL, _T("SNDVOL32.EXE"), NULL, NULL, SW_SHOWNORMAL); break; @@ -743,7 +754,11 @@ WndClass.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); WndClass.lpszMenuName = MAKEINTRESOURCE(IDR_MAINMENU); - RegisterClassEx(&WndClass); + if (!RegisterClassEx(&WndClass)) + { + ShowLastWin32Error(0); + return 0; + } hwnd = CreateWindow(szClassName, szAppTitle, @@ -756,6 +771,11 @@ NULL, hInstance, NULL); + if (!hwnd) + { + ShowLastWin32Error(0); + return 0; + } DragAcceptFiles(hwnd, TRUE); @@ -780,5 +800,5 @@ DispatchMessage(&msg); } - return 0; -} + return (INT)msg.wParam; +}

10 years

[dquintana] 63935: [EXPLORER-NEW] * Turn a couple DbgPrints into ERR.

by dquintana＠svn.reactos.org

Author: dquintana Date: Sun Aug 24 14:06:41 2014 New Revision: 63935 URL: http://svn.reactos.org/svn/reactos?rev=63935&view=rev Log: [EXPLORER-NEW] * Turn a couple DbgPrints into ERR. Modified: branches/shell-experiments/base/shell/explorer-new/explorer.c Modified: branches/shell-experiments/base/shell/explorer-new/explorer.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/explorer.c [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/explorer.c [iso-8859-1] Sun Aug 24 14:06:41 2014 @@ -360,7 +360,7 @@ mm.cbSize = sizeof(mm); if (!SystemParametersInfo(SPI_GETMINIMIZEDMETRICS, sizeof(mm), &mm, 0)) { - DbgPrint("SystemParametersInfo failed with %lu\n", GetLastError()); + ERR("SystemParametersInfo failed with %lu\n", GetLastError()); return; } if (bHide) @@ -368,7 +368,7 @@ else mm.iArrange &= ~ARW_HIDE; if (!SystemParametersInfo(SPI_SETMINIMIZEDMETRICS, sizeof(mm), &mm, 0)) - DbgPrint("SystemParametersInfo failed with %lu\n", GetLastError()); + ERR("SystemParametersInfo failed with %lu\n", GetLastError()); } INT WINAPI @@ -470,7 +470,7 @@ * /root,<object> Open a window for the given object path. * /select,<object> Open a window with the given object selected. */ - + /* FIXME: Do it right */ WCHAR* tmp = wcsstr(lpCmdLine,L"/root,"); if (tmp)

10 years

[dquintana] 63934: [RSHELL] * Add a shell DDE skeleton, based on shell32's DDE stubs.

by dquintana＠svn.reactos.org

Author: dquintana Date: Sun Aug 24 14:04:42 2014 New Revision: 63934 URL: http://svn.reactos.org/svn/reactos?rev=63934&view=rev Log: [RSHELL] * Add a shell DDE skeleton, based on shell32's DDE stubs. Added: branches/shell-experiments/base/shell/rshell/ShellDDE.cpp (with props) Modified: branches/shell-experiments/base/shell/rshell/CMakeLists.txt branches/shell-experiments/base/shell/rshell/rshell.spec Modified: branches/shell-experiments/base/shell/rshell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMakeLists.txt [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMakeLists.txt [iso-8859-1] Sun Aug 24 14:04:42 2014 @@ -16,6 +16,7 @@ CMergedFolder.cpp CStartMenu.cpp misc.cpp + ShellDDE.cpp ${CMAKE_CURRENT_BINARY_DIR}/rshell.def) add_library(rshell SHARED ${SOURCE}) Added: branches/shell-experiments/base/shell/rshell/ShellDDE.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/ShellDDE.cpp (added) +++ branches/shell-experiments/base/shell/rshell/ShellDDE.cpp [iso-8859-1] Sun Aug 24 14:04:42 2014 @@ -0,0 +1,196 @@ +/* + * Shell DDE Handling + * + * Copyright 2004 Robert Shearman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "precomp.h" +#include <ddeml.h> +#include <strsafe.h> + +WINE_DEFAULT_DEBUG_CHANNEL(shelldde); + +/* DDE Instance ID */ +static DWORD dwDDEInst; + +/* String handles */ +static HSZ hszProgmanTopic; +static HSZ hszProgmanService; +static HSZ hszShell; +static HSZ hszAppProperties; +static HSZ hszFolders; + +static BOOL Dde_OnConnect(HSZ hszTopic, HSZ hszService) +{ + WCHAR szTopic[MAX_PATH]; + WCHAR szService[MAX_PATH]; + + DdeQueryStringW(dwDDEInst, hszTopic, szTopic, _countof(szTopic), CP_WINUNICODE); + DdeQueryStringW(dwDDEInst, hszService, szService, _countof(szService), CP_WINUNICODE); + + DbgPrint("Dde_OnConnect: topic=%S, service=%S\n", szTopic, szService); + + return TRUE; +} + +static void Dde_OnConnectConfirm(HCONV hconv, HSZ hszTopic, HSZ hszService) +{ + WCHAR szTopic[MAX_PATH]; + WCHAR szService[MAX_PATH]; + + DdeQueryStringW(dwDDEInst, hszTopic, szTopic, _countof(szTopic), CP_WINUNICODE); + DdeQueryStringW(dwDDEInst, hszService, szService, _countof(szService), CP_WINUNICODE); + + DbgPrint("Dde_OnConnectConfirm: hconv=%p, topic=%S, service=%S\n", hconv, szTopic, szService); +} + +static BOOL Dde_OnWildConnect(HSZ hszTopic, HSZ hszService) +{ + WCHAR szTopic[MAX_PATH]; + WCHAR szService[MAX_PATH]; + + DdeQueryStringW(dwDDEInst, hszTopic, szTopic, _countof(szTopic), CP_WINUNICODE); + DdeQueryStringW(dwDDEInst, hszService, szService, _countof(szService), CP_WINUNICODE); + + DbgPrint("Dde_OnWildConnect: topic=%S, service=%S\n", szTopic, szService); + + return FALSE; +} + +static HDDEDATA Dde_OnRequest(UINT uFmt, HCONV hconv, HSZ hszTopic, HSZ hszItem) +{ + WCHAR szTopic[MAX_PATH]; + WCHAR szItem[MAX_PATH]; + + DdeQueryStringW(dwDDEInst, hszTopic, szTopic, _countof(szTopic), CP_WINUNICODE); + DdeQueryStringW(dwDDEInst, hszItem, szItem, _countof(szItem), CP_WINUNICODE); + + DbgPrint("Dde_OnRequest: uFmt=%d, hconv=%p, topic=%S, item=%S\n", hconv, szTopic, szItem); + + return NULL; +} + +static DWORD Dde_OnExecute(HCONV hconv, HSZ hszTopic, HDDEDATA hdata) +{ + WCHAR szTopic[MAX_PATH]; + WCHAR szCommand[MAX_PATH]; + WCHAR *pszCommand; + + DdeQueryStringW(dwDDEInst, hszTopic, szTopic, _countof(szTopic), CP_WINUNICODE); + + pszCommand = (WCHAR*)DdeAccessData(hdata, NULL); + if (!pszCommand) + return DDE_FNOTPROCESSED; + + StringCchCopyW(szCommand, _countof(szCommand), pszCommand); + + DdeUnaccessData(hdata); + + DbgPrint("Dde_OnExecute: hconv=%p, topic=%S, command=%S\n", hconv, szTopic, pszCommand); + + /* + + [ViewFolder("%l", %I, %S)] -- Open a folder in standard mode + [ExploreFolder("%l", %I, %S)] -- Open a folder in "explore" mode (file tree is shown to the left by default) + [FindFolder("%l", %I)] -- Open a folder in "find" mode (search panel is shown to the left by default) + [ShellFile("%1","%1",%S)] -- Execute the contents of the specified .SCF file + + */ + + return DDE_FACK; +} + +static void Dde_OnDisconnect(HCONV hconv) +{ + DbgPrint("Dde_OnDisconnect: hconv=%p\n", hconv); +} + +static HDDEDATA CALLBACK DdeCallback( + UINT uType, + UINT uFmt, + HCONV hconv, + HSZ hsz1, + HSZ hsz2, + HDDEDATA hdata, + ULONG_PTR dwData1, + ULONG_PTR dwData2) +{ + switch (uType) + { + case XTYP_CONNECT: + return (HDDEDATA)(DWORD_PTR)Dde_OnConnect(hsz1, hsz2); + case XTYP_CONNECT_CONFIRM: + Dde_OnConnectConfirm(hconv, hsz1, hsz2); + return NULL; + case XTYP_WILDCONNECT: + return (HDDEDATA)(DWORD_PTR)Dde_OnWildConnect(hsz1, hsz2); + case XTYP_REQUEST: + return Dde_OnRequest(uFmt, hconv, hsz1, hsz2); + case XTYP_EXECUTE: + return (HDDEDATA)(DWORD_PTR)Dde_OnExecute(hconv, hsz1, hdata); + case XTYP_DISCONNECT: + Dde_OnDisconnect(hconv); + return NULL; + default: + DbgPrint("DdeCallback: unknown uType=%d\n", uType); + case XTYP_REGISTER: + return NULL; + } +} + +/************************************************************************* + * ShellDDEInit (SHELL32.@) + * + * Registers the Shell DDE services with the system so that applications + * can use them. + * + * PARAMS + * bInit [I] TRUE to initialize the services, FALSE to uninitialize. + * + * RETURNS + * Nothing. + */ +EXTERN_C void WINAPI ShellDDEInit(BOOL bInit) +{ + DbgPrint("ShellDDEInit bInit = %s\n", bInit ? "TRUE" : "FALSE"); + + if (bInit) + { + DdeInitializeW(&dwDDEInst, DdeCallback, CBF_FAIL_ADVISES | CBF_FAIL_POKES, 0); + + hszProgmanTopic = DdeCreateStringHandleW(dwDDEInst, L"Progman", CP_WINUNICODE); + hszProgmanService = DdeCreateStringHandleW(dwDDEInst, L"Progman", CP_WINUNICODE); + hszShell = DdeCreateStringHandleW(dwDDEInst, L"Shell", CP_WINUNICODE); + hszAppProperties = DdeCreateStringHandleW(dwDDEInst, L"AppProperties", CP_WINUNICODE); + hszFolders = DdeCreateStringHandleW(dwDDEInst, L"Folders", CP_WINUNICODE); + + DdeNameService(dwDDEInst, hszFolders, 0, DNS_FILTEROFF); + } + else + { + /* unregister all services */ + DdeNameService(dwDDEInst, 0, 0, DNS_UNREGISTER); + + DdeFreeStringHandle(dwDDEInst, hszFolders); + DdeFreeStringHandle(dwDDEInst, hszAppProperties); + DdeFreeStringHandle(dwDDEInst, hszShell); + DdeFreeStringHandle(dwDDEInst, hszProgmanService); + DdeFreeStringHandle(dwDDEInst, hszProgmanTopic); + + DdeUninitialize(dwDDEInst); + } +} Propchange: branches/shell-experiments/base/shell/rshell/ShellDDE.cpp ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/shell-experiments/base/shell/rshell/rshell.spec URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/rshell.spec [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/rshell.spec [iso-8859-1] Sun Aug 24 14:04:42 2014 @@ -2,4 +2,5 @@ @ stdcall CMenuDeskBar_Constructor(ptr ptr); @ stdcall CMenuSite_Constructor(ptr ptr); @ stdcall CMenuBand_Constructor(ptr ptr); -@ stdcall CMergedFolder_Constructor(ptr ptr); +@ stdcall CMergedFolder_Constructor(ptr ptr); +@ stdcall ShellDDEInit(long);

10 years

[jgardou] 63933: [WIN32K] - Enable commented freetype call: set font face size and coordinate transformation matrix Patch by Huw Campbell, reviewed by a gazillion of people. CORE-4657 #resolve #com...

by jgardou＠svn.reactos.org

Author: jgardou Date: Sun Aug 24 13:28:33 2014 New Revision: 63933 URL: http://svn.reactos.org/svn/reactos?rev=63933&view=rev Log: [WIN32K] - Enable commented freetype call: set font face size and coordinate transformation matrix Patch by Huw Campbell, reviewed by a gazillion of people. CORE-4657 #resolve #comment committed in r63933, a million thanks Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Sun Aug 24 13:28:33 2014 @@ -1600,12 +1600,12 @@ } } -// FT_Set_Pixel_Sizes(ft_face, -// TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfWidth, + FT_Set_Pixel_Sizes(ft_face, + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfWidth, /* FIXME: Should set character height if neg */ -// (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? -// dc->ppdev->devinfo.lfDefaultFont.lfHeight : abs(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))); -// FtSetCoordinateTransform(face, DC_pmxWorldToDevice(dc)); + (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? + dc->ppdev->devinfo.lfDefaultFont.lfHeight : abs(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))); + FtSetCoordinateTransform(ft_face, DC_pmxWorldToDevice(dc)); TEXTOBJ_UnlockText(TextObj); @@ -3674,6 +3674,7 @@ } else { + // FIXME this should probably be a matrix transform with TextTop as well. Scale = pdcattr->mxWorldToDevice.efM11; if (_FLOATOBJ_Equal0(&Scale)) FLOATOBJ_Set1(&Scale);

10 years

[dreimer] 63932: [SHELL32] Marshall interface pointers during background delete by Huw Campbell CORE-8460 #resolve #comment Committed by request of Victor. Have fun ^^

by dreimer＠svn.reactos.org

Author: dreimer Date: Sun Aug 24 13:25:12 2014 New Revision: 63932 URL: http://svn.reactos.org/svn/reactos?rev=63932&view=rev Log: [SHELL32] Marshall interface pointers during background delete by Huw Campbell CORE-8460 #resolve #comment Committed by request of Victor. Have fun ^^ Modified: trunk/reactos/dll/win32/shell32/defcontextmenu.cpp trunk/reactos/dll/win32/shell32/folders/fs.cpp trunk/reactos/dll/win32/shell32/folders/recyclebin.cpp Modified: trunk/reactos/dll/win32/shell32/defcontextmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/defconte… ============================================================================== --- trunk/reactos/dll/win32/shell32/defcontextmenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/defcontextmenu.cpp [iso-8859-1] Sun Aug 24 13:25:12 2014 @@ -1144,18 +1144,17 @@ HRESULT CDefaultContextMenu::DoDelete(LPCMINVOKECOMMANDINFO lpcmi) { TRACE("(%p) Deleting\n", this); - LPDATAOBJECT pDataObj; - - if (SUCCEEDED(SHCreateDataObject(m_pidlFolder, m_cidl, m_apidl, NULL, IID_PPV_ARG(IDataObject, &pDataObj)))) - { - pDataObj->AddRef(); - SHCreateThread(DoDeleteThreadProc, pDataObj, NULL, NULL); - pDataObj->Release(); + CComPtr<IDataObject> pDataObject; + + if (SUCCEEDED(SHCreateDataObject(m_pidlFolder, m_cidl, m_apidl, NULL, IID_PPV_ARG(IDataObject, &pDataObject)))) + { + IStream *s; + CoMarshalInterThreadInterfaceInStream(IID_IDataObject, pDataObject, &s); + SHCreateThread(DoDeleteThreadProc, s, NULL, NULL); } else return E_FAIL; return S_OK; - } HRESULT Modified: trunk/reactos/dll/win32/shell32/folders/fs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/fs.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/fs.cpp [iso-8859-1] Sun Aug 24 13:25:12 2014 @@ -1763,6 +1763,7 @@ data->This->Release(); //Release the parameter from the heap. HeapFree(GetProcessHeap(), 0, data); + CoUninitialize(); return 0; } Modified: trunk/reactos/dll/win32/shell32/folders/recyclebin.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/recyclebin.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/recyclebin.cpp [iso-8859-1] Sun Aug 24 13:25:12 2014 @@ -1459,8 +1459,9 @@ /* Handle cfShellIDList Drop objects here, otherwise send the approriate message to other software */ if (SUCCEEDED(pDataObject->QueryGetData(&fmt))) { - pDataObject->AddRef(); - SHCreateThread(DoDeleteThreadProc, pDataObject, NULL, NULL); + IStream *s; + CoMarshalInterThreadInterfaceInStream(IID_IDataObject, pDataObject, &s); + SHCreateThread(DoDeleteThreadProc, s, NULL, NULL); } else { @@ -1474,10 +1475,14 @@ DWORD WINAPI DoDeleteThreadProc(LPVOID lpParameter) { - IDataObject *pda = (IDataObject*) lpParameter; - DoDeleteDataObject(pda); - //Release the data object - pda->Release(); + CoInitialize(NULL); + CComPtr<IDataObject> pDataObject; + HRESULT hr = CoGetInterfaceAndReleaseStream (static_cast<IStream*>(lpParameter), IID_PPV_ARG(IDataObject, &pDataObject)); + if (SUCCEEDED(hr)) + { + DoDeleteDataObject(pDataObject); + } + CoUninitialize(); return 0; }

10 years

[hbelusca] 63931: [DESK.CPL] Set a default choice for the options of the first tab of Settings/Advanced.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Aug 24 12:19:35 2014 New Revision: 63931 URL: http://svn.reactos.org/svn/reactos?rev=63931&view=rev Log: [DESK.CPL] Set a default choice for the options of the first tab of Settings/Advanced. Modified: trunk/reactos/dll/cpl/desk/general.c Modified: trunk/reactos/dll/cpl/desk/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/general.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/desk/general.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/general.c [iso-8859-1] Sun Aug 24 12:19:35 2014 @@ -95,9 +95,13 @@ break; } } + else + SendDlgItemMessage(hWnd, IDC_WITHOUTREBOOT_RB, BM_SETCHECK, 1, 1); RegCloseKey(hKey); } + else + SendDlgItemMessage(hWnd, IDC_WITHOUTREBOOT_RB, BM_SETCHECK, 1, 1); } INT_PTR CALLBACK

10 years

[hbelusca] 63930: [EVENTVWR] Do not hardcode event logs, but retrieve them from the registry. Patch by Ricardo Hanke. CORE-8458 #resolve #comment Committed, thanks!

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Aug 24 12:00:57 2014 New Revision: 63930 URL: http://svn.reactos.org/svn/reactos?rev=63930&view=rev Log: [EVENTVWR] Do not hardcode event logs, but retrieve them from the registry. Patch by Ricardo Hanke. CORE-8458 #resolve #comment Committed, thanks! Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/cs-CZ.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc trunk/reactos/base/applications/mscutils/eventvwr/resource.h Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] Sun Aug 24 12:00:57 2014 @@ -41,12 +41,10 @@ #define _CRT_SECURE_NO_DEPRECATE /* all deprecated unsafe string functions */ #endif -static const LPWSTR EVENT_SOURCE_APPLICATION = L"Application"; -static const LPWSTR EVENT_SOURCE_SECURITY = L"Security"; -static const LPWSTR EVENT_SOURCE_SYSTEM = L"System"; static const WCHAR szWindowClass[] = L"EVENTVWR"; /* the main window class name*/ - -//MessageFile message buffer size +static const WCHAR EVENTLOG_BASE_KEY[] = L"SYSTEM\\CurrentControlSet\\Services\\EventLog\\"; + +// MessageFile message buffer size #define EVENT_MESSAGE_EVENTTEXT_BUFFER 1024*10 #define EVENT_MESSAGE_FILE_BUFFER 1024*10 #define EVENT_DLL_SEPARATOR L";" @@ -72,6 +70,9 @@ LPWSTR lpSourceLogName = NULL; LPWSTR lpComputerName = NULL; + +DWORD dwNumLogs = 0; +WCHAR **LogNames; /* Forward declarations of functions included in this code module: */ ATOM MyRegisterClass(HINSTANCE hInstance); @@ -838,19 +839,6 @@ } -// -// FUNCTION: MyRegisterClass() -// -// PURPOSE: Registers the window class. -// -// COMMENTS: -// -// This function and its usage are only necessary if you want this code -// to be compatible with Win32 systems prior to the 'RegisterClassEx' -// function that was added to Windows 95. It is important to call this function -// so that the application will get 'well formed' small icons associated -// with it. -// ATOM MyRegisterClass(HINSTANCE hInstance) { @@ -874,16 +862,188 @@ } -// -// FUNCTION: InitInstance(HINSTANCE, int) -// -// PURPOSE: Saves instance handle and creates main window -// -// COMMENTS: -// -// In this function, we save the instance handle in a global variable and -// create and display the main program window. -// +VOID +GetDisplayNameFile(LPCWSTR lpLogName, LPWSTR lpModuleName) +{ + HKEY hKey; + WCHAR *KeyPath; + WCHAR szModuleName[MAX_PATH]; + DWORD dwData; + + + KeyPath = (WCHAR*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (wcslen(EVENTLOG_BASE_KEY) + wcslen(lpLogName) + 1) * sizeof(WCHAR)); + if (!KeyPath) + { + return; + } + + wcscpy(KeyPath, EVENTLOG_BASE_KEY); + wcscat(KeyPath, lpLogName); + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, KeyPath, 0, KEY_READ, &hKey) != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, KeyPath); + return; + } + + dwData = MAX_PATH; + + if (RegQueryValueExW(hKey, L"DisplayNameFile", NULL, NULL, (LPBYTE)szModuleName, &dwData) == ERROR_SUCCESS) + { + ExpandEnvironmentStringsW(szModuleName, lpModuleName, MAX_PATH); + } + + RegCloseKey(hKey); + HeapFree(GetProcessHeap(), 0, KeyPath); +} + + +DWORD +GetDisplayNameID(LPCWSTR lpLogName) +{ + HKEY hKey; + WCHAR *KeyPath; + DWORD dwMessageID = 0; + DWORD dwData; + + KeyPath = (WCHAR*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (wcslen(EVENTLOG_BASE_KEY) + wcslen(lpLogName) + 1) * sizeof(WCHAR)); + if (!KeyPath) + { + return 0; + } + + wcscpy(KeyPath, EVENTLOG_BASE_KEY); + wcscat(KeyPath, lpLogName); + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, KeyPath, 0, KEY_READ, &hKey) != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, KeyPath); + return 0; + } + + dwData = sizeof(dwMessageID); + + RegQueryValueExW(hKey, L"DisplayNameID", NULL, NULL, (LPBYTE)&dwMessageID, &dwData); + + RegCloseKey(hKey); + HeapFree(GetProcessHeap(), 0, KeyPath); + + return dwMessageID; +} + + +VOID +BuildLogList(void) +{ + HKEY hKey; + DWORD lpcName; + DWORD dwIndex; + DWORD dwMessageID; + DWORD dwMaxKeyLength; + WCHAR szModuleName[MAX_PATH]; + LPWSTR lpDisplayName; + HANDLE hLibrary = NULL; + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, EVENTLOG_BASE_KEY, 0, KEY_READ, &hKey) != ERROR_SUCCESS) + { + return; + } + + if (RegQueryInfoKeyW(hKey, NULL, NULL, NULL, &dwNumLogs, &dwMaxKeyLength, NULL, NULL, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) + { + RegCloseKey(hKey); + return; + } + + if (!dwNumLogs) + { + RegCloseKey(hKey); + return; + } + + LogNames = (WCHAR**)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (dwNumLogs + 1) * sizeof(WCHAR*)); + + if (!LogNames) + { + RegCloseKey(hKey); + return; + } + + for (dwIndex = 0; dwIndex < dwNumLogs; dwIndex++) + { + LogNames[dwIndex] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ((dwMaxKeyLength + 1) * sizeof(WCHAR))); + + if (LogNames[dwIndex] != NULL) + { + lpcName = dwMaxKeyLength + 1; + + if (RegEnumKeyExW(hKey, dwIndex, LogNames[dwIndex], &lpcName, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + { + lpDisplayName = NULL; + + ZeroMemory(szModuleName, sizeof(szModuleName)); + GetDisplayNameFile(LogNames[dwIndex], szModuleName); + dwMessageID = GetDisplayNameID(LogNames[dwIndex]); + + hLibrary = LoadLibraryExW(szModuleName, NULL, DONT_RESOLVE_DLL_REFERENCES | LOAD_LIBRARY_AS_DATAFILE); + if (hLibrary != NULL) + { + FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_HMODULE, hLibrary, dwMessageID, 0, (LPWSTR)&lpDisplayName, 0, NULL); + FreeLibrary(hLibrary); + } + + if (lpDisplayName) + { + InsertMenuW(hMainMenu, ID_SAVE_PROTOCOL, MF_BYCOMMAND | MF_STRING, ID_FIRST_LOG + dwIndex, lpDisplayName); + } + else + { + InsertMenuW(hMainMenu, ID_SAVE_PROTOCOL, MF_BYCOMMAND | MF_STRING, ID_FIRST_LOG + dwIndex, LogNames[dwIndex]); + } + + LocalFree(lpDisplayName); + } + } + } + + InsertMenuW(hMainMenu, ID_SAVE_PROTOCOL, MF_BYCOMMAND | MF_SEPARATOR, ID_FIRST_LOG + dwIndex + 1, NULL); + + RegCloseKey(hKey); + + return; +} + + +VOID +FreeLogList(void) +{ + DWORD dwIndex; + + if (!LogNames) + { + return; + } + + for (dwIndex = 0; dwIndex < dwNumLogs; dwIndex++) + { + if (LogNames[dwIndex]) + { + HeapFree(GetProcessHeap(), 0, LogNames[dwIndex]); + } + + DeleteMenu(hMainMenu, ID_FIRST_LOG + dwIndex, MF_BYCOMMAND); + } + + DeleteMenu(hMainMenu, ID_FIRST_LOG + dwIndex + 1, MF_BYCOMMAND); + + HeapFree(GetProcessHeap(), 0, LogNames); + + dwNumLogs = 0; + + return; +} + + BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) @@ -1042,23 +1202,16 @@ ShowWindow(hwndMainWindow, nCmdShow); UpdateWindow(hwndMainWindow); - QueryEventMessages(lpComputerName, // Use the local computer. - EVENT_SOURCE_APPLICATION); // The event log category + BuildLogList(); + + QueryEventMessages(lpComputerName, LogNames[0]); + + CheckMenuRadioItem(GetMenu(hwndMainWindow), ID_FIRST_LOG, ID_FIRST_LOG + dwNumLogs, ID_FIRST_LOG, MF_BYCOMMAND); return TRUE; } -// -// FUNCTION: WndProc(HWND, UINT, WPARAM, LPARAM) -// -// PURPOSE: Processes messages for the main window. -// -// WM_COMMAND - process the application menu -// WM_PAINT - Paint the main window -// WM_DESTROY - post a quit message and return -// -// LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { @@ -1069,11 +1222,6 @@ { case WM_CREATE: hMainMenu = GetMenu(hWnd); - CheckMenuRadioItem(GetMenu(hWnd), - ID_LOG_APPLICATION, - ID_LOG_SYSTEM, - ID_LOG_APPLICATION, - MF_BYCOMMAND); break; case WM_NOTIFY: @@ -1099,44 +1247,21 @@ case WM_COMMAND: // Parse the menu selections: + + if ((LOWORD(wParam) >= ID_FIRST_LOG) && (LOWORD(wParam) <= ID_FIRST_LOG + dwNumLogs)) + { + if (LogNames[LOWORD(wParam) - ID_FIRST_LOG]) + { + if (QueryEventMessages(lpComputerName, LogNames[LOWORD(wParam) - ID_FIRST_LOG])) + { + CheckMenuRadioItem(GetMenu(hWnd), ID_FIRST_LOG, ID_FIRST_LOG + dwNumLogs, LOWORD(wParam), MF_BYCOMMAND); + } + } + } + else + switch (LOWORD(wParam)) { - case ID_LOG_APPLICATION: - if (QueryEventMessages(lpComputerName, // Use the local computer. - EVENT_SOURCE_APPLICATION)) // The event log category - { - CheckMenuRadioItem(GetMenu(hWnd), - ID_LOG_APPLICATION, - ID_LOG_SYSTEM, - ID_LOG_APPLICATION, - MF_BYCOMMAND); - } - break; - - case ID_LOG_SECURITY: - if (QueryEventMessages(lpComputerName, // Use the local computer. - EVENT_SOURCE_SECURITY)) // The event log category - { - CheckMenuRadioItem(GetMenu(hWnd), - ID_LOG_APPLICATION, - ID_LOG_SYSTEM, - ID_LOG_SECURITY, - MF_BYCOMMAND); - } - break; - - case ID_LOG_SYSTEM: - if (QueryEventMessages(lpComputerName, // Use the local computer. - EVENT_SOURCE_SYSTEM)) // The event log category - { - CheckMenuRadioItem(GetMenu(hWnd), - ID_LOG_APPLICATION, - ID_LOG_SYSTEM, - ID_LOG_SYSTEM, - MF_BYCOMMAND); - } - break; - case ID_SAVE_PROTOCOL: SaveProtocol(); break; @@ -1191,6 +1316,7 @@ break; case WM_DESTROY: FreeRecords(); + FreeLogList(); PostQuitMessage(0); break; Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc [iso-8859-1] Sun Aug 24 12:00:57 2014 @@ -4,10 +4,6 @@ BEGIN POPUP "&ÐÐ½ÐµÐ²Ð½Ð¸Ðº" BEGIN - MENUITEM "&ÐÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ", ID_LOG_APPLICATION - MENUITEM "&Ð¡Ð¸Ð³ÑÑÐ½Ð¾ÑÑ", ID_LOG_SECURITY - MENUITEM "&Ð£ÑÐµÐ´Ð±Ð°", ID_LOG_SYSTEM - MENUITEM SEPARATOR MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED MENUITEM SEPARATOR MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/cs-CZ.rc [iso-8859-1] Sun Aug 24 12:00:57 2014 @@ -4,10 +4,6 @@ BEGIN POPUP "&Protokol" BEGIN - MENUITEM "&Aplikace", ID_LOG_APPLICATION - MENUITEM "&ZabezpeÄenÃ", ID_LOG_SECURITY - MENUITEM "&SystÃ©m", ID_LOG_SYSTEM - MENUITEM SEPARATOR MENUITEM "UloÅ¾it &Protokol...", ID_SAVE_PROTOCOL, GRAYED MENUITEM SEPARATOR MENUITEM "&Odstranit udÃ¡losti", ID_CLEAR_EVENTS, GRAYED Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc [iso-8859-1] Sun Aug 24 12:00:57 2014 @@ -6,10 +6,6 @@ BEGIN POPUP "&Protokoll" BEGIN - MENUITEM "&Anwendung", ID_LOG_APPLICATION - MENUITEM "&Sicherheit", ID_LOG_SECURITY - MENUITEM "&System", ID_LOG_SYSTEM - MENUITEM SEPARATOR MENUITEM "Protokoll s&peichern...", ID_SAVE_PROTOCOL, GRAYED MENUITEM SEPARATOR MENUITEM "Alle E&reignisse lÃ¶schen", ID_CLEAR_EVENTS, GRAYED Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc [iso-8859-1] Sun Aug 24 12:00:57 2014 @@ -6,10 +6,6 @@ BEGIN POPUP "&Log" BEGIN - MENUITEM "&ÎÏÎ±ÏÎ¼Î¿Î³Î®", ID_LOG_APPLICATION - MENUITEM "&ÎÏÏÎ¬Î»ÎµÎ¹Î±", ID_LOG_SECURITY - MENUITEM "&Î£ÏÏÏÎ·Î¼Î±", ID_LOG_SYSTEM - MENUITEM SEPARATOR MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED MENUITEM SEPARATOR MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc [iso-8859-1] Sun Aug 24 12:00:57 2014 @@ -12,10 +12,6 @@ BEGIN POPUP "&Log" BEGIN - MENUITEM "&Application", ID_LOG_APPLICATION - MENUITEM "&Security", ID_LOG_SECURITY - MENUITEM "&System", ID_LOG_SYSTEM - MENUITEM SEPARATOR MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED MENUITEM SEPARATOR MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc [iso-8859-1] Sun Aug 24 12:00:57 2014 @@ -6,10 +6,6 @@ BEGIN POPUP "&Log" BEGIN - MENUITEM "&AplicaciÃ³n", ID_LOG_APPLICATION - MENUITEM "&Seguridad", ID_LOG_SECURITY - MENUITEM "&Sistema", ID_LOG_SYSTEM - MENUITEM SEPARATOR MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED MENUITEM SEPARATOR MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc [iso-8859-1] Sun Aug 24 12:00:57 2014 @@ -6,10 +6,6 @@ BEGIN POPUP "Journa&l" BEGIN - MENUITEM "&Application", ID_LOG_APPLICATION - MENUITEM "&SÃ©curitÃ©", ID_LOG_SECURITY - MENUITEM "&SystÃ¨me", ID_LOG_SYSTEM - MENUITEM SEPARATOR MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED MENUITEM SEPARATOR MENUITEM "Effacer tous &les Ã©vÃ©nements", ID_CLEAR_EVENTS, GRAYED Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc [iso-8859-1] Sun Aug 24 12:00:57 2014 @@ -6,10 +6,6 @@ BEGIN POPUP "××¦×× ××××¨××¢×× (××§×××)" BEGIN - MENUITEM "×××©××", ID_LOG_APPLICATION - MENUITEM "×××××", ID_LOG_SECURITY - MENUITEM "××¢×¨××ª", ID_LOG_SYSTEM - MENUITEM SEPARATOR MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED MENUITEM SEPARATOR MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc [iso-8859-1] Sun Aug 24 12:00:57 2014 @@ -6,10 +6,6 @@ BEGIN POPUP "&Log" BEGIN - MENUITEM "&Applicazioni", ID_LOG_APPLICATION - MENUITEM "&Sicurezza", ID_LOG_SECURITY - MENUITEM "&Sistema", ID_LOG_SYSTEM - MENUITEM SEPARATOR MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED MENUITEM SEPARATOR MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc [iso-8859-1] Sun Aug 24 12:00:57 2014 @@ -6,10 +6,6 @@ BEGIN POPUP "ãã°(&L)" BEGIN - MENUITEM "ã¢ããªã±ã¼ã·ã§ã³(&A)", ID_LOG_APPLICATION - MENUITEM "ã»ãã¥ãªãã£(&S)", ID_LOG_SECURITY - MENUITEM "ã·ã¹ãã (&S)", ID_LOG_SYSTEM - MENUITEM SEPARATOR MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED MENUITEM SEPARATOR MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc [iso-8859-1] Sun Aug 24 12:00:57 2014 @@ -6,10 +6,6 @@ BEGIN POPUP "ë¡ê·¸(&L)" BEGIN - MENUITEM "ì íë¦¬ì¼ì´ì(&A)", ID_LOG_APPLICATION - MENUITEM "ë³´ì(&S)", ID_LOG_SECURITY - MENUITEM "ìì¤í(&S)", ID_LOG_SYSTEM - MENUITEM SEPARATOR MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED MENUITEM SEPARATOR MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc [iso-8859-1] Sun Aug 24 12:00:57 2014 @@ -4,10 +4,6 @@ BEGIN POPUP "&Logg" BEGIN - MENUITEM "&Applikasjon", ID_LOG_APPLICATION - MENUITEM "&Sikkerhet", ID_LOG_SECURITY - MENUITEM "&System", ID_LOG_SYSTEM - MENUITEM SEPARATOR MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED MENUITEM SEPARATOR MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc [iso-8859-1] Sun Aug 24 12:00:57 2014 @@ -8,10 +8,6 @@ BEGIN POPUP "&Logi" BEGIN - MENUITEM "&Aplikacja", ID_LOG_APPLICATION - MENUITEM "&Zabezpieczenia", ID_LOG_SECURITY - MENUITEM "&System", ID_LOG_SYSTEM - MENUITEM SEPARATOR MENUITEM "Zapisz &protokÃ³Å...", ID_SAVE_PROTOCOL, GRAYED MENUITEM SEPARATOR MENUITEM "W&yczyÅÄ wszystkie zdarzenia", ID_CLEAR_EVENTS, GRAYED Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc [iso-8859-1] Sun Aug 24 12:00:57 2014 @@ -6,10 +6,6 @@ BEGIN POPUP "&Registro" BEGIN - MENUITEM "&Aplicativo", ID_LOG_APPLICATION - MENUITEM "S&eguranÃ§a", ID_LOG_SECURITY - MENUITEM "&Sistema", ID_LOG_SYSTEM - MENUITEM SEPARATOR MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED MENUITEM SEPARATOR MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc [iso-8859-1] Sun Aug 24 12:00:57 2014 @@ -6,10 +6,6 @@ BEGIN POPUP "J&urnal" BEGIN - MENUITEM "&AplicaÈie", ID_LOG_APPLICATION - MENUITEM "Se&curitate", ID_LOG_SECURITY - MENUITEM "&Sistem", ID_LOG_SYSTEM - MENUITEM SEPARATOR MENUITEM "PÄstrare p&rotocolâ¦", ID_SAVE_PROTOCOL, GRAYED MENUITEM SEPARATOR MENUITEM "ÃnlÄt&urÄ toate evenimentele", ID_CLEAR_EVENTS, GRAYED Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc [iso-8859-1] Sun Aug 24 12:00:57 2014 @@ -6,10 +6,6 @@ BEGIN POPUP "&ÐÐ¾Ð³Ð¸" BEGIN - MENUITEM "&ÐÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹", ID_LOG_APPLICATION - MENUITEM "&ÐÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑÐ¸", ID_LOG_SECURITY - MENUITEM "&Ð¡Ð¸ÑÑÐµÐ¼Ñ", ID_LOG_SYSTEM - MENUITEM SEPARATOR MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED MENUITEM SEPARATOR MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc [iso-8859-1] Sun Aug 24 12:00:57 2014 @@ -9,10 +9,6 @@ BEGIN POPUP "&ZÃ¡znam" BEGIN - MENUITEM "&Application", ID_LOG_APPLICATION - MENUITEM "&Security", ID_LOG_SECURITY - MENUITEM "&System", ID_LOG_SYSTEM - MENUITEM SEPARATOR MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED MENUITEM SEPARATOR MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc [iso-8859-1] Sun Aug 24 12:00:57 2014 @@ -12,10 +12,6 @@ BEGIN POPUP "&Log" BEGIN - MENUITEM "&Aplikacion", ID_LOG_APPLICATION - MENUITEM "&Siguri", ID_LOG_SECURITY - MENUITEM "&Sistemi", ID_LOG_SYSTEM - MENUITEM SEPARATOR MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED MENUITEM SEPARATOR MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc [iso-8859-1] Sun Aug 24 12:00:57 2014 @@ -6,10 +6,6 @@ BEGIN POPUP "&Logg" BEGIN - MENUITEM "&Applikation", ID_LOG_APPLICATION - MENUITEM "&SÃ¤kerhet", ID_LOG_SECURITY - MENUITEM "&System", ID_LOG_SYSTEM - MENUITEM SEPARATOR MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED MENUITEM SEPARATOR MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc [iso-8859-1] Sun Aug 24 12:00:57 2014 @@ -12,10 +12,6 @@ BEGIN POPUP "&KayÄ±t" BEGIN - MENUITEM "&Uygulama", ID_LOG_APPLICATION - MENUITEM "&GÃ¼venlik", ID_LOG_SECURITY - MENUITEM "&Dizge", ID_LOG_SYSTEM - MENUITEM SEPARATOR MENUITEM "&ProtokolÃ¼ Kaydet...", ID_SAVE_PROTOCOL, GRAYED MENUITEM SEPARATOR MENUITEM "&TÃ¼m OlaylarÄ± Sil", ID_CLEAR_EVENTS, GRAYED Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc [iso-8859-1] Sun Aug 24 12:00:57 2014 @@ -6,10 +6,6 @@ BEGIN POPUP "&ÐÐ²ÑÑ" BEGIN - MENUITEM "&ÐÑÐ¾Ð³ÑÐ°Ð¼Ð°", ID_LOG_APPLICATION - MENUITEM "&ÐÐ°ÑÐ¸ÑÑ", ID_LOG_SECURITY - MENUITEM "&Ð¡Ð¸ÑÑÐµÐ¼Ð°", ID_LOG_SYSTEM - MENUITEM SEPARATOR MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED MENUITEM SEPARATOR MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc [iso-8859-1] Sun Aug 24 12:00:57 2014 @@ -6,10 +6,6 @@ BEGIN POPUP "æ¥å¿(&L)" BEGIN - MENUITEM "åºç¨ç¨åºæ¥å¿(&A)", ID_LOG_APPLICATION - MENUITEM "å®å¨æ¥å¿(&S)", ID_LOG_SECURITY - MENUITEM "ç³»ç»æ¥å¿(&Y)", ID_LOG_SYSTEM - MENUITEM SEPARATOR MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED MENUITEM SEPARATOR MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED Modified: trunk/reactos/base/applications/mscutils/eventvwr/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/resource.h [iso-8859-1] Sun Aug 24 12:00:57 2014 @@ -35,19 +35,18 @@ #define IDC_WORDRADIO 1013 #define IDC_EVENTDATAEDIT 1014 -#define ID_LOG_APPLICATION 32771 -#define ID_LOG_SECURITY 32772 -#define ID_LOG_SYSTEM 32773 -#define ID_HELP_HELP 32775 -#define ID_HELP 32776 -#define ID_OPTIONS 32777 -#define ID_VIEW 32778 -#define IDM_HELP 32779 -#define ID_VIEW_REFRESH 32780 -#define ID_REFRESH 32781 -#define IDM_REFRESH 32782 -#define ID_CLEAR_EVENTS 32783 -#define ID_SAVE_PROTOCOL 32784 +#define ID_HELP_HELP 32771 +#define ID_HELP 32772 +#define ID_OPTIONS 32773 +#define ID_VIEW 32774 +#define IDM_HELP 32775 +#define ID_VIEW_REFRESH 32776 +#define ID_REFRESH 32777 +#define IDM_REFRESH 32778 +#define ID_CLEAR_EVENTS 32779 +#define ID_SAVE_PROTOCOL 32780 + +#define ID_FIRST_LOG 45000 /* String IDs */ #define IDS_APP_TITLE 103

10 years

[hbelusca] 63929: [DEVMGR]: Fix a french misspelling. [EVENTVWR]: Fix a french misspelling and fix event description dialog layout.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Aug 24 11:42:49 2014 New Revision: 63929 URL: http://svn.reactos.org/svn/reactos?rev=63929&view=rev Log: [DEVMGR]: Fix a french misspelling. [EVENTVWR]: Fix a french misspelling and fix event description dialog layout. Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc trunk/reactos/dll/win32/devmgr/lang/fr-FR.rc Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc [iso-8859-1] Sun Aug 24 11:42:49 2014 @@ -12,7 +12,7 @@ MENUITEM SEPARATOR MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED MENUITEM SEPARATOR - MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED + MENUITEM "Effacer tous &les Ã©vÃ©nements", ID_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR MENUITEM "Quitter", IDM_EXIT END @@ -48,10 +48,10 @@ IDD_PROGRESSBOX DIALOGEX 0, 0, 230, 40 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER -CAPTION "Patientez.." +CAPTION "Patientez..." FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - CTEXT "Chargement des journaux d'Ã©vÃ©nements. Veuillez patienter ...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX + CTEXT "Chargement des journaux d'Ã©vÃ©nements. Veuillez patienter...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX END IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 276, 282 @@ -65,27 +65,27 @@ PUSHBUTTON "Suiva&nt", IDNEXT, 144, 258, 50, 14 PUSHBUTTON "Aide", IDHELP, 210, 258, 50, 14 EDITTEXT IDC_EVENTTEXTEDIT, 14, 81, 247, 108, ES_MULTILINE | ES_READONLY - LTEXT "&Description:", IDC_STATIC, 15, 70, 39, 8 - LTEXT "Date:", IDC_STATIC, 14, 14, 36, 8 + LTEXT "&Description :", IDC_STATIC, 14, 70, 45, 8 + LTEXT "Date :", IDC_STATIC, 14, 14, 40, 8 EDITTEXT IDC_EVENTDATESTATIC, 56, 14, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Heure :", IDC_STATIC, 14, 27, 36, 8 + LTEXT "Heure :", IDC_STATIC, 14, 27, 40, 8 EDITTEXT IDC_EVENTTIMESTATIC, 56, 27, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Utilisateur :", IDC_STATIC, 14, 41, 36, 8 + LTEXT "&Utilisateur :", IDC_STATIC, 14, 41, 40, 8 EDITTEXT IDC_EVENTUSERSTATIC, 56, 41, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Ordinateur :", IDC_STATIC, 14, 54, 36, 8 + LTEXT "Ordinateur :", IDC_STATIC, 14, 54, 40, 8 EDITTEXT IDC_EVENTCOMPUTERSTATIC, 56, 54, 72, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "ÃvÃ©nement :", IDC_STATIC, 133, 15, 36, 8 + LTEXT "ÃvÃ©nement :", IDC_STATIC, 133, 15, 42, 8 EDITTEXT IDC_EVENTIDSTATIC, 175, 15, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Source:", IDC_STATIC, 133, 28, 36, 8 + LTEXT "Source :", IDC_STATIC, 133, 28, 42, 8 EDITTEXT IDC_EVENTSOURCESTATIC, 175, 28, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Type:", IDC_STATIC, 133, 42, 36, 8 + LTEXT "Type :", IDC_STATIC, 133, 42, 42, 8 EDITTEXT IDC_EVENTTYPESTATIC, 175, 42, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "CatÃ©gorie :", IDC_STATIC, 133, 55, 36, 8 + LTEXT "CatÃ©gorie :", IDC_STATIC, 133, 55, 42, 8 EDITTEXT IDC_EVENTCATEGORYSTATIC, 175, 55, 87, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_EVENTDATAEDIT, 14, 204, 247, 44, ES_MULTILINE | ES_READONLY - LTEXT "DonnÃ©es", IDC_STATIC, 14, 194, 20, 8 - CONTROL "&Octets", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 39, 194, 34, 8 - CONTROL "&Mots", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 77, 194, 33, 8 + LTEXT "DonnÃ©es :", IDC_STATIC, 14, 194, 35, 8 + CONTROL "&Octets", IDC_BYTESRADIO, "Button", BS_AUTORADIOBUTTON, 50, 194, 34, 8 + CONTROL "&Mots", IDC_WORDRADIO, "Button", BS_AUTORADIOBUTTON, 88, 194, 33, 8 END STRINGTABLE @@ -93,7 +93,7 @@ IDS_APP_TITLE "Visionneuse d'Ã©vÃ©nements" IDS_APP_TITLE_EX "%s - %s Log on \\\\" IDS_STATUS_MSG "%s has %lu event(s)" - IDS_EVENTSTRINGIDNOTFOUND "La description pour l'Ã©vÃ©nement d'ID ( %lu ) dans la source ( %s ) ne peut Ãªtre trouvÃ©e. L'ordinateur local pourrait ne pas avoir les informations registres nÃ©cÃ©ssaires ou les fichiers DLL de message pour afficher les messages depuis un ordinateur distant." + IDS_EVENTSTRINGIDNOTFOUND "La description pour l'Ã©vÃ©nement d'ID ( %lu ) dans la source ( %s ) ne peut Ãªtre trouvÃ©e. L'ordinateur local pourrait ne pas avoir les informations registres nÃ©cessaires ou les fichiers DLL de message pour afficher les messages depuis un ordinateur distant." IDS_EVENTLOG_ERROR_TYPE "Erreur" IDS_EVENTLOG_WARNING_TYPE "Avertissement" IDS_EVENTLOG_INFORMATION_TYPE "Informations" Modified: trunk/reactos/dll/win32/devmgr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/fr-F… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/fr-FR.rc [iso-8859-1] Sun Aug 24 11:42:49 2014 @@ -44,7 +44,7 @@ IDS_DEV_OUT_OF_MEMORY "Le pilote de ce pÃ©riphÃ©rique peut Ãªtre mauvais, ou votre systÃ¨me peut Ãªtre Ã court de mÃ©moire ou d'autres ressources." IDS_DEV_ENTRY_IS_WRONG_TYPE "Ce pÃ©riphÃ©rique ne fonctionne pas correctement parce qu'un des pilotes de ce pÃ©riphÃ©rique peut Ãªtre mauvais, ou votre base de registres peut Ãªtre mauvaise." IDS_DEV_LACKED_ARBITRATOR "Le pilote de ce pÃ©riphÃ©rique a demandÃ© une ressource que ReactOS ne sait pas prendre en compte." - IDS_DEV_BOOT_CONFIG_CONFLICT "Un autre pÃ©riphÃ©rique utilise les ressources nÃ©cÃ©ssaires Ã ce pÃ©riphÃ©rique." + IDS_DEV_BOOT_CONFIG_CONFLICT "Un autre pÃ©riphÃ©rique utilise les ressources nÃ©cessaires Ã ce pÃ©riphÃ©rique." IDS_DEV_FAILED_FILTER "Les pilotes de ce pÃ©riphÃ©rique doivent Ãªtre rÃ©installÃ©s." IDS_DEV_DEVLOADER_NOT_FOUND "Ce pÃ©riphÃ©rique ne fonctionne pas correctement parce que ReactOS ne peut charger le fichier %1 qui charge les pilotes de ce pÃ©riphÃ©rique." IDS_DEV_DEVLOADER_NOT_FOUND2 "Ce pÃ©riphÃ©rique ne fonctionne pas correctement parce que le fichier %1 qui charge les pilotes de ce pÃ©riphÃ©rique est mauvais."

10 years

[tfaber] 63928: [FASTFAT] - Properly handle errors in CcInitializeCacheMap, CcCopyRead and CcCopyWrite CORE-8410

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Aug 24 03:28:01 2014 New Revision: 63928 URL: http://svn.reactos.org/svn/reactos?rev=63928&view=rev Log: [FASTFAT] - Properly handle errors in CcInitializeCacheMap, CcCopyRead and CcCopyWrite CORE-8410 Modified: trunk/reactos/drivers/filesystems/fastfat/CMakeLists.txt trunk/reactos/drivers/filesystems/fastfat/fcb.c trunk/reactos/drivers/filesystems/fastfat/fsctl.c trunk/reactos/drivers/filesystems/fastfat/rw.c trunk/reactos/drivers/filesystems/fastfat/vfat.h Modified: trunk/reactos/drivers/filesystems/fastfat/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/CMakeLists.txt [iso-8859-1] Sun Aug 24 03:28:01 2014 @@ -26,6 +26,7 @@ add_library(fastfat SHARED ${SOURCE} vfatfs.rc) set_module_type(fastfat kernelmodedriver) +target_link_libraries(fastfat ${PSEH_LIB}) add_importlibs(fastfat ntoskrnl hal) add_pch(fastfat vfat.h SOURCE) Modified: trunk/reactos/drivers/filesystems/fastfat/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fcb.c [iso-8859-1] Sun Aug 24 03:28:01 2014 @@ -340,12 +340,14 @@ { PFILE_OBJECT fileObject; PVFATCCB newCCB; + NTSTATUS status; fileObject = IoCreateStreamFileObject (NULL, vcb->StorageDevice); newCCB = ExAllocateFromNPagedLookasideList(&VfatGlobalData->CcbLookasideList); if (newCCB == NULL) { + ObDereferenceObject(fileObject); return STATUS_INSUFFICIENT_RESOURCES; } RtlZeroMemory(newCCB, sizeof (VFATCCB)); @@ -356,11 +358,24 @@ fcb->FileObject = fileObject; fcb->RefCount++; - CcInitializeCacheMap(fileObject, - (PCC_FILE_SIZES)(&fcb->RFCB.AllocationSize), - TRUE, - &VfatGlobalData->CacheMgrCallbacks, - fcb); + _SEH2_TRY + { + CcInitializeCacheMap(fileObject, + (PCC_FILE_SIZES)(&fcb->RFCB.AllocationSize), + TRUE, + &VfatGlobalData->CacheMgrCallbacks, + fcb); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + status = _SEH2_GetExceptionCode(); + fcb->RefCount--; + fcb->FileObject = NULL; + ExFreeToNPagedLookasideList(&VfatGlobalData->CcbLookasideList, newCCB); + ObDereferenceObject(fileObject); + return status; + } + _SEH2_END; fcb->Flags |= FCB_CACHE_INITIALIZED; return STATUS_SUCCESS; Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] Sun Aug 24 03:28:01 2014 @@ -550,11 +550,20 @@ Fcb->RFCB.ValidDataLength = Fcb->RFCB.FileSize; Fcb->RFCB.AllocationSize = Fcb->RFCB.FileSize; - CcInitializeCacheMap(DeviceExt->FATFileObject, - (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), - TRUE, - &VfatGlobalData->CacheMgrCallbacks, - Fcb); + _SEH2_TRY + { + CcInitializeCacheMap(DeviceExt->FATFileObject, + (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), + TRUE, + &VfatGlobalData->CacheMgrCallbacks, + Fcb); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + goto ByeBye; + } + _SEH2_END; DeviceExt->LastAvailableCluster = 2; ExInitializeResourceLite(&DeviceExt->FatResource); Modified: trunk/reactos/drivers/filesystems/fastfat/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] Sun Aug 24 03:28:01 2014 @@ -673,22 +673,35 @@ Status = /*STATUS_END_OF_FILE*/STATUS_SUCCESS; } - if (IrpContext->FileObject->PrivateCacheMap == NULL) - { - CcInitializeCacheMap(IrpContext->FileObject, - (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), - FALSE, - &(VfatGlobalData->CacheMgrCallbacks), - Fcb); - } - - if (!CcCopyRead(IrpContext->FileObject, &ByteOffset, Length, - (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT), Buffer, - &IrpContext->Irp->IoStatus)) - { - Status = STATUS_PENDING; - goto ByeBye; - } + _SEH2_TRY + { + if (IrpContext->FileObject->PrivateCacheMap == NULL) + { + CcInitializeCacheMap(IrpContext->FileObject, + (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), + FALSE, + &(VfatGlobalData->CacheMgrCallbacks), + Fcb); + } + + if (!CcCopyRead(IrpContext->FileObject, + &ByteOffset, + Length, + (IrpContext->Flags & IRPCONTEXT_CANWAIT) != 0, + Buffer, + &IrpContext->Irp->IoStatus)) + { + ASSERT((IrpContext->Flags & IRPCONTEXT_CANWAIT) == 0); + Status = STATUS_PENDING; + goto ByeBye; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + goto ByeBye; + } + _SEH2_END; if (!NT_SUCCESS(IrpContext->Irp->IoStatus.Status)) { @@ -947,30 +960,42 @@ { // cached write - if (IrpContext->FileObject->PrivateCacheMap == NULL) - { - CcInitializeCacheMap(IrpContext->FileObject, - (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), - FALSE, - &VfatGlobalData->CacheMgrCallbacks, - Fcb); - } - - if (ByteOffset.QuadPart > OldFileSize.QuadPart) - { - CcZeroData(IrpContext->FileObject, &OldFileSize, &ByteOffset, TRUE); - } - - if (CcCopyWrite(IrpContext->FileObject, &ByteOffset, Length, - 1 /*IrpContext->Flags & IRPCONTEXT_CANWAIT*/, Buffer)) - { - IrpContext->Irp->IoStatus.Information = Length; - Status = STATUS_SUCCESS; - } - else - { - Status = STATUS_UNSUCCESSFUL; - } + _SEH2_TRY + { + if (IrpContext->FileObject->PrivateCacheMap == NULL) + { + CcInitializeCacheMap(IrpContext->FileObject, + (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), + FALSE, + &VfatGlobalData->CacheMgrCallbacks, + Fcb); + } + + if (ByteOffset.QuadPart > OldFileSize.QuadPart) + { + CcZeroData(IrpContext->FileObject, &OldFileSize, &ByteOffset, TRUE); + } + + if (CcCopyWrite(IrpContext->FileObject, + &ByteOffset, + Length, + TRUE /*(IrpContext->Flags & IRPCONTEXT_CANWAIT) != 0*/, + Buffer)) + { + IrpContext->Irp->IoStatus.Information = Length; + Status = STATUS_SUCCESS; + } + else + { + ASSERT(FALSE /*(IrpContext->Flags & IRPCONTEXT_CANWAIT) == 0*/); + Status = STATUS_UNSUCCESSFUL; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; } else { Modified: trunk/reactos/drivers/filesystems/fastfat/vfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] Sun Aug 24 03:28:01 2014 @@ -4,6 +4,7 @@ #include <ntifs.h> #include <ntdddisk.h> #include <dos.h> +#include <pseh/pseh2.h> #define USE_ROS_CC_AND_FS

10 years

← Newer
1
...
6
7
8
9
10
11
12
...
23
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 August 2014